really show the window after creation (calling Show(TRUE) doesn't do it any more)

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

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index 74f8f798e76e5930e49b559ae13966e438e6aae8..a14428f89e8fcb97043d1b1985614deee1a8b882 100644 (file)
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -13,7 +13,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "artprov.h"
 #endif
 
@@ -32,7 +32,9 @@
 #include "wx/artprov.h"
 #include "wx/hashmap.h"
 #include "wx/module.h"
+#if wxUSE_IMAGE
 #include "wx/image.h"
+#endif
 
 // For the purposes of forcing this module to link
 extern char g_ArtProviderModule;
@@ -148,6 +150,7 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
 
 /*static*/ void wxArtProvider::CleanUpProviders()
 {
+    WX_CLEAR_LIST(wxArtProvidersList, *sm_providers);
     wxDELETE(sm_providers);
     wxDELETE(sm_cache);
 }
@@ -172,6 +175,7 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
             bmp = node->GetData()->CreateBitmap(id, client, size);
             if ( bmp.Ok() )
             {
+#if wxUSE_IMAGE
                 if ( size != wxDefaultSize &&
                      (bmp.GetWidth() != size.x || bmp.GetHeight() != size.y) )
                 {
@@ -179,6 +183,7 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
                     img.Rescale(size.x, size.y);
                     bmp = wxBitmap(img);
                 }
+#endif                
                 break;
             }
         }