X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76b49cf49ba9ee9f3eeec9730cb4bc4569ab17f1..4542739ccb3b2ad47afc66b7a3182568a182b71f:/src/univ/framuniv.cpp?ds=inline diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp index 2ce9b25aa4..91c5a9d7eb 100644 --- a/src/univ/framuniv.cpp +++ b/src/univ/framuniv.cpp @@ -49,12 +49,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) // ---------------------------------------------------------------------------- bool wxFrame::Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) { if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) ) return false; @@ -285,47 +285,35 @@ void wxFrame::DoSetClientSize(int width, int height) wxFrameBase::DoSetClientSize(width, height); } -int wxFrame::GetMinWidth() const +wxSize wxFrame::GetMinSize() 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; + wxSize size = wxFrameBase::GetMinSize(); #if wxUSE_MENUS if ( m_frameMenuBar ) { - height += m_frameMenuBar->GetSize().y; + const wxSize sizeMenu = m_frameMenuBar->GetBestSize(); + if ( sizeMenu.x > size.x ) + size.x = sizeMenu.x; + size.y += sizeMenu.y; } #endif // wxUSE_MENUS #if wxUSE_TOOLBAR if ( m_frameToolBar ) { - height += m_frameToolBar->GetSize().y; + size.y += m_frameToolBar->GetSize().y; } #endif // wxUSE_TOOLBAR #if wxUSE_STATUSBAR if ( m_frameStatusBar ) { - height += m_frameStatusBar->GetSize().y; + size.y += m_frameStatusBar->GetSize().y; } #endif // wxUSE_STATUSBAR - if ( height ) - return height + wxMax(0, wxFrameBase::GetMinHeight()); - else - return wxFrameBase::GetMinHeight(); + return size; } bool wxFrame::Enable(bool enable)