[Ide] Cleanup more API

28 files changed, 66 insertions, 61 deletions

diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopView.cs b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopView.cs
index 73d0cad10f..48dd881866 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopView.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopView.cs
@@ -1,5 +1,6 @@
 
 using System;
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui;
 
 namespace MonoDevelop.Deployment.Linux
@@ -38,7 +39,7 @@ namespace MonoDevelop.Deployment.Linux
 			IsDirty = false;
 		}
 		
-		public override Gtk.Widget Control {
+		public override Control Control {
 			get { return widget; }
 		}
 	}
diff --git a/main/src/addins/MacPlatform/MacPlatform.cs b/main/src/addins/MacPlatform/MacPlatform.cs
index b765cc0a06..efbaa83372 100644
--- a/main/src/addins/MacPlatform/MacPlatform.cs
+++ b/main/src/addins/MacPlatform/MacPlatform.cs
@@ -675,7 +675,7 @@ namespace MonoDevelop.MacIntegration
 			return new Gdk.Rectangle ((int) x, (int) y, (int) width, (int) height);
 		}
 
-		public override void GrabDesktopFocus (Gtk.Window window)
+		internal override void GrabDesktopFocus (Gtk.Window window)
 		{
 			window.Present ();
 			NSApplication.SharedApplication.ActivateIgnoringOtherApps (true);
@@ -763,7 +763,7 @@ namespace MonoDevelop.MacIntegration
 			return new FdoRecentFiles (UserProfile.Current.LocalConfigDir.Combine ("RecentlyUsed.xml"));
 		}
 
-		public override bool GetIsFullscreen (Gtk.Window window)
+		public override bool GetIsFullscreen (Window window)
 		{
 			if (MacSystemInformation.OsVersion < MacSystemInformation.Lion) {
 				return base.GetIsFullscreen (window);
@@ -773,7 +773,7 @@ namespace MonoDevelop.MacIntegration
 			return (nswin.StyleMask & NSWindowStyle.FullScreenWindow) != 0;
 		}
 
-		public override void SetIsFullscreen (Gtk.Window window, bool isFullscreen)
+		public override void SetIsFullscreen (Window window, bool isFullscreen)
 		{
 			if (MacSystemInformation.OsVersion < MacSystemInformation.Lion) {
 				base.SetIsFullscreen (window, isFullscreen);
@@ -801,7 +801,7 @@ namespace MonoDevelop.MacIntegration
 				));
 		}
 
-		public override void AddChildWindow (Gtk.Window parent, Gtk.Window child)
+		internal override void AddChildWindow (Gtk.Window parent, Gtk.Window child)
 		{
 			NSWindow w = GtkQuartz.GetWindow (parent);
 			child.Realize ();
@@ -810,7 +810,7 @@ namespace MonoDevelop.MacIntegration
 			w.AddChildWindow (overlay, NSWindowOrderingMode.Above);
 		}
 
-		public override void PlaceWindow (Gtk.Window window, int x, int y, int width, int height)
+		internal override void PlaceWindow (Gtk.Window window, int x, int y, int width, int height)
 		{
 			if (window.GdkWindow == null)
 				return; // Not yet realized
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs
index 177a61db98..7a11c04226 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs
@@ -30,6 +30,7 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Refactoring;
 using System;
 using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.Navigation;
@@ -54,7 +55,7 @@ namespace MonoDevelop.AssemblyBrowser
 			}
 		}
 
-		public override Gtk.Widget Control {
+		public override Control Control {
 			get {
 				return widget;
 			}
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DisplayBinding.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DisplayBinding.cs
index 71ded99d16..5512f3bfb6 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DisplayBinding.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DisplayBinding.cs
@@ -53,7 +53,7 @@ namespace MonoDevelop.AssemblyBrowser
 		{
 			if (viewContent == null || viewContent.IsDisposed) {
 				viewContent = new AssemblyBrowserViewContent ();
-				viewContent.Control.Destroyed += HandleDestroyed;
+				viewContent.Control.GetNativeWidget<Gtk.Widget> ().Destroyed += HandleDestroyed;
 			}
 			return viewContent;
 		}
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs
index c299f6f051..16b76d6cc8 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs
@@ -155,7 +155,7 @@ namespace MonoDevelop.Debugger
 			}
 		}
 		
-		public override Gtk.Widget Control {
+		public override Control Control {
 			get {
 				return sw;
 			}
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/WrapperDesignView.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/WrapperDesignView.cs
index a3a743e8b0..315d312ee7 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/WrapperDesignView.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/WrapperDesignView.cs
@@ -31,6 +31,7 @@
 
 using System;
 
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide;
 
@@ -113,7 +114,7 @@ namespace MonoDevelop.DesignerSupport
 			this.content.LoadNew (content, mimeType);
 		}
 		
-		public override Gtk.Widget Control {
+		public override Control Control {
 			get { return contentBox; }
 		}
 		
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/CatalogEditorView.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/CatalogEditorView.cs
index cc9aef04b0..e84905e8da 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/CatalogEditorView.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/CatalogEditorView.cs
@@ -32,6 +32,7 @@ using System;
 using System.Collections.Generic;
 using Gtk;
 using Gdk;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Content;
@@ -108,7 +109,7 @@ namespace MonoDevelop.Gettext.Editor
 		}
 		#endregion
 	
-		public override Widget Control
+		public override Control Control
 		{
 			get { return poEditorWidget; }
 		}
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 c08d33c374..73752b1ff8 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs
@@ -30,6 +30,7 @@
 using System;
 using System.Linq;
 using Gtk;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.Gui;
@@ -87,7 +88,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		
 		public bool HasPage (Gtk.Widget page)
 		{
-			return tabs.Any (p => p.Control == page);
+			return tabs.Any (p => p.Control.GetNativeWidget<Gtk.Widget> () == page);
 		}
 		
 		public void RemoveButton (Gtk.Widget page)
@@ -178,7 +179,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			content.Load (ContentName);
 		}
 		
-		public override Gtk.Widget Control {
+		public override Control Control {
 			get { return control; }
 		}
 		
@@ -291,7 +292,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		}
 		#endregion
 
-		public override Widget Control {
+		public override Control Control {
 			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 482dbcaded..6401eaa82a 100644
--- a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/Commands.cs
+++ b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/Commands.cs
@@ -27,6 +27,7 @@
 //
 
 using System;
+using MonoDevelop.Components;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide;
 using Gtk;
@@ -43,8 +44,8 @@ namespace MonoDevelop.RegexToolkit
 	class ViewOnlyContent : AbstractViewContent
 	{
 		Widget widget;
-		
-		public override Widget Control {
+
+		public override Control Control {
 			get {
 				return widget;
 			}
@@ -67,8 +68,8 @@ namespace MonoDevelop.RegexToolkit
 	class DefaultAttachableViewContent : AbstractAttachableViewContent
 	{
 		Widget widget;
-		
-		public override Widget Control {
+
+		public override Control Control {
 			get {
 				return widget;
 			}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
index 75417c0ccd..2eb0b850ba 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
@@ -118,7 +118,7 @@ namespace MonoDevelop.SourceEditor
 			}
 		}
 		
-		public override Widget Control {
+		public override Control Control {
 			get {
 				return widget != null ? widget.Vbox : null;
 			}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/SmartTagMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/SmartTagMarker.cs
index c3d828e858..78d287400a 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/SmartTagMarker.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/SmartTagMarker.cs
@@ -105,13 +105,6 @@ namespace MonoDevelop.SourceEditor
 				y - y2 < (editor.LineHeight / 2) * editor.Options.Zoom;
 		}
 
-		bool ISmartTagMarker.IsInsideWindow (Gtk.MotionNotifyEventArgs args)
-		{
-			if (editor == null)
-				return false;
-			return args.Event.Window == editor.TextArea.GdkWindow;
-		}
-
 		public event EventHandler<TextMarkerMouseEventArgs> MousePressed;
 		public event EventHandler<TextMarkerMouseEventArgs> MouseHover;
 		public event EventHandler ShowPopup;
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 ee6571fb78..5c5c10938b 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
@@ -24,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Content;
@@ -39,7 +40,7 @@ namespace MonoDevelop.VersionControl.Views
 		BlameWidget widget;
 		VersionControlDocumentInfo info;
 		
-		public override Gtk.Widget Control { 
+		public override Control Control { 
 			get {
 				if (widget == null)
 					widget = new BlameWidget (info);
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 8920fd588a..5af8c57bc2 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
@@ -26,6 +26,7 @@
 using System;
 using MonoDevelop.Ide.Gui;
 using System.Collections.Generic;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Content;
 
@@ -39,7 +40,7 @@ namespace MonoDevelop.VersionControl.Views
 	{
 		DiffWidget widget;
 
-		public override Gtk.Widget Control { 
+		public override Control Control { 
 			get {
 				if (widget == null) {
 					widget = new DiffWidget (info);
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 d25f151308..3a1e47c841 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
@@ -2,6 +2,7 @@ using System;
 using System.IO;
 using Gtk;
 using MonoDevelop.Core;
+using MonoDevelop.Components;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide;
@@ -78,7 +79,7 @@ namespace MonoDevelop.VersionControl.Views
 		}
 
 		
-		public override Gtk.Widget Control { 
+		public override Control Control { 
 			get {
 				if (widget == null)
 					CreateControlFromInfo ();
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 8cb107fa2d..f0a402e6d2 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
@@ -24,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using MonoDevelop.Ide.Gui;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 
 namespace MonoDevelop.VersionControl.Views
@@ -37,7 +38,7 @@ namespace MonoDevelop.VersionControl.Views
 		VersionControlDocumentInfo info;
 		MergeWidget widget;
 
-		public override Gtk.Widget Control { 
+		public override Control Control { 
 			get {
 				if (widget == null) {
 					widget = new MergeWidget ();
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
index 4c85bc0729..0c8bd28167 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
@@ -8,6 +8,7 @@ using Mono.Addins;
 using Gtk;
 
 using MonoDevelop.Core;
+using MonoDevelop.Components;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide.Gui.Components;
@@ -436,7 +437,7 @@ namespace MonoDevelop.VersionControl.Views
 			base.Dispose ();
 		}
 
-		public override Gtk.Widget Control {
+		public override Control Control {
 			get {
 				return widget;
 			}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/PlaceholderWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/PlaceholderWindow.cs
index 397d413170..756d2b672f 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/PlaceholderWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/PlaceholderWindow.cs
@@ -51,7 +51,7 @@ namespace MonoDevelop.Components.DockNotebook
 				var doc = IdeApp.Workbench.ActiveDocument;
 				if (doc == null)
 					return;
-				var rootWindow = doc.Window.ActiveViewContent.Control.Toplevel as DockWindow;
+				var rootWindow = doc.Window.ActiveViewContent.Control.GetNativeWidget<Gtk.Widget> ().Toplevel as DockWindow;
 				if (rootWindow == null)
 					return;
 				
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/RoundedFrame.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/RoundedFrame.cs
index 597e9dc134..43b4cb2286 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/RoundedFrame.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/RoundedFrame.cs
@@ -38,9 +38,6 @@ namespace MonoDevelop.Components
 	public class RoundedFrame : Bin
 	{
 		private Theme theme;
-		protected Theme Theme {
-			get { return theme; }
-		}
 
 		private int frame_width = 3;
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs
index 2e66e750f7..81c9d975ae 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs
@@ -432,7 +432,7 @@ namespace MonoDevelop.Ide.Desktop
 		/// <summary>
 		/// Grab the desktop focus for the window.
 		/// </summary>
-		public virtual void GrabDesktopFocus (Gtk.Window window)
+		internal virtual void GrabDesktopFocus (Gtk.Window window)
 		{
 			if (Platform.IsWindows && window.IsRealized) {
 				/* On Windows calling Present() will break out of window edge snapping mode. */
@@ -463,9 +463,9 @@ namespace MonoDevelop.Ide.Desktop
 			toolbarBox.PackStart ((MainToolbar)toolbar, true, true, 0);
 		}
 
-		public virtual bool GetIsFullscreen (Gtk.Window window)
+		public virtual bool GetIsFullscreen (Window window)
 		{
-			return ((bool?) window.Data ["isFullScreen"]) ?? false;
+			return ((bool?) window.GetNativeWidget <Gtk.Window> ().Data ["isFullScreen"]) ?? false;
 		}
 
 		public virtual bool IsModalDialogRunning ()
@@ -474,26 +474,27 @@ namespace MonoDevelop.Ide.Desktop
 			return windows.Any (w => w.Modal && w.Visible);
 		}
 
-		public virtual void SetIsFullscreen (Gtk.Window window, bool isFullscreen)
+		public virtual void SetIsFullscreen (Window window, bool isFullscreen)
 		{
-			window.Data ["isFullScreen"] = isFullscreen;
+			Gtk.Window windowControl = window;
+			windowControl.Data ["isFullScreen"] = isFullscreen;
 			if (isFullscreen) {
-				window.Fullscreen ();
+				windowControl.Fullscreen ();
 			} else {
-				window.Unfullscreen ();
-				SetMainWindowDecorations (window);
+				windowControl.Unfullscreen ();
+				SetMainWindowDecorations (windowControl);
 			}
 		}
 
-		public virtual void AddChildWindow (Gtk.Window parent, Gtk.Window child)
+		internal virtual void AddChildWindow (Gtk.Window parent, Gtk.Window child)
 		{
 		}
 
-		public virtual void RemoveChildWindow (Gtk.Window parent, Gtk.Window child)
+		internal virtual void RemoveChildWindow (Gtk.Window parent, Gtk.Window child)
 		{
 		}
 
-		public virtual void PlaceWindow (Gtk.Window window, int x, int y, int width, int height)
+		internal virtual void PlaceWindow (Gtk.Window window, int x, int y, int width, int height)
 		{
 			window.Move (x, y);
 			window.Resize (width, height);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/ITextSegmentMarker.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/ITextSegmentMarker.cs
index 954980f1ef..1f5bf5ad11 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/ITextSegmentMarker.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/ITextSegmentMarker.cs
@@ -80,8 +80,6 @@ namespace MonoDevelop.Ide.Editor
 	{
 		bool IsInsideSmartTag (double x, double y);
 
-		bool IsInsideWindow (Gtk.MotionNotifyEventArgs args);
-
 		event EventHandler ShowPopup;
 		event EventHandler CancelPopup;
 	}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs
index 215ea3b4cd..c00d0ee970 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs
@@ -575,7 +575,7 @@ namespace MonoDevelop.Ide.Editor
 			}
 		}
 
-		Gtk.Widget IBaseViewContent.Control {
+		Control IBaseViewContent.Control {
 			get {
 				return textEditor;
 			}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractBaseViewContent.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractBaseViewContent.cs
index 8c441c2e52..d26c07bc9b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractBaseViewContent.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractBaseViewContent.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 
 namespace MonoDevelop.Ide.Gui
@@ -38,7 +39,7 @@ namespace MonoDevelop.Ide.Gui
 		
 		#region IBaseViewContent Members
 
-		public abstract Gtk.Widget Control { get; }
+		public abstract Control Control { get; }
 		
 		public virtual IWorkbenchWindow WorkbenchWindow {
 			get { return workbenchWindow; }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractViewContent.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractViewContent.cs
index 620ca00313..0344ab9207 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractViewContent.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractViewContent.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Projects;
 using Xwt;
@@ -165,7 +166,7 @@ namespace MonoDevelop.Ide.Gui
 
 	public abstract class AbstractXwtViewContent :AbstractViewContent
 	{
-		public override Gtk.Widget Control {
+		public override Control Control {
 			get {
 				return (Gtk.Widget)Toolkit.CurrentEngine.GetNativeWidget (Widget);
 			}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
index 916f2d7a0b..f400e96da1 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
@@ -538,7 +538,7 @@ namespace MonoDevelop.Ide.Gui
 			try {
 				IWorkbenchWindow window = ActiveWorkbenchWindow;
 				if (window != null) {
-					if (window.ActiveViewContent.Control.Toplevel == this)
+					if (window.ActiveViewContent.Control.GetNativeWidget<Gtk.Widget> ().Toplevel == this)
 						Title = GetTitle (window);
 				} else {
 					Title = GetDefaultTitle ();
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HiddenTextEditorViewContent.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HiddenTextEditorViewContent.cs
index cb55076e14..ccef9f2dc1 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HiddenTextEditorViewContent.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HiddenTextEditorViewContent.cs
@@ -26,6 +26,7 @@
 
 using System;
 using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Editor;
 using MonoDevelop.Core.Text;
@@ -42,7 +43,7 @@ namespace MonoDevelop.Ide.Gui
 			}
 		}
 		
-		public override Gtk.Widget Control {
+		public override Control Control {
 			get {
 				return null;
 			}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IBaseViewContent.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IBaseViewContent.cs
index ad246af631..128ecc63eb 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IBaseViewContent.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IBaseViewContent.cs
@@ -26,15 +26,16 @@
 //
 
 using System;
-using Gtk;
 using System.Collections.Generic;
 
+using MonoDevelop.Components;
+
 namespace MonoDevelop.Ide.Gui
 {
 	public interface IBaseViewContent : IDisposable
 	{
 		IWorkbenchWindow WorkbenchWindow { get; set; }
-		Widget Control { get; }
+		Control Control { get; }
 		
 		/// <summary>
 		/// The label used for the subview list.
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs
index e937b4faaf..861bf437a3 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs
@@ -566,8 +566,9 @@ namespace MonoDevelop.Ide.Gui
 			// may happen before the main content is added to 'box', so we
 			// have to check if the content is already parented or not
 
-			if (this.ViewContent.Control.Parent != null)
-				box.Remove (this.ViewContent.Control);
+			Gtk.Widget viewWidget = ViewContent.Control;
+			if (viewWidget.Parent != null)
+				box.Remove (viewWidget);
 			
 			subViewNotebook = new Notebook ();
 			subViewNotebook.TabPos = PositionType.Bottom;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs
index 8455c21735..2a51c72e33 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs
@@ -319,13 +319,13 @@ namespace MonoDevelop.Ide
 			PlatformService.GrabDesktopFocus (window);
 		}
 
-		public static void RemoveWindowShadow (Gtk.Window window)
+		public static void RemoveWindowShadow (Window window)
 		{
 			PlatformService.RemoveWindowShadow (window);
 		}
 
 
-		public static void SetMainWindowDecorations (Gtk.Window window)
+		public static void SetMainWindowDecorations (Window window)
 		{
 			PlatformService.SetMainWindowDecorations (window);
 		}
@@ -341,12 +341,12 @@ namespace MonoDevelop.Ide
 			toolbar.Initialize ();
 		}
 
-		public static bool GetIsFullscreen (Gtk.Window window)
+		public static bool GetIsFullscreen (Window window)
 		{
 			return PlatformService.GetIsFullscreen (window);
 		}
 
-		public static void SetIsFullscreen (Gtk.Window window, bool isFullscreen)
+		public static void SetIsFullscreen (Window window, bool isFullscreen)
 		{
 			PlatformService.SetIsFullscreen (window, isFullscreen);
 		}