Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverted Robert's preference for tables-driven EC_CharSet

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-08-19 23:09:18 +00:00
parent 4efd425972
commit e4c2bd8403
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/strconv.cpp
View File

@@ -908,15 +908,6 @@ static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
cset = NULL; cset = NULL;
} }
#if wxUSE_FONTMAP
cset = new EC_CharSet(name);
if ( cset->usable() )
return cset;
delete cset;
cset = NULL;
#endif // wxUSE_FONTMAP
#if defined(__WIN32__) && !defined(__WXMICROWIN__) #if defined(__WIN32__) && !defined(__WXMICROWIN__)
cset = new CP_CharSet(name); cset = new CP_CharSet(name);
if ( cset->usable() ) if ( cset->usable() )
@@ -926,6 +917,15 @@ static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
cset = NULL; cset = NULL;
#endif // __WIN32__ #endif // __WIN32__
#if wxUSE_FONTMAP
cset = new EC_CharSet(name);
if ( cset->usable() )
return cset;
delete cset;
cset = NULL;
#endif // wxUSE_FONTMAP
wxLogError(_("Cannot convert from encoding '%s'!"), name); wxLogError(_("Cannot convert from encoding '%s'!"), name);
return NULL; return NULL;