colors are only set if non-black, otherwise Enable(false) does not gray them out
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -886,8 +886,14 @@ void wxWindowMac::MacUpdateControlFont()
|
|||||||
fontStyle.just = teJustRight ;
|
fontStyle.just = teJustRight ;
|
||||||
|
|
||||||
|
|
||||||
|
// we only should do this in case of a non-standard color, as otherwise 'disabled' controls
|
||||||
|
// won't get grayed out by the system anymore
|
||||||
|
|
||||||
|
if ( GetForegroundColour() != *wxBLACK )
|
||||||
|
{
|
||||||
fontStyle.foreColor = MAC_WXCOLORREF(GetForegroundColour().GetPixel() ) ;
|
fontStyle.foreColor = MAC_WXCOLORREF(GetForegroundColour().GetPixel() ) ;
|
||||||
fontStyle.flags |= kControlUseForeColorMask ;
|
fontStyle.flags |= kControlUseForeColorMask ;
|
||||||
|
}
|
||||||
|
|
||||||
::SetControlFontStyle( *m_peer , &fontStyle );
|
::SetControlFontStyle( *m_peer , &fontStyle );
|
||||||
Refresh() ;
|
Refresh() ;
|
||||||
|
Reference in New Issue
Block a user