[Debugger] Changing PreviewVisualizer to return MD.Control instead of Gdk.Widget

4 files changed, 5 insertions, 4 deletions

diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/ColorPreviewVisualizer.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/ColorPreviewVisualizer.cs
index f8fc8736f1..77345f3092 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/ColorPreviewVisualizer.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/ColorPreviewVisualizer.cs
@@ -37,7 +37,7 @@ namespace MonoDevelop.Debugger.PreviewVisualizers
 			return DebuggingService.HasGetConverter<Xwt.Drawing.Color> (val);
 		}
 
-		public override Gtk.Widget GetVisualizerWidget (ObjectValue val)
+		public override Control GetVisualizerWidget (ObjectValue val)
 		{
 			var color = DebuggingService.GetGetConverter<Xwt.Drawing.Color> (val).GetValue (val);
 			var mainBox = new HBox ();
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizer.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizer.cs
index ca11464f3f..d2899029ca 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizer.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizer.cs
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 using System;
 using Mono.Debugging.Client;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.Debugger
 {
@@ -61,7 +62,7 @@ namespace MonoDevelop.Debugger
 		/// representation of the value. If the visualizer needs to get values from
 		/// the object properties, it can use the ObjectValue.GetRawValue method.
 		/// </remarks>
-		public abstract Gtk.Widget GetVisualizerWidget (ObjectValue val);
+		public abstract Control GetVisualizerWidget (ObjectValue val);
 	}
 }
 
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs
index 49cefd2d84..7f5f4b29a7 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs
@@ -83,7 +83,6 @@ namespace MonoDevelop.Debugger
 
 			var widget = previewVisualizer.GetVisualizerWidget (val);
 			mainBox.Add (widget);
-			widget.Show ();
 			ContentBox.Add (mainBox);
 			ShowPopup (invokingWidget, previewButtonArea, PopupPosition.Left);
 		}
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/SizeAndRectanglePreviewVisualizer.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/SizeAndRectanglePreviewVisualizer.cs
index 2c61540645..36af518c98 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/SizeAndRectanglePreviewVisualizer.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/SizeAndRectanglePreviewVisualizer.cs
@@ -26,6 +26,7 @@
 using System;
 using Mono.Debugging.Client;
 using Gtk;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.Debugger.PreviewVisualizers
 {
@@ -38,7 +39,7 @@ namespace MonoDevelop.Debugger.PreviewVisualizers
 			return DebuggingService.HasGetConverter<Xwt.Size> (val) || DebuggingService.HasGetConverter<Xwt.Rectangle> (val);
 		}
 
-		public override Gtk.Widget GetVisualizerWidget (ObjectValue val)
+		public override Control GetVisualizerWidget (ObjectValue val)
 		{
 			var sizeConverter = DebuggingService.GetGetConverter<Xwt.Size> (val);
 			if (sizeConverter != null) {