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:
@@ -1172,7 +1172,7 @@ void *wxULongLongWx::asArray(void) const
|
||||
while ( ll != 0 ) \
|
||||
{ \
|
||||
long digit = (ll % 10).ToLong(); \
|
||||
result.Prepend((wxChar)(_T('0') - digit)); \
|
||||
result.Prepend((wxChar)(wxT('0') - digit)); \
|
||||
ll /= 10; \
|
||||
} \
|
||||
} \
|
||||
@@ -1181,15 +1181,15 @@ void *wxULongLongWx::asArray(void) const
|
||||
while ( ll != 0 ) \
|
||||
{ \
|
||||
long digit = (ll % 10).ToLong(); \
|
||||
result.Prepend((wxChar)(_T('0') + digit)); \
|
||||
result.Prepend((wxChar)(wxT('0') + digit)); \
|
||||
ll /= 10; \
|
||||
} \
|
||||
} \
|
||||
\
|
||||
if ( result.empty() ) \
|
||||
result = _T('0'); \
|
||||
result = wxT('0'); \
|
||||
else if ( neg ) \
|
||||
result.Prepend(_T('-')); \
|
||||
result.Prepend(wxT('-')); \
|
||||
\
|
||||
return result; \
|
||||
}
|
||||
@@ -1204,12 +1204,12 @@ void *wxULongLongWx::asArray(void) const
|
||||
\
|
||||
while ( ll != 0 ) \
|
||||
{ \
|
||||
result.Prepend((wxChar)(_T('0') + (ll % 10).ToULong())); \
|
||||
result.Prepend((wxChar)(wxT('0') + (ll % 10).ToULong())); \
|
||||
ll /= 10; \
|
||||
} \
|
||||
\
|
||||
if ( result.empty() ) \
|
||||
result = _T('0'); \
|
||||
result = wxT('0'); \
|
||||
\
|
||||
return result; \
|
||||
}
|
||||
@@ -1263,7 +1263,7 @@ WXDLLIMPEXP_BASE wxTextOutputStream& operator<< (wxTextOutputStream& o, const wx
|
||||
return o << ll.ToString();
|
||||
}
|
||||
|
||||
#define READ_STRING_CHAR(s, idx, len) ((idx!=len) ? (wxChar)s[idx++] : _T('\0'))
|
||||
#define READ_STRING_CHAR(s, idx, len) ((idx!=len) ? (wxChar)s[idx++] : wxT('\0'))
|
||||
|
||||
WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxULongLong &ll)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user