Minor source cleaning.

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

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index 817d5e08db84f2a8e4b5dbffdac739c530f0c143..2e8a1df31c826bb25ec9e3c0e6cd249d3f0a3b59 100644 (file)
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -44,7 +44,7 @@ WX_DEFINE_LIST(wxArtProvidersList)
 // Cache class - stores already requested bitmaps
 // ----------------------------------------------------------------------------
 
 // Cache class - stores already requested bitmaps
 // ----------------------------------------------------------------------------
 

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

 
 class WXDLLEXPORT wxArtProviderCache
 {
 
 class WXDLLEXPORT wxArtProviderCache
 {


@@ -165,7 +165,7 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
             bmp = node->GetData()->CreateBitmap(id, client, size);
             if ( bmp.Ok() )
             {
             bmp = node->GetData()->CreateBitmap(id, client, size);
             if ( bmp.Ok() )
             {

-#if wxUSE_IMAGE
+#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)

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