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

1. wxSystemSettings class API face lift: better names for its methods

Browse Source 
2. wxSystemSettings under wxUniv uses the wxTheme and wxColourScheme


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-12-30 22:34:36 +00:00
parent a1622950a6
commit 7516ed26c9
9 changed files with 217 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/univ/colschem.cpp
View File

@@ -31,12 +31,73 @@
#ifndef WX_PRECOMP
#endif // WX_PRECOMP
#include "wx/settings.h"
#include "wx/univ/colschem.h"
// ============================================================================
// implementation
// ============================================================================
// ----------------------------------------------------------------------------
// wxColourScheme
// ----------------------------------------------------------------------------
wxColourScheme::~wxColourScheme()
{
}
#ifdef wxHAS_SS_NATIVE
// ----------------------------------------------------------------------------
// wxSystemSettings
// ----------------------------------------------------------------------------
wxColour wxSystemSettings::GetColour(wxSystemColour index)
{
// the elements of this enum must be kept in sync with wxSystemColour
static const wxColourScheme::StdColour s_mapSysToThemeCol[] =
{
wxColourScheme::SCROLLBAR /* wxSYS_COLOUR_SCROLLBAR */,
wxColourScheme::WINDOW /* wxSYS_COLOUR_BACKGROUND */,
wxColourScheme::TITLEBAR_ACTIVE_TEXT /* wxSYS_COLOUR_ACTIVECAPTION */,
wxColourScheme::TITLEBAR_TEXT /* wxSYS_COLOUR_INACTIVECAPTION */,
wxColourScheme::MAX /* wxSYS_COLOUR_MENU */,
wxColourScheme::MAX /* wxSYS_COLOUR_WINDOW */,
wxColourScheme::MAX /* wxSYS_COLOUR_WINDOWFRAME */,
wxColourScheme::CONTROL_TEXT /* wxSYS_COLOUR_MENUTEXT */,
wxColourScheme::CONTROL_TEXT /* wxSYS_COLOUR_WINDOWTEXT */,
wxColourScheme::CONTROL_TEXT /* wxSYS_COLOUR_CAPTIONTEXT */,
wxColourScheme::MAX /* wxSYS_COLOUR_ACTIVEBORDER */,
wxColourScheme::MAX /* wxSYS_COLOUR_INACTIVEBORDER */,
wxColourScheme::MAX /* wxSYS_COLOUR_APPWORKSPACE */,
wxColourScheme::HIGHLIGHT /* wxSYS_COLOUR_HIGHLIGHT */,
wxColourScheme::HIGHLIGHT_TEXT /* wxSYS_COLOUR_HIGHLIGHTTEXT */,
wxColourScheme::SCROLLBAR /* wxSYS_COLOUR_BTNFACE */,
wxColourScheme::SHADOW_DARK /* wxSYS_COLOUR_BTNSHADOW */,
wxColourScheme::CONTROL_TEXT_DISABLED /* wxSYS_COLOUR_GRAYTEXT */,
wxColourScheme::CONTROL_TEXT /* wxSYS_COLOUR_BTNTEXT */,
wxColourScheme::MAX /* wxSYS_COLOUR_INACTIVECAPTIONTEXT */,
wxColourScheme::SHADOW_HIGHLIGHT /* wxSYS_COLOUR_BTNHIGHLIGHT */,
wxColourScheme::SHADOW_IN /* wxSYS_COLOUR_3DDKSHADOW */,
wxColourScheme::SHADOW_OUT /* wxSYS_COLOUR_3DLIGHT */,
wxColourScheme::MAX /* wxSYS_COLOUR_INFOTEXT */,
wxColourScheme::MAX /* wxSYS_COLOUR_INFOBK */,
wxColourScheme::CONTROL /* wxSYS_COLOUR_LISTBOX */,
};
wxCHECK_MSG( index < WXSIZEOF(s_mapSysToThemeCol), wxNullColour,
_T("invalid wxSystemColour") );
wxColourScheme::StdColour col = s_mapSysToThemeCol[index];
if ( col == wxColourScheme::MAX )
{
// we don't have theme-equivalent for this colour
return wxSystemSettingsNative::GetColour(index);
}
return wxTheme::Get()->GetColourScheme()->Get(col);
}
#endif // wxHAS_SS_NATIVE