X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85f6b408dfd796805b1c43718e69549506353ca7..ca8d899fcb677bad4ed7df5c65887b725a092482:/include/wx/os2/region.h diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h index 6205315f22..b19dfd045d 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. @@ -59,14 +55,6 @@ public: wxRegion(); ~wxRegion(); - // - // Copying - // - inline wxRegion(const wxRegion& rSrc) - { Ref(rSrc); } - inline wxRegion& operator = (const wxRegion& rSrc) - { Ref(rSrc); return (*this); } - // // 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