Update version to 2.9.4 in version.bkl too and rebake everything.

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

diff --git a/src/osx/carbon/region.cpp b/src/osx/carbon/region.cpp
index 8f3eeb884f993a71041a111e2193ca68ca867c06..83a2e15e12c369776d1b5ae96ef50c750177f185 100644 (file)
--- a/src/osx/carbon/region.cpp
+++ b/src/osx/carbon/region.cpp
@@ -16,6 +16,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/gdicmn.h"
 
 #ifndef WX_PRECOMP
     #include "wx/gdicmn.h"

+    #include "wx/dcmemory.h"

 #endif
 
 #include "wx/osx/private.h"
 #endif
 
 #include "wx/osx/private.h"


@@ -67,14 +68,6 @@ public:
 // wxRegion
 //-----------------------------------------------------------------------------
 
 // wxRegion
 //-----------------------------------------------------------------------------
 

-/*!
- * Create an empty region.
- */
-wxRegion::wxRegion()
-{
-    m_refData = new wxRegionRefData();
-}
-

 wxRegion::wxRegion(WXHRGN hRegion )
 {
     wxCFRef< HIShapeRef > shape( (HIShapeRef) hRegion );
 wxRegion::wxRegion(WXHRGN hRegion )
 {
     wxCFRef< HIShapeRef > shape( (HIShapeRef) hRegion );


@@ -89,8 +82,8 @@ wxRegion::wxRegion(long x, long y, long w, long h)
 wxRegion::wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight)
 {
     m_refData = new wxRegionRefData(topLeft.x , topLeft.y ,
 wxRegion::wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight)
 {
     m_refData = new wxRegionRefData(topLeft.x , topLeft.y ,

-                                    topLeft.x - bottomRight.x ,
-                                    topLeft.y - bottomRight.y);
+                                    bottomRight.x - topLeft.x,
+                                    bottomRight.y - topLeft.y);

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


@@ -185,12 +178,14 @@ void wxRegion::Clear()
 // Move the region
 bool wxRegion::DoOffset(wxCoord x, wxCoord y)
 {
 // 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;
 
 
     if ( !x && !y )
         // nothing to do
         return true;
 

+    AllocExclusive();
+

     verify_noerr( HIShapeOffset( M_REGION , x , y ) ) ;
 
     return true ;
     verify_noerr( HIShapeOffset( M_REGION , x , y ) ) ;
 
     return true ;


@@ -202,6 +197,30 @@ bool wxRegion::DoCombine(const wxRegion& region, wxRegionOp op)
 {
     wxCHECK_MSG( region.IsOk(), false, wxT("invalid wxRegion") );
 
 {
     wxCHECK_MSG( region.IsOk(), false, wxT("invalid wxRegion") );
 

+    // Handle the special case of not initialized (e.g. default constructed)
+    // region as we can't use HIShape functions if we don't have any shape.
+    if ( !m_refData )
+    {
+        switch ( op )
+        {
+            case wxRGN_COPY:
+            case wxRGN_OR:
+            case wxRGN_XOR:
+                // These operations make sense with a null region.
+                *this = region;
+                return true;
+
+            case wxRGN_AND:
+            case wxRGN_DIFF:
+                // Those ones don't really make sense so just leave this region
+                // empty/invalid.
+                return false;
+        }
+
+        wxFAIL_MSG( wxT("Unknown region operation") );
+        return false;
+    }
+

     AllocExclusive();
 
     switch (op)
     AllocExclusive();
 
     switch (op)


@@ -240,11 +259,21 @@ bool wxRegion::DoCombine(const wxRegion& region, wxRegionOp op)
 //# Information on region
 //-----------------------------------------------------------------------------
 
 //# Information on region
 //-----------------------------------------------------------------------------
 

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

 {
 {

-    wxFAIL_MSG( wxT("not implemented") );
+    // There doesn't seem to be any native function for checking the equality
+    // of HIShapes so we compute their differences to determine if they are
+    // equal.
+    wxRegion r(*this);
+    r.Subtract(region);
+
+    if ( !r.IsEmpty() )
+        return false;
+
+    wxRegion r2(region);
+    r2.Subtract(*this);

 
 

-    return false;
+    return r2.IsEmpty();

 }
 
 // Outer bounds of region
 }
 
 // Outer bounds of region