From fe975a9b3c5603fe2b2d0491de3bbfe1e4bf0233 Mon Sep 17 00:00:00 2001
From: Martin Owens <doctormo@gmail.com>
Date: Tue, 12 Apr 2016 17:01:58 +0100
Subject: Fork GtkImageMenuItem and remove show_image boolean because we always
 want to show menu.

(bzr r14800)
---
 src/ui/interface.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/ui/interface.cpp')

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);
-- 
cgit v1.2.3


From 0336a2a6926411517cdba3baa93a0bd67411cfe1 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Wed, 13 Apr 2016 11:46:28 +0200
Subject: Fix cmake build

(bzr r14818)
---
 src/ui/interface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/interface.cpp')

diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 6d0a85f13..a16bbc472 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -80,7 +80,7 @@
 #include "ui/dialog/layer-properties.h"
 
 #if GTK_CHECK_VERSION(3,0,0)
-    #include "widgets/imagemenuitem.h"
+    #include "widgets/image-menu-item.h"
 #endif
 
 #include <gdk/gdkkeysyms.h>
-- 
cgit v1.2.3