stricter reply code checking: verify that we get the expected reply, not just that...

[wxWidgets.git] / src / common / docmdi.cpp

diff --git a/src/common/docmdi.cpp b/src/common/docmdi.cpp
index 5efadc5ce70b2e07d78d649fae71670362ac06f3..72930bbaaf3b29c5bb62a3894a11e4b4457a693b 100644 (file)
--- a/src/common/docmdi.cpp
+++ b/src/common/docmdi.cpp
@@ -9,10 +9,6 @@
 // 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,19 +63,14 @@ 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);
 }
 
-// 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)
@@ -131,42 +122,20 @@ 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
-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)
@@ -180,16 +149,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 wxWindows 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;