Changeset 9187

Timestamp:

01/24/13 12:55:52 (11 years ago)

Author:

ascheibe

Message:

#2005 merged changes from trunk into branch

Location:

branches/UnloadJobs

Files:

• . (modified) (1 prop)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewContextMenuStrip.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.Designer.cs (modified) (1 diff)

branches/UnloadJobs/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewContextMenuStrip.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Windows.Forms;
@@ -33 +34 @@
     }
 
-    public ViewContextMenuStrip(object item)
-      : this() {
-      this.Item = item;
+    public ViewContextMenuStrip(IContainer container)
+      : base(container) {
+        InitializeComponent();
+      this.menuItems = new Dictionary<Type, ToolStripMenuItem>();
+      this.ignoredViewTypes = new List<Type>();
     }
 

branches/UnloadJobs/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.Designer.cs

@@ -48 +48 @@
       this.messageLabel = new System.Windows.Forms.Label();
       this.viewsLabel = new System.Windows.Forms.Label();
-      this.viewContextMenuStrip = new HeuristicLab.MainForm.WindowsForms.ViewContextMenuStrip();
+      this.viewContextMenuStrip = new HeuristicLab.MainForm.WindowsForms.ViewContextMenuStrip(this.components);
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       this.configurationLabel = new System.Windows.Forms.Label();