X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45e0dc94770d598a1cc84d83730d470dd1cfbcca..24bcaec36746abeeb9e2023d03e3ab4289006fc3:/src/common/toplvcmn.cpp diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp index a67959b9f0..da1e1cb9e0 100644 --- a/src/common/toplvcmn.cpp +++ b/src/common/toplvcmn.cpp @@ -73,6 +73,22 @@ bool wxTopLevelWindowBase::Destroy() return TRUE; } +wxSize wxTopLevelWindowBase::GetMaxSize() const +{ + wxSize size( GetMaxWidth(), GetMaxHeight() ); + int w, h; + + wxClientDisplayRect( 0, 0, &w, &h ); + + if( size.GetWidth() == -1 ) + size.SetWidth( w ); + + if( size.GetHeight() == -1 ) + size.SetHeight( h ); + + return size; +} + // ---------------------------------------------------------------------------- // wxTopLevelWindow size management: we exclude the areas taken by // menu/status/toolbars from the client area, so the client area is what's @@ -113,14 +129,12 @@ void wxTopLevelWindowBase::DoClientToScreen(int *x, int *y) const // whole client area void wxTopLevelWindowBase::OnSize(wxSizeEvent& WXUNUSED(event)) { - // if we're using constraints - do use them -#if wxUSE_CONSTRAINTS + // if we're using constraints or sizers - do use them if ( GetAutoLayout() ) { Layout(); } else -#endif // wxUSE_CONSTRAINTS { // do we have _exactly_ one child? wxWindow *child = (wxWindow *)NULL; @@ -137,9 +151,6 @@ void wxTopLevelWindowBase::OnSize(wxSizeEvent& WXUNUSED(event)) { if ( child ) { -#ifdef __WXPM__ - AlterChildPos(); -#endif return; // it's our second subwindow - nothing to do } @@ -162,14 +173,7 @@ void wxTopLevelWindowBase::OnSize(wxSizeEvent& WXUNUSED(event)) static const int ofs = 0; #endif -#ifdef __WXPM__ - // OS/2 PM has to do a LOT of stuff to get things - // positioned right, especially if the child is a - // scrolled window. - UpdateInternalSize(child, clientW, clientH); -#else child->SetSize(ofs, ofs, clientW - 2*ofs, clientH - 2*ofs); -#endif } } } @@ -187,3 +191,5 @@ bool wxTopLevelWindowBase::SendIconizeEvent(bool iconized) return GetEventHandler()->ProcessEvent(event); } + +// vi:sts=4:sw=4:et