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

use wxRect::Contains(), not Inside() (fixes compilation for WXWIN_COMPATIBILITY_2_6==0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-09-24 13:09:46 +00:00
parent f164c52bc7
commit 19883268f1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/dfb/region.cpp
View File

@@ -143,11 +143,11 @@ bool wxRegion::Union(const wxRect& rect)
{ {
AllocExclusive(); AllocExclusive();
if ( M_REGION->m_rect.Inside(rect) ) if ( M_REGION->m_rect.Contains(rect) )
{ {
return true; return true;
} }
else if ( rect.Inside(M_REGION->m_rect) ) else if ( rect.Contains(M_REGION->m_rect) )
{ {
M_REGION->m_rect = rect; M_REGION->m_rect = rect;
return true; return true;
@@ -182,7 +182,7 @@ bool wxRegion::Subtract(const wxRect& rect)
{ {
wxCHECK_MSG( Ok(), false, _T("invalid region") ); wxCHECK_MSG( Ok(), false, _T("invalid region") );
if ( rect.Inside(M_REGION->m_rect) ) if ( rect.Contains(M_REGION->m_rect) )
{ {
// subtracted rectangle contains this one, so the result is empty // subtracted rectangle contains this one, so the result is empty
// rectangle // rectangle
@@ -228,7 +228,7 @@ wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y) const
{ {
wxCHECK_MSG( Ok(), wxOutRegion, _T("invalid region") ); wxCHECK_MSG( Ok(), wxOutRegion, _T("invalid region") );
if (M_REGION->m_rect.Inside(x, y)) if (M_REGION->m_rect.Contains(x, y))
return wxInRegion; return wxInRegion;
else else
return wxOutRegion; return wxOutRegion;
@@ -239,7 +239,7 @@ wxRegionContain wxRegion::Contains(const wxRect& rect) const
wxCHECK_MSG( Ok(), wxOutRegion, _T("invalid region") ); wxCHECK_MSG( Ok(), wxOutRegion, _T("invalid region") );
// 1) is the rectangle entirely covered by the region? // 1) is the rectangle entirely covered by the region?
if (M_REGION->m_rect.Inside(rect)) if (M_REGION->m_rect.Contains(rect))
return wxInRegion; return wxInRegion;
// 2) is the rectangle completely outside the region? // 2) is the rectangle completely outside the region?