2007-04-27 Everaldo Canuto <everaldo@simios.org>

	* MenuAPI.cs: Remove unneeded "keynav_state = KeyNavState.Idle" before
	Deactivate calls, Deactivate method already do it. Also ser ActiveTracker
	when <alt> key is pressed.

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 479008ccbe9ffbea033ef5d57b258ac24814dae9..6a121261eff0dffac85ad6028f4ebba7e4c58ab4 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-04-27  Everaldo Canuto  <everaldo@simios.org>
+
+       * MenuAPI.cs: Remove unneeded "keynav_state = KeyNavState.Idle" before 
+       Deactivate calls, Deactivate method already do it. Also ser ActiveTracker
+       when <alt> key is pressed.
+
 2007-04-26  Everaldo Canuto  <everaldo@simios.org>
 
        * XplatUIX11.cs: Simplify SystrayRemove to be like other libraries,     Gtk as 

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 684ce79299d8dda2308756c2c5c7a4d29f017be5..ac53a2d5aa519b1feb033ddded9660dd257280a3 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs
@@ -528,13 +528,13 @@ namespace System.Windows.Forms {
                                case KeyNavState.Idle:
                                        keynav_state = KeyNavState.Startup;
                                        hotkey_active = true;
+                                       grab_control.ActiveTracker = this;
                                        CurrentMenu = TopMenu;
                                        main_menu.Draw ();
                                        break;
                                case KeyNavState.Startup:
                                        break;
                                default:
-                                       keynav_state = KeyNavState.Idle;
                                        Deactivate ();
                                        main_menu.Draw ();
                                        break;
@@ -551,7 +551,6 @@ namespace System.Windows.Forms {
                                        SelectItem (TopMenu, TopMenu.MenuItems [0], false);
                                        break;
                                default:
-                                       keynav_state = KeyNavState.Idle;
                                        Deactivate ();
                                        main_menu.Draw ();
                                        break;