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:
@@ -569,7 +569,7 @@ void wxDCImpl::GetMultiLineTextExtent(const wxString& text,
|
||||
wxString curLine;
|
||||
for ( wxString::const_iterator pc = text.begin(); ; ++pc )
|
||||
{
|
||||
if ( pc == text.end() || *pc == _T('\n') )
|
||||
if ( pc == text.end() || *pc == wxT('\n') )
|
||||
{
|
||||
if ( curLine.empty() )
|
||||
{
|
||||
@@ -585,7 +585,7 @@ void wxDCImpl::GetMultiLineTextExtent(const wxString& text,
|
||||
if ( !heightLineDefault )
|
||||
{
|
||||
// but we don't know it yet - choose something reasonable
|
||||
DoGetTextExtent(_T("W"), NULL, &heightLineDefault,
|
||||
DoGetTextExtent(wxT("W"), NULL, &heightLineDefault,
|
||||
NULL, NULL, font);
|
||||
}
|
||||
|
||||
@@ -656,7 +656,7 @@ wxDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
|
||||
wxCoord ysrcMask)
|
||||
{
|
||||
wxCHECK_MSG( srcWidth && srcHeight && dstWidth && dstHeight, false,
|
||||
_T("invalid blit size") );
|
||||
wxT("invalid blit size") );
|
||||
|
||||
// emulate the stretching by modifying the DC scale
|
||||
double xscale = (double)srcWidth/dstWidth,
|
||||
|
||||
Reference in New Issue
Block a user