/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/region.cpp
+// Name: src/gtk/region.cpp
// Purpose:
// Author: Robert Roebling
+// Modified: VZ at 05.10.00: use AllocExclusive(), comparison fixed
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "region.h"
-#endif
+// ============================================================================
+// declarations
+// ============================================================================
-#include "wx/region.h"
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/region.h"
-// Unfortunately the new way of implementing the region iterator
-// doesn't work with GTK+ 2.0 or above (can't access a Region in
-// GdkPrivateRegion)
-#ifdef __WXGTK20__
-#define OLDCODE 1
-#else
-#define OLDCODE 0
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
#endif
-//-----------------------------------------------------------------------------
-// wxRegion
-//-----------------------------------------------------------------------------
+#include "wx/gtk/private.h"
-class wxRegionRefData: public wxObjectRefData
-{
-public:
- wxRegionRefData();
- ~wxRegionRefData();
- GdkRegion *m_region;
-#if OLDCODE
- wxList m_rects;
-#endif
-};
+// ----------------------------------------------------------------------------
+// wxRegionRefData: private class containing the information about the region
+// ----------------------------------------------------------------------------
-wxRegionRefData::wxRegionRefData()
+class wxRegionRefData : public wxGDIRefData
{
- m_region = (GdkRegion *) NULL;
-}
+public:
+ wxRegionRefData()
+ {
+ m_region = NULL;
+ }
-wxRegionRefData::~wxRegionRefData()
-{
- if (m_region) gdk_region_destroy( m_region );
+ wxRegionRefData(const wxRegionRefData& refData)
+ : wxGDIRefData()
+ {
+ m_region = gdk_region_copy(refData.m_region);
+ }
-#if OLDCODE
- wxNode *node = m_rects.First();
- while (node)
+ virtual ~wxRegionRefData()
{
- wxRect *r = (wxRect*)node->Data();
- delete r;
- node = node->Next();
+ if (m_region)
+ gdk_region_destroy( m_region );
}
-#endif
-}
-//-----------------------------------------------------------------------------
+ GdkRegion *m_region;
+};
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
#define M_REGIONDATA ((wxRegionRefData *)m_refData)
+#define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData))
-IMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject);
+IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
+IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject)
-wxRegion::wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
+// ----------------------------------------------------------------------------
+// wxRegion construction
+// ----------------------------------------------------------------------------
+
+#define M_REGIONDATA ((wxRegionRefData *)m_refData)
+
+void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
{
- m_refData = new wxRegionRefData();
- GdkRegion *reg = gdk_region_new();
GdkRectangle rect;
rect.x = x;
rect.y = y;
rect.width = w;
rect.height = h;
-#ifdef __WXGTK20__
- gdk_region_union_with_rect( reg, &rect );
- M_REGIONDATA->m_region = reg;
-#else
- M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
- gdk_region_destroy( reg );
-#endif
-#if OLDCODE
- M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,w,h) );
-#endif
+
+ m_refData = new wxRegionRefData();
+
+ M_REGIONDATA->m_region = gdk_region_rectangle( &rect );
}
-wxRegion::wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight )
+wxRegion::wxRegion( GdkRegion *region )
{
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;
-#ifdef __WXGTK20__
- gdk_region_union_with_rect( reg, &rect );
- M_REGIONDATA->m_region = reg;
-#else
- M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
- gdk_region_destroy( reg );
-#endif
-#if OLDCODE
- M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(topLeft,bottomRight) );
-#endif
+ M_REGIONDATA->m_region = gdk_region_copy( region );
}
-wxRegion::wxRegion( const wxRect& rect )
+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;
+ }
+
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;
-#ifdef __WXGTK20__
- gdk_region_union_with_rect( reg, &g_rect );
+
+ GdkRegion* reg = gdk_region_polygon
+ (
+ gdkpoints,
+ n,
+ fillStyle == wxWINDING_RULE ? GDK_WINDING_RULE
+ : GDK_EVEN_ODD_RULE
+ );
+
M_REGIONDATA->m_region = reg;
-#else
- M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &g_rect );
- gdk_region_destroy( reg );
-#endif
-#if OLDCODE
- M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(rect.x,rect.y,rect.width,rect.height) );
-#endif
+
+ delete [] gdkpoints;
}
-wxRegion::wxRegion()
+wxRegion::~wxRegion()
{
+ // m_refData unrefed in ~wxObject
}
-wxRegion::~wxRegion()
+wxGDIRefData *wxRegion::CreateGDIRefData() const
{
+ return new wxRegionRefData;
}
-bool wxRegion::operator == ( const wxRegion& region )
+wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const
{
- return m_refData == region.m_refData;
+ return new wxRegionRefData(*(wxRegionRefData *)data);
}
-bool wxRegion::operator != ( const wxRegion& region )
+// ----------------------------------------------------------------------------
+// wxRegion comparison
+// ----------------------------------------------------------------------------
+
+bool wxRegion::DoIsEqual(const wxRegion& region) const
{
- return m_refData != region.m_refData;
+ return gdk_region_equal(M_REGIONDATA->m_region,
+ M_REGIONDATA_OF(region)->m_region);
}
+// ----------------------------------------------------------------------------
+// wxRegion operations
+// ----------------------------------------------------------------------------
+
void wxRegion::Clear()
{
UnRef();
}
-bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
+bool wxRegion::DoUnionWithRect(const wxRect& r)
{
- GdkRectangle rect;
- rect.x = x;
- rect.y = y;
- rect.width = width;
- rect.height = height;
- if (!m_refData)
+ // 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 ( r.IsEmpty() )
+ return true;
+
+ if ( !m_refData )
{
- m_refData = new wxRegionRefData();
- GdkRegion *reg = gdk_region_new();
-#ifdef __WXGTK20__
- gdk_region_union_with_rect( reg, &rect );
- M_REGIONDATA->m_region = reg;
-#else
- M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
- gdk_region_destroy( reg );
-#endif
+ InitRect(r.x, r.y, r.width, r.height);
}
else
{
-#ifdef __WXGTK20__
+ AllocExclusive();
+
+ GdkRectangle rect;
+ rect.x = r.x;
+ rect.y = r.y;
+ rect.width = r.width;
+ rect.height = r.height;
+
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
}
-
-#if OLDCODE
- M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) );
-#endif
- return TRUE;
+ return true;
}
-bool wxRegion::Union( const wxRect& rect )
+bool wxRegion::DoUnionWithRegion( const wxRegion& region )
{
- return Union( rect.x, rect.y, rect.width, rect.height );
-}
-
-bool wxRegion::Union( const wxRegion& region )
-{
- if (region.IsNull())
- return FALSE;
+ wxCHECK_MSG( region.Ok(), false, _T("invalid region") );
if (!m_refData)
{
m_refData = new wxRegionRefData();
M_REGIONDATA->m_region = gdk_region_new();
}
-
-#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
-
-#if OLDCODE
- wxNode *node = region.GetRectList()->First();
- while (node)
+ else
{
- wxRect *r = (wxRect*)node->Data();
- M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) );
- node = node->Next();
+ AllocExclusive();
}
-#endif
- return TRUE;
-}
+ gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() );
-bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
-{
- if (!m_refData)
- {
- m_refData = new wxRegionRefData();
- M_REGIONDATA->m_region = gdk_region_new();
- }
-
- wxRegion reg( x, y, width, height );
- Intersect( reg );
- return TRUE;
+ return true;
}
-bool wxRegion::Intersect( const wxRect& rect )
+bool wxRegion::DoIntersect( const wxRegion& region )
{
+ wxCHECK_MSG( region.Ok(), false, _T("invalid region") );
+
if (!m_refData)
{
- m_refData = new wxRegionRefData();
- M_REGIONDATA->m_region = gdk_region_new();
+ // intersecting with invalid region doesn't make sense
+ return false;
}
-
- wxRegion reg( rect );
- Intersect( reg );
- return TRUE;
-}
-bool wxRegion::Intersect( const wxRegion& region )
-{
- if (region.IsNull())
- return FALSE;
+ AllocExclusive();
- if (!m_refData)
- {
- m_refData = new wxRegionRefData();
- M_REGIONDATA->m_region = gdk_region_new();
- return TRUE;
- }
-
-#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;
+
+ return true;
}
-bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
+bool wxRegion::DoSubtract( const wxRegion& region )
{
+ wxCHECK_MSG( region.Ok(), false, _T("invalid region") );
+
if (!m_refData)
{
- m_refData = new wxRegionRefData();
- M_REGIONDATA->m_region = gdk_region_new();
+ // subtracting from an invalid region doesn't make sense
+ return false;
}
- wxRegion reg( x, y, width, height );
- Subtract( reg );
- return TRUE;
-}
+ AllocExclusive();
-bool wxRegion::Subtract( const wxRect& rect )
-{
- if (!m_refData)
- {
- m_refData = new wxRegionRefData();
- M_REGIONDATA->m_region = gdk_region_new();
- }
+ gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() );
- wxRegion reg( rect );
- Subtract( reg );
- return TRUE;
+ return true;
}
-bool wxRegion::Subtract( const wxRegion& region )
+bool wxRegion::DoXor( const wxRegion& region )
{
- if (region.IsNull())
- return FALSE;
+ wxCHECK_MSG( region.Ok(), false, _T("invalid region") );
if (!m_refData)
{
- m_refData = new wxRegionRefData();
- M_REGIONDATA->m_region = gdk_region_new();
+ return false;
}
-#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;
-}
+ AllocExclusive();
-bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
-{
- if (!m_refData)
- {
- m_refData = new wxRegionRefData();
- M_REGIONDATA->m_region = gdk_region_new();
- }
+ gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() );
- wxRegion reg( x, y, width, height );
- Xor( reg );
- return TRUE;
+ return true;
}
-bool wxRegion::Xor( const wxRect& rect )
+bool wxRegion::DoOffset( wxCoord x, wxCoord y )
{
if (!m_refData)
- {
- m_refData = new wxRegionRefData();
- M_REGIONDATA->m_region = gdk_region_new();
- }
+ return false;
- wxRegion reg( rect );
- Xor( reg );
- return TRUE;
-}
+ AllocExclusive();
-bool wxRegion::Xor( const wxRegion& region )
-{
- if (region.IsNull())
- return FALSE;
+ gdk_region_offset( M_REGIONDATA->m_region, x, y );
- if (!m_refData)
- {
- m_refData = new wxRegionRefData();
- M_REGIONDATA->m_region = gdk_region_new();
- }
+ return true;
+}
-#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
+// ----------------------------------------------------------------------------
+// wxRegion tests
+// ----------------------------------------------------------------------------
-#if OLDCODE
- wxNode *node = region.GetRectList()->First();
- while (node)
+bool wxRegion::DoGetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
+{
+ if ( m_refData )
{
- wxRect *r = (wxRect*)node->Data();
- M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) );
- node = node->Next();
+ GdkRectangle rect;
+ gdk_region_get_clipbox( M_REGIONDATA->m_region, &rect );
+ x = rect.x;
+ y = rect.y;
+ w = rect.width;
+ h = rect.height;
+
+ return true;
}
-#endif
-
- return TRUE;
-}
-
-void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
-{
- x = 0;
- y = 0;
- w = -1;
- h = -1;
- if (!m_refData)
- return;
-
- GdkRectangle rect;
- gdk_region_get_clipbox( M_REGIONDATA->m_region, &rect );
- x = rect.x;
- y = rect.y;
- w = rect.width;
- h = rect.height;
-}
+ else
+ {
+ x = 0;
+ y = 0;
+ w = -1;
+ h = -1;
-wxRect wxRegion::GetBox() const
-{
- wxCoord x = 0;
- wxCoord y = 0;
- wxCoord w = -1;
- wxCoord h = -1;
- GetBox( x, y, w, h );
- return wxRect( x, y, w, h );
+ return false;
+ }
}
-bool wxRegion::Empty() const
+bool wxRegion::IsEmpty() const
{
if (!m_refData)
- return TRUE;
+ return true;
return gdk_region_empty( M_REGIONDATA->m_region );
}
-wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const
+wxRegionContain wxRegion::DoContainsPoint( wxCoord x, wxCoord y ) const
{
if (!m_refData)
return wxOutRegion;
return wxOutRegion;
}
-wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) const
+wxRegionContain wxRegion::DoContainsRect(const wxRect& r) const
{
if (!m_refData)
return wxOutRegion;
GdkRectangle rect;
- rect.x = x;
- rect.y = y;
- rect.width = w;
- rect.height = h;
+ rect.x = r.x;
+ rect.y = r.y;
+ rect.width = r.width;
+ rect.height = r.height;
GdkOverlapType res = gdk_region_rect_in( M_REGIONDATA->m_region, &rect );
switch (res)
{
return wxOutRegion;
}
-wxRegionContain wxRegion::Contains(const wxPoint& pt) const
-{
- return Contains( pt.x, pt.y );
-}
-
-wxRegionContain wxRegion::Contains(const wxRect& rect) const
-{
- return Contains( rect.x, rect.y, rect.width, rect.height );
-}
-
GdkRegion *wxRegion::GetRegion() const
{
if (!m_refData)
return M_REGIONDATA->m_region;
}
-wxList *wxRegion::GetRectList() const
-{
-#if OLDCODE
- if (!m_refData)
- return (wxList*) NULL;
-
- return &(M_REGIONDATA->m_rects);
-#else
- return (wxList*) NULL;
-#endif
-}
-
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
// wxRegionIterator
-//-----------------------------------------------------------------------------
-
-#if OLDCODE
-
-IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
+// ----------------------------------------------------------------------------
wxRegionIterator::wxRegionIterator()
{
+ Init();
Reset();
}
wxRegionIterator::wxRegionIterator( const wxRegion& region )
{
+ Init();
Reset(region);
}
-void wxRegionIterator::Reset( const wxRegion& region )
-{
- m_region = region;
- Reset();
-}
-
-wxRegionIterator::operator bool () const
-{
- return m_region.GetRectList() && m_current < (size_t)m_region.GetRectList()->Number();
-}
-
-bool wxRegionIterator::HaveRects() const
+void wxRegionIterator::Init()
{
- return m_region.GetRectList() && m_current < (size_t)m_region.GetRectList()->Number();
+ m_rects = NULL;
+ m_numRects = 0;
}
-void wxRegionIterator::operator ++ ()
+wxRegionIterator::~wxRegionIterator()
{
- if (HaveRects()) ++m_current;
+ wxDELETEA(m_rects);
}
-void wxRegionIterator::operator ++ (int)
+void wxRegionIterator::CreateRects( const wxRegion& region )
{
- if (HaveRects()) ++m_current;
-}
+ wxDELETEA(m_rects);
+ m_numRects = 0;
-wxCoord wxRegionIterator::GetX() const
-{
- wxNode *node = m_region.GetRectList()->Nth( m_current );
- if (!node) return 0;
- wxRect *r = (wxRect*)node->Data();
- return r->x;
-}
-
-wxCoord wxRegionIterator::GetY() const
-{
- wxNode *node = m_region.GetRectList()->Nth( m_current );
- if (!node) return 0;
- wxRect *r = (wxRect*)node->Data();
- return r->y;
-}
-
-wxCoord wxRegionIterator::GetW() const
-{
- wxNode *node = m_region.GetRectList()->Nth( m_current );
- if (!node) return 0;
- wxRect *r = (wxRect*)node->Data();
- return r->width;
-}
-
-wxCoord wxRegionIterator::GetH() const
-{
- wxNode *node = m_region.GetRectList()->Nth( m_current );
- if (!node) return 0;
- wxRect *r = (wxRect*)node->Data();
- return r->height;
-}
-
-#else
-
-// 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
-
-struct _XBox {
- short x1, x2, y1, y2;
-};
-
-struct _XRegion {
- long size , numRects;
- _XBox *rects, extents;
-};
-
-class wxRIRefData: public wxObjectRefData
-{
-public:
-
- wxRIRefData() : m_rects(0), m_numRects(0){}
- ~wxRIRefData();
-
- wxRect *m_rects;
- size_t m_numRects;
-
- void CreateRects( const wxRegion& r );
-};
-
-wxRIRefData::~wxRIRefData()
-{
- delete m_rects;
-}
+ GdkRegion *gdkregion = region.GetRegion();
+ if (!gdkregion)
+ return;
-#include <gdk/gdkprivate.h>
+ GdkRectangle *gdkrects = NULL;
+ gint numRects = 0;
+ gdk_region_get_rectangles( gdkregion, &gdkrects, &numRects );
-void wxRIRefData::CreateRects( const wxRegion& region )
-{
- if( m_rects )
- delete m_rects;
- m_rects = 0;
- m_numRects= 0;
- GdkRegion *gdkregion= region.GetRegion();
- if( gdkregion ){
- 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 )
+ m_numRects = numRects;
+ if (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;
+ 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;
}
- }
}
- }
-}
-
-IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
-
-wxRegionIterator::wxRegionIterator()
-{
- m_refData = new wxRIRefData();
- Reset();
-}
-
-wxRegionIterator::wxRegionIterator( const wxRegion& region )
-{
- m_refData = new wxRIRefData();
- Reset(region);
+ g_free( gdkrects );
}
void wxRegionIterator::Reset( const wxRegion& region )
{
m_region = region;
- ((wxRIRefData*)m_refData)->CreateRects(region);
+ CreateRects(region);
Reset();
}
bool wxRegionIterator::HaveRects() const
{
- return m_current < ((wxRIRefData*)m_refData)->m_numRects;
+ return m_current < m_numRects;
}
-wxRegionIterator::operator bool () const
+wxRegionIterator& wxRegionIterator::operator ++ ()
{
- return HaveRects();
-}
+ if (HaveRects())
+ ++m_current;
-void wxRegionIterator::operator ++ ()
-{
- if (HaveRects()) ++m_current;
+ return *this;
}
-void wxRegionIterator::operator ++ (int)
+wxRegionIterator wxRegionIterator::operator ++ (int)
{
- if (HaveRects()) ++m_current;
+ wxRegionIterator tmp = *this;
+
+ if (HaveRects())
+ ++m_current;
+
+ return tmp;
}
wxCoord wxRegionIterator::GetX() const
{
- if( !HaveRects() ) return 0;
- return ((wxRIRefData*)m_refData)->m_rects[m_current].x;
+ wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+
+ return m_rects[m_current].x;
}
wxCoord wxRegionIterator::GetY() const
{
- if( !HaveRects() ) return 0;
- return ((wxRIRefData*)m_refData)->m_rects[m_current].y;
+ wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+
+ return m_rects[m_current].y;
}
wxCoord wxRegionIterator::GetW() const
{
- if( !HaveRects() ) return -1;
- return ((wxRIRefData*)m_refData)->m_rects[m_current].width;
+ wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+
+ return m_rects[m_current].width;
}
wxCoord wxRegionIterator::GetH() const
{
- if( !HaveRects() ) return -1;
- return ((wxRIRefData*)m_refData)->m_rects[m_current].height;
+ wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+
+ return m_rects[m_current].height;
}
-#endif
+wxRect wxRegionIterator::GetRect() const
+{
+ wxRect r;
+ if( HaveRects() )
+ r = m_rects[m_current];
+
+ return r;
+}
+
+wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& ri)
+{
+ wxDELETEA(m_rects);
+ m_current = ri.m_current;
+ m_numRects = ri.m_numRects;
+ if ( m_numRects )
+ {
+ m_rects = new wxRect[m_numRects];
+ for ( unsigned int n = 0; n < m_numRects; n++ )
+ m_rects[n] = ri.m_rects[n];
+ }
+ else
+ {
+ m_rects = NULL;
+ }
+
+ return *this;
+}
projects / wxWidgets.git / blobdiff