let _T() work with macros (modified patch 1437983)

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index ad650d57e8b68229b145a8fa5a461f50b8fcbb60..52f6af64e227f5719495dc4b03920ff53a8947bf 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -232,7 +232,8 @@
     #if !wxUSE_UNICODE
         #define _T(x) x
     #else /* Unicode */
-        #define _T(x) L ## x
+        /* use wxCONCAT_HELPER so that x could be expanded if it's a macro */
+        #define _T(x) wxCONCAT_HELPER(L, x)
     #endif /* ASCII/Unicode */
 #endif /* !defined(_T) */