Rm remaining Gtk::Stock usage

(bzr r15368)

21 files changed, 165 insertions, 1342 deletions

diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp
index 5ce2f69cc..fcc88853d 100644
--- a/src/extension/prefdialog.cpp
+++ b/src/extension/prefdialog.cpp
@@ -8,7 +8,6 @@
  */
 
 #include "prefdialog.h"
-#include <gtkmm/stock.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/separator.h>
 #include <glibmm/i18n.h>
diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp
index b7a48e859..8f0545e96 100644
--- a/src/ui/dialog/aboutbox.cpp
+++ b/src/ui/dialog/aboutbox.cpp
@@ -27,7 +27,6 @@
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/aspectframe.h>
 #include <gtkmm/textview.h>
-#include <gtkmm/stock.h>
 
 #include "path-prefix.h"
 #include "document.h"
@@ -39,8 +38,6 @@
 #include "inkscape-version.h"
 
 
-
-
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/calligraphic-profile-rename.cpp b/src/ui/dialog/calligraphic-profile-rename.cpp
index 0835043ab..36570e769 100644
--- a/src/ui/dialog/calligraphic-profile-rename.cpp
+++ b/src/ui/dialog/calligraphic-profile-rename.cpp
@@ -15,7 +15,6 @@
 
 #include "calligraphic-profile-rename.h"
 #include <glibmm/i18n.h>
-#include <gtkmm/stock.h>
 #include <gtkmm/grid.h>
 
 #include "desktop.h"
diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index d0b618c65..27a6e55d9 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -19,7 +19,6 @@
 
 #include "dialog-manager.h"
 #include <gtkmm/dialog.h>
-#include <gtkmm/stock.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "inkscape.h"
diff --git a/src/ui/dialog/dock-behavior.cpp b/src/ui/dialog/dock-behavior.cpp
index ec630c08f..02955b9a8 100644
--- a/src/ui/dialog/dock-behavior.cpp
+++ b/src/ui/dialog/dock-behavior.cpp
@@ -25,9 +25,6 @@
 #include "dialog.h"
 #include "ui/dialog-events.h"
 
-#include <gtkmm/invisible.h>
-#include <gtkmm/stock.h>
-
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp
index fa8e11dfd..9abad3e7b 100644
--- a/src/ui/dialog/floating-behavior.cpp
+++ b/src/ui/dialog/floating-behavior.cpp
@@ -15,7 +15,6 @@
 #endif
 
 #include <gtkmm/dialog.h>
-#include <gtkmm/stock.h>
 #include <glibmm/main.h>
 
 #include "floating-behavior.h"
diff --git a/src/ui/dialog/grid-arrange-tab.cpp b/src/ui/dialog/grid-arrange-tab.cpp
index 5872393ae..9ec8d3148 100644
--- a/src/ui/dialog/grid-arrange-tab.cpp
+++ b/src/ui/dialog/grid-arrange-tab.cpp
@@ -1,25 +1,24 @@
-/*
- * A simple dialog for creating grid type arrangements of selected objects
- *
- * Authors:
- *   Bob Jamison ( based off trace dialog)
- *   John Cliff
- *   Other dudes from The Inkscape Organization
- *   Abhishek Sharma
- *   Declara Denis
- *
- * Copyright (C) 2004 Bob Jamison
- * Copyright (C) 2004 John Cliff
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-//#define DEBUG_GRID_ARRANGE 1
+    /*
+     * A simple dialog for creating grid type arrangements of selected objects
+     *
+     * Authors:
+     *   Bob Jamison ( based off trace dialog)
+     *   John Cliff
+     *   Other dudes from The Inkscape Organization
+     *   Abhishek Sharma
+     *   Declara Denis
+     *
+     * Copyright (C) 2004 Bob Jamison
+     * Copyright (C) 2004 John Cliff
+     *
+     * Released under GNU GPL, read the file 'COPYING' for more information
+     */
+    //#define DEBUG_GRID_ARRANGE 1
 
 #include "ui/dialog/grid-arrange-tab.h"
 #include <glibmm/i18n.h>
 
 #include <gtkmm/grid.h>
-#include <gtkmm/stock.h>
 
 #include <2geom/transforms.h>
 
@@ -31,193 +30,193 @@
 #include "document-undo.h"
 #include "widgets/icon.h"
 #include "desktop.h"
-//#include "sp-item-transform.h" FIXME
+    //#include "sp-item-transform.h" FIXME
 #include "ui/dialog/tile.h" // for Inkscape::UI::Dialog::ArrangeDialog
 
-/*
- *    Sort items by their x co-ordinates, taking account of y (keeps rows intact)
- *
- *    <0 *elem1 goes before *elem2
- *    0  *elem1 == *elem2
- *    >0  *elem1 goes after *elem2
- */
-static bool sp_compare_x_position(SPItem *first, SPItem *second)
-{
-    using Geom::X;
-    using Geom::Y;
+    /*
+     *    Sort items by their x co-ordinates, taking account of y (keeps rows intact)
+     *
+     *    <0 *elem1 goes before *elem2
+     *    0  *elem1 == *elem2
+     *    >0  *elem1 goes after *elem2
+     */
+    static bool sp_compare_x_position(SPItem *first, SPItem *second)
+    {
+        using Geom::X;
+        using Geom::Y;
 
-    Geom::OptRect a = first->documentVisualBounds();
-    Geom::OptRect b = second->documentVisualBounds();
+        Geom::OptRect a = first->documentVisualBounds();
+        Geom::OptRect b = second->documentVisualBounds();
 
-    if ( !a || !b ) {
-        // FIXME?
-        return false;
-    }
+        if ( !a || !b ) {
+            // FIXME?
+            return false;
+        }
 
-    double const a_height = a->dimensions()[Y];
-    double const b_height = b->dimensions()[Y];
+        double const a_height = a->dimensions()[Y];
+        double const b_height = b->dimensions()[Y];
 
-    bool a_in_b_vert = false;
-    if ((a->min()[Y] < b->min()[Y] + 0.1) && (a->min()[Y] > b->min()[Y] - b_height)) {
-        a_in_b_vert = true;
-    } else if ((b->min()[Y] < a->min()[Y] + 0.1) && (b->min()[Y] > a->min()[Y] - a_height)) {
-        a_in_b_vert = true;
-    } else if (b->min()[Y] == a->min()[Y]) {
-        a_in_b_vert = true;
-    } else {
-        a_in_b_vert = false;
-    }
+        bool a_in_b_vert = false;
+        if ((a->min()[Y] < b->min()[Y] + 0.1) && (a->min()[Y] > b->min()[Y] - b_height)) {
+            a_in_b_vert = true;
+        } else if ((b->min()[Y] < a->min()[Y] + 0.1) && (b->min()[Y] > a->min()[Y] - a_height)) {
+            a_in_b_vert = true;
+        } else if (b->min()[Y] == a->min()[Y]) {
+            a_in_b_vert = true;
+        } else {
+            a_in_b_vert = false;
+        }
 
-    if (!a_in_b_vert) { // a and b are not in the same row
-        return (a->min()[Y] < b->min()[Y]);
+        if (!a_in_b_vert) { // a and b are not in the same row
+            return (a->min()[Y] < b->min()[Y]);
+        }
+        return (a->min()[X] < b->min()[X]);
     }
-    return (a->min()[X] < b->min()[X]);
-}
 
-/*
- *    Sort items by their y co-ordinates.
- */
-static bool sp_compare_y_position(SPItem *first, SPItem *second)
-{
-    Geom::OptRect a = first->documentVisualBounds();
-    Geom::OptRect b = second->documentVisualBounds();
+    /*
+     *    Sort items by their y co-ordinates.
+     */
+    static bool sp_compare_y_position(SPItem *first, SPItem *second)
+    {
+        Geom::OptRect a = first->documentVisualBounds();
+        Geom::OptRect b = second->documentVisualBounds();
 
-    if ( !a || !b ) {
-        // FIXME?
-        return false;
-    }
+        if ( !a || !b ) {
+            // FIXME?
+            return false;
+        }
+
+        if (a->min()[Geom::Y] > b->min()[Geom::Y]) {
+            return false;
+        }
+        if (a->min()[Geom::Y] < b->min()[Geom::Y]) {
+            return true;
+        }
 
-    if (a->min()[Geom::Y] > b->min()[Geom::Y]) {
         return false;
     }
-    if (a->min()[Geom::Y] < b->min()[Geom::Y]) {
-        return true;
-    }
-
-    return false;
-}
 
 
-namespace Inkscape {
-namespace UI {
-namespace Dialog {
+    namespace Inkscape {
+    namespace UI {
+    namespace Dialog {
 
 
-//#########################################################################
-//## E V E N T S
-//#########################################################################
-
-/*
- *
- * This arranges the selection in a grid pattern.
- *
- */
+    //#########################################################################
+    //## E V E N T S
+    //#########################################################################
 
-void GridArrangeTab::arrange()
-{
+    /*
+     *
+     * This arranges the selection in a grid pattern.
+     *
+     */
 
-    int cnt,row_cnt,col_cnt,a,row,col;
-    double grid_left,grid_top,col_width,row_height,paddingx,paddingy,width, height, new_x, new_y;
-    double total_col_width,total_row_height;
-    col_width = 0;
-    row_height = 0;
-    total_col_width=0;
-    total_row_height=0;
+    void GridArrangeTab::arrange()
+    {
 
-    // check for correct numbers in the row- and col-spinners
-    on_col_spinbutton_changed();
-    on_row_spinbutton_changed();
+        int cnt,row_cnt,col_cnt,a,row,col;
+        double grid_left,grid_top,col_width,row_height,paddingx,paddingy,width, height, new_x, new_y;
+        double total_col_width,total_row_height;
+        col_width = 0;
+        row_height = 0;
+        total_col_width=0;
+        total_row_height=0;
 
-    // set padding to manual values
-    paddingx = XPadding.getValue("px");
-    paddingy = YPadding.getValue("px");
+        // check for correct numbers in the row- and col-spinners
+        on_col_spinbutton_changed();
+        on_row_spinbutton_changed();
 
-    std::vector<double> row_heights;
-    std::vector<double> col_widths;
-    std::vector<double> row_ys;
-    std::vector<double> col_xs;
+        // set padding to manual values
+        paddingx = XPadding.getValue("px");
+        paddingy = YPadding.getValue("px");
 
-    int NoOfCols = NoOfColsSpinner.get_value_as_int();
-    int NoOfRows = NoOfRowsSpinner.get_value_as_int();
+        std::vector<double> row_heights;
+        std::vector<double> col_widths;
+        std::vector<double> row_ys;
+        std::vector<double> col_xs;
 
-    width = 0;
-    for (a=0;a<NoOfCols; a++){
-        col_widths.push_back(width);
-    }
+        int NoOfCols = NoOfColsSpinner.get_value_as_int();
+        int NoOfRows = NoOfRowsSpinner.get_value_as_int();
 
-    height = 0;
-    for (a=0;a<NoOfRows; a++){
-        row_heights.push_back(height);
-    }
-    grid_left = 99999;
-    grid_top = 99999;
+        width = 0;
+        for (a=0;a<NoOfCols; a++){
+            col_widths.push_back(width);
+        }
 
-    SPDesktop *desktop = Parent->getDesktop();
-    desktop->getDocument()->ensureUpToDate();
+        height = 0;
+        for (a=0;a<NoOfRows; a++){
+            row_heights.push_back(height);
+        }
+        grid_left = 99999;
+        grid_top = 99999;
 
-    Inkscape::Selection *selection = desktop->getSelection();
-    std::vector<SPItem*> items;
-    if (selection) {
-        items.insert(items.end(), selection->items().begin(), selection->items().end());
-    }
+        SPDesktop *desktop = Parent->getDesktop();
+        desktop->getDocument()->ensureUpToDate();
 
-    for(std::vector<SPItem*>::const_iterator i = items.begin();i!=items.end(); ++i){
-        SPItem *item = *i;
-        Geom::OptRect b = item->documentVisualBounds();
-        if (!b) {
-            continue;
+        Inkscape::Selection *selection = desktop->getSelection();
+        std::vector<SPItem*> items;
+        if (selection) {
+            items.insert(items.end(), selection->items().begin(), selection->items().end());
         }
 
-        width = b->dimensions()[Geom::X];
-        height = b->dimensions()[Geom::Y];
+        for(std::vector<SPItem*>::const_iterator i = items.begin();i!=items.end(); ++i){
+            SPItem *item = *i;
+            Geom::OptRect b = item->documentVisualBounds();
+            if (!b) {
+                continue;
+            }
+
+            width = b->dimensions()[Geom::X];
+            height = b->dimensions()[Geom::Y];
 
-        if (b->min()[Geom::X] < grid_left) {
-            grid_left = b->min()[Geom::X];
-        }
-        if (b->min()[Geom::Y] < grid_top) {
-            grid_top = b->min()[Geom::Y];
-        }
-        if (width > col_width) {
-            col_width = width;
-        }
-        if (height > row_height) {
-            row_height = height;
+            if (b->min()[Geom::X] < grid_left) {
+                grid_left = b->min()[Geom::X];
+            }
+            if (b->min()[Geom::Y] < grid_top) {
+                grid_top = b->min()[Geom::Y];
+            }
+            if (width > col_width) {
+                col_width = width;
+            }
+            if (height > row_height) {
+                row_height = height;
+            }
         }
-    }
 
 
-    // require the sorting done before we can calculate row heights etc.
+        // require the sorting done before we can calculate row heights etc.
 
-    g_return_if_fail(selection);
-    std::vector<SPItem*> sorted(selection->items().begin(), selection->items().end());
-    sort(sorted.begin(),sorted.end(),sp_compare_y_position);
-    sort(sorted.begin(),sorted.end(),sp_compare_x_position);
+        g_return_if_fail(selection);
+        std::vector<SPItem*> sorted(selection->items().begin(), selection->items().end());
+        sort(sorted.begin(),sorted.end(),sp_compare_y_position);
+        sort(sorted.begin(),sorted.end(),sp_compare_x_position);
 
 
-    // Calculate individual Row and Column sizes if necessary
+        // Calculate individual Row and Column sizes if necessary
 
 
-        cnt=0;
-        const std::vector<SPItem*> sizes(sorted);
-        for (std::vector<SPItem*>::const_iterator i = sizes.begin();i!=sizes.end(); ++i) {
-            SPItem *item = *i;
-            Geom::OptRect b = item->documentVisualBounds();
-            if (b) {
-                width = b->dimensions()[Geom::X];
-                height = b->dimensions()[Geom::Y];
-                if (width > col_widths[(cnt % NoOfCols)]) {
-                    col_widths[(cnt % NoOfCols)] = width;
+            cnt=0;
+            const std::vector<SPItem*> sizes(sorted);
+            for (std::vector<SPItem*>::const_iterator i = sizes.begin();i!=sizes.end(); ++i) {
+                SPItem *item = *i;
+                Geom::OptRect b = item->documentVisualBounds();
+                if (b) {
+                    width = b->dimensions()[Geom::X];
+                    height = b->dimensions()[Geom::Y];
+                    if (width > col_widths[(cnt % NoOfCols)]) {
+                        col_widths[(cnt % NoOfCols)] = width;
+                    }
+                    if (height > row_heights[(cnt / NoOfCols)]) {
+                        row_heights[(cnt / NoOfCols)] = height;
+                    }
                 }
-                if (height > row_heights[(cnt / NoOfCols)]) {
-                    row_heights[(cnt / NoOfCols)] = height;
-                }
-            }
 
-            cnt++;
-        }
+                cnt++;
+            }
 
 
-    /// Make sure the top and left of the grid dont move by compensating for align values.
+        /// Make sure the top and left of the grid dont move by compensating for align values.
     if (RowHeightButton.get_active()){
         grid_top = grid_top - (((row_height - row_heights[0]) / 2)*(VertAlign));
     }
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index a4fcc9947..19050fb1d 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -27,7 +27,6 @@
 #include <gtkmm/alignment.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/frame.h>
-#include <gtkmm/stock.h>
 #include "ui/widget/frame.h"
 
 #include "desktop.h"
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index 8910005aa..e5becdb5c 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -17,7 +17,6 @@
 #endif
 
 #include "livepatheffect-editor.h"
-#include <gtkmm/stock.h>
 
 #include "desktop.h"
 
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index 446af4ccb..c7c696cdc 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -15,7 +15,6 @@
 
 #include "objects.h"
 #include <gtkmm/icontheme.h>
-#include <gtkmm/stock.h>
 #include <gtkmm/imagemenuitem.h>
 #include <gtkmm/separatormenuitem.h>
 #include <glibmm/main.h>
diff --git a/src/ui/dialog/pixelartdialog.cpp b/src/ui/dialog/pixelartdialog.cpp
index 79747a798..3e6617cfe 100644
--- a/src/ui/dialog/pixelartdialog.cpp
+++ b/src/ui/dialog/pixelartdialog.cpp
@@ -28,7 +28,6 @@
 
 #include "pixelartdialog.h"
 #include <gtkmm/radiobutton.h>
-#include <gtkmm/stock.h>
 #include <gtkmm/messagedialog.h>
 
 #include <glibmm/i18n.h>
diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp
index 6f31935a4..a1d4d88b8 100644
--- a/src/ui/dialog/tracedialog.cpp
+++ b/src/ui/dialog/tracedialog.cpp
@@ -21,7 +21,6 @@
 #include <gtkmm/radiobutton.h>
 #include "ui/widget/spinbutton.h"
 #include "ui/widget/frame.h"
-#include <gtkmm/stock.h>
 
 #include <glibmm/i18n.h>
 
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index 475c3a9c6..d209a450c 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -16,7 +16,6 @@
 #endif
 
 #include <gtkmm/dialog.h>
-#include <gtkmm/stock.h>
 #include <2geom/transforms.h>
 
 #include "document.h"
diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp
index d05c52531..fa35b092a 100644
--- a/src/ui/dialog/xml-tree.cpp
+++ b/src/ui/dialog/xml-tree.cpp
@@ -19,7 +19,6 @@
 #include "xml-tree.h"
 #include "widgets/icon.h"
 #include <glibmm/i18n.h>
-#include <gtkmm/stock.h>
 
 #include "desktop.h"
 
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index e0c767509..d50c56b76 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -73,8 +73,6 @@
 #include "message-stack.h"
 #include "ui/dialog/layer-properties.h"
 
-#include "widgets/image-menu-item.h"
-
 using Inkscape::DocumentUndo;
 
 /* Drag and Drop */
@@ -405,7 +403,7 @@ sp_ui_menuitem_add_icon( GtkWidget *item, gchar *icon_name )
 
     icon = sp_icon_new( Inkscape::ICON_SIZE_MENU, icon_name );
     gtk_widget_show(icon);
-    image_menu_item_set_image((ImageMenuItem *) item, icon);
+    gtk_image_menu_item_set_image((GtkImageMenuItem *) item, icon);
 } // end of sp_ui_menu_add_icon
 
 void
@@ -459,7 +457,7 @@ static GtkWidget *sp_ui_menu_append_item_from_verb(GtkMenu *menu, Inkscape::Verb
         if (radio) {
             item = gtk_radio_menu_item_new_with_mnemonic(group, action->name);
         } else {
-            item = image_menu_item_new_with_mnemonic(action->name);
+            item = gtk_image_menu_item_new_with_mnemonic(action->name);
         }
 
         gtk_label_set_markup_with_mnemonic( GTK_LABEL(gtk_bin_get_child(GTK_BIN (item))), action->name);
diff --git a/src/verbs.cpp b/src/verbs.cpp
index 32aee4161..975a3679e 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -37,7 +37,6 @@
 // If this is not done, then errors will be generate relating to Glib::Threads being undefined
 #include <gtkmm/filechooserdialog.h>
 #include <gtkmm/messagedialog.h>
-#include <gtkmm/stock.h>
 
 #include "desktop.h"
 
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index c87fa1500..1184291f2 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -22,7 +22,6 @@ set(widgets_SRC
 	gradient-toolbar.cpp
 	gradient-vector.cpp
 	icon.cpp
-	image-menu-item.c
 	ink-action.cpp
 	ink-comboboxentry-action.cpp
 	ink-radio-action.cpp
@@ -80,7 +79,6 @@ set(widgets_SRC
 	gradient-toolbar.h
 	gradient-vector.h
 	icon.h
-	image-menu-item.h
 	ink-action.h
 	ink-comboboxentry-action.h
 	ink-radio-action.h
diff --git a/src/widgets/image-menu-item.c b/src/widgets/image-menu-item.c
deleted file mode 100644
index 2b9500ba0..000000000
--- a/src/widgets/image-menu-item.c
+++ /dev/null
@@ -1,1071 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2001 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.
- * Forked by . Icons in menus are important to us.
- */
-
-#include "config.h"
-
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
-#include "widgets/image-menu-item.h"
-
-/**
- * SECTION:gtkimagemenuitem
- * @Short_description: A menu item with an icon
- * @Title: ImageMenuItem
- *
- * A ImageMenuItem is a menu item which has an icon next to the text label.
- *
- * Note that the user can disable display of menu icons, so make sure to still
- * fill in the text label.
- */
-
-
-struct _ImageMenuItemPrivate
-{
-  GtkWidget     *image;
-
-  gchar         *label;
-  guint          use_stock         : 1;
-  guint          toggle_size;
-};
-
-enum {
-  PROP_0,
-  PROP_IMAGE,
-  PROP_USE_STOCK,
-  PROP_ACCEL_GROUP,
-};
-
-static GtkActivatableIface *parent_activatable_iface;
-
-static void image_menu_item_destroy              (GtkWidget        *widget);
-static void image_menu_item_get_preferred_width  (GtkWidget        *widget,
-                                                      gint             *minimum,
-                                                      gint             *natural);
-static void image_menu_item_get_preferred_height (GtkWidget        *widget,
-                                                      gint             *minimum,
-                                                      gint             *natural);
-static void image_menu_item_get_preferred_height_for_width (GtkWidget *widget,
-                                                                gint       width,
-                                                                gint      *minimum,
-                                                                gint      *natural);
-static void image_menu_item_size_allocate        (GtkWidget        *widget,
-                                                      GtkAllocation    *allocation);
-static void image_menu_item_map                  (GtkWidget        *widget);
-static void image_menu_item_remove               (GtkContainer     *container,
-                                                      GtkWidget        *child);
-static void image_menu_item_toggle_size_request  (GtkMenuItem      *menu_item,
-                                                      gint             *requisition);
-static void image_menu_item_set_label            (GtkMenuItem      *menu_item,
-                                                      const gchar      *label);
-static const gchar * image_menu_item_get_label   (GtkMenuItem *menu_item);
-
-static void image_menu_item_forall               (GtkContainer    *container,
-                                                      gboolean         include_internals,
-                                                      GtkCallback      callback,
-                                                      gpointer         callback_data);
-
-static void image_menu_item_finalize             (GObject         *object);
-static void image_menu_item_set_property         (GObject         *object,
-                                                      guint            prop_id,
-                                                      const GValue    *value,
-                                                      GParamSpec      *pspec);
-static void image_menu_item_get_property         (GObject         *object,
-                                                      guint            prop_id,
-                                                      GValue          *value,
-                                                      GParamSpec      *pspec);
-static void image_menu_item_screen_changed       (GtkWidget       *widget,
-                                                      GdkScreen       *previous_screen);
-
-static void image_menu_item_recalculate          (ImageMenuItem *image_menu_item);
-
-static void image_menu_item_activatable_interface_init (GtkActivatableIface  *iface);
-static void image_menu_item_update                     (GtkActivatable       *activatable,
-                                                            GtkAction            *action,
-                                                            const gchar          *property_name);
-static void image_menu_item_sync_action_properties     (GtkActivatable       *activatable,
-                                                            GtkAction            *action);
-
-
-G_DEFINE_TYPE_WITH_CODE (ImageMenuItem, image_menu_item, GTK_TYPE_MENU_ITEM,
-                         G_ADD_PRIVATE (ImageMenuItem)
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIVATABLE,
-                             image_menu_item_activatable_interface_init))
-
-
-static void
-image_menu_item_class_init (ImageMenuItemClass *klass)
-{
-  GObjectClass *gobject_class = (GObjectClass*) klass;
-  GtkWidgetClass *widget_class = (GtkWidgetClass*) klass;
-  GtkMenuItemClass *menu_item_class = (GtkMenuItemClass*) klass;
-  GtkContainerClass *container_class = (GtkContainerClass*) klass;
-
-  widget_class->destroy = image_menu_item_destroy;
-  widget_class->screen_changed = image_menu_item_screen_changed;
-  widget_class->get_preferred_width = image_menu_item_get_preferred_width;
-  widget_class->get_preferred_height = image_menu_item_get_preferred_height;
-  widget_class->get_preferred_height_for_width = image_menu_item_get_preferred_height_for_width;
-  widget_class->size_allocate = image_menu_item_size_allocate;
-  widget_class->map = image_menu_item_map;
-
-  container_class->forall = image_menu_item_forall;
-  container_class->remove = image_menu_item_remove;
-
-  menu_item_class->toggle_size_request = image_menu_item_toggle_size_request;
-  menu_item_class->set_label           = image_menu_item_set_label;
-  menu_item_class->get_label           = image_menu_item_get_label;
-
-  gobject_class->finalize     = image_menu_item_finalize;
-  gobject_class->set_property = image_menu_item_set_property;
-  gobject_class->get_property = image_menu_item_get_property;
-
-  /**
-   * ImageMenuItem:image:
-   *
-   * Child widget to appear next to the menu text.
-   *
-   */
-  g_object_class_install_property (gobject_class,
-                                   PROP_IMAGE,
-                                   g_param_spec_object ("image",
-                                                        _("Image widget"),
-                                                        _("Child widget to appear next to the menu text"),
-                                                        GTK_TYPE_WIDGET,
-                                                        GTK_PARAM_READWRITE | G_PARAM_DEPRECATED));
-  /**
-   * ImageMenuItem:use-stock:
-   *
-   * If %TRUE, the label set in the menuitem is used as a
-   * stock id to select the stock item for the item.
-   *
-   * Since: 2.16
-   *
-   */
-  g_object_class_install_property (gobject_class,
-                                   PROP_USE_STOCK,
-                                   g_param_spec_boolean ("use-stock",
-                                                         _("Use stock"),
-                                                         _("Whether to use the label text to create a stock menu item"),
-                                                         FALSE,
-                                                         GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED));
-
-  /**
-   * ImageMenuItem:accel-group:
-   *
-   * The Accel Group to use for stock accelerator keys
-   *
-   * Since: 2.16
-   *
-   */
-  g_object_class_install_property (gobject_class,
-                                   PROP_ACCEL_GROUP,
-                                   g_param_spec_object ("accel-group",
-                                                        _("Accel Group"),
-                                                        _("The Accel Group to use for stock accelerator keys"),
-                                                        GTK_TYPE_ACCEL_GROUP,
-                                                        GTK_PARAM_WRITABLE | G_PARAM_DEPRECATED));
-
-}
-
-static void
-image_menu_item_init (ImageMenuItem *image_menu_item)
-{
-  ImageMenuItemPrivate *priv;
-
-  image_menu_item->priv = image_menu_item_get_instance_private (image_menu_item);
-  priv = image_menu_item->priv;
-
-  priv->image = NULL;
-  priv->use_stock = FALSE;
-  priv->label  = NULL;
-}
-
-static void
-image_menu_item_finalize (GObject *object)
-{
-  ImageMenuItemPrivate *priv = IMAGE_MENU_ITEM (object)->priv;
-
-  g_free (priv->label);
-  priv->label  = NULL;
-
-  G_OBJECT_CLASS (image_menu_item_parent_class)->finalize (object);
-}
-
-static void
-image_menu_item_set_property (GObject         *object,
-                                  guint            prop_id,
-                                  const GValue    *value,
-                                  GParamSpec      *pspec)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (object);
-
-  switch (prop_id)
-    {
-    case PROP_IMAGE:
-      image_menu_item_set_image (image_menu_item, (GtkWidget *) g_value_get_object (value));
-      break;
-    case PROP_USE_STOCK:
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-      image_menu_item_set_use_stock (image_menu_item, g_value_get_boolean (value));
-      G_GNUC_END_IGNORE_DEPRECATIONS;
-      break;
-    case PROP_ACCEL_GROUP:
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-      image_menu_item_set_accel_group (image_menu_item, g_value_get_object (value));
-      G_GNUC_END_IGNORE_DEPRECATIONS;
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-image_menu_item_get_property (GObject         *object,
-                                  guint            prop_id,
-                                  GValue          *value,
-                                  GParamSpec      *pspec)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (object);
-
-  switch (prop_id)
-    {
-    case PROP_IMAGE:
-      g_value_set_object (value, image_menu_item_get_image (image_menu_item));
-      break;
-    case PROP_USE_STOCK:
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-      g_value_set_boolean (value, image_menu_item_get_use_stock (image_menu_item));
-      G_GNUC_END_IGNORE_DEPRECATIONS;
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-image_menu_item_map (GtkWidget *widget)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget);
-  ImageMenuItemPrivate *priv = image_menu_item->priv;
-
-  GTK_WIDGET_CLASS (image_menu_item_parent_class)->map (widget);
-
-  if (priv->image)
-    g_object_set (priv->image, "visible", TRUE, NULL);
-}
-
-static void
-image_menu_item_destroy (GtkWidget *widget)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget);
-  ImageMenuItemPrivate *priv = image_menu_item->priv;
-
-  if (priv->image)
-    gtk_container_remove (GTK_CONTAINER (image_menu_item),
-                          priv->image);
-
-  GTK_WIDGET_CLASS (image_menu_item_parent_class)->destroy (widget);
-}
-
-static void
-image_menu_item_toggle_size_request (GtkMenuItem *menu_item,
-                                         gint        *requisition)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (menu_item);
-  ImageMenuItemPrivate *priv = image_menu_item->priv;
-  GtkPackDirection pack_dir;
-  GtkWidget *parent;
-  GtkWidget *widget = GTK_WIDGET (menu_item);
-
-  parent = gtk_widget_get_parent (widget);
-
-  if (GTK_IS_MENU_BAR (parent))
-    pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent));
-  else
-    pack_dir = GTK_PACK_DIRECTION_LTR;
-
-  *requisition = 0;
-
-  if (priv->image && gtk_widget_get_visible (priv->image))
-    {
-      GtkRequisition image_requisition;
-      guint toggle_spacing;
-
-      gtk_widget_get_preferred_size (priv->image, &image_requisition, NULL);
-
-      gtk_widget_style_get (GTK_WIDGET (menu_item),
-                            "toggle-spacing", &toggle_spacing,
-                            NULL);
-
-      if (pack_dir == GTK_PACK_DIRECTION_LTR || pack_dir == GTK_PACK_DIRECTION_RTL)
-        {
-          if (image_requisition.width > 0)
-            *requisition = image_requisition.width + toggle_spacing;
-        }
-      else
-        {
-          if (image_requisition.height > 0)
-            *requisition = image_requisition.height + toggle_spacing;
-        }
-    }
-}
-
-static void
-image_menu_item_recalculate (ImageMenuItem *image_menu_item)
-{
-  ImageMenuItemPrivate    *priv = image_menu_item->priv;
-  GtkStockItem             stock_item;
-  GtkWidget               *image;
-  const gchar             *resolved_label = priv->label;
-
-  if (priv->use_stock && priv->label)
-    {
-
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-
-      if (!priv->image)
-        {
-          image = gtk_image_new_from_stock (priv->label, GTK_ICON_SIZE_MENU);
-          image_menu_item_set_image (image_menu_item, image);
-        }
-
-      if (gtk_stock_lookup (priv->label, &stock_item))
-          resolved_label = stock_item.label;
-
-      gtk_menu_item_set_use_underline (GTK_MENU_ITEM (image_menu_item), TRUE);
-
-      G_GNUC_END_IGNORE_DEPRECATIONS;
-    }
-
-  GTK_MENU_ITEM_CLASS
-    (image_menu_item_parent_class)->set_label (GTK_MENU_ITEM (image_menu_item), resolved_label);
-
-}
-
-static void
-image_menu_item_set_label (GtkMenuItem      *menu_item,
-                               const gchar      *label)
-{
-  ImageMenuItemPrivate *priv = IMAGE_MENU_ITEM (menu_item)->priv;
-
-  if (priv->label != label)
-    {
-      g_free (priv->label);
-      priv->label = g_strdup (label);
-
-      image_menu_item_recalculate (IMAGE_MENU_ITEM (menu_item));
-
-      g_object_notify (G_OBJECT (menu_item), "label");
-
-    }
-}
-
-static const gchar *
-image_menu_item_get_label (GtkMenuItem *menu_item)
-{
-  ImageMenuItemPrivate *priv = IMAGE_MENU_ITEM (menu_item)->priv;
-
-  return priv->label;
-}
-
-static void
-image_menu_item_get_preferred_width (GtkWidget        *widget,
-                                         gint             *minimum,
-                                         gint             *natural)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget);
-  ImageMenuItemPrivate *priv = image_menu_item->priv;
-  GtkPackDirection pack_dir;
-  GtkWidget *parent;
-
-  parent = gtk_widget_get_parent (widget);
-
-  if (GTK_IS_MENU_BAR (parent))
-    pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent));
-  else
-    pack_dir = GTK_PACK_DIRECTION_LTR;
-
-  GTK_WIDGET_CLASS (image_menu_item_parent_class)->get_preferred_width (widget, minimum, natural);
-
-  if ((pack_dir == GTK_PACK_DIRECTION_TTB || pack_dir == GTK_PACK_DIRECTION_BTT) &&
-      priv->image &&
-      gtk_widget_get_visible (priv->image))
-    {
-      gint child_minimum, child_natural;
-
-      gtk_widget_get_preferred_width (priv->image, &child_minimum, &child_natural);
-
-      *minimum = MAX (*minimum, child_minimum);
-      *natural = MAX (*natural, child_natural);
-    }
-}
-
-static void
-image_menu_item_get_preferred_height (GtkWidget        *widget,
-                                          gint             *minimum,
-                                          gint             *natural)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget);
-  ImageMenuItemPrivate *priv = image_menu_item->priv;
-  gint child_height = 0;
-  GtkPackDirection pack_dir;
-  GtkWidget *parent;
-
-  parent = gtk_widget_get_parent (widget);
-
-  if (GTK_IS_MENU_BAR (parent))
-    pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent));
-  else
-    pack_dir = GTK_PACK_DIRECTION_LTR;
-
-  if (priv->image && gtk_widget_get_visible (priv->image))
-    {
-      GtkRequisition child_requisition;
-
-      gtk_widget_get_preferred_size (priv->image, &child_requisition, NULL);
-
-      child_height = child_requisition.height;
-    }
-
-  GTK_WIDGET_CLASS (image_menu_item_parent_class)->get_preferred_height (widget, minimum, natural);
-
-  if (pack_dir == GTK_PACK_DIRECTION_RTL || pack_dir == GTK_PACK_DIRECTION_LTR)
-    {
-      *minimum = MAX (*minimum, child_height);
-      *natural = MAX (*natural, child_height);
-    }
-}
-
-static void
-image_menu_item_get_preferred_height_for_width (GtkWidget        *widget,
-                                                    gint              width,
-                                                    gint             *minimum,
-                                                    gint             *natural)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget);
-  ImageMenuItemPrivate *priv = image_menu_item->priv;
-  gint child_height = 0;
-  GtkPackDirection pack_dir;
-  GtkWidget *parent;
-
-  parent = gtk_widget_get_parent (widget);
-
-  if (GTK_IS_MENU_BAR (parent))
-    pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent));
-  else
-    pack_dir = GTK_PACK_DIRECTION_LTR;
-
-  if (priv->image && gtk_widget_get_visible (priv->image))
-    {
-      GtkRequisition child_requisition;
-
-      gtk_widget_get_preferred_size (priv->image, &child_requisition, NULL);
-
-      child_height = child_requisition.height;
-    }
-
-  GTK_WIDGET_CLASS
-    (image_menu_item_parent_class)->get_preferred_height_for_width (widget, width, minimum, natural);
-
-  if (pack_dir == GTK_PACK_DIRECTION_RTL || pack_dir == GTK_PACK_DIRECTION_LTR)
-    {
-      *minimum = MAX (*minimum, child_height);
-      *natural = MAX (*natural, child_height);
-    }
-}
-
-
-static void
-image_menu_item_size_allocate (GtkWidget     *widget,
-                                   GtkAllocation *allocation)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget);
-  ImageMenuItemPrivate *priv = image_menu_item->priv;
-  GtkAllocation widget_allocation;
-  GtkPackDirection pack_dir;
-  GtkWidget *parent;
-
-  parent = gtk_widget_get_parent (widget);
-
-  if (GTK_IS_MENU_BAR (parent))
-    pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent));
-  else
-    pack_dir = GTK_PACK_DIRECTION_LTR;
-
-  GTK_WIDGET_CLASS (image_menu_item_parent_class)->size_allocate (widget, allocation);
-
-  if (priv->image && gtk_widget_get_visible (priv->image))
-    {
-      gint x, y, offset;
-      GtkStyleContext *context;
-      GtkStateFlags state;
-      GtkBorder padding;
-      GtkRequisition child_requisition;
-      GtkAllocation child_allocation;
-      guint horizontal_padding, toggle_spacing;
-      gint toggle_size;
-
-      toggle_size = image_menu_item->priv->toggle_size;
-      gtk_widget_style_get (widget,
-                            "horizontal-padding", &horizontal_padding,
-                            "toggle-spacing", &toggle_spacing,
-                            NULL);
-
-      /* Man this is lame hardcoding action, but I can't
-       * come up with a solution that's really better.
-       */
-
-      gtk_widget_get_preferred_size (priv->image, &child_requisition, NULL);
-
-      gtk_widget_get_allocation (widget, &widget_allocation);
-
-      context = gtk_widget_get_style_context (widget);
-      state = gtk_widget_get_state_flags (widget);
-      gtk_style_context_get_padding (context, state, &padding);
-      offset = gtk_container_get_border_width (GTK_CONTAINER (image_menu_item));
-
-      if (pack_dir == GTK_PACK_DIRECTION_LTR ||
-          pack_dir == GTK_PACK_DIRECTION_RTL)
-        {
-          if ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) ==
-              (pack_dir == GTK_PACK_DIRECTION_LTR))
-            x = offset + horizontal_padding + padding.left +
-               (toggle_size - toggle_spacing - child_requisition.width) / 2;
-          else
-            x = widget_allocation.width - offset - horizontal_padding - padding.right -
-              toggle_size + toggle_spacing +
-              (toggle_size - toggle_spacing - child_requisition.width) / 2;
-
-          y = (widget_allocation.height - child_requisition.height) / 2;
-        }
-      else
-        {
-          if ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) ==
-              (pack_dir == GTK_PACK_DIRECTION_TTB))
-            y = offset + horizontal_padding + padding.top +
-              (toggle_size - toggle_spacing - child_requisition.height) / 2;
-          else
-            y = widget_allocation.height - offset - horizontal_padding - padding.bottom -
-              toggle_size + toggle_spacing +
-              (toggle_size - toggle_spacing - child_requisition.height) / 2;
-
-          x = (widget_allocation.width - child_requisition.width) / 2;
-        }
-
-      child_allocation.width = child_requisition.width;
-      child_allocation.height = child_requisition.height;
-      child_allocation.x = widget_allocation.x + MAX (x, 0);
-      child_allocation.y = widget_allocation.y + MAX (y, 0);
-
-      gtk_widget_size_allocate (priv->image, &child_allocation);
-    }
-}
-
-static void
-image_menu_item_forall (GtkContainer   *container,
-                            gboolean        include_internals,
-                            GtkCallback     callback,
-                            gpointer        callback_data)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (container);
-  ImageMenuItemPrivate *priv = image_menu_item->priv;
-
-  GTK_CONTAINER_CLASS (image_menu_item_parent_class)->forall (container,
-                                                                  include_internals,
-                                                                  callback,
-                                                                  callback_data);
-
-  if (include_internals && priv->image)
-    (* callback) (priv->image, callback_data);
-}
-
-
-static void
-image_menu_item_activatable_interface_init (GtkActivatableIface  *iface)
-{
-  parent_activatable_iface = g_type_interface_peek_parent (iface);
-  iface->update = image_menu_item_update;
-  iface->sync_action_properties = image_menu_item_sync_action_properties;
-}
-
-static gboolean
-activatable_update_stock_id (ImageMenuItem *image_menu_item, GtkAction *action)
-{
-  GtkWidget   *image;
-  const gchar *stock_id  = gtk_action_get_stock_id (action);
-
-  image = image_menu_item_get_image (image_menu_item);
-
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-
-  if (GTK_IS_IMAGE (image) &&
-      stock_id && gtk_icon_factory_lookup_default (stock_id))
-    {
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-      gtk_image_set_from_stock (GTK_IMAGE (image), stock_id, GTK_ICON_SIZE_MENU);
-      G_GNUC_END_IGNORE_DEPRECATIONS;
-      return TRUE;
-    }
-
-  G_GNUC_END_IGNORE_DEPRECATIONS;
-
-  return FALSE;
-}
-
-static gboolean
-activatable_update_gicon (ImageMenuItem *image_menu_item, GtkAction *action)
-{
-  GtkWidget   *image;
-  GIcon       *icon = gtk_action_get_gicon (action);
-  const gchar *stock_id;
-  gboolean     ret = FALSE;
-
-  stock_id = gtk_action_get_stock_id (action);
-
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-
-  image = image_menu_item_get_image (image_menu_item);
-
-  if (icon && GTK_IS_IMAGE (image) &&
-      !(stock_id && gtk_icon_factory_lookup_default (stock_id)))
-    {
-      gtk_image_set_from_gicon (GTK_IMAGE (image), icon, GTK_ICON_SIZE_MENU);
-      ret = TRUE;
-    }
-
-  G_GNUC_END_IGNORE_DEPRECATIONS;
-
-  return ret;
-}
-
-static void
-activatable_update_icon_name (ImageMenuItem *image_menu_item, GtkAction *action)
-{
-  GtkWidget   *image;
-  const gchar *icon_name = gtk_action_get_icon_name (action);
-
-  image = image_menu_item_get_image (image_menu_item);
-
-  if (GTK_IS_IMAGE (image) &&
-      (gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_EMPTY ||
-       gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_ICON_NAME))
-    {
-      gtk_image_set_from_icon_name (GTK_IMAGE (image), icon_name, GTK_ICON_SIZE_MENU);
-    }
-}
-
-static void
-image_menu_item_update (GtkActivatable *activatable,
-                            GtkAction      *action,
-                            const gchar    *property_name)
-{
-  ImageMenuItem *image_menu_item;
-  gboolean   use_appearance;
-
-  image_menu_item = IMAGE_MENU_ITEM (activatable);
-
-  parent_activatable_iface->update (activatable, action, property_name);
-
-  use_appearance = gtk_activatable_get_use_action_appearance (activatable);
-  if (!use_appearance)
-    return;
-
-  if (strcmp (property_name, "stock-id") == 0)
-    activatable_update_stock_id (image_menu_item, action);
-  else if (strcmp (property_name, "gicon") == 0)
-    activatable_update_gicon (image_menu_item, action);
-  else if (strcmp (property_name, "icon-name") == 0)
-    activatable_update_icon_name (image_menu_item, action);
-}
-
-static void
-image_menu_item_sync_action_properties (GtkActivatable *activatable,
-                                            GtkAction      *action)
-{
-  ImageMenuItem *image_menu_item;
-  GtkWidget *image;
-  gboolean   use_appearance;
-
-  image_menu_item = IMAGE_MENU_ITEM (activatable);
-
-  parent_activatable_iface->sync_action_properties (activatable, action);
-
-  if (!action)
-    return;
-
-  use_appearance = gtk_activatable_get_use_action_appearance (activatable);
-  if (!use_appearance)
-    return;
-
-  image = image_menu_item_get_image (image_menu_item);
-  if (image && !GTK_IS_IMAGE (image))
-    {
-      image_menu_item_set_image (image_menu_item, NULL);
-      image = NULL;
-    }
-
-  if (!image)
-    {
-      image = gtk_image_new ();
-      gtk_widget_show (image);
-      image_menu_item_set_image (IMAGE_MENU_ITEM (activatable),
-                                     image);
-    }
-
-  if (!activatable_update_stock_id (image_menu_item, action) &&
-      !activatable_update_gicon (image_menu_item, action))
-    activatable_update_icon_name (image_menu_item, action);
-
-}
-
-
-/**
- * image_menu_item_new:
- *
- * Creates a new #ImageMenuItem with an empty label.
- *
- * Returns: a new #ImageMenuItem
- *
- */
-GtkWidget*
-image_menu_item_new (void)
-{
-  return g_object_new (TYPE_IMAGE_MENU_ITEM, NULL);
-}
-
-/**
- * image_menu_item_new_with_label:
- * @label: the text of the menu item.
- *
- * Creates a new #ImageMenuItem containing a label.
- *
- * Returns: a new #ImageMenuItem.
- *
- */
-GtkWidget*
-image_menu_item_new_with_label (const gchar *label)
-{
-  return g_object_new (TYPE_IMAGE_MENU_ITEM,
-                       "label", label,
-                       NULL);
-}
-
-/**
- * image_menu_item_new_with_mnemonic:
- * @label: the text of the menu item, with an underscore in front of the
- *         mnemonic character
- *
- * Creates a new #ImageMenuItem containing a label. The label
- * will be created using gtk_label_new_with_mnemonic(), so underscores
- * in @label indicate the mnemonic for the menu item.
- *
- * Returns: a new #ImageMenuItem
- *
- */
-GtkWidget*
-image_menu_item_new_with_mnemonic (const gchar *label)
-{
-  return g_object_new (TYPE_IMAGE_MENU_ITEM,
-                       "use-underline", TRUE,
-                       "label", label,
-                       NULL);
-}
-
-/**
- * image_menu_item_new_from_stock:
- * @stock_id: the name of the stock item.
- * @accel_group: (allow-none): the #GtkAccelGroup to add the menu items
- *   accelerator to, or %NULL.
- *
- * Creates a new #ImageMenuItem containing the image and text from a
- * stock item. Some stock ids have preprocessor macros like #STOCK_OK
- * and #STOCK_APPLY.
- *
- * If you want this menu item to have changeable accelerators, then pass in
- * %NULL for accel_group. Next call gtk_menu_item_set_accel_path() with an
- * appropriate path for the menu item, use gtk_stock_lookup() to look up the
- * standard accelerator for the stock item, and if one is found, call
- * gtk_accel_map_add_entry() to register it.
- *
- * Returns: a new #ImageMenuItem.
- *
- */
-GtkWidget*
-image_menu_item_new_from_stock (const gchar   *stock_id,
-                                    GtkAccelGroup *accel_group)
-{
-  return g_object_new (TYPE_IMAGE_MENU_ITEM,
-                       "label", stock_id,
-                       "use-stock", TRUE,
-                       "accel-group", accel_group,
-                       NULL);
-}
-
-/**
- * image_menu_item_set_use_stock:
- * @image_menu_item: a #ImageMenuItem
- * @use_stock: %TRUE if the menuitem should use a stock item
- *
- * If %TRUE, the label set in the menuitem is used as a
- * stock id to select the stock item for the item.
- *
- * Since: 2.16
- *
- */
-void
-image_menu_item_set_use_stock (ImageMenuItem *image_menu_item,
-                                   gboolean          use_stock)
-{
-  ImageMenuItemPrivate *priv;
-
-  g_return_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item));
-
-  priv = image_menu_item->priv;
-
-  if (priv->use_stock != use_stock)
-    {
-      priv->use_stock = use_stock;
-
-      image_menu_item_recalculate (image_menu_item);
-
-      g_object_notify (G_OBJECT (image_menu_item), "use-stock");
-    }
-}
-
-/**
- * image_menu_item_get_use_stock:
- * @image_menu_item: a #ImageMenuItem
- *
- * Checks whether the label set in the menuitem is used as a
- * stock id to select the stock item for the item.
- *
- * Returns: %TRUE if the label set in the menuitem is used as a
- *     stock id to select the stock item for the item
- *
- * Since: 2.16
- *
- */
-gboolean
-image_menu_item_get_use_stock (ImageMenuItem *image_menu_item)
-{
-  g_return_val_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item), FALSE);
-
-  return image_menu_item->priv->use_stock;
-}
-
-/**
- * image_menu_item_set_accel_group:
- * @image_menu_item: a #ImageMenuItem
- * @accel_group: the #GtkAccelGroup
- *
- * Specifies an @accel_group to add the menu items accelerator to
- * (this only applies to stock items so a stock item must already
- * be set, make sure to call image_menu_item_set_use_stock()
- * and gtk_menu_item_set_label() with a valid stock item first).
- *
- * If you want this menu item to have changeable accelerators then
- * you shouldnt need this (see image_menu_item_new_from_stock()).
- *
- * Since: 2.16
- *
- */
-void
-image_menu_item_set_accel_group (ImageMenuItem *image_menu_item,
-                                     GtkAccelGroup    *accel_group)
-{
-  ImageMenuItemPrivate    *priv;
-  GtkStockItem             stock_item;
-
-  /* Silent return for the constructor */
-  if (!accel_group)
-    return;
-
-  g_return_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item));
-  g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group));
-
-  priv = image_menu_item->priv;
-
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-
-  if (priv->use_stock && priv->label && gtk_stock_lookup (priv->label, &stock_item))
-    if (stock_item.keyval)
-      {
-        gtk_widget_add_accelerator (GTK_WIDGET (image_menu_item),
-                                    "activate",
-                                    accel_group,
-                                    stock_item.keyval,
-                                    stock_item.modifier,
-                                    GTK_ACCEL_VISIBLE);
-
-        g_object_notify (G_OBJECT (image_menu_item), "accel-group");
-      }
-
-  G_GNUC_END_IGNORE_DEPRECATIONS;
-
-}
-
-/**
- * image_menu_item_set_image:
- * @image_menu_item: a #ImageMenuItem.
- * @image: (allow-none): a widget to set as the image for the menu item.
- *
- * Sets the image of @image_menu_item to the given widget.
- * Note that it depends on the show-menu-images setting whether
- * the image will be displayed or not.
- *
- */
-void
-image_menu_item_set_image (ImageMenuItem *image_menu_item,
-                               GtkWidget        *image)
-{
-  ImageMenuItemPrivate *priv;
-
-  g_return_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item));
-
-  priv = image_menu_item->priv;
-
-  if (image == priv->image)
-    return;
-
-  if (priv->image)
-    gtk_container_remove (GTK_CONTAINER (image_menu_item),
-                          priv->image);
-
-  priv->image = image;
-
-  if (image == NULL)
-    return;
-
-  gtk_widget_set_parent (image, GTK_WIDGET (image_menu_item));
-  g_object_set (image, "visible", TRUE, "no-show-all", TRUE, NULL);
-
-  g_object_notify (G_OBJECT (image_menu_item), "image");
-}
-
-/**
- * image_menu_item_get_image:
- * @image_menu_item: a #ImageMenuItem
- *
- * Gets the widget that is currently set as the image of @image_menu_item.
- * See image_menu_item_set_image().
- *
- * Return value: (transfer none): the widget set as image of @image_menu_item
- *
- **/
-GtkWidget*
-image_menu_item_get_image (ImageMenuItem *image_menu_item)
-{
-  g_return_val_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item), NULL);
-
-  return image_menu_item->priv->image;
-}
-
-static void
-image_menu_item_remove (GtkContainer *container,
-                            GtkWidget    *child)
-{
-  ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (container);
-  ImageMenuItemPrivate *priv = image_menu_item->priv;
-
-  if (child == priv->image)
-    {
-      gboolean widget_was_visible;
-
-      widget_was_visible = gtk_widget_get_visible (child);
-
-      gtk_widget_unparent (child);
-      priv->image = NULL;
-
-      if (widget_was_visible &&
-          gtk_widget_get_visible (GTK_WIDGET (container)))
-        gtk_widget_queue_resize (GTK_WIDGET (container));
-
-      g_object_notify (G_OBJECT (image_menu_item), "image");
-    }
-  else
-    {
-      GTK_CONTAINER_CLASS (image_menu_item_parent_class)->remove (container, child);
-    }
-}
-
-static void
-show_image_change_notify (ImageMenuItem *image_menu_item)
-{
-  ImageMenuItemPrivate *priv = image_menu_item->priv;
-
-  if (priv->image)
-    {
-        gtk_widget_show (priv->image);
-    }
-}
-
-static void
-traverse_container (GtkWidget *widget,
-                    gpointer   data)
-{
-  if (IS_IMAGE_MENU_ITEM (widget))
-    show_image_change_notify (IMAGE_MENU_ITEM (widget));
-  else if (GTK_IS_CONTAINER (widget))
-    gtk_container_forall (GTK_CONTAINER (widget), traverse_container, NULL);
-}
-
-static void
-image_menu_item_setting_changed (GtkSettings *settings)
-{
-  GList *list, *l;
-
-  list = gtk_window_list_toplevels ();
-
-  for (l = list; l; l = l->next)
-    gtk_container_forall (GTK_CONTAINER (l->data),
-                          traverse_container, NULL);
-
-  g_list_free (list);
-}
-
-static void
-image_menu_item_screen_changed (GtkWidget *widget,
-                                    GdkScreen *previous_screen)
-{
-  GtkSettings *settings;
-  gulong show_image_connection;
-
-  if (!gtk_widget_has_screen (widget))
-    return;
-
-  settings = gtk_widget_get_settings (widget);
-
-  show_image_connection =
-    g_signal_handler_find (settings, G_SIGNAL_MATCH_FUNC, 0, 0,
-                           NULL, image_menu_item_setting_changed, NULL);
-
-  if (show_image_connection)
-    return;
-
-  g_signal_connect (settings, "notify::gtk-menu-images",
-                    G_CALLBACK (image_menu_item_setting_changed), NULL);
-
-  show_image_change_notify (IMAGE_MENU_ITEM (widget));
-}
diff --git a/src/widgets/image-menu-item.h b/src/widgets/image-menu-item.h
deleted file mode 100644
index 61cc48f3a..000000000
--- a/src/widgets/image-menu-item.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.
- * Forked for , icons in menus are important to us.
- */
-
-#ifndef __IMAGE_MENU_ITEM_H__
-#define __IMAGE_MENU_ITEM_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define GTK_PARAM_READABLE G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-#define GTK_PARAM_WRITABLE G_PARAM_WRITABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-
-#define TYPE_IMAGE_MENU_ITEM            (image_menu_item_get_type ())
-#define IMAGE_MENU_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IMAGE_MENU_ITEM, ImageMenuItem))
-#define IMAGE_MENU_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_IMAGE_MENU_ITEM, ImageMenuItemClass))
-#define IS_IMAGE_MENU_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_IMAGE_MENU_ITEM))
-#define IS_IMAGE_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_IMAGE_MENU_ITEM))
-#define IMAGE_MENU_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_IMAGE_MENU_ITEM, ImageMenuItemClass))
-
-typedef struct _ImageMenuItem              ImageMenuItem;
-typedef struct _ImageMenuItemPrivate       ImageMenuItemPrivate;
-typedef struct _ImageMenuItemClass         ImageMenuItemClass;
-
-struct _ImageMenuItem
-{
-  GtkMenuItem menu_item;
-
-  /*< private >*/
-  ImageMenuItemPrivate *priv;
-};
-
-struct _ImageMenuItemClass
-{
-  GtkMenuItemClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType	   image_menu_item_get_type          (void) G_GNUC_CONST;
-GtkWidget* image_menu_item_new               (void);
-GtkWidget* image_menu_item_new_with_label    (const gchar      *label);
-GtkWidget* image_menu_item_new_with_mnemonic (const gchar      *label);
-GtkWidget* image_menu_item_new_from_stock    (const gchar      *stock_id,
-                                                  GtkAccelGroup    *accel_group);
-void       image_menu_item_set_image         (ImageMenuItem *image_menu_item,
-                                                  GtkWidget        *image);
-GtkWidget* image_menu_item_get_image         (ImageMenuItem *image_menu_item);
-void       image_menu_item_set_use_stock     (ImageMenuItem *image_menu_item,
-						  gboolean          use_stock);
-gboolean   image_menu_item_get_use_stock     (ImageMenuItem *image_menu_item);
-void       image_menu_item_set_accel_group   (ImageMenuItem *image_menu_item, 
-						  GtkAccelGroup    *accel_group);
-
-G_END_DECLS
-
-#endif /* __IMAGE_MENU_ITEM_H__ */
diff --git a/src/widgets/ink-action.cpp b/src/widgets/ink-action.cpp
index 2f1bf94e4..8859306f1 100644
--- a/src/widgets/ink-action.cpp
+++ b/src/widgets/ink-action.cpp
@@ -1,8 +1,6 @@
 #include "ink-action.h"
 #include "widgets/icon.h"
 
-#include "widgets/image-menu-item.h"
-
 #include <gtk/gtk.h>
 
 static void ink_action_finalize( GObject* obj );
@@ -155,7 +153,7 @@ static GtkWidget* ink_action_create_menu_item( GtkAction* action )
     if ( act->private_data->iconId ) {
         gchar* label = 0;
         g_object_get( G_OBJECT(act), "label", &label, NULL );
-        item = image_menu_item_new_with_mnemonic( label );
+        item = gtk_image_menu_item_new_with_mnemonic( label );
 
         GtkWidget* child = sp_icon_new( Inkscape::ICON_SIZE_MENU, act->private_data->iconId );
         // TODO this work-around is until SPIcon will live properly inside of a popup menu
@@ -170,7 +168,7 @@ static GtkWidget* ink_action_create_menu_item( GtkAction* action )
             }
         }
         gtk_widget_show_all( child );
-        image_menu_item_set_image( IMAGE_MENU_ITEM(item), child );
+        gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(item), child );
 
         g_free( label );
         label = 0;
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index b72a8d5dc..758a3125b 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -676,7 +676,7 @@ VerbAction::~VerbAction()
 Gtk::Widget* VerbAction::create_menu_item_vfunc()
 {
 // First call in to get the icon rendered if present in SVG
-    Gtk::Widget *widget = sp_icon_get_icon( property_stock_id().get_value().get_string(), Inkscape::ICON_SIZE_MENU );
+    Gtk::Widget *widget = sp_icon_get_icon( get_icon_name(), Inkscape::ICON_SIZE_MENU );
     delete widget;
     widget = 0;