X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a16d7370e3cdc7d583a6f14ab11b3a1d27b73df..c0da0dbabf2d3cf8e1a76a2c82608822d15d0625:/src/os2/region.cpp diff --git a/src/os2/region.cpp b/src/os2/region.cpp index 02832228a8..92849e1384 100644 --- a/src/os2/region.cpp +++ b/src/os2/region.cpp @@ -151,10 +151,8 @@ wxRegion::wxRegion( ); } // end of wxRegion::wxRegion -wxRegion::wxRegion( - const wxPoint& rTopLeft -, const wxPoint& rBottomRight -) +wxRegion::wxRegion(const wxPoint& rTopLeft, + const wxPoint& rBottomRight) { RECTL vRect; SIZEL vSize = {0, 0}; @@ -188,9 +186,7 @@ wxRegion::wxRegion( ); } // end of wxRegion::wxRegion -wxRegion::wxRegion( - const wxRect& rRect -) +wxRegion::wxRegion(const wxRect& rRect) { RECTL vRect; SIZEL vSize = {0, 0}; @@ -225,6 +221,11 @@ wxRegion::wxRegion( ); } // end of wxRegion::wxRegion +wxRegion::wxRegion(size_t n, const wxPoint *points, int WXUNUSED(fillStyle)) +{ + // TO DO +} + // // Destroy the region. // @@ -347,7 +348,7 @@ bool wxRegion::DoCombine( const wxRegion& rRegion, wxRegionOp eOp ) //# Information on region //----------------------------------------------------------------------------- -bool wxRegion::DoIsEqual(const wxRegion& region) const +bool wxRegion::DoIsEqual(const wxRegion& WXUNUSED(region)) const { return false; } @@ -411,9 +412,9 @@ bool wxRegion::IsEmpty() const // // Does the region contain the point pt? // -wxRegionContain wxRegion::DoContainsPoint( const wxPoint& rPoint ) const +wxRegionContain wxRegion::DoContainsPoint( wxCoord x, wxCoord y ) const { - POINTL vPoint = { rPoint.x, rPoint.y }; + POINTL vPoint = { x, y }; if (!m_refData) return wxOutRegion; @@ -437,10 +438,10 @@ wxRegionContain wxRegion::DoContainsRect(const wxRect& rect) const return wxOutRegion; RECTL vRect; - vRect.xLeft = r.x; - vRect.xRight = r.x + r.width; - vRect.yTop = r.y + r.height; - vRect.yBottom = r.y; + vRect.xLeft = rect.x; + vRect.xRight = rect.x + rect.width; + vRect.yTop = rect.y + rect.height; + vRect.yBottom = rect.y; LONG lInside = ::GpiRectInRegion( ((wxRegionRefData*)m_refData)->m_hPS, M_REGION, @@ -453,6 +454,7 @@ wxRegionContain wxRegion::DoContainsRect(const wxRect& rect) const case RRGN_ERROR : default : return wxOutRegion; } + } // end of wxRegion::Contains //