X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..53e3cd047cb9d01952af76779e89e444915e86c6:/src/common/docmdi.cpp diff --git a/src/common/docmdi.cpp b/src/common/docmdi.cpp index 9d154ffec6..29f89756d0 100644 --- a/src/common/docmdi.cpp +++ b/src/common/docmdi.cpp @@ -6,13 +6,9 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "docmdi.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -67,8 +63,8 @@ void wxDocMDIParentFrame::Init() 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); } @@ -79,7 +75,7 @@ bool wxDocMDIParentFrame::ProcessEvent(wxEvent& event) if (!m_docManager || !m_docManager->ProcessEvent(event)) return wxEvtHandler::ProcessEvent(event); else - return TRUE; + return true; } void wxDocMDIParentFrame::OnCloseWindow(wxCloseEvent& event) @@ -131,15 +127,15 @@ bool wxDocMDIChildFrame::Create(wxDocument *doc, wxView *view, wxMDIParentFrame { if (view) view->SetFrame(this); - return TRUE; + return true; } - return FALSE; + return false; } wxDocMDIChildFrame::~wxDocMDIChildFrame(void) { - m_childView = (wxView *) NULL; + m_childView = (wxView *) NULL; } // Extend event processing to search the view's event table @@ -149,21 +145,21 @@ bool wxDocMDIChildFrame::ProcessEvent(wxEvent& event) // Break recursion loops if (ActiveEvent == &event) - return FALSE; + return false; ActiveEvent = &event; bool ret; - if ( !m_childView || ! m_childView->ProcessEvent(event) ) + 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; + ret = true; } - else - ret = TRUE; + else + ret = true; ActiveEvent = NULL; return ret; @@ -180,16 +176,16 @@ 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 wxWidgets if we return TRUE. + // ...since it will be deleted by wxWidgets if we return true. if (m_childView) { bool ans = event.CanVeto() - ? m_childView->Close(FALSE) // FALSE means don't delete associated window - : TRUE; // Must delete. + ? 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;