X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85f6b408dfd796805b1c43718e69549506353ca7..7d90da2b4c677a3a1eeaab1b5991566a5d515368:/include/wx/os2/region.h

diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h
index 6205315f22..00ba96adc9 100644
--- a/include/wx/os2/region.h
+++ b/include/wx/os2/region.h
@@ -21,10 +21,6 @@
 class WXDLLEXPORT wxRect;
 class WXDLLEXPORT wxPoint;
 
-enum wxRegionContain {
-    wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2
-};
-
 // So far, for internal use only
 enum wxRegionOp { wxRGN_AND         // Creates the intersection of the two combined regions.
                  ,wxRGN_COPY         // Creates a copy of the region identified by hrgnSrc1.
@@ -57,15 +53,7 @@ public:
     }
 
     wxRegion();
-    ~wxRegion();
-
-    //
-    // Copying
-    //
-    inline wxRegion(const wxRegion& rSrc)
-        { Ref(rSrc); }
-    inline wxRegion& operator = (const wxRegion& rSrc)
-        { Ref(rSrc); return (*this); }
+    virtual ~wxRegion();
 
     //
     // Modify region
@@ -178,10 +166,9 @@ public:
     // Tests
     // Does the region contain the point (x,y)?
     //
-    wxRegionContain Contains( wxCoord lX
-                             ,wxCoord lY
-                            ) const;
-
+    inline wxRegionContain Contains( wxCoord lX, wxCoord lY ) const{
+        return Contains( wxPoint( lX, lY ) );
+    }
     //
     // Convert the region to a B&W bitmap with the black pixels being inside
     // the region.
@@ -214,7 +201,10 @@ public:
     //
     // Does the region contain the rectangle rect?
     //
-    wxRegionContain Contains(const wxRect& rRect) const;
+    inline wxRegionContain Contains(const wxRect& rRect) const{
+         return Contains( rRect.x, rRect.y,
+                          rRect.GetWidth(), rRect.GetHeight());
+    }
 
     //
     // Internal
@@ -253,7 +243,7 @@ DECLARE_DYNAMIC_CLASS(wxRegionIterator);
 public:
     wxRegionIterator();
     wxRegionIterator(const wxRegion& rRegion);
-    ~wxRegionIterator();
+    virtual ~wxRegionIterator();
 
     void Reset(void) { m_lCurrent = 0; }
     void Reset(const wxRegion& rRegion);