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

recognize ANSI_X3.4-1968 as US-ASCII

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-03-22 19:09:03 +00:00
parent 01459e68af
commit 84f858e94c
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/intl.cpp
View File

@@ -1253,18 +1253,23 @@ wxString wxLocale::GetSystemEncodingName()
char *alang = nl_langinfo(CODESET); char *alang = nl_langinfo(CODESET);
setlocale(LC_CTYPE, oldLocale); setlocale(LC_CTYPE, oldLocale);
free(oldLocale); free(oldLocale);
if (alang)
if ( alang )
{ {
#ifdef __SOLARIS__ // 7 bit ASCII encoding has several alternative names which we should
// recognize to avoid warnings about unrecognized encoding on each
// program startup
// nl_langinfo() under Solaris returns 646 by default which stands for // 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 // ISO-646, i.e. 7 bit ASCII
// warnings about unrecognized encoding on each program startup //
if ( strcmp(alang, "646") == 0 ) // and recent glibc call it ANSI_X3.4-1968...
if ( strcmp(alang, "646") == 0 ||
strcmp(alang, "ANSI_X3.4-1968") == 0 )
{ {
encname = _T("US-ASCII"); encname = _T("US-ASCII");
} }
else else
#endif // __SOLARIS__
{ {
encname = wxConvLibc.cMB2WX(alang); encname = wxConvLibc.cMB2WX(alang);
} }