From 4e17cf82ff38eabe33381c60d3d7c8b9c8c07069 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 8 Feb 2012 00:20:38 +0000 Subject: [PATCH] Following the theory that something lame is better than nothing at all, provide a very generic implementation of the ctor wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle) by drawing the polygon into a bitmap and using that to create the region. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/carbon/region.cpp | 92 +++++++++++++++------------------------ 1 file changed, 35 insertions(+), 57 deletions(-) diff --git a/src/osx/carbon/region.cpp b/src/osx/carbon/region.cpp index 8db684def8..e7d5a1fe37 100644 --- a/src/osx/carbon/region.cpp +++ b/src/osx/carbon/region.cpp @@ -91,63 +91,41 @@ wxRegion::wxRegion(const wxRect& rect) m_refData = new wxRegionRefData(rect.x , rect.y , rect.width , rect.height); } -wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode WXUNUSED(fillStyle)) -{ - wxUnusedVar(n); - wxUnusedVar(points); - -#if 0 - // no non-QD APIs available - // TODO : remove ? - // OS X somehow does not collect the region invisibly as before, so sometimes things - // get drawn on screen instead of just being combined into a region, therefore we allocate a temp gworld now - - GWorldPtr gWorld = NULL; - GWorldPtr oldWorld; - GDHandle oldGDHandle; - OSStatus err; - Rect destRect = { 0, 0, 1, 1 }; - - ::GetGWorld( &oldWorld, &oldGDHandle ); - err = ::NewGWorld( &gWorld, 32, &destRect, NULL, NULL, 0 ); - if ( err == noErr ) - { - ::SetGWorld( gWorld, GetGDevice() ); - - OpenRgn(); - - wxCoord x1, x2 , y1 , y2 ; - x2 = x1 = points[0].x ; - y2 = y1 = points[0].y ; - - ::MoveTo( x1, y1 ); - for (size_t i = 1; i < n; i++) - { - x2 = points[i].x ; - y2 = points[i].y ; - ::LineTo( x2, y2 ); - } - - // close the polyline if necessary - if ( x1 != x2 || y1 != y2 ) - ::LineTo( x1, y1 ) ; - - RgnHandle tempRgn = NewRgn(); - CloseRgn( tempRgn ) ; - - ::SetGWorld( oldWorld, oldGDHandle ); - wxCFRef tempShape( HIShapeCreateWithQDRgn(tempRgn ) ); - m_refData = new wxRegionRefData(tempShape); - DisposeRgn( tempRgn ); - } - else - { - m_refData = new wxRegionRefData; - } -#else - wxFAIL_MSG( "not implemented" ); - m_refData = NULL; -#endif +wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle) +{ + // Set the region to a polygon shape generically using a bitmap with the + // polygon drawn on it. + + m_refData = new wxRegionRefData(); + + wxCoord mx = 0; + wxCoord my = 0; + wxPoint p; + size_t idx; + + // Find the max size needed to draw the polygon + for (idx=0; idx mx) + mx = pt.x; + if (pt.y > my) + my = pt.y; + } + + // Make the bitmap + wxBitmap bmp(mx, my); + wxMemoryDC dc(bmp); + dc.SetBackground(*wxBLACK_BRUSH); + dc.Clear(); + dc.SetPen(*wxWHITE_PEN); + dc.SetBrush(*wxWHITE_BRUSH); + dc.DrawPolygon(n, (wxPoint*)points, 0, 0, fillStyle); + dc.SelectObject(wxNullBitmap); + bmp.SetMask(new wxMask(bmp, *wxBLACK)); + + // Use it to set this region + Union(bmp); } wxRegion::~wxRegion() -- 2.45.2