X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/443aec6f41be3d7428a2c61accc611b42dc9238d..91c536df157aa500e832ff9e8541839d2e07f6b4:/src/univ/framuniv.cpp diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp index 08ccc26c63..d4c06aa36b 100644 --- a/src/univ/framuniv.cpp +++ b/src/univ/framuniv.cpp @@ -96,13 +96,21 @@ void wxFrame::PositionMenuBar() // the menubar is positioned above the client size, hence the negative // y coord wxCoord heightMbar = m_frameMenuBar->GetSize().y; - m_frameMenuBar->SetSize(0, + + wxCoord heightTbar = 0; + +#if wxUSE_TOOLBAR + if ( m_frameToolBar ) + heightTbar = m_frameToolBar->GetSize().y; +#endif // wxUSE_TOOLBAR + + m_frameMenuBar->SetSize(0, #ifdef __WXPM__ // FIXME -- remove this, make wxOS2/Univ behave as // the rest of the world!!! - GetClientSize().y - heightMbar, + GetClientSize().y - heightMbar - heightTbar, #else - -heightMbar, -#endif + - (heightMbar + heightTbar), +#endif GetClientSize().x, heightMbar); } } @@ -263,6 +271,49 @@ void wxFrame::DoSetClientSize(int width, int height) wxFrameBase::DoSetClientSize(width, height); } +int wxFrame::GetMinWidth() const +{ +#if wxUSE_MENUS + if ( m_frameMenuBar ) + { + return wxMax(m_frameMenuBar->GetBestSize().x, wxFrameBase::GetMinWidth()); + } + else +#endif // wxUSE_MENUS + return wxFrameBase::GetMinWidth(); +} + +int wxFrame::GetMinHeight() const +{ + int height = 0; + +#if wxUSE_MENUS + if ( m_frameMenuBar ) + { + height += m_frameMenuBar->GetSize().y; + } +#endif // wxUSE_MENUS + +#if wxUSE_TOOLBAR + if ( m_frameToolBar ) + { + height += m_frameToolBar->GetSize().y; + } +#endif // wxUSE_TOOLBAR + +#if wxUSE_STATUSBAR + if ( m_frameStatusBar ) + { + height += m_frameStatusBar->GetSize().y; + } +#endif // wxUSE_STATUSBAR + + if ( height ) + return height + wxMax(0, wxFrameBase::GetMinHeight()); + else + return wxFrameBase::GetMinHeight(); +} + bool wxFrame::Enable(bool enable) { if (!wxFrameBase::Enable(enable))