avoid a bug in Carbon headers

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

diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index 3bba43e060bdad34b6bb1b3f88404d867a2112b5..adf181ca4ad91275b28711cceb2d2d28fa4d51eb 100644 (file)
--- a/include/wx/artprov.h
+++ b/include/wx/artprov.h
@@ -12,7 +12,7 @@
 #ifndef _WX_ARTPROV_H_
 #define _WX_ARTPROV_H_
 
 #ifndef _WX_ARTPROV_H_
 #define _WX_ARTPROV_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "artprov.h"
 #endif
 
 #pragma interface "artprov.h"
 #endif
 


@@ -22,6 +22,7 @@
 
 class WXDLLEXPORT wxArtProvidersList;
 class WXDLLEXPORT wxArtProviderCache;
 
 class WXDLLEXPORT wxArtProvidersList;
 class WXDLLEXPORT wxArtProviderCache;

+class wxArtProviderModule;

 
 // ----------------------------------------------------------------------------
 // Types
 
 // ----------------------------------------------------------------------------
 // Types


@@ -83,6 +84,7 @@ typedef wxString wxArtID;
 #define wxART_QUESTION             wxART_MAKE_ART_ID(wxART_QUESTION)           
 #define wxART_WARNING              wxART_MAKE_ART_ID(wxART_WARNING)            
 #define wxART_INFORMATION          wxART_MAKE_ART_ID(wxART_INFORMATION)        
 #define wxART_QUESTION             wxART_MAKE_ART_ID(wxART_QUESTION)           
 #define wxART_WARNING              wxART_MAKE_ART_ID(wxART_WARNING)            
 #define wxART_INFORMATION          wxART_MAKE_ART_ID(wxART_INFORMATION)        

+#define wxART_MISSING_IMAGE        wxART_MAKE_ART_ID(wxART_MISSING_IMAGE)

 
 // ----------------------------------------------------------------------------
 // wxArtProvider class
 
 // ----------------------------------------------------------------------------
 // wxArtProvider class


@@ -113,10 +115,13 @@ public:
                           const wxArtClient& client = wxART_OTHER,
                           const wxSize& size = wxDefaultSize);
 
                           const wxArtClient& client = wxART_OTHER,
                           const wxSize& size = wxDefaultSize);
 

+protected:
+    friend class wxArtProviderModule;
+    // Initializes default provider
+    static void InitStdProvider();

     // Destroy caches & all providers
     static void CleanUpProviders();
 
     // Destroy caches & all providers
     static void CleanUpProviders();
 

-protected:

     // Derived classes must override this method to create requested 
     // art resource. This method is called only once per instance's
     // lifetime for each requested wxArtID.
     // Derived classes must override this method to create requested 
     // art resource. This method is called only once per instance's
     // lifetime for each requested wxArtID.