Resolve '&&' ambiguity (VC++ 6)

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

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index 23bbfb70530087d074a774248065b542b8f9cbaa..c5a9679e3892ff43aa9e8b34cf8e0aa788790f47 100644 (file)
--- 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,9 +21,7 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #if WXWIN_COMPATIBILITY_2_2
-        #include "wx/app.h"
-    #endif
+    #include "wx/image.h"
 #endif
 
 #include "wx/artprov.h"
@@ -76,10 +74,10 @@ protected:
 
 /*static*/ void wxArtProvider::InitStdProvider()
 {
-    wxArtProvider::PushProvider(new wxDefaultArtProvider);
+    wxArtProvider::Push(new wxDefaultArtProvider);
 }
 
-#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)
+#if !(defined(__WXGTK20__) || defined(__WXMAC__)) || defined(__WXUNIVERSAL__)
 /*static*/ void wxArtProvider::InitNativeProvider()
 {
 }
@@ -141,15 +139,23 @@ protected:
 #include "../../art/tick.xpm"
 #include "../../art/cross.xpm"
 
-#undef static
+#include "../../art/filesave.xpm"
+#include "../../art/filesaveas.xpm"
+#include "../../art/copy.xpm"
+#include "../../art/cut.xpm"
+#include "../../art/paste.xpm"
+#include "../../art/delete.xpm"
+#include "../../art/new.xpm"
+#include "../../art/undo.xpm"
+#include "../../art/redo.xpm"
+#include "../../art/quit.xpm"
+#include "../../art/find.xpm"
+#include "../../art/findrepl.xpm"
 
-// ----------------------------------------------------------------------------
-// CreateBitmap routine
-// ----------------------------------------------------------------------------
 
-wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
-                                            const wxArtClient& WXUNUSED(client),
-                                            const wxSize& WXUNUSED(size))
+#undef static
+
+wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id)
 {
     // wxMessageBox icons:
     ART_MSGBOX(wxART_ERROR,       wxICON_ERROR,       error)
@@ -193,5 +199,60 @@ 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_COPY,                                copy)
+    ART(wxART_CUT,                                 cut)
+    ART(wxART_PASTE,                               paste)
+    ART(wxART_DELETE,                              delete)
+    ART(wxART_UNDO,                                undo)
+    ART(wxART_REDO,                                redo)
+    ART(wxART_QUIT,                                quit)
+    ART(wxART_FIND,                                find)
+    ART(wxART_FIND_AND_REPLACE,                    findrepl)
+    ART(wxART_NEW,                                 new)
+
+
     return wxNullBitmap;
 }
+
+// ----------------------------------------------------------------------------
+// CreateBitmap routine
+// ----------------------------------------------------------------------------
+
+wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
+                                            const wxArtClient& client,
+                                            const wxSize& reqSize)
+{
+    wxBitmap bmp = wxDefaultArtProvider_CreateBitmap(id);
+
+#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)
+    if (bmp.Ok())
+    {
+        // fit into transparent image with desired size hint from the client
+        if (reqSize == wxDefaultSize)
+        {
+            // find out if there is a desired size for this client
+            wxSize bestSize = GetSizeHint(client);
+            if (bestSize != wxDefaultSize)
+            {
+                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))
+                {
+                    wxPoint offset((bestSize.x - bmp_w)/2, (bestSize.y - bmp_h)/2);
+                    wxImage img = bmp.ConvertToImage();
+                    img.Resize(bestSize, offset);
+                    bmp = wxBitmap(img);
+                }
+            }
+        }
+    }
+#else
+    wxUnusedVar(client);
+    wxUnusedVar(reqSize);
+#endif // wxUSE_IMAGE
+
+    return bmp;
+}