X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd05139a8023fd3e30476409fafbe04221c6d627..ca86035f16f071d3f6b987bbac9fab174c6079c4:/src/mac/carbon/settings.cpp?ds=inline diff --git a/src/mac/carbon/settings.cpp b/src/mac/carbon/settings.cpp index e543a54fd8..81cbcc4b94 100644 --- a/src/mac/carbon/settings.cpp +++ b/src/mac/carbon/settings.cpp @@ -39,12 +39,14 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) switch ( index ) { + case wxSYS_COLOUR_WINDOW: + resultColor = *wxWHITE ; + break ; case wxSYS_COLOUR_SCROLLBAR : case wxSYS_COLOUR_BACKGROUND: case wxSYS_COLOUR_ACTIVECAPTION: case wxSYS_COLOUR_INACTIVECAPTION: case wxSYS_COLOUR_MENU: - case wxSYS_COLOUR_WINDOW: case wxSYS_COLOUR_WINDOWFRAME: case wxSYS_COLOUR_ACTIVEBORDER: case wxSYS_COLOUR_INACTIVEBORDER: @@ -86,7 +88,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) #endif GetThemeBrushAsColor( colorBrushID, 32, true, &macRGB ); - resultColor = wxColor( macRGB.red >> 8, macRGB.green >> 8, macRGB.blue >> 8 ); + resultColor = wxColor( macRGB ); break ; case wxSYS_COLOUR_BTNHIGHLIGHT: @@ -116,9 +118,11 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) break ; case wxSYS_COLOUR_INFOBK : - case wxSYS_COLOUR_APPWORKSPACE: resultColor = *wxWHITE ; break ; + case wxSYS_COLOUR_APPWORKSPACE: + resultColor = wxColor( 0x80, 0x80, 0x80 ); ; + break ; case wxSYS_COLOUR_HOTLIGHT: case wxSYS_COLOUR_GRADIENTACTIVECAPTION: