r7307@daniel-notebook (orig r3338): daniel | 2008-08-14 07:56:11 +0200

Allow WPF contents in Tools pad.


git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0wpf@3340 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/WixDialogDesigner.cs

@@ -269,7 +269,7 @@ namespace ICSharpCode.WixBinding
 		}
 		
 		
-		public override System.Windows.Forms.Control ToolsControl {
+		public override object ToolsContent {
 			get {
 				return SetupDialogControlsToolBox;
 			}

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs

@@ -594,7 +594,7 @@ namespace ICSharpCode.FormsDesigner
 			}
 		}
 		
-		public virtual Control ToolsControl {
+		public virtual object ToolsContent {
 			get { return ToolboxProvider.FormsDesignerSideBar; }
 		}
 	}

src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/PrimaryView/PrimaryViewContent.cs

@@ -75,7 +75,7 @@ namespace WorkflowDesigner
 		}
 		#endregion
 		
-		System.Windows.Forms.Control IToolsHost.ToolsControl {
+		object IToolsHost.ToolsContent {
 			get {
 				return WorkflowSideTabService.WorkflowSideBar;
 			}

src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/SecondaryView/SecondaryViewContent.cs

@@ -58,7 +58,7 @@ namespace WorkflowDesigner
 			control.UnloadWorkflow();
 		}
 		
-		System.Windows.Forms.Control IToolsHost.ToolsControl {
+		object IToolsHost.ToolsContent {
 			get {
 				return WorkflowSideTabService.WorkflowSideBar;
 			}

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfViewContent.cs

@@ -9,8 +9,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text;
-using System.Windows.Forms;
-using System.Windows.Forms.Integration;
 using System.Windows.Markup;
 using System.Xml;
 
@@ -29,7 +27,6 @@ namespace ICSharpCode.WpfDesign.AddIn
 	/// </summary>
 	public class WpfViewContent : AbstractViewContentHandlingLoadErrors, IHasPropertyContainer, IToolsHost
 	{
-		ElementHost wpfHost;
 		DesignSurface designer;
 		
 		public DesignContext DesignContext {
@@ -133,7 +130,7 @@ namespace ICSharpCode.WpfDesign.AddIn
 		}
 		#endregion
 		
-		public Control ToolsControl {
+		public object ToolsContent {
 			get { return WpfToolbox.Instance.ToolboxControl; }
 		}
 		

src/Main/Base/Project/Src/Gui/Pads/ToolsPad.cs

@@ -6,8 +6,8 @@
 // </file>
 
 using System;
-using System.Windows.Forms;
 using ICSharpCode.Core;
+using System.Windows.Controls;
 
 namespace ICSharpCode.SharpDevelop.Gui
 {
@@ -19,7 +19,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		/// <summary>
 		/// Gets the control to display in the tool box.
 		/// </summary>
-		Control ToolsControl { get; }
+		object ToolsContent { get; }
 	}
 	
 	/// <summary>
@@ -27,44 +27,27 @@ namespace ICSharpCode.SharpDevelop.Gui
 	/// </summary>
 	public class ToolsPad : AbstractPadContent
 	{
-		Panel panel = new Panel();
-		Label noToolsAvailable = new Label();
-		Control child;
+		ContentControl contentControl = new ContentControl();
 		
 		public override object Content {
 			get {
-				return panel;
+				return contentControl;
 			}
 		}
 		
 		public ToolsPad()
 		{
-			noToolsAvailable.Text = StringParser.Parse("${res:SharpDevelop.SideBar.NoToolsAvailableForCurrentDocument}");
-			noToolsAvailable.Dock = DockStyle.Fill;
-			panel.Controls.Add(noToolsAvailable);
-			child = noToolsAvailable;
-			
 			WorkbenchSingleton.Workbench.ActiveViewContentChanged += WorkbenchActiveContentChanged;
 			WorkbenchActiveContentChanged(null, null);
 		}
 		
-		void SetChild(Control newChild)
-		{
-			if (child != newChild) {
-				panel.Controls.Clear();
-				newChild.Dock = DockStyle.Fill;
-				panel.Controls.Add(newChild);
-				child = newChild;
-			}
-		}
-		
 		void WorkbenchActiveContentChanged(object sender, EventArgs e)
 		{
 			IToolsHost th = WorkbenchSingleton.Workbench.ActiveViewContent as IToolsHost;
-			if (th != null) {
-				SetChild(th.ToolsControl ?? noToolsAvailable);
+			if (th != null && th.ToolsContent != null) {
+				contentControl.SetContent(th.ToolsContent);
 			} else {
-				SetChild(noToolsAvailable);
+				contentControl.SetContent(StringParser.Parse("${res:SharpDevelop.SideBar.NoToolsAvailableForCurrentDocument}"));
 			}
 		}
 	}

src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorBasedPad.cs

@@ -112,7 +112,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
 		}
 		#endregion
 		
-		Control IToolsHost.ToolsControl {
+		object IToolsHost.ToolsContent {
 			get { return TextEditorSideBar.Instance; }
 		}
 		

src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorDisplayBinding.cs

@@ -508,7 +508,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
 		}
 		#endregion
 		
-		Control IToolsHost.ToolsControl {
+		object IToolsHost.ToolsContent {
 			get { return TextEditorSideBar.Instance; }
 		}
 	}