Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxUniChar wchar_t handling fixes for Borland, DMC and Watcom compilers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-29 19:11:09 +00:00
parent e16916eae4
commit 4d62edfb07
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/wx/unichar.h
View File

@@ -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,7 +91,7 @@ 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
#if wxWCHAR_T_IS_SEPARATE_TYPE
operator wchar_t() const { return m_value; }
#endif
operator int() const { return m_value; }
@@ -116,7 +117,7 @@ public:
wxUniChar& operator=(const wxUniChar& c) { m_value = c.m_value; return *this; }
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 +212,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 +225,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(); }