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

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

Author: tberman
Date: 2004-06-12 19:37:47 -0400 (Sat, 12 Jun 2004)
New Revision: 1752

Modified:
   trunk/MonoDevelop/src/Libraries/Gdl/Dock.cs
   trunk/MonoDevelop/src/Libraries/Gdl/DockItem.cs
   trunk/MonoDevelop/src/Libraries/Gdl/DockItemGrip.cs
   trunk/MonoDevelop/src/Libraries/Gdl/DockNotebook.cs
   trunk/MonoDevelop/src/Libraries/Gdl/DockObject.cs
   trunk/MonoDevelop/src/Libraries/Gdl/DockPaned.cs
   trunk/MonoDevelop/src/Libraries/Gdl/DockPlaceholder.cs
Log:
commented out OnDestroy stuff, the one in Dock seems to break stuff.


Modified: trunk/MonoDevelop/src/Libraries/Gdl/Dock.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/Dock.cs	2004-06-12 23:16:40 UTC (rev 1751)
+++ trunk/MonoDevelop/src/Libraries/Gdl/Dock.cs	2004-06-12 23:37:47 UTC (rev 1752)
@@ -232,7 +232,7 @@
 			}
 		}
 
-		protected override void OnDestroyed ()
+		/*protected override void OnDestroyed ()
 		{
 			if (window != null) {
 				window.Destroy ();
@@ -242,7 +242,7 @@
 			if (xorGC != null)
 				xorGC = null;
 			base.OnDestroyed ();
-		}
+		}*/
 		
 		protected override void OnAdded (Widget widget)
 		{

Modified: trunk/MonoDevelop/src/Libraries/Gdl/DockItem.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/DockItem.cs	2004-06-12 23:16:40 UTC (rev 1751)
+++ trunk/MonoDevelop/src/Libraries/Gdl/DockItem.cs	2004-06-12 23:37:47 UTC (rev 1752)
@@ -428,6 +428,24 @@
 					GdkWindow.Clear ();
 			}
 		}
+
+		/*protected override void OnDestroyed ()
+		{
+			if (tabLabel != null)
+				tabLabel = null;
+			if (menu != null) {
+				menu.Detach ();
+				menu = null;
+			}
+			if (grip != null) {
+				Remove (grip);
+				grip = null;
+			}
+			if (ph != null) {
+				ph = null;
+			}
+			base.OnDestroyed ();
+		}*/
 		
 		protected override bool OnExposeEvent (Gdk.EventExpose evnt)
 		{
@@ -831,18 +849,7 @@
 			if (!(widget is DockItem))
 				return;
 			DockItem item = widget as DockItem;
-			if (!(item.IsAttached))
-				return;
-			if (!(item.IsAutomatic))
-				item.ph = new DockPlaceholder (this, false);
-			
-			item.Freeze ();
-			if (item.IsCompound) {
-				item.Foreach (new Callback (HideItem));
-			}
-			
-			item.Detach (true);
-			item.Thaw ();
+			item.HideItem ();
 		}
 		
 		public void IconifyItem ()

Modified: trunk/MonoDevelop/src/Libraries/Gdl/DockItemGrip.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/DockItemGrip.cs	2004-06-12 23:16:40 UTC (rev 1751)
+++ trunk/MonoDevelop/src/Libraries/Gdl/DockItemGrip.cs	2004-06-12 23:37:47 UTC (rev 1752)
@@ -131,7 +131,22 @@
 				title_layout.SingleParagraphMode = true;
 			}
 		}
-		
+
+		/*protected override void OnDestroyed ()
+		{
+			if (title_layout != null)
+				title_layout = null;
+			if (icon_pixbuf != null)
+				icon_pixbuf = null;
+			if (tooltips != null)
+				tooltips = null;
+			if (item != null) {
+				//TODO: Disconnect future signal handlers for notify.
+			}
+			item = null;
+			base.OnDestroyed ();
+		}*/
+	
 		protected override bool OnExposeEvent (Gdk.EventExpose evnt)
 		{
 			Gdk.Rectangle title_area = GetTitleArea ();

Modified: trunk/MonoDevelop/src/Libraries/Gdl/DockNotebook.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/DockNotebook.cs	2004-06-12 23:16:40 UTC (rev 1751)
+++ trunk/MonoDevelop/src/Libraries/Gdl/DockNotebook.cs	2004-06-12 23:37:47 UTC (rev 1752)
@@ -51,6 +51,15 @@
 		{
 			//Does this code need to be ported at all?
 		}
+
+		/*protected override void OnDestroyed ()
+		{
+			base.OnDestroyed ();
+			if (Child != null) {
+				Child.Unparent ();
+				Child = null;
+			}
+		}*/
 		
 		protected override void OnAdded (Widget widget)
 		{

Modified: trunk/MonoDevelop/src/Libraries/Gdl/DockObject.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/DockObject.cs	2004-06-12 23:16:40 UTC (rev 1751)
+++ trunk/MonoDevelop/src/Libraries/Gdl/DockObject.cs	2004-06-12 23:37:47 UTC (rev 1752)
@@ -118,6 +118,27 @@
 				stockid = value;
 			}
 		}
+
+		private void ForeachDetach (Widget w)
+		{
+			if (w is DockObject)
+				((DockObject)w).Detach (true);
+		}
+
+		/*protected override void OnDestroyed ()
+		{
+			if (IsCompound) {
+				Freeze ();
+				Foreach (new Gtk.Callback (ForeachDetach));
+				reducePending = false;
+				Thaw ();
+			}
+			if (IsAttached)
+				Detach (false);
+			if (Master != null)
+				Unbind ();
+			base.OnDestroyed ();
+		}*/
 		
 		protected override void OnShown ()
 		{

Modified: trunk/MonoDevelop/src/Libraries/Gdl/DockPaned.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/DockPaned.cs	2004-06-12 23:16:40 UTC (rev 1751)
+++ trunk/MonoDevelop/src/Libraries/Gdl/DockPaned.cs	2004-06-12 23:37:47 UTC (rev 1752)
@@ -85,7 +85,16 @@
 		{
 			stored_invoker.Invoke (widget);
 		}
-		
+
+		/*protected override void OnDestroyed ()
+		{
+			base.OnDestroyed ();
+			if (Child != null) {
+				Child.Unparent ();
+				Child = null;
+			}
+		}*/	
+	
 		private CallbackInvoker stored_invoker;
 		protected override void ForAll (bool include_internals, CallbackInvoker invoker)
 		{

Modified: trunk/MonoDevelop/src/Libraries/Gdl/DockPlaceholder.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/DockPlaceholder.cs	2004-06-12 23:16:40 UTC (rev 1751)
+++ trunk/MonoDevelop/src/Libraries/Gdl/DockPlaceholder.cs	2004-06-12 23:37:47 UTC (rev 1752)
@@ -65,6 +65,13 @@
 				placement_stack.Insert (0, value);
 			}
 		}
+
+		/*protected override void OnDestroyed ()
+		{
+			if (host != null)
+				OnDetached (false);
+			base.OnDestroyed ();
+		}*/
 		
 		protected override void OnAdded (Widget widget)
 		{