diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-11-12 18:53:52 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-11-12 18:58:01 +0400 |
| commit | 776f0184d11965ccf8232ff47206d1e1566a6fd2 (patch) | |
| tree | d0d51495c2e89ebddba9841a7ae67fcd0f1e6fcf | |
| parent | faef84abca7860227730351d7d1cd4e3c4b6e0e5 (diff) | |
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
| -rw-r--r-- | vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 4455c2bd71cf..c1bdf3c2b779 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); |