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

recognize 646 charset as US-ASCII (this is how it is used by Solaris)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-01-23 12:02:40 +00:00
parent 273b399fe9
commit caa6e137ba
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/fontmap.cpp
View File

@@ -479,7 +479,7 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
cs.Trim(FALSE); cs.Trim(FALSE);
// discard the optional quotes // discard the optional quotes
if ( !!cs ) if ( !cs.empty() )
{ {
if ( cs[0u] == _T('"') && cs.Last() == _T('"') ) if ( cs[0u] == _T('"') && cs.Last() == _T('"') )
{ {
@@ -489,7 +489,10 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
cs.MakeUpper(); cs.MakeUpper();
if ( !cs || cs == wxT("US-ASCII") ) // nl_langinfo() under Solaris returns 646 by default which stands for
// ISO-646, i.e. 7 bit ASCII and we should recognize it to avoid
// warnings about unrecognized encoding on each program startup
if ( cs.empty() || cs == _T("US-ASCII") || cs == _T("646") )
{ {
encoding = wxFONTENCODING_DEFAULT; encoding = wxFONTENCODING_DEFAULT;
} }