Allow absent checkbox when transferring dimension data

[wxWidgets.git] / src / common / rgncmn.cpp

diff --git a/src/common/rgncmn.cpp b/src/common/rgncmn.cpp
index 2368fbc13376581da968c9e7a21156a6a19abe34..9c756c35da6d53d44355a63826333117d245e1ac 100644 (file)
--- a/src/common/rgncmn.cpp
+++ b/src/common/rgncmn.cpp
@@ -1,57 +1,79 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        rgncmn.cpp
+// Name:        src/common/rgncmn.cpp

 // Purpose:     Methods of wxRegion that have a generic implementation
 // Author:      Robin Dunn
 // Modified by:
 // Created:     27-Mar-2003
 // Purpose:     Methods of wxRegion that have a generic implementation
 // Author:      Robin Dunn
 // Modified by:
 // Created:     27-Mar-2003

-// RCS-ID:      $Id$

 // Copyright:   (c) Robin Dunn
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) Robin Dunn
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "rgncmn.h"
-#endif
-
+// ============================================================================
+// declarations
+// ============================================================================

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

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

-#include "wx/bitmap.h"
-#if wxUSE_IMAGE
-#include "wx/image.h"
-#endif
-#include "wx/dcmemory.h"

 
 

+#ifndef WX_PRECOMP
+    #include "wx/dcmemory.h"
+    #include "wx/bitmap.h"
+    #include "wx/image.h"
+#endif //WX_PRECOMP

 
 

-//---------------------------------------------------------------------------
+// ============================================================================
+// wxRegionBase implementation
+// ============================================================================

 
 

+// ----------------------------------------------------------------------------
+// region comparison
+// ----------------------------------------------------------------------------
+
+bool wxRegionBase::IsEqual(const wxRegion& region) const
+{
+    if ( m_refData == region.GetRefData() )
+    {
+        // regions are identical, hence equal
+        return true;
+    }
+
+    if ( !m_refData || !region.GetRefData() )
+    {
+        // one, but not both, of the regions is invalid
+        return false;
+    }
+
+    return DoIsEqual(region);
+}

 
 

+// ----------------------------------------------------------------------------
+// region to/from bitmap conversions
+// ----------------------------------------------------------------------------

 
 

-wxBitmap wxRegion::ConvertToBitmap() const
+wxBitmap wxRegionBase::ConvertToBitmap() const

 {
     wxRect box = GetBox();
 {
     wxRect box = GetBox();

-    wxBitmap bmp(box.GetRight(), box.GetBottom());
+    wxBitmap bmp(box.GetRight() + 1, box.GetBottom() + 1);

     wxMemoryDC dc;
     dc.SelectObject(bmp);
     dc.SetBackground(*wxBLACK_BRUSH);
     dc.Clear();
     wxMemoryDC dc;
     dc.SelectObject(bmp);
     dc.SetBackground(*wxBLACK_BRUSH);
     dc.Clear();

-    dc.SetClippingRegion(*this);
+    dc.SetDeviceClippingRegion(*static_cast<const wxRegion *>(this));

     dc.SetBackground(*wxWHITE_BRUSH);
     dc.Clear();
     dc.SelectObject(wxNullBitmap);
     return bmp;
 }
 
     dc.SetBackground(*wxWHITE_BRUSH);
     dc.Clear();
     dc.SelectObject(wxNullBitmap);
     return bmp;
 }
 

-//---------------------------------------------------------------------------
-

 #if wxUSE_IMAGE
 #if wxUSE_IMAGE

-static bool DoRegionUnion(wxRegion& region,
+
+static bool DoRegionUnion(wxRegionBase& region,

                           const wxImage& image,
                           unsigned char loR,
                           unsigned char loG,
                           const wxImage& image,
                           unsigned char loR,
                           unsigned char loG,


@@ -60,9 +82,9 @@ static bool DoRegionUnion(wxRegion& region,
 {
     unsigned char hiR, hiG, hiB;
 
 {
     unsigned char hiR, hiG, hiB;
 

-    hiR = wxMin(0xFF, loR + tolerance);
-    hiG = wxMin(0xFF, loG + tolerance);
-    hiB = wxMin(0xFF, loB + tolerance);
+    hiR = (unsigned char)wxMin(0xFF, loR + tolerance);
+    hiG = (unsigned char)wxMin(0xFF, loG + tolerance);
+    hiB = (unsigned char)wxMin(0xFF, loB + tolerance);

 
     // Loop through the image row by row, pixel by pixel, building up
     // rectangles to add to the region.
 
     // Loop through the image row by row, pixel by pixel, building up
     // rectangles to add to the region.


@@ -103,12 +125,12 @@ static bool DoRegionUnion(wxRegion& region,
 }
 
 
 }
 
 

-bool wxRegion::Union(const wxBitmap& bmp)
+bool wxRegionBase::Union(const wxBitmap& bmp)

 {
     if (bmp.GetMask())
     {
         wxImage image = bmp.ConvertToImage();
 {
     if (bmp.GetMask())
     {
         wxImage image = bmp.ConvertToImage();

-        wxASSERT_MSG( image.HasMask(), _T("wxBitmap::ConvertToImage doesn't preserve mask?") );
+        wxASSERT_MSG( image.HasMask(), wxT("wxBitmap::ConvertToImage doesn't preserve mask?") );

         return DoRegionUnion(*this, image,
                              image.GetMaskRed(),
                              image.GetMaskGreen(),
         return DoRegionUnion(*this, image,
                              image.GetMaskRed(),
                              image.GetMaskGreen(),


@@ -121,9 +143,9 @@ bool wxRegion::Union(const wxBitmap& bmp)
     }
 }
 
     }
 }
 

-bool wxRegion::Union(const wxBitmap& bmp,
-                     const wxColour& transColour,
-                     int   tolerance)
+bool wxRegionBase::Union(const wxBitmap& bmp,
+                         const wxColour& transColour,
+                         int   tolerance)

 {
     wxImage image = bmp.ConvertToImage();
     return DoRegionUnion(*this, image,
 {
     wxImage image = bmp.ConvertToImage();
     return DoRegionUnion(*this, image,


@@ -133,22 +155,37 @@ bool wxRegion::Union(const wxBitmap& bmp,
                          tolerance);
 }
 
                          tolerance);
 }
 

-#else
+#endif // wxUSE_IMAGE
+
+#ifdef wxHAS_REGION_COMBINE
+// ============================================================================
+// wxRegionWithCombine
+// ============================================================================

 
 

-bool wxRegion::Union(const wxBitmap& WXUNUSED(bmp))
+// implement some wxRegionBase pure virtuals in terms of Combine()
+bool wxRegionWithCombine::DoUnionWithRect(const wxRect& rect)

 {
 {

-    // No wxImage support
-    return false;
+    return Combine(rect, wxRGN_OR);

 }
 
 }
 

-bool wxRegion::Union(const wxBitmap& WXUNUSED(bmp),
-                     const wxColour& WXUNUSED(transColour),
-                     int   WXUNUSED(tolerance))
+bool wxRegionWithCombine::DoUnionWithRegion(const wxRegion& region)

 {
 {

-    // No wxImage support
-    return false;
+    return DoCombine(region, wxRGN_OR);

 }
 
 }
 

-#endif
+bool wxRegionWithCombine::DoIntersect(const wxRegion& region)
+{
+    return DoCombine(region, wxRGN_AND);
+}
+
+bool wxRegionWithCombine::DoSubtract(const wxRegion& region)
+{
+    return DoCombine(region, wxRGN_DIFF);
+}
+
+bool wxRegionWithCombine::DoXor(const wxRegion& region)
+{
+    return DoCombine(region, wxRGN_XOR);
+}

 
 

-//---------------------------------------------------------------------------
+#endif // wxHAS_REGION_COMBINE