X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66941e14d69e0cee8a67afc81203e958e08a6acf..9c136858af7a37b1ed7d5f036f8d6953f7c8d507:/src/common/artstd.cpp

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index cc08b0d756..31b4355928 100644
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -27,7 +27,6 @@
 #endif
 
 #include "wx/artprov.h"
-#include "wx/module.h"
 
 // For the purposes of forcing this module to link
 char g_ArtProviderModule = 0;
@@ -93,23 +92,20 @@ protected:
     }
 
 // ----------------------------------------------------------------------------
-// wxDefaultArtProviderModule
+// wxArtProvider::InitStdProvider
 // ----------------------------------------------------------------------------
 
-class wxDefaultArtProviderModule: public wxModule
+/*static*/ void wxArtProvider::InitStdProvider()
 {
-public:
-    bool OnInit() 
-    {
-        wxArtProvider::PushProvider(new wxDefaultArtProvider);
-        return TRUE; 
-    }
-    void OnExit() {}
-
-    DECLARE_DYNAMIC_CLASS(wxDefaultArtProviderModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule)
+    // 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);
+}
 
 
 // ----------------------------------------------------------------------------
@@ -169,7 +165,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule)
 
 wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
                                             const wxArtClient& client,
-                                            const wxSize& size)
+                                            const wxSize& WXUNUSED(size))
 {
     // wxMessageBox icons:
     ART_MSGBOX(wxART_ERROR,       wxICON_ERROR,       error)