Changeset 3301 for trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/View.cs

Timestamp:

04/11/10 19:32:52 (14 years ago)

Author:

mkommend

Message:

implemented fix for ticket #966

File:

• trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/View.cs (modified) (2 diffs)

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

@@ -119 +119 @@
     }
 
-    private void OnClosingHelper(object sender, FormClosingEventArgs e) {
+    internal void OnClosingHelper(object sender, FormClosingEventArgs e) {
+      FormClosingEventArgs eventArgs = new FormClosingEventArgs(this.closeReason, e.Cancel);
       if (this.closeReason != CloseReason.None)
-        this.OnClosing(new FormClosingEventArgs(this.closeReason, e.Cancel));
+        this.OnClosing(eventArgs);
       else
         this.OnClosing(e);
 
+      if (eventArgs.Cancel != e.Cancel)
+        e.Cancel = eventArgs.Cancel;
       this.closeReason = CloseReason.None;
     }
@@ -131 +134 @@
     }
 
-    private void OnClosedHelper(object sender, FormClosedEventArgs e) {
+    internal void OnClosedHelper(object sender, FormClosedEventArgs e) {
       if (this.closeReason != CloseReason.None)
         this.OnClosed(new FormClosedEventArgs(this.closeReason));