[A11y] Make ActionDelegate disposable

The arrays of actions are only generated whenever the actions change in order to avoid
constantly reallocating memory for them over and over, but this means the memory needs
to be freed when the ActionDelegate is no longer needed. Implement IDisposable and
call Dispose when the owner widget is destroyed

2 files changed, 24 insertions, 2 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs
index 67d164147e..618a1e13d9 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs
@@ -133,9 +133,10 @@ namespace MonoDevelop.Components.Docking
 		CrossfadeIcon crossfade;
 		double hoverProgress;
 
+		ActionDelegate actionHandler;
 		public DockBarItem (DockBar bar, DockItem it, int size)
 		{
-			var actionHandler = new AtkCocoaHelper.ActionDelegate ();
+			actionHandler = new AtkCocoaHelper.ActionDelegate ();
 			actionHandler.PerformPress += OnPerformPress;
 
 			Accessible.SetActionDelegate (actionHandler);
@@ -168,6 +169,16 @@ namespace MonoDevelop.Components.Docking
 			Accessible.Name = "DockbarItem";
 		}
 
+		public override void Destroy ()
+		{
+			if (actionHandler != null) {
+				actionHandler.Dispose ();
+				actionHandler = null;
+			}
+
+			base.Destroy ();
+		}
+
 		void IAnimatable.BatchBegin () { }
 		void IAnimatable.BatchCommit () { QueueDraw (); }
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs
index 17c16f250d..116dd5f20b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs
@@ -58,6 +58,7 @@ namespace MonoDevelop.Components.Docking
 		DockItem item;
 		bool allowPlaceholderDocking;
 		bool mouseOver;
+		ActionDelegate actionHandler;
 
 		IDisposable subscribedLeaveEvent;
 
@@ -96,7 +97,7 @@ namespace MonoDevelop.Components.Docking
 		
 		public DockItemTitleTab (DockItem item, DockFrame frame)
 		{
-			var actionHandler = new AtkCocoaHelper.ActionDelegate ();
+			actionHandler = new AtkCocoaHelper.ActionDelegate ();
 			actionHandler.PerformPress += HandlePress;
 			actionHandler.PerformShowMenu += HandleShowMenu;
 
@@ -118,6 +119,16 @@ namespace MonoDevelop.Components.Docking
 			subscribedLeaveEvent = this.SubscribeLeaveEvent (OnLeave);
 		}
 
+		public override void Destroy ()
+		{
+			if (actionHandler != null) {
+				actionHandler.Dispose ();
+				actionHandler = null;
+			}
+
+			base.Destroy ();
+		}
+
 		public DockVisualStyle VisualStyle {
 			get { return visualStyle; }
 			set {