Don't automatically define WX_PRECOMP when building using configure.

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

diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index be58e9d62c81d50117b5f0891fa6ff534a69bb22..4afdfad882bf7be2b237f68bec7fbd5d45e46400 100644 (file)
--- a/include/wx/artprov.h
+++ b/include/wx/artprov.h
@@ -6,7 +6,7 @@
 // Created:     18/03/2002
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik
 // Created:     18/03/2002
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ARTPROV_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ARTPROV_H_


@@ -31,7 +31,7 @@ class wxArtProviderModule;
 typedef wxString wxArtClient;
 typedef wxString wxArtID;
 
 typedef wxString wxArtClient;
 typedef wxString wxArtID;
 

-#define wxART_MAKE_CLIENT_ID_FROM_STR(id)  (wxString(id)+_T("_C"))
+#define wxART_MAKE_CLIENT_ID_FROM_STR(id)  (id + _T("_C"))

 #define wxART_MAKE_CLIENT_ID(id)           _T(#id) _T("_C")
 #define wxART_MAKE_ART_ID_FROM_STR(id)     (id)
 #define wxART_MAKE_ART_ID(id)              _T(#id)
 #define wxART_MAKE_CLIENT_ID(id)           _T(#id) _T("_C")
 #define wxART_MAKE_ART_ID_FROM_STR(id)     (id)
 #define wxART_MAKE_ART_ID(id)              _T(#id)


@@ -40,52 +40,74 @@ typedef wxString wxArtID;
 // Art clients
 // ----------------------------------------------------------------------------
 
 // Art clients
 // ----------------------------------------------------------------------------
 

-#define wxART_TOOLBAR              wxART_MAKE_CLIENT_ID(wxART_TOOLBAR)         
-#define wxART_MENU                 wxART_MAKE_CLIENT_ID(wxART_MENU)            
-#define wxART_FRAME_ICON           wxART_MAKE_CLIENT_ID(wxART_FRAME_ICON)      
+#define wxART_TOOLBAR              wxART_MAKE_CLIENT_ID(wxART_TOOLBAR)
+#define wxART_MENU                 wxART_MAKE_CLIENT_ID(wxART_MENU)
+#define wxART_FRAME_ICON           wxART_MAKE_CLIENT_ID(wxART_FRAME_ICON)

 
 

-#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)

 
 // ----------------------------------------------------------------------------
 // Art IDs
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // Art IDs
 // ----------------------------------------------------------------------------
 

-#define wxART_ADD_BOOKMARK         wxART_MAKE_ART_ID(wxART_ADD_BOOKMARK)       
-#define wxART_DEL_BOOKMARK         wxART_MAKE_ART_ID(wxART_DEL_BOOKMARK)       
-#define wxART_HELP_SIDE_PANEL      wxART_MAKE_ART_ID(wxART_HELP_SIDE_PANEL)    
-#define wxART_HELP_SETTINGS        wxART_MAKE_ART_ID(wxART_HELP_SETTINGS)      
-#define wxART_HELP_BOOK            wxART_MAKE_ART_ID(wxART_HELP_BOOK)          
-#define wxART_HELP_FOLDER          wxART_MAKE_ART_ID(wxART_HELP_FOLDER)        
-#define wxART_HELP_PAGE            wxART_MAKE_ART_ID(wxART_HELP_PAGE)          
-#define wxART_GO_BACK              wxART_MAKE_ART_ID(wxART_GO_BACK)            
-#define wxART_GO_FORWARD           wxART_MAKE_ART_ID(wxART_GO_FORWARD)         
-#define wxART_GO_UP                wxART_MAKE_ART_ID(wxART_GO_UP)              
-#define wxART_GO_DOWN              wxART_MAKE_ART_ID(wxART_GO_DOWN)            
-#define wxART_GO_TO_PARENT         wxART_MAKE_ART_ID(wxART_GO_TO_PARENT)       
-#define wxART_GO_HOME              wxART_MAKE_ART_ID(wxART_GO_HOME)            
-#define wxART_FILE_OPEN            wxART_MAKE_ART_ID(wxART_FILE_OPEN)          
-#define wxART_PRINT                wxART_MAKE_ART_ID(wxART_PRINT)              
-#define wxART_HELP                 wxART_MAKE_ART_ID(wxART_HELP)               
-#define wxART_TIP                  wxART_MAKE_ART_ID(wxART_TIP)                
-#define wxART_REPORT_VIEW          wxART_MAKE_ART_ID(wxART_REPORT_VIEW)        
-#define wxART_LIST_VIEW            wxART_MAKE_ART_ID(wxART_LIST_VIEW)          
-#define wxART_NEW_DIR              wxART_MAKE_ART_ID(wxART_NEW_DIR)            
-#define wxART_FOLDER               wxART_MAKE_ART_ID(wxART_FOLDER)             
-#define wxART_GO_DIR_UP            wxART_MAKE_ART_ID(wxART_GO_DIR_UP)          
-#define wxART_EXECUTABLE_FILE      wxART_MAKE_ART_ID(wxART_EXECUTABLE_FILE)    
-#define wxART_NORMAL_FILE          wxART_MAKE_ART_ID(wxART_NORMAL_FILE)        
-#define wxART_TICK_MARK            wxART_MAKE_ART_ID(wxART_TICK_MARK)          
-#define wxART_CROSS_MARK           wxART_MAKE_ART_ID(wxART_CROSS_MARK)         
-#define wxART_ERROR                wxART_MAKE_ART_ID(wxART_ERROR)              
-#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_ADD_BOOKMARK         wxART_MAKE_ART_ID(wxART_ADD_BOOKMARK)
+#define wxART_DEL_BOOKMARK         wxART_MAKE_ART_ID(wxART_DEL_BOOKMARK)
+#define wxART_HELP_SIDE_PANEL      wxART_MAKE_ART_ID(wxART_HELP_SIDE_PANEL)
+#define wxART_HELP_SETTINGS        wxART_MAKE_ART_ID(wxART_HELP_SETTINGS)
+#define wxART_HELP_BOOK            wxART_MAKE_ART_ID(wxART_HELP_BOOK)
+#define wxART_HELP_FOLDER          wxART_MAKE_ART_ID(wxART_HELP_FOLDER)
+#define wxART_HELP_PAGE            wxART_MAKE_ART_ID(wxART_HELP_PAGE)
+#define wxART_GO_BACK              wxART_MAKE_ART_ID(wxART_GO_BACK)
+#define wxART_GO_FORWARD           wxART_MAKE_ART_ID(wxART_GO_FORWARD)
+#define wxART_GO_UP                wxART_MAKE_ART_ID(wxART_GO_UP)
+#define wxART_GO_DOWN              wxART_MAKE_ART_ID(wxART_GO_DOWN)
+#define wxART_GO_TO_PARENT         wxART_MAKE_ART_ID(wxART_GO_TO_PARENT)
+#define wxART_GO_HOME              wxART_MAKE_ART_ID(wxART_GO_HOME)
+#define wxART_FILE_OPEN            wxART_MAKE_ART_ID(wxART_FILE_OPEN)
+#define wxART_FILE_SAVE            wxART_MAKE_ART_ID(wxART_FILE_SAVE)
+#define wxART_FILE_SAVE_AS         wxART_MAKE_ART_ID(wxART_FILE_SAVE_AS)
+#define wxART_PRINT                wxART_MAKE_ART_ID(wxART_PRINT)
+#define wxART_HELP                 wxART_MAKE_ART_ID(wxART_HELP)
+#define wxART_TIP                  wxART_MAKE_ART_ID(wxART_TIP)
+#define wxART_REPORT_VIEW          wxART_MAKE_ART_ID(wxART_REPORT_VIEW)
+#define wxART_LIST_VIEW            wxART_MAKE_ART_ID(wxART_LIST_VIEW)
+#define wxART_NEW_DIR              wxART_MAKE_ART_ID(wxART_NEW_DIR)
+#define wxART_HARDDISK             wxART_MAKE_ART_ID(wxART_HARDDISK)
+#define wxART_FLOPPY               wxART_MAKE_ART_ID(wxART_FLOPPY)
+#define wxART_CDROM                wxART_MAKE_ART_ID(wxART_CDROM)
+#define wxART_REMOVABLE            wxART_MAKE_ART_ID(wxART_REMOVABLE)
+#define wxART_FOLDER               wxART_MAKE_ART_ID(wxART_FOLDER)
+#define wxART_FOLDER_OPEN          wxART_MAKE_ART_ID(wxART_FOLDER_OPEN)
+#define wxART_GO_DIR_UP            wxART_MAKE_ART_ID(wxART_GO_DIR_UP)
+#define wxART_EXECUTABLE_FILE      wxART_MAKE_ART_ID(wxART_EXECUTABLE_FILE)
+#define wxART_NORMAL_FILE          wxART_MAKE_ART_ID(wxART_NORMAL_FILE)
+#define wxART_TICK_MARK            wxART_MAKE_ART_ID(wxART_TICK_MARK)
+#define wxART_CROSS_MARK           wxART_MAKE_ART_ID(wxART_CROSS_MARK)
+#define wxART_ERROR                wxART_MAKE_ART_ID(wxART_ERROR)
+#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)
 
 #define wxART_MISSING_IMAGE        wxART_MAKE_ART_ID(wxART_MISSING_IMAGE)
 

+#define wxART_COPY                 wxART_MAKE_ART_ID(wxART_COPY)
+#define wxART_CUT                  wxART_MAKE_ART_ID(wxART_CUT)
+#define wxART_PASTE                wxART_MAKE_ART_ID(wxART_PASTE)
+#define wxART_DELETE               wxART_MAKE_ART_ID(wxART_DELETE)
+
+#define wxART_UNDO                 wxART_MAKE_ART_ID(wxART_UNDO)
+#define wxART_REDO                 wxART_MAKE_ART_ID(wxART_REDO)
+
+#define wxART_QUIT                 wxART_MAKE_ART_ID(wxART_QUIT)
+
+#define wxART_FIND                 wxART_MAKE_ART_ID(wxART_FIND)
+#define wxART_FIND_AND_REPLACE     wxART_MAKE_ART_ID(wxART_FIND_AND_REPLACE)
+
+

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


@@ -102,10 +124,10 @@ public:
     // Remove provider. The provider must have been added previously!
     // The provider is _not_ deleted.
     static bool RemoveProvider(wxArtProvider *provider);
     // Remove provider. The provider must have been added previously!
     // The provider is _not_ deleted.
     static bool RemoveProvider(wxArtProvider *provider);

-    
+

     // Query the providers for bitmap with given ID and return it. Return
     // wxNullBitmap if no provider provides it.
     // Query the providers for bitmap with given ID and return it. Return
     // wxNullBitmap if no provider provides it.

-    static wxBitmap GetBitmap(const wxArtID& id, 
+    static wxBitmap GetBitmap(const wxArtID& id,

                               const wxArtClient& client = wxART_OTHER,
                               const wxSize& size = wxDefaultSize);
 
                               const wxArtClient& client = wxART_OTHER,
                               const wxSize& size = wxDefaultSize);
 


@@ -119,10 +141,12 @@ 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();
 

-    // Derived classes must override this method to create requested 
+    // 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.
     virtual wxBitmap CreateBitmap(const wxArtID& WXUNUSED(id),
     // art resource. This method is called only once per instance's
     // lifetime for each requested wxArtID.
     virtual wxBitmap CreateBitmap(const wxArtID& WXUNUSED(id),