get rid of base arrays in wxUSE_STL build, we don't need them there and deriving...

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

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index c3e4fe994b110ace2d9cd26c0727d4a4a7e7bbc8..9dab2e587869c8b4fbea7855cdeb4a5a490d5498 100644 (file)
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -77,7 +77,7 @@ protected:
     wxArtProvider::Push(new wxDefaultArtProvider);
 }
 
     wxArtProvider::Push(new wxDefaultArtProvider);
 }
 

-#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)
+#if !(defined(__WXGTK20__) || defined(__WXMAC__)) || defined(__WXUNIVERSAL__)

 /*static*/ void wxArtProvider::InitNativeProvider()
 {
 }
 /*static*/ void wxArtProvider::InitNativeProvider()
 {
 }


@@ -88,9 +88,6 @@ protected:
 // XPMs with the art
 // ----------------------------------------------------------------------------
 
 // 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"
 #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"
 
 #include "../../art/find.xpm"
 #include "../../art/findrepl.xpm"
 

-
-#undef static
-

 wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id)
 {
     // wxMessageBox icons:
 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();
             {
                 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))
                 {
                 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);
                 }
                     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)
+                          );
+                }

             }
         }
     }
             }
         }
     }