wxRegion should work with wxCoord, not long

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

diff --git a/src/os2/region.cpp b/src/os2/region.cpp
index cb637f96ebabe42ffc9051783cc094b4ae286af7..c991f9c046325634024d203fdd75a67d6c5675f4 100644 (file)
--- a/src/os2/region.cpp
+++ b/src/os2/region.cpp
@@ -18,10 +18,8 @@
 #include "wx/window.h"
 #include "wx/os2/private.h"
 
-#if !USE_SHARED_LIBRARY
        IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
        IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)
-#endif
 
 //-----------------------------------------------------------------------------
 // wxRegionRefData implementation
@@ -44,8 +42,11 @@ public:
         // TODO
 
     }
+
+    HRGN m_region;
 };
 
+#define M_REGION (((wxRegionRefData*)m_refData)->m_region)
 
 //-----------------------------------------------------------------------------
 // wxRegion
@@ -224,11 +225,12 @@ bool wxRegion::Empty() 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 (0)
+    if (bOK)
         return wxInRegion;
     return wxOutRegion;
 }
@@ -236,11 +238,12 @@ wxRegionContain wxRegion::Contains(long x, long y) 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 (0)
+    if (bOK)
         return wxInRegion;
     else
         return wxOutRegion;
@@ -249,11 +252,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
 {
+    bool    bOK = FALSE; // temporary
     if (!m_refData)
         return wxOutRegion;
 
     // TODO. Return wxInRegion if within region.
-    if (0)
+    if (bOK)
         return wxInRegion;
     else
         return wxOutRegion;