don't include windows.h unless neccessary

[wxWidgets.git] / src / msw / region.cpp

diff --git a/src/msw/region.cpp b/src/msw/region.cpp
index d2b0f83cf6bd1c59f281847e91e9bb6df60a87d5..c91f27635009bc17bebb451f20f0efdaf3e3c967 100644 (file)
--- a/src/msw/region.cpp
+++ b/src/msw/region.cpp
@@ -26,8 +26,8 @@
 #include "wx/window.h"
 #include "wx/msw/private.h"
 
 #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
 
 //-----------------------------------------------------------------------------
 // wxRegionRefData implementation


@@ -43,7 +43,7 @@ public:
 
     wxRegionRefData(const wxRegionRefData& data)
     {
 
     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);
         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()
 {
  */
 wxRegion::wxRegion()
 {

-    m_refData = new wxRegionRefData;
-    M_REGION = ::CreateRectRgn(0, 0, 0, 0);
+    m_refData = (wxRegionRefData *)NULL;

 }
 
 wxRegion::wxRegion(WXHRGN hRegion)
 }
 
 wxRegion::wxRegion(WXHRGN hRegion)


@@ -104,6 +103,22 @@ wxRegion::wxRegion(const wxRect& rect)
     M_REGION = ::CreateRectRgn(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height);
 }
 
     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.
  */
 /*
  * Destroy the region.
  */


@@ -198,14 +213,17 @@ bool wxRegion::Combine(const wxRect& rect, wxRegionOp op)
 // Outer bounds of region
 void wxRegion::GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const
 {
 // Outer bounds of region
 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;
         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;
     }
 }
         x = y = w = h = 0;
     }
 }


@@ -220,12 +238,10 @@ wxRect wxRegion::GetBox() const
 // Is region empty?
 bool wxRegion::Empty() const
 {
 // Is region empty?
 bool wxRegion::Empty() const
 {

-    if (M_REGION == 0)
-        return TRUE;

     wxCoord x, y, w, h;
     GetBox(x, y, w, h);
 
     wxCoord x, y, w, h;
     GetBox(x, y, w, h);
 

-    return ((w == 0) && (h == 0));
+    return (w == 0) && (h == 0);

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------