Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-01-03 09:29:20 +00:00
parent 19f478fdd7
commit c9fdc1071b
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mac/carbon/stattext.cpp
View File

@@ -128,10 +128,17 @@ void wxStaticText::OnDraw( wxDC &dc )
if (m_width <= 0 || m_height <= 0) if (m_width <= 0 || m_height <= 0)
return; 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 ) ) ; dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
} }
else
{
dc.SetTextForeground( GetForegroundColour() ) ;
}
wxString paragraph; wxString paragraph;
int i = 0 ; int i = 0 ;
wxString text = m_label; wxString text = m_label;

9
src/mac/stattext.cpp
View File

@@ -128,10 +128,17 @@ void wxStaticText::OnDraw( wxDC &dc )
if (m_width <= 0 || m_height <= 0) if (m_width <= 0 || m_height <= 0)
return; 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 ) ) ; dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
} }
else
{
dc.SetTextForeground( GetForegroundColour() ) ;
}
wxString paragraph; wxString paragraph;
int i = 0 ; int i = 0 ;
wxString text = m_label; wxString text = m_label;