From: Václav Slavík <vslavik@fastmail.fm>
Date: Mon, 19 Aug 2002 23:09:18 +0000 (+0000)
Subject: reverted Robert's preference for tables-driven EC_CharSet
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e4c2bd8403ea224ae5ce482f9a6cc2ac8c902dac?ds=inline

reverted Robert's preference for tables-driven EC_CharSet


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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 516e0a6a7c..cf96614eef 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -908,23 +908,23 @@ static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
         cset = NULL;
     }
 
-#if wxUSE_FONTMAP
-    cset = new EC_CharSet(name);
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+    cset = new CP_CharSet(name);
     if ( cset->usable() )
         return cset;
 
     delete cset;
     cset = NULL;
-#endif // wxUSE_FONTMAP
+#endif // __WIN32__
 
-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
-    cset = new CP_CharSet(name);
+#if wxUSE_FONTMAP
+    cset = new EC_CharSet(name);
     if ( cset->usable() )
         return cset;
 
     delete cset;
     cset = NULL;
-#endif // __WIN32__
+#endif // wxUSE_FONTMAP
 
     wxLogError(_("Cannot convert from encoding '%s'!"), name);