Changeset 4234

Timestamp:

08/16/10 23:56:28 (14 years ago)

Author:

mkommend

Message:

Added InvokeRequired check to ShowContent method (ticket #1154).

File:

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

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/MainForm.cs

@@ -113 +113 @@
       if (InvokeRequired)
         Invoke((MethodInvoker)OnActiveViewChanged);
-      else if (ActiveViewChanged != null)
-        ActiveViewChanged(this, EventArgs.Empty);
+      else {
+        EventHandler handler = ActiveViewChanged;
+        if (handler != null)
+          handler(this, EventArgs.Empty);
+      }
     }
 
@@ -226 +229 @@
 
     public IContentView ShowContent(IContent content, Type viewType) {
-      if (content == null)
-        throw new ArgumentNullException("Content cannot be null.");
-      if (viewType == null)
-        throw new ArgumentNullException("ViewType cannot be null.");
-
-      IContentView view;
-      if (this.ShowContentInViewHost) {
-        ViewHost viewHost = new ViewHost();
-        viewHost.ViewType = viewType;
-        view = viewHost;
-      } else
-        view = MainFormManager.CreateView(viewType);
-
-      view.Content = content;
-      view.Show();
-      return view;
+      if (InvokeRequired) return (IContentView)Invoke((Func<IContent, Type, IContentView>)ShowContent, content, viewType);
+      else {
+        if (content == null)
+          throw new ArgumentNullException("Content cannot be null.");
+        if (viewType == null)
+          throw new ArgumentNullException("ViewType cannot be null.");
+
+        IContentView view;
+        if (this.ShowContentInViewHost) {
+          ViewHost viewHost = new ViewHost();
+          viewHost.ViewType = viewType;
+          view = viewHost;
+        } else
+          view = MainFormManager.CreateView(viewType);
+
+        view.Content = content;
+        view.Show();
+        return view;
+      }
     }