X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c469f7f4e85bd5212bf0409be0384a7b89405df..0c44c1c63f96363fe834ce1c7e52f16961f14cc5:/src/mac/carbon/stattext.cpp?ds=sidebyside

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 88b0edf3f9..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 <stdio.h>
 
@@ -128,10 +129,17 @@ void wxStaticText::OnDraw( wxDC &dc )
     if (m_width <= 0 || m_height <= 0)
         return;
 
-  if ( !IsWindowHilited( MacGetRootWindow() ) )
+  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;