don't crash when EnsureVisible() is called for the hidden root item

[wxWidgets.git] / include / wx / os2 / region.h

diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h
index 348f24008b87ce9f62bbde16c42fd171ab0ca616..b19dfd045da0fbf3fd71595423c1e10c50bc27d2 100644 (file)
--- 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.
@@ -170,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.
@@ -206,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