X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/24f588af92d50c77142e299ff66ba45b88915c8c..db70a2f20ac7b47299fe7ab66bae9ef613a0fe6b:/src/common/strconv.cpp

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index ffb8be0d21..f1d4c56ea2 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -186,14 +186,44 @@ static size_t decode_utf16(const wchar_t* input, wxUint32& output)
 // wxMBConv
 // ----------------------------------------------------------------------------
 
+#define IGNORE_LIBC 0
+
 size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
 {
+#if IGNORE_LIBC
+    if (buf)
+    {
+        for (size_t i = 0; i < strlen( psz )+1; i++)
+            buf[i] = (wchar_t) psz[i];
+        // printf( "libc %s\n", buf );
+        return strlen( psz );
+    }
+    else
+    {
+        return strlen( psz );
+    }
+#else
     return wxMB2WC(buf, psz, n);
+#endif
 }
 
 size_t wxMBConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 {
+#if IGNORE_LIBC
+    if (buf)
+    {
+        for (size_t i = 0; i < wxStrlen( psz )+1; i++)
+            buf[i] = (char) psz[i];
+        // printf( "libc %s\n", buf );
+        return wxStrlen( psz );
+    }
+    else
+    {
+        return wxStrlen( psz );
+    }
+#else
     return wxWC2MB(buf, psz, n);
+#endif
 }
 
 const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const
@@ -220,29 +250,13 @@ const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *psz) const
             return wxCharBuffer((char *) NULL);
         wxCharBuffer buf(nLen);                      // this allocates nLen+1
         WC2MB((char *)(const char *) buf, psz, nLen+1);
+        // printf( "str %s\n", (const char*) buf );
         return buf;
     }
     else
         return wxCharBuffer((char *) NULL);
 }
 
-// ----------------------------------------------------------------------------
-// standard file conversion
-// ----------------------------------------------------------------------------
-
-WXDLLEXPORT_DATA(wxMBConvFile) wxConvFile;
-
-// just use the libc conversion for now
-size_t wxMBConvFile::MB2WC(wchar_t *buf, const char *psz, size_t n) const
-{
-    return wxMB2WC(buf, psz, n);
-}
-
-size_t wxMBConvFile::WC2MB(char *buf, const wchar_t *psz, size_t n) const
-{
-    return wxWC2MB(buf, psz, n);
-}
-
 // ----------------------------------------------------------------------------
 // standard gdk conversion
 // ----------------------------------------------------------------------------
@@ -532,6 +546,11 @@ bool IC_CharSet::ms_wcNeedsSwap = FALSE;
 IC_CharSet::IC_CharSet(const wxChar *name)
           : wxCharacterSet(name)
 {
+    // Do it the hard way
+    char cname[100];
+    for (size_t i = 0; i < wxStrlen(name)+1; i++)
+        cname[i] = (char) name[i];
+
     // check for charset that represents wchar_t:
     if (ms_wcCharsetName == NULL)
     {
@@ -539,20 +558,20 @@ IC_CharSet::IC_CharSet(const wxChar *name)
 
         // try charset with explicit bytesex info (e.g. "UCS-4LE"):
         ms_wcCharsetName = WC_NAME_BEST;
-        m2w = iconv_open(ms_wcCharsetName, wxConvLibc.cWX2MB(name));
+        m2w = iconv_open(ms_wcCharsetName, cname);
 
         if (m2w == (iconv_t)-1)
         {
             // try charset w/o bytesex info (e.g. "UCS4")
             // and check for bytesex ourselves:
             ms_wcCharsetName = WC_NAME;
-            m2w = iconv_open(ms_wcCharsetName, wxConvLibc.cWX2MB(name));
+            m2w = iconv_open(ms_wcCharsetName, cname);
 
             // last bet, try if it knows WCHAR_T pseudo-charset
             if (m2w == (iconv_t)-1)
             {
                 ms_wcCharsetName = "WCHAR_T";
-                m2w = iconv_open(ms_wcCharsetName, wxConvLibc.cWX2MB(name));
+                m2w = iconv_open(ms_wcCharsetName, cname);
             }
 
             if (m2w != (iconv_t)-1)
@@ -598,13 +617,13 @@ IC_CharSet::IC_CharSet(const wxChar *name)
     }
     else // we already have ms_wcCharsetName
     {
-        m2w = iconv_open(ms_wcCharsetName, wxConvLibc.cWX2MB(name));
+        m2w = iconv_open(ms_wcCharsetName, cname);
     }
 
     // NB: don't ever pass NULL to iconv_open(), it may crash!
     if ( ms_wcCharsetName )
     {
-        w2m = iconv_open(wxConvLibc.cWX2MB(name), ms_wcCharsetName);
+        w2m = iconv_open( cname, ms_wcCharsetName);
     }
     else
     {
@@ -962,7 +981,9 @@ void wxCSConv::LoadNow()
         {
             wxString name = wxLocale::GetSystemEncodingName();
             if ( !name.empty() )
+            {
                 SetName(name);
+            }
         }
 
         // wxGetCharacterSet() complains about NULL name