Changeset 3918 for trunk

Timestamp:

06/14/10 15:35:38 (14 years ago)

Author:

mkommend

Message:

added bug fixes to avoid CreateWindowHandle exceptions (ticket #972)

Location:

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3

Files:

• MainForm.cs (modified) (1 diff)
• ViewHost.cs (modified) (5 diffs)

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

@@ -239 +239 @@
       if (this.ShowContentInViewHost) {
         ViewHost viewHost = new ViewHost();
+        viewHost.Content = content;
         viewHost.ViewType = viewType;
         view = viewHost;
-      } else
+        view.Show();
+      } else {
         view = MainFormManager.CreateView(viewType);
-
-      if (view != null) {
-        view.Show();
-        view.Content = content;
-      }
+        if (view != null) {
+          view.Content = content;
+          view.Show();
+        }
+      }
+
       return view;
     }

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

@@ -100 +100 @@
         if (viewContextMenuStrip.Items.Count == 0) {
           messageLabel.Visible = true;
-          viewsLabel.Visible = false;
+          viewsLabel.Enabled = false;
           viewPanel.Visible = false;
         } else {
           messageLabel.Visible = false;
-          viewsLabel.Visible = true;
+          viewsLabel.Enabled = true;
           viewPanel.Visible = true;
         }
@@ -126 +126 @@
       } else {
         messageLabel.Visible = false;
-        viewsLabel.Visible = false;
+        viewsLabel.Enabled = false;
         viewPanel.Visible = false;
       }
@@ -132 +132 @@
 
     private void OnViewTypeChanged() {
+      for (int i = viewPanel.Controls.Count - 1; i > 0; i--)
+        viewPanel.Controls[i].Dispose();
       viewPanel.Controls.Clear();
+
       if (viewType == null || Content == null)
         return;
@@ -152 +155 @@
         view.ReadOnly = this.ReadOnly;
         view.Locked = this.Locked;
+        view.Content = Content;
         cachedViews.Add(viewType, view);
       }
@@ -159 +163 @@
       viewPanel.Controls.Add(control);
       viewPanel.Visible = true;
-      view.Content = Content;
+      viewPanel.Refresh();
     }