Changeset 3924 for trunk

Timestamp:

06/16/10 11:17:24 (14 years ago)

Author:

mkommend

Message:

added dispose call before removing views from the view collection (ticket #972)

File:

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

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

@@ -100 +100 @@
         if (viewContextMenuStrip.Items.Count == 0) {
           messageLabel.Visible = true;
-          viewsLabel.Enabled = false;
+          viewsLabel.Visible = false;
           viewPanel.Visible = false;
         } else {
           messageLabel.Visible = false;
-          viewsLabel.Enabled = true;
+          viewsLabel.Visible = true;
           viewPanel.Visible = true;
         }
@@ -117 +117 @@
         } else {
           foreach (Type type in cachedViews.Keys.ToList()) {
-            if (!ViewCanShowContent(type, Content))
+            if (!ViewCanShowContent(type, Content)) {
+              Control c = cachedViews[type] as Control;
+              if (c != null)
+                c.Dispose();
               cachedViews.Remove(type);
+            }
           }
         }
@@ -126 +130 @@
       } else {
         messageLabel.Visible = false;
-        viewsLabel.Enabled = false;
+        viewsLabel.Visible = false;
         viewPanel.Visible = false;
       }
@@ -163 +167 @@
       viewPanel.Controls.Add(control);
       viewPanel.Visible = true;
-      viewPanel.Refresh();
     }