renamed wxRect::Inside() to wxRect::Contains(), wxRect::Inside(wxRect) is too confusing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -183,7 +183,7 @@ wxRect& wxRect::Inflate(wxCoord dx, wxCoord dy)
|
||||
return *this;
|
||||
}
|
||||
|
||||
bool wxRect::Inside(int cx, int cy) const
|
||||
bool wxRect::Contains(int cx, int cy) const
|
||||
{
|
||||
return ( (cx >= x) && (cy >= y)
|
||||
&& ((cy - y) < height)
|
||||
@@ -191,9 +191,9 @@ bool wxRect::Inside(int cx, int cy) const
|
||||
);
|
||||
}
|
||||
|
||||
bool wxRect::Inside(const wxRect& rect) const
|
||||
bool wxRect::Contains(const wxRect& rect) const
|
||||
{
|
||||
return Inside(rect.GetTopLeft()) && Inside(rect.GetBottomRight());
|
||||
return Contains(rect.GetTopLeft()) && Contains(rect.GetBottomRight());
|
||||
}
|
||||
|
||||
wxRect& wxRect::Intersect(const wxRect& rect)
|
||||
|
||||
Reference in New Issue
Block a user