diff options
| author | Vincent Sanders <vince@netsurf-browser.org> | 2010-09-17 23:18:01 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@netsurf-browser.org> | 2010-09-17 23:18:01 +0000 |
| commit | dd43ea083092c3f310be221f9df7512ca1d21265 (patch) | |
| tree | 6b685ccbd418608794a08d03963f6a6e9beea8d9 /gtk/gtk_menu.h | |
| parent | 9ad74ad786699e3020cd9f684d4bc4646bfacae5 (diff) | |
| download | netsurf-dd43ea083092c3f310be221f9df7512ca1d21265.tar.gz netsurf-dd43ea083092c3f310be221f9df7512ca1d21265.tar.bz2 | |
move the gtk menu creation into gtk_menu.c from gtk_scaffolding.c
This causes the menu creation to be concentrated in one place removing the need for numerous external linkages
svn path=/trunk/netsurf/; revision=10794
Diffstat (limited to 'gtk/gtk_menu.h')
| -rw-r--r-- | gtk/gtk_menu.h | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/gtk/gtk_menu.h b/gtk/gtk_menu.h index b61cf7f51..627ee1283 100644 --- a/gtk/gtk_menu.h +++ b/gtk/gtk_menu.h @@ -124,11 +124,24 @@ struct nsgtk_debugging_submenu { GtkImageMenuItem *savedomtree_menuitem; }; -struct nsgtk_file_menu *nsgtk_menu_file_menu(GtkAccelGroup *group); -struct nsgtk_edit_menu *nsgtk_menu_edit_menu(GtkAccelGroup *group); -struct nsgtk_view_menu *nsgtk_menu_view_menu(GtkAccelGroup *group); -struct nsgtk_nav_menu *nsgtk_menu_nav_menu(GtkAccelGroup *group); -struct nsgtk_tabs_menu *nsgtk_menu_tabs_menu(GtkAccelGroup *group); -struct nsgtk_help_menu *nsgtk_menu_help_menu(GtkAccelGroup *group); + +struct nsgtk_menu { + struct nsgtk_file_menu *file_menu; + struct nsgtk_file_menu *rclick_file_menu; + struct nsgtk_edit_menu *edit_menu; + struct nsgtk_edit_menu *rclick_edit_menu; + struct nsgtk_view_menu *view_menu; + struct nsgtk_view_menu *rclick_view_menu; + struct nsgtk_nav_menu *nav_menu; + struct nsgtk_nav_menu *rclick_nav_menu; + struct nsgtk_tabs_menu *tabs_menu; + struct nsgtk_tabs_menu *rclick_tabs_menu; + struct nsgtk_help_menu *help_menu; + struct nsgtk_help_menu *rclick_help_menu; + GtkMenuItem *edit_menu_item; + GtkMenuItem *tabs_menu_item; +}; + +struct nsgtk_menu *nsgtk_menu_create(GladeXML *xml, GtkWindow *window); #endif |