No changes, synchronised source names that appear commented at the top of files with...

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

diff --git a/src/common/rgncmn.cpp b/src/common/rgncmn.cpp
index 41b273e76c123fcafd185384c16654c831e0f6c9..93de0d48f84f69e2d4280d9ac0ba68e598aad8f0 100644 (file)
--- a/src/common/rgncmn.cpp
+++ b/src/common/rgncmn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     Methods of wxRegion that have a generic implementation
 // Author:      Robin Dunn
 // Modified by:
 // Purpose:     Methods of wxRegion that have a generic implementation
 // Author:      Robin Dunn
 // Modified by:


@@ -9,77 +9,83 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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 comparision
+// ----------------------------------------------------------------------------
+
+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

 
 

-bool wxRegion::Union(const wxBitmap& bmp,
-                     const wxColour& transColour,
-                     int   tolerance)
+static bool DoRegionUnion(wxRegionBase& region,
+                          const wxImage& image,
+                          unsigned char loR,
+                          unsigned char loG,
+                          unsigned char loB,
+                          int tolerance)

 {
 {

-#if wxUSE_IMAGE
-    unsigned char loR, loG, loB;

     unsigned char hiR, hiG, hiB;
 
     unsigned char hiR, hiG, hiB;
 

-    wxCHECK_MSG((bmp.GetMask() != NULL) || transColour.Ok(),
-                FALSE,
-                wxT("Either the bitmap should have a mask or a colour should be given."));
-
-    wxImage image = bmp.ConvertToImage();
-
-    if (image.HasMask())
-    {
-        loR = image.GetMaskRed();
-        loG = image.GetMaskGreen();
-        loB = image.GetMaskBlue();
-    }
-    else
-    {
-        loR = transColour.Red();
-        loG = transColour.Green();
-        loB = transColour.Blue();
-    }
-
-    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.


@@ -111,16 +117,76 @@ bool wxRegion::Union(const wxBitmap& bmp,
             if (x > x0) {
                 rect.x = x0;
                 rect.width = x - x0;
             if (x > x0) {
                 rect.x = x0;
                 rect.width = x - x0;

-                Union(rect);
+                region.Union(rect);

             }
         }
     }
 
             }
         }
     }
 

-    return TRUE;
-#else
-    // No wxImage support
-    return FALSE;
-#endif
+    return true;
+}
+
+
+bool wxRegionBase::Union(const wxBitmap& bmp)
+{
+    if (bmp.GetMask())
+    {
+        wxImage image = bmp.ConvertToImage();
+        wxASSERT_MSG( image.HasMask(), wxT("wxBitmap::ConvertToImage doesn't preserve mask?") );
+        return DoRegionUnion(*this, image,
+                             image.GetMaskRed(),
+                             image.GetMaskGreen(),
+                             image.GetMaskBlue(),
+                             0);
+    }
+    else
+    {
+        return Union(0, 0, bmp.GetWidth(), bmp.GetHeight());
+    }
+}
+
+bool wxRegionBase::Union(const wxBitmap& bmp,
+                         const wxColour& transColour,
+                         int   tolerance)
+{
+    wxImage image = bmp.ConvertToImage();
+    return DoRegionUnion(*this, image,
+                         transColour.Red(),
+                         transColour.Green(),
+                         transColour.Blue(),
+                         tolerance);
+}
+
+#endif // wxUSE_IMAGE
+
+#ifdef wxHAS_REGION_COMBINE
+// ============================================================================
+// wxRegionWithCombine
+// ============================================================================
+
+// implement some wxRegionBase pure virtuals in terms of Combine()
+bool wxRegionWithCombine::DoUnionWithRect(const wxRect& rect)
+{
+    return Combine(rect, wxRGN_OR);
+}
+
+bool wxRegionWithCombine::DoUnionWithRegion(const wxRegion& region)
+{
+    return DoCombine(region, wxRGN_OR);
+}
+
+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