summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-06-22 11:46:18 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-06-22 11:46:18 +0100
commit9ffd60792c0d445f3061d9593c233660799cd401 (patch)
treea21453f56aa6061d4f3368eba98d66697ef3f166 /vcl
parent2822d1891b551a58c691cac37c11d3b9c2255755 (diff)
g_bytes_icon_new is only in glib >= 2.38
Change-Id: I57f2d016eb6d35d2bc9be090444be1190d68d11d
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/gtk/gtksalmenu.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 081ca5430de4..a08917a9b702 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -859,6 +859,7 @@ namespace
void GtkSalMenu::NativeSetItemIcon( unsigned nSection, unsigned nItemPos, const Image& rImage )
{
+#if GLIB_CHECK_VERSION(2,38,0)
SolarMutexGuard aGuard;
SvMemoryStream* pMemStm = new SvMemoryStream;
@@ -874,6 +875,11 @@ void GtkSalMenu::NativeSetItemIcon( unsigned nSection, unsigned nItemPos, const
g_lo_menu_set_icon_to_item_in_section( G_LO_MENU( mpMenuModel ), nSection, nItemPos, pIcon );
g_object_unref(pIcon);
g_bytes_unref(pBytes);
+#else
+ (void)nSection;
+ (void)nItemPos;
+ (void)rImage;
+#endif
}
void GtkSalMenu::NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const vcl::KeyCode& rKeyCode, const OUString& rKeyName )