fix for d_mars 8.35

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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 0631cb5b68a3c52df24eb4ebea0e2d963f610ae9..a5e08ae3330413bf9731ca01dd52f12132f9abcc 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Ove Kaaven, Robert Roebling, Vadim Zeitlin, Vaclav Slavik
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Ove Kaaven, Robert Roebling, Vadim Zeitlin, Vaclav Slavik

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

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


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

   #pragma implementation "strconv.h"
 #endif
 
   #pragma implementation "strconv.h"
 #endif
 


@@ -28,45 +28,84 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

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

 #ifdef __WXMSW__
 #ifdef __WXMSW__

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

 #endif
 
 #endif
 

+#ifndef __WXWINCE__

 #include <errno.h>
 #include <errno.h>

+#endif
+

 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
 
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
 

-
-#include "wx/debug.h"
+#include "wx/module.h"

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

-#include "wx/intl.h"
-#include "wx/log.h"

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

-WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
+#if wxUSE_WCHAR_T
+    WXDLLIMPEXP_DATA_BASE(wxMBConv) wxConvLibc;
+    WXDLLIMPEXP_DATA_BASE(wxCSConv) wxConvLocal((const wxChar *)NULL);
+    WXDLLIMPEXP_DATA_BASE(wxCSConv) wxConvISO8859_1(_T("iso-8859-1"));
+#else
+    // stand-ins in absence of wchar_t
+    WXDLLIMPEXP_DATA_BASE(wxMBConv) wxConvLibc,
+                                    wxConvFile,
+                                    wxConvISO8859_1,
+                                    wxConvLocal,
+                                    wxConvUTF8;
+#endif // wxUSE_WCHAR_T

 
 

+WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent = &wxConvLibc;

 
 

-// ============================================================================
-// implementation
-// ============================================================================
+class wxStrConvModule: public wxModule
+{
+public:
+    wxStrConvModule() : wxModule() { }
+    virtual bool OnInit() { return TRUE; }
+    virtual void OnExit()
+    {
+#if wxUSE_WCHAR_T
+         wxConvLocal.Clear();
+         wxConvISO8859_1.Clear();
+#endif
+    }
+
+    DECLARE_DYNAMIC_CLASS(wxStrConvModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxStrConvModule, wxModule)
+
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------

 
 #if wxUSE_WCHAR_T
 
 #ifdef __SALFORDC__
 
 #if wxUSE_WCHAR_T
 
 #ifdef __SALFORDC__

-  #include <clib.h>
+    #include <clib.h>

 #endif
 
 #ifdef HAVE_ICONV
 #endif
 
 #ifdef HAVE_ICONV

-  #include <iconv.h>
+    #include <iconv.h>

 #endif
 
 #endif
 

-#ifdef __WXMSW__
-  #include <windows.h>
-#endif
+#include "wx/encconv.h"
+#include "wx/fontmap.h"
+
+// ----------------------------------------------------------------------------
+// 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]); }
 
 #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]); }


@@ -99,6 +138,13 @@ WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
     #error "Weird sizeof(wchar_t): please report your platform details to wx-users mailing list"
 #endif
 
     #error "Weird sizeof(wchar_t): please report your platform details to wx-users mailing list"
 #endif
 

+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// UTF-16 en/decoding
+// ----------------------------------------------------------------------------

 
 #ifdef WC_UTF16
 
 
 #ifdef WC_UTF16
 


@@ -106,7 +152,7 @@ static size_t encode_utf16(wxUint32 input, wchar_t *output)
 {
     if (input<=0xffff)
     {
 {
     if (input<=0xffff)
     {

-        if (output) *output++ = input;
+        if (output) *output++ = (wchar_t) input;

         return 1;
     }
     else if (input>=0x110000)
         return 1;
     }
     else if (input>=0x110000)


@@ -117,8 +163,8 @@ static size_t encode_utf16(wxUint32 input, wchar_t *output)
     {
         if (output)
         {
     {
         if (output)
         {

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

         }
         return 2;
     }
         }
         return 2;
     }


@@ -149,112 +195,94 @@ static size_t decode_utf16(const wchar_t* input, wxUint32& output)
 // wxMBConv
 // ----------------------------------------------------------------------------
 
 // wxMBConv
 // ----------------------------------------------------------------------------
 

-WXDLLEXPORT_DATA(wxMBConv) wxConvLibc;
+#define IGNORE_LIBC 0

 
 

-size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+wxMBConv::~wxMBConv()

 {
 {

-    return wxMB2WC(buf, psz, n);
-}
-
-size_t wxMBConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
-{
-    return wxWC2MB(buf, psz, n);
+    // nothing to do here

 }
 
 }
 

-const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const
+size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const

 {
 {

-    if (psz)
+#if IGNORE_LIBC
+    if (buf)

     {
     {

-        size_t nLen = MB2WC((wchar_t *) NULL, psz, 0);
-        if (nLen == (size_t)-1)
-            return wxWCharBuffer((wchar_t *) NULL);
-        wxWCharBuffer buf(nLen);
-        MB2WC((wchar_t *)(const wchar_t *) buf, psz, nLen);
-        return buf;
+        for (size_t i = 0; i < strlen( psz )+1; i++)
+            buf[i] = (wchar_t) psz[i];
+        return strlen( psz );

     }
     else
     }
     else

-        return wxWCharBuffer((wchar_t *) NULL);
-}
-
-const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *psz) const
-{
-    if (psz)

     {
     {

-        size_t nLen = WC2MB((char *) NULL, psz, 0);
-        if (nLen == (size_t)-1)
-            return wxCharBuffer((char *) NULL);
-        wxCharBuffer buf(nLen);
-        WC2MB((char *)(const char *) buf, psz, nLen);
-        return buf;
+        return strlen( psz );

     }
     }

-    else
-        return wxCharBuffer((char *) NULL);
-}
-
-// ----------------------------------------------------------------------------
-// standard file conversion
-// ----------------------------------------------------------------------------
-
-WXDLLEXPORT_DATA(wxMBConvFile) wxConvFile;
-
-// just use the libc conversion for now
-size_t wxMBConvFile::MB2WC(wchar_t *buf, const char *psz, size_t n) const
-{
+#else

     return wxMB2WC(buf, psz, n);
     return wxMB2WC(buf, psz, n);

+#endif

 }
 
 }
 

-size_t wxMBConvFile::WC2MB(char *buf, const wchar_t *psz, size_t n) const
-{
-    return wxWC2MB(buf, psz, n);
-}
-
-// ----------------------------------------------------------------------------
-// standard gdk conversion
-// ----------------------------------------------------------------------------
-
-#ifdef __WXGTK12__
-
-WXDLLEXPORT_DATA(wxMBConvGdk) wxConvGdk;
-
-#include <gdk/gdk.h>
-
-size_t wxMBConvGdk::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+size_t wxMBConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const

 {
 {

+#if IGNORE_LIBC

     if (buf)
     {
     if (buf)
     {

-        return gdk_mbstowcs((GdkWChar *)buf, psz, n);
+        for (size_t i = 0; i < wxStrlen( psz )+1; i++)
+            buf[i] = (char) psz[i];
+        return wxStrlen( psz );

     }
     else
     {
     }
     else
     {

-        GdkWChar *nbuf = new GdkWChar[n=strlen(psz)];
-        size_t len = gdk_mbstowcs(nbuf, psz, n);
-        delete[] nbuf;
-        return len;
+        return wxStrlen( psz );

     }
     }

+#else
+    return wxWC2MB(buf, psz, n);
+#endif

 }
 
 }
 

-size_t wxMBConvGdk::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const

 {
 {

-    char *mbstr = gdk_wcstombs((GdkWChar *)psz);
-    size_t len = mbstr ? strlen(mbstr) : 0;
-    if (buf)
+    if ( psz )

     {
     {

-        if (len > n)
-            len = n;
-        memcpy(buf, psz, len);
-        if (len < n)
-            buf[len] = 0;
+        // calculate the length of the buffer needed first
+        size_t nLen = MB2WC(NULL, psz, 0);
+        if ( nLen != (size_t)-1 )
+        {
+            // now do the actual conversion
+            wxWCharBuffer buf(nLen);
+            MB2WC(buf.data(), psz, nLen + 1); // with the trailing NUL
+
+            return buf;
+        }

     }
     }

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

 }
 
 }
 

-#endif // GTK > 1.0
+const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const
+{
+    if ( pwz )
+    {
+        size_t nLen = WC2MB(NULL, pwz, 0);
+        if ( nLen != (size_t)-1 )
+        {
+            wxCharBuffer buf(nLen);
+            WC2MB(buf.data(), pwz, nLen + 1);
+
+            return buf;
+        }
+    }
+
+    wxCharBuffer buf((char *)NULL);
+
+    return buf;
+}

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

-WXDLLEXPORT_DATA(wxMBConvUTF7) wxConvUTF7;
+WXDLLIMPEXP_DATA_BASE(wxMBConvUTF7) wxConvUTF7;

 
 #if 0
 static char utf7_setD[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 
 #if 0
 static char utf7_setD[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ"


@@ -285,7 +313,7 @@ size_t wxMBConvUTF7::WC2MB(char * WXUNUSED(buf),
 // UTF-8
 // ----------------------------------------------------------------------------
 
 // UTF-8
 // ----------------------------------------------------------------------------
 

-WXDLLEXPORT_DATA(wxMBConvUTF8) wxConvUTF8;
+WXDLLIMPEXP_DATA_BASE(wxMBConvUTF8) wxConvUTF8;

 
 static wxUint32 utf8_max[]=
     { 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff, 0xffffffff };
 
 static wxUint32 utf8_max[]=
     { 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff, 0xffffffff };


@@ -341,11 +369,11 @@ size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
                 if (buf)
                     buf += pa;
                 len += pa;
                 if (buf)
                     buf += pa;
                 len += pa;

-#else
+#else // !WC_UTF16

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

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

             }
         }
     }
             }
         }
     }


@@ -373,7 +401,7 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
         {
             // plain ASCII char
             if (buf)
         {
             // plain ASCII char
             if (buf)

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

             len++;
         }
 
             len++;
         }
 


@@ -382,121 +410,18 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
             len += cnt + 1;
             if (buf)
             {
             len += cnt + 1;
             if (buf)
             {

-                *buf++ = (-128 >> cnt) | ((cc >> (cnt * 6)) & (0x3f >> cnt));
+                *buf++ = (char) ((-128 >> cnt) | ((cc >> (cnt * 6)) & (0x3f >> cnt)));

                 while (cnt--)
                 while (cnt--)

-                    *buf++ = 0x80 | ((cc >> (cnt * 6)) & 0x3f);
+                    *buf++ = (char) (0x80 | ((cc >> (cnt * 6)) & 0x3f));

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

-    return len;
-}
-
-// ----------------------------------------------------------------------------
-// specified character set
-// ----------------------------------------------------------------------------
-
-WXDLLEXPORT_DATA(wxCSConv) wxConvLocal((const wxChar *)NULL);
-
-#include "wx/encconv.h"
-#include "wx/fontmap.h"
-
-// TODO: add some tables here
-// - perhaps common encodings to common codepages (for Win32)
-// - perhaps common encodings to objects ("UTF8" -> wxConvUTF8)
-// - move wxEncodingConverter meat in here
-
-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
-
-#if wxUSE_GUI
-
-// VZ: the new version of wxCharsetToCodepage() is more politically correct
-//     and should work on other Windows versions as well but the old version is
-//     still needed for !wxUSE_FONTMAP || !wxUSE_GUI case
-
-extern long wxEncodingToCodepage(wxFontEncoding encoding)
-{
-    // translate encoding into the Windows CHARSET
-    wxNativeEncodingInfo natveEncInfo;
-    if ( !wxGetNativeFontEncoding(encoding, &natveEncInfo) )
-        return -1;
-
-    // translate CHARSET to code page
-    CHARSETINFO csetInfo;
-    if ( !::TranslateCharsetInfo((DWORD *)(DWORD)natveEncInfo.charset,
-                                 &csetInfo,
-                                 TCI_SRCCHARSET) )
-    {
-        wxLogLastError(_T("TranslateCharsetInfo(TCI_SRCCHARSET)"));
-
-        return -1;
-    }
-
-    return csetInfo.ciACP;
-}
-
-#if wxUSE_FONTMAP
-
-extern long wxCharsetToCodepage(const wxChar *name)
-{
-    // first get the font encoding for this charset
-    if ( !name )
-        return -1;
-
-    wxFontEncoding enc = wxTheFontMapper->CharsetToEncoding(name, FALSE);
-    if ( enc == wxFONTENCODING_SYSTEM )
-        return -1;
-
-    // the use the helper function
-    return wxEncodingToCodepage(enc);
-}
-
-#endif // wxUSE_FONTMAP
-
-#endif // wxUSE_GUI
-
-// include old wxCharsetToCodepage() by OK if needed
-#if !wxUSE_GUI || !wxUSE_FONTMAP
-
-#include "wx/msw/registry.h"
-
-// this should work if Internet Exploiter is installed
-extern long wxCharsetToCodepage(const wxChar *name)
-{
-    if (!name)
-        return GetACP();
-
-    long CP=-1;
-
-    wxString cn(name);
-    do {
-        wxString path(wxT("MIME\\Database\\Charset\\"));
-        path += cn;
-        wxRegKey key(wxRegKey::HKCR, path);
-
-        if (!key.Exists()) break;

 
 

-        // two cases: either there's an AliasForCharset string,
-        // or there are Codepage and InternetEncoding dwords.
-        // The InternetEncoding gives us the actual encoding,
-        // the Codepage just says which Windows character set to
-        // use when displaying the data.
-        if (key.HasValue(wxT("InternetEncoding")) &&
-            key.QueryValue(wxT("InternetEncoding"), &CP)) break;
-
-        // no encoding, see if it's an alias
-        if (!key.HasValue(wxT("AliasForCharset")) ||
-            !key.QueryValue(wxT("AliasForCharset"), cn)) break;
-    } while (1);
-
-    return CP;
+    return len;

 }
 
 }
 

-#endif // !wxUSE_GUI || !wxUSE_FONTMAP
-
-#endif // Win32
-

 // ============================================================================
 // wxCharacterSet and derived classes
 // ============================================================================
 // ============================================================================
 // wxCharacterSet and derived classes
 // ============================================================================


@@ -600,6 +525,11 @@ bool IC_CharSet::ms_wcNeedsSwap = FALSE;
 IC_CharSet::IC_CharSet(const wxChar *name)
           : wxCharacterSet(name)
 {
 IC_CharSet::IC_CharSet(const wxChar *name)
           : wxCharacterSet(name)
 {

+    // Do it the hard way
+    char cname[100];
+    for (size_t i = 0; i < wxStrlen(name)+1; i++)
+        cname[i] = (char) name[i];
+

     // check for charset that represents wchar_t:
     if (ms_wcCharsetName == NULL)
     {
     // check for charset that represents wchar_t:
     if (ms_wcCharsetName == NULL)
     {


@@ -607,20 +537,20 @@ IC_CharSet::IC_CharSet(const wxChar *name)
 
         // try charset with explicit bytesex info (e.g. "UCS-4LE"):
         ms_wcCharsetName = WC_NAME_BEST;
 
         // try charset with explicit bytesex info (e.g. "UCS-4LE"):
         ms_wcCharsetName = WC_NAME_BEST;

-        m2w = iconv_open(ms_wcCharsetName, wxConvLibc.cWX2MB(name));
+        m2w = iconv_open(ms_wcCharsetName, cname);

 
         if (m2w == (iconv_t)-1)
         {
             // try charset w/o bytesex info (e.g. "UCS4")
             // and check for bytesex ourselves:
             ms_wcCharsetName = WC_NAME;
 
         if (m2w == (iconv_t)-1)
         {
             // try charset w/o bytesex info (e.g. "UCS4")
             // and check for bytesex ourselves:
             ms_wcCharsetName = WC_NAME;

-            m2w = iconv_open(ms_wcCharsetName, wxConvLibc.cWX2MB(name));
+            m2w = iconv_open(ms_wcCharsetName, cname);

 
             // last bet, try if it knows WCHAR_T pseudo-charset
             if (m2w == (iconv_t)-1)
             {
                 ms_wcCharsetName = "WCHAR_T";
 
             // last bet, try if it knows WCHAR_T pseudo-charset
             if (m2w == (iconv_t)-1)
             {
                 ms_wcCharsetName = "WCHAR_T";

-                m2w = iconv_open(ms_wcCharsetName, wxConvLibc.cWX2MB(name));
+                m2w = iconv_open(ms_wcCharsetName, cname);

             }
 
             if (m2w != (iconv_t)-1)
             }
 
             if (m2w != (iconv_t)-1)


@@ -645,7 +575,7 @@ IC_CharSet::IC_CharSet(const wxChar *name)
                 {
                     ms_wcCharsetName = NULL;
                     wxLogLastError(wxT("iconv"));
                 {
                     ms_wcCharsetName = NULL;
                     wxLogLastError(wxT("iconv"));

-                    wxLogError(_("Convertion to charset '%s' doesn't work."), name);
+                    wxLogError(_("Conversion to charset '%s' doesn't work."), name);

                 }
                 else
                 {
                 }
                 else
                 {


@@ -655,7 +585,7 @@ IC_CharSet::IC_CharSet(const wxChar *name)
             else
             {
                 ms_wcCharsetName = NULL;
             else
             {
                 ms_wcCharsetName = NULL;

-                
+

                 // VS: we must not output an error here, since wxWindows will safely
                 //     fall back to using wxEncodingConverter.
                 wxLogTrace(wxT("strconv"), wxT("Impossible to convert to/from charset '%s' with iconv, falling back to wxEncodingConverter."), name);
                 // VS: we must not output an error here, since wxWindows will safely
                 //     fall back to using wxEncodingConverter.
                 wxLogTrace(wxT("strconv"), wxT("Impossible to convert to/from charset '%s' with iconv, falling back to wxEncodingConverter."), name);


@@ -666,13 +596,13 @@ IC_CharSet::IC_CharSet(const wxChar *name)
     }
     else // we already have ms_wcCharsetName
     {
     }
     else // we already have ms_wcCharsetName
     {

-        m2w = iconv_open(ms_wcCharsetName, wxConvLibc.cWX2MB(name));
+        m2w = iconv_open(ms_wcCharsetName, cname);

     }
 
     // NB: don't ever pass NULL to iconv_open(), it may crash!
     if ( ms_wcCharsetName )
     {
     }
 
     // NB: don't ever pass NULL to iconv_open(), it may crash!
     if ( ms_wcCharsetName )
     {

-        w2m = iconv_open(wxConvLibc.cWX2MB(name), ms_wcCharsetName);
+        w2m = iconv_open( cname, ms_wcCharsetName);

     }
     else
     {
     }
     else
     {


@@ -710,6 +640,12 @@ size_t IC_CharSet::MB2WC(wchar_t *buf, const char *psz, size_t n)
             // convert to native endianness
             WC_BSWAP(buf /* _not_ bufPtr */, res)
         }
             // convert to native endianness
             WC_BSWAP(buf /* _not_ bufPtr */, res)
         }

+
+        // NB: iconv was given only strlen(psz) characters on input, and so
+        //     it couldn't convert the trailing zero. Let's do it ourselves
+        //     if there's some room left for it in the output buffer.
+        if (res < n)
+            buf[res] = 0;

     }
     else
     {
     }
     else
     {


@@ -741,11 +677,7 @@ size_t IC_CharSet::MB2WC(wchar_t *buf, const char *psz, size_t n)
 
 size_t IC_CharSet::WC2MB(char *buf, const wchar_t *psz, size_t n)
 {
 
 size_t IC_CharSet::WC2MB(char *buf, const wchar_t *psz, size_t n)
 {

-#if defined(__BORLANDC__) && (__BORLANDC__ > 0x530)
-    size_t inbuf = std::wcslen(psz) * SIZEOF_WCHAR_T;
-#else
-    size_t inbuf = ::wcslen(psz) * SIZEOF_WCHAR_T;
-#endif
+    size_t inbuf = wxWcslen(psz) * SIZEOF_WCHAR_T;

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


@@ -769,6 +701,12 @@ size_t IC_CharSet::WC2MB(char *buf, const wchar_t *psz, size_t n)
         cres = iconv( w2m, ICONV_CHAR_CAST(&psz), &inbuf, &buf, &outbuf );
 
         res = n-outbuf;
         cres = iconv( w2m, ICONV_CHAR_CAST(&psz), &inbuf, &buf, &outbuf );
 
         res = n-outbuf;

+
+        // NB: iconv was given only wcslen(psz) characters on input, and so
+        //     it couldn't convert the trailing zero. Let's do it ourselves
+        //     if there's some room left for it in the output buffer.
+        if (res < n)
+            buf[0] = 0;

     }
     else
     {
     }
     else
     {


@@ -806,7 +744,10 @@ size_t IC_CharSet::WC2MB(char *buf, const wchar_t *psz, size_t n)
 // Win32 conversion classes
 // ============================================================================
 
 // Win32 conversion classes
 // ============================================================================
 

-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+#if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__)
+
+extern long wxCharsetToCodepage(const wxChar *charset); // from utils.cpp
+

 class CP_CharSet : public wxCharacterSet
 {
 public:
 class CP_CharSet : public wxCharacterSet
 {
 public:


@@ -818,20 +759,37 @@ public:
 
     size_t MB2WC(wchar_t *buf, const char *psz, size_t n)
     {
 
     size_t MB2WC(wchar_t *buf, const char *psz, size_t n)
     {

-        size_t len =
-            MultiByteToWideChar(m_CodePage, 0, psz, -1, buf, buf ? n : 0);
-        //VS: returns # of written chars for buf!=NULL and *size*
-        //    needed buffer for buf==NULL
-        return len ? (buf ? len : len-1) : (size_t)-1;
+        const size_t len = ::MultiByteToWideChar
+                             (
+                                m_CodePage,     // code page
+                                0,              // flags (none)
+                                psz,            // input string
+                                -1,             // its length (NUL-terminated)
+                                buf,            // output string
+                                buf ? n : 0     // size of output buffer
+                             );
+
+        // note that it returns # of written chars for buf != NULL and *size*
+        // of the needed buffer for buf == NULL
+        return len ? (buf ? len : len - 1) : (size_t)-1;

     }
 
     size_t WC2MB(char *buf, const wchar_t *psz, size_t n)
     {
     }
 
     size_t WC2MB(char *buf, const wchar_t *psz, size_t n)
     {

-        size_t len = WideCharToMultiByte(m_CodePage, 0, psz, -1, buf,
-                                         buf ? n : 0, NULL, NULL);
-        //VS: returns # of written chars for buf!=NULL and *size*
-        //    needed buffer for buf==NULL
-        return len ? (buf ? len : len-1) : (size_t)-1;
+        const size_t len = ::WideCharToMultiByte
+                             (
+                                m_CodePage,     // code page
+                                0,              // flags (none)
+                                psz,            // input string
+                                -1,             // it is (wide) NUL-terminated
+                                buf,            // output buffer
+                                buf ? n : 0,    // and its size
+                                NULL,           // default "replacement" char
+                                NULL            // [out] was it used?
+                             );
+
+        // see the comment above!
+        return len ? (buf ? len : len - 1) : (size_t)-1;

     }
 
     bool usable() const
     }
 
     bool usable() const


@@ -840,7 +798,7 @@ public:
 public:
     long m_CodePage;
 };
 public:
     long m_CodePage;
 };

-#endif // __WIN32__
+#endif // defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__)

 
 // ============================================================================
 // wxEncodingConverter based conversion classes
 
 // ============================================================================
 // wxEncodingConverter based conversion classes


@@ -857,13 +815,13 @@ public:
                                      enc(wxFONTENCODING_SYSTEM)
     {
         if (name)
                                      enc(wxFONTENCODING_SYSTEM)
     {
         if (name)

-            enc = wxTheFontMapper->CharsetToEncoding(name, FALSE);
+            enc = wxFontMapper::Get()->CharsetToEncoding(name, FALSE);

 
         m_ok = m2w.Init(enc, wxFONTENCODING_UNICODE) &&
                w2m.Init(wxFONTENCODING_UNICODE, enc);
     }
 
 
         m_ok = m2w.Init(enc, wxFONTENCODING_UNICODE) &&
                w2m.Init(wxFONTENCODING_UNICODE, enc);
     }
 

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

     {
         size_t inbuf = strlen(psz);
         if (buf)
     {
         size_t inbuf = strlen(psz);
         if (buf)


@@ -871,14 +829,9 @@ public:
         return inbuf;
     }
 
         return inbuf;
     }
 

-    size_t WC2MB(char *buf, const wchar_t *psz, size_t n)
+    size_t WC2MB(char *buf, const wchar_t *psz, size_t WXUNUSED(n))

     {
     {

-#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \
-    || ( defined(__MWERKS__) && defined(__WXMSW__) )
-        size_t inbuf = std::wcslen(psz);
-#else
-        size_t inbuf = ::wcslen(psz);
-#endif
+        const size_t inbuf = wxWcslen(psz);

         if (buf)
             w2m.Convert(psz,buf);
 
         if (buf)
             w2m.Convert(psz,buf);
 


@@ -893,6 +846,8 @@ public:
 
     // were we initialized successfully?
     bool m_ok;
 
     // were we initialized successfully?
     bool m_ok;

+
+    DECLARE_NO_COPY_CLASS(EC_CharSet)

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


@@ -906,7 +861,7 @@ static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
 {
     // check for the special case of ASCII charset
 #if wxUSE_FONTMAP
 {
     // check for the special case of ASCII charset
 #if wxUSE_FONTMAP

-    if ( wxTheFontMapper->CharsetToEncoding(name) == wxFONTENCODING_DEFAULT )
+    if ( wxFontMapper::Get()->CharsetToEncoding(name) == wxFONTENCODING_DEFAULT )

 #else // wxUSE_FONTMAP
     if ( !name )
 #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
 #else // wxUSE_FONTMAP
     if ( !name )
 #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP


@@ -933,20 +888,26 @@ static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
 #endif // HAVE_ICONV/!HAVE_ICONV
     }
 
 #endif // HAVE_ICONV/!HAVE_ICONV
     }
 

-    if ( cset->usable() )
-        return cset;
+    // it can only be NULL in this case
+#ifndef HAVE_ICONV
+    if ( cset )
+#endif // !HAVE_ICONV
+    {
+        if ( cset->usable() )
+            return cset;

 
 

-    delete cset;
-    cset = NULL;
+        delete cset;
+        cset = NULL;
+    }

 
 

-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+#if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__)

     cset = new CP_CharSet(name);
     if ( cset->usable() )
         return cset;
 
     delete cset;
     cset = NULL;
     cset = new CP_CharSet(name);
     if ( cset->usable() )
         return cset;
 
     delete cset;
     cset = NULL;

-#endif // __WIN32__
+#endif // defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__)

 
 #if wxUSE_FONTMAP
     cset = new EC_CharSet(name);
 
 #if wxUSE_FONTMAP
     cset = new EC_CharSet(name);


@@ -977,8 +938,31 @@ wxCSConv::wxCSConv(const wxChar *charset)
 
 wxCSConv::~wxCSConv()
 {
 
 wxCSConv::~wxCSConv()
 {

-    free(m_name);
-    delete m_cset;
+    Clear();
+}
+
+wxCSConv::wxCSConv(const wxCSConv& conv)
+    : wxMBConv()
+{
+    Clear();
+    SetName(conv.m_name);
+}
+
+wxCSConv& wxCSConv::operator=(const wxCSConv& conv)
+{
+    Clear();
+    SetName(conv.m_name);
+    return *this;
+}
+
+void wxCSConv::Clear()
+{
+    if (m_name)
+        free(m_name);
+    if (m_cset)
+        delete m_cset;
+    m_name = NULL;
+    m_cset = NULL;

 }
 
 void wxCSConv::SetName(const wxChar *charset)
 }
 
 void wxCSConv::SetName(const wxChar *charset)


@@ -992,14 +976,20 @@ void wxCSConv::SetName(const wxChar *charset)
 
 void wxCSConv::LoadNow()
 {
 
 void wxCSConv::LoadNow()
 {

-    if (m_deferred)
+    if ( m_deferred )

     {
     {

+        // it would probably be better to make GetSystemEncodingName() always
+        // available (i.e. even when wxUSE_INTL == 0)?
+#if wxUSE_INTL

         if ( !m_name )
         {
             wxString name = wxLocale::GetSystemEncodingName();
             if ( !name.empty() )
         if ( !m_name )
         {
             wxString name = wxLocale::GetSystemEncodingName();
             if ( !name.empty() )

+            {

                 SetName(name);
                 SetName(name);

+            }

         }
         }

+#endif // wxUSE_INTL

 
         // wxGetCharacterSet() complains about NULL name
         m_cset = m_name ? wxGetCharacterSet(m_name) : NULL;
 
         // wxGetCharacterSet() complains about NULL name
         m_cset = m_name ? wxGetCharacterSet(m_name) : NULL;


@@ -1034,12 +1024,7 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
         return m_cset->WC2MB(buf, psz, n);
 
     // latin-1 (direct)
         return m_cset->WC2MB(buf, psz, n);
 
     // latin-1 (direct)

-#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \
-    || ( defined(__MWERKS__) && defined(__WXMSW__) )
-    size_t len=std::wcslen(psz);
-#else
-    size_t len=::wcslen(psz);
-#endif
+    const size_t len = wxWcslen(psz);

     if (buf)
     {
         for (size_t c = 0; c <= len; c++)
     if (buf)
     {
         for (size_t c = 0; c <= len; c++)


@@ -1049,14 +1034,6 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
     return len;
 }
 
     return len;
 }
 

-#else // !wxUSE_WCHAR_T
-
-// ----------------------------------------------------------------------------
-// stand-ins in absence of wchar_t
-// ----------------------------------------------------------------------------
-
-WXDLLEXPORT_DATA(wxMBConv) wxConvLibc, wxConvFile;
-

 #endif // wxUSE_WCHAR_T
 
 
 #endif // wxUSE_WCHAR_T