X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/436bb9f539b73a12f1f46af36e923459eec7a5f3..2c17722ec8a15d93ef9ec4a4ff390a0db9a34d9d:/include/wx/unichar.h

diff --git a/include/wx/unichar.h b/include/wx/unichar.h
index 8896425f1e..f2bc4b0e48 100644
--- a/include/wx/unichar.h
+++ b/include/wx/unichar.h
@@ -18,7 +18,7 @@
 // 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__)) || \
+#if (defined(__GNUC__) && !defined(__DARWIN__) && !defined(__OS2__)) || \
     (defined(__VISUALC__) && defined(_NATIVE_WCHAR_T_DEFINED))
     #define wxWINT_T_IS_SEPARATE_TYPE
 #endif
@@ -31,6 +31,12 @@
     #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;
 
 // This class represents single Unicode character. It can be converted to
@@ -63,12 +69,18 @@ public:
     // Returns Unicode code point value of the character
     value_type GetValue() const { return m_value; }
 
+    // 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 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)
@@ -98,6 +110,7 @@ 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
@@ -142,7 +155,11 @@ private:
     typedef wxStringImpl::iterator iterator;
 
     // create the reference
+#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
@@ -150,26 +167,30 @@ 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!):
+#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
@@ -182,6 +203,9 @@ public:
 #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(); }
@@ -213,11 +237,19 @@ public:
 #endif
 
 private:
+#if wxUSE_UNICODE_UTF8
+    wxUniChar UniChar() const;
+#else
     wxUniChar UniChar() const { return *m_pos; }
+#endif
+
     friend class WXDLLIMPEXP_BASE wxUniChar;
 
 private:
-    // pointer to the character in string
+    // reference to the string and pointer to the character in string
+#if wxUSE_UNICODE_UTF8
+    wxStringImpl& m_str;
+#endif
     iterator m_pos;
 };
 
@@ -238,7 +270,7 @@ 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 wxUniChar&, wxCMP_REVERSE)
 wxDEFINE_COMPARISONS(wint_t, const wxUniCharRef&, wxCMP_REVERSE)
 #endif