Added hack to make standard art provider link with app

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

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index 7294febe6f51d57dc609daf0282c23de74239b4b..1c18b538ca93d0e1beac7fc89548bd302c612c65 100644 (file)
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -33,6 +33,8 @@
 #include "wx/hashmap.h"
 #include "wx/module.h"
 
+// For the purposes of forcing this module to link
+extern char g_ArtProviderModule;
 
 // ===========================================================================
 // implementation
@@ -81,6 +83,9 @@ bool wxArtProviderCache::GetBitmap(const wxString& full_id, wxBitmap* bmp)
 
 void wxArtProviderCache::Clear()
 {
+    // Hack to make the default provider link
+    // with the application
+    g_ArtProviderModule = 0;
     m_bitmapsHash.clear();
 }
 

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index fb05b05047eba7425231e754be4d8199adc23ed4..3bbd83c4c8d9ae93e2ef3d9a96e18a3f62283aa7 100644 (file)
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -23,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
 // ----------------------------------------------------------------------------