Temporary fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp
index 6c0a9380a26bac4debbf5491c0bc7945c99165e5..6b401aee0918b15c882e8647308dad9d112f2ee7 100644 (file)
--- a/src/gtk/artgtk.cpp
+++ b/src/gtk/artgtk.cpp
@@ -160,10 +160,26 @@ static GtkIconSize FindClosestIconSize(const wxSize& size)
         s_sizes[5].icon = GTK_ICON_SIZE_DIALOG;
         for (size_t i = 0; i < NUM_SIZES; i++)
         {
-            gtk_icon_size_lookup_for_settings(
+#if !defined(GDK_MULTITHREAD_SAFE)
+            gtk_icon_size_lookup(
+                              s_sizes[i].icon,
+                              &s_sizes[i].x, &s_sizes[i].y);
+#else
+#if GTK_VERSION_CHECK(2,2,0)
+            if (!gtk_verson_check(2,2,0))
+                gtk_icon_size_lookup_for_settings(
                               gtk_settings_get_for_screen(gdk_screen_get_default()),
                               s_sizes[i].icon,
                               &s_sizes[i].x, &s_sizes[i].y);
+            else
+#else // pre-GTK 2.2
+            {
+                // FIXME
+                gtk_icon_size_lookup(s_sizes[i].icon,
+                                 &s_sizes[i].x, &s_sizes[i].y);
+            }
+#endif
+#endif
         }
         s_sizesInitialized = true;
     }

diff --git a/src/gtk1/artgtk.cpp b/src/gtk1/artgtk.cpp
index 6c0a9380a26bac4debbf5491c0bc7945c99165e5..6b401aee0918b15c882e8647308dad9d112f2ee7 100644 (file)
--- a/src/gtk1/artgtk.cpp
+++ b/src/gtk1/artgtk.cpp
@@ -160,10 +160,26 @@ static GtkIconSize FindClosestIconSize(const wxSize& size)
         s_sizes[5].icon = GTK_ICON_SIZE_DIALOG;
         for (size_t i = 0; i < NUM_SIZES; i++)
         {
-            gtk_icon_size_lookup_for_settings(
+#if !defined(GDK_MULTITHREAD_SAFE)
+            gtk_icon_size_lookup(
+                              s_sizes[i].icon,
+                              &s_sizes[i].x, &s_sizes[i].y);
+#else
+#if GTK_VERSION_CHECK(2,2,0)
+            if (!gtk_verson_check(2,2,0))
+                gtk_icon_size_lookup_for_settings(
                               gtk_settings_get_for_screen(gdk_screen_get_default()),
                               s_sizes[i].icon,
                               &s_sizes[i].x, &s_sizes[i].y);
+            else
+#else // pre-GTK 2.2
+            {
+                // FIXME
+                gtk_icon_size_lookup(s_sizes[i].icon,
+                                 &s_sizes[i].x, &s_sizes[i].y);
+            }
+#endif
+#endif
         }
         s_sizesInitialized = true;
     }