From 19883268f1878c44f5fdb4bec3570c7534a00dd0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 24 Sep 2006 13:09:46 +0000 Subject: [PATCH] use wxRect::Contains(), not Inside() (fixes compilation for WXWIN_COMPATIBILITY_2_6==0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/dfb/region.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dfb/region.cpp b/src/dfb/region.cpp index bd6e379973..c93bb6e651 100644 --- a/src/dfb/region.cpp +++ b/src/dfb/region.cpp @@ -143,11 +143,11 @@ bool wxRegion::Union(const wxRect& rect) { AllocExclusive(); - if ( M_REGION->m_rect.Inside(rect) ) + if ( M_REGION->m_rect.Contains(rect) ) { return true; } - else if ( rect.Inside(M_REGION->m_rect) ) + else if ( rect.Contains(M_REGION->m_rect) ) { M_REGION->m_rect = rect; return true; @@ -182,7 +182,7 @@ bool wxRegion::Subtract(const wxRect& rect) { 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 // rectangle @@ -228,7 +228,7 @@ wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y) const { 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; else return wxOutRegion; @@ -239,7 +239,7 @@ wxRegionContain wxRegion::Contains(const wxRect& rect) const wxCHECK_MSG( Ok(), wxOutRegion, _T("invalid 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; // 2) is the rectangle completely outside the region? -- 2.45.2