X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc7c324430ea3762c474bed9a5601585aff489d1..98840d95db7ab85159dc63d523864b2523d48cae:/src/common/strconv.cpp

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index bd39f333b0..ea5e74110f 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -5,8 +5,9 @@
 // Modified by:
 // Created:     29/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) 1999 Ove Kaaven, Robert Roebling, Vadim Zeitlin, Vaclav Slavik
-// Licence:     wxWindows license
+// Copyright:   (c) 1999 Ove Kaaven, Robert Roebling, Vaclav Slavik
+//              (c) 2000-2003 Vadim Zeitlin
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,7 +18,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
   #pragma implementation "strconv.h"
 #endif
 
@@ -28,55 +29,60 @@
   #pragma hdrstop
 #endif
 
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif // WX_PRECOMP
+
+#include "wx/strconv.h"
+
+#if wxUSE_WCHAR_T
+
 #ifdef __WXMSW__
-  #include "wx/msw/private.h"
+    #include "wx/msw/private.h"
 #endif
 
+#ifndef __WXWINCE__
 #include <errno.h>
+#endif
+
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
 
-
-#include "wx/debug.h"
-#include "wx/strconv.h"
-#include "wx/intl.h"
-#include "wx/log.h"
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+    #define wxHAVE_WIN32_MB2WC
+#endif // __WIN32__ but !__WXMICROWIN__
 
 // ----------------------------------------------------------------------------
-// globals
+// headers
 // ----------------------------------------------------------------------------
 
-WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
-
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-#if wxUSE_WCHAR_T
-
 #ifdef __SALFORDC__
-  #include <clib.h>
+    #include <clib.h>
 #endif
 
-#ifdef HAVE_ICONV_H
-  #include <iconv.h>
+#ifdef HAVE_ICONV
+    #include <iconv.h>
 #endif
 
-#ifdef __WXMSW__
-  #include <windows.h>
+#include "wx/encconv.h"
+#include "wx/fontmap.h"
+
+#ifdef __WXMAC__
+#include "ATSUnicode.h"
+#include "TextCommon.h"
+#include "TextEncodingConverter.h"
+
+#include  "wx/mac/private.h"  // includes mac headers
 #endif
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
 
 #define BSWAP_UCS4(str, len) { unsigned _c; for (_c=0; _c<len; _c++) str[_c]=wxUINT32_SWAP_ALWAYS(str[_c]); }
 #define BSWAP_UTF16(str, len) { unsigned _c; for (_c=0; _c<len; _c++) str[_c]=wxUINT16_SWAP_ALWAYS(str[_c]); }
 
-// under Unix SIZEOF_WCHAR_T is defined by configure, but under other platforms
-// it might be not defined - assume the most common value
-#ifndef SIZEOF_WCHAR_T
-    #define SIZEOF_WCHAR_T 2
-#endif // !defined(SIZEOF_WCHAR_T)
-
 #if SIZEOF_WCHAR_T == 4
     #define WC_NAME         "UCS4"
     #define WC_BSWAP         BSWAP_UCS4
@@ -95,18 +101,25 @@ WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
       #define WC_NAME_BEST  "UTF-16LE"
     #endif
 #else // sizeof(wchar_t) != 2 nor 4
-    // I don't know what to do about this
-    #error "Weird sizeof(wchar_t): please report your platform details to wx-users mailing list"
+    // does this ever happen?
+    #error "Unknown sizeof(wchar_t): please report this to wx-dev@lists.wxwindows.org"
 #endif
 
+// ============================================================================
+// implementation
+// ============================================================================
 
-#ifdef WC_UTF16
+// ----------------------------------------------------------------------------
+// UTF-16 en/decoding to/from UCS-4
+// ----------------------------------------------------------------------------
 
-static size_t encode_utf16(wxUint32 input, wchar_t *output)
+
+static size_t encode_utf16(wxUint32 input, wxUint16 *output)
 {
     if (input<=0xffff)
     {
-        if (output) *output++ = input;
+        if (output)
+            *output = (wxUint16) input;
         return 1;
     }
     else if (input>=0x110000)
@@ -117,14 +130,14 @@ static size_t encode_utf16(wxUint32 input, wchar_t *output)
     {
         if (output)
         {
-            *output++ = (input >> 10)+0xd7c0;
-            *output++ = (input&0x3ff)+0xdc00;
+            *output++ = (wxUint16) ((input >> 10)+0xd7c0);
+            *output = (wxUint16) ((input&0x3ff)+0xdc00);
         }
         return 2;
     }
 }
 
-static size_t decode_utf16(const wchar_t* input, wxUint32& output)
+static size_t decode_utf16(const wxUint16* input, wxUint32& output)
 {
     if ((*input<0xd800) || (*input>0xdfff))
     {
@@ -143,119 +156,74 @@ static size_t decode_utf16(const wchar_t* input, wxUint32& output)
     }
 }
 
-#endif // WC_UTF16
 
 // ----------------------------------------------------------------------------
 // wxMBConv
 // ----------------------------------------------------------------------------
 
-WXDLLEXPORT_DATA(wxMBConv) wxConvLibc;
-
-size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
-{
-    return wxMB2WC(buf, psz, n);
-}
-
-size_t wxMBConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+wxMBConv::~wxMBConv()
 {
-    return wxWC2MB(buf, psz, n);
+    // nothing to do here
 }
 
 const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const
 {
-    if (psz)
+    if ( psz )
     {
-        size_t nLen = MB2WC((wchar_t *) NULL, psz, 0);
-        if (nLen == (size_t)-1)
-            return wxWCharBuffer((wchar_t *) NULL);
-        wxWCharBuffer buf(nLen);
-        MB2WC((wchar_t *)(const wchar_t *) buf, psz, nLen);
-        return buf;
+        // calculate the length of the buffer needed first
+        size_t nLen = MB2WC(NULL, psz, 0);
+        if ( nLen != (size_t)-1 )
+        {
+            // now do the actual conversion
+            wxWCharBuffer buf(nLen);
+            MB2WC(buf.data(), psz, nLen + 1); // with the trailing NUL
+
+            return buf;
+        }
     }
-    else
-        return wxWCharBuffer((wchar_t *) NULL);
+
+    wxWCharBuffer buf((wchar_t *)NULL);
+
+    return buf;
 }
 
-const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *psz) const
+const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const
 {
-    if (psz)
+    if ( pwz )
     {
-        size_t nLen = WC2MB((char *) NULL, psz, 0);
-        if (nLen == (size_t)-1)
-            return wxCharBuffer((char *) NULL);
-        wxCharBuffer buf(nLen);
-        WC2MB((char *)(const char *) buf, psz, nLen);
-        return buf;
-    }
-    else
-        return wxCharBuffer((char *) NULL);
-}
-
-// ----------------------------------------------------------------------------
-// standard file conversion
-// ----------------------------------------------------------------------------
+        size_t nLen = WC2MB(NULL, pwz, 0);
+        if ( nLen != (size_t)-1 )
+        {
+            wxCharBuffer buf(nLen+3);       // space for a wxUint32 trailing zero
+            WC2MB(buf.data(), pwz, nLen + 4);
 
-WXDLLEXPORT_DATA(wxMBConvFile) wxConvFile;
+            return buf;
+        }
+    }
 
-// 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);
-}
+    wxCharBuffer buf((char *)NULL);
 
-size_t wxMBConvFile::WC2MB(char *buf, const wchar_t *psz, size_t n) const
-{
-    return wxWC2MB(buf, psz, n);
+    return buf;
 }
 
 // ----------------------------------------------------------------------------
-// standard gdk conversion
+// wxMBConvLibc
 // ----------------------------------------------------------------------------
 
-#ifdef __WXGTK12__
-
-WXDLLEXPORT_DATA(wxMBConvGdk) wxConvGdk;
-
-#include <gdk/gdk.h>
-
-size_t wxMBConvGdk::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+size_t wxMBConvLibc::MB2WC(wchar_t *buf, const char *psz, size_t n) const
 {
-    if (buf)
-    {
-        return gdk_mbstowcs((GdkWChar *)buf, psz, n);
-    }
-    else
-    {
-        GdkWChar *nbuf = new GdkWChar[n=strlen(psz)];
-        size_t len = gdk_mbstowcs(nbuf, psz, n);
-        delete[] nbuf;
-        return len;
-    }
+    return wxMB2WC(buf, psz, n);
 }
 
-size_t wxMBConvGdk::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+size_t wxMBConvLibc::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 {
-    char *mbstr = gdk_wcstombs((GdkWChar *)psz);
-    size_t len = mbstr ? strlen(mbstr) : 0;
-    if (buf)
-    {
-        if (len > n)
-            len = n;
-        memcpy(buf, psz, len);
-        if (len < n)
-            buf[len] = 0;
-    }
-    return len;
+    return wxWC2MB(buf, psz, n);
 }
 
-#endif // GTK > 1.0
-
 // ----------------------------------------------------------------------------
 // UTF-7
 // ----------------------------------------------------------------------------
 
-WXDLLEXPORT_DATA(wxMBConvUTF7) wxConvUTF7;
-
 #if 0
 static char utf7_setD[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ"
                         "abcdefghijklmnopqrstuvwxyz"
@@ -285,8 +253,6 @@ size_t wxMBConvUTF7::WC2MB(char * WXUNUSED(buf),
 // UTF-8
 // ----------------------------------------------------------------------------
 
-WXDLLEXPORT_DATA(wxMBConvUTF8) wxConvUTF8;
-
 static wxUint32 utf8_max[]=
     { 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff, 0xffffffff };
 
@@ -335,17 +301,18 @@ size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
                     return (size_t)-1;
                 }
 #ifdef WC_UTF16
-                size_t pa = encode_utf16(res, buf);
+                // cast is ok because wchar_t == wxUuint16 if WC_UTF16
+                size_t pa = encode_utf16(res, (wxUint16 *)buf);
                 if (pa == (size_t)-1)
                   return (size_t)-1;
                 if (buf)
                     buf += pa;
                 len += pa;
-#else
+#else // !WC_UTF16
                 if (buf)
                     *buf++ = res;
                 len++;
-#endif
+#endif // WC_UTF16/!WC_UTF16
             }
         }
     }
@@ -362,7 +329,8 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
     {
         wxUint32 cc;
 #ifdef WC_UTF16
-        size_t pa = decode_utf16(psz, cc);
+        // cast is ok for WC_UTF16
+        size_t pa = decode_utf16((const wxUint16 *)psz, cc);
         psz += (pa == (size_t)-1) ? 1 : pa;
 #else
         cc=(*psz++) & 0x7fffffff;
@@ -373,7 +341,7 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
         {
             // plain ASCII char
             if (buf)
-                *buf++ = cc;
+                *buf++ = (char) cc;
             len++;
         }
 
@@ -382,437 +350,987 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
             len += cnt + 1;
             if (buf)
             {
-                *buf++ = (-128 >> cnt) | ((cc >> (cnt * 6)) & (0x3f >> cnt));
+                *buf++ = (char) ((-128 >> cnt) | ((cc >> (cnt * 6)) & (0x3f >> cnt)));
                 while (cnt--)
-                    *buf++ = 0x80 | ((cc >> (cnt * 6)) & 0x3f);
+                    *buf++ = (char) (0x80 | ((cc >> (cnt * 6)) & 0x3f));
             }
         }
     }
 
     if (buf && (len<n)) *buf = 0;
+
     return len;
 }
 
-// ----------------------------------------------------------------------------
-// specified character set
-// ----------------------------------------------------------------------------
 
-WXDLLEXPORT_DATA(wxCSConv) wxConvLocal((const wxChar *)NULL);
 
-#include "wx/encconv.h"
-#include "wx/fontmap.h"
 
-// TODO: add some tables here
-// - perhaps common encodings to common codepages (for Win32)
-// - perhaps common encodings to objects ("UTF8" -> wxConvUTF8)
-// - move wxEncodingConverter meat in here
+// ----------------------------------------------------------------------------
+// UTF-16
+// ----------------------------------------------------------------------------
 
-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+#ifdef WORDS_BIGENDIAN
+    #define wxMBConvUTF16straight wxMBConvUTF16BE
+    #define wxMBConvUTF16swap     wxMBConvUTF16LE
+#else
+    #define wxMBConvUTF16swap     wxMBConvUTF16BE
+    #define wxMBConvUTF16straight wxMBConvUTF16LE
+#endif
 
-#if wxUSE_GUI
 
-// VZ: the new version of wxCharsetToCodepage() is more politically correct
-//     and should work on other Windows versions as well but the old version is
-//     still needed for !wxUSE_FONTMAP || !wxUSE_GUI case
+#ifdef WC_UTF16
 
-extern long wxEncodingToCodepage(wxFontEncoding encoding)
+// copy 16bit MB to 16bit String
+size_t wxMBConvUTF16straight::MB2WC(wchar_t *buf, const char *psz, size_t n) const
 {
-    // translate encoding into the Windows CHARSET
-    wxNativeEncodingInfo natveEncInfo;
-    if ( !wxGetNativeFontEncoding(encoding, &natveEncInfo) )
-        return -1;
+    size_t len=0;
 
-    // translate CHARSET to code page
-    CHARSETINFO csetInfo;
-    if ( !::TranslateCharsetInfo((DWORD *)(DWORD)natveEncInfo.charset,
-                                 &csetInfo,
-                                 TCI_SRCCHARSET) )
+    while (*(wxUint16*)psz && (!buf || len < n))
     {
-        wxLogLastError(_T("TranslateCharsetInfo(TCI_SRCCHARSET)"));
+        if (buf)
+            *buf++ = *(wxUint16*)psz;
+        len++;
 
-        return -1;
+        psz += sizeof(wxUint16);
     }
+    if (buf && len<n)   *buf=0;
 
-    return csetInfo.ciACP;
+    return len;
 }
 
-#if wxUSE_FONTMAP
 
-extern long wxCharsetToCodepage(const wxChar *name)
+// copy 16bit String to 16bit MB
+size_t wxMBConvUTF16straight::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 {
-    // first get the font encoding for this charset
-    if ( !name )
-        return -1;
+    size_t len=0;
 
-    wxFontEncoding enc = wxTheFontMapper->CharsetToEncoding(name, FALSE);
-    if ( enc == wxFONTENCODING_SYSTEM )
-        return -1;
+    while (*psz && (!buf || len < n))
+    {
+        if (buf)
+        {
+            *(wxUint16*)buf = *psz;
+            buf += sizeof(wxUint16);
+        }
+        len += sizeof(wxUint16);
+        psz++;
+    }
+    if (buf && len<=n-sizeof(wxUint16))   *(wxUint16*)buf=0;
 
-    // the use the helper function
-    return wxEncodingToCodepage(enc);
+    return len;
 }
 
-#endif // wxUSE_FONTMAP
-
-#endif // wxUSE_GUI
-
-// include old wxCharsetToCodepage() by OK if needed
-#if !wxUSE_GUI || !wxUSE_FONTMAP
-
-#include "wx/msw/registry.h"
 
-// this should work if Internet Exploiter is installed
-extern long wxCharsetToCodepage(const wxChar *name)
+// swap 16bit MB to 16bit String
+size_t wxMBConvUTF16swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
 {
-    if (!name)
-        return GetACP();
+    size_t len=0;
 
-    long CP=-1;
+    while (*(wxUint16*)psz && (!buf || len < n))
+    {
+        if (buf)
+        {
+            ((char *)buf)[0] = psz[1];
+            ((char *)buf)[1] = psz[0];
+            buf++;
+        }
+        len++;
+        psz += sizeof(wxUint16);
+    }
+    if (buf && len<n)   *buf=0;
 
-    wxString cn(name);
-    do {
-        wxString path(wxT("MIME\\Database\\Charset\\"));
-        path += cn;
-        wxRegKey key(wxRegKey::HKCR, path);
+    return len;
+}
 
-        if (!key.Exists()) break;
 
-        // two cases: either there's an AliasForCharset string,
-        // or there are Codepage and InternetEncoding dwords.
-        // The InternetEncoding gives us the actual encoding,
-        // the Codepage just says which Windows character set to
-        // use when displaying the data.
-        if (key.HasValue(wxT("InternetEncoding")) &&
-            key.QueryValue(wxT("InternetEncoding"), &CP)) break;
+// swap 16bit MB to 16bit String
+size_t wxMBConvUTF16swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+{
+    size_t len=0;
 
-        // no encoding, see if it's an alias
-        if (!key.HasValue(wxT("AliasForCharset")) ||
-            !key.QueryValue(wxT("AliasForCharset"), cn)) break;
-    } while (1);
+    while (*psz && (!buf || len < n))
+    {
+        if (buf)
+        {
+            *buf++ = ((char*)psz)[1];
+            *buf++ = ((char*)psz)[0];
+        }
+        len += sizeof(wxUint16);
+        psz++;
+    }
+    if (buf && len<=n-sizeof(wxUint16))   *(wxUint16*)buf=0;
 
-    return CP;
+    return len;
 }
 
-#endif // !wxUSE_GUI || !wxUSE_FONTMAP
 
-#endif // Win32
+#else // WC_UTF16
 
-class wxCharacterSet
-{
-public:
-    wxCharacterSet(const wxChar*name)
-        : cname(name) {}
-    virtual ~wxCharacterSet()
-        {}
-    virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n)
-        { return (size_t)-1; }
-    virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n)
-        { return (size_t)-1; }
-    virtual bool usable()
-        { return FALSE; }
-public:
-    const wxChar*cname;
-};
 
-class ID_CharSet : public wxCharacterSet
+// copy 16bit MB to 32bit String
+size_t wxMBConvUTF16straight::MB2WC(wchar_t *buf, const char *psz, size_t n) const
 {
-public:
-    ID_CharSet(const wxChar *name,wxMBConv *cnv)
-        : wxCharacterSet(name), work(cnv) {}
-
-    size_t MB2WC(wchar_t *buf, const char *psz, size_t n)
-        { return work ? work->MB2WC(buf,psz,n) : (size_t)-1; }
-
-    size_t WC2MB(char *buf, const wchar_t *psz, size_t n)
-        { return work ? work->WC2MB(buf,psz,n) : (size_t)-1; }
-
-    bool usable()
-        { return work!=NULL; }
-public:
-    wxMBConv*work;
-};
+    size_t len=0;
 
+    while (*(wxUint16*)psz && (!buf || len < n))
+    {
+        wxUint32 cc;
+        size_t pa=decode_utf16((wxUint16*)psz, cc);
+        if (pa == (size_t)-1)
+            return pa;
 
-#ifdef HAVE_ICONV_H
+        if (buf)
+            *buf++ = cc;
+        len++;
+        psz += pa * sizeof(wxUint16);
+    }
+    if (buf && len<n)   *buf=0;
 
-bool g_wcNeedsSwap = FALSE;
-static const char *g_wcCharset = NULL;
+    return len;
+}
 
-// VS: glibc 2.1.3 is broken in that iconv() conversion to/from UCS4 fails with E2BIG
-//     if output buffer is _exactly_ as big as needed. Such case is (unless there's
-//     yet another bug in glibc) the only case when iconv() returns with (size_t)-1
-//     (which means error) and says there are 0 bytes left in the input buffer --
-//     when _real_ error occurs, bytes-left-in-input buffer is non-zero. Hence,
-//     this alternative test for iconv() failure.
-//     [This bug does not appear in glibc 2.2.]
-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 1
-#define ICONV_FAILED(cres, bufLeft) ((cres == (size_t)-1) && \
-                                     (errno != E2BIG || bufLeft != 0))
-#else
-#define ICONV_FAILED(cres, bufLeft)  (cres == (size_t)-1)
-#endif
 
-class IC_CharSet : public wxCharacterSet
+// copy 32bit String to 16bit MB
+size_t wxMBConvUTF16straight::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 {
-public:
-    IC_CharSet(const wxChar *name)
-        : wxCharacterSet(name)
+    size_t len=0;
+
+    while (*psz && (!buf || len < n))
     {
-        // check for charset that represents wchar_t:
-        if (g_wcCharset == NULL)
-        {
-            g_wcNeedsSwap = FALSE;
+        wxUint16 cc[2];
+        size_t pa=encode_utf16(*psz, cc);
 
-            // try charset with explicit bytesex info (e.g. "UCS-4LE"):
-            g_wcCharset = WC_NAME_BEST;
-            m2w = iconv_open(g_wcCharset, wxConvLibc.cWX2MB(name));
+        if (pa == (size_t)-1)
+            return pa;
 
-            if (m2w == (iconv_t)-1)
+        if (buf)
+        {
+            *(wxUint16*)buf = cc[0];
+            buf += sizeof(wxUint16);
+            if (pa > 1)
             {
-                // try charset w/o bytesex info (e.g. "UCS4")
-                // and check for bytesex ourselves: 
-                g_wcCharset = WC_NAME;
-                m2w = iconv_open(g_wcCharset, wxConvLibc.cWX2MB(name));
-
-                // last bet, try if it knows WCHAR_T pseudo-charset
-                if (m2w == (iconv_t)-1)
-                {
-                    g_wcCharset = "WCHAR_T";
-                    m2w = iconv_open(g_wcCharset, wxConvLibc.cWX2MB(name));
-                }
-                
-                if (m2w != (iconv_t)-1)
-                {
-                    char    buf[2], *bufPtr;
-                    wchar_t wbuf[2], *wbufPtr;
-                    size_t  insz, outsz;
-                    size_t  res;
-                    
-                    buf[0] = 'A';
-                    buf[1] = 0;
-                    wbuf[0] = 0;
-                    insz = 2;
-                    outsz = SIZEOF_WCHAR_T * 2;
-                    wbufPtr = wbuf;
-                    bufPtr = buf;
-
-                    #ifdef WX_ICONV_TAKES_CHAR
-                    res = iconv(m2w, (char**)&bufPtr, &insz, (char**)&wbufPtr, &outsz);
-                    #else
-                    res = iconv(m2w, (const char**)&bufPtr, &insz, (char**)&wbufPtr, &outsz);
-                    #endif
-                    if (ICONV_FAILED(res, insz))
-                    {
-                        g_wcCharset = NULL;
-                        wxLogLastError(wxT("iconv"));
-                        wxLogError(_("Convertion to charset '%s' doesn't work."), name);
-                    }
-                    else
-                    {
-                        g_wcNeedsSwap = (wbuf[0] != (wchar_t)buf[0]);
-                    }
-                }
-                else
-                {
-                    g_wcCharset = NULL;
-                    wxLogError(_("Don't know how to convert to/from charset '%s'."), name);
-                }
+                *(wxUint16*)buf = cc[1];
+                buf += sizeof(wxUint16);
             }
-            wxLogTrace(wxT("strconv"), wxT("wchar_t charset is '%s', needs swap: %i"), g_wcCharset, g_wcNeedsSwap);
         }
-        else
-            m2w = iconv_open(g_wcCharset, wxConvLibc.cWX2MB(name));
-    
-        w2m = iconv_open(wxConvLibc.cWX2MB(name), g_wcCharset);
+
+        len += pa*sizeof(wxUint16);
+        psz++;
     }
-    
-    ~IC_CharSet() 
+    if (buf && len<=n-sizeof(wxUint16))   *(wxUint16*)buf=0;
+
+    return len;
+}
+
+
+// swap 16bit MB to 32bit String
+size_t wxMBConvUTF16swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+{
+    size_t len=0;
+
+    while (*(wxUint16*)psz && (!buf || len < n))
     {
-        if ( m2w != (iconv_t)-1 )
-            iconv_close(m2w);
-        if ( w2m != (iconv_t)-1 )
-            iconv_close(w2m);
+        wxUint32 cc;
+        char tmp[4];
+        tmp[0]=psz[1];  tmp[1]=psz[0];
+        tmp[2]=psz[3];  tmp[3]=psz[2];
+
+        size_t pa=decode_utf16((wxUint16*)tmp, cc);
+        if (pa == (size_t)-1)
+            return pa;
+
+        if (buf)
+            *buf++ = cc;
+
+        len++;
+        psz += pa * sizeof(wxUint16);
     }
+    if (buf && len<n)   *buf=0;
+
+    return len;
+}
 
-    size_t MB2WC(wchar_t *buf, const char *psz, size_t n)
+
+// swap 32bit String to 16bit MB
+size_t wxMBConvUTF16swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+{
+    size_t len=0;
+
+    while (*psz && (!buf || len < n))
     {
-        size_t inbuf = strlen(psz);
-        size_t outbuf = n * SIZEOF_WCHAR_T;
-        size_t res, cres;
-        // VS: Use these instead of psz, buf because iconv() modifies its arguments:
-        wchar_t *bufPtr = buf;
-        const char *pszPtr = psz;
+        wxUint16 cc[2];
+        size_t pa=encode_utf16(*psz, cc);
+
+        if (pa == (size_t)-1)
+            return pa;
 
         if (buf)
         {
-            // have destination buffer, convert there
-#ifdef WX_ICONV_TAKES_CHAR
-            cres = iconv(m2w, (char**)&pszPtr, &inbuf, (char**)&bufPtr, &outbuf);
-#else
-            cres = iconv(m2w, &pszPtr, &inbuf, (char**)&bufPtr, &outbuf);
-#endif
-            res = n - (outbuf / SIZEOF_WCHAR_T);
-
-            if (g_wcNeedsSwap)
+            *buf++ = ((char*)cc)[1];
+            *buf++ = ((char*)cc)[0];
+            if (pa > 1)
             {
-                // convert to native endianness
-                WC_BSWAP(buf /* _not_ bufPtr */, res)
+                *buf++ = ((char*)cc)[3];
+                *buf++ = ((char*)cc)[2];
             }
         }
-        else
-        {
-            // no destination buffer... convert using temp buffer
-            // to calculate destination buffer requirement
-            wchar_t tbuf[8];
-            res = 0;
-            do {
-                bufPtr = tbuf; outbuf = 8*SIZEOF_WCHAR_T;
-#ifdef WX_ICONV_TAKES_CHAR
-                cres = iconv( m2w, (char**)&pszPtr, &inbuf, (char**)&bufPtr, &outbuf );
+
+        len += pa*sizeof(wxUint16);
+        psz++;
+    }
+    if (buf && len<=n-sizeof(wxUint16))   *(wxUint16*)buf=0;
+
+    return len;
+}
+
+#endif // WC_UTF16
+
+
+// ----------------------------------------------------------------------------
+// UTF-32
+// ----------------------------------------------------------------------------
+
+#ifdef WORDS_BIGENDIAN
+#define wxMBConvUTF32straight  wxMBConvUTF32BE
+#define wxMBConvUTF32swap      wxMBConvUTF32LE
 #else
-                cres = iconv( m2w, &pszPtr, &inbuf, (char**)&bufPtr, &outbuf );
+#define wxMBConvUTF32swap      wxMBConvUTF32BE
+#define wxMBConvUTF32straight  wxMBConvUTF32LE
 #endif
-                res += 8-(outbuf/SIZEOF_WCHAR_T);
-            } while ((cres==(size_t)-1) && (errno==E2BIG));
-        }
 
-        if (ICONV_FAILED(cres, inbuf))
-        {
-            //VS: it is ok if iconv fails, hence trace only
-            wxLogTrace(wxT("strconv"), wxT("iconv failed: %s"), wxSysErrorMsg(wxSysErrorCode()));
-            return (size_t)-1;
-        }
 
-        return res;
-    }
+WXDLLIMPEXP_DATA_BASE(wxMBConvUTF32LE) wxConvUTF32LE;
+WXDLLIMPEXP_DATA_BASE(wxMBConvUTF32BE) wxConvUTF32BE;
+
+
+#ifdef WC_UTF16
+
+// copy 32bit MB to 16bit String
+size_t wxMBConvUTF32straight::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+{
+    size_t len=0;
 
-    size_t WC2MB(char *buf, const wchar_t *psz, size_t n)
+    while (*(wxUint32*)psz && (!buf || len < n))
     {
-#if defined(__BORLANDC__) && (__BORLANDC__ > 0x530)
-        size_t inbuf = std::wcslen(psz) * SIZEOF_WCHAR_T;
-#else
-        size_t inbuf = ::wcslen(psz) * SIZEOF_WCHAR_T;
-#endif
-        size_t outbuf = n;
-        size_t res, cres;
-        
-        wchar_t *tmpbuf = 0;
+        wxUint16 cc[2];
 
-        if (g_wcNeedsSwap)
-        {
-            // need to copy to temp buffer to switch endianness
-            // this absolutely doesn't rock!
-            // (no, doing WC_BSWAP twice on the original buffer won't help, as it
-            //  could be in read-only memory, or be accessed in some other thread)
-            tmpbuf=(wchar_t*)malloc((inbuf+1)*SIZEOF_WCHAR_T);
-            memcpy(tmpbuf,psz,(inbuf+1)*SIZEOF_WCHAR_T);
-            WC_BSWAP(tmpbuf, inbuf)
-            psz=tmpbuf;
-        }
+        size_t pa=encode_utf16(*(wxUint32*)psz, cc);
+        if (pa == (size_t)-1)
+            return pa;
 
         if (buf)
         {
-            // have destination buffer, convert there
-#ifdef WX_ICONV_TAKES_CHAR
-            cres = iconv( w2m, (char**)&psz, &inbuf, &buf, &outbuf );
-#else
-            cres = iconv( w2m, (const char**)&psz, &inbuf, &buf, &outbuf );
-#endif
-            res = n-outbuf;
-        }
-        else
-        {
-            // no destination buffer... convert using temp buffer
-            // to calculate destination buffer requirement
-            char tbuf[16];
-            res = 0;
-            do {
-                buf = tbuf; outbuf = 16;
-#ifdef WX_ICONV_TAKES_CHAR
-                cres = iconv( w2m, (char**)&psz, &inbuf, &buf, &outbuf );
-#else
-                cres = iconv( w2m, (const char**)&psz, &inbuf, &buf, &outbuf );
-#endif
-                res += 16 - outbuf;
-            } while ((cres==(size_t)-1) && (errno==E2BIG));
+            *buf++ = cc[0];
+            if (pa > 1)
+                *buf++ = cc[1];
         }
+        len += pa;
+        psz += sizeof(wxUint32);
+    }
+    if (buf && len<n)   *buf=0;
 
-        if (g_wcNeedsSwap)
-        {
-            free(tmpbuf);
-        }
+    return len;
+}
 
-        if (ICONV_FAILED(cres, inbuf))
-        {
-            //VS: it is ok if iconv fails, hence trace only
-            wxLogTrace(wxT("strconv"), wxT("iconv failed: %s"), wxSysErrorMsg(wxSysErrorCode()));
-            return (size_t)-1;
-        }
 
-        return res;
-    }
+// copy 16bit String to 32bit MB
+size_t wxMBConvUTF32straight::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+{
+    size_t len=0;
 
-    bool usable()
-        { return (m2w != (iconv_t)-1) && (w2m != (iconv_t)-1); }
+    while (*psz && (!buf || len < n))
+    {
+        wxUint32 cc;
 
-protected:
-    iconv_t m2w, w2m;
-};
-#endif
+        // cast is ok for WC_UTF16
+        size_t pa = decode_utf16((const wxUint16 *)psz, cc);
+        if (pa == (size_t)-1)
+            return pa;
 
-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
-class CP_CharSet : public wxCharacterSet
-{
-public:
-    CP_CharSet(const wxChar* name)
-        : wxCharacterSet(name)
+        if (buf)
         {
-            m_CodePage = wxCharsetToCodepage(name);
+            *(wxUint32*)buf = cc;
+            buf += sizeof(wxUint32);
         }
-
-    size_t MB2WC(wchar_t *buf, const char *psz, size_t n)
-    {
-        size_t len =
-            MultiByteToWideChar(m_CodePage, 0, psz, -1, buf, buf ? n : 0);
-        //VS: returns # of written chars for buf!=NULL and *size*
-        //    needed buffer for buf==NULL
-        return len ? (buf ? len : len-1) : (size_t)-1;
+        len += sizeof(wxUint32);
+        psz += pa;
     }
 
-    size_t WC2MB(char *buf, const wchar_t *psz, size_t n)
-    {
-        size_t len = WideCharToMultiByte(m_CodePage, 0, psz, -1, buf,
-                                         buf ? n : 0, NULL, NULL);
-        //VS: returns # of written chars for buf!=NULL and *size*
-        //    needed buffer for buf==NULL
-        return len ? (buf ? len : len-1) : (size_t)-1;
-    }
+    if (buf && len<=n-sizeof(wxUint32))
+        *(wxUint32*)buf=0;
 
-    bool usable()
-        { return m_CodePage != -1; }
+    return len;
+}
+
+
+
+// swap 32bit MB to 16bit String
+size_t wxMBConvUTF32swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+{
+    size_t len=0;
+
+    while (*(wxUint32*)psz && (!buf || len < n))
+    {
+        char tmp[4];
+        tmp[0] = psz[3];   tmp[1] = psz[2];
+        tmp[2] = psz[1];   tmp[3] = psz[0];
+
+
+        wxUint16 cc[2];
+
+        size_t pa=encode_utf16(*(wxUint32*)tmp, cc);
+        if (pa == (size_t)-1)
+            return pa;
+
+        if (buf)
+        {
+            *buf++ = cc[0];
+            if (pa > 1)
+                *buf++ = cc[1];
+        }
+        len += pa;
+        psz += sizeof(wxUint32);
+    }
+
+    if (buf && len<n)
+        *buf=0;
+
+    return len;
+}
+
+
+// swap 16bit String to 32bit MB
+size_t wxMBConvUTF32swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+{
+    size_t len=0;
+
+    while (*psz && (!buf || len < n))
+    {
+        char cc[4];
+
+        // cast is ok for WC_UTF16
+        size_t pa=decode_utf16((const wxUint16 *)psz, *(wxUint32*)cc);
+        if (pa == (size_t)-1)
+            return pa;
+
+        if (buf)
+        {
+            *buf++ = cc[3];
+            *buf++ = cc[2];
+            *buf++ = cc[1];
+            *buf++ = cc[0];
+        }
+        len += sizeof(wxUint32);
+        psz += pa;
+    }
+
+    if (buf && len<=n-sizeof(wxUint32))
+        *(wxUint32*)buf=0;
+
+    return len;
+}
+
+#else // WC_UTF16
+
+
+// copy 32bit MB to 32bit String
+size_t wxMBConvUTF32straight::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+{
+    size_t len=0;
+
+    while (*(wxUint32*)psz && (!buf || len < n))
+    {
+        if (buf)
+            *buf++ = *(wxUint32*)psz;
+        len++;
+        psz += sizeof(wxUint32);
+    }
+
+    if (buf && len<n)
+        *buf=0;
+
+    return len;
+}
+
+
+// copy 32bit String to 32bit MB
+size_t wxMBConvUTF32straight::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+{
+    size_t len=0;
+
+    while (*psz && (!buf || len < n))
+    {
+        if (buf)
+        {
+            *(wxUint32*)buf = *psz;
+            buf += sizeof(wxUint32);
+        }
+
+        len += sizeof(wxUint32);
+        psz++;
+    }
+
+    if (buf && len<=n-sizeof(wxUint32))
+        *(wxUint32*)buf=0;
+
+    return len;
+}
+
+
+// swap 32bit MB to 32bit String
+size_t wxMBConvUTF32swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+{
+    size_t len=0;
+
+    while (*(wxUint32*)psz && (!buf || len < n))
+    {
+        if (buf)
+        {
+            ((char *)buf)[0] = psz[3];
+            ((char *)buf)[1] = psz[2];
+            ((char *)buf)[2] = psz[1];
+            ((char *)buf)[3] = psz[0];
+            buf++;
+        }
+        len++;
+        psz += sizeof(wxUint32);
+    }
+
+    if (buf && len<n)
+        *buf=0;
+
+    return len;
+}
+
+
+// swap 32bit String to 32bit MB
+size_t wxMBConvUTF32swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+{
+    size_t len=0;
+
+    while (*psz && (!buf || len < n))
+    {
+        if (buf)
+        {
+            *buf++ = ((char *)psz)[3];
+            *buf++ = ((char *)psz)[2];
+            *buf++ = ((char *)psz)[1];
+            *buf++ = ((char *)psz)[0];
+        }
+        len += sizeof(wxUint32);
+        psz++;
+    }
+
+    if (buf && len<=n-sizeof(wxUint32))
+        *(wxUint32*)buf=0;
+
+    return len;
+}
+
+
+#endif // WC_UTF16
+
+
+// ============================================================================
+// The classes doing conversion using the iconv_xxx() functions
+// ============================================================================
+
+#ifdef HAVE_ICONV
+
+// VS: glibc 2.1.3 is broken in that iconv() conversion to/from UCS4 fails with E2BIG
+//     if output buffer is _exactly_ as big as needed. Such case is (unless there's
+//     yet another bug in glibc) the only case when iconv() returns with (size_t)-1
+//     (which means error) and says there are 0 bytes left in the input buffer --
+//     when _real_ error occurs, bytes-left-in-input buffer is non-zero. Hence,
+//     this alternative test for iconv() failure.
+//     [This bug does not appear in glibc 2.2.]
+#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 1
+#define ICONV_FAILED(cres, bufLeft) ((cres == (size_t)-1) && \
+                                     (errno != E2BIG || bufLeft != 0))
+#else
+#define ICONV_FAILED(cres, bufLeft)  (cres == (size_t)-1)
+#endif
+
+#define ICONV_CHAR_CAST(x)  ((ICONV_CONST char **)(x))
+
+// ----------------------------------------------------------------------------
+// wxMBConv_iconv: encapsulates an iconv character set
+// ----------------------------------------------------------------------------
+
+class wxMBConv_iconv : public wxMBConv
+{
+public:
+    wxMBConv_iconv(const wxChar *name);
+    virtual ~wxMBConv_iconv();
+
+    virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;
+    virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const;
+
+    bool IsOk() const
+        { return (m2w != (iconv_t)-1) && (w2m != (iconv_t)-1); }
+
+protected:
+    // the iconv handlers used to translate from multibyte to wide char and in
+    // the other direction
+    iconv_t m2w,
+            w2m;
+
+private:
+    // the name (for iconv_open()) of a wide char charset -- if none is
+    // available on this machine, it will remain NULL
+    static const char *ms_wcCharsetName;
+
+    // true if the wide char encoding we use (i.e. ms_wcCharsetName) has
+    // different endian-ness than the native one
+    static bool ms_wcNeedsSwap;
+};
+
+const char *wxMBConv_iconv::ms_wcCharsetName = NULL;
+bool wxMBConv_iconv::ms_wcNeedsSwap = false;
+
+wxMBConv_iconv::wxMBConv_iconv(const wxChar *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)
+    {
+        ms_wcNeedsSwap = false;
+
+        // try charset with explicit bytesex info (e.g. "UCS-4LE"):
+        ms_wcCharsetName = WC_NAME_BEST;
+        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, 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, cname);
+            }
+
+            if (m2w != (iconv_t)-1)
+            {
+                char    buf[2], *bufPtr;
+                wchar_t wbuf[2], *wbufPtr;
+                size_t  insz, outsz;
+                size_t  res;
+
+                buf[0] = 'A';
+                buf[1] = 0;
+                wbuf[0] = 0;
+                insz = 2;
+                outsz = SIZEOF_WCHAR_T * 2;
+                wbufPtr = wbuf;
+                bufPtr = buf;
+
+                res = iconv(m2w, ICONV_CHAR_CAST(&bufPtr), &insz,
+                            (char**)&wbufPtr, &outsz);
+
+                if (ICONV_FAILED(res, insz))
+                {
+                    ms_wcCharsetName = NULL;
+                    wxLogLastError(wxT("iconv"));
+                    wxLogError(_("Conversion to charset '%s' doesn't work."), name);
+                }
+                else
+                {
+                    ms_wcNeedsSwap = wbuf[0] != (wchar_t)buf[0];
+                }
+            }
+            else
+            {
+                ms_wcCharsetName = NULL;
+
+                // VS: we must not output an error here, since wxWindows will safely
+                //     fall back to using wxEncodingConverter.
+                wxLogTrace(wxT("strconv"), wxT("Impossible to convert to/from charset '%s' with iconv, falling back to wxEncodingConverter."), name);
+                //wxLogError(
+            }
+        }
+        wxLogTrace(wxT("strconv"), wxT("wchar_t charset is '%s', needs swap: %i"), ms_wcCharsetName, ms_wcNeedsSwap);
+    }
+    else // we already have ms_wcCharsetName
+    {
+        m2w = iconv_open(ms_wcCharsetName, cname);
+    }
+
+    // NB: don't ever pass NULL to iconv_open(), it may crash!
+    if ( ms_wcCharsetName )
+    {
+        w2m = iconv_open( cname, ms_wcCharsetName);
+    }
+    else
+    {
+        w2m = (iconv_t)-1;
+    }
+}
+
+wxMBConv_iconv::~wxMBConv_iconv()
+{
+    if ( m2w != (iconv_t)-1 )
+        iconv_close(m2w);
+    if ( w2m != (iconv_t)-1 )
+        iconv_close(w2m);
+}
+
+size_t wxMBConv_iconv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+{
+    size_t inbuf = strlen(psz);
+    size_t outbuf = n * SIZEOF_WCHAR_T;
+    size_t res, cres;
+    // VS: Use these instead of psz, buf because iconv() modifies its arguments:
+    wchar_t *bufPtr = buf;
+    const char *pszPtr = psz;
+
+    if (buf)
+    {
+        // have destination buffer, convert there
+        cres = iconv(m2w,
+                     ICONV_CHAR_CAST(&pszPtr), &inbuf,
+                     (char**)&bufPtr, &outbuf);
+        res = n - (outbuf / SIZEOF_WCHAR_T);
+
+        if (ms_wcNeedsSwap)
+        {
+            // convert to native endianness
+            WC_BSWAP(buf /* _not_ bufPtr */, res)
+        }
+
+        // NB: iconv was given only strlen(psz) characters on input, and so
+        //     it couldn't convert the trailing zero. Let's do it ourselves
+        //     if there's some room left for it in the output buffer.
+        if (res < n)
+            buf[res] = 0;
+    }
+    else
+    {
+        // no destination buffer... convert using temp buffer
+        // to calculate destination buffer requirement
+        wchar_t tbuf[8];
+        res = 0;
+        do {
+            bufPtr = tbuf;
+            outbuf = 8*SIZEOF_WCHAR_T;
+
+            cres = iconv(m2w,
+                         ICONV_CHAR_CAST(&pszPtr), &inbuf,
+                         (char**)&bufPtr, &outbuf );
+
+            res += 8-(outbuf/SIZEOF_WCHAR_T);
+        } while ((cres==(size_t)-1) && (errno==E2BIG));
+    }
+
+    if (ICONV_FAILED(cres, inbuf))
+    {
+        //VS: it is ok if iconv fails, hence trace only
+        wxLogTrace(wxT("strconv"), wxT("iconv failed: %s"), wxSysErrorMsg(wxSysErrorCode()));
+        return (size_t)-1;
+    }
+
+    return res;
+}
+
+size_t wxMBConv_iconv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+{
+    size_t inbuf = wxWcslen(psz) * SIZEOF_WCHAR_T;
+    size_t outbuf = n;
+    size_t res, cres;
+
+    wchar_t *tmpbuf = 0;
+
+    if (ms_wcNeedsSwap)
+    {
+        // need to copy to temp buffer to switch endianness
+        // this absolutely doesn't rock!
+        // (no, doing WC_BSWAP twice on the original buffer won't help, as it
+        //  could be in read-only memory, or be accessed in some other thread)
+        tmpbuf=(wchar_t*)malloc((inbuf+1)*SIZEOF_WCHAR_T);
+        memcpy(tmpbuf,psz,(inbuf+1)*SIZEOF_WCHAR_T);
+        WC_BSWAP(tmpbuf, inbuf)
+        psz=tmpbuf;
+    }
+
+    if (buf)
+    {
+        // have destination buffer, convert there
+        cres = iconv( w2m, ICONV_CHAR_CAST(&psz), &inbuf, &buf, &outbuf );
+
+        res = n-outbuf;
+
+        // NB: iconv was given only wcslen(psz) characters on input, and so
+        //     it couldn't convert the trailing zero. Let's do it ourselves
+        //     if there's some room left for it in the output buffer.
+        if (res < n)
+            buf[0] = 0;
+    }
+    else
+    {
+        // no destination buffer... convert using temp buffer
+        // to calculate destination buffer requirement
+        char tbuf[16];
+        res = 0;
+        do {
+            buf = tbuf; outbuf = 16;
+
+            cres = iconv( w2m, ICONV_CHAR_CAST(&psz), &inbuf, &buf, &outbuf );
+
+            res += 16 - outbuf;
+        } while ((cres==(size_t)-1) && (errno==E2BIG));
+    }
+
+    if (ms_wcNeedsSwap)
+    {
+        free(tmpbuf);
+    }
+
+    if (ICONV_FAILED(cres, inbuf))
+    {
+        //VS: it is ok if iconv fails, hence trace only
+        wxLogTrace(wxT("strconv"), wxT("iconv failed: %s"), wxSysErrorMsg(wxSysErrorCode()));
+        return (size_t)-1;
+    }
+
+    return res;
+}
+
+#endif // HAVE_ICONV
+
+
+// ============================================================================
+// Win32 conversion classes
+// ============================================================================
+
+#ifdef wxHAVE_WIN32_MB2WC
+
+// from utils.cpp
+extern WXDLLIMPEXP_BASE long wxCharsetToCodepage(const wxChar *charset);
+extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding);
+
+class wxMBConv_win32 : public wxMBConv
+{
+public:
+    wxMBConv_win32()
+    {
+        m_CodePage = CP_ACP;
+    }
+
+    wxMBConv_win32(const wxChar* name)
+    {
+        m_CodePage = wxCharsetToCodepage(name);
+    }
+
+    wxMBConv_win32(wxFontEncoding encoding)
+    {
+        m_CodePage = wxEncodingToCodepage(encoding);
+    }
+
+    size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const
+    {
+        const size_t len = ::MultiByteToWideChar
+                             (
+                                m_CodePage,     // code page
+                                0,              // flags (none)
+                                psz,            // input string
+                                -1,             // its length (NUL-terminated)
+                                buf,            // output string
+                                buf ? n : 0     // size of output buffer
+                             );
+
+        // note that it returns count of written chars for buf != NULL and size
+        // of the needed buffer for buf == NULL so in either case the length of
+        // the string (which never includes the terminating NUL) is one less
+        return len ? len - 1 : (size_t)-1;
+    }
+
+    size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const
+    {
+        const size_t len = ::WideCharToMultiByte
+                             (
+                                m_CodePage,     // code page
+                                0,              // flags (none)
+                                psz,            // input string
+                                -1,             // it is (wide) NUL-terminated
+                                buf,            // output buffer
+                                buf ? n : 0,    // and its size
+                                NULL,           // default "replacement" char
+                                NULL            // [out] was it used?
+                             );
+
+        // see the comment above for the reason of "len - 1"
+        return len ? len - 1 : (size_t)-1;
+    }
+
+    bool IsOk() const
+        { return m_CodePage != -1; }
 
 public:
     long m_CodePage;
 };
-#endif // __WIN32__
+
+#endif // wxHAVE_WIN32_MB2WC
+
+// ============================================================================
+// Mac conversion classes
+// ============================================================================
+
+#if defined(__WXMAC__) && defined(TARGET_CARBON)
+
+class wxMBConv_mac : public wxMBConv
+{
+public:
+    wxMBConv_mac()
+    {
+        Init(CFStringGetSystemEncoding()) ;
+    }
+
+    wxMBConv_mac(const wxChar* name)
+    {
+    	Init( wxMacGetSystemEncFromFontEnc(wxFontMapper::Get()->CharsetToEncoding(name, FALSE) ) ) ;
+    }
+
+    wxMBConv_mac(wxFontEncoding encoding)
+    {
+    	Init( wxMacGetSystemEncFromFontEnc(encoding) );
+    }
+    
+	~wxMBConv_mac()
+	{
+	    OSStatus status = noErr ;
+	    status = TECDisposeConverter(m_MB2WC_converter);
+	    status = TECDisposeConverter(m_WC2MB_converter);		
+	}
+	
+    
+	void Init( TextEncodingBase encoding)
+	{
+	    OSStatus status = noErr ;
+		m_char_encoding = encoding ;
+#if SIZEOF_WCHAR_T == 4
+		m_unicode_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ;
+#else
+		m_unicode_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
+#endif		
+	    status = TECCreateConverter(&m_MB2WC_converter,
+	                                m_char_encoding,
+	                                m_unicode_encoding);
+	    status = TECCreateConverter(&m_WC2MB_converter,
+	                                m_unicode_encoding,
+	                                m_char_encoding);
+	}
+	
+    size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const
+    {
+	    OSStatus status = noErr ;
+	    ByteCount byteOutLen ;
+	    ByteCount byteInLen = strlen(psz) ;
+	    ByteCount byteBufferLen = n ; 
+		wchar_t *tbuf = NULL ;
+		
+		if (buf == NULL)
+		{
+			n = byteInLen * SIZEOF_WCHAR_T ;
+			tbuf = (wchar_t*) malloc( n ) ;
+		}
+	
+	    status = TECConvertText(m_MB2WC_converter, (ConstTextPtr) psz , byteInLen, &byteInLen,
+	      (TextPtr) (buf ? buf : tbuf) , byteBufferLen, &byteOutLen);
+
+		if ( buf == NULL )
+			free(tbuf) ;
+
+		size_t res = byteOutLen / SIZEOF_WCHAR_T ;
+        if ( buf  && res < n)
+            buf[res] = 0;
+
+		return res ;
+    }
+
+    size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const
+    {    	
+	    OSStatus status = noErr ;
+	    ByteCount byteOutLen ;
+	    ByteCount byteInLen = wxWcslen(psz) * SIZEOF_WCHAR_T ;
+	    ByteCount byteBufferLen = n ;
+
+		char *tbuf = NULL ;
+		
+		if (buf == NULL)
+		{
+			n = byteInLen ;
+			tbuf = (char*) malloc( n ) ;
+		}
+
+	    status = TECConvertText(m_WC2MB_converter, (ConstTextPtr) psz , byteInLen, &byteInLen,
+	       (TextPtr) ( buf ? buf : tbuf ) , byteBufferLen, &byteOutLen);
+
+		if ( buf == NULL )
+			free(tbuf) ;
+
+		size_t res = byteOutLen ;
+        if ( buf  && res < n)
+            buf[res] = 0;
+
+		return res ;
+    }
+
+    bool IsOk() const
+        { return m_MB2WC_converter !=  NULL && m_WC2MB_converter != NULL  ; }
+
+private:
+	TECObjectRef m_MB2WC_converter ;
+	TECObjectRef m_WC2MB_converter ;
+	
+	TextEncodingBase m_char_encoding ;
+	TextEncodingBase m_unicode_encoding ;
+};
+
+#endif // defined(__WXMAC__) && defined(TARGET_CARBON)
+
+// ============================================================================
+// wxEncodingConverter based conversion classes
+// ============================================================================
 
 #if wxUSE_FONTMAP
 
-class EC_CharSet : public wxCharacterSet
+class wxMBConv_wxwin : public wxMBConv
 {
+private:
+    void Init()
+    {
+        m_ok = m2w.Init(m_enc, wxFONTENCODING_UNICODE) &&
+               w2m.Init(wxFONTENCODING_UNICODE, m_enc);
+    }
+
 public:
     // temporarily just use wxEncodingConverter stuff,
     // so that it works while a better implementation is built
-    EC_CharSet(const wxChar* name) : wxCharacterSet(name),
-                                     enc(wxFONTENCODING_SYSTEM)
+    wxMBConv_wxwin(const wxChar* name)
     {
         if (name)
-            enc = wxTheFontMapper->CharsetToEncoding(name, FALSE);
-        m2w.Init(enc, wxFONTENCODING_UNICODE);
-        w2m.Init(wxFONTENCODING_UNICODE, enc);
+            m_enc = wxFontMapper::Get()->CharsetToEncoding(name, false);
+        else
+            m_enc = wxFONTENCODING_SYSTEM;
+
+        Init();
     }
 
-    size_t MB2WC(wchar_t *buf, const char *psz, size_t n)
+    wxMBConv_wxwin(wxFontEncoding enc)
+    {
+        m_enc = enc;
+
+        Init();
+    }
+
+    size_t MB2WC(wchar_t *buf, const char *psz, size_t WXUNUSED(n)) const
     {
         size_t inbuf = strlen(psz);
         if (buf)
@@ -820,88 +1338,97 @@ public:
         return inbuf;
     }
 
-    size_t WC2MB(char *buf, const wchar_t *psz, size_t n)
+    size_t WC2MB(char *buf, const wchar_t *psz, size_t WXUNUSED(n)) const
     {
-#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \
-    || ( defined(__MWERKS__) && defined(__WXMSW__) )
-        size_t inbuf = std::wcslen(psz);
-#else
-        size_t inbuf = ::wcslen(psz);
-#endif
+        const size_t inbuf = wxWcslen(psz);
         if (buf)
             w2m.Convert(psz,buf);
 
         return inbuf;
     }
 
-    bool usable()
-        { return (enc!=wxFONTENCODING_SYSTEM) && (enc!=wxFONTENCODING_DEFAULT); }
+    bool IsOk() const { return m_ok; }
 
 public:
-    wxFontEncoding enc;
+    wxFontEncoding m_enc;
     wxEncodingConverter m2w, w2m;
+
+    // were we initialized successfully?
+    bool m_ok;
+
+    DECLARE_NO_COPY_CLASS(wxMBConv_wxwin)
 };
 
 #endif // wxUSE_FONTMAP
 
-static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
+// ============================================================================
+// wxCSConv implementation
+// ============================================================================
+
+void wxCSConv::Init()
+{
+    m_name = NULL;
+    m_convReal =  NULL;
+    m_deferred = true;
+}
+
+wxCSConv::wxCSConv(const wxChar *charset)
 {
-    wxCharacterSet *cset = NULL;
-    if (name)
+    Init();
+
+    if ( charset )
     {
-        if (wxStricmp(name, wxT("UTF8")) == 0 || wxStricmp(name, wxT("UTF-8")) == 0)
-        {
-            cset = new ID_CharSet(name, &wxConvUTF8);
-        }
-        else
-        {
-#ifdef HAVE_ICONV_H
-            cset = new IC_CharSet(name); // may not take NULL
-#endif
-        }
+        SetName(charset);
     }
 
-    if (cset && cset->usable())
-        return cset;
+    m_encoding = wxFONTENCODING_SYSTEM;
+}
 
-    if (cset)
+wxCSConv::wxCSConv(wxFontEncoding encoding)
+{
+    if ( encoding == wxFONTENCODING_MAX || encoding == wxFONTENCODING_DEFAULT )
     {
-        delete cset;
-        cset = NULL;
+        wxFAIL_MSG( _T("invalid encoding value in wxCSConv ctor") );
+
+        encoding = wxFONTENCODING_SYSTEM;
     }
 
-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
-    cset = new CP_CharSet(name); // may take NULL
-    if (cset->usable())
-        return cset;
+    Init();
+
+    m_encoding = encoding;
+}
 
-    delete cset;
-#endif // __WIN32__
+wxCSConv::~wxCSConv()
+{
+    Clear();
+}
 
-#if wxUSE_FONTMAP
-    cset = new EC_CharSet(name);
-    if (cset->usable())
-        return cset;
-#endif // wxUSE_FONTMAP
+wxCSConv::wxCSConv(const wxCSConv& conv)
+        : wxMBConv()
+{
+    Init();
 
-    delete cset;
-    wxLogError(_("Unknown encoding '%s'!"), name);
-    return NULL;
+    SetName(conv.m_name);
+    m_encoding = conv.m_encoding;
 }
 
-wxCSConv::wxCSConv(const wxChar *charset)
+wxCSConv& wxCSConv::operator=(const wxCSConv& conv)
 {
-    m_name = (wxChar *)NULL;
-    m_cset = (wxCharacterSet *) NULL;
-    m_deferred = TRUE;
+    Clear();
+
+    SetName(conv.m_name);
+    m_encoding = conv.m_encoding;
 
-    SetName(charset);
+    return *this;
 }
 
-wxCSConv::~wxCSConv()
+void wxCSConv::Clear()
 {
     free(m_name);
-    delete m_cset;
+    delete m_convReal;
+
+    m_name = NULL;
+    m_convReal = NULL;
 }
 
 void wxCSConv::SetName(const wxChar *charset)
@@ -909,33 +1436,175 @@ void wxCSConv::SetName(const wxChar *charset)
     if (charset)
     {
         m_name = wxStrdup(charset);
-        m_deferred = TRUE;
+        m_deferred = true;
     }
 }
 
-void wxCSConv::LoadNow()
+wxMBConv *wxCSConv::DoCreate() const
 {
-    if (m_deferred)
+    // check for the special case of ASCII or ISO8859-1 charset: as we have
+    // special knowledge of it anyhow, we don't need to create a special
+    // conversion object
+    if ( m_encoding == wxFONTENCODING_ISO8859_1 )
+    {
+        // don't convert at all
+        return NULL;
+    }
+
+    // we trust OS to do conversion better than we can so try external
+    // conversion methods first
+    //
+    // the full order is:
+    //      1. OS conversion (iconv() under Unix or Win32 API)
+    //      2. hard coded conversions for UTF
+    //      3. wxEncodingConverter as fall back
+
+    // step (1)
+#ifdef HAVE_ICONV
+#if !wxUSE_FONTMAP
+    if ( m_name )
+#endif // !wxUSE_FONTMAP
+    {
+        wxString name(m_name);
+
+#if wxUSE_FONTMAP
+        if ( name.empty() )
+            name = wxFontMapper::Get()->GetEncodingName(m_encoding);
+#endif // wxUSE_FONTMAP
+
+        wxMBConv_iconv *conv = new wxMBConv_iconv(name);
+        if ( conv->IsOk() )
+            return conv;
+
+        delete conv;
+    }
+#endif // HAVE_ICONV
+
+#ifdef wxHAVE_WIN32_MB2WC
+    {
+        wxMBConv_win32 *conv = m_name ? new wxMBConv_win32(m_name)
+                                      : new wxMBConv_win32(m_encoding);
+        if ( conv->IsOk() )
+            return conv;
+
+        delete conv;
+    }
+#endif // wxHAVE_WIN32_MB2WC
+#if defined(__WXMAC__) 
     {
-        if ( !m_name )
+    	if ( m_name || ( m_encoding < wxFONTENCODING_UTF16BE ) )
+    	{
+	    		
+	        wxMBConv_mac *conv = m_name ? new wxMBConv_mac(m_name)
+	                                    : new wxMBConv_mac(m_encoding);
+	        if ( conv->IsOk() )
+	            return conv;
+
+	        delete conv;
+    	}
+    }
+#endif
+    // step (2)
+    wxFontEncoding enc = m_encoding;
+#if wxUSE_FONTMAP
+    if ( enc == wxFONTENCODING_SYSTEM && m_name )
+    {
+        // use "false" to suppress interactive dialogs -- we can be called from
+        // anywhere and popping up a dialog from here is the last thing we want to
+        // do
+        enc = wxFontMapper::Get()->CharsetToEncoding(m_name, false);
+    }
+#endif // wxUSE_FONTMAP
+
+    switch ( enc )
+    {
+        case wxFONTENCODING_UTF7:
+             return new wxMBConvUTF7;
+
+        case wxFONTENCODING_UTF8:
+             return new wxMBConvUTF8;
+
+        case wxFONTENCODING_UTF16BE:
+             return new wxMBConvUTF16BE;
+
+        case wxFONTENCODING_UTF16LE:
+             return new wxMBConvUTF16LE;
+
+        case wxFONTENCODING_UTF32BE:
+             return new wxMBConvUTF32BE;
+
+        case wxFONTENCODING_UTF32LE:
+             return new wxMBConvUTF32LE;
+
+        default:
+             // nothing to do but put here to suppress gcc warnings
+             ;
+    }
+
+    // step (3)
+#if wxUSE_FONTMAP
+    {
+        wxMBConv_wxwin *conv = m_name ? new wxMBConv_wxwin(m_name)
+                                      : new wxMBConv_wxwin(m_encoding);
+        if ( conv->IsOk() )
+            return conv;
+
+        delete conv;
+    }
+#endif // wxUSE_FONTMAP
+
+    // NB: This is a hack to prevent deadlock. What could otherwise happen
+    //     in Unicode build: wxConvLocal creation ends up being here
+    //     because of some failure and logs the error. But wxLog will try to
+    //     attach timestamp, for which it will need wxConvLocal (to convert
+    //     time to char* and then wchar_t*), but that fails, tries to log
+    //     error, but wxLog has a (already locked) critical section that
+    //     guards static buffer.
+    static bool alreadyLoggingError = false;
+    if (!alreadyLoggingError)
+    {
+        alreadyLoggingError = true;
+        wxLogError(_("Cannot convert from the charset '%s'!"),
+                   m_name ? m_name
+                      :
+#if wxUSE_FONTMAP
+                         wxFontMapper::GetEncodingDescription(m_encoding).c_str()
+#else // !wxUSE_FONTMAP
+                         wxString::Format(_("encoding %s"), m_encoding).c_str()
+#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
+              );
+        alreadyLoggingError = false;
+    }
+
+    return NULL;
+}
+
+void wxCSConv::CreateConvIfNeeded() const
+{
+    if ( m_deferred )
+    {
+        wxCSConv *self = (wxCSConv *)this; // const_cast
+
+#if wxUSE_INTL
+        // if we don't have neither the name nor the encoding, use the default
+        // encoding for this system
+        if ( !m_name && m_encoding == wxFONTENCODING_SYSTEM )
         {
-            wxString name = wxLocale::GetSystemEncodingName();
-            if ( !name.empty() )
-                SetName(name);
+            self->m_name = wxStrdup(wxLocale::GetSystemEncodingName());
         }
+#endif // wxUSE_INTL
 
-        // wxGetCharacterSet() complains about NULL name
-        m_cset = m_name ? wxGetCharacterSet(m_name) : NULL;
-        m_deferred = FALSE;
+        self->m_convReal = DoCreate();
+        self->m_deferred = false;
     }
 }
 
 size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
 {
-    ((wxCSConv *)this)->LoadNow(); // discard constness
+    CreateConvIfNeeded();
 
-    if (m_cset)
-        return m_cset->MB2WC(buf, psz, n);
+    if (m_convReal)
+        return m_convReal->MB2WC(buf, psz, n);
 
     // latin-1 (direct)
     size_t len = strlen(psz);
@@ -951,89 +1620,65 @@ size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
 
 size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 {
-    ((wxCSConv *)this)->LoadNow(); // discard constness
+    CreateConvIfNeeded();
 
-    if (m_cset)
-        return m_cset->WC2MB(buf, psz, n);
+    if (m_convReal)
+        return m_convReal->WC2MB(buf, psz, n);
 
     // latin-1 (direct)
-#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \
-    || ( defined(__MWERKS__) && defined(__WXMSW__) )
-    size_t len=std::wcslen(psz);
-#else
-    size_t len=::wcslen(psz);
-#endif
+    const size_t len = wxWcslen(psz);
     if (buf)
     {
         for (size_t c = 0; c <= len; c++)
-            buf[c] = (psz[c] > 0xff) ? '?' : psz[c];
+        {
+            if (psz[c] > 0xFF)
+                return (size_t)-1;
+            buf[c] = psz[c];
+        }
+    }
+    else
+    {
+        for (size_t c = 0; c <= len; c++)
+        {
+            if (psz[c] > 0xFF)
+                return (size_t)-1;
+        }
     }
 
     return len;
 }
 
-#ifdef HAVE_ICONV_H
-
-class IC_CharSetConverter
-{
-public:
-    IC_CharSetConverter(IC_CharSet *from, IC_CharSet *to)
-    {
-        cnv = iconv_open(wxConvLibc.cWX2MB(to->cname),
-                         wxConvLibc.cWX2MB(from->cname));
-    }
-
-    ~IC_CharSetConverter()
-    {
-        if (cnv != (iconv_t)-1)
-            iconv_close(cnv);
-    }
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
 
-    size_t Convert(char *buf, const char *psz, size_t n)
-    {
-        size_t inbuf = strlen(psz);
-        size_t outbuf = n;
-#ifdef WX_ICONV_TAKES_CHAR
-        size_t res = iconv( cnv, (char**)&psz, &inbuf, &buf, &outbuf );
+#ifdef __WINDOWS__
+    static wxMBConv_win32 wxConvLibcObj;
 #else
-        size_t res = iconv( cnv, &psz, &inbuf, &buf, &outbuf );
+    static wxMBConvLibc wxConvLibcObj;
 #endif
-        if (res == (size_t)-1)
-            return (size_t)-1;
-        return (n - outbuf);
-    }
-
-public:
-    iconv_t cnv;
-};
 
-#endif // HAVE_ICONV_H
+static wxCSConv wxConvLocalObj(wxFONTENCODING_SYSTEM);
+static wxCSConv wxConvISO8859_1Obj(wxFONTENCODING_ISO8859_1);
+static wxMBConvUTF7 wxConvUTF7Obj;
+static wxMBConvUTF8 wxConvUTF8Obj;
 
-class EC_CharSetConverter
-{
-public:
-    EC_CharSetConverter(EC_CharSet* from,EC_CharSet* to)
-        { cnv.Init(from->enc,to->enc); }
-
-    size_t Convert(char* buf, const char* psz, size_t n)
-    {
-        size_t inbuf = strlen(psz);
-        if (buf) cnv.Convert(psz,buf);
-        return inbuf;
-    }
 
-public:
-    wxEncodingConverter cnv;
-};
+WXDLLIMPEXP_DATA_BASE(wxMBConv&) wxConvLibc = wxConvLibcObj;
+WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvLocal = wxConvLocalObj;
+WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvISO8859_1 = wxConvISO8859_1Obj;
+WXDLLIMPEXP_DATA_BASE(wxMBConvUTF7&) wxConvUTF7 = wxConvUTF7Obj;
+WXDLLIMPEXP_DATA_BASE(wxMBConvUTF8&) wxConvUTF8 = wxConvUTF8Obj;
+WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent = &wxConvLibcObj;
 
 #else // !wxUSE_WCHAR_T
 
-// ----------------------------------------------------------------------------
 // stand-ins in absence of wchar_t
-// ----------------------------------------------------------------------------
-
-WXDLLEXPORT_DATA(wxMBConv) wxConvLibc, wxConvFile;
+WXDLLIMPEXP_DATA_BASE(wxMBConv) wxConvLibc,
+                                wxConvISO8859_1,
+                                wxConvLocal,
+                                wxConvUTF8;
 
-#endif // wxUSE_WCHAR_T
+#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T