Compilation fixes for wxUSE_FONTMAP==0.

Closes #11150.

Closes #11152.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-08-28 10:44:12 +00:00
parent 1c51fc784d
commit dc2575bad4
2 changed files with 4 additions and 0 deletions

View File

@@ -1793,6 +1793,7 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
// encoding
wxFontEncoding enc = wxFONTENCODING_DEFAULT;
bool hasEncoding = HasParam(wxT("encoding"));
#if wxUSE_FONTMAP
if (hasEncoding)
{
wxString encoding = GetParamValue(wxT("encoding"));
@@ -1802,6 +1803,7 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
if (enc == wxFONTENCODING_SYSTEM)
enc = wxFONTENCODING_DEFAULT;
}
#endif // wxUSE_FONTMAP
// is this font based on a system font?
wxFont font = GetSystemFont(GetParamValue(wxT("sysfont")));