X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/71908213057690d5452f72b2b9c8e62b53357170..2fe212b0336512aac9eace69fab09ce856b0bf4b:/src/univ/framuniv.cpp diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp index 17e59adcaf..6c38c6201c 100644 --- a/src/univ/framuniv.cpp +++ b/src/univ/framuniv.cpp @@ -18,7 +18,7 @@ // --------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "framuniv.h" + #pragma implementation "univframe.h" #endif // For compilers that support precompilation, includes "wx.h". @@ -31,41 +31,34 @@ #include "wx/menu.h" #ifndef WX_PRECOMP #include "wx/frame.h" + #include "wx/statusbr.h" #endif // WX_PRECOMP // ============================================================================ // implementation // ============================================================================ -BEGIN_EVENT_TABLE(wxFrame, wxFrameNative) +BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) EVT_SIZE(wxFrame::OnSize) END_EVENT_TABLE() -#if defined(__WXMSW__) - IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameMSW) -#elif defined(__WXGTK__) - IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameGTK) -#endif +IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) // ---------------------------------------------------------------------------- // ctors // ---------------------------------------------------------------------------- -wxFrame::wxFrame() +bool wxFrame::Create(wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) { + return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name); } -wxFrame::wxFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) - : wxFrameNative(parent, id, title, pos, size, style, name) -{ - m_renderer = NULL; -} // ---------------------------------------------------------------------------- // menu support @@ -75,11 +68,21 @@ void wxFrame::OnSize(wxSizeEvent& event) { #if wxUSE_MENUS PositionMenuBar(); -#endif // wxUSE_WAVE +#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() @@ -88,18 +91,57 @@ void wxFrame::PositionMenuBar() { // the menubar is positioned above the client size, hence the negative // y coord - m_frameMenuBar->SetSize(0, -m_frameMenuBar->GetSize().y, - GetClientSize().x, -1); + wxCoord heightMbar = m_frameMenuBar->GetSize().y; + 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 = wxFrameNative::GetClientAreaOrigin(); + wxPoint pt = wxFrameBase::GetClientAreaOrigin(); -#if wxUSE_MENUS +#if wxUSE_MENUS && !defined(__WXPM__) if ( m_frameMenuBar ) { pt.y += m_frameMenuBar->GetSize().y; @@ -109,3 +151,51 @@ wxPoint wxFrame::GetClientAreaOrigin() const return pt; } +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) +{ +#if wxUSE_MENUS + if ( m_frameMenuBar ) + { + 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); +} + +bool wxFrame::Enable(bool enable) +{ + if (!wxFrameBase::Enable(enable)) + return FALSE; +#ifdef __WXMICROWIN__ + if (m_frameMenuBar) + m_frameMenuBar->Enable(enable); +#endif + return TRUE; +}