X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d3dfc57e77c64a4691fae47b566bcfb99eceb48..95912bdddeb21afe1cabc0401c0f8b8475a5e5c6:/src/common/artprov.cpp?ds=sidebyside

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index 3a4f56b04c..dac5bd30b7 100644
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -204,11 +204,8 @@ wxArtProvider::~wxArtProvider()
         while ( !sm_providers->empty() )
             delete *sm_providers->begin();
 
-        delete sm_providers;
-        sm_providers = NULL;
-
-        delete sm_cache;
-        sm_cache = NULL;
+        wxDELETE(sm_providers);
+        wxDELETE(sm_cache);
     }
 }
 
@@ -443,7 +440,12 @@ class wxArtProviderModule: public wxModule
 public:
     bool OnInit()
     {
+#if wxUSE_ARTPROVIDER_STD
         wxArtProvider::InitStdProvider();
+#endif // wxUSE_ARTPROVIDER_STD
+#if wxUSE_ARTPROVIDER_TANGO
+        wxArtProvider::InitTangoProvider();
+#endif // wxUSE_ARTPROVIDER_TANGO
         wxArtProvider::InitNativeProvider();
         return true;
     }