From 6eab84e26d384f147983a308085ca1e55f91a7fa Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 13 Jul 2020 20:24:57 +0200 Subject: [PATCH] Use wxSYS_COLOUR_GRAYTEXT for disabled AUI buttons labels This is more appropriate than wxSYS_COLOUR_INACTIVECAPTIONTEXT which just happened to be the same as wxSYS_COLOUR_GRAYTEXT under Mac, but this is not true elsewhere. --- src/aui/auibar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp index 7434a494ec..603c9e718d 100644 --- a/src/aui/auibar.cpp +++ b/src/aui/auibar.cpp @@ -354,7 +354,7 @@ void wxAuiGenericToolBarArt::DrawButton( dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT)); if (item.GetState() & wxAUI_BUTTON_STATE_DISABLED) { - dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_INACTIVECAPTIONTEXT)); + dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT)); } if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() ) @@ -484,7 +484,7 @@ void wxAuiGenericToolBarArt::DrawDropDownButton( dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT)); if (item.GetState() & wxAUI_BUTTON_STATE_DISABLED) { - dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_INACTIVECAPTIONTEXT)); + dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT)); } if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() )