Changeset 9363 for branches/OaaS/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewContextMenuStrip.cs

Timestamp:

04/16/13 13:13:41 (12 years ago)

Author:

spimming

Message:

#1888:

• Merged revisions from trunk

Location:

branches/OaaS

Files:

• . (modified) (2 props)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewContextMenuStrip.cs (modified) (3 diffs)

branches/OaaS

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

branches/OaaS/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>();
     }
 
@@ -63 +66 @@
       if (InvokeRequired) Invoke((Action)RefreshMenuItems);
       else {
+        foreach (ToolStripMenuItem m in menuItems.Values)
+          m.Dispose();
         this.Items.Clear();
         this.menuItems.Clear();

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages