X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f464296deff25be95f9e2b7c68566919aa17da2..6d7b547184bfdcdf67790755deb0122050b1d728:/src/common/toplvcmn.cpp?ds=sidebyside diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp index f69ac1e021..60376d3ebc 100644 --- a/src/common/toplvcmn.cpp +++ b/src/common/toplvcmn.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: common/toplvcmn.cpp +// Name: src/common/toplvcmn.cpp // Purpose: common (for all platforms) wxTopLevelWindow functions // Author: Julian Smart, Vadim Zeitlin // Created: 01/02/97 @@ -23,8 +23,9 @@ #pragma hdrstop #endif +#include "wx/toplevel.h" + #ifndef WX_PRECOMP - #include "wx/toplevel.h" #include "wx/dcclient.h" #include "wx/app.h" #endif // WX_PRECOMP @@ -54,6 +55,8 @@ wxTopLevelWindowBase::wxTopLevelWindowBase() { // Unlike windows, top level windows are created hidden by default. m_isShown = false; + m_winDefault = NULL; + m_winTmpDefault = NULL; } wxTopLevelWindowBase::~wxTopLevelWindowBase() @@ -62,13 +65,11 @@ wxTopLevelWindowBase::~wxTopLevelWindowBase() if ( wxTheApp && wxTheApp->GetTopWindow() == this ) wxTheApp->SetTopWindow(NULL); - bool shouldExit = IsLastBeforeExit(); - wxTopLevelWindows.DeleteObject(this); - if ( shouldExit ) + if ( IsLastBeforeExit() ) { - // then do it + // no other (important) windows left, quit the app wxTheApp->ExitMainLoop(); } } @@ -96,11 +97,43 @@ bool wxTopLevelWindowBase::Destroy() bool wxTopLevelWindowBase::IsLastBeforeExit() const { - // we exit the application if there are no more top level windows left - // normally but wxApp can prevent this from happening - return wxTopLevelWindows.GetCount() == 1 && - wxTopLevelWindows.GetFirst()->GetData() == (wxWindow *)this && - wxTheApp && wxTheApp->GetExitOnFrameDelete(); + // first of all, automatically exiting the app on last window close can be + // completely disabled at wxTheApp level + if ( !wxTheApp || !wxTheApp->GetExitOnFrameDelete() ) + return false; + + wxWindowList::const_iterator i; + const wxWindowList::const_iterator end = wxTopLevelWindows.end(); + + // then decide whether we should exit at all + for ( i = wxTopLevelWindows.begin(); i != end; ++i ) + { + wxTopLevelWindow * const win = wx_static_cast(wxTopLevelWindow *, *i); + if ( win->ShouldPreventAppExit() ) + { + // there remains at least one important TLW, don't exit + return false; + } + } + + // if yes, close all the other windows: this could still fail + for ( i = wxTopLevelWindows.begin(); i != end; ++i ) + { + // don't close twice the windows which are already marked for deletion + wxTopLevelWindow * const win = wx_static_cast(wxTopLevelWindow *, *i); + if ( !wxPendingDelete.Member(win) && !win->Close() ) + { + // one of the windows refused to close, don't exit + // + // NB: of course, by now some other windows could have been already + // closed but there is really nothing we can do about it as we + // have no way just to ask the window if it can close without + // forcing it to do it + return false; + } + } + + return true; } // ---------------------------------------------------------------------------- @@ -155,31 +188,79 @@ wxSize wxTopLevelWindowBase::GetDefaultSize() void wxTopLevelWindowBase::DoCentre(int dir) { - wxRect rectCentre; + // on some platforms centering top level windows is impossible + // because they are always maximized by guidelines or limitations + if(IsAlwaysMaximized()) + return; + + // we need the display rect anyhow so store it first + int nDisplay = wxDisplay::GetFromWindow(this); + wxDisplay dpy(nDisplay == wxNOT_FOUND ? 0 : nDisplay); + const wxRect rectDisplay(dpy.GetClientArea()); + + // what should we centre this window on? + wxRect rectParent; if ( !(dir & wxCENTRE_ON_SCREEN) && GetParent() ) { - // centre on parent window - rectCentre = GetParent()->GetRect(); + // centre on parent window: notice that we need screen coordinates for + // positioning this TLW + rectParent = GetParent()->GetScreenRect(); + + // if the parent is entirely off screen (happens at least with MDI + // 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()) ) + { + // this is enough to make IsEmpty() test below pass + rectParent.width = 0; + } } - else + + if ( rectParent.IsEmpty() ) { // we were explicitely asked to centre this window on the entire screen // or if we have no parent anyhow and so can't centre on it -#if wxUSE_DISPLAY - const int nDisplay = wxDisplay::GetFromWindow(this); - if ( nDisplay != wxNOT_FOUND ) - { - rectCentre = wxDisplay(nDisplay).GetGeometry(); - } - else -#endif // wxUSE_DISPLAY + rectParent = rectDisplay; + } + + // centering maximized window on screen is no-op + if((rectParent == rectDisplay) && IsMaximized()) + return; + + // the new window rect candidate + wxRect rect = GetRect().CentreIn(rectParent, 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.Inside(rect.GetBottomRight()) ) { - wxDisplaySize(&rectCentre.width, &rectCentre.height); + // check if we can move the window so that the bottom right corner + // is visible without hiding the top left one + int dx = rectDisplay.GetRight() - rect.GetRight(); + int dy = rectDisplay.GetBottom() - rect.GetBottom(); + rect.Offset(dx, dy); } + //else: the window top left and bottom right corner are both visible, + // although the window might still be not entirely on screen (with + // 2 staggered displays for example) we wouldn't be able to + // improve the layout much in such case, so just leave it as is + } + else // make top left corner visible + { + if ( rect.x < rectDisplay.x ) + rect.x = rectDisplay.x; + + if ( rect.y < rectDisplay.y ) + rect.y = rectDisplay.y; } - // window may be at -1 if it's centered on a secondary display, for example - SetSize(GetRect().CentreIn(rectCentre, dir), wxSIZE_ALLOW_MINUS_ONE); + // -1 could be valid coordinate here if there are several displays + SetSize(rect, wxSIZE_ALLOW_MINUS_ONE); } // ---------------------------------------------------------------------------- @@ -213,6 +294,14 @@ void wxTopLevelWindowBase::DoClientToScreen(int *x, int *y) const wxWindow::DoClientToScreen(x, y); } +bool wxTopLevelWindowBase::IsAlwaysMaximized() const +{ +#if defined(__SMARTPHONE__) || defined(__POCKETPC__) + return true; +#else + return false; +#endif +} // ---------------------------------------------------------------------------- // event handlers @@ -252,7 +341,7 @@ void wxTopLevelWindowBase::DoLayout() } // do we have any children at all? - if ( child ) + if ( child && child->IsShown() ) { // exactly one child - set it's size to fill the whole frame int clientW, clientH; @@ -288,9 +377,12 @@ bool wxTopLevelWindowBase::SendIconizeEvent(bool iconized) // do the window-specific processing after processing the update event void wxTopLevelWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event) { - if ( event.GetSetEnabled() ) - Enable(event.GetEnabled()); + // call inherited, but skip the wxControl's version, and call directly the + // wxWindow's one instead, because the only reason why we are overriding this + // function is that we want to use SetTitle() instead of wxControl::SetLabel() + wxWindowBase::DoUpdateWindowUI(event); + // update title if ( event.GetSetText() ) { if ( event.GetText() != GetTitle() ) @@ -304,3 +396,13 @@ void wxTopLevelWindowBase::RequestUserAttention(int WXUNUSED(flags)) Raise(); } +void wxTopLevelWindowBase::RemoveChild(wxWindowBase *child) +{ + if ( child == m_winDefault ) + m_winDefault = NULL; + + if ( child == m_winTmpDefault ) + m_winTmpDefault = NULL; + + wxWindow::RemoveChild(child); +}