X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/607f6d2b4f2e29c389a9bc753813077d0f57d3cb..88bed4b484a2f78c284c049428cd82adcc69f25d:/src/mac/carbon/stattext.cpp diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp index bb9b15ad7f..2982b7c5c4 100644 --- a/src/mac/carbon/stattext.cpp +++ b/src/mac/carbon/stattext.cpp @@ -20,6 +20,7 @@ #include "wx/dc.h" #include "wx/dcclient.h" #include "wx/utils.h" +#include "wx/settings.h" #include @@ -128,6 +129,17 @@ void wxStaticText::OnDraw( wxDC &dc ) if (m_width <= 0 || m_height <= 0) return; + if ( !IsWindowHilited( (WindowRef) MacGetRootWindow() ) && + ( GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) + || GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) ) + { + dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ; + } + else + { + dc.SetTextForeground( GetForegroundColour() ) ; + } + wxString paragraph; int i = 0 ; wxString text = m_label;