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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index c5b0529e992c95420408f3d5881b4a407f6f0e77..7f1c3e5cc459c5ed63c788693e3f1f677ae56611 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -25,9 +25,15 @@
 #if defined(__VISUALC__) && defined(__WIN32__)
 
 #include <tchar.h>
+#if wxUSE_UNICODE // temporary - preserve binary compatibility
 typedef  _TCHAR      wxChar;
 typedef  _TSCHAR     wxSChar;
 typedef  _TUCHAR     wxUChar;
+#else
+#define wxChar char
+#define wxSChar signed char
+#define wxUChar unsigned char
+#endif
 
    // ctype.h functions
 #define  wxIsalnum   _istalnum
@@ -173,9 +179,15 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
 #endif
 #else//!Unicode
 
+#if 0 // temporary - preserve binary compatibilty
 typedef char            wxChar;
 typedef signed char     wxSChar;
 typedef unsigned char   wxUChar;
+#else
+#define wxChar char
+#define wxSChar signed char
+#define wxUChar unsigned char
+#endif
 
 #define _T(x)           x