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

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

Author: jluke
Date: 2005-02-28 17:51:05 -0500 (Mon, 28 Feb 2005)
New Revision: 2279

Modified:
   trunk/MonoDevelop/Unused/Gdl/DockBar.cs
   trunk/MonoDevelop/Unused/Gdl/DockMaster.cs
   trunk/MonoDevelop/Unused/Gdl/GdlDockTest.cs
Log:
make the dockmaster control the dockbar


Modified: trunk/MonoDevelop/Unused/Gdl/DockBar.cs
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/DockBar.cs	2005-02-28 22:25:46 UTC (rev 2278)
+++ trunk/MonoDevelop/Unused/Gdl/DockBar.cs	2005-02-28 22:51:05 UTC (rev 2279)
@@ -11,9 +11,8 @@
 		DockMaster master;
 		Tooltips tooltips = new Tooltips ();
 		
-		public DockBar (Dock dock)
+		public DockBar ()
 		{
-			this.Attach (dock.Master);
 		}
 		
 		public DockMaster Master {
@@ -35,7 +34,7 @@
 			item.DockBar = this;
 			item.DockBarButton = button;
 			this.PackStart (button, false, false, 0);
-			button.ShowAll ();
+			this.ShowAll ();
 		}
 		
 		public void Attach (DockMaster master)
@@ -44,7 +43,6 @@
 				master.LayoutChanged -= OnLayoutChanged;
 
 			this.master = master;
-			master.DockBar = this;
 			master.LayoutChanged += OnLayoutChanged;
 		}
 		

Modified: trunk/MonoDevelop/Unused/Gdl/DockMaster.cs
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/DockMaster.cs	2005-02-28 22:25:46 UTC (rev 2278)
+++ trunk/MonoDevelop/Unused/Gdl/DockMaster.cs	2005-02-28 22:51:05 UTC (rev 2279)
@@ -73,8 +73,12 @@
 			}
 		}
 
-		internal DockBar DockBar {
+		public DockBar DockBar {
 			get {
+				if (dockBar == null) {
+					dockBar = new DockBar ();
+					dockBar.Attach (this);
+				}
 				return dockBar;
 			}
 			set {

Modified: trunk/MonoDevelop/Unused/Gdl/GdlDockTest.cs
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/GdlDockTest.cs	2005-02-28 22:25:46 UTC (rev 2278)
+++ trunk/MonoDevelop/Unused/Gdl/GdlDockTest.cs	2005-02-28 22:51:05 UTC (rev 2279)
@@ -22,7 +22,7 @@
 		
 		Dock dock = new Dock ();		
 		DockLayout layout = new DockLayout (dock);
-		DockBar dockbar = new DockBar (dock);
+		DockBar dockbar = dock.Master.DockBar;
 		
 		Box box = new HBox (false, 5);
 		box.PackStart (dockbar, false, false, 0);