X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2e9b5717cdd0e824dbccdb9d60e2d6db095d13b8..f6669958924c3c3833e2932b65598b06073d2e65:/include/wx/artprov.h diff --git a/include/wx/artprov.h b/include/wx/artprov.h index fcc93518f6..7eef3973c4 100644 --- a/include/wx/artprov.h +++ b/include/wx/artprov.h @@ -136,7 +136,7 @@ public: #if WXWIN_COMPATIBILITY_2_8 // use PushBack(), it's the same thing - wxDEPRECATED( static void Insert(wxArtProvider *provider) ); + static wxDEPRECATED( void Insert(wxArtProvider *provider) ); #endif // Remove latest added provider and delete it. @@ -189,14 +189,14 @@ public: #if WXWIN_COMPATIBILITY_2_6 // use the corresponding methods without redundant "Provider" suffix - wxDEPRECATED( static void PushProvider(wxArtProvider *provider) ); - wxDEPRECATED( static void InsertProvider(wxArtProvider *provider) ); - wxDEPRECATED( static bool PopProvider() ); + static wxDEPRECATED( void PushProvider(wxArtProvider *provider) ); + static wxDEPRECATED( void InsertProvider(wxArtProvider *provider) ); + static wxDEPRECATED( bool PopProvider() ); // use Delete() if this is what you really need, or just delete the // provider pointer, do not use Remove() as it does not delete the pointer // unlike RemoveProvider() which does - wxDEPRECATED( static bool RemoveProvider(wxArtProvider *provider) ); + static wxDEPRECATED( bool RemoveProvider(wxArtProvider *provider) ); #endif // WXWIN_COMPATIBILITY_2_6 protected: @@ -253,7 +253,7 @@ private: #if !defined(__WXUNIVERSAL__) && \ ((defined(__WXGTK__) && defined(__WXGTK20__)) || defined(__WXMSW__) || \ - (defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON)) + defined(__WXMAC__)) // *some* (partial) native implementation of wxArtProvider exists; this is // not the same as wxArtProvider::HasNativeProvider()! #define wxHAS_NATIVE_ART_PROVIDER_IMPL