X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c72619486dfe7383fb389ac16cceef55a74bd544..0f243af310c9772628bbeeab8131a8c09bb94dbc:/src/univ/colschem.cpp?ds=sidebyside diff --git a/src/univ/colschem.cpp b/src/univ/colschem.cpp index 56ee660153..3339b53c21 100644 --- a/src/univ/colschem.cpp +++ b/src/univ/colschem.cpp @@ -48,8 +48,6 @@ wxColourScheme::~wxColourScheme() { } -#ifdef wxHAS_SS_NATIVE - // ---------------------------------------------------------------------------- // wxSystemSettings // ---------------------------------------------------------------------------- @@ -74,17 +72,17 @@ wxColour wxSystemSettings::GetColour(wxSystemColour index) wxColourScheme::MAX /* wxSYS_COLOUR_APPWORKSPACE */, wxColourScheme::HIGHLIGHT /* wxSYS_COLOUR_HIGHLIGHT */, wxColourScheme::HIGHLIGHT_TEXT /* wxSYS_COLOUR_HIGHLIGHTTEXT */, - wxColourScheme::SCROLLBAR /* wxSYS_COLOUR_BTNFACE */, + wxColourScheme::CONTROL /* 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_DARK /* wxSYS_COLOUR_3DDKSHADOW */, wxColourScheme::SHADOW_OUT /* wxSYS_COLOUR_3DLIGHT */, wxColourScheme::MAX /* wxSYS_COLOUR_INFOTEXT */, wxColourScheme::MAX /* wxSYS_COLOUR_INFOBK */, - wxColourScheme::CONTROL /* wxSYS_COLOUR_LISTBOX */, + wxColourScheme::WINDOW /* wxSYS_COLOUR_LISTBOX */, }; wxCHECK_MSG( index < (int)WXSIZEOF(s_mapSysToThemeCol), wxNullColour, @@ -100,5 +98,3 @@ wxColour wxSystemSettings::GetColour(wxSystemColour index) return wxTheme::Get()->GetColourScheme()->Get(col); } -#endif // wxHAS_SS_NATIVE -