[Monodevelop-patches-list] r1722 - trunk/MonoDevelop/src/Libraries/Gdl

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2004-06-09 02:42:10 -0400 (Wed, 09 Jun 2004)
New Revision: 1722

Modified:
   trunk/MonoDevelop/src/Libraries/Gdl/Dock.cs
   trunk/MonoDevelop/src/Libraries/Gdl/DockItem.cs
   trunk/MonoDevelop/src/Libraries/Gdl/DockNotebook.cs
   trunk/MonoDevelop/src/Libraries/Gdl/DockObject.cs
   trunk/MonoDevelop/src/Libraries/Gdl/GdlDockTest.cs
Log:
got the notebook working a bit better, still some strangeness... in fact, still a lot of strangeness


Modified: trunk/MonoDevelop/src/Libraries/Gdl/Dock.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/Dock.cs	2004-06-09 01:20:53 UTC (rev 1721)
+++ trunk/MonoDevelop/src/Libraries/Gdl/Dock.cs	2004-06-09 06:42:10 UTC (rev 1722)
@@ -292,7 +292,6 @@
 		{
 			if (!(requestor is DockItem))
 				return;
-			Console.WriteLine ("requestor is a DockItem");
 			if (position == DockPlacement.Floating) {
 				Console.WriteLine ("Adding a floating dockitem");
 				DockItem item = requestor as DockItem;

Modified: trunk/MonoDevelop/src/Libraries/Gdl/DockItem.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/DockItem.cs	2004-06-09 01:20:53 UTC (rev 1721)
+++ trunk/MonoDevelop/src/Libraries/Gdl/DockItem.cs	2004-06-09 06:42:10 UTC (rev 1722)
@@ -548,6 +548,7 @@
 		{
 			DockObject new_parent = null;
 			bool add_ourselves_first;
+			DockObject parentObj = this.ParentObject;
 			
 			switch (position) {
 			case DockPlacement.Top:
@@ -576,6 +577,7 @@
 			new_parent.Freeze ();
 			new_parent.Bind (this.Master);
 			
+			Console.WriteLine ("About to add");
 			if (add_ourselves_first) {
 				new_parent.Add (this);
 				new_parent.Add (requestor);
@@ -583,9 +585,13 @@
 				new_parent.Add (requestor);
 				new_parent.Add (this);
 			}
+			Console.WriteLine ("Done Adding");
 			
-			if (this.ParentObject != null)
-				this.ParentObject.Add (new_parent);
+			if (parentObj != null) {
+				Console.WriteLine ("About to add new_parent to ParentObject");
+				parentObj.Add (new_parent);
+				Console.WriteLine ("Done with the second add");
+			}
 			
 			if (this.Visible)
 				new_parent.Show ();

Modified: trunk/MonoDevelop/src/Libraries/Gdl/DockNotebook.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/DockNotebook.cs	2004-06-09 01:20:53 UTC (rev 1721)
+++ trunk/MonoDevelop/src/Libraries/Gdl/DockNotebook.cs	2004-06-09 06:42:10 UTC (rev 1722)
@@ -100,6 +100,7 @@
 					int new_position = -1;
 					if (extra_data is Int32)
 						new_position = Convert.ToInt32 (extra_data);
+					Console.WriteLine (requestor_item + " --> " + requestor_item.Child + " <-- " + requestor_item.Child.Parent);
 					((Gtk.Notebook)this.Child).InsertPage (requestor, label, new_position);
 					requestor.DockObjectFlags |= DockObjectFlags.Attached;
 				}
@@ -163,7 +164,7 @@
 		}
 		
 		public override bool IsCompound {
-			get { return false; }
+			get { return true; }
 		}
 		
 		public int Page {

Modified: trunk/MonoDevelop/src/Libraries/Gdl/DockObject.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/DockObject.cs	2004-06-09 01:20:53 UTC (rev 1721)
+++ trunk/MonoDevelop/src/Libraries/Gdl/DockObject.cs	2004-06-09 06:42:10 UTC (rev 1722)
@@ -10,7 +10,6 @@
 {
 	public class DockObject : Gtk.Container
 	{	
-		private Gtk.Container container;
 		private Gdl.DockObjectFlags flags;
 		private int freeze_count;
 		private DockMaster master;

Modified: trunk/MonoDevelop/src/Libraries/Gdl/GdlDockTest.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/GdlDockTest.cs	2004-06-09 01:20:53 UTC (rev 1721)
+++ trunk/MonoDevelop/src/Libraries/Gdl/GdlDockTest.cs	2004-06-09 06:42:10 UTC (rev 1722)
@@ -30,11 +30,11 @@
 		di.Add (new Label ("test"));
 		dock.AddItem (di, DockPlacement.Center);
 		
-		/*DockItem di2 = new DockItem ("item2", "Item #2", DockItemBehavior.Normal);
+		DockItem di2 = new DockItem ("item2", "Item #2", DockItemBehavior.Normal);
 		di2.Add (new Label ("test2"));
 		dock.AddItem (di2, DockPlacement.Center);
 		
-		DockItem di3 = new DockItem ("item3", "Item #3", DockItemBehavior.Normal);
+		/*DockItem di3 = new DockItem ("item3", "Item #3", DockItemBehavior.Normal);
 		di3.Add (new Label ("test3"));
 		dock.AddItem (di3, DockPlacement.Center);
 		
@@ -47,6 +47,9 @@
 		Console.WriteLine ("2");
 		app.ShowAll ();
 		Console.WriteLine ("3");
+		if (dock.Root == null) {
+			Console.WriteLine ("Crap, dock.root is null");
+		}
 		Gtk.Application.Run ();
 		Console.WriteLine ("4");
 	}