From 01e9bd008da4293e18b27333da882831d590b1b0 Mon Sep 17 00:00:00 2001
From: Daniel Kulp <dan@kulp.com>
Date: Mon, 13 Jul 2020 15:59:46 +0200
Subject: [PATCH] Use previously Mac-specific colours for all platforms in
 wxAUI

Get rid of platform checks in wxAUI and use (the same) system colours
everywhere.
---
 src/aui/auibar.cpp  | 20 --------------------
 src/aui/dockart.cpp |  4 ----
 src/aui/tabart.cpp  |  4 ----
 3 files changed, 28 deletions(-)

diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp
index 8b36681b7b..291e49e842 100644
--- a/src/aui/auibar.cpp
+++ b/src/aui/auibar.cpp
@@ -69,11 +69,7 @@ wxBitmap wxAuiBitmapFromBits(const unsigned char bits[], int w, int h,
 static wxColor GetBaseColor()
 {
 
-#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
-    wxColor baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-#else
     wxColor baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-#endif
 
     // the baseColour is too pale to use as our base colour,
     // so darken it a bit --
@@ -252,11 +248,7 @@ void wxAuiGenericToolBarArt::DrawLabel(
                                     const wxRect& rect)
 {
     dc.SetFont(m_font);
-#ifdef __WXMAC__
     dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT));
-#else
-    dc.SetTextForeground(*wxBLACK);
-#endif
 
     // we only care about the text height here since the text
     // will get cropped based on the width of the item
@@ -369,11 +361,7 @@ void wxAuiGenericToolBarArt::DrawButton(
     dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT));
     if (item.GetState() & wxAUI_BUTTON_STATE_DISABLED)
     {
-#ifdef __WXMAC__
         dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_INACTIVECAPTIONTEXT));
-#else
-        dc.SetTextForeground(DISABLED_TEXT_COLOR);
-#endif
     }
 
     if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() )
@@ -503,11 +491,7 @@ void wxAuiGenericToolBarArt::DrawDropDownButton(
     dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT));
     if (item.GetState() & wxAUI_BUTTON_STATE_DISABLED)
     {
-#ifdef __WXMAC__
         dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_INACTIVECAPTIONTEXT));
-#else
-        dc.SetTextForeground(DISABLED_TEXT_COLOR);
-#endif
     }
 
     if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() )
@@ -547,11 +531,7 @@ void wxAuiGenericToolBarArt::DrawControlLabel(
         return;
 
     // set the label's text color
-#ifdef __WXMAC__
     dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT));
-#else
-    dc.SetTextForeground(*wxBLACK);
-#endif
 
     textX = rect.x + (rect.width/2) - (textWidth/2) + 1;
     textY = rect.y + rect.height - textHeight - 1;
diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
index 22f0f65e11..d0cd248896 100644
--- a/src/aui/dockart.cpp
+++ b/src/aui/dockart.cpp
@@ -319,11 +319,7 @@ wxAuiDefaultDockArt::InitBitmaps ()
 
 void wxAuiDefaultDockArt::UpdateColoursFromSystem()
 {
-#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
-    wxColor baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-#else
     wxColor baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-#endif
 
     // the baseColour is too pale to use as our base colour,
     // so darken it a bit --
diff --git a/src/aui/tabart.cpp b/src/aui/tabart.cpp
index 95a7a2bd5c..807155b17d 100644
--- a/src/aui/tabart.cpp
+++ b/src/aui/tabart.cpp
@@ -193,11 +193,7 @@ wxAuiGenericTabArt::~wxAuiGenericTabArt()
 
 void wxAuiGenericTabArt::UpdateColoursFromSystem()
 {
-#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
-    wxColor baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-#else
     wxColor baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-#endif
 
     // the baseColour is too pale to use as our base colour,
     // so darken it a bit --