Added Set/GetQuickBestSize

[wxWidgets.git] / src / common / strconv.cpp

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 9b9e76d790f91542a3c1202a9a32c19643015148..f4a58755c3cb3f2a983cb4c2bb6fa1a31614a718 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -1,48 +1,32 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        strconv.cpp
+// Name:        src/common/strconv.cpp

 // Purpose:     Unicode conversion classes
 // Purpose:     Unicode conversion classes

-// Author:      Ove Kaaven, Robert Roebling, Vadim Zeitlin, Vaclav Slavik
+// Author:      Ove Kaaven, Robert Roebling, Vadim Zeitlin, Vaclav Slavik,
+//              Ryan Norton, Fredrik Roubert (UTF7)

 // Modified by:
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Ove Kaaven, Robert Roebling, Vaclav Slavik
 //              (c) 2000-2003 Vadim Zeitlin
 // Modified by:
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Ove Kaaven, Robert Roebling, Vaclav Slavik
 //              (c) 2000-2003 Vadim Zeitlin

+//              (c) 2004 Ryan Norton, Fredrik Roubert

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-  #pragma implementation "strconv.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifdef __BORLANDC__
-  #pragma hdrstop
-#endif
-

 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

-#endif // WX_PRECOMP
+    #include "wx/utils.h"
+#endif

 
 #include "wx/strconv.h"
 
 #if wxUSE_WCHAR_T
 
 
 #include "wx/strconv.h"
 
 #if wxUSE_WCHAR_T
 

-#ifdef __WXMSW__
-    #include "wx/msw/private.h"
-#endif
-

 #ifdef __WINDOWS__
 #ifdef __WINDOWS__

+    #include "wx/msw/private.h"

     #include "wx/msw/missing.h"
 #endif
 
     #include "wx/msw/missing.h"
 #endif
 


@@ -56,11 +40,7 @@
 
 #if defined(__WIN32__) && !defined(__WXMICROWIN__)
     #define wxHAVE_WIN32_MB2WC
 
 #if defined(__WIN32__) && !defined(__WXMICROWIN__)
     #define wxHAVE_WIN32_MB2WC

-#endif // __WIN32__ but !__WXMICROWIN__
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
+#endif

 
 #ifdef __SALFORDC__
     #include <clib.h>
 
 #ifdef __SALFORDC__
     #include <clib.h>


@@ -68,91 +48,86 @@
 
 #ifdef HAVE_ICONV
     #include <iconv.h>
 
 #ifdef HAVE_ICONV
     #include <iconv.h>

+    #include "wx/thread.h"

 #endif
 
 #include "wx/encconv.h"
 #include "wx/fontmap.h"
 #endif
 
 #include "wx/encconv.h"
 #include "wx/fontmap.h"

-#include "wx/utils.h"

 
 #ifdef __WXMAC__
 
 #ifdef __WXMAC__

+#ifndef __DARWIN__

 #include <ATSUnicode.h>
 #include <TextCommon.h>
 #include <TextEncodingConverter.h>
 #include <ATSUnicode.h>
 #include <TextCommon.h>
 #include <TextEncodingConverter.h>

+#endif

 
 

-#include  "wx/mac/private.h"  // includes mac headers
+// includes Mac headers
+#include "wx/mac/private.h"

 #endif
 #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]); }

 
 

-#if SIZEOF_WCHAR_T == 4
-    #define WC_NAME         "UCS4"
-    #define WC_BSWAP         BSWAP_UCS4
-    #ifdef WORDS_BIGENDIAN
-      #define WC_NAME_BEST  "UCS-4BE"
-    #else
-      #define WC_NAME_BEST  "UCS-4LE"
-    #endif
-#elif SIZEOF_WCHAR_T == 2
-    #define WC_NAME         "UTF16"
-    #define WC_BSWAP         BSWAP_UTF16
+#define TRACE_STRCONV _T("strconv")
+
+// WC_UTF16 is defined only if sizeof(wchar_t) == 2, otherwise it's supposed to
+// be 4 bytes
+#if SIZEOF_WCHAR_T == 2

     #define WC_UTF16
     #define WC_UTF16

-    #ifdef WORDS_BIGENDIAN
-      #define WC_NAME_BEST  "UTF-16BE"
-    #else
-      #define WC_NAME_BEST  "UTF-16LE"
-    #endif
-#else // sizeof(wchar_t) != 2 nor 4
-    // does this ever happen?
-    #error "Unknown sizeof(wchar_t): please report this to wx-dev@lists.wxwindows.org"

 #endif
 
 #endif
 

+

 // ============================================================================
 // implementation
 // ============================================================================
 
 // ============================================================================
 // implementation
 // ============================================================================
 

+// helper function of cMB2WC(): check if n bytes at this location are all NUL
+static bool NotAllNULs(const char *p, size_t n)
+{
+    while ( n && *p++ == '\0' )
+        n--;
+
+    return n != 0;
+}
+

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// UTF-16 en/decoding to/from UCS-4
+// UTF-16 en/decoding to/from UCS-4 with surrogates handling

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-

 static size_t encode_utf16(wxUint32 input, wxUint16 *output)
 {
 static size_t encode_utf16(wxUint32 input, wxUint16 *output)
 {

-    if (input<=0xffff)
+    if (input <= 0xffff)

     {
         if (output)
             *output = (wxUint16) input;
     {
         if (output)
             *output = (wxUint16) input;

+

         return 1;
     }
         return 1;
     }

-    else if (input>=0x110000)
+    else if (input >= 0x110000)

     {
     {

-        return (size_t)-1;
+        return wxCONV_FAILED;

     }
     else
     {
         if (output)
         {
     }
     else
     {
         if (output)
         {

-            *output++ = (wxUint16) ((input >> 10)+0xd7c0);
-            *output = (wxUint16) ((input&0x3ff)+0xdc00);
+            *output++ = (wxUint16) ((input >> 10) + 0xd7c0);
+            *output = (wxUint16) ((input & 0x3ff) + 0xdc00);

         }
         }

+

         return 2;
     }
 }
 
 static size_t decode_utf16(const wxUint16* input, wxUint32& output)
 {
         return 2;
     }
 }
 
 static size_t decode_utf16(const wxUint16* input, wxUint32& output)
 {

-    if ((*input<0xd800) || (*input>0xdfff))
+    if ((*input < 0xd800) || (*input > 0xdfff))

     {
         output = *input;
         return 1;
     }
     {
         output = *input;
         return 1;
     }

-    else if ((input[1]<0xdc00) || (input[1]>=0xdfff))
+    else if ((input[1] < 0xdc00) || (input[1] > 0xdfff))

     {
         output = *input;
     {
         output = *input;

-        return (size_t)-1;
+        return wxCONV_FAILED;

     }
     else
     {
     }
     else
     {


@@ -161,53 +136,322 @@ static size_t decode_utf16(const wxUint16* input, wxUint32& output)
     }
 }
 
     }
 }
 

+#ifdef WC_UTF16
+    typedef wchar_t wxDecodeSurrogate_t;
+#else // !WC_UTF16
+    typedef wxUint16 wxDecodeSurrogate_t;
+#endif // WC_UTF16/!WC_UTF16
+
+// returns the next UTF-32 character from the wchar_t buffer and advances the
+// pointer to the character after this one
+//
+// if an invalid character is found, *pSrc is set to NULL, the caller must
+// check for this
+static wxUint32 wxDecodeSurrogate(const wxDecodeSurrogate_t **pSrc)
+{
+    wxUint32 out;
+    const size_t
+        n = decode_utf16(wx_reinterpret_cast(const wxUint16 *, *pSrc), out);
+    if ( n == wxCONV_FAILED )
+        *pSrc = NULL;
+    else
+        *pSrc += n;
+
+    return out;
+}

 
 // ----------------------------------------------------------------------------
 // wxMBConv
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxMBConv
 // ----------------------------------------------------------------------------
 

+size_t
+wxMBConv::ToWChar(wchar_t *dst, size_t dstLen,
+                  const char *src, size_t srcLen) const
+{
+    // although new conversion classes are supposed to implement this function
+    // directly, the existins ones only implement the old MB2WC() and so, to
+    // avoid to have to rewrite all conversion classes at once, we provide a
+    // default (but not efficient) implementation of this one in terms of the
+    // old function by copying the input to ensure that it's NUL-terminated and
+    // then using MB2WC() to convert it
+
+    // the number of chars [which would be] written to dst [if it were not NULL]
+    size_t dstWritten = 0;
+
+    // the number of NULs terminating this string
+    size_t nulLen = 0;  // not really needed, but just to avoid warnings
+
+    // if we were not given the input size we just have to assume that the
+    // string is properly terminated as we have no way of knowing how long it
+    // is anyhow, but if we do have the size check whether there are enough
+    // NULs at the end
+    wxCharBuffer bufTmp;
+    const char *srcEnd;
+    if ( srcLen != wxNO_LEN )
+    {
+        // we need to know how to find the end of this string
+        nulLen = GetMBNulLen();
+        if ( nulLen == wxCONV_FAILED )
+            return wxCONV_FAILED;
+
+        // if there are enough NULs we can avoid the copy
+        if ( srcLen < nulLen || NotAllNULs(src + srcLen - nulLen, nulLen) )
+        {
+            // make a copy in order to properly NUL-terminate the string
+            bufTmp = wxCharBuffer(srcLen + nulLen - 1 /* 1 will be added */);
+            char * const p = bufTmp.data();
+            memcpy(p, src, srcLen);
+            for ( char *s = p + srcLen; s < p + srcLen + nulLen; s++ )
+                *s = '\0';
+
+            src = bufTmp;
+        }
+
+        srcEnd = src + srcLen;
+    }
+    else // quit after the first loop iteration
+    {
+        srcEnd = NULL;
+    }
+
+    for ( ;; )
+    {
+        // try to convert the current chunk
+        size_t lenChunk = MB2WC(NULL, src, 0);
+        if ( lenChunk == wxCONV_FAILED )
+            return wxCONV_FAILED;
+
+        lenChunk++; // for the L'\0' at the end of this chunk
+
+        dstWritten += lenChunk;
+
+        if ( lenChunk == 1 )
+        {
+            // nothing left in the input string, conversion succeeded
+            break;
+        }
+
+        if ( dst )
+        {
+            if ( dstWritten > dstLen )
+                return wxCONV_FAILED;
+
+            if ( MB2WC(dst, src, lenChunk) == wxCONV_FAILED )
+                return wxCONV_FAILED;
+
+            dst += lenChunk;
+        }
+
+        if ( !srcEnd )
+        {
+            // we convert just one chunk in this case as this is the entire
+            // string anyhow
+            break;
+        }
+
+        // advance the input pointer past the end of this chunk
+        while ( NotAllNULs(src, nulLen) )
+        {
+            // notice that we must skip over multiple bytes here as we suppose
+            // that if NUL takes 2 or 4 bytes, then all the other characters do
+            // too and so if advanced by a single byte we might erroneously
+            // detect sequences of NUL bytes in the middle of the input
+            src += nulLen;
+        }
+
+        src += nulLen; // skipping over its terminator as well
+
+        // note that ">=" (and not just "==") is needed here as the terminator
+        // we skipped just above could be inside or just after the buffer
+        // delimited by inEnd
+        if ( src >= srcEnd )
+            break;
+    }
+
+    return dstWritten;
+}
+
+size_t
+wxMBConv::FromWChar(char *dst, size_t dstLen,
+                    const wchar_t *src, size_t srcLen) const
+{
+    // the number of chars [which would be] written to dst [if it were not NULL]
+    size_t dstWritten = 0;
+
+    // make a copy of the input string unless it is already properly
+    // NUL-terminated
+    //
+    // if we don't know its length we have no choice but to assume that it is,
+    // indeed, properly terminated
+    wxWCharBuffer bufTmp;
+    if ( srcLen == wxNO_LEN )
+    {
+        srcLen = wxWcslen(src) + 1;
+    }
+    else if ( srcLen != 0 && src[srcLen - 1] != L'\0' )
+    {
+        // make a copy in order to properly NUL-terminate the string
+        bufTmp = wxWCharBuffer(srcLen);
+        memcpy(bufTmp.data(), src, srcLen * sizeof(wchar_t));
+        src = bufTmp;
+    }
+
+    const size_t lenNul = GetMBNulLen();
+    for ( const wchar_t * const srcEnd = src + srcLen;
+          src < srcEnd;
+          src += wxWcslen(src) + 1 /* skip L'\0' too */ )
+    {
+        // try to convert the current chunk
+        size_t lenChunk = WC2MB(NULL, src, 0);
+
+        if ( lenChunk == wxCONV_FAILED )
+            return wxCONV_FAILED;
+
+        lenChunk += lenNul;
+        dstWritten += lenChunk;
+
+        if ( dst )
+        {
+            if ( dstWritten > dstLen )
+                return wxCONV_FAILED;
+
+            if ( WC2MB(dst, src, lenChunk) == wxCONV_FAILED )
+                return wxCONV_FAILED;
+
+            dst += lenChunk;
+        }
+    }
+
+    return dstWritten;
+}
+
+size_t wxMBConv::MB2WC(wchar_t *outBuff, const char *inBuff, size_t outLen) const
+{
+    size_t rc = ToWChar(outBuff, outLen, inBuff);
+    if ( rc != wxCONV_FAILED )
+    {
+        // ToWChar() returns the buffer length, i.e. including the trailing
+        // NUL, while this method doesn't take it into account
+        rc--;
+    }
+
+    return rc;
+}
+
+size_t wxMBConv::WC2MB(char *outBuff, const wchar_t *inBuff, size_t outLen) const
+{
+    size_t rc = FromWChar(outBuff, outLen, inBuff);
+    if ( rc != wxCONV_FAILED )
+    {
+        rc -= GetMBNulLen();
+    }
+
+    return rc;
+}
+
+wxMBConv::~wxMBConv()
+{
+    // nothing to do here (necessary for Darwin linking probably)
+}
+

 const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const
 {
     if ( psz )
     {
         // calculate the length of the buffer needed first
 const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const
 {
     if ( psz )
     {
         // calculate the length of the buffer needed first

-        size_t nLen = MB2WC(NULL, psz, 0);
-        if ( nLen != (size_t)-1 )
+        const size_t nLen = MB2WC(NULL, psz, 0);
+        if ( nLen != wxCONV_FAILED )

         {
             // now do the actual conversion
         {
             // now do the actual conversion

-            wxWCharBuffer buf(nLen);
-            nLen = MB2WC(buf.data(), psz, nLen + 1); // with the trailing NULL
-            if ( nLen != (size_t)-1 )
-            {
+            wxWCharBuffer buf(nLen /* +1 added implicitly */);
+
+            // +1 for the trailing NULL
+            if ( MB2WC(buf.data(), psz, nLen + 1) != wxCONV_FAILED )

                 return buf;
                 return buf;

-            }

         }
     }
 
         }
     }
 

-    wxWCharBuffer buf((wchar_t *)NULL);
-
-    return buf;
+    return wxWCharBuffer();

 }
 
 const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const
 {
     if ( pwz )
     {
 }
 
 const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const
 {
     if ( pwz )
     {

-        size_t nLen = WC2MB(NULL, pwz, 0);
-        if ( nLen != (size_t)-1 )
+        const size_t nLen = WC2MB(NULL, pwz, 0);
+        if ( nLen != wxCONV_FAILED )

         {
         {

-            wxCharBuffer buf(nLen+3);       // space for a wxUint32 trailing zero
-            nLen = WC2MB(buf.data(), pwz, nLen + 4);
-            if ( nLen != (size_t)-1 )
-            {
+            // extra space for trailing NUL(s)
+            static const size_t extraLen = GetMaxMBNulLen();
+
+            wxCharBuffer buf(nLen + extraLen - 1);
+            if ( WC2MB(buf.data(), pwz, nLen + extraLen) != wxCONV_FAILED )

                 return buf;
                 return buf;

+        }
+    }
+
+    return wxCharBuffer();
+}
+
+const wxWCharBuffer
+wxMBConv::cMB2WC(const char *inBuff, size_t inLen, size_t *outLen) const
+{
+    const size_t dstLen = ToWChar(NULL, 0, inBuff, inLen);
+    if ( dstLen != wxCONV_FAILED )
+    {
+        wxWCharBuffer wbuf(dstLen - 1);
+        if ( ToWChar(wbuf.data(), dstLen, inBuff, inLen) != wxCONV_FAILED )
+        {
+            if ( outLen )
+            {
+                *outLen = dstLen;
+                if ( wbuf[dstLen - 1] == L'\0' )
+                    (*outLen)--;

             }
             }

+
+            return wbuf;

         }
     }
 
         }
     }
 

-    wxCharBuffer buf((char *)NULL);
+    if ( outLen )
+        *outLen = 0;

 
 

-    return buf;
+    return wxWCharBuffer();
+}
+
+const wxCharBuffer
+wxMBConv::cWC2MB(const wchar_t *inBuff, size_t inLen, size_t *outLen) const
+{
+    size_t dstLen = FromWChar(NULL, 0, inBuff, inLen);
+    if ( dstLen != wxCONV_FAILED )
+    {
+        // special case of empty input: can't allocate 0 size buffer below as
+        // wxCharBuffer insists on NUL-terminating it
+        wxCharBuffer buf(dstLen ? dstLen - 1 : 1);
+        if ( FromWChar(buf.data(), dstLen, inBuff, inLen) != wxCONV_FAILED )
+        {
+            if ( outLen )
+            {
+                *outLen = dstLen;
+
+                const size_t nulLen = GetMBNulLen();
+                if ( dstLen >= nulLen &&
+                        !NotAllNULs(buf.data() + dstLen - nulLen, nulLen) )
+                {
+                    // in this case the output is NUL-terminated and we're not
+                    // supposed to count NUL
+                    *outLen -= nulLen;
+                }
+            }
+
+            return buf;
+        }
+    }
+
+    if ( outLen )
+        *outLen = 0;
+
+    return wxCharBuffer();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -224,33 +468,243 @@ size_t wxMBConvLibc::WC2MB(char *buf, const wchar_t *psz, size_t n) const
     return wxWC2MB(buf, psz, n);
 }
 
     return wxWC2MB(buf, psz, n);
 }
 

+// ----------------------------------------------------------------------------
+// wxConvBrokenFileNames
+// ----------------------------------------------------------------------------
+
+#ifdef __UNIX__
+
+wxConvBrokenFileNames::wxConvBrokenFileNames(const wxChar *charset)
+{
+    if ( !charset || wxStricmp(charset, _T("UTF-8")) == 0
+                  || wxStricmp(charset, _T("UTF8")) == 0  )
+        m_conv = new wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL);
+    else
+        m_conv = new wxCSConv(charset);
+}
+
+#endif // __UNIX__
+

 // ----------------------------------------------------------------------------
 // UTF-7
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // UTF-7
 // ----------------------------------------------------------------------------
 

-#if 0
-static char utf7_setD[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                        "abcdefghijklmnopqrstuvwxyz"
-                        "0123456789'(),-./:?";
-static char utf7_setO[]="!\"#$%&*;<=>@[]^_`{|}";
-static char utf7_setB[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                        "abcdefghijklmnopqrstuvwxyz"
-                        "0123456789+/";
-#endif
+// Implementation (C) 2004 Fredrik Roubert

 
 

-// TODO: write actual implementations of UTF-7 here
-size_t wxMBConvUTF7::MB2WC(wchar_t * WXUNUSED(buf),
-                           const char * WXUNUSED(psz),
-                           size_t WXUNUSED(n)) const
+//
+// BASE64 decoding table
+//
+static const unsigned char utf7unb64[] =

 {
 {

-  return 0;
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0x3e, 0xff, 0xff, 0xff, 0x3f,
+    0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b,
+    0x3c, 0x3d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,
+    0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
+    0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
+    0x17, 0x18, 0x19, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
+    0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
+    0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
+    0x31, 0x32, 0x33, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+};
+
+size_t wxMBConvUTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+{
+    size_t len = 0;
+
+    while ( *psz && (!buf || (len < n)) )
+    {
+        unsigned char cc = *psz++;
+        if (cc != '+')
+        {
+            // plain ASCII char
+            if (buf)
+                *buf++ = cc;
+            len++;
+        }
+        else if (*psz == '-')
+        {
+            // encoded plus sign
+            if (buf)
+                *buf++ = cc;
+            len++;
+            psz++;
+        }
+        else // start of BASE64 encoded string
+        {
+            bool lsb, ok;
+            unsigned int d, l;
+            for ( ok = lsb = false, d = 0, l = 0;
+                  (cc = utf7unb64[(unsigned char)*psz]) != 0xff;
+                  psz++ )
+            {
+                d <<= 6;
+                d += cc;
+                for (l += 6; l >= 8; lsb = !lsb)
+                {
+                    unsigned char c = (unsigned char)((d >> (l -= 8)) % 256);
+                    if (lsb)
+                    {
+                        if (buf)
+                            *buf++ |= c;
+                        len ++;
+                    }
+                    else
+                    {
+                        if (buf)
+                            *buf = (wchar_t)(c << 8);
+                    }
+
+                    ok = true;
+                }
+            }
+
+            if ( !ok )
+            {
+                // in valid UTF7 we should have valid characters after '+'
+                return wxCONV_FAILED;
+            }
+
+            if (*psz == '-')
+                psz++;
+        }
+    }
+
+    if ( buf && (len < n) )
+        *buf = '\0';
+
+    return len;

 }
 
 }
 

-size_t wxMBConvUTF7::WC2MB(char * WXUNUSED(buf),
-                           const wchar_t * WXUNUSED(psz),
-                           size_t WXUNUSED(n)) const
+//
+// BASE64 encoding table
+//
+static const unsigned char utf7enb64[] =
+{
+    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+    'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+    'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
+    'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
+    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+    'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+    'w', 'x', 'y', 'z', '0', '1', '2', '3',
+    '4', '5', '6', '7', '8', '9', '+', '/'
+};
+
+//
+// UTF-7 encoding table
+//
+// 0 - Set D (directly encoded characters)
+// 1 - Set O (optional direct characters)
+// 2 - whitespace characters (optional)
+// 3 - special characters
+//
+static const unsigned char utf7encode[128] =

 {
 {

-  return 0;
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 2, 3, 3,
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    2, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 3, 0, 0, 0, 3,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0,
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 1, 1, 1,
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 3
+};
+
+size_t wxMBConvUTF7::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+{
+    size_t len = 0;
+
+    while (*psz && ((!buf) || (len < n)))
+    {
+        wchar_t cc = *psz++;
+        if (cc < 0x80 && utf7encode[cc] < 1)
+        {
+            // plain ASCII char
+            if (buf)
+                *buf++ = (char)cc;
+
+            len++;
+        }
+#ifndef WC_UTF16
+        else if (((wxUint32)cc) > 0xffff)
+        {
+            // no surrogate pair generation (yet?)
+            return wxCONV_FAILED;
+        }
+#endif
+        else
+        {
+            if (buf)
+                *buf++ = '+';
+
+            len++;
+            if (cc != '+')
+            {
+                // BASE64 encode string
+                unsigned int lsb, d, l;
+                for (d = 0, l = 0; /*nothing*/; psz++)
+                {
+                    for (lsb = 0; lsb < 2; lsb ++)
+                    {
+                        d <<= 8;
+                        d += lsb ? cc & 0xff : (cc & 0xff00) >> 8;
+
+                        for (l += 8; l >= 6; )
+                        {
+                            l -= 6;
+                            if (buf)
+                                *buf++ = utf7enb64[(d >> l) % 64];
+                            len++;
+                        }
+                    }
+
+                    cc = *psz;
+                    if (!(cc) || (cc < 0x80 && utf7encode[cc] < 1))
+                        break;
+                }
+
+                if (l != 0)
+                {
+                    if (buf)
+                        *buf++ = utf7enb64[((d % 16) << (6 - l)) % 64];
+
+                    len++;
+                }
+            }
+
+            if (buf)
+                *buf++ = '-';
+            len++;
+        }
+    }
+
+    if (buf && (len < n))
+        *buf = 0;
+
+    return len;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -260,22 +714,39 @@ size_t wxMBConvUTF7::WC2MB(char * WXUNUSED(buf),
 static wxUint32 utf8_max[]=
     { 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff, 0xffffffff };
 
 static wxUint32 utf8_max[]=
     { 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff, 0xffffffff };
 

+// boundaries of the private use area we use to (temporarily) remap invalid
+// characters invalid in a UTF-8 encoded string
+const wxUint32 wxUnicodePUA = 0x100000;
+const wxUint32 wxUnicodePUAEnd = wxUnicodePUA + 256;
+

 size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
 {
     size_t len = 0;
 
     while (*psz && ((!buf) || (len < n)))
     {
 size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
 {
     size_t len = 0;
 
     while (*psz && ((!buf) || (len < n)))
     {

+        const char *opsz = psz;
+        bool invalid = false;

         unsigned char cc = *psz++, fc = cc;
         unsigned cnt;
         for (cnt = 0; fc & 0x80; cnt++)
             fc <<= 1;
         unsigned char cc = *psz++, fc = cc;
         unsigned cnt;
         for (cnt = 0; fc & 0x80; cnt++)
             fc <<= 1;

+

         if (!cnt)
         {
             // plain ASCII char
             if (buf)
                 *buf++ = cc;
             len++;
         if (!cnt)
         {
             // plain ASCII char
             if (buf)
                 *buf++ = cc;
             len++;

+
+            // escape the escape character for octal escapes
+            if ((m_options & MAP_INVALID_UTF8_TO_OCTAL)
+                    && cc == '\\' && (!buf || len < n))
+            {
+                if (buf)
+                    *buf++ = cc;
+                len++;
+            }

         }
         else
         {
         }
         else
         {


@@ -283,7 +754,7 @@ size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
             if (!cnt)
             {
                 // invalid UTF-8 sequence
             if (!cnt)
             {
                 // invalid UTF-8 sequence

-                return (size_t)-1;
+                invalid = true;

             }
             else
             {
             }
             else
             {


@@ -291,40 +762,112 @@ size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
                 wxUint32 res = cc & (0x3f >> cnt);
                 while (cnt--)
                 {
                 wxUint32 res = cc & (0x3f >> cnt);
                 while (cnt--)
                 {

-                    cc = *psz++;
+                    cc = *psz;

                     if ((cc & 0xC0) != 0x80)
                     {
                         // invalid UTF-8 sequence
                     if ((cc & 0xC0) != 0x80)
                     {
                         // invalid UTF-8 sequence

-                        return (size_t)-1;
+                        invalid = true;
+                        break;

                     }
                     }

+
+                    psz++;

                     res = (res << 6) | (cc & 0x3f);
                 }
                     res = (res << 6) | (cc & 0x3f);
                 }

-                if (res <= utf8_max[ocnt])
+
+                if (invalid || res <= utf8_max[ocnt])

                 {
                     // illegal UTF-8 encoding
                 {
                     // illegal UTF-8 encoding

-                    return (size_t)-1;
+                    invalid = true;

                 }
                 }

+                else if ((m_options & MAP_INVALID_UTF8_TO_PUA) &&
+                        res >= wxUnicodePUA && res < wxUnicodePUAEnd)
+                {
+                    // if one of our PUA characters turns up externally
+                    // it must also be treated as an illegal sequence
+                    // (a bit like you have to escape an escape character)
+                    invalid = true;
+                }
+                else
+                {

 #ifdef WC_UTF16
 #ifdef WC_UTF16

-                // 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;
+                    // cast is ok because wchar_t == wxUuint16 if WC_UTF16
+                    size_t pa = encode_utf16(res, (wxUint16 *)buf);
+                    if (pa == wxCONV_FAILED)
+                    {
+                        invalid = true;
+                    }
+                    else
+                    {
+                        if (buf)
+                            buf += pa;
+                        len += pa;
+                    }

 #else // !WC_UTF16
 #else // !WC_UTF16

-                if (buf)
-                    *buf++ = res;
-                len++;
+                    if (buf)
+                        *buf++ = (wchar_t)res;
+                    len++;

 #endif // WC_UTF16/!WC_UTF16
 #endif // WC_UTF16/!WC_UTF16

+                }
+            }
+
+            if (invalid)
+            {
+                if (m_options & MAP_INVALID_UTF8_TO_PUA)
+                {
+                    while (opsz < psz && (!buf || len < n))
+                    {
+#ifdef WC_UTF16
+                        // cast is ok because wchar_t == wxUuint16 if WC_UTF16
+                        size_t pa = encode_utf16((unsigned char)*opsz + wxUnicodePUA, (wxUint16 *)buf);
+                        wxASSERT(pa != wxCONV_FAILED);
+                        if (buf)
+                            buf += pa;
+                        opsz++;
+                        len += pa;
+#else
+                        if (buf)
+                            *buf++ = (wchar_t)(wxUnicodePUA + (unsigned char)*opsz);
+                        opsz++;
+                        len++;
+#endif
+                    }
+                }
+                else if (m_options & MAP_INVALID_UTF8_TO_OCTAL)
+                {
+                    while (opsz < psz && (!buf || len < n))
+                    {
+                        if ( buf && len + 3 < n )
+                        {
+                            unsigned char on = *opsz;
+                            *buf++ = L'\\';
+                            *buf++ = (wchar_t)( L'0' + on / 0100 );
+                            *buf++ = (wchar_t)( L'0' + (on % 0100) / 010 );
+                            *buf++ = (wchar_t)( L'0' + on % 010 );
+                        }
+
+                        opsz++;
+                        len += 4;
+                    }
+                }
+                else // MAP_INVALID_UTF8_NOT
+                {
+                    return wxCONV_FAILED;
+                }

             }
         }
     }
             }
         }
     }

+

     if (buf && (len < n))
         *buf = 0;
     if (buf && (len < n))
         *buf = 0;

+

     return len;
 }
 
     return len;
 }
 

+static inline bool isoctal(wchar_t wch)
+{
+    return L'0' <= wch && wch <= L'7';
+}
+

 size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 {
     size_t len = 0;
 size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 {
     size_t len = 0;


@@ -332,46 +875,80 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
     while (*psz && ((!buf) || (len < n)))
     {
         wxUint32 cc;
     while (*psz && ((!buf) || (len < n)))
     {
         wxUint32 cc;

+

 #ifdef WC_UTF16
         // cast is ok for WC_UTF16
         size_t pa = decode_utf16((const wxUint16 *)psz, cc);
 #ifdef WC_UTF16
         // cast is ok for WC_UTF16
         size_t pa = decode_utf16((const wxUint16 *)psz, cc);

-        psz += (pa == (size_t)-1) ? 1 : pa;
+        psz += (pa == wxCONV_FAILED) ? 1 : pa;

 #else
 #else

-        cc=(*psz++) & 0x7fffffff;
+        cc = (*psz++) & 0x7fffffff;

 #endif
 #endif

-        unsigned cnt;
-        for (cnt = 0; cc > utf8_max[cnt]; cnt++) {}
-        if (!cnt)
+
+        if ( (m_options & MAP_INVALID_UTF8_TO_PUA)
+                && cc >= wxUnicodePUA && cc < wxUnicodePUAEnd )

         {
         {

-            // plain ASCII char

             if (buf)
             if (buf)

-                *buf++ = (char) cc;
+                *buf++ = (char)(cc - wxUnicodePUA);

             len++;
         }
             len++;
         }

+        else if ( (m_options & MAP_INVALID_UTF8_TO_OCTAL)
+                    && cc == L'\\' && psz[0] == L'\\' )
+        {
+            if (buf)
+                *buf++ = (char)cc;
+            psz++;
+            len++;
+        }
+        else if ( (m_options & MAP_INVALID_UTF8_TO_OCTAL) &&
+                    cc == L'\\' &&
+                        isoctal(psz[0]) && isoctal(psz[1]) && isoctal(psz[2]) )
+        {
+            if (buf)
+            {
+                *buf++ = (char) ((psz[0] - L'0') * 0100 +
+                                 (psz[1] - L'0') * 010 +
+                                 (psz[2] - L'0'));
+            }

 
 

+            psz += 3;
+            len++;
+        }

         else
         {
         else
         {

-            len += cnt + 1;
-            if (buf)
+            unsigned cnt;
+            for (cnt = 0; cc > utf8_max[cnt]; cnt++)

             {
             {

-                *buf++ = (char) ((-128 >> cnt) | ((cc >> (cnt * 6)) & (0x3f >> cnt)));
-                while (cnt--)
-                    *buf++ = (char) (0x80 | ((cc >> (cnt * 6)) & 0x3f));
+            }
+
+            if (!cnt)
+            {
+                // plain ASCII char
+                if (buf)
+                    *buf++ = (char) cc;
+                len++;
+            }
+            else
+            {
+                len += cnt + 1;
+                if (buf)
+                {
+                    *buf++ = (char) ((-128 >> cnt) | ((cc >> (cnt * 6)) & (0x3f >> cnt)));
+                    while (cnt--)
+                        *buf++ = (char) (0x80 | ((cc >> (cnt * 6)) & 0x3f));
+                }

             }
         }
     }
 
             }
         }
     }
 

-    if (buf && (len<n)) *buf = 0;
+    if (buf && (len < n))
+        *buf = 0;

 
     return len;
 }
 
 
     return len;
 }
 

-
-
-
-// ----------------------------------------------------------------------------
+// ============================================================================

 // UTF-16
 // UTF-16

-// ----------------------------------------------------------------------------
+// ============================================================================

 
 #ifdef WORDS_BIGENDIAN
     #define wxMBConvUTF16straight wxMBConvUTF16BE
 
 #ifdef WORDS_BIGENDIAN
     #define wxMBConvUTF16straight wxMBConvUTF16BE


@@ -381,457 +958,589 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
     #define wxMBConvUTF16straight wxMBConvUTF16LE
 #endif
 
     #define wxMBConvUTF16straight wxMBConvUTF16LE
 #endif
 

+/* static */
+size_t wxMBConvUTF16Base::GetLength(const char *src, size_t srcLen)
+{
+    if ( srcLen == wxNO_LEN )
+    {
+        // count the number of bytes in input, including the trailing NULs
+        const wxUint16 *inBuff = wx_reinterpret_cast(const wxUint16 *, src);
+        for ( srcLen = 1; *inBuff++; srcLen++ )
+            ;
+
+        srcLen *= BYTES_PER_CHAR;
+    }
+    else // we already have the length
+    {
+        // we can only convert an entire number of UTF-16 characters
+        if ( srcLen % BYTES_PER_CHAR )
+            return wxCONV_FAILED;
+    }
+
+    return srcLen;
+}

 
 

+// case when in-memory representation is UTF-16 too

 #ifdef WC_UTF16
 
 #ifdef WC_UTF16
 

-// copy 16bit MB to 16bit String
-size_t wxMBConvUTF16straight::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+// ----------------------------------------------------------------------------
+// conversions without endianness change
+// ----------------------------------------------------------------------------
+
+size_t
+wxMBConvUTF16straight::ToWChar(wchar_t *dst, size_t dstLen,
+                               const char *src, size_t srcLen) const

 {
 {

-    size_t len=0;
+    // set up the scene for using memcpy() (which is presumably more efficient
+    // than copying the bytes one by one)
+    srcLen = GetLength(src, srcLen);
+    if ( srcLen == wxNO_LEN )
+        return wxCONV_FAILED;

 
 

-    while (*(wxUint16*)psz && (!buf || len < n))
+    const size_t inLen = srcLen / BYTES_PER_CHAR;
+    if ( dst )

     {
     {

-        if (buf)
-            *buf++ = *(wxUint16*)psz;
-        len++;
+        if ( dstLen < inLen )
+            return wxCONV_FAILED;

 
 

-        psz += sizeof(wxUint16);
+        memcpy(dst, src, srcLen);

     }
     }

-    if (buf && len<n)   *buf=0;

 
 

-    return len;
+    return inLen;

 }
 
 }
 

-
-// copy 16bit String to 16bit MB
-size_t wxMBConvUTF16straight::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+size_t
+wxMBConvUTF16straight::FromWChar(char *dst, size_t dstLen,
+                                 const wchar_t *src, size_t srcLen) const

 {
 {

-    size_t len=0;
+    if ( srcLen == wxNO_LEN )
+        srcLen = wxWcslen(src) + 1;
+
+    srcLen *= BYTES_PER_CHAR;

 
 

-    while (*psz && (!buf || len < n))
+    if ( dst )

     {
     {

-        if (buf)
-        {
-            *(wxUint16*)buf = *psz;
-            buf += sizeof(wxUint16);
-        }
-        len += sizeof(wxUint16);
-        psz++;
+        if ( dstLen < srcLen )
+            return wxCONV_FAILED;
+
+        memcpy(dst, src, srcLen);

     }
     }

-    if (buf && len<=n-sizeof(wxUint16))   *(wxUint16*)buf=0;

 
 

-    return len;
+    return srcLen;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// endian-reversing conversions
+// ----------------------------------------------------------------------------

 
 

-// swap 16bit MB to 16bit String
-size_t wxMBConvUTF16swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+size_t
+wxMBConvUTF16swap::ToWChar(wchar_t *dst, size_t dstLen,
+                           const char *src, size_t srcLen) const

 {
 {

-    size_t len=0;
+    srcLen = GetLength(src, srcLen);
+    if ( srcLen == wxNO_LEN )
+        return wxCONV_FAILED;

 
 

-    while (*(wxUint16*)psz && (!buf || len < n))
+    srcLen /= BYTES_PER_CHAR;
+
+    if ( dst )

     {
     {

-        if (buf)
+        if ( dstLen < srcLen )
+            return wxCONV_FAILED;
+
+        const wxUint16 *inBuff = wx_reinterpret_cast(const wxUint16 *, src);
+        for ( size_t n = 0; n < srcLen; n++, inBuff++ )

         {
         {

-            ((char *)buf)[0] = psz[1];
-            ((char *)buf)[1] = psz[0];
-            buf++;
+            *dst++ = wxUINT16_SWAP_ALWAYS(*inBuff);

         }
         }

-        len++;
-        psz += sizeof(wxUint16);

     }
     }

-    if (buf && len<n)   *buf=0;

 
 

-    return len;
+    return srcLen;

 }
 
 }
 

-
-// swap 16bit MB to 16bit String
-size_t wxMBConvUTF16swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+size_t
+wxMBConvUTF16swap::FromWChar(char *dst, size_t dstLen,
+                             const wchar_t *src, size_t srcLen) const

 {
 {

-    size_t len=0;
+    if ( srcLen == wxNO_LEN )
+        srcLen = wxWcslen(src) + 1;

 
 

-    while (*psz && (!buf || len < n))
+    srcLen *= BYTES_PER_CHAR;
+
+    if ( dst )

     {
     {

-        if (buf)
+        if ( dstLen < srcLen )
+            return wxCONV_FAILED;
+
+        wxUint16 *outBuff = wx_reinterpret_cast(wxUint16 *, dst);
+        for ( size_t n = 0; n < srcLen; n += BYTES_PER_CHAR, src++ )

         {
         {

-            *buf++ = ((char*)psz)[1];
-            *buf++ = ((char*)psz)[0];
+            *outBuff++ = wxUINT16_SWAP_ALWAYS(*src);

         }
         }

-        len += sizeof(wxUint16);
-        psz++;

     }
     }

-    if (buf && len<=n-sizeof(wxUint16))   *(wxUint16*)buf=0;

 
 

-    return len;
+    return srcLen;

 }
 
 }
 

+#else // !WC_UTF16: wchar_t is UTF-32

 
 

-#else // WC_UTF16
-
+// ----------------------------------------------------------------------------
+// conversions without endianness change
+// ----------------------------------------------------------------------------

 
 

-// copy 16bit MB to 32bit String
-size_t wxMBConvUTF16straight::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+size_t
+wxMBConvUTF16straight::ToWChar(wchar_t *dst, size_t dstLen,
+                               const char *src, size_t srcLen) const

 {
 {

-    size_t len=0;
+    srcLen = GetLength(src, srcLen);
+    if ( srcLen == wxNO_LEN )
+        return wxCONV_FAILED;

 
 

-    while (*(wxUint16*)psz && (!buf || len < n))
+    const size_t inLen = srcLen / BYTES_PER_CHAR;
+    if ( !dst )

     {
     {

-        wxUint32 cc;
-        size_t pa=decode_utf16((wxUint16*)psz, cc);
-        if (pa == (size_t)-1)
-            return pa;
+        // optimization: return maximal space which could be needed for this
+        // string even if the real size could be smaller if the buffer contains
+        // any surrogates
+        return inLen;
+    }

 
 

-        if (buf)
-            *buf++ = cc;
-        len++;
-        psz += pa * sizeof(wxUint16);
+    size_t outLen = 0;
+    const wxUint16 *inBuff = wx_reinterpret_cast(const wxUint16 *, src);
+    for ( const wxUint16 * const inEnd = inBuff + inLen; inBuff < inEnd; )
+    {
+        const wxUint32 ch = wxDecodeSurrogate(&inBuff);
+        if ( !inBuff )
+            return wxCONV_FAILED;
+
+        if ( ++outLen > dstLen )
+            return wxCONV_FAILED;
+
+        *dst++ = ch;

     }
     }

-    if (buf && len<n)   *buf=0;

 
 

-    return len;
-}

 
 

+    return outLen;
+}

 
 

-// copy 32bit String to 16bit MB
-size_t wxMBConvUTF16straight::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+size_t
+wxMBConvUTF16straight::FromWChar(char *dst, size_t dstLen,
+                                 const wchar_t *src, size_t srcLen) const

 {
 {

-    size_t len=0;
+    if ( srcLen == wxNO_LEN )
+        srcLen = wxWcslen(src) + 1;

 
 

-    while (*psz && (!buf || len < n))
+    size_t outLen = 0;
+    wxUint16 *outBuff = wx_reinterpret_cast(wxUint16 *, dst);
+    for ( size_t n = 0; n < srcLen; n++ )

     {
         wxUint16 cc[2];
     {
         wxUint16 cc[2];

-        size_t pa=encode_utf16(*psz, cc);
+        const size_t numChars = encode_utf16(*src++, cc);
+        if ( numChars == wxCONV_FAILED )
+            return wxCONV_FAILED;

 
 

-        if (pa == (size_t)-1)
-            return pa;
-
-        if (buf)
+        outLen += numChars * BYTES_PER_CHAR;
+        if ( outBuff )

         {
         {

-            *(wxUint16*)buf = cc[0];
-            buf += sizeof(wxUint16);
-            if (pa > 1)
+            if ( outLen > dstLen )
+                return wxCONV_FAILED;
+
+            *outBuff++ = cc[0];
+            if ( numChars == 2 )

             {
             {

-                *(wxUint16*)buf = cc[1];
-                buf += sizeof(wxUint16);
+                // second character of a surrogate
+                *outBuff++ = cc[1];

             }
         }
             }
         }

-
-        len += pa*sizeof(wxUint16);
-        psz++;

     }
     }

-    if (buf && len<=n-sizeof(wxUint16))   *(wxUint16*)buf=0;

 
 

-    return len;
+    return outLen;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// endian-reversing conversions
+// ----------------------------------------------------------------------------

 
 

-// swap 16bit MB to 32bit String
-size_t wxMBConvUTF16swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+size_t
+wxMBConvUTF16swap::ToWChar(wchar_t *dst, size_t dstLen,
+                           const char *src, size_t srcLen) const

 {
 {

-    size_t len=0;
+    srcLen = GetLength(src, srcLen);
+    if ( srcLen == wxNO_LEN )
+        return wxCONV_FAILED;

 
 

-    while (*(wxUint16*)psz && (!buf || len < n))
+    const size_t inLen = srcLen / BYTES_PER_CHAR;
+    if ( !dst )

     {
     {

-        wxUint32 cc;
-        char tmp[4];
-        tmp[0]=psz[1];  tmp[1]=psz[0];
-        tmp[2]=psz[3];  tmp[3]=psz[2];
+        // optimization: return maximal space which could be needed for this
+        // string even if the real size could be smaller if the buffer contains
+        // any surrogates
+        return inLen;
+    }
+
+    size_t outLen = 0;
+    const wxUint16 *inBuff = wx_reinterpret_cast(const wxUint16 *, src);
+    for ( const wxUint16 * const inEnd = inBuff + inLen; inBuff < inEnd; )
+    {
+        wxUint32 ch;
+        wxUint16 tmp[2];

 
 

-        size_t pa=decode_utf16((wxUint16*)tmp, cc);
-        if (pa == (size_t)-1)
-            return pa;
+        tmp[0] = wxUINT16_SWAP_ALWAYS(*inBuff);
+        inBuff++;
+        tmp[1] = wxUINT16_SWAP_ALWAYS(*inBuff);

 
 

-        if (buf)
-            *buf++ = cc;
+        const size_t numChars = decode_utf16(tmp, ch);
+        if ( numChars == wxCONV_FAILED )
+            return wxCONV_FAILED;

 
 

-        len++;
-        psz += pa * sizeof(wxUint16);
+        if ( numChars == 2 )
+            inBuff++;
+
+        if ( ++outLen > dstLen )
+            return wxCONV_FAILED;
+
+        *dst++ = ch;

     }
     }

-    if (buf && len<n)   *buf=0;

 
 

-    return len;
-}

 
 

+    return outLen;
+}

 
 

-// swap 32bit String to 16bit MB
-size_t wxMBConvUTF16swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+size_t
+wxMBConvUTF16swap::FromWChar(char *dst, size_t dstLen,
+                             const wchar_t *src, size_t srcLen) const

 {
 {

-    size_t len=0;
+    if ( srcLen == wxNO_LEN )
+        srcLen = wxWcslen(src) + 1;

 
 

-    while (*psz && (!buf || len < n))
+    size_t outLen = 0;
+    wxUint16 *outBuff = wx_reinterpret_cast(wxUint16 *, dst);
+    for ( const wchar_t *srcEnd = src + srcLen; src < srcEnd; src++ )

     {
         wxUint16 cc[2];
     {
         wxUint16 cc[2];

-        size_t pa=encode_utf16(*psz, cc);
-
-        if (pa == (size_t)-1)
-            return pa;
+        const size_t numChars = encode_utf16(*src, cc);
+        if ( numChars == wxCONV_FAILED )
+            return wxCONV_FAILED;

 
 

-        if (buf)
+        outLen += numChars * BYTES_PER_CHAR;
+        if ( outBuff )

         {
         {

-            *buf++ = ((char*)cc)[1];
-            *buf++ = ((char*)cc)[0];
-            if (pa > 1)
+            if ( outLen > dstLen )
+                return wxCONV_FAILED;
+
+            *outBuff++ = wxUINT16_SWAP_ALWAYS(cc[0]);
+            if ( numChars == 2 )

             {
             {

-                *buf++ = ((char*)cc)[3];
-                *buf++ = ((char*)cc)[2];
+                // second character of a surrogate
+                *outBuff++ = wxUINT16_SWAP_ALWAYS(cc[1]);

             }
         }
             }
         }

-
-        len += pa*sizeof(wxUint16);
-        psz++;

     }
     }

-    if (buf && len<=n-sizeof(wxUint16))   *(wxUint16*)buf=0;

 
 

-    return len;
+    return outLen;

 }
 
 }
 

-#endif // WC_UTF16
+#endif // WC_UTF16/!WC_UTF16

 
 
 
 

-// ----------------------------------------------------------------------------
+// ============================================================================

 // UTF-32
 // UTF-32

-// ----------------------------------------------------------------------------
+// ============================================================================

 
 #ifdef WORDS_BIGENDIAN
 
 #ifdef WORDS_BIGENDIAN

-#define wxMBConvUTF32straight  wxMBConvUTF32BE
-#define wxMBConvUTF32swap      wxMBConvUTF32LE
+    #define wxMBConvUTF32straight  wxMBConvUTF32BE
+    #define wxMBConvUTF32swap      wxMBConvUTF32LE

 #else
 #else

-#define wxMBConvUTF32swap      wxMBConvUTF32BE
-#define wxMBConvUTF32straight  wxMBConvUTF32LE
+    #define wxMBConvUTF32swap      wxMBConvUTF32BE
+    #define wxMBConvUTF32straight  wxMBConvUTF32LE

 #endif
 
 
 WXDLLIMPEXP_DATA_BASE(wxMBConvUTF32LE) wxConvUTF32LE;
 WXDLLIMPEXP_DATA_BASE(wxMBConvUTF32BE) wxConvUTF32BE;
 
 #endif
 
 
 WXDLLIMPEXP_DATA_BASE(wxMBConvUTF32LE) wxConvUTF32LE;
 WXDLLIMPEXP_DATA_BASE(wxMBConvUTF32BE) wxConvUTF32BE;
 

+/* static */
+size_t wxMBConvUTF32Base::GetLength(const char *src, size_t srcLen)
+{
+    if ( srcLen == wxNO_LEN )
+    {
+        // count the number of bytes in input, including the trailing NULs
+        const wxUint32 *inBuff = wx_reinterpret_cast(const wxUint32 *, src);
+        for ( srcLen = 1; *inBuff++; srcLen++ )
+            ;
+
+        srcLen *= BYTES_PER_CHAR;
+    }
+    else // we already have the length
+    {
+        // we can only convert an entire number of UTF-32 characters
+        if ( srcLen % BYTES_PER_CHAR )
+            return wxCONV_FAILED;
+    }
+
+    return srcLen;
+}

 
 

+// case when in-memory representation is UTF-16

 #ifdef WC_UTF16
 
 #ifdef WC_UTF16
 

-// copy 32bit MB to 16bit String
-size_t wxMBConvUTF32straight::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+// ----------------------------------------------------------------------------
+// conversions without endianness change
+// ----------------------------------------------------------------------------
+
+size_t
+wxMBConvUTF32straight::ToWChar(wchar_t *dst, size_t dstLen,
+                               const char *src, size_t srcLen) const

 {
 {

-    size_t len=0;
+    srcLen = GetLength(src, srcLen);
+    if ( srcLen == wxNO_LEN )
+        return wxCONV_FAILED;

 
 

-    while (*(wxUint32*)psz && (!buf || len < n))
+    const wxUint32 *inBuff = wx_reinterpret_cast(const wxUint32 *, src);
+    const size_t inLen = srcLen / BYTES_PER_CHAR;
+    size_t outLen = 0;
+    for ( size_t n = 0; n < inLen; n++ )

     {
         wxUint16 cc[2];
     {
         wxUint16 cc[2];

+        const size_t numChars = encode_utf16(*inBuff++, cc);
+        if ( numChars == wxCONV_FAILED )
+            return wxCONV_FAILED;

 
 

-        size_t pa=encode_utf16(*(wxUint32*)psz, cc);
-        if (pa == (size_t)-1)
-            return pa;
-
-        if (buf)
+        outLen += numChars;
+        if ( dst )

         {
         {

-            *buf++ = cc[0];
-            if (pa > 1)
-                *buf++ = cc[1];
+            if ( outLen > dstLen )
+                return wxCONV_FAILED;
+
+            *dst++ = cc[0];
+            if ( numChars == 2 )
+            {
+                // second character of a surrogate
+                *dst++ = cc[1];
+            }

         }
         }

-        len += pa;
-        psz += sizeof(wxUint32);

     }
     }

-    if (buf && len<n)   *buf=0;

 
 

-    return len;
+    return outLen;

 }
 
 }
 

-
-// copy 16bit String to 32bit MB
-size_t wxMBConvUTF32straight::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+size_t
+wxMBConvUTF32straight::FromWChar(char *dst, size_t dstLen,
+                                 const wchar_t *src, size_t srcLen) const

 {
 {

-    size_t len=0;
+    if ( srcLen == wxNO_LEN )
+        srcLen = wxWcslen(src) + 1;

 
 

-    while (*psz && (!buf || len < n))
+    if ( !dst )

     {
     {

-        wxUint32 cc;
+        // optimization: return maximal space which could be needed for this
+        // string instead of the exact amount which could be less if there are
+        // any surrogates in the input
+        //
+        // we consider that surrogates are rare enough to make it worthwhile to
+        // avoid running the loop below at the cost of slightly extra memory
+        // consumption
+        return srcLen * BYTES_PER_CHAR;
+    }

 
 

-        // cast is ok for WC_UTF16
-        size_t pa = decode_utf16((const wxUint16 *)psz, cc);
-        if (pa == (size_t)-1)
-            return pa;
+    wxUint32 *outBuff = wx_reinterpret_cast(wxUint32 *, dst);
+    size_t outLen = 0;
+    for ( const wchar_t * const srcEnd = src + srcLen; src < srcEnd; )
+    {
+        const wxUint32 ch = wxDecodeSurrogate(&src);
+        if ( !src )
+            return wxCONV_FAILED;

 
 

-        if (buf)
-        {
-            *(wxUint32*)buf = cc;
-            buf += sizeof(wxUint32);
-        }
-        len += sizeof(wxUint32);
-        psz += pa;
-    }
+        outLen += BYTES_PER_CHAR;

 
 

-    if (buf && len<=n-sizeof(wxUint32))
-        *(wxUint32*)buf=0;
+        if ( outLen > dstLen )
+            return wxCONV_FAILED;

 
 

-    return len;
-}
+        *outBuff++ = ch;
+    }

 
 

+    return outLen;
+}

 
 

+// ----------------------------------------------------------------------------
+// endian-reversing conversions
+// ----------------------------------------------------------------------------

 
 

-// swap 32bit MB to 16bit String
-size_t wxMBConvUTF32swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+size_t
+wxMBConvUTF32swap::ToWChar(wchar_t *dst, size_t dstLen,
+                           const char *src, size_t srcLen) const

 {
 {

-    size_t len=0;
+    srcLen = GetLength(src, srcLen);
+    if ( srcLen == wxNO_LEN )
+        return wxCONV_FAILED;

 
 

-    while (*(wxUint32*)psz && (!buf || len < n))
+    const wxUint32 *inBuff = wx_reinterpret_cast(const wxUint32 *, src);
+    const size_t inLen = srcLen / BYTES_PER_CHAR;
+    size_t outLen = 0;
+    for ( size_t n = 0; n < inLen; n++, inBuff++ )

     {
     {

-        char tmp[4];
-        tmp[0] = psz[3];   tmp[1] = psz[2];
-        tmp[2] = psz[1];   tmp[3] = psz[0];
-
-

         wxUint16 cc[2];
         wxUint16 cc[2];

+        const size_t numChars = encode_utf16(wxUINT32_SWAP_ALWAYS(*inBuff), cc);
+        if ( numChars == wxCONV_FAILED )
+            return wxCONV_FAILED;

 
 

-        size_t pa=encode_utf16(*(wxUint32*)tmp, cc);
-        if (pa == (size_t)-1)
-            return pa;
-
-        if (buf)
+        outLen += numChars;
+        if ( dst )

         {
         {

-            *buf++ = cc[0];
-            if (pa > 1)
-                *buf++ = cc[1];
+            if ( outLen > dstLen )
+                return wxCONV_FAILED;
+
+            *dst++ = cc[0];
+            if ( numChars == 2 )
+            {
+                // second character of a surrogate
+                *dst++ = cc[1];
+            }

         }
         }

-        len += pa;
-        psz += sizeof(wxUint32);

     }
 
     }
 

-    if (buf && len<n)
-        *buf=0;
-
-    return len;
+    return outLen;

 }
 
 }
 

-
-// swap 16bit String to 32bit MB
-size_t wxMBConvUTF32swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+size_t
+wxMBConvUTF32swap::FromWChar(char *dst, size_t dstLen,
+                             const wchar_t *src, size_t srcLen) const

 {
 {

-    size_t len=0;
+    if ( srcLen == wxNO_LEN )
+        srcLen = wxWcslen(src) + 1;

 
 

-    while (*psz && (!buf || len < n))
+    if ( !dst )

     {
     {

-        char cc[4];
+        // optimization: return maximal space which could be needed for this
+        // string instead of the exact amount which could be less if there are
+        // any surrogates in the input
+        //
+        // we consider that surrogates are rare enough to make it worthwhile to
+        // avoid running the loop below at the cost of slightly extra memory
+        // consumption
+        return srcLen*BYTES_PER_CHAR;
+    }

 
 

-        // cast is ok for WC_UTF16
-        size_t pa=decode_utf16((const wxUint16 *)psz, *(wxUint32*)cc);
-        if (pa == (size_t)-1)
-            return pa;
+    wxUint32 *outBuff = wx_reinterpret_cast(wxUint32 *, dst);
+    size_t outLen = 0;
+    for ( const wchar_t * const srcEnd = src + srcLen; src < srcEnd; )
+    {
+        const wxUint32 ch = wxDecodeSurrogate(&src);
+        if ( !src )
+            return wxCONV_FAILED;

 
 

-        if (buf)
-        {
-            *buf++ = cc[3];
-            *buf++ = cc[2];
-            *buf++ = cc[1];
-            *buf++ = cc[0];
-        }
-        len += sizeof(wxUint32);
-        psz += pa;
-    }
+        outLen += BYTES_PER_CHAR;

 
 

-    if (buf && len<=n-sizeof(wxUint32))
-        *(wxUint32*)buf=0;
+        if ( outLen > dstLen )
+            return wxCONV_FAILED;

 
 

-    return len;
+        *outBuff++ = wxUINT32_SWAP_ALWAYS(ch);
+    }
+
+    return outLen;

 }
 
 }
 

-#else // WC_UTF16
+#else // !WC_UTF16: wchar_t is UTF-32

 
 

+// ----------------------------------------------------------------------------
+// conversions without endianness change
+// ----------------------------------------------------------------------------

 
 

-// copy 32bit MB to 32bit String
-size_t wxMBConvUTF32straight::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+size_t
+wxMBConvUTF32straight::ToWChar(wchar_t *dst, size_t dstLen,
+                               const char *src, size_t srcLen) const

 {
 {

-    size_t len=0;
+    // use memcpy() as it should be much faster than hand-written loop
+    srcLen = GetLength(src, srcLen);
+    if ( srcLen == wxNO_LEN )
+        return wxCONV_FAILED;

 
 

-    while (*(wxUint32*)psz && (!buf || len < n))
+    const size_t inLen = srcLen/BYTES_PER_CHAR;
+    if ( dst )

     {
     {

-        if (buf)
-            *buf++ = *(wxUint32*)psz;
-        len++;
-        psz += sizeof(wxUint32);
-    }
+        if ( dstLen < inLen )
+            return wxCONV_FAILED;

 
 

-    if (buf && len<n)
-        *buf=0;
+        memcpy(dst, src, srcLen);
+    }

 
 

-    return len;
+    return inLen;

 }
 
 }
 

-
-// copy 32bit String to 32bit MB
-size_t wxMBConvUTF32straight::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+size_t
+wxMBConvUTF32straight::FromWChar(char *dst, size_t dstLen,
+                                 const wchar_t *src, size_t srcLen) const

 {
 {

-    size_t len=0;
+    if ( srcLen == wxNO_LEN )
+        srcLen = wxWcslen(src) + 1;
+
+    srcLen *= BYTES_PER_CHAR;

 
 

-    while (*psz && (!buf || len < n))
+    if ( dst )

     {
     {

-        if (buf)
-        {
-            *(wxUint32*)buf = *psz;
-            buf += sizeof(wxUint32);
-        }
+        if ( dstLen < srcLen )
+            return wxCONV_FAILED;

 
 

-        len += sizeof(wxUint32);
-        psz++;
+        memcpy(dst, src, srcLen);

     }
 
     }
 

-    if (buf && len<=n-sizeof(wxUint32))
-        *(wxUint32*)buf=0;
-
-    return len;
+    return srcLen;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// endian-reversing conversions
+// ----------------------------------------------------------------------------

 
 

-// swap 32bit MB to 32bit String
-size_t wxMBConvUTF32swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+size_t
+wxMBConvUTF32swap::ToWChar(wchar_t *dst, size_t dstLen,
+                           const char *src, size_t srcLen) const

 {
 {

-    size_t len=0;
+    srcLen = GetLength(src, srcLen);
+    if ( srcLen == wxNO_LEN )
+        return wxCONV_FAILED;
+
+    srcLen /= BYTES_PER_CHAR;

 
 

-    while (*(wxUint32*)psz && (!buf || len < n))
+    if ( dst )

     {
     {

-        if (buf)
+        if ( dstLen < srcLen )
+            return wxCONV_FAILED;
+
+        const wxUint32 *inBuff = wx_reinterpret_cast(const wxUint32 *, src);
+        for ( size_t n = 0; n < srcLen; n++, inBuff++ )

         {
         {

-            ((char *)buf)[0] = psz[3];
-            ((char *)buf)[1] = psz[2];
-            ((char *)buf)[2] = psz[1];
-            ((char *)buf)[3] = psz[0];
-            buf++;
+            *dst++ = wxUINT32_SWAP_ALWAYS(*inBuff);

         }
         }

-        len++;
-        psz += sizeof(wxUint32);

     }
 
     }
 

-    if (buf && len<n)
-        *buf=0;
-
-    return len;
+    return srcLen;

 }
 
 }
 

-
-// swap 32bit String to 32bit MB
-size_t wxMBConvUTF32swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+size_t
+wxMBConvUTF32swap::FromWChar(char *dst, size_t dstLen,
+                             const wchar_t *src, size_t srcLen) const

 {
 {

-    size_t len=0;
+    if ( srcLen == wxNO_LEN )
+        srcLen = wxWcslen(src) + 1;
+
+    srcLen *= BYTES_PER_CHAR;

 
 

-    while (*psz && (!buf || len < n))
+    if ( dst )

     {
     {

-        if (buf)
+        if ( dstLen < srcLen )
+            return wxCONV_FAILED;
+
+        wxUint32 *outBuff = wx_reinterpret_cast(wxUint32 *, dst);
+        for ( size_t n = 0; n < srcLen; n += BYTES_PER_CHAR, src++ )

         {
         {

-            *buf++ = ((char *)psz)[3];
-            *buf++ = ((char *)psz)[2];
-            *buf++ = ((char *)psz)[1];
-            *buf++ = ((char *)psz)[0];
+            *outBuff++ = wxUINT32_SWAP_ALWAYS(*src);

         }
         }

-        len += sizeof(wxUint32);
-        psz++;

     }
 
     }
 

-    if (buf && len<=n-sizeof(wxUint32))
-        *(wxUint32*)buf=0;
-
-    return len;
+    return srcLen;

 }
 
 }
 

-
-#endif // WC_UTF16
+#endif // WC_UTF16/!WC_UTF16

 
 
 // ============================================================================
 
 
 // ============================================================================


@@ -840,12 +1549,13 @@ size_t wxMBConvUTF32swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 
 #ifdef HAVE_ICONV
 
 
 #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.
+// 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) && \
 //     [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) && \


@@ -856,6 +1566,19 @@ size_t wxMBConvUTF32swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 
 #define ICONV_CHAR_CAST(x)  ((ICONV_CONST char **)(x))
 
 
 #define ICONV_CHAR_CAST(x)  ((ICONV_CONST char **)(x))
 

+#define ICONV_T_INVALID ((iconv_t)-1)
+
+#if SIZEOF_WCHAR_T == 4
+    #define WC_BSWAP    wxUINT32_SWAP_ALWAYS
+    #define WC_ENC      wxFONTENCODING_UTF32
+#elif SIZEOF_WCHAR_T == 2
+    #define WC_BSWAP    wxUINT16_SWAP_ALWAYS
+    #define WC_ENC      wxFONTENCODING_UTF16
+#else // sizeof(wchar_t) != 2 nor 4
+    // does this ever happen?
+    #error "Unknown sizeof(wchar_t): please report this to wx-dev@lists.wxwindows.org"
+#endif
+

 // ----------------------------------------------------------------------------
 // wxMBConv_iconv: encapsulates an iconv character set
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxMBConv_iconv: encapsulates an iconv character set
 // ----------------------------------------------------------------------------


@@ -869,126 +1592,228 @@ public:
     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;
 
     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;
 

+    // classify this encoding as explained in wxMBConv::GetMBNulLen() comment
+    virtual size_t GetMBNulLen() const;
+
+    virtual wxMBConv *Clone() const
+    {
+        wxMBConv_iconv *p = new wxMBConv_iconv(m_name);
+        p->m_minMBCharWidth = m_minMBCharWidth;
+        return p;
+    }
+

     bool IsOk() const
     bool IsOk() const

-        { return (m2w != (iconv_t)-1) && (w2m != (iconv_t)-1); }
+        { return (m2w != ICONV_T_INVALID) && (w2m != ICONV_T_INVALID); }

 
 protected:
 
 protected:

-    // the iconv handlers used to translate from multibyte to wide char and in
-    // the other direction
+    // the iconv handlers used to translate from multibyte
+    // to wide char and in the other direction

     iconv_t m2w,
             w2m;
 
     iconv_t m2w,
             w2m;
 

+#if wxUSE_THREADS
+    // guards access to m2w and w2m objects
+    wxMutex m_iconvMutex;
+#endif
+

 private:
     // the name (for iconv_open()) of a wide char charset -- if none is
     // available on this machine, it will remain NULL
 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;
+    static wxString 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;
 
     // true if the wide char encoding we use (i.e. ms_wcCharsetName) has
     // different endian-ness than the native one
     static bool ms_wcNeedsSwap;

+
+
+    // name of the encoding handled by this conversion
+    wxString m_name;
+
+    // cached result of GetMBNulLen(); set to 0 meaning "unknown"
+    // initially
+    size_t m_minMBCharWidth;

 };
 
 };
 

-const char *wxMBConv_iconv::ms_wcCharsetName = NULL;
+// make the constructor available for unit testing
+WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_iconv( const wxChar* name )
+{
+    wxMBConv_iconv* result = new wxMBConv_iconv( name );
+    if ( !result->IsOk() )
+    {
+        delete result;
+        return 0;
+    }
+
+    return result;
+}
+
+wxString wxMBConv_iconv::ms_wcCharsetName;

 bool wxMBConv_iconv::ms_wcNeedsSwap = false;
 
 wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
 bool wxMBConv_iconv::ms_wcNeedsSwap = false;
 
 wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)

+              : m_name(name)

 {
 {

-    // Do it the hard way
-    char cname[100];
-    for (size_t i = 0; i < wxStrlen(name)+1; i++)
-        cname[i] = (char) name[i];
+    m_minMBCharWidth = 0;
+
+    // iconv operates with chars, not wxChars, but luckily it uses only ASCII
+    // names for the charsets
+    const wxCharBuffer cname(wxString(name).ToAscii());

 
     // check for charset that represents wchar_t:
 
     // check for charset that represents wchar_t:

-    if (ms_wcCharsetName == NULL)
+    if ( ms_wcCharsetName.empty() )

     {
     {

-        ms_wcNeedsSwap = false;
+        wxLogTrace(TRACE_STRCONV, _T("Looking for wide char codeset:"));

 
 

-        // try charset with explicit bytesex info (e.g. "UCS-4LE"):
-        ms_wcCharsetName = WC_NAME_BEST;
-        m2w = iconv_open(ms_wcCharsetName, cname);
+#if wxUSE_FONTMAP
+        const wxChar **names = wxFontMapperBase::GetAllEncodingNames(WC_ENC);
+#else // !wxUSE_FONTMAP
+        static const wxChar *names[] =
+        {
+#if SIZEOF_WCHAR_T == 4
+            _T("UCS-4"),
+#elif SIZEOF_WCHAR_T = 2
+            _T("UCS-2"),
+#endif
+            NULL
+        };
+#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP

 
 

-        if (m2w == (iconv_t)-1)
+        for ( ; *names && ms_wcCharsetName.empty(); ++names )

         {
         {

-            // try charset w/o bytesex info (e.g. "UCS4")
-            // and check for bytesex ourselves:
-            ms_wcCharsetName = WC_NAME;
-            m2w = iconv_open(ms_wcCharsetName, cname);
+            const wxString nameCS(*names);

 
 

-            // 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);
-            }
+            // first try charset with explicit bytesex info (e.g. "UCS-4LE"):
+            wxString nameXE(nameCS);
+
+#ifdef WORDS_BIGENDIAN
+                nameXE += _T("BE");
+#else // little endian
+                nameXE += _T("LE");
+#endif
+
+            wxLogTrace(TRACE_STRCONV, _T("  trying charset \"%s\""),
+                       nameXE.c_str());

 
 

-            if (m2w != (iconv_t)-1)
+            m2w = iconv_open(nameXE.ToAscii(), cname);
+            if ( m2w == ICONV_T_INVALID )

             {
             {

-                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
+                // try charset w/o bytesex info (e.g. "UCS4")
+                wxLogTrace(TRACE_STRCONV, _T("  trying charset \"%s\""),
+                           nameCS.c_str());
+                m2w = iconv_open(nameCS.ToAscii(), cname);
+
+                // and check for bytesex ourselves:
+                if ( m2w != ICONV_T_INVALID )

                 {
                 {

-                    ms_wcNeedsSwap = wbuf[0] != (wchar_t)buf[0];
+                    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))
+                    {
+                        wxLogLastError(wxT("iconv"));
+                        wxLogError(_("Conversion to charset '%s' doesn't work."),
+                                   nameCS.c_str());
+                    }
+                    else // ok, can convert to this encoding, remember it
+                    {
+                        ms_wcCharsetName = nameCS;
+                        ms_wcNeedsSwap = wbuf[0] != (wchar_t)buf[0];
+                    }

                 }
             }
                 }
             }

-            else
+            else // use charset not requiring byte swapping

             {
             {

-                ms_wcCharsetName = NULL;
-
-                // VS: we must not output an error here, since wxWidgets 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(
+                ms_wcCharsetName = nameXE;

             }
         }
             }
         }

-        wxLogTrace(wxT("strconv"), wxT("wchar_t charset is '%s', needs swap: %i"), ms_wcCharsetName, ms_wcNeedsSwap);
+
+        wxLogTrace(TRACE_STRCONV,
+                   wxT("iconv wchar_t charset is \"%s\"%s"),
+                   ms_wcCharsetName.empty() ? _T("<none>")
+                                            : ms_wcCharsetName.c_str(),
+                   ms_wcNeedsSwap ? _T(" (needs swap)")
+                                  : _T(""));

     }
     else // we already have ms_wcCharsetName
     {
     }
     else // we already have ms_wcCharsetName
     {

-        m2w = iconv_open(ms_wcCharsetName, cname);
+        m2w = iconv_open(ms_wcCharsetName.ToAscii(), cname);

     }
 
     }
 

-    // NB: don't ever pass NULL to iconv_open(), it may crash!
-    if ( ms_wcCharsetName )
+    if ( ms_wcCharsetName.empty() )

     {
     {

-        w2m = iconv_open( cname, ms_wcCharsetName);
+        w2m = ICONV_T_INVALID;

     }
     else
     {
     }
     else
     {

-        w2m = (iconv_t)-1;
+        w2m = iconv_open(cname, ms_wcCharsetName.ToAscii());
+        if ( w2m == ICONV_T_INVALID )
+        {
+            wxLogTrace(TRACE_STRCONV,
+                       wxT("\"%s\" -> \"%s\" works but not the converse!?"),
+                       ms_wcCharsetName.c_str(), cname.data());
+        }

     }
 }
 
 wxMBConv_iconv::~wxMBConv_iconv()
 {
     }
 }
 
 wxMBConv_iconv::~wxMBConv_iconv()
 {

-    if ( m2w != (iconv_t)-1 )
+    if ( m2w != ICONV_T_INVALID )

         iconv_close(m2w);
         iconv_close(m2w);

-    if ( w2m != (iconv_t)-1 )
+    if ( w2m != ICONV_T_INVALID )

         iconv_close(w2m);
 }
 
 size_t wxMBConv_iconv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
 {
         iconv_close(w2m);
 }
 
 size_t wxMBConv_iconv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
 {

-    size_t inbuf = strlen(psz);
+    // find the string length: notice that must be done differently for
+    // NUL-terminated strings and UTF-16/32 which are terminated with 2/4 NULs
+    size_t inbuf;
+    const size_t nulLen = GetMBNulLen();
+    switch ( nulLen )
+    {
+        default:
+            return wxCONV_FAILED;
+
+        case 1:
+            inbuf = strlen(psz); // arguably more optimized than our version
+            break;
+
+        case 2:
+        case 4:
+            // for UTF-16/32 not only we need to have 2/4 consecutive NULs but
+            // they also have to start at character boundary and not span two
+            // adjacent characters
+            const char *p;
+            for ( p = psz; NotAllNULs(p, nulLen); p += nulLen )
+                ;
+            inbuf = p - psz;
+            break;
+    }
+
+#if wxUSE_THREADS
+    // NB: iconv() is MT-safe, but each thread must use it's own iconv_t handle.
+    //     Unfortunately there is a couple of global wxCSConv objects such as
+    //     wxConvLocal that are used all over wx code, so we have to make sure
+    //     the handle is used by at most one thread at the time. Otherwise
+    //     only a few wx classes would be safe to use from non-main threads
+    //     as MB<->WC conversion would fail "randomly".
+    wxMutexLocker lock(wxConstCast(this, wxMBConv_iconv)->m_iconvMutex);
+#endif // wxUSE_THREADS
+

     size_t outbuf = n * SIZEOF_WCHAR_T;
     size_t res, cres;
     // VS: Use these instead of psz, buf because iconv() modifies its arguments:
     size_t outbuf = n * SIZEOF_WCHAR_T;
     size_t res, cres;
     // VS: Use these instead of psz, buf because iconv() modifies its arguments:


@@ -1006,12 +1831,11 @@ size_t wxMBConv_iconv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
         if (ms_wcNeedsSwap)
         {
             // convert to native endianness
         if (ms_wcNeedsSwap)
         {
             // convert to native endianness

-            WC_BSWAP(buf /* _not_ bufPtr */, res)
+            for ( unsigned i = 0; i < res; i++ )
+                buf[n] = WC_BSWAP(buf[i]);

         }
 
         }
 

-        // 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.
+        // NUL-terminate the string if there is any space left

         if (res < n)
             buf[res] = 0;
     }
         if (res < n)
             buf[res] = 0;
     }


@@ -1021,23 +1845,26 @@ size_t wxMBConv_iconv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
         // to calculate destination buffer requirement
         wchar_t tbuf[8];
         res = 0;
         // to calculate destination buffer requirement
         wchar_t tbuf[8];
         res = 0;

-        do {
+
+        do
+        {

             bufPtr = tbuf;
             bufPtr = tbuf;

-            outbuf = 8*SIZEOF_WCHAR_T;
+            outbuf = 8 * SIZEOF_WCHAR_T;

 
             cres = iconv(m2w,
                          ICONV_CHAR_CAST(&pszPtr), &inbuf,
                          (char**)&bufPtr, &outbuf );
 
 
             cres = iconv(m2w,
                          ICONV_CHAR_CAST(&pszPtr), &inbuf,
                          (char**)&bufPtr, &outbuf );
 

-            res += 8-(outbuf/SIZEOF_WCHAR_T);
-        } while ((cres==(size_t)-1) && (errno==E2BIG));
+            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
     }
 
     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;
+        wxLogTrace(TRACE_STRCONV, wxT("iconv failed: %s"), wxSysErrorMsg(wxSysErrorCode()));
+        return wxCONV_FAILED;

     }
 
     return res;
     }
 
     return res;


@@ -1045,7 +1872,13 @@ size_t wxMBConv_iconv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
 
 size_t wxMBConv_iconv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 {
 
 size_t wxMBConv_iconv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 {

-    size_t inbuf = wxWcslen(psz) * SIZEOF_WCHAR_T;
+#if wxUSE_THREADS
+    // NB: explained in MB2WC
+    wxMutexLocker lock(wxConstCast(this, wxMBConv_iconv)->m_iconvMutex);
+#endif
+
+    size_t inlen = wxWcslen(psz);
+    size_t inbuf = inlen * SIZEOF_WCHAR_T;

     size_t outbuf = n;
     size_t res, cres;
 
     size_t outbuf = n;
     size_t res, cres;
 


@@ -1054,13 +1887,14 @@ size_t wxMBConv_iconv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
     if (ms_wcNeedsSwap)
     {
         // need to copy to temp buffer to switch endianness
     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
+        // (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)
         //  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;
+        tmpbuf = (wchar_t *)malloc(inbuf + SIZEOF_WCHAR_T);
+        for ( size_t i = 0; i < inlen; i++ )
+            tmpbuf[n] = WC_BSWAP(psz[i]);
+
+        tmpbuf[inlen] = L'\0';
+        psz = tmpbuf;

     }
 
     if (buf)
     }
 
     if (buf)


@@ -1068,7 +1902,7 @@ size_t wxMBConv_iconv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
         // have destination buffer, convert there
         cres = iconv( w2m, ICONV_CHAR_CAST(&psz), &inbuf, &buf, &outbuf );
 
         // have destination buffer, convert there
         cres = iconv( w2m, ICONV_CHAR_CAST(&psz), &inbuf, &buf, &outbuf );
 

-        res = n-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
 
         // NB: iconv was given only wcslen(psz) characters on input, and so
         //     it couldn't convert the trailing zero. Let's do it ourselves


@@ -1078,17 +1912,20 @@ size_t wxMBConv_iconv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
     }
     else
     {
     }
     else
     {

-        // no destination buffer... convert using temp buffer
+        // no destination buffer: convert using temp buffer

         // to calculate destination buffer requirement
         char tbuf[16];
         res = 0;
         // to calculate destination buffer requirement
         char tbuf[16];
         res = 0;

-        do {
-            buf = tbuf; outbuf = 16;
+        do
+        {
+            buf = tbuf;
+            outbuf = 16;

 
             cres = iconv( w2m, ICONV_CHAR_CAST(&psz), &inbuf, &buf, &outbuf );
 
             res += 16 - outbuf;
 
             cres = iconv( w2m, ICONV_CHAR_CAST(&psz), &inbuf, &buf, &outbuf );
 
             res += 16 - outbuf;

-        } while ((cres==(size_t)-1) && (errno==E2BIG));
+        }
+        while ((cres == (size_t)-1) && (errno == E2BIG));

     }
 
     if (ms_wcNeedsSwap)
     }
 
     if (ms_wcNeedsSwap)


@@ -1098,14 +1935,43 @@ size_t wxMBConv_iconv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 
     if (ICONV_FAILED(cres, inbuf))
     {
 
     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;
+        wxLogTrace(TRACE_STRCONV, wxT("iconv failed: %s"), wxSysErrorMsg(wxSysErrorCode()));
+        return wxCONV_FAILED;

     }
 
     return res;
 }
 
     }
 
     return res;
 }
 

+size_t wxMBConv_iconv::GetMBNulLen() const
+{
+    if ( m_minMBCharWidth == 0 )
+    {
+        wxMBConv_iconv * const self = wxConstCast(this, wxMBConv_iconv);
+
+#if wxUSE_THREADS
+        // NB: explained in MB2WC
+        wxMutexLocker lock(self->m_iconvMutex);
+#endif
+
+        wchar_t *wnul = L"";
+        char buf[8]; // should be enough for NUL in any encoding
+        size_t inLen = sizeof(wchar_t),
+               outLen = WXSIZEOF(buf);
+        char *inBuff = (char *)wnul;
+        char *outBuff = buf;
+        if ( iconv(w2m, ICONV_CHAR_CAST(&inBuff), &inLen, &outBuff, &outLen) == (size_t)-1 )
+        {
+            self->m_minMBCharWidth = (size_t)-1;
+        }
+        else // ok
+        {
+            self->m_minMBCharWidth = outBuff - buf;
+        }
+    }
+
+    return m_minMBCharWidth;
+}
+

 #endif // HAVE_ICONV
 
 
 #endif // HAVE_ICONV
 
 


@@ -1127,44 +1993,106 @@ public:
     wxMBConv_win32()
     {
         m_CodePage = CP_ACP;
     wxMBConv_win32()
     {
         m_CodePage = CP_ACP;

+        m_minMBCharWidth = 0;
+    }
+
+    wxMBConv_win32(const wxMBConv_win32& conv)
+    {
+        m_CodePage = conv.m_CodePage;
+        m_minMBCharWidth = conv.m_minMBCharWidth;

     }
 
 #if wxUSE_FONTMAP
     wxMBConv_win32(const wxChar* name)
     {
         m_CodePage = wxCharsetToCodepage(name);
     }
 
 #if wxUSE_FONTMAP
     wxMBConv_win32(const wxChar* name)
     {
         m_CodePage = wxCharsetToCodepage(name);

+        m_minMBCharWidth = 0;

     }
 
     wxMBConv_win32(wxFontEncoding encoding)
     {
         m_CodePage = wxEncodingToCodepage(encoding);
     }
 
     wxMBConv_win32(wxFontEncoding encoding)
     {
         m_CodePage = wxEncodingToCodepage(encoding);

+        m_minMBCharWidth = 0;

     }
     }

-#endif
+#endif // wxUSE_FONTMAP

 
 

-    size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const
+    virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const

     {
         // note that we have to use MB_ERR_INVALID_CHARS flag as it without it
         // the behaviour is not compatible with the Unix version (using iconv)
         // and break the library itself, e.g. wxTextInputStream::NextChar()
         // wouldn't work if reading an incomplete MB char didn't result in an
         // error
     {
         // note that we have to use MB_ERR_INVALID_CHARS flag as it without it
         // the behaviour is not compatible with the Unix version (using iconv)
         // and break the library itself, e.g. wxTextInputStream::NextChar()
         // wouldn't work if reading an incomplete MB char didn't result in an
         // error

+        //
+        // Moreover, MB_ERR_INVALID_CHARS is only supported on Win 2K SP4 or
+        // Win XP or newer and it is not supported for UTF-[78] so we always
+        // use our own conversions in this case. See
+        //     http://blogs.msdn.com/michkap/archive/2005/04/19/409566.aspx
+        //     http://msdn.microsoft.com/library/en-us/intl/unicode_17si.asp
+        if ( m_CodePage == CP_UTF8 )
+        {
+            return wxConvUTF8.MB2WC(buf, psz, n);
+        }
+
+        if ( m_CodePage == CP_UTF7 )
+        {
+            return wxConvUTF7.MB2WC(buf, psz, n);
+        }
+
+        int flags = 0;
+        if ( (m_CodePage < 50000 && m_CodePage != CP_SYMBOL) &&
+                IsAtLeastWin2kSP4() )
+        {
+            flags = MB_ERR_INVALID_CHARS;
+        }
+

         const size_t len = ::MultiByteToWideChar
                              (
                                 m_CodePage,     // code page
         const size_t len = ::MultiByteToWideChar
                              (
                                 m_CodePage,     // code page

-                                MB_ERR_INVALID_CHARS, // flags: fall on error
+                                flags,          // flags: fall on error

                                 psz,            // input string
                                 -1,             // its length (NUL-terminated)
                                 buf,            // output string
                                 buf ? n : 0     // size of output buffer
                              );
                                 psz,            // input string
                                 -1,             // its length (NUL-terminated)
                                 buf,            // output string
                                 buf ? n : 0     // size of output buffer
                              );

+        if ( !len )
+        {
+            // function totally failed
+            return wxCONV_FAILED;
+        }
+
+        // if we were really converting and didn't use MB_ERR_INVALID_CHARS,
+        // check if we succeeded, by doing a double trip:
+        if ( !flags && buf )
+        {
+            const size_t mbLen = strlen(psz);
+            wxCharBuffer mbBuf(mbLen);
+            if ( ::WideCharToMultiByte
+                   (
+                      m_CodePage,
+                      0,
+                      buf,
+                      -1,
+                      mbBuf.data(),
+                      mbLen + 1,        // size in bytes, not length
+                      NULL,
+                      NULL
+                   ) == 0 ||
+                  strcmp(mbBuf, psz) != 0 )
+            {
+                // we didn't obtain the same thing we started from, hence
+                // the conversion was lossy and we consider that it failed
+                return wxCONV_FAILED;
+            }
+        }

 
         // 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
 
         // 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;
+        return len - 1;

     }
 
     }
 

-    size_t WC2MB(char *buf, const wchar_t *pwz, size_t n) const
+    virtual size_t WC2MB(char *buf, const wchar_t *pwz, size_t n) const

     {
         /*
             we have a problem here: by default, WideCharToMultiByte() may
     {
         /*
             we have a problem here: by default, WideCharToMultiByte() may


@@ -1215,7 +2143,7 @@ public:
         if ( !len )
         {
             // function totally failed
         if ( !len )
         {
             // function totally failed

-            return (size_t)-1;
+            return wxCONV_FAILED;

         }
 
         // if we were really converting, check if we succeeded
         }
 
         // if we were really converting, check if we succeeded


@@ -1226,17 +2154,17 @@ public:
                 // check if the conversion failed, i.e. if any replacements
                 // were done
                 if ( usedDef )
                 // check if the conversion failed, i.e. if any replacements
                 // were done
                 if ( usedDef )

-                    return (size_t)-1;
+                    return wxCONV_FAILED;

             }
             else // we must resort to double tripping...
             {
                 wxWCharBuffer wcBuf(n);
             }
             else // we must resort to double tripping...
             {
                 wxWCharBuffer wcBuf(n);

-                if ( MB2WC(wcBuf.data(), buf, n) == (size_t)-1 ||
+                if ( MB2WC(wcBuf.data(), buf, n) == wxCONV_FAILED ||

                         wcscmp(wcBuf, pwz) != 0 )
                 {
                     // we didn't obtain the same thing we started from, hence
                     // the conversion was lossy and we consider that it failed
                         wcscmp(wcBuf, pwz) != 0 )
                 {
                     // we didn't obtain the same thing we started from, hence
                     // the conversion was lossy and we consider that it failed

-                    return (size_t)-1;
+                    return wxCONV_FAILED;

                 }
             }
         }
                 }
             }
         }


@@ -1245,6 +2173,47 @@ public:
         return len - 1;
     }
 
         return len - 1;
     }
 

+    virtual size_t GetMBNulLen() const
+    {
+        if ( m_minMBCharWidth == 0 )
+        {
+            int len = ::WideCharToMultiByte
+                        (
+                            m_CodePage,     // code page
+                            0,              // no flags
+                            L"",            // input string
+                            1,              // translate just the NUL
+                            NULL,           // output buffer
+                            0,              // and its size
+                            NULL,           // no replacement char
+                            NULL            // [out] don't care if it was used
+                        );
+
+            wxMBConv_win32 * const self = wxConstCast(this, wxMBConv_win32);
+            switch ( len )
+            {
+                default:
+                    wxLogDebug(_T("Unexpected NUL length %d"), len);
+                    self->m_minMBCharWidth = (size_t)-1;
+                    break;
+
+                case 0:
+                    self->m_minMBCharWidth = (size_t)-1;
+                    break;
+
+                case 1:
+                case 2:
+                case 4:
+                    self->m_minMBCharWidth = len;
+                    break;
+            }
+        }
+
+        return m_minMBCharWidth;
+    }
+
+    virtual wxMBConv *Clone() const { return new wxMBConv_win32(*this); }
+

     bool IsOk() const { return m_CodePage != -1; }
 
 private:
     bool IsOk() const { return m_CodePage != -1; }
 
 private:


@@ -1266,17 +2235,51 @@ private:
                     break;
 
                 default:
                     break;
 
                 default:

-                    // unknown, be conseravtive by default
+                    // unknown: be conservative by default

                     s_isWin98Or2k = 0;
                     s_isWin98Or2k = 0;

+                    break;

             }
 
             }
 

-            wxASSERT_MSG( s_isWin98Or2k != -1, _T("should be set above") );
+            wxASSERT_MSG( s_isWin98Or2k != -1, _T("should be set above") );
+        }
+
+        return s_isWin98Or2k == 1;
+    }
+
+    static bool IsAtLeastWin2kSP4()
+    {
+#ifdef __WXWINCE__
+        return false;
+#else
+        static int s_isAtLeastWin2kSP4 = -1;
+
+        if ( s_isAtLeastWin2kSP4 == -1 )
+        {
+            OSVERSIONINFOEX ver;
+
+            memset(&ver, 0, sizeof(ver));
+            ver.dwOSVersionInfoSize = sizeof(ver);
+            GetVersionEx((OSVERSIONINFO*)&ver);
+
+            s_isAtLeastWin2kSP4 =
+              ((ver.dwMajorVersion > 5) || // Vista+
+               (ver.dwMajorVersion == 5 && ver.dwMinorVersion > 0) || // XP/2003
+               (ver.dwMajorVersion == 5 && ver.dwMinorVersion == 0 &&
+               ver.wServicePackMajor >= 4)) // 2000 SP4+
+              ? 1 : 0;

         }
 
         }
 

-        return s_isWin98Or2k == 1;
+        return s_isAtLeastWin2kSP4 == 1;
+#endif

     }
 
     }
 

+
+    // the code page we're working with

     long m_CodePage;
     long m_CodePage;

+
+    // cached result of GetMBNulLen(), set to 0 initially meaning
+    // "unknown"
+    size_t m_minMBCharWidth;

 };
 
 #endif // wxHAVE_WIN32_MB2WC
 };
 
 #endif // wxHAVE_WIN32_MB2WC


@@ -1287,26 +2290,23 @@ private:
 
 #if defined(__WXCOCOA__)
 
 
 #if defined(__WXCOCOA__)
 

-// RN:  There is no UTF-32 support in either Core Foundation or
-// Cocoa.  Strangely enough, internally Core Foundation uses
-// UTF 32 internally quite a bit - its just not public (yet).
+// RN: There is no UTF-32 support in either Core Foundation or Cocoa.
+// Strangely enough, internally Core Foundation uses
+// UTF-32 internally quite a bit - its just not public (yet).

 
 #include <CoreFoundation/CFString.h>
 #include <CoreFoundation/CFStringEncodingExt.h>
 
 CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
 {
 
 #include <CoreFoundation/CFString.h>
 #include <CoreFoundation/CFStringEncodingExt.h>
 
 CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
 {

-    CFStringEncoding enc = 0 ;
-    if ( encoding == wxFONTENCODING_DEFAULT )
-    {
-#if wxUSE_GUI
-        encoding = wxFont::GetDefaultEncoding() ;
-#else
-        encoding = wxLocale::GetSystemEncoding() ;
-#endif
-    }
-    else switch( encoding)
+    CFStringEncoding enc = kCFStringEncodingInvalidId ;
+
+    switch (encoding)

     {
     {

+        case wxFONTENCODING_DEFAULT :
+            enc = CFStringGetSystemEncoding();
+            break ;
+

         case wxFONTENCODING_ISO8859_1 :
             enc = kCFStringEncodingISOLatin1 ;
             break ;
         case wxFONTENCODING_ISO8859_1 :
             enc = kCFStringEncodingISOLatin1 ;
             break ;


@@ -1362,7 +2362,7 @@ CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
 //          break ;
 
         case wxFONTENCODING_CP437 :
 //          break ;
 
         case wxFONTENCODING_CP437 :

-            enc =kCFStringEncodingDOSLatinUS ;
+            enc = kCFStringEncodingDOSLatinUS ;

             break ;
         case wxFONTENCODING_CP850 :
             enc = kCFStringEncodingDOSLatin1;
             break ;
         case wxFONTENCODING_CP850 :
             enc = kCFStringEncodingDOSLatin1;


@@ -1374,7 +2374,7 @@ CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
             enc = kCFStringEncodingDOSCyrillic;
             break ;
         case wxFONTENCODING_CP866 :
             enc = kCFStringEncodingDOSCyrillic;
             break ;
         case wxFONTENCODING_CP866 :

-            enc =kCFStringEncodingDOSRussian ;
+            enc = kCFStringEncodingDOSRussian ;

             break ;
         case wxFONTENCODING_CP874 :
             enc = kCFStringEncodingDOSThai;
             break ;
         case wxFONTENCODING_CP874 :
             enc = kCFStringEncodingDOSThai;


@@ -1383,7 +2383,7 @@ CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
             enc = kCFStringEncodingDOSJapanese;
             break ;
         case wxFONTENCODING_CP936 :
             enc = kCFStringEncodingDOSJapanese;
             break ;
         case wxFONTENCODING_CP936 :

-            enc =kCFStringEncodingDOSChineseSimplif ;
+            enc = kCFStringEncodingDOSChineseSimplif ;

             break ;
         case wxFONTENCODING_CP949 :
             enc = kCFStringEncodingDOSKorean;
             break ;
         case wxFONTENCODING_CP949 :
             enc = kCFStringEncodingDOSKorean;


@@ -1391,15 +2391,14 @@ CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
         case wxFONTENCODING_CP950 :
             enc = kCFStringEncodingDOSChineseTrad;
             break ;
         case wxFONTENCODING_CP950 :
             enc = kCFStringEncodingDOSChineseTrad;
             break ;

-

         case wxFONTENCODING_CP1250 :
             enc = kCFStringEncodingWindowsLatin2;
             break ;
         case wxFONTENCODING_CP1251 :
         case wxFONTENCODING_CP1250 :
             enc = kCFStringEncodingWindowsLatin2;
             break ;
         case wxFONTENCODING_CP1251 :

-            enc =kCFStringEncodingWindowsCyrillic ;
+            enc = kCFStringEncodingWindowsCyrillic ;

             break ;
         case wxFONTENCODING_CP1252 :
             break ;
         case wxFONTENCODING_CP1252 :

-            enc =kCFStringEncodingWindowsLatin1 ;
+            enc = kCFStringEncodingWindowsLatin1 ;

             break ;
         case wxFONTENCODING_CP1253 :
             enc = kCFStringEncodingWindowsGreek;
             break ;
         case wxFONTENCODING_CP1253 :
             enc = kCFStringEncodingWindowsGreek;


@@ -1408,17 +2407,18 @@ CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
             enc = kCFStringEncodingWindowsLatin5;
             break ;
         case wxFONTENCODING_CP1255 :
             enc = kCFStringEncodingWindowsLatin5;
             break ;
         case wxFONTENCODING_CP1255 :

-            enc =kCFStringEncodingWindowsHebrew ;
+            enc = kCFStringEncodingWindowsHebrew ;

             break ;
         case wxFONTENCODING_CP1256 :
             break ;
         case wxFONTENCODING_CP1256 :

-            enc =kCFStringEncodingWindowsArabic ;
+            enc = kCFStringEncodingWindowsArabic ;

             break ;
         case wxFONTENCODING_CP1257 :
             enc = kCFStringEncodingWindowsBalticRim;
             break ;
             break ;
         case wxFONTENCODING_CP1257 :
             enc = kCFStringEncodingWindowsBalticRim;
             break ;

-        case wxFONTENCODING_UTF7 :
-            enc = kCFStringEncodingNonLossyASCII ;
-            break ;
+//   This only really encodes to UTF7 (if that) evidently
+//        case wxFONTENCODING_UTF7 :
+//            enc = kCFStringEncodingNonLossyASCII ;
+//            break ;

         case wxFONTENCODING_UTF8 :
             enc = kCFStringEncodingUTF8 ;
             break ;
         case wxFONTENCODING_UTF8 :
             enc = kCFStringEncodingUTF8 ;
             break ;


@@ -1548,249 +2548,12 @@ CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
 //      case wxFONTENCODING_MACKEYBOARD :
 //          enc = kCFStringEncodingMacKeyboardGlyphs ;
 //          break ;
 //      case wxFONTENCODING_MACKEYBOARD :
 //          enc = kCFStringEncodingMacKeyboardGlyphs ;
 //          break ;

+

         default :
             // because gcc is picky
             break ;
         default :
             // because gcc is picky
             break ;

-    } ;
-    return enc ;
-}
-
-wxFontEncoding wxFontEncFromCFStringEnc(CFStringEncoding encoding)
-{
-    wxFontEncoding enc = wxFONTENCODING_DEFAULT ;
-
-    switch( encoding)
-    {
-        case kCFStringEncodingISOLatin1  :
-            enc = wxFONTENCODING_ISO8859_1 ;
-            break ;
-        case kCFStringEncodingISOLatin2 :
-            enc = wxFONTENCODING_ISO8859_2;
-            break ;
-        case kCFStringEncodingISOLatin3 :
-            enc = wxFONTENCODING_ISO8859_3 ;
-            break ;
-        case kCFStringEncodingISOLatin4 :
-            enc = wxFONTENCODING_ISO8859_4;
-            break ;
-        case kCFStringEncodingISOLatinCyrillic :
-            enc = wxFONTENCODING_ISO8859_5;
-            break ;
-        case kCFStringEncodingISOLatinArabic :
-            enc = wxFONTENCODING_ISO8859_6;
-            break ;
-        case kCFStringEncodingISOLatinGreek :
-            enc = wxFONTENCODING_ISO8859_7;
-            break ;
-        case kCFStringEncodingISOLatinHebrew :
-            enc = wxFONTENCODING_ISO8859_8;
-            break ;
-        case kCFStringEncodingISOLatin5 :
-            enc = wxFONTENCODING_ISO8859_9;
-            break ;
-        case kCFStringEncodingISOLatin6 :
-            enc = wxFONTENCODING_ISO8859_10;
-            break ;
-        case kCFStringEncodingISOLatin7 :
-            enc = wxFONTENCODING_ISO8859_13;
-            break ;
-        case kCFStringEncodingISOLatin8 :
-            enc = wxFONTENCODING_ISO8859_14;
-            break ;
-        case kCFStringEncodingISOLatin9 :
-            enc =wxFONTENCODING_ISO8859_15 ;
-            break ;
-
-        case kCFStringEncodingKOI8_R :
-            enc = wxFONTENCODING_KOI8;
-            break ;
-
-//      case  :
-//          enc = wxFONTENCODING_BULGARIAN;
-//          break ;
-
-        case kCFStringEncodingDOSLatinUS :
-            enc = wxFONTENCODING_CP437;
-            break ;
-        case kCFStringEncodingDOSLatin1 :
-            enc = wxFONTENCODING_CP850;
-            break ;
-        case kCFStringEncodingDOSLatin2 :
-            enc =wxFONTENCODING_CP852 ;
-            break ;
-        case kCFStringEncodingDOSCyrillic :
-            enc = wxFONTENCODING_CP855;
-            break ;
-        case kCFStringEncodingDOSRussian :
-            enc = wxFONTENCODING_CP866;
-            break ;
-        case kCFStringEncodingDOSThai :
-            enc =wxFONTENCODING_CP874 ;
-            break ;
-        case kCFStringEncodingDOSJapanese :
-            enc = wxFONTENCODING_CP932;
-            break ;
-        case kCFStringEncodingDOSChineseSimplif :
-            enc = wxFONTENCODING_CP936;
-            break ;
-        case kCFStringEncodingDOSKorean :
-            enc = wxFONTENCODING_CP949;
-            break ;
-        case kCFStringEncodingDOSChineseTrad :
-            enc = wxFONTENCODING_CP950;
-            break ;
+    }

 
 

-        case kCFStringEncodingWindowsLatin2 :
-            enc = wxFONTENCODING_CP1250;
-            break ;
-        case kCFStringEncodingWindowsCyrillic :
-            enc = wxFONTENCODING_CP1251;
-            break ;
-        case kCFStringEncodingWindowsLatin1 :
-            enc = wxFONTENCODING_CP1252;
-            break ;
-        case kCFStringEncodingWindowsGreek :
-            enc = wxFONTENCODING_CP1253;
-            break ;
-        case kCFStringEncodingWindowsLatin5 :
-            enc = wxFONTENCODING_CP1254;
-            break ;
-        case kCFStringEncodingWindowsHebrew :
-            enc = wxFONTENCODING_CP1255;
-            break ;
-        case kCFStringEncodingWindowsArabic :
-            enc = wxFONTENCODING_CP1256;
-            break ;
-        case kCFStringEncodingWindowsBalticRim :
-            enc =wxFONTENCODING_CP1257 ;
-            break ;
-        case kCFStringEncodingEUC_JP :
-            enc = wxFONTENCODING_EUC_JP;
-            break ;
-        case kCFStringEncodingUnicode :
-            enc = wxFONTENCODING_UTF16;
-            break;
-        case kCFStringEncodingMacRoman :
-            enc = wxFONTENCODING_MACROMAN ;
-            break ;
-        case kCFStringEncodingMacJapanese :
-            enc = wxFONTENCODING_MACJAPANESE ;
-            break ;
-        case kCFStringEncodingMacChineseTrad :
-            enc = wxFONTENCODING_MACCHINESETRAD ;
-            break ;
-        case kCFStringEncodingMacKorean :
-            enc = wxFONTENCODING_MACKOREAN ;
-            break ;
-        case kCFStringEncodingMacArabic :
-            enc =wxFONTENCODING_MACARABIC ;
-            break ;
-        case kCFStringEncodingMacHebrew :
-            enc = wxFONTENCODING_MACHEBREW ;
-            break ;
-        case kCFStringEncodingMacGreek :
-            enc = wxFONTENCODING_MACGREEK ;
-            break ;
-        case kCFStringEncodingMacCyrillic :
-            enc = wxFONTENCODING_MACCYRILLIC ;
-            break ;
-        case kCFStringEncodingMacDevanagari :
-            enc = wxFONTENCODING_MACDEVANAGARI ;
-            break ;
-        case kCFStringEncodingMacGurmukhi :
-            enc = wxFONTENCODING_MACGURMUKHI ;
-            break ;
-        case kCFStringEncodingMacGujarati :
-            enc = wxFONTENCODING_MACGUJARATI ;
-            break ;
-        case kCFStringEncodingMacOriya :
-            enc =wxFONTENCODING_MACORIYA ;
-            break ;
-        case kCFStringEncodingMacBengali :
-            enc =wxFONTENCODING_MACBENGALI ;
-            break ;
-        case kCFStringEncodingMacTamil :
-            enc = wxFONTENCODING_MACTAMIL ;
-            break ;
-        case kCFStringEncodingMacTelugu :
-            enc = wxFONTENCODING_MACTELUGU ;
-            break ;
-        case kCFStringEncodingMacKannada :
-            enc = wxFONTENCODING_MACKANNADA ;
-            break ;
-        case kCFStringEncodingMacMalayalam :
-            enc = wxFONTENCODING_MACMALAJALAM ;
-            break ;
-        case kCFStringEncodingMacSinhalese :
-            enc = wxFONTENCODING_MACSINHALESE ;
-            break ;
-        case kCFStringEncodingMacBurmese :
-            enc = wxFONTENCODING_MACBURMESE ;
-            break ;
-        case kCFStringEncodingMacKhmer :
-            enc = wxFONTENCODING_MACKHMER ;
-            break ;
-        case kCFStringEncodingMacThai :
-            enc = wxFONTENCODING_MACTHAI ;
-            break ;
-        case kCFStringEncodingMacLaotian :
-            enc = wxFONTENCODING_MACLAOTIAN ;
-            break ;
-        case kCFStringEncodingMacGeorgian :
-            enc = wxFONTENCODING_MACGEORGIAN ;
-            break ;
-        case kCFStringEncodingMacArmenian :
-            enc = wxFONTENCODING_MACARMENIAN ;
-            break ;
-        case kCFStringEncodingMacChineseSimp :
-            enc = wxFONTENCODING_MACCHINESESIMP ;
-            break ;
-        case kCFStringEncodingMacTibetan :
-            enc = wxFONTENCODING_MACTIBETAN ;
-            break ;
-        case kCFStringEncodingMacMongolian :
-            enc = wxFONTENCODING_MACMONGOLIAN ;
-            break ;
-        case kCFStringEncodingMacEthiopic :
-            enc = wxFONTENCODING_MACETHIOPIC ;
-            break ;
-        case kCFStringEncodingMacCentralEurRoman:
-            enc = wxFONTENCODING_MACCENTRALEUR  ;
-            break ;
-        case kCFStringEncodingMacVietnamese:
-            enc = wxFONTENCODING_MACVIATNAMESE  ;
-            break ;
-        case kCFStringEncodingMacExtArabic :
-            enc = wxFONTENCODING_MACARABICEXT ;
-            break ;
-        case kCFStringEncodingMacSymbol :
-            enc = wxFONTENCODING_MACSYMBOL ;
-            break ;
-        case kCFStringEncodingMacDingbats :
-            enc = wxFONTENCODING_MACDINGBATS ;
-            break ;
-        case kCFStringEncodingMacTurkish :
-            enc = wxFONTENCODING_MACTURKISH ;
-            break ;
-        case kCFStringEncodingMacCroatian :
-            enc = wxFONTENCODING_MACCROATIAN ;
-            break ;
-        case kCFStringEncodingMacIcelandic :
-            enc = wxFONTENCODING_MACICELANDIC ;
-            break ;
-        case kCFStringEncodingMacRomanian :
-            enc = wxFONTENCODING_MACROMANIAN ;
-            break ;
-        case kCFStringEncodingMacCeltic :
-            enc = wxFONTENCODING_MACCELTIC ;
-            break ;
-        case kCFStringEncodingMacGaelic :
-            enc = wxFONTENCODING_MACGAELIC ;
-            break ;
-//        case kCFStringEncodingMacKeyboardGlyphs :
-//            enc = wxFONTENCODING_MACKEYBOARD ;
-//            break ;
-    } ;

     return enc ;
 }
 
     return enc ;
 }
 


@@ -1802,10 +2565,17 @@ public:
         Init(CFStringGetSystemEncoding()) ;
     }
 
         Init(CFStringGetSystemEncoding()) ;
     }
 

+    wxMBConv_cocoa(const wxMBConv_cocoa& conv)
+    {
+        m_encoding = conv.m_encoding;
+    }
+
+#if wxUSE_FONTMAP

     wxMBConv_cocoa(const wxChar* name)
     {
     wxMBConv_cocoa(const wxChar* name)
     {

-        Init( wxCFStringEncFromFontEnc(wxFontMapper::Get()->CharsetToEncoding(name, false) ) ) ;
+        Init( wxCFStringEncFromFontEnc(wxFontMapperBase::Get()->CharsetToEncoding(name, false) ) ) ;

     }
     }

+#endif

 
     wxMBConv_cocoa(wxFontEncoding encoding)
     {
 
     wxMBConv_cocoa(wxFontEncoding encoding)
     {


@@ -1818,160 +2588,120 @@ public:
 
     void Init( CFStringEncoding encoding)
     {
 
     void Init( CFStringEncoding encoding)
     {

-        m_char_encoding = encoding ;
-        m_unicode_encoding = kCFStringEncodingUnicode;
+        m_encoding = encoding ;

     }
 
     size_t MB2WC(wchar_t * szOut, const char * szUnConv, size_t nOutSize) const
     {
         wxASSERT(szUnConv);
 
     }
 
     size_t MB2WC(wchar_t * szOut, const char * szUnConv, size_t nOutSize) const
     {
         wxASSERT(szUnConv);
 

-        size_t nBufSize = strlen(szUnConv) + 1;
-        size_t nRealOutSize;
-
-        UniChar* szUniCharBuffer    = (UniChar*) szOut;
-        wchar_t* szConvBuffer       = szOut;
-
-        if (szConvBuffer == NULL && nOutSize != 0)
-        {
-            szConvBuffer = new wchar_t[nOutSize] ;
-        }
-
-#if SIZEOF_WCHAR_T == 4
-        szUniCharBuffer = new UniChar[nOutSize];
-#endif
-
-        CFDataRef theData = CFDataCreateWithBytesNoCopy (
-                                            NULL,     //allocator
-                                            (const UInt8*)szUnConv,
-                                            nBufSize - 1,
-                                            NULL      //deallocator
-                                            );
-
-        wxASSERT(theData);
-
-        CFStringRef theString = CFStringCreateFromExternalRepresentation (
-                                                NULL,
-                                                theData,
-                                                m_char_encoding
+        CFStringRef theString = CFStringCreateWithBytes (
+                                                NULL, //the allocator
+                                                (const UInt8*)szUnConv,
+                                                strlen(szUnConv),
+                                                m_encoding,
+                                                false //no BOM/external representation

                                                 );
 
         wxASSERT(theString);
 
                                                 );
 
         wxASSERT(theString);
 

-        if (nOutSize == 0)
+        size_t nOutLength = CFStringGetLength(theString);
+
+        if (szOut == NULL)

         {
         {

-            nRealOutSize = CFStringGetLength(theString) + 1;

             CFRelease(theString);
             CFRelease(theString);

-            return nRealOutSize - 1;
+            return nOutLength;

         }
 
         }
 

-        CFRange theRange = { 0, CFStringGetLength(theString) };
-
-        CFStringGetCharacters(theString, theRange, szUniCharBuffer);
+        CFRange theRange = { 0, nOutSize };

 
 

+#if SIZEOF_WCHAR_T == 4
+        UniChar* szUniCharBuffer = new UniChar[nOutSize];
+#endif

 
 

-        nRealOutSize = (CFStringGetLength(theString) + 1);
+        CFStringGetCharacters(theString, theRange, szUniCharBuffer);

 
         CFRelease(theString);
 
 
         CFRelease(theString);
 

-        szUniCharBuffer[nRealOutSize-1] = '\0' ;
+        szUniCharBuffer[nOutLength] = '\0';

 
 #if SIZEOF_WCHAR_T == 4
 
 #if SIZEOF_WCHAR_T == 4

-        wxMBConvUTF16 converter ;
-        converter.MB2WC(szConvBuffer  , (const char*)szUniCharBuffer , nRealOutSize ) ;
-        delete[] szUniCharBuffer;
+        wxMBConvUTF16 converter;
+        converter.MB2WC( szOut, (const char*)szUniCharBuffer, nOutSize );
+        delete [] szUniCharBuffer;

 #endif
 #endif

-        if ( szOut == NULL )
-            delete [] szConvBuffer;

 
 

-        return nRealOutSize ;
+        return nOutLength;

     }
 
     size_t WC2MB(char *szOut, const wchar_t *szUnConv, size_t nOutSize) const
     {
     }
 
     size_t WC2MB(char *szOut, const wchar_t *szUnConv, size_t nOutSize) const
     {

-        size_t nBufSize = wxWcslen(szUnConv) + 1;
+        wxASSERT(szUnConv);
+

         size_t nRealOutSize;
         size_t nRealOutSize;

-        char* szBuffer = szOut;
+        size_t nBufSize = wxWcslen(szUnConv);

         UniChar* szUniBuffer = (UniChar*) szUnConv;
 
         UniChar* szUniBuffer = (UniChar*) szUnConv;
 

-        if (szOut == NULL)
-        {
-            // worst case
-            nRealOutSize = ((nBufSize - 1) << 1)+1 ;
-            szBuffer = new char[ nRealOutSize ] ;
-        }
-        else
-            nRealOutSize = nOutSize;
-

 #if SIZEOF_WCHAR_T == 4
 #if SIZEOF_WCHAR_T == 4

-        wxMBConvUTF16BE converter ;
-        nBufSize = converter.WC2MB( NULL , szUnConv , 0 );
-        szUniBuffer = new UniChar[ (nBufSize / sizeof(UniChar)) + 1] ;
-        converter.WC2MB( (char*) szUniBuffer , szUnConv, nBufSize + sizeof(UniChar)) ;
+        wxMBConvUTF16 converter ;
+        nBufSize = converter.WC2MB( NULL, szUnConv, 0 );
+        szUniBuffer = new UniChar[ (nBufSize / sizeof(UniChar)) + 1];
+        converter.WC2MB( (char*) szUniBuffer, szUnConv, nBufSize + sizeof(UniChar));

         nBufSize /= sizeof(UniChar);
         nBufSize /= sizeof(UniChar);

-        ++nBufSize;

 #endif
 
         CFStringRef theString = CFStringCreateWithCharactersNoCopy(
                                 NULL, //allocator
                                 szUniBuffer,
                                 nBufSize,
 #endif
 
         CFStringRef theString = CFStringCreateWithCharactersNoCopy(
                                 NULL, //allocator
                                 szUniBuffer,
                                 nBufSize,

-                                NULL //deallocator
+                                kCFAllocatorNull //deallocator - we want to deallocate it ourselves

                             );
 
         wxASSERT(theString);
 
         //Note that CER puts a BOM when converting to unicode
                             );
 
         wxASSERT(theString);
 
         //Note that CER puts a BOM when converting to unicode

-        //so we may want to check and use getchars instead in that case
-        CFDataRef theData = CFStringCreateExternalRepresentation(
-                                NULL, //allocator
-                                theString,
-                                m_char_encoding,
-                                0 //what to put in characters that can't be converted -
-                                    //0 tells CFString to return NULL if it meets such a character
-                        );
-
-        if(!theData)
-            return (size_t)-1;
-
-        CFRelease(theString);
-
-        nRealOutSize = CFDataGetLength(theData);
-
-        if ( szOut == NULL )
-            delete[] szBuffer;
+        //so we  check and use getchars instead in that case
+        if (m_encoding == kCFStringEncodingUnicode)
+        {
+            if (szOut != NULL)
+                CFStringGetCharacters(theString, CFRangeMake(0, nOutSize - 1), (UniChar*) szOut);

 
 

-        if(nOutSize == 0)
+            nRealOutSize = CFStringGetLength(theString) + 1;
+        }
+        else

         {
         {

-//TODO: This gets flagged as a non-malloced address by the debugger...
-//#if SIZEOF_WCHAR_T == 4
-//        delete[] szUniBuffer;
-//#endif
-            CFRelease(theData);
-            return nRealOutSize - 1;
+            CFStringGetBytes(
+                theString,
+                CFRangeMake(0, CFStringGetLength(theString)),
+                m_encoding,
+                0, //what to put in characters that can't be converted -
+                    //0 tells CFString to return NULL if it meets such a character
+                false, //not an external representation
+                (UInt8*) szOut,
+                nOutSize,
+                (CFIndex*) &nRealOutSize
+                        );

         }
 
         }
 

-        CFRange theRange = {0, CFDataGetLength(theData) };
-        CFDataGetBytes(theData, theRange, (UInt8*) szBuffer);
+        CFRelease(theString);

 
 

-        CFRelease(theData);
+#if SIZEOF_WCHAR_T == 4
+        delete[] szUniBuffer;
+#endif

 
 

-//TODO: This gets flagged as a non-malloced address by the debugger...
-//#if SIZEOF_WCHAR_T == 4
-//        delete[] szUniBuffer;
-//#endif

         return  nRealOutSize - 1;
     }
 
         return  nRealOutSize - 1;
     }
 

+    virtual wxMBConv *Clone() const { return new wxMBConv_cocoa(*this); }
+

     bool IsOk() const
     {
     bool IsOk() const
     {

-        //TODO: check for invalid en/de/coding
-        return true;
+        return m_encoding != kCFStringEncodingInvalidId &&
+              CFStringIsEncodingAvailable(m_encoding);

     }
 
 private:
     }
 
 private:

-    CFStringEncoding m_char_encoding ;
-    CFStringEncoding m_unicode_encoding ;
+    CFStringEncoding m_encoding ;

 };
 
 #endif // defined(__WXCOCOA__)
 };
 
 #endif // defined(__WXCOCOA__)


@@ -1990,10 +2720,17 @@ public:
         Init(CFStringGetSystemEncoding()) ;
     }
 
         Init(CFStringGetSystemEncoding()) ;
     }
 

+    wxMBConv_mac(const wxMBConv_mac& conv)
+    {
+        Init(conv.m_char_encoding);
+    }
+
+#if wxUSE_FONTMAP

     wxMBConv_mac(const wxChar* name)
     {
     wxMBConv_mac(const wxChar* name)
     {

-        Init( wxMacGetSystemEncFromFontEnc(wxFontMapper::Get()->CharsetToEncoding(name, false) ) ) ;
+        Init( wxMacGetSystemEncFromFontEnc( wxFontMapperBase::Get()->CharsetToEncoding(name, false) ) );

     }
     }

+#endif

 
     wxMBConv_mac(wxFontEncoding encoding)
     {
 
     wxMBConv_mac(wxFontEncoding encoding)
     {


@@ -2012,7 +2749,7 @@ public:
     {
         OSStatus status = noErr ;
         m_char_encoding = encoding ;
     {
         OSStatus status = noErr ;
         m_char_encoding = encoding ;

-        m_unicode_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
+        m_unicode_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault, 0, kUnicode16BitFormat) ;

 
         status = TECCreateConverter(&m_MB2WC_converter,
                                     m_char_encoding,
 
         status = TECCreateConverter(&m_MB2WC_converter,
                                     m_char_encoding,


@@ -2026,34 +2763,41 @@ public:
     {
         OSStatus status = noErr ;
         ByteCount byteOutLen ;
     {
         OSStatus status = noErr ;
         ByteCount byteOutLen ;

-        ByteCount byteInLen = strlen(psz) ;
+        ByteCount byteInLen = strlen(psz) + 1;

         wchar_t *tbuf = NULL ;
         UniChar* ubuf = NULL ;
         size_t res = 0 ;
 
         if (buf == NULL)
         {
         wchar_t *tbuf = NULL ;
         UniChar* ubuf = NULL ;
         size_t res = 0 ;
 
         if (buf == NULL)
         {

-            n = byteInLen ;
-            tbuf = (wchar_t*) malloc( n * SIZEOF_WCHAR_T) ;
+            // Apple specs say at least 32
+            n = wxMax( 32, byteInLen ) ;
+            tbuf = (wchar_t*) malloc( n * SIZEOF_WCHAR_T ) ;

         }
         }

+

         ByteCount byteBufferLen = n * sizeof( UniChar ) ;
         ByteCount byteBufferLen = n * sizeof( UniChar ) ;

+

 #if SIZEOF_WCHAR_T == 4
         ubuf = (UniChar*) malloc( byteBufferLen + 2 ) ;
 #else
         ubuf = (UniChar*) (buf ? buf : tbuf) ;
 #endif
 #if SIZEOF_WCHAR_T == 4
         ubuf = (UniChar*) malloc( byteBufferLen + 2 ) ;
 #else
         ubuf = (UniChar*) (buf ? buf : tbuf) ;
 #endif

-        status = TECConvertText(m_MB2WC_converter, (ConstTextPtr) psz , byteInLen, &byteInLen,
-          (TextPtr) ubuf , byteBufferLen, &byteOutLen);
+
+        status = TECConvertText(
+            m_MB2WC_converter, (ConstTextPtr) psz, byteInLen, &byteInLen,
+            (TextPtr) ubuf, byteBufferLen, &byteOutLen);
+

 #if SIZEOF_WCHAR_T == 4
         // we have to terminate here, because n might be larger for the trailing zero, and if UniChar
         // is not properly terminated we get random characters at the end
         ubuf[byteOutLen / sizeof( UniChar ) ] = 0 ;
 #if SIZEOF_WCHAR_T == 4
         // we have to terminate here, because n might be larger for the trailing zero, and if UniChar
         // is not properly terminated we get random characters at the end
         ubuf[byteOutLen / sizeof( UniChar ) ] = 0 ;

-        wxMBConvUTF16BE converter ;
-        res = converter.MB2WC( (buf ? buf : tbuf) , (const char*)ubuf , n ) ;
+        wxMBConvUTF16 converter ;
+        res = converter.MB2WC( (buf ? buf : tbuf), (const char*)ubuf, n ) ;

         free( ubuf ) ;
 #else
         res = byteOutLen / sizeof( UniChar ) ;
 #endif
         free( ubuf ) ;
 #else
         res = byteOutLen / sizeof( UniChar ) ;
 #endif

+

         if ( buf == NULL )
              free(tbuf) ;
 
         if ( buf == NULL )
              free(tbuf) ;
 


@@ -2073,46 +2817,68 @@ public:
 
         if (buf == NULL)
         {
 
         if (buf == NULL)
         {

-            // worst case
-            n = byteInLen * 2 ;
+            // Apple specs say at least 32
+            n = wxMax( 32, ((byteInLen / SIZEOF_WCHAR_T) * 8) + SIZEOF_WCHAR_T );

             tbuf = (char*) malloc( n ) ;
         }
 
         ByteCount byteBufferLen = n ;
         UniChar* ubuf = NULL ;
             tbuf = (char*) malloc( n ) ;
         }
 
         ByteCount byteBufferLen = n ;
         UniChar* ubuf = NULL ;

+

 #if SIZEOF_WCHAR_T == 4
 #if SIZEOF_WCHAR_T == 4

-        wxMBConvUTF16BE converter ;
-        size_t unicharlen = converter.WC2MB( NULL , psz , 0 ) ;
+        wxMBConvUTF16 converter ;
+        size_t unicharlen = converter.WC2MB( NULL, psz, 0 ) ;

         byteInLen = unicharlen ;
         ubuf = (UniChar*) malloc( byteInLen + 2 ) ;
         byteInLen = unicharlen ;
         ubuf = (UniChar*) malloc( byteInLen + 2 ) ;

-        converter.WC2MB( (char*) ubuf , psz, unicharlen + 2 ) ;
+        converter.WC2MB( (char*) ubuf, psz, unicharlen + 2 ) ;

 #else
         ubuf = (UniChar*) psz ;
 #endif
 #else
         ubuf = (UniChar*) psz ;
 #endif

-        status = TECConvertText(m_WC2MB_converter, (ConstTextPtr) ubuf , byteInLen, &byteInLen,
-            (TextPtr) (buf ? buf : tbuf) , byteBufferLen, &byteOutLen);
+
+        status = TECConvertText(
+            m_WC2MB_converter, (ConstTextPtr) ubuf, byteInLen, &byteInLen,
+            (TextPtr) (buf ? buf : tbuf), byteBufferLen, &byteOutLen);
+

 #if SIZEOF_WCHAR_T == 4
         free( ubuf ) ;
 #endif
 #if SIZEOF_WCHAR_T == 4
         free( ubuf ) ;
 #endif

+

         if ( buf == NULL )
             free(tbuf) ;
 
         size_t res = byteOutLen ;
         if ( buf  && res < n)
         if ( buf == NULL )
             free(tbuf) ;
 
         size_t res = byteOutLen ;
         if ( buf  && res < n)

+        {

             buf[res] = 0;
 
             buf[res] = 0;
 

+            //we need to double-trip to verify it didn't insert any ? in place
+            //of bogus characters
+            wxWCharBuffer wcBuf(n);
+            size_t pszlen = wxWcslen(psz);
+            if ( MB2WC(wcBuf.data(), buf, n) == wxCONV_FAILED ||
+                        wxWcslen(wcBuf) != pszlen ||
+                        memcmp(wcBuf, psz, pszlen * sizeof(wchar_t)) != 0 )
+            {
+                // we didn't obtain the same thing we started from, hence
+                // the conversion was lossy and we consider that it failed
+                return wxCONV_FAILED;
+            }
+        }
+

         return res ;
     }
 
         return res ;
     }
 

+    virtual wxMBConv *Clone() const { return new wxMBConv_mac(*this); }
+

     bool IsOk() const
     bool IsOk() const

-        { return m_MB2WC_converter !=  NULL && m_WC2MB_converter != NULL  ; }
+        { return m_MB2WC_converter != NULL && m_WC2MB_converter != NULL; }

 
 private:
 
 private:

-    TECObjectRef m_MB2WC_converter ;
-    TECObjectRef m_WC2MB_converter ;
+    TECObjectRef m_MB2WC_converter;
+    TECObjectRef m_WC2MB_converter;

 
 

-    TextEncodingBase m_char_encoding ;
-    TextEncodingBase m_unicode_encoding ;
+    TextEncodingBase m_char_encoding;
+    TextEncodingBase m_unicode_encoding;

 };
 
 #endif // defined(__WXMAC__) && defined(TARGET_CARBON)
 };
 
 #endif // defined(__WXMAC__) && defined(TARGET_CARBON)


@@ -2138,7 +2904,7 @@ public:
     wxMBConv_wxwin(const wxChar* name)
     {
         if (name)
     wxMBConv_wxwin(const wxChar* name)
     {
         if (name)

-            m_enc = wxFontMapper::Get()->CharsetToEncoding(name, false);
+            m_enc = wxFontMapperBase::Get()->CharsetToEncoding(name, false);

         else
             m_enc = wxFONTENCODING_SYSTEM;
 
         else
             m_enc = wxFONTENCODING_SYSTEM;
 


@@ -2156,7 +2922,10 @@ public:
     {
         size_t inbuf = strlen(psz);
         if (buf)
     {
         size_t inbuf = strlen(psz);
         if (buf)

-            m2w.Convert(psz,buf);
+        {
+            if (!m2w.Convert(psz, buf))
+                return wxCONV_FAILED;
+        }

         return inbuf;
     }
 
         return inbuf;
     }
 


@@ -2164,23 +2933,59 @@ public:
     {
         const size_t inbuf = wxWcslen(psz);
         if (buf)
     {
         const size_t inbuf = wxWcslen(psz);
         if (buf)

-            w2m.Convert(psz,buf);
+        {
+            if (!w2m.Convert(psz, buf))
+                return wxCONV_FAILED;
+        }

 
         return inbuf;
     }
 
 
         return inbuf;
     }
 

+    virtual size_t GetMBNulLen() const
+    {
+        switch ( m_enc )
+        {
+            case wxFONTENCODING_UTF16BE:
+            case wxFONTENCODING_UTF16LE:
+                return 2;
+
+            case wxFONTENCODING_UTF32BE:
+            case wxFONTENCODING_UTF32LE:
+                return 4;
+
+            default:
+                return 1;
+        }
+    }
+
+    virtual wxMBConv *Clone() const { return new wxMBConv_wxwin(m_enc); }
+

     bool IsOk() const { return m_ok; }
 
 public:
     wxFontEncoding m_enc;
     wxEncodingConverter m2w, w2m;
 
     bool IsOk() const { return m_ok; }
 
 public:
     wxFontEncoding m_enc;
     wxEncodingConverter m2w, w2m;
 

+private:

     // were we initialized successfully?
     bool m_ok;
 
     DECLARE_NO_COPY_CLASS(wxMBConv_wxwin)
 };
 
     // were we initialized successfully?
     bool m_ok;
 
     DECLARE_NO_COPY_CLASS(wxMBConv_wxwin)
 };
 

+// make the constructors available for unit testing
+WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_wxwin( const wxChar* name )
+{
+    wxMBConv_wxwin* result = new wxMBConv_wxwin( name );
+    if ( !result->IsOk() )
+    {
+        delete result;
+        return 0;
+    }
+
+    return result;
+}
+

 #endif // wxUSE_FONTMAP
 
 // ============================================================================
 #endif // wxUSE_FONTMAP
 
 // ============================================================================


@@ -2203,7 +3008,11 @@ wxCSConv::wxCSConv(const wxChar *charset)
         SetName(charset);
     }
 
         SetName(charset);
     }
 

+#if wxUSE_FONTMAP
+    m_encoding = wxFontMapperBase::GetEncodingFromName(charset);
+#else

     m_encoding = wxFONTENCODING_SYSTEM;
     m_encoding = wxFONTENCODING_SYSTEM;

+#endif

 }
 
 wxCSConv::wxCSConv(wxFontEncoding encoding)
 }
 
 wxCSConv::wxCSConv(wxFontEncoding encoding)


@@ -2262,12 +3071,29 @@ void wxCSConv::SetName(const wxChar *charset)
     }
 }
 
     }
 }
 

+#if wxUSE_FONTMAP
+#include "wx/hashmap.h"
+
+WX_DECLARE_HASH_MAP( wxFontEncoding, wxString, wxIntegerHash, wxIntegerEqual,
+                     wxEncodingNameCache );
+
+static wxEncodingNameCache gs_nameCache;
+#endif
+

 wxMBConv *wxCSConv::DoCreate() const
 {
 wxMBConv *wxCSConv::DoCreate() const
 {

+#if wxUSE_FONTMAP
+    wxLogTrace(TRACE_STRCONV,
+               wxT("creating conversion for %s"),
+               (m_name ? m_name
+                       : wxFontMapperBase::GetEncodingName(m_encoding).c_str()));
+#endif // wxUSE_FONTMAP
+

     // 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
     // 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 )
+    if ( m_encoding == wxFONTENCODING_ISO8859_1 ||
+            m_encoding == wxFONTENCODING_DEFAULT )

     {
         // don't convert at all
         return NULL;
     {
         // don't convert at all
         return NULL;


@@ -2288,17 +3114,53 @@ wxMBConv *wxCSConv::DoCreate() const
 #endif // !wxUSE_FONTMAP
     {
         wxString name(m_name);
 #endif // !wxUSE_FONTMAP
     {
         wxString name(m_name);

+        wxFontEncoding encoding(m_encoding);
+
+        if ( !name.empty() )
+        {
+            wxMBConv_iconv *conv = new wxMBConv_iconv(name);
+            if ( conv->IsOk() )
+                return conv;
+
+            delete conv;

 
 #if wxUSE_FONTMAP
 
 #if wxUSE_FONTMAP

-        if ( name.empty() )
-            name = wxFontMapper::Get()->GetEncodingName(m_encoding);
+            encoding =
+                wxFontMapperBase::Get()->CharsetToEncoding(name, false);

 #endif // wxUSE_FONTMAP
 #endif // wxUSE_FONTMAP

+        }
+#if wxUSE_FONTMAP
+        {
+            const wxEncodingNameCache::iterator it = gs_nameCache.find(encoding);
+            if ( it != gs_nameCache.end() )
+            {
+                if ( it->second.empty() )
+                    return NULL;

 
 

-        wxMBConv_iconv *conv = new wxMBConv_iconv(name);
-        if ( conv->IsOk() )
-            return conv;
+                wxMBConv_iconv *conv = new wxMBConv_iconv(it->second);
+                if ( conv->IsOk() )
+                    return conv;

 
 

-        delete conv;
+                delete conv;
+            }
+
+            const wxChar** names = wxFontMapperBase::GetAllEncodingNames(encoding);
+
+            for ( ; *names; ++names )
+            {
+                wxMBConv_iconv *conv = new wxMBConv_iconv(*names);
+                if ( conv->IsOk() )
+                {
+                    gs_nameCache[encoding] = *names;
+                    return conv;
+                }
+
+                delete conv;
+            }
+
+            gs_nameCache[encoding] = _T(""); // cache the failure
+        }
+#endif // wxUSE_FONTMAP

     }
 #endif // HAVE_ICONV
 
     }
 #endif // HAVE_ICONV
 


@@ -2316,13 +3178,19 @@ wxMBConv *wxCSConv::DoCreate() const
 #endif
     }
 #endif // wxHAVE_WIN32_MB2WC
 #endif
     }
 #endif // wxHAVE_WIN32_MB2WC

+

 #if defined(__WXMAC__)
     {
 #if defined(__WXMAC__)
     {

-        if ( m_name || ( m_encoding < wxFONTENCODING_UTF16BE ) )
+        // leave UTF16 and UTF32 to the built-ins of wx
+        if ( m_name || ( m_encoding < wxFONTENCODING_UTF16BE ||
+            ( m_encoding >= wxFONTENCODING_MACMIN && m_encoding <= wxFONTENCODING_MACMAX ) ) )

         {
         {

-
+#if wxUSE_FONTMAP

             wxMBConv_mac *conv = m_name ? new wxMBConv_mac(m_name)
                                         : new wxMBConv_mac(m_encoding);
             wxMBConv_mac *conv = m_name ? new wxMBConv_mac(m_name)
                                         : new wxMBConv_mac(m_encoding);

+#else
+            wxMBConv_mac *conv = new wxMBConv_mac(m_encoding);
+#endif

             if ( conv->IsOk() )
                  return conv;
 
             if ( conv->IsOk() )
                  return conv;
 


@@ -2330,13 +3198,18 @@ wxMBConv *wxCSConv::DoCreate() const
         }
     }
 #endif
         }
     }
 #endif

+

 #if defined(__WXCOCOA__)
     {
         if ( m_name || ( m_encoding <= wxFONTENCODING_UTF16 ) )
         {
 #if defined(__WXCOCOA__)
     {
         if ( m_name || ( m_encoding <= wxFONTENCODING_UTF16 ) )
         {

-
+#if wxUSE_FONTMAP

             wxMBConv_cocoa *conv = m_name ? new wxMBConv_cocoa(m_name)
                                           : new wxMBConv_cocoa(m_encoding);
             wxMBConv_cocoa *conv = m_name ? new wxMBConv_cocoa(m_name)
                                           : new wxMBConv_cocoa(m_encoding);

+#else
+            wxMBConv_cocoa *conv = new wxMBConv_cocoa(m_encoding);
+#endif
+

             if ( conv->IsOk() )
                  return conv;
 
             if ( conv->IsOk() )
                  return conv;
 


@@ -2352,7 +3225,7 @@ wxMBConv *wxCSConv::DoCreate() const
         // 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
         // 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);
+        enc = wxFontMapperBase::Get()->CharsetToEncoding(m_name, false);

     }
 #endif // wxUSE_FONTMAP
 
     }
 #endif // wxUSE_FONTMAP
 


@@ -2378,7 +3251,7 @@ wxMBConv *wxCSConv::DoCreate() const
 
         default:
              // nothing to do but put here to suppress gcc warnings
 
         default:
              // nothing to do but put here to suppress gcc warnings

-             ;
+             break;

     }
 
     // step (3)
     }
 
     // step (3)


@@ -2408,11 +3281,12 @@ wxMBConv *wxCSConv::DoCreate() const
                    m_name ? m_name
                       :
 #if wxUSE_FONTMAP
                    m_name ? m_name
                       :
 #if wxUSE_FONTMAP

-                         wxFontMapper::GetEncodingDescription(m_encoding).c_str()
+                         wxFontMapperBase::GetEncodingDescription(m_encoding).c_str()

 #else // !wxUSE_FONTMAP
                          wxString::Format(_("encoding %s"), m_encoding).c_str()
 #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
               );
 #else // !wxUSE_FONTMAP
                          wxString::Format(_("encoding %s"), m_encoding).c_str()
 #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
               );

+

         alreadyLoggingError = false;
     }
 
         alreadyLoggingError = false;
     }
 


@@ -2472,7 +3346,8 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
         for (size_t c = 0; c <= len; c++)
         {
             if (psz[c] > 0xFF)
         for (size_t c = 0; c <= len; c++)
         {
             if (psz[c] > 0xFF)

-                return (size_t)-1;
+                return wxCONV_FAILED;
+

             buf[c] = (char)psz[c];
         }
     }
             buf[c] = (char)psz[c];
         }
     }


@@ -2481,13 +3356,25 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
         for (size_t c = 0; c <= len; c++)
         {
             if (psz[c] > 0xFF)
         for (size_t c = 0; c <= len; c++)
         {
             if (psz[c] > 0xFF)

-                return (size_t)-1;
+                return wxCONV_FAILED;

         }
     }
 
     return len;
 }
 
         }
     }
 
     return len;
 }
 

+size_t wxCSConv::GetMBNulLen() const
+{
+    CreateConvIfNeeded();
+
+    if ( m_convReal )
+    {
+        return m_convReal->GetMBNulLen();
+    }
+
+    return 1;
+}
+

 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------


@@ -2505,13 +3392,19 @@ static wxCSConv wxConvISO8859_1Obj(wxFONTENCODING_ISO8859_1);
 static wxMBConvUTF7 wxConvUTF7Obj;
 static wxMBConvUTF8 wxConvUTF8Obj;
 
 static wxMBConvUTF7 wxConvUTF7Obj;
 static wxMBConvUTF8 wxConvUTF8Obj;
 

-

 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;
 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;

+WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI = &wxConvLocal;
+WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvFileName = &
+#ifdef __WXOSX__
+                                    wxConvUTF8Obj;
+#else
+                                    wxConvLibcObj;
+#endif

 
 #else // !wxUSE_WCHAR_T
 
 
 #else // !wxUSE_WCHAR_T
 


@@ -2522,5 +3415,3 @@ WXDLLIMPEXP_DATA_BASE(wxMBConv) wxConvLibc,
                                 wxConvUTF8;
 
 #endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
                                 wxConvUTF8;
 
 #endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T

-
-