X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83624f79609f0d5e240c1f7d77d044bfff9702fc..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/gtk/region.cpp diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp index a607e5da6c..3c53a68c88 100644 --- a/src/gtk/region.cpp +++ b/src/gtk/region.cpp @@ -1,434 +1,600 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: 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 +// 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 "gdk/gdk.h" -#include "gtk/gtk.h" +#include -//----------------------------------------------------------------------------- -// wxRegion -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// wxRegionRefData: private class containing the information about the region +// ---------------------------------------------------------------------------- -class wxRegionRefData: public wxObjectRefData +class wxRegionRefData : public wxGDIRefData { - public: - - wxRegionRefData(void); - ~wxRegionRefData(void); - - public: +public: + wxRegionRefData() + { + m_region = NULL; + } + + wxRegionRefData(const wxRegionRefData& refData) + : wxGDIRefData() + { +#ifdef __WXGTK3__ + m_region = cairo_region_copy(refData.m_region); +#else + m_region = gdk_region_copy(refData.m_region); +#endif + } + virtual ~wxRegionRefData() + { + if (m_region) + { +#ifdef __WXGTK3__ + cairo_region_destroy(m_region); +#else + gdk_region_destroy( m_region ); +#endif + } + } + +#ifdef __WXGTK3__ + cairo_region_t* m_region; +#else GdkRegion *m_region; - wxList m_rects; +#endif }; -wxRegionRefData::wxRegionRefData(void) -{ - m_region = (GdkRegion *) NULL; -} +// ---------------------------------------------------------------------------- +// macros +// ---------------------------------------------------------------------------- -wxRegionRefData::~wxRegionRefData(void) -{ - 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(); - } -} +#define M_REGIONDATA static_cast(m_refData) +#define M_REGIONDATA_OF(r) static_cast(r.m_refData) -//----------------------------------------------------------------------------- +IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject) +IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject) -#define M_REGIONDATA ((wxRegionRefData *)m_refData) +// ---------------------------------------------------------------------------- +// wxRegion construction +// ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject); - -wxRegion::wxRegion( long x, long y, long w, long h ) +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; - 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) ); -} + GdkRectangle rect; + rect.x = x; + rect.y = y; + rect.width = w; + rect.height = h; -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; - 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 = new wxRegionRefData(); -wxRegion::wxRegion( const wxRect& rect ) -{ - 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(); - } +#ifdef __WXGTK3__ + M_REGIONDATA->m_region = cairo_region_create_rectangle(&rect); +#else + M_REGIONDATA->m_region = gdk_region_rectangle( &rect ); +#endif } -wxRegion::wxRegion(void) +#ifndef __WXGTK3__ +wxRegion::wxRegion(const GdkRegion* region) { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); + m_refData = new wxRegionRefData(); + M_REGIONDATA->m_region = gdk_region_copy(const_cast(region)); } +#endif -wxRegion::~wxRegion(void) -{ -} +wxRegion::wxRegion( size_t n, const wxPoint *points, + wxPolygonFillMode fillStyle ) +{ +#ifdef __WXGTK3__ + // Make a cairo path from the points, draw it onto an image surface, use + // gdk_cairo_region_create_from_surface() to get a cairo region + + // need at least 3 points to make a useful polygon + if (n < 3) + return; + // get bounding rect + int min_x = points[0].x; + int max_x = min_x; + int min_y = points[0].y; + int max_y = min_y; + size_t i; + for (i = 1; i < n; i++) + { + const int x = points[i].x; + if (min_x > x) + min_x = x; + else if (max_x < x) + max_x = x; + const int y = points[i].y; + if (min_y > y) + min_y = y; + else if (max_y < y) + max_y = y; + } + const int w = max_x - min_x + 1; + const int h = max_y - min_y + 1; + // make surface just big enough to contain polygon (A1 is native format + // for gdk_cairo_region_create_from_surface) + cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_A1, w, h); + memset(cairo_image_surface_get_data(surface), 0, cairo_image_surface_get_stride(surface) * h); + cairo_surface_mark_dirty(surface); + cairo_surface_set_device_offset(surface, -min_x, -min_y); + cairo_t* cr = cairo_create(surface); + cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE); + if (fillStyle == wxODDEVEN_RULE) + cairo_set_fill_rule(cr, CAIRO_FILL_RULE_EVEN_ODD); + // make path + cairo_move_to(cr, points[0].x, points[0].y); + for (i = 1; i < n; i++) + cairo_line_to(cr, points[i].x, points[i].y); + cairo_close_path(cr); + cairo_fill(cr); + cairo_destroy(cr); + cairo_surface_flush(surface); + m_refData = new wxRegionRefData; + M_REGIONDATA->m_region = gdk_cairo_region_create_from_surface(surface); + cairo_surface_destroy(surface); +#else + 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; + } -bool wxRegion::operator == ( const wxRegion& region ) -{ - return m_refData == region.m_refData; -} + m_refData = new wxRegionRefData(); -bool wxRegion::operator != ( const wxRegion& region ) -{ - return m_refData != region.m_refData; -} + GdkRegion* reg = gdk_region_polygon + ( + gdkpoints, + n, + fillStyle == wxWINDING_RULE ? GDK_WINDING_RULE + : GDK_EVEN_ODD_RULE + ); -void wxRegion::Clear(void) -{ - UnRef(); - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); -} + M_REGIONDATA->m_region = reg; -bool wxRegion::Union( long x, long y, long width, long 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; + delete [] gdkpoints; +#endif } -bool wxRegion::Union( const wxRect& rect ) +wxRegion::~wxRegion() { - 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; + // m_refData unrefed in ~wxObject } -bool wxRegion::Union( const wxRegion& region ) +wxGDIRefData *wxRegion::CreateGDIRefData() const { - 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; + // should never be called + wxFAIL; + return NULL; } -bool wxRegion::Intersect( long x, long y, long width, long height ) +wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const { - wxRegion reg( x, y, width, height ); - Intersect( reg ); - return TRUE; + return new wxRegionRefData(*static_cast(data)); } -bool wxRegion::Intersect( const wxRect& rect ) +// ---------------------------------------------------------------------------- +// wxRegion comparison +// ---------------------------------------------------------------------------- + +bool wxRegion::DoIsEqual(const wxRegion& region) const { - wxRegion reg( rect ); - Intersect( reg ); - return TRUE; +#ifdef __WXGTK3__ + return cairo_region_equal( + M_REGIONDATA->m_region, M_REGIONDATA_OF(region)->m_region); +#else + return gdk_region_equal(M_REGIONDATA->m_region, + M_REGIONDATA_OF(region)->m_region) != 0; +#endif } -bool wxRegion::Intersect( const wxRegion& region ) +// ---------------------------------------------------------------------------- +// wxRegion operations +// ---------------------------------------------------------------------------- + +void wxRegion::Clear() { - 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; + UnRef(); } -bool wxRegion::Subtract( long x, long y, long width, long height ) +bool wxRegion::DoUnionWithRect(const wxRect& r) { - wxRegion reg( x, y, width, height ); - Subtract( reg ); - 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 ( r.IsEmpty() ) + return true; + + if ( !m_refData ) + { + InitRect(r.x, r.y, r.width, r.height); + } + else + { + AllocExclusive(); + + GdkRectangle rect; + rect.x = r.x; + rect.y = r.y; + rect.width = r.width; + rect.height = r.height; + +#ifdef __WXGTK3__ + cairo_region_union_rectangle(M_REGIONDATA->m_region, &rect); +#else + gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect ); +#endif + } + + return true; } -bool wxRegion::Subtract( const wxRect& rect ) +bool wxRegion::DoUnionWithRegion( const wxRegion& region ) { - wxRegion reg( rect ); - Subtract( reg ); - return TRUE; + if (region.m_refData == NULL) + { } + else if (m_refData == NULL) + { + m_refData = new wxRegionRefData(*M_REGIONDATA_OF(region)); + } + else + { + AllocExclusive(); +#ifdef __WXGTK3__ + cairo_region_union(M_REGIONDATA->m_region, M_REGIONDATA_OF(region)->m_region); +#else + gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() ); +#endif + } + + return true; } -bool wxRegion::Subtract( const wxRegion& region ) +bool wxRegion::DoIntersect( 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.m_refData == NULL || m_refData == NULL) + return false; + + AllocExclusive(); + +#ifdef __WXGTK3__ + cairo_region_intersect(M_REGIONDATA->m_region, M_REGIONDATA_OF(region)->m_region); +#else + gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() ); +#endif + + return true; } -bool wxRegion::Xor( long x, long y, long width, long height ) +bool wxRegion::DoSubtract( const wxRegion& region ) { - wxRegion reg( x, y, width, height ); - Xor( reg ); - return TRUE; + if (region.m_refData == NULL || m_refData == NULL) + return false; + + AllocExclusive(); + +#ifdef __WXGTK3__ + cairo_region_subtract(M_REGIONDATA->m_region, M_REGIONDATA_OF(region)->m_region); +#else + gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() ); +#endif + + return true; } -bool wxRegion::Xor( const wxRect& rect ) +bool wxRegion::DoXor( const wxRegion& region ) { - wxRegion reg( rect ); - Xor( reg ); - return TRUE; + if (region.m_refData == NULL) + { } + else if (m_refData == NULL) + { + // XOR-ing with an invalid region is the same as XOR-ing with an empty + // one, i.e. it is simply a copy. + m_refData = new wxRegionRefData(*M_REGIONDATA_OF(region)); + } + else + { + AllocExclusive(); + +#ifdef __WXGTK3__ + cairo_region_xor(M_REGIONDATA->m_region, M_REGIONDATA_OF(region)->m_region); +#else + gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() ); +#endif + } + + return true; } -bool wxRegion::Xor( const wxRegion& region ) +bool wxRegion::DoOffset( wxCoord x, wxCoord y ) { - 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; + wxCHECK_MSG( m_refData, false, wxS("invalid region") ); + + AllocExclusive(); + +#ifdef __WXGTK3__ + cairo_region_translate(M_REGIONDATA->m_region, x, y); +#else + gdk_region_offset( M_REGIONDATA->m_region, x, y ); +#endif + + return true; } -void wxRegion::GetBox( long& x, long& y, long&w, long &h ) const +// ---------------------------------------------------------------------------- +// wxRegion tests +// ---------------------------------------------------------------------------- + +bool wxRegion::DoGetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &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 ( m_refData ) { - x = r->x; - y = r->y; - w = r->width; - h = r->height; + GdkRectangle rect; +#ifdef __WXGTK3__ + cairo_region_get_extents(M_REGIONDATA->m_region, &rect); +#else + gdk_region_get_clipbox( M_REGIONDATA->m_region, &rect ); +#endif + x = rect.x; + y = rect.y; + w = rect.width; + h = rect.height; + + return true; } 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; + + return false; } - node = node->Next(); - } } -wxRect wxRegion::GetBox(void) const +bool wxRegion::IsEmpty() const { - long x = 0; - long y = 0; - long w = -1; - long h = -1; - GetBox( x, y, w, h ); - return wxRect( x, y, w, h ); +#ifdef __WXGTK3__ + return m_refData == NULL || cairo_region_is_empty(M_REGIONDATA->m_region); +#else + return m_refData == NULL || gdk_region_empty(M_REGIONDATA->m_region); +#endif } -bool wxRegion::Empty(void) const +wxRegionContain wxRegion::DoContainsPoint( wxCoord x, wxCoord y ) const { - return gdk_region_empty( M_REGIONDATA->m_region ); -} +#ifdef __WXGTK3__ + if (m_refData == NULL || !cairo_region_contains_point(M_REGIONDATA->m_region, x, y)) +#else + if (m_refData == NULL || !gdk_region_point_in(M_REGIONDATA->m_region, x, y)) +#endif + return wxOutRegion; -wxRegionContain wxRegion::Contains( long x, long y ) const -{ - 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::DoContainsRect(const wxRect& r) 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 = r.x; + rect.y = r.y; + rect.width = r.width; + rect.height = r.height; +#ifdef __WXGTK3__ + switch (cairo_region_contains_rectangle(M_REGIONDATA->m_region, &rect)) + { + case CAIRO_REGION_OVERLAP_IN: return wxInRegion; + case CAIRO_REGION_OVERLAP_PART: return wxPartRegion; + default: break; + } +#else + 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; + } +#endif + return wxOutRegion; } -wxRegionContain wxRegion::Contains(const wxPoint& pt) const +#ifdef __WXGTK3__ +cairo_region_t* wxRegion::GetRegion() const +#else +GdkRegion *wxRegion::GetRegion() const +#endif { - return Contains( pt.x, pt.y ); + if (!m_refData) + return NULL; + + return M_REGIONDATA->m_region; } -wxRegionContain wxRegion::Contains(const wxRect& rect) const +// ---------------------------------------------------------------------------- +// wxRegionIterator +// ---------------------------------------------------------------------------- + +wxRegionIterator::wxRegionIterator() { - return Contains( rect.x, rect.y, rect.width, rect.height ); + Init(); + Reset(); } -GdkRegion *wxRegion::GetRegion(void) const +wxRegionIterator::wxRegionIterator( const wxRegion& region ) { - return M_REGIONDATA->m_region; + Init(); + Reset(region); } -wxList *wxRegion::GetRectList() const +void wxRegionIterator::Init() { - return &(M_REGIONDATA->m_rects); + m_rects = NULL; + m_numRects = 0; } -//----------------------------------------------------------------------------- -// wxRegion -//----------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject); - -wxRegionIterator::wxRegionIterator(void) +wxRegionIterator::~wxRegionIterator() { - m_current = 0; + wxDELETEA(m_rects); } -wxRegionIterator::wxRegionIterator( const wxRegion& region ) +void wxRegionIterator::CreateRects( const wxRegion& region ) { - m_region = region; - m_current = 0; + wxDELETEA(m_rects); + m_numRects = 0; + +#ifdef __WXGTK3__ + cairo_region_t* cairoRegion = region.GetRegion(); + if (cairoRegion == NULL) + return; + m_numRects = cairo_region_num_rectangles(cairoRegion); + + if (m_numRects) + { + m_rects = new wxRect[m_numRects]; + for (int i = 0; i < m_numRects; i++) + { + GdkRectangle gr; + cairo_region_get_rectangle(cairoRegion, i, &gr); + wxRect &wr = m_rects[i]; + wr.x = gr.x; + wr.y = gr.y; + wr.width = gr.width; + wr.height = gr.height; + } + } +#else + GdkRegion *gdkregion = region.GetRegion(); + if (!gdkregion) + return; + + GdkRectangle* gdkrects; + gdk_region_get_rectangles(gdkregion, &gdkrects, &m_numRects); + + if (m_numRects) + { + m_rects = new wxRect[m_numRects]; + for (int 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 ); +#endif } void wxRegionIterator::Reset( const wxRegion& region ) { - m_region = region; - m_current = 0; + m_region = region; + CreateRects(region); + Reset(); } -wxRegionIterator::operator bool (void) const -{ - return m_current < m_region.GetRectList()->Number(); +bool wxRegionIterator::HaveRects() const +{ + return m_current < 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, wxT("invalid wxRegionIterator") ); + + return 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, wxT("invalid wxRegionIterator") ); + + return 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, wxT("invalid wxRegionIterator") ); + + return 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, wxT("invalid wxRegionIterator") ); + + return 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 = m_rects[m_current]; + return r; +} +wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& ri) +{ + if (this != &ri) + { + wxDELETEA(m_rects); + + m_current = ri.m_current; + m_numRects = ri.m_numRects; + if ( m_numRects ) + { + m_rects = new wxRect[m_numRects]; + memcpy(m_rects, ri.m_rects, m_numRects * sizeof m_rects[0]); + } + } + return *this; +}