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

using statically allocated font objects for speedup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2010-04-08 18:47:41 +00:00
parent cfb0ef701e
commit 7eb8aeb8b1
9 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/osx/window_osx.cpp
View File

@@ -338,36 +338,33 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
m_peer->SetData<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;
#endif
wxFont font ;
wxOSXSystemFont systemFont = wxOSX_SYSTEM_FONT_NORMAL ;
switch ( variant )
{
case wxWINDOW_VARIANT_NORMAL :
systemFont = wxOSX_SYSTEM_FONT_NORMAL ;
static wxFont sysNormal(wxOSX_SYSTEM_FONT_NORMAL);
SetFont(sysNormal) ;
break ;
case wxWINDOW_VARIANT_SMALL :
systemFont = wxOSX_SYSTEM_FONT_SMALL ;
static wxFont sysSmall(wxOSX_SYSTEM_FONT_SMALL);
SetFont(sysSmall) ;
break ;
case wxWINDOW_VARIANT_MINI :
systemFont = wxOSX_SYSTEM_FONT_MINI ;
static wxFont sysMini(wxOSX_SYSTEM_FONT_MINI);
SetFont(sysMini) ;
break ;
case wxWINDOW_VARIANT_LARGE :
systemFont = wxOSX_SYSTEM_FONT_NORMAL ;
static wxFont sysLarge(wxOSX_SYSTEM_FONT_NORMAL);
SetFont(sysLarge) ;
break ;
default:
wxFAIL_MSG(wxT("unexpected window variant"));
break ;
}
font.CreateSystemFont( systemFont ) ;
SetFont( font ) ;
}
void wxWindowMac::MacUpdateControlFont()