Author: everaldo
Date: 2007-01-15 20:51:52 -0500 (Mon, 15 Jan 2007)
New Revision: 71102
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Menu.cs
Log:
2007-01-15 Everaldo Canuto <[EMAIL PROTECTED]>
* Menu.cs: implement MergeItems and Replace for MenuMerge method.
Fixes #80006.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-01-16 01:31:57 UTC (rev 71101)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-01-16 01:51:52 UTC (rev 71102)
@@ -1,3 +1,8 @@
+2007-01-15 Everaldo Canuto <[EMAIL PROTECTED]>
+
+ * Menu.cs: implement MergeItems and Replace for MenuMerge method.
+ Fixes #80006.
+
2007-01-15 Carlos Alberto Cortez <[EMAIL PROTECTED]>
* ListViewItem.cs:
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Menu.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Menu.cs
2007-01-16 01:31:57 UTC (rev 71101)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Menu.cs
2007-01-16 01:51:52 UTC (rev 71102)
@@ -263,24 +263,43 @@
if (menuSrc == this)
throw new ArgumentException ("The menu cannot
be merged with itself");
- for (int i = 0; i < menuSrc.MenuItems.Count; i++){
-
- switch (menuSrc.MenuItems[i].MergeType) {
+ for (int i = 0; i < menuSrc.MenuItems.Count; i++) {
+
+ MenuItem sourceitem = menuSrc.MenuItems[i];
+
+ switch (sourceitem.MergeType) {
case MenuMerge.Remove: // Item not
included
break;
case MenuMerge.Add:
{
- int pos = FindMergePosition
(menuSrc.MenuItems[i].MergeOrder);
- MenuItems.Add (pos,
menuSrc.MenuItems[i].CloneMenu ());
+ int pos = FindMergePosition
(sourceitem.MergeOrder);
+ MenuItems.Add (pos,
sourceitem.CloneMenu ());
break;
}
case MenuMerge.Replace:
case MenuMerge.MergeItems:
{
- int pos = FindMergePosition
(menuSrc.MenuItems[i].MergeOrder - 1);
- MenuItems.Insert (pos,
menuSrc.MenuItems[i].CloneMenu ());
+ for (int pos =
FindMergePosition (sourceitem.MergeOrder-1); pos <= MenuItems.Count; pos++) {
+
+ if ((pos >=
MenuItems.Count) || (MenuItems[pos].MergeOrder != sourceitem.MergeOrder)) {
+ MenuItems.Add
(pos, sourceitem.CloneMenu ());
+ break;
+ }
+
+ MenuItem mergeitem =
MenuItems[pos];
+
+ if (mergeitem.MergeType
!= MenuMerge.Add) {
+ if
((sourceitem.MergeType == MenuMerge.MergeItems) && (mergeitem.MergeType ==
MenuMerge.MergeItems)) {
+
mergeitem.MergeMenu (sourceitem);
+ } else {
+
MenuItems.Remove (sourceitem);
+
MenuItems.Add (pos, sourceitem.CloneMenu ());
+ }
+ break;
+ }
+ }
break;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches