Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cast fix, workaround for pickeir compilers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2004-11-05 16:33:47 +00:00
parent 59059feb40
commit 6e394fc623
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/strconv.cpp
View File

@@ -473,12 +473,8 @@ size_t wxMBConvUTF7::WC2MB(char *buf, const wchar_t
len++; len++;
} }
#ifndef WC_UTF16 #ifndef WC_UTF16
#ifdef __VMS else if (((wxUint16)cc) > 0xffff)
else if (cc > 0xffff) {
#else
else if (cc > ((const wchar_t)0xffff))
#endif
{
// no surrogate pair generation (yet?) // no surrogate pair generation (yet?)
return (size_t)-1; return (size_t)-1;
} }

4
src/common/string.cpp
View File

@@ -1409,12 +1409,12 @@ const wxCharBuffer wxString::ToAscii() const
wxCharBuffer buffer(length()); wxCharBuffer buffer(length());
wxInt8 *dest = buffer.data(); char *dest = buffer.data();
const wchar_t *pwc = c_str(); const wchar_t *pwc = c_str();
for ( ;; ) for ( ;; )
{ {
*dest++ = (wxInt8)(*pwc > SCHAR_MAX ? wxT('_') : *pwc); *dest++ = (char)(*pwc > SCHAR_MAX ? wxT('_') : *pwc);
// the output string can't have embedded NULs anyhow, so we can safely // the output string can't have embedded NULs anyhow, so we can safely
// stop at first of them even if we do have any // stop at first of them even if we do have any