Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(hopefully) final touches to wxArtProvider

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-03-21 23:42:39 +00:00
parent 07e252a547
commit 57b0987bb9
18 changed files with 95 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/common/artstd.cpp
View File

@@ -34,13 +34,13 @@
class wxDefaultArtProvider : public wxArtProvider
{
protected:
virtual wxBitmap CreateBitmap(const wxArtDomain& domain,
const wxArtID& id, const wxSize& size);
virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client,
const wxSize& size);
};
#define BEGIN_DOMAIN(domainId) if ( domain == domainId ) {
#define END_DOMAIN() }
#define ART_ID(artId, xpmRc) if ( id == artId ) return wxBitmap(xpmRc##_xpm);
#define ART(artId, xpmRc) \
if ( id == artId ) return wxBitmap(xpmRc##_xpm);
// ----------------------------------------------------------------------------
// wxDefaultArtProviderModule
@@ -70,25 +70,24 @@ IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule)
#define static static const
#if wxUSE_HTML
#include "../../art/wxhtml/addbookm.xpm"
#include "../../art/wxhtml/delbookm.xpm"
#include "../../art/wxhtml/navig.xpm"
#include "../../art/wxhtml/settings.xpm"
#include "../../art/wxhtml/book.xpm"
#include "../../art/wxhtml/folder.xpm"
#include "../../art/wxhtml/page.xpm"
#include "../../art/htmsidep.xpm"
#include "../../art/htmoptns.xpm"
#include "../../art/htmbook.xpm"
#include "../../art/htmfoldr.xpm"
#include "../../art/htmpage.xpm"
#endif // wxUSE_HTML
#include "../../art/browser/back.xpm"
#include "../../art/browser/forward.xpm"
#include "../../art/browser/up.xpm"
#include "../../art/browser/down.xpm"
#include "../../art/browser/toparent.xpm"
#include "../../art/toolbar/fileopen.xpm"
#include "../../art/toolbar/print.xpm"
#include "../../art/framicon/help.xpm"
#include "../../art/addbookm.xpm"
#include "../../art/delbookm.xpm"
#include "../../art/back.xpm"
#include "../../art/forward.xpm"
#include "../../art/up.xpm"
#include "../../art/down.xpm"
#include "../../art/toparent.xpm"
#include "../../art/fileopen.xpm"
#include "../../art/print.xpm"
#include "../../art/helpicon.xpm"
#include "../../art/tipicon.xpm"
#undef static
@@ -96,38 +95,28 @@ IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule)
// CreateBitmap routine
// ----------------------------------------------------------------------------
wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtDomain& domain,
const wxArtID& id,
wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
const wxArtClient& client,
const wxSize& size)
{
#if wxUSE_HTML
BEGIN_DOMAIN(wxART_WXHTML)
ART_ID(wxART_ADD_BOOKMARK, addbookm)
ART_ID(wxART_DEL_BOOKMARK, delbookm)
ART_ID(wxART_NAVIG_PANEL, navig)
ART_ID(wxART_HELP_SETTINGS, settings)
ART_ID(wxART_HELP_BOOK, book)
ART_ID(wxART_HELP_FOLDER, folder)
ART_ID(wxART_HELP_PAGE, page)
END_DOMAIN()
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)
#endif // wxUSE_HTML
BEGIN_DOMAIN(wxART_BROWSER_TOOLBAR)
ART_ID(wxART_GO_BACK, back)
ART_ID(wxART_GO_FORWARD, forward)
ART_ID(wxART_GO_UP, up)
ART_ID(wxART_GO_DOWN, down)
ART_ID(wxART_GO_TO_PARENT, toparent)
END_DOMAIN()
BEGIN_DOMAIN(wxART_TOOLBAR)
ART_ID(wxART_FILE_OPEN, fileopen)
ART_ID(wxART_PRINT, print)
END_DOMAIN()
BEGIN_DOMAIN(wxART_FRAME_ICON)
ART_ID(wxART_HELP, help)
END_DOMAIN()
ART(wxART_ADD_BOOKMARK, addbookm)
ART(wxART_DEL_BOOKMARK, delbookm)
ART(wxART_GO_BACK, back)
ART(wxART_GO_FORWARD, forward)
ART(wxART_GO_UP, up)
ART(wxART_GO_DOWN, down)
ART(wxART_GO_TO_PARENT, toparent)
ART(wxART_FILE_OPEN, fileopen)
ART(wxART_PRINT, print)
ART(wxART_HELP, helpicon)
ART(wxART_TIP, tipicon)
return wxNullBitmap;
}