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:
@@ -208,9 +208,9 @@ void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
|
||||
|
||||
{
|
||||
wxRect rectUpdate = rgnUpdate.GetBox();
|
||||
wxLogTrace(_T("scrollbar"),
|
||||
_T("%s redraw: update box is (%d, %d)-(%d, %d)"),
|
||||
scrollbar->IsVertical() ? _T("vert") : _T("horz"),
|
||||
wxLogTrace(wxT("scrollbar"),
|
||||
wxT("%s redraw: update box is (%d, %d)-(%d, %d)"),
|
||||
scrollbar->IsVertical() ? wxT("vert") : wxT("horz"),
|
||||
rectUpdate.GetLeft(),
|
||||
rectUpdate.GetTop(),
|
||||
rectUpdate.GetRight(),
|
||||
@@ -247,8 +247,8 @@ void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
|
||||
|
||||
if ( rgnUpdate.Contains(rectBar) )
|
||||
{
|
||||
wxLogTrace(_T("scrollbar"),
|
||||
_T("drawing bar part %d at (%d, %d)-(%d, %d)"),
|
||||
wxLogTrace(wxT("scrollbar"),
|
||||
wxT("drawing bar part %d at (%d, %d)-(%d, %d)"),
|
||||
nBar + 1,
|
||||
rectBar.GetLeft(),
|
||||
rectBar.GetTop(),
|
||||
@@ -271,8 +271,8 @@ void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
|
||||
wxRect rectArrow = scrollbar->GetScrollbarRect(elem);
|
||||
if ( rgnUpdate.Contains(rectArrow) )
|
||||
{
|
||||
wxLogTrace(_T("scrollbar"),
|
||||
_T("drawing arrow %d at (%d, %d)-(%d, %d)"),
|
||||
wxLogTrace(wxT("scrollbar"),
|
||||
wxT("drawing arrow %d at (%d, %d)-(%d, %d)"),
|
||||
nArrow + 1,
|
||||
rectArrow.GetLeft(),
|
||||
rectArrow.GetTop(),
|
||||
@@ -296,8 +296,8 @@ void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
|
||||
wxRect rectThumb = scrollbar->GetScrollbarRect(elem);
|
||||
if ( rectThumb.width && rectThumb.height && rgnUpdate.Contains(rectThumb) )
|
||||
{
|
||||
wxLogTrace(_T("scrollbar"),
|
||||
_T("drawing thumb at (%d, %d)-(%d, %d)"),
|
||||
wxLogTrace(wxT("scrollbar"),
|
||||
wxT("drawing thumb at (%d, %d)-(%d, %d)"),
|
||||
rectThumb.GetLeft(),
|
||||
rectThumb.GetTop(),
|
||||
rectThumb.GetRight(),
|
||||
@@ -315,7 +315,7 @@ void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
|
||||
void wxControlRenderer::DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
|
||||
{
|
||||
wxASSERT_MSG( x1 == x2 || y1 == y2,
|
||||
_T("line must be either horizontal or vertical") );
|
||||
wxT("line must be either horizontal or vertical") );
|
||||
|
||||
if ( x1 == x2 )
|
||||
m_renderer->DrawVerticalLine(m_dc, x1, y1, y2);
|
||||
@@ -465,7 +465,7 @@ void wxControlRenderer::DrawProgressBar(const wxGauge *gauge)
|
||||
int step = gauge->IsVertical() ? sizeStep.y : sizeStep.x;
|
||||
|
||||
// we divide by it below!
|
||||
wxCHECK_RET( step, _T("invalid wxGauge step") );
|
||||
wxCHECK_RET( step, wxT("invalid wxGauge step") );
|
||||
|
||||
// round up to make the progress appear to start faster
|
||||
int lenTotal = gauge->IsVertical() ? rect.height : rect.width;
|
||||
|
||||
Reference in New Issue
Block a user