* MenuItem.cs: In MdiWindowClickHandler uses sender instead of

	SelectedItem, it prevent for errors when you must disable item
	before perform click. Fixes #80409.

2007-01-02  Everaldo Canuto  <everaldo@simios.org>

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index ddd84e43248ead448aeba7edb295d312d2b02c01..a246d12913187a73245f0c2c9182d9a968e3a4d4 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-01-02  Everaldo Canuto  <everaldo@simios.org>
+
+       * MenuItem.cs: In MdiWindowClickHandler uses sender instead of
+       SelectedItem, it prevent for errors when you must disable item
+       before perform click. Fixes #80409.
+
 2007-01-02  Everaldo Canuto  <everaldo@simios.org>
 
        * MenuAPI.cs: Prevent second level and beyond submenus to close

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuItem.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuItem.cs
index a3ca963e60be6f6c16cd8b516b2546e847d640e9..00076ec0e1daace42c0646482f10304dfc8bcfd0 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuItem.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuItem.cs
@@ -790,7 +790,7 @@ namespace System.Windows.Forms
 
                private void MdiWindowClickHandler (object sender, EventArgs e)
                {
-                       Form mdichild = (Form) mdilist_items [SelectedItem];
+                       Form mdichild = (Form) mdilist_items [sender];
 
                        // people could add weird items to the Window menu
                        // so we can't assume its just us