return immediately from WalkFrom() if dbghelp dll initialization fails (part of patch...

[wxWidgets.git] / src / gtk / artgtk.cpp

diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp
index a936c31900f5087e0edc592a74a18bf579fe681f..6b401aee0918b15c882e8647308dad9d112f2ee7 100644 (file)
--- a/src/gtk/artgtk.cpp
+++ b/src/gtk/artgtk.cpp
@@ -110,6 +110,7 @@ static const char *wxArtIDToStock(const wxArtID& id)
     ART(wxART_CUT,                                 GTK_STOCK_CUT)
     ART(wxART_PASTE,                               GTK_STOCK_PASTE)
     ART(wxART_DELETE,                              GTK_STOCK_DELETE)
     ART(wxART_CUT,                                 GTK_STOCK_CUT)
     ART(wxART_PASTE,                               GTK_STOCK_PASTE)
     ART(wxART_DELETE,                              GTK_STOCK_DELETE)

+    ART(wxART_NEW,                                 GTK_STOCK_NEW)

 
     ART(wxART_UNDO,                                GTK_STOCK_UNDO)
     ART(wxART_REDO,                                GTK_STOCK_REDO)
 
     ART(wxART_UNDO,                                GTK_STOCK_UNDO)
     ART(wxART_REDO,                                GTK_STOCK_REDO)


@@ -159,8 +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++)
         {
         s_sizes[5].icon = GTK_ICON_SIZE_DIALOG;
         for (size_t i = 0; i < NUM_SIZES; i++)
         {

-            gtk_icon_size_lookup(s_sizes[i].icon,
+#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);
                                  &s_sizes[i].x, &s_sizes[i].y);

+            }
+#endif
+#endif

         }
         s_sizesInitialized = true;
     }
         }
         s_sizesInitialized = true;
     }