Source cleaning: whitespaces, tabs, -1/wxNOT_FOUND, TRUE/true, FALSE/false.

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

diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index 4a862d3f5820ef16fc45f2b4212bdbd5849bfb2b..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_
 
 #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
 


@@ -47,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_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)           
 
 
 #define wxART_OTHER                wxART_MAKE_CLIENT_ID(wxART_OTHER)           
 


@@ -84,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_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


@@ -118,6 +120,8 @@ protected:
     friend class wxArtProviderModule;
     // Initializes default provider
     static void InitStdProvider();
     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();
 
     // Destroy caches & all providers
     static void CleanUpProviders();