don't use deprecated wxImage methods inside wxWin

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

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index a8785916b58c5bd7d1876ba54d8ccf22f522d6c6..1c18b538ca93d0e1beac7fc89548bd302c612c65 100644 (file)
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -33,6 +33,8 @@
 #include "wx/hashmap.h"
 #include "wx/module.h"
 
 #include "wx/hashmap.h"
 #include "wx/module.h"
 

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

 
 // ===========================================================================
 // implementation
 
 // ===========================================================================
 // implementation


@@ -57,8 +59,8 @@ public:
 
     void Clear();
     
 
     void Clear();
     

-    static wxString ConstructHashID(const wxArtDomain& domain, 
-                                    const wxArtID& id,
+    static wxString ConstructHashID(const wxArtID& id,
+                                    const wxArtClient& client,

                                     const wxSize& size);
 
 private:
                                     const wxSize& size);
 
 private:


@@ -81,15 +83,18 @@ bool wxArtProviderCache::GetBitmap(const wxString& full_id, wxBitmap* bmp)
 
 void wxArtProviderCache::Clear()
 {
 
 void wxArtProviderCache::Clear()
 {

+    // Hack to make the default provider link
+    // with the application
+    g_ArtProviderModule = 0;

     m_bitmapsHash.clear();
 }
 
 /*static*/ wxString wxArtProviderCache::ConstructHashID(
     m_bitmapsHash.clear();
 }
 
 /*static*/ wxString wxArtProviderCache::ConstructHashID(

-                                    const wxArtDomain& domain, 
-                                    const wxArtID& id, const wxSize& size)
+                                const wxArtID& id, const wxArtClient& client,
+                                const wxSize& size)

 {
     wxString str;
 {
     wxString str;

-    str.Printf(wxT("%s-%s-%i-%i"), domain.c_str(), id.c_str(), size.x, size.y);
+    str.Printf(wxT("%s-%s-%i-%i"), id.c_str(), client.c_str(), size.x, size.y);

     return str;
 }
 
     return str;
 }
 


@@ -144,13 +149,16 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
     wxDELETE(sm_cache);
 }
 
     wxDELETE(sm_cache);
 }
 

-/*static*/ wxBitmap wxArtProvider::GetBitmap(const wxArtDomain& domain,
-                                             const wxArtID& id,
+/*static*/ wxBitmap wxArtProvider::GetBitmap(const wxArtID& id,
+                                             const wxArtClient& client,

                                              const wxSize& size)
 {
                                              const wxSize& size)
 {

+    // safety-check against writing client,id,size instead of id,client,size:
+    wxASSERT_MSG( client.Last() == _T('C'), _T("invalid 'client' parameter") );
+

     wxCHECK_MSG( sm_providers, wxNullBitmap, _T("no wxArtProvider exists") );
 
     wxCHECK_MSG( sm_providers, wxNullBitmap, _T("no wxArtProvider exists") );
 

-    wxString hashId = wxArtProviderCache::ConstructHashID(domain, id, size);
+    wxString hashId = wxArtProviderCache::ConstructHashID(id, client, size);

 
     wxBitmap bmp;
     if ( !sm_cache->GetBitmap(hashId, &bmp) )
 
     wxBitmap bmp;
     if ( !sm_cache->GetBitmap(hashId, &bmp) )


@@ -158,7 +166,7 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
         for (wxArtProvidersList::Node *node = sm_providers->GetFirst();
              node; node = node->GetNext())
         {
         for (wxArtProvidersList::Node *node = sm_providers->GetFirst();
              node; node = node->GetNext())
         {

-            bmp = node->GetData()->CreateBitmap(domain, id, size);
+            bmp = node->GetData()->CreateBitmap(id, client, size);

             if ( bmp.Ok() )
                 break;
         }
             if ( bmp.Ok() )
                 break;
         }


@@ -168,13 +176,13 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
     return bmp;
 }
 
     return bmp;
 }
 

-/*static*/ wxIcon wxArtProvider::GetIcon(const wxArtDomain& domain, 
-                                         const wxArtID& id,
+/*static*/ wxIcon wxArtProvider::GetIcon(const wxArtID& id,
+                                         const wxArtClient& client,

                                          const wxSize& size)
 {
     wxCHECK_MSG( sm_providers, wxNullIcon, _T("no wxArtProvider exists") );
 
                                          const wxSize& size)
 {
     wxCHECK_MSG( sm_providers, wxNullIcon, _T("no wxArtProvider exists") );
 

-    wxBitmap bmp = GetBitmap(domain, id, size);
+    wxBitmap bmp = GetBitmap(id, client, size);

     if ( bmp.Ok() )
     {
         wxIcon icon;
     if ( bmp.Ok() )
     {
         wxIcon icon;