Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk+ 1.3.1's region transformation code no longer returns a new region,

Browse Source 
but rather seems to operate on the source region... added a bunch
of ifdefs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
2000-07-19 09:39:18 +00:00
parent 9d084560f8
commit b7c2d6ffcb
2 changed files with 80 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/gtk/region.cpp
View File

@@ -64,8 +64,13 @@ wxRegion::wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
rect.y = y; rect.y = y;
rect.width = w; rect.width = w;
rect.height = h; 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 ); M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
gdk_region_destroy( reg ); gdk_region_destroy( reg );
#endif
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,w,h) ); M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,w,h) );
} }
@@ -78,8 +83,13 @@ wxRegion::wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight )
rect.y = topLeft.y; rect.y = topLeft.y;
rect.width = bottomRight.x - rect.x; rect.width = bottomRight.x - rect.x;
rect.height = bottomRight.y - rect.y; 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 ); M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
gdk_region_destroy( reg ); gdk_region_destroy( reg );
#endif
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(topLeft,bottomRight) ); M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(topLeft,bottomRight) );
} }
@@ -92,8 +102,13 @@ wxRegion::wxRegion( const wxRect& rect )
g_rect.y = rect.y; g_rect.y = rect.y;
g_rect.width = rect.width; g_rect.width = rect.width;
g_rect.height = rect.height; g_rect.height = rect.height;
#ifdef __WXGTK20__
gdk_region_union_with_rect( reg, &g_rect );
M_REGIONDATA->m_region = reg;
#else
M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &g_rect ); M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &g_rect );
gdk_region_destroy( reg ); gdk_region_destroy( reg );
#endif
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(rect.x,rect.y,rect.width,rect.height) ); M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(rect.x,rect.y,rect.width,rect.height) );
} }
@@ -131,14 +146,23 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{ {
m_refData = new wxRegionRefData(); m_refData = new wxRegionRefData();
GdkRegion *reg = gdk_region_new(); 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 ); M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
gdk_region_destroy( reg ); gdk_region_destroy( reg );
#endif
} }
else else
{ {
#ifdef __WXGTK20__
gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect );
#else
GdkRegion *reg = gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect ); GdkRegion *reg = gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect );
gdk_region_destroy( M_REGIONDATA->m_region ); gdk_region_destroy( M_REGIONDATA->m_region );
M_REGIONDATA->m_region = reg; M_REGIONDATA->m_region = reg;
#endif
} }
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) ); M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) );
@@ -162,9 +186,13 @@ bool wxRegion::Union( const wxRegion& region )
M_REGIONDATA->m_region = gdk_region_new(); M_REGIONDATA->m_region = gdk_region_new();
} }
#ifdef __WXGTK20__
gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() );
#else
GdkRegion *reg = gdk_regions_union( M_REGIONDATA->m_region, region.GetRegion() ); GdkRegion *reg = gdk_regions_union( M_REGIONDATA->m_region, region.GetRegion() );
gdk_region_destroy( M_REGIONDATA->m_region ); gdk_region_destroy( M_REGIONDATA->m_region );
M_REGIONDATA->m_region = reg; M_REGIONDATA->m_region = reg;
#endif
wxNode *node = region.GetRectList()->First(); wxNode *node = region.GetRectList()->First();
while (node) while (node)
@@ -215,9 +243,13 @@ bool wxRegion::Intersect( const wxRegion& region )
return TRUE; return TRUE;
} }
#ifdef __WXGTK20__
gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() );
#else
GdkRegion *reg = gdk_regions_intersect( M_REGIONDATA->m_region, region.GetRegion() ); GdkRegion *reg = gdk_regions_intersect( M_REGIONDATA->m_region, region.GetRegion() );
gdk_region_destroy( M_REGIONDATA->m_region ); gdk_region_destroy( M_REGIONDATA->m_region );
M_REGIONDATA->m_region = reg; M_REGIONDATA->m_region = reg;
#endif
return TRUE; return TRUE;
} }
@@ -258,9 +290,13 @@ bool wxRegion::Subtract( const wxRegion& region )
M_REGIONDATA->m_region = gdk_region_new(); M_REGIONDATA->m_region = gdk_region_new();
} }
#ifdef __WXGTK20__
gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() );
#else
GdkRegion *reg = gdk_regions_subtract( M_REGIONDATA->m_region, region.GetRegion() ); GdkRegion *reg = gdk_regions_subtract( M_REGIONDATA->m_region, region.GetRegion() );
gdk_region_destroy( M_REGIONDATA->m_region ); gdk_region_destroy( M_REGIONDATA->m_region );
M_REGIONDATA->m_region = reg; M_REGIONDATA->m_region = reg;
#endif
return TRUE; return TRUE;
} }
@@ -301,9 +337,13 @@ bool wxRegion::Xor( const wxRegion& region )
M_REGIONDATA->m_region = gdk_region_new(); M_REGIONDATA->m_region = gdk_region_new();
} }
#ifdef __WXGTK20__
gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() );
#else
GdkRegion *reg = gdk_regions_xor( M_REGIONDATA->m_region, region.GetRegion() ); GdkRegion *reg = gdk_regions_xor( M_REGIONDATA->m_region, region.GetRegion() );
gdk_region_destroy( M_REGIONDATA->m_region ); gdk_region_destroy( M_REGIONDATA->m_region );
M_REGIONDATA->m_region = reg; M_REGIONDATA->m_region = reg;
#endif
wxNode *node = region.GetRectList()->First(); wxNode *node = region.GetRectList()->First();
while (node) while (node)

40
src/gtk1/region.cpp
View File

@@ -64,8 +64,13 @@ wxRegion::wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
rect.y = y; rect.y = y;
rect.width = w; rect.width = w;
rect.height = h; 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 ); M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
gdk_region_destroy( reg ); gdk_region_destroy( reg );
#endif
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,w,h) ); M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,w,h) );
} }
@@ -78,8 +83,13 @@ wxRegion::wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight )
rect.y = topLeft.y; rect.y = topLeft.y;
rect.width = bottomRight.x - rect.x; rect.width = bottomRight.x - rect.x;
rect.height = bottomRight.y - rect.y; 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 ); M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
gdk_region_destroy( reg ); gdk_region_destroy( reg );
#endif
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(topLeft,bottomRight) ); M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(topLeft,bottomRight) );
} }
@@ -92,8 +102,13 @@ wxRegion::wxRegion( const wxRect& rect )
g_rect.y = rect.y; g_rect.y = rect.y;
g_rect.width = rect.width; g_rect.width = rect.width;
g_rect.height = rect.height; g_rect.height = rect.height;
#ifdef __WXGTK20__
gdk_region_union_with_rect( reg, &g_rect );
M_REGIONDATA->m_region = reg;
#else
M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &g_rect ); M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &g_rect );
gdk_region_destroy( reg ); gdk_region_destroy( reg );
#endif
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(rect.x,rect.y,rect.width,rect.height) ); M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(rect.x,rect.y,rect.width,rect.height) );
} }
@@ -131,14 +146,23 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{ {
m_refData = new wxRegionRefData(); m_refData = new wxRegionRefData();
GdkRegion *reg = gdk_region_new(); 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 ); M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
gdk_region_destroy( reg ); gdk_region_destroy( reg );
#endif
} }
else else
{ {
#ifdef __WXGTK20__
gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect );
#else
GdkRegion *reg = gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect ); GdkRegion *reg = gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect );
gdk_region_destroy( M_REGIONDATA->m_region ); gdk_region_destroy( M_REGIONDATA->m_region );
M_REGIONDATA->m_region = reg; M_REGIONDATA->m_region = reg;
#endif
} }
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) ); M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) );
@@ -162,9 +186,13 @@ bool wxRegion::Union( const wxRegion& region )
M_REGIONDATA->m_region = gdk_region_new(); M_REGIONDATA->m_region = gdk_region_new();
} }
#ifdef __WXGTK20__
gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() );
#else
GdkRegion *reg = gdk_regions_union( M_REGIONDATA->m_region, region.GetRegion() ); GdkRegion *reg = gdk_regions_union( M_REGIONDATA->m_region, region.GetRegion() );
gdk_region_destroy( M_REGIONDATA->m_region ); gdk_region_destroy( M_REGIONDATA->m_region );
M_REGIONDATA->m_region = reg; M_REGIONDATA->m_region = reg;
#endif
wxNode *node = region.GetRectList()->First(); wxNode *node = region.GetRectList()->First();
while (node) while (node)
@@ -215,9 +243,13 @@ bool wxRegion::Intersect( const wxRegion& region )
return TRUE; return TRUE;
} }
#ifdef __WXGTK20__
gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() );
#else
GdkRegion *reg = gdk_regions_intersect( M_REGIONDATA->m_region, region.GetRegion() ); GdkRegion *reg = gdk_regions_intersect( M_REGIONDATA->m_region, region.GetRegion() );
gdk_region_destroy( M_REGIONDATA->m_region ); gdk_region_destroy( M_REGIONDATA->m_region );
M_REGIONDATA->m_region = reg; M_REGIONDATA->m_region = reg;
#endif
return TRUE; return TRUE;
} }
@@ -258,9 +290,13 @@ bool wxRegion::Subtract( const wxRegion& region )
M_REGIONDATA->m_region = gdk_region_new(); M_REGIONDATA->m_region = gdk_region_new();
} }
#ifdef __WXGTK20__
gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() );
#else
GdkRegion *reg = gdk_regions_subtract( M_REGIONDATA->m_region, region.GetRegion() ); GdkRegion *reg = gdk_regions_subtract( M_REGIONDATA->m_region, region.GetRegion() );
gdk_region_destroy( M_REGIONDATA->m_region ); gdk_region_destroy( M_REGIONDATA->m_region );
M_REGIONDATA->m_region = reg; M_REGIONDATA->m_region = reg;
#endif
return TRUE; return TRUE;
} }
@@ -301,9 +337,13 @@ bool wxRegion::Xor( const wxRegion& region )
M_REGIONDATA->m_region = gdk_region_new(); M_REGIONDATA->m_region = gdk_region_new();
} }
#ifdef __WXGTK20__
gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() );
#else
GdkRegion *reg = gdk_regions_xor( M_REGIONDATA->m_region, region.GetRegion() ); GdkRegion *reg = gdk_regions_xor( M_REGIONDATA->m_region, region.GetRegion() );
gdk_region_destroy( M_REGIONDATA->m_region ); gdk_region_destroy( M_REGIONDATA->m_region );
M_REGIONDATA->m_region = reg; M_REGIONDATA->m_region = reg;
#endif
wxNode *node = region.GetRectList()->First(); wxNode *node = region.GetRectList()->First();
while (node) while (node)