modifications to URL<->filename conversion: take wxFileName, rename

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

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index 9a8e4f53eb476bf2ff70d0087c800df65e31b2d8..31b43559289f33714a9d40af5155369c88f38138 100644 (file)
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -27,7 +27,6 @@
 #endif
 
 #include "wx/artprov.h"
 #endif
 
 #include "wx/artprov.h"

-#include "wx/module.h"

 
 // For the purposes of forcing this module to link
 char g_ArtProviderModule = 0;
 
 // 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);
+}

 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------