/////////////////////////////////////////////////////////////////////////////
-// Name: region.cpp
+// Name: gtk/region.cpp
// Purpose:
// Author: Robert Roebling
-// Created: 01/02/98
-// Id:
-// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence: wxWindows licence
+// Modified: VZ at 05.10.00: use AllocExclusive(), comparison fixed
+// Id: $Id$
+// Copyright: (c) 1998 Robert Roebling
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// ============================================================================
+// declarations
+// ============================================================================
-#ifdef __GNUG__
-#pragma implementation "region.h"
-#endif
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#include "wx/region.h"
+#include "wx/log.h"
+#include "wx/gtk/private.h"
+
+#ifndef __WXGTK20__
-//-----------------------------------------------------------------------------
-// wxRegion
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// wxGdkRegion: creates a new region in ctor and destroys in dtor
+// ----------------------------------------------------------------------------
-class wxRegionRefData: public wxObjectRefData
+class wxGdkRegion
{
- public:
-
- wxRegionRefData(void);
- ~wxRegionRefData(void);
-
- public:
+public:
+ wxGdkRegion() { m_region = gdk_region_new(); }
+ ~wxGdkRegion() { gdk_region_destroy(m_region); }
+
+ operator GdkRegion *() const { return m_region; }
+
+private:
+ GdkRegion *m_region;
+};
+
+#endif // __WXGTK20__
+
+// ----------------------------------------------------------------------------
+// wxRegionRefData: private class containing the information about the region
+// ----------------------------------------------------------------------------
+
+class wxRegionRefData : public wxObjectRefData
+{
+public:
+ wxRegionRefData()
+ {
+ m_region = NULL;
+ }
+
+ wxRegionRefData(const wxRegionRefData& refData)
+ : wxObjectRefData()
+ {
+#ifdef __WXGTK20__
+ m_region = gdk_region_copy(refData.m_region);
+#else
+ m_region = gdk_regions_union(wxGdkRegion(), refData.m_region);
+#endif
+ }
+
+ ~wxRegionRefData()
+ {
+ if (m_region)
+ gdk_region_destroy( m_region );
+ }
GdkRegion *m_region;
- wxList m_rects;
};
-wxRegionRefData::wxRegionRefData(void)
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+#define M_REGIONDATA ((wxRegionRefData *)m_refData)
+#define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData))
+
+IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
+IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject)
+
+// ----------------------------------------------------------------------------
+// wxRegion construction
+// ----------------------------------------------------------------------------
+
+#define M_REGIONDATA ((wxRegionRefData *)m_refData)
+
+void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
{
- m_region = (GdkRegion *) NULL;
+ GdkRectangle rect;
+ rect.x = x;
+ rect.y = y;
+ rect.width = w;
+ rect.height = h;
+
+ m_refData = new wxRegionRefData();
+
+#ifdef __WXGTK20__
+ M_REGIONDATA->m_region = gdk_region_rectangle( &rect );
+#else
+ M_REGIONDATA->m_region = gdk_region_union_with_rect( wxGdkRegion(), &rect );
+#endif
}
-wxRegionRefData::~wxRegionRefData(void)
+wxRegion::wxRegion( GdkRegion *region )
{
- if (m_region) gdk_region_destroy( m_region );
-
- wxNode *node = m_rects.First();
- while (node)
- {
- wxRect *r = (wxRect*)node->Data();
- delete r;
- node = node->Next();
- }
+ m_refData = new wxRegionRefData();
+#ifdef __WXGTK20__
+ M_REGIONDATA->m_region = gdk_region_copy( region );
+#else
+ M_REGIONDATA->m_region = gdk_regions_union(wxGdkRegion(), region);
+#endif
}
-//-----------------------------------------------------------------------------
+wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle )
+{
+ GdkPoint *gdkpoints = new GdkPoint[n];
+ for ( size_t i = 0 ; i < n ; i++ )
+ {
+ gdkpoints[i].x = points[i].x;
+ gdkpoints[i].y = points[i].y;
+ }
-#define M_REGIONDATA ((wxRegionRefData *)m_refData)
+ m_refData = new wxRegionRefData();
-IMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject);
-
-wxRegion::wxRegion( long x, long y, long w, long h )
-{
- m_refData = new wxRegionRefData();
- GdkRegion *reg = gdk_region_new();
- GdkRectangle rect;
- rect.x = x;
- rect.y = y;
- rect.width = w;
- rect.height = h;
- M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
- gdk_region_destroy( reg );
- M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,w,h) );
+ GdkRegion* reg = gdk_region_polygon
+ (
+ gdkpoints,
+ n,
+ fillStyle == wxWINDING_RULE ? GDK_WINDING_RULE
+ : GDK_EVEN_ODD_RULE
+ );
+
+ M_REGIONDATA->m_region = reg;
+
+ delete [] gdkpoints;
}
-wxRegion::wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight )
+wxRegion::~wxRegion()
{
- m_refData = new wxRegionRefData();
- GdkRegion *reg = gdk_region_new();
- GdkRectangle rect;
- rect.x = topLeft.x;
- rect.y = topLeft.y;
- rect.width = bottomRight.x - rect.x;
- rect.height = bottomRight.y - rect.y;
- M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
- gdk_region_destroy( reg );
- M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(topLeft,bottomRight) );
+ // m_refData unrefed in ~wxObject
}
-wxRegion::wxRegion( const wxRect& rect )
+wxObjectRefData *wxRegion::CreateRefData() const
{
- m_refData = new wxRegionRefData();
- GdkRegion *reg = gdk_region_new();
- GdkRectangle g_rect;
- g_rect.x = rect.x;
- g_rect.y = rect.y;
- g_rect.width = rect.width;
- g_rect.height = rect.height;
- M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &g_rect );
- gdk_region_destroy( reg );
-
- wxNode *node = M_REGIONDATA->m_rects.First();
- while (node)
- {
- wxRect *r = (wxRect*)node->Data();
- M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) );
- node = node->Next();
- }
+ return new wxRegionRefData;
}
-wxRegion::wxRegion(void)
+wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const
{
- m_refData = new wxRegionRefData();
- M_REGIONDATA->m_region = gdk_region_new();
+ return new wxRegionRefData(*(wxRegionRefData *)data);
}
-wxRegion::~wxRegion(void)
+// ----------------------------------------------------------------------------
+// wxRegion comparison
+// ----------------------------------------------------------------------------
+
+bool wxRegion::operator==( const wxRegion& region ) const
{
+ if (m_refData == region.m_refData) return TRUE;
+
+ if (!m_refData || !region.m_refData) return FALSE;
+
+ // compare the regions themselves, not the pointers to ref data!
+ return gdk_region_equal(M_REGIONDATA->m_region,
+ M_REGIONDATA_OF(region)->m_region);
}
-void wxRegion::Clear(void)
+// ----------------------------------------------------------------------------
+// wxRegion operations
+// ----------------------------------------------------------------------------
+
+void wxRegion::Clear()
{
- UnRef();
- m_refData = new wxRegionRefData();
- M_REGIONDATA->m_region = gdk_region_new();
+ UnRef();
}
-bool wxRegion::Union( long x, long y, long width, long height )
+bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{
- GdkRectangle rect;
- rect.x = x;
- rect.y = y;
- rect.width = width;
- rect.height = height;
- GdkRegion *reg = gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect );
- gdk_region_destroy( M_REGIONDATA->m_region );
- M_REGIONDATA->m_region = reg;
- M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) );
- return TRUE;
+ // workaround for a strange GTK/X11 bug: taking union with an empty
+ // rectangle results in an empty region which is definitely not what we
+ // want
+ if ( !width || !height )
+ return TRUE;
+
+ if ( !m_refData )
+ {
+ InitRect(x, y, width, height);
+ }
+ else
+ {
+ AllocExclusive();
+
+ GdkRectangle rect;
+ rect.x = x;
+ rect.y = y;
+ rect.width = width;
+ rect.height = height;
+
+#ifdef __WXGTK20__
+ gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect );
+#else
+ GdkRegion *reg = gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect );
+ gdk_region_destroy( M_REGIONDATA->m_region );
+ M_REGIONDATA->m_region = reg;
+#endif
+ }
+
+ return TRUE;
}
bool wxRegion::Union( const wxRect& rect )
{
- GdkRectangle g_rect;
- g_rect.x = rect.x;
- g_rect.y = rect.y;
- g_rect.width = rect.width;
- g_rect.height = rect.height;
- GdkRegion *reg = gdk_region_union_with_rect( M_REGIONDATA->m_region, &g_rect );
- gdk_region_destroy( M_REGIONDATA->m_region );
- M_REGIONDATA->m_region = reg;
- M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(rect.x,rect.y,rect.width,rect.height) );
- return TRUE;
+ return Union( rect.x, rect.y, rect.width, rect.height );
}
bool wxRegion::Union( const wxRegion& region )
{
- GdkRegion *reg = gdk_regions_union( M_REGIONDATA->m_region, region.GetRegion() );
- gdk_region_destroy( M_REGIONDATA->m_region );
- M_REGIONDATA->m_region = reg;
-
- wxNode *node = region.GetRectList()->First();
- while (node)
- {
- wxRect *r = (wxRect*)node->Data();
- M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) );
- node = node->Next();
- }
-
- return TRUE;
+ if (region.IsNull())
+ return FALSE;
+
+ if (!m_refData)
+ {
+ m_refData = new wxRegionRefData();
+ M_REGIONDATA->m_region = gdk_region_new();
+ }
+ else
+ {
+ AllocExclusive();
+ }
+
+#ifdef __WXGTK20__
+ gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() );
+#else
+ GdkRegion *reg = gdk_regions_union( M_REGIONDATA->m_region, region.GetRegion() );
+ gdk_region_destroy( M_REGIONDATA->m_region );
+ M_REGIONDATA->m_region = reg;
+#endif
+
+ return TRUE;
}
-bool wxRegion::Intersect( long x, long y, long width, long height )
+bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{
- wxRegion reg( x, y, width, height );
- Intersect( reg );
- return TRUE;
+ wxRegion reg( x, y, width, height );
+
+ return Intersect( reg );
}
bool wxRegion::Intersect( const wxRect& rect )
{
- wxRegion reg( rect );
- Intersect( reg );
- return TRUE;
+ wxRegion reg( rect );
+
+ return Intersect( reg );
}
bool wxRegion::Intersect( const wxRegion& region )
{
- GdkRegion *reg = gdk_regions_intersect( M_REGIONDATA->m_region, region.GetRegion() );
- gdk_region_destroy( M_REGIONDATA->m_region );
- M_REGIONDATA->m_region = reg;
- return TRUE;
+ if (region.IsNull())
+ return FALSE;
+
+ if (!m_refData)
+ {
+ // intersecting with invalid region doesn't make sense
+ return FALSE;
+ }
+
+ AllocExclusive();
+
+#ifdef __WXGTK20__
+ gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() );
+#else
+ GdkRegion *reg = gdk_regions_intersect( M_REGIONDATA->m_region, region.GetRegion() );
+ gdk_region_destroy( M_REGIONDATA->m_region );
+ M_REGIONDATA->m_region = reg;
+#endif
+
+ return TRUE;
}
-bool wxRegion::Subtract( long x, long y, long width, long height )
+bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{
- wxRegion reg( x, y, width, height );
- Subtract( reg );
- return TRUE;
+ wxRegion reg( x, y, width, height );
+ return Subtract( reg );
}
bool wxRegion::Subtract( const wxRect& rect )
{
- wxRegion reg( rect );
- Subtract( reg );
- return TRUE;
+ wxRegion reg( rect );
+ return Subtract( reg );
}
bool wxRegion::Subtract( const wxRegion& region )
{
- GdkRegion *reg = gdk_regions_subtract( M_REGIONDATA->m_region, region.GetRegion() );
- gdk_region_destroy( M_REGIONDATA->m_region );
- M_REGIONDATA->m_region = reg;
- return TRUE;
+ if (region.IsNull())
+ return FALSE;
+
+ if (!m_refData)
+ {
+ // subtracting from an invalid region doesn't make sense
+ return FALSE;
+ }
+
+ AllocExclusive();
+
+#ifdef __WXGTK20__
+ gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() );
+#else
+ GdkRegion *reg = gdk_regions_subtract( M_REGIONDATA->m_region, region.GetRegion() );
+ gdk_region_destroy( M_REGIONDATA->m_region );
+ M_REGIONDATA->m_region = reg;
+#endif
+
+ return TRUE;
}
-bool wxRegion::Xor( long x, long y, long width, long height )
+bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{
- wxRegion reg( x, y, width, height );
- Xor( reg );
- return TRUE;
+ wxRegion reg( x, y, width, height );
+ return Xor( reg );
}
bool wxRegion::Xor( const wxRect& rect )
{
- wxRegion reg( rect );
- Xor( reg );
- return TRUE;
+ wxRegion reg( rect );
+ return Xor( reg );
}
bool wxRegion::Xor( const wxRegion& region )
{
- GdkRegion *reg = gdk_regions_xor( M_REGIONDATA->m_region, region.GetRegion() );
- gdk_region_destroy( M_REGIONDATA->m_region );
- M_REGIONDATA->m_region = reg;
-
- wxNode *node = region.GetRectList()->First();
- while (node)
- {
- wxRect *r = (wxRect*)node->Data();
- M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) );
- node = node->Next();
- }
-
- return TRUE;
-}
-
-void wxRegion::GetBox( long& x, long& y, long&w, long &h ) const
-{
- x = 0;
- y = 0;
- w = -1;
- h = -1;
- wxNode *node = GetRectList()->First();
- while (node)
- {
- wxRect *r = (wxRect*)node->Data();
- if (node == GetRectList()->First())
+ if (region.IsNull())
+ return FALSE;
+
+ if (!m_refData)
+ {
+ return FALSE;
+ }
+
+ AllocExclusive();
+
+#ifdef __WXGTK20__
+ gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() );
+#else
+ GdkRegion *reg = gdk_regions_xor( M_REGIONDATA->m_region, region.GetRegion() );
+ gdk_region_destroy( M_REGIONDATA->m_region );
+ M_REGIONDATA->m_region = reg;
+#endif
+
+ return TRUE;
+}
+
+bool wxRegion::Offset( wxCoord x, wxCoord y )
+{
+ if (!m_refData)
+ return FALSE;
+
+ AllocExclusive();
+
+ gdk_region_offset( M_REGIONDATA->m_region, x, y );
+
+ return TRUE;
+}
+
+// ----------------------------------------------------------------------------
+// wxRegion tests
+// ----------------------------------------------------------------------------
+
+void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
+{
+ if ( m_refData )
{
- x = r->x;
- y = r->y;
- w = r->width;
- h = r->height;
+ GdkRectangle rect;
+ gdk_region_get_clipbox( M_REGIONDATA->m_region, &rect );
+ x = rect.x;
+ y = rect.y;
+ w = rect.width;
+ h = rect.height;
}
else
{
- if (r->x < x)
- {
- x = r->x;
- w += x - r->x;
- }
- if (r->y < y)
- {
- y = r->y;
- h += y - r->y;
- }
- if (r->width+r->x > x+w)
- {
- w = r->x + r->width - x;
- }
- if (r->height+r->y > y+h)
- {
- h = r->y + r->height - y;
- }
+ x = 0;
+ y = 0;
+ w = -1;
+ h = -1;
}
- node = node->Next();
- }
}
-wxRect wxRegion::GetBox(void) const
+wxRect wxRegion::GetBox() const
{
- long x = 0;
- long y = 0;
- long w = -1;
- long h = -1;
- GetBox( x, y, w, h );
- return wxRect( x, y, w, h );
+ wxCoord x, y, w, h;
+ GetBox( x, y, w, h );
+ return wxRect( x, y, w, h );
}
-bool wxRegion::Empty(void) const
+bool wxRegion::Empty() const
{
- return gdk_region_empty( M_REGIONDATA->m_region );
+ if (!m_refData)
+ return TRUE;
+
+ return gdk_region_empty( M_REGIONDATA->m_region );
}
-wxRegionContain wxRegion::Contains( long x, long y ) const
+wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const
{
- if (gdk_region_point_in( M_REGIONDATA->m_region, x, y ))
- return wxInRegion;
- else
- return wxOutRegion;
+ if (!m_refData)
+ return wxOutRegion;
+
+ if (gdk_region_point_in( M_REGIONDATA->m_region, x, y ))
+ return wxInRegion;
+ else
+ return wxOutRegion;
}
-wxRegionContain wxRegion::Contains( long x, long y, long w, long h ) const
+wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) const
{
- GdkRectangle rect;
- rect.x = x;
- rect.y = y;
- rect.width = w;
- rect.height = h;
- GdkOverlapType res = gdk_region_rect_in( M_REGIONDATA->m_region, &rect );
- switch (res)
- {
- case GDK_OVERLAP_RECTANGLE_IN: return wxInRegion;
- case GDK_OVERLAP_RECTANGLE_OUT: return wxOutRegion;
- case GDK_OVERLAP_RECTANGLE_PART: return wxPartRegion;
- }
- return wxOutRegion;
+ if (!m_refData)
+ return wxOutRegion;
+
+ GdkRectangle rect;
+ rect.x = x;
+ rect.y = y;
+ rect.width = w;
+ rect.height = h;
+ GdkOverlapType res = gdk_region_rect_in( M_REGIONDATA->m_region, &rect );
+ switch (res)
+ {
+ case GDK_OVERLAP_RECTANGLE_IN: return wxInRegion;
+ case GDK_OVERLAP_RECTANGLE_OUT: return wxOutRegion;
+ case GDK_OVERLAP_RECTANGLE_PART: return wxPartRegion;
+ }
+ return wxOutRegion;
}
wxRegionContain wxRegion::Contains(const wxPoint& pt) const
{
- return Contains( pt.x, pt.y );
+ return Contains( pt.x, pt.y );
}
wxRegionContain wxRegion::Contains(const wxRect& rect) const
{
- return Contains( rect.x, rect.y, rect.width, rect.height );
+ return Contains( rect.x, rect.y, rect.width, rect.height );
}
-GdkRegion *wxRegion::GetRegion(void) const
+GdkRegion *wxRegion::GetRegion() const
{
- return M_REGIONDATA->m_region;
+ if (!m_refData)
+ return (GdkRegion*) NULL;
+
+ return M_REGIONDATA->m_region;
}
-wxList *wxRegion::GetRectList() const
+// ----------------------------------------------------------------------------
+// wxRegionIterator
+// ----------------------------------------------------------------------------
+
+#ifndef __WXGTK20__
+
+// the following structures must match the private structures
+// in X11 region code ( xc/lib/X11/region.h )
+
+// this makes the Region type transparent
+// and we have access to the region rectangles
+
+#include <gdk/gdkprivate.h>
+
+struct _XBox {
+ short x1, x2, y1, y2;
+};
+
+struct _XRegion {
+ long size , numRects;
+ _XBox *rects, extents;
+};
+
+#endif // GTK+ 1.x
+
+class wxRIRefData: public wxObjectRefData
{
- return &(M_REGIONDATA->m_rects);
+public:
+ wxRIRefData() { Init(); }
+ virtual ~wxRIRefData();
+
+ void CreateRects( const wxRegion& r );
+
+ void Init() { m_rects = NULL; m_numRects = 0; }
+
+ wxRect *m_rects;
+ size_t m_numRects;
+};
+
+wxRIRefData::~wxRIRefData()
+{
+ delete [] m_rects;
}
-//-----------------------------------------------------------------------------
-// wxRegion
-//-----------------------------------------------------------------------------
+void wxRIRefData::CreateRects( const wxRegion& region )
+{
+ delete [] m_rects;
+
+ Init();
+
+ GdkRegion *gdkregion = region.GetRegion();
+ if (!gdkregion)
+ return;
-IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
-
-wxRegionIterator::wxRegionIterator(void)
+#ifdef __WXGTK20__
+ GdkRectangle *gdkrects = NULL;
+ gint numRects = 0;
+ gdk_region_get_rectangles( gdkregion, &gdkrects, &numRects );
+
+ m_numRects = numRects;
+ if (numRects)
+ {
+ m_rects = new wxRect[m_numRects];
+ for (size_t i=0; i < m_numRects; ++i)
+ {
+ GdkRectangle &gr = gdkrects[i];
+ wxRect &wr = m_rects[i];
+ wr.x = gr.x;
+ wr.y = gr.y;
+ wr.width = gr.width;
+ wr.height = gr.height;
+ }
+ }
+ g_free( gdkrects );
+#else // GTK+ 1.x
+ Region r = ((GdkRegionPrivate *)gdkregion)->xregion;
+ if (r)
+ {
+ m_numRects = r->numRects;
+ if (m_numRects)
+ {
+ m_rects = new wxRect[m_numRects];
+ for (size_t i=0; i < m_numRects; ++i)
+ {
+ _XBox &xr = r->rects[i];
+ wxRect &wr = m_rects[i];
+ wr.x = xr.x1;
+ wr.y = xr.y1;
+ wr.width = xr.x2-xr.x1;
+ wr.height = xr.y2-xr.y1;
+ }
+ }
+ }
+#endif // GTK+ 2.0/1.x
+}
+
+wxRegionIterator::wxRegionIterator()
{
- m_current = 0;
+ m_refData = new wxRIRefData();
+ Reset();
}
wxRegionIterator::wxRegionIterator( const wxRegion& region )
{
- m_region = region;
- m_current = 0;
+ m_refData = new wxRIRefData();
+ Reset(region);
}
void wxRegionIterator::Reset( const wxRegion& region )
{
- m_region = region;
- m_current = 0;
+ m_region = region;
+ ((wxRIRefData*)m_refData)->CreateRects(region);
+ Reset();
}
-wxRegionIterator::operator bool (void) const
-{
- return m_current < m_region.GetRectList()->Number();
+bool wxRegionIterator::HaveRects() const
+{
+ return m_current < ((wxRIRefData*)m_refData)->m_numRects;
}
-bool wxRegionIterator::HaveRects(void) const
-{
- return m_current < m_region.GetRectList()->Number();
+wxRegionIterator& wxRegionIterator::operator ++ ()
+{
+ if (HaveRects())
+ ++m_current;
+
+ return *this;
}
-void wxRegionIterator::operator ++ (void)
+wxRegionIterator wxRegionIterator::operator ++ (int)
{
- if (m_current < m_region.GetRectList()->Number()) ++m_current;
+ wxRegionIterator tmp = *this;
+ if (HaveRects())
+ ++m_current;
+
+ return tmp;
}
-void wxRegionIterator::operator ++ (int)
+wxCoord wxRegionIterator::GetX() const
{
- if (m_current < m_region.GetRectList()->Number()) ++m_current;
+ wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+
+ return ((wxRIRefData*)m_refData)->m_rects[m_current].x;
}
-long wxRegionIterator::GetX(void) const
+wxCoord wxRegionIterator::GetY() const
{
- wxNode *node = m_region.GetRectList()->Nth( m_current );
- if (!node) return 0;
- wxRect *r = (wxRect*)node->Data();
- return r->x;
+ wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+
+ return ((wxRIRefData*)m_refData)->m_rects[m_current].y;
}
-long wxRegionIterator::GetY(void) const
+wxCoord wxRegionIterator::GetW() const
{
- wxNode *node = m_region.GetRectList()->Nth( m_current );
- if (!node) return 0;
- wxRect *r = (wxRect*)node->Data();
- return r->y;
+ wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+
+ return ((wxRIRefData*)m_refData)->m_rects[m_current].width;
}
-long wxRegionIterator::GetW(void) const
+wxCoord wxRegionIterator::GetH() const
{
- wxNode *node = m_region.GetRectList()->Nth( m_current );
- if (!node) return 0;
- wxRect *r = (wxRect*)node->Data();
- return r->width;
+ wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+
+ return ((wxRIRefData*)m_refData)->m_rects[m_current].height;
}
-long wxRegionIterator::GetH(void) const
+wxRect wxRegionIterator::GetRect() const
{
- wxNode *node = m_region.GetRectList()->Nth( m_current );
- if (!node) return 0;
- wxRect *r = (wxRect*)node->Data();
- return r->height;
-}
+ wxRect r;
+ if( HaveRects() )
+ r = ((wxRIRefData*)m_refData)->m_rects[m_current];
+ return r;
+}
projects / wxWidgets.git / blobdiff