For non-Unicode, preserve binary compatibility by doing
#define wxChar char instead of typedef char wxChar. This is a temporary measure. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -25,9 +25,15 @@
|
|||||||
#if defined(__VISUALC__) && defined(__WIN32__)
|
#if defined(__VISUALC__) && defined(__WIN32__)
|
||||||
|
|
||||||
#include <tchar.h>
|
#include <tchar.h>
|
||||||
|
#if wxUSE_UNICODE // temporary - preserve binary compatibility
|
||||||
typedef _TCHAR wxChar;
|
typedef _TCHAR wxChar;
|
||||||
typedef _TSCHAR wxSChar;
|
typedef _TSCHAR wxSChar;
|
||||||
typedef _TUCHAR wxUChar;
|
typedef _TUCHAR wxUChar;
|
||||||
|
#else
|
||||||
|
#define wxChar char
|
||||||
|
#define wxSChar signed char
|
||||||
|
#define wxUChar unsigned char
|
||||||
|
#endif
|
||||||
|
|
||||||
// ctype.h functions
|
// ctype.h functions
|
||||||
#define wxIsalnum _istalnum
|
#define wxIsalnum _istalnum
|
||||||
@@ -173,9 +179,15 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
|
|||||||
#endif
|
#endif
|
||||||
#else//!Unicode
|
#else//!Unicode
|
||||||
|
|
||||||
|
#if 0 // temporary - preserve binary compatibilty
|
||||||
typedef char wxChar;
|
typedef char wxChar;
|
||||||
typedef signed char wxSChar;
|
typedef signed char wxSChar;
|
||||||
typedef unsigned char wxUChar;
|
typedef unsigned char wxUChar;
|
||||||
|
#else
|
||||||
|
#define wxChar char
|
||||||
|
#define wxSChar signed char
|
||||||
|
#define wxUChar unsigned char
|
||||||
|
#endif
|
||||||
|
|
||||||
#define _T(x) x
|
#define _T(x) x
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user