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

Use wxSYS_COLOUR_GRAYTEXT for disabled AUI buttons labels

Browse Source 
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.
This commit is contained in:
Vadim Zeitlin
2020-07-13 20:24:57 +02:00
parent 77095c5fbd
commit 6eab84e26d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/aui/auibar.cpp
View File

@@ -354,7 +354,7 @@ void wxAuiGenericToolBarArt::DrawButton(
dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT)); dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT));
if (item.GetState() & wxAUI_BUTTON_STATE_DISABLED) 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() ) if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() )
@@ -484,7 +484,7 @@ void wxAuiGenericToolBarArt::DrawDropDownButton(
dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT)); dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT));
if (item.GetState() & wxAUI_BUTTON_STATE_DISABLED) 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() ) if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() )