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

Avoid unnecessary checks in wxStaticText::SetFont() in wxGTK

Browse Source 
There is no need to do anything if the font didn't actually change.
This commit is contained in:
Vadim Zeitlin
2018-01-16 16:26:35 +01:00
parent 6651999719
commit 51bfc68423
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gtk/stattext.cpp
View File

@@ -175,7 +175,8 @@ bool wxStaticText::SetFont( const wxFont &font )
const bool wasUnderlined = GetFont().GetUnderlined(); const bool wasUnderlined = GetFont().GetUnderlined();
const bool wasStrickenThrough = GetFont().GetStrikethrough(); const bool wasStrickenThrough = GetFont().GetStrikethrough();
bool ret = wxControl::SetFont(font); if ( !wxControl::SetFont(font) )
return false;
const bool isUnderlined = GetFont().GetUnderlined(); const bool isUnderlined = GetFont().GetUnderlined();
const bool isStrickenThrough = GetFont().GetStrikethrough(); const bool isStrickenThrough = GetFont().GetStrikethrough();
@@ -219,7 +220,7 @@ bool wxStaticText::SetFont( const wxFont &font )
AutoResizeIfNecessary(); AutoResizeIfNecessary();
return ret; return true;
} }
wxSize wxStaticText::DoGetBestSize() const wxSize wxStaticText::DoGetBestSize() const