// Created: 29/01/98
// RCS-ID: $Id$
// Copyright: (c) 1999 Ove Kaaven, Robert Roebling, Vadim Zeitlin, Vaclav Slavik
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "strconv.h"
#endif
#include "wx/msw/private.h"
#endif
+#ifndef __WXWINCE__
#include <errno.h>
+#endif
+
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
// ----------------------------------------------------------------------------
#if wxUSE_WCHAR_T
- WXDLLEXPORT_DATA(wxMBConv) wxConvLibc;
- WXDLLEXPORT_DATA(wxCSConv) wxConvLocal((const wxChar *)NULL);
+ 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
- WXDLLEXPORT_DATA(wxMBConv) wxConvLibc, wxConvFile, wxConvLocal;
+ WXDLLIMPEXP_DATA_BASE(wxMBConv) wxConvLibc,
+ wxConvFile,
+ wxConvISO8859_1,
+ wxConvLocal,
+ wxConvUTF8;
#endif // wxUSE_WCHAR_T
-WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
+WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent = &wxConvLibc;
class wxStrConvModule: public wxModule
{
{
#if wxUSE_WCHAR_T
wxConvLocal.Clear();
+ wxConvISO8859_1.Clear();
#endif
}
#define IGNORE_LIBC 0
+wxMBConv::~wxMBConv()
+{
+ // nothing to do here
+}
+
size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
#if IGNORE_LIBC
const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const
{
- if (psz)
+ if ( psz )
{
- size_t nLen = MB2WC((wchar_t *) NULL, psz, 0); // return value excludes /0
- if (nLen == (size_t)-1)
- return wxWCharBuffer((wchar_t *) NULL);
- wxWCharBuffer buf(nLen); // this allocates nLen1+
- MB2WC((wchar_t *)(const wchar_t *) buf, psz, nLen+1);
- return buf;
+ // calculate the length of the buffer needed first
+ size_t nLen = MB2WC(NULL, psz, 0);
+ if ( nLen != (size_t)-1 )
+ {
+ // now do the actual conversion
+ wxWCharBuffer buf(nLen);
+ MB2WC(buf.data(), psz, nLen + 1); // with the trailing NUL
+
+ return buf;
+ }
}
- else
- return wxWCharBuffer((wchar_t *) NULL);
-}
-const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const
-{
- // return value excludes NUL
- size_t nLen = pwz ? WC2MB((char *) NULL, pwz, 0) : (size_t)-1;
- if (nLen == (size_t)-1)
- return wxCharBuffer((const char *)NULL);
+ wxWCharBuffer buf((wchar_t *)NULL);
- wxCharBuffer buf(nLen); // this allocates nLen+1
- WC2MB((char *)(const char *) buf, pwz, nLen+1);
return buf;
}
-// ----------------------------------------------------------------------------
-// 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
+const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const
{
- if (buf)
+ if ( pwz )
{
- return gdk_mbstowcs((GdkWChar *)buf, psz, n);
- }
- else
- {
- GdkWChar *nbuf = new GdkWChar[n=strlen(psz)];
- size_t len = gdk_mbstowcs(nbuf, psz, n);
- delete[] nbuf;
- return len;
- }
-}
+ size_t nLen = WC2MB(NULL, pwz, 0);
+ if ( nLen != (size_t)-1 )
+ {
+ wxCharBuffer buf(nLen);
+ WC2MB(buf.data(), pwz, nLen + 1);
-size_t wxMBConvGdk::WC2MB(char *buf, const wchar_t *psz, size_t n) const
-{
- char *mbstr = gdk_wcstombs((GdkWChar *)psz);
- size_t len = mbstr ? strlen(mbstr) : 0;
- if (buf)
- {
- if (len > n)
- len = n;
- memcpy(buf, psz, len);
- if (len < n)
- buf[len] = 0;
+ return buf;
+ }
}
- return len;
-}
-#endif // GTK > 1.0
+ 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 && (len<n)) *buf = 0;
-
+
return len;
}
{
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
{
// 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.
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.
// Win32 conversion classes
// ============================================================================
-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+#if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__)
extern long wxCharsetToCodepage(const wxChar *charset); // from utils.cpp
size_t MB2WC(wchar_t *buf, const char *psz, size_t n)
{
- size_t len =
-#ifdef __WXWINE__
- MultiByteToWideChar(m_CodePage, 0, psz, -1, (WCHAR*) buf, buf ? n : 0);
-#else
- MultiByteToWideChar(m_CodePage, 0, psz, -1, buf, buf ? n : 0);
-#endif
- //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)
{
-#ifdef __WXWINE__
- size_t len = WideCharToMultiByte(m_CodePage, 0, (const WCHAR*) psz, -1, buf,
- buf ? n : 0, NULL, NULL);
-#else
- size_t len = WideCharToMultiByte(m_CodePage, 0, psz, -1, buf,
- buf ? n : 0, NULL, NULL);
-#endif
- //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
public:
long m_CodePage;
};
-#endif // __WIN32__
+#endif // defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__)
// ============================================================================
// wxEncodingConverter based conversion classes
// were we initialized successfully?
bool m_ok;
+
+ DECLARE_NO_COPY_CLASS(EC_CharSet)
};
#endif // wxUSE_FONTMAP
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;
-#endif // __WIN32__
+#endif // defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__)
#if wxUSE_FONTMAP
cset = new EC_CharSet(name);
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();
SetName(name);
}
}
+#endif // wxUSE_INTL
// wxGetCharacterSet() complains about NULL name
m_cset = m_name ? wxGetCharacterSet(m_name) : NULL;
projects / wxWidgets.git / blobdiff