fix for typo

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp
index ef1e2f2761309e848237f3f6663dd6c66fe2b486..8064dd94703f37f23aecebeb2381073dc48e58a4 100644 (file)
--- 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 ef1e2f2761309e848237f3f6663dd6c66fe2b486..8064dd94703f37f23aecebeb2381073dc48e58a4 100644 (file)
--- 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;