vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 776f0184d11965ccf8232ff47206d1e1566a6fd2
Author: Ivan Timofeev <timofeev....@gmail.com>
Date: Mon Nov 12 18:53:52 2012 +0400
Related: fdo#56198 avoid gtk warning, take 3
We need to check at run time, not at compile.
Thanks to Michael Meeks for spotting!
Change-Id: Ic8175d6af0bb8ec167f108925aaaf31f970fbd05
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 4455c2b..c1bdf3c 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -3990,10 +3990,14 @@ void GtkSalGraphics::updateSettings( AllSettings&
rSettings )
gboolean showmenuicons = true, primarybuttonwarps = false;
g_object_get( pSettings,
"gtk-menu-images", &showmenuicons,
-#if GTK_CHECK_VERSION(2,24,13)
- "gtk-primary-button-warps-slider", &primarybuttonwarps,
-#endif
(char *)NULL );
+ if( g_object_class_find_property(
+ G_OBJECT_GET_CLASS(pSettings), "gtk-primary-button-warps-slider") )
+ {
+ g_object_get( pSettings,
+ "gtk-primary-button-warps-slider", &primarybuttonwarps,
+ (char *)NULL );
+ }
aStyleSet.SetPreferredUseImagesInMenus(showmenuicons);
aStyleSet.SetPrimaryButtonWarpsSlider(primarybuttonwarps);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
