[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mono-patches
Subject:    [Mono-patches] r120294 -
From:       "Carlos Alberto Cortes (calberto.cortez () gmail ! com)"
Date:       2008-11-30 2:48:57
Message-ID: 20081130024857.6CD859472C () mono-cvs ! ximian ! com
[Download RAW message or body]

Author: calberto
Date: 2008-11-29 21:48:56 -0500 (Sat, 29 Nov 2008)
New Revision: 120294

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs
Log:
2008-11-29  Carlos Alberto Cortez <calberto.cortez@gmail.com>

	* MenuAPI.cs: Add a Menu.SelectedItem null check when navigating the
	menus using the arrow keys. Also when handling the left arrow key, don't 
	assign the current menu to the parent one, if the parent is null.
	Fixes #446392.



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog	2008-11-30 \
                01:07:38 UTC (rev 120293)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog	2008-11-30 \
02:48:56 UTC (rev 120294) @@ -1,3 +1,10 @@
+2008-11-29  Carlos Alberto Cortez <calberto.cortez@gmail.com>
+
+	* MenuAPI.cs: Add a Menu.SelectedItem null check when navigating the
+	menus using the arrow keys. Also when handling the left arrow key, don't 
+	assign the current menu to the parent one, if the parent is null.
+	Fixes #446392.
+
 2008-11-24  Everaldo Canuto  <ecanuto@novell.com>
 
 	* PrintPreviewDialog.cs: Fix toolbar size, height must be 26. Fixes bug

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs	2008-11-30 \
                01:07:38 UTC (rev 120293)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs	2008-11-30 \
02:48:56 UTC (rev 120294) @@ -740,7 +740,7 @@
 						SelectItem (item, item.MenuItems [0], false);
 						CurrentMenu = item;
 					}
-				} else if (CurrentMenu.SelectedItem.IsPopup) {
+				} else if (CurrentMenu.SelectedItem != null && CurrentMenu.SelectedItem.IsPopup) \
{  item = CurrentMenu.SelectedItem;
 					ShowSubPopup (CurrentMenu, item);
 					SelectItem (item, item.MenuItems [0], false);
@@ -782,7 +782,8 @@
 					}
 				} else {
 					HideSubPopups (CurrentMenu, TopMenu);
-					CurrentMenu = CurrentMenu.parent_menu;
+					if (CurrentMenu.parent_menu != null)
+						CurrentMenu = CurrentMenu.parent_menu;
 				}
 				break;
 

_______________________________________________
Mono-patches maillist  -  Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches


[prev in list] [next in list] [prev in thread] [next in thread]