respect Veto()ing the column resize events; added test for this in the sample

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

diff --git a/src/mac/region.cpp b/src/mac/region.cpp
index 6c1ef13da2dc1b969ca3470b7a9cef84c670fb1b..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/Stefan Csomor
+// 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/Stefan Csomor
+// RCS-ID:    $Id$
+// Copyright: (c) 1997 Stefan Csomor

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


@@ -17,8 +17,8 @@
 #include "wx/mac/uma.h"
 
 #if !USE_SHARED_LIBRARY
 #include "wx/mac/uma.h"
 
 #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
 
 //-----------------------------------------------------------------------------


@@ -43,7 +43,7 @@ public:
     {
         DisposeRgn( m_macRgn ) ;
     }
     {
         DisposeRgn( m_macRgn ) ;
     }

-    RgnHandle  m_macRgn ;
+    RgnHandle    m_macRgn ;

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


@@ -106,20 +106,20 @@ 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);
-       }
+    // 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() ;
     RgnHandle rgn = NewRgn() ;

-               SetRectRgn( rgn , x , y, x+width,y + height ) ;
-               
+        SetRectRgn( rgn , x , y, x+width,y + height ) ;
+        

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


@@ -136,11 +136,11 @@ bool wxRegion::Combine(long x, long y, long width, long height, wxRegionOp op)
             break ;
         case wxRGN_COPY:
         default:
             break ;
         case wxRGN_COPY:
         default:

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

             break ;
     }
 
             break ;
     }
 

-               DisposeRgn( rgn ) ;
+        DisposeRgn( rgn ) ;

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -148,19 +148,19 @@ bool wxRegion::Combine(long x, long y, long width, long height, wxRegionOp op)
 //! 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);
-       }
+    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)
     {
 
     switch (op)
     {


@@ -178,11 +178,11 @@ bool wxRegion::Combine(const wxRegion& region, wxRegionOp op)
             break ;
         case wxRGN_COPY:
         default:
             break ;
         case wxRGN_COPY:
         default:

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

             break ;
     }
 
             break ;
     }
 

-       return TRUE;
+    return TRUE;

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


@@ -197,19 +197,19 @@ bool wxRegion::Combine(const wxRect& rect, wxRegionOp op)
 // Outer bounds of region
 void wxRegion::GetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const
 {
 // Outer bounds of region
 void wxRegion::GetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const
 {

-       if (m_refData) 
-       {
-               Rect box ;
-               GetRegionBounds( M_REGION , &box ) ;
+    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 ;
         x = box.left ;
         y = box.top ;
         w = box.right - box.left ;
         h = box.bottom - box.top ;

-       } 
-       else 
-       {
-               x = y = w = h = 0;
-       }
+    } 
+    else 
+    {
+        x = y = w = h = 0;
+    }

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


@@ -227,7 +227,7 @@ bool wxRegion::Empty() const
 
 const WXHRGN wxRegion::GetWXHRGN() const
 {
 
 const WXHRGN wxRegion::GetWXHRGN() const
 {

-       return M_REGION ;
+    return M_REGION ;

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


@@ -237,8 +237,8 @@ const WXHRGN wxRegion::GetWXHRGN() 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)


@@ -249,8 +249,8 @@ 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;

 
     Point p = { pt.y , pt.x } ;
     if (PtInRgn( p , M_REGION ) )
 
     Point p = { pt.y , pt.x } ;
     if (PtInRgn( p , M_REGION ) )


@@ -262,8 +262,8 @@ wxRegionContain wxRegion::Contains(const wxPoint& pt) const
 // 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;

 
     Rect rect = { y , x , y + h , x + w } ;
     if (RectInRgn( &rect , M_REGION ) )
 
     Rect rect = { y , x , y + h , x + w } ;
     if (RectInRgn( &rect , M_REGION ) )


@@ -275,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;


@@ -370,7 +370,7 @@ void wxRegionIterator::Reset(const wxRegion& region)
         m_numRects = 0;
     else
     {
         m_numRects = 0;
     else
     {

-       // we cannot dissolve it into rects on mac
+        // we cannot dissolve it into rects on mac

         m_rects = new wxRect[1];
         Rect rect ;
         GetRegionBounds( OTHER_M_REGION( region ) , &rect ) ;
         m_rects = new wxRect[1];
         Rect rect ;
         GetRegionBounds( OTHER_M_REGION( region ) , &rect ) ;


@@ -409,29 +409,29 @@ wxRegionIterator wxRegionIterator::operator ++ (int)
 
 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;

 }
 
 }