From 34a246df34d95ef815476d06363b57049e46035b Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Tue, 31 May 2005 21:56:38 +0000
Subject: [PATCH] Temporary fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/gtk/artgtk.cpp  | 18 +++++++++++++++++-
 src/gtk1/artgtk.cpp | 18 +++++++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp
index 6c0a9380a2..6b401aee09 100644
--- 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 6c0a9380a2..6b401aee09 100644
--- 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;
     }
-- 
2.47.2