X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2d122aa7d8f2b8d76aef0440b75cd640b56c707..3ac1094bead05e30462122d00e4859725d2ea59f:/include/wx/unichar.h?ds=inline diff --git a/include/wx/unichar.h b/include/wx/unichar.h index 584b85cb4b..e2232d2817 100644 --- a/include/wx/unichar.h +++ b/include/wx/unichar.h @@ -15,26 +15,8 @@ #include "wx/chartype.h" #include "wx/stringimpl.h" -#ifndef wxWCHAR_T_IS_SEPARATE_TYPE - // older versions of VC++ have wchar_t as typedef by default; this is - // configurable, so we have to check which behaviour is enabled - #if defined(__VISUALC__) && !defined(_NATIVE_WCHAR_T_DEFINED) - #define wxWCHAR_T_IS_SEPARATE_TYPE 0 - #else - #define wxWCHAR_T_IS_SEPARATE_TYPE 1 - #endif -#endif - -// helper macro for doing something dependent on whether wchar_t is or isn't a -// typedef inside another macro -#if wxWCHAR_T_IS_SEPARATE_TYPE - #define wxIF_WCHAR_T_TYPE(x) x -#else // !wxWCHAR_T_IS_SEPARATE_TYPE - #define wxIF_WCHAR_T_TYPE(x) -#endif // wxWCHAR_T_IS_SEPARATE_TYPE/!wxWCHAR_T_IS_SEPARATE_TYPE - -class WXDLLIMPEXP_BASE wxUniCharRef; -class WXDLLIMPEXP_BASE wxStringIteratorNode; +class WXDLLIMPEXP_FWD_BASE wxUniCharRef; +class WXDLLIMPEXP_FWD_BASE wxStringIteratorNode; // This class represents single Unicode character. It can be converted to // and from char or wchar_t and implements commonly used character operations. @@ -54,7 +36,7 @@ public: wxUniChar(unsigned char c) { m_value = From8bit((char)c); } // Create the character from a wchar_t character value. -#if wxWCHAR_T_IS_SEPARATE_TYPE +#if wxWCHAR_T_IS_REAL_TYPE wxUniChar(wchar_t c) { m_value = c; } #endif @@ -91,7 +73,7 @@ public: // functions operator char() const { return To8bit(m_value); } operator unsigned char() const { return (unsigned char)To8bit(m_value); } -#if wxWCHAR_T_IS_SEPARATE_TYPE +#if wxWCHAR_T_IS_REAL_TYPE operator wchar_t() const { return (wchar_t)m_value; } #endif operator int() const { return (int)m_value; } @@ -118,7 +100,7 @@ public: wxUniChar& operator=(const wxUniCharRef& c); wxUniChar& operator=(char c) { m_value = From8bit(c); return *this; } wxUniChar& operator=(unsigned char c) { m_value = From8bit((char)c); return *this; } -#if wxWCHAR_T_IS_SEPARATE_TYPE +#if wxWCHAR_T_IS_REAL_TYPE wxUniChar& operator=(wchar_t c) { m_value = c; return *this; } #endif wxUniChar& operator=(int c) { m_value = c; return *this; } @@ -155,8 +137,35 @@ public: private: - static value_type From8bit(char c); - static char To8bit(value_type c); + // notice that we implement these functions inline for 7-bit ASCII + // characters purely for performance reasons + static value_type From8bit(char c) + { +#if wxUSE_UNICODE + if ( (unsigned char)c < 0x80 ) + return c; + + return FromHi8bit(c); +#else + return c; +#endif + } + + static char To8bit(value_type c) + { +#if wxUSE_UNICODE + if ( c < 0x80 ) + return c; + + return ToHi8bit(c); +#else + return c; +#endif + } + + // helpers of the functions above called to deal with non-ASCII chars + static value_type FromHi8bit(char c); + static char ToHi8bit(value_type c); private: value_type m_value; @@ -213,7 +222,7 @@ public: wxUniCharRef& operator=(char c) { return *this = wxUniChar(c); } wxUniCharRef& operator=(unsigned char c) { return *this = wxUniChar(c); } -#if wxWCHAR_T_IS_SEPARATE_TYPE +#if wxWCHAR_T_IS_REAL_TYPE wxUniCharRef& operator=(wchar_t c) { return *this = wxUniChar(c); } #endif wxUniCharRef& operator=(int c) { return *this = wxUniChar(c); } @@ -226,7 +235,7 @@ public: // Conversions to the same types as wxUniChar is convertible too: operator char() const { return UniChar(); } operator unsigned char() const { return UniChar(); } -#if wxWCHAR_T_IS_SEPARATE_TYPE +#if wxWCHAR_T_IS_REAL_TYPE operator wchar_t() const { return UniChar(); } #endif operator int() const { return UniChar(); } @@ -273,7 +282,7 @@ private: wxUniChar UniChar() const { return *m_pos; } #endif - friend class WXDLLIMPEXP_BASE wxUniChar; + friend class WXDLLIMPEXP_FWD_BASE wxUniChar; private: // reference to the string and pointer to the character in string