Changeset 2707 for trunk/sources

Timestamp:

01/28/10 20:39:00 (15 years ago)

Author:

mkommend

Message:

changed responsibility for calling OnToolStripItemSet from the MainForm to the ActionUserInterfaceItem (ticket #857)

Location:

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2

Files:

• ActionUserInterfaceItem.cs (modified) (2 diffs)
• MainForm.cs (modified) (1 diff)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/ActionUserInterfaceItem.cs

@@ -29 +29 @@
   public abstract class ActionUserInterfaceItem : HeuristicLab.MainForm.ActionUserInterfaceItem {
     private ToolStripItem toolStripItem;
-    public virtual ToolStripItem ToolStripItem {
+    public ToolStripItem ToolStripItem {
       get { return this.toolStripItem; }
-      internal set { this.toolStripItem = value; }
+      internal set {
+        if (this.toolStripItem != value) {
+          this.toolStripItem = value;
+          if (this.toolStripItem == null)
+            this.OnToolStripItemSet(new EventArgs());
+        }
+      }
     }
 
@@ -38 +44 @@
     }
 
-    protected internal virtual void OnToolStripItemSet(EventArgs e) {
+    protected virtual void OnToolStripItemSet(EventArgs e) {
     }
   }

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

@@ -347 +347 @@
       toolStripItem.Image = userInterfaceItem.Image;
       toolStripItem.Click += new EventHandler(ToolStripItemClicked);
-      if (userInterfaceItem is ActionUserInterfaceItem)
-        ((ActionUserInterfaceItem)userInterfaceItem).OnToolStripItemSet(new EventArgs());
       this.userInterfaceItems.Add(userInterfaceItem);
     }