X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f1c75e0f93b4ec9f45827cc5a2d16ef17a675dfc..05e1201cb5943fb9c75f5612e9fb9323358edab5:/src/common/fmapbase.cpp?ds=inline diff --git a/src/common/fmapbase.cpp b/src/common/fmapbase.cpp index f39c95e01d..e9b303613c 100644 --- a/src/common/fmapbase.cpp +++ b/src/common/fmapbase.cpp @@ -87,6 +87,12 @@ static wxFontEncoding gs_encodings[] = wxFONTENCODING_CP437, wxFONTENCODING_UTF7, wxFONTENCODING_UTF8, + wxFONTENCODING_UTF16, + wxFONTENCODING_UTF16BE, + wxFONTENCODING_UTF16LE, + wxFONTENCODING_UTF32, + wxFONTENCODING_UTF32BE, + wxFONTENCODING_UTF32LE, wxFONTENCODING_EUC_JP, }; @@ -124,6 +130,12 @@ static const wxChar* gs_encodingDescs[] = wxTRANSLATE( "Windows/DOS OEM (CP 437)" ), wxTRANSLATE( "Unicode 7 bit (UTF-7)" ), wxTRANSLATE( "Unicode 8 bit (UTF-8)" ), + wxTRANSLATE( "Unicode 16 bit (UTF-16)" ), + wxTRANSLATE( "Unicode 16 bit Big Endian (UTF-16BE)" ), + wxTRANSLATE( "Unicode 16 bit Little Endian (UTF-16LE)" ), + wxTRANSLATE( "Unicode 32 bit (UTF-32)" ), + wxTRANSLATE( "Unicode 32 bit Big Endian (UTF-32BE)" ), + wxTRANSLATE( "Unicode 32 bit Little Endian (UTF-32LE)" ), wxTRANSLATE( "Extended Unix Codepage for Japanese (EUC-JP)" ), }; @@ -161,6 +173,12 @@ static const wxChar* gs_encodingNames[] = wxT( "windows-437" ), wxT( "utf-7" ), wxT( "utf-8" ), + wxT( "utf-16" ), + wxT( "utf-16be" ), + wxT( "utf-16le" ), + wxT( "utf-32" ), + wxT( "utf-32be" ), + wxT( "utf-32le" ), wxT( "euc-jp" ), }; @@ -362,6 +380,20 @@ void wxFontMapperBase::RestorePath(const wxString& pathOld) wxFontEncoding wxFontMapperBase::CharsetToEncoding(const wxString& charset, bool WXUNUSED(interactive)) +{ + int enc = NonInteractiveCharsetToEncoding(charset); + if ( enc == wxFONTENCODING_UNKNOWN ) + { + // we should return wxFONTENCODING_SYSTEM from here for unknown + // encodings + enc = wxFONTENCODING_SYSTEM; + } + + return (wxFontEncoding)enc; +} + +int +wxFontMapperBase::NonInteractiveCharsetToEncoding(const wxString& charset) { wxFontEncoding encoding = wxFONTENCODING_SYSTEM; @@ -382,7 +414,7 @@ wxFontMapperBase::CharsetToEncoding(const wxString& charset, if ( value == wxFONTENCODING_UNKNOWN ) { // don't try to find it, in particular don't ask the user - return wxFONTENCODING_SYSTEM; + return value; } if ( value >= 0 && value <= wxFONTENCODING_MAX ) @@ -441,6 +473,30 @@ wxFontMapperBase::CharsetToEncoding(const wxString& charset, { encoding = wxFONTENCODING_UTF8; } + else if ( cs == wxT("UTF-16") ) + { + encoding = wxFONTENCODING_UTF16; + } + else if ( cs == wxT("UTF-16BE") ) + { + encoding = wxFONTENCODING_UTF16BE; + } + else if ( cs == wxT("UTF-16LE") ) + { + encoding = wxFONTENCODING_UTF16LE; + } + else if ( cs == wxT("UTF-32") || cs == wxT("UCS-4") ) + { + encoding = wxFONTENCODING_UTF32; + } + else if ( cs == wxT("UTF-32BE") || cs == wxT("UCS-4BE") ) + { + encoding = wxFONTENCODING_UTF32BE; + } + else if ( cs == wxT("UTF-32LE") || cs == wxT("UCS-4LE") ) + { + encoding = wxFONTENCODING_UTF32LE; + } else if ( cs == wxT("GB2312") ) { encoding = wxFONTENCODING_GB2312;