diff --git a/src/osx/carbon/renderer.cpp b/src/osx/carbon/renderer.cpp index 360931a421..1bfe9ac733 100644 --- a/src/osx/carbon/renderer.cpp +++ b/src/osx/carbon/renderer.cpp @@ -173,11 +173,9 @@ int wxRendererMac::DrawHeaderButton( wxWindow *win, wxHeaderSortIconType sortArrow, wxHeaderButtonParams* params ) { - if ( WX_IS_MACOS_AVAILABLE(10, 14) ) - { - if ( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW).Red() < 128 ) - return wxRendererNative::GetGeneric().DrawHeaderButton(win, dc, rect, flags, sortArrow, params); - } + if ( wxSystemSettings::GetAppearance().IsDark() ) + return wxRendererNative::GetGeneric().DrawHeaderButton(win, dc, rect, flags, sortArrow, params); + const wxCoord x = rect.x; const wxCoord y = rect.y; const wxCoord w = rect.width; @@ -391,13 +389,7 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win, if ( win->HasFlag(wxSP_3DSASH) ) { - bool doDraw; - if ( WX_IS_MACOS_AVAILABLE(10, 14) ) - doDraw = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW).Red() > 128; - else - doDraw = true; - - if ( doDraw ) + if ( !wxSystemSettings::GetAppearance().IsDark() ) { HIThemeSplitterDrawInfo drawInfo; drawInfo.version = 0; diff --git a/src/osx/carbon/statbrma.cpp b/src/osx/carbon/statbrma.cpp index 3d63fa31a5..ba19399a55 100644 --- a/src/osx/carbon/statbrma.cpp +++ b/src/osx/carbon/statbrma.cpp @@ -88,7 +88,7 @@ void wxStatusBarMac::InitColours() m_textActive = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT); m_textInactive = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT); - if ( bg.Red() < 128 ) + if ( wxSystemSettings::GetAppearance().IsDark() ) { // dark mode appearance m_textActive = wxColour(0xB0, 0xB0, 0xB0);