X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/406011a83dd46464cf615fb1988b5f6dee07366d..b21d67a04d99a82b74a587f8552b85241a177887:/src/common/artstd.cpp?ds=sidebyside diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp index b82d687330..0eda93afd3 100644 --- a/src/common/artstd.cpp +++ b/src/common/artstd.cpp @@ -20,12 +20,6 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP - #if WXWIN_COMPATIBILITY_2_2 - #include "wx/app.h" - #endif -#endif - #include "wx/artprov.h" #include "wx/image.h" @@ -202,8 +196,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 +208,8 @@ wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id) ART(wxART_FIND, find) ART(wxART_FIND_AND_REPLACE, findrepl) ART(wxART_NEW, new) - - + + return wxNullBitmap; } @@ -252,6 +246,9 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id, } } } +#else + wxUnusedVar(client); + wxUnusedVar(reqSize); #endif // wxUSE_IMAGE return bmp;