X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/532d575bd9baedbbf1c52907a66255975f527530..601398b9b1e63109f44af34ff79bc558fe929b4d:/src/common/artstd.cpp

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index fbd908ecab..e7e113c851 100644
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        artstd.cpp
+// Name:        src/common/artstd.cpp
 // Purpose:     stock wxArtProvider instance with default wxWin art
 // Author:      Vaclav Slavik
 // Modified by:
@@ -21,13 +21,10 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #if WXWIN_COMPATIBILITY_2_2
-        #include "wx/app.h"
-    #endif
+    #include "wx/image.h"
 #endif
 
 #include "wx/artprov.h"
-#include "wx/image.h"
 
 // ----------------------------------------------------------------------------
 // wxDefaultArtProvider
@@ -77,10 +74,10 @@ protected:
 
 /*static*/ void wxArtProvider::InitStdProvider()
 {
-    wxArtProvider::PushProvider(new wxDefaultArtProvider);
+    wxArtProvider::Push(new wxDefaultArtProvider);
 }
 
-#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)
+#if !(defined(__WXGTK20__) || defined(__WXMAC__)) || defined(__WXUNIVERSAL__)
 /*static*/ void wxArtProvider::InitNativeProvider()
 {
 }
@@ -91,9 +88,6 @@ protected:
 // XPMs with the art
 // ----------------------------------------------------------------------------
 
-// XPM hack: make the arrays const
-#define static static const
-
 #if defined(__WXGTK__)
     #include "../../art/gtk/info.xpm"
     #include "../../art/gtk/error.xpm"
@@ -155,9 +149,6 @@ protected:
 #include "../../art/find.xpm"
 #include "../../art/findrepl.xpm"
 
-
-#undef static
-
 wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id)
 {
     // wxMessageBox icons:
@@ -229,7 +220,7 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
 {
     wxBitmap bmp = wxDefaultArtProvider_CreateBitmap(id);
 
-#if wxUSE_IMAGE
+#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)
     if (bmp.Ok())
     {
         // fit into transparent image with desired size hint from the client