generate a text event even if SetValue() didn't really chaneg anything

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

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index 27a7d54d90a88defa2977e73cf78869c040b137a..1dda57dd33db0098efb53aa971ce3f676fdd6f64 100644 (file)
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -49,7 +49,7 @@ WX_DEFINE_LIST(wxArtProvidersList);
 // Cache class - stores already requested bitmaps
 // ----------------------------------------------------------------------------
 
 // Cache class - stores already requested bitmaps
 // ----------------------------------------------------------------------------
 

-WX_DECLARE_STRING_HASH_MAP(wxBitmap, wxArtProviderBitmapsHash);
+WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxBitmap, wxArtProviderBitmapsHash);

 
 class WXDLLEXPORT wxArtProviderCache
 {
 
 class WXDLLEXPORT wxArtProviderCache
 {


@@ -59,7 +59,7 @@ public:
         { m_bitmapsHash[full_id] = bmp; }
 
     void Clear();
         { m_bitmapsHash[full_id] = bmp; }
 
     void Clear();

-    
+

     static wxString ConstructHashID(const wxArtID& id,
                                     const wxArtClient& client,
                                     const wxSize& size);
     static wxString ConstructHashID(const wxArtID& id,
                                     const wxArtClient& client,
                                     const wxSize& size);


@@ -114,11 +114,11 @@ 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_providers->Insert(provider);
         sm_cache = new wxArtProviderCache;
     }
 
     sm_providers->Insert(provider);

+    sm_cache->Clear();

 }
 
 /*static*/ bool wxArtProvider::PopProvider()
 }
 
 /*static*/ bool wxArtProvider::PopProvider()


@@ -126,7 +126,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;
 }


@@ -137,15 +138,17 @@ 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;
     }

-    
+

     return FALSE;
 }
 
 /*static*/ void wxArtProvider::CleanUpProviders()
 {
     return FALSE;
 }
 
 /*static*/ void wxArtProvider::CleanUpProviders()
 {

+    WX_CLEAR_LIST(wxArtProvidersList, *sm_providers);

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


@@ -164,13 +167,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 ( size != wxDefaultSize && 
+                if ( size != wxDefaultSize &&

                      (bmp.GetWidth() != size.x || bmp.GetHeight() != size.y) )
                 {
                     wxImage img = bmp.ConvertToImage();
                      (bmp.GetWidth() != size.x || bmp.GetHeight() != size.y) )
                 {
                     wxImage img = bmp.ConvertToImage();


@@ -194,25 +197,27 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
     wxCHECK_MSG( sm_providers, wxNullIcon, _T("no wxArtProvider exists") );
 
     wxBitmap bmp = GetBitmap(id, client, size);
     wxCHECK_MSG( sm_providers, wxNullIcon, _T("no wxArtProvider exists") );
 
     wxBitmap bmp = GetBitmap(id, client, size);

-    if ( bmp.Ok() )
-    {
-        wxIcon icon;
-        icon.CopyFromBitmap(bmp);
-        return icon;
-    }
-    else
-    {
+    if ( !bmp.Ok() )

         return wxNullIcon;
         return wxNullIcon;

-    }
-}

 
 

+    wxIcon icon;
+    icon.CopyFromBitmap(bmp);
+    return icon;
+}

 
 
 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)
 };