/////////////////////////////////////////////////////////////////////////////
// File: region.cpp
// Purpose: Region class
-// Author: Markus Holzem/Julian Smart/AUTHOR
+// Author: Stefan Csomor
// Created: Fri Oct 24 10:46:34 MET 1997
-// RCS-ID: $Id$
-// Copyright: (c) 1997 Markus Holzem/Julian Smart/AUTHOR
+// RCS-ID: $Id$
+// Copyright: (c) 1997 Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/region.h"
#include "wx/gdicmn.h"
+#include "wx/mac/uma.h"
#if !USE_SHARED_LIBRARY
- IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
- IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)
+ IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
+ IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)
#endif
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxRegionRefData : public wxGDIRefData {
public:
- wxRegionRefData()
- {
- m_macRgn = NewRgn() ;
- }
-
- wxRegionRefData(const wxRegionRefData& data)
- {
- m_macRgn = NewRgn() ;
+ wxRegionRefData()
+ {
+ m_macRgn = NewRgn() ;
+ }
+
+ wxRegionRefData(const wxRegionRefData& data)
+ : wxGDIRefData()
+ {
+ m_macRgn = NewRgn() ;
CopyRgn( data.m_macRgn , m_macRgn ) ;
- }
+ }
- ~wxRegionRefData()
- {
+ ~wxRegionRefData()
+ {
DisposeRgn( m_macRgn ) ;
- }
- RgnHandle m_macRgn ;
+ }
+ RgnHandle m_macRgn ;
};
#define M_REGION (((wxRegionRefData*)m_refData)->m_macRgn)
wxRegion::wxRegion(WXHRGN hRegion )
{
m_refData = new wxRegionRefData;
- CopyRgn( hRegion , M_REGION ) ;
+ CopyRgn( (RgnHandle) hRegion , (RgnHandle) M_REGION ) ;
}
wxRegion::wxRegion(long x, long y, long w, long h)
{
m_refData = new wxRegionRefData;
- SetRectRgn( M_REGION , x , y , x+w , y+h ) ;
+ SetRectRgn( (RgnHandle) M_REGION , x , y , x+w , y+h ) ;
}
wxRegion::wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight)
{
m_refData = new wxRegionRefData;
- SetRectRgn( M_REGION , topLeft.x , topLeft.y , bottomRight.x , bottomRight.y ) ;
+ SetRectRgn( (RgnHandle) M_REGION , topLeft.x , topLeft.y , bottomRight.x , bottomRight.y ) ;
}
wxRegion::wxRegion(const wxRect& rect)
{
m_refData = new wxRegionRefData;
- SetRectRgn( M_REGION , rect.x , rect.y , rect.x+rect.width , rect.y+rect.height ) ;
+ SetRectRgn( (RgnHandle) M_REGION , rect.x , rect.y , rect.x+rect.width , rect.y+rect.height ) ;
+}
+
+wxRegion::wxRegion(size_t n, const wxPoint *points, int WXUNUSED(fillStyle))
+{
+ m_refData = new wxRegionRefData;
+
+ OpenRgn();
+
+ wxCoord x1, x2 , y1 , y2 ;
+ x2 = x1 = points[0].x ;
+ y2 = y1 = points[0].y ;
+ ::MoveTo(x1,y1);
+ for (size_t i = 1; i < n; i++)
+ {
+ x2 = points[i].x ;
+ y2 = points[i].y ;
+ ::LineTo(x2, y2);
+ }
+ // close the polyline if necessary
+ if ( x1 != x2 || y1 != y2 )
+ {
+ ::LineTo(x1,y1 ) ;
+ }
+ ClosePoly();
+ CloseRgn( M_REGION ) ;
}
/*!
UnRef();
}
+// Move the region
+bool wxRegion::Offset(wxCoord x, wxCoord y)
+{
+ wxCHECK_MSG( M_REGION, false, _T("invalid wxRegion") );
+
+ if ( !x && !y )
+ {
+ // nothing to do
+ return true;
+ }
+
+ OffsetRgn( M_REGION , x , y ) ;
+ return true ;
+}
+
+
//! Combine rectangle (x, y, w, h) with this.
bool wxRegion::Combine(long x, long y, long width, long 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);
+ }
RgnHandle rgn = NewRgn() ;
- SetRectRgn( rgn , x , y, x+width,y + height ) ;
-
+ SetRectRgn( rgn , x , y, x+width,y + height ) ;
+
switch (op)
{
case wxRGN_AND:
break ;
case wxRGN_COPY:
default:
- CopyRgn( rgn ,M_REGION ) ;
+ CopyRgn( rgn ,M_REGION ) ;
break ;
}
- DisposeRgn( rgn ) ;
+ DisposeRgn( rgn ) ;
return TRUE;
}
//! 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);
+ }
switch (op)
{
break ;
case wxRGN_COPY:
default:
- CopyRgn( OTHER_M_REGION(region) ,M_REGION ) ;
+ CopyRgn( OTHER_M_REGION(region) ,M_REGION ) ;
break ;
}
- return TRUE;
+ return TRUE;
}
bool wxRegion::Combine(const wxRect& rect, wxRegionOp op)
//-----------------------------------------------------------------------------
// 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)
- {
- Rect box = (**M_REGION).rgnBBox ;
+ if (m_refData)
+ {
+ Rect box ;
+ GetRegionBounds( M_REGION , &box ) ;
x = box.left ;
y = box.top ;
w = box.right - box.left ;
h = box.bottom - box.top ;
- }
- else
- {
- x = y = w = h = 0;
- }
+ }
+ else
+ {
+ x = y = w = h = 0;
+ }
}
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);
}
const WXHRGN wxRegion::GetWXHRGN() const
{
- return M_REGION ;
+ return M_REGION ;
}
//-----------------------------------------------------------------------------
// Does the region contain the point (x,y)?
wxRegionContain wxRegion::Contains(long x, long y) const
{
- if (!m_refData)
- return wxOutRegion;
+ if (!m_refData)
+ return wxOutRegion;
// TODO. Return wxInRegion if within region.
if (0)
// Does the region contain the point pt?
wxRegionContain wxRegion::Contains(const wxPoint& pt) const
{
- if (!m_refData)
- return wxOutRegion;
+ if (!m_refData)
+ return wxOutRegion;
Point p = { pt.y , pt.x } ;
if (PtInRgn( p , M_REGION ) )
// Does the region contain the rectangle (x, y, w, h)?
wxRegionContain wxRegion::Contains(long x, long y, long w, long h) const
{
- if (!m_refData)
- return wxOutRegion;
+ if (!m_refData)
+ return wxOutRegion;
Rect rect = { y , x , y + h , x + w } ;
if (RectInRgn( &rect , M_REGION ) )
// 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;
x = rect.x;
}
///////////////////////////////////////////////////////////////////////////////
-// //
-// wxRegionIterator //
-// //
+// //
+// wxRegionIterator //
+// //
///////////////////////////////////////////////////////////////////////////////
/*!
* Initialize empty iterator
*/
-wxRegionIterator::wxRegionIterator() : m_current(0), m_numRects(0), m_rects(NULL)
+wxRegionIterator::wxRegionIterator()
+ : m_current(0), m_numRects(0), m_rects(NULL)
{
}
wxRegionIterator::~wxRegionIterator()
{
- if (m_rects)
+ if (m_rects) {
delete[] m_rects;
+ m_rects = NULL;
+ }
+}
+
+wxRegionIterator::wxRegionIterator(const wxRegionIterator& iterator)
+ : wxObject()
+ , m_current(iterator.m_current)
+ , m_numRects(0)
+ , m_rects(NULL)
+{
+ SetRects(iterator.m_numRects, iterator.m_rects);
+}
+
+wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& iterator)
+{
+ m_current = iterator.m_current;
+ SetRects(iterator.m_numRects, iterator.m_rects);
+ return *this;
+}
+
+/*!
+ * Set iterator rects for region
+ */
+void wxRegionIterator::SetRects(long numRects, wxRect *rects)
+{
+ if (m_rects) {
+ delete[] m_rects;
+ m_rects = NULL;
+ }
+ if (rects)
+ {
+ int i;
+ m_rects = new wxRect[numRects];
+ for (i = 0; i < numRects; i++)
+ m_rects[i] = rects[i];
+ }
+ m_numRects = numRects;
}
/*!
{
m_rects = NULL;
- Reset(region);
+ Reset(region);
}
/*!
*/
void wxRegionIterator::Reset(const wxRegion& region)
{
- m_current = 0;
- m_region = region;
+ m_current = 0;
+ m_region = region;
- if (m_rects)
+ if (m_rects) {
delete[] m_rects;
+ m_rects = NULL;
+ }
- m_rects = NULL;
-
- if (m_region.Empty())
- m_numRects = 0;
- else
+ if (m_region.Empty())
+ m_numRects = 0;
+ else
{
- // we cannot dissolve it into rects on mac
+ // we cannot dissolve it into rects on mac
m_rects = new wxRect[1];
- Rect rect = (**OTHER_M_REGION( region )).rgnBBox ;
+ Rect rect ;
+ GetRegionBounds( OTHER_M_REGION( region ) , &rect ) ;
m_rects[0].x = rect.left;
m_rects[0].y = rect.top;
m_rects[0].width = rect.right - rect.left;
* Increment iterator. The rectangle returned is the one after the
* incrementation.
*/
-void wxRegionIterator::operator ++ ()
+wxRegionIterator& wxRegionIterator::operator ++ ()
{
- if (m_current < m_numRects)
- ++m_current;
+ if (m_current < m_numRects)
+ ++m_current;
+ return *this;
}
/*!
* Increment iterator. The rectangle returned is the one before the
* incrementation.
*/
-void wxRegionIterator::operator ++ (int)
+wxRegionIterator wxRegionIterator::operator ++ (int)
{
- if (m_current < m_numRects)
- ++m_current;
+ wxRegionIterator previous(*this);
+
+ if (m_current < m_numRects)
+ ++m_current;
+
+ return previous;
}
long 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() 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() 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() 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;
}
projects / wxWidgets.git / blobdiff