X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/71e030352d74e4e6aed28cfcb0ea6edf3d17af6e..00c813596e3eefdd028365acf9542355937e5531:/src/univ/framuniv.cpp diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp index 4f5bca178c..6c38c6201c 100644 --- a/src/univ/framuniv.cpp +++ b/src/univ/framuniv.cpp @@ -92,7 +92,12 @@ 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, -heightMbar, + m_frameMenuBar->SetSize(0, +#ifdef __WXPM__ + GetClientSize().y - heightMbar, +#else + -heightMbar, +#endif GetClientSize().x, heightMbar); } } @@ -136,7 +141,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const { wxPoint pt = wxFrameBase::GetClientAreaOrigin(); -#if wxUSE_MENUS +#if wxUSE_MENUS && !defined(__WXPM__) if ( m_frameMenuBar ) { pt.y += m_frameMenuBar->GetSize().y;