Merge branch 'mono-master' into retina-SideBySide

Conflicts:
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj

3 files changed, 2 insertions, 64 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandCheckMenuItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandCheckMenuItem.cs
index a0fde12cf1..47e5a7aa42 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandCheckMenuItem.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandCheckMenuItem.cs
@@ -180,6 +180,7 @@ namespace MonoDevelop.Components.Commands
 			base.OnDestroyed ();
 			initialTarget = null;
 			arrayDataItem = null;
+			lastCmdInfo = null;
 		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs
index 2f9e51a4f2..2c5831e44a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs
@@ -204,18 +204,6 @@ namespace MonoDevelop.Components.Commands
 			ShowContextMenu (parent, evt, CreateCommandEntrySet (ctx, addinPath));
 		}
 		
-		[Obsolete("Use ShowContextMenu (Gtk.Widget parent, Gdk.EventButton evt, ...)")]
-		public void ShowContextMenu (string addinPath)
-		{
-			ShowContextMenu (CreateCommandEntrySet (addinPath));
-		}
-		
-		[Obsolete("Use ShowContextMenu (Gtk.Widget parent, Gdk.EventButton evt, ...)")]
-		public void ShowContextMenu (ExtensionContext ctx, string addinPath)
-		{
-			ShowContextMenu (CreateCommandEntrySet (ctx, addinPath));
-		}
-		
 		/// <summary>
 		/// Creates a command entry set.
 		/// </summary>
@@ -700,25 +688,6 @@ namespace MonoDevelop.Components.Commands
 			return menu;
 		}
 		
-		[Obsolete("Unused. To be removed")]
-		public void InsertOptions (Gtk.Menu menu, CommandEntrySet entrySet, int index)
-		{
-			CommandTargetRoute route = new CommandTargetRoute ();
-			foreach (CommandEntry entry in entrySet) {
-				Gtk.MenuItem item = entry.CreateMenuItem (this);
-				CustomItem ci = item.Child as CustomItem;
-				if (ci != null)
-					ci.SetMenuStyle (menu);
-				int n = menu.Children.Length;
-				menu.Insert (item, index);
-				if (item is ICommandUserItem)
-					((ICommandUserItem)item).Update (route);
-				else
-					item.Show ();
-				index += menu.Children.Length - n;
-			}
-		}
-		
 		/// <summary>
 		/// Shows a context menu.
 		/// </summary>
@@ -767,39 +736,6 @@ namespace MonoDevelop.Components.Commands
 			Mono.TextEditor.GtkWorkarounds.ShowContextMenu (menu, parent, evt);
 		}
 		
-		[Obsolete ("Use ShowContextMenu (Gtk.Widget parent, Gdk.EventButton evt, ...)")]
-		public void ShowContextMenu (Gtk.Menu menu, object initialCommandTarget, Gdk.EventButton evt)
-		{
-			if (menu is CommandMenu) {
-				((CommandMenu)menu).InitialCommandTarget = initialCommandTarget;
-			}
-			ShowContextMenu (null, evt, menu, initialCommandTarget);
-		}
-		
-		[Obsolete ("Use ShowContextMenu (Gtk.Widget parent, Gdk.EventButton evt, ...)")]
-		public void ShowContextMenu (CommandEntrySet entrySet)
-		{
-			ShowContextMenu (entrySet, null);
-		}
-		
-		[Obsolete ("Use ShowContextMenu (Gtk.Widget parent, Gdk.EventButton evt, ...)")]
-		public void ShowContextMenu (CommandEntrySet entrySet, object initialTarget)
-		{
-			ShowContextMenu (CreateMenu (entrySet, initialTarget));
-		}
-		
-		[Obsolete ("Use ShowContextMenu (Gtk.Widget parent, Gdk.EventButton evt, ...)")]
-		public void ShowContextMenu (Gtk.Menu menu)
-		{
-			ShowContextMenu (menu, null, (Gdk.EventButton) null);
-		}
-		
-		[Obsolete ("Use ShowContextMenu (Gtk.Widget parent, Gdk.EventButton evt, ...)")]
-		public void ShowContextMenu (Gtk.Menu menu, object initialCommandTarget)
-		{
-			ShowContextMenu (menu, initialCommandTarget, null);
-		}
-		
 		/// <summary>
 		/// Creates a toolbar.
 		/// </summary>
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuItem.cs
index 2fd04db58e..df4cdae1de 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuItem.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuItem.cs
@@ -258,6 +258,7 @@ namespace MonoDevelop.Components.Commands
 			itemArray = null;
 			initialTarget = null;
 			arrayDataItem = null;
+			lastCmdInfo = null;
 		}
 	}
 }