X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9152a05f8132181caa920309fba63c3784f8c71..2fe212b0336512aac9eace69fab09ce856b0bf4b:/src/univ/framuniv.cpp diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp index c1a2650051..6c38c6201c 100644 --- a/src/univ/framuniv.cpp +++ b/src/univ/framuniv.cpp @@ -31,6 +31,7 @@ #include "wx/menu.h" #ifndef WX_PRECOMP #include "wx/frame.h" + #include "wx/statusbr.h" #endif // WX_PRECOMP // ============================================================================ @@ -55,7 +56,6 @@ bool wxFrame::Create(wxWindow *parent, long style, const wxString& name) { - m_renderer = NULL; return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name); } @@ -69,10 +69,20 @@ void wxFrame::OnSize(wxSizeEvent& event) #if wxUSE_MENUS PositionMenuBar(); #endif // wxUSE_MENUS +#if wxUSE_STATUSBAR + PositionStatusBar(); +#endif // wxUSE_STATUSBAR event.Skip(); } +void wxFrame::SendSizeEvent() +{ + wxSizeEvent event(GetSize(), GetId()); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); +} + #if wxUSE_MENUS void wxFrame::PositionMenuBar() @@ -82,18 +92,56 @@ 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); } } +void wxFrame::DetachMenuBar() +{ + wxFrameBase::DetachMenuBar(); + SendSizeEvent(); +} + +void wxFrame::AttachMenuBar(wxMenuBar *menubar) +{ + wxFrameBase::AttachMenuBar(menubar); + SendSizeEvent(); +} + #endif // wxUSE_MENUS +#if wxUSE_STATUSBAR + +void wxFrame::PositionStatusBar() +{ + if ( m_frameStatusBar ) + { + wxSize size = GetClientSize(); + m_frameStatusBar->SetSize(0, size.y, size.x, -1); + } +} + +wxStatusBar* wxFrame::CreateStatusBar(int number, long style, + wxWindowID id, const wxString& name) +{ + wxStatusBar *bar = wxFrameBase::CreateStatusBar(number, style, id, name); + SendSizeEvent(); + return bar; +} + +#endif // wxUSE_STATUSBAR + 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; @@ -106,12 +154,20 @@ wxPoint wxFrame::GetClientAreaOrigin() const void wxFrame::DoGetClientSize(int *width, int *height) const { wxFrameBase::DoGetClientSize(width, height); + #if wxUSE_MENUS if ( m_frameMenuBar && height ) { (*height) -= m_frameMenuBar->GetSize().y; } #endif // wxUSE_MENUS + +#if wxUSE_STATUSBAR + if ( m_frameStatusBar && height ) + { + (*height) -= m_frameStatusBar->GetSize().y; + } +#endif // wxUSE_STATUSBAR } void wxFrame::DoSetClientSize(int width, int height) @@ -122,6 +178,14 @@ void wxFrame::DoSetClientSize(int width, int height) height += m_frameMenuBar->GetSize().y; } #endif // wxUSE_MENUS + +#if wxUSE_STATUSBAR + if ( m_frameStatusBar ) + { + height += m_frameStatusBar->GetSize().y; + } +#endif // wxUSE_STATUSBAR + wxFrameBase::DoSetClientSize(width, height); }