corrected conflicts after import of libpng-1.2.4

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

diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index c01a5ccd10fe07d110bbceebbe8b523f2986dbd9..cd4821d5bc21c39d694e34038a0e7372d1fd54b3 100644 (file)
--- a/include/wx/artprov.h
+++ b/include/wx/artprov.h
@@ -34,14 +34,15 @@ typedef wxString wxArtID;
 // Art clients
 // ----------------------------------------------------------------------------
 
-#define wxART_TOOLBAR                       _T("toolbar_C")
-#define wxART_MENU                          _T("menu_C")
-#define wxART_FRAME_ICON                    _T("frame_icon_C")
+#define wxART_TOOLBAR                  _T("toolbar_C")
+#define wxART_MENU                     _T("menu_C")
+#define wxART_FRAME_ICON               _T("frame_icon_C")
 
-#define wxART_CMN_DIALOG                    _T("cmn_dialog_C")
-#define wxART_HELP_BROWSER                  _T("help_browser_C")
+#define wxART_CMN_DIALOG               _T("cmn_dialog_C")
+#define wxART_HELP_BROWSER             _T("help_browser_C")
+#define wxART_MESSAGE_BOX              _T("message_box_C")
 
-#define wxART_OTHER                         _T("other_C")
+#define wxART_OTHER                    _T("other_C")
 
 // ----------------------------------------------------------------------------
 // Art IDs
@@ -59,10 +60,24 @@ typedef wxString wxArtID;
 #define wxART_GO_UP                    _T("go_up")
 #define wxART_GO_DOWN                  _T("go_down")
 #define wxART_GO_TO_PARENT             _T("go_to_parent")
+#define wxART_GO_HOME                  _T("go_home")
 #define wxART_FILE_OPEN                _T("file_open")
 #define wxART_PRINT                    _T("print")
 #define wxART_HELP                     _T("help")
 #define wxART_TIP                      _T("tip")
+#define wxART_REPORT_VIEW              _T("report_view")
+#define wxART_LIST_VIEW                _T("list_view")
+#define wxART_NEW_DIR                  _T("new_dir")
+#define wxART_FOLDER                   _T("folder")
+#define wxART_GO_DIR_UP                _T("go_dir_up")
+#define wxART_EXECUTABLE_FILE          _T("executable_file")
+#define wxART_NORMAL_FILE              _T("normal_file")
+#define wxART_TICK_MARK                _T("tick")
+#define wxART_CROSS_MARK               _T("cross")
+#define wxART_ERROR                    _T("error")
+#define wxART_QUESTION                 _T("question")
+#define wxART_WARNING                  _T("warning")
+#define wxART_INFORMATION              _T("information")
 
 // ----------------------------------------------------------------------------
 // wxArtProvider class
@@ -102,11 +117,7 @@ protected:
     // lifetime for each requested wxArtID.
     virtual wxBitmap CreateBitmap(const wxArtID& WXUNUSED(id),
                                   const wxArtClient& WXUNUSED(client),
-                                  const wxSize& WXUNUSED(size))
-    {
-        wxFAIL_MSG(_T("pure virtual method wxArtProvider::CreateBitmap called!"));
-        return wxNullBitmap;
-    }
+                                  const wxSize& WXUNUSED(size)) = 0;
 
 private:
     // list of providers: