Changeset 2266 for trunk/sources/HeuristicLab.MainForm/3.2

Timestamp:

08/09/09 15:55:56 (15 years ago)

Author:

mkommend

Message:

added ability to cancel form close;
removed mistakenly commited csproj.user file (ticket #716)

Location:

trunk/sources/HeuristicLab.MainForm/3.2

Files:

• DockingMainForm.cs (modified) (2 diffs)
• Interfaces/IView.cs (modified) (2 diffs)
• MultipleDocumentMainForm.cs (modified) (3 diffs)
• ViewBase.cs (modified) (1 diff)

trunk/sources/HeuristicLab.MainForm/3.2/DockingMainForm.cs

@@ -48 +48 @@
       else {
         base.ShowView(view);
-        DockContent content = new DockForm(view);
-        content.Activated += new EventHandler(DockFormActivated);
-        content.FormClosing += new FormClosingEventHandler(DockFormClosing);
+        DockContent dockForm = new DockForm(view);
+        dockForm.Activated += new EventHandler(DockFormActivated);
+        dockForm.FormClosing += new FormClosingEventHandler(view.FormClosing);
+        dockForm.FormClosed += new FormClosedEventHandler(DockFormClosed);
         foreach (IToolStripItem item in ViewChangedToolStripItems)
           view.StateChanged += new EventHandler(item.ViewChanged);
-        content.Show(dockPanel);
+        dockForm.Show(dockPanel);
       }
     }
 
-    private void DockFormClosing(object sender, FormClosingEventArgs e) {
+    private void DockFormClosed(object sender, FormClosedEventArgs e) {
       DockForm dockForm = (DockForm)sender;
       views.Remove(dockForm.View);
@@ -63 +64 @@
         ActiveView = null;
       dockForm.Activated -= new EventHandler(DockFormActivated);
-      dockForm.FormClosing -= new FormClosingEventHandler(DockFormClosing);
+      dockForm.FormClosing -= new FormClosingEventHandler(dockForm.View.FormClosing);
+      dockForm.FormClosed -= new FormClosedEventHandler(DockFormClosed);
       foreach (IToolStripItem item in ViewChangedToolStripItems)
         dockForm.View.StateChanged -= new EventHandler(item.ViewChanged);

trunk/sources/HeuristicLab.MainForm/3.2/Interfaces/IView.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Text;
+using System.Windows.Forms;
 
 namespace HeuristicLab.MainForm {
@@ -30 +31 @@
     event EventHandler StateChanged;
     IMainForm MainForm { get; set; }
+    void FormClosing(object sender, FormClosingEventArgs e);
   }
 }

trunk/sources/HeuristicLab.MainForm/3.2/MultipleDocumentMainForm.cs

@@ -22 +22 @@
         MultipleDocumentForm form = new MultipleDocumentForm(view);
         form.Activated += new EventHandler(MultipleDocumentFormActivated);
-        form.FormClosing += new FormClosingEventHandler(MultipleDocumentFormClosing);
+        form.FormClosing += new FormClosingEventHandler(view.FormClosing);
+        form.FormClosed += new FormClosedEventHandler(MultipleDocumentFormClosed);
         form.MdiParent = this;
         foreach (IToolStripItem item in ViewChangedToolStripItems)
@@ -35 +36 @@
     }
 
-    private void MultipleDocumentFormClosing(object sender, FormClosingEventArgs e) {
+    private void MultipleDocumentFormClosed(object sender, FormClosedEventArgs e) {
       MultipleDocumentForm form = (MultipleDocumentForm)sender;
       views.Remove(form.View);
@@ -41 +42 @@
         ActiveView = null;
       form.Activated -= new EventHandler(MultipleDocumentFormActivated);
-      form.FormClosing -= new FormClosingEventHandler(MultipleDocumentFormClosing);
+      form.FormClosing -= new FormClosingEventHandler(form.View.FormClosing);
+      form.FormClosed -= new FormClosedEventHandler(MultipleDocumentFormClosed);
       foreach (IToolStripItem item in ViewChangedToolStripItems)
         form.View.StateChanged -= new EventHandler(item.ViewChanged);

trunk/sources/HeuristicLab.MainForm/3.2/ViewBase.cs

@@ -68 +68 @@
       set { this.mainForm = value; }
     }
+
+    public virtual void FormClosing(object sender, FormClosingEventArgs e) {
+    }
   }
 }