Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Globally replace _T() with wxT().

Browse Source 
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:
Vadim Zeitlin
2009-07-23 20:30:22 +00:00
parent 32cdc45397
commit 9a83f86094
798 changed files with 10370 additions and 10349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/generic/htmllbox.cpp
View File

@@ -318,11 +318,11 @@ void wxHtmlListBox::CacheItem(size_t n) const
wxHtmlContainerCell *cell = (wxHtmlContainerCell *)m_htmlParser->
Parse(OnGetItemMarkup(n));
wxCHECK_RET( cell, _T("wxHtmlParser::Parse() returned NULL?") );
wxCHECK_RET( cell, wxT("wxHtmlParser::Parse() returned NULL?") );
// set the cell's ID to item's index so that CellCoordsToPhysical()
// can quickly find the item:
cell->SetId(wxString::Format(_T("%lu"), (unsigned long)n));
cell->SetId(wxString::Format(wxT("%lu"), (unsigned long)n));
cell->Layout(GetClientSize().x - 2*GetMargins().x);
@@ -397,7 +397,7 @@ void wxHtmlListBox::OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const
CacheItem(n);
wxHtmlCell *cell = m_cache->Get(n);
wxCHECK_RET( cell, _T("this cell should be cached!") );
wxCHECK_RET( cell, wxT("this cell should be cached!") );
wxHtmlRenderingInfo htmlRendInfo;
@@ -430,7 +430,7 @@ wxCoord wxHtmlListBox::OnMeasureItem(size_t n) const
CacheItem(n);
wxHtmlCell *cell = m_cache->Get(n);
wxCHECK_MSG( cell, 0, _T("this cell should be cached!") );
wxCHECK_MSG( cell, 0, wxT("this cell should be cached!") );
return cell->GetHeight() + cell->GetDescent() + 4;
}
@@ -531,17 +531,17 @@ bool wxHtmlListBox::PhysicalCoordsToCell(wxPoint& pos, wxHtmlCell*& cell) const
size_t wxHtmlListBox::GetItemForCell(const wxHtmlCell *cell) const
{
wxCHECK_MSG( cell, 0, _T("no cell") );
wxCHECK_MSG( cell, 0, wxT("no cell") );
cell = cell->GetRootCell();
wxCHECK_MSG( cell, 0, _T("no root cell") );
wxCHECK_MSG( cell, 0, wxT("no root cell") );
// the cell's ID contains item index, see CacheItem():
unsigned long n;
if ( !cell->GetId().ToULong(&n) )
{
wxFAIL_MSG( _T("unexpected root cell's ID") );
wxFAIL_MSG( wxT("unexpected root cell's ID") );
return 0;
}