X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f61e22c77b1a7cb148f6567996d816f72ac854f..221ed5767f7ef4d51b0bbef50ec9f53edfaa46f2:/src/common/strconv.cpp

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 17a15ca5a8..d53b870f40 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -858,8 +858,9 @@ public:
     {
         if (name)
             enc = wxTheFontMapper->CharsetToEncoding(name, FALSE);
-        m2w.Init(enc, wxFONTENCODING_UNICODE);
-        w2m.Init(wxFONTENCODING_UNICODE, enc);
+
+        m_ok = m2w.Init(enc, wxFONTENCODING_UNICODE) &&
+               w2m.Init(wxFONTENCODING_UNICODE, enc);
     }
 
     size_t MB2WC(wchar_t *buf, const char *psz, size_t n)
@@ -884,12 +885,14 @@ public:
         return inbuf;
     }
 
-    bool usable() const
-        { return (enc!=wxFONTENCODING_SYSTEM) && (enc!=wxFONTENCODING_DEFAULT); }
+    bool usable() const { return m_ok; }
 
 public:
     wxFontEncoding enc;
     wxEncodingConverter m2w, w2m;
+
+    // were we initialized successfully?
+    bool m_ok;
 };
 
 #endif // wxUSE_FONTMAP
@@ -901,46 +904,67 @@ public:
 
 static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
 {
-    wxCharacterSet *cset = NULL;
-    if (name)
+    // check for the special case of ASCII charset
+#if wxUSE_FONTMAP
+    if ( wxTheFontMapper->CharsetToEncoding(name) == wxFONTENCODING_DEFAULT )
+#else // wxUSE_FONTMAP
+    if ( !name )
+#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
     {
-        if (wxStricmp(name, wxT("UTF8")) == 0 || wxStricmp(name, wxT("UTF-8")) == 0)
-        {
-            cset = new ID_CharSet(name, &wxConvUTF8);
-        }
-        else
-        {
-#ifdef HAVE_ICONV
-            cset = new IC_CharSet(name); // may not take NULL
-#endif
-        }
+        // don't convert at all
+        return NULL;
     }
 
-    if (cset && cset->usable())
-        return cset;
+    // the test above must have taken care of this case
+    wxCHECK_MSG( name, NULL, _T("NULL name must be wxFONTENCODING_DEFAULT") );
+
+    wxCharacterSet *cset;
 
-    if (cset)
+    if ( wxStricmp(name, wxT("UTF8")) == 0 || wxStricmp(name, wxT("UTF-8")) == 0)
     {
+        cset = new ID_CharSet(name, &wxConvUTF8);
+    }
+    else
+    {
+#ifdef HAVE_ICONV
+        cset = new IC_CharSet(name);
+#else // !HAVE_ICONV
+        cset = NULL;
+#endif // HAVE_ICONV/!HAVE_ICONV
+    }
+
+    // it can only be NULL in this case
+#ifndef HAVE_ICONV
+    if ( cset )
+#endif // !HAVE_ICONV
+    {
+        if ( cset->usable() )
+            return cset;
+
         delete cset;
         cset = NULL;
     }
 
 #if defined(__WIN32__) && !defined(__WXMICROWIN__)
-    cset = new CP_CharSet(name); // may take NULL
-    if (cset->usable())
+    cset = new CP_CharSet(name);
+    if ( cset->usable() )
         return cset;
 
     delete cset;
+    cset = NULL;
 #endif // __WIN32__
 
 #if wxUSE_FONTMAP
     cset = new EC_CharSet(name);
-    if (cset->usable())
+    if ( cset->usable() )
         return cset;
-#endif // wxUSE_FONTMAP
 
     delete cset;
-    wxLogError(_("Unknown encoding '%s'!"), name);
+    cset = NULL;
+#endif // wxUSE_FONTMAP
+
+    wxLogError(_("Cannot convert from encoding '%s'!"), name);
+
     return NULL;
 }