Big wxRegion clean up.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
parent
e0f0b19775
commit
48850fa74d
@ -111,7 +111,6 @@ public:
|
||||
wxRegionContain Contains(const wxRect& rect) const;
|
||||
|
||||
public:
|
||||
wxList *GetRectList() const;
|
||||
GdkRegion *GetRegion() const;
|
||||
|
||||
protected:
|
||||
@ -122,9 +121,6 @@ protected:
|
||||
// common part of ctors for a rectangle region
|
||||
void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
|
||||
|
||||
// helper of Intersect()
|
||||
bool IntersectRegionOnly(const wxRegion& reg);
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxRegion);
|
||||
};
|
||||
|
||||
@ -111,7 +111,6 @@ public:
|
||||
wxRegionContain Contains(const wxRect& rect) const;
|
||||
|
||||
public:
|
||||
wxList *GetRectList() const;
|
||||
GdkRegion *GetRegion() const;
|
||||
|
||||
protected:
|
||||
@ -122,9 +121,6 @@ protected:
|
||||
// common part of ctors for a rectangle region
|
||||
void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
|
||||
|
||||
// helper of Intersect()
|
||||
bool IntersectRegionOnly(const wxRegion& reg);
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxRegion);
|
||||
};
|
||||
|
||||
@ -25,15 +25,6 @@
|
||||
#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
|
||||
|
||||
#include "wx/log.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@ -43,14 +34,30 @@
|
||||
class wxRegionRefData : public wxObjectRefData
|
||||
{
|
||||
public:
|
||||
wxRegionRefData();
|
||||
wxRegionRefData(const wxRegionRefData& refData);
|
||||
virtual ~wxRegionRefData();
|
||||
wxRegionRefData()
|
||||
{
|
||||
m_region = NULL;
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
~wxRegionRefData()
|
||||
{
|
||||
if (m_region)
|
||||
gdk_region_destroy( m_region );
|
||||
}
|
||||
|
||||
GdkRegion *m_region;
|
||||
#if OLDCODE
|
||||
wxList m_rects;
|
||||
#endif
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@ -63,57 +70,6 @@ public:
|
||||
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
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxRegion construction
|
||||
// ----------------------------------------------------------------------------
|
||||
@ -122,24 +78,21 @@ wxRegionRefData::~wxRegionRefData()
|
||||
|
||||
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;
|
||||
|
||||
m_refData = new wxRegionRefData();
|
||||
|
||||
#ifdef __WXGTK20__
|
||||
gdk_region_union_with_rect( reg, &rect );
|
||||
M_REGIONDATA->m_region = reg;
|
||||
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
|
||||
|
||||
#if OLDCODE
|
||||
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x, y, w, h) );
|
||||
#endif
|
||||
}
|
||||
|
||||
wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle )
|
||||
@ -216,11 +169,10 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
|
||||
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;
|
||||
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
|
||||
@ -238,10 +190,6 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
|
||||
#endif
|
||||
}
|
||||
|
||||
#if OLDCODE
|
||||
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) );
|
||||
#endif
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@ -255,7 +203,15 @@ bool wxRegion::Union( const wxRegion& region )
|
||||
if (region.IsNull())
|
||||
return FALSE;
|
||||
|
||||
AllocExclusive();
|
||||
if (!m_refData)
|
||||
{
|
||||
m_refData = new wxRegionRefData();
|
||||
M_REGIONDATA->m_region = gdk_region_new();
|
||||
}
|
||||
else
|
||||
{
|
||||
AllocExclusive();
|
||||
}
|
||||
|
||||
#ifdef __WXGTK20__
|
||||
gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() );
|
||||
@ -265,16 +221,6 @@ bool wxRegion::Union( const wxRegion& 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;
|
||||
}
|
||||
|
||||
@ -292,25 +238,6 @@ bool wxRegion::Intersect( const wxRect& 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)
|
||||
{
|
||||
AllocExclusive();
|
||||
|
||||
#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;
|
||||
}
|
||||
|
||||
bool wxRegion::Intersect( const wxRegion& region )
|
||||
{
|
||||
if (region.IsNull())
|
||||
@ -320,40 +247,22 @@ bool wxRegion::Intersect( const wxRegion& region )
|
||||
{
|
||||
m_refData = new wxRegionRefData();
|
||||
M_REGIONDATA->m_region = gdk_region_new();
|
||||
|
||||
// leave here
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
if ( !IntersectRegionOnly(region) )
|
||||
else
|
||||
{
|
||||
GetRectList()->Clear();
|
||||
|
||||
return FALSE;
|
||||
AllocExclusive();
|
||||
}
|
||||
|
||||
// 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
|
||||
#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;
|
||||
}
|
||||
@ -380,8 +289,10 @@ bool wxRegion::Subtract( const wxRegion& region )
|
||||
m_refData = new wxRegionRefData();
|
||||
M_REGIONDATA->m_region = gdk_region_new();
|
||||
}
|
||||
|
||||
AllocExclusive();
|
||||
else
|
||||
{
|
||||
AllocExclusive();
|
||||
}
|
||||
|
||||
#ifdef __WXGTK20__
|
||||
gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() );
|
||||
@ -429,16 +340,6 @@ bool wxRegion::Xor( const wxRegion& 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 // OLDCODE
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@ -542,93 +443,11 @@ GdkRegion *wxRegion::GetRegion() const
|
||||
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
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if OLDCODE
|
||||
|
||||
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 // !OLDCODE
|
||||
#ifndef __WXGTK20__
|
||||
|
||||
// the following structures must match the private structures
|
||||
// in X11 region code ( xc/lib/X11/region.h )
|
||||
@ -636,6 +455,8 @@ wxCoord wxRegionIterator::GetH() const
|
||||
// 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;
|
||||
};
|
||||
@ -645,6 +466,8 @@ struct _XRegion {
|
||||
_XBox *rects, extents;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
class wxRIRefData: public wxObjectRefData
|
||||
{
|
||||
public:
|
||||
@ -663,34 +486,57 @@ 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 )
|
||||
if (m_rects)
|
||||
delete m_rects;
|
||||
|
||||
m_rects = 0;
|
||||
m_numRects = 0;
|
||||
|
||||
GdkRegion *gdkregion = region.GetRegion();
|
||||
if (!gdkregion) return;
|
||||
|
||||
#ifdef __WXGTK20__
|
||||
GdkRectangles *gdkrects = NULL;
|
||||
gint numRects = 0;
|
||||
gdk_region_get_rectangles( gdkregion, &gdkrect, &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_delete( gdkrects ); // delete []
|
||||
#else
|
||||
Region r = ((GdkRegionPrivate *)gdkregion)->xregion;
|
||||
if (r)
|
||||
{
|
||||
m_numRects = r->numRects;
|
||||
if (m_numRects)
|
||||
{
|
||||
m_rects = new wxRect[m_numRects];
|
||||
for (size_t i=0; i < m_numRects; ++i)
|
||||
{
|
||||
_XBox &xr = r->rects[i];
|
||||
wxRect &wr = m_rects[i];
|
||||
wr.x = xr.x1;
|
||||
wr.y = xr.y1;
|
||||
wr.width = xr.x2-xr.x1;
|
||||
wr.height = xr.y2-xr.y1;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
wxRegionIterator::wxRegionIterator()
|
||||
@ -765,5 +611,3 @@ wxRect wxRegionIterator::GetRect() const
|
||||
return r;
|
||||
}
|
||||
|
||||
#endif // OLDCODE/!OLDCODE
|
||||
|
||||
|
||||
@ -25,15 +25,6 @@
|
||||
#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
|
||||
|
||||
#include "wx/log.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@ -43,14 +34,30 @@
|
||||
class wxRegionRefData : public wxObjectRefData
|
||||
{
|
||||
public:
|
||||
wxRegionRefData();
|
||||
wxRegionRefData(const wxRegionRefData& refData);
|
||||
virtual ~wxRegionRefData();
|
||||
wxRegionRefData()
|
||||
{
|
||||
m_region = NULL;
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
~wxRegionRefData()
|
||||
{
|
||||
if (m_region)
|
||||
gdk_region_destroy( m_region );
|
||||
}
|
||||
|
||||
GdkRegion *m_region;
|
||||
#if OLDCODE
|
||||
wxList m_rects;
|
||||
#endif
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@ -63,57 +70,6 @@ public:
|
||||
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
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxRegion construction
|
||||
// ----------------------------------------------------------------------------
|
||||
@ -122,24 +78,21 @@ wxRegionRefData::~wxRegionRefData()
|
||||
|
||||
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;
|
||||
|
||||
m_refData = new wxRegionRefData();
|
||||
|
||||
#ifdef __WXGTK20__
|
||||
gdk_region_union_with_rect( reg, &rect );
|
||||
M_REGIONDATA->m_region = reg;
|
||||
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
|
||||
|
||||
#if OLDCODE
|
||||
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x, y, w, h) );
|
||||
#endif
|
||||
}
|
||||
|
||||
wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle )
|
||||
@ -216,11 +169,10 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
|
||||
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;
|
||||
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
|
||||
@ -238,10 +190,6 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
|
||||
#endif
|
||||
}
|
||||
|
||||
#if OLDCODE
|
||||
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) );
|
||||
#endif
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@ -255,7 +203,15 @@ bool wxRegion::Union( const wxRegion& region )
|
||||
if (region.IsNull())
|
||||
return FALSE;
|
||||
|
||||
AllocExclusive();
|
||||
if (!m_refData)
|
||||
{
|
||||
m_refData = new wxRegionRefData();
|
||||
M_REGIONDATA->m_region = gdk_region_new();
|
||||
}
|
||||
else
|
||||
{
|
||||
AllocExclusive();
|
||||
}
|
||||
|
||||
#ifdef __WXGTK20__
|
||||
gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() );
|
||||
@ -265,16 +221,6 @@ bool wxRegion::Union( const wxRegion& 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;
|
||||
}
|
||||
|
||||
@ -292,25 +238,6 @@ bool wxRegion::Intersect( const wxRect& 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)
|
||||
{
|
||||
AllocExclusive();
|
||||
|
||||
#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;
|
||||
}
|
||||
|
||||
bool wxRegion::Intersect( const wxRegion& region )
|
||||
{
|
||||
if (region.IsNull())
|
||||
@ -320,40 +247,22 @@ bool wxRegion::Intersect( const wxRegion& region )
|
||||
{
|
||||
m_refData = new wxRegionRefData();
|
||||
M_REGIONDATA->m_region = gdk_region_new();
|
||||
|
||||
// leave here
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
if ( !IntersectRegionOnly(region) )
|
||||
else
|
||||
{
|
||||
GetRectList()->Clear();
|
||||
|
||||
return FALSE;
|
||||
AllocExclusive();
|
||||
}
|
||||
|
||||
// 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
|
||||
#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;
|
||||
}
|
||||
@ -380,8 +289,10 @@ bool wxRegion::Subtract( const wxRegion& region )
|
||||
m_refData = new wxRegionRefData();
|
||||
M_REGIONDATA->m_region = gdk_region_new();
|
||||
}
|
||||
|
||||
AllocExclusive();
|
||||
else
|
||||
{
|
||||
AllocExclusive();
|
||||
}
|
||||
|
||||
#ifdef __WXGTK20__
|
||||
gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() );
|
||||
@ -429,16 +340,6 @@ bool wxRegion::Xor( const wxRegion& 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 // OLDCODE
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@ -542,93 +443,11 @@ GdkRegion *wxRegion::GetRegion() const
|
||||
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
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if OLDCODE
|
||||
|
||||
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 // !OLDCODE
|
||||
#ifndef __WXGTK20__
|
||||
|
||||
// the following structures must match the private structures
|
||||
// in X11 region code ( xc/lib/X11/region.h )
|
||||
@ -636,6 +455,8 @@ wxCoord wxRegionIterator::GetH() const
|
||||
// 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;
|
||||
};
|
||||
@ -645,6 +466,8 @@ struct _XRegion {
|
||||
_XBox *rects, extents;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
class wxRIRefData: public wxObjectRefData
|
||||
{
|
||||
public:
|
||||
@ -663,34 +486,57 @@ 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 )
|
||||
if (m_rects)
|
||||
delete m_rects;
|
||||
|
||||
m_rects = 0;
|
||||
m_numRects = 0;
|
||||
|
||||
GdkRegion *gdkregion = region.GetRegion();
|
||||
if (!gdkregion) return;
|
||||
|
||||
#ifdef __WXGTK20__
|
||||
GdkRectangles *gdkrects = NULL;
|
||||
gint numRects = 0;
|
||||
gdk_region_get_rectangles( gdkregion, &gdkrect, &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_delete( gdkrects ); // delete []
|
||||
#else
|
||||
Region r = ((GdkRegionPrivate *)gdkregion)->xregion;
|
||||
if (r)
|
||||
{
|
||||
m_numRects = r->numRects;
|
||||
if (m_numRects)
|
||||
{
|
||||
m_rects = new wxRect[m_numRects];
|
||||
for (size_t i=0; i < m_numRects; ++i)
|
||||
{
|
||||
_XBox &xr = r->rects[i];
|
||||
wxRect &wr = m_rects[i];
|
||||
wr.x = xr.x1;
|
||||
wr.y = xr.y1;
|
||||
wr.width = xr.x2-xr.x1;
|
||||
wr.height = xr.y2-xr.y1;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
wxRegionIterator::wxRegionIterator()
|
||||
@ -765,5 +611,3 @@ wxRect wxRegionIterator::GetRect() const
|
||||
return r;
|
||||
}
|
||||
|
||||
#endif // OLDCODE/!OLDCODE
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user