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

List:       mono-patches
Subject:    [Mono-patches] r70292 -
From:       "Everaldo Canuto (everaldo () simios ! org)"
Date:       2006-12-31 17:49:13
Message-ID: 20061231174913.E582F9472C () mono-cvs ! ximian ! com
[Download RAW message or body]

Author: everaldo
Date: 2006-12-31 12:49:13 -0500 (Sun, 31 Dec 2006)
New Revision: 70292

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs
Log:
2006-12-31  Everaldo Canuto  <everaldo@simios.org>

	* MenuAPI.cs: After click, dont close popup menu when menu is
	ContextMenu. Fixes #80399.



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog	2006-12-31 \
                17:29:54 UTC (rev 70291)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog	2006-12-31 \
17:49:13 UTC (rev 70292) @@ -1,3 +1,8 @@
+2006-12-31  Everaldo Canuto  <everaldo@simios.org>
+
+	* MenuAPI.cs: After click, dont close popup menu when menu is
+	ContextMenu. Fixes #80399.
+
 2006-12-30  Chris Toshok  <toshok@ximian.com>
 
 	* ContainerControl.cs: make sure we throw the exception if the

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs	2006-12-31 \
                17:29:54 UTC (rev 70291)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs	2006-12-31 \
17:49:13 UTC (rev 70292) @@ -197,9 +197,9 @@
 				return;
 			
 			/* Deactivate the menu when is topmenu and popdown and */
-			if (((CurrentMenu == TopMenu) && (popdown_menu)) || !item.IsPopup)
+			if (((CurrentMenu == TopMenu) && !(CurrentMenu is ContextMenu) && popdown_menu) \
|| !item.IsPopup)  Deactivate ();
-				
+			
 			/* Perform click when is not a popup */
 			if (!item.IsPopup) {
 				DeselectItem (item);

_______________________________________________
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]