From 4d62478e14fe8bef8ae88a55b0864217b400b719 Mon Sep 17 00:00:00 2001 From: Nathan Samson Date: Sun, 4 Sep 2011 02:14:39 +0200 Subject: Use the newer GtkUIManager for menu creation. Signed-off-by: Nathan Samson Signed-off-by: Linus Torvalds --- main.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/main.c b/main.c index 5a047bb09..410bf9544 100644 --- a/main.c +++ b/main.c @@ -128,25 +128,38 @@ static void file_save(GtkWidget *w, gpointer data) gtk_widget_destroy(dialog); } -static GtkItemFactoryEntry menu_items[] = { - { "/_File", NULL, NULL, 0, "" }, - { "/File/_Open", "O", file_open, 0, "", GTK_STOCK_OPEN }, - { "/File/_Save", "S", file_save, 0, "", GTK_STOCK_SAVE }, +static GtkActionEntry menu_items[] = { + { "FileMenuAction", GTK_STOCK_FILE, NULL, NULL, NULL, NULL}, + { "OpenFile", GTK_STOCK_OPEN, NULL, "O", NULL, G_CALLBACK(file_open) }, + { "SaveFile", GTK_STOCK_SAVE, NULL, "S", NULL, G_CALLBACK(file_save) }, }; static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]); -/* This is just directly from the gtk menubar tutorial. */ +static const gchar* ui_string = " \ + \ + \ + \ + \ + \ + \ + \ + \ +"; + static GtkWidget *get_menubar_menu(GtkWidget *window) { - GtkItemFactory *item_factory; - GtkAccelGroup *accel_group; + GtkActionGroup *action_group = gtk_action_group_new("Menu"); + gtk_action_group_add_actions(action_group, menu_items, nmenu_items, 0); + + GtkUIManager *ui_manager = gtk_ui_manager_new(); + gtk_ui_manager_insert_action_group(ui_manager, action_group, 0); + GError* error = 0; + gtk_ui_manager_add_ui_from_string(GTK_UI_MANAGER(ui_manager), ui_string, -1, &error); - accel_group = gtk_accel_group_new(); - item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "
", accel_group); + gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(ui_manager)); + GtkWidget* menu = gtk_ui_manager_get_widget(ui_manager, "/MainMenu"); - gtk_item_factory_create_items(item_factory, nmenu_items, menu_items, NULL); - gtk_window_add_accel_group(GTK_WINDOW(window), accel_group); - return gtk_item_factory_get_widget(item_factory, "
"); + return menu; } int main(int argc, char **argv) -- cgit v1.2.3-70-g09d2