always use SYSTEM_FONT under CE, it doesn't have any others
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
5fccb5b4fd
commit
27adb8ba21
@ -249,6 +249,17 @@ wxFont wxCreateFontFromStockObject(int index)
|
||||
|
||||
wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
|
||||
{
|
||||
#ifdef __WXWINCE__
|
||||
// under CE only a single SYSTEM_FONT exists
|
||||
index;
|
||||
|
||||
if ( !gs_fontDefault )
|
||||
{
|
||||
gs_fontDefault = new wxFont(wxCreateFontFromStockObject(SYSTEM_FONT));
|
||||
}
|
||||
|
||||
return *gs_fontDefault;
|
||||
#else // !__WXWINCE__
|
||||
// wxWindow ctor calls GetSystemFont(wxSYS_DEFAULT_GUI_FONT) so we're
|
||||
// called fairly often -- this is why we cache this particular font
|
||||
const bool isDefaultRequested = index == wxSYS_DEFAULT_GUI_FONT;
|
||||
@ -267,6 +278,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
|
||||
}
|
||||
|
||||
return font;
|
||||
#endif // __WXWINCE__/!__WXWINCE__
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user