correcting a source for double event delivery

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

diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index 3bba43e060bdad34b6bb1b3f88404d867a2112b5..934f343c249528a754dd591750f105d5fffe488c 100644 (file)
--- a/include/wx/artprov.h
+++ b/include/wx/artprov.h
@@ -12,7 +12,7 @@
 #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
 
@@ -22,6 +22,7 @@
 
 class WXDLLEXPORT wxArtProvidersList;
 class WXDLLEXPORT wxArtProviderCache;
+class wxArtProviderModule;
 
 // ----------------------------------------------------------------------------
 // Types
@@ -46,6 +47,7 @@ typedef wxString wxArtID;
 #define wxART_CMN_DIALOG           wxART_MAKE_CLIENT_ID(wxART_CMN_DIALOG)      
 #define wxART_HELP_BROWSER         wxART_MAKE_CLIENT_ID(wxART_HELP_BROWSER)    
 #define wxART_MESSAGE_BOX          wxART_MAKE_CLIENT_ID(wxART_MESSAGE_BOX)     
+#define wxART_BUTTON               wxART_MAKE_CLIENT_ID(wxART_BUTTON)
 
 #define wxART_OTHER                wxART_MAKE_CLIENT_ID(wxART_OTHER)           
 
@@ -83,6 +85,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_MISSING_IMAGE        wxART_MAKE_ART_ID(wxART_MISSING_IMAGE)
 
 // ----------------------------------------------------------------------------
 // wxArtProvider class
@@ -113,10 +116,15 @@ public:
                           const wxArtClient& client = wxART_OTHER,
                           const wxSize& size = wxDefaultSize);
 
+protected:
+    friend class wxArtProviderModule;
+    // Initializes default provider
+    static void InitStdProvider();
+    // Initializes platform's native provider, if available (e.g. GTK2)
+    static void InitNativeProvider();
     // 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.