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 acf173b8b30d3d91cf98bc596753b7300555aaa3..69c692852870f14460b3b92aa33706dcbc26fca7 100644 (file)
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -231,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


@@ -440,7 +440,9 @@ 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
 #if wxUSE_ARTPROVIDER_TANGO
         wxArtProvider::InitTangoProvider();
 #endif // wxUSE_ARTPROVIDER_TANGO