X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/155c2f6c8231d2e337a3ed2aad2dca681a8ff76e..434e29032fdbff103182aa97bb66af48332f9dc8:/src/common/unichar.cpp?ds=sidebyside

diff --git a/src/common/unichar.cpp b/src/common/unichar.cpp
index b0f3eb4030..4bfb6277b8 100644
--- a/src/common/unichar.cpp
+++ b/src/common/unichar.cpp
@@ -21,6 +21,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/strconv.h"  // wxConvLibc
+    #include "wx/log.h"
 #endif
 
 #include "wx/unichar.h"
@@ -42,12 +43,15 @@ wxUniChar::value_type wxUniChar::From8bit(char c)
         return c;
 
 #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 )
+    {
+        wxFAIL_MSG( "invalid multibyte character" );
         return wxT('?'); // FIXME-UTF8: what to use as failure character?
+    }
     return buf[0];
 #endif
 }
@@ -60,13 +64,16 @@ char wxUniChar::To8bit(wxUniChar::value_type c)
         return c;
 
 #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 )
+    {
+        wxFAIL_MSG( "character cannot be converted to single byte" );
         return '?'; // FIXME-UTF8: what to use as failure character?
+    }
     return buf[0];
 #endif
 }