fixed bug in parsing formats in which fields don't have any non-numeric delimiters

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

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index 7294febe6f51d57dc609daf0282c23de74239b4b..64b87d781ee45ee1f587a34bc7b45e32828d5208 100644 (file)
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -32,7 +32,10 @@
 #include "wx/artprov.h"
 #include "wx/hashmap.h"
 #include "wx/module.h"
+#include "wx/image.h"
 
+// For the purposes of forcing this module to link
+extern char g_ArtProviderModule;
 
 // ===========================================================================
 // implementation
@@ -46,7 +49,7 @@ WX_DEFINE_LIST(wxArtProvidersList);
 // Cache class - stores already requested bitmaps
 // ----------------------------------------------------------------------------
 
-WX_DECLARE_STRING_HASH_MAP(wxBitmap, wxArtProviderBitmapsHash);
+WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxBitmap, wxArtProviderBitmapsHash);
 
 class WXDLLEXPORT wxArtProviderCache
 {
@@ -56,7 +59,7 @@ public:
         { m_bitmapsHash[full_id] = bmp; }
 
     void Clear();
-    
+
     static wxString ConstructHashID(const wxArtID& id,
                                     const wxArtClient& client,
                                     const wxSize& size);
@@ -81,6 +84,9 @@ bool wxArtProviderCache::GetBitmap(const wxString& full_id, wxBitmap* bmp)
 
 void wxArtProviderCache::Clear()
 {
+    // Hack to make the default provider link
+    // with the application
+    g_ArtProviderModule = 0;
     m_bitmapsHash.clear();
 }
 
@@ -113,6 +119,7 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
     }
 
     sm_providers->Insert(provider);
+    sm_cache->Clear();
 }
 
 /*static*/ bool wxArtProvider::PopProvider()
@@ -134,7 +141,7 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
         sm_cache->Clear();
         return TRUE;
     }
-    
+
     return FALSE;
 }
 
@@ -163,8 +170,18 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
         {
             bmp = node->GetData()->CreateBitmap(id, client, size);
             if ( bmp.Ok() )
+            {
+                if ( size != wxDefaultSize &&
+                     (bmp.GetWidth() != size.x || bmp.GetHeight() != size.y) )
+                {
+                    wxImage img = bmp.ConvertToImage();
+                    img.Rescale(size.x, size.y);
+                    bmp = wxBitmap(img);
+                }
                 break;
+            }
         }
+
         sm_cache->PutBitmap(hashId, bmp);
     }
 
@@ -178,18 +195,13 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
     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;
-    }
-}
 
+    wxIcon icon;
+    icon.CopyFromBitmap(bmp);
+    return icon;
+}
 
 
 class wxArtProviderModule: public wxModule