X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/999836aacade840a5d9a0cbb5fad7b1d4de62c93..052d2fc5818243dadbc1ec54b1120e295304fc55:/src/common/strconv.cpp?ds=sidebyside diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index f13005cb37..83c06de9c6 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -1,12 +1,14 @@ ///////////////////////////////////////////////////////////////////////////// // Name: strconv.cpp // 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 +// (c) 2004 Ryan Norton, Fredrik Roubert // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -42,6 +44,10 @@ #include "wx/msw/private.h" #endif +#ifdef __WINDOWS__ + #include "wx/msw/missing.h" +#endif + #ifndef __WXWINCE__ #include #endif @@ -68,7 +74,15 @@ #include "wx/encconv.h" #include "wx/fontmap.h" +#include "wx/utils.h" +#ifdef __WXMAC__ +#include +#include +#include + +#include "wx/mac/private.h" // includes mac headers +#endif // ---------------------------------------------------------------------------- // macros // ---------------------------------------------------------------------------- @@ -156,7 +170,7 @@ static size_t decode_utf16(const wxUint16* input, wxUint32& output) wxMBConv::~wxMBConv() { - // nothing to do here + // nothing to do here (necessary for Darwin linking probably) } const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const @@ -169,9 +183,11 @@ const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const { // now do the actual conversion wxWCharBuffer buf(nLen); - MB2WC(buf.data(), psz, nLen + 1); // with the trailing NUL - - return buf; + nLen = MB2WC(buf.data(), psz, nLen + 1); // with the trailing NULL + if ( nLen != (size_t)-1 ) + { + return buf; + } } } @@ -188,9 +204,11 @@ const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const if ( nLen != (size_t)-1 ) { wxCharBuffer buf(nLen+3); // space for a wxUint32 trailing zero - WC2MB(buf.data(), pwz, nLen + 4); - - return buf; + nLen = WC2MB(buf.data(), pwz, nLen + 4); + if ( nLen != (size_t)-1 ) + { + return buf; + } } } @@ -212,34 +230,210 @@ size_t wxMBConvLibc::WC2MB(char *buf, const wchar_t *psz, size_t n) const { return wxWC2MB(buf, psz, n); } - // ---------------------------------------------------------------------------- -// 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 + +// +// BASE64 decoding table +// +static const unsigned char utf7unb64[] = +{ + 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 +}; -// 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 +size_t wxMBConvUTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const { - return 0; + + 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 + { + // BASE64 encoded string + bool lsb; + unsigned char c; + unsigned int d, l; + for (lsb = false, d = 0, l = 0; + (cc = utf7unb64[(unsigned char)*psz]) != 0xff; psz++) + { + d <<= 6; + d += cc; + for (l += 6; l >= 8; lsb = !lsb) + { + c = (d >> (l -= 8)) % 256; + if (lsb) + { + if (buf) + *buf++ |= c; + len ++; + } + else + if (buf) + *buf = c << 8; + } + } + 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] = +{ + 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 { - return 0; + + + 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 (cc > 0xffff) + { + // no surrogate pair generation (yet?) + return (size_t)-1; + } +#endif + else + { + if (buf) + *buf++ = '+'; + len++; + if (cc != '+') + { + // BASE64 encode string + unsigned int lsb, d, l; + for (d = 0, l = 0;; 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; } // ---------------------------------------------------------------------------- @@ -943,7 +1137,7 @@ wxMBConv_iconv::wxMBConv_iconv(const wxChar *name) { ms_wcCharsetName = NULL; - // VS: we must not output an error here, since wxWindows will safely + // 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( @@ -1105,8 +1299,10 @@ size_t wxMBConv_iconv::WC2MB(char *buf, const wchar_t *psz, size_t n) const #ifdef wxHAVE_WIN32_MB2WC // from utils.cpp +#if wxUSE_FONTMAP extern WXDLLIMPEXP_BASE long wxCharsetToCodepage(const wxChar *charset); extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding); +#endif class wxMBConv_win32 : public wxMBConv { @@ -1116,6 +1312,7 @@ public: m_CodePage = CP_ACP; } +#if wxUSE_FONTMAP wxMBConv_win32(const wxChar* name) { m_CodePage = wxCharsetToCodepage(name); @@ -1125,13 +1322,19 @@ public: { m_CodePage = wxEncodingToCodepage(encoding); } +#endif 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 const size_t len = ::MultiByteToWideChar ( m_CodePage, // code page - 0, // flags (none) + MB_ERR_INVALID_CHARS, // flags: fall on error psz, // input string -1, // its length (NUL-terminated) buf, // output string @@ -1144,33 +1347,958 @@ public: return len ? len - 1 : (size_t)-1; } - size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const + size_t WC2MB(char *buf, const wchar_t *pwz, size_t n) const { + /* + we have a problem here: by default, WideCharToMultiByte() may + replace characters unrepresentable in the target code page with bad + quality approximations such as turning "1/2" symbol (U+00BD) into + "1" for the code pages which don't have it and we, obviously, want + to avoid this at any price + + the trouble is that this function does it _silently_, i.e. it won't + even tell us whether it did or not... Win98/2000 and higher provide + WC_NO_BEST_FIT_CHARS but it doesn't work for the older systems and + we have to resort to a round trip, i.e. check that converting back + results in the same string -- this is, of course, expensive but + otherwise we simply can't be sure to not garble the data. + */ + + // determine if we can rely on WC_NO_BEST_FIT_CHARS: according to MSDN + // it doesn't work with CJK encodings (which we test for rather roughly + // here...) nor with UTF-7/8 nor, of course, with Windows versions not + // supporting it + BOOL usedDef wxDUMMY_INITIALIZE(false); + BOOL *pUsedDef; + int flags; + if ( CanUseNoBestFit() && m_CodePage < 50000 ) + { + // it's our lucky day + flags = WC_NO_BEST_FIT_CHARS; + pUsedDef = &usedDef; + } + else // old system or unsupported encoding + { + flags = 0; + pUsedDef = NULL; + } + const size_t len = ::WideCharToMultiByte ( m_CodePage, // code page - 0, // flags (none) - psz, // input string + flags, // either none or no best fit + pwz, // 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? + pUsedDef // [out] was it used? ); + if ( !len ) + { + // function totally failed + return (size_t)-1; + } + + // if we were really converting, check if we succeeded + if ( buf ) + { + if ( flags ) + { + // check if the conversion failed, i.e. if any replacements + // were done + if ( usedDef ) + return (size_t)-1; + } + else // we must resort to double tripping... + { + wxWCharBuffer wcBuf(n); + if ( MB2WC(wcBuf.data(), buf, n) == (size_t)-1 || + 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; + } + } + } + // see the comment above for the reason of "len - 1" - return len ? len - 1 : (size_t)-1; + return len - 1; } - bool IsOk() const - { return m_CodePage != -1; } + bool IsOk() const { return m_CodePage != -1; } + +private: + static bool CanUseNoBestFit() + { + static int s_isWin98Or2k = -1; + + if ( s_isWin98Or2k == -1 ) + { + int verMaj, verMin; + switch ( wxGetOsVersion(&verMaj, &verMin) ) + { + case wxWIN95: + s_isWin98Or2k = verMaj >= 4 && verMin >= 10; + break; + + case wxWINDOWS_NT: + s_isWin98Or2k = verMaj >= 5; + break; + + default: + // unknown, be conseravtive by default + s_isWin98Or2k = 0; + } + + wxASSERT_MSG( s_isWin98Or2k != -1, _T("should be set above") ); + } + + return s_isWin98Or2k == 1; + } -public: long m_CodePage; }; #endif // wxHAVE_WIN32_MB2WC +// ============================================================================ +// Cocoa conversion classes +// ============================================================================ + +#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). + +#include +#include + +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) + { + case wxFONTENCODING_ISO8859_1 : + enc = kCFStringEncodingISOLatin1 ; + break ; + case wxFONTENCODING_ISO8859_2 : + enc = kCFStringEncodingISOLatin2; + break ; + case wxFONTENCODING_ISO8859_3 : + enc = kCFStringEncodingISOLatin3 ; + break ; + case wxFONTENCODING_ISO8859_4 : + enc = kCFStringEncodingISOLatin4; + break ; + case wxFONTENCODING_ISO8859_5 : + enc = kCFStringEncodingISOLatinCyrillic; + break ; + case wxFONTENCODING_ISO8859_6 : + enc = kCFStringEncodingISOLatinArabic; + break ; + case wxFONTENCODING_ISO8859_7 : + enc = kCFStringEncodingISOLatinGreek; + break ; + case wxFONTENCODING_ISO8859_8 : + enc = kCFStringEncodingISOLatinHebrew; + break ; + case wxFONTENCODING_ISO8859_9 : + enc = kCFStringEncodingISOLatin5; + break ; + case wxFONTENCODING_ISO8859_10 : + enc = kCFStringEncodingISOLatin6; + break ; + case wxFONTENCODING_ISO8859_11 : + enc = kCFStringEncodingISOLatinThai; + break ; + case wxFONTENCODING_ISO8859_13 : + enc = kCFStringEncodingISOLatin7; + break ; + case wxFONTENCODING_ISO8859_14 : + enc = kCFStringEncodingISOLatin8; + break ; + case wxFONTENCODING_ISO8859_15 : + enc = kCFStringEncodingISOLatin9; + break ; + + case wxFONTENCODING_KOI8 : + enc = kCFStringEncodingKOI8_R; + break ; + case wxFONTENCODING_ALTERNATIVE : // MS-DOS CP866 + enc = kCFStringEncodingDOSRussian; + break ; + +// case wxFONTENCODING_BULGARIAN : +// enc = ; +// break ; + + case wxFONTENCODING_CP437 : + enc =kCFStringEncodingDOSLatinUS ; + break ; + case wxFONTENCODING_CP850 : + enc = kCFStringEncodingDOSLatin1; + break ; + case wxFONTENCODING_CP852 : + enc = kCFStringEncodingDOSLatin2; + break ; + case wxFONTENCODING_CP855 : + enc = kCFStringEncodingDOSCyrillic; + break ; + case wxFONTENCODING_CP866 : + enc =kCFStringEncodingDOSRussian ; + break ; + case wxFONTENCODING_CP874 : + enc = kCFStringEncodingDOSThai; + break ; + case wxFONTENCODING_CP932 : + enc = kCFStringEncodingDOSJapanese; + break ; + case wxFONTENCODING_CP936 : + enc =kCFStringEncodingDOSChineseSimplif ; + break ; + case wxFONTENCODING_CP949 : + enc = kCFStringEncodingDOSKorean; + break ; + case wxFONTENCODING_CP950 : + enc = kCFStringEncodingDOSChineseTrad; + break ; + + case wxFONTENCODING_CP1250 : + enc = kCFStringEncodingWindowsLatin2; + break ; + case wxFONTENCODING_CP1251 : + enc =kCFStringEncodingWindowsCyrillic ; + break ; + case wxFONTENCODING_CP1252 : + enc =kCFStringEncodingWindowsLatin1 ; + break ; + case wxFONTENCODING_CP1253 : + enc = kCFStringEncodingWindowsGreek; + break ; + case wxFONTENCODING_CP1254 : + enc = kCFStringEncodingWindowsLatin5; + break ; + case wxFONTENCODING_CP1255 : + enc =kCFStringEncodingWindowsHebrew ; + break ; + case wxFONTENCODING_CP1256 : + enc =kCFStringEncodingWindowsArabic ; + break ; + case wxFONTENCODING_CP1257 : + enc = kCFStringEncodingWindowsBalticRim; + break ; + case wxFONTENCODING_UTF7 : + enc = kCFStringEncodingNonLossyASCII ; + break ; + case wxFONTENCODING_UTF8 : + enc = kCFStringEncodingUTF8 ; + break ; + case wxFONTENCODING_EUC_JP : + enc = kCFStringEncodingEUC_JP; + break ; + case wxFONTENCODING_UTF16 : + enc = kCFStringEncodingUnicode ; + break ; + case wxFONTENCODING_MACROMAN : + enc = kCFStringEncodingMacRoman ; + break ; + case wxFONTENCODING_MACJAPANESE : + enc = kCFStringEncodingMacJapanese ; + break ; + case wxFONTENCODING_MACCHINESETRAD : + enc = kCFStringEncodingMacChineseTrad ; + break ; + case wxFONTENCODING_MACKOREAN : + enc = kCFStringEncodingMacKorean ; + break ; + case wxFONTENCODING_MACARABIC : + enc = kCFStringEncodingMacArabic ; + break ; + case wxFONTENCODING_MACHEBREW : + enc = kCFStringEncodingMacHebrew ; + break ; + case wxFONTENCODING_MACGREEK : + enc = kCFStringEncodingMacGreek ; + break ; + case wxFONTENCODING_MACCYRILLIC : + enc = kCFStringEncodingMacCyrillic ; + break ; + case wxFONTENCODING_MACDEVANAGARI : + enc = kCFStringEncodingMacDevanagari ; + break ; + case wxFONTENCODING_MACGURMUKHI : + enc = kCFStringEncodingMacGurmukhi ; + break ; + case wxFONTENCODING_MACGUJARATI : + enc = kCFStringEncodingMacGujarati ; + break ; + case wxFONTENCODING_MACORIYA : + enc = kCFStringEncodingMacOriya ; + break ; + case wxFONTENCODING_MACBENGALI : + enc = kCFStringEncodingMacBengali ; + break ; + case wxFONTENCODING_MACTAMIL : + enc = kCFStringEncodingMacTamil ; + break ; + case wxFONTENCODING_MACTELUGU : + enc = kCFStringEncodingMacTelugu ; + break ; + case wxFONTENCODING_MACKANNADA : + enc = kCFStringEncodingMacKannada ; + break ; + case wxFONTENCODING_MACMALAJALAM : + enc = kCFStringEncodingMacMalayalam ; + break ; + case wxFONTENCODING_MACSINHALESE : + enc = kCFStringEncodingMacSinhalese ; + break ; + case wxFONTENCODING_MACBURMESE : + enc = kCFStringEncodingMacBurmese ; + break ; + case wxFONTENCODING_MACKHMER : + enc = kCFStringEncodingMacKhmer ; + break ; + case wxFONTENCODING_MACTHAI : + enc = kCFStringEncodingMacThai ; + break ; + case wxFONTENCODING_MACLAOTIAN : + enc = kCFStringEncodingMacLaotian ; + break ; + case wxFONTENCODING_MACGEORGIAN : + enc = kCFStringEncodingMacGeorgian ; + break ; + case wxFONTENCODING_MACARMENIAN : + enc = kCFStringEncodingMacArmenian ; + break ; + case wxFONTENCODING_MACCHINESESIMP : + enc = kCFStringEncodingMacChineseSimp ; + break ; + case wxFONTENCODING_MACTIBETAN : + enc = kCFStringEncodingMacTibetan ; + break ; + case wxFONTENCODING_MACMONGOLIAN : + enc = kCFStringEncodingMacMongolian ; + break ; + case wxFONTENCODING_MACETHIOPIC : + enc = kCFStringEncodingMacEthiopic ; + break ; + case wxFONTENCODING_MACCENTRALEUR : + enc = kCFStringEncodingMacCentralEurRoman ; + break ; + case wxFONTENCODING_MACVIATNAMESE : + enc = kCFStringEncodingMacVietnamese ; + break ; + case wxFONTENCODING_MACARABICEXT : + enc = kCFStringEncodingMacExtArabic ; + break ; + case wxFONTENCODING_MACSYMBOL : + enc = kCFStringEncodingMacSymbol ; + break ; + case wxFONTENCODING_MACDINGBATS : + enc = kCFStringEncodingMacDingbats ; + break ; + case wxFONTENCODING_MACTURKISH : + enc = kCFStringEncodingMacTurkish ; + break ; + case wxFONTENCODING_MACCROATIAN : + enc = kCFStringEncodingMacCroatian ; + break ; + case wxFONTENCODING_MACICELANDIC : + enc = kCFStringEncodingMacIcelandic ; + break ; + case wxFONTENCODING_MACROMANIAN : + enc = kCFStringEncodingMacRomanian ; + break ; + case wxFONTENCODING_MACCELTIC : + enc = kCFStringEncodingMacCeltic ; + break ; + case wxFONTENCODING_MACGAELIC : + enc = kCFStringEncodingMacGaelic ; + break ; +// case wxFONTENCODING_MACKEYBOARD : +// enc = kCFStringEncodingMacKeyboardGlyphs ; +// 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 ; +} + +class wxMBConv_cocoa : public wxMBConv +{ +public: + wxMBConv_cocoa() + { + Init(CFStringGetSystemEncoding()) ; + } + + wxMBConv_cocoa(const wxChar* name) + { + Init( wxCFStringEncFromFontEnc(wxFontMapper::Get()->CharsetToEncoding(name, false) ) ) ; + } + + wxMBConv_cocoa(wxFontEncoding encoding) + { + Init( wxCFStringEncFromFontEnc(encoding) ); + } + + ~wxMBConv_cocoa() + { + } + + void Init( CFStringEncoding encoding) + { + m_char_encoding = encoding ; + m_unicode_encoding = kCFStringEncodingUnicode; + } + + 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 + ); + + wxASSERT(theString); + + if (nOutSize == 0) + { + nRealOutSize = CFStringGetLength(theString) + 1; + CFRelease(theString); + return nRealOutSize - 1; + } + + CFRange theRange = { 0, CFStringGetLength(theString) }; + + CFStringGetCharacters(theString, theRange, szUniCharBuffer); + + + nRealOutSize = (CFStringGetLength(theString) + 1); + + CFRelease(theString); + + szUniCharBuffer[nRealOutSize-1] = '\0' ; + +#if SIZEOF_WCHAR_T == 4 + wxMBConvUTF16 converter ; + converter.MB2WC(szConvBuffer , (const char*)szUniCharBuffer , nRealOutSize ) ; + delete[] szUniCharBuffer; +#endif + if ( szOut == NULL ) + delete [] szConvBuffer; + + return nRealOutSize ; + } + + size_t WC2MB(char *szOut, const wchar_t *szUnConv, size_t nOutSize) const + { + size_t nBufSize = wxWcslen(szUnConv) + 1; + size_t nRealOutSize; + char* szBuffer = szOut; + UniChar* szUniBuffer = (UniChar*) szUnConv; + + if (szOut == NULL) + { + // worst case + nRealOutSize = wxString::WorstEncodingCase(nBufSize - 1, *this)+1 ; + szBuffer = new char[ nRealOutSize ] ; + } + else + nRealOutSize = nOutSize; + +#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)) ; + nBufSize /= sizeof(UniChar); + ++nBufSize; +#endif + + CFStringRef theString = CFStringCreateWithCharactersNoCopy( + NULL, //allocator + szUniBuffer, + nBufSize, + NULL //deallocator + ); + + 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; + + if(nOutSize == 0) + { +//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; + } + + CFRange theRange = {0, CFDataGetLength(theData) }; + CFDataGetBytes(theData, theRange, (UInt8*) szBuffer); + + CFRelease(theData); + +//TODO: This gets flagged as a non-malloced address by the debugger... +//#if SIZEOF_WCHAR_T == 4 +// delete[] szUniBuffer; +//#endif + return nRealOutSize - 1; + } + + bool IsOk() const + { + //TODO: check for invalid en/de/coding + return true; + } + +private: + CFStringEncoding m_char_encoding ; + CFStringEncoding m_unicode_encoding ; +}; + +#endif // defined(__WXCOCOA__) + +// ============================================================================ +// Mac conversion classes +// ============================================================================ + +#if defined(__WXMAC__) && defined(TARGET_CARBON) + +class wxMBConv_mac : public wxMBConv +{ +public: + wxMBConv_mac() + { + Init(CFStringGetSystemEncoding()) ; + } + + wxMBConv_mac(const wxChar* name) + { + Init( wxMacGetSystemEncFromFontEnc(wxFontMapper::Get()->CharsetToEncoding(name, false) ) ) ; + } + + wxMBConv_mac(wxFontEncoding encoding) + { + Init( wxMacGetSystemEncFromFontEnc(encoding) ); + } + + ~wxMBConv_mac() + { + OSStatus status = noErr ; + status = TECDisposeConverter(m_MB2WC_converter); + status = TECDisposeConverter(m_WC2MB_converter); + } + + + void Init( TextEncodingBase encoding) + { + OSStatus status = noErr ; + m_char_encoding = encoding ; + m_unicode_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ; + + status = TECCreateConverter(&m_MB2WC_converter, + m_char_encoding, + m_unicode_encoding); + status = TECCreateConverter(&m_WC2MB_converter, + m_unicode_encoding, + m_char_encoding); + } + + size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const + { + OSStatus status = noErr ; + ByteCount byteOutLen ; + ByteCount byteInLen = strlen(psz) ; + wchar_t *tbuf = NULL ; + UniChar* ubuf = NULL ; + size_t res = 0 ; + + if (buf == NULL) + { + n = byteInLen ; + tbuf = (wchar_t*) malloc( n * SIZEOF_WCHAR_T) ; + } + ByteCount byteBufferLen = n * sizeof( UniChar ) ; +#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); +#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 ) ; + free( ubuf ) ; +#else + res = byteOutLen / sizeof( UniChar ) ; +#endif + if ( buf == NULL ) + free(tbuf) ; + + if ( buf && res < n) + buf[res] = 0; + + return res ; + } + + size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const + { + OSStatus status = noErr ; + ByteCount byteOutLen ; + ByteCount byteInLen = wxWcslen(psz) * SIZEOF_WCHAR_T ; + + char *tbuf = NULL ; + + if (buf == NULL) + { + // worst case + n = wxString::WorstEncodingCase(byteInLen / SIZEOF_WCHAR_T, *this) + SIZEOF_WCHAR_T; + tbuf = (char*) malloc( n ) ; + } + + ByteCount byteBufferLen = n ; + UniChar* ubuf = NULL ; +#if SIZEOF_WCHAR_T == 4 + wxMBConvUTF16BE converter ; + size_t unicharlen = converter.WC2MB( NULL , psz , 0 ) ; + byteInLen = unicharlen ; + ubuf = (UniChar*) malloc( byteInLen + 2 ) ; + converter.WC2MB( (char*) ubuf , psz, unicharlen + 2 ) ; +#else + ubuf = (UniChar*) psz ; +#endif + status = TECConvertText(m_WC2MB_converter, (ConstTextPtr) ubuf , byteInLen, &byteInLen, + (TextPtr) (buf ? buf : tbuf) , byteBufferLen, &byteOutLen); +#if SIZEOF_WCHAR_T == 4 + free( ubuf ) ; +#endif + if ( buf == NULL ) + free(tbuf) ; + + size_t res = byteOutLen ; + if ( buf && res < n) + buf[res] = 0; + + return res ; + } + + bool IsOk() const + { return m_MB2WC_converter != NULL && m_WC2MB_converter != NULL ; } + +private: + TECObjectRef m_MB2WC_converter ; + TECObjectRef m_WC2MB_converter ; + + TextEncodingBase m_char_encoding ; + TextEncodingBase m_unicode_encoding ; +}; + +#endif // defined(__WXMAC__) && defined(TARGET_CARBON) // ============================================================================ // wxEncodingConverter based conversion classes @@ -1317,28 +2445,12 @@ void wxCSConv::SetName(const wxChar *charset) } } -static inline bool DoesntNeedConv(wxFontEncoding enc) -{ - return enc == wxFONTENCODING_DEFAULT || - enc == wxFONTENCODING_SYSTEM || - enc == wxFONTENCODING_ISO8859_1; -} - wxMBConv *wxCSConv::DoCreate() const { -#if wxUSE_FONTMAP - wxFontMapper * const fontMapper = wxFontMapper::Get(); - - wxFontEncoding encFromName = m_name ? fontMapper->CharsetToEncoding(m_name) - : wxFONTENCODING_SYSTEM; -#endif // wxUSE_FONTMAP - - // check for the special case of ASCII charset - if ( (!m_name && DoesntNeedConv(m_encoding)) -#if wxUSE_FONTMAP - || (m_name && DoesntNeedConv(encFromName)) -#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 + if ( m_encoding == wxFONTENCODING_ISO8859_1 ) { // don't convert at all return NULL; @@ -1354,9 +2466,18 @@ wxMBConv *wxCSConv::DoCreate() const // step (1) #ifdef HAVE_ICONV +#if !wxUSE_FONTMAP if ( m_name ) +#endif // !wxUSE_FONTMAP { - wxMBConv_iconv *conv = new wxMBConv_iconv(m_name); + wxString name(m_name); + +#if wxUSE_FONTMAP + if ( name.empty() ) + name = wxFontMapper::Get()->GetEncodingName(m_encoding); +#endif // wxUSE_FONTMAP + + wxMBConv_iconv *conv = new wxMBConv_iconv(name); if ( conv->IsOk() ) return conv; @@ -1366,20 +2487,56 @@ wxMBConv *wxCSConv::DoCreate() const #ifdef wxHAVE_WIN32_MB2WC { +#if wxUSE_FONTMAP wxMBConv_win32 *conv = m_name ? new wxMBConv_win32(m_name) : new wxMBConv_win32(m_encoding); if ( conv->IsOk() ) return conv; delete conv; +#else + return NULL; +#endif } #endif // wxHAVE_WIN32_MB2WC +#if defined(__WXMAC__) + { + if ( m_name || ( m_encoding < wxFONTENCODING_UTF16BE ) ) + { + + wxMBConv_mac *conv = m_name ? new wxMBConv_mac(m_name) + : new wxMBConv_mac(m_encoding); + if ( conv->IsOk() ) + return conv; + + delete conv; + } + } +#endif +#if defined(__WXCOCOA__) + { + if ( m_name || ( m_encoding <= wxFONTENCODING_UTF16 ) ) + { + + wxMBConv_cocoa *conv = m_name ? new wxMBConv_cocoa(m_name) + : new wxMBConv_cocoa(m_encoding); + if ( conv->IsOk() ) + return conv; + delete conv; + } + } +#endif // step (2) wxFontEncoding enc = m_encoding; #if wxUSE_FONTMAP - if ( enc == wxFONTENCODING_SYSTEM ) - enc = encFromName; + if ( enc == wxFONTENCODING_SYSTEM && m_name ) + { + // use "false" to suppress interactive dialogs -- we can be called from + // anywhere and popping up a dialog from here is the last thing we want to + // do + enc = wxFontMapper::Get()->CharsetToEncoding(m_name, false); + } #endif // wxUSE_FONTMAP switch ( enc ) @@ -1419,8 +2576,19 @@ wxMBConv *wxCSConv::DoCreate() const } #endif // wxUSE_FONTMAP - wxLogError(_("Cannot convert from the charset '%s'!"), - m_name ? m_name + // NB: This is a hack to prevent deadlock. What could otherwise happen + // in Unicode build: wxConvLocal creation ends up being here + // because of some failure and logs the error. But wxLog will try to + // attach timestamp, for which it will need wxConvLocal (to convert + // time to char* and then wchar_t*), but that fails, tries to log + // error, but wxLog has a (already locked) critical section that + // guards static buffer. + static bool alreadyLoggingError = false; + if (!alreadyLoggingError) + { + alreadyLoggingError = true; + wxLogError(_("Cannot convert from the charset '%s'!"), + m_name ? m_name : #if wxUSE_FONTMAP wxFontMapper::GetEncodingDescription(m_encoding).c_str() @@ -1428,6 +2596,8 @@ wxMBConv *wxCSConv::DoCreate() const wxString::Format(_("encoding %s"), m_encoding).c_str() #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP ); + alreadyLoggingError = false; + } return NULL; } @@ -1443,7 +2613,7 @@ void wxCSConv::CreateConvIfNeeded() const // encoding for this system if ( !m_name && m_encoding == wxFONTENCODING_SYSTEM ) { - self->m_encoding = wxLocale::GetSystemEncoding(); + self->m_name = wxStrdup(wxLocale::GetSystemEncodingName()); } #endif // wxUSE_INTL @@ -1483,7 +2653,19 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const if (buf) { for (size_t c = 0; c <= len; c++) - buf[c] = (psz[c] > 0xff) ? '?' : psz[c]; + { + if (psz[c] > 0xFF) + return (size_t)-1; + buf[c] = (char)psz[c]; + } + } + else + { + for (size_t c = 0; c <= len; c++) + { + if (psz[c] > 0xFF) + return (size_t)-1; + } } return len; @@ -1495,6 +2677,8 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const #ifdef __WINDOWS__ static wxMBConv_win32 wxConvLibcObj; +#elif defined(__WXMAC__) && !defined(__MACH__) + static wxMBConv_mac wxConvLibcObj ; #else static wxMBConvLibc wxConvLibcObj; #endif