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
This commit is contained in:
parent
19f478fdd7
commit
c9fdc1071b
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user