failed conversion shouldn't trigger an assert
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
fb5ae4f6d9
commit
8fa2cfe258
@ -85,7 +85,8 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf(wxFontEncoding encoding)
|
||||
false //no BOM/external representation
|
||||
));
|
||||
|
||||
wxCHECK(theString != NULL, wxCONV_FAILED);
|
||||
if ( theString == NULL )
|
||||
return wxCONV_FAILED;
|
||||
|
||||
/* NOTE: The string content includes the NULL element if the source string did
|
||||
* That means we have to do nothing special because the destination will have
|
||||
|
Loading…
Reference in New Issue
Block a user