wxUSE_*BOOK checks.

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

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index 7e8abec577b01cb1a37da149a48af16016cc0f43..613b901d7e0a6f2ce289c53baee3af6ff89be730 100644 (file)
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -28,9 +28,6 @@
 
 #include "wx/artprov.h"
 
 
 #include "wx/artprov.h"
 

-// For the purposes of forcing this module to link
-char g_ArtProviderModule = 0;
-

 // ----------------------------------------------------------------------------
 // wxDefaultArtProvider
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxDefaultArtProvider
 // ----------------------------------------------------------------------------


@@ -79,16 +76,15 @@ protected:
 
 /*static*/ void wxArtProvider::InitStdProvider()
 {
 
 /*static*/ void wxArtProvider::InitStdProvider()
 {

-    // NB: A few notes about this function:
-    //     (1) it is in artstd.cpp and not in artprov.cpp on purpose. I wanted
-    //         to avoid declaring wxDefaultArtProvider in any public header as
-    //         it is only an implementation detail
-    //     (2) other default art providers (e.g. GTK one) should NOT be added
-    //         here. Instead, add them in port-specific initialialization code
-

     wxArtProvider::PushProvider(new wxDefaultArtProvider);
 }
 
     wxArtProvider::PushProvider(new wxDefaultArtProvider);
 }
 

+#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)
+/*static*/ void wxArtProvider::InitNativeProvider()
+{
+}
+#endif
+

 
 // ----------------------------------------------------------------------------
 // XPMs with the art
 
 // ----------------------------------------------------------------------------
 // XPMs with the art


@@ -115,9 +111,9 @@ protected:
     #include "../../art/htmbook.xpm"
     #include "../../art/htmfoldr.xpm"
     #include "../../art/htmpage.xpm"
     #include "../../art/htmbook.xpm"
     #include "../../art/htmfoldr.xpm"
     #include "../../art/htmpage.xpm"

-    #include "../../art/missimg.xpm"

 #endif // wxUSE_HTML
 
 #endif // wxUSE_HTML
 

+#include "../../art/missimg.xpm"

 #include "../../art/addbookm.xpm"
 #include "../../art/delbookm.xpm"
 #include "../../art/back.xpm"
 #include "../../art/addbookm.xpm"
 #include "../../art/delbookm.xpm"
 #include "../../art/back.xpm"


@@ -163,8 +159,8 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
     ART(wxART_HELP_BOOK,                           htmbook)
     ART(wxART_HELP_FOLDER,                         htmfoldr)
     ART(wxART_HELP_PAGE,                           htmpage)
     ART(wxART_HELP_BOOK,                           htmbook)
     ART(wxART_HELP_FOLDER,                         htmfoldr)
     ART(wxART_HELP_PAGE,                           htmpage)

-    ART(wxART_MISSING_IMAGE,                       missimg)

 #endif // wxUSE_HTML
 #endif // wxUSE_HTML

+    ART(wxART_MISSING_IMAGE,                       missimg)

     ART(wxART_ADD_BOOKMARK,                        addbookm)
     ART(wxART_DEL_BOOKMARK,                        delbookm)
     ART(wxART_GO_BACK,                             back)
     ART(wxART_ADD_BOOKMARK,                        addbookm)
     ART(wxART_DEL_BOOKMARK,                        delbookm)
     ART(wxART_GO_BACK,                             back)