Reorganize wxCollapsiblePane event and layout code under GTK+

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

diff --git a/src/common/docmdi.cpp b/src/common/docmdi.cpp
index 77b81cabbcb27639c20ead1614eec466aff65cf9..cca56168cb6bf391d23fe17b5a09dbf18f0a4e00 100644 (file)
--- a/src/common/docmdi.cpp
+++ b/src/common/docmdi.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -72,14 +68,9 @@ void wxDocMDIParentFrame::OnMRUFile(wxCommandEvent& event)
         (void)m_docManager->CreateDocument(f, wxDOC_SILENT);
 }
 
         (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)
 }
 
 void wxDocMDIParentFrame::OnCloseWindow(wxCloseEvent& event)


@@ -106,8 +97,8 @@ END_EVENT_TABLE()
 
 void wxDocMDIChildFrame::Init()
 {
 
 void wxDocMDIChildFrame::Init()
 {

-    m_childDocument = (wxDocument*)  NULL;
-    m_childView = (wxView*) NULL;
+    m_childDocument = NULL;
+    m_childView = NULL;

 }
 
 wxDocMDIChildFrame::wxDocMDIChildFrame()
 }
 
 wxDocMDIChildFrame::wxDocMDIChildFrame()


@@ -139,34 +130,12 @@ bool wxDocMDIChildFrame::Create(wxDocument *doc, wxView *view, wxMDIParentFrame
 
 wxDocMDIChildFrame::~wxDocMDIChildFrame(void)
 {
 
 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)
 }
 
 void wxDocMDIChildFrame::OnActivate(wxActivateEvent& event)


@@ -191,8 +160,8 @@ void wxDocMDIChildFrame::OnCloseWindow(wxCloseEvent& event)
     {
       m_childView->Activate(false);
       delete m_childView;
     {
       m_childView->Activate(false);
       delete m_childView;

-      m_childView = (wxView *) NULL;
-      m_childDocument = (wxDocument *) NULL;
+      m_childView = NULL;
+      m_childDocument = NULL;

 
       this->Destroy();
     }
 
       this->Destroy();
     }