From 91cddacfe014ae0b0afd78cfc866494f4b5e9090 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 23 Oct 2001 23:21:31 +0000 Subject: [PATCH] fix for typo git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/xrc/xmlres.cpp | 6 ++++-- src/xrc/xmlres.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp index ef1e2f2761..8064dd9470 100644 --- a/contrib/src/xrc/xmlres.cpp +++ b/contrib/src/xrc/xmlres.cpp @@ -808,8 +808,10 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param) wxString encoding = GetParamValue(wxT("encoding")); wxFontMapper mapper; wxFontEncoding enc = wxFONTENCODING_DEFAULT; - if (!encoding.IsEmpty()) enc = mapper.CharsetToEncoding(encoding); - if (enc == wxFONTENCODING_SYSTEM) enc = wxFONTENCODING_SYSTEM; + if (!encoding.IsEmpty()) + enc = mapper.CharsetToEncoding(encoding); + if (enc == wxFONTENCODING_SYSTEM) + enc = wxFONTENCODING_DEFAULT; wxString faces = GetParamValue(wxT("face")); wxString facename = wxEmptyString; diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index ef1e2f2761..8064dd9470 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -808,8 +808,10 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param) wxString encoding = GetParamValue(wxT("encoding")); wxFontMapper mapper; wxFontEncoding enc = wxFONTENCODING_DEFAULT; - if (!encoding.IsEmpty()) enc = mapper.CharsetToEncoding(encoding); - if (enc == wxFONTENCODING_SYSTEM) enc = wxFONTENCODING_SYSTEM; + if (!encoding.IsEmpty()) + enc = mapper.CharsetToEncoding(encoding); + if (enc == wxFONTENCODING_SYSTEM) + enc = wxFONTENCODING_DEFAULT; wxString faces = GetParamValue(wxT("face")); wxString facename = wxEmptyString; -- 2.47.2