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

Enable these wxRegion constructor for x11 port

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-09-23 17:40:08 +00:00
parent a8b36e90eb
commit 51ca7cdcd0
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/x11/region.cpp
View File

@@ -83,9 +83,8 @@ void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
XUnionRectWithRegion( &rect, M_REGIONDATA->m_region, M_REGIONDATA->m_region ); XUnionRectWithRegion( &rect, M_REGIONDATA->m_region, M_REGIONDATA->m_region );
} }
wxRegion::wxRegion( size_t WXUNUSED(n), const wxPoint *WXUNUSED(points), wxPolygonFillMode WXUNUSED(fillStyle) ) wxRegion::wxRegion( size_t n, const wxPoint *points, wxPolygonFillMode fillStyle )
{ {
#if 0
XPoint *xpoints = new XPoint[n]; XPoint *xpoints = new XPoint[n];
for ( size_t i = 0 ; i < n ; i++ ) for ( size_t i = 0 ; i < n ; i++ )
{ {
@@ -95,18 +94,10 @@ wxRegion::wxRegion( size_t WXUNUSED(n), const wxPoint *WXUNUSED(points), wxPolyg
m_refData = new wxRegionRefData(); m_refData = new wxRegionRefData();
Region* reg = gdk_region_polygon if ( fillStyle == wxODDEVEN_RULE )
( M_REGIONDATA->m_region = XPolygonRegion(xpoints, n, EvenOddRule);
gdkpoints, else if ( fillStyle == wxWINDING_RULE )
n, M_REGIONDATA->m_region = XPolygonRegion(xpoints, n, WindingRule);
fillStyle == wxWINDING_RULE ? GDK_WINDING_RULE
: GDK_EVEN_ODD_RULE
);
M_REGIONDATA->m_region = reg;
delete [] xpoints;
#endif
} }
wxRegion::~wxRegion() wxRegion::~wxRegion()