X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/406011a83dd46464cf615fb1988b5f6dee07366d..0b7dce5480b8cf7ce4368122744d853f7a684e34:/src/common/artstd.cpp

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index b82d687330..c4e34e7912 100644
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        artstd.cpp
+// Name:        src/common/artstd.cpp
 // Purpose:     stock wxArtProvider instance with default wxWin art
 // Author:      Vaclav Slavik
 // Modified by:
@@ -21,13 +21,10 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #if WXWIN_COMPATIBILITY_2_2
-        #include "wx/app.h"
-    #endif
+    #include "wx/image.h"
 #endif
 
 #include "wx/artprov.h"
-#include "wx/image.h"
 
 // ----------------------------------------------------------------------------
 // wxDefaultArtProvider
@@ -40,71 +37,40 @@ protected:
                                   const wxSize& size);
 };
 
-// ----------------------------------------------------------------------------
-// helper macros
-// ----------------------------------------------------------------------------
-
-// Standard macro for getting a resource from XPM file:
-#define ART(artId, xpmRc) \
-    if ( id == artId ) return wxBitmap(xpmRc##_xpm);
-
-// There are two ways of getting the standard icon: either via XPMs or via
-// wxIcon ctor. This depends on the platform:
-#if defined(__WXUNIVERSAL__)
-    #define CREATE_STD_ICON(iconId, xpmRc) return wxNullBitmap;
-#elif defined(__WXGTK__) || defined(__WXMOTIF__)
-    #define CREATE_STD_ICON(iconId, xpmRc) return wxBitmap(xpmRc##_xpm);
-#else
-    #define CREATE_STD_ICON(iconId, xpmRc) \
-        { \
-            wxIcon icon(_T(iconId)); \
-            wxBitmap bmp; \
-            bmp.CopyFromIcon(icon); \
-            return bmp; \
-        }
-#endif
-
-// Macro used in CreateBitmap to get wxICON_FOO icons:
-#define ART_MSGBOX(artId, iconId, xpmRc) \
-    if ( id == artId ) \
-    { \
-        CREATE_STD_ICON(#iconId, xpmRc) \
-    }
-
 // ----------------------------------------------------------------------------
 // wxArtProvider::InitStdProvider
 // ----------------------------------------------------------------------------
 
 /*static*/ void wxArtProvider::InitStdProvider()
 {
-    wxArtProvider::PushProvider(new wxDefaultArtProvider);
+    wxArtProvider::Push(new wxDefaultArtProvider);
 }
 
-#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)
-/*static*/ void wxArtProvider::InitNativeProvider()
-{
-}
-#endif
+// ----------------------------------------------------------------------------
+// helper macros
+// ----------------------------------------------------------------------------
 
+// Standard macro for getting a resource from XPM file:
+#define ART(artId, xpmRc) \
+    if ( id == artId ) return wxBitmap(xpmRc##_xpm);
 
 // ----------------------------------------------------------------------------
 // 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"
-    #include "../../art/gtk/warning.xpm"
-    #include "../../art/gtk/question.xpm"
-#elif defined(__WXMOTIF__)
-    #include "../../art/motif/info.xpm"
-    #include "../../art/motif/error.xpm"
-    #include "../../art/motif/warning.xpm"
-    #include "../../art/motif/question.xpm"
-#endif
+#ifndef __WXUNIVERSAL__
+    #if defined(__WXGTK__)
+        #include "../../art/gtk/info.xpm"
+        #include "../../art/gtk/error.xpm"
+        #include "../../art/gtk/warning.xpm"
+        #include "../../art/gtk/question.xpm"
+    #elif defined(__WXMOTIF__)
+        #include "../../art/motif/info.xpm"
+        #include "../../art/motif/error.xpm"
+        #include "../../art/motif/warning.xpm"
+        #include "../../art/motif/question.xpm"
+    #endif
+#endif // !__WXUNIVERSAL__
 
 #if wxUSE_HTML
     #include "../../art/htmsidep.xpm"
@@ -155,16 +121,15 @@ protected:
 #include "../../art/find.xpm"
 #include "../../art/findrepl.xpm"
 
-
-#undef static
-
 wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id)
 {
+#if !defined(__WXUNIVERSAL__) && (defined(__WXGTK__) || defined(__WXMOTIF__))
     // wxMessageBox icons:
-    ART_MSGBOX(wxART_ERROR,       wxICON_ERROR,       error)
-    ART_MSGBOX(wxART_INFORMATION, wxICON_INFORMATION, info)
-    ART_MSGBOX(wxART_WARNING,     wxICON_WARNING,     warning)
-    ART_MSGBOX(wxART_QUESTION,    wxICON_QUESTION,    question)
+    ART(wxART_ERROR,                               error)
+    ART(wxART_INFORMATION,                         info)
+    ART(wxART_WARNING,                             warning)
+    ART(wxART_QUESTION,                            question)
+#endif
 
     // standard icons:
 #if wxUSE_HTML
@@ -202,8 +167,8 @@ wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id)
     ART(wxART_TICK_MARK,                           tick)
     ART(wxART_CROSS_MARK,                          cross)
 
-    ART(wxART_FILE_SAVE,                           filesave)  
-    ART(wxART_FILE_SAVE_AS,                        filesaveas)        
+    ART(wxART_FILE_SAVE,                           filesave)
+    ART(wxART_FILE_SAVE_AS,                        filesaveas)
     ART(wxART_COPY,                                copy)
     ART(wxART_CUT,                                 cut)
     ART(wxART_PASTE,                               paste)
@@ -214,8 +179,8 @@ wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id)
     ART(wxART_FIND,                                find)
     ART(wxART_FIND_AND_REPLACE,                    findrepl)
     ART(wxART_NEW,                                 new)
-       
-        
+
+
     return wxNullBitmap;
 }
 
@@ -229,7 +194,7 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
 {
     wxBitmap bmp = wxDefaultArtProvider_CreateBitmap(id);
 
-#if wxUSE_IMAGE
+#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)
     if (bmp.Ok())
     {
         // fit into transparent image with desired size hint from the client
@@ -241,17 +206,32 @@ 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)
+                          );
+                }
             }
         }
     }
+#else
+    wxUnusedVar(client);
+    wxUnusedVar(reqSize);
 #endif // wxUSE_IMAGE
 
     return bmp;