2006-12-31 Chris Toshok <toshok@ximian.com>

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownItem.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownItem.cs
index 5725d538ef3ccdb5ce8a90d0974019e737cfbdaf..0df8ac06a3da01f8f2a89f57ec8a07c73ff22965 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownItem.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownItem.cs
@@ -87,7 +87,7 @@ namespace System.Windows.Forms
                }
 
                public override bool Pressed {
-                       get { return base.Pressed && this.HasDropDownItems; }
+                       get { return base.Pressed || this.DropDown.Visible; }
                }
                #endregion
 
@@ -150,7 +150,9 @@ namespace System.Windows.Forms
 
                protected internal virtual void OnDropDownClosed (EventArgs e)
                {
-                       if (DropDownClosed != null) DropDownClosed (this, e);
+                       EventHandler eh = (EventHandler)(Events [DropDownClosedEvent]);
+                       if (eh != null)
+                               eh (this, e);
                }
 
                protected virtual void OnDropDownHide (EventArgs e)
@@ -159,12 +161,16 @@ namespace System.Windows.Forms
 
                protected internal virtual void OnDropDownItemClicked (ToolStripItemClickedEventArgs e)
                {
-                       if (DropDownItemClicked != null) DropDownItemClicked (this, e);
+                       ToolStripItemClickedEventHandler eh = (ToolStripItemClickedEventHandler)(Events [DropDownClosedEvent]);
+                       if (eh != null)
+                               eh (this, e);
                }
 
                protected internal virtual void OnDropDownOpened (EventArgs e)
                {
-                       if (DropDownOpened != null) DropDownOpened (this, e);
+                       EventHandler eh = (EventHandler)(Events [DropDownOpenedEvent]);
+                       if (eh != null)
+                               eh (this, e);
                }
 
                protected virtual void OnDropDownShow (EventArgs e)
@@ -178,10 +184,30 @@ namespace System.Windows.Forms
                #endregion
 
                #region Public Events
-               public event EventHandler DropDownClosed;
-               public event ToolStripItemClickedEventHandler DropDownItemClicked;
-               public event EventHandler DropDownOpened;
-               public event EventHandler DropDownOpening;
+               static object DropDownClosedEvent = new object ();
+               static object DropDownItemClickedEvent = new object ();
+               static object DropDownOpenedEvent = new object ();
+               static object DropDownOpeningEvent = new object ();
+
+               public event EventHandler DropDownClosed {
+                       add { Events.AddHandler (DropDownClosedEvent, value); }
+                       remove { Events.RemoveHandler (DropDownClosedEvent, value); }
+               }
+
+               public event ToolStripItemClickedEventHandler DropDownItemClicked {
+                       add { Events.AddHandler (DropDownItemClickedEvent, value); }
+                       remove { Events.RemoveHandler (DropDownItemClickedEvent, value); }
+               }
+
+               public event EventHandler DropDownOpened {
+                       add { Events.AddHandler (DropDownOpenedEvent, value); }
+                       remove { Events.RemoveHandler (DropDownOpenedEvent, value); }
+               }
+
+               public event EventHandler DropDownOpening {
+                       add { Events.AddHandler (DropDownOpeningEvent, value); }
+                       remove { Events.RemoveHandler (DropDownOpeningEvent, value); }
+               }
                #endregion
 
                #region Internal Methods