X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..5adad46628e545a6d4172ecf3a0cb848934f5cd0:/src/univ/framuniv.cpp?ds=inline diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp index b55c96ae49..fdd0927bf6 100644 --- a/src/univ/framuniv.cpp +++ b/src/univ/framuniv.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 19.05.01 // RCS-ID: $Id$ -// Copyright: (c) 2001 Vadim Zeitlin +// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -68,19 +68,22 @@ wxFrame::wxFrame(wxWindow *parent, } // ---------------------------------------------------------------------------- -// geometry +// menu support // ---------------------------------------------------------------------------- void wxFrame::OnSize(wxSizeEvent& event) { +#if wxUSE_MENUS PositionMenuBar(); +#endif // wxUSE_WAVE event.Skip(); } +#if wxUSE_MENUS + void wxFrame::PositionMenuBar() { -#if wxUSE_MENUS if ( m_frameMenuBar ) { // the menubar is positioned above the client size, hence the negative @@ -88,9 +91,10 @@ void wxFrame::PositionMenuBar() m_frameMenuBar->SetSize(0, -m_frameMenuBar->GetSize().y, GetClientSize().x, -1); } -#endif // wxUSE_MENUS } +#endif // wxUSE_MENUS + wxPoint wxFrame::GetClientAreaOrigin() const { wxPoint pt = wxFrameNative::GetClientAreaOrigin();