X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e53a95bcb122a06a74e116aba717b0d7a5bdc1b8..601398b9b1e63109f44af34ff79bc558fe929b4d:/src/common/artstd.cpp diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp index a96e970d22..e7e113c851 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 @@ -77,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() { } @@ -91,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" @@ -142,7 +136,18 @@ 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" wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id) { @@ -188,6 +193,20 @@ 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; } @@ -201,6 +220,7 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id, { 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 @@ -219,9 +239,14 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id, wxImage img = bmp.ConvertToImage(); img.Resize(bestSize, offset); bmp = wxBitmap(img); - } + } } - } + } } +#else + wxUnusedVar(client); + wxUnusedVar(reqSize); +#endif // wxUSE_IMAGE + return bmp; }