Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

always assert if char<->wxUniChar conversion fails, not only if wxUSE_UTF8_LOCALE_ONLY

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-07-04 08:04:31 +00:00
parent 30f3757b50
commit 68fb51cd1d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/unichar.cpp
View File

@@ -43,12 +43,15 @@ wxUniChar::value_type wxUniChar::From8bit(char c)
return c; 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? return wxT('?'); // FIXME-UTF8: what to use as failure character?
#else #else
wchar_t buf[2]; wchar_t buf[2];
if ( wxConvLibc.ToWChar(buf, 2, &c, 1) != 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]; return buf[0];
#endif #endif
} }
@@ -61,13 +64,16 @@ char wxUniChar::To8bit(wxUniChar::value_type c)
return c; 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? return '?'; // FIXME-UTF8: what to use as failure character?
#else #else
wchar_t in = c; wchar_t in = c;
char buf[2]; char buf[2];
if ( wxConvLibc.FromWChar(buf, 2, &in, 1) != 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]; return buf[0];
#endif #endif
} }