X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b1801c19c82340be79810c8b7617b05caa0cd59..7b35aa40a06a160ae4a8650c5820880a020697e3:/src/msw/region.cpp diff --git a/src/msw/region.cpp b/src/msw/region.cpp index 0e1cab3ea9..dc33bc15a2 100644 --- a/src/msw/region.cpp +++ b/src/msw/region.cpp @@ -26,8 +26,8 @@ #include "wx/window.h" #include "wx/msw/private.h" - IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject) - IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject) +IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject) //----------------------------------------------------------------------------- // wxRegionRefData implementation @@ -43,7 +43,7 @@ public: wxRegionRefData(const wxRegionRefData& data) { -#if defined(__WIN32__) +#if defined(__WIN32__) && !defined(__WXMICROWIN__) DWORD noBytes = ::GetRegionData(data.m_region, 0, NULL); RGNDATA *rgnData = (RGNDATA*) new char[noBytes]; ::GetRegionData(data.m_region, noBytes, rgnData); @@ -66,6 +66,7 @@ public: }; #define M_REGION (((wxRegionRefData*)m_refData)->m_region) +#define M_REGION_OF(rgn) (((wxRegionRefData*)(rgn.m_refData))->m_region) //----------------------------------------------------------------------------- // wxRegion @@ -76,8 +77,7 @@ public: */ wxRegion::wxRegion() { - m_refData = new wxRegionRefData; - M_REGION = ::CreateRectRgn(0, 0, 0, 0); + m_refData = (wxRegionRefData *)NULL; } wxRegion::wxRegion(WXHRGN hRegion) @@ -101,17 +101,40 @@ wxRegion::wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight) wxRegion::wxRegion(const wxRect& rect) { m_refData = new wxRegionRefData; - M_REGION = ::CreateRectRgn(rect.GetLeft(), rect.GetTop(), rect.GetRight(), rect.GetBottom()); + M_REGION = ::CreateRectRgn(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height); +} + +wxRegion::wxRegion(size_t n, const wxPoint *points, int fillStyle) +{ +#ifdef __WXMICROWIN__ + m_refData = NULL; + M_REGION = NULL; +#else + m_refData = new wxRegionRefData; + M_REGION = ::CreatePolygonRgn + ( + (POINT*)points, + n, + fillStyle == wxODDEVEN_RULE ? ALTERNATE : WINDING + ); +#endif } -/* - * Destroy the region. - */ wxRegion::~wxRegion() { // m_refData unrefed in ~wxObject } +wxObjectRefData *wxRegion::CreateRefData() const +{ + return new wxRegionRefData; +} + +wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const +{ + return new wxRegionRefData(*(wxRegionRefData *)data); +} + //----------------------------------------------------------------------------- // Modify region //----------------------------------------------------------------------------- @@ -122,73 +145,107 @@ void wxRegion::Clear() UnRef(); } -// Combine rectangle (x, y, w, h) with this. -bool wxRegion::Combine(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxRegionOp op) -{ - // Don't change shared data - if (!m_refData) { - m_refData = new wxRegionRefData(); - } else if (m_refData->GetRefCount() > 1) { - wxRegionRefData* ref = (wxRegionRefData*)m_refData; - UnRef(); - m_refData = new wxRegionRefData(*ref); - } - // If ref count is 1, that means it's 'ours' anyway so no action. - - HRGN rectRegion = ::CreateRectRgn(x, y, x + width, y + height); +bool wxRegion::Offset(wxCoord x, wxCoord y) +{ + wxCHECK_MSG( M_REGION, FALSE, _T("invalid wxRegion") ); - int mode = 0; - switch (op) + if ( !x && !y ) { - case wxRGN_AND: mode = RGN_AND; break ; - case wxRGN_OR: mode = RGN_OR; break ; - case wxRGN_XOR: mode = RGN_XOR; break ; - case wxRGN_DIFF: mode = RGN_DIFF; break ; - case wxRGN_COPY: - default: - mode = RGN_COPY; break ; + // nothing to do + return TRUE; } - bool success = (ERROR != ::CombineRgn(M_REGION, M_REGION, rectRegion, mode)); + AllocExclusive(); + + if ( ::OffsetRgn(GetHrgn(), x, y) == ERROR ) + { + wxLogLastError(_T("OffsetRgn")); - ::DeleteObject(rectRegion); + return FALSE; + } - return success; + return TRUE; } -// Union /e region with this. -bool wxRegion::Combine(const wxRegion& region, wxRegionOp op) +// combine another region with this one +bool wxRegion::Combine(const wxRegion& rgn, wxRegionOp op) { - if (region.Empty()) - return FALSE; - - // Don't change shared data - if (!m_refData) { - m_refData = new wxRegionRefData(); - } else if (m_refData->GetRefCount() > 1) { - wxRegionRefData* ref = (wxRegionRefData*)m_refData; - UnRef(); - m_refData = new wxRegionRefData(*ref); + // we can't use the API functions if we don't have a valid region handle + if ( !m_refData ) + { + // combining with an empty/invalid region works differently depending + // on the operation + switch ( op ) + { + case wxRGN_COPY: + case wxRGN_OR: + case wxRGN_XOR: + *this = rgn; + break; + + default: + wxFAIL_MSG( _T("unknown region operation") ); + // fall through + + case wxRGN_AND: + case wxRGN_DIFF: + // leave empty/invalid + return FALSE; + } } - - int mode = 0; - switch (op) + else // we have a valid region { - case wxRGN_AND: mode = RGN_AND; break ; - case wxRGN_OR: mode = RGN_OR; break ; - case wxRGN_XOR: mode = RGN_XOR; break ; - case wxRGN_DIFF: mode = RGN_DIFF; break ; - case wxRGN_COPY: - default: - mode = RGN_COPY; break ; + int mode; + switch ( op ) + { + case wxRGN_AND: + mode = RGN_AND; + break; + + case wxRGN_OR: + mode = RGN_OR; + break; + + case wxRGN_XOR: + mode = RGN_XOR; + break; + + case wxRGN_DIFF: + mode = RGN_DIFF; + break; + + default: + wxFAIL_MSG( _T("unknown region operation") ); + // fall through + + case wxRGN_COPY: + mode = RGN_COPY; + break; + } + + if ( ::CombineRgn(M_REGION, M_REGION, M_REGION_OF(rgn), mode) == ERROR ) + { + wxLogLastError(_T("CombineRgn")); + + return FALSE; + } } - return (ERROR != ::CombineRgn(M_REGION, M_REGION, ((wxRegionRefData*)region.m_refData)->m_region, mode)); + 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); + return Combine(rect.GetLeft(), rect.GetTop(), + rect.GetWidth(), rect.GetHeight(), op); } //----------------------------------------------------------------------------- @@ -198,14 +255,17 @@ bool wxRegion::Combine(const wxRect& rect, wxRegionOp op) // Outer bounds of region void wxRegion::GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const { - if (m_refData) { + if (m_refData) + { RECT rect; ::GetRgnBox(M_REGION, & rect); x = rect.left; y = rect.top; w = rect.right - rect.left; h = rect.bottom - rect.top; - } else { + } + else + { x = y = w = h = 0; } } @@ -220,12 +280,10 @@ wxRect wxRegion::GetBox() const // Is region empty? bool wxRegion::Empty() const { - if (M_REGION == 0) - return TRUE; wxCoord x, y, w, h; GetBox(x, y, w, h); - return ((w == 0) && (h == 0)); + return (w == 0) && (h == 0); } //----------------------------------------------------------------------------- @@ -351,7 +409,7 @@ void wxRegionIterator::Reset(const wxRegion& region) m_rects = new wxRect[header->nCount]; - RECT* rect = (RECT*) ((char*)rgnData + sizeof(RGNDATAHEADER)) ; + RECT* rect = (RECT*) ((char*)rgnData + sizeof(RGNDATAHEADER)); size_t i; for (i = 0; i < header->nCount; i++) { @@ -414,7 +472,7 @@ wxCoord wxRegionIterator::GetY() const wxCoord wxRegionIterator::GetW() const { if (m_current < m_numRects) - return m_rects[m_current].width ; + return m_rects[m_current].width; return 0; }