X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..4c420a80e0fb11511b235411875ba5d3e0eb8492:/src/common/artprov.cpp

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index eb081a66b7..0b8018556c 100644
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -6,7 +6,7 @@
 // Created:     18/03/2002
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ---------------------------------------------------------------------------
@@ -36,9 +36,6 @@
 #include "wx/image.h"
 #endif
 
-// For the purposes of forcing this module to link
-extern char g_ArtProviderModule;
-
 // ===========================================================================
 // implementation
 // ===========================================================================
@@ -75,20 +72,17 @@ bool wxArtProviderCache::GetBitmap(const wxString& full_id, wxBitmap* bmp)
     wxArtProviderBitmapsHash::iterator entry = m_bitmapsHash.find(full_id);
     if ( entry == m_bitmapsHash.end() )
     {
-        return FALSE;
+        return false;
     }
     else
     {
         *bmp = entry->second;
-        return TRUE;
+        return true;
     }
 }
 
 void wxArtProviderCache::Clear()
 {
-    // Hack to make the default provider link
-    // with the application
-    g_ArtProviderModule = 0;
     m_bitmapsHash.clear();
 }
 
@@ -125,27 +119,27 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
 
 /*static*/ bool wxArtProvider::PopProvider()
 {
-    wxCHECK_MSG( sm_providers, FALSE, _T("no wxArtProvider exists") );
-    wxCHECK_MSG( sm_providers->GetCount() > 0, FALSE, _T("wxArtProviders stack is empty") );
+    wxCHECK_MSG( sm_providers, false, _T("no wxArtProvider exists") );
+    wxCHECK_MSG( sm_providers->GetCount() > 0, false, _T("wxArtProviders stack is empty") );
 
     delete sm_providers->GetFirst()->GetData();
     sm_providers->Erase(sm_providers->GetFirst());
     sm_cache->Clear();
-    return TRUE;
+    return true;
 }
 
 /*static*/ bool wxArtProvider::RemoveProvider(wxArtProvider *provider)
 {
-    wxCHECK_MSG( sm_providers, FALSE, _T("no wxArtProvider exists") );
+    wxCHECK_MSG( sm_providers, false, _T("no wxArtProvider exists") );
 
     if ( sm_providers->DeleteObject(provider) )
     {
         delete provider;
         sm_cache->Clear();
-        return TRUE;
+        return true;
     }
 
-    return FALSE;
+    return false;
 }
 
 /*static*/ void wxArtProvider::CleanUpProviders()
@@ -183,7 +177,7 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
                     img.Rescale(size.x, size.y);
                     bmp = wxBitmap(img);
                 }
-#endif                
+#endif
                 break;
             }
         }
@@ -216,7 +210,8 @@ public:
     bool OnInit()
     {
         wxArtProvider::InitStdProvider();
-        return TRUE;
+        wxArtProvider::InitNativeProvider();
+        return true;
     }
     void OnExit()
     {