Changeset 2350 for trunk

Timestamp:

09/14/09 14:27:16 (15 years ago)

Author:

mkommend

Message:

corrected usage of new and override keywords for inherited properties from control or form in MainFormBase (ticket #716)

Location:

trunk/sources/HeuristicLab.MainForm/3.2

Files:

• Interfaces/IMainForm.cs (modified) (1 diff)
• MainFormBase.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.MainForm/3.2/Interfaces/IMainForm.cs

@@ -33 +33 @@
     bool StatusStripProgressBarVisible { get; set; }
 
-    Icon Icon { get; set; }
     Cursor Cursor { get; set; }
 

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

@@ -83 +83 @@
     }
 
-    public new Cursor Cursor {
+    public override Cursor Cursor {
       get { return base.Cursor; }
       set {
@@ -91 +91 @@
         } else
           base.Cursor = value;
-      }
-    }
-
-    public new Icon Icon {
-      get { return base.Icon; }
-      set {
-        if (InvokeRequired) {
-          Action<Icon> action = delegate(Icon i) { this.Icon = i; };
-          Invoke(action, new object[] { value });
-        } else
-          base.Icon = value;
       }
     }