[Monodevelop-patches-list] r2347 - in trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor: . Gui

[Lluis Sanchez <lluis@ximian.com>]

Author: lluis
Date: 2005-03-14 18:33:00 -0500 (Mon, 14 Mar 2005)
New Revision: 2347

Modified:
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs
Log:
2005-03-14  Lluis Sanchez Gual  <lluis at novell.com>

	* Gui/SourceEditorWidget.cs: Added IntPtr constructor. Nullify
	DisplayBinding field on dispose.
	* Gui/SourceEditorDisplayBinding.cs: Set SourceEditor to null on dispose.



Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2005-03-14 23:32:08 UTC (rev 2346)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2005-03-14 23:33:00 UTC (rev 2347)
@@ -1,3 +1,9 @@
+2005-03-14  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* Gui/SourceEditorWidget.cs: Added IntPtr constructor. Nullify
+	DisplayBinding field on dispose.
+	* Gui/SourceEditorDisplayBinding.cs: Set SourceEditor to null on dispose.
+
 2005-03-10  John Luke  <john.luke at gmail.com>
 
 	* Gui/SourceEditorView.cs:

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs	2005-03-14 23:32:08 UTC (rev 2346)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs	2005-03-14 23:33:00 UTC (rev 2347)
@@ -248,6 +248,7 @@
 			ContentNameChanged -= new EventHandler (UpdateFSW);
 			se.Dispose ();
 			fsw.Dispose ();
+			se = null;
 		}
 		
 		void OnModifiedChanged (object o, EventArgs e)
@@ -380,7 +381,7 @@
 		bool needsUpdate;
 		bool BounceAndGrab ()
 		{
-			if (needsUpdate) {
+			if (needsUpdate && se != null) {
 				cachedText = se.Buffer.Text;
 				needsUpdate = false;
 			}

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs	2005-03-14 23:32:08 UTC (rev 2346)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs	2005-03-14 23:33:00 UTC (rev 2347)
@@ -11,6 +11,10 @@
 		public SourceEditorView View;
 		public SourceEditorDisplayBindingWrapper DisplayBinding;
 		
+		protected SourceEditor (IntPtr ptr): base (ptr)
+		{
+		}
+		
 		public SourceEditor (SourceEditorDisplayBindingWrapper bind)
 		{
 			ShadowType = Gtk.ShadowType.In;
@@ -34,6 +38,7 @@
 			Remove (View);
 			View.Dispose ();
 			View = null;
+			DisplayBinding = null;
 			base.Dispose ();
 		}