corrected graying out, only to be executed when background is gray or white

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 88b0edf3f9b5564cc832cbde0f6b70553a469857..e977973b73ec30c1fc5062d29cb5a40df0207f18 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -128,10 +128,17 @@ void wxStaticText::OnDraw( wxDC &dc )
     if (m_width <= 0 || m_height <= 0)
         return;
 
-  if ( !IsWindowHilited( MacGetRootWindow() ) )
+  if ( !IsWindowHilited( MacGetRootWindow() ) && 
+    ( GetBackgroundColour() == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) 
+      || GetBackgroundColour() == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) ) )
   {
     dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
   }
+  else
+  {
+    dc.SetTextForeground( GetForegroundColour() ) ;
+  }
+  
   wxString paragraph;
   int i = 0 ;
   wxString text = m_label;

diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index 88b0edf3f9b5564cc832cbde0f6b70553a469857..e977973b73ec30c1fc5062d29cb5a40df0207f18 100644 (file)
--- a/src/mac/stattext.cpp
+++ b/src/mac/stattext.cpp
@@ -128,10 +128,17 @@ void wxStaticText::OnDraw( wxDC &dc )
     if (m_width <= 0 || m_height <= 0)
         return;
 
-  if ( !IsWindowHilited( MacGetRootWindow() ) )
+  if ( !IsWindowHilited( MacGetRootWindow() ) && 
+    ( GetBackgroundColour() == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) 
+      || GetBackgroundColour() == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) ) )
   {
     dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
   }
+  else
+  {
+    dc.SetTextForeground( GetForegroundColour() ) ;
+  }
+  
   wxString paragraph;
   int i = 0 ;
   wxString text = m_label;