File tabstrip context menu now working again. (Patched docking suite. Take care on dockin library updates.)

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@314 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/Libraries/DockPanel_Src/WinFormsUI/Docking/DockContent.cs

@@ -573,12 +573,12 @@ namespace WeifenLuo.WinFormsUI
 			return DockHelper.IsDockStateValid(dockState, DockableAreas);
 		}
 
-		private ContextMenu m_tabPageContextMenu = null;
+		private ContextMenuStrip m_tabPageContextMenu = null;
 		/// <include file='CodeDoc\DockContent.xml' path='//CodeDoc/Class[@name="DockContent"]/Property[@name="TabPageContextMenu"]/*'/>
 		[LocalizedCategory("Category.Docking")]
 		[LocalizedDescription("DockContent.TabPageContextMenu.Description")]
 		[DefaultValue(null)]
-		public ContextMenu TabPageContextMenu
+		public ContextMenuStrip TabPageContextMenu
 		{
 			get	{	return m_tabPageContextMenu;	}
 			set	{	m_tabPageContextMenu = value;	}

src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs

@@ -133,7 +133,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			this.DockPadding.All = 2;
 
 			SetTitleEvent(this, EventArgs.Empty);
-//			this.TabPageContextMenu  = MenuService.CreateContextMenu(this, contextMenuPath);
+			this.TabPageContextMenu  = MenuService.CreateContextMenu(this, contextMenuPath);
 			InitControls();
 		}
 		

src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/Gui/MenuCommand.cs

@@ -44,6 +44,7 @@ namespace ICSharpCode.Core
 		{
 			try {
 				menuCommand = (ICommand)codon.AddIn.CreateObject(codon.Properties["class"]);
+				menuCommand.Owner = caller;
 			} catch (Exception e) {
 				MessageService.ShowError(e, "Can't create menu command : " + codon.Id);
 			}
@@ -127,14 +128,12 @@ namespace ICSharpCode.Core
 		
 		public virtual void UpdateStatus()
 		{
-//			Console.Write("Update status of : " + localizedText);
 			if (codon != null) {
 				if (Image == null && codon.Properties.Contains("icon")) {
 					Image = ResourceService.GetBitmap(codon.Properties["icon"]);
 				}
 				ConditionFailedAction failedAction = codon.GetFailedAction(caller);
 				Visible = failedAction != ConditionFailedAction.Exclude;
-//				Console.Write(" failed action " + failedAction + " Visible : " + Visible);
 				
 				if (localizedText == null) {
 					localizedText = codon.Properties["label"];
@@ -143,7 +142,6 @@ namespace ICSharpCode.Core
 			if (localizedText != null) {
 				Text = StringParser.Parse(localizedText);
 			}
-//			Console.WriteLine();
 		}
 	}
 }

src/Main/Core/Project/Src/Services/MenuService/MenuService.cs

@@ -32,6 +32,7 @@ namespace ICSharpCode.Core
 		
 		public static ContextMenuStrip CreateContextMenu(object owner, string addInTreePath)
 		{
+			Console.WriteLine("Create Owner == " + owner);
 			if (addInTreePath == null) {
 				return null;
 			}