Changeset 2532

Timestamp:

11/25/09 10:43:07 (15 years ago)

Author:

mkommend

Message:

added new virtual method for form closing (ticket #771)

Location:

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2

Files:

• MainFormBase.cs (modified) (2 diffs)
• ViewBase.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/MainFormBase.cs

@@ -143 +143 @@
           form.GotFocus += new EventHandler(FormActivated);
           form.FormClosing += new FormClosingEventHandler(view.OnClosing);
+          form.FormClosing += new FormClosingEventHandler(((ViewBase)view).OnClosing);
           form.FormClosed += new FormClosedEventHandler(view.OnClosed);
           form.FormClosed += new FormClosedEventHandler(ChildFormClosed);
           foreach (IUserInterfaceItem item in UserInterfaceItems)
-            view.Changed += new EventHandler(item.ViewChanged);
+            view.Changed += new EventHandler(item.ViewChanged);          
           return true;
         } else
@@ -183 +184 @@
       form.GotFocus -= new EventHandler(FormActivated);
       form.FormClosing -= new FormClosingEventHandler(view.OnClosing);
+      form.FormClosing -= new FormClosingEventHandler(((ViewBase)view).OnClosing);
       form.FormClosed -= new FormClosedEventHandler(view.OnClosed);
       form.FormClosed -= new FormClosedEventHandler(ChildFormClosed);

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

@@ -51 +51 @@
     protected virtual void OnCaptionChanged() {
       if (CaptionChanged != null)
-        CaptionChanged(this, new EventArgs());      
+        CaptionChanged(this, new EventArgs());
     }
 
@@ -57 +57 @@
     protected virtual void OnChanged() {
       if (Changed != null)
-        Changed(this, new EventArgs());    
+        Changed(this, new EventArgs());
     }
 
-    public virtual void OnClosing(object sender, CancelEventArgs e) {
+    public virtual void OnClosing(object sender, CancelEventArgs e) {     
+    }
+
+    public virtual void OnClosing(object sender, FormClosingEventArgs e) {
     }