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

fixed compilation for Windows compilers now after last change: replaced conversions to ushort and uint with a conversion to wint_t but do it for (non-Apple) gcc only

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-23 15:16:08 +00:00
parent 2a686bd333
commit c961c0cfca
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/wx/unichar.h
View File

@@ -52,11 +52,13 @@ public:
// More conversions needed for other standard functions: uchar is for VC++ // More conversions needed for other standard functions: uchar is for VC++
// _mbxxx() ones (to which toxxx/isxxx() are mapped when _MBCS is defined) // _mbxxx() ones (to which toxxx/isxxx() are mapped when _MBCS is defined)
// and wint_t is either uint or ushort and it's easier for us to just // and some wide character functions take wint_t which happens to be the
// define both at this stage than have a separate test for what wint_t is // same as wchar_t for Windows compilers but not for g++ (except for the
// special Apple version)
operator unsigned char() const { return (unsigned char)To8bit(m_value); } operator unsigned char() const { return (unsigned char)To8bit(m_value); }
operator unsigned short() const { return m_value; } #if defined(__GNUC__) && !defined(__DARWIN__)
operator unsigned int() const { return m_value; } operator wint_t() const { return m_value; }
#endif
// We need this operator for the "*p" part of expressions like "for ( // We need this operator for the "*p" part of expressions like "for (
// const_iterator p = begin() + nStart; *p; ++p )". In this case, // const_iterator p = begin() + nStart; *p; ++p )". In this case,
@@ -148,8 +150,9 @@ public:
operator wchar_t() const { return UniChar(); } operator wchar_t() const { return UniChar(); }
operator int() const { return UniChar(); } operator int() const { return UniChar(); }
operator unsigned char() const { return UniChar(); } operator unsigned char() const { return UniChar(); }
operator unsigned short() const { return UniChar(); } #if defined(__GNUC__) && !defined(__DARWIN__)
operator unsigned int() const { return UniChar(); } operator wint_t() const { return UniChar(); }
#endif
// see wxUniChar::operator bool etc. for explanation // see wxUniChar::operator bool etc. for explanation
operator bool() const { return (bool)UniChar(); } operator bool() const { return (bool)UniChar(); }