diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-06-22 11:46:18 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-06-22 11:47:38 +0100 |
| commit | 1458470cfc3e3f4840f0e245c2e03adeb89a008a (patch) | |
| tree | 5377bdc56f3c8f1fed5414b3182ebcd2b9494d59 /vcl | |
| parent | d95d2a723ffa291c300fd6cae5530f145a7d47de (diff) | |
g_bytes_icon_new is only in glib >= 2.38
Change-Id: I57f2d016eb6d35d2bc9be090444be1190d68d11d
(cherry picked from commit 9ffd60792c0d445f3061d9593c233660799cd401)
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk/gtksalmenu.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx index c98126531738..2e44f76d4039 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 ) |