don't use deprecated wxMenuItem methods

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

diff --git a/src/common/unichar.cpp b/src/common/unichar.cpp
index efcfe62babcf0dd0abed5b45111eb2ffb6f9f68c..653e33f14e066a0af2f9b8c1cac23f6e8d0c425f 100644 (file)
--- a/src/common/unichar.cpp
+++ b/src/common/unichar.cpp
@@ -36,38 +36,36 @@
 // ---------------------------------------------------------------------------
 
 /* 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
 #if wxUSE_UTF8_LOCALE_ONLY

-    wxFAIL_MSG( _T("invalid UTF-8 character") );
+    wxFAIL_MSG( "invalid UTF-8 character" );

     return wxT('?'); // FIXME-UTF8: what to use as failure character?
 #else
     wchar_t buf[2];
     if ( wxConvLibc.ToWChar(buf, 2, &c, 1) != 2 )
     return wxT('?'); // FIXME-UTF8: what to use as failure character?
 #else
     wchar_t buf[2];
     if ( wxConvLibc.ToWChar(buf, 2, &c, 1) != 2 )

+    {
+        wxFAIL_MSG( "invalid multibyte character" );

         return wxT('?'); // FIXME-UTF8: what to use as failure character?
         return wxT('?'); // FIXME-UTF8: what to use as failure character?

+    }

     return buf[0];
 #endif
 }
 
 /* static */
     return buf[0];
 #endif
 }
 
 /* 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
 #if wxUSE_UTF8_LOCALE_ONLY

-    wxFAIL_MSG( _T("character cannot be converted to single UTF-8 byte") );
+    wxFAIL_MSG( "character cannot be converted to single UTF-8 byte" );

     return '?'; // FIXME-UTF8: what to use as failure character?
 #else
     wchar_t in = c;
     char buf[2];
     if ( wxConvLibc.FromWChar(buf, 2, &in, 1) != 2 )
     return '?'; // FIXME-UTF8: what to use as failure character?
 #else
     wchar_t in = c;
     char buf[2];
     if ( wxConvLibc.FromWChar(buf, 2, &in, 1) != 2 )

+    {
+        wxFAIL_MSG( "character cannot be converted to single byte" );

         return '?'; // FIXME-UTF8: what to use as failure character?
         return '?'; // FIXME-UTF8: what to use as failure character?

+    }

     return buf[0];
 #endif
 }
     return buf[0];
 #endif
 }