From 68fb51cd1db401a0a1aa4ec277f2c3f6a9bd994e Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 4 Jul 2007 08:04:31 +0000 Subject: [PATCH] always assert if char<->wxUniChar conversion fails, not only if wxUSE_UTF8_LOCALE_ONLY git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/unichar.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/common/unichar.cpp b/src/common/unichar.cpp index efcfe62bab..4bfb6277b8 100644 --- a/src/common/unichar.cpp +++ b/src/common/unichar.cpp @@ -43,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 } @@ -61,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 } -- 2.45.2