added missing wxUSE_RICHEDIT test

[wxWidgets.git] / src / common / unichar.cpp

diff --git a/src/common/unichar.cpp b/src/common/unichar.cpp
index 4bfb6277b80ac697c6349cc80983f33a7eaacd37..653e33f14e066a0af2f9b8c1cac23f6e8d0c425f 100644 (file)
--- a/src/common/unichar.cpp
+++ b/src/common/unichar.cpp
@@ -36,12 +36,8 @@
 // ---------------------------------------------------------------------------
 
 /* static */
 // ---------------------------------------------------------------------------
 
 /* 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" );
     return wxT('?'); // FIXME-UTF8: what to use as failure character?
 #if wxUSE_UTF8_LOCALE_ONLY
     wxFAIL_MSG( "invalid UTF-8 character" );
     return wxT('?'); // FIXME-UTF8: what to use as failure character?


@@ -57,12 +53,8 @@ wxUniChar::value_type wxUniChar::From8bit(char c)
 }
 
 /* static */
 }
 
 /* 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" );
     return '?'; // FIXME-UTF8: what to use as failure character?
 #if wxUSE_UTF8_LOCALE_ONLY
     wxFAIL_MSG( "character cannot be converted to single UTF-8 byte" );
     return '?'; // FIXME-UTF8: what to use as failure character?