X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..19e30148e18cc99296b26503c155e5cef59045f4:/src/msw/region.cpp

diff --git a/src/msw/region.cpp b/src/msw/region.cpp
index e40c381e7d..ec84dd0205 100644
--- a/src/msw/region.cpp
+++ b/src/msw/region.cpp
@@ -26,8 +26,8 @@
 #include "wx/window.h"
 #include "wx/msw/private.h"
 
-    IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
+IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)
 
 //-----------------------------------------------------------------------------
 // wxRegionRefData implementation
@@ -43,7 +43,7 @@ public:
 
     wxRegionRefData(const wxRegionRefData& data)
     {
-#if defined(__WIN32__)
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
         DWORD noBytes = ::GetRegionData(data.m_region, 0, NULL);
         RGNDATA *rgnData = (RGNDATA*) new char[noBytes];
         ::GetRegionData(data.m_region, noBytes, rgnData);
@@ -76,8 +76,7 @@ public:
  */
 wxRegion::wxRegion()
 {
-    m_refData = new wxRegionRefData;
-    M_REGION = ::CreateRectRgn(0, 0, 0, 0);
+    m_refData = (wxRegionRefData *)NULL;
 }
 
 wxRegion::wxRegion(WXHRGN hRegion)
@@ -86,7 +85,7 @@ wxRegion::wxRegion(WXHRGN hRegion)
     M_REGION = (HRGN) hRegion;
 }
 
-wxRegion::wxRegion(long x, long y, long w, long h)
+wxRegion::wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
 {
     m_refData = new wxRegionRefData;
     M_REGION = ::CreateRectRgn(x, y, x + w, y + h);
@@ -101,17 +100,40 @@ wxRegion::wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight)
 wxRegion::wxRegion(const wxRect& rect)
 {
     m_refData = new wxRegionRefData;
-    M_REGION = ::CreateRectRgn(rect.GetLeft(), rect.GetTop(), rect.GetRight(), rect.GetBottom());
+    M_REGION = ::CreateRectRgn(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height);
+}
+
+wxRegion::wxRegion(size_t n, const wxPoint *points, int fillStyle)
+{
+#ifdef __WXMICROWIN__
+    m_refData = NULL;
+    M_REGION = NULL;
+#else
+    m_refData = new wxRegionRefData;
+    M_REGION = ::CreatePolygonRgn
+               (
+                    (POINT*)points,
+                    n,
+                    fillStyle == wxODDEVEN_RULE ? ALTERNATE : WINDING
+               );
+#endif
 }
 
-/*
- * Destroy the region.
- */
 wxRegion::~wxRegion()
 {
     // m_refData unrefed in ~wxObject
 }
 
+wxObjectRefData *wxRegion::CreateRefData() const
+{
+    return new wxRegionRefData;
+}
+
+wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const
+{
+    return new wxRegionRefData(*(wxRegionRefData *)data);
+}
+
 //-----------------------------------------------------------------------------
 // Modify region
 //-----------------------------------------------------------------------------
@@ -122,18 +144,30 @@ void wxRegion::Clear()
     UnRef();
 }
 
-// Combine rectangle (x, y, w, h) with this.
-bool wxRegion::Combine(long x, long y, long width, long height, wxRegionOp op)
-{
-    // Don't change shared data
-    if (!m_refData) {
-        m_refData = new wxRegionRefData();
-    } else if (m_refData->GetRefCount() > 1) {
-        wxRegionRefData* ref = (wxRegionRefData*)m_refData;
-        UnRef();
-        m_refData = new wxRegionRefData(*ref);
+bool wxRegion::Offset(wxCoord x, wxCoord y)
+{
+    if ( !x && !y )
+    {
+        // nothing to do
+        return TRUE;
     }
-    // If ref count is 1, that means it's 'ours' anyway so no action.
+
+    AllocExclusive();
+
+    if ( ::OffsetRgn(GetHrgn(), x, y) == ERROR )
+    {
+        wxLogLastError(_T("OffsetRgn"));
+
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+// Combine rectangle (x, y, w, h) with this.
+bool wxRegion::Combine(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxRegionOp op)
+{
+    AllocExclusive();
 
     HRGN rectRegion = ::CreateRectRgn(x, y, x + width, y + height);
 
@@ -149,7 +183,11 @@ bool wxRegion::Combine(long x, long y, long width, long height, wxRegionOp op)
             mode = RGN_COPY; break ;
     }
 
-    bool success = (ERROR != ::CombineRgn(M_REGION, M_REGION, rectRegion, mode));
+    bool success = ::CombineRgn(M_REGION, M_REGION, rectRegion, mode) != ERROR;
+    if ( !success )
+    {
+        wxLogLastError(_T("CombineRgn"));
+    }
 
     ::DeleteObject(rectRegion);
 
@@ -162,14 +200,7 @@ bool wxRegion::Combine(const wxRegion& region, wxRegionOp op)
     if (region.Empty())
         return FALSE;
 
-    // Don't change shared data
-    if (!m_refData) {
-        m_refData = new wxRegionRefData();
-    } else    if (m_refData->GetRefCount() > 1) {
-        wxRegionRefData* ref = (wxRegionRefData*)m_refData;
-        UnRef();
-        m_refData = new wxRegionRefData(*ref);
-    }
+    AllocExclusive();
 
     int mode = 0;
     switch (op)
@@ -196,23 +227,26 @@ bool wxRegion::Combine(const wxRect& rect, wxRegionOp op)
 //-----------------------------------------------------------------------------
 
 // Outer bounds of region
-void wxRegion::GetBox(long& x, long& y, long&w, long &h) const
+void wxRegion::GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const
 {
-    if (m_refData) {
+    if (m_refData)
+    {
         RECT rect;
         ::GetRgnBox(M_REGION, & rect);
         x = rect.left;
         y = rect.top;
         w = rect.right - rect.left;
         h = rect.bottom - rect.top;
-    } else {
+    }
+    else
+    {
         x = y = w = h = 0;
     }
 }
 
 wxRect wxRegion::GetBox() const
 {
-    long x, y, w, h;
+    wxCoord x, y, w, h;
     GetBox(x, y, w, h);
     return wxRect(x, y, w, h);
 }
@@ -220,12 +254,10 @@ wxRect wxRegion::GetBox() const
 // Is region empty?
 bool wxRegion::Empty() const
 {
-    if (M_REGION == 0)
-        return TRUE;
-    long x, y, w, h;
+    wxCoord x, y, w, h;
     GetBox(x, y, w, h);
 
-    return ((w == 0) && (h == 0));
+    return (w == 0) && (h == 0);
 }
 
 //-----------------------------------------------------------------------------
@@ -233,7 +265,7 @@ bool wxRegion::Empty() const
 //-----------------------------------------------------------------------------
 
 // Does the region contain the point (x,y)?
-wxRegionContain wxRegion::Contains(long x, long y) const
+wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y) const
 {
     if (!m_refData)
         return wxOutRegion;
@@ -257,7 +289,7 @@ wxRegionContain wxRegion::Contains(const wxPoint& pt) const
 }
 
 // Does the region contain the rectangle (x, y, w, h)?
-wxRegionContain wxRegion::Contains(long x, long y, long w, long h) const
+wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y, wxCoord w, wxCoord h) const
 {
     if (!m_refData)
         return wxOutRegion;
@@ -280,7 +312,7 @@ wxRegionContain wxRegion::Contains(const wxRect& rect) const
     if (!m_refData)
         return wxOutRegion;
 
-    long x, y, w, h;
+    wxCoord x, y, w, h;
     x = rect.x;
     y = rect.y;
     w = rect.GetWidth();
@@ -397,28 +429,28 @@ void wxRegionIterator::operator ++ (int)
         ++m_current;
 }
 
-long wxRegionIterator::GetX() const
+wxCoord wxRegionIterator::GetX() const
 {
     if (m_current < m_numRects)
         return m_rects[m_current].x;
     return 0;
 }
 
-long wxRegionIterator::GetY() const
+wxCoord wxRegionIterator::GetY() const
 {
     if (m_current < m_numRects)
         return m_rects[m_current].y;
     return 0;
 }
 
-long wxRegionIterator::GetW() const
+wxCoord wxRegionIterator::GetW() const
 {
     if (m_current < m_numRects)
         return m_rects[m_current].width ;
     return 0;
 }
 
-long wxRegionIterator::GetH() const
+wxCoord wxRegionIterator::GetH() const
 {
     if (m_current < m_numRects)
         return m_rects[m_current].height;