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

Cleaned up wxArtProvider:

Browse Source 
1. Move platform-specific code for both GetSizeHint() and GetBitmap()
   into platform-specific files.
2. Introduced GetNativeSizeHint() to make native sizes better accessible,
   without having to understand weird GetSizeHint() semantics.
3. Fixed GetNativeSizeHint() to return sensible values in non-GTK ports;
   it returns wxDefaultSize if it can't make a good guess instead of
   returning arbitrary value.
4. Use 16x16 icons on MSW instead of 16x15: it works and is more
   'natural' size.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-10-16 19:07:42 +00:00
parent ea91ff8e33
commit a158acac6d
17 changed files with 331 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/common/artstd.cpp
View File

@@ -37,37 +37,6 @@ 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);
// There are two ways of getting the standard icon: either via XPMs or via
// wxIcon ctor. This depends on the platform:
#if defined(__WXUNIVERSAL__) || ( defined(__WXMAC__) && wxOSX_USE_IPHONE )
#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
// Macro used in CreateBitmap to get wxICON_FOO icons:
#define ART_MSGBOX(artId, iconId, xpmRc) \
if ( id == artId ) \
{ \
CREATE_STD_ICON(#iconId, xpmRc) \
}
// ----------------------------------------------------------------------------
// wxArtProvider::InitStdProvider
// ----------------------------------------------------------------------------
@@ -77,28 +46,31 @@ protected:
wxArtProvider::Push(new wxDefaultArtProvider);
}
#if !(defined(__WXGTK20__) || (defined(__WXMAC__) && wxOSX_USE_CARBON)) || defined(__WXUNIVERSAL__)
/*static*/ void wxArtProvider::InitNativeProvider()
{
}
#endif
// ----------------------------------------------------------------------------
// helper macros
// ----------------------------------------------------------------------------
// Standard macro for getting a resource from XPM file:
#define ART(artId, xpmRc) \
if ( id == artId ) return wxBitmap(xpmRc##_xpm);
// ----------------------------------------------------------------------------
// XPMs with the art
// ----------------------------------------------------------------------------
#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
#ifndef __WXUNIVERSAL__
#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
#endif // !__WXUNIVERSAL__
#if wxUSE_HTML
#include "../../art/htmsidep.xpm"
@@ -151,11 +123,13 @@ protected:
wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id)
{
#if !defined(__WXUNIVERSAL__) && (defined(__WXGTK__) || defined(__WXMOTIF__))
// 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)
ART(wxART_ERROR, error)
ART(wxART_INFORMATION, info)
ART(wxART_WARNING, warning)
ART(wxART_QUESTION, question)
#endif
// standard icons:
#if wxUSE_HTML