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

Use wxT() instead of _T() in XTI code.

Browse Source 
_T() is deprecated and doesn't work with Solaris compiler, use wxT() instead.

Also change one occurrence of _T() inside a comment in wx/debug.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-01-09 18:48:39 +00:00
parent 9349c84fdb
commit ebd98179c5
5 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/debug.h
View File

@@ -162,7 +162,7 @@ inline void wxDisableAsserts() { wxSetAssertHandler(NULL); }
/*
wxOnAssert() is used by the debugging macros defined below. Different
overloads are needed because these macros can be used with or without _T().
overloads are needed because these macros can be used with or without wxT().
All of them are implemented in src/common/appcmn.cpp and unconditionally
call wxTheAssertHandler so the caller must check that it is non-NULL
@@ -172,7 +172,7 @@ inline void wxDisableAsserts() { wxSetAssertHandler(NULL); }
#if wxUSE_UNICODE
// these overloads are the ones typically used by debugging macros: we have to
// provide wxChar* msg version because it's common to use _T() in the macros
// provide wxChar* msg version because it's common to use wxT() in the macros
// and finally, we can't use const wx(char)* msg = NULL, because that would
// be ambiguous
//

8
include/wx/xtitypes.h
View File

@@ -355,7 +355,7 @@ public:
if ( m_toString )
(*m_toString)( data, result );
else
wxLogError( wxGetTranslation(_T("String conversions not supported")) );
wxLogError( wxGetTranslation(wxT("String conversions not supported")) );
}
// convert a string into a wxAny holding the corresponding data in this type
@@ -364,7 +364,7 @@ public:
if( m_fromString )
(*m_fromString)( data, result );
else
wxLogError( wxGetTranslation(_T("String conversions not supported")) );
wxLogError( wxGetTranslation(wxT("String conversions not supported")) );
}
// statics:
@@ -428,7 +428,7 @@ public:
if( m_toLong )
(*m_toLong)( data, result );
else
wxLogError( wxGetTranslation(_T("Long Conversions not supported")) );
wxLogError( wxGetTranslation(wxT("Long Conversions not supported")) );
}
// convert a long into a wxAny holding the corresponding data in this type
@@ -437,7 +437,7 @@ public:
if( m_fromLong )
(*m_fromLong)( data, result );
else
wxLogError( wxGetTranslation(_T("Long Conversions not supported")) );
wxLogError( wxGetTranslation(wxT("Long Conversions not supported")) );
}
private: