X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/155ecd4c4221d3bbc7aa93d472d11948f21d21ab..089b23d02837219d553940c6b7354276bdff52f2:/src/common/artstd.cpp diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp index 314e609089..e7e113c851 100644 --- a/src/common/artstd.cpp +++ b/src/common/artstd.cpp @@ -74,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() { } @@ -88,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" @@ -152,9 +149,6 @@ protected: #include "../../art/find.xpm" #include "../../art/findrepl.xpm" - -#undef static - wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id) { // wxMessageBox icons: