VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

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

diff --git a/src/os2/region.cpp b/src/os2/region.cpp
index cb637f96ebabe42ffc9051783cc094b4ae286af7..58495d9a9e2b182d71009fcc2819a76e1f6449fa 100644 (file)
--- a/src/os2/region.cpp
+++ b/src/os2/region.cpp
@@ -44,8 +44,11 @@ public:
         // TODO
 
     }
         // TODO
 
     }

+
+    HRGN m_region;

 };
 
 };
 

+#define M_REGION (((wxRegionRefData*)m_refData)->m_region)

 
 //-----------------------------------------------------------------------------
 // wxRegion
 
 //-----------------------------------------------------------------------------
 // wxRegion


@@ -224,11 +227,12 @@ bool wxRegion::Empty() const
 // Does the region contain the point (x,y)?
 wxRegionContain wxRegion::Contains(long x, long y) const
 {
 // Does the region contain the point (x,y)?
 wxRegionContain wxRegion::Contains(long x, long y) const
 {

+    bool    bOK = FALSE; // temporary

     if (!m_refData)
         return wxOutRegion;
 
     // TODO. Return wxInRegion if within region.
     if (!m_refData)
         return wxOutRegion;
 
     // TODO. Return wxInRegion if within region.

-    if (0)
+    if (bOK)

         return wxInRegion;
     return wxOutRegion;
 }
         return wxInRegion;
     return wxOutRegion;
 }


@@ -236,11 +240,12 @@ wxRegionContain wxRegion::Contains(long x, long y) const
 // Does the region contain the point pt?
 wxRegionContain wxRegion::Contains(const wxPoint& pt) const
 {
 // Does the region contain the point pt?
 wxRegionContain wxRegion::Contains(const wxPoint& pt) const
 {

+    bool    bOK = FALSE; // temporary

     if (!m_refData)
         return wxOutRegion;
 
     // TODO. Return wxInRegion if within region.
     if (!m_refData)
         return wxOutRegion;
 
     // TODO. Return wxInRegion if within region.

-    if (0)
+    if (bOK)

         return wxInRegion;
     else
         return wxOutRegion;
         return wxInRegion;
     else
         return wxOutRegion;


@@ -249,11 +254,12 @@ 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
 {
 // Does the region contain the rectangle (x, y, w, h)?
 wxRegionContain wxRegion::Contains(long x, long y, long w, long h) const
 {

+    bool    bOK = FALSE; // temporary

     if (!m_refData)
         return wxOutRegion;
 
     // TODO. Return wxInRegion if within region.
     if (!m_refData)
         return wxOutRegion;
 
     // TODO. Return wxInRegion if within region.

-    if (0)
+    if (bOK)

         return wxInRegion;
     else
         return wxOutRegion;
         return wxInRegion;
     else
         return wxOutRegion;