remove checks for new dc code

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

diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp
index e5fc5a45e9a7f9743a18691a8132be242507c693..6153868e5c0834e93917839e1933b3cbaafdb07a 100644 (file)
--- a/src/gtk/artgtk.cpp
+++ b/src/gtk/artgtk.cpp
@@ -28,8 +28,11 @@
     #include "wx/module.h"
 #endif
 
-#include "wx/gtk/private.h"
-
+#include <gtk/gtkversion.h>
+#if GTK_CHECK_VERSION(2, 9, 0)
+    // gtk_object_sink
+    #undef GTK_DISABLE_DEPRECATED
+#endif
 #include <gtk/gtk.h>
 
 // compatibility with older GTK+ versions:
@@ -92,17 +95,14 @@ static const char *wxArtIDToStock(const wxArtID& id)
     //ART(wxART_REPORT_VIEW,                         )
     //ART(wxART_LIST_VIEW,                           )
     //ART(wxART_NEW_DIR,                             )
-#ifdef __WXGTK24__
     ART(wxART_FOLDER,                              GTK_STOCK_DIRECTORY)
     ART(wxART_FOLDER_OPEN,                         GTK_STOCK_DIRECTORY)
-#endif
     //ART(wxART_GO_DIR_UP,                           )
     ART(wxART_EXECUTABLE_FILE,                     GTK_STOCK_EXECUTE)
     ART(wxART_NORMAL_FILE,                         GTK_STOCK_FILE)
     ART(wxART_TICK_MARK,                           GTK_STOCK_APPLY)
     ART(wxART_CROSS_MARK,                          GTK_STOCK_CANCEL)
 
-#ifdef __WXGTK24__
     ART(wxART_FLOPPY,                              GTK_STOCK_FLOPPY)
     ART(wxART_CDROM,                               GTK_STOCK_CDROM)
     ART(wxART_HARDDISK,                            GTK_STOCK_HARDDISK)
@@ -124,7 +124,6 @@ static const char *wxArtIDToStock(const wxArtID& id)
 
     ART(wxART_FIND,                                GTK_STOCK_FIND)
     ART(wxART_FIND_AND_REPLACE,                    GTK_STOCK_FIND_AND_REPLACE)
-#endif
 
     return NULL;
 
@@ -211,7 +210,7 @@ static GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size)
         gs_gtkStyle = gtk_rc_get_style(widget);
         wxASSERT( gs_gtkStyle != NULL );
         g_object_ref(gs_gtkStyle);
-        gtk_widget_destroy(widget);
+        gtk_object_sink((GtkObject*)widget);
     }
 
     GtkIconSet *iconset = gtk_style_lookup_icon_set(gs_gtkStyle, stockid);
@@ -224,7 +223,6 @@ static GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size)
                                     GTK_STATE_NORMAL, size, NULL, NULL);
 }
 
-#ifdef __WXGTK24__
 static GdkPixbuf *CreateThemeIcon(const char *iconname,
                                   GtkIconSize iconsize, const wxSize& sz)
 {
@@ -240,7 +238,6 @@ static GdkPixbuf *CreateThemeIcon(const char *iconname,
                     size.x,
                     (GtkIconLookupFlags)0, NULL);
 }
-#endif
 
 wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
                                          const wxArtClient& client,
@@ -260,13 +257,8 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
         stockid = id.ToAscii();
 
     GdkPixbuf *pixbuf = CreateStockIcon(stockid, stocksize);
-
-#ifdef __WXGTK24__
-    if (!pixbuf && !gtk_check_version(2,4,0))
-    {
+    if (!pixbuf)
         pixbuf = CreateThemeIcon(stockid, stocksize, size);
-    }
-#endif
 
     if (pixbuf && size != wxDefaultSize &&
         (size.x != gdk_pixbuf_get_width(pixbuf) ||