X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb52c2b67139da20b026475aa48d73522e6afe2b..e7aab1094ddc05b3f74bf6a9c71825f0d90819fb:/include/wx/unichar.h diff --git a/include/wx/unichar.h b/include/wx/unichar.h index 8917f569f6..e9645cfcab 100644 --- a/include/wx/unichar.h +++ b/include/wx/unichar.h @@ -13,6 +13,7 @@ #include "wx/defs.h" #include "wx/chartype.h" +#include "wx/stringimpl.h" class WXDLLIMPEXP_BASE wxUniCharRef; @@ -36,11 +37,6 @@ public: // Create the character from a wchar_t character value. wxUniChar(wchar_t c) { m_value = c; } -#ifndef wxWINT_T_IS_TYPEDEF - // Create the character from a wint_t character value. - wxUniChar(wint_t c) { m_value = c; } -#endif - wxUniChar(int c) { m_value = c; } wxUniChar(const wxUniCharRef& c); @@ -48,15 +44,22 @@ public: // Returns Unicode code point value of the character value_type GetValue() const { return m_value; } - // Casts to char and wchar_t types: + // Conversions to char and wchar_t types: all of those are needed to be + // able to pass wxUniChars to verious standard narrow and wide character + // functions operator char() const { return To8bit(m_value); } - operator unsigned char() const { return (unsigned char)To8bit(m_value); } operator wchar_t() const { return m_value; } -#ifndef wxWINT_T_IS_TYPEDEF + operator int() const { return m_value; } + + // More conversions needed for other standard functions: uchar is for VC++ + // _mbxxx() ones (to which toxxx/isxxx() are mapped when _MBCS is defined) + // and some wide character functions take wint_t which happens to be the + // 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); } +#if defined(__GNUC__) && !defined(__DARWIN__) operator wint_t() const { return m_value; } #endif - operator int() const { return m_value; } - operator unsigned int() const { return m_value; } // We need this operator for the "*p" part of expressions like "for ( // const_iterator p = begin() + nStart; *p; ++p )". In this case, @@ -76,38 +79,23 @@ public: wxUniChar& operator=(const wxUniChar& c) { m_value = c.m_value; return *this; } wxUniChar& operator=(char c) { m_value = From8bit(c); return *this; } wxUniChar& operator=(wchar_t c) { m_value = c; return *this; } -#ifndef wxWINT_T_IS_TYPEDEF - wxUniChar& operator=(wint_t c) { m_value = c; return *this; } -#endif // Comparison operators: // define the given comparison operator for all the types -#define wxDEFINE_UNICHAR_OPERATOR_NO_WINT(op) \ +#define wxDEFINE_UNICHAR_OPERATOR(op) \ bool operator op(const wxUniChar& c) const { return m_value op c.m_value; }\ bool operator op(char c) const { return m_value op From8bit(c); } \ bool operator op(wchar_t c) const { return m_value op (value_type)c; } -#ifdef wxWINT_T_IS_TYPEDEF - #define wxDEFINE_UNICHAR_OPERATOR wxDEFINE_UNICHAR_OPERATOR_NO_WINT -#else // wint_t is a separate type, need to overload for it too - #define wxDEFINE_UNICHAR_OPERATOR(op) \ - wxDEFINE_UNICHAR_OPERATOR_NO_WINT(op) \ - bool operator op(wint_t c) const { return m_value op (value_type)c; } -#endif - wxFOR_ALL_COMPARISONS(wxDEFINE_UNICHAR_OPERATOR) -#undef wxDEFINE_UNICHAR_OPERATOR_NO_WINT #undef wxDEFINE_UNICHAR_OPERATOR // this is needed for expressions like 'Z'-c int operator-(const wxUniChar& c) const { return m_value - c.m_value; } int operator-(char c) const { return m_value - From8bit(c); } int operator-(wchar_t c) const { return m_value - (value_type)c; } -#ifndef wxWINT_T_IS_TYPEDEF - int operator-(wint_t c) const { return m_value - (value_type)c; } -#endif private: static value_type From8bit(char c); @@ -125,9 +113,10 @@ private: class WXDLLIMPEXP_BASE wxUniCharRef { private: + typedef wxStringImpl::iterator iterator; + // create the reference - // FIXME-UTF8: the interface will need changes for UTF-8 build - wxUniCharRef(wxChar *pos) : m_pos(pos) {} + wxUniCharRef(iterator pos) : m_pos(pos) {} public: // NB: we have to make this public, because we don't have wxString @@ -135,9 +124,7 @@ public: // as friend; so at least don't use a ctor but a static function // that must be used explicitly (this is more than using 'explicit' // keyword on ctor!): - // - // FIXME-UTF8: the interface will need changes for UTF-8 build - static wxUniCharRef CreateForString(wxChar *pos) + static wxUniCharRef CreateForString(iterator pos) { return wxUniCharRef(pos); } wxUniChar::value_type GetValue() const { return UniChar().GetValue(); } @@ -158,15 +145,14 @@ public: wxUniCharRef& operator=(char c) { return *this = wxUniChar(c); } wxUniCharRef& operator=(wchar_t c) { return *this = wxUniChar(c); } - // Casts to wxUniChar type: + // Conversions to the same types as wxUniChar is convertible too: operator char() const { return UniChar(); } - operator unsigned char() const { return UniChar(); } operator wchar_t() const { return UniChar(); } -#ifndef wxWINT_T_IS_TYPEDEF + operator int() const { return UniChar(); } + operator unsigned char() const { return UniChar(); } +#if defined(__GNUC__) && !defined(__DARWIN__) operator wint_t() const { return UniChar(); } #endif - operator int() const { return UniChar(); } - operator unsigned int() const { return UniChar(); } // see wxUniChar::operator bool etc. for explanation operator bool() const { return (bool)UniChar(); } @@ -177,23 +163,14 @@ public: #endif // Comparison operators: -#define wxDEFINE_UNICHARREF_OPERATOR_NO_WINT(op) \ +#define wxDEFINE_UNICHARREF_OPERATOR(op) \ bool operator op(const wxUniCharRef& c) const { return UniChar() op c.UniChar(); }\ bool operator op(const wxUniChar& c) const { return UniChar() op c; } \ bool operator op(char c) const { return UniChar() op c; } \ bool operator op(wchar_t c) const { return UniChar() op c; } -#ifdef wxWINT_T_IS_TYPEDEF - #define wxDEFINE_UNICHARREF_OPERATOR wxDEFINE_UNICHARREF_OPERATOR_NO_WINT -#else // wint_t is a separate type, need to overload for it too - #define wxDEFINE_UNICHARREF_OPERATOR(op) \ - wxDEFINE_UNICHARREF_OPERATOR_NO_WINT(op) \ - bool operator op(wint_t c) const { return UniChar() op c; } -#endif - wxFOR_ALL_COMPARISONS(wxDEFINE_UNICHARREF_OPERATOR) -#undef wxDEFINE_UNICHARREF_OPERATOR_NO_WINT #undef wxDEFINE_UNICHARREF_OPERATOR // for expressions like c-'A': @@ -201,9 +178,6 @@ public: int operator-(const wxUniChar& c) const { return UniChar() - c; } int operator-(char c) const { return UniChar() - c; } int operator-(wchar_t c) const { return UniChar() - c; } -#ifndef wxWINT_T_IS_TYPEDEF - int operator-(wint_t c) const { return UniChar() - c; } -#endif private: wxUniChar UniChar() const { return *m_pos; } @@ -211,7 +185,7 @@ private: private: // pointer to the character in string - wxChar *m_pos; + iterator m_pos; }; inline wxUniChar::wxUniChar(const wxUniCharRef& c) @@ -230,11 +204,6 @@ wxDEFINE_COMPARISONS(char, const wxUniCharRef&, wxCMP_REVERSE) wxDEFINE_COMPARISONS(wchar_t, const wxUniChar&, wxCMP_REVERSE) wxDEFINE_COMPARISONS(wchar_t, const wxUniCharRef&, wxCMP_REVERSE) -#ifndef wxWINT_T_IS_TYPEDEF -wxDEFINE_COMPARISONS(wint_t, const wxUniChar&, wxCMP_REVERSE) -wxDEFINE_COMPARISONS(wint_t, const wxUniCharRef&, wxCMP_REVERSE) -#endif - wxDEFINE_COMPARISONS(const wxUniChar&, const wxUniCharRef&, wxCMP_REVERSE) #undef wxCMP_REVERSE @@ -242,9 +211,6 @@ wxDEFINE_COMPARISONS(const wxUniChar&, const wxUniCharRef&, wxCMP_REVERSE) // for expressions like c-'A': inline int operator-(char c1, const wxUniCharRef& c2) { return -(c2 - c1); } inline int operator-(wchar_t c1, const wxUniCharRef& c2) { return -(c2 - c1); } -#ifndef wxWINT_T_IS_TYPEDEF -inline int operator-(wint_t c1, const wxUniCharRef& c2) { return -(c2 - c1); } -#endif inline int operator-(const wxUniChar& c1, const wxUniCharRef& c2) { return -(c2 - c1); } #endif /* _WX_UNICHAR_H_ */