Changeset 2309

Timestamp:

08/25/09 13:25:40 (15 years ago)

Author:

mkommend

Message:

added invoke required checks in close view methods (ticket #716)

Location:

trunk/sources/HeuristicLab.MainForm/3.2

Files:

• DockingMainForm.cs (modified) (1 diff)
• MainFormBase.cs (modified) (1 diff)
• MultipleDocumentMainForm.cs (modified) (1 diff)
• SingleDocumentMainForm.cs (modified) (1 diff)

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

@@ -63 +63 @@
 
     public override void CloseView(IView view) {
-      DockForm dockform = FindForm(view);
-      if (dockform != null)
-        dockform.Close();
+      if (InvokeRequired) Invoke((Action<IView>)CloseView, view);
+      else {
+        DockForm dockform = FindForm(view);
+        if (dockform != null)
+          dockform.Close();
+      }
     }
 

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

@@ -82 +82 @@
       protected set {
         if (this.activeView != value) {
-          this.activeView = value;
-          OnActiveViewChanged();
+          if (InvokeRequired) {
+            Action<IView> action = delegate(IView activeView) { this.ActiveView = activeView; };
+            Invoke(action, new object[] { value });
+          } else {
+            this.activeView = value;
+            OnActiveViewChanged();
+          }
         }
       }

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

@@ -70 +70 @@
 
     public override void CloseView(IView view) {
-      DocumentForm documentForm = FindForm(view);
-      if (documentForm != null)
-        documentForm.Close();
+      if (InvokeRequired) Invoke((Action<IView>)CloseView, view);
+      else {
+        DocumentForm documentForm = FindForm(view);
+        if (documentForm != null)
+          documentForm.Close();
+      }
     }
 

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

@@ -64 +64 @@
 
     public override void CloseView(IView view) {
-      DocumentForm documentForm = FindForm(view);
-      if (documentForm != null)
-        documentForm.Close();
+      if (InvokeRequired) Invoke((Action<IView>)CloseView, view);
+      else {
+        DocumentForm documentForm = FindForm(view);
+        if (documentForm != null)
+          documentForm.Close();
+      }
     }