From e4c2bd8403ea224ae5ce482f9a6cc2ac8c902dac Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 19 Aug 2002 23:09:18 +0000 Subject: [PATCH] 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 --- src/common/strconv.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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); -- 2.47.2