[Monodevelop-patches-list] r2280 - trunk/MonoDevelop/Unused/Gdl

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

Author: jluke
Date: 2005-02-28 18:26:42 -0500 (Mon, 28 Feb 2005)
New Revision: 2280

Modified:
   trunk/MonoDevelop/Unused/Gdl/DockBar.cs
   trunk/MonoDevelop/Unused/Gdl/DockItem.cs
   trunk/MonoDevelop/Unused/Gdl/DockMaster.cs
Log:
fix a little better


Modified: trunk/MonoDevelop/Unused/Gdl/DockBar.cs
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/DockBar.cs	2005-02-28 22:51:05 UTC (rev 2279)
+++ trunk/MonoDevelop/Unused/Gdl/DockBar.cs	2005-02-28 23:26:42 UTC (rev 2280)
@@ -48,14 +48,23 @@
 		
 		public void RemoveItem (DockItem item)
 		{
-			// check if there
-			this.Remove (item.DockBarButton);
+			// we can only remove if it is there
+			foreach (DockBarButton dbb in this.Children) {
+				if (dbb == item.DockBarButton) {
+					this.Remove (item.DockBarButton);
+					return;
+				}
+			}
 		}
 		
 		void UpdateDockItems ()
 		{
-			foreach (DockItem item in master.DockObjects)
+			foreach (object o in master.DockObjects)
 			{
+				DockItem item = o as DockItem;
+				if (item == null)
+					continue;
+
 				if (item.Iconified)
 					this.AddItem (item);
 				else

Modified: trunk/MonoDevelop/Unused/Gdl/DockItem.cs
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/DockItem.cs	2005-02-28 22:51:05 UTC (rev 2279)
+++ trunk/MonoDevelop/Unused/Gdl/DockItem.cs	2005-02-28 23:26:42 UTC (rev 2280)
@@ -906,7 +906,8 @@
 		{
 			DockObjectFlags |= DockObjectFlags.Iconified;
 			HideItem ();
-			Master.DockBar.AddItem (this);
+			//Master.DockBar.AddItem (this);
+			Master.EmitLayoutChangedEvent ();
 		}
 		
 		public void ShowItem ()

Modified: trunk/MonoDevelop/Unused/Gdl/DockMaster.cs
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/DockMaster.cs	2005-02-28 22:51:05 UTC (rev 2279)
+++ trunk/MonoDevelop/Unused/Gdl/DockMaster.cs	2005-02-28 23:26:42 UTC (rev 2280)
@@ -115,7 +115,7 @@
 			if (obj == null)
 				return;
 
-			if (!obj.IsAutomatic) {
+			//if (!obj.IsAutomatic) {
 				/* create a name for the object if it doesn't have one */
 				if (obj.Name == null)
 					obj.Name = "__dock_" + number++;
@@ -125,7 +125,7 @@
 					Console.WriteLine ("Unable to add object, name \"{0}\" taken", obj.Name);
 				else
 					dockObjects.Add (obj.Name, obj);
-			}
+			//}
 			
 			if (obj is Dock) {
 				/* if this is the first toplevel we are adding, name it controller */