Add some version checks to help compiling on OSX.

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

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index 3a4f56b04cfe9142345d0c85bc522e920f2c72c4..69c692852870f14460b3b92aa33706dcbc26fca7 100644 (file)
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -204,11 +204,8 @@ wxArtProvider::~wxArtProvider()
         while ( !sm_providers->empty() )
             delete *sm_providers->begin();
 
         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);

     }
 }
 
     }
 }
 


@@ -234,12 +231,12 @@ wxArtProvider::~wxArtProvider()
              node; node = node->GetNext())
         {
             bmp = node->GetData()->CreateBitmap(id, client, size);
              node; node = node->GetNext())
         {
             bmp = node->GetData()->CreateBitmap(id, client, size);

-            if ( bmp.Ok() )
+            if ( bmp.IsOk() )

                 break;
         }
 
         wxSize sizeNeeded = size;
                 break;
         }
 
         wxSize sizeNeeded = size;

-        if ( !bmp.Ok() )
+        if ( !bmp.IsOk() )

         {
             // no bitmap created -- as a fallback, try if we can find desired
             // icon in a bundle
         {
             // no bitmap created -- as a fallback, try if we can find desired
             // icon in a bundle


@@ -443,7 +440,12 @@ class wxArtProviderModule: public wxModule
 public:
     bool OnInit()
     {
 public:
     bool OnInit()
     {

+#if wxUSE_ARTPROVIDER_STD

         wxArtProvider::InitStdProvider();
         wxArtProvider::InitStdProvider();

+#endif // wxUSE_ARTPROVIDER_STD
+#if wxUSE_ARTPROVIDER_TANGO
+        wxArtProvider::InitTangoProvider();
+#endif // wxUSE_ARTPROVIDER_TANGO

         wxArtProvider::InitNativeProvider();
         return true;
     }
         wxArtProvider::InitNativeProvider();
         return true;
     }