small cleanup

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

diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp
index d42c6a69b154c5beb5127e08864fb5fe0d8578c3..e5fc5a45e9a7f9743a18691a8132be242507c693 100644 (file)
--- a/src/gtk/artgtk.cpp
+++ b/src/gtk/artgtk.cpp
@@ -20,7 +20,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

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

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


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

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

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


@@ -262,10 +262,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
 


@@ -282,13 +281,9 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
         }
     }
 
         }
     }
 

-    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;
 }


@@ -315,4 +310,4 @@ public:
 
 IMPLEMENT_DYNAMIC_CLASS(wxArtGtkModule, wxModule)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxArtGtkModule, wxModule)
 

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