[Monodevelop-patches-list] r2342 - in trunk/MonoDevelop/Core/src/MonoDevelop.Base: . Gui/Workbench/Layouts

[Todd Berman <tberman@sevenl.net>]

Author: tberman
Date: 2005-03-13 17:05:18 -0500 (Sun, 13 Mar 2005)
New Revision: 2342

Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
Log:
2005-03-13  Todd Berman  <tberman at off.net>

	* Gui/Workbench/Layouts/SdiWorkspaceWindow.cs: Don't use a dock, this
	is insane, and it always was.



Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-03-13 20:22:01 UTC (rev 2341)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-03-13 22:05:18 UTC (rev 2342)
@@ -1,3 +1,8 @@
+2005-03-13  Todd Berman  <tberman at off.net>
+
+	* Gui/Workbench/Layouts/SdiWorkspaceWindow.cs: Don't use a dock, this
+	is insane, and it always was.
+
 2005-03-12  John Luke  <john.luke at gmail.com>
 
 	* Makefile.am: use MonoDevelop.Dock.dll

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs	2005-03-13 20:22:01 UTC (rev 2341)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs	2005-03-13 22:05:18 UTC (rev 2342)
@@ -20,13 +20,12 @@
 
 namespace MonoDevelop.Gui
 {
-	public class SdiWorkspaceWindow : Dock, IWorkbenchWindow
+	public class SdiWorkspaceWindow : Frame, IWorkbenchWindow
 	{
 		Notebook   viewTabControl = null;
 		IViewContent content;
 		ArrayList    subViewContents = null;
 
-		DockItem mainItem;
 		ArrayList    subDockItems = null;
 		
 		TabLabel tabLabel;
@@ -127,11 +126,10 @@
 			content.DirtyChanged       += new EventHandler(SetTitleEvent);
 			content.BeforeSave         += new EventHandler(BeforeSave);
 			content.ContentChanged     += new EventHandler (OnContentChanged);
-
-			mainItem = new DockItem (content.TabPageLabel, content.TabPageLabel, DockItemBehavior.Locked | DockItemBehavior.CantClose | DockItemBehavior.CantIconify);
-			mainItem.Add (content.Control);
-			mainItem.ShowAll ();
-			AddItem (mainItem, DockPlacement.Center);
+			ShadowType = ShadowType.None;
+			Add (content.Control);
+			content.Control.ShowAll ();
+			ShowAll ();
 			SetTitleEvent(null, null);
 		}
 		
@@ -251,7 +249,6 @@
 				WorkbenchSingleton.Workbench.WorkbenchLayout.RemoveTab (pageNum);
 			}
 			OnWindowDeselected(EventArgs.Empty);
-			mainItem.Remove (content.Control);
 			content.Dispose ();
 			OnCloseEvent(null);
 			content = null;
@@ -259,7 +256,8 @@
 		
 		public void AttachSecondaryViewContent(ISecondaryViewContent subViewContent)
 		{
-			if (subViewContents == null) {
+			// FIXME: We should use a notebook instead.
+			/*if (subViewContents == null) {
 				subViewContents = new ArrayList ();
 				subDockItems = new ArrayList ();
 			}
@@ -272,7 +270,7 @@
 			dockitem.ShowAll ();
 			subDockItems.Add (dockitem);
 			AddItem (dockitem, DockPlacement.Bottom);
-			OnContentChanged (null, null);
+			OnContentChanged (null, null);*/
 		}
 		
 		int oldIndex = -1;