added alpha channel support to wxDFB's wxBitmap

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

diff --git a/include/wx/unichar.h b/include/wx/unichar.h
index 0d7c5a681bd30d0a1273695feb89ebdfb565e645..584b85cb4b34a8e8b15078815c1fd8ec08193e2f 100644 (file)
--- a/include/wx/unichar.h
+++ b/include/wx/unichar.h
@@ -16,17 +16,18 @@
 #include "wx/stringimpl.h"
 
 #ifndef wxWCHAR_T_IS_SEPARATE_TYPE
-    #ifdef __GNUG__
-        #define wxWCHAR_T_IS_SEPARATE_TYPE
-    #endif
-    #if defined(__VISUALC__) && defined(_NATIVE_WCHAR_T_DEFINED)
-        #define 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
-#ifdef wxWCHAR_T_IS_SEPARATE_TYPE
+#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)
@@ -53,7 +54,7 @@ public:
     wxUniChar(unsigned char c) { m_value = From8bit((char)c); }
 
     // Create the character from a wchar_t character value.
-#ifdef wxWCHAR_T_IS_SEPARATE_TYPE
+#if wxWCHAR_T_IS_SEPARATE_TYPE
     wxUniChar(wchar_t c) { m_value = c; }
 #endif
 
@@ -90,15 +91,15 @@ public:
     // functions
     operator char() const { return To8bit(m_value); }
     operator unsigned char() const { return (unsigned char)To8bit(m_value); }
-#ifdef wxWCHAR_T_IS_SEPARATE_TYPE
-    operator wchar_t() const { return m_value; }
+#if wxWCHAR_T_IS_SEPARATE_TYPE
+    operator wchar_t() const { return (wchar_t)m_value; }
 #endif
-    operator int() const { return m_value; }
-    operator unsigned int() const { return m_value; }
-    operator long int() const { return m_value; }
-    operator unsigned long int() const { return m_value; }
-    operator short int() const { return m_value; }
-    operator unsigned short int() const { return m_value; }
+    operator int() const { return (int)m_value; }
+    operator unsigned int() const { return (unsigned int)m_value; }
+    operator long int() const { return (long int)m_value; }
+    operator unsigned long int() const { return (unsigned long)m_value; }
+    operator short int() const { return (short int)m_value; }
+    operator unsigned short int() const { return (unsigned short int)m_value; }
 
     // We need this operator for the "*p" part of expressions like "for (
     // const_iterator p = begin() + nStart; *p; ++p )". In this case,
@@ -114,9 +115,10 @@ public:
 
     // Assignment operators:
     wxUniChar& operator=(const wxUniChar& c) { m_value = c.m_value; return *this; }
+    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; }
-#ifdef wxWCHAR_T_IS_SEPARATE_TYPE
+#if wxWCHAR_T_IS_SEPARATE_TYPE
     wxUniChar& operator=(wchar_t c) { m_value = c; return *this; }
 #endif
     wxUniChar& operator=(int c) { m_value = c; return *this; }
@@ -211,7 +213,7 @@ public:
 
     wxUniCharRef& operator=(char c) { return *this = wxUniChar(c); }
     wxUniCharRef& operator=(unsigned char c) { return *this = wxUniChar(c); }
-#ifdef wxWCHAR_T_IS_SEPARATE_TYPE
+#if wxWCHAR_T_IS_SEPARATE_TYPE
     wxUniCharRef& operator=(wchar_t c) { return *this = wxUniChar(c); }
 #endif
     wxUniCharRef& operator=(int c) { return *this = wxUniChar(c); }
@@ -224,7 +226,7 @@ public:
     // Conversions to the same types as wxUniChar is convertible too:
     operator char() const { return UniChar(); }
     operator unsigned char() const { return UniChar(); }
-#ifdef wxWCHAR_T_IS_SEPARATE_TYPE
+#if wxWCHAR_T_IS_SEPARATE_TYPE
     operator wchar_t() const { return UniChar(); }
 #endif
     operator int() const { return UniChar(); }
@@ -286,6 +288,12 @@ inline wxUniChar::wxUniChar(const wxUniCharRef& c)
     m_value = c.UniChar().m_value;
 }
 
+inline wxUniChar& wxUniChar::operator=(const wxUniCharRef& c)
+{
+    m_value = c.UniChar().m_value;
+    return *this;
+}
+
 // Comparison operators for the case when wxUniChar(Ref) is the second operand
 // implemented in terms of member comparison functions