more fixes to radio menu items: fixed Check() for them; allow separators inside the...

[wxWidgets.git] / src / common / artstd.cpp

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index bcd007fff3c67d08353151802305d5119b068bf9..3bbd83c4c8d9ae93e2ef3d9a96e18a3f62283aa7 100644 (file)
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -13,10 +13,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "artprov.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -27,6 +23,9 @@
 #include "wx/artprov.h"
 #include "wx/module.h"
 
+// For the purposes of forcing this module to link
+char g_ArtProviderModule = 0;
+
 // ----------------------------------------------------------------------------
 // wxDefaultArtProvider
 // ----------------------------------------------------------------------------
@@ -34,13 +33,13 @@
 class wxDefaultArtProvider : public wxArtProvider
 {
 protected:
-    virtual wxBitmap CreateBitmap(const wxArtDomain& domain, 
-                                  const wxArtID& id, const wxSize& size);
+    virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client,
+                                  const wxSize& size);
 };
 
-#define BEGIN_DOMAIN(domainId) if ( domain == domainId ) {
-#define END_DOMAIN()           }
-#define ART_ID(artId, xpmRc)   if ( id == artId ) return wxBitmap(xpmRc##_xpm);
+#define ART(artId, xpmRc) \
+    if ( id == artId ) return wxBitmap(xpmRc##_xpm);
+    
 
 // ----------------------------------------------------------------------------
 // wxDefaultArtProviderModule
@@ -70,25 +69,34 @@ IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule)
 #define static static const
 
 #if wxUSE_HTML
-#include "../../art/wxhtml/addbookm.xpm"
-#include "../../art/wxhtml/delbookm.xpm"
-#include "../../art/wxhtml/navig.xpm"
-#include "../../art/wxhtml/settings.xpm"
-#include "../../art/wxhtml/book.xpm"
-#include "../../art/wxhtml/folder.xpm"
-#include "../../art/wxhtml/page.xpm"
+    #include "../../art/htmsidep.xpm"
+    #include "../../art/htmoptns.xpm"
+    #include "../../art/htmbook.xpm"
+    #include "../../art/htmfoldr.xpm"
+    #include "../../art/htmpage.xpm"
 #endif // wxUSE_HTML
 
-#include "../../art/browser/back.xpm"
-#include "../../art/browser/forward.xpm"
-#include "../../art/browser/up.xpm"
-#include "../../art/browser/down.xpm"
-#include "../../art/browser/toparent.xpm"
-
-#include "../../art/toolbar/fileopen.xpm"
-#include "../../art/toolbar/print.xpm"
-
-#include "../../art/framicon/help.xpm"
+#include "../../art/addbookm.xpm"
+#include "../../art/delbookm.xpm"
+#include "../../art/back.xpm"
+#include "../../art/forward.xpm"
+#include "../../art/up.xpm"
+#include "../../art/down.xpm"
+#include "../../art/toparent.xpm"
+#include "../../art/fileopen.xpm"
+#include "../../art/print.xpm"
+#include "../../art/helpicon.xpm"
+#include "../../art/tipicon.xpm"
+#include "../../art/home.xpm"
+#include "../../art/repview.xpm"
+#include "../../art/listview.xpm"
+#include "../../art/new_dir.xpm"
+#include "../../art/folder.xpm"
+#include "../../art/dir_up.xpm"
+#include "../../art/exefile.xpm"
+#include "../../art/deffile.xpm"
+#include "../../art/tick.xpm"
+#include "../../art/cross.xpm"
 
 #undef static
 
@@ -96,38 +104,38 @@ IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule)
 // CreateBitmap routine
 // ----------------------------------------------------------------------------
 
-wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtDomain& domain, 
-                                            const wxArtID& id,
+wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
+                                            const wxArtClient& client,
                                             const wxSize& size)
 {
 #if wxUSE_HTML
-    BEGIN_DOMAIN(wxART_WXHTML)
-        ART_ID(wxART_ADD_BOOKMARK,     addbookm)
-        ART_ID(wxART_DEL_BOOKMARK,     delbookm)
-        ART_ID(wxART_NAVIG_PANEL,      navig)
-        ART_ID(wxART_HELP_SETTINGS,    settings)
-        ART_ID(wxART_HELP_BOOK,        book)
-        ART_ID(wxART_HELP_FOLDER,      folder)
-        ART_ID(wxART_HELP_PAGE,        page)
-    END_DOMAIN()
+    ART(wxART_HELP_SIDE_PANEL,                     htmsidep)
+    ART(wxART_HELP_SETTINGS,                       htmoptns)
+    ART(wxART_HELP_BOOK,                           htmbook)
+    ART(wxART_HELP_FOLDER,                         htmfoldr)
+    ART(wxART_HELP_PAGE,                           htmpage)
 #endif // wxUSE_HTML
-
-    BEGIN_DOMAIN(wxART_BROWSER_TOOLBAR)
-        ART_ID(wxART_GO_BACK,          back)
-        ART_ID(wxART_GO_FORWARD,       forward)
-        ART_ID(wxART_GO_UP,            up)
-        ART_ID(wxART_GO_DOWN,          down)
-        ART_ID(wxART_GO_TO_PARENT,     toparent)
-    END_DOMAIN()
-
-    BEGIN_DOMAIN(wxART_TOOLBAR)
-        ART_ID(wxART_FILE_OPEN,        fileopen)
-        ART_ID(wxART_PRINT,            print)
-    END_DOMAIN()
-
-    BEGIN_DOMAIN(wxART_FRAME_ICON)
-        ART_ID(wxART_HELP,             help)
-    END_DOMAIN()
+    ART(wxART_ADD_BOOKMARK,                        addbookm)
+    ART(wxART_DEL_BOOKMARK,                        delbookm)
+    ART(wxART_GO_BACK,                             back)
+    ART(wxART_GO_FORWARD,                          forward)
+    ART(wxART_GO_UP,                               up)
+    ART(wxART_GO_DOWN,                             down)
+    ART(wxART_GO_TO_PARENT,                        toparent)
+    ART(wxART_GO_HOME,                             home)
+    ART(wxART_FILE_OPEN,                           fileopen)
+    ART(wxART_PRINT,                               print)
+    ART(wxART_HELP,                                helpicon)
+    ART(wxART_TIP,                                 tipicon)
+    ART(wxART_REPORT_VIEW,                         repview)
+    ART(wxART_LIST_VIEW,                           listview)
+    ART(wxART_NEW_DIR,                             new_dir)
+    ART(wxART_FOLDER,                              folder)
+    ART(wxART_GO_DIR_UP,                           dir_up)
+    ART(wxART_EXECUTABLE_FILE,                     exefile)
+    ART(wxART_NORMAL_FILE,                         deffile)
+    ART(wxART_TICK_MARK,                           tick)
+    ART(wxART_CROSS_MARK,                          cross)
 
     return wxNullBitmap;
 }