Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use _T() in public headers used under Unix.

Browse Source 
Avoid conflict with the Sun CC standard headers (see #10660).

Also update the change log to mention _T() changes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@61872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-09-09 22:37:05 +00:00
parent 9ff9127930
commit 6dfeacd66f
80 changed files with 326 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/debug.h
View File

@@ -123,13 +123,13 @@
if ( cond ) \
{} \
else \
wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, _T(#cond), msg)
wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, wxT(#cond), msg)
#else
#define wxASSERT_MSG(cond, msg) \
if ( cond ) \
; \
else \
wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, _T(#cond), msg)
wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, wxT(#cond), msg)
#endif
/* special form of assert: always triggers it (in debug mode) */
@@ -140,7 +140,7 @@
/* FAIL with some message and a condition */
#define wxFAIL_COND_MSG(cond, msg) \
wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, _T(cond), msg)
wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, wxT(cond), msg)
/* An assert helper used to avoid warning when testing constant expressions, */
/* i.e. wxASSERT( sizeof(int) == 4 ) can generate a compiler warning about */