remove unnecessary include of wx/cairo.h

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

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index 542247d4ae68a147b110769af3c9db5b61aec8e1..3fa46d4d45afd7f2214f2fff5abaa341132dec71 100644 (file)
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -45,7 +45,7 @@ protected:
 
 /*static*/ void wxArtProvider::InitStdProvider()
 {
 
 /*static*/ void wxArtProvider::InitStdProvider()
 {

-    wxArtProvider::Push(new wxDefaultArtProvider);
+    wxArtProvider::PushBack(new wxDefaultArtProvider);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -219,7 +219,12 @@ 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();
 

-                if ((bmp_h < bestSize.x) && (bmp_w < bestSize.y))
+                if (bmp_w == 16 && bmp_h == 15 && bestSize == wxSize(16, 16))
+                {
+                    // Do nothing in this special but quite common case, because scaling
+                    // with only a pixel difference will look horrible.
+                }
+                else 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
                 {
                     // the caller wants default size, which is larger than
                     // the image we have; to avoid degrading it visually by