From 88928e712a18c3c68d3b90f9b410a765385d9d38 Mon Sep 17 00:00:00 2001 From: Daniel Kulp Date: Mon, 13 Jul 2020 00:52:50 +0200 Subject: [PATCH] Use system colours in wxAuiGenericTabArt Don't hardcode black and grey, which don't look right in all themes. --- src/aui/tabart.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/aui/tabart.cpp b/src/aui/tabart.cpp index b4b8ab6397..eb5dc8cda6 100644 --- a/src/aui/tabart.cpp +++ b/src/aui/tabart.cpp @@ -176,14 +176,14 @@ static const unsigned char list_bits[] = { wxAuiGenericTabArt::wxAuiGenericTabArt() : m_normalFont(*wxNORMAL_FONT) , m_selectedFont(m_normalFont) - , m_activeCloseBmp(wxAuiBitmapFromBits(close_bits, 16, 16, *wxBLACK)) - , m_disabledCloseBmp(wxAuiBitmapFromBits(close_bits, 16, 16, wxColour(128,128,128))) - , m_activeLeftBmp(wxAuiBitmapFromBits(left_bits, 16, 16, *wxBLACK)) - , m_disabledLeftBmp(wxAuiBitmapFromBits(left_bits, 16, 16, wxColour(128,128,128))) - , m_activeRightBmp(wxAuiBitmapFromBits(right_bits, 16, 16, *wxBLACK)) - , m_disabledRightBmp(wxAuiBitmapFromBits(right_bits, 16, 16, wxColour(128,128,128))) - , m_activeWindowListBmp(wxAuiBitmapFromBits(list_bits, 16, 16, *wxBLACK)) - , m_disabledWindowListBmp(wxAuiBitmapFromBits(list_bits, 16, 16, wxColour(128,128,128))) + , m_activeCloseBmp(wxAuiBitmapFromBits(close_bits, 16, 16, wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT))) + , m_disabledCloseBmp(wxAuiBitmapFromBits(close_bits, 16, 16, wxSystemSettings::GetColour(wxSYS_COLOUR_INACTIVECAPTION))) + , m_activeLeftBmp(wxAuiBitmapFromBits(left_bits, 16, 16, wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT))) + , m_disabledLeftBmp(wxAuiBitmapFromBits(left_bits, 16, 16, wxSystemSettings::GetColour(wxSYS_COLOUR_INACTIVECAPTION))) + , m_activeRightBmp(wxAuiBitmapFromBits(right_bits, 16, 16, wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT))) + , m_disabledRightBmp(wxAuiBitmapFromBits(right_bits, 16, 16, wxSystemSettings::GetColour(wxSYS_COLOUR_INACTIVECAPTION))) + , m_activeWindowListBmp(wxAuiBitmapFromBits(list_bits, 16, 16, wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT))) + , m_disabledWindowListBmp(wxAuiBitmapFromBits(list_bits, 16, 16, wxSystemSettings::GetColour(wxSYS_COLOUR_INACTIVECAPTION))) { m_selectedFont.SetWeight(wxFONTWEIGHT_BOLD); m_measuringFont = m_selectedFont;