ViewContent now creates Controls instead of GTK widgets

10 files changed, 23 insertions, 20 deletions

diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs
index 85b1937f5c..db1d5f40fa 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs
@@ -39,6 +39,7 @@ using System.Linq;
 using MonoDevelop.Ide;
 using System.Collections.Generic;

 using System.Threading.Tasks;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -103,9 +104,12 @@ namespace MonoDevelop.AssemblyBrowser
 			IsDisposed = true;
 			base.Dispose ();
 			widget = null;
-			GC.Collect ();
+			if (Disposed != null)
+				Disposed (this, EventArgs.Empty);
 		}
 
+		internal event EventHandler Disposed;
+
 		#region INavigable implementation 
 		
 		public NavigationPoint BuildNavigationPoint ()
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DisplayBinding.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DisplayBinding.cs
index f47262daba..f992060d7e 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DisplayBinding.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DisplayBinding.cs
@@ -53,14 +53,14 @@ namespace MonoDevelop.AssemblyBrowser
 		{
 			if (viewContent == null || viewContent.IsDisposed) {
 				viewContent = new AssemblyBrowserViewContent ();
-				viewContent.Control.GetNativeWidget<Gtk.Widget> ().Destroyed += HandleDestroyed;
+				viewContent.Disposed += HandleDestroyed;
 			}
 			return viewContent;
 		}
 
 		void HandleDestroyed (object sender, EventArgs e)
 		{
-			((Gtk.Widget)sender).Destroyed -= HandleDestroyed;
+			((AssemblyBrowserViewContent)sender).Disposed -= HandleDestroyed;
 			this.viewContent = null;
 		}
 		
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs
index 915c16c770..1985b9dd32 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs
@@ -161,11 +161,6 @@ namespace MonoDevelop.Debugger
 				return sw;
 			}
 		}
-		
-		public override Task Load (FileOpenInformation fileOpenInformation)
-		{
-			return Task.FromResult (true);
-		}
 
 		public override bool IsFile {
 			get {
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs
index ad1b5a8310..65dc06e292 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs
@@ -272,7 +272,11 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			return base.OnGetContent (type);
 		}
 		
+<<<<<<< d31689b2197378846e127fd9c38d594f7c7f85e1
 		public override Control Control {
+=======
+		public override Components.Control Control {
+>>>>>>> ViewContent now creates Controls instead of GTK widgets
 			get {
 				return content;
 			}
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/Commands.cs b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/Commands.cs
index 91fcea2a45..f68d14aef3 100644
--- a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/Commands.cs
+++ b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/Commands.cs
@@ -63,19 +63,18 @@ namespace MonoDevelop.RegexToolkit
 				return true;
 			}
 		}
-		
-		public override Task Load (FileOpenInformation fileOpenInformation)
-		{
-			throw new System.NotImplementedException ();
-		}
-		
 	}
 	
 	class DefaultAttachableViewContent : BaseViewContent
 	{
 		Widget widget;
+<<<<<<< d31689b2197378846e127fd9c38d594f7c7f85e1
 
 		public override Control Control {
+=======
+		
+		public override Components.Control Control {
+>>>>>>> ViewContent now creates Controls instead of GTK widgets
 			get {
 				return widget;
 			}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BaseView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BaseView.cs
index a20ac4b8cb..bdf5f4ebcb 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BaseView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BaseView.cs
@@ -4,6 +4,7 @@ using MonoDevelop.Ide.Gui;
 using System.Text;

 using Gtk;
 using System.Threading.Tasks;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.VersionControl
 {

@@ -16,7 +17,7 @@ namespace MonoDevelop.VersionControl
 			this.name = name;

 		}
 
-		public override Widget Control {
+		public override Control Control {
 			get
 			{
 				throw new NotImplementedException ();
@@ -26,10 +27,5 @@ namespace MonoDevelop.VersionControl
 		public override string TabPageLabel {

 			get { return name; }

 		}
-
-		public override Task Load (FileOpenInformation fileOpenInformation)
-		{
-			throw new NotImplementedException ();
-		}
 	}

 }
\ No newline at end of file
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameView.cs
index a58c156e93..2faf833e3e 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameView.cs
@@ -29,6 +29,8 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Content;
 using Mono.TextEditor;
+using MonoDevelop.Components;
+
 namespace MonoDevelop.VersionControl.Views
 {
 	public interface IBlameView
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
index b979493bdd..37998fd4b7 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
@@ -29,6 +29,7 @@ using System.Collections.Generic;
 using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.VersionControl.Views
 {
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs
index 0ede894bab..b3d5ce38ea 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs
@@ -7,6 +7,7 @@ using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide;
 using System.Linq;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.VersionControl.Views
 {
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeView.cs
index aa56bac0b2..5408740683 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeView.cs
@@ -26,6 +26,7 @@
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Components;
 using MonoDevelop.Core;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.VersionControl.Views
 {