Fix double deletion bug in wxGTK wxDVC dnd code.

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

diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index 28b4337c435bfa533eb2d653fed33f5c24bdd982..669dc09424f026927098f1c4f7a42d95a39c17d0 100644 (file)
--- a/src/gtk/region.cpp
+++ b/src/gtk/region.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Modified:    VZ at 05.10.00: use AllocExclusive(), comparison fixed
 // Purpose:
 // Author:      Robert Roebling
 // Modified:    VZ at 05.10.00: use AllocExclusive(), comparison fixed


@@ -12,45 +12,47 @@
 // declarations
 // ============================================================================
 
 // declarations
 // ============================================================================
 

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

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

-#include "wx/region.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+#include "wx/region.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
+#ifndef WX_PRECOMP
+    #include "wx/log.h"

 #endif
 
 #endif
 

-#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
 // ----------------------------------------------------------------------------
 

-class wxRegionRefData : public wxObjectRefData
+class wxRegionRefData : public wxGDIRefData

 {
 public:
 {
 public:

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

 
     GdkRegion  *m_region;
 
     GdkRegion  *m_region;

-#if OLDCODE
-    wxList      m_rects;
-#endif

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


@@ -60,59 +62,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
-
-#if OLDCODE
-    wxNode *node = refData.m_rects.First();
-    while (node)
-    {
-        wxRect *r = (wxRect*)node->Data();
-        m_rects.Append( (wxObject*) new wxRect(*r) );
-        node = node->Next();
-    }
-#endif
-}
-
-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


@@ -120,33 +71,27 @@ wxRegionRefData::~wxRegionRefData()
 
 #define M_REGIONDATA ((wxRegionRefData *)m_refData)
 
 
 #define M_REGIONDATA ((wxRegionRefData *)m_refData)
 

-wxRegion::wxRegion()
-{
-}
-

 void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord 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;
     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( size_t n, const wxPoint *points, int fillStyle )
+wxRegion::wxRegion( GdkRegion *region )
+{
+    m_refData = new wxRegionRefData();
+    M_REGIONDATA->m_region = gdk_region_copy( region );
+}
+
+wxRegion::wxRegion( size_t n, const wxPoint *points,
+                    wxPolygonFillMode fillStyle )

 {
     GdkPoint *gdkpoints = new GdkPoint[n];
     for ( size_t i = 0 ; i < n ; i++ )
 {
     GdkPoint *gdkpoints = new GdkPoint[n];
     for ( size_t i = 0 ; i < n ; i++ )


@@ -172,24 +117,29 @@ wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle )
 
 wxRegion::~wxRegion()
 {
 
 wxRegion::~wxRegion()
 {

+    // m_refData unrefed in ~wxObject
+}
+
+wxGDIRefData *wxRegion::CreateGDIRefData() const
+{
+    return new wxRegionRefData;
+}
+
+wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxRegionRefData(*(wxRegionRefData *)data);

 }
 
 // ----------------------------------------------------------------------------
 // wxRegion comparison
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxRegion comparison
 // ----------------------------------------------------------------------------
 

-bool wxRegion::operator==( const wxRegion& region )
+bool wxRegion::DoIsEqual(const wxRegion& region) const

 {
 {

-    // 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 gdk_region_equal(M_REGIONDATA->m_region,
                             M_REGIONDATA_OF(region)->m_region);
 }
 

-bool wxRegion::operator != ( const wxRegion& region )
-{
-    return !(*this == region);
-}
-

 // ----------------------------------------------------------------------------
 // wxRegion operations
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxRegion operations
 // ----------------------------------------------------------------------------


@@ -199,246 +149,120 @@ void wxRegion::Clear()
     UnRef();
 }
 
     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();
-        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(r.x, r.y, r.width, r.height);

     }
     else
     {
         AllocExclusive();
 
     }
     else
     {
         AllocExclusive();
 

-#ifdef __WXGTK20__
+        GdkRectangle rect;
+        rect.x = r.x;
+        rect.y = r.y;
+        rect.width = r.width;
+        rect.height = r.height;
+

         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;
-}
-
-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;
-
-    AllocExclusive();
-
-#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
+    wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") );

 
 

-#if OLDCODE
-    wxNode *node = region.GetRectList()->First();
-    while (node)
+    if (!m_refData)

     {
     {

-        wxRect *r = (wxRect*)node->Data();
-        M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) );
-        node = node->Next();
+        m_refData = new wxRegionRefData();
+        M_REGIONDATA->m_region = gdk_region_new();
+    }
+    else
+    {
+        AllocExclusive();

     }
     }

-#endif
-
-    return TRUE;
-}

 
 

-bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
-{
-    wxRegion reg( x, y, width, height );
+    gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() );

 
 

-    return Intersect( reg );
+    return true;

 }
 
 }
 

-bool wxRegion::Intersect( const wxRect& rect )
+bool wxRegion::DoIntersect( const wxRegion& region )

 {
 {

-    wxRegion reg( rect );
-    return Intersect( reg );
-}
+    wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") );
+
+    if (!m_refData)
+    {
+        // intersecting with invalid region doesn't make sense
+        return false;
+    }

 
 

-// 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)
-{

     AllocExclusive();
 
     AllocExclusive();
 

-#ifdef __WXGTK20__

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

 }
 
 }
 

-bool wxRegion::Intersect( const wxRegion& region )
+bool wxRegion::DoSubtract( const wxRegion& region )

 {
 {

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

     }
 
     }
 

-    // we need to update the rect list as well
-#if OLDCODE
-    wxList& list = *GetRectList();
-    wxNode *node = list.First();
-    while (node)
-    {
-        wxRect *r = (wxRect*)node->Data();
-
-        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();
-    }
-#endif // OLDCODE
-
-    return TRUE;
-}
+    AllocExclusive();

 
 

-bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
-{
-    wxRegion reg( x, y, width, height );
-    return Subtract( reg );
-}
+    gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() );

 
 

-bool wxRegion::Subtract( const wxRect& rect )
-{
-    wxRegion reg( rect );
-    return Subtract( reg );
+    return true;

 }
 
 }
 

-bool wxRegion::Subtract( const wxRegion& region )
+bool wxRegion::DoXor( const wxRegion& region )

 {
 {

-    if (region.IsNull())
-        return FALSE;
+    wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") );

 
     if (!m_refData)
     {
 
     if (!m_refData)
     {

-        m_refData = new wxRegionRefData();
-        M_REGIONDATA->m_region = gdk_region_new();
+        return false;

     }
 
     AllocExclusive();
 
     }
 
     AllocExclusive();
 

-#ifdef __WXGTK20__
-    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;
-}
-
-bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
-{
-    wxRegion reg( x, y, width, height );
-    return Xor( reg );
-}
+    gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() );

 
 

-bool wxRegion::Xor( const wxRect& rect )
-{
-    wxRegion reg( rect );
-    return Xor( reg );
+    return true;

 }
 
 }
 

-bool wxRegion::Xor( const wxRegion& region )
+bool wxRegion::DoOffset( wxCoord x, wxCoord y )

 {
 {

-    if (region.IsNull())
-        return FALSE;
-

     if (!m_refData)
     if (!m_refData)

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

 
 

-#ifdef __WXGTK20__
-    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
+    AllocExclusive();

 
 

-#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 // OLDCODE
+    gdk_region_offset( M_REGIONDATA->m_region, x, y );

 
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 // wxRegion tests
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // 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 )
     {
 {
     if ( m_refData )
     {


@@ -448,6 +272,8 @@ void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
         y = rect.y;
         w = rect.width;
         h = rect.height;
         y = rect.y;
         w = rect.width;
         h = rect.height;

+
+        return true;

     }
     else
     {
     }
     else
     {


@@ -455,37 +281,20 @@ void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
         y = 0;
         w = -1;
         h = -1;
         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)
 {
     if (!m_refData)

-        return TRUE;
+        return true;

 
     return gdk_region_empty( M_REGIONDATA->m_region );
 }
 
 
     return gdk_region_empty( M_REGIONDATA->m_region );
 }
 

-wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const
+wxRegionContain wxRegion::DoContainsPoint( wxCoord x, wxCoord y ) const

 {
     if (!m_refData)
         return wxOutRegion;
 {
     if (!m_refData)
         return wxOutRegion;


@@ -496,16 +305,16 @@ wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const
         return wxOutRegion;
 }
 
         return wxOutRegion;
 }
 

-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;
 {
     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;

     GdkOverlapType res = gdk_region_rect_in( M_REGIONDATA->m_region, &rect );
     switch (res)
     {
     GdkOverlapType res = gdk_region_rect_in( M_REGIONDATA->m_region, &rect );
     switch (res)
     {


@@ -516,246 +325,154 @@ wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
     return wxOutRegion;
 }
 
     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 );
-}
-

 GdkRegion *wxRegion::GetRegion() const
 {
     if (!m_refData)
 GdkRegion *wxRegion::GetRegion() const
 {
     if (!m_refData)

-        return (GdkRegion*) NULL;
+        return NULL;

 
     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
-

 wxRegionIterator::wxRegionIterator()
 {
 wxRegionIterator::wxRegionIterator()
 {

+    Init();

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

+    Init();

     Reset(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
+void wxRegionIterator::Init()

 {
 {

-    wxNode *node = m_region.GetRectList()->Nth( m_current );
-    if (!node) return 0;
-    wxRect *r = (wxRect*)node->Data();
-    return r->width;
+    m_rects = NULL;
+    m_numRects = 0;

 }
 
 }
 

-wxCoord wxRegionIterator::GetH() const
+wxRegionIterator::~wxRegionIterator()

 {
 {

-    wxNode *node = m_region.GetRectList()->Nth( m_current );
-    if (!node) return 0;
-    wxRect *r = (wxRect*)node->Data();
-    return r->height;
+    wxDELETEA(m_rects);

 }
 
 }
 

-#else // !OLDCODE
-
-// 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
+void wxRegionIterator::CreateRects( const wxRegion& region )

 {
 {

-public:
-
-    wxRIRefData() : m_rects(0), m_numRects(0){}
-   ~wxRIRefData();
+    wxDELETEA(m_rects);
+    m_numRects = 0;

 
 

-    wxRect *m_rects;
-    size_t  m_numRects;
+    GdkRegion *gdkregion = region.GetRegion();
+    if (!gdkregion)
+        return;

 
 

-    void CreateRects( const wxRegion& r );
-};
+    GdkRectangle *gdkrects = NULL;
+    gint numRects = 0;
+    gdk_region_get_rectangles( gdkregion, &gdkrects, &numRects );

 
 

-wxRIRefData::~wxRIRefData()
-{
-    delete m_rects;
-}
-
-#include <gdk/gdkprivate.h>
-
-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 )
+    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;

         }
         }

-      }

     }
     }

-  }
-}
-
-wxRegionIterator::wxRegionIterator()
-{
-    m_refData = new wxRIRefData();
-    Reset();
-}
-
-wxRegionIterator::wxRegionIterator( const wxRegion& region )
-{
-    m_refData = new wxRIRefData();
-    Reset(region);
+    g_free( gdkrects );

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

-    ((wxRIRefData*)m_refData)->CreateRects(region);
+    CreateRects(region);

     Reset();
 }
 
 bool wxRegionIterator::HaveRects() const
 {
     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
 {
 }
 
 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
 {
 }
 
 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
 {
 }
 
 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
 {
 }
 
 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() )
 }
 
 wxRect wxRegionIterator::GetRect() const
 {
     wxRect r;
     if( HaveRects() )

-        r = ((wxRIRefData*)m_refData)->m_rects[m_current];
+        r = m_rects[m_current];

 
     return r;
 }
 
 
     return r;
 }
 

-#endif // OLDCODE/!OLDCODE
+wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& ri)
+{
+    wxDELETEA(m_rects);

 
 

+    m_current = ri.m_current;
+    m_numRects = ri.m_numRects;
+    if ( m_numRects )
+    {
+        m_rects = new wxRect[m_numRects];
+        for ( unsigned int n = 0; n < m_numRects; n++ )
+            m_rects[n] = ri.m_rects[n];
+    }
+    else
+    {
+        m_rects = NULL;
+    }
+
+    return *this;
+}