Add wxBitmap::GetNSImage() which creates an autoreleased NSImage either

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

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index 64b87d781ee45ee1f587a34bc7b45e32828d5208..a14428f89e8fcb97043d1b1985614deee1a8b882 100644 (file)
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -13,7 +13,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "artprov.h"
 #endif
 
     #pragma implementation "artprov.h"
 #endif
 


@@ -32,7 +32,9 @@
 #include "wx/artprov.h"
 #include "wx/hashmap.h"
 #include "wx/module.h"
 #include "wx/artprov.h"
 #include "wx/hashmap.h"
 #include "wx/module.h"

+#if wxUSE_IMAGE

 #include "wx/image.h"
 #include "wx/image.h"

+#endif

 
 // For the purposes of forcing this module to link
 extern char g_ArtProviderModule;
 
 // For the purposes of forcing this module to link
 extern char g_ArtProviderModule;


@@ -114,7 +116,6 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
     if ( !sm_providers )
     {
         sm_providers = new wxArtProvidersList;
     if ( !sm_providers )
     {
         sm_providers = new wxArtProvidersList;

-        sm_providers->DeleteContents(TRUE);

         sm_cache = new wxArtProviderCache;
     }
 
         sm_cache = new wxArtProviderCache;
     }
 


@@ -127,7 +128,8 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
     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") );
 

-    sm_providers->DeleteNode(sm_providers->GetFirst());
+    delete sm_providers->GetFirst()->GetData();
+    sm_providers->Erase(sm_providers->GetFirst());

     sm_cache->Clear();
     return TRUE;
 }
     sm_cache->Clear();
     return TRUE;
 }


@@ -138,6 +140,7 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
 
     if ( sm_providers->DeleteObject(provider) )
     {
 
     if ( sm_providers->DeleteObject(provider) )
     {

+        delete provider;

         sm_cache->Clear();
         return TRUE;
     }
         sm_cache->Clear();
         return TRUE;
     }


@@ -147,6 +150,7 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
 
 /*static*/ void wxArtProvider::CleanUpProviders()
 {
 
 /*static*/ void wxArtProvider::CleanUpProviders()
 {

+    WX_CLEAR_LIST(wxArtProvidersList, *sm_providers);

     wxDELETE(sm_providers);
     wxDELETE(sm_cache);
 }
     wxDELETE(sm_providers);
     wxDELETE(sm_cache);
 }


@@ -165,12 +169,13 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
     wxBitmap bmp;
     if ( !sm_cache->GetBitmap(hashId, &bmp) )
     {
     wxBitmap bmp;
     if ( !sm_cache->GetBitmap(hashId, &bmp) )
     {

-        for (wxArtProvidersList::Node *node = sm_providers->GetFirst();
+        for (wxArtProvidersList::compatibility_iterator node = sm_providers->GetFirst();

              node; node = node->GetNext())
         {
             bmp = node->GetData()->CreateBitmap(id, client, size);
             if ( bmp.Ok() )
             {
              node; node = node->GetNext())
         {
             bmp = node->GetData()->CreateBitmap(id, client, size);
             if ( bmp.Ok() )
             {

+#if wxUSE_IMAGE

                 if ( size != wxDefaultSize &&
                      (bmp.GetWidth() != size.x || bmp.GetHeight() != size.y) )
                 {
                 if ( size != wxDefaultSize &&
                      (bmp.GetWidth() != size.x || bmp.GetHeight() != size.y) )
                 {


@@ -178,6 +183,7 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
                     img.Rescale(size.x, size.y);
                     bmp = wxBitmap(img);
                 }
                     img.Rescale(size.x, size.y);
                     bmp = wxBitmap(img);
                 }

+#endif                

                 break;
             }
         }
                 break;
             }
         }


@@ -207,8 +213,15 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
 class wxArtProviderModule: public wxModule
 {
 public:
 class wxArtProviderModule: public wxModule
 {
 public:

-    bool OnInit() { return TRUE; }
-    void OnExit() { wxArtProvider::CleanUpProviders(); }
+    bool OnInit()
+    {
+        wxArtProvider::InitStdProvider();
+        return TRUE;
+    }
+    void OnExit()
+    {
+        wxArtProvider::CleanUpProviders();
+    }

 
     DECLARE_DYNAMIC_CLASS(wxArtProviderModule)
 };
 
     DECLARE_DYNAMIC_CLASS(wxArtProviderModule)
 };