* MenuAPI.cs: When deselect items deselect also selected subitems.

2006-12-23  Everaldo Canuto  <everaldo@simios.org>

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index f1e39d93fef8a2ac39bf6335043e6c097e42b3ba..4c50e9a0e08d169543313e30549977c415b8dd84 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,7 @@
+2006-12-23  Everaldo Canuto  <everaldo@simios.org>
+
+       * MenuAPI.cs: When deselect items deselect also selected subitems.
+       
 2006-12-23  Everaldo Canuto  <everaldo@simios.org>
 
        * MenuAPI.cs: When hides menu set Wnd to null, it prevents

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs
index 9d72a4fc9a0db73cd478cc20013dce7daa66c654..3488836025e8aa9770da43e8c747bf375d7dcbad 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs
@@ -252,8 +252,15 @@ namespace System.Windows.Forms {
                        
                        item.Selected = false;
 
-                       if (item.IsPopup)
+                       /* When popup item then close all sub popups and unselect all sub items */
+                       if (item.IsPopup) {
                                HideSubPopups (item);
+                               
+                               /* Unselect all selected sub itens */
+                               foreach (MenuItem subitem in item.MenuItems)
+                                       if (subitem.Selected)
+                                               DeselectItem (subitem);
+                       }
 
                        Menu menu = item.Parent;
                        menu.InvalidateItem (item);