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

[Lluis Sanchez <lluis@ximian.com>]

Author: lluis
Date: 2005-04-25 06:02:22 -0400 (Mon, 25 Apr 2005)
New Revision: 2470

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

	* Gui/SourceEditorWidget.cs:
	* Gui/SourceEditorBuffer.cs:
	* SourceEditorDisplayBinding.cs: Improve memory usage.



Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2005-04-25 09:55:59 UTC (rev 2469)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2005-04-25 10:02:22 UTC (rev 2470)
@@ -1,3 +1,9 @@
+2005-04-25  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* Gui/SourceEditorWidget.cs:
+	* Gui/SourceEditorBuffer.cs:
+	* SourceEditorDisplayBinding.cs: Improve memory usage.
+
 2005-04-17  John Luke  <john.luke at gmail.com>
 
 	* Makefile.am: fix distcheck

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs	2005-04-25 09:55:59 UTC (rev 2469)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs	2005-04-25 10:02:22 UTC (rev 2470)
@@ -123,6 +123,11 @@
 			highlightLineTag.Background = "lightgrey";
 			TagTable.Add (highlightLineTag);
 		}
+		
+		public void Dispose ()
+		{
+			Language = null;
+		}
 
 		void ParseChanged (object o, ParseInformationEventArgs e)
 		{

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs	2005-04-25 09:55:59 UTC (rev 2469)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs	2005-04-25 10:02:22 UTC (rev 2470)
@@ -240,6 +240,7 @@
 		
 		public override void Dispose()
 		{
+			mainBox.Remove (se);
 			properties.PropertyChanged -= new PropertyEventHandler (PropertiesChanged);
 			se.Buffer.ModifiedChanged -= new EventHandler (OnModifiedChanged);
 			se.Buffer.MarkSet -= new MarkSetHandler (OnMarkSet);

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs	2005-04-25 09:55:59 UTC (rev 2469)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs	2005-04-25 10:02:22 UTC (rev 2470)
@@ -11,6 +11,17 @@
 		public SourceEditorView View;
 		public SourceEditorDisplayBindingWrapper DisplayBinding;
 		
+		static Gdk.Pixbuf dragIconPixbuf;
+		static Gdk.Pixbuf executionMarkerPixbuf;
+		static Gdk.Pixbuf breakPointPixbuf;
+		
+		static SourceEditor ()
+		{
+			dragIconPixbuf = new Gdk.Pixbuf (drag_icon_xpm);
+			executionMarkerPixbuf = new Gdk.Pixbuf ("../data/resources/icons/ExecutionMarker.png");
+			breakPointPixbuf = new Gdk.Pixbuf ("../data/resources/icons/BreakPoint.png");
+		}
+		
 		protected SourceEditor (IntPtr ptr): base (ptr)
 		{
 		}
@@ -25,15 +36,16 @@
 			this.VscrollbarPolicy = PolicyType.Automatic;
 			this.HscrollbarPolicy = PolicyType.Automatic;
 			
-			View.SetMarkerPixbuf ("SourceEditorBookmark", new Gdk.Pixbuf (drag_icon_xpm));
-			View.SetMarkerPixbuf ("ExecutionMark", new Gdk.Pixbuf ("../data/resources/icons/ExecutionMarker.png"));
-			View.SetMarkerPixbuf ("BreakpointMark", new Gdk.Pixbuf ("../data/resources/icons/BreakPoint.png"));
+			View.SetMarkerPixbuf ("SourceEditorBookmark", dragIconPixbuf);
+			View.SetMarkerPixbuf ("ExecutionMark", executionMarkerPixbuf);
+			View.SetMarkerPixbuf ("BreakpointMark", breakPointPixbuf);
 			
 			Add (View);
 		}
 		
 		public new void Dispose ()
 		{
+			Buffer.Dispose ();
 			Buffer = null;
 			Remove (View);
 			View.Dispose ();