X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/89c20ac15cdcff42502723c0b52ba0e37a8c6275..f3f0d961af5454a3544a4f4f9aced750d4641d69:/src/common/artprov.cpp?ds=sidebyside diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp index 1dda57dd33..a14428f89e 100644 --- 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; @@ -173,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) ) { @@ -180,6 +183,7 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL; img.Rescale(size.x, size.y); bmp = wxBitmap(img); } +#endif break; } }