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

Using NSColor System Colours

Browse Source 
Removing the old HITheme Constants for the last two wx system colours, first step for Dark Mode support, see https://trac.wxwidgets.org/ticket/18146
This commit is contained in:
Stefan Csomor
2018-06-11 22:38:05 +02:00
parent 93edcaef20
commit 71bb680a93
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/osx/cocoa/settings.mm
View File

@@ -74,9 +74,14 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
sysColor = [NSColor windowFrameColor]; sysColor = [NSColor windowFrameColor];
break; break;
case wxSYS_COLOUR_WINDOW: case wxSYS_COLOUR_WINDOW:
return wxColour(wxMacCreateCGColorFromHITheme( 15 /* kThemeBrushDocumentWindowBackground */ )) ; sysColor = [NSColor windowBackgroundColor];
break;
case wxSYS_COLOUR_BTNFACE: case wxSYS_COLOUR_BTNFACE:
return wxColour(wxMacCreateCGColorFromHITheme( 3 /* kThemeBrushDialogBackgroundActive */)); if ( wxPlatformInfo::Get().CheckOSVersion(10, 14 ) )
sysColor = [NSColor windowBackgroundColor];
else
sysColor = [NSColor controlColor];
break;
case wxSYS_COLOUR_LISTBOX: case wxSYS_COLOUR_LISTBOX:
sysColor = [NSColor controlBackgroundColor]; sysColor = [NSColor controlBackgroundColor];
break; break;