[ 1473731 ] 'wxColourBase and wxString <-> wxColour implementation' with minor modifi...

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

diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index 2c4be00d6d7d34e2d1d7d0fc2967350d6f239b6a..71cc667463f521cd646f8923f502bd867f02a18d 100644 (file)
--- a/src/gtk/region.cpp
+++ b/src/gtk/region.cpp
@@ -2,7 +2,7 @@
 // Name:        gtk/region.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        gtk/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
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence


@@ -12,29 +12,17 @@
 // declarations
 // ============================================================================
 
 // declarations
 // ============================================================================
 

-#ifdef __GNUG__
-    #pragma implementation "region.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 

-#include "wx/region.h"
-
-#include <gdk/gdk.h>
-#include <gtk/gtk.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
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

+#include "wx/region.h"

 #include "wx/log.h"
 #include "wx/log.h"

+#include "wx/gtk/private.h"
+

 
 // ----------------------------------------------------------------------------
 // wxRegionRefData: private class containing the information about the region
 
 // ----------------------------------------------------------------------------
 // wxRegionRefData: private class containing the information about the region


@@ -43,14 +31,24 @@
 class wxRegionRefData : public wxObjectRefData
 {
 public:
 class wxRegionRefData : public wxObjectRefData
 {
 public:

-    wxRegionRefData();
-    wxRegionRefData(const wxRegionRefData& refData);
-    virtual ~wxRegionRefData();
+    wxRegionRefData()
+    {
+        m_region = NULL;
+    }
+
+    wxRegionRefData(const wxRegionRefData& refData)
+        : wxObjectRefData()
+    {
+        m_region = gdk_region_copy(refData.m_region);
+    }
+
+    ~wxRegionRefData()
+    {
+        if (m_region)
+            gdk_region_destroy( m_region );
+    }

 
     GdkRegion  *m_region;
 
     GdkRegion  *m_region;

-#if OLDCODE
-    wxList      m_rects;
-#endif

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -60,56 +58,8 @@ public:
 #define M_REGIONDATA ((wxRegionRefData *)m_refData)
 #define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData))
 
 #define M_REGIONDATA ((wxRegionRefData *)m_refData)
 #define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData))
 

-IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject);
-IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxRegionRefData
-// ----------------------------------------------------------------------------
-
-wxRegionRefData::wxRegionRefData()
-{
-    m_region = (GdkRegion *) NULL;
-}
-
-wxRegionRefData::wxRegionRefData(const wxRegionRefData& refData)
-{
-#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
-
-    wxNode *node = refData.m_rects.First();
-    while (node)
-    {
-        wxRect *r = (wxRect*)node->Data();
-        m_rects.Append( (wxObject*) new wxRect(*r) );
-        node = node->Next();
-    }
-}
-
-wxRegionRefData::~wxRegionRefData()
-{
-    if (m_region) gdk_region_destroy( m_region );
-
-#if OLDCODE
-    wxNode *node = m_rects.First();
-    while (node)
-    {
-        wxRect *r = (wxRect*)node->Data();
-        delete r;
-        node = node->Next();
-    }
-#endif
-}
+IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
+IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject)

 
 // ----------------------------------------------------------------------------
 // wxRegion construction
 
 // ----------------------------------------------------------------------------
 // wxRegion construction


@@ -117,105 +67,77 @@ wxRegionRefData::~wxRegionRefData()
 
 #define M_REGIONDATA ((wxRegionRefData *)m_refData)
 
 
 #define M_REGIONDATA ((wxRegionRefData *)m_refData)
 

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

 {
 {

-}
-
-wxRegion::wxRegion( 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;
     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
+
+    m_refData = new wxRegionRefData();
+
+    M_REGIONDATA->m_region = gdk_region_rectangle( &rect );

 }
 
 }
 

-wxRegion::wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight )
+wxRegion::wxRegion( GdkRegion *region )

 {
     m_refData = new wxRegionRefData();
 {
     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_copy( region );

 }
 
 }
 

-wxRegion::wxRegion( const wxRect& rect )
+wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle )

 {
 {

+    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;
+    }
+

     m_refData = new wxRegionRefData();
     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 );
+
+    GdkRegion* reg = gdk_region_polygon
+                     (
+                        gdkpoints,
+                        n,
+                        fillStyle == wxWINDING_RULE ? GDK_WINDING_RULE
+                                                    : GDK_EVEN_ODD_RULE
+                     );
+

     M_REGIONDATA->m_region = reg;
     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
+
+    delete [] gdkpoints;

 }
 
 wxRegion::~wxRegion()
 {
 }
 
 wxRegion::~wxRegion()
 {

+    // m_refData unrefed in ~wxObject

 }
 
 }
 

-bool wxRegion::operator==( const wxRegion& region )
+wxObjectRefData *wxRegion::CreateRefData() 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 )
+wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const

 {
 {

-    return !(*this == region);
+    return new wxRegionRefData(*(wxRegionRefData *)data);

 }
 
 }
 

-void wxRegion::Unshare()
+// ----------------------------------------------------------------------------
+// wxRegion comparison
+// ----------------------------------------------------------------------------
+
+bool wxRegion::operator==( 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
+    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!
+    return gdk_region_equal(M_REGIONDATA->m_region,
+                            M_REGIONDATA_OF(region)->m_region);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -229,40 +151,29 @@ void wxRegion::Clear()
 
 bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 {
 
 bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 {

-    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 ( !width || !height )
+        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(x, y, width, height);

     }
     else
     {
     }
     else
     {

-        Unshare();
+        AllocExclusive();
+
+        GdkRectangle rect;
+        rect.x = x;
+        rect.y = y;
+        rect.width = width;
+        rect.height = height;

 
 

-#ifdef __WXGTK20__

         gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect );
         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;
 }
 
     return TRUE;
 }
 


@@ -276,25 +187,17 @@ bool wxRegion::Union( const wxRegion& region )
     if (region.IsNull())
         return FALSE;
 
     if (region.IsNull())
         return FALSE;
 

-    Unshare();
-
-#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)
+    if (!m_refData)
+    {
+        m_refData = new wxRegionRefData();
+        M_REGIONDATA->m_region = gdk_region_new();
+    }
+    else

     {
     {

-        wxRect *r = (wxRect*)node->Data();
-        M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) );
-        node = node->Next();
+        AllocExclusive();

     }
     }

-#endif
+
+    gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() );

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -309,26 +212,8 @@ bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 bool wxRegion::Intersect( const wxRect& rect )
 {
     wxRegion reg( rect );
 bool wxRegion::Intersect( const wxRect& rect )
 {
     wxRegion reg( rect );

-    return Intersect( reg );
-}

 
 

-// 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();
-
-#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;
+    return Intersect( reg );

 }
 
 bool wxRegion::Intersect( const wxRegion& region )
 }
 
 bool wxRegion::Intersect( const wxRegion& region )


@@ -338,40 +223,13 @@ bool wxRegion::Intersect( const wxRegion& region )
 
     if (!m_refData)
     {
 
     if (!m_refData)
     {

-        m_refData = new wxRegionRefData();
-        M_REGIONDATA->m_region = gdk_region_new();
-        return TRUE;
-    }
-
-    if ( !IntersectRegionOnly(region) )
-    {
-        GetRectList()->Clear();
-
+        // intersecting with invalid region doesn't make sense

         return FALSE;
     }
 
         return FALSE;
     }
 

-    // we need to update the rect list as well
-    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;
-        }
-
-        node = node->Next();
-    }
+    gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() );

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -395,19 +253,13 @@ bool wxRegion::Subtract( const wxRegion& region )
 
     if (!m_refData)
     {
 
     if (!m_refData)
     {

-        m_refData = new wxRegionRefData();
-        M_REGIONDATA->m_region = gdk_region_new();
+        // subtracting from an invalid region doesn't make sense
+        return FALSE;

     }
 
     }
 

-    Unshare();
+    AllocExclusive();

 
 

-#ifdef __WXGTK20__

     gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() );
     gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() );

-#else
-    GdkRegion *reg = gdk_regions_subtract( M_REGIONDATA->m_region, region.GetRegion() );
-    gdk_region_destroy( M_REGIONDATA->m_region );
-    M_REGIONDATA->m_region = reg;
-#endif

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -431,31 +283,24 @@ bool wxRegion::Xor( const wxRegion& region )
 
     if (!m_refData)
     {
 
     if (!m_refData)
     {

-        m_refData = new wxRegionRefData();
-        M_REGIONDATA->m_region = gdk_region_new();
-    }
-    else
-    {
-        Unshare();
+        return FALSE;

     }
 
     }
 

-#ifdef __WXGTK20__
+    AllocExclusive();
+

     gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() );
     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

 
 

-#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::Offset( wxCoord x, wxCoord y )
+{
+    if (!m_refData)
+        return FALSE;
+
+    AllocExclusive();
+
+    gdk_region_offset( M_REGIONDATA->m_region, x, y );

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -548,161 +393,60 @@ GdkRegion *wxRegion::GetRegion() const
     return M_REGIONDATA->m_region;
 }
 
     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
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxRegionIterator
 // ----------------------------------------------------------------------------
 

-#if OLDCODE
-
-IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
-
-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
-
-struct _XBox {
-    short x1, x2, y1, y2;
-};
-
-struct _XRegion {
-    long   size , numRects;
-    _XBox *rects, extents;
-};
-

 class wxRIRefData: public wxObjectRefData
 {
 public:
 class wxRIRefData: public wxObjectRefData
 {
 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;
 
     wxRect *m_rects;
     size_t  m_numRects;

-
-    void CreateRects( const wxRegion& r );

 };
 
 wxRIRefData::~wxRIRefData()
 {
 };
 
 wxRIRefData::~wxRIRefData()
 {

-    delete m_rects;
+    delete [] m_rects;

 }
 
 }
 

-#include <gdk/gdkprivate.h>
-

 void wxRIRefData::CreateRects( const wxRegion& region )
 {
 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;
+
+    GdkRectangle *gdkrects = NULL;
+    gint numRects = 0;
+    gdk_region_get_rectangles( gdkregion, &gdkrects, &numRects );
+
+    m_numRects = numRects;
+    if (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;
+            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 );

 }
 
 }
 

-IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
-

 wxRegionIterator::wxRegionIterator()
 {
     m_refData = new wxRIRefData();
 wxRegionIterator::wxRegionIterator()
 {
     m_refData = new wxRIRefData();


@@ -727,55 +471,57 @@ bool wxRegionIterator::HaveRects() const
     return m_current < ((wxRIRefData*)m_refData)->m_numRects;
 }
 
     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
 {
 }
 
 wxCoord wxRegionIterator::GetX() const
 {

-    if( !HaveRects() ) return 0;
+    wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+

     return ((wxRIRefData*)m_refData)->m_rects[m_current].x;
 }
 
 wxCoord wxRegionIterator::GetY() const
 {
     return ((wxRIRefData*)m_refData)->m_rects[m_current].x;
 }
 
 wxCoord wxRegionIterator::GetY() const
 {

-    if( !HaveRects() ) return 0;
+    wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+

     return ((wxRIRefData*)m_refData)->m_rects[m_current].y;
 }
 
 wxCoord wxRegionIterator::GetW() const
 {
     return ((wxRIRefData*)m_refData)->m_rects[m_current].y;
 }
 
 wxCoord wxRegionIterator::GetW() const
 {

-    if( !HaveRects() ) return -1;
+    wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+

     return ((wxRIRefData*)m_refData)->m_rects[m_current].width;
 }
 
 wxCoord wxRegionIterator::GetH() const
 {
     return ((wxRIRefData*)m_refData)->m_rects[m_current].width;
 }
 
 wxCoord wxRegionIterator::GetH() const
 {

-    if( !HaveRects() ) return -1;
+    wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+

     return ((wxRIRefData*)m_refData)->m_rects[m_current].height;
 }
 
 wxRect wxRegionIterator::GetRect() const
 {
     wxRect r;
     return ((wxRIRefData*)m_refData)->m_rects[m_current].height;
 }
 
 wxRect wxRegionIterator::GetRect() const
 {
     wxRect r;

-    wxNode *node = m_region.GetRectList()->Nth( m_current );
-
-    if (node)
-        r = *((wxRect*)node->Data());
+    if( HaveRects() )
+        r = ((wxRIRefData*)m_refData)->m_rects[m_current];

 
     return r;
 }
 
 
     return r;
 }
 

-#endif
-