X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/gtk/region.cpp diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp index d6ae8c12a1..3c53a68c88 100644 --- a/src/gtk/region.cpp +++ b/src/gtk/region.cpp @@ -1,21 +1,17 @@ ///////////////////////////////////////////////////////////////////////////// -// 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: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ // declarations // ============================================================================ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "region.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -23,37 +19,15 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/log.h" - #include "wx/region.h" -#include "wx/gtk/private.h" - -#ifndef __WXGTK20__ - -// ---------------------------------------------------------------------------- -// wxGdkRegion: creates a new region in ctor and destroys in dtor -// ---------------------------------------------------------------------------- - -class wxGdkRegion -{ -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__ +#include // ---------------------------------------------------------------------------- // wxRegionRefData: private class containing the information about the region // ---------------------------------------------------------------------------- -class wxRegionRefData : public wxObjectRefData +class wxRegionRefData : public wxGDIRefData { public: wxRegionRefData() @@ -62,30 +36,40 @@ public: } wxRegionRefData(const wxRegionRefData& refData) - : wxObjectRefData() + : wxGDIRefData() { -#ifdef __WXGTK20__ - m_region = gdk_region_copy(refData.m_region); +#ifdef __WXGTK3__ + m_region = cairo_region_copy(refData.m_region); #else - m_region = gdk_regions_union(wxGdkRegion(), refData.m_region); + m_region = gdk_region_copy(refData.m_region); #endif } - ~wxRegionRefData() + 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; +#endif }; // ---------------------------------------------------------------------------- // macros // ---------------------------------------------------------------------------- -#define M_REGIONDATA ((wxRegionRefData *)m_refData) -#define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData)) +#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) @@ -94,8 +78,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject) // wxRegion construction // ---------------------------------------------------------------------------- -#define M_REGIONDATA ((wxRegionRefData *)m_refData) - void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h) { GdkRectangle rect; @@ -106,25 +88,74 @@ void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h) m_refData = new wxRegionRefData(); -#ifdef __WXGTK20__ - M_REGIONDATA->m_region = gdk_region_rectangle( &rect ); +#ifdef __WXGTK3__ + M_REGIONDATA->m_region = cairo_region_create_rectangle(&rect); #else - M_REGIONDATA->m_region = gdk_region_union_with_rect( wxGdkRegion(), &rect ); + M_REGIONDATA->m_region = gdk_region_rectangle( &rect ); #endif } -wxRegion::wxRegion( GdkRegion *region ) +#ifndef __WXGTK3__ +wxRegion::wxRegion(const GdkRegion* region) { 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 + M_REGIONDATA->m_region = gdk_region_copy(const_cast(region)); } +#endif -wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle ) +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++ ) { @@ -145,6 +176,7 @@ wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle ) M_REGIONDATA->m_region = reg; delete [] gdkpoints; +#endif } wxRegion::~wxRegion() @@ -152,29 +184,31 @@ wxRegion::~wxRegion() // m_refData unrefed in ~wxObject } -wxObjectRefData *wxRegion::CreateRefData() const +wxGDIRefData *wxRegion::CreateGDIRefData() const { - return new wxRegionRefData; + // should never be called + wxFAIL; + return NULL; } -wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const +wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const { - return new wxRegionRefData(*(wxRegionRefData *)data); + return new wxRegionRefData(*static_cast(data)); } // ---------------------------------------------------------------------------- // wxRegion comparison // ---------------------------------------------------------------------------- -bool wxRegion::operator==( const wxRegion& region ) +bool wxRegion::DoIsEqual(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! +#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); + M_REGIONDATA_OF(region)->m_region) != 0; +#endif } // ---------------------------------------------------------------------------- @@ -186,206 +220,150 @@ void wxRegion::Clear() UnRef(); } -bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) +bool wxRegion::DoUnionWithRect(const wxRect& r) { // 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 ( r.IsEmpty() ) + return true; if ( !m_refData ) { - InitRect(x, y, width, height); + InitRect(r.x, r.y, r.width, r.height); } else { AllocExclusive(); GdkRectangle rect; - rect.x = x; - rect.y = y; - rect.width = width; - rect.height = height; + 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 ); +#ifdef __WXGTK3__ + cairo_region_union_rectangle(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; + gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect ); #endif } - return TRUE; -} - -bool wxRegion::Union( const wxRect& rect ) -{ - return Union( rect.x, rect.y, rect.width, rect.height ); + return true; } -bool wxRegion::Union( const wxRegion& region ) +bool wxRegion::DoUnionWithRegion( const wxRegion& region ) { - if (region.IsNull()) - return FALSE; - - if (!m_refData) + if (region.m_refData == NULL) + { } + else if (m_refData == NULL) { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); + m_refData = new wxRegionRefData(*M_REGIONDATA_OF(region)); } else { AllocExclusive(); - } - -#ifdef __WXGTK20__ - gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() ); +#ifdef __WXGTK3__ + cairo_region_union(M_REGIONDATA->m_region, M_REGIONDATA_OF(region)->m_region); #else - GdkRegion *reg = gdk_regions_union( M_REGIONDATA->m_region, region.GetRegion() ); - gdk_region_destroy( M_REGIONDATA->m_region ); - M_REGIONDATA->m_region = reg; + gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() ); #endif + } - return TRUE; -} - -bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) -{ - wxRegion reg( x, y, width, height ); - - return Intersect( reg ); -} - -bool wxRegion::Intersect( const wxRect& rect ) -{ - wxRegion reg( rect ); - - return Intersect( reg ); + return true; } -bool wxRegion::Intersect( const wxRegion& region ) +bool wxRegion::DoIntersect( const wxRegion& region ) { - if (region.IsNull()) - return FALSE; - - if (!m_refData) - { - // intersecting with invalid region doesn't make sense - return FALSE; - } + if (region.m_refData == NULL || m_refData == NULL) + return false; AllocExclusive(); -#ifdef __WXGTK20__ - gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() ); +#ifdef __WXGTK3__ + cairo_region_intersect(M_REGIONDATA->m_region, M_REGIONDATA_OF(region)->m_region); #else - GdkRegion *reg = gdk_regions_intersect( M_REGIONDATA->m_region, region.GetRegion() ); - gdk_region_destroy( M_REGIONDATA->m_region ); - M_REGIONDATA->m_region = reg; + gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() ); #endif - return TRUE; -} - -bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) -{ - wxRegion reg( x, y, width, height ); - return Subtract( reg ); -} - -bool wxRegion::Subtract( const wxRect& rect ) -{ - wxRegion reg( rect ); - return Subtract( reg ); + return true; } -bool wxRegion::Subtract( const wxRegion& region ) +bool wxRegion::DoSubtract( const wxRegion& region ) { - if (region.IsNull()) - return FALSE; - - if (!m_refData) - { - // subtracting from an invalid region doesn't make sense - return FALSE; - } + if (region.m_refData == NULL || m_refData == NULL) + return false; AllocExclusive(); -#ifdef __WXGTK20__ - gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() ); +#ifdef __WXGTK3__ + cairo_region_subtract(M_REGIONDATA->m_region, M_REGIONDATA_OF(region)->m_region); #else - GdkRegion *reg = gdk_regions_subtract( M_REGIONDATA->m_region, region.GetRegion() ); - gdk_region_destroy( M_REGIONDATA->m_region ); - M_REGIONDATA->m_region = reg; + gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() ); #endif - return TRUE; -} - -bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) -{ - wxRegion reg( x, y, width, height ); - return Xor( reg ); -} - -bool wxRegion::Xor( const wxRect& rect ) -{ - wxRegion reg( rect ); - return Xor( reg ); + return true; } -bool wxRegion::Xor( const wxRegion& region ) +bool wxRegion::DoXor( const wxRegion& region ) { - if (region.IsNull()) - return FALSE; - - if (!m_refData) + if (region.m_refData == NULL) + { } + else if (m_refData == NULL) { - return FALSE; + // 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(); - AllocExclusive(); - -#ifdef __WXGTK20__ - gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() ); +#ifdef __WXGTK3__ + cairo_region_xor(M_REGIONDATA->m_region, M_REGIONDATA_OF(region)->m_region); #else - GdkRegion *reg = gdk_regions_xor( M_REGIONDATA->m_region, region.GetRegion() ); - gdk_region_destroy( M_REGIONDATA->m_region ); - M_REGIONDATA->m_region = reg; + gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() ); #endif + } - return TRUE; + return true; } -bool wxRegion::Offset( wxCoord x, wxCoord y ) +bool wxRegion::DoOffset( wxCoord x, wxCoord y ) { - if (!m_refData) - return FALSE; + 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; + 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 ) { 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 { @@ -393,45 +371,50 @@ void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const 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 ); +#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 } -wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const +wxRegionContain wxRegion::DoContainsPoint( wxCoord x, wxCoord y ) const { - if (!m_refData) +#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; - if (gdk_region_point_in( M_REGIONDATA->m_region, x, y )) - return wxInRegion; - else - return wxOutRegion; + return wxInRegion; } -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; +#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) { @@ -439,23 +422,18 @@ wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) case GDK_OVERLAP_RECTANGLE_OUT: return wxOutRegion; case GDK_OVERLAP_RECTANGLE_PART: return wxPartRegion; } +#endif 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 ); -} - +#ifdef __WXGTK3__ +cairo_region_t* wxRegion::GetRegion() const +#else GdkRegion *wxRegion::GetRegion() const +#endif { if (!m_refData) - return (GdkRegion*) NULL; + return NULL; return M_REGIONDATA->m_region; } @@ -464,66 +442,66 @@ GdkRegion *wxRegion::GetRegion() 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 - -struct _XBox { - short x1, x2, y1, y2; -}; - -struct _XRegion { - long size , numRects; - _XBox *rects, extents; -}; - -#endif // GTK+ 1.x - -class wxRIRefData: public wxObjectRefData +wxRegionIterator::wxRegionIterator() { -public: - wxRIRefData() { Init(); } - virtual ~wxRIRefData(); - - void CreateRects( const wxRegion& r ); - - void Init() { m_rects = NULL; m_numRects = 0; } + Init(); + Reset(); +} - wxRect *m_rects; - size_t m_numRects; -}; +wxRegionIterator::wxRegionIterator( const wxRegion& region ) +{ + Init(); + Reset(region); +} -wxRIRefData::~wxRIRefData() +void wxRegionIterator::Init() { - delete [] m_rects; + m_rects = NULL; + m_numRects = 0; } -void wxRIRefData::CreateRects( const wxRegion& region ) +wxRegionIterator::~wxRegionIterator() { - delete [] m_rects; + wxDELETEA(m_rects); +} - Init(); +void wxRegionIterator::CreateRects( const wxRegion& region ) +{ + 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; -#ifdef __WXGTK20__ - GdkRectangle *gdkrects = NULL; - gint numRects = 0; - gdk_region_get_rectangles( gdkregion, &gdkrects, &numRects ); + GdkRectangle* gdkrects; + gdk_region_get_rectangles(gdkregion, &gdkrects, &m_numRects); - m_numRects = numRects; - if (numRects) + if (m_numRects) { m_rects = new wxRect[m_numRects]; - for (size_t i=0; i < m_numRects; ++i) + for (int i = 0; i < m_numRects; ++i) { GdkRectangle &gr = gdkrects[i]; wxRect &wr = m_rects[i]; @@ -534,50 +512,19 @@ void wxRIRefData::CreateRects( const wxRegion& region ) } } 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_refData = new wxRIRefData(); - Reset(); -} - -wxRegionIterator::wxRegionIterator( const wxRegion& region ) -{ - m_refData = new wxRIRefData(); - Reset(region); +#endif } 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& wxRegionIterator::operator ++ () @@ -591,6 +538,7 @@ wxRegionIterator& wxRegionIterator::operator ++ () wxRegionIterator wxRegionIterator::operator ++ (int) { wxRegionIterator tmp = *this; + if (HaveRects()) ++m_current; @@ -599,38 +547,54 @@ wxRegionIterator wxRegionIterator::operator ++ (int) wxCoord wxRegionIterator::GetX() const { - wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") ); + wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") ); - return ((wxRIRefData*)m_refData)->m_rects[m_current].x; + return m_rects[m_current].x; } wxCoord wxRegionIterator::GetY() const { - wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") ); + wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") ); - return ((wxRIRefData*)m_refData)->m_rects[m_current].y; + return m_rects[m_current].y; } wxCoord wxRegionIterator::GetW() const { - wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") ); + wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") ); - return ((wxRIRefData*)m_refData)->m_rects[m_current].width; + return m_rects[m_current].width; } wxCoord wxRegionIterator::GetH() const { - wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") ); + wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") ); - return ((wxRIRefData*)m_refData)->m_rects[m_current].height; + return m_rects[m_current].height; } wxRect wxRegionIterator::GetRect() const { wxRect r; if( HaveRects() ) - r = ((wxRIRefData*)m_refData)->m_rects[m_current]; + 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; +}