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:
@@ -80,7 +80,7 @@ bool wxHeaderCtrl::Create(wxWindow *parent,
|
||||
if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
|
||||
return false;
|
||||
|
||||
if ( !MSWCreateControl(WC_HEADER, _T(""), pos, size) )
|
||||
if ( !MSWCreateControl(WC_HEADER, wxT(""), pos, size) )
|
||||
return false;
|
||||
|
||||
// special hack for margins when using comctl32.dll v6 or later: the
|
||||
@@ -156,7 +156,7 @@ wxSize wxHeaderCtrl::DoGetBestSize() const
|
||||
HDLAYOUT layout = { &rc, &wpos };
|
||||
if ( !Header_Layout(GetHwnd(), &layout) )
|
||||
{
|
||||
wxLogLastError(_T("Header_Layout"));
|
||||
wxLogLastError(wxT("Header_Layout"));
|
||||
return wxControl::DoGetBestSize();
|
||||
}
|
||||
|
||||
@@ -196,7 +196,7 @@ void wxHeaderCtrl::DoSetCount(unsigned int count)
|
||||
{
|
||||
if ( !Header_DeleteItem(GetHwnd(), 0) )
|
||||
{
|
||||
wxLogLastError(_T("Header_DeleteItem"));
|
||||
wxLogLastError(wxT("Header_DeleteItem"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -348,7 +348,7 @@ void wxHeaderCtrl::DoInsertItem(const wxHeaderColumn& col, unsigned int idx)
|
||||
if ( ::SendMessage(GetHwnd(), HDM_INSERTITEM,
|
||||
MSWToNativeIdx(idx), (LPARAM)&hdi) == -1 )
|
||||
{
|
||||
wxLogLastError(_T("Header_InsertItem()"));
|
||||
wxLogLastError(wxT("Header_InsertItem()"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -366,7 +366,7 @@ void wxHeaderCtrl::DoSetColumnsOrder(const wxArrayInt& order)
|
||||
|
||||
if ( !Header_SetOrderArray(GetHwnd(), orderShown.size(), &orderShown[0]) )
|
||||
{
|
||||
wxLogLastError(_T("Header_GetOrderArray"));
|
||||
wxLogLastError(wxT("Header_GetOrderArray"));
|
||||
}
|
||||
|
||||
m_colIndices = order;
|
||||
|
Reference in New Issue
Block a user