Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed wxRect::Inside() to wxRect::Contains(), wxRect::Inside(wxRect) is too confusing

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2006-09-13 17:12:25 +00:00
parent 23621b352c
commit 22a35096a0
30 changed files with 74 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/toplvcmn.cpp
View File

@@ -210,8 +210,8 @@ void wxTopLevelWindowBase::DoCentre(int dir)
// parent frame under Mac but could happen elsewhere too if the frame
// was hidden/moved away for some reason), don't use it as otherwise
// this window wouldn't be visible at all
if ( !rectDisplay.Inside(rectParent.GetTopLeft()) &&
!rectParent.Inside(rectParent.GetBottomRight()) )
if ( !rectDisplay.Contains(rectParent.GetTopLeft()) &&
!rectParent.Contains(rectParent.GetBottomRight()) )
{
// this is enough to make IsEmpty() test below pass
rectParent.width = 0;
@@ -235,9 +235,9 @@ void wxTopLevelWindowBase::DoCentre(int dir)
// we don't want to place the window off screen if Centre() is called as
// this is (almost?) never wanted and it would be very difficult to prevent
// it from happening from the user code if we didn't check for it here
if ( rectDisplay.Inside(rect.GetTopLeft()) )
if ( rectDisplay.Contains(rect.GetTopLeft()) )
{
if ( !rectDisplay.Inside(rect.GetBottomRight()) )
if ( !rectDisplay.Contains(rect.GetBottomRight()) )
{
// check if we can move the window so that the bottom right corner
// is visible without hiding the top left one