simpler implementation that also works over remote connections by Kevin O.

[wxWidgets.git] / include / wx / artprov.h

diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index f62ef93e9325c0a85dd3657877791377b367f60a..7eef3973c4266c2fd1a0d479e6d086ea1ccbccfb 100644 (file)
--- 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,20 +189,22 @@ 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:
     friend class wxArtProviderModule;
+#if wxUSE_ARTPROVIDER_STD
     // Initializes default provider
     static void InitStdProvider();
+#endif // wxUSE_ARTPROVIDER_STD
     // Initializes Tango-based icon provider
 #if wxUSE_ARTPROVIDER_TANGO
     static void InitTangoProvider();
@@ -251,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