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:
@@ -151,7 +151,7 @@ wxStdRenderer::ArrowDirection wxStdRenderer::GetArrowDirection(wxDirection dir)
|
||||
return Arrow_Down;
|
||||
|
||||
default:
|
||||
wxFAIL_MSG(_T("unknown arrow direction"));
|
||||
wxFAIL_MSG(wxT("unknown arrow direction"));
|
||||
}
|
||||
|
||||
return Arrow_Max;
|
||||
@@ -438,7 +438,7 @@ void wxStdRenderer::DrawBorder(wxDC& dc,
|
||||
break;
|
||||
|
||||
default:
|
||||
wxFAIL_MSG(_T("unknown border type"));
|
||||
wxFAIL_MSG(wxT("unknown border type"));
|
||||
// fall through
|
||||
|
||||
case wxBORDER_DEFAULT:
|
||||
@@ -471,7 +471,7 @@ wxRect wxStdRenderer::GetBorderDimensions(wxBorder border) const
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
wxFAIL_MSG(_T("unknown border type"));
|
||||
wxFAIL_MSG(wxT("unknown border type"));
|
||||
// fall through
|
||||
|
||||
case wxBORDER_DEFAULT:
|
||||
@@ -862,7 +862,7 @@ wxSize wxStdRenderer::GetStatusBarBorders() const
|
||||
wxRect flat = GetBorderDimensions(wxBORDER_STATIC);
|
||||
wxASSERT_MSG( raised.x == raised.width && raised.y == raised.height &&
|
||||
flat.x == flat.width && flat.y == flat.height,
|
||||
_T("this code expects uniform borders, you must override GetStatusBarBorders") );
|
||||
wxT("this code expects uniform borders, you must override GetStatusBarBorders") );
|
||||
|
||||
// take the larger of flat/raised values:
|
||||
wxSize border(wxMax(raised.x, flat.x), wxMax(raised.y, flat.y));
|
||||
|
||||
Reference in New Issue
Block a user