#ifndef _WX_UNICHAR_H_
#define _WX_UNICHAR_H_
+#include "wx/defs.h"
#include "wx/chartype.h"
class WXDLLIMPEXP_BASE wxUniCharRef;
// NB: this is not wchar_t on purpose, it needs to represent the entire
// Unicode code points range and wchar_t may be too small for that
// (e.g. on Win32 where wchar_t* is encoded in UTF-16)
- typedef unsigned int value_type;
+ typedef wxUint32 value_type;
wxUniChar() : m_value(0) {}
// Create the character from 8bit character value encoded in the current
// locale's charset.
wxUniChar(char c) { m_value = From8bit(c); }
+ wxUniChar(unsigned char c) { m_value = From8bit((char)c); }
// 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);
// 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 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; }
// We need this operator for the "*p" part of expressions like "for (
// const_iterator p = begin() + nStart; *p; ++p )". In this case,
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
- // Comparision operators:
- bool operator==(const wxUniChar& c) const { return m_value == c.m_value; }
- bool operator==(char c) const { return m_value == From8bit(c); }
- bool operator==(wchar_t c) const { return m_value == (value_type)c; }
-#ifndef wxWINT_T_IS_TYPEDEF
- bool operator==(wint_t c) const { return m_value == (value_type)c; }
-#endif
-
- bool operator!=(const wxUniChar& c) const { return m_value != c.m_value; }
- bool operator!=(char c) const { return m_value != From8bit(c); }
- bool operator!=(wchar_t c) const { return m_value != (value_type)c; }
-#ifndef wxWINT_T_IS_TYPEDEF
- bool operator!=(wint_t c) const { return m_value != (value_type)c; }
-#endif
+ // Comparison operators:
- bool operator>(const wxUniChar& c) const { return m_value > c.m_value; }
- bool operator>(char c) const { return m_value > (value_type)c; }
- bool operator>(wchar_t c) const { return m_value > (value_type)c; }
-#ifndef wxWINT_T_IS_TYPEDEF
- bool operator>(wint_t c) const { return m_value > (value_type)c; }
-#endif
-
- bool operator<(const wxUniChar& c) const { return m_value < c.m_value; }
- bool operator<(char c) const { return m_value < From8bit(c); }
- bool operator<(wchar_t c) const { return m_value < (value_type)c; }
-#ifndef wxWINT_T_IS_TYPEDEF
- bool operator<(wint_t c) const { return m_value < (value_type)c; }
-#endif
+ // define the given comparison operator for all the types
+#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>=(const wxUniChar& c) const { return m_value >= c.m_value; }
- bool operator>=(char c) const { return m_value >= From8bit(c); }
- bool operator>=(wchar_t c) const { return m_value >= (value_type)c; }
-#ifndef wxWINT_T_IS_TYPEDEF
- bool operator>=(wint_t c) const { return m_value >= (value_type)c; }
-#endif
+ wxFOR_ALL_COMPARISONS(wxDEFINE_UNICHAR_OPERATOR)
- bool operator<=(const wxUniChar& c) const { return m_value <= c.m_value; }
- bool operator<=(char c) const { return m_value <= From8bit(c); }
- bool operator<=(wchar_t c) const { return m_value <= (value_type)c; }
-#ifndef wxWINT_T_IS_TYPEDEF
- bool operator<=(wint_t c) const { return m_value <= (value_type)c; }
-#endif
+#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);
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 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(); }
// see wxUniChar::operator bool etc. for explanation
operator bool() const { return (bool)UniChar(); }
bool operator&&(bool v) const { return UniChar() && v; }
#endif
- // Comparision operators:
- bool operator==(const wxUniCharRef& c) const { return m_pos == c.m_pos; }
- bool operator==(const wxUniChar& c) const { return UniChar() == c; }
- bool operator==(char c) const { return UniChar() == c; }
- bool operator==(wchar_t c) const { return UniChar() == c; }
-#ifndef wxWINT_T_IS_TYPEDEF
- bool operator==(wint_t c) const { return UniChar() == c; }
-#endif
-
- bool operator!=(const wxUniCharRef& c) const { return m_pos != c.m_pos; }
- bool operator!=(const wxUniChar& c) const { return UniChar() != c; }
- bool operator!=(char c) const { return UniChar() != c; }
- bool operator!=(wchar_t c) const { return UniChar() != c; }
-#ifndef wxWINT_T_IS_TYPEDEF
- bool operator!=(wint_t c) const { return UniChar() != c; }
-#endif
-
- bool operator>(const wxUniCharRef& c) const { return UniChar() > c.UniChar(); }
- bool operator>(const wxUniChar& c) const { return UniChar() > c; }
- bool operator>(char c) const { return UniChar() > c; }
- bool operator>(wchar_t c) const { return UniChar() > c; }
-#ifndef wxWINT_T_IS_TYPEDEF
- bool operator>(wint_t c) const { return UniChar() > c; }
-#endif
+ // Comparison operators:
+#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; }
- bool operator<(const wxUniCharRef& c) const { return UniChar() < c.UniChar(); }
- bool operator<(const wxUniChar& c) const { return UniChar() < c; }
- bool operator<(char c) const { return UniChar() < c; }
- bool operator<(wchar_t c) const { return UniChar() < c; }
-#ifndef wxWINT_T_IS_TYPEDEF
- bool operator<(wint_t c) const { return UniChar() < c; }
-#endif
+ wxFOR_ALL_COMPARISONS(wxDEFINE_UNICHARREF_OPERATOR)
- bool operator>=(const wxUniCharRef& c) const { return UniChar() >= c.UniChar(); }
- bool operator>=(const wxUniChar& c) const { return UniChar() >= c; }
- bool operator>=(char c) const { return UniChar() >= c; }
- bool operator>=(wchar_t c) const { return UniChar() >= c; }
-#ifndef wxWINT_T_IS_TYPEDEF
- bool operator>=(wint_t c) const { return UniChar() >= c; }
-#endif
-
- bool operator<=(const wxUniCharRef& c) const { return UniChar() <= c.UniChar(); }
- bool operator<=(const wxUniChar& c) const { return UniChar() <= c; }
- bool operator<=(char c) const { return UniChar() <= c; }
- bool operator<=(wchar_t c) const { return UniChar() <= c; }
-#ifndef wxWINT_T_IS_TYPEDEF
- bool operator<=(wint_t c) const { return UniChar() <= c; }
-#endif
+#undef wxDEFINE_UNICHARREF_OPERATOR
// for expressions like c-'A':
int operator-(const wxUniCharRef& c) const { return UniChar() - c.UniChar(); }
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; }
m_value = c.UniChar().m_value;
}
-// Comparision operators for the case when wxUniChar(Ref) is the second operand:
-inline bool operator==(char c1, const wxUniChar& c2) { return c2 == c1; }
-inline bool operator==(wchar_t c1, const wxUniChar& c2) { return c2 == c1; }
-#ifndef wxWINT_T_IS_TYPEDEF
-inline bool operator==(wint_t c1, const wxUniChar& c2) { return c2 == c1; }
-#endif
-
-inline bool operator!=(char c1, const wxUniChar& c2) { return c2 != c1; }
-inline bool operator!=(wchar_t c1, const wxUniChar& c2) { return c2 != c1; }
-#ifndef wxWINT_T_IS_TYPEDEF
-inline bool operator!=(wint_t c1, const wxUniChar& c2) { return c2 != c1; }
-#endif
-
-inline bool operator>(char c1, const wxUniChar& c2) { return c2 < c1; }
-inline bool operator>(wchar_t c1, const wxUniChar& c2) { return c2 < c1; }
-#ifndef wxWINT_T_IS_TYPEDEF
-inline bool operator>(wint_t c1, const wxUniChar& c2) { return c2 < c1; }
-#endif
+// Comparison operators for the case when wxUniChar(Ref) is the second operand
+// implemented in terms of member comparison functions
-inline bool operator<(char c1, const wxUniChar& c2) { return c2 > c1; }
-inline bool operator<(wchar_t c1, const wxUniChar& c2) { return c2 > c1; }
-#ifndef wxWINT_T_IS_TYPEDEF
-inline bool operator<(wint_t c1, const wxUniChar& c2) { return c2 > c1; }
-#endif
+#define wxCMP_REVERSE(c1, c2, op) c2 op c1
-inline bool operator>=(char c1, const wxUniChar& c2) { return c2 <= c1; }
-inline bool operator>=(wchar_t c1, const wxUniChar& c2) { return c2 <= c1; }
-#ifndef wxWINT_T_IS_TYPEDEF
-inline bool operator>=(wint_t c1, const wxUniChar& c2) { return c2 <= c1; }
-#endif
+wxDEFINE_COMPARISONS(char, const wxUniChar&, wxCMP_REVERSE)
+wxDEFINE_COMPARISONS(char, const wxUniCharRef&, wxCMP_REVERSE)
-inline bool operator<=(char c1, const wxUniChar& c2) { return c2 >= c1; }
-inline bool operator<=(wchar_t c1, const wxUniChar& c2) { return c2 >= c1; }
-#ifndef wxWINT_T_IS_TYPEDEF
-inline bool operator<=(wint_t c1, const wxUniChar& c2) { return c2 >= c1; }
-#endif
+wxDEFINE_COMPARISONS(wchar_t, const wxUniChar&, wxCMP_REVERSE)
+wxDEFINE_COMPARISONS(wchar_t, const wxUniCharRef&, wxCMP_REVERSE)
+wxDEFINE_COMPARISONS(const wxUniChar&, const wxUniCharRef&, wxCMP_REVERSE)
-inline bool operator==(char c1, const wxUniCharRef& c2) { return c2 == c1; }
-inline bool operator==(wchar_t c1, const wxUniCharRef& c2) { return c2 == c1; }
-#ifndef wxWINT_T_IS_TYPEDEF
-inline bool operator==(wint_t c1, const wxUniCharRef& c2) { return c2 == c1; }
-#endif
-inline bool operator==(const wxUniChar& c1, const wxUniCharRef& c2) { return c2 == c1; }
-
-inline bool operator!=(char c1, const wxUniCharRef& c2) { return c2 != c1; }
-inline bool operator!=(wchar_t c1, const wxUniCharRef& c2) { return c2 != c1; }
-#ifndef wxWINT_T_IS_TYPEDEF
-inline bool operator!=(wint_t c1, const wxUniCharRef& c2) { return c2 != c1; }
-#endif
-inline bool operator!=(const wxUniChar& c1, const wxUniCharRef& c2) { return c2 != c1; }
-
-inline bool operator>(char c1, const wxUniCharRef& c2) { return c2 < c1; }
-inline bool operator>(wchar_t c1, const wxUniCharRef& c2) { return c2 < c1; }
-#ifndef wxWINT_T_IS_TYPEDEF
-inline bool operator>(wint_t c1, const wxUniCharRef& c2) { return c2 < c1; }
-#endif
-inline bool operator>(const wxUniChar& c1, const wxUniCharRef& c2) { return c2 < c1; }
-
-inline bool operator<(char c1, const wxUniCharRef& c2) { return c2 > c1; }
-inline bool operator<(wchar_t c1, const wxUniCharRef& c2) { return c2 > c1; }
-#ifndef wxWINT_T_IS_TYPEDEF
-inline bool operator<(wint_t c1, const wxUniCharRef& c2) { return c2 > c1; }
-#endif
-inline bool operator<(const wxUniChar& c1, const wxUniCharRef& c2) { return c2 > c1; }
-
-inline bool operator>=(char c1, const wxUniCharRef& c2) { return c2 <= c1; }
-inline bool operator>=(wchar_t c1, const wxUniCharRef& c2) { return c2 <= c1; }
-#ifndef wxWINT_T_IS_TYPEDEF
-inline bool operator>=(wint_t c1, const wxUniCharRef& c2) { return c2 <= c1; }
-#endif
-inline bool operator>=(const wxUniChar& c1, const wxUniCharRef& c2) { return c2 <= c1; }
-
-inline bool operator<=(char c1, const wxUniCharRef& c2) { return c2 >= c1; }
-inline bool operator<=(wchar_t c1, const wxUniCharRef& c2) { return c2 >= c1; }
-#ifndef wxWINT_T_IS_TYPEDEF
-inline bool operator<=(wint_t c1, const wxUniCharRef& c2) { return c2 >= c1; }
-#endif
-inline bool operator<=(const wxUniChar& c1, const wxUniCharRef& c2) { return c2 >= c1; }
+#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); }
-#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_ */
projects / wxWidgets.git / blobdiff