X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cdb516809531b5bedacd2d29652d8f8f8634e8d9..da048e3d4c244a0d0b42e6e6970ad895ea948a53:/include/wx/wxchar.h

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index f51a494c29..2b6ba272fb 100644
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -303,7 +303,10 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
 #   ifdef __FreeBSD__
 #     undef _T
 #   endif
-#   define _T(x)           x
+
+#   if !defined(__MINGW32__) || !defined(_T)
+#     define _T(x)           x
+#   endif
 
      // ctype.h functions
 #   define  wxIsalnum   isalnum
@@ -565,11 +568,11 @@ WXDLLEXPORT size_t   wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const
 // 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)
+#define wxT(x)       _T(x)
 
 // a Unicode-friendly __FILE__ analog
 #ifndef __TFILE__
-    #define __XFILE__(x) T(x)
+    #define __XFILE__(x) wxT(x)
     #define __TFILE__ __XFILE__(__FILE__)
 #endif