X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb52c2b67139da20b026475aa48d73522e6afe2b..57d7f9888e18d350fb023fdccd39e0ab7a3bb8dd:/include/wx/unichar.h

diff --git a/include/wx/unichar.h b/include/wx/unichar.h
index 8917f569f6..9562669710 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,9 +58,7 @@ 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.
+#ifdef wxWINT_T_IS_SEPARATE_TYPE
     wxUniChar(wint_t c) { m_value = c; }
 #endif
 
@@ -48,15 +69,28 @@ public:
     // Returns Unicode code point value of the character
     value_type GetValue() const { return m_value; }
 
-    // Casts to char and wchar_t types:
+    // Returns true if the character is an ASCII character:
+    bool IsAscii() const { return m_value < 0x80; }
+
+    // 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 wint_t() const { return m_value; }
-#endif
     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 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); }
+#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,36 +110,29 @@ 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=(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:
 
     // 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
+    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)
 
-#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
+#ifdef wxWINT_T_IS_SEPARATE_TYPE
     int operator-(wint_t c) const { return m_value - (value_type)c; }
 #endif
 
@@ -125,9 +152,14 @@ 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) {}
+#if wxUSE_UNICODE_UTF8
+    wxUniCharRef(wxStringImpl& str, iterator pos) : m_str(str), m_pos(pos) {}
+#else
+    wxUniCharRef(iterator pos) : m_pos(pos) {}
+#endif
 
 public:
     // NB: we have to make this public, because we don't have wxString
@@ -135,38 +167,45 @@ 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)
+#if wxUSE_UNICODE_UTF8
+    static wxUniCharRef CreateForString(wxStringImpl& str, iterator pos)
+        { return wxUniCharRef(str, pos); }
+#else
+    static wxUniCharRef CreateForString(iterator pos)
         { return wxUniCharRef(pos); }
+#endif
 
     wxUniChar::value_type GetValue() const { return UniChar().GetValue(); }
+    bool IsAscii() const { return UniChar().IsAscii(); }
 
     // Assignment operators:
-    wxUniCharRef& operator=(const wxUniCharRef& c)
-    {
-        *m_pos = *c.m_pos;
-        return *this;
-    };
+#if wxUSE_UNICODE_UTF8
+    wxUniCharRef& operator=(const wxUniChar& c);
+#else
+    wxUniCharRef& operator=(const wxUniChar& c) { *m_pos = c; return *this; }
+#endif
 
-    wxUniCharRef& operator=(const wxUniChar& c)
-    {
-        *m_pos = c;
-        return *this;
-    };
+    wxUniCharRef& operator=(const wxUniCharRef& c)
+        { return *this = c.UniChar(); }
 
     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
 
-    // Casts to wxUniChar type:
+    // Conversions to the same types as wxUniChar is convertible too:
     operator char() const { return UniChar(); }
+    operator int() const { return UniChar(); }
     operator unsigned char() const { return UniChar(); }
     operator wchar_t() const { return UniChar(); }
-#ifndef wxWINT_T_IS_TYPEDEF
+#ifdef wxWINT_T_IS_SEPARATE_TYPE
     operator wint_t() const { return UniChar(); }
 #endif
-    operator int() const { return UniChar(); }
+#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(); }
@@ -177,23 +216,15 @@ 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
+    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)
 
-#undef wxDEFINE_UNICHARREF_OPERATOR_NO_WINT
 #undef wxDEFINE_UNICHARREF_OPERATOR
 
     // for expressions like c-'A':
@@ -201,17 +232,34 @@ 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
+#ifdef wxWINT_T_IS_SEPARATE_TYPE
     int operator-(wint_t c) const { return UniChar() - c; }
 #endif
 
 private:
-    wxUniChar UniChar() const { return *m_pos; }
+    wxUniChar UniChar() const
+    {
+#if wxUSE_UNICODE_UTF8
+        return DecodeChar(m_pos);
+#else
+        return *m_pos;
+#endif
+    }
+
+#if wxUSE_UNICODE_UTF8
+    // FIXME-UTF8: move this to a separate 'string operations' class
+    static wxUniChar DecodeChar(wxStringImpl::const_iterator i);
+    friend class WXDLLIMPEXP_BASE wxString;
+#endif
+
     friend class WXDLLIMPEXP_BASE wxUniChar;
 
 private:
-    // pointer to the character in string
-    wxChar *m_pos;
+    // reference to the string and pointer to the character in string
+#if wxUSE_UNICODE_UTF8
+    wxStringImpl& m_str;
+#endif
+    iterator m_pos;
 };
 
 inline wxUniChar::wxUniChar(const wxUniCharRef& c)
@@ -230,8 +278,8 @@ 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)
+#ifdef wxWINT_T_IS_SEPARATE_TYPE
+//wxDEFINE_COMPARISONS(wint_t, const wxUniChar&, wxCMP_REVERSE)
 wxDEFINE_COMPARISONS(wint_t, const wxUniCharRef&, wxCMP_REVERSE)
 #endif
 
@@ -241,10 +289,10 @@ 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-(const wxUniChar& c1, const wxUniCharRef& c2) { return -(c2 - c1); }
 inline int operator-(wchar_t c1, const wxUniCharRef& c2) { return -(c2 - c1); }
-#ifndef wxWINT_T_IS_TYPEDEF
+#ifdef wxWINT_T_IS_SEPARATE_TYPE
 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_ */