explicitly cast m_value to the resulting type in wxUniChar's integer conversion opera...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/unichar.h b/include/wx/unichar.h
index 8c61a2c898d31b0b0c067c0cdf2161181a7ecae9..e3bfb4c5877f606e2e485ef106c67827a54d7970 100644 (file)
--- a/include/wx/unichar.h
+++ b/include/wx/unichar.h
@@ -92,14 +92,14 @@ public:
     operator char() const { return To8bit(m_value); }
     operator unsigned char() const { return (unsigned char)To8bit(m_value); }
 #if wxWCHAR_T_IS_SEPARATE_TYPE
     operator char() const { return To8bit(m_value); }
     operator unsigned char() const { return (unsigned char)To8bit(m_value); }
 #if wxWCHAR_T_IS_SEPARATE_TYPE

-    operator wchar_t() const { return m_value; }
+    operator wchar_t() const { return (wchar_t)m_value; }

 #endif
 #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,
 
     // We need this operator for the "*p" part of expressions like "for (
     // const_iterator p = begin() + nStart; *p; ++p )". In this case,