X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec6803d9654cb8f5e2b1ffa4998b41da5fe63983..511383f91b1443d576276c826fdfd5286f9dbbdb:/src/common/artstd.cpp diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp index 0d9dfd3546..c5a9679e38 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() { } @@ -147,7 +144,8 @@ protected: #include "../../art/copy.xpm" #include "../../art/cut.xpm" #include "../../art/paste.xpm" -#include "../../art/delete_.xpm" +#include "../../art/delete.xpm" +#include "../../art/new.xpm" #include "../../art/undo.xpm" #include "../../art/redo.xpm" #include "../../art/quit.xpm" @@ -201,18 +199,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_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_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; } @@ -226,7 +226,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 @@ -249,6 +249,9 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id, } } } +#else + wxUnusedVar(client); + wxUnusedVar(reqSize); #endif // wxUSE_IMAGE return bmp;