From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 6 Oct 1999 18:12:57 +0000 (+0000)
Subject: _T() restored for compatibility
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/cdb516809531b5bedacd2d29652d8f8f8634e8d9

_T() restored for compatibility


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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 17afab729f..f51a494c29 100644
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -48,8 +48,6 @@
 
 #  include <tchar.h>
 
-#  define T(x)       _T(x)
-
 #  if wxUSE_UNICODE // temporary - preserve binary compatibility
 typedef  _TCHAR      wxChar;
 typedef  _TSCHAR     wxSChar;
@@ -233,7 +231,7 @@ typedef __WCHAR_TYPE__          wxChar;
 typedef signed __WCHAR_TYPE__   wxSChar;
 typedef unsigned __WCHAR_TYPE__ wxUChar;
 
-#      define T(x)                   L##x
+#      define _T(x)                   L##x
 
        // ctype.h functions (wctype.h)
 #      define  wxIsalnum   iswalnum
@@ -303,9 +301,9 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
 #   endif
 
 #   ifdef __FreeBSD__
-#     undef T
+#     undef _T
 #   endif
-#   define T(x)           x
+#   define _T(x)           x
 
      // ctype.h functions
 #   define  wxIsalnum   isalnum
@@ -564,6 +562,11 @@ WXDLLEXPORT int      wxSystem(const wxChar *psz);
 WXDLLEXPORT size_t   wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const struct tm *tm);
 #endif
 
+// although global macros with such names are really bad, we want to have
+// another name for _T() which should be used to avoid confusion between _T()
+// and _() in wxWindows sources
+#define T(x)       _T(x)
+
 // a Unicode-friendly __FILE__ analog
 #ifndef __TFILE__
     #define __XFILE__(x) T(x)