X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a724d7892daa5a4eb5e7eb615bfbb4779730f4a6..54081dc5c22c4ef292eb343b4c5b8821ac92dbbd:/src/msw/region.cpp diff --git a/src/msw/region.cpp b/src/msw/region.cpp index e26d294ce7..cb214071d0 100644 --- a/src/msw/region.cpp +++ b/src/msw/region.cpp @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/region.cpp +// Name: msw/region.cpp // Purpose: Region handling for wxWindows/X11 // Author: Markus Holzem // Modified by: // Created: Fri Oct 24 10:46:34 MET 1997 -// RCS-ID: $Id$ +// RCS-ID: $Id$ // Copyright: (c) 1997 Julian Smart and Markus Holzem // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -23,30 +23,30 @@ #include "wx/msw/region.h" #include "wx/gdicmn.h" -#include +#include "wx/window.h" +#include "wx/msw/private.h" -#if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject) - IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject) -#endif + IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject) + IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject) //----------------------------------------------------------------------------- // wxRegionRefData implementation //----------------------------------------------------------------------------- -class WXDLLEXPORT wxRegionRefData : public wxGDIRefData { +class WXDLLEXPORT wxRegionRefData : public wxGDIRefData +{ public: - wxRegionRefData(void) - { + wxRegionRefData() + { m_region = 0; - } + } - wxRegionRefData(const wxRegionRefData& data) - { + wxRegionRefData(const wxRegionRefData& data) + { #if defined(__WIN32__) DWORD noBytes = ::GetRegionData(data.m_region, 0, NULL); RGNDATA *rgnData = (RGNDATA*) new char[noBytes]; - ::GetRegionData(data.m_region, noBytes, rgnData); + ::GetRegionData(data.m_region, noBytes, rgnData); m_region = ::ExtCreateRegion(NULL, noBytes, rgnData); delete[] (char*) rgnData; #else @@ -54,15 +54,15 @@ public: ::GetRgnBox(data.m_region, &rect); m_region = ::CreateRectRgnIndirect(&rect); #endif - } + } - ~wxRegionRefData(void) - { - ::DeleteObject(m_region); + ~wxRegionRefData() + { + ::DeleteObject(m_region); m_region = 0; - } + } - HRGN m_region; + HRGN m_region; }; #define M_REGION (((wxRegionRefData*)m_refData)->m_region) @@ -71,13 +71,12 @@ public: // wxRegion //----------------------------------------------------------------------------- -/*! +/* * Create an empty region. */ -wxRegion::wxRegion(void) +wxRegion::wxRegion() { - m_refData = new wxRegionRefData; - M_REGION = ::CreateRectRgn(0, 0, 0, 0); + m_refData = (wxRegionRefData *)NULL; } wxRegion::wxRegion(WXHRGN hRegion) @@ -86,7 +85,7 @@ wxRegion::wxRegion(WXHRGN hRegion) M_REGION = (HRGN) hRegion; } -wxRegion::wxRegion(long x, long y, long w, long h) +wxRegion::wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h) { m_refData = new wxRegionRefData; M_REGION = ::CreateRectRgn(x, y, x + w, y + h); @@ -101,38 +100,38 @@ 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); } -/*! +/* * Destroy the region. */ -wxRegion::~wxRegion(void) +wxRegion::~wxRegion() { // m_refData unrefed in ~wxObject } //----------------------------------------------------------------------------- -//# Modify region +// Modify region //----------------------------------------------------------------------------- -//! Clear current region -void wxRegion::Clear(void) +// Clear current region +void wxRegion::Clear() { - UnRef(); + UnRef(); } -//! Combine rectangle (x, y, w, h) with this. -bool wxRegion::Combine(long x, long y, long width, long height, wxRegionOp op) +// 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); - } + // 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); @@ -149,27 +148,27 @@ bool wxRegion::Combine(long x, long y, long width, long height, wxRegionOp op) mode = RGN_COPY; break ; } - bool success = (ERROR != ::CombineRgn(M_REGION, M_REGION, rectRegion, mode)); + bool success = (ERROR != ::CombineRgn(M_REGION, M_REGION, rectRegion, mode)); ::DeleteObject(rectRegion); return success; } -//! Union /e region with this. +// Union /e region with this. bool wxRegion::Combine(const wxRegion& region, 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); - } + 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); + } int mode = 0; switch (op) @@ -183,7 +182,7 @@ bool wxRegion::Combine(const wxRegion& region, wxRegionOp op) mode = RGN_COPY; break ; } - return (ERROR != ::CombineRgn(M_REGION, M_REGION, ((wxRegionRefData*)region.m_refData)->m_region, mode)); + return (ERROR != ::CombineRgn(M_REGION, M_REGION, ((wxRegionRefData*)region.m_refData)->m_region, mode)); } bool wxRegion::Combine(const wxRect& rect, wxRegionOp op) @@ -192,51 +191,51 @@ bool wxRegion::Combine(const wxRect& rect, wxRegionOp op) } //----------------------------------------------------------------------------- -//# Information on region +// Information on region //----------------------------------------------------------------------------- // Outer bounds of region -void wxRegion::GetBox(long& x, long& y, long&w, long &h) const +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 { - x = y = w = h = 0; - } + x = rect.left; + y = rect.top; + w = rect.right - rect.left; + h = rect.bottom - rect.top; + } else { + x = y = w = h = 0; + } } -wxRect wxRegion::GetBox(void) const +wxRect wxRegion::GetBox() const { - long x, y, w, h; + wxCoord x, y, w, h; GetBox(x, y, w, h); return wxRect(x, y, w, h); } // Is region empty? -bool wxRegion::Empty(void) const +bool wxRegion::Empty() const { if (M_REGION == 0) return TRUE; - long x, y, w, h; + wxCoord x, y, w, h; GetBox(x, y, w, h); return ((w == 0) && (h == 0)); } //----------------------------------------------------------------------------- -//# Tests +// Tests //----------------------------------------------------------------------------- // Does the region contain the point (x,y)? -wxRegionContain wxRegion::Contains(long x, long y) const +wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y) const { - if (!m_refData) - return wxOutRegion; + if (!m_refData) + return wxOutRegion; if (::PtInRegion(M_REGION, (int) x, (int) y)) return wxInRegion; @@ -247,8 +246,8 @@ wxRegionContain wxRegion::Contains(long x, long y) const // Does the region contain the point pt? wxRegionContain wxRegion::Contains(const wxPoint& pt) const { - if (!m_refData) - return wxOutRegion; + if (!m_refData) + return wxOutRegion; if (::PtInRegion(M_REGION, (int) pt.x, (int) pt.y)) return wxInRegion; @@ -257,10 +256,10 @@ wxRegionContain wxRegion::Contains(const wxPoint& pt) const } // Does the region contain the rectangle (x, y, w, h)? -wxRegionContain wxRegion::Contains(long x, long y, long w, long h) const +wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y, wxCoord w, wxCoord h) const { - if (!m_refData) - return wxOutRegion; + if (!m_refData) + return wxOutRegion; RECT rect; rect.left = x; @@ -277,10 +276,10 @@ wxRegionContain wxRegion::Contains(long x, long y, long w, long h) const // Does the region contain the rectangle rect wxRegionContain wxRegion::Contains(const wxRect& rect) const { - if (!m_refData) - return wxOutRegion; + if (!m_refData) + return wxOutRegion; - long x, y, w, h; + wxCoord x, y, w, h; x = rect.x; y = rect.y; w = rect.GetWidth(); @@ -297,67 +296,67 @@ WXHRGN wxRegion::GetHRGN() const } /////////////////////////////////////////////////////////////////////////////// -// // -// wxRegionIterator // -// // +// // +// wxRegionIterator // +// // /////////////////////////////////////////////////////////////////////////////// -/*! +/* * Initialize empty iterator */ -wxRegionIterator::wxRegionIterator(void) : m_current(0), m_numRects(0), m_rects(NULL) +wxRegionIterator::wxRegionIterator() : m_current(0), m_numRects(0), m_rects(NULL) { } -wxRegionIterator::~wxRegionIterator(void) +wxRegionIterator::~wxRegionIterator() { if (m_rects) delete[] m_rects; } -/*! +/* * Initialize iterator for region */ wxRegionIterator::wxRegionIterator(const wxRegion& region) { m_rects = NULL; - Reset(region); + Reset(region); } -/*! +/* * Reset iterator for a new /e region. */ void wxRegionIterator::Reset(const wxRegion& region) { - m_current = 0; - m_region = region; + m_current = 0; + m_region = region; if (m_rects) delete[] m_rects; m_rects = NULL; - if (m_region.Empty()) - m_numRects = 0; - else + if (m_region.Empty()) + m_numRects = 0; + else { #if defined(__WIN32__) DWORD noBytes = ::GetRegionData(((wxRegionRefData*)region.m_refData)->m_region, 0, NULL); RGNDATA *rgnData = (RGNDATA*) new char[noBytes]; - ::GetRegionData(((wxRegionRefData*)region.m_refData)->m_region, noBytes, rgnData); + ::GetRegionData(((wxRegionRefData*)region.m_refData)->m_region, noBytes, rgnData); RGNDATAHEADER* header = (RGNDATAHEADER*) rgnData; m_rects = new wxRect[header->nCount]; - RECT* rect = (RECT*) (rgnData + sizeof(RGNDATAHEADER)) ; + RECT* rect = (RECT*) ((char*)rgnData + sizeof(RGNDATAHEADER)) ; size_t i; for (i = 0; i < header->nCount; i++) { m_rects[i] = wxRect(rect->left, rect->top, rect->right - rect->left, rect->bottom - rect->top); - rect += sizeof(RECT); + rect ++; // Advances pointer by sizeof(RECT) } m_numRects = header->nCount; @@ -377,51 +376,51 @@ void wxRegionIterator::Reset(const wxRegion& region) } } -/*! +/* * Increment iterator. The rectangle returned is the one after the * incrementation. */ -void wxRegionIterator::operator ++ (void) +void wxRegionIterator::operator ++ () { - if (m_current < m_numRects) - ++m_current; + if (m_current < m_numRects) + ++m_current; } -/*! +/* * Increment iterator. The rectangle returned is the one before the * incrementation. */ void wxRegionIterator::operator ++ (int) { - if (m_current < m_numRects) - ++m_current; + if (m_current < m_numRects) + ++m_current; } -long wxRegionIterator::GetX(void) const +wxCoord wxRegionIterator::GetX() const { - if (m_current < m_numRects) - return m_rects[m_current].x; - return 0; + if (m_current < m_numRects) + return m_rects[m_current].x; + return 0; } -long wxRegionIterator::GetY(void) const +wxCoord wxRegionIterator::GetY() const { - if (m_current < m_numRects) - return m_rects[m_current].y; - return 0; + if (m_current < m_numRects) + return m_rects[m_current].y; + return 0; } -long wxRegionIterator::GetW(void) const +wxCoord wxRegionIterator::GetW() const { - if (m_current < m_numRects) - return m_rects[m_current].width ; - return 0; + if (m_current < m_numRects) + return m_rects[m_current].width ; + return 0; } -long wxRegionIterator::GetH(void) const +wxCoord wxRegionIterator::GetH() const { - if (m_current < m_numRects) - return m_rects[m_current].height; - return 0; + if (m_current < m_numRects) + return m_rects[m_current].height; + return 0; }