X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e7dda1ffa3db91707f2a554fc3c8dffa34e0e510..6b707fc394b2601878996dc7581c6d7427f8f4dd:/src/univ/framuniv.cpp diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp index 2ea330be1d..1fa17e7a06 100644 --- a/src/univ/framuniv.cpp +++ b/src/univ/framuniv.cpp @@ -17,7 +17,7 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "univframe.h" #endif @@ -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); } } @@ -299,7 +307,7 @@ int wxFrame::GetMinHeight() const height += m_frameStatusBar->GetSize().y; } #endif // wxUSE_STATUSBAR - + if ( height ) return height + wxMax(0, wxFrameBase::GetMinHeight()); else