size_t lenChunk = MB2WC(NULL, src, 0);
if ( lenChunk == 0 )
{
- // nothing left in the input string, conversion succeeded; but
- // still account for the trailing NULL
+ // nothing left in the input string, conversion succeeded;
+ // but still account for the trailing NULL
dstWritten++;
break;
}
if ( !srcEnd )
{
- // we convert the entire string in this cas, as we suppose that the
+ // we convert the entire string in this case, as we suppose that the
// string is NUL-terminated and so srcEnd is not used at all
break;
}
{
// make a copy in order to properly NUL-terminate the string
bufTmp = wxWCharBuffer(srcLen);
- memcpy(bufTmp.data(), src, srcLen*sizeof(wchar_t));
+ memcpy(bufTmp.data(), src, srcLen * sizeof(wchar_t));
src = bufTmp;
}
return dstWritten;
}
-size_t wxMBConv::MB2WC(wchar_t *out, const char *in, size_t outLen) const
+size_t wxMBConv::MB2WC(wchar_t *outBuff, const char *inBuff, size_t outLen) const
{
- size_t rc = ToWChar(out, outLen, in);
- if ( rc != wxCONV_FAILED )
+ size_t rc = ToWChar(outBuff, outLen, inBuff);
+ if ( rc != (size_t)wxCONV_FAILED )
{
// ToWChar() returns the buffer length, i.e. including the trailing
// NUL, while this method doesn't take it into account
return rc;
}
-size_t wxMBConv::WC2MB(char *out, const wchar_t *in, size_t outLen) const
+size_t wxMBConv::WC2MB(char *outBuff, const wchar_t *inBuff, size_t outLen) const
{
- size_t rc = FromWChar(out, outLen, in);
- if ( rc != wxCONV_FAILED )
+ size_t rc = FromWChar(outBuff, outLen, inBuff);
+ if ( rc != (size_t)wxCONV_FAILED )
{
rc -= GetMBNulLen();
}
{
// calculate the length of the buffer needed first
const size_t nLen = MB2WC(NULL, psz, 0);
- if ( nLen != wxCONV_FAILED )
+ if ( nLen != (size_t)wxCONV_FAILED )
{
// now do the actual conversion
wxWCharBuffer buf(nLen /* +1 added implicitly */);
if ( pwz )
{
const size_t nLen = WC2MB(NULL, pwz, 0);
- if ( nLen != wxCONV_FAILED )
+ if ( nLen != (size_t)wxCONV_FAILED )
{
// extra space for trailing NUL(s)
static const size_t extraLen = GetMaxMBNulLen();
}
const wxWCharBuffer
-wxMBConv::cMB2WC(const char *in, size_t inLen, size_t *outLen) const
+wxMBConv::cMB2WC(const char *inBuff, size_t inLen, size_t *outLen) const
{
- const size_t dstLen = ToWChar(NULL, 0, in, inLen);
- if ( dstLen != wxCONV_FAILED )
+ const size_t dstLen = ToWChar(NULL, 0, inBuff, inLen);
+ if ( dstLen != (size_t)wxCONV_FAILED )
{
wxWCharBuffer wbuf(dstLen - 1);
- if ( ToWChar(wbuf.data(), dstLen, in, inLen) )
+ if ( ToWChar(wbuf.data(), dstLen, inBuff, inLen) )
{
if ( outLen )
*outLen = dstLen - 1;
}
const wxCharBuffer
-wxMBConv::cWC2MB(const wchar_t *in, size_t inLen, size_t *outLen) const
+wxMBConv::cWC2MB(const wchar_t *inBuff, size_t inLen, size_t *outLen) const
{
- const size_t dstLen = FromWChar(NULL, 0, in, inLen);
- if ( dstLen != wxCONV_FAILED )
+ const size_t dstLen = FromWChar(NULL, 0, inBuff, inLen);
+ if ( dstLen != (size_t)wxCONV_FAILED )
{
wxCharBuffer buf(dstLen - 1);
- if ( FromWChar(buf.data(), dstLen, in, inLen) )
+ if ( FromWChar(buf.data(), dstLen, inBuff, inLen) )
{
if ( outLen )
*outLen = dstLen - 1;
+
return buf;
}
}
// plain ASCII char
if (buf)
*buf++ = (char)cc;
+
len++;
}
#ifndef WC_UTF16
len++;
}
}
+
if (buf)
*buf++ = '-';
len++;
}
}
+
if (buf && (len < n))
*buf = 0;
+
return len;
}
unsigned cnt;
for (cnt = 0; fc & 0x80; cnt++)
fc <<= 1;
+
if (!cnt)
{
// plain ASCII char
invalid = true;
break;
}
+
psz++;
res = (res << 6) | (cc & 0x3f);
}
*buf++ = (wchar_t)( L'0' + (on % 0100) / 010 );
*buf++ = (wchar_t)( L'0' + on % 010 );
}
+
opsz++;
len += 4;
}
}
}
}
+
if (buf && (len < n))
*buf = 0;
+
return len;
}
while (*psz && ((!buf) || (len < n)))
{
wxUint32 cc;
+
#ifdef WC_UTF16
// cast is ok for WC_UTF16
size_t pa = decode_utf16((const wxUint16 *)psz, cc);
psz += (pa == (size_t)-1) ? 1 : pa;
#else
- cc=(*psz++) & 0x7fffffff;
+ cc = (*psz++) & 0x7fffffff;
#endif
if ( (m_options & MAP_INVALID_UTF8_TO_PUA)
{
if (buf)
{
- *buf++ = (char) ((psz[0] - L'0')*0100 +
- (psz[1] - L'0')*010 +
+ *buf++ = (char) ((psz[0] - L'0') * 0100 +
+ (psz[1] - L'0') * 010 +
(psz[2] - L'0'));
}
else
{
unsigned cnt;
- for (cnt = 0; cc > utf8_max[cnt]; cnt++) {}
+ for (cnt = 0; cc > utf8_max[cnt]; cnt++)
+ {
+ }
+
if (!cnt)
{
// plain ASCII char
}
}
- if (buf && (len<n))
+ if (buf && (len < n))
*buf = 0;
return len;
// copy 16bit MB to 16bit String
size_t wxMBConvUTF16straight::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
- size_t len=0;
+ size_t len = 0;
while (*(wxUint16*)psz && (!buf || len < n))
{
psz += sizeof(wxUint16);
}
- if (buf && len<n) *buf=0;
+
+ if (buf && len < n)
+ *buf = 0;
return len;
}
// copy 16bit String to 16bit MB
size_t wxMBConvUTF16straight::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{
- size_t len=0;
+ size_t len = 0;
while (*psz && (!buf || len < n))
{
*(wxUint16*)buf = *psz;
buf += sizeof(wxUint16);
}
+
len += sizeof(wxUint16);
psz++;
}
- if (buf && len<=n-sizeof(wxUint16)) *(wxUint16*)buf=0;
+
+ if (buf && len <= n - sizeof(wxUint16))
+ *(wxUint16*)buf = 0;
return len;
}
*buf++ = ((char*)psz)[1];
*buf++ = ((char*)psz)[0];
}
+
len += 2;
psz++;
}
// copy 16bit MB to 32bit String
size_t wxMBConvUTF16straight::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
- size_t len=0;
+ size_t len = 0;
while (*(wxUint16*)psz && (!buf || len < n))
{
wxUint32 cc;
- size_t pa=decode_utf16((wxUint16*)psz, cc);
+ size_t pa = decode_utf16((wxUint16*)psz, cc);
if (pa == (size_t)-1)
return pa;
len++;
psz += pa * sizeof(wxUint16);
}
- if (buf && len<n) *buf=0;
+
+ if (buf && len < n)
+ *buf = 0;
return len;
}
while (*psz && (!buf || len < n))
{
wxUint16 cc[2];
- size_t pa=encode_utf16(*psz, cc);
+ size_t pa = encode_utf16(*psz, cc);
if (pa == (size_t)-1)
return pa;
len += pa*sizeof(wxUint16);
psz++;
}
- if (buf && len<=n-sizeof(wxUint16)) *(wxUint16*)buf=0;
+
+ if (buf && len <= n - sizeof(wxUint16))
+ *(wxUint16*)buf = 0;
return len;
}
{
wxUint32 cc;
char tmp[4];
- tmp[0]=psz[1]; tmp[1]=psz[0];
- tmp[2]=psz[3]; tmp[3]=psz[2];
- size_t pa=decode_utf16((wxUint16*)tmp, cc);
+ tmp[0] = psz[1];
+ tmp[1] = psz[0];
+ tmp[2] = psz[3];
+ tmp[3] = psz[2];
+
+ size_t pa = decode_utf16((wxUint16*)tmp, cc);
if (pa == (size_t)-1)
return pa;
len++;
psz += pa * sizeof(wxUint16);
}
- if (buf && len<n) *buf=0;
+
+ if (buf && len < n)
+ *buf = 0;
return len;
}
// swap 32bit String to 16bit MB
size_t wxMBConvUTF16swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{
- size_t len=0;
+ size_t len = 0;
while (*psz && (!buf || len < n))
{
wxUint16 cc[2];
- size_t pa=encode_utf16(*psz, cc);
+ size_t pa = encode_utf16(*psz, cc);
if (pa == (size_t)-1)
return pa;
}
}
- len += pa*sizeof(wxUint16);
+ len += pa * sizeof(wxUint16);
psz++;
}
- if (buf && len<=n-sizeof(wxUint16)) *(wxUint16*)buf=0;
+
+ if (buf && len <= n - sizeof(wxUint16))
+ *(wxUint16*)buf = 0;
return len;
}
// copy 32bit MB to 16bit String
size_t wxMBConvUTF32straight::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
- size_t len=0;
+ size_t len = 0;
while (*(wxUint32*)psz && (!buf || len < n))
{
wxUint16 cc[2];
- size_t pa=encode_utf16(*(wxUint32*)psz, cc);
+ size_t pa = encode_utf16(*(wxUint32*)psz, cc);
if (pa == (size_t)-1)
return pa;
if (pa > 1)
*buf++ = cc[1];
}
+
len += pa;
psz += sizeof(wxUint32);
}
- if (buf && len<n) *buf=0;
+
+ if (buf && len < n)
+ *buf = 0;
return len;
}
// copy 16bit String to 32bit MB
size_t wxMBConvUTF32straight::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{
- size_t len=0;
+ size_t len = 0;
while (*psz && (!buf || len < n))
{
*(wxUint32*)buf = cc;
buf += sizeof(wxUint32);
}
+
len += sizeof(wxUint32);
psz += pa;
}
- if (buf && len<=n-sizeof(wxUint32))
- *(wxUint32*)buf=0;
+ if (buf && len <= n - sizeof(wxUint32))
+ *(wxUint32*)buf = 0;
return len;
}
-
// swap 32bit MB to 16bit String
size_t wxMBConvUTF32swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
- size_t len=0;
+ size_t len = 0;
while (*(wxUint32*)psz && (!buf || len < n))
{
char tmp[4];
- tmp[0] = psz[3]; tmp[1] = psz[2];
- tmp[2] = psz[1]; tmp[3] = psz[0];
-
+ tmp[0] = psz[3];
+ tmp[1] = psz[2];
+ tmp[2] = psz[1];
+ tmp[3] = psz[0];
wxUint16 cc[2];
- size_t pa=encode_utf16(*(wxUint32*)tmp, cc);
+ size_t pa = encode_utf16(*(wxUint32*)tmp, cc);
if (pa == (size_t)-1)
return pa;
if (pa > 1)
*buf++ = cc[1];
}
+
len += pa;
psz += sizeof(wxUint32);
}
- if (buf && len<n)
- *buf=0;
+ if (buf && len < n)
+ *buf = 0;
return len;
}
// swap 16bit String to 32bit MB
size_t wxMBConvUTF32swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{
- size_t len=0;
+ size_t len = 0;
while (*psz && (!buf || len < n))
{
char cc[4];
// cast is ok for WC_UTF16
- size_t pa=decode_utf16((const wxUint16 *)psz, *(wxUint32*)cc);
+ size_t pa = decode_utf16((const wxUint16 *)psz, *(wxUint32*)cc);
if (pa == (size_t)-1)
return pa;
*buf++ = cc[1];
*buf++ = cc[0];
}
+
len += sizeof(wxUint32);
psz += pa;
}
- if (buf && len<=n-sizeof(wxUint32))
- *(wxUint32*)buf=0;
+ if (buf && len <= n - sizeof(wxUint32))
+ *(wxUint32*)buf = 0;
return len;
}
psz += sizeof(wxUint32);
}
- if (buf && len<n)
- *buf=0;
+ if (buf && len < n)
+ *buf = 0;
return len;
}
// copy 32bit String to 32bit MB
size_t wxMBConvUTF32straight::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{
- size_t len=0;
+ size_t len = 0;
while (*psz && (!buf || len < n))
{
psz++;
}
- if (buf && len<=n-sizeof(wxUint32))
- *(wxUint32*)buf=0;
+ if (buf && len <= n - sizeof(wxUint32))
+ *(wxUint32*)buf = 0;
return len;
}
// swap 32bit MB to 32bit String
size_t wxMBConvUTF32swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
- size_t len=0;
+ size_t len = 0;
while (*(wxUint32*)psz && (!buf || len < n))
{
((char *)buf)[3] = psz[0];
buf++;
}
+
len++;
psz += sizeof(wxUint32);
}
- if (buf && len<n)
- *buf=0;
+ if (buf && len < n)
+ *buf = 0;
return len;
}
// swap 32bit String to 32bit MB
size_t wxMBConvUTF32swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{
- size_t len=0;
+ size_t len = 0;
while (*psz && (!buf || len < n))
{
*buf++ = ((char *)psz)[1];
*buf++ = ((char *)psz)[0];
}
+
len += sizeof(wxUint32);
psz++;
}
- if (buf && len<=n-sizeof(wxUint32))
- *(wxUint32*)buf=0;
+ if (buf && len <= n - sizeof(wxUint32))
+ *(wxUint32*)buf = 0;
return len;
}
// the other direction
iconv_t m2w,
w2m;
+
#if wxUSE_THREADS
// guards access to m2w and w2m objects
wxMutex m_iconvMutex;
delete result;
return 0;
}
+
return result;
}
wxMutexLocker lock(wxConstCast(this, wxMBConv_iconv)->m_iconvMutex);
#endif // wxUSE_THREADS
-
size_t outbuf = n * SIZEOF_WCHAR_T;
size_t res, cres;
// VS: Use these instead of psz, buf because iconv() modifies its arguments:
// to calculate destination buffer requirement
wchar_t tbuf[8];
res = 0;
- do {
+
+ do
+ {
bufPtr = tbuf;
- outbuf = 8*SIZEOF_WCHAR_T;
+ outbuf = 8 * SIZEOF_WCHAR_T;
cres = iconv(m2w,
ICONV_CHAR_CAST(&pszPtr), &inbuf,
(char**)&bufPtr, &outbuf );
- res += 8-(outbuf/SIZEOF_WCHAR_T);
- } while ((cres==(size_t)-1) && (errno==E2BIG));
+ res += 8 - (outbuf / SIZEOF_WCHAR_T);
+ }
+ while ((cres == (size_t)-1) && (errno == E2BIG));
}
if (ICONV_FAILED(cres, inbuf))
tmpbuf = (wchar_t *)malloc(inbuf + SIZEOF_WCHAR_T);
for ( size_t i = 0; i < inlen; i++ )
tmpbuf[n] = WC_BSWAP(psz[i]);
+
tmpbuf[inlen] = L'\0';
psz = tmpbuf;
}
// have destination buffer, convert there
cres = iconv( w2m, ICONV_CHAR_CAST(&psz), &inbuf, &buf, &outbuf );
- res = n-outbuf;
+ res = n - outbuf;
// NB: iconv was given only wcslen(psz) characters on input, and so
// it couldn't convert the trailing zero. Let's do it ourselves
// to calculate destination buffer requirement
char tbuf[16];
res = 0;
- do {
- buf = tbuf; outbuf = 16;
+ do
+ {
+ buf = tbuf;
+ outbuf = 16;
cres = iconv( w2m, ICONV_CHAR_CAST(&psz), &inbuf, &buf, &outbuf );
res += 16 - outbuf;
- } while ((cres==(size_t)-1) && (errno==E2BIG));
+ }
+ while ((cres == (size_t)-1) && (errno == E2BIG));
}
if (ms_wcNeedsSwap)
char buf[8]; // should be enough for NUL in any encoding
size_t inLen = sizeof(wchar_t),
outLen = WXSIZEOF(buf);
- char *in = (char *)wnul;
- char *out = buf;
- if ( iconv(w2m, ICONV_CHAR_CAST(&in), &inLen, &out, &outLen) == (size_t)-1 )
+ char *inBuff = (char *)wnul;
+ char *outBuff = buf;
+ if ( iconv(w2m, ICONV_CHAR_CAST(&inBuff), &inLen, &outBuff, &outLen) == (size_t)-1 )
{
self->m_minMBCharWidth = (size_t)-1;
}
else // ok
{
- self->m_minMBCharWidth = out - buf;
+ self->m_minMBCharWidth = outBuff - buf;
}
}
{
default:
wxLogDebug(_T("Unexpected NUL length %d"), len);
- // fall through
+ self->m_minMBCharWidth = (size_t)-1;
+ break;
case 0:
self->m_minMBCharWidth = (size_t)-1;
break;
default:
- // unknown, be conseravtive by default
+ // unknown, be conservative by default
s_isWin98Or2k = 0;
+ break;
}
wxASSERT_MSG( s_isWin98Or2k != -1, _T("should be set above") );
#if defined(__WXCOCOA__)
-// RN: There is no UTF-32 support in either Core Foundation or
-// Cocoa. Strangely enough, internally Core Foundation uses
+// RN: There is no UTF-32 support in either Core Foundation or Cocoa.
+// Strangely enough, internally Core Foundation uses
// UTF 32 internally quite a bit - its just not public (yet).
#include <CoreFoundation/CFString.h>
CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
{
CFStringEncoding enc = kCFStringEncodingInvalidId ;
- if ( encoding == wxFONTENCODING_DEFAULT )
- {
- enc = CFStringGetSystemEncoding();
- }
- else switch( encoding)
+
+ switch (encoding)
{
+ case wxFONTENCODING_DEFAULT :
+ enc = CFStringGetSystemEncoding();
+ break ;
+
case wxFONTENCODING_ISO8859_1 :
enc = kCFStringEncodingISOLatin1 ;
break ;
// break ;
case wxFONTENCODING_CP437 :
- enc =kCFStringEncodingDOSLatinUS ;
+ enc = kCFStringEncodingDOSLatinUS ;
break ;
case wxFONTENCODING_CP850 :
enc = kCFStringEncodingDOSLatin1;
enc = kCFStringEncodingDOSCyrillic;
break ;
case wxFONTENCODING_CP866 :
- enc =kCFStringEncodingDOSRussian ;
+ enc = kCFStringEncodingDOSRussian ;
break ;
case wxFONTENCODING_CP874 :
enc = kCFStringEncodingDOSThai;
enc = kCFStringEncodingDOSJapanese;
break ;
case wxFONTENCODING_CP936 :
- enc =kCFStringEncodingDOSChineseSimplif ;
+ enc = kCFStringEncodingDOSChineseSimplif ;
break ;
case wxFONTENCODING_CP949 :
enc = kCFStringEncodingDOSKorean;
enc = kCFStringEncodingWindowsLatin2;
break ;
case wxFONTENCODING_CP1251 :
- enc =kCFStringEncodingWindowsCyrillic ;
+ enc = kCFStringEncodingWindowsCyrillic ;
break ;
case wxFONTENCODING_CP1252 :
- enc =kCFStringEncodingWindowsLatin1 ;
+ enc = kCFStringEncodingWindowsLatin1 ;
break ;
case wxFONTENCODING_CP1253 :
enc = kCFStringEncodingWindowsGreek;
enc = kCFStringEncodingWindowsLatin5;
break ;
case wxFONTENCODING_CP1255 :
- enc =kCFStringEncodingWindowsHebrew ;
+ enc = kCFStringEncodingWindowsHebrew ;
break ;
case wxFONTENCODING_CP1256 :
- enc =kCFStringEncodingWindowsArabic ;
+ enc = kCFStringEncodingWindowsArabic ;
break ;
case wxFONTENCODING_CP1257 :
enc = kCFStringEncodingWindowsBalticRim;
// case wxFONTENCODING_MACKEYBOARD :
// enc = kCFStringEncodingMacKeyboardGlyphs ;
// break ;
+
default :
// because gcc is picky
break ;
- } ;
+ }
+
return enc ;
}
#if wxUSE_FONTMAP
wxMBConv_mac(const wxChar* name)
{
- Init( wxMacGetSystemEncFromFontEnc(wxFontMapperBase::Get()->CharsetToEncoding(name, false) ) ) ;
+ Init( wxMacGetSystemEncFromFontEnc( wxFontMapperBase::Get()->CharsetToEncoding(name, false) ) ) ;
}
#endif
{
OSStatus status = noErr ;
m_char_encoding = encoding ;
- m_unicode_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
+ m_unicode_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault, 0, kUnicode16BitFormat) ;
status = TECCreateConverter(&m_MB2WC_converter,
m_char_encoding,
n = wxMax( 32 , 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
#else
res = byteOutLen / sizeof( UniChar ) ;
#endif
+
if ( buf == NULL )
free(tbuf) ;
ByteCount byteBufferLen = n ;
UniChar* ubuf = NULL ;
+
#if SIZEOF_WCHAR_T == 4
wxMBConvUTF16 converter ;
size_t unicharlen = converter.WC2MB( NULL , psz , 0 ) ;
#else
ubuf = (UniChar*) psz ;
#endif
- status = TECConvertText(m_WC2MB_converter, (ConstTextPtr) ubuf , byteInLen, &byteInLen,
- (TextPtr) (buf ? buf : tbuf) , byteBufferLen, &byteOutLen);
+
+ status = TECConvertText(
+ m_WC2MB_converter, (ConstTextPtr) ubuf, byteInLen, &byteInLen,
+ (TextPtr) (buf ? buf : tbuf), byteBufferLen, &byteOutLen);
+
#if SIZEOF_WCHAR_T == 4
free( ubuf ) ;
#endif
+
if ( buf == NULL )
free(tbuf) ;
virtual wxMBConv *Clone() const { return new wxMBConv_mac(*this); }
bool IsOk() const
- { return m_MB2WC_converter != NULL && m_WC2MB_converter != NULL ; }
+ { return m_MB2WC_converter != NULL && m_WC2MB_converter != NULL; }
private:
- TECObjectRef m_MB2WC_converter ;
- TECObjectRef m_WC2MB_converter ;
+ TECObjectRef m_MB2WC_converter;
+ TECObjectRef m_WC2MB_converter;
- TextEncodingBase m_char_encoding ;
- TextEncodingBase m_unicode_encoding ;
+ TextEncodingBase m_char_encoding;
+ TextEncodingBase m_unicode_encoding;
};
#endif // defined(__WXMAC__) && defined(TARGET_CARBON)
size_t inbuf = strlen(psz);
if (buf)
{
- if (!m2w.Convert(psz,buf))
+ if (!m2w.Convert(psz, buf))
return (size_t)-1;
}
return inbuf;
const size_t inbuf = wxWcslen(psz);
if (buf)
{
- if (!w2m.Convert(psz,buf))
+ if (!w2m.Convert(psz, buf))
return (size_t)-1;
}
delete result;
return 0;
}
+
return result;
}
#endif
}
#endif // wxHAVE_WIN32_MB2WC
+
#if defined(__WXMAC__)
{
// leave UTF16 and UTF32 to the built-ins of wx
if ( m_name || ( m_encoding < wxFONTENCODING_UTF16BE ||
( m_encoding >= wxFONTENCODING_MACMIN && m_encoding <= wxFONTENCODING_MACMAX ) ) )
{
-
#if wxUSE_FONTMAP
wxMBConv_mac *conv = m_name ? new wxMBConv_mac(m_name)
: new wxMBConv_mac(m_encoding);
}
}
#endif
+
#if defined(__WXCOCOA__)
{
if ( m_name || ( m_encoding <= wxFONTENCODING_UTF16 ) )
{
-
#if wxUSE_FONTMAP
wxMBConv_cocoa *conv = m_name ? new wxMBConv_cocoa(m_name)
: new wxMBConv_cocoa(m_encoding);
#else
wxMBConv_cocoa *conv = new wxMBConv_cocoa(m_encoding);
#endif
+
if ( conv->IsOk() )
return conv;
default:
// nothing to do but put here to suppress gcc warnings
- ;
+ break;
}
// step (3)
wxString::Format(_("encoding %s"), m_encoding).c_str()
#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
);
+
alreadyLoggingError = false;
}
{
if (psz[c] > 0xFF)
return (size_t)-1;
+
buf[c] = (char)psz[c];
}
}
projects / wxWidgets.git / commitdiff
