Move SideBar and AutoHide to ICSharpCode.SharpDevelop.Widgets.

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

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

@@ -14,12 +14,13 @@ using ICSharpCode.Core;
 using ICSharpCode.FormsDesigner;
 using ICSharpCode.FormsDesigner.Gui;
 using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Widgets.SideBar;
 
 namespace ICSharpCode.WixBinding
 {
 	public sealed class SetupDialogControlsSideTab : SideTabDesigner
 	{
-		SetupDialogControlsSideTab(AxSideBar sideBar, Category category, IToolboxService toolboxService)
+		SetupDialogControlsSideTab(SideBarControl sideBar, Category category, IToolboxService toolboxService)
 			: base(sideBar, category, toolboxService)
 		{
 		}

src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj

@@ -213,6 +213,11 @@
       <Private>False</Private>
     </ProjectReference>
     <Folder Include="Src\PropertyGrid" />
+    <ProjectReference Include="..\..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj">
+      <Project>{8035765F-D51F-4A0C-A746-2FD100E19419}</Project>
+      <Name>ICSharpCode.SharpDevelop.Widgets</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <Import Project="PostBuildEvent.proj" />

src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.csproj

@@ -129,6 +129,11 @@
       <Name>ICSharpCode.SharpDevelop.Dom</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj">
+      <Project>{8035765F-D51F-4A0C-A746-2FD100E19419}</Project>
+      <Name>ICSharpCode.SharpDevelop.Widgets</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <Import Project="PostBuildEvent.proj" />

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

@@ -22,6 +22,7 @@ using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.TextEditor;
 using ICSharpCode.TextEditor.Document;
+using ICSharpCode.SharpDevelop.Widgets.SideBar;
 
 namespace ICSharpCode.FormsDesigner
 {
@@ -335,7 +336,7 @@ namespace ICSharpCode.FormsDesigner
 			if (SharpDevelopSideBar.SideBar.ActiveTab != null && ToolboxProvider.SideTabs.Contains(SharpDevelopSideBar.SideBar.ActiveTab)) {
 				activeTabName = SharpDevelopSideBar.SideBar.ActiveTab.Name;
 			}
-			foreach(AxSideTab tab in ToolboxProvider.SideTabs) {
+			foreach(SideTab tab in ToolboxProvider.SideTabs) {
 				if (!SharpDevelopSideBar.SideBar.Tabs.Contains(tab)) {
 					return;
 				}
@@ -577,7 +578,7 @@ namespace ICSharpCode.FormsDesigner
 		
 		void AddSideBars()
 		{
-			foreach(AxSideTab tab in ToolboxProvider.SideTabs) {
+			foreach(SideTab tab in ToolboxProvider.SideTabs) {
 				if (!SharpDevelopSideBar.SideBar.Tabs.Contains(tab)) {
 					SharpDevelopSideBar.SideBar.Tabs.Add(tab);
 				}
@@ -591,7 +592,7 @@ namespace ICSharpCode.FormsDesigner
 				return;
 			}
 			
-			foreach(AxSideTab tab in ToolboxProvider.SideTabs) {
+			foreach(SideTab tab in ToolboxProvider.SideTabs) {
 				if (activeTabName == tab.Name) {
 					SharpDevelopSideBar.SideBar.ActiveTab = tab;
 					return;

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/CustomComponentsSideTab.cs

@@ -17,13 +17,14 @@ using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Dom;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Project;
+using ICSharpCode.SharpDevelop.Widgets.SideBar;
 
 namespace ICSharpCode.FormsDesigner.Gui
 {
 	public class CustomComponentsSideTab : SideTabDesigner
 	{
 		///<summary>Load an assembly's controls</summary>
-		public CustomComponentsSideTab(AxSideBar sideTab, string name, IToolboxService toolboxService) : base(sideTab,name, toolboxService)
+		public CustomComponentsSideTab(SideBarControl sideTab, string name, IToolboxService toolboxService) : base(sideTab,name, toolboxService)
 		{
 			ScanProjectAssemblies();
 			ProjectService.EndBuild       += RescanProjectAssemblies;

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/RenameCategoryDialog.cs

@@ -11,6 +11,7 @@ using System.Windows.Forms;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Gui.XmlForms;
+using ICSharpCode.SharpDevelop.Widgets.SideBar;
 
 namespace ICSharpCode.FormsDesigner.Gui
 {
@@ -60,7 +61,7 @@ namespace ICSharpCode.FormsDesigner.Gui
 					}
 				}
 					
-				foreach (AxSideTab tab in SharpDevelopSideBar.SideBar.Tabs) {
+				foreach (SideTab tab in SharpDevelopSideBar.SideBar.Tabs) {
 					if (!(tab is SideTabDesigner) && !(tab is CustomComponentsSideTab)) {
 						if (tab.Name == ControlDictionary["categoryNameTextBox"].Text) {
 							ShowDuplicateErrorMessage();

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/SideTabDesigner.cs

@@ -10,15 +10,16 @@ using System.Drawing.Design;
 using System.Reflection;
 
 using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Widgets.SideBar;
 
 namespace ICSharpCode.FormsDesigner.Gui
 {
-	public class SideTabDesigner : AxSideTab
+	public class SideTabDesigner : SideTab
 	{
 		protected bool loadImages = true;
 		IToolboxService toolboxService;
 		
-		protected SideTabDesigner(AxSideBar sideBar, string name, IToolboxService toolboxService) : base(sideBar, name)
+		protected SideTabDesigner(SideBarControl sideBar, string name, IToolboxService toolboxService) : base(sideBar, name)
 		{
 			this.toolboxService = toolboxService;
 			this.CanSaved = false;
@@ -33,7 +34,7 @@ namespace ICSharpCode.FormsDesigner.Gui
 		}
 		
 		///<summary>Load an assembly's controls</summary>
-		public SideTabDesigner(AxSideBar sideBar, Category category, IToolboxService toolboxService) : this(sideBar, category.Name, toolboxService)
+		public SideTabDesigner(SideBarControl sideBar, Category category, IToolboxService toolboxService) : this(sideBar, category.Name, toolboxService)
 		{
 			foreach (ToolComponent component in category.ToolComponents) {
 				if (component.IsEnabled) {
@@ -51,7 +52,7 @@ namespace ICSharpCode.FormsDesigner.Gui
 		
 		void SelectedTabItemChanged(object sender, EventArgs e)
 		{
-			AxSideTabItem item = (sender as AxSideTab).ChoosedItem;
+			SideTabItem item = (sender as SideTab).ChoosedItem;
 			if (item == null) {
 				toolboxService.SetSelectedToolboxItem(null);
 			} else {

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

@@ -17,13 +17,14 @@ using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Dom;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Project;
+using ICSharpCode.SharpDevelop.Widgets.SideBar;
 
 namespace ICSharpCode.FormsDesigner
 {
 	public class ToolboxProvider
 	{
 		static ICSharpCode.FormsDesigner.Services.ToolboxService toolboxService = null;
-		public static List<AxSideTab> SideTabs = new List<AxSideTab>();
+		public static List<SideTab> SideTabs = new List<SideTab>();
 		
 		static ComponentLibraryLoader componentLibraryLoader = new ComponentLibraryLoader();
 		
@@ -84,7 +85,7 @@ namespace ICSharpCode.FormsDesigner
 		public static void ReloadSideTabs(bool doInsert)
 		{
 			bool reInsertTabs = false;
-			foreach(AxSideTab tab in SideTabs) {
+			foreach(SideTab tab in SideTabs) {
 				tab.ItemRemoved -= SideTabItemRemoved;
 				tab.ItemsExchanged -= SideTabItemsExchanged;
 				if (SharpDevelopSideBar.SideBar.Tabs.Contains(tab)) {
@@ -112,7 +113,7 @@ namespace ICSharpCode.FormsDesigner
 			customTab.ItemsExchanged += SideTabItemsExchanged;
 			SideTabs.Add(customTab);
 			if (reInsertTabs) {
-				foreach(AxSideTab tab in SideTabs) {
+				foreach(SideTab tab in SideTabs) {
 					SharpDevelopSideBar.SideBar.Tabs.Add(tab);
 				}
 			}
@@ -121,7 +122,7 @@ namespace ICSharpCode.FormsDesigner
 		static void SelectedToolUsedHandler(object sender, EventArgs e)
 		{
 			LoggingService.Debug("SelectedToolUsedHandler");
-			AxSideTab tab = SharpDevelopSideBar.SideBar.ActiveTab;
+			SideTab tab = SharpDevelopSideBar.SideBar.ActiveTab;
 						
 			// try to add project reference
 			if (sender != null && sender is ICSharpCode.FormsDesigner.Services.ToolboxService) {

src/AddIns/Misc/SharpReport/SharpReport/Designer/SideTab/BuildSideTab.cs

@@ -13,6 +13,7 @@ using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
 using SharpReport.Designer;
 using SharpReportCore;
+using ICSharpCode.SharpDevelop.Widgets.SideBar;
 
 namespace SharpReport
 {
@@ -21,8 +22,8 @@ namespace SharpReport
 	/// </summary>
 	public class BuildSideTab{
 		SharpDevelopSideBar	sideBar;
-		AxSideTab sideTab;	
-		AxSideTab sideTabFunctions;
+		SideTab sideTab;	
+		SideTab sideTabFunctions;
 		
 		public BuildSideTab(SharpDevelopSideBar sideBar){
 			this.sideBar = sideBar;
@@ -49,22 +50,22 @@ namespace SharpReport
 			sideBar.Tabs.Add (this.sideTabFunctions);
 		}
 		
-		private AxSideTabItem BuildPointer () {
+		private SideTabItem BuildPointer () {
 			return sideTab.SideTabItemFactory.CreateSideTabItem(ResourceService.GetString("SharpReport.Toolbar.Pointer"),
 			                                                               "pointer",
 			                                                               ResourceService.GetBitmap("Icons.16x16.FormsDesigner.PointerIcon"));
 		}
 		
-		private  void CusomizeSideTab (AxSideTab tab) {
+		private  void CusomizeSideTab (SideTab tab) {
 			tab.CanDragDrop = true;
 			tab.CanSaved = false;
 		}
 		
-		private void AddReportElements (AxSideTab tab) {
+		private void AddReportElements (SideTab tab) {
 
 			Bitmap bitmap = ResourceService.GetIcon("Icons.16.16.SharpReport.Textbox").ToBitmap();
 			
-			AxSideTabItem	t = sideTab.SideTabItemFactory.CreateSideTabItem(ResourceService.GetString("SharpReport.Toolbar.TextBox"),
+			SideTabItem	t = sideTab.SideTabItemFactory.CreateSideTabItem(ResourceService.GetString("SharpReport.Toolbar.TextBox"),
 			                                                               GlobalEnums.ReportItemType.ReportTextItem.ToString(),
 			                                                               bitmap);
 			tab.Items.Add (t);
@@ -115,13 +116,13 @@ namespace SharpReport
 			//
 		}
 		
-		private void AddFunctionElements (AxSideTab tab) {
+		private void AddFunctionElements (SideTab tab) {
 			
 			FunctionFactory ff = new FunctionFactory();
 			string localise = "SharpReport.Toolbar.Functions.";
 			Bitmap functionBitmap = ResourceService.GetIcon("Icons.16x16.SharpReport.Function").ToBitmap();
 		
-			AxSideTabItem	t = sideTab.SideTabItemFactory.CreateSideTabItem(ResourceService.GetString(localise + ff.AvailableTypes[0]) ,
+			SideTabItem	t = sideTab.SideTabItemFactory.CreateSideTabItem(ResourceService.GetString(localise + ff.AvailableTypes[0]) ,
 			                                                               ff.AvailableTypes[0].ToString(),
 			                                                               functionBitmap);
 			

src/AddIns/Misc/SharpReport/SharpReport/SharpReport.csproj

@@ -130,6 +130,11 @@
       <Name>SharpReportCore</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj">
+      <Project>{8035765F-D51F-4A0C-A746-2FD100E19419}</Project>
+      <Name>ICSharpCode.SharpDevelop.Widgets</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>

src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportAddin.csproj

@@ -96,6 +96,11 @@
       <Name>SharpQuery</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj">
+      <Project>{8035765F-D51F-4A0C-A746-2FD100E19419}</Project>
+      <Name>ICSharpCode.SharpDevelop.Widgets</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>

src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportView.cs

@@ -21,6 +21,7 @@ using SharpReport;
 using SharpReport.Designer;
 using SharpReportAddin.Commands;
 using SharpReportCore;
+using ICSharpCode.SharpDevelop.Widgets.SideBar;
 
 namespace SharpReportAddin{
 	/// <summary>
@@ -37,8 +38,8 @@ namespace SharpReportAddin{
 
 		
 		// SideBar
-		private AxSideTab sideTabItem = null;
-		private AxSideTab sideTabFunctions = null;
+		private SideTab sideTabItem = null;
+		private SideTab sideTabFunctions = null;
 		private Panel panel;
 		
 		private bool disposed;
@@ -148,7 +149,7 @@ namespace SharpReportAddin{
 				SideBarView v = (SideBarView)WorkbenchSingleton.Workbench.GetPad (typeof(SideBarView)).PadContent;
 				SharpDevelopSideBar sb =(SharpDevelopSideBar) v.Control;
 				
-				AxSideTab s;
+				SideTab s;
 				for (int i = SideBarView.sideBar.Tabs.Count -1; i > 0;i -- ) {
 					s = SideBarView.sideBar.Tabs[i];
 					if (s.Name.IndexOf("Report") > 0) {

src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@@ -128,11 +128,6 @@
     <Compile Include="Src\Gui\BrowserDisplayBinding\HtmlViewPane.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Src\Gui\Components\SideBar\AxSideBar.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\Gui\Components\SideBar\AxSideTab.cs" />
-    <Compile Include="Src\Gui\Components\SideBar\AxSideTabItem.cs" />
     <Compile Include="Src\Gui\Components\SideBar\SharpDevelopSideBar.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -609,9 +604,6 @@
     <Compile Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\FullscreenPanel.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Src\Gui\Components\AutoHide\AutoHideMenuStripContainer.cs" />
-    <Compile Include="Src\Gui\Components\AutoHide\AutoHideStatusStripContainer.cs" />
-    <Compile Include="Src\Gui\Components\AutoHide\AutoHideContainer.cs" />
     <Compile Include="Src\Services\RefactoringService\LocalVariableRefactoring.cs" />
     <Compile Include="Src\Services\RefactoringService\FindReferencesAndRenameHelper.cs" />
     <Compile Include="Src\Internal\Doozers\DirectoryDoozer.cs" />
@@ -714,7 +706,6 @@
       <Project>{35cef10f-2d4c-45f2-9dd1-161e0fec583c}</Project>
       <Name>ICSharpCode.Core</Name>
     </ProjectReference>
-    <Folder Include="Src\Gui\Components\AutoHide" />
     <Folder Include="Src\Gui\Pads\TaskList" />
     <Content Include="..\..\..\..\AddIns\ICSharpCode.SharpDevelop.addin">
       <Link>ICSharpCode.SharpDevelop.addin</Link>

src/Main/Base/Project/Src/Commands/SideBarCommands.cs

@@ -9,6 +9,7 @@ using System;
 using System.Windows.Forms;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Widgets.SideBar;
 
 namespace ICSharpCode.SharpDevelop.Commands
 {
@@ -17,7 +18,7 @@ namespace ICSharpCode.SharpDevelop.Commands
 		public override void Run()
 		{
 			SharpDevelopSideBar sideBar = (SharpDevelopSideBar)Owner;
-			AxSideTabItem item = sideBar.ActiveTab.ChoosedItem;
+			SideTabItem item = sideBar.ActiveTab.ChoosedItem;
 			if (item != null) {
 				sideBar.StartRenamingOf(item);
 			}
@@ -29,7 +30,7 @@ namespace ICSharpCode.SharpDevelop.Commands
 		public override void Run()
 		{
 			SharpDevelopSideBar sideBar = (SharpDevelopSideBar)Owner;
-			AxSideTabItem item = sideBar.ActiveTab.ChoosedItem;
+			SideTabItem item = sideBar.ActiveTab.ChoosedItem;
 			if (item != null && MessageBox.Show(StringParser.Parse(ResourceService.GetString("SideBarComponent.ContextMenu.DeleteTabItemQuestion"), new string[,] { {"TabItem", item.Name}}),
 			                    ResourceService.GetString("Global.QuestionText"), 
 			                    MessageBoxButtons.YesNo, 
@@ -46,7 +47,7 @@ namespace ICSharpCode.SharpDevelop.Commands
 		public override void Run()
 		{
 			SharpDevelopSideBar sideBar = (SharpDevelopSideBar)Owner;
-			AxSideTab tab = new AxSideTab(sideBar, "New Tab");
+			SideTab tab = new SideTab(sideBar, "New Tab");
 			sideBar.Tabs.Add(tab);
 			sideBar.StartRenamingOf(tab);
 			sideBar.DoAddTab = true;
@@ -61,7 +62,7 @@ namespace ICSharpCode.SharpDevelop.Commands
 			SharpDevelopSideBar sideBar = (SharpDevelopSideBar)Owner;
 			int index = sideBar.GetTabIndexAt(sideBar.SideBarMousePosition.X, sideBar.SideBarMousePosition.Y);
 			if (index > 0) {
-				AxSideTab tab = sideBar.Tabs[index];
+				SideTab tab = sideBar.Tabs[index];
 				sideBar.Tabs[index] = sideBar.Tabs[index - 1];
 				sideBar.Tabs[index - 1] = tab;
 				sideBar.Refresh();
@@ -75,7 +76,7 @@ namespace ICSharpCode.SharpDevelop.Commands
 			SharpDevelopSideBar sideBar = (SharpDevelopSideBar)Owner;
 			int index = sideBar.GetTabIndexAt(sideBar.SideBarMousePosition.X, sideBar.SideBarMousePosition.Y);
 			if (index >= 0 && index < sideBar.Tabs.Count - 1) {
-				AxSideTab tab = sideBar.Tabs[index];
+				SideTab tab = sideBar.Tabs[index];
 				sideBar.Tabs[index] = sideBar.Tabs[index + 1];
 				sideBar.Tabs[index + 1] = tab;
 				sideBar.Refresh();
@@ -91,7 +92,7 @@ namespace ICSharpCode.SharpDevelop.Commands
 			SharpDevelopSideBar sideBar = (SharpDevelopSideBar)Owner;
 			int index = sideBar.Tabs.IndexOf(sideBar.ActiveTab);
 			if (index > 0) {
-				AxSideTab tab = sideBar.Tabs[index];
+				SideTab tab = sideBar.Tabs[index];
 				sideBar.Tabs[index] = sideBar.Tabs[index - 1];
 				sideBar.Tabs[index - 1] = tab;
 				sideBar.Refresh();
@@ -106,7 +107,7 @@ namespace ICSharpCode.SharpDevelop.Commands
 			SharpDevelopSideBar sideBar = (SharpDevelopSideBar)Owner;
 			int index = sideBar.Tabs.IndexOf(sideBar.ActiveTab);
 			if (index >= 0 && index < sideBar.Tabs.Count - 1) {
-				AxSideTab tab = sideBar.Tabs[index];
+				SideTab tab = sideBar.Tabs[index];
 				sideBar.Tabs[index] = sideBar.Tabs[index + 1];
 				sideBar.Tabs[index + 1] = tab;
 				sideBar.Refresh();
@@ -119,7 +120,7 @@ namespace ICSharpCode.SharpDevelop.Commands
 		public override void Run()
 		{
 			SharpDevelopSideBar sideBar = (SharpDevelopSideBar)Owner;
-			AxSideTab selectedSideTab = sideBar.GetTabAt(sideBar.SideBarMousePosition.X, sideBar.SideBarMousePosition.Y);
+			SideTab selectedSideTab = sideBar.GetTabAt(sideBar.SideBarMousePosition.X, sideBar.SideBarMousePosition.Y);
 			if (MessageBox.Show(StringParser.Parse(ResourceService.GetString("SideBarComponent.ContextMenu.DeleteTabHeaderQuestion"), new string[,] { {"TabHeader", selectedSideTab.Name}}),
 			                    ResourceService.GetString("Global.QuestionText"), 
 			                    MessageBoxButtons.YesNo, 

src/Main/Base/Project/Src/Gui/Components/SideBar/SharpDevelopSideBar.cs

@@ -13,35 +13,36 @@ using System.Xml;
 
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Internal.Templates;
+using ICSharpCode.SharpDevelop.Widgets.SideBar;
 
 namespace ICSharpCode.SharpDevelop.Gui
 {
 	public class SharpDevelopSideTabItemFactory : ISideTabItemFactory
 	{
-		public AxSideTabItem CreateSideTabItem(string name)
+		public SideTabItem CreateSideTabItem(string name)
 		{
 			return new SharpDevelopSideTabItem(name);
 		}
 		
-		public AxSideTabItem CreateSideTabItem(string name, object tag)
+		public SideTabItem CreateSideTabItem(string name, object tag)
 		{
 			return new SharpDevelopSideTabItem(name, tag);
 		}
 		
-		public AxSideTabItem CreateSideTabItem(string name, object tag, Bitmap bitmap)
+		public SideTabItem CreateSideTabItem(string name, object tag, Bitmap bitmap)
 		{
 			return new SharpDevelopSideTabItem(name, tag, bitmap);
 		}
 	}
 		
-	public class SharpDevelopSideBar : AxSideBar, IOwnerState
+	public class SharpDevelopSideBar : SideBarControl, IOwnerState
 	{
 		readonly static string contextMenuPath        = "/SharpDevelop/Workbench/SharpDevelopSideBar/ContextMenu";
 		readonly static string sideTabContextMenuPath = "/SharpDevelop/Workbench/SharpDevelopSideBar/SideTab/ContextMenu";
 		
 		Point mousePosition;
 		Point itemMousePosition;
-		public AxSideTab ClipboardRing = null;
+		public SideTab ClipboardRing = null;
 		
 		public Point ItemMousePosition {
 			get {
@@ -88,11 +89,11 @@ namespace ICSharpCode.SharpDevelop.Gui
 			
 			SideTabItemFactory = new SharpDevelopSideTabItemFactory();
 			
-			MouseUp                  += new MouseEventHandler(SetContextMenu);
-			sideTabContent.MouseUp   += new MouseEventHandler(SetItemContextMenu);
+			MouseUp                     += new MouseEventHandler(SetContextMenu);
+			sideTabContent.MouseUp += new MouseEventHandler(SetItemContextMenu);
 			
 			foreach (TextTemplate template in TextTemplate.TextTemplates) {
-				AxSideTab tab = new AxSideTab(this, template.Name);
+				SideTab tab = new SideTab(this, template.Name);
 				tab.CanSaved  = false;
 				foreach (TextTemplate.Entry entry in template.Entries)  {
 					tab.Items.Add(SideTabItemFactory.CreateSideTabItem(entry.Display, entry.Value));
@@ -129,7 +130,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		public void PutInClipboardRing(string text)
 		{
-			foreach (AxSideTab tab in Tabs) {
+			foreach (SideTab tab in Tabs) {
 				if (tab.IsClipboardRing) {
 					tab.Items.Add("Text:" + text.Trim(), text);
 					if (tab.Items.Count > 20) {
@@ -141,7 +142,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			System.Diagnostics.Debug.Assert(false, "Can't find clipboard ring side tab category");
 		}
 		
-		public void DeleteSideTab(AxSideTab tab)
+		public void DeleteSideTab(SideTab tab)
 		{
 			if (tab == null) {
 				return;
@@ -154,7 +155,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		////////////////////////////////////////////////////////////////////////////
 		// Tab Context Menu
 		
-		void SetDeletedState(AxSideTabItem item)
+		void SetDeletedState(SideTabItem item)
 		{
 			if (item != null) {
 				SetDeletedState(item.CanBeDeleted);
@@ -173,7 +174,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		}
 
 		
-		void SetRenameState(AxSideTabItem item)
+		void SetRenameState(SideTabItem item)
 		{
 			if (item != null) {
 				SetRenameState(item.CanBeRenamed);
@@ -197,7 +198,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			
 			int index = GetTabIndexAt(e.X, e.Y);
 			if (index >= 0) {
-				AxSideTab tab = Tabs[index];
+				SideTab tab = Tabs[index];
 				
 				SetDeletedState(tab.CanBeDeleted);
 				SetRenameState(tab.CanBeRenamed);
@@ -282,7 +283,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		void SetOptions(XmlElement el)
 		{
 			foreach (XmlElement sideTabEl in el.ChildNodes) {
-				AxSideTab tab = new AxSideTab(this, sideTabEl.GetAttribute("text"));
+				SideTab tab = new SideTab(this, sideTabEl.GetAttribute("text"));
 				if (tab.Name == el.GetAttribute("activetab")) {
 					ActiveTab = tab;
 				} else {
@@ -313,7 +314,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			XmlElement el = doc.CreateElement("SideBar");
 			el.SetAttribute("activetab", ActiveTab.Name);
 			
-			foreach (AxSideTab tab in Tabs) {
+			foreach (SideTab tab in Tabs) {
 				if (tab.CanSaved && standardTabs[tab] == null) {
 					XmlElement child = doc.CreateElement("SideTab");
 					
@@ -323,7 +324,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 					
 					child.SetAttribute("text", tab.Name);
 					
-					foreach (AxSideTabItem item in tab.Items) {
+					foreach (SideTabItem item in tab.Items) {
 						XmlElement itemChild = doc.CreateElement("SideTabItem");
 						
 						itemChild.SetAttribute("text",  item.Name);
@@ -338,7 +339,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			return el;
 		}
 		
-		void OnSideTabDeleted(AxSideTab tab)
+		void OnSideTabDeleted(SideTab tab)
 		{
 			if (SideTabDeleted != null) {
 				SideTabDeleted(this, new SideTabEventArgs(tab));

src/Main/Base/Project/Src/Gui/Components/SideBar/SharpDevelopSideTabItem.cs

@@ -8,10 +8,11 @@
 using System;
 using System.Drawing;
 using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop.Widgets.SideBar;
 
 namespace ICSharpCode.SharpDevelop.Gui
 {
-	public class SharpDevelopSideTabItem : AxSideTabItem
+	public class SharpDevelopSideTabItem : SideTabItem
 	{
 		
 		

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

@@ -11,6 +11,7 @@ using System.Windows.Forms;
 using System.Xml;
 
 using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop.Widgets.SideBar;
 
 namespace ICSharpCode.SharpDevelop.Gui
 {
@@ -61,12 +62,12 @@ namespace ICSharpCode.SharpDevelop.Gui
 		void GenerateStandardSideBar()
 		{
 			sideBar = new SharpDevelopSideBar();
-			AxSideTab tab = new AxSideTab(sideBar, "${res:SharpDevelop.SideBar.GeneralCategory}");
+			SideTab tab = new SideTab(sideBar, "${res:SharpDevelop.SideBar.GeneralCategory}");
 			
 			sideBar.Tabs.Add(tab);
 			sideBar.ActiveTab = tab;
 			
-			tab = new AxSideTab(sideBar, "${res:SharpDevelop.SideBar.ClipboardRing}");
+			tab = new SideTab(sideBar, "${res:SharpDevelop.SideBar.ClipboardRing}");
 			tab.IsClipboardRing = true;
 			tab.CanBeDeleted = false;
 			tab.CanDragDrop  = false;

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

@@ -12,6 +12,7 @@ using System.IO;
 using System.Windows.Forms;
 
 using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop.Widgets.AutoHide;
 using WeifenLuo.WinFormsUI;
 
 namespace ICSharpCode.SharpDevelop.Gui

src/Main/ICSharpCode.SharpDevelop.Widgets/Project/AutoHide/AutoHideContainer.cs

@@ -9,7 +9,7 @@ using System;
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace ICSharpCode.SharpDevelop.Gui
+namespace ICSharpCode.SharpDevelop.Widgets.AutoHide
 {
 	public class AutoHideContainer: Panel
 	{

src/Main/ICSharpCode.SharpDevelop.Widgets/Project/AutoHide/AutoHideMenuStripContainer.cs

@@ -8,7 +8,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace ICSharpCode.SharpDevelop.Gui
+namespace ICSharpCode.SharpDevelop.Widgets.AutoHide
 {
 	/// <summary>
 	/// AutoHideMenuStripContainer can be used instead of MenuStrip to get a menu

src/Main/ICSharpCode.SharpDevelop.Widgets/Project/AutoHide/AutoHideStatusStripContainer.cs

@@ -8,7 +8,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace ICSharpCode.SharpDevelop.Gui
+namespace ICSharpCode.SharpDevelop.Widgets.AutoHide
 {
 	/// <summary>
 	/// AutoHideStatusStripContainer can be used instead of StatusStrip to get a status strip

src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj

@@ -57,10 +57,18 @@
     <Compile Include="TreeGrid\ScrollButton.cs" />
     <Compile Include="TreeGrid\VerticalScrollContainer.cs" />
     <Compile Include="DesignHelper.cs" />
+    <Compile Include="AutoHide\AutoHideContainer.cs" />
+    <Compile Include="AutoHide\AutoHideMenuStripContainer.cs" />
+    <Compile Include="AutoHide\AutoHideStatusStripContainer.cs" />
+    <Compile Include="SideBar\SideBar.cs" />
+    <Compile Include="SideBar\SideTab.cs" />
+    <Compile Include="SideBar\SideTabItem.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Configuration" />
     <Folder Include="TreeGrid" />
+    <Folder Include="AutoHide" />
+    <Folder Include="SideBar" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>

src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideBar.cs

@@ -10,61 +10,62 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace ICSharpCode.SharpDevelop.Gui
+namespace ICSharpCode.SharpDevelop.Widgets.SideBar
 {
 	public interface ISideTabItemFactory
 	{
-		AxSideTabItem CreateSideTabItem(string name);
-		AxSideTabItem CreateSideTabItem(string name, object tag);
-		AxSideTabItem CreateSideTabItem(string name, object tag, Bitmap bitmap);
+		SideTabItem CreateSideTabItem(string name);
+		SideTabItem CreateSideTabItem(string name, object tag);
+		SideTabItem CreateSideTabItem(string name, object tag, Bitmap bitmap);
 	}
 	
 	public class DefaultSideTabItemFactory : ISideTabItemFactory
 	{
-		public AxSideTabItem CreateSideTabItem(string name)
+		public SideTabItem CreateSideTabItem(string name)
 		{
-			return new AxSideTabItem(name);
+			return new SideTabItem(name);
 		}
 		
-		public AxSideTabItem CreateSideTabItem(string name, object tag)
+		public SideTabItem CreateSideTabItem(string name, object tag)
 		{
-			return new AxSideTabItem(name, tag);
+			return new SideTabItem(name, tag);
 		}
-		public AxSideTabItem CreateSideTabItem(string name, object tag, Bitmap bitmap)
+		public SideTabItem CreateSideTabItem(string name, object tag, Bitmap bitmap)
 		{
-			return new AxSideTabItem(name, tag, bitmap);
+			return new SideTabItem(name, tag, bitmap);
 		}
 		
 	}
 	
 	public interface ISideTabFactory
 	{
-		AxSideTab CreateSideTab(AxSideBar sideBar, string name);
+		SideTab CreateSideTab(SideBarControl sideBar, string name);
 	}
 	
 	public class DefaultSideTabFactory : ISideTabFactory
 	{
-		public AxSideTab CreateSideTab(AxSideBar sideBar, string name)
+		public SideTab CreateSideTab(SideBarControl sideBar, string name)
 		{
-			return new AxSideTab(sideBar, name);
+			return new SideTab(sideBar, name);
 		}
 	}
 	
-	public class AxSideBar : UserControl
+	public class SideBarControl : UserControl
 	{
 		SideTabCollection    sideTabs;
-		AxSideTab           activeTab = null;
+		SideTab           activeTab = null;
 		
-		protected SideTabContent    sideTabContent = new SideTabContent();
+		[CLSCompliant(false)]
+		protected SideTabContent sideTabContent = new SideTabContent();
 		
-		AxSideTab           renameTab     = null;
-		AxSideTabItem       renameTabItem = null;
+		SideTab           renameTab     = null;
+		SideTabItem     renameTabItem = null;
 		TextBox           renameTextBox = new TextBox();
 		
 		ScrollBar         scrollBar = new VScrollBar();
 		
-		Point             mousePosition;
-		protected bool      doAddTab = false;
+		Point mousePosition;
+		bool  doAddTab = false;
 		
 		public bool DoAddTab {
 			get {
@@ -102,7 +103,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			}
 		}
 		
-		public AxSideTab ActiveTab {
+		public SideTab ActiveTab {
 			get {
 				return activeTab;
 			}
@@ -129,7 +130,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			scrollBar.LargeChange = sideTabContent.Height / activeTab.ItemHeight;
 		}
 		
-		public AxSideBar()
+		public SideBarControl()
 		{
 			ResizeRedraw = true;
 			AllowDrop = true;
@@ -166,7 +167,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			}
 		}
 		
-		public void EnsureVisible(AxSideTabItem item)
+		public void EnsureVisible(SideTabItem item)
 		{
 			int index = activeTab.Items.IndexOf(item);
 			if (index != -1) {
@@ -279,7 +280,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			return false;
 		}
 		
-		public void StartRenamingOf(AxSideTabItem item)
+		public void StartRenamingOf(SideTabItem item)
 		{
 			EnsureVisible(item);
 			renameTabItem = item;
@@ -297,7 +298,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		}
 		
 		
-		public void StartRenamingOf(AxSideTab tab)
+		public void StartRenamingOf(SideTab tab)
 		{
 			int index = Tabs.IndexOf(tab);
 			renameTab        = Tabs[index];
@@ -318,14 +319,14 @@ namespace ICSharpCode.SharpDevelop.Gui
 			Refresh();
 		}
 		
-		public Point GetLocation(AxSideTab whichTab)
+		public Point GetLocation(SideTab whichTab)
 		{
 			int i = 0;
 			
 			int lastUpperY = 0;
 			
 			for (; i < sideTabs.Count; ++i) {
-				AxSideTab tab = sideTabs[i];
+				SideTab tab = sideTabs[i];
 				
 				int yPos = i * (Font.Height + 4 + 1);
 				if (tab == whichTab) {
@@ -340,7 +341,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			int bottom = Height;
 			
 			for (int j = sideTabs.Count - 1; j > i; --j) {
-				AxSideTab tab = sideTabs[j];
+				SideTab tab = sideTabs[j];
 				
 				int yPos = Height - (-j + sideTabs.Count ) * (Font.Height + 4 + 1);
 				
@@ -356,12 +357,12 @@ namespace ICSharpCode.SharpDevelop.Gui
 			return new Point(-1, -1);
 		}
 		
-		public AxSideTab GetTabAt(int x, int y)
+		public SideTab GetTabAt(int x, int y)
 		{
 			int lastUpperY = 0;
 			int i = 0;
 			for (; i < sideTabs.Count; ++i) {
-				AxSideTab tab = sideTabs[i];
+				SideTab tab = sideTabs[i];
 				
 				int yPos = i * (Font.Height + 4 + 1);
 				
@@ -375,7 +376,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			}
 			
 			for (int j = sideTabs.Count - 1; j > i; --j) {
-				AxSideTab tab = sideTabs[j];
+				SideTab tab = sideTabs[j];
 				
 				int yPos = Height - (-j + sideTabs.Count ) * (Font.Height + 4 + 1);
 				
@@ -392,7 +393,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			int lastUpperY = 0;
 			int i = 0;
 			for (; i < sideTabs.Count; ++i) {
-				AxSideTab tab = sideTabs[i];
+				SideTab tab = sideTabs[i];
 				
 				int yPos = i * (Font.Height + 4 + 1);
 				
@@ -405,7 +406,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			}
 			
 			for (int j = sideTabs.Count - 1; j > i; --j) {
-				AxSideTab tab = sideTabs[j];
+				SideTab tab = sideTabs[j];
 				
 				int yPos = Height - (-j + sideTabs.Count ) * (Font.Height + 4 + 1);
 				
@@ -438,10 +439,10 @@ namespace ICSharpCode.SharpDevelop.Gui
 			
 			Point p = PointToClient(new Point(e.X, e.Y));
 			
-			if (e.Data.GetDataPresent(typeof(AxSideTabItem))) {
+			if (e.Data.GetDataPresent(typeof(SideTabItem))) {
 				e.Effect = (e.KeyState & 8) > 0 ? DragDropEffects.Copy : DragDropEffects.Move;
-			} else if (e.Data.GetDataPresent(typeof(AxSideTab))) {
-				AxSideTab tab = (AxSideTab)e.Data.GetData(typeof(AxSideTab));
+			} else if (e.Data.GetDataPresent(typeof(SideTab))) {
+				SideTab tab = (SideTab)e.Data.GetData(typeof(SideTab));
 				if (Tabs.Contains(tab)) {
 					Tabs.DragOverTab = tab;
 					e.Effect = GetDragDropEffect(e);
@@ -469,12 +470,12 @@ namespace ICSharpCode.SharpDevelop.Gui
 			base.OnDragDrop(e);
 			
 			Point p = PointToClient(new Point(e.X, e.Y));
-			if (e.Data.GetDataPresent(typeof(AxSideTabItem))) {
+			if (e.Data.GetDataPresent(typeof(SideTabItem))) {
 				
-				AxSideTabItem draggedItem = (AxSideTabItem)e.Data.GetData(typeof(AxSideTabItem));
+				SideTabItem draggedItem = (SideTabItem)e.Data.GetData(typeof(SideTabItem));
 				
 				// drag tabitem into other sideTab
-				AxSideTab tab = GetTabAt(p.X, p.Y);
+				SideTab tab = GetTabAt(p.X, p.Y);
 				if (tab != null) {
 					if (tab == Tabs.DragOverTab && tab.CanDragDrop) {
 						Tabs.DragOverTab.SideTabStatus = SideTabStatus.Normal;
@@ -487,7 +488,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 								}
 								break;
 							case DragDropEffects.Copy:
-								AxSideTabItem newItem = draggedItem.Clone();
+								SideTabItem newItem = draggedItem.Clone();
 								Tabs.DragOverTab.Items.Add(newItem);
 								break;
 						}
@@ -508,9 +509,9 @@ namespace ICSharpCode.SharpDevelop.Gui
 			}
 		}
 		
-		void ClearDraggings(AxSideTab tab)
+		void ClearDraggings(SideTab tab)
 		{
-			foreach (AxSideTabItem item in tab.Items) {
+			foreach (SideTabItem item in tab.Items) {
 				if (item.SideTabItemStatus == SideTabItemStatus.Drag) {
 					item.SideTabItemStatus = SideTabItemStatus.Normal;
 				}
@@ -523,9 +524,9 @@ namespace ICSharpCode.SharpDevelop.Gui
 			base.OnDragOver(e);
 			
 			Point p = PointToClient(new Point(e.X, e.Y));
-			if (e.Data.GetDataPresent(typeof(AxSideTabItem))) {
+			if (e.Data.GetDataPresent(typeof(SideTabItem))) {
 				ClearDraggings(activeTab);
-				AxSideTab tab = GetTabAt(p.X, p.Y);
+				SideTab tab = GetTabAt(p.X, p.Y);
 				if (tab != null && tab != Tabs.DragOverTab) {
 					if (tab.CanDragDrop) {
 						Tabs.DragOverTab = tab;
@@ -540,7 +541,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 					e.Effect = DragDropEffects.None;
 				}
 			} else if (e.Data.GetDataPresent(typeof(string))) {
-				AxSideTab oldTab = Tabs.DragOverTab;
+				SideTab oldTab = Tabs.DragOverTab;
 				if (activeTabMemberArea.Contains(p.X, p.Y)) {
 					Tabs.DragOverTab = activeTab;
 				} else {
@@ -549,10 +550,10 @@ namespace ICSharpCode.SharpDevelop.Gui
 				if (oldTab != Tabs.DragOverTab) {
 					Refresh();
 				}
-			} else if (e.Data.GetDataPresent(typeof(AxSideTab))) {
+			} else if (e.Data.GetDataPresent(typeof(SideTab))) {
 				int tabIndex = GetTabIndexAt(p.X, p.Y);
 				if (tabIndex != -1) {
-					AxSideTab tab = Tabs.DragOverTab;
+					SideTab tab = Tabs.DragOverTab;
 					Tabs.Remove(tab);
 					Tabs.Insert(tabIndex, tab);
 					Refresh();
@@ -626,7 +627,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			if (e.Button == MouseButtons.Left) {
 				mouseDownPosition = e.Location;
 				
-				AxSideTab tab = GetTabAt(e.X, e.Y);
+				SideTab tab = GetTabAt(e.X, e.Y);
 				if (tab != null) {
 					mouseDownTab = tab;
 					tab.SideTabStatus = SideTabStatus.Selected;
@@ -634,7 +635,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 				}
 			}
 		}
-		AxSideTab mouseDownTab = null;
+		SideTab mouseDownTab = null;
 		
 		protected override void OnMouseUp(MouseEventArgs e)
 		{
@@ -659,7 +660,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			int lastUpperY = 0;
 			
 			for (; i < sideTabs.Count; ++i) {
-				AxSideTab tab = sideTabs[i];
+				SideTab tab = sideTabs[i];
 				
 				int yPos = i * (Font.Height + 4 + 1);
 				tab.DrawTabHeader(g, Font, new Point(0, yPos), Width);
@@ -673,7 +674,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			int bottom = Height;
 			
 			for (int j = sideTabs.Count - 1; j > i; --j) {
-				AxSideTab tab = sideTabs[j];
+				SideTab tab = sideTabs[j];
 				
 				int yPos = Height - (-j + sideTabs.Count ) * (Font.Height + 4 + 1);
 				
@@ -706,10 +707,10 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		protected class SideTabContent : UserControl
 		{
-			AxSideBar sideBar = null;
+			SideBarControl sideBar = null;
 			Point   mousePosition;
 			
-			public AxSideBar SideBar {
+			public SideBarControl SideBar {
 				get {
 					return sideBar;
 				}
@@ -746,7 +747,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 				base.OnDragEnter(e);
 				sideBar.ExitRenameMode();
 				if (sideBar.activeTab.CanDragDrop) {
-					if (e.Data.GetDataPresent(typeof(string)) || e.Data.GetDataPresent(typeof(AxSideTabItem))) {
+					if (e.Data.GetDataPresent(typeof(string)) || e.Data.GetDataPresent(typeof(SideTabItem))) {
 						e.Effect = GetDragDropEffect(e);
 					} else {
 						e.Effect = DragDropEffects.None;
@@ -769,11 +770,11 @@ namespace ICSharpCode.SharpDevelop.Gui
 				base.OnDragDrop(e);
 				
 				Point p = PointToClient(new Point(e.X, e.Y));
-				if (e.Data.GetDataPresent(typeof(AxSideTabItem))) {
-					AxSideTabItem draggedItem = (AxSideTabItem)e.Data.GetData(typeof(AxSideTabItem));
+				if (e.Data.GetDataPresent(typeof(SideTabItem))) {
+					SideTabItem draggedItem = (SideTabItem)e.Data.GetData(typeof(SideTabItem));
 					switch (e.Effect) {
 						case DragDropEffects.Move:
-							AxSideTabItem item = sideBar.activeTab.GetItemAt(p.X, p.Y);
+							SideTabItem item = sideBar.activeTab.GetItemAt(p.X, p.Y);
 							
 							if (item != sideBar.activeTab.ChoosedItem) {
 								int idx = sideBar.activeTab.Items.DraggedIndex;
@@ -784,7 +785,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 							}
 							break;
 						case DragDropEffects.Copy:
-							AxSideTabItem newItem = draggedItem.Clone();
+							SideTabItem newItem = draggedItem.Clone();
 							newItem.SideTabItemStatus = SideTabItemStatus.Normal;
 							sideBar.activeTab.Items.Add(newItem);
 							break;
@@ -805,9 +806,9 @@ namespace ICSharpCode.SharpDevelop.Gui
 				}
 			}
 			
-			void ClearDraggings(AxSideTab tab)
+			void ClearDraggings(SideTab tab)
 			{
-				foreach (AxSideTabItem item in tab.Items) {
+				foreach (SideTabItem item in tab.Items) {
 					if (item.SideTabItemStatus == SideTabItemStatus.Drag) {
 						item.SideTabItemStatus = SideTabItemStatus.Normal;
 					}
@@ -820,10 +821,10 @@ namespace ICSharpCode.SharpDevelop.Gui
 				sideBar.ExitRenameMode();
 				Point p = PointToClient(new Point(e.X, e.Y));
 				
-				if (e.Data.GetDataPresent(typeof(AxSideTabItem))) {
+				if (e.Data.GetDataPresent(typeof(SideTabItem))) {
 					// drag move item inside the activeTabMembarArea
 					if (sideBar.activeTab.CanDragDrop) {
-						AxSideTabItem item = sideBar.activeTab.GetItemAt(p.X, p.Y);
+						SideTabItem item = sideBar.activeTab.GetItemAt(p.X, p.Y);
 						if (item == null) {
 							sideBar.ClearDraggings(sideBar.activeTab);
 							sideBar.Refresh();
@@ -880,7 +881,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			{
 				base.OnMouseMove(e);
 				if (e.Button == MouseButtons.Left) {
-					AxSideTabItem item = sideBar.activeTab.GetItemAt(e.X, e.Y);
+					SideTabItem item = sideBar.activeTab.GetItemAt(e.X, e.Y);
 					
 					if (item != null) {
 						if (IsDragStarted(mouseDownPos, e.Location)) {
@@ -894,10 +895,10 @@ namespace ICSharpCode.SharpDevelop.Gui
 						Refresh();
 					}
 				} else {
-					AxSideTabItem oldItem = sideBar.activeTab.SelectedItem;
+					SideTabItem oldItem = sideBar.activeTab.SelectedItem;
 					sideBar.activeTab.SelectedItem = null;
 					mousePosition = new Point(e.X, e.Y);
-					AxSideTabItem item = sideBar.activeTab.GetItemAt(e.X, e.Y);
+					SideTabItem item = sideBar.activeTab.GetItemAt(e.X, e.Y);
 					
 					if (item != null) {
 						sideBar.activeTab.SelectedItem = item;
@@ -929,13 +930,13 @@ namespace ICSharpCode.SharpDevelop.Gui
 			}
 		}
 		
-		public class SideTabCollection : ICollection<AxSideTab>, IEnumerable<AxSideTab>
+		public class SideTabCollection : ICollection<SideTab>, IEnumerable<SideTab>
 		{
-			List<AxSideTab> list = new List<AxSideTab>();
-			AxSideTab dragOverTab;
-			AxSideBar sideBar;
+			List<SideTab> list = new List<SideTab>();
+			SideTab dragOverTab;
+			SideBarControl sideBar;
 			
-			public AxSideTab this[int index] {
+			public SideTab this[int index] {
 				get {
 					return list[index];
 				}
@@ -944,7 +945,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 				}
 			}
 			
-			public AxSideTab DragOverTab {
+			public SideTab DragOverTab {
 				get {
 					return dragOverTab;
 				}
@@ -958,7 +959,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 					}
 				}
 			}
-			public SideTabCollection(AxSideBar sideBar)
+			public SideTabCollection(SideBarControl sideBar)
 			{
 				this.sideBar = sideBar;
 			}
@@ -980,14 +981,14 @@ namespace ICSharpCode.SharpDevelop.Gui
 				}
 			}
 			
-			public virtual void Add(AxSideTab item)
+			public virtual void Add(SideTab item)
 			{
 				list.Add(item);
 			}
 			
-			public virtual AxSideTab Add(string name)
+			public virtual SideTab Add(string name)
 			{
-				AxSideTab tab = sideBar.SideTabFactory.CreateSideTab(sideBar, name);
+				SideTab tab = sideBar.SideTabFactory.CreateSideTab(sideBar, name);
 				Add(tab);
 				return tab;
 			}
@@ -997,12 +998,12 @@ namespace ICSharpCode.SharpDevelop.Gui
 				list.Clear();
 			}
 			
-			public bool Contains(AxSideTab item)
+			public bool Contains(SideTab item)
 			{
 				return list.Contains(item);
 			}
 			
-			public IEnumerator<AxSideTab> GetEnumerator()
+			public IEnumerator<SideTab> GetEnumerator()
 			{
 				return list.GetEnumerator();
 			}
@@ -1012,28 +1013,28 @@ namespace ICSharpCode.SharpDevelop.Gui
 				return list.GetEnumerator();
 			}
 			
-			public int IndexOf(AxSideTab item)
+			public int IndexOf(SideTab item)
 			{
 				return list.IndexOf(item);
 			}
 			
 			public void CopyTo(Array dest, int index)
 			{
-				list.CopyTo((AxSideTab[])dest, index);
+				list.CopyTo((SideTab[])dest, index);
 			}
 			
-			public virtual AxSideTab Insert(int index, AxSideTab item)
+			public virtual SideTab Insert(int index, SideTab item)
 			{
 				list.Insert(index, item);
 				return item;
 			}
 			
-			public virtual AxSideTab Insert(int index, string name)
+			public virtual SideTab Insert(int index, string name)
 			{
 				return Insert(index, sideBar.SideTabFactory.CreateSideTab(sideBar, name));
 			}
 			
-			public bool Remove(AxSideTab item)
+			public bool Remove(SideTab item)
 			{
 				if (item == sideBar.ActiveTab) {
 					int index =  IndexOf(item);
@@ -1059,7 +1060,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 				}
 			}
 			
-			public void CopyTo(AxSideTab[] array, int arrayIndex)
+			public void CopyTo(SideTab[] array, int arrayIndex)
 			{
 				list.CopyTo(array, arrayIndex);
 			}

src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideTab.cs

@@ -10,9 +10,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 
-using ICSharpCode.Core;
-
-namespace ICSharpCode.SharpDevelop.Gui
+namespace ICSharpCode.SharpDevelop.Widgets.SideBar
 {
 	public enum SideTabStatus {
 		Normal,
@@ -24,14 +22,14 @@ namespace ICSharpCode.SharpDevelop.Gui
 	
 	public class SideTabEventArgs
 	{
-		AxSideTab tab;
+		SideTab tab;
 		
-		public SideTabEventArgs(AxSideTab tab)
+		public SideTabEventArgs(SideTab tab)
 		{
 			this.tab = tab;
 		}
 		
-		public AxSideTab SideTab {
+		public SideTab SideTab {
 			get {
 				return tab;
 			}
@@ -42,14 +40,14 @@ namespace ICSharpCode.SharpDevelop.Gui
 	
 	public class SideTabItemEventArgs
 	{
-		AxSideTabItem item;
+		SideTabItem item;
 		
-		public SideTabItemEventArgs(AxSideTabItem item)
+		public SideTabItemEventArgs(SideTabItem item)
 		{
 			this.item = item;
 		}
 		
-		public AxSideTabItem Item {
+		public SideTabItem Item {
 			get {
 				return item;
 			}
@@ -60,29 +58,29 @@ namespace ICSharpCode.SharpDevelop.Gui
 	
 	public class SideTabItemExchangeEventArgs
 	{
-		AxSideTabItem item1;
-		AxSideTabItem item2;
+		SideTabItem item1;
+		SideTabItem item2;
 		
-		public SideTabItemExchangeEventArgs(AxSideTabItem item1, AxSideTabItem item2)
+		public SideTabItemExchangeEventArgs(SideTabItem item1, SideTabItem item2)
 		{
 			this.item1 = item1;
 			this.item2 = item2;
 		}
 		
-		public AxSideTabItem Item1 {
+		public SideTabItem Item1 {
 			get {
 				return item1;
 			}
 		}
 		
-		public AxSideTabItem Item2 {
+		public SideTabItem Item2 {
 			get {
 				return item2;
 			}
 		}
 	}
 	
-	public class AxSideTab
+	public class SideTab
 	{
 		string    name;
 		bool      canDragDrop  = true;
@@ -91,8 +89,8 @@ namespace ICSharpCode.SharpDevelop.Gui
 		bool      isClipboardRing = false;
 		SideTabItemCollection items = new SideTabItemCollection();
 		SideTabStatus sideTabStatus;
-		AxSideTabItem   selectedItem = null;
-		AxSideTabItem   choosedItem  = null;
+		SideTabItem   selectedItem = null;
+		SideTabItem   choosedItem  = null;
 		
 		ImageList largeImageList = null;
 		ImageList smallImageList = null;
@@ -199,7 +197,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			}
 		}
 		
-		public AxSideTabItem SelectedItem {
+		public SideTabItem SelectedItem {
 			get {
 				return selectedItem;
 			}
@@ -222,7 +220,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		}
 		public event EventHandler ChoosedItemChanged;
 		
-		public AxSideTabItem ChoosedItem {
+		public SideTabItem ChoosedItem {
 			get {
 				return choosedItem;
 			}
@@ -257,23 +255,23 @@ namespace ICSharpCode.SharpDevelop.Gui
 			}
 		}
 		
-		protected AxSideTab()
+		protected SideTab()
 		{
 		}
 		
-		public AxSideTab(ISideTabItemFactory sideTabItemFactory)
+		public SideTab(ISideTabItemFactory sideTabItemFactory)
 		{
 			SideTabItemFactory = sideTabItemFactory;
 		}
 		
-		public AxSideTab(AxSideBar sideBar, string name) : this(sideBar.SideTabItemFactory)
+		public SideTab(SideBarControl sideBar, string name) : this(sideBar.SideTabItemFactory)
 		{
 			this.name = name;
 			SetCanRename();
 			items.ItemRemoved += OnSideTabItemRemoved;
 		}
 		
-		public AxSideTab(string name)
+		public SideTab(string name)
 		{
 			this.name = name;
 			SetCanRename();
@@ -297,12 +295,12 @@ namespace ICSharpCode.SharpDevelop.Gui
 			switch (sideTabStatus) {
 				case SideTabStatus.Normal:
 					ControlPaint.DrawBorder3D(g, new Rectangle(0, pos.Y, width - 4, font.Height + 4), Border3DStyle.RaisedInner);
-					g.DrawString(StringParser.Parse(name), font, SystemBrushes.ControlText, new RectangleF(1, pos.Y + 1, width - 5, font.Height + 1));
+					g.DrawString(name, font, SystemBrushes.ControlText, new RectangleF(1, pos.Y + 1, width - 5, font.Height + 1));
 					
 					break;
 				case SideTabStatus.Selected:
 					ControlPaint.DrawBorder3D(g, new Rectangle(0, pos.Y, width - 4, font.Height + 4), Border3DStyle.Sunken);
-					g.DrawString(StringParser.Parse(name), font, SystemBrushes.ControlText, new RectangleF(1 + 1, pos.Y + 2, width - 5, font.Height + 2));
+					g.DrawString(name, font, SystemBrushes.ControlText, new RectangleF(1 + 1, pos.Y + 2, width - 5, font.Height + 2));
 					break;
 				case SideTabStatus.Dragged:
 					Rectangle r = new Rectangle(0, pos.Y, width - 4, font.Height + 4);
@@ -314,7 +312,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 					
 					g.FillRectangle(SystemBrushes.ControlDarkDark, r);
 					
-					g.DrawString(StringParser.Parse(name), font, SystemBrushes.HighlightText, new RectangleF(1 + 1, pos.Y + 2, width - 5, font.Height + 2));
+					g.DrawString(name, font, SystemBrushes.HighlightText, new RectangleF(1 + 1, pos.Y + 2, width - 5, font.Height + 2));
 					break;
 			}
 		}
@@ -325,10 +323,10 @@ namespace ICSharpCode.SharpDevelop.Gui
 			}
 		}
 		
-		public Point GetLocation(AxSideTabItem whichItem)
+		public Point GetLocation(SideTabItem whichItem)
 		{
 			for (int i = 0; i < Items.Count; ++i) {
-				AxSideTabItem item = (AxSideTabItem)Items[i];
+				SideTabItem item = (SideTabItem)Items[i];
 				if (item == whichItem) {
 					return new Point(0, i * 20);
 				}
@@ -336,13 +334,13 @@ namespace ICSharpCode.SharpDevelop.Gui
 			return new Point(-1, -1);
 		}
 		
-		public AxSideTabItem GetItemAt(int x, int y)
+		public SideTabItem GetItemAt(int x, int y)
 		{
 			int index = ScrollIndex + y / 20;
-			return (index >= 0 && index < Items.Count) ? (AxSideTabItem)Items[index] : null;
+			return (index >= 0 && index < Items.Count) ? (SideTabItem)Items[index] : null;
 		}
 		
-		public AxSideTabItem GetItemAt(Point pos)
+		public SideTabItem GetItemAt(Point pos)
 		{
 			return GetItemAt(pos.X, pos.Y);
 		}
@@ -356,7 +354,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		public void DrawTabContent(Graphics g, Font f, Rectangle rectangle)
 		{
 			for (int i = 0; i + ScrollIndex < Items.Count; ++i) {
-				AxSideTabItem item = (AxSideTabItem)Items[ScrollIndex + i];
+				SideTabItem item = (SideTabItem)Items[ScrollIndex + i];
 				if (rectangle.Height < i * ItemHeight) {
 					break;
 				}
@@ -372,8 +370,8 @@ namespace ICSharpCode.SharpDevelop.Gui
 		/// </summary>
 		public void Exchange(int a, int b)
 		{
-			AxSideTabItem itemA = Items[a];
-			AxSideTabItem itemB = Items[b];
+			SideTabItem itemA = Items[a];
+			SideTabItem itemB = Items[b];
 			Items[a] = itemB;
 			Items[b] = itemA;
 			OnExchange(itemA, itemB);
@@ -393,16 +391,16 @@ namespace ICSharpCode.SharpDevelop.Gui
 			}
 		}
 		
-		void OnExchange(AxSideTabItem item1, AxSideTabItem item2)
+		void OnExchange(SideTabItem item1, SideTabItem item2)
 		{
 			if (ItemsExchanged != null) {
 				ItemsExchanged(this, new SideTabItemExchangeEventArgs(item1, item2));
 			}
 		}
 
-		public class SideTabItemCollection : ICollection<AxSideTabItem>, IEnumerable<AxSideTabItem>
+		public class SideTabItemCollection : ICollection<SideTabItem>, IEnumerable<SideTabItem>
 		{
-			List<AxSideTabItem> list = new List<AxSideTabItem>();
+			List<SideTabItem> list = new List<SideTabItem>();
 			ISideTabItemFactory sideTabItemFactory = new DefaultSideTabItemFactory();
 			
 			public event SideTabItemEventHandler ItemRemoved;
@@ -420,9 +418,9 @@ namespace ICSharpCode.SharpDevelop.Gui
 			{
 			}
 			
-			public AxSideTabItem this[int index] {
+			public SideTabItem this[int index] {
 				get {
-					return (AxSideTabItem)list[index];
+					return (SideTabItem)list[index];
 				}
 				set {
 					list[index] = value;
@@ -457,19 +455,19 @@ namespace ICSharpCode.SharpDevelop.Gui
 				}
 			}
 			
-			public virtual void Add(AxSideTabItem item)
+			public virtual void Add(SideTabItem item)
 			{
 				list.Add(item);
 			}
 						
-			public virtual AxSideTabItem Add(string name, object content)
+			public virtual SideTabItem Add(string name, object content)
 			{
 				return Add(name, content, -1);
 			}
 			
-			public virtual AxSideTabItem Add(string name, object content, int imageIndex)
+			public virtual SideTabItem Add(string name, object content, int imageIndex)
 			{
-				AxSideTabItem item = sideTabItemFactory.CreateSideTabItem(name, imageIndex);
+				SideTabItem item = sideTabItemFactory.CreateSideTabItem(name, imageIndex);
 				item.Tag = content;
 				Add(item);
 				return item;
@@ -480,12 +478,12 @@ namespace ICSharpCode.SharpDevelop.Gui
 				list.Clear();
 			}
 			
-			public bool Contains(AxSideTabItem item)
+			public bool Contains(SideTabItem item)
 			{
 				return list.Contains(item);
 			}
 			
-			public IEnumerator<AxSideTabItem> GetEnumerator()
+			public IEnumerator<SideTabItem> GetEnumerator()
 			{
 				return list.GetEnumerator();
 			}
@@ -495,35 +493,35 @@ namespace ICSharpCode.SharpDevelop.Gui
 				return list.GetEnumerator();
 			}
 			
-			public int IndexOf(AxSideTabItem item)
+			public int IndexOf(SideTabItem item)
 			{
 				return list.IndexOf(item);
 			}
 			
 			public void CopyTo(Array dest, int index)
 			{
-				list.CopyTo((AxSideTabItem[])dest, index);
+				list.CopyTo((SideTabItem[])dest, index);
 			}
 			
-			public virtual AxSideTabItem Insert(int index, AxSideTabItem item)
+			public virtual SideTabItem Insert(int index, SideTabItem item)
 			{
 				list.Insert(index, item);
 				return item;
 			}
 			
-			public virtual AxSideTabItem Insert(int index, string name, object content)
+			public virtual SideTabItem Insert(int index, string name, object content)
 			{
 				return Insert(index, name, content, -1);
 			}
 			
-			public virtual AxSideTabItem Insert(int index, string name, object content, int imageIndex)
+			public virtual SideTabItem Insert(int index, string name, object content, int imageIndex)
 			{
-				AxSideTabItem item = sideTabItemFactory.CreateSideTabItem(name, imageIndex);
+				SideTabItem item = sideTabItemFactory.CreateSideTabItem(name, imageIndex);
 				item.Tag = content;
 				return Insert(index, item);
 			}
 			
-			public virtual bool Remove(AxSideTabItem item)
+			public virtual bool Remove(SideTabItem item)
 			{
 				bool r = list.Remove(item);
 				OnItemRemoved(item);
@@ -535,12 +533,12 @@ namespace ICSharpCode.SharpDevelop.Gui
 				if (index < 0 || index >= list.Count) {
 					return;
 				}
-				AxSideTabItem item = this[index];
+				SideTabItem item = this[index];
 				list.Remove(item);
 				OnItemRemoved(item);
 			}
 			
-			void OnItemRemoved(AxSideTabItem item)
+			void OnItemRemoved(SideTabItem item)
 			{
 				if (ItemRemoved != null) {
 					ItemRemoved(this, new SideTabItemEventArgs(item));
@@ -553,7 +551,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 				}
 			}
 			
-			public void CopyTo(AxSideTabItem[] array, int arrayIndex)
+			public void CopyTo(SideTabItem[] array, int arrayIndex)
 			{
 				throw new NotImplementedException();
 			}

src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideTabItem.cs

@@ -9,7 +9,7 @@ using System;
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace ICSharpCode.SharpDevelop.Gui
+namespace ICSharpCode.SharpDevelop.Widgets.SideBar
 {
 	public enum SideTabItemStatus {
 		Normal,
@@ -18,7 +18,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		Drag
 	}
 	
-	public class AxSideTabItem
+	public class SideTabItem
 	{
 		string name;
 		object tag;
@@ -81,7 +81,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			}
 		}
 		
-		public AxSideTabItem(string name)
+		public SideTabItem(string name)
 		{
 			int idx = name.IndexOf("\n");
 			if (idx > 0) {
@@ -91,19 +91,19 @@ namespace ICSharpCode.SharpDevelop.Gui
 			}			
 		}
 		
-		public AxSideTabItem(string name, object tag) : this(name)
+		public SideTabItem(string name, object tag) : this(name)
 		{
 			this.tag = tag;
 		}
 		
-		public AxSideTabItem(string name, object tag, Bitmap icon) : this(name, tag)
+		public SideTabItem(string name, object tag, Bitmap icon) : this(name, tag)
 		{
 			this.icon = new Bitmap(icon);
 		}
 		
-		public AxSideTabItem Clone()
+		public SideTabItem Clone()
 		{
-			return (AxSideTabItem)MemberwiseClone();
+			return (SideTabItem)MemberwiseClone();
 		}
 		
 		public virtual void DrawItem(Graphics g, Font f, Rectangle rectangle)