mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-16 17:22:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

clean up attach parent macro

Browse Source
This commit is contained in:
Vincent Sanders 2014-07-21 15:45:14 +01:00
parent 9e010dc7a5
commit 418925fa4b
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gtk/menu.c
View File

@ -105,15 +105,13 @@ static bool nsgtk_menu_add_image_item(GtkMenu *menu,
#define ATTACH_PARENT(parent, msgname, menuv, group) \ #define ATTACH_PARENT(parent, msgname, menuv, group) \
do { \ do { \
if (parent != NULL) { \ /* create top level menu entry and attach to parent */ \
/* create top level menu entry and attach to parent */ \ menuv = GTK_MENU_ITEM(gtk_menu_item_new_with_mnemonic(messages_get(#msgname))); \
menuv = GTK_MENU_ITEM(gtk_menu_item_new_with_mnemonic(messages_get(#msgname))); \ gtk_menu_shell_append(parent, GTK_WIDGET(menuv)); \
gtk_menu_shell_append(parent, GTK_WIDGET(menuv)); \ gtk_widget_show(GTK_WIDGET(menuv)); \
gtk_widget_show(GTK_WIDGET(menuv)); \ /* attach submenu to parent */ \
/* attach submenu to parent */ \ gtk_menu_item_set_submenu(menuv, GTK_WIDGET(menuv##_menu)); \
gtk_menu_item_set_submenu(menuv, GTK_WIDGET(menuv##_menu)); \ gtk_menu_set_accel_group(menuv##_menu, group); \
gtk_menu_set_accel_group(menuv##_menu, group); \
} \
} while(0) } while(0)
/** /**
@ -460,28 +458,28 @@ nsgtk_menu_bar_create(GtkMenuShell *menubar, GtkAccelGroup *group)
{ {
struct nsgtk_bar_submenu *nmenu; struct nsgtk_bar_submenu *nmenu;
nmenu = malloc(sizeof(struct nsgtk_bar_submenu)); nmenu = calloc(1, sizeof(struct nsgtk_bar_submenu));
if (nmenu == NULL) { if (nmenu == NULL) {
warn_user(messages_get("NoMemory"), 0);
return NULL; return NULL;
} }
nmenu->bar_menu = GTK_MENU_BAR(menubar); /* create sub menus */
nmenu->file_submenu = nsgtk_menu_file_submenu(group); nmenu->file_submenu = nsgtk_menu_file_submenu(group);
ATTACH_PARENT(menubar, gtkFile, nmenu->file_submenu->file, group);
nmenu->edit_submenu = nsgtk_menu_edit_submenu(group); nmenu->edit_submenu = nsgtk_menu_edit_submenu(group);
ATTACH_PARENT(menubar, gtkEdit, nmenu->edit_submenu->edit, group);
nmenu->view_submenu = nsgtk_menu_view_submenu(group); nmenu->view_submenu = nsgtk_menu_view_submenu(group);
ATTACH_PARENT(menubar, gtkView, nmenu->view_submenu->view, group);
nmenu->nav_submenu = nsgtk_menu_nav_submenu(group); nmenu->nav_submenu = nsgtk_menu_nav_submenu(group);
ATTACH_PARENT(menubar, gtkNavigate, nmenu->nav_submenu->nav, group);
nmenu->help_submenu = nsgtk_menu_help_submenu(group); nmenu->help_submenu = nsgtk_menu_help_submenu(group);
ATTACH_PARENT(menubar, gtkHelp, nmenu->help_submenu->help, group);
if (menubar != NULL) {
nmenu->bar_menu = GTK_MENU_BAR(menubar);
/* attach menus to menubar */
ATTACH_PARENT(menubar, gtkFile, nmenu->file_submenu->file, group);
ATTACH_PARENT(menubar, gtkEdit, nmenu->edit_submenu->edit, group);
ATTACH_PARENT(menubar, gtkView, nmenu->view_submenu->view, group);
ATTACH_PARENT(menubar, gtkNavigate, nmenu->nav_submenu->nav, group);
ATTACH_PARENT(menubar, gtkHelp, nmenu->help_submenu->help, group);
}
return nmenu; return nmenu;
} }