Gtk cleanup: gtk_menu_append

(bzr r10350.1.7)

8 files changed, 42 insertions, 42 deletions

diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp
index 43dbf4e60..df9ea3be7 100644
--- a/src/dialogs/clonetiler.cpp
+++ b/src/dialogs/clonetiler.cpp
@@ -1864,7 +1864,7 @@ void clonetiler_dialog(void)
                                      G_CALLBACK (clonetiler_symgroup_changed),
                                      GINT_TO_POINTER (sg.group) );
 
-                gtk_menu_append (GTK_MENU (m), item);
+                gtk_menu_shell_append(GTK_MENU_SHELL (m), item);
             }
 
             gtk_option_menu_set_menu (GTK_OPTION_MENU (om), m);
diff --git a/src/interface.cpp b/src/interface.cpp
index 209f32fd7..c7946cf18 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -456,7 +456,7 @@ sp_ui_menu_append_item( GtkMenu *menu, gchar const *stock,
         g_signal_connect( G_OBJECT(item), "deselect", G_CALLBACK(sp_ui_menu_deselect), NULL);
     }
 
-    gtk_menu_append(GTK_MENU(menu), item);
+    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
     return item;
 
@@ -562,7 +562,7 @@ sp_ui_menu_append_item_from_verb(GtkMenu *menu, Inkscape::Verb *verb, Inkscape::
     }
 
     gtk_widget_show(item);
-    gtk_menu_append(GTK_MENU(menu), item);
+    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
     return item;
 
@@ -953,7 +953,7 @@ sp_ui_build_dyn_menus(Inkscape::XML::Node *menus, GtkWidget *menu, Inkscape::UI:
                 GtkWidget *item = gtk_menu_item_new_with_label(string);
                 gtk_widget_set_sensitive(item, false);
                 gtk_widget_show(item);
-                gtk_menu_append(GTK_MENU(menu), item);
+                gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
             }
             continue;
         }
@@ -964,7 +964,7 @@ sp_ui_build_dyn_menus(Inkscape::XML::Node *menus, GtkWidget *menu, Inkscape::UI:
              || !strcmp(menu_pntr->name(), "seperator")) {
             GtkWidget *item = gtk_separator_menu_item_new();
             gtk_widget_show(item);
-            gtk_menu_append(GTK_MENU(menu), item);
+            gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
             continue;
         }
         if (!strcmp(menu_pntr->name(), "template-list")) {
@@ -993,7 +993,7 @@ sp_ui_build_dyn_menus(Inkscape::XML::Node *menus, GtkWidget *menu, Inkscape::UI:
             GtkWidget *recent_item = gtk_menu_item_new_with_mnemonic(_("Open _Recent"));
             gtk_menu_item_set_submenu(GTK_MENU_ITEM(recent_item), recent_menu);
 
-            gtk_menu_append(GTK_MENU(menu), GTK_WIDGET(recent_item));
+            gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(recent_item));
             // this will just sit and update the list's item count
             static MaxRecentObserver *mro = new MaxRecentObserver(recent_menu);
             prefs->addObserver(*mro);
diff --git a/src/ui/context-menu.cpp b/src/ui/context-menu.cpp
index a5d882192..2f41b3fde 100644
--- a/src/ui/context-menu.cpp
+++ b/src/ui/context-menu.cpp
@@ -113,11 +113,11 @@ sp_item_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
     g_object_set_data(G_OBJECT(w), "desktop", desktop);
     g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_item_properties), item);
     gtk_widget_show(w);
-    gtk_menu_append(GTK_MENU(m), w);
+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
     /* Separator */
     w = gtk_menu_item_new();
     gtk_widget_show(w);
-    gtk_menu_append(GTK_MENU(m), w);
+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
     /* Select item */
     w = gtk_menu_item_new_with_mnemonic(_("_Select This"));
     if (sp_desktop_selection(desktop)->includes(item)) {
@@ -127,14 +127,14 @@ sp_item_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
         g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_item_select_this), item);
     }
     gtk_widget_show(w);
-    gtk_menu_append(GTK_MENU(m), w);
+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
     /* Create link */
     w = gtk_menu_item_new_with_mnemonic(_("_Create Link"));
     g_object_set_data(G_OBJECT(w), "desktop", desktop);
     g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_item_create_link), item);
     gtk_widget_set_sensitive(w, !SP_IS_ANCHOR(item));
     gtk_widget_show(w);
-    gtk_menu_append(GTK_MENU(m), w);
+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
     /* Set mask */
     w = gtk_menu_item_new_with_mnemonic(_("Set Mask"));
     g_object_set_data(G_OBJECT(w), "desktop", desktop);
@@ -145,7 +145,7 @@ sp_item_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
         gtk_widget_set_sensitive(w, TRUE);
     }
     gtk_widget_show(w);
-    gtk_menu_append(GTK_MENU(m), w);
+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
     /* Release mask */
     w = gtk_menu_item_new_with_mnemonic(_("Release Mask"));
     g_object_set_data(G_OBJECT(w), "desktop", desktop);
@@ -156,7 +156,7 @@ sp_item_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
         gtk_widget_set_sensitive(w, FALSE);
     }
     gtk_widget_show(w);
-    gtk_menu_append(GTK_MENU(m), w);
+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
     /* Set Clip */
     w = gtk_menu_item_new_with_mnemonic(_("Set _Clip"));
     g_object_set_data(G_OBJECT(w), "desktop", desktop);
@@ -167,7 +167,7 @@ sp_item_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
         gtk_widget_set_sensitive(w, TRUE);
     }
     gtk_widget_show(w);
-    gtk_menu_append(GTK_MENU(m), w);
+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
     /* Release Clip */
     w = gtk_menu_item_new_with_mnemonic(_("Release C_lip"));
     g_object_set_data(G_OBJECT(w), "desktop", desktop);
@@ -178,7 +178,7 @@ sp_item_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
         gtk_widget_set_sensitive(w, FALSE);
     }
     gtk_widget_show(w);
-    gtk_menu_append(GTK_MENU(m), w);
+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
 
 }
 
@@ -314,7 +314,7 @@ sp_group_menu(SPObject *object, SPDesktop *desktop, GtkMenu *menu)
     g_object_set_data(G_OBJECT(w), "desktop", desktop);
     g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_item_group_ungroup_activate), item);
     gtk_widget_show(w);
-    gtk_menu_append(GTK_MENU(menu), w);
+    gtk_menu_shell_append(GTK_MENU_SHELL(menu), w);
 }
 
 static void
@@ -354,18 +354,18 @@ sp_anchor_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
     g_object_set_data(G_OBJECT(w), "desktop", desktop);
     g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_anchor_link_properties), item);
     gtk_widget_show(w);
-    gtk_menu_append(GTK_MENU(m), w);
+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
     /* Select item */
     w = gtk_menu_item_new_with_mnemonic(_("_Follow Link"));
     g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_anchor_link_follow), item);
     gtk_widget_show(w);
-    gtk_menu_append(GTK_MENU(m), w);
+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
     /* Reset transformations */
     w = gtk_menu_item_new_with_mnemonic(_("_Remove Link"));
     g_object_set_data(G_OBJECT(w), "desktop", desktop);
     g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_anchor_link_remove), item);
     gtk_widget_show(w);
-    gtk_menu_append(GTK_MENU(m), w);
+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
 }
 
 static void
@@ -413,13 +413,13 @@ sp_image_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
     g_object_set_data(G_OBJECT(w), "desktop", desktop);
     g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_image_image_properties), item);
     gtk_widget_show(w);
-    gtk_menu_append(GTK_MENU(m), w);
+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
 
     w = gtk_menu_item_new_with_mnemonic(_("Edit Externally..."));
     g_object_set_data(G_OBJECT(w), "desktop", desktop);
     g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_image_image_edit), item);
     gtk_widget_show(w);
-    gtk_menu_append(GTK_MENU(m), w);
+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
     Inkscape::XML::Node *ir = object->getRepr();
     const gchar *href = ir->attribute("xlink:href");
     if ( (!href) || ((strncmp(href, "data:", 5) == 0)) ) {
@@ -536,7 +536,7 @@ sp_shape_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
     g_object_set_data(G_OBJECT(w), "desktop", desktop);
     g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_fill_settings), item);
     gtk_widget_show(w);
-    gtk_menu_append(GTK_MENU(m), w);
+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
 }
 
 /* Edit Text entry */
@@ -592,21 +592,21 @@ sp_text_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
     g_object_set_data(G_OBJECT(w), "desktop", desktop);
     g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_fill_settings), item);
     gtk_widget_show(w);
-    gtk_menu_append(GTK_MENU(m), w);
+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
     
     /* Edit Text dialog */
     w = gtk_menu_item_new_with_mnemonic(_("_Text and Font..."));
     g_object_set_data(G_OBJECT(w), "desktop", desktop);
     g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_text_settings), item);
     gtk_widget_show(w);
-    gtk_menu_append(GTK_MENU(m), w);
+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
 
     /* Spellcheck dialog */
     w = gtk_menu_item_new_with_mnemonic(_("Check Spellin_g..."));
     g_object_set_data(G_OBJECT(w), "desktop", desktop);
     g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_spellcheck_settings), item);
     gtk_widget_show(w);
-    gtk_menu_append(GTK_MENU(m), w);
+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
 }
 /*
   Local Variables:
diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp
index a3110ed5b..c6b867595 100644
--- a/src/widgets/gradient-selector.cpp
+++ b/src/widgets/gradient-selector.cpp
@@ -171,17 +171,17 @@ static void sp_gradient_selector_init(SPGradientSelector *sel)
 
     GtkWidget *m = gtk_menu_new();
     GtkWidget *mi = gtk_menu_item_new_with_label(_("none"));
-    gtk_menu_append (GTK_MENU (m), mi);
+    gtk_menu_shell_append(GTK_MENU_SHELL (m), mi);
     g_object_set_data (G_OBJECT (mi), "gradientSpread", GUINT_TO_POINTER (SP_GRADIENT_SPREAD_PAD));
     g_signal_connect (G_OBJECT (mi), "activate", G_CALLBACK (sp_gradient_selector_spread_activate), sel);
     mi = gtk_menu_item_new_with_label (_("reflected"));
     g_object_set_data (G_OBJECT (mi), "gradientSpread", GUINT_TO_POINTER (SP_GRADIENT_SPREAD_REFLECT));
     g_signal_connect (G_OBJECT (mi), "activate", G_CALLBACK (sp_gradient_selector_spread_activate), sel);
-    gtk_menu_append (GTK_MENU (m), mi);
+    gtk_menu_shell_append(GTK_MENU_SHELL (m), mi);
     mi = gtk_menu_item_new_with_label (_("direct"));
     g_object_set_data (G_OBJECT (mi), "gradientSpread", GUINT_TO_POINTER (SP_GRADIENT_SPREAD_REPEAT));
     g_signal_connect (G_OBJECT (mi), "activate", G_CALLBACK (sp_gradient_selector_spread_activate), sel);
-    gtk_menu_append (GTK_MENU (m), mi);
+    gtk_menu_shell_append(GTK_MENU_SHELL (m), mi);
     gtk_widget_show_all (m);
 
     gtk_option_menu_set_menu( GTK_OPTION_MENU(sel->spread), m );
diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp
index 96dadcc26..6d4f6fae0 100644
--- a/src/widgets/gradient-toolbar.cpp
+++ b/src/widgets/gradient-toolbar.cpp
@@ -193,7 +193,7 @@ GtkWidget *gr_vector_list(SPDesktop *desktop, bool selection_empty, SPGradient *
         gtk_container_add (GTK_CONTAINER (i), l);
 
         gtk_widget_show (i);
-        gtk_menu_append (GTK_MENU (m), i);
+        gtk_menu_shell_append(GTK_MENU_SHELL (m), i);
         gtk_widget_set_sensitive (om, FALSE);
     } else if (selection_empty) {
         // Document has gradients, but nothing is currently selected.
@@ -203,7 +203,7 @@ GtkWidget *gr_vector_list(SPDesktop *desktop, bool selection_empty, SPGradient *
         gtk_container_add (GTK_CONTAINER (i), l);
 
         gtk_widget_show (i);
-        gtk_menu_append (GTK_MENU (m), i);
+        gtk_menu_shell_append(GTK_MENU_SHELL (m), i);
         gtk_widget_set_sensitive (om, FALSE);
     } else {
 
@@ -214,7 +214,7 @@ GtkWidget *gr_vector_list(SPDesktop *desktop, bool selection_empty, SPGradient *
             gtk_container_add (GTK_CONTAINER (i), l);
 
             gtk_widget_show (i);
-            gtk_menu_append (GTK_MENU (m), i);
+            gtk_menu_shell_append(GTK_MENU_SHELL (m), i);
         }
 
         if (gr_multi) {
@@ -224,7 +224,7 @@ GtkWidget *gr_vector_list(SPDesktop *desktop, bool selection_empty, SPGradient *
             gtk_container_add (GTK_CONTAINER (i), l);
 
             gtk_widget_show (i);
-            gtk_menu_append (GTK_MENU (m), i);
+            gtk_menu_shell_append(GTK_MENU_SHELL (m), i);
         }
 
         while (gl) {
@@ -250,7 +250,7 @@ GtkWidget *gr_vector_list(SPDesktop *desktop, bool selection_empty, SPGradient *
 
             gtk_container_add (GTK_CONTAINER (i), hb);
 
-            gtk_menu_append (GTK_MENU (m), i);
+            gtk_menu_shell_append(GTK_MENU_SHELL (m), i);
 
             if (gradient == gr_selected) {
                 pos = idx;
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 008bff266..ceb6f5c06 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -274,19 +274,19 @@ static void sp_gvs_rebuild_gui_full(SPGradientVectorSelector *gvs)
         GtkWidget *i;
         i = gtk_menu_item_new_with_label(_("No document selected"));
         gtk_widget_show(i);
-        gtk_menu_append(GTK_MENU(m), i);
+        gtk_menu_shell_append(GTK_MENU_SHELL(m), i);
         gtk_widget_set_sensitive(gvs->menu, FALSE);
     } else if (!gl) {
         GtkWidget *i;
         i = gtk_menu_item_new_with_label(_("No gradients in document"));
         gtk_widget_show(i);
-        gtk_menu_append(GTK_MENU(m), i);
+        gtk_menu_shell_append(GTK_MENU_SHELL(m), i);
         gtk_widget_set_sensitive(gvs->menu, FALSE);
     } else if (!gvs->gr) {
         GtkWidget *i;
         i = gtk_menu_item_new_with_label(_("No gradient selected"));
         gtk_widget_show(i);
-        gtk_menu_append(GTK_MENU(m), i);
+        gtk_menu_shell_append(GTK_MENU_SHELL(m), i);
         gtk_widget_set_sensitive(gvs->menu, FALSE);
     } else {
         while (gl) {
@@ -320,7 +320,7 @@ static void sp_gvs_rebuild_gui_full(SPGradientVectorSelector *gvs)
 
             gtk_container_add(GTK_CONTAINER(i), w);
 
-            gtk_menu_append(GTK_MENU(m), i);
+            gtk_menu_shell_append(GTK_MENU_SHELL(m), i);
 
             if (gr == gvs->gr) {
                 pos = idx;
@@ -551,7 +551,7 @@ static void update_stop_list( GtkWidget *mnu, SPGradient *gradient, SPStop *new_
     if (!sl) {
         GtkWidget *i = gtk_menu_item_new_with_label(_("No stops in gradient"));
         gtk_widget_show(i);
-        gtk_menu_append(GTK_MENU(m), i);
+        gtk_menu_shell_append(GTK_MENU_SHELL(m), i);
         gtk_widget_set_sensitive(mnu, FALSE);
     } else {
 
@@ -574,7 +574,7 @@ static void update_stop_list( GtkWidget *mnu, SPGradient *gradient, SPStop *new_
                 gtk_box_pack_start(GTK_BOX(hb), l, TRUE, TRUE, 0);
                 gtk_widget_show(hb);
                 gtk_container_add(GTK_CONTAINER(i), hb);
-                gtk_menu_append(GTK_MENU(m), i);
+                gtk_menu_shell_append(GTK_MENU_SHELL(m), i);
             }
         }
 
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index e771c60c7..60ce6beff 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -830,7 +830,7 @@ sp_pattern_menu_build (GtkWidget *m, GSList *pattern_list, SPDocument */*source*
                 gtk_widget_show(hb);
                 gtk_container_add(GTK_CONTAINER(i), hb);
 
-                gtk_menu_append(GTK_MENU(m), i);
+                gtk_menu_shell_append(GTK_MENU_SHELL(m), i);
             }
         }
 
@@ -887,7 +887,7 @@ ink_pattern_menu_populate_menu(GtkWidget *m, SPDocument *doc)
         gchar const *patid = "";
         g_object_set_data (G_OBJECT(i), "pattern", (void *) patid);
         gtk_widget_show(i);
-        gtk_menu_append(GTK_MENU(m), i);
+        gtk_menu_shell_append(GTK_MENU_SHELL(m), i);
     }
 
     // suck in from patterns.svg
@@ -911,7 +911,7 @@ ink_pattern_menu(GtkWidget *mnu)
         GtkWidget *i;
         i = gtk_menu_item_new_with_label(_("No document selected"));
         gtk_widget_show(i);
-        gtk_menu_append(GTK_MENU(m), i);
+        gtk_menu_shell_append(GTK_MENU_SHELL(m), i);
         gtk_widget_set_sensitive(mnu, FALSE);
     } else {
 
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index e3e28979d..0379fa141 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -294,7 +294,7 @@ void ColorNotebook::init()
                 GtkWidget *item = gtk_check_menu_item_new_with_label (_(entry->name));
                 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), entry->enabledFull);
                 gtk_widget_show (item);
-                gtk_menu_append (menu, item);
+                gtk_menu_shell_append (GTK_MENU_SHELL(menu), item);
 
                 g_signal_connect (G_OBJECT (item), "activate",
                                   G_CALLBACK (sp_color_notebook_menuitem_response),