Compilation fix for wxFont in wxGTK1.

[wxWidgets.git] / src / gtk1 / region.cpp

diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp
index a01289855ba0c4a3160944287dd7332b8e38a786..bc33b745516c502185cdfce8120c6c3cbff49199 100644 (file)
--- a/src/gtk1/region.cpp
+++ b/src/gtk1/region.cpp
@@ -1,431 +1,510 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        region.cpp
+// Name:        src/gtk1/region.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

+// Modified:    VZ at 05.10.00: use AllocExclusive(), comparison fixed

 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // 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 "wx/region.h"
 

-//-----------------------------------------------------------------------------
-// wxRegion
-//-----------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+
+#include "wx/gtk1/private.h"

 
 

-class wxRegionRefData: public wxObjectRefData
+
+// ----------------------------------------------------------------------------
+// wxGdkRegion: creates a new region in ctor and destroys in dtor
+// ----------------------------------------------------------------------------
+
+class wxGdkRegion

 {
 {

-  public:
-  
-    wxRegionRefData(void);
-    ~wxRegionRefData(void);
-  
-  public:    
+public:
+    wxGdkRegion() { m_region = gdk_region_new(); }
+    ~wxGdkRegion() { gdk_region_destroy(m_region); }

 
 

-    GdkRegion  *m_region;
-    wxList      m_rects;
+    operator GdkRegion *() const { return m_region; }
+
+private:
+    GdkRegion *m_region;

 };
 
 };
 

-wxRegionRefData::wxRegionRefData(void)
-{
-  m_region = (GdkRegion *) NULL;
-}

 
 

-wxRegionRefData::~wxRegionRefData(void)
+// ----------------------------------------------------------------------------
+// wxRegionRefData: private class containing the information about the region
+// ----------------------------------------------------------------------------
+
+class wxRegionRefData : public wxGDIRefData

 {
 {

-  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();
-  }
-}
+public:
+    wxRegionRefData()
+    {
+        m_region = NULL;
+    }

 
 

-//-----------------------------------------------------------------------------
+    wxRegionRefData(const wxRegionRefData& refData)
+        : wxGDIRefData()
+    {
+        m_region = gdk_regions_union(wxGdkRegion(), refData.m_region);
+    }
+
+    virtual ~wxRegionRefData()
+    {
+        if (m_region)
+            gdk_region_destroy( m_region );
+    }
+
+    GdkRegion  *m_region;
+};
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------

 
 #define M_REGIONDATA ((wxRegionRefData *)m_refData)
 
 #define M_REGIONDATA ((wxRegionRefData *)m_refData)

+#define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData))

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject);
-  
-wxRegion::wxRegion( long x, long y, long w, long 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) );
-}
+IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
+IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject)

 
 

-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) );
-}
+// ----------------------------------------------------------------------------
+// wxRegion construction
+// ----------------------------------------------------------------------------

 
 

-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();
-  }
-}
+#define M_REGIONDATA ((wxRegionRefData *)m_refData)

 
 

-wxRegion::wxRegion(void)
+void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h)

 {
 {

-  m_refData = new wxRegionRefData();
-  M_REGIONDATA->m_region = gdk_region_new();
-}
+    GdkRectangle rect;
+    rect.x = x;
+    rect.y = y;
+    rect.width = w;
+    rect.height = h;

 
 

-wxRegion::~wxRegion(void)
-{
-}
+    m_refData = new wxRegionRefData();

 
 

-bool wxRegion::operator == ( const wxRegion& region )
-{
-  return m_refData == region.m_refData; 
+    M_REGIONDATA->m_region = gdk_region_union_with_rect( wxGdkRegion(), &rect );

 }
 
 }
 

-bool wxRegion::operator != ( const wxRegion& region )
+wxRegion::wxRegion( GdkRegion *region )

 {
 {

-  return m_refData != region.m_refData; 
+    m_refData = new wxRegionRefData();
+    M_REGIONDATA->m_region = gdk_regions_union(wxGdkRegion(), region);

 }
 
 }
 

-void wxRegion::Clear(void)
+wxRegion::wxRegion( size_t n, const wxPoint *points, wxPolygonFillMode fillStyle )

 {
 {

-  UnRef();
-  m_refData = new wxRegionRefData();
-  M_REGIONDATA->m_region = gdk_region_new();
-}
+    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::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;
+    m_refData = new wxRegionRefData();
+
+    GdkRegion* reg = gdk_region_polygon
+                     (
+                        gdkpoints,
+                        n,
+                        fillStyle == wxWINDING_RULE ? GDK_WINDING_RULE
+                                                    : GDK_EVEN_ODD_RULE
+                     );
+
+    M_REGIONDATA->m_region = reg;
+
+    delete [] gdkpoints;

 }
 
 }
 

-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;
+    return new wxRegionRefData;

 }
 
 }
 

-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(*(wxRegionRefData *)data);

 }
 
 }
 

-bool wxRegion::Intersect( const wxRect& rect )
+// ----------------------------------------------------------------------------
+// wxRegion comparison
+// ----------------------------------------------------------------------------
+
+bool wxRegion::DoIsEqual(const wxRegion& region) const

 {
 {

-  wxRegion reg( rect );
-  Intersect( reg );
-  return TRUE;
+    return gdk_region_equal(M_REGIONDATA->m_region,
+                            M_REGIONDATA_OF(region)->m_region);

 }
 
 }
 

-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;
+
+        GdkRegion *reg = gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect );
+        gdk_region_destroy( M_REGIONDATA->m_region );
+        M_REGIONDATA->m_region = reg;
+    }
+
+    return TRUE;

 }
 
 }
 

-bool wxRegion::Subtract( const wxRect& rect )
+bool wxRegion::DoUnionWithRegion( const wxRegion& region )

 {
 {

-  wxRegion reg( rect );
-  Subtract( reg );
-  return TRUE;
+    if (region.IsNull())
+        return FALSE;
+
+    if (!m_refData)
+    {
+        m_refData = new wxRegionRefData();
+        M_REGIONDATA->m_region = gdk_region_new();
+    }
+    else
+    {
+        AllocExclusive();
+    }
+
+    GdkRegion *reg = gdk_regions_union( M_REGIONDATA->m_region, region.GetRegion() );
+    gdk_region_destroy( M_REGIONDATA->m_region );
+    M_REGIONDATA->m_region = reg;
+
+    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;
+    wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") );
+
+    if (!m_refData)
+    {
+        // intersecting with invalid region doesn't make sense
+        return FALSE;
+    }
+
+    AllocExclusive();
+
+    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;

 }
 
 }
 

-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;
+    wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") );
+
+    if (!m_refData)
+    {
+        // subtracting from an invalid region doesn't make sense
+        return FALSE;
+    }
+
+    AllocExclusive();
+
+    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;

 }
 
 }
 

-bool wxRegion::Xor( const wxRect& rect )
+bool wxRegion::DoXor( const wxRegion& region )

 {
 {

-  wxRegion reg( rect );
-  Xor( reg );
-  return TRUE;
+    wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") );
+
+    if (!m_refData)
+    {
+        return FALSE;
+    }
+
+    AllocExclusive();
+
+    GdkRegion *reg = gdk_regions_xor( M_REGIONDATA->m_region, region.GetRegion() );
+    gdk_region_destroy( M_REGIONDATA->m_region );
+    M_REGIONDATA->m_region = reg;
+
+    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;
+    if (!m_refData)
+        return FALSE;
+
+    AllocExclusive();
+
+    gdk_region_offset( M_REGIONDATA->m_region, x, y );
+
+    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;
+        gdk_region_get_clipbox( M_REGIONDATA->m_region, &rect );
+        x = rect.x;
+        y = rect.y;
+        w = rect.width;
+        h = rect.height;
+
+        return true;

     }
     else
     {
     }
     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 );
+    if (!m_refData)
+        return TRUE;
+
+    return gdk_region_empty( M_REGIONDATA->m_region );

 }
 
 }
 

-bool wxRegion::Empty(void) const
+wxRegionContain wxRegion::DoContainsPoint( wxCoord x, wxCoord y ) const

 {
 {

-  return gdk_region_empty( M_REGIONDATA->m_region );
+    if (!m_refData)
+        return wxOutRegion;
+
+    if (gdk_region_point_in( M_REGIONDATA->m_region, x, y ))
+        return wxInRegion;
+    else
+        return wxOutRegion;

 }
 
 }
 

-wxRegionContain wxRegion::Contains( long x, long y ) const
+wxRegionContain wxRegion::DoContainsRect(const wxRect& r) const

 {
 {

-  if (gdk_region_point_in( M_REGIONDATA->m_region, x, y ))
-    return wxInRegion;
-  else
+    if (!m_refData)
+        return wxOutRegion;
+
+    GdkRectangle rect;
+    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)
+    {
+        case GDK_OVERLAP_RECTANGLE_IN:   return wxInRegion;
+        case GDK_OVERLAP_RECTANGLE_OUT:  return wxOutRegion;
+        case GDK_OVERLAP_RECTANGLE_PART: return wxPartRegion;
+    }

     return wxOutRegion;
 }
 
     return wxOutRegion;
 }
 

-wxRegionContain wxRegion::Contains( long x, long y, long w, long h ) const
+GdkRegion *wxRegion::GetRegion() 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 NULL;

 
 

-wxRegionContain wxRegion::Contains(const wxPoint& pt) const
-{
-  return Contains( pt.x, pt.y );
+    return M_REGIONDATA->m_region;

 }
 
 }
 

-wxRegionContain wxRegion::Contains(const wxRect& rect) const
+// ----------------------------------------------------------------------------
+// wxRegionIterator
+// ----------------------------------------------------------------------------
+
+// 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;
+};
+
+
+class wxRIRefData : public wxGDIRefData

 {
 {

-  return Contains( rect.x, rect.y, rect.width, rect.height );
-}
+public:
+    wxRIRefData() { Init(); }
+    virtual ~wxRIRefData();
+
+    void CreateRects( const wxRegion& r );

 
 

-GdkRegion *wxRegion::GetRegion(void) const
+    void Init() { m_rects = NULL; m_numRects = 0; }
+
+    wxRect *m_rects;
+    size_t  m_numRects;
+};
+
+wxRIRefData::~wxRIRefData()

 {
 {

-  return M_REGIONDATA->m_region;
+    delete [] m_rects;

 }
 
 }
 

-wxList *wxRegion::GetRectList() const
+void wxRIRefData::CreateRects( const wxRegion& region )

 {
 {

-  return &(M_REGIONDATA->m_rects);
-}
+    delete [] m_rects;
+
+    Init();

 
 

-//-----------------------------------------------------------------------------
-// wxRegion
-//-----------------------------------------------------------------------------
+    GdkRegion *gdkregion = region.GetRegion();
+    if (!gdkregion)
+        return;

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
-  
-wxRegionIterator::wxRegionIterator(void)
+    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;
+            }
+        }
+    }
+}
+
+wxRegionIterator::wxRegionIterator()

 {
 {

-  m_current = 0;
+    m_refData = new wxRIRefData();
+    Reset();

 }
 
 wxRegionIterator::wxRegionIterator( const wxRegion& region )
 {
 }
 
 wxRegionIterator::wxRegionIterator( const wxRegion& region )
 {

-  m_region = region;
-  m_current = 0;
+    m_refData = new wxRIRefData();
+    Reset(region);

 }
 
 void wxRegionIterator::Reset( const wxRegion& region )
 {
 }
 
 void wxRegionIterator::Reset( const wxRegion& region )
 {

-  m_region = region;
-  m_current = 0;
+    m_region = region;
+    ((wxRIRefData*)m_refData)->CreateRects(region);
+    Reset();

 }
 
 }
 

-wxRegionIterator::operator bool (void) const 
-{ 
-  return m_current < m_region.GetRectList()->Number(); 
-}
-
-bool wxRegionIterator::HaveRects(void) const 
-{ 
-  return m_current < m_region.GetRectList()->Number(); 
+bool wxRegionIterator::HaveRects() const
+{
+    return m_current < ((wxRIRefData*)m_refData)->m_numRects;

 }
 
 }
 

-void wxRegionIterator::operator ++ (void)
+wxRegionIterator& wxRegionIterator::operator ++ ()

 {
 {

-  if (m_current < m_region.GetRectList()->Number()) ++m_current;
+    if (HaveRects())
+        ++m_current;
+
+    return *this;

 }
 
 }
 

-void wxRegionIterator::operator ++ (int)
+wxRegionIterator wxRegionIterator::operator ++ (int)

 {
 {

-  if (m_current < m_region.GetRectList()->Number()) ++m_current;
+    wxRegionIterator tmp = *this;
+    if (HaveRects())
+        ++m_current;
+
+    return tmp;

 }
 
 }
 

-long wxRegionIterator::GetX(void) const
+wxCoord wxRegionIterator::GetX() 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 ((wxRIRefData*)m_refData)->m_rects[m_current].x;

 }
 
 }
 

-long wxRegionIterator::GetY(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->y;
+    wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") );
+
+    return ((wxRIRefData*)m_refData)->m_rects[m_current].y;

 }
 
 }
 

-long wxRegionIterator::GetW(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->width;
+    wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") );
+
+    return ((wxRIRefData*)m_refData)->m_rects[m_current].width;

 }
 
 }
 

-long wxRegionIterator::GetH(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->height;
+    wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") );
+
+    return ((wxRIRefData*)m_refData)->m_rects[m_current].height;

 }
 
 }
 

+wxRect wxRegionIterator::GetRect() const
+{
+    wxRect r;
+    if( HaveRects() )
+        r = ((wxRIRefData*)m_refData)->m_rects[m_current];

 
 

+    return r;
+}