X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68fb51cd1db401a0a1aa4ec277f2c3f6a9bd994e..b25c34aae4f8ef394efc04eed23163e8b4837bf4:/src/common/unichar.cpp diff --git a/src/common/unichar.cpp b/src/common/unichar.cpp index 4bfb6277b8..d75555acd9 100644 --- a/src/common/unichar.cpp +++ b/src/common/unichar.cpp @@ -36,14 +36,12 @@ // --------------------------------------------------------------------------- /* static */ -wxUniChar::value_type wxUniChar::From8bit(char c) +wxUniChar::value_type wxUniChar::FromHi8bit(char c) { - // all supported charsets have the first 128 characters same as ASCII: - if ( (unsigned char)c < 0x80 ) - return c; - #if wxUSE_UTF8_LOCALE_ONLY wxFAIL_MSG( "invalid UTF-8 character" ); + wxUnusedVar(c); + return wxT('?'); // FIXME-UTF8: what to use as failure character? #else wchar_t buf[2]; @@ -57,14 +55,12 @@ wxUniChar::value_type wxUniChar::From8bit(char c) } /* static */ -char wxUniChar::To8bit(wxUniChar::value_type c) +char wxUniChar::ToHi8bit(wxUniChar::value_type c) { - // all supported charsets have the first 128 characters same as ASCII: - if ( c < 0x80 ) - return c; - #if wxUSE_UTF8_LOCALE_ONLY wxFAIL_MSG( "character cannot be converted to single UTF-8 byte" ); + wxUnusedVar(c); + return '?'; // FIXME-UTF8: what to use as failure character? #else wchar_t in = c;