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

[John Luke <jluke@cfl.rr.com>]

Author: jluke
Date: 2005-03-09 13:50:57 -0500 (Wed, 09 Mar 2005)
New Revision: 2321

Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
Log:
remove unused code that was causing an assertion


Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-03-09 04:01:53 UTC (rev 2320)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-03-09 18:50:57 UTC (rev 2321)
@@ -1,3 +1,9 @@
+2005-03-09  John Luke  <john.luke at gmail.com>
+
+	* Gui/Workbench/Layouts/SdiWorkspaceLayout.cs:
+	remove toolbarContainer that was causing an assertion
+	and was no longer used
+
 2005-03-08  Todd Berman  <tberman at off.net>
 
 	* Gui/AbstractViewContent.cs: only emit an event when the name

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs	2005-03-09 04:01:53 UTC (rev 2320)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs	2005-03-09 18:50:57 UTC (rev 2321)
@@ -40,7 +40,6 @@
 		
 		Window wbWindow;
 		Container rootWidget;
-		VBox toolbarContainer;
 		Dock dock;
 		DockLayout dockLayout;
 		DragNotebook tabControl;
@@ -71,14 +70,12 @@
 
 			vbox.PackStart (workbench.TopMenu, false, false, 0);
 			if (workbench.ToolBars != null) {
-				toolbarContainer = new VBox (false, 0);
 				for (int i = 0; i < workbench.ToolBars.Length; i++) {
 					Gtk.HandleBox toolHandleBox = new Gtk.HandleBox ();
 					toolHandleBox.Shadow = Gtk.ShadowType.None;
 					toolHandleBox.Add (workbench.ToolBars[i]);
 					vbox.PackStart (toolHandleBox, false, false, 0);
 				}
-				//vbox.PackStart(toolbarContainer, false, false, 0);
 			}
 			
 			// Create the docking widget and add it to the window.
@@ -330,10 +327,6 @@
 			dockLayout.SaveLayout (currentLayout);
 			dockLayout.SaveToFile (configFile);
 			rootWidget.Remove(((DefaultWorkbench)workbench).TopMenu);
-			foreach (Gtk.Widget w in toolbarContainer.Children) {
-				toolbarContainer.Remove(w);
-			}
-			rootWidget.Remove(toolbarContainer);
 			wbWindow.Remove(rootWidget);
 			activePadCollection = null;
 		}