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:
@@ -219,7 +219,7 @@ bool wxRegion::DoUnionWithRegion( const wxRegion& region )
|
||||
|
||||
bool wxRegion::DoIntersect( const wxRegion& region )
|
||||
{
|
||||
wxCHECK_MSG( region.Ok(), false, _T("invalid region") );
|
||||
wxCHECK_MSG( region.Ok(), false, wxT("invalid region") );
|
||||
|
||||
if (!m_refData)
|
||||
{
|
||||
@@ -238,7 +238,7 @@ bool wxRegion::DoIntersect( const wxRegion& region )
|
||||
|
||||
bool wxRegion::DoSubtract( const wxRegion& region )
|
||||
{
|
||||
wxCHECK_MSG( region.Ok(), false, _T("invalid region") );
|
||||
wxCHECK_MSG( region.Ok(), false, wxT("invalid region") );
|
||||
|
||||
if (!m_refData)
|
||||
{
|
||||
@@ -257,7 +257,7 @@ bool wxRegion::DoSubtract( const wxRegion& region )
|
||||
|
||||
bool wxRegion::DoXor( const wxRegion& region )
|
||||
{
|
||||
wxCHECK_MSG( region.Ok(), false, _T("invalid region") );
|
||||
wxCHECK_MSG( region.Ok(), false, wxT("invalid region") );
|
||||
|
||||
if (!m_refData)
|
||||
{
|
||||
@@ -474,28 +474,28 @@ wxRegionIterator wxRegionIterator::operator ++ (int)
|
||||
|
||||
wxCoord wxRegionIterator::GetX() const
|
||||
{
|
||||
wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
|
||||
wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") );
|
||||
|
||||
return ((wxRIRefData*)m_refData)->m_rects[m_current].x;
|
||||
}
|
||||
|
||||
wxCoord wxRegionIterator::GetY() const
|
||||
{
|
||||
wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
|
||||
wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") );
|
||||
|
||||
return ((wxRIRefData*)m_refData)->m_rects[m_current].y;
|
||||
}
|
||||
|
||||
wxCoord wxRegionIterator::GetW() const
|
||||
{
|
||||
wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
|
||||
wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") );
|
||||
|
||||
return ((wxRIRefData*)m_refData)->m_rects[m_current].width;
|
||||
}
|
||||
|
||||
wxCoord wxRegionIterator::GetH() const
|
||||
{
|
||||
wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
|
||||
wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") );
|
||||
|
||||
return ((wxRIRefData*)m_refData)->m_rects[m_current].height;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user