X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b58a1455e15477cac9d335b5f7a2c3fc3111b342..a6de86fa530d95b6f30e0349e81de8b8692b348f:/src/common/artstd.cpp?ds=sidebyside diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp index e97af0bc4a..7e8abec577 100644 --- a/src/common/artstd.cpp +++ b/src/common/artstd.cpp @@ -20,8 +20,16 @@ #pragma hdrstop #endif +#ifndef WX_PRECOMP + #if WXWIN_COMPATIBILITY_2_2 + #include "wx/app.h" + #endif +#endif + #include "wx/artprov.h" -#include "wx/module.h" + +// For the purposes of forcing this module to link +char g_ArtProviderModule = 0; // ---------------------------------------------------------------------------- // wxDefaultArtProvider @@ -34,28 +42,52 @@ protected: const wxSize& size); }; +// ---------------------------------------------------------------------------- +// helper macros +// ---------------------------------------------------------------------------- + +// Standard macro for getting a resource from XPM file: #define ART(artId, xpmRc) \ if ( id == artId ) return wxBitmap(xpmRc##_xpm); - -// ---------------------------------------------------------------------------- -// wxDefaultArtProviderModule -// ---------------------------------------------------------------------------- +// There are two ways of getting the standard icon: either via XPMs or via +// wxIcon ctor. This depends on the platform: +#if defined(__WXUNIVERSAL__) + #define CREATE_STD_ICON(iconId, xpmRc) return wxNullBitmap; +#elif defined(__WXGTK__) || defined(__WXMOTIF__) + #define CREATE_STD_ICON(iconId, xpmRc) return wxBitmap(xpmRc##_xpm); +#else + #define CREATE_STD_ICON(iconId, xpmRc) \ + { \ + wxIcon icon(_T(iconId)); \ + wxBitmap bmp; \ + bmp.CopyFromIcon(icon); \ + return bmp; \ + } +#endif -class wxDefaultArtProviderModule: public wxModule -{ -public: - bool OnInit() - { - wxArtProvider::PushProvider(new wxDefaultArtProvider); - return TRUE; +// Macro used in CreateBitmap to get wxICON_FOO icons: +#define ART_MSGBOX(artId, iconId, xpmRc) \ + if ( id == artId ) \ + { \ + CREATE_STD_ICON(#iconId, xpmRc) \ } - void OnExit() {} - DECLARE_DYNAMIC_CLASS(wxDefaultArtProviderModule) -}; +// ---------------------------------------------------------------------------- +// wxArtProvider::InitStdProvider +// ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule) +/*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); +} // ---------------------------------------------------------------------------- @@ -65,12 +97,25 @@ IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule) // XPM hack: make the arrays const #define static static const +#if defined(__WXGTK__) + #include "../../art/gtk/info.xpm" + #include "../../art/gtk/error.xpm" + #include "../../art/gtk/warning.xpm" + #include "../../art/gtk/question.xpm" +#elif defined(__WXMOTIF__) + #include "../../art/motif/info.xpm" + #include "../../art/motif/error.xpm" + #include "../../art/motif/warning.xpm" + #include "../../art/motif/question.xpm" +#endif + #if wxUSE_HTML #include "../../art/htmsidep.xpm" #include "../../art/htmoptns.xpm" #include "../../art/htmbook.xpm" #include "../../art/htmfoldr.xpm" #include "../../art/htmpage.xpm" + #include "../../art/missimg.xpm" #endif // wxUSE_HTML #include "../../art/addbookm.xpm" @@ -84,6 +129,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule) #include "../../art/print.xpm" #include "../../art/helpicon.xpm" #include "../../art/tipicon.xpm" +#include "../../art/home.xpm" +#include "../../art/repview.xpm" +#include "../../art/listview.xpm" +#include "../../art/new_dir.xpm" +#include "../../art/folder.xpm" +#include "../../art/dir_up.xpm" +#include "../../art/exefile.xpm" +#include "../../art/deffile.xpm" +#include "../../art/tick.xpm" +#include "../../art/cross.xpm" #undef static @@ -92,15 +147,23 @@ IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule) // ---------------------------------------------------------------------------- wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id, - const wxArtClient& client, - const wxSize& size) + const wxArtClient& WXUNUSED(client), + const wxSize& WXUNUSED(size)) { + // wxMessageBox icons: + ART_MSGBOX(wxART_ERROR, wxICON_ERROR, error) + ART_MSGBOX(wxART_INFORMATION, wxICON_INFORMATION, info) + ART_MSGBOX(wxART_WARNING, wxICON_WARNING, warning) + ART_MSGBOX(wxART_QUESTION, wxICON_QUESTION, question) + + // standard icons: #if wxUSE_HTML ART(wxART_HELP_SIDE_PANEL, htmsidep) ART(wxART_HELP_SETTINGS, htmoptns) ART(wxART_HELP_BOOK, htmbook) ART(wxART_HELP_FOLDER, htmfoldr) ART(wxART_HELP_PAGE, htmpage) + ART(wxART_MISSING_IMAGE, missimg) #endif // wxUSE_HTML ART(wxART_ADD_BOOKMARK, addbookm) ART(wxART_DEL_BOOKMARK, delbookm) @@ -109,10 +172,20 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id, ART(wxART_GO_UP, up) ART(wxART_GO_DOWN, down) ART(wxART_GO_TO_PARENT, toparent) + ART(wxART_GO_HOME, home) ART(wxART_FILE_OPEN, fileopen) ART(wxART_PRINT, print) ART(wxART_HELP, helpicon) ART(wxART_TIP, tipicon) + ART(wxART_REPORT_VIEW, repview) + ART(wxART_LIST_VIEW, listview) + ART(wxART_NEW_DIR, new_dir) + ART(wxART_FOLDER, folder) + 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) return wxNullBitmap; }