X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2a686bd3331e0a5e927b11069d00fe366340b82a..05f32fc39e4aae6144c24971c74a11d119cea82e:/include/wx/unichar.h

diff --git a/include/wx/unichar.h b/include/wx/unichar.h
index a1bd85fa1c..b7fe54d9ca 100644
--- a/include/wx/unichar.h
+++ b/include/wx/unichar.h
@@ -13,6 +13,29 @@
 
 #include "wx/defs.h"
 #include "wx/chartype.h"
+#include "wx/stringimpl.h"
+
+// wint_t is just a typedef for wchar_t for many old compilers but for modern
+// ones it's a separate type and we must provide a conversion to it to allow
+// passing wxUniChar[Ref] to functions taking wint_t such as iswalnum() &c
+#if (defined(__GNUC__) && !defined(__DARWIN__) && !defined(__OS2__)) || \
+    (defined(__VISUALC__) && defined(_NATIVE_WCHAR_T_DEFINED))
+    #define wxWINT_T_IS_SEPARATE_TYPE
+#endif
+
+// helper macro for doing something dependent on whether wint_t is or isn't a
+// typedef inside another macro
+#ifdef wxWINT_T_IS_SEPARATE_TYPE
+    #define wxIF_WINT_T_TYPE(x) x
+#else // !wxWINT_T_IS_SEPARATE_TYPE
+    #define wxIF_WINT_T_TYPE(x)
+#endif // wxWINT_T_IS_SEPARATE_TYPE/!wxWINT_T_IS_SEPARATE_TYPE
+
+// wchar_t seems to be defined as unsigned short by all Windows compilers but
+// unsigned int everywhere else
+#ifndef __WIN32__
+    #define wxWCHAR_T_IS_UINT
+#endif
 
 class WXDLLIMPEXP_BASE wxUniCharRef;
 
@@ -35,6 +58,9 @@ public:
 
     // Create the character from a wchar_t character value.
     wxUniChar(wchar_t c) { m_value = c; }
+#ifdef wxWINT_T_IS_SEPARATE_TYPE
+    wxUniChar(wint_t c) { m_value = c; }
+#endif
 
     wxUniChar(int c) { m_value = c; }
 
@@ -49,14 +75,19 @@ public:
     operator char() const { return To8bit(m_value); }
     operator wchar_t() const { return m_value; }
     operator int() const { return m_value; }
+#ifndef wxWCHAR_T_IS_UINT
+    operator unsigned int() const { return m_value; }
+#endif
 
     // More conversions needed for other standard functions: uchar is for VC++
     // _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
-    // define both at this stage than have a separate test for what wint_t is
+    // 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); }
-    operator unsigned short() const { return m_value; }
-    operator unsigned int() const { return m_value; }
+#ifdef wxWINT_T_IS_SEPARATE_TYPE
+    operator wint_t() const { return m_value; }
+#endif
 
     // We need this operator for the "*p" part of expressions like "for (
     // const_iterator p = begin() + nStart; *p; ++p )". In this case,
@@ -76,6 +107,10 @@ 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; }
+    wxUniChar& operator=(int c) { m_value = c; return *this; }
+#ifdef wxWINT_T_IS_SEPARATE_TYPE
+    wxUniChar& operator=(wint_t c) { m_value = c; return *this; }
+#endif
 
     // Comparison operators:
 
@@ -83,7 +118,8 @@ public:
 #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; }
+    bool operator op(wchar_t c) const { return m_value op (value_type)c; }    \
+    wxIF_WINT_T_TYPE( bool operator op(wint_t c) const { return m_value op (value_type)c; } )
 
     wxFOR_ALL_COMPARISONS(wxDEFINE_UNICHAR_OPERATOR)
 
@@ -93,6 +129,9 @@ public:
     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; }
+#ifdef wxWINT_T_IS_SEPARATE_TYPE
+    int operator-(wint_t c) const { return m_value - (value_type)c; }
+#endif
 
 private:
     static value_type From8bit(char c);
@@ -110,9 +149,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
@@ -120,9 +160,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(); }
@@ -142,14 +180,22 @@ public:
 
     wxUniCharRef& operator=(char c) { return *this = wxUniChar(c); }
     wxUniCharRef& operator=(wchar_t c) { return *this = wxUniChar(c); }
+    wxUniCharRef& operator=(int c) { return *this = wxUniChar(c); }
+#ifdef wxWINT_T_IS_SEPARATE_TYPE
+    wxUniCharRef& operator=(wint_t c) { return *this = wxUniChar(c); }
+#endif
 
     // Conversions to the same types as wxUniChar is convertible too:
     operator char() const { return UniChar(); }
-    operator wchar_t() const { return UniChar(); }
     operator int() const { return UniChar(); }
     operator unsigned char() const { return UniChar(); }
-    operator unsigned short() const { return UniChar(); }
+    operator wchar_t() const { return UniChar(); }
+#ifdef wxWINT_T_IS_SEPARATE_TYPE
+    operator wint_t() const { return UniChar(); }
+#endif
+#ifndef wxWCHAR_T_IS_UINT
     operator unsigned int() const { return UniChar(); }
+#endif
 
     // see wxUniChar::operator bool etc. for explanation
     operator bool() const { return (bool)UniChar(); }
@@ -164,7 +210,8 @@ public:
     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; }
+    bool operator op(wchar_t c) const { return UniChar() op c; }              \
+    wxIF_WINT_T_TYPE( bool operator op(wint_t c) const { return UniChar() op c; } )
 
     wxFOR_ALL_COMPARISONS(wxDEFINE_UNICHARREF_OPERATOR)
 
@@ -175,6 +222,9 @@ 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; }
+#ifdef wxWINT_T_IS_SEPARATE_TYPE
+    int operator-(wint_t c) const { return UniChar() - c; }
+#endif
 
 private:
     wxUniChar UniChar() const { return *m_pos; }
@@ -182,7 +232,7 @@ private:
 
 private:
     // pointer to the character in string
-    wxChar *m_pos;
+    iterator m_pos;
 };
 
 inline wxUniChar::wxUniChar(const wxUniCharRef& c)
@@ -201,13 +251,21 @@ wxDEFINE_COMPARISONS(char, const wxUniCharRef&, wxCMP_REVERSE)
 wxDEFINE_COMPARISONS(wchar_t, const wxUniChar&, wxCMP_REVERSE)
 wxDEFINE_COMPARISONS(wchar_t, const wxUniCharRef&, wxCMP_REVERSE)
 
+#ifdef wxWINT_T_IS_SEPARATE_TYPE
+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
 
 // 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); }
 inline int operator-(const wxUniChar& c1, const wxUniCharRef& c2) { return -(c2 - c1); }
+inline int operator-(wchar_t c1, const wxUniCharRef& c2) { return -(c2 - c1); }
+#ifdef wxWINT_T_IS_SEPARATE_TYPE
+inline int operator-(wint_t c1, const wxUniCharRef& c2) { return -(c2 - c1); }
+#endif
 
 #endif /* _WX_UNICHAR_H_ */