don't use DLL export declaration with inline functions, it is ignored and just result...

[wxWidgets.git] / include / wx / unichar.h

diff --git a/include/wx/unichar.h b/include/wx/unichar.h
index 03b26cca2cb28cc6f4b32ccf3309c6acd7a4a334..ed7c494d37e717d3600f3a5ed4a8d460d22fdb28 100644 (file)
--- a/include/wx/unichar.h
+++ b/include/wx/unichar.h
@@ -65,12 +65,26 @@ public:
 #endif
 
     wxUniChar(int c) { m_value = c; }
+    wxUniChar(long int c) { m_value = c; }
 
     wxUniChar(const wxUniCharRef& c);
 
     // Returns Unicode code point value of the character
     value_type GetValue() const { return m_value; }
 
+#if wxUSE_UNICODE_UTF8
+    // buffer for single UTF-8 character
+    struct Utf8CharBuffer
+    {
+        char data[5];
+        operator const char*() const { return data; }
+    };
+
+    // returns the character encoded as UTF-8
+    // (NB: implemented in stringops.cpp)
+    Utf8CharBuffer AsUTF8() const;
+#endif // wxUSE_UNICODE_UTF8
+
     // Returns true if the character is an ASCII character:
     bool IsAscii() const { return m_value < 0x80; }
 
@@ -80,6 +94,7 @@ public:
     operator char() const { return To8bit(m_value); }
     operator wchar_t() const { return m_value; }
     operator int() const { return m_value; }
+    operator long int() const { return m_value; }
 #ifndef wxWCHAR_T_IS_UINT
     operator unsigned int() const { return m_value; }
 #endif
@@ -114,6 +129,7 @@ public:
     wxUniChar& operator=(unsigned char c) { m_value = From8bit((char)c); return *this; }
     wxUniChar& operator=(wchar_t c) { m_value = c; return *this; }
     wxUniChar& operator=(int c) { m_value = c; return *this; }
+    wxUniChar& operator=(long int c) { m_value = c; return *this; }
 #ifdef wxWINT_T_IS_SEPARATE_TYPE
     wxUniChar& operator=(wint_t c) { m_value = c; return *this; }
 #endif
@@ -127,6 +143,7 @@ public:
     bool operator op(unsigned char c) const { return m_value op From8bit((char)c); } \
     bool operator op(wchar_t c) const { return m_value op (value_type)c; }    \
     bool operator op(int c) const { return m_value op (value_type)c; }        \
+    bool operator op(long int 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)
@@ -182,6 +199,11 @@ public:
 #endif
 
     wxUniChar::value_type GetValue() const { return UniChar().GetValue(); }
+
+#if wxUSE_UNICODE_UTF8
+    wxUniChar::Utf8CharBuffer AsUTF8() const { return UniChar().AsUTF8(); }
+#endif // wxUSE_UNICODE_UTF8
+
     bool IsAscii() const { return UniChar().IsAscii(); }
 
     // Assignment operators:
@@ -198,6 +220,7 @@ public:
     wxUniCharRef& operator=(unsigned char c) { return *this = wxUniChar(c); }
     wxUniCharRef& operator=(wchar_t c) { return *this = wxUniChar(c); }
     wxUniCharRef& operator=(int c) { return *this = wxUniChar(c); }
+    wxUniCharRef& operator=(long int c) { return *this = wxUniChar(c); }
 #ifdef wxWINT_T_IS_SEPARATE_TYPE
     wxUniCharRef& operator=(wint_t c) { return *this = wxUniChar(c); }
 #endif
@@ -205,6 +228,7 @@ public:
     // Conversions to the same types as wxUniChar is convertible too:
     operator char() const { return UniChar(); }
     operator int() const { return UniChar(); }
+    operator long int() const { return UniChar(); }
     operator unsigned char() const { return UniChar(); }
     operator wchar_t() const { return UniChar(); }
 #ifdef wxWINT_T_IS_SEPARATE_TYPE
@@ -230,6 +254,7 @@ public:
     bool operator op(unsigned char c) const { return UniChar() op c; }        \
     bool operator op(wchar_t c) const { return UniChar() op c; }              \
     bool operator op(int c) const { return UniChar() op c; }                  \
+    bool operator op(long int 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)
@@ -280,7 +305,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