/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/region.cpp
+// Name: src/gtk/region.cpp
// Purpose:
// Author: Robert Roebling
// Modified: VZ at 05.10.00: use AllocExclusive(), comparison fixed
// declarations
// ============================================================================
-#ifdef __GNUG__
- #pragma implementation "region.h"
-#endif
-
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#include "wx/log.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#include "wx/region.h"
-#include "wx/gtk/private.h"
+#include <gdk/gdk.h>
// ----------------------------------------------------------------------------
// wxRegionRefData: private class containing the information about the region
// ----------------------------------------------------------------------------
-class wxRegionRefData : public wxObjectRefData
+class wxRegionRefData : public wxGDIRefData
{
public:
wxRegionRefData()
{
m_region = NULL;
}
-
+
wxRegionRefData(const wxRegionRefData& refData)
+ : 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_region_new();
- GdkRegion *regCopy = gdk_regions_union(m_region, refData.m_region);
- gdk_region_destroy(m_region);
- m_region = regCopy;
+ 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<wxRegionRefData*>(m_refData)
+#define M_REGIONDATA_OF(r) static_cast<wxRegionRefData*>(r.m_refData)
-IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject);
-IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
+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)
{
GdkRectangle rect;
rect.y = y;
rect.width = w;
rect.height = 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
- GdkRegion *reg = gdk_region_new();
- M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
- gdk_region_destroy( reg );
+ M_REGIONDATA->m_region = gdk_region_rectangle( &rect );
#endif
}
-wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle )
+#ifndef __WXGTK3__
+wxRegion::wxRegion(const GdkRegion* region)
{
+ m_refData = new wxRegionRefData();
+ M_REGIONDATA->m_region = gdk_region_copy(const_cast<GdkRegion*>(region));
+}
+#endif
+
+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++ )
{
M_REGIONDATA->m_region = reg;
delete [] gdkpoints;
+#endif
}
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<const wxRegionRefData*>(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
}
// ----------------------------------------------------------------------------
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();
-#ifdef __WXGTK20__
- M_REGIONDATA->m_region = gdk_region_rectangle( &rect );
-#else
- GdkRegion *reg = gdk_region_new();
- 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
{
AllocExclusive();
-#ifdef __WXGTK20__
- gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect );
+ 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
- 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;
+ 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;
-
- 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;
+ 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 );
+ if (region.m_refData == NULL || m_refData == NULL)
+ return false;
- return Intersect( reg );
-}
+ AllocExclusive();
-bool wxRegion::Intersect( const wxRect& rect )
-{
- wxRegion reg( rect );
-
- return Intersect( reg );
+#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::Intersect( const wxRegion& region )
+bool wxRegion::DoSubtract( const wxRegion& region )
{
- if (region.IsNull())
- return FALSE;
+ if (region.m_refData == NULL || m_refData == NULL)
+ return false;
- if (!m_refData)
- {
- m_refData = new wxRegionRefData();
- M_REGIONDATA->m_region = gdk_region_new();
-
- // leave here
- return TRUE;
- }
- else
- {
- AllocExclusive();
- }
+ AllocExclusive();
-#ifdef __WXGTK20__
- gdk_region_intersect( 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_intersect( 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;
+ 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;
-
- if (!m_refData)
+ if (region.m_refData == NULL)
+ { }
+ else if (m_refData == NULL)
{
- m_refData = new wxRegionRefData();
- M_REGIONDATA->m_region = gdk_region_new();
+ // 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 __WXGTK20__
- gdk_region_subtract( 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_subtract( 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::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 );
-}
+ wxCHECK_MSG( m_refData, false, wxS("invalid region") );
-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
- {
- AllocExclusive();
- }
+ AllocExclusive();
-#ifdef __WXGTK20__
- gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() );
+#ifdef __WXGTK3__
+ cairo_region_translate(M_REGIONDATA->m_region, x, y);
#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_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
{
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 );
-}
-bool wxRegion::Offset( wxCoord x, wxCoord y )
-{
- if (!m_refData)
- return FALSE;
-
- AllocExclusive();
-
- gdk_region_offset( M_REGIONDATA->m_region, x, y );
-
- return TRUE;
+ 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)
{
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;
}
// 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
-
-class wxRIRefData: public wxObjectRefData
+wxRegionIterator::wxRegionIterator()
{
-public:
- wxRIRefData() { Init(); }
- virtual ~wxRIRefData();
-
- void CreateRects( const wxRegion& r );
+ Init();
+ Reset();
+}
- void Init() { m_rects = NULL; m_numRects = 0; }
+wxRegionIterator::wxRegionIterator( const wxRegion& region )
+{
+ Init();
+ Reset(region);
+}
- wxRect *m_rects;
- size_t m_numRects;
-};
+void wxRegionIterator::Init()
+{
+ m_rects = NULL;
+ m_numRects = 0;
+}
-wxRIRefData::~wxRIRefData()
+wxRegionIterator::~wxRegionIterator()
{
- delete [] m_rects;
+ wxDELETEA(m_rects);
}
-void wxRIRefData::CreateRects( const wxRegion& region )
+void wxRegionIterator::CreateRects( const wxRegion& region )
{
- delete [] m_rects;
+ wxDELETEA(m_rects);
+ m_numRects = 0;
- Init();
-
- GdkRegion *gdkregion = region.GetRegion();
- if (!gdkregion)
+#ifdef __WXGTK3__
+ cairo_region_t* cairoRegion = region.GetRegion();
+ if (cairoRegion == NULL)
return;
-
-#ifdef __WXGTK20__
- GdkRectangle *gdkrects = NULL;
- gint numRects = 0;
- gdk_region_get_rectangles( gdkregion, &gdkrects, &numRects );
-
- m_numRects = numRects;
- if (numRects)
+ m_numRects = cairo_region_num_rectangles(cairoRegion);
+
+ 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];
+ GdkRectangle gr;
+ cairo_region_get_rectangle(cairoRegion, i, &gr);
wxRect &wr = m_rects[i];
wr.x = gr.x;
wr.y = gr.y;
wr.height = gr.height;
}
}
- g_free( gdkrects );
-#else // GTK+ 1.x
- Region r = ((GdkRegionPrivate *)gdkregion)->xregion;
- if (r)
+#else
+ GdkRegion *gdkregion = region.GetRegion();
+ if (!gdkregion)
+ return;
+
+ GdkRectangle* gdkrects;
+ gdk_region_get_rectangles(gdkregion, &gdkrects, &m_numRects);
+
+ if (m_numRects)
{
- m_numRects = r->numRects;
- if (m_numRects)
+ m_rects = new wxRect[m_numRects];
+ for (int i = 0; i < m_numRects; ++i)
{
- 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;
}
}
-#endif // GTK+ 2.0/1.x
-}
-
-wxRegionIterator::wxRegionIterator()
-{
- m_refData = new wxRIRefData();
- Reset();
-}
-
-wxRegionIterator::wxRegionIterator( const wxRegion& region )
-{
- m_refData = new wxRIRefData();
- Reset(region);
+ g_free( gdkrects );
+#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::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, wxT("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, wxT("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, wxT("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, wxT("invalid wxRegionIterator") );
+
+ 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;
+}
projects / wxWidgets.git / blobdiff