Disabled simple accelerators when a text entry gets focus.

1 files changed, 17 insertions, 17 deletions

diff --git a/src/gui/menus/edition.c b/src/gui/menus/edition.c
index 4a24d33..80c0796 100644
--- a/src/gui/menus/edition.c
+++ b/src/gui/menus/edition.c
@@ -31,6 +31,7 @@
 #include <i18n.h>
 
 
+#include "../agroup.h"
 #include "../core/global.h"
 #include "../dialogs/bookmark.h"
 #include "../dialogs/goto.h"
@@ -82,9 +83,8 @@ static void mcb_edition_comment_enter_next(GtkMenuItem *, GMenuBar *);
 
 /******************************************************************************
 *                                                                             *
-*  Paramètres  : ref      = espace de référencement global.                   *
-*                accgroup = groupe d'accélérateurs pour les menus.            *
-*                bar      = barre de menu parente.                            *
+*  Paramètres  : ref = espace de référencement global.                        *
+*                bar = barre de menu parente.                                 *
 *                                                                             *
 *  Description : Construit le menu "Edition".                                 *
 *                                                                             *
@@ -94,7 +94,7 @@ static void mcb_edition_comment_enter_next(GtkMenuItem *, GMenuBar *);
 *                                                                             *
 ******************************************************************************/
 
-GtkWidget *build_menu_edition(GObject *ref, GtkAccelGroup *accgroup, GMenuBar *bar)
+GtkWidget *build_menu_edition(GObject *ref, GMenuBar *bar)
 {
     GtkWidget *result;                      /* Support à retourner         */
     GtkWidget *menubar;                     /* Support pour éléments       */
@@ -111,7 +111,7 @@ GtkWidget *build_menu_edition(GObject *ref, GtkAccelGroup *accgroup, GMenuBar *b
 
     submenuitem = qck_create_menu_item(ref, "mnu_edit_goto", _("Go to address..."),
                                        G_CALLBACK(mcb_edition_goto), bar);
-    add_accelerator_to_menu_item(submenuitem, "<Ctrl>G", accgroup);
+    add_accelerator_to_widget(submenuitem, "<Ctrl>G");
     gtk_container_add(GTK_CONTAINER(menubar), submenuitem);
 
     /* Séparation */
@@ -128,25 +128,25 @@ GtkWidget *build_menu_edition(GObject *ref, GtkAccelGroup *accgroup, GMenuBar *b
 
     deepmenuitem = qck_create_menu_item(ref, "mnu_edit_switch_hex", _("Hexadecimal"),
                                         G_CALLBACK(mcb_edition_switch_numeric_operand), NULL);
-    add_accelerator_to_menu_item(deepmenuitem, "H", accgroup);
+    add_accelerator_to_widget(deepmenuitem, "H");
     g_object_set_data(G_OBJECT(deepmenuitem), "kind_of_switch", GUINT_TO_POINTER(IOD_HEX));
     gtk_container_add(GTK_CONTAINER(deepmenubar), deepmenuitem);
 
     deepmenuitem = qck_create_menu_item(ref, "mnu_edit_switch_dec", _("Decimal"),
                                         G_CALLBACK(mcb_edition_switch_numeric_operand), NULL);
-    add_accelerator_to_menu_item(deepmenuitem, "D", accgroup);
+    add_accelerator_to_widget(deepmenuitem, "D");
     g_object_set_data(G_OBJECT(deepmenuitem), "kind_of_switch", GUINT_TO_POINTER(IOD_DEC));
     gtk_container_add(GTK_CONTAINER(deepmenubar), deepmenuitem);
 
     deepmenuitem = qck_create_menu_item(ref, "mnu_edit_switch_oct", _("Octal"),
                                         G_CALLBACK(mcb_edition_switch_numeric_operand), NULL);
-    add_accelerator_to_menu_item(deepmenuitem, "O", accgroup);
+    add_accelerator_to_widget(deepmenuitem, "O");
     g_object_set_data(G_OBJECT(deepmenuitem), "kind_of_switch", GUINT_TO_POINTER(IOD_OCT));
     gtk_container_add(GTK_CONTAINER(deepmenubar), deepmenuitem);
 
     deepmenuitem = qck_create_menu_item(ref, "mnu_edit_switch_bin", _("Binary"),
                                         G_CALLBACK(mcb_edition_switch_numeric_operand), NULL);
-    add_accelerator_to_menu_item(deepmenuitem, "B", accgroup);
+    add_accelerator_to_widget(deepmenuitem, "B");
     g_object_set_data(G_OBJECT(deepmenuitem), "kind_of_switch", GUINT_TO_POINTER(IOD_BIN));
     gtk_container_add(GTK_CONTAINER(deepmenubar), deepmenuitem);
 
@@ -167,17 +167,17 @@ GtkWidget *build_menu_edition(GObject *ref, GtkAccelGroup *accgroup, GMenuBar *b
 
     submenuitem = qck_create_menu_item(ref, "mnu_edit_go_back", _("Go back"),
                                        G_CALLBACK(mcb_edition_go_back), bar);
-    add_accelerator_to_menu_item(submenuitem, "Escape", accgroup);
+    add_accelerator_to_widget(submenuitem, "Escape");
     gtk_container_add(GTK_CONTAINER(menubar), submenuitem);
 
     submenuitem = qck_create_menu_item(ref, "mnu_edit_follow_ref", _("Follow the reference"),
                                        G_CALLBACK(mcb_edition_follow_ref), NULL);
-    add_accelerator_to_menu_item(submenuitem, "Return", accgroup);
+    add_accelerator_to_widget(submenuitem, "Return");
     gtk_container_add(GTK_CONTAINER(menubar), submenuitem);
 
     submenuitem = qck_create_menu_item(ref, "mnu_edit_list_xrefs", _("List all references leading to..."),
                                        G_CALLBACK(mcb_edition_list_xrefs), bar);
-    add_accelerator_to_menu_item(submenuitem, "X", accgroup);
+    add_accelerator_to_widget(submenuitem, "X");
     gtk_container_add(GTK_CONTAINER(menubar), submenuitem);
 
     /* Séparation */
@@ -194,7 +194,7 @@ GtkWidget *build_menu_edition(GObject *ref, GtkAccelGroup *accgroup, GMenuBar *b
 
     deepmenuitem = qck_create_menu_item(ref, "mnu_edit_toggle_bmark", _("Toggle at current location"),
                                         G_CALLBACK(mcb_edition_bookmarks_toggle), bar);
-    add_accelerator_to_menu_item(deepmenuitem, "<Ctrl>D", accgroup);
+    add_accelerator_to_widget(deepmenuitem, "<Ctrl>D");
     gtk_container_add(GTK_CONTAINER(deepmenubar), deepmenuitem);
 
     deepmenuitem = qck_create_menu_item(ref, "mnu_edit_delete_bmarks", _("Delete all bookmarks"),
@@ -210,22 +210,22 @@ GtkWidget *build_menu_edition(GObject *ref, GtkAccelGroup *accgroup, GMenuBar *b
 
     deepmenuitem = qck_create_menu_item(ref, "mnu_edit_enter_comment", _("Enter a comment..."),
                                         G_CALLBACK(mcb_edition_comment_enter), bar);
-    add_accelerator_to_menu_item(deepmenuitem, "semicolon", accgroup);
+    add_accelerator_to_widget(deepmenuitem, "semicolon");
     gtk_container_add(GTK_CONTAINER(deepmenubar), deepmenuitem);
 
     deepmenuitem = qck_create_menu_item(ref, "mnu_edit_enter_rep_comment", _("Enter a repeatable comment..."),
                                         G_CALLBACK(mcb_edition_comment_enter_repeatable), bar);
-    add_accelerator_to_menu_item(deepmenuitem, "colon", accgroup);
+    add_accelerator_to_widget(deepmenuitem, "colon");
     gtk_container_add(GTK_CONTAINER(deepmenubar), deepmenuitem);
 
     deepmenuitem = qck_create_menu_item(ref, "mnu_edit_enter_prev", _("Enter a comment in the previous line..."),
                                         G_CALLBACK(mcb_edition_comment_enter_previous), bar);
-    add_accelerator_to_menu_item(deepmenuitem, "Insert", accgroup);
+    add_accelerator_to_widget(deepmenuitem, "Insert");
     gtk_container_add(GTK_CONTAINER(deepmenubar), deepmenuitem);
 
     deepmenuitem = qck_create_menu_item(ref, "mnu_edit_enter_next", _("Enter a comment in the next line..."),
                                         G_CALLBACK(mcb_edition_comment_enter_next), bar);
-    add_accelerator_to_menu_item(deepmenuitem, "<Shift>Insert", accgroup);
+    add_accelerator_to_widget(deepmenuitem, "<Shift>Insert");
     gtk_container_add(GTK_CONTAINER(deepmenubar), deepmenuitem);
 
     return result;