Applied patch from Bo, WIP

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

diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp
index 8cdcb39bf7ca8fa5ed76702ac262fc5bf500aa90..07d8f4cf4cc1db938811253583085bf2e3437803 100644 (file)
--- a/src/gtk/artgtk.cpp
+++ b/src/gtk/artgtk.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        artstd.cpp
+// Name:        src/gtk/artstd.cpp

 // Purpose:     stock wxArtProvider instance with native GTK+ stock icons
 // Author:      Vaclav Slavik
 // Modified by:
 // Purpose:     stock wxArtProvider instance with native GTK+ stock icons
 // Author:      Vaclav Slavik
 // Modified by:


@@ -20,12 +20,19 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
+#if !defined(__WXUNIVERSAL__)

 
 #include "wx/artprov.h"
 
 #include "wx/artprov.h"

-#include "wx/module.h"
-#include "wx/gtk/private.h"

 
 

+#ifndef WX_PRECOMP
+    #include "wx/module.h"
+#endif
+
+#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:
 #include <gtk/gtk.h>
 
 // compatibility with older GTK+ versions:


@@ -50,7 +57,7 @@ protected:
 
 /*static*/ void wxArtProvider::InitNativeProvider()
 {
 
 /*static*/ void wxArtProvider::InitNativeProvider()
 {

-    wxArtProvider::PushProvider(new wxGTK2ArtProvider);
+    Push(new wxGTK2ArtProvider);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -175,7 +182,7 @@ static GtkIconSize FindClosestIconSize(const wxSize& size)
         if (size.x > s_sizes[i].x || size.y > s_sizes[i].y)
             continue;
 
         if (size.x > s_sizes[i].x || size.y > s_sizes[i].y)
             continue;
 

-        unsigned dist = (size.x - s_sizes[i].x) * (size.x - s_sizes[i].x) + 
+        unsigned dist = (size.x - s_sizes[i].x) * (size.x - s_sizes[i].x) +

                         (size.y - s_sizes[i].y) * (size.y - s_sizes[i].y);
         if (dist == 0)
             return s_sizes[i].icon;
                         (size.y - s_sizes[i].y) * (size.y - s_sizes[i].y);
         if (dist == 0)
             return s_sizes[i].icon;


@@ -206,8 +213,8 @@ static GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size)
         GtkWidget *widget = gtk_button_new();
         gs_gtkStyle = gtk_rc_get_style(widget);
         wxASSERT( gs_gtkStyle != NULL );
         GtkWidget *widget = gtk_button_new();
         gs_gtkStyle = gtk_rc_get_style(widget);
         wxASSERT( gs_gtkStyle != NULL );

-        g_object_ref(G_OBJECT(gs_gtkStyle));
-        gtk_widget_destroy(widget);
+        g_object_ref(gs_gtkStyle);
+        gtk_object_sink((GtkObject*)widget);

     }
 
     GtkIconSet *iconset = gtk_style_lookup_icon_set(gs_gtkStyle, stockid);
     }
 
     GtkIconSet *iconset = gtk_style_lookup_icon_set(gs_gtkStyle, stockid);


@@ -258,10 +265,9 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
     GdkPixbuf *pixbuf = CreateStockIcon(stockid, stocksize);
 
 #ifdef __WXGTK24__
     GdkPixbuf *pixbuf = CreateStockIcon(stockid, stocksize);
 
 #ifdef __WXGTK24__

-    if (!gtk_check_version(2,4,0))
+    if (!pixbuf && !gtk_check_version(2,4,0))

     {
     {

-        if (!pixbuf)
-            pixbuf = CreateThemeIcon(stockid, stocksize, size);
+        pixbuf = CreateThemeIcon(stockid, stocksize, size);

     }
 #endif
 
     }
 #endif
 


@@ -273,18 +279,14 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
                                                 GDK_INTERP_BILINEAR);
         if (p2)
         {
                                                 GDK_INTERP_BILINEAR);
         if (p2)
         {

-            gdk_pixbuf_unref(pixbuf);
+            g_object_unref (pixbuf);

             pixbuf = p2;
         }
     }
 
             pixbuf = p2;
         }
     }
 

-    if (!pixbuf)
-        return wxNullBitmap;
-

     wxBitmap bmp;
     wxBitmap bmp;

-    bmp.SetWidth(gdk_pixbuf_get_width(pixbuf));
-    bmp.SetHeight(gdk_pixbuf_get_height(pixbuf));
-    bmp.SetPixbuf(pixbuf);
+    if (pixbuf != NULL)
+        bmp.SetPixbuf(pixbuf);

 
     return bmp;
 }
 
     return bmp;
 }


@@ -301,7 +303,7 @@ public:
     {
         if (gs_gtkStyle)
         {
     {
         if (gs_gtkStyle)
         {

-            g_object_unref(G_OBJECT(gs_gtkStyle));
+            g_object_unref(gs_gtkStyle);

             gs_gtkStyle = NULL;
         }
     }
             gs_gtkStyle = NULL;
         }
     }


@@ -311,4 +313,4 @@ public:
 
 IMPLEMENT_DYNAMIC_CLASS(wxArtGtkModule, wxModule)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxArtGtkModule, wxModule)
 

-#endif // defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
+#endif // !defined(__WXUNIVERSAL__)