// Created: 29/01/98
// RCS-ID: $Id$
// Copyright: (c) 1999 Ove Kaaven, Robert Roebling, Vadim Zeitlin, Vaclav Slavik
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
#pragma hdrstop
#endif
+#ifndef WX_PRECOMP
+ #include "wx/intl.h"
+ #include "wx/log.h"
+#endif // WX_PRECOMP
+
#ifdef __WXMSW__
- #include "wx/msw/private.h"
+ #include "wx/msw/private.h"
#endif
+#ifndef __WXWINCE__
#include <errno.h>
+#endif
+
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
-
-#include "wx/debug.h"
+#include "wx/module.h"
#include "wx/strconv.h"
-#include "wx/intl.h"
-#include "wx/log.h"
// ----------------------------------------------------------------------------
// 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__
- #include <clib.h>
+ #include <clib.h>
#endif
-#ifdef HAVE_ICONV_H
- #include <iconv.h>
+#ifdef HAVE_ICONV
+ #include <iconv.h>
#endif
-#ifdef __WXMSW__
- #include <windows.h>
-#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]); }
#error "Weird sizeof(wchar_t): please report your platform details to wx-users mailing list"
#endif
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// UTF-16 en/decoding
+// ----------------------------------------------------------------------------
#ifdef WC_UTF16
{
if (input<=0xffff)
{
- if (output) *output++ = input;
+ if (output) *output++ = (wchar_t) input;
return 1;
}
else if (input>=0x110000)
{
if (output)
{
- *output++ = (input >> 10)+0xd7c0;
- *output++ = (input&0x3ff)+0xdc00;
+ *output++ = (wchar_t) ((input >> 10)+0xd7c0);
+ *output++ = (wchar_t) ((input&0x3ff)+0xdc00);
}
return 2;
}
// 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
- 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);
+#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)
{
- 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
{
- 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
// ----------------------------------------------------------------------------
-WXDLLEXPORT_DATA(wxMBConvUTF7) wxConvUTF7;
+WXDLLIMPEXP_DATA_BASE(wxMBConvUTF7) wxConvUTF7;
#if 0
static char utf7_setD[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ"
// UTF-8
// ----------------------------------------------------------------------------
-WXDLLEXPORT_DATA(wxMBConvUTF8) wxConvUTF8;
+WXDLLIMPEXP_DATA_BASE(wxMBConvUTF8) wxConvUTF8;
static wxUint32 utf8_max[]=
{ 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff, 0xffffffff };
if (buf)
buf += pa;
len += pa;
-#else
+#else // !WC_UTF16
if (buf)
*buf++ = res;
len++;
-#endif
+#endif // WC_UTF16/!WC_UTF16
}
}
}
{
// plain ASCII char
if (buf)
- *buf++ = cc;
+ *buf++ = (char) cc;
len++;
}
len += cnt + 1;
if (buf)
{
- *buf++ = (-128 >> cnt) | ((cc >> (cnt * 6)) & (0x3f >> cnt));
+ *buf++ = (char) ((-128 >> cnt) | ((cc >> (cnt * 6)) & (0x3f >> cnt)));
while (cnt--)
- *buf++ = 0x80 | ((cc >> (cnt * 6)) & 0x3f);
+ *buf++ = (char) (0x80 | ((cc >> (cnt * 6)) & 0x3f));
}
}
}
if (buf && (len<n)) *buf = 0;
- return len;
-}
-
-// ----------------------------------------------------------------------------
-// specified character set
-// ----------------------------------------------------------------------------
-
-WXDLLEXPORT_DATA(wxCSConv) wxConvLocal((const wxChar *)NULL);
-
-#include "wx/encconv.h"
-#include "wx/fontmap.h"
-
-// TODO: add some tables here
-// - perhaps common encodings to common codepages (for Win32)
-// - perhaps common encodings to objects ("UTF8" -> wxConvUTF8)
-// - move wxEncodingConverter meat in here
-
-#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
// ============================================================================
class wxCharacterSet
{
public:
- wxCharacterSet(const wxChar*name)
- : cname(name) {}
- virtual ~wxCharacterSet()
- {}
- virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n)
- { return (size_t)-1; }
- virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n)
- { return (size_t)-1; }
- virtual bool usable()
- { return FALSE; }
+ wxCharacterSet(const wxChar*name) : cname(name) {}
+ virtual ~wxCharacterSet() {}
+ virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) = 0;
+ virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) = 0;
+ virtual bool usable() const = 0;
public:
const wxChar*cname;
};
size_t WC2MB(char *buf, const wchar_t *psz, size_t n)
{ return work ? work->WC2MB(buf,psz,n) : (size_t)-1; }
- bool usable()
+ bool usable() const
{ return work!=NULL; }
public:
wxMBConv*work;
// The classes doing conversion using the iconv_xxx() functions
// ============================================================================
-#ifdef HAVE_ICONV_H
+#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
#define ICONV_FAILED(cres, bufLeft) (cres == (size_t)-1)
#endif
-#ifdef WX_ICONV_TAKES_CHAR
- #define ICONV_CHAR_CAST(x) (char **)x
-#else
- #define ICONV_CHAR_CAST(x) (const char **)x
-#endif
+#define ICONV_CHAR_CAST(x) ((ICONV_CONST char **)(x))
// ----------------------------------------------------------------------------
// IC_CharSet: encapsulates an iconv character set
// true if the wide char encoding we use (i.e. ms_wcCharsetName) has
// different endian-ness than the native one
- static bool ms_wcNeedsSwap = FALSE;
+ static bool ms_wcNeedsSwap;
};
const char *IC_CharSet::ms_wcCharsetName = NULL;
+bool IC_CharSet::ms_wcNeedsSwap = FALSE;
IC_CharSet::IC_CharSet(const wxChar *name)
: wxCharacterSet(name)
{
+ // Do it the hard way
+ char cname[100];
+ for (size_t i = 0; i < wxStrlen(name)+1; i++)
+ cname[i] = (char) name[i];
+
// check for charset that represents wchar_t:
if (ms_wcCharsetName == NULL)
{
// try charset with explicit bytesex info (e.g. "UCS-4LE"):
ms_wcCharsetName = WC_NAME_BEST;
- m2w = iconv_open(ms_wcCharsetName, wxConvLibc.cWX2MB(name));
+ m2w = iconv_open(ms_wcCharsetName, cname);
if (m2w == (iconv_t)-1)
{
// try charset w/o bytesex info (e.g. "UCS4")
// and check for bytesex ourselves:
ms_wcCharsetName = WC_NAME;
- m2w = iconv_open(ms_wcCharsetName, wxConvLibc.cWX2MB(name));
+ m2w = iconv_open(ms_wcCharsetName, cname);
// last bet, try if it knows WCHAR_T pseudo-charset
if (m2w == (iconv_t)-1)
{
ms_wcCharsetName = "WCHAR_T";
- m2w = iconv_open(ms_wcCharsetName, wxConvLibc.cWX2MB(name));
+ m2w = iconv_open(ms_wcCharsetName, cname);
}
if (m2w != (iconv_t)-1)
{
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
{
ms_wcCharsetName = NULL;
- wxLogError(_("Impossible to convert to/from charset '%s'."), 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);
+ //wxLogError(
}
}
wxLogTrace(wxT("strconv"), wxT("wchar_t charset is '%s', needs swap: %i"), ms_wcCharsetName, ms_wcNeedsSwap);
}
else // we already have ms_wcCharsetName
{
- m2w = iconv_open(ms_wcCharsetName, wxConvLibc.cWX2MB(name));
+ m2w = iconv_open(ms_wcCharsetName, cname);
}
// NB: don't ever pass NULL to iconv_open(), it may crash!
if ( ms_wcCharsetName )
{
- w2m = iconv_open(wxConvLibc.cWX2MB(name), ms_wcCharsetName);
+ w2m = iconv_open( cname, ms_wcCharsetName);
+ }
+ else
+ {
+ w2m = (iconv_t)-1;
}
}
// 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
{
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;
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
{
return res;
}
-#endif // HAVE_ICONV_H
+#endif // HAVE_ICONV
// ============================================================================
// 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:
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 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()
+ bool usable() const
{ return m_CodePage != -1; }
public:
long m_CodePage;
};
-#endif // __WIN32__
+#endif // defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__)
// ============================================================================
// wxEncodingConverter based conversion classes
enc(wxFONTENCODING_SYSTEM)
{
if (name)
- enc = wxTheFontMapper->CharsetToEncoding(name, FALSE);
- m2w.Init(enc, wxFONTENCODING_UNICODE);
- w2m.Init(wxFONTENCODING_UNICODE, enc);
+ enc = wxFontMapper::Get()->CharsetToEncoding(name, FALSE);
+
+ 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)
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);
return inbuf;
}
- bool usable()
- { return (enc!=wxFONTENCODING_SYSTEM) && (enc!=wxFONTENCODING_DEFAULT); }
+ bool usable() const { return m_ok; }
public:
wxFontEncoding enc;
wxEncodingConverter m2w, w2m;
+
+ // were we initialized successfully?
+ bool m_ok;
+
+ DECLARE_NO_COPY_CLASS(EC_CharSet)
};
#endif // wxUSE_FONTMAP
static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
{
- wxCharacterSet *cset = NULL;
- if (name)
+ // check for the special case of ASCII charset
+#if wxUSE_FONTMAP
+ if ( wxFontMapper::Get()->CharsetToEncoding(name) == wxFONTENCODING_DEFAULT )
+#else // wxUSE_FONTMAP
+ if ( !name )
+#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
{
- if (wxStricmp(name, wxT("UTF8")) == 0 || wxStricmp(name, wxT("UTF-8")) == 0)
- {
- cset = new ID_CharSet(name, &wxConvUTF8);
- }
- else
- {
-#ifdef HAVE_ICONV_H
- cset = new IC_CharSet(name); // may not take NULL
-#endif
- }
+ // don't convert at all
+ return NULL;
}
- if (cset && cset->usable())
- return cset;
+ // the test above must have taken care of this case
+ wxCHECK_MSG( name, NULL, _T("NULL name must be wxFONTENCODING_DEFAULT") );
+
+ wxCharacterSet *cset;
- if (cset)
+ if ( wxStricmp(name, wxT("UTF8")) == 0 || wxStricmp(name, wxT("UTF-8")) == 0)
{
+ cset = new ID_CharSet(name, &wxConvUTF8);
+ }
+ else
+ {
+#ifdef HAVE_ICONV
+ cset = new IC_CharSet(name);
+#else // !HAVE_ICONV
+ cset = NULL;
+#endif // HAVE_ICONV/!HAVE_ICONV
+ }
+
+ // it can only be NULL in this case
+#ifndef HAVE_ICONV
+ if ( cset )
+#endif // !HAVE_ICONV
+ {
+ if ( cset->usable() )
+ return cset;
+
delete cset;
cset = NULL;
}
-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
- cset = new CP_CharSet(name); // may take NULL
- if (cset->usable())
+#if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__)
+ cset = new CP_CharSet(name);
+ if ( cset->usable() )
return cset;
delete cset;
-#endif // __WIN32__
+ cset = NULL;
+#endif // defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__)
#if wxUSE_FONTMAP
cset = new EC_CharSet(name);
- if (cset->usable())
+ if ( cset->usable() )
return cset;
-#endif // wxUSE_FONTMAP
delete cset;
- wxLogError(_("Unknown encoding '%s'!"), name);
+ cset = NULL;
+#endif // wxUSE_FONTMAP
+
+ wxLogError(_("Cannot convert from encoding '%s'!"), name);
+
return NULL;
}
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::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() )
+ {
SetName(name);
+ }
}
+#endif // wxUSE_INTL
// wxGetCharacterSet() complains about NULL name
m_cset = m_name ? wxGetCharacterSet(m_name) : NULL;
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++)
return len;
}
-// VZ: are the classes below used at all??
-#if 0
-
-#ifdef HAVE_ICONV_H
-
-class IC_CharSetConverter
-{
-public:
- IC_CharSetConverter(IC_CharSet *from, IC_CharSet *to)
- {
- cnv = iconv_open(wxConvLibc.cWX2MB(to->cname),
- wxConvLibc.cWX2MB(from->cname));
- }
-
- ~IC_CharSetConverter()
- {
- if (cnv != (iconv_t)-1)
- iconv_close(cnv);
- }
-
- size_t Convert(char *buf, const char *psz, size_t n)
- {
- size_t inbuf = strlen(psz);
- size_t outbuf = n;
- size_t res = iconv( cnv, ICONV_CHAR_CAST(&psz), &inbuf, &buf, &outbuf );
- if (res == (size_t)-1)
- return (size_t)-1;
- return (n - outbuf);
- }
-
-public:
- iconv_t cnv;
-};
-
-#endif // HAVE_ICONV_H
-
-class EC_CharSetConverter
-{
-public:
- EC_CharSetConverter(EC_CharSet* from,EC_CharSet* to)
- { cnv.Init(from->enc,to->enc); }
-
- size_t Convert(char* buf, const char* psz, size_t n)
- {
- size_t inbuf = strlen(psz);
- if (buf) cnv.Convert(psz,buf);
- return inbuf;
- }
-
-public:
- wxEncodingConverter cnv;
-};
-
-#endif // 0
-
-#else // !wxUSE_WCHAR_T
-
-// ----------------------------------------------------------------------------
-// stand-ins in absence of wchar_t
-// ----------------------------------------------------------------------------
-
-WXDLLEXPORT_DATA(wxMBConv) wxConvLibc, wxConvFile;
-
#endif // wxUSE_WCHAR_T
projects / wxWidgets.git / blobdiff