Globally replace _T() with wxT().
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -89,26 +89,26 @@ wxString wxTextBuffer::Translate(const wxString& text, wxTextFileType type)
|
||||
{
|
||||
wxChar ch = *i;
|
||||
switch ( ch ) {
|
||||
case _T('\n'):
|
||||
case wxT('\n'):
|
||||
// Dos/Unix line termination
|
||||
result += eol;
|
||||
chLast = 0;
|
||||
break;
|
||||
|
||||
case _T('\r'):
|
||||
if ( chLast == _T('\r') ) {
|
||||
case wxT('\r'):
|
||||
if ( chLast == wxT('\r') ) {
|
||||
// Mac empty line
|
||||
result += eol;
|
||||
}
|
||||
else {
|
||||
// just remember it: we don't know whether it is just "\r"
|
||||
// or "\r\n" yet
|
||||
chLast = _T('\r');
|
||||
chLast = wxT('\r');
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
if ( chLast == _T('\r') ) {
|
||||
if ( chLast == wxT('\r') ) {
|
||||
// Mac line termination
|
||||
result += eol;
|
||||
|
||||
@@ -226,7 +226,7 @@ wxTextFileType wxTextBuffer::GuessType() const
|
||||
case wxTextFileType_Unix: nUnix++; break; \
|
||||
case wxTextFileType_Dos: nDos++; break; \
|
||||
case wxTextFileType_Mac: nMac++; break; \
|
||||
default: wxFAIL_MSG(_T("unknown line terminator")); \
|
||||
default: wxFAIL_MSG(wxT("unknown line terminator")); \
|
||||
}
|
||||
|
||||
size_t n;
|
||||
|
||||
Reference in New Issue
Block a user