failed conversion shouldn't trigger an assert

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/core/strconv_cf.cpp b/src/osx/core/strconv_cf.cpp
index be04c8a881aa8683675a0b7fc70898eff051ed42..b4cde0c351bee28e264797685b30fec92068c043 100644 (file)
--- a/src/osx/core/strconv_cf.cpp
+++ b/src/osx/core/strconv_cf.cpp
@@ -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