remove wxSOCKET_MAX_EVENT, it is not really necessary and results in gcc warnings...

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

diff --git a/src/common/docmdi.cpp b/src/common/docmdi.cpp
index 114a3f4df70d2274c4cb3d5d194b8986cf655d69..72930bbaaf3b29c5bb62a3894a11e4b4457a693b 100644 (file)
--- a/src/common/docmdi.cpp
+++ b/src/common/docmdi.cpp
@@ -6,29 +6,17 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "docmdi.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WX_PRECOMP
-#include "wx/defs.h"
-#endif
-
-#if USE_DOC_VIEW_ARCHITECTURE
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
+#if wxUSE_MDI_ARCHITECTURE

 
 #include "wx/docmdi.h"
 
 
 #include "wx/docmdi.h"
 


@@ -40,14 +28,27 @@ IMPLEMENT_CLASS(wxDocMDIParentFrame, wxMDIParentFrame)
 
 BEGIN_EVENT_TABLE(wxDocMDIParentFrame, wxMDIParentFrame)
     EVT_MENU(wxID_EXIT, wxDocMDIParentFrame::OnExit)
 
 BEGIN_EVENT_TABLE(wxDocMDIParentFrame, wxMDIParentFrame)
     EVT_MENU(wxID_EXIT, wxDocMDIParentFrame::OnExit)

-    EVT_MENU_RANGE(wxID_FILE1, wxID_FILE2, wxDocMDIParentFrame::OnMRUFile)
+    EVT_MENU_RANGE(wxID_FILE1, wxID_FILE9, wxDocMDIParentFrame::OnMRUFile)
+    EVT_CLOSE(wxDocMDIParentFrame::OnCloseWindow)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

+wxDocMDIParentFrame::wxDocMDIParentFrame()
+{
+    Init();
+}
+

 wxDocMDIParentFrame::wxDocMDIParentFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title,
 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))
 }
 
 void wxDocMDIParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))


@@ -55,28 +56,31 @@ void wxDocMDIParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
     Close();
 }
 
     Close();
 }
 

+void wxDocMDIParentFrame::Init()
+{
+    m_docManager = NULL;
+}
+

 void wxDocMDIParentFrame::OnMRUFile(wxCommandEvent& event)
 {
 void wxDocMDIParentFrame::OnMRUFile(wxCommandEvent& event)
 {

-      wxString f(m_docManager->GetHistoryFile(event.GetSelection() - wxID_FILE1));
-      if (f != "")
+    wxString f(m_docManager->GetHistoryFile(event.GetId() - wxID_FILE1));
+    if (!f.empty())

         (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);

 }
 
 }
 

-// Define the behaviour for the frame closing
-// - must delete all frames except for the main one.
-bool wxDocMDIParentFrame::OnClose(void)
+void wxDocMDIParentFrame::OnCloseWindow(wxCloseEvent& event)

 {
 {

-  return m_docManager->Clear(FALSE);
+  if (m_docManager->Clear(!event.CanVeto()))
+  {
+    this->Destroy();
+  }
+  else
+    event.Veto();

 }
 
 
 }
 
 


@@ -88,68 +92,86 @@ IMPLEMENT_CLASS(wxDocMDIChildFrame, wxMDIChildFrame)
 
 BEGIN_EVENT_TABLE(wxDocMDIChildFrame, wxMDIChildFrame)
     EVT_ACTIVATE(wxDocMDIChildFrame::OnActivate)
 
 BEGIN_EVENT_TABLE(wxDocMDIChildFrame, wxMDIChildFrame)
     EVT_ACTIVATE(wxDocMDIChildFrame::OnActivate)

+    EVT_CLOSE(wxDocMDIChildFrame::OnCloseWindow)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-wxDocMDIChildFrame::wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID  id,
-  const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name):
-    wxMDIChildFrame(frame, id, title, pos, size, style, name)
+void wxDocMDIChildFrame::Init()

 {
 {

-  m_childDocument = doc;
-  m_childView = view;
-  if (view)
-    view->SetFrame(this);
+    m_childDocument = (wxDocument*)  NULL;
+    m_childView = (wxView*) NULL;

 }
 
 }
 

-wxDocMDIChildFrame::~wxDocMDIChildFrame(void)
+wxDocMDIChildFrame::wxDocMDIChildFrame()

 {
 {

+    Init();

 }
 
 }
 

-// Extend event processing to search the view's event table
-bool wxDocMDIChildFrame::ProcessEvent(wxEvent& event)
+wxDocMDIChildFrame::wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID  id,
+  const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name)

 {
 {

-    if (m_childView)
-        m_childView->Activate(TRUE);
+    Init();
+    Create(doc, view, frame, id, title, pos, size, style, name);
+}

 
 

-       if ( !m_childView || ! m_childView->ProcessEvent(event) )
+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))

     {
     {

-        // Only hand up to the parent if it's a menu command
-        if (!event.IsKindOf(CLASSINFO(wxCommandEvent)) || !GetParent() || !GetParent()->ProcessEvent(event))
-                   return wxEvtHandler::ProcessEvent(event);
-        else
-            return TRUE;
+        if (view)
+            view->SetFrame(this);
+        return true;

     }
     }

-       else
-               return TRUE;
+
+    return false;
+}
+
+wxDocMDIChildFrame::~wxDocMDIChildFrame(void)
+{
+    m_childView = (wxView *) NULL;
+}
+
+bool wxDocMDIChildFrame::TryValidator(wxEvent& event)
+{
+    return m_childView && m_childView->ProcessEventHere(event);

 }
 
 void wxDocMDIChildFrame::OnActivate(wxActivateEvent& event)
 {
   wxMDIChildFrame::OnActivate(event);
 
 }
 
 void wxDocMDIChildFrame::OnActivate(wxActivateEvent& event)
 {
   wxMDIChildFrame::OnActivate(event);
 

-  if (m_childView)
+  if (event.GetActive() && m_childView)

     m_childView->Activate(event.GetActive());
 }
 
     m_childView->Activate(event.GetActive());
 }
 

-bool wxDocMDIChildFrame::OnClose(void)
+void wxDocMDIChildFrame::OnCloseWindow(wxCloseEvent& event)

 {
   // Close view but don't delete the frame while doing so!
 {
   // 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)
   {
   if (m_childView)
   {

-    bool 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)
     {
     if (ans)
     {

-      m_childView->Activate(FALSE);
+      m_childView->Activate(false);

       delete m_childView;
       delete m_childView;

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

     }
     }

-    
-    return ans;
+    else
+        event.Veto();

   }
   }

-  else return TRUE;
+  else
+    event.Veto();

 }
 
 #endif
 }
 
 #endif

-    // USE_DOC_VIEW_ARCHITECTURE
+    // wxUSE_DOC_VIEW_ARCHITECTURE