X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75799719334c85392638ce5c7d0e90a8b74b7e5a..b53aea81d2e102224b452ef5bf7aee1132f37c6f:/src/common/docmdi.cpp?ds=sidebyside diff --git a/src/common/docmdi.cpp b/src/common/docmdi.cpp index 4a9857983f..cca56168cb 100644 --- a/src/common/docmdi.cpp +++ b/src/common/docmdi.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "docmdi.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -36,11 +32,23 @@ BEGIN_EVENT_TABLE(wxDocMDIParentFrame, wxMDIParentFrame) EVT_CLOSE(wxDocMDIParentFrame::OnCloseWindow) END_EVENT_TABLE() +wxDocMDIParentFrame::wxDocMDIParentFrame() +{ + Init(); +} + wxDocMDIParentFrame::wxDocMDIParentFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, - const wxPoint& pos, const wxSize& size, long style, const wxString& name): - wxMDIParentFrame(frame, id, title, pos, size, style, name) + const wxPoint& pos, const wxSize& size, long style, const wxString& name) { - m_docManager = manager; + Init(); + Create(manager, frame, id, title, pos, size, style, name); +} + +bool wxDocMDIParentFrame::Create(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, + const wxPoint& pos, const wxSize& size, long style, const wxString& name) +{ + m_docManager = manager; + return wxMDIParentFrame::Create(frame, id, title, pos, size, style, name); } void wxDocMDIParentFrame::OnExit(wxCommandEvent& WXUNUSED(event)) @@ -48,21 +56,21 @@ void wxDocMDIParentFrame::OnExit(wxCommandEvent& WXUNUSED(event)) Close(); } +void wxDocMDIParentFrame::Init() +{ + m_docManager = NULL; +} + void wxDocMDIParentFrame::OnMRUFile(wxCommandEvent& event) { - wxString f(m_docManager->GetHistoryFile(event.GetId() - wxID_FILE1)); - if (f != wxT("")) + wxString f(m_docManager->GetHistoryFile(event.GetId() - wxID_FILE1)); + if (!f.empty()) (void)m_docManager->CreateDocument(f, wxDOC_SILENT); } -// Extend event processing to search the view's event table -bool wxDocMDIParentFrame::ProcessEvent(wxEvent& event) +bool wxDocMDIParentFrame::TryValidator(wxEvent& event) { - // Try the document manager, then do default processing - if (!m_docManager || !m_docManager->ProcessEvent(event)) - return wxEvtHandler::ProcessEvent(event); - else - return TRUE; + return m_docManager && m_docManager->ProcessEventHere(event); } void wxDocMDIParentFrame::OnCloseWindow(wxCloseEvent& event) @@ -89,8 +97,8 @@ END_EVENT_TABLE() void wxDocMDIChildFrame::Init() { - m_childDocument = (wxDocument*) NULL; - m_childView = (wxView*) NULL; + m_childDocument = NULL; + m_childView = NULL; } wxDocMDIChildFrame::wxDocMDIChildFrame() @@ -108,47 +116,26 @@ wxDocMDIChildFrame::wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParen bool wxDocMDIChildFrame::Create(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name) { - m_childDocument = doc; - m_childView = view; - if (wxMDIChildFrame::Create(frame, id, title, pos, size, style, name)) { - if (view) - view->SetFrame(this); - return TRUE; + m_childDocument = doc; + m_childView = view; + if (wxMDIChildFrame::Create(frame, id, title, pos, size, style, name)) + { + if (view) + view->SetFrame(this); + return true; } - return FALSE; + return false; } wxDocMDIChildFrame::~wxDocMDIChildFrame(void) { - m_childView = (wxView *) NULL; + m_childView = NULL; } -// Extend event processing to search the view's event table -bool wxDocMDIChildFrame::ProcessEvent(wxEvent& event) +bool wxDocMDIChildFrame::TryValidator(wxEvent& event) { - static wxEvent *ActiveEvent = NULL; - - // Break recursion loops - if (ActiveEvent == &event) - return FALSE; - - ActiveEvent = &event; - - bool ret; - if ( !m_childView || ! m_childView->ProcessEvent(event) ) - { - // Only hand up to the parent if it's a menu command - if (!event.IsKindOf(CLASSINFO(wxCommandEvent)) || !GetParent() || !GetParent()->ProcessEvent(event)) - ret = wxEvtHandler::ProcessEvent(event); - else - ret = TRUE; - } - else - ret = TRUE; - - ActiveEvent = NULL; - return ret; + return m_childView && m_childView->ProcessEventHere(event); } void wxDocMDIChildFrame::OnActivate(wxActivateEvent& event) @@ -162,21 +149,19 @@ void wxDocMDIChildFrame::OnActivate(wxActivateEvent& event) void wxDocMDIChildFrame::OnCloseWindow(wxCloseEvent& event) { // Close view but don't delete the frame while doing so! - // ...since it will be deleted by wxWindows if we return TRUE. + // ...since it will be deleted by wxWidgets if we return true. if (m_childView) { - bool ans = FALSE; - if (!event.CanVeto()) - ans = TRUE; // Must delete. - else - ans = m_childView->Close(FALSE); // FALSE means don't delete associated window + bool ans = event.CanVeto() + ? m_childView->Close(false) // false means don't delete associated window + : true; // Must delete. if (ans) { - m_childView->Activate(FALSE); + m_childView->Activate(false); delete m_childView; - m_childView = (wxView *) NULL; - m_childDocument = (wxDocument *) NULL; + m_childView = NULL; + m_childDocument = NULL; this->Destroy(); }