X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9379c0d752144826342fa2688a77aa5cccea3d9b..69659fd770f615210efac4b4fa741b3ad6223616:/src/common/toplvcmn.cpp diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp index 88350bebcf..77cbec0582 100644 --- a/src/common/toplvcmn.cpp +++ b/src/common/toplvcmn.cpp @@ -39,8 +39,12 @@ BEGIN_EVENT_TABLE(wxTopLevelWindowBase, wxWindow) EVT_CLOSE(wxTopLevelWindowBase::OnCloseWindow) EVT_SIZE(wxTopLevelWindowBase::OnSize) + EVT_WINDOW_DESTROY(wxTopLevelWindowBase::OnChildDestroy) + WX_EVENT_TABLE_CONTROL_CONTAINER(wxTopLevelWindowBase) END_EVENT_TABLE() +WX_DELEGATE_TO_CONTROL_CONTAINER(wxTopLevelWindowBase, wxWindow) + // ============================================================================ // implementation // ============================================================================ @@ -57,10 +61,14 @@ wxTopLevelWindowBase::wxTopLevelWindowBase() m_isShown = false; m_winDefault = NULL; m_winTmpDefault = NULL; + + WX_INIT_CONTROL_CONTAINER(); } wxTopLevelWindowBase::~wxTopLevelWindowBase() { + m_winDefault = m_winTmpDefault = NULL; + // don't let wxTheApp keep any stale pointers to us if ( wxTheApp && wxTheApp->GetTopWindow() == this ) wxTheApp->SetTopWindow(NULL); @@ -140,43 +148,20 @@ bool wxTopLevelWindowBase::IsLastBeforeExit() const // wxTopLevelWindow geometry // ---------------------------------------------------------------------------- -// set the min/max size of the window -void wxTopLevelWindowBase::DoSetSizeHints(int minW, int minH, - int maxW, int maxH, - int WXUNUSED(incW), int WXUNUSED(incH)) +void wxTopLevelWindowBase::SetMinSize(const wxSize& minSize) { - // setting min width greater than max width leads to infinite loops under - // X11 and generally doesn't make any sense, so don't allow it - wxCHECK_RET( (minW == wxDefaultCoord || maxW == wxDefaultCoord || minW <= maxW) && - (minH == wxDefaultCoord || maxH == wxDefaultCoord || minH <= maxH), - _T("min width/height must be less than max width/height!") ); - - m_minWidth = minW; - m_maxWidth = maxW; - m_minHeight = minH; - m_maxHeight = maxH; + SetSizeHints(minSize, GetMaxSize()); } -void wxTopLevelWindowBase::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h) +void wxTopLevelWindowBase::SetMaxSize(const wxSize& maxSize) { - GetPosition(x,y); - GetSize(w,h); + SetSizeHints(GetMinSize(), maxSize); } -wxSize wxTopLevelWindowBase::GetMaxSize() const +void wxTopLevelWindowBase::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h) { - wxSize size( GetMaxWidth(), GetMaxHeight() ); - int w, h; - - wxClientDisplayRect( 0, 0, &w, &h ); - - if( size.GetWidth() == wxDefaultCoord ) - size.SetWidth( w ); - - if( size.GetHeight() == wxDefaultCoord ) - size.SetHeight( h ); - - return size; + GetPosition(x,y); + GetSize(w,h); } /* static */ @@ -210,8 +195,10 @@ void wxTopLevelWindowBase::DoCentre(int dir) if(IsAlwaysMaximized()) return; - // we need the display rect anyhow so store it first - int nDisplay = wxDisplay::GetFromWindow(this); + // we need the display rect anyhow so store it first: notice that we should + // be centered on the same display as our parent window, the display of + // this window itself is not really defined yet + int nDisplay = wxDisplay::GetFromWindow(GetParent() ? GetParent() : this); wxDisplay dpy(nDisplay == wxNOT_FOUND ? 0 : nDisplay); const wxRect rectDisplay(dpy.GetClientArea()); @@ -237,7 +224,7 @@ void wxTopLevelWindowBase::DoCentre(int dir) if ( rectParent.IsEmpty() ) { - // we were explicitely asked to centre this window on the entire screen + // we were explicitly asked to centre this window on the entire screen // or if we have no parent anyhow and so can't centre on it rectParent = rectDisplay; } @@ -252,30 +239,27 @@ 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.Contains(rect.GetTopLeft()) ) + if ( !rectDisplay.Contains(rect.GetTopLeft()) ) { - 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 - 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 + // move the window just enough to make the corner visible + int dx = rectDisplay.GetLeft() - rect.GetLeft(); + int dy = rectDisplay.GetTop() - rect.GetTop(); + rect.Offset(dx > 0 ? dx : 0, dy > 0 ? dy : 0); } - else // make top left corner visible - { - if ( rect.x < rectDisplay.x ) - rect.x = rectDisplay.x; - if ( rect.y < rectDisplay.y ) - rect.y = rectDisplay.y; + if ( !rectDisplay.Contains(rect.GetBottomRight()) ) + { + // do the same for this corner too + int dx = rectDisplay.GetRight() - rect.GetRight(); + int dy = rectDisplay.GetBottom() - rect.GetBottom(); + rect.Offset(dx < 0 ? dx : 0, dy < 0 ? dy : 0); } + // the window top left and bottom right corner are both visible now and + // 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 we stop here + // -1 could be valid coordinate here if there are several displays SetSize(rect, wxSIZE_ALLOW_MINUS_ONE); } @@ -320,6 +304,26 @@ bool wxTopLevelWindowBase::IsAlwaysMaximized() const #endif } +// ---------------------------------------------------------------------------- +// icons +// ---------------------------------------------------------------------------- + +wxIcon wxTopLevelWindowBase::GetIcon() const +{ + return m_icons.IsEmpty() ? wxIcon() : m_icons.GetIcon( -1 ); +} + +void wxTopLevelWindowBase::SetIcon(const wxIcon& icon) +{ + // passing wxNullIcon to SetIcon() is possible (it means that we shouldn't + // have any icon), but adding an invalid icon to wxIconBundle is not + wxIconBundle icons; + if ( icon.Ok() ) + icons.AddIcon(icon); + + SetIcons(icons); +} + // ---------------------------------------------------------------------------- // event handlers // ---------------------------------------------------------------------------- @@ -364,21 +368,7 @@ void wxTopLevelWindowBase::DoLayout() int clientW, clientH; DoGetClientSize(&clientW, &clientH); - // for whatever reasons, wxGTK wants to have a small offset - it - // probably looks better with it? -#ifdef __WXGTK__ - const int ofs = 1; - clientW -= 2 * ofs; - clientH -= 2 * ofs; - if (clientW < 0) - clientW = 0; - if (clientH < 0) - clientH = 0; -#else - const int ofs = 0; -#endif - - child->SetSize(ofs, ofs, clientW, clientH); + child->SetSize(0, 0, clientW, clientH); } } } @@ -389,6 +379,17 @@ void wxTopLevelWindowBase::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) Destroy(); } +void wxTopLevelWindowBase::OnChildDestroy(wxWindowDestroyEvent& event) +{ + event.Skip(); + + wxWindow * const win = event.GetWindow(); + if ( win == m_winDefault ) + m_winDefault = NULL; + if ( win == m_winTmpDefault ) + m_winTmpDefault = NULL; +} + bool wxTopLevelWindowBase::SendIconizeEvent(bool iconized) { wxIconizeEvent event(GetId(), iconized); @@ -418,14 +419,3 @@ void wxTopLevelWindowBase::RequestUserAttention(int WXUNUSED(flags)) // it's probably better than do nothing, isn't it? Raise(); } - -void wxTopLevelWindowBase::RemoveChild(wxWindowBase *child) -{ - if ( child == m_winDefault ) - m_winDefault = NULL; - - if ( child == m_winTmpDefault ) - m_winTmpDefault = NULL; - - wxWindow::RemoveChild(child); -}