X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/527343602e91d60c65fb7589a6ddcf4683930c78..d863389f773348f5b6e06243050d4379d66de05d:/src/common/artstd.cpp diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp index c5a9679e38..4623b41184 100644 --- a/src/common/artstd.cpp +++ b/src/common/artstd.cpp @@ -47,7 +47,7 @@ protected: // There are two ways of getting the standard icon: either via XPMs or via // wxIcon ctor. This depends on the platform: -#if defined(__WXUNIVERSAL__) +#if defined(__WXUNIVERSAL__) || ( defined(__WXMAC__) && wxOSX_USE_IPHONE ) #define CREATE_STD_ICON(iconId, xpmRc) return wxNullBitmap; #elif defined(__WXGTK__) || defined(__WXMOTIF__) #define CREATE_STD_ICON(iconId, xpmRc) return wxBitmap(xpmRc##_xpm); @@ -77,7 +77,7 @@ protected: wxArtProvider::Push(new wxDefaultArtProvider); } -#if !(defined(__WXGTK20__) || defined(__WXMAC__)) || defined(__WXUNIVERSAL__) +#if !(defined(__WXGTK20__) || (defined(__WXMAC__) && wxOSX_USE_CARBON)) || defined(__WXUNIVERSAL__) /*static*/ void wxArtProvider::InitNativeProvider() { } @@ -88,9 +88,6 @@ protected: // XPMs with the art // ---------------------------------------------------------------------------- -// XPM hack: make the arrays const -#define static static const - #if defined(__WXGTK__) #include "../../art/gtk/info.xpm" #include "../../art/gtk/error.xpm" @@ -152,9 +149,6 @@ protected: #include "../../art/find.xpm" #include "../../art/findrepl.xpm" - -#undef static - wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id) { // wxMessageBox icons: @@ -238,14 +232,26 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id, { int bmp_w = bmp.GetWidth(); int bmp_h = bmp.GetHeight(); - // want default size but it's smaller, paste into transparent image + if ((bmp_h < bestSize.x) && (bmp_w < bestSize.y)) { + // the caller wants default size, which is larger than + // the image we have; to avoid degrading it visually by + // scaling it up, paste it into transparent image instead: wxPoint offset((bestSize.x - bmp_w)/2, (bestSize.y - bmp_h)/2); wxImage img = bmp.ConvertToImage(); img.Resize(bestSize, offset); bmp = wxBitmap(img); } + else // scale (down or mixed, but not up) + { + wxImage img = bmp.ConvertToImage(); + bmp = wxBitmap + ( + img.Scale(bestSize.x, bestSize.y, + wxIMAGE_QUALITY_HIGH) + ); + } } } }