X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/msw/region.cpp?ds=sidebyside diff --git a/src/msw/region.cpp b/src/msw/region.cpp index eb6e672159..329f150d01 100644 --- a/src/msw/region.cpp +++ b/src/msw/region.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/region.cpp +// Name: src/msw/region.cpp // Purpose: wxRegion implementation using Win32 API // Author: Vadim Zeitlin // Modified by: @@ -21,11 +21,14 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #include "wx/region.h" -#include "wx/gdicmn.h" + +#ifndef WX_PRECOMP + #include "wx/gdicmn.h" +#endif #include "wx/msw/private.h" @@ -140,12 +143,12 @@ wxRegion::~wxRegion() // m_refData unrefed in ~wxObject } -wxObjectRefData *wxRegion::CreateRefData() const +wxGDIRefData *wxRegion::CreateGDIRefData() const { return new wxRegionRefData; } -wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const +wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const { return new wxRegionRefData(*(wxRegionRefData *)data); } @@ -160,7 +163,7 @@ void wxRegion::Clear() UnRef(); } -bool wxRegion::Offset(wxCoord x, wxCoord y) +bool wxRegion::DoOffset(wxCoord x, wxCoord y) { wxCHECK_MSG( M_REGION, false, _T("invalid wxRegion") ); @@ -183,7 +186,7 @@ bool wxRegion::Offset(wxCoord x, wxCoord y) } // combine another region with this one -bool wxRegion::Combine(const wxRegion& rgn, wxRegionOp op) +bool wxRegion::DoCombine(const wxRegion& rgn, wxRegionOp op) { // we can't use the API functions if we don't have a valid region handle if ( !m_refData ) @@ -251,26 +254,12 @@ bool wxRegion::Combine(const wxRegion& rgn, wxRegionOp op) return true; } -// Combine rectangle (x, y, w, h) with this. -bool wxRegion::Combine(wxCoord x, wxCoord y, - wxCoord width, wxCoord height, - wxRegionOp op) -{ - return Combine(wxRegion(x, y, width, height), op); -} - -bool wxRegion::Combine(const wxRect& rect, wxRegionOp op) -{ - return Combine(rect.GetLeft(), rect.GetTop(), - rect.GetWidth(), rect.GetHeight(), op); -} - // ---------------------------------------------------------------------------- // wxRegion bounding box // ---------------------------------------------------------------------------- // Outer bounds of region -void wxRegion::GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const +bool wxRegion::DoGetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const { if (m_refData) { @@ -280,22 +269,19 @@ void wxRegion::GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const y = rect.top; w = rect.right - rect.left; h = rect.bottom - rect.top; + + return true; } else { x = y = w = h = 0; - } -} -wxRect wxRegion::GetBox() const -{ - wxCoord x, y, w, h; - GetBox(x, y, w, h); - return wxRect(x, y, w, h); + return false; + } } // Is region empty? -bool wxRegion::Empty() const +bool wxRegion::IsEmpty() const { wxCoord x, y, w, h; GetBox(x, y, w, h); @@ -303,12 +289,17 @@ bool wxRegion::Empty() const return (w == 0) && (h == 0); } +bool wxRegion::DoIsEqual(const wxRegion& region) const +{ + return ::EqualRgn(M_REGION, M_REGION_OF(region)) != 0; +} + // ---------------------------------------------------------------------------- // wxRegion hit testing // ---------------------------------------------------------------------------- // Does the region contain the point (x,y)? -wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y) const +wxRegionContain wxRegion::DoContainsPoint(wxCoord x, wxCoord y) const { if (!m_refData) return wxOutRegion; @@ -316,32 +307,16 @@ wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y) const return ::PtInRegion(M_REGION, (int) x, (int) y) ? wxInRegion : wxOutRegion; } -// Does the region contain the point pt? -wxRegionContain wxRegion::Contains(const wxPoint& pt) const -{ - return Contains(pt.x, pt.y); -} - // Does the region contain the rectangle (x, y, w, h)? -wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y, - wxCoord w, wxCoord h) const +wxRegionContain wxRegion::DoContainsRect(const wxRect& rect) const { if (!m_refData) return wxOutRegion; - RECT rect; - rect.left = x; - rect.top = y; - rect.right = x + w; - rect.bottom = y + h; - - return ::RectInRegion(M_REGION, &rect) ? wxInRegion : wxOutRegion; -} + RECT rc; + wxCopyRectToRECT(rect, rc); -// Does the region contain the rectangle rect -wxRegionContain wxRegion::Contains(const wxRect& rect) const -{ - return Contains(rect.x, rect.y, rect.width, rect.height); + return ::RectInRegion(M_REGION, &rc) ? wxInRegion : wxOutRegion; } // Get internal region handle @@ -491,4 +466,3 @@ wxCoord wxRegionIterator::GetH() const return m_rects[m_current].height; } -