private:
// Cannot use
-// DECLARE_NO_COPY_CLASS(wxRegionRefData)
+// wxDECLARE_NO_COPY_CLASS(wxRegionRefData);
// because copy constructor is explicitly declared above;
// but no copy assignment operator is defined, so declare
// it private to prevent the compiler from defining it:
wxRegion::wxRegion()
{
- m_refData = (wxRegionRefData *)NULL;
+ m_refData = NULL;
}
wxRegion::wxRegion(WXHRGN hRegion)
M_REGION = ::CreateRectRgn(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height);
}
-wxRegion::wxRegion(size_t n, const wxPoint *points, int fillStyle)
+wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle)
{
#if defined(__WXMICROWIN__) || defined(__WXWINCE__)
wxUnusedVar(n);
bool wxRegion::DoOffset(wxCoord x, wxCoord y)
{
- wxCHECK_MSG( M_REGION, false, _T("invalid wxRegion") );
+ wxCHECK_MSG( M_REGION, false, wxT("invalid wxRegion") );
if ( !x && !y )
{
if ( ::OffsetRgn(GetHrgn(), x, y) == ERROR )
{
- wxLogLastError(_T("OffsetRgn"));
+ wxLogLastError(wxT("OffsetRgn"));
return false;
}
break;
default:
- wxFAIL_MSG( _T("unknown region operation") );
+ wxFAIL_MSG( wxT("unknown region operation") );
// fall through
case wxRGN_AND:
break;
default:
- wxFAIL_MSG( _T("unknown region operation") );
+ wxFAIL_MSG( wxT("unknown region operation") );
// fall through
case wxRGN_COPY:
if ( ::CombineRgn(M_REGION, M_REGION, M_REGION_OF(rgn), mode) == ERROR )
{
- wxLogLastError(_T("CombineRgn"));
+ wxLogLastError(wxT("CombineRgn"));
return false;
}
wxCoord wxRegionIterator::GetX() const
{
- wxCHECK_MSG( m_current < m_numRects, 0, _T("invalid wxRegionIterator") );
+ wxCHECK_MSG( m_current < m_numRects, 0, wxT("invalid wxRegionIterator") );
return m_rects[m_current].x;
}
wxCoord wxRegionIterator::GetY() const
{
- wxCHECK_MSG( m_current < m_numRects, 0, _T("invalid wxRegionIterator") );
+ wxCHECK_MSG( m_current < m_numRects, 0, wxT("invalid wxRegionIterator") );
return m_rects[m_current].y;
}
wxCoord wxRegionIterator::GetW() const
{
- wxCHECK_MSG( m_current < m_numRects, 0, _T("invalid wxRegionIterator") );
+ wxCHECK_MSG( m_current < m_numRects, 0, wxT("invalid wxRegionIterator") );
return m_rects[m_current].width;
}
wxCoord wxRegionIterator::GetH() const
{
- wxCHECK_MSG( m_current < m_numRects, 0, _T("invalid wxRegionIterator") );
+ wxCHECK_MSG( m_current < m_numRects, 0, wxT("invalid wxRegionIterator") );
return m_rects[m_current].height;
}