check that the version of __sync_sub_and_fetch that returns a value is supported...

[wxWidgets.git] / src / mac / carbon / region.cpp

diff --git a/src/mac/carbon/region.cpp b/src/mac/carbon/region.cpp
index b8147e5db86a6910530b98ba1d6d445f9cbfe91b..20d5d46b7d99204a31b6a0e3ac337208a8eb5d07 100644 (file)
--- a/src/mac/carbon/region.cpp
+++ b/src/mac/carbon/region.cpp
@@ -29,19 +29,33 @@ class WXDLLEXPORT wxRegionRefData : public wxGDIRefData
 {
 public:
     wxRegionRefData()
 {
 public:
     wxRegionRefData()

-    { m_macRgn = NewRgn(); }
+    {
+        m_macRgn.reset( HIShapeCreateMutable() );
+    }
+
+    wxRegionRefData(HIShapeRef hRegion)
+    {
+        m_macRgn.reset( HIShapeCreateMutableCopy(hRegion) );
+    }
+
+    wxRegionRefData(long x, long y, long w, long h)
+    {
+        CGRect r = CGRectMake(x,y,w,h);
+        wxCFRef<HIShapeRef> rect(HIShapeCreateWithRect(&r));
+        m_macRgn.reset( HIShapeCreateMutableCopy(rect) );
+    }

 
     wxRegionRefData(const wxRegionRefData& data)
         : wxGDIRefData()
     {
 
     wxRegionRefData(const wxRegionRefData& data)
         : wxGDIRefData()
     {

-        m_macRgn = NewRgn();
-        CopyRgn( data.m_macRgn , m_macRgn );
+        m_macRgn.reset( HIShapeCreateMutableCopy(data.m_macRgn) );

     }
 
     virtual ~wxRegionRefData()
     }
 
     virtual ~wxRegionRefData()

-    { DisposeRgn( m_macRgn ); }
+    {
+    }

 
 

-    RgnHandle    m_macRgn;
+    wxCFRef<HIMutableShapeRef> m_macRgn;

 };
 
 #define M_REGION (((wxRegionRefData*)m_refData)->m_macRgn)
 };
 
 #define M_REGION (((wxRegionRefData*)m_refData)->m_macRgn)


@@ -56,38 +70,39 @@ public:
  */
 wxRegion::wxRegion()
 {
  */
 wxRegion::wxRegion()
 {

-    m_refData = new wxRegionRefData;
+    m_refData = new wxRegionRefData();

 }
 
 wxRegion::wxRegion(WXHRGN hRegion )
 {
 }
 
 wxRegion::wxRegion(WXHRGN hRegion )
 {

-    m_refData = new wxRegionRefData;
-    CopyRgn( (RgnHandle) hRegion , (RgnHandle) M_REGION ) ;
+    m_refData = new wxRegionRefData(hRegion);

 }
 
 wxRegion::wxRegion(long x, long y, long w, long h)
 {
 }
 
 wxRegion::wxRegion(long x, long y, long w, long h)
 {

-    m_refData = new wxRegionRefData;
-    SetRectRgn( (RgnHandle) M_REGION , x , y , x + w , y + h ) ;
+    m_refData = new wxRegionRefData(x , y , w , h );

 }
 
 wxRegion::wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight)
 {
 }
 
 wxRegion::wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight)
 {

-    m_refData = new wxRegionRefData;
-    SetRectRgn( (RgnHandle) M_REGION , topLeft.x , topLeft.y , bottomRight.x , bottomRight.y ) ;
+    m_refData = new wxRegionRefData(topLeft.x , topLeft.y ,
+                                    topLeft.x - bottomRight.x ,
+                                    topLeft.y - bottomRight.y);

 }
 
 wxRegion::wxRegion(const wxRect& rect)
 {
 }
 
 wxRegion::wxRegion(const wxRect& rect)
 {

-    m_refData = new wxRegionRefData;
-    SetRectRgn( (RgnHandle) M_REGION , rect.x , rect.y , rect.x + rect.width , rect.y + rect.height ) ;
+    m_refData = new wxRegionRefData(rect.x , rect.y , rect.width , rect.height);

 }
 
 wxRegion::wxRegion(size_t n, const wxPoint *points, int WXUNUSED(fillStyle))
 {
 }
 
 wxRegion::wxRegion(size_t n, const wxPoint *points, int WXUNUSED(fillStyle))
 {

+    wxUnusedVar(n);
+    wxUnusedVar(points);
+
+#if 0 // ndef __LP64__

     m_refData = new wxRegionRefData;
 
     m_refData = new wxRegionRefData;
 

-#ifndef __LP64__

     // TODO : any APIs ?
     // 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
     // TODO : any APIs ?
     // 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


@@ -126,6 +141,9 @@ wxRegion::wxRegion(size_t n, const wxPoint *points, int WXUNUSED(fillStyle))
 
         ::SetGWorld( oldWorld, oldGDHandle );
     }
 
         ::SetGWorld( oldWorld, oldGDHandle );
     }

+#else
+    wxFAIL_MSG( "not implemented" );
+    m_refData = NULL;

 #endif
 }
 
 #endif
 }
 


@@ -153,7 +171,7 @@ bool wxRegion::DoOffset(wxCoord x, wxCoord y)
         // nothing to do
         return true;
 
         // nothing to do
         return true;
 

-    OffsetRgn( M_REGION , x , y ) ;
+    verify_noerr( HIShapeOffset( M_REGION , x , y ) ) ;

 
     return true ;
 }
 
     return true ;
 }


@@ -179,24 +197,29 @@ bool wxRegion::DoCombine(const wxRegion& region, wxRegionOp op)
     switch (op)
     {
         case wxRGN_AND:
     switch (op)
     {
         case wxRGN_AND:

-            SectRgn( M_REGION , OTHER_M_REGION(region) , M_REGION ) ;
+            verify_noerr( HIShapeIntersect( M_REGION , OTHER_M_REGION(region) , M_REGION ) );

             break ;
 
         case wxRGN_OR:
             break ;
 
         case wxRGN_OR:

-            UnionRgn( M_REGION , OTHER_M_REGION(region) , M_REGION ) ;
+            verify_noerr( HIShapeUnion( M_REGION , OTHER_M_REGION(region) , M_REGION ) );

             break ;
 
         case wxRGN_XOR:
             break ;
 
         case wxRGN_XOR:

-             XorRgn( M_REGION , OTHER_M_REGION(region) , M_REGION ) ;
+            {
+                // XOR is defined as the difference between union and intersection
+                wxCFRef< HIShapeRef > unionshape( HIShapeCreateUnion( M_REGION , OTHER_M_REGION(region) ) );
+                wxCFRef< HIShapeRef > intersectionshape( HIShapeCreateIntersection( M_REGION , OTHER_M_REGION(region) ) );
+                verify_noerr( HIShapeDifference( unionshape, intersectionshape, M_REGION ) );
+            }

             break ;
 
         case wxRGN_DIFF:
             break ;
 
         case wxRGN_DIFF:

-            DiffRgn( M_REGION , OTHER_M_REGION(region) , M_REGION ) ;
+            verify_noerr( HIShapeDifference( M_REGION , OTHER_M_REGION(region) , M_REGION ) ) ;

             break ;
 
         case wxRGN_COPY:
         default:
             break ;
 
         case wxRGN_COPY:
         default:

-            CopyRgn( OTHER_M_REGION(region) , M_REGION ) ;
+            M_REGION.reset( HIShapeCreateMutableCopy( OTHER_M_REGION(region) ) );

             break ;
     }
 
             break ;
     }
 


@@ -207,7 +230,7 @@ bool wxRegion::DoCombine(const wxRegion& region, wxRegionOp op)
 //# Information on region
 //-----------------------------------------------------------------------------
 
 //# Information on region
 //-----------------------------------------------------------------------------
 

-bool wxRegion::DoIsEqual(const wxRegion& region) const
+bool wxRegion::DoIsEqual(const wxRegion& WXUNUSED(region)) const

 {
     wxFAIL_MSG( _T("not implemented") );
 
 {
     wxFAIL_MSG( _T("not implemented") );
 


@@ -219,12 +242,12 @@ bool wxRegion::DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const
 {
     if (m_refData)
     {
 {
     if (m_refData)
     {

-        Rect box ;
-        GetRegionBounds( M_REGION , &box ) ;
-        x = box.left ;
-        y = box.top ;
-        w = box.right - box.left ;
-        h = box.bottom - box.top ;
+        CGRect box ;
+        HIShapeGetBounds( M_REGION , &box ) ;
+        x = wx_static_cast(int, box.origin.x);
+        y = wx_static_cast(int, box.origin.y);
+        w = wx_static_cast(int, box.size.width);
+        h = wx_static_cast(int, box.size.height);

 
         return true;
     }
 
         return true;
     }


@@ -240,7 +263,7 @@ bool wxRegion::DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const
 bool wxRegion::IsEmpty() const
 {
     if ( m_refData )
 bool wxRegion::IsEmpty() const
 {
     if ( m_refData )

-        return EmptyRgn( M_REGION ) ;
+        return HIShapeIsEmpty( M_REGION ) ;

     else
         return true ;
 }
     else
         return true ;
 }


@@ -260,8 +283,8 @@ wxRegionContain wxRegion::DoContainsPoint(wxCoord x, wxCoord y) const
     if (!m_refData)
         return wxOutRegion;
 
     if (!m_refData)
         return wxOutRegion;
 

-    Point p = { y , x } ;
-    if (PtInRgn( p , M_REGION ) )
+    CGPoint p = { y , x } ;
+    if (HIShapeContainsPoint( M_REGION , &p ) )

         return wxInRegion;
 
     return wxOutRegion;
         return wxInRegion;
 
     return wxOutRegion;


@@ -273,11 +296,18 @@ wxRegionContain wxRegion::DoContainsRect(const wxRect& r) const
     if (!m_refData)
         return wxOutRegion;
 
     if (!m_refData)
         return wxOutRegion;
 

-    Rect rect = { r.y , r.x , r.y + r.height , r.x + r.width } ;
-    if (RectInRgn( &rect , M_REGION ) )
+    CGRect rect = CGRectMake(r.x,r.y,r.width,r.height);
+    wxCFRef<HIShapeRef> rectshape(HIShapeCreateWithRect(&rect));
+    wxCFRef<HIShapeRef> intersect(HIShapeCreateIntersection(rectshape,M_REGION));
+    CGRect bounds;
+    HIShapeGetBounds(intersect, &bounds);
+
+    if ( HIShapeIsRectangular(intersect) && CGRectEqualToRect(rect,bounds) )

         return wxInRegion;
         return wxInRegion;

-    else
+    else if ( HIShapeIsEmpty( intersect ) )

         return wxOutRegion;
         return wxOutRegion;

+    else
+        return wxPartRegion;

 }
 
 ///////////////////////////////////////////////////////////////////////////////
 }
 
 ///////////////////////////////////////////////////////////////////////////////


@@ -357,8 +387,9 @@ wxRegionIterator::wxRegionIterator(const wxRegion& region)
  * Reset iterator for a new /e region.
  */
 
  * Reset iterator for a new /e region.
  */
 

+#ifndef __LP64__

 OSStatus wxMacRegionToRectsCounterCallback(
 OSStatus wxMacRegionToRectsCounterCallback(

-    UInt16 message, RgnHandle region, const Rect *rect, void *data )
+    UInt16 message, RgnHandle WXUNUSED(region), const Rect *WXUNUSED(rect), void *data )

 {
     long *m_numRects = (long*) data ;
     if ( message == kQDRegionToRectsMsgInit )
 {
     long *m_numRects = (long*) data ;
     if ( message == kQDRegionToRectsMsgInit )


@@ -381,7 +412,7 @@ public :
 };
 
 OSStatus wxMacRegionToRectsSetterCallback(
 };
 
 OSStatus wxMacRegionToRectsSetterCallback(

-    UInt16 message, RgnHandle region, const Rect *rect, void *data )
+    UInt16 message, RgnHandle WXUNUSED(region), const Rect *rect, void *data )

 {
     if (message == kQDRegionToRectsMsgParse)
     {
 {
     if (message == kQDRegionToRectsMsgParse)
     {


@@ -391,6 +422,7 @@ OSStatus wxMacRegionToRectsSetterCallback(
 
     return noErr;
 }
 
     return noErr;
 }

+#endif

 
 void wxRegionIterator::Reset(const wxRegion& region)
 {
 
 void wxRegionIterator::Reset(const wxRegion& region)
 {


@@ -409,39 +441,34 @@ void wxRegionIterator::Reset(const wxRegion& region)
     }
     else
     {
     }
     else
     {

-        RegionToRectsUPP proc = 
-#ifdef __MACH__
-        (RegionToRectsUPP) wxMacRegionToRectsCounterCallback;
+#ifdef __LP64__
+        // copying this to a path and dissecting the path would be an option
+        m_numRects = 1;
+        m_rects = new wxRect[m_numRects];
+        m_rects[0] = m_region.GetBox();
+

 #else
 #else

-        NewRegionToRectsUPP( wxMacRegionToRectsCounterCallback );
-#endif
+        RegionToRectsUPP proc = (RegionToRectsUPP) wxMacRegionToRectsCounterCallback;

 
         OSStatus err = noErr;
 
         OSStatus err = noErr;

-        err = QDRegionToRects (OTHER_M_REGION( region ) , kQDParseRegionFromTopLeft, proc, (void*)&m_numRects);
+        RgnHandle rgn = NewRgn();
+        HIShapeGetAsQDRgn(OTHER_M_REGION(region), rgn);
+
+        err = QDRegionToRects (rgn, kQDParseRegionFromTopLeft, proc, (void*)&m_numRects);

         if (err == noErr)
         {
         if (err == noErr)
         {

-#ifndef __MACH__
-            DisposeRegionToRectsUPP (proc);
-#endif
-            proc = 
-#ifdef __MACH__
-            (RegionToRectsUPP) wxMacRegionToRectsSetterCallback;
-#else
-            NewRegionToRectsUPP (wxMacRegionToRectsSetterCallback);
-#endif
+            proc = (RegionToRectsUPP) wxMacRegionToRectsSetterCallback;

             m_rects = new wxRect[m_numRects];
             RegionToRectsCallbackData data ;
             data.m_rects = m_rects ;
             data.m_current = 0 ;
             m_rects = new wxRect[m_numRects];
             RegionToRectsCallbackData data ;
             data.m_rects = m_rects ;
             data.m_current = 0 ;

-            QDRegionToRects( OTHER_M_REGION( region ) , kQDParseRegionFromTopLeft, proc, (void*)&data );
+            QDRegionToRects( rgn , kQDParseRegionFromTopLeft, proc, (void*)&data );

         }
         else
         {
             m_numRects = 0;
         }
         }
         else
         {
             m_numRects = 0;
         }

-
-#ifndef __MACH__
-        DisposeRegionToRectsUPP( proc );
+        DisposeRgn( rgn );

 #endif
     }
 }
 #endif
     }
 }