X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/761952d9cbc4fef5810fccd8abe2b71b9e29a2a1..96531a71a07563fee5fdfa69eb0a99732fed24de:/src/common/fmapbase.cpp diff --git a/src/common/fmapbase.cpp b/src/common/fmapbase.cpp index 2c15cb5e65..4a8a019edd 100644 --- a/src/common/fmapbase.cpp +++ b/src/common/fmapbase.cpp @@ -152,25 +152,25 @@ static const wxChar* gs_encodingDescs[] = }; // and the internal names (these are not translated on purpose!) -static const wxChar* gs_encodingNames[WXSIZEOF(gs_encodingDescs)][7] = +static const wxChar* gs_encodingNames[WXSIZEOF(gs_encodingDescs)][10] = { - // names from the first column are used under Linux, from the second one - // under Solaris and IRIX and from the third one -- under AIX - { wxT( "ISO-8859-1" ), wxT( "ISO8859-1" ), wxT( "8859-1" ), wxT("iso_8859_1"), NULL }, - { wxT( "ISO-8859-2" ), wxT( "ISO8859-2" ), wxT( "8859-2" ), NULL }, - { wxT( "ISO-8859-3" ), wxT( "ISO8859-3" ), wxT( "8859-3" ), NULL }, - { wxT( "ISO-8859-4" ), wxT( "ISO8859-4" ), wxT( "8859-4" ), NULL }, - { wxT( "ISO-8859-5" ), wxT( "ISO8859-5" ), wxT( "8859-5" ), NULL }, - { wxT( "ISO-8859-6" ), wxT( "ISO8859-6" ), wxT( "8859-6" ), NULL }, - { wxT( "ISO-8859-7" ), wxT( "ISO8859-7" ), wxT( "8859-7" ), NULL }, - { wxT( "ISO-8859-8" ), wxT( "ISO8859-8" ), wxT( "8859-8" ), NULL }, - { wxT( "ISO-8859-9" ), wxT( "ISO8859-9" ), wxT( "8859-9" ), NULL }, - { wxT( "ISO-8859-10" ), wxT( "ISO8859-10" ), wxT( "8859-10" ), NULL }, - { wxT( "ISO-8859-11" ), wxT( "ISO8859-11" ), wxT( "8859-11" ), NULL }, - { wxT( "ISO-8859-12" ), wxT( "ISO8859-12" ), wxT( "8859-12" ), NULL }, - { wxT( "ISO-8859-13" ), wxT( "ISO8859-13" ), wxT( "8859-13" ), NULL }, - { wxT( "ISO-8859-14" ), wxT( "ISO8859-14" ), wxT( "8859-14" ), NULL }, - { wxT( "ISO-8859-15" ), wxT( "ISO8859-15" ), wxT( "8859-15" ), NULL }, + // names from the columns correspond to these OS: + // Linux Solaris and IRIX HP-UX AIX + { _T("ISO-8859-1"), _T("ISO8859-1"), _T("iso88591"), _T("8859-1"), wxT("iso_8859_1"), NULL }, + { _T("ISO-8859-2"), _T("ISO8859-2"), _T("iso88592"), _T("8859-2"), NULL }, + { _T("ISO-8859-3"), _T("ISO8859-3"), _T("iso88593"), _T("8859-3"), NULL }, + { _T("ISO-8859-4"), _T("ISO8859-4"), _T("iso88594"), _T("8859-4"), NULL }, + { _T("ISO-8859-5"), _T("ISO8859-5"), _T("iso88595"), _T("8859-5"), NULL }, + { _T("ISO-8859-6"), _T("ISO8859-6"), _T("iso88596"), _T("8859-6"), NULL }, + { _T("ISO-8859-7"), _T("ISO8859-7"), _T("iso88597"), _T("8859-7"), NULL }, + { _T("ISO-8859-8"), _T("ISO8859-8"), _T("iso88598"), _T("8859-8"), NULL }, + { _T("ISO-8859-9"), _T("ISO8859-9"), _T("iso88599"), _T("8859-9"), NULL }, + { _T("ISO-8859-10"), _T("ISO8859-10"), _T("iso885910"), _T("8859-10"), NULL }, + { _T("ISO-8859-11"), _T("ISO8859-11"), _T("iso885911"), _T("8859-11"), NULL }, + { _T("ISO-8859-12"), _T("ISO8859-12"), _T("iso885912"), _T("8859-12"), NULL }, + { _T("ISO-8859-13"), _T("ISO8859-13"), _T("iso885913"), _T("8859-13"), NULL }, + { _T("ISO-8859-14"), _T("ISO8859-14"), _T("iso885914"), _T("8859-14"), NULL }, + { _T("ISO-8859-15"), _T("ISO8859-15"), _T("iso885915"), _T("8859-15"), NULL }, // although koi8-ru is not strictly speaking the same as koi8-r, // they are similar enough to make mapping it to koi8 better than @@ -178,42 +178,38 @@ static const wxChar* gs_encodingNames[WXSIZEOF(gs_encodingDescs)][7] = { wxT( "KOI8-R" ), wxT( "KOI8-RU" ), NULL }, { wxT( "KOI8-U" ), NULL }, - { wxT( "WINDOWS-874" ), NULL }, - { wxT( "WINDOWS-932" ), NULL }, - { wxT( "WINDOWS-936" ), NULL }, - { wxT( "WINDOWS-949" ), wxT( "EUC-KR" ), wxT( "eucKR" ), wxT( "euc_kr" ), NULL }, - { wxT( "WINDOWS-950" ), NULL }, - { wxT( "WINDOWS-1250" ), NULL }, - { wxT( "WINDOWS-1251" ), NULL }, - { wxT( "WINDOWS-1252" ), wxT("IBM-1252"), NULL }, - { wxT( "WINDOWS-1253" ), NULL }, - { wxT( "WINDOWS-1254" ), NULL }, - { wxT( "WINDOWS-1255" ), NULL }, - { wxT( "WINDOWS-1256" ), NULL }, - { wxT( "WINDOWS-1257" ), NULL }, - { wxT( "WINDOWS-437" ), NULL }, - - { wxT( "UTF-7" ), NULL }, - { wxT( "UTF-8" ), NULL }, - { wxT( "UTF-16" ), NULL }, - { wxT( "UTF-16BE" ), NULL }, - { wxT( "UTF-16LE" ), NULL }, - { wxT( "UTF-32" ), wxT( "UCS-4" ), NULL }, + { wxT( "WINDOWS-874" ), wxT( "CP-874" ), NULL }, + { wxT( "WINDOWS-932" ), wxT( "CP-932" ), NULL }, + { wxT( "WINDOWS-936" ), wxT( "CP-936" ), NULL }, + { wxT( "WINDOWS-949" ), wxT( "CP-949" ), wxT( "EUC-KR" ), wxT( "eucKR" ), wxT( "euc_kr" ), NULL }, + { wxT( "WINDOWS-950" ), wxT( "CP-950" ), NULL }, + { wxT( "WINDOWS-1250" ),wxT( "CP-1250" ), NULL }, + { wxT( "WINDOWS-1251" ),wxT( "CP-1251" ), NULL }, + { wxT( "WINDOWS-1252" ),wxT( "CP-1252" ), wxT("IBM-1252"), NULL }, + { wxT( "WINDOWS-1253" ),wxT( "CP-1253" ), NULL }, + { wxT( "WINDOWS-1254" ),wxT( "CP-1254" ), NULL }, + { wxT( "WINDOWS-1255" ),wxT( "CP-1255" ), NULL }, + { wxT( "WINDOWS-1256" ),wxT( "CP-1256" ), NULL }, + { wxT( "WINDOWS-1257" ),wxT( "CP-1257" ), NULL }, + { wxT( "WINDOWS-437" ), wxT( "CP-437" ), NULL }, + + { wxT( "UTF-7" ), wxT("utf7"), NULL }, + { wxT( "UTF-8" ), wxT("utf8"), NULL }, + { wxT( "UTF-16" ), wxT("UCS-2"), wxT("UCS2"), NULL }, + { wxT( "UTF-16BE" ), wxT("UCS-2BE"), NULL }, + { wxT( "UTF-16LE" ), wxT("UCS-2LE"), NULL }, + { wxT( "UTF-32" ), wxT( "UCS-4" ), wxT("UCS4"), NULL }, { wxT( "UTF-32BE" ), wxT( "UCS-4BE" ), NULL }, { wxT( "UTF-32LE" ), wxT( "UCS-4LE" ), NULL }, { wxT( "EUC-JP" ), wxT( "eucJP" ), wxT( "euc_jp" ), wxT( "IBM-eucJP" ), NULL }, - { wxT( "US-ASCII" ), wxT( "ASCII" ), wxT("ANSI_X3.4-1968"), -#ifdef __SOLARIS__ - wxT("646"), -#endif -#ifdef __HPUX__ - wxT("roman8"), -#endif - wxT( "" ), NULL }, - { wxT( "BIG5" ), NULL }, - { wxT( "shift-jis" ), wxT( "shift_jis" ), wxT( "sjis" ), NULL }, + // 646 is for Solaris, roman8 -- for HP-UX + { wxT( "US-ASCII" ), wxT( "ASCII" ), wxT("C"), wxT("POSIX"), wxT("ANSI_X3.4-1968"), + wxT("646"), wxT("roman8"), wxT( "" ), NULL }, + + { wxT( "BIG5" ), wxT("big5"), NULL }, + { wxT( "SJIS" ), wxT( "SHIFT-JIS" ), wxT( "SHIFT_JIS" ), NULL }, { wxT( "GB2312" ), NULL }, }; @@ -577,7 +573,7 @@ wxFontMapperBase::NonInteractiveCharsetToEncoding(const wxString& charset) if ( *p == wxT('-') ) p++; - int value; + unsigned int value; if ( wxSscanf(p, wxT("%u"), &value) == 1 ) { if ( value >= 1250 ) @@ -716,11 +712,6 @@ wxFontEncoding wxFontMapperBase::GetEncodingFromName(const wxString& name) } } - if ( name == _("default") ) - { - return wxFONTENCODING_DEFAULT; - } - return wxFONTENCODING_MAX; }