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

Fix centering of top-level children of wxMDIParentFrame on Mac

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-11-22 20:10:53 +00:00
parent 58b9c9badd
commit 0bba37f51d
5 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/wincmn.cpp
View File

@@ -388,6 +388,7 @@ void wxWindowBase::Centre(int direction)
int widthParent, heightParent;
wxWindow *parent = NULL;
wxTopLevelWindow *winTop = NULL;
if ( !(direction & wxCENTRE_ON_SCREEN) )
{
@@ -409,9 +410,10 @@ void wxWindowBase::Centre(int direction)
// Windows, for example, this places it completely off the screen
if ( parent )
{
wxTopLevelWindow *winTop = wxDynamicCast(parent, wxTopLevelWindow);
winTop = wxDynamicCast(parent, wxTopLevelWindow);
if ( winTop && winTop->IsIconized() )
{
winTop = NULL;
parent = NULL;
}
}
@@ -434,11 +436,16 @@ void wxWindowBase::Centre(int direction)
{
if ( IsTopLevel() )
{
// centre on the parent
parent->GetSize(&widthParent, &heightParent);
if(winTop)
winTop->GetRectForTopLevelChildren(&posParent.x, &posParent.y, &widthParent, &heightParent);
else
{
// centre on the parent
parent->GetSize(&widthParent, &heightParent);
// adjust to the parents position
posParent = parent->GetPosition();
// adjust to the parents position
posParent = parent->GetPosition();
}
}
else
{