merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

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() {}
+    // 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
 
-    DECLARE_DYNAMIC_CLASS(wxDefaultArtProviderModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule)
+    wxArtProvider::PushProvider(new wxDefaultArtProvider);
+}
 
 
 // ----------------------------------------------------------------------------