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<HIShapeRef> 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<n; idx++)
+ {
+ wxPoint pt = points[idx];
+ if (pt.x > 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()
// Move the region
bool wxRegion::DoOffset(wxCoord x, wxCoord y)
{
- wxCHECK_MSG( M_REGION, false, wxT("invalid wxRegion") );
+ wxCHECK_MSG( m_refData, false, wxT("invalid wxRegion") );
if ( !x && !y )
// nothing to do
return true ;
}
+bool wxRegion::DoUnionWithRect(const wxRect& rect)
+{
+ if ( !m_refData )
+ {
+ m_refData = new wxRegionRefData(rect.x , rect.y , rect.width , rect.height);
+ return true;
+ }
+
+ AllocExclusive();
+
+ CGRect r = CGRectMake(rect.x , rect.y , rect.width , rect.height);
+ HIShapeUnionWithRect(M_REGION , &r);
+
+ return true;
+}
//! Union /e region with this.
bool wxRegion::DoCombine(const wxRegion& region, wxRegionOp op)
WXHRGN wxRegion::GetWXHRGN() const
{
+ if ( !m_refData )
+ return NULL;
+
return M_REGION ;
}
if (!m_refData)
return wxOutRegion;
- CGPoint p = { x, y } ;
+ CGPoint p = CGPointMake( x, y ) ;
if (HIShapeContainsPoint( M_REGION , &p ) )
return wxInRegion;
long m_current ;
};
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
-
-OSStatus wxMacRegionToRectsCounterCallback(
- UInt16 message, RgnHandle WXUNUSED(region), const Rect *WXUNUSED(rect), void *data )
-{
- long *m_numRects = (long*) data ;
- if ( message == kQDRegionToRectsMsgInit )
- {
- (*m_numRects) = 0 ;
- }
- else if (message == kQDRegionToRectsMsgParse)
- {
- (*m_numRects) += 1 ;
- }
-
- return noErr;
-}
-
-OSStatus wxMacRegionToRectsSetterCallback(
- UInt16 message, RgnHandle WXUNUSED(region), const Rect *rect, void *data )
-{
- if (message == kQDRegionToRectsMsgParse)
- {
- RegionToRectsCallbackData *cb = (RegionToRectsCallbackData*) data ;
- cb->m_rects[cb->m_current++] = wxRect( rect->left , rect->top , rect->right - rect->left , rect->bottom - rect->top ) ;
- }
-
- return noErr;
-}
-
-#endif
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-
OSStatus wxOSXRegionToRectsCounterCallback(
int message, HIShapeRef WXUNUSED(region), const CGRect *WXUNUSED(rect), void *data )
{
return noErr;
}
-#endif
-
void wxRegionIterator::Reset(const wxRegion& region)
{
m_current = 0;
m_rects = new wxRect[m_numRects];
m_rects[0] = m_region.GetBox();
#endif
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
- if ( HIShapeEnumerate != NULL )
+ OSStatus err = HIShapeEnumerate (OTHER_M_REGION(region), kHIShapeParseFromTopLeft, wxOSXRegionToRectsCounterCallback,
+ (void*)&m_numRects);
+ if (err == noErr)
{
- OSStatus err = HIShapeEnumerate (OTHER_M_REGION(region), kHIShapeParseFromTopLeft, wxOSXRegionToRectsCounterCallback,
- (void*)&m_numRects);
- if (err == noErr)
- {
- m_rects = new wxRect[m_numRects];
- RegionToRectsCallbackData data ;
- data.m_rects = m_rects ;
- data.m_current = 0 ;
- HIShapeEnumerate( OTHER_M_REGION(region), kHIShapeParseFromTopLeft, wxOSXRegionToRectsSetterCallback,
- (void*)&data );
- }
- else
- {
- m_numRects = 0;
- }
+ m_rects = new wxRect[m_numRects];
+ RegionToRectsCallbackData data ;
+ data.m_rects = m_rects ;
+ data.m_current = 0 ;
+ HIShapeEnumerate( OTHER_M_REGION(region), kHIShapeParseFromTopLeft, wxOSXRegionToRectsSetterCallback,
+ (void*)&data );
}
else
-#endif
{
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
- OSStatus err = noErr;
- RgnHandle rgn = NewRgn();
- HIShapeGetAsQDRgn(OTHER_M_REGION(region), rgn);
-
- err = QDRegionToRects (rgn, kQDParseRegionFromTopLeft, wxMacRegionToRectsCounterCallback
- , (void*)&m_numRects);
- if (err == noErr)
- {
- m_rects = new wxRect[m_numRects];
- RegionToRectsCallbackData data ;
- data.m_rects = m_rects ;
- data.m_current = 0 ;
- QDRegionToRects( rgn , kQDParseRegionFromTopLeft, wxMacRegionToRectsSetterCallback,
- (void*)&data );
- }
- else
- {
- m_numRects = 0;
- }
- DisposeRgn( rgn );
-#endif
+ m_numRects = 0;
}
}
}
projects / wxWidgets.git / blobdiff