AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only set font color if explicitly set

Browse Source 
Otherwise eg the default button doesn't get its white font color.
This commit is contained in:
Stefan Csomor 2017-09-07 19:00:43 +02:00
parent 41d042516d
commit 37191f6f16
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/osx/cocoa/window.mm
View File

@ -2447,7 +2447,8 @@ void wxWidgetCocoaImpl::SetLabel( const wxString& title, wxFontEncoding encoding
if ( [m_osxView respondsToSelector:@selector(setAttributedTitle:) ] ) if ( [m_osxView respondsToSelector:@selector(setAttributedTitle:) ] )
{ {
wxFont f = GetWXPeer()->GetFont(); wxFont f = GetWXPeer()->GetFont();
wxColour col = GetWXPeer()->GetForegroundColour(); // we should not override system font colors unless explicitly specified
wxColour col = GetWXPeer()->UseForegroundColour() ? GetWXPeer()->GetForegroundColour() : wxNullColour;
if ( f.GetStrikethrough() || f.GetUnderlined() || col.IsOk() ) if ( f.GetStrikethrough() || f.GetUnderlined() || col.IsOk() )
{ {
wxCFStringRef cf(title, encoding ); wxCFStringRef cf(title, encoding );