Restore ability to parse hours only with wxDateTime::ParseTime().

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

diff --git a/src/common/rgncmn.cpp b/src/common/rgncmn.cpp
index 6b7bac3a5c4e7d7c350a626797e4b37a37e40cf4..f70b68030350eef7f8a36f6b9cbbca33c63481ae 100644 (file)
--- a/src/common/rgncmn.cpp
+++ b/src/common/rgncmn.cpp
@@ -9,6 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+

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


@@ -21,33 +25,56 @@
 #ifndef WX_PRECOMP
     #include "wx/dcmemory.h"
     #include "wx/bitmap.h"
 #ifndef WX_PRECOMP
     #include "wx/dcmemory.h"
     #include "wx/bitmap.h"

+    #include "wx/image.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#if wxUSE_IMAGE
-    #include "wx/image.h"
-#endif
+// ============================================================================
+// wxRegionBase implementation
+// ============================================================================

 
 

+// ----------------------------------------------------------------------------
+// region comparison
+// ----------------------------------------------------------------------------

 
 

+bool wxRegionBase::IsEqual(const wxRegion& region) const
+{
+    if ( m_refData == region.GetRefData() )
+    {
+        // regions are identical, hence equal
+        return true;
+    }

 
 

-wxBitmap wxRegion::ConvertToBitmap() const
+    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 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,


@@ -99,13 +126,12 @@ static bool DoRegionUnion(wxRegion& region,
 }
 
 
 }
 
 

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

 {
 {

-#if (!defined(__WXMSW__) || wxUSE_WXDIB)

     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(),


@@ -113,42 +139,54 @@ bool wxRegion::Union(const wxBitmap& bmp)
                              0);
     }
     else
                              0);
     }
     else

-#endif

     {
         return Union(0, 0, bmp.GetWidth(), bmp.GetHeight());
     }
 }
 
     {
         return Union(0, 0, bmp.GetWidth(), bmp.GetHeight());
     }
 }
 

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

 {
 {

-#if (!defined(__WXMSW__) || wxUSE_WXDIB)

     wxImage image = bmp.ConvertToImage();
     return DoRegionUnion(*this, image,
                          transColour.Red(),
                          transColour.Green(),
                          transColour.Blue(),
                          tolerance);
     wxImage image = bmp.ConvertToImage();
     return DoRegionUnion(*this, image,
                          transColour.Red(),
                          transColour.Green(),
                          transColour.Blue(),
                          tolerance);

-#else
-    return false;
-#endif

 }
 
 }
 

-#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