/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/region.cpp
+// Name: src/gtk1/region.cpp
// Purpose:
// Author: Robert Roebling
-// Modified: VZ at 05.10.00: use Unshare(), comparison fixed
+// 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
// ----------------------------------------------------------------------------
-#include "wx/region.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
-#include <gdk/gdk.h>
-#include <gtk/gtk.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
-#include "wx/log.h"
+#include "wx/gtk1/private.h"
+
// ----------------------------------------------------------------------------
-// wxRegionRefData: private class containing the information about the region
+// wxGdkRegion: creates a new region in ctor and destroys in dtor
// ----------------------------------------------------------------------------
-class wxRegionRefData : public wxObjectRefData
+class wxGdkRegion
{
public:
- wxRegionRefData();
- wxRegionRefData(const wxRegionRefData& refData);
- virtual ~wxRegionRefData();
+ wxGdkRegion() { m_region = gdk_region_new(); }
+ ~wxGdkRegion() { gdk_region_destroy(m_region); }
- GdkRegion *m_region;
-#if OLDCODE
- wxList m_rects;
-#endif
-};
+ operator GdkRegion *() const { return m_region; }
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-#define M_REGIONDATA ((wxRegionRefData *)m_refData)
-#define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData))
+private:
+ GdkRegion *m_region;
+};
-IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject);
-IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
-
-// ============================================================================
-// implementation
-// ============================================================================
// ----------------------------------------------------------------------------
-// wxRegionRefData
+// wxRegionRefData: private class containing the information about the region
// ----------------------------------------------------------------------------
-wxRegionRefData::wxRegionRefData()
-{
- m_region = (GdkRegion *) NULL;
-}
-
-wxRegionRefData::wxRegionRefData(const wxRegionRefData& refData)
+class wxRegionRefData : public wxGDIRefData
{
-#ifdef __WXGTK20__
- m_region = gdk_region_copy(refData.m_region);
-#else
- m_region = gdk_region_new();
- GdkRegion *regCopy = gdk_regions_union(m_region, refData.m_region);
- gdk_region_destroy(m_region);
- m_region = regCopy;
-#endif
-
-#if OLDCODE
- wxNode *node = refData.m_rects.First();
- while (node)
+public:
+ wxRegionRefData()
{
- wxRect *r = (wxRect*)node->Data();
- m_rects.Append( (wxObject*) new wxRect(*r) );
- node = node->Next();
+ m_region = NULL;
}
-#endif
-}
-wxRegionRefData::~wxRegionRefData()
-{
- if (m_region) gdk_region_destroy( m_region );
+ wxRegionRefData(const wxRegionRefData& refData)
+ : wxGDIRefData()
+ {
+ m_region = gdk_regions_union(wxGdkRegion(), 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;
+};
// ----------------------------------------------------------------------------
-// wxRegion construction
+// macros
// ----------------------------------------------------------------------------
#define M_REGIONDATA ((wxRegionRefData *)m_refData)
+#define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData))
-wxRegion::wxRegion()
-{
-}
+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
-}
-wxRegion::wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight )
-{
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_union_with_rect( wxGdkRegion(), &rect );
}
-wxRegion::wxRegion( const wxRect& rect )
+wxRegion::wxRegion( GdkRegion *region )
{
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 );
- 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
+ M_REGIONDATA->m_region = gdk_regions_union(wxGdkRegion(), region);
}
-wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle )
+wxRegion::wxRegion( size_t n, const wxPoint *points, wxPolygonFillMode fillStyle )
{
GdkPoint *gdkpoints = new GdkPoint[n];
for ( size_t i = 0 ; i < n ; i++ )
wxRegion::~wxRegion()
{
+ // m_refData unrefed in ~wxObject
}
-bool wxRegion::operator==( const wxRegion& region )
+wxGDIRefData *wxRegion::CreateGDIRefData() const
{
- // VZ: compare the regions themselves, not the pointers to ref data!
- return gdk_region_equal(M_REGIONDATA->m_region,
- M_REGIONDATA_OF(region)->m_region);
+ return new wxRegionRefData;
}
-bool wxRegion::operator != ( const wxRegion& region )
+wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const
{
- return !(*this == region);
+ return new wxRegionRefData(*(wxRegionRefData *)data);
}
-void wxRegion::Unshare()
+// ----------------------------------------------------------------------------
+// wxRegion comparison
+// ----------------------------------------------------------------------------
+
+bool wxRegion::DoIsEqual(const wxRegion& region) const
{
- if ( !m_refData )
- {
- m_refData = new wxRegionRefData;
- M_REGIONDATA->m_region = gdk_region_new();
- }
- else if ( m_refData->GetRefCount() > 1 )
- {
- wxRegionRefData *refData = new wxRegionRefData(*M_REGIONDATA);
- UnRef();
- m_refData = refData;
- }
- //else: we're not shared
+ return gdk_region_equal(M_REGIONDATA->m_region,
+ M_REGIONDATA_OF(region)->m_region);
}
// ----------------------------------------------------------------------------
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
{
- Unshare();
+ AllocExclusive();
+
+ GdkRectangle rect;
+ rect.x = r.x;
+ rect.y = r.y;
+ rect.width = r.width;
+ rect.height = r.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
}
-#if OLDCODE
- M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) );
-#endif
-
return TRUE;
}
-bool wxRegion::Union( const wxRect& rect )
-{
- return Union( rect.x, rect.y, rect.width, rect.height );
-}
-
-bool wxRegion::Union( const wxRegion& region )
+bool wxRegion::DoUnionWithRegion( const wxRegion& region )
{
if (region.IsNull())
return FALSE;
- Unshare();
+ 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
-
-#if OLDCODE
- 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();
- }
-#endif
return TRUE;
}
-bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
+bool wxRegion::DoIntersect( const wxRegion& region )
{
- wxRegion reg( x, y, width, height );
-
- return Intersect( reg );
-}
+ wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") );
-bool wxRegion::Intersect( const wxRect& rect )
-{
- wxRegion reg( rect );
- return Intersect( reg );
-}
+ if (!m_refData)
+ {
+ // intersecting with invalid region doesn't make sense
+ return FALSE;
+ }
-// this helper function just computes the region intersection without updating
-// the list of rectangles each region maintaints: this allows us to call it
-// from Intersect() itself without going into infinite recursion as we would
-// if we called Intersect() itself recursively
-bool wxRegion::IntersectRegionOnly(const wxRegion& region)
-{
- Unshare();
+ 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::Intersect( const wxRegion& region )
+bool wxRegion::DoSubtract( const wxRegion& region )
{
- if (region.IsNull())
- return FALSE;
+ wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") );
if (!m_refData)
{
- m_refData = new wxRegionRefData();
- M_REGIONDATA->m_region = gdk_region_new();
- return TRUE;
- }
-
- if ( !IntersectRegionOnly(region) )
- {
- GetRectList()->Clear();
-
+ // subtracting from an invalid region doesn't make sense
return FALSE;
}
- // we need to update the rect list as well
-#if OLDCODE
- wxList& list = *GetRectList();
- wxNode *node = list.First();
- while (node)
- {
- wxRect *r = (wxRect*)node->Data();
+ AllocExclusive();
- wxRegion regCopy = region;
- if ( regCopy.IntersectRegionOnly(*r) )
- {
- // replace the node with the intersection
- *r = regCopy.GetBox();
- }
- else
- {
- // TODO remove the rect from the list
- r->width = 0;
- r->height = 0;
- }
+ GdkRegion *reg = gdk_regions_subtract( M_REGIONDATA->m_region, region.GetRegion() );
+ gdk_region_destroy( M_REGIONDATA->m_region );
+ M_REGIONDATA->m_region = reg;
- node = node->Next();
- }
-#endif
return TRUE;
}
-bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
+bool wxRegion::DoXor( const wxRegion& region )
{
- wxRegion reg( x, y, width, height );
- return Subtract( reg );
-}
-
-bool wxRegion::Subtract( const wxRect& rect )
-{
- wxRegion reg( rect );
- return Subtract( reg );
-}
-
-bool wxRegion::Subtract( const wxRegion& region )
-{
- if (region.IsNull())
- return FALSE;
+ wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") );
if (!m_refData)
{
- m_refData = new wxRegionRefData();
- M_REGIONDATA->m_region = gdk_region_new();
+ return FALSE;
}
- Unshare();
+ AllocExclusive();
-#ifdef __WXGTK20__
- gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() );
-#else
- GdkRegion *reg = gdk_regions_subtract( M_REGIONDATA->m_region, region.GetRegion() );
+ 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::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
+bool wxRegion::DoOffset( wxCoord x, wxCoord y )
{
- wxRegion reg( x, y, width, height );
- return Xor( reg );
-}
-
-bool wxRegion::Xor( const wxRect& rect )
-{
- wxRegion reg( rect );
- return Xor( reg );
-}
-
-bool wxRegion::Xor( const wxRegion& region )
-{
- if (region.IsNull())
- return FALSE;
-
if (!m_refData)
- {
- m_refData = new wxRegionRefData();
- M_REGIONDATA->m_region = gdk_region_new();
- }
- else
- {
- Unshare();
- }
+ return FALSE;
-#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
+ AllocExclusive();
-#if OLDCODE
- 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();
- }
-#endif
+ 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
+bool wxRegion::DoGetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
{
if ( m_refData )
{
y = rect.y;
w = rect.width;
h = rect.height;
+
+ return true;
}
else
{
y = 0;
w = -1;
h = -1;
- }
-}
-wxRect wxRegion::GetBox() const
-{
- wxCoord x, y, w, h;
- 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 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 (GdkRegion*) NULL;
+ return NULL;
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
-
-wxRegionIterator::wxRegionIterator()
-{
- Reset();
-}
-
-wxRegionIterator::wxRegionIterator( const wxRegion& region )
-{
- 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
-{
- return m_region.GetRectList() && m_current < (size_t)m_region.GetRectList()->Number();
-}
-
-void wxRegionIterator::operator ++ ()
-{
- if (HaveRects()) ++m_current;
-}
-
-void wxRegionIterator::operator ++ (int)
-{
- if (HaveRects()) ++m_current;
-}
-
-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
+#include <gdk/gdkprivate.h>
+
struct _XBox {
short x1, x2, y1, y2;
};
_XBox *rects, extents;
};
-class wxRIRefData: public wxObjectRefData
+
+class wxRIRefData : public wxGDIRefData
{
public:
+ wxRIRefData() { Init(); }
+ virtual ~wxRIRefData();
- wxRIRefData() : m_rects(0), m_numRects(0){}
- ~wxRIRefData();
+ void CreateRects( const wxRegion& r );
+
+ void Init() { m_rects = NULL; m_numRects = 0; }
wxRect *m_rects;
size_t m_numRects;
-
- void CreateRects( const wxRegion& r );
};
wxRIRefData::~wxRIRefData()
{
- delete m_rects;
+ delete [] m_rects;
}
-#include <gdk/gdkprivate.h>
-
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 )
+ delete [] m_rects;
+
+ Init();
+
+ GdkRegion *gdkregion = region.GetRegion();
+ if (!gdkregion)
+ return;
+
+ Region r = ((GdkRegionPrivate *)gdkregion)->xregion;
+ if (r)
+ {
+ m_numRects = r->numRects;
+ if (m_numRects)
{
- _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;
+ 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;
+ }
}
- }
}
- }
}
wxRegionIterator::wxRegionIterator()
return m_current < ((wxRIRefData*)m_refData)->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;
+ wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") );
+
return ((wxRIRefData*)m_refData)->m_rects[m_current].x;
}
wxCoord wxRegionIterator::GetY() const
{
- if( !HaveRects() ) return 0;
+ wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") );
+
return ((wxRIRefData*)m_refData)->m_rects[m_current].y;
}
wxCoord wxRegionIterator::GetW() const
{
- if( !HaveRects() ) return -1;
+ wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") );
+
return ((wxRIRefData*)m_refData)->m_rects[m_current].width;
}
wxCoord wxRegionIterator::GetH() const
{
- if( !HaveRects() ) return -1;
+ wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") );
+
return ((wxRIRefData*)m_refData)->m_rects[m_current].height;
}
return r;
}
-
-#endif
-
projects / wxWidgets.git / blobdiff