Removed __WXUNIVERSAL__ part of condition

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

diff --git a/src/mac/region.cpp b/src/mac/region.cpp
index c71d4c605a45a15004c399c66b2a1577e4c6e716..a3cf8cef7b84f3eb0ed2287cf5517d9f3694fb08 100644 (file)
--- a/src/mac/region.cpp
+++ b/src/mac/region.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // File:      region.cpp
 // Purpose:   Region class
 /////////////////////////////////////////////////////////////////////////////
 // File:      region.cpp
 // Purpose:   Region class

-// Author:    Markus Holzem/Julian Smart/AUTHOR
+// Author:    Stefan Csomor

 // Created:   Fri Oct 24 10:46:34 MET 1997
 // Created:   Fri Oct 24 10:46:34 MET 1997

-// RCS-ID:       $Id$
-// Copyright: (c) 1997 Markus Holzem/Julian Smart/AUTHOR
+// RCS-ID:    $Id$
+// Copyright: (c) 1997 Stefan Csomor

 // Licence:   wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:   wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -14,10 +14,11 @@
 
 #include "wx/region.h"
 #include "wx/gdicmn.h"
 
 #include "wx/region.h"
 #include "wx/gdicmn.h"

+#include "wx/mac/uma.h"

 
 #if !USE_SHARED_LIBRARY
 
 #if !USE_SHARED_LIBRARY

-       IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
-       IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)
+    IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
+    IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)

 #endif
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------


@@ -26,21 +27,27 @@
 
 class WXDLLEXPORT wxRegionRefData : public wxGDIRefData {
 public:
 
 class WXDLLEXPORT wxRegionRefData : public wxGDIRefData {
 public:

-       wxRegionRefData()
-       {
-       }
-
-       wxRegionRefData(const wxRegionRefData& data)
-       {
-        // TODO
-       }
-
-       ~wxRegionRefData()
-       {
-        // TODO
-       }
+    wxRegionRefData()
+    {
+        m_macRgn = NewRgn() ;
+    }
+
+    wxRegionRefData(const wxRegionRefData& data)
+        : wxGDIRefData()
+    {
+        m_macRgn = NewRgn() ;
+        CopyRgn( data.m_macRgn , m_macRgn ) ;
+    }
+
+    ~wxRegionRefData()
+    {
+        DisposeRgn( m_macRgn ) ;
+    }
+    RgnHandle    m_macRgn ;

 };
 
 };
 

+#define M_REGION (((wxRegionRefData*)m_refData)->m_macRgn)
+#define OTHER_M_REGION(a) (((wxRegionRefData*)(a.m_refData))->m_macRgn)

 
 //-----------------------------------------------------------------------------
 // wxRegion
 
 //-----------------------------------------------------------------------------
 // wxRegion


@@ -52,25 +59,30 @@ public:
 wxRegion::wxRegion()
 {
     m_refData = new wxRegionRefData;
 wxRegion::wxRegion()
 {
     m_refData = new wxRegionRefData;

-    // TODO create empty region
+}
+
+wxRegion::wxRegion(WXHRGN hRegion )
+{
+    m_refData = new wxRegionRefData;
+    CopyRgn( (RgnHandle) hRegion , (RgnHandle) M_REGION ) ;

 }
 
 wxRegion::wxRegion(long x, long y, long w, long h)
 {
     m_refData = new wxRegionRefData;
 }
 
 wxRegion::wxRegion(long x, long y, long w, long h)
 {
     m_refData = new wxRegionRefData;

-    // TODO create rect region
+    SetRectRgn( (RgnHandle) M_REGION , x , y , x+w , y+h ) ;

 }
 
 wxRegion::wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight)
 {
     m_refData = new wxRegionRefData;
 }
 
 wxRegion::wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight)
 {
     m_refData = new wxRegionRefData;

-    // TODO create rect region
+    SetRectRgn( (RgnHandle) M_REGION , topLeft.x , topLeft.y , bottomRight.x , bottomRight.y ) ;

 }
 
 wxRegion::wxRegion(const wxRect& rect)
 {
     m_refData = new wxRegionRefData;
 }
 
 wxRegion::wxRegion(const wxRect& rect)
 {
     m_refData = new wxRegionRefData;

-    // TODO create rect region
+    SetRectRgn( (RgnHandle) M_REGION , rect.x , rect.y , rect.x+rect.width , rect.y+rect.height ) ;

 }
 
 /*!
 }
 
 /*!


@@ -94,83 +106,83 @@ void wxRegion::Clear()
 //! Combine rectangle (x, y, w, h) with this.
 bool wxRegion::Combine(long x, long y, long width, long height, wxRegionOp op)
 {
 //! Combine rectangle (x, y, w, h) with this.
 bool wxRegion::Combine(long x, long y, long width, long height, wxRegionOp op)
 {

-       // Don't change shared data
-       if (!m_refData) {
-               m_refData = new wxRegionRefData();
-       } else if (m_refData->GetRefCount() > 1) {
-               wxRegionRefData* ref = (wxRegionRefData*)m_refData;
-               UnRef();
-               m_refData = new wxRegionRefData(*ref);
-       }
-    // If ref count is 1, that means it's 'ours' anyway so no action.
-
-    // TODO create rect region
-
-    int mode = 0; // TODO platform-specific code
+    // Don't change shared data
+    if (!m_refData) 
+    {
+        m_refData = new wxRegionRefData();
+    } 
+    else if (m_refData->GetRefCount() > 1) 
+    {
+        wxRegionRefData* ref = (wxRegionRefData*)m_refData;
+        UnRef();
+        m_refData = new wxRegionRefData(*ref);
+    }
+    RgnHandle rgn = NewRgn() ;
+        SetRectRgn( rgn , x , y, x+width,y + height ) ;
+        

     switch (op)
     {
         case wxRGN_AND:
     switch (op)
     {
         case wxRGN_AND:

-            // TODO
+            SectRgn( M_REGION , rgn , M_REGION ) ;

             break ;
         case wxRGN_OR:
             break ;
         case wxRGN_OR:

-            // TODO
+            UnionRgn( M_REGION , rgn , M_REGION ) ;

             break ;
         case wxRGN_XOR:
             break ;
         case wxRGN_XOR:

-            // TODO
+             XorRgn( M_REGION , rgn , M_REGION ) ;

             break ;
         case wxRGN_DIFF:
             break ;
         case wxRGN_DIFF:

-            // TODO
+            DiffRgn( M_REGION , rgn , M_REGION ) ;

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

-            // TODO
+                   CopyRgn( rgn ,M_REGION ) ;

             break ;
     }
 
             break ;
     }
 

-    // TODO do combine region
+        DisposeRgn( rgn ) ;

 
 

-    return FALSE;
+    return TRUE;

 }
 
 //! Union /e region with this.
 bool wxRegion::Combine(const wxRegion& region, wxRegionOp op)
 {
 }
 
 //! Union /e region with this.
 bool wxRegion::Combine(const wxRegion& region, wxRegionOp op)
 {

-       if (region.Empty())
-               return FALSE;
-
-       // Don't change shared data
-       if (!m_refData) {
-               m_refData = new wxRegionRefData();
-       } else  if (m_refData->GetRefCount() > 1) {
-               wxRegionRefData* ref = (wxRegionRefData*)m_refData;
-               UnRef();
-               m_refData = new wxRegionRefData(*ref);
-       }
-
-    int mode = 0; // TODO platform-specific code
+    if (region.Empty())
+        return FALSE;
+
+    // Don't change shared data
+    if (!m_refData) {
+        m_refData = new wxRegionRefData();
+    } 
+    else    if (m_refData->GetRefCount() > 1) 
+    {
+        wxRegionRefData* ref = (wxRegionRefData*)m_refData;
+        UnRef();
+        m_refData = new wxRegionRefData(*ref);
+    }
+

     switch (op)
     {
         case wxRGN_AND:
     switch (op)
     {
         case wxRGN_AND:

-            // TODO
+            SectRgn( M_REGION , OTHER_M_REGION(region) , M_REGION ) ;

             break ;
         case wxRGN_OR:
             break ;
         case wxRGN_OR:

-            // TODO
+            UnionRgn( M_REGION , OTHER_M_REGION(region) , M_REGION ) ;

             break ;
         case wxRGN_XOR:
             break ;
         case wxRGN_XOR:

-            // TODO
+             XorRgn( M_REGION , OTHER_M_REGION(region) , M_REGION ) ;

             break ;
         case wxRGN_DIFF:
             break ;
         case wxRGN_DIFF:

-            // TODO
+            DiffRgn( M_REGION , OTHER_M_REGION(region) , M_REGION ) ;

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

-            // TODO
+                   CopyRgn( OTHER_M_REGION(region) ,M_REGION ) ;

             break ;
     }
 
             break ;
     }
 

-    // TODO combine region
-
-       return FALSE;
+    return TRUE;

 }
 
 bool wxRegion::Combine(const wxRect& rect, wxRegionOp op)
 }
 
 bool wxRegion::Combine(const wxRect& rect, wxRegionOp op)


@@ -183,18 +195,26 @@ bool wxRegion::Combine(const wxRect& rect, wxRegionOp op)
 //-----------------------------------------------------------------------------
 
 // Outer bounds of region
 //-----------------------------------------------------------------------------
 
 // Outer bounds of region

-void wxRegion::GetBox(long& x, long& y, long&w, long &h) const
+void wxRegion::GetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const

 {
 {

-       if (m_refData) {
-        // TODO get box
-       } else {
-               x = y = w = h = 0;
-       }
+    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 ;
+    } 
+    else 
+    {
+        x = y = w = h = 0;
+    }

 }
 
 wxRect wxRegion::GetBox() const
 {
 }
 
 wxRect wxRegion::GetBox() const
 {

-    long x, y, w, h;
+    wxCoord x, y, w, h;

     GetBox(x, y, w, h);
     return wxRect(x, y, w, h);
 }
     GetBox(x, y, w, h);
     return wxRect(x, y, w, h);
 }


@@ -202,8 +222,12 @@ wxRect wxRegion::GetBox() const
 // Is region empty?
 bool wxRegion::Empty() const
 {
 // Is region empty?
 bool wxRegion::Empty() const
 {

-    // TODO
-    return FALSE;
+    return EmptyRgn( M_REGION ) ;
+}
+
+const WXHRGN wxRegion::GetWXHRGN() const
+{
+    return M_REGION ;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -213,8 +237,8 @@ bool wxRegion::Empty() const
 // Does the region contain the point (x,y)?
 wxRegionContain wxRegion::Contains(long x, long y) const
 {
 // Does the region contain the point (x,y)?
 wxRegionContain wxRegion::Contains(long x, long y) const
 {

-       if (!m_refData)
-               return wxOutRegion;
+    if (!m_refData)
+        return wxOutRegion;

 
     // TODO. Return wxInRegion if within region.
     if (0)
 
     // TODO. Return wxInRegion if within region.
     if (0)


@@ -225,24 +249,24 @@ wxRegionContain wxRegion::Contains(long x, long y) const
 // Does the region contain the point pt?
 wxRegionContain wxRegion::Contains(const wxPoint& pt) const
 {
 // Does the region contain the point pt?
 wxRegionContain wxRegion::Contains(const wxPoint& pt) const
 {

-       if (!m_refData)
-               return wxOutRegion;
+    if (!m_refData)
+        return wxOutRegion;

 
 

-    // TODO. Return wxInRegion if within region.
-    if (0)
+    Point p = { pt.y , pt.x } ;
+    if (PtInRgn( p , M_REGION ) )

         return wxInRegion;
         return wxInRegion;

-    else
-        return wxOutRegion;
+        
+    return wxOutRegion;

 }
 
 // Does the region contain the rectangle (x, y, w, h)?
 wxRegionContain wxRegion::Contains(long x, long y, long w, long h) const
 {
 }
 
 // Does the region contain the rectangle (x, y, w, h)?
 wxRegionContain wxRegion::Contains(long x, long y, long w, long h) const
 {

-       if (!m_refData)
-               return wxOutRegion;
+    if (!m_refData)
+        return wxOutRegion;

 
 

-    // TODO. Return wxInRegion if within region.
-    if (0)
+    Rect rect = { y , x , y + h , x + w } ;
+    if (RectInRgn( &rect , M_REGION ) )

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


@@ -251,8 +275,8 @@ wxRegionContain wxRegion::Contains(long x, long y, long w, long h) const
 // Does the region contain the rectangle rect
 wxRegionContain wxRegion::Contains(const wxRect& rect) const
 {
 // Does the region contain the rectangle rect
 wxRegionContain wxRegion::Contains(const wxRect& rect) const
 {

-       if (!m_refData)
-               return wxOutRegion;
+    if (!m_refData)
+        return wxOutRegion;

 
     long x, y, w, h;
     x = rect.x;
 
     long x, y, w, h;
     x = rect.x;


@@ -263,22 +287,60 @@ wxRegionContain wxRegion::Contains(const wxRect& rect) const
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 }
 
 ///////////////////////////////////////////////////////////////////////////////

-//                                                                                                                                                      //
-//                                                        wxRegionIterator                                                              //
-//                                                                                                                                                      //
+//                                                                           //
+//                               wxRegionIterator                            //
+//                                                                           //

 ///////////////////////////////////////////////////////////////////////////////
 
 /*!
  * Initialize empty iterator
  */
 ///////////////////////////////////////////////////////////////////////////////
 
 /*!
  * Initialize empty iterator
  */

-wxRegionIterator::wxRegionIterator() : m_current(0), m_numRects(0), m_rects(NULL)
+wxRegionIterator::wxRegionIterator()
+    : m_current(0), m_numRects(0), m_rects(NULL)

 {
 }
 
 wxRegionIterator::~wxRegionIterator()
 {
 {
 }
 
 wxRegionIterator::~wxRegionIterator()
 {

-    if (m_rects)
+    if (m_rects) {
+        delete[] m_rects;
+        m_rects = NULL;
+    }
+}
+
+wxRegionIterator::wxRegionIterator(const wxRegionIterator& iterator)
+    : wxObject()
+    , m_current(iterator.m_current)
+    , m_numRects(0)
+    , m_rects(NULL)
+{
+    SetRects(iterator.m_numRects, iterator.m_rects);
+}
+
+wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& iterator)
+{
+    m_current  = iterator.m_current;
+    SetRects(iterator.m_numRects, iterator.m_rects);
+    return *this;
+}
+
+/*!
+ * Set iterator rects for region
+ */
+void wxRegionIterator::SetRects(long numRects, wxRect *rects)
+{
+    if (m_rects) {

         delete[] m_rects;
         delete[] m_rects;

+        m_rects = NULL;
+    }
+    if (rects)
+    {
+        int i;
+        m_rects = new wxRect[numRects];
+        for (i = 0; i < numRects; i++)
+            m_rects[i] = rects[i];
+    }
+    m_numRects = numRects;

 }
 
 /*!
 }
 
 /*!


@@ -288,7 +350,7 @@ wxRegionIterator::wxRegionIterator(const wxRegion& region)
 {
     m_rects = NULL;
 
 {
     m_rects = NULL;
 

-       Reset(region);
+    Reset(region);

 }
 
 /*!
 }
 
 /*!


@@ -296,20 +358,27 @@ wxRegionIterator::wxRegionIterator(const wxRegion& region)
  */
 void wxRegionIterator::Reset(const wxRegion& region)
 {
  */
 void wxRegionIterator::Reset(const wxRegion& region)
 {

-       m_current = 0;
-       m_region = region;
+    m_current = 0;
+    m_region = region;

 
 

-    if (m_rects)
+    if (m_rects) {

         delete[] m_rects;
         delete[] m_rects;

+        m_rects = NULL;
+    }

 
 

-    m_rects = NULL;
-
-       if (m_region.Empty())
-               m_numRects = 0;
-       else
-    {
-        // TODO create m_rects and fill with rectangles for this region
+    if (m_region.Empty())

         m_numRects = 0;
         m_numRects = 0;

+    else
+    {
+        // we cannot dissolve it into rects on mac
+        m_rects = new wxRect[1];
+        Rect rect ;
+        GetRegionBounds( OTHER_M_REGION( region ) , &rect ) ;
+        m_rects[0].x = rect.left;
+        m_rects[0].y = rect.top;
+        m_rects[0].width = rect.right - rect.left;
+        m_rects[0].height = rect.bottom - rect.top;
+        m_numRects = 1;

     }
 }
 
     }
 }
 


@@ -317,47 +386,52 @@ void wxRegionIterator::Reset(const wxRegion& region)
  * Increment iterator. The rectangle returned is the one after the
  * incrementation.
  */
  * Increment iterator. The rectangle returned is the one after the
  * incrementation.
  */

-void wxRegionIterator::operator ++ ()
+wxRegionIterator& wxRegionIterator::operator ++ ()

 {
 {

-       if (m_current < m_numRects)
-               ++m_current;
+    if (m_current < m_numRects)
+        ++m_current;
+    return *this;

 }
 
 /*!
  * Increment iterator. The rectangle returned is the one before the
  * incrementation.
  */
 }
 
 /*!
  * Increment iterator. The rectangle returned is the one before the
  * incrementation.
  */

-void wxRegionIterator::operator ++ (int)
+wxRegionIterator wxRegionIterator::operator ++ (int)

 {
 {

-       if (m_current < m_numRects)
-               ++m_current;
+    wxRegionIterator previous(*this);
+
+    if (m_current < m_numRects)
+        ++m_current;
+
+    return previous;

 }
 
 long wxRegionIterator::GetX() const
 {
 }
 
 long wxRegionIterator::GetX() const
 {

-       if (m_current < m_numRects)
-               return m_rects[m_current].x;
-       return 0;
+    if (m_current < m_numRects)
+        return m_rects[m_current].x;
+    return 0;

 }
 
 long wxRegionIterator::GetY() const
 {
 }
 
 long wxRegionIterator::GetY() const
 {

-       if (m_current < m_numRects)
-               return m_rects[m_current].y;
-       return 0;
+    if (m_current < m_numRects)
+        return m_rects[m_current].y;
+    return 0;

 }
 
 long wxRegionIterator::GetW() const
 {
 }
 
 long wxRegionIterator::GetW() const
 {

-       if (m_current < m_numRects)
-               return m_rects[m_current].width ;
-       return 0;
+    if (m_current < m_numRects)
+        return m_rects[m_current].width ;
+    return 0;

 }
 
 long wxRegionIterator::GetH() const
 {
 }
 
 long wxRegionIterator::GetH() const
 {

-       if (m_current < m_numRects)
-               return m_rects[m_current].height;
-       return 0;
+    if (m_current < m_numRects)
+        return m_rects[m_current].height;
+    return 0;

 }
 
 }