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

Corrections after The Great wxRegion Refactoring.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-09-25 16:17:12 +00:00
parent 74750ae4e6
commit 566177181a
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/os2/region.cpp
View File

@@ -347,7 +347,7 @@ bool wxRegion::DoCombine( const wxRegion& rRegion, wxRegionOp eOp )
//# Information on region //# Information on region
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool wxRegion::DoIsEqual(const wxRegion& region) const bool wxRegion::DoIsEqual(const wxRegion& WXUNUSED(region)) const
{ {
return false; return false;
} }
@@ -411,9 +411,9 @@ bool wxRegion::IsEmpty() const
// //
// Does the region contain the point pt? // 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) if (!m_refData)
return wxOutRegion; return wxOutRegion;
@@ -437,10 +437,10 @@ wxRegionContain wxRegion::DoContainsRect(const wxRect& rect) const
return wxOutRegion; return wxOutRegion;
RECTL vRect; RECTL vRect;
vRect.xLeft = r.x; vRect.xLeft = rect.x;
vRect.xRight = r.x + r.width; vRect.xRight = rect.x + rect.width;
vRect.yTop = r.y + r.height; vRect.yTop = rect.y + rect.height;
vRect.yBottom = r.y; vRect.yBottom = rect.y;
LONG lInside = ::GpiRectInRegion( ((wxRegionRefData*)m_refData)->m_hPS, LONG lInside = ::GpiRectInRegion( ((wxRegionRefData*)m_refData)->m_hPS,
M_REGION, M_REGION,
@@ -453,6 +453,7 @@ wxRegionContain wxRegion::DoContainsRect(const wxRect& rect) const
case RRGN_ERROR : case RRGN_ERROR :
default : return wxOutRegion; default : return wxOutRegion;
} }
} // end of wxRegion::Contains } // end of wxRegion::Contains
// //