diff options
author | Vincent Sanders <vince@netsurf-browser.org> | 2011-02-01 23:11:29 +0000 |
---|---|---|
committer | Vincent Sanders <vince@netsurf-browser.org> | 2011-02-01 23:11:29 +0000 |
commit | 726881c2adbbdc8f722dc1fe0016326daf7e5c44 (patch) | |
tree | 695901db5746b13c1e89e0b147a6b5512f950128 /gtk/menu.c | |
parent | ad69ae092320193424bb341030c8712d3db3fcf7 (diff) | |
download | netsurf-726881c2adbbdc8f722dc1fe0016326daf7e5c44.tar.gz netsurf-726881c2adbbdc8f722dc1fe0016326daf7e5c44.tar.bz2 |
gtk can have *only* a single accelerator group attached or it goes bang
svn path=/trunk/netsurf/; revision=11598
Diffstat (limited to 'gtk/menu.c')
-rw-r--r-- | gtk/menu.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/gtk/menu.c b/gtk/menu.c index 99bfde997..f16cfee40 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -449,9 +449,9 @@ static struct nsgtk_help_menu *nsgtk_menu_help_submenu(GtkAccelGroup *group) * * Generate the main menu structure and attach it to a menubar widget. */ -struct nsgtk_bar_submenu *nsgtk_menu_bar_create(GtkMenuShell *menubar, GtkWindow *window) +struct nsgtk_bar_submenu *nsgtk_menu_bar_create(GtkMenuShell *menubar, GtkAccelGroup *group) { - GtkAccelGroup *group; + ; struct nsgtk_bar_submenu *nmenu; nmenu = malloc(sizeof(struct nsgtk_bar_submenu)); @@ -462,9 +462,6 @@ struct nsgtk_bar_submenu *nsgtk_menu_bar_create(GtkMenuShell *menubar, GtkWindow nmenu->bar_menu = GTK_MENU_BAR(menubar); - group = gtk_accel_group_new(); - gtk_window_add_accel_group(window, group); - nmenu->file_submenu = nsgtk_menu_file_submenu(group); ATTACH_PARENT(menubar, gtkFile, nmenu->file_submenu->file, group); @@ -487,9 +484,8 @@ struct nsgtk_bar_submenu *nsgtk_menu_bar_create(GtkMenuShell *menubar, GtkWindow * Generate right click menu menu. * */ -struct nsgtk_popup_submenu *nsgtk_menu_popup_create(GtkWindow *window) +struct nsgtk_popup_submenu *nsgtk_menu_popup_create(GtkAccelGroup *group) { - GtkAccelGroup *group; struct nsgtk_popup_submenu *nmenu; nmenu = malloc(sizeof(struct nsgtk_popup_submenu)); @@ -498,9 +494,6 @@ struct nsgtk_popup_submenu *nsgtk_menu_popup_create(GtkWindow *window) return NULL; } - group = gtk_accel_group_new(); - gtk_window_add_accel_group(window, group); - nmenu->popup_menu = GTK_MENU(gtk_menu_new()); IMAGE_ITEM(popup, file, gtkFile, nmenu, group); |