2007-11-01 Jonathan Pobst <monkey@jpobst.com>

	* ToolStrip.cs: Don't process MouseUp for a ToolStripControlHost, clicking
	on the non-hosted-control part of it shouldn't do anything.
	Fixes part of bug #327498.

svn path=/trunk/mcs/; revision=88682

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 9c83a58009c2526baba901e9bcc1704234f74611..110b8dd2afe4b25bb86651e34b74d60321b4669e 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-01  Jonathan Pobst  <monkey@jpobst.com>
+
+       * ToolStrip.cs: Don't process MouseUp for a ToolStripControlHost, clicking
+       on the non-hosted-control part of it shouldn't do anything.
+       Fixes part of bug #327498.
+
 2007-11-01  Andreia Gaita <avidigal@novell.com>
 
        * WebBrowserBase.cs: revert previous change, resize can be called anytime

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
index aa49faefc0b71779357fc1c072737b6c58bb7a6f..5a8cb504a4b5427b45fdefa144a99ff706749fa5 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
@@ -943,7 +943,7 @@ namespace System.Windows.Forms
                protected override void OnMouseUp (MouseEventArgs mea)
                {
                        // If we're currently over an item (set in MouseMove)
-                       if (mouse_currently_over != null) {
+                       if (mouse_currently_over != null && !(mouse_currently_over is ToolStripControlHost)) {
                                // Fire our ItemClicked event
                                OnItemClicked (new ToolStripItemClickedEventArgs (mouse_currently_over));