* Timer.cs, Control.cs, Menu.cs: make control_tag private.

[mono.git] / mcs / class / Managed.Windows.Forms / System.Windows.Forms / Timer.cs

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Timer.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Timer.cs
index 5e0bc8e90512946fb327877530ce24149ceb5422..3b26332245c1dcdfcb90aa7f750fdd6976663c12 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Timer.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Timer.cs
@@ -34,11 +34,13 @@ namespace System.Windows.Forms {
        public class Timer : Component {
 
                private bool enabled;
-               private IContainer container;
                private int interval = 100;
                private DateTime expires;
                internal Thread thread;
 
+#if NET_2_0
+               object control_tag;
+#endif
                internal static readonly int Minimum = 15;
 
                public Timer ()
@@ -94,6 +96,23 @@ namespace System.Windows.Forms {
                                }
                        }
                }
+               
+#if NET_2_0
+               [Localizable(false)]
+               [Bindable(true)]
+               [TypeConverter(typeof(StringConverter))]
+               [DefaultValue(null)]
+               [MWFCategory("Data")]
+               public object Tag {
+                       get {
+                               return control_tag;
+                       }
+
+                       set {
+                               control_tag = value;
+                       }
+               }
+#endif
 
                public void Start ()
                {
@@ -141,9 +160,6 @@ namespace System.Windows.Forms {
                        Enabled = false;
                }
 
-               private bool has_last_fire = false;
-               private DateTime last_fire;
-
                internal void TickHandler (object sender, EventArgs e)
                {
                        OnTick (e);