don't create non-existing groups in HasEntry()

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

diff --git a/src/mac/carbon/region.cpp b/src/mac/carbon/region.cpp
index aefaa806930ece47ecf515dfdb3dd78a2e661898..23e905e86900eaaee465a306c42ae3509a456a8a 100644 (file)
--- a/src/mac/carbon/region.cpp
+++ b/src/mac/carbon/region.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// File:      region.cpp
+// File:      src/mac/carbon/region.cpp

 // Purpose:   Region class
 // Author:    Stefan Csomor
 // Created:   Fri Oct 24 10:46:34 MET 1997
 // Purpose:   Region class
 // Author:    Stefan Csomor
 // Created:   Fri Oct 24 10:46:34 MET 1997


@@ -8,42 +8,40 @@
 // Licence:   wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:   wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "region.h"
-#endif
+#include "wx/wxprec.h"

 
 #include "wx/region.h"
 
 #include "wx/region.h"

-#include "wx/gdicmn.h"
-#include "wx/mac/uma.h"

 
 

-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"

 #endif
 
 #endif
 

+#include "wx/mac/uma.h"
+
+IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
+IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)
+

 //-----------------------------------------------------------------------------
 // wxRegionRefData implementation
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxRegionRefData implementation
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxRegionRefData : public wxGDIRefData {
+class WXDLLEXPORT wxRegionRefData : public wxGDIRefData
+{

 public:
     wxRegionRefData()
 public:
     wxRegionRefData()

-    {
-        m_macRgn = NewRgn() ;
-    }
+    { m_macRgn = NewRgn(); }

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

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

     }
 
     ~wxRegionRefData()
     }
 
     ~wxRegionRefData()

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

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


@@ -70,7 +68,7 @@ wxRegion::wxRegion(WXHRGN hRegion )
 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;

-    SetRectRgn( (RgnHandle) M_REGION , x , y , x+w , y+h ) ;
+    SetRectRgn( (RgnHandle) M_REGION , x , y , x + w , y + h ) ;

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


@@ -82,37 +80,52 @@ wxRegion::wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight)
 wxRegion::wxRegion(const wxRect& rect)
 {
     m_refData = new wxRegionRefData;
 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 ) ;
+    SetRectRgn( (RgnHandle) M_REGION , rect.x , rect.y , rect.x + rect.width , rect.y + rect.height ) ;

 }
 
 wxRegion::wxRegion(size_t n, const wxPoint *points, int WXUNUSED(fillStyle))
 {
     m_refData = new wxRegionRefData;
 
 }
 
 wxRegion::wxRegion(size_t n, const wxPoint *points, int WXUNUSED(fillStyle))
 {
     m_refData = new wxRegionRefData;
 

-    OpenRgn();
+    // 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

 
 

-    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 )
+    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 )

     {
     {

-        ::LineTo(x1,y1 ) ;
+        ::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 ) ;
+
+        CloseRgn( M_REGION ) ;
+
+        ::SetGWorld( oldWorld, oldGDHandle );

     }
     }

-    ClosePoly();
-    CloseRgn( M_REGION ) ;

 }
 
 }
 

-/*!
- * Destroy the region.
- */

 wxRegion::~wxRegion()
 {
     // m_refData unrefed in ~wxObject
 wxRegion::~wxRegion()
 {
     // m_refData unrefed in ~wxObject


@@ -134,12 +147,11 @@ bool wxRegion::Offset(wxCoord x, wxCoord y)
     wxCHECK_MSG( M_REGION, false, _T("invalid wxRegion") );
 
     if ( !x && !y )
     wxCHECK_MSG( M_REGION, false, _T("invalid wxRegion") );
 
     if ( !x && !y )

-    {

         // nothing to do
         return true;
         // nothing to do
         return true;

-    }

 
     OffsetRgn( M_REGION , x , y ) ;
 
     OffsetRgn( M_REGION , x , y ) ;

+

     return true ;
 }
 
     return true ;
 }
 


@@ -148,55 +160,61 @@ bool wxRegion::Offset(wxCoord x, wxCoord y)
 bool wxRegion::Combine(long x, long y, long width, long height, wxRegionOp op)
 {
     // Don't change shared data
 bool wxRegion::Combine(long x, long y, long width, long height, wxRegionOp op)
 {
     // Don't change shared data

-    if (!m_refData) 
+    if (!m_refData)

     {
         m_refData = new wxRegionRefData();
     {
         m_refData = new wxRegionRefData();

-    } 
-    else if (m_refData->GetRefCount() > 1) 
+    }
+    else if (m_refData->GetRefCount() > 1)

     {
         wxRegionRefData* ref = (wxRegionRefData*)m_refData;
         UnRef();
     {
         wxRegionRefData* ref = (wxRegionRefData*)m_refData;
         UnRef();

-        m_refData = new wxRegionRefData(*ref);
+        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:
             SectRgn( M_REGION , rgn , M_REGION ) ;
             break ;
     switch (op)
     {
         case wxRGN_AND:
             SectRgn( M_REGION , rgn , M_REGION ) ;
             break ;

+

         case wxRGN_OR:
             UnionRgn( M_REGION , rgn , M_REGION ) ;
             break ;
         case wxRGN_OR:
             UnionRgn( M_REGION , rgn , M_REGION ) ;
             break ;

+

         case wxRGN_XOR:
              XorRgn( M_REGION , rgn , M_REGION ) ;
             break ;
         case wxRGN_XOR:
              XorRgn( M_REGION , rgn , M_REGION ) ;
             break ;

+

         case wxRGN_DIFF:
             DiffRgn( M_REGION , rgn , M_REGION ) ;
             break ;
         case wxRGN_DIFF:
             DiffRgn( M_REGION , rgn , M_REGION ) ;
             break ;

+

         case wxRGN_COPY:
         default:
         case wxRGN_COPY:
         default:

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

             break ;
     }
 
             break ;
     }
 

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

 
 

-    return TRUE;
+    return true;

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

-        return FALSE;
+        return false;

 
     // Don't change shared data
 
     // Don't change shared data

-    if (!m_refData) {
+    if (!m_refData)
+    {

         m_refData = new wxRegionRefData();
         m_refData = new wxRegionRefData();

-    } 
-    else    if (m_refData->GetRefCount() > 1) 
+    }
+    else if (m_refData->GetRefCount() > 1)

     {
         wxRegionRefData* ref = (wxRegionRefData*)m_refData;
         UnRef();
     {
         wxRegionRefData* ref = (wxRegionRefData*)m_refData;
         UnRef();


@@ -208,22 +226,26 @@ bool wxRegion::Combine(const wxRegion& region, wxRegionOp op)
         case wxRGN_AND:
             SectRgn( M_REGION , OTHER_M_REGION(region) , M_REGION ) ;
             break ;
         case wxRGN_AND:
             SectRgn( M_REGION , OTHER_M_REGION(region) , M_REGION ) ;
             break ;

+

         case wxRGN_OR:
             UnionRgn( M_REGION , OTHER_M_REGION(region) , M_REGION ) ;
             break ;
         case wxRGN_OR:
             UnionRgn( M_REGION , OTHER_M_REGION(region) , M_REGION ) ;
             break ;

+

         case wxRGN_XOR:
              XorRgn( M_REGION , OTHER_M_REGION(region) , M_REGION ) ;
             break ;
         case wxRGN_XOR:
              XorRgn( M_REGION , OTHER_M_REGION(region) , M_REGION ) ;
             break ;

+

         case wxRGN_DIFF:
             DiffRgn( M_REGION , OTHER_M_REGION(region) , M_REGION ) ;
             break ;
         case wxRGN_DIFF:
             DiffRgn( M_REGION , OTHER_M_REGION(region) , M_REGION ) ;
             break ;

+

         case wxRGN_COPY:
         default:
         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)


@@ -238,7 +260,7 @@ 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) 
+    if (m_refData)

     {
         Rect box ;
         GetRegionBounds( M_REGION , &box ) ;
     {
         Rect box ;
         GetRegionBounds( M_REGION , &box ) ;


@@ -246,8 +268,8 @@ void wxRegion::GetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const
         y = box.top ;
         w = box.right - box.left ;
         h = box.bottom - box.top ;
         y = box.top ;
         w = box.right - box.left ;
         h = box.bottom - box.top ;

-    } 
-    else 
+    }
+    else

     {
         x = y = w = h = 0;
     }
     {
         x = y = w = h = 0;
     }


@@ -257,13 +279,17 @@ wxRect wxRegion::GetBox() const
 {
     wxCoord x, y, w, h;
     GetBox(x, y, w, h);
 {
     wxCoord x, y, w, h;
     GetBox(x, y, w, h);

+

     return wxRect(x, y, w, h);
 }
 
 // Is region empty?
 bool wxRegion::Empty() const
 {
     return wxRect(x, y, w, h);
 }
 
 // Is region empty?
 bool wxRegion::Empty() const
 {

-    return EmptyRgn( M_REGION ) ;
+    if ( m_refData )
+        return EmptyRgn( M_REGION ) ;
+    else
+        return true ;

 }
 
 const WXHRGN wxRegion::GetWXHRGN() const
 }
 
 const WXHRGN wxRegion::GetWXHRGN() const


@@ -282,12 +308,13 @@ wxRegionContain wxRegion::Contains(long x, long y) const
         return wxOutRegion;
 
     // TODO. Return wxInRegion if within region.
         return wxOutRegion;
 
     // TODO. Return wxInRegion if within region.

-    if (0)
-        return wxInRegion;
+//    if (0)
+//        return wxInRegion;
+

     return wxOutRegion;
 }
 
     return wxOutRegion;
 }
 

-// Does the region contain the point pt?
+// Does the region contain the point?

 wxRegionContain wxRegion::Contains(const wxPoint& pt) const
 {
     if (!m_refData)
 wxRegionContain wxRegion::Contains(const wxPoint& pt) const
 {
     if (!m_refData)


@@ -296,7 +323,7 @@ wxRegionContain wxRegion::Contains(const wxPoint& pt) const
     Point p = { pt.y , pt.x } ;
     if (PtInRgn( p , M_REGION ) )
         return wxInRegion;
     Point p = { pt.y , pt.x } ;
     if (PtInRgn( p , M_REGION ) )
         return wxInRegion;

-        
+

     return wxOutRegion;
 }
 
     return wxOutRegion;
 }
 


@@ -320,10 +347,12 @@ wxRegionContain wxRegion::Contains(const wxRect& rect) const
         return wxOutRegion;
 
     long x, y, w, h;
         return wxOutRegion;
 
     long x, y, w, h;

+

     x = rect.x;
     y = rect.y;
     w = rect.GetWidth();
     h = rect.GetHeight();
     x = rect.x;
     y = rect.y;
     w = rect.GetWidth();
     h = rect.GetHeight();

+

     return Contains(x, y, w, h);
 }
 
     return Contains(x, y, w, h);
 }
 


@@ -343,8 +372,9 @@ wxRegionIterator::wxRegionIterator()
 
 wxRegionIterator::~wxRegionIterator()
 {
 
 wxRegionIterator::~wxRegionIterator()
 {

-    if (m_rects) {
-        delete[] m_rects;
+    if (m_rects)
+    {
+        delete [] m_rects;

         m_rects = NULL;
     }
 }
         m_rects = NULL;
     }
 }


@@ -362,6 +392,7 @@ wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& iterator)
 {
     m_current  = iterator.m_current;
     SetRects(iterator.m_numRects, iterator.m_rects);
 {
     m_current  = iterator.m_current;
     SetRects(iterator.m_numRects, iterator.m_rects);

+

     return *this;
 }
 
     return *this;
 }
 


@@ -370,17 +401,21 @@ wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& iterator)
  */
 void wxRegionIterator::SetRects(long numRects, wxRect *rects)
 {
  */
 void wxRegionIterator::SetRects(long numRects, wxRect *rects)
 {

-    if (m_rects) {
-        delete[] m_rects;
+    if (m_rects)
+    {
+        delete [] m_rects;

         m_rects = NULL;
     }
         m_rects = NULL;
     }

-    if (rects)
+
+    if (rects && (numRects > 0))

     {
         int i;
     {
         int i;

+

         m_rects = new wxRect[numRects];
         for (i = 0; i < numRects; i++)
             m_rects[i] = rects[i];
     }
         m_rects = new wxRect[numRects];
         for (i = 0; i < numRects; i++)
             m_rects[i] = rects[i];
     }

+

     m_numRects = numRects;
 }
 
     m_numRects = numRects;
 }
 


@@ -397,29 +432,79 @@ wxRegionIterator::wxRegionIterator(const wxRegion& region)
 /*!
  * Reset iterator for a new /e region.
  */
 /*!
  * Reset iterator for a new /e region.
  */

+
+OSStatus wxMacRegionToRectsCounterCallback(
+    UInt16 message, RgnHandle region, const Rect *rect, void *data )
+{
+    long *m_numRects = (long*) data ;
+    if ( message == kQDRegionToRectsMsgInit )
+    {
+        (*m_numRects) = 0 ;
+    }
+    else if (message == kQDRegionToRectsMsgParse)
+    {
+        (*m_numRects) += 1 ;
+    }
+
+    return noErr;
+}
+
+class RegionToRectsCallbackData
+{
+public :
+    wxRect* m_rects ;
+    long m_current ;
+};
+
+OSStatus wxMacRegionToRectsSetterCallback(
+    UInt16 message, RgnHandle 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;
+}
+

 void wxRegionIterator::Reset(const wxRegion& region)
 {
     m_current = 0;
     m_region = region;
 
 void wxRegionIterator::Reset(const wxRegion& region)
 {
     m_current = 0;
     m_region = region;
 

-    if (m_rects) {
-        delete[] m_rects;
+    if (m_rects)
+    {
+        delete [] m_rects;

         m_rects = NULL;
     }
 
     if (m_region.Empty())
         m_rects = NULL;
     }
 
     if (m_region.Empty())

+    {

         m_numRects = 0;
         m_numRects = 0;

+    }

     else
     {
     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;
+        RegionToRectsUPP proc = NewRegionToRectsUPP( wxMacRegionToRectsCounterCallback );
+
+        OSStatus err = noErr;
+        err = QDRegionToRects (OTHER_M_REGION( region ) , kQDParseRegionFromTopLeft, proc, (void*)&m_numRects);
+        if (err == noErr)
+        {
+            DisposeRegionToRectsUPP (proc);
+            proc = NewRegionToRectsUPP (wxMacRegionToRectsSetterCallback);
+            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 );
+        }
+        else
+        {
+            m_numRects = 0;
+        }
+
+        DisposeRegionToRectsUPP( proc );

     }
 }
 
     }
 }
 


@@ -431,6 +516,7 @@ wxRegionIterator& wxRegionIterator::operator ++ ()
 {
     if (m_current < m_numRects)
         ++m_current;
 {
     if (m_current < m_numRects)
         ++m_current;

+

     return *this;
 }
 
     return *this;
 }
 


@@ -452,6 +538,7 @@ long wxRegionIterator::GetX() const
 {
     if (m_current < m_numRects)
         return m_rects[m_current].x;
 {
     if (m_current < m_numRects)
         return m_rects[m_current].x;

+

     return 0;
 }
 
     return 0;
 }
 


@@ -459,6 +546,7 @@ long wxRegionIterator::GetY() const
 {
     if (m_current < m_numRects)
         return m_rects[m_current].y;
 {
     if (m_current < m_numRects)
         return m_rects[m_current].y;

+

     return 0;
 }
 
     return 0;
 }
 


@@ -466,6 +554,7 @@ long wxRegionIterator::GetW() const
 {
     if (m_current < m_numRects)
         return m_rects[m_current].width ;
 {
     if (m_current < m_numRects)
         return m_rects[m_current].width ;

+

     return 0;
 }
 
     return 0;
 }
 


@@ -473,6 +562,6 @@ long wxRegionIterator::GetH() const
 {
     if (m_current < m_numRects)
         return m_rects[m_current].height;
 {
     if (m_current < m_numRects)
         return m_rects[m_current].height;

+

     return 0;
 }
     return 0;
 }

-