Fork GtkImageMenuItem and remove show_image boolean because we always want to show menu.

(bzr r14800)

1 files changed, 12 insertions, 0 deletions

diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 8639861f8..6d0a85f13 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -79,6 +79,10 @@
 #include "message-stack.h"
 #include "ui/dialog/layer-properties.h"
 
+#if GTK_CHECK_VERSION(3,0,0)
+    #include "widgets/imagemenuitem.h"
+#endif
+
 #include <gdk/gdkkeysyms.h>
 
 #include <glibmm/miscutils.h>
@@ -413,7 +417,11 @@ sp_ui_menuitem_add_icon( GtkWidget *item, gchar *icon_name )
 
     icon = sp_icon_new( Inkscape::ICON_SIZE_MENU, icon_name );
     gtk_widget_show(icon);
+#if GTK_CHECK_VERSION(3,0,0)
+    image_menu_item_set_image((ImageMenuItem *) item, icon);
+#else
     gtk_image_menu_item_set_image((GtkImageMenuItem *) item, icon);
+#endif
 } // end of sp_ui_menu_add_icon
 
 void
@@ -467,7 +475,11 @@ 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 {
+#if GTK_CHECK_VERSION(3,0,0)
+            item = image_menu_item_new_with_mnemonic(action->name);
+#else
             item = gtk_image_menu_item_new_with_mnemonic(action->name);
+#endif
         }
 
         gtk_label_set_markup_with_mnemonic( GTK_LABEL(gtk_bin_get_child(GTK_BIN (item))), action->name);