X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/common/artstd.cpp?ds=inline diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp index 31b4355928..c3e4fe994b 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,16 +21,11 @@ #endif #ifndef WX_PRECOMP - #if WXWIN_COMPATIBILITY_2_2 - #include "wx/app.h" - #endif + #include "wx/image.h" #endif #include "wx/artprov.h" -// For the purposes of forcing this module to link -char g_ArtProviderModule = 0; - // ---------------------------------------------------------------------------- // wxDefaultArtProvider // ---------------------------------------------------------------------------- @@ -50,23 +45,6 @@ protected: #define ART(artId, xpmRc) \ if ( id == artId ) return wxBitmap(xpmRc##_xpm); -// Compatibility hack to use wxApp::GetStdIcon of overriden by the user -#if WXWIN_COMPATIBILITY_2_2 - #define GET_STD_ICON_FROM_APP(iconId) \ - if ( client == wxART_MESSAGE_BOX ) \ - { \ - wxIcon icon = wxTheApp->GetStdIcon(iconId); \ - if ( icon.Ok() ) \ - { \ - wxBitmap bmp; \ - bmp.CopyFromIcon(icon); \ - return bmp; \ - } \ - } -#else - #define GET_STD_ICON_FROM_APP(iconId) -#endif - // There are two ways of getting the standard icon: either via XPMs or via // wxIcon ctor. This depends on the platform: #if defined(__WXUNIVERSAL__) @@ -87,7 +65,6 @@ protected: #define ART_MSGBOX(artId, iconId, xpmRc) \ if ( id == artId ) \ { \ - GET_STD_ICON_FROM_APP(iconId) \ CREATE_STD_ICON(#iconId, xpmRc) \ } @@ -97,16 +74,15 @@ protected: /*static*/ void wxArtProvider::InitStdProvider() { - // NB: A few notes about this function: - // (1) it is in artstd.cpp and not in artprov.cpp on purpose. I wanted - // to avoid declaring wxDefaultArtProvider in any public header as - // it is only an implementation detail - // (2) other default art providers (e.g. GTK one) should NOT be added - // here. Instead, add them in port-specific initialialization code - - wxArtProvider::PushProvider(new wxDefaultArtProvider); + wxArtProvider::Push(new wxDefaultArtProvider); } +#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__) +/*static*/ void wxArtProvider::InitNativeProvider() +{ +} +#endif + // ---------------------------------------------------------------------------- // XPMs with the art @@ -135,6 +111,7 @@ protected: #include "../../art/htmpage.xpm" #endif // wxUSE_HTML +#include "../../art/missimg.xpm" #include "../../art/addbookm.xpm" #include "../../art/delbookm.xpm" #include "../../art/back.xpm" @@ -150,22 +127,35 @@ protected: #include "../../art/repview.xpm" #include "../../art/listview.xpm" #include "../../art/new_dir.xpm" +#include "../../art/harddisk.xpm" +#include "../../art/cdrom.xpm" +#include "../../art/floppy.xpm" +#include "../../art/removable.xpm" #include "../../art/folder.xpm" +#include "../../art/folder_open.xpm" #include "../../art/dir_up.xpm" #include "../../art/exefile.xpm" #include "../../art/deffile.xpm" #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& client, - const wxSize& WXUNUSED(size)) +#undef static + +wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id) { // wxMessageBox icons: ART_MSGBOX(wxART_ERROR, wxICON_ERROR, error) @@ -181,6 +171,7 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id, ART(wxART_HELP_FOLDER, htmfoldr) ART(wxART_HELP_PAGE, htmpage) #endif // wxUSE_HTML + ART(wxART_MISSING_IMAGE, missimg) ART(wxART_ADD_BOOKMARK, addbookm) ART(wxART_DEL_BOOKMARK, delbookm) ART(wxART_GO_BACK, back) @@ -196,12 +187,72 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id, ART(wxART_REPORT_VIEW, repview) ART(wxART_LIST_VIEW, listview) ART(wxART_NEW_DIR, new_dir) + ART(wxART_HARDDISK, harddisk) + ART(wxART_FLOPPY, floppy) + ART(wxART_CDROM, cdrom) + ART(wxART_REMOVABLE, removable) ART(wxART_FOLDER, folder) + ART(wxART_FOLDER_OPEN, folder_open) ART(wxART_GO_DIR_UP, dir_up) ART(wxART_EXECUTABLE_FILE, exefile) ART(wxART_NORMAL_FILE, deffile) 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; +}