Merge remote-tracking branch 'origin/master' into fsharp

Conflicts:
	version-checks

8 files changed, 241 insertions, 384 deletions

diff --git a/configure b/configure
index f960522c73..98dabd5280 100755
--- a/configure
+++ b/configure
@@ -269,7 +269,7 @@ fi
 
 if test `uname` = "Darwin"; then
 	if test "x$BUILD_REVISION" != "x" -o "x$DYLD_FALLBACK_LIBRARY_PATH" = "x"; then
-		export DYLD_FALLBACK_LIBRARY_PATH="/Library/Frameworks/Mono.framework/Versions/Current/lib:/lib:/usr/lib"
+		export DYLD_FALLBACK_LIBRARY_PATH="/Library/Frameworks/Mono.framework/Versions/Current/lib:/lib:/usr/lib:/Library/Developer/CommandLineTools/usr/lib"
 		export PATH="/Library/Frameworks/Mono.framework/Versions/Current/bin:$PATH"
 		export ACLOCAL_FLAGS="-I /Library/Frameworks/Mono.framework/Versions/Current/share/aclocal"
 	fi
diff --git a/main/external/debugger-libs b/main/external/debugger-libs
-Subproject 34595024f0072c1cfc5b1dde1d194d0dcc5c11f
+Subproject 6a0997d560e6c5a7d1ce6df36ccc9e73d27151e
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs
index 160313a26e..d9c73ce43c 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs
@@ -114,6 +114,12 @@ namespace MonoDevelop.AssemblyBrowser
 				var entity = element as IMember;
 				if (entity != null)
 					member = entity.UnresolvedMember;
+
+			}
+			if (member == null) {
+				var entity = element as IType;
+				if (entity != null)
+					member = entity.GetDefinition ().Parts [0];
 			}
 			if (member == null)
 				return;
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
index 1a478e0aaf..484057ea6a 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
@@ -143,7 +143,6 @@
     <Compile Include="MonoDevelop.Debugger.Visualizer\PixbufVisualizer.cs" />
     <Compile Include="MonoDevelop.Debugger.Visualizer\IValueVisualizer.cs" />
     <Compile Include="MonoDevelop.Debugger\ExpressionEvaluatorExtensionNode.cs" />
-    <Compile Include="gtk-gui\MonoDevelop.Debugger.ExceptionCaughtWidget.cs" />
     <Compile Include="MonoDevelop.Debugger\TreePathComparer.cs" />
     <Compile Include="MonoDevelop.Debugger\TreePathReference.cs" />
     <Compile Include="MonoDevelop.Debugger\DebuggerConsoleView.cs" />
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
index b2923199f3..20832efb7d 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
@@ -1,10 +1,11 @@
 // 
 // ExceptionCaughtDialog.cs
 //  
-// Author:
-//       Lluis Sanchez Gual <lluis@novell.com>
+// Authors: Lluis Sanchez Gual <lluis@novell.com>
+//          Jeffrey Stedfast <jeff@xamarin.com>
 // 
-// Copyright (c) 2010 Novell, Inc (http://www.novell.com)
+// Copyright (c) 2010 Novell, Inc. (http://www.novell.com)
+// Copyright (c) 2011 Xamarin Inc. (http://www.xamarin.com)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -25,191 +26,291 @@
 // THE SOFTWARE.
 
 using System;
+
+using Gtk;
+
 using Mono.Debugging.Client;
+
+using MonoDevelop.Ide;
 using MonoDevelop.Core;
-using Gtk;
-using System.Threading;
 using MonoDevelop.Components;
 using MonoDevelop.Ide.TextEditing;
-using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui.Content;
 
 namespace MonoDevelop.Debugger
 {
-	public partial class ExceptionCaughtWidget : Gtk.Bin
+	class ExceptionCaughtDialog : Gtk.Dialog
 	{
-		readonly Gtk.TreeStore stackStore;
+		static readonly Gdk.Pixbuf WarningIconPixbuf = Gdk.Pixbuf.LoadFromResource ("exception-icon.png");
+		protected ObjectValueTreeView ExceptionValueTreeView { get; private set; }
+		protected TreeView StackTraceTreeView { get; private set; }
+		protected CheckButton OnlyShowMyCodeCheckbox { get; private set; }
+		protected Label ExceptionMessageLabel { get; private set; }
+		protected Label ExceptionTypeLabel { get; private set; }
+		readonly ExceptionCaughtMessage message;
 		readonly ExceptionInfo exception;
 		bool destroyed;
-		
-		public ExceptionCaughtWidget (ExceptionInfo exception)
+
+		protected enum ModelColumn {
+			StackFrame,
+			Markup
+		}
+
+		public ExceptionCaughtDialog (ExceptionInfo ex, ExceptionCaughtMessage msg)
+		{
+			exception = ex;
+			message = msg;
+
+			Build ();
+			UpdateDisplay ();
+
+			exception.Changed += ExceptionChanged;
+		}
+
+		Widget CreateExceptionInfoHeader ()
 		{
-			this.Build ();
+			ExceptionMessageLabel = new Label () { Selectable = true, Wrap = true, WidthRequest = 500, Xalign = 0.0f };
+			ExceptionTypeLabel = new Label () { UseMarkup = true, Xalign = 0.0f };
+
+			ExceptionMessageLabel.Show ();
+			ExceptionTypeLabel.Show ();
 
-			vboxExceptionInfo.Remove (labelMessage);
-			var frame = new InfoFrame (labelMessage);
+			var frame = new InfoFrame (ExceptionMessageLabel);
 			frame.Show ();
-			vboxExceptionInfo.PackStart (frame, false, true, 0);
 
-			stackStore = new TreeStore (typeof(string), typeof(string), typeof(int), typeof(int));
-			treeStack.Model = stackStore;
+			var vbox = new VBox (false, 6);
+			vbox.PackStart (ExceptionTypeLabel, false, true, 0);
+			vbox.PackStart (frame, true, true, 0);
+			vbox.Show ();
+
+			return vbox;
+		}
+
+		Widget CreateExceptionHeader ()
+		{
+			var icon = new Image (WarningIconPixbuf);
+			icon.Show ();
+
+			var hbox = new HBox (false, 12) { BorderWidth = 12 };
+			hbox.PackStart (icon, false, true, 0);
+			hbox.PackStart (CreateExceptionInfoHeader (), true, true, 0);
+			hbox.Show ();
+
+			return hbox;
+		}
+
+		Widget CreateExceptionValueTreeView ()
+		{
+			ExceptionValueTreeView = new ObjectValueTreeView ();
+			ExceptionValueTreeView.Frame = DebuggingService.CurrentFrame;
+			ExceptionValueTreeView.AllowExpanding = true;
+			ExceptionValueTreeView.AllowPinning = false;
+			ExceptionValueTreeView.AllowEditing = false;
+			ExceptionValueTreeView.AllowAdding = false;
+
+			// TODO: set the bg color to a greyish blue
+			ExceptionValueTreeView.Show ();
+
+			var scrolled = new ScrolledWindow () { HeightRequest = 128 };
+			scrolled.ShadowType = ShadowType.In;
+			scrolled.Add (ExceptionValueTreeView);
+			scrolled.Show ();
+
+			return scrolled;
+		}
+
+		Widget CreateStackTraceTreeView ()
+		{
+			var store = new TreeStore (typeof (ExceptionStackFrame), typeof (string));
+			StackTraceTreeView = new TreeView (store);
+			StackTraceTreeView.HeadersVisible = false;
+			StackTraceTreeView.ShowExpanders = false;
+			StackTraceTreeView.RulesHint = true;
+			StackTraceTreeView.Show ();
+
 			var crt = new CellRendererText ();
 			crt.Ellipsize = Pango.EllipsizeMode.End;
 			crt.WrapWidth = -1;
-			treeStack.AppendColumn ("", crt, "markup", 0);
-			treeStack.ShowExpanders = false;
-			treeStack.RulesHint = true;
-			
-			valueView.AllowExpanding = true;
-			valueView.Frame = DebuggingService.CurrentFrame;
-			this.exception = exception;
-			
-			exception.Changed += HandleExceptionChanged;
-			treeStack.SizeAllocated += (object o, SizeAllocatedArgs args) => crt.WrapWidth = args.Allocation.Width;
-			
-			Fill ();
-			treeStack.RowActivated += HandleRowActivated;
+
+			StackTraceTreeView.AppendColumn ("", crt, "markup", (int) ModelColumn.Markup);
+
+			StackTraceTreeView.SizeAllocated += (o, args) => crt.WrapWidth = args.Allocation.Width;
+			StackTraceTreeView.RowActivated += StackFrameActivated;
+
+			var scrolled = new ScrolledWindow () { HeightRequest = 128 };
+			scrolled.ShadowType = ShadowType.In;
+			scrolled.Add (StackTraceTreeView);
+			scrolled.Show ();
+
+			return scrolled;
 		}
 
-		void HandleRowActivated (object o, RowActivatedArgs args)
+		Widget CreateButtonBox ()
 		{
-			TreeIter iter;
+			var buttons = new HButtonBox () { Layout = ButtonBoxStyle.End, Spacing = 12 };
 
-			if (!stackStore.GetIter (out iter, args.Path))
-				return;
+			var copy = new Button (Stock.Copy);
+			copy.Clicked += CopyClicked;
+			copy.Show ();
+
+			buttons.PackStart (copy, false, true, 0);
+
+			var close = new Button (Stock.Close);
+			close.Activated += CloseClicked;
+			close.Clicked += CloseClicked;
+			close.Show ();
+
+			buttons.PackStart (close, false, true, 0);
+
+			buttons.Show ();
 
-			string file = (string) stackStore.GetValue (iter, 1);
-			int line = (int) stackStore.GetValue (iter, 2);
-			if (!string.IsNullOrEmpty (file))
-				IdeApp.Workbench.OpenDocument (file, line, 0);
+			return buttons;
 		}
 
-		void HandleExceptionChanged (object sender, EventArgs e)
+		void Build ()
 		{
-			Gtk.Application.Invoke (delegate {
-				Fill ();
-			});
+			Title = GettextCatalog.GetString ("Exception Caught");
+			DefaultHeight = 350;
+			DefaultWidth = 500;
+			VBox.Spacing = 0;
+
+			VBox.PackStart (CreateExceptionHeader (), false, true, 0);
+
+			var vbox = new VBox (false, 0);
+			vbox.PackStart (CreateExceptionValueTreeView (), true, true, 0);
+			vbox.PackStart (CreateStackTraceTreeView (), true, true, 0);
+			vbox.Show ();
+
+			VBox.PackStart (vbox, true, true, 0);
+
+			var actionArea = new HBox (false, 12) { BorderWidth = 6 };
+
+			OnlyShowMyCodeCheckbox = new CheckButton (GettextCatalog.GetString ("_Only show my code."));
+			OnlyShowMyCodeCheckbox.Toggled += OnlyShowMyCodeToggled;
+			OnlyShowMyCodeCheckbox.Show ();
+
+			var alignment = new Alignment (0.0f, 0.5f, 0.0f, 0.0f) { Child = OnlyShowMyCodeCheckbox };
+			alignment.Show ();
+
+			actionArea.PackStart (alignment, true, true, 0);
+			actionArea.PackStart (CreateButtonBox (), false, true, 0);
+			actionArea.Show ();
+
+			VBox.PackStart (actionArea, false, true, 0);
+			ActionArea.Hide ();
 		}
-		
-		void Fill ()
+
+		void StackFrameActivated (object o, RowActivatedArgs args)
 		{
-			if (destroyed)
+			var model = StackTraceTreeView.Model;
+			TreeIter iter;
+
+			if (!model.GetIter (out iter, args.Path))
 				return;
-			
-			stackStore.Clear ();
-			valueView.ClearValues ();
 
-			labelType.Markup = GettextCatalog.GetString ("A <b>{0}</b> was thrown.", exception.Type);
-			labelMessage.Text = string.IsNullOrEmpty (exception.Message) ?
-			                    string.Empty : 
-			                    exception.Message;
-			
-			ShowStackTrace (exception, false);
-			
-			if (!exception.IsEvaluating && exception.Instance != null) {
-				valueView.AddValue (exception.Instance);
-				valueView.ExpandRow (new TreePath ("0"), false);
-			}
+			var frame = (ExceptionStackFrame) model.GetValue (iter, (int) ModelColumn.StackFrame);
 
-			if (exception.StackIsEvaluating) {
-				stackStore.AppendValues (GettextCatalog.GetString ("Loading..."), "", 0, 0);
-			}
+			if (frame != null && !string.IsNullOrEmpty (frame.File))
+				IdeApp.Workbench.OpenDocument (frame.File, frame.Line, frame.Column);
 		}
-		
-		void ShowStackTrace (ExceptionInfo exc, bool showExceptionNode)
+
+		void ShowStackTrace (ExceptionInfo ex, bool showExceptionNode)
 		{
+			var model = (TreeStore) StackTraceTreeView.Model;
 			TreeIter iter = TreeIter.Zero;
 
 			if (showExceptionNode) {
-				treeStack.ShowExpanders = true;
-				string tn = exc.Type + ": " + exc.Message;
-				iter = stackStore.AppendValues (tn, null, 0, 0);
+				var markup = ex.Type + ": " + ex.Message;
+				iter = model.AppendValues (null, markup);
+				StackTraceTreeView.ShowExpanders = true;
 			}
 
-			foreach (ExceptionStackFrame frame in exc.StackTrace) {
-				string text = string.Format ("<b>{0}</b>", GLib.Markup.EscapeText (frame.DisplayText));
+			foreach (var frame in ex.StackTrace) {
+				var markup = string.Format ("<b>{0}</b>", GLib.Markup.EscapeText (frame.DisplayText));
+
 				if (!string.IsNullOrEmpty (frame.File)) {
-					text += "\n<small>" + GLib.Markup.EscapeText (frame.File);
+					markup += "\n<small>" + GLib.Markup.EscapeText (frame.File);
 					if (frame.Line > 0) {
-						text += ":" + frame.Line;
+						markup += ":" + frame.Line;
 						if (frame.Column > 0)
-							text += "," + frame.Column;
+							markup += "," + frame.Column;
 					}
-					text += "</small>";
+					markup += "</small>";
 				}
 
 				if (!iter.Equals (TreeIter.Zero))
-					stackStore.AppendValues (iter, text, frame.File, frame.Line, frame.Column);
+					model.AppendValues (iter, frame, markup);
 				else
-					stackStore.AppendValues (text, frame.File, frame.Line, frame.Column);
+					model.AppendValues (frame, markup);
 			}
-			
-			ExceptionInfo inner = exc.InnerException;
+
+			var inner = ex.InnerException;
 			if (inner != null)
 				ShowStackTrace (inner, true);
 		}
-		
-		protected override void OnDestroyed ()
+
+		void UpdateDisplay ()
 		{
-			destroyed = true;
-			exception.Changed -= HandleExceptionChanged;
-			base.OnDestroyed ();
-		}
-	}
+			if (destroyed)
+				return;
 
-	class ExceptionCaughtDialog: Gtk.Dialog
-	{
-		readonly ExceptionCaughtWidget widget;
-		readonly ExceptionCaughtMessage msg;
-		readonly ExceptionInfo ex;
+			var stack = (TreeStore) StackTraceTreeView.Model;
+			ExceptionValueTreeView.ClearValues ();
+			stack.Clear ();
 
-		public ExceptionCaughtDialog (ExceptionInfo val, ExceptionCaughtMessage msg)
-		{
-			Title = GettextCatalog.GetString ("Exception Caught");
-			ex = val;
-			widget = new ExceptionCaughtWidget (val);
-			this.msg = msg;
+			ExceptionTypeLabel.Markup = GettextCatalog.GetString ("A <b>{0}</b> was thrown.", exception.Type);
+			ExceptionMessageLabel.Text = string.IsNullOrEmpty (exception.Message) ? string.Empty : exception.Message;
 
-			VBox box = new VBox ();
-			box.Spacing = 6;
-			box.PackStart (widget, true, true, 0);
-			HButtonBox buttonBox = new HButtonBox ();
-			buttonBox.Layout = ButtonBoxStyle.End;
-			buttonBox.BorderWidth = 6;
-			buttonBox.Spacing = 12;
+			ShowStackTrace (exception, false);
 
-			var copy = new Gtk.Button (GettextCatalog.GetString ("Copy"));
-			buttonBox.PackStart (copy, false, false, 0);
-			copy.Clicked += HandleCopyClicked;
+			if (!exception.IsEvaluating && exception.Instance != null) {
+				ExceptionValueTreeView.AddValue (exception.Instance);
+				ExceptionValueTreeView.ExpandRow (new TreePath ("0"), false);
+			}
 
-			var close = new Gtk.Button (GettextCatalog.GetString ("Close"));
-			buttonBox.PackStart (close, false, false, 0);
-			close.Clicked += (sender, e) => msg.Close ();
-			close.Activated += (sender, e) => msg.Close ();
+			if (exception.StackIsEvaluating)
+				stack.AppendValues (null, GettextCatalog.GetString ("Loading..."));
+		}
 
-			box.PackStart (buttonBox, false, false, 0);
-			VBox.Add (box);
+		void ExceptionChanged (object sender, EventArgs e)
+		{
+			Application.Invoke (delegate {
+				UpdateDisplay ();
+			});
+		}
 
-			DefaultWidth = 500;
-			DefaultHeight = 350;
+		void OnlyShowMyCodeToggled (object sender, EventArgs e)
+		{
+			
+		}
 
-			box.ShowAll ();
-			ActionArea.Hide ();
+		void CloseClicked (object sender, EventArgs e)
+		{
+			message.Close ();
+		}
+
+		void CopyClicked (object sender, EventArgs e)
+		{
+			var text = exception.ToString ();
+
+			var clipboard = Clipboard.Get (Gdk.Atom.Intern ("CLIPBOARD", false));
+			clipboard.Text = text;
+
+			var primary = Clipboard.Get (Gdk.Atom.Intern ("PRIMARY", false));
+			primary.Text = text;
 		}
 
 		protected override bool OnDeleteEvent (Gdk.Event evnt)
 		{
-			msg.Close ();
+			message.Close ();
 			return true;
 		}
 
-		void HandleCopyClicked (object sender, EventArgs e)
+		protected override void OnDestroyed ()
 		{
-			var text = ex.ToString ();
-			var clipboard = Clipboard.Get (Gdk.Atom.Intern ("CLIPBOARD", false));
-			clipboard.Text = text;
-			clipboard = Clipboard.Get (Gdk.Atom.Intern ("PRIMARY", false));
-			clipboard.Text = text;
+			destroyed = true;
+			exception.Changed -= ExceptionChanged;
+			base.OnDestroyed ();
 		}
 	}
 
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionsDialog.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionsDialog.cs
index 34ac6adb40..00636f3c48 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionsDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionsDialog.cs
@@ -27,25 +27,28 @@
 
 using System;
 using System.Collections.Generic;
+
 using Gtk;
-using MonoDevelop.Core;
-using MonoDevelop.Components;
+
 using Mono.Debugging.Client;
-using MonoDevelop.Ide;
 using ICSharpCode.NRefactory.TypeSystem;
+
+using MonoDevelop.Ide;
+using MonoDevelop.Core;
+using MonoDevelop.Components;
 using MonoDevelop.Ide.TypeSystem;
 
 namespace MonoDevelop.Debugger
 {
 	public partial class ExceptionsDialog : Gtk.Dialog
 	{
-		ListStore storeExceptions;
-		ListStore storeSelection;
-		HashSet<string> classes = new HashSet<string> ();
-		TreeViewState tstateExc;
-		TreeViewState tstateSel;
+		readonly HashSet<string> selectedClasses = new HashSet<string> ();
+		readonly HashSet<string> classes = new HashSet<string> ();
+		readonly ListStore storeExceptions;
+		readonly ListStore storeSelection;
+		readonly TreeViewState tstateExc;
+		readonly TreeViewState tstateSel;
 		bool updateScheduled;
-		HashSet<string> selectedClasses = new HashSet<string> ();
 		
 		public ExceptionsDialog()
 		{
diff --git a/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.ExceptionCaughtWidget.cs b/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.ExceptionCaughtWidget.cs
deleted file mode 100644
index 3359b30d19..0000000000
--- a/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.ExceptionCaughtWidget.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace MonoDevelop.Debugger
-{
-	public partial class ExceptionCaughtWidget
-	{
-		private global::Gtk.VBox dialog1_VBox;
-		private global::Gtk.VBox vbox2;
-		private global::Gtk.HBox hbox2;
-		private global::Gtk.Image imageWarning;
-		private global::Gtk.VBox vboxExceptionInfo;
-		private global::Gtk.Label labelType;
-		private global::Gtk.Label labelMessage;
-		private global::Gtk.ScrolledWindow GtkScrolledWindow;
-		private global::MonoDevelop.Debugger.ObjectValueTreeView valueView;
-		private global::Gtk.ScrolledWindow GtkScrolledWindow1;
-		private global::Gtk.TreeView treeStack;
-
-		protected virtual void Build ()
-		{
-			global::Stetic.Gui.Initialize (this);
-			// Widget MonoDevelop.Debugger.ExceptionCaughtWidget
-			global::Stetic.BinContainer.Attach (this);
-			this.Name = "MonoDevelop.Debugger.ExceptionCaughtWidget";
-			// Container child MonoDevelop.Debugger.ExceptionCaughtWidget.Gtk.Container+ContainerChild
-			this.dialog1_VBox = new global::Gtk.VBox ();
-			this.dialog1_VBox.Name = "dialog1_VBox";
-			// Container child dialog1_VBox.Gtk.Box+BoxChild
-			this.vbox2 = new global::Gtk.VBox ();
-			this.vbox2.Name = "vbox2";
-			// Container child vbox2.Gtk.Box+BoxChild
-			this.hbox2 = new global::Gtk.HBox ();
-			this.hbox2.Name = "hbox2";
-			this.hbox2.Spacing = 12;
-			this.hbox2.BorderWidth = ((uint)(12));
-			// Container child hbox2.Gtk.Box+BoxChild
-			this.imageWarning = new global::Gtk.Image ();
-			this.imageWarning.Name = "imageWarning";
-			this.imageWarning.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("exception-icon.png");
-			this.hbox2.Add (this.imageWarning);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.imageWarning]));
-			w1.Position = 0;
-			w1.Expand = false;
-			w1.Fill = false;
-			// Container child hbox2.Gtk.Box+BoxChild
-			this.vboxExceptionInfo = new global::Gtk.VBox ();
-			this.vboxExceptionInfo.Name = "vboxExceptionInfo";
-			this.vboxExceptionInfo.Spacing = 6;
-			// Container child vboxExceptionInfo.Gtk.Box+BoxChild
-			this.labelType = new global::Gtk.Label ();
-			this.labelType.Name = "labelType";
-			this.labelType.Xalign = 0F;
-			this.labelType.LabelProp = "<b>Exception</b> has been thrown";
-			this.labelType.UseMarkup = true;
-			this.vboxExceptionInfo.Add (this.labelType);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vboxExceptionInfo [this.labelType]));
-			w2.Position = 0;
-			w2.Expand = false;
-			w2.Fill = false;
-			// Container child vboxExceptionInfo.Gtk.Box+BoxChild
-			this.labelMessage = new global::Gtk.Label ();
-			this.labelMessage.WidthRequest = 500;
-			this.labelMessage.Name = "labelMessage";
-			this.labelMessage.Xalign = 0F;
-			this.labelMessage.LabelProp = "test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test";
-			this.labelMessage.Wrap = true;
-			this.labelMessage.Selectable = true;
-			this.vboxExceptionInfo.Add (this.labelMessage);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vboxExceptionInfo [this.labelMessage]));
-			w3.Position = 1;
-			w3.Expand = false;
-			w3.Fill = false;
-			this.hbox2.Add (this.vboxExceptionInfo);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.vboxExceptionInfo]));
-			w4.Position = 1;
-			this.vbox2.Add (this.hbox2);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox2]));
-			w5.Position = 0;
-			w5.Expand = false;
-			w5.Fill = false;
-			// Container child vbox2.Gtk.Box+BoxChild
-			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow ();
-			this.GtkScrolledWindow.HeightRequest = 128;
-			this.GtkScrolledWindow.Name = "GtkScrolledWindow";
-			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child GtkScrolledWindow.Gtk.Container+ContainerChild
-			this.valueView = new global::MonoDevelop.Debugger.ObjectValueTreeView ();
-			this.valueView.CanFocus = true;
-			this.valueView.Name = "valueView";
-			this.valueView.AllowAdding = false;
-			this.valueView.AllowEditing = true;
-			this.valueView.AllowPinning = false;
-			this.valueView.RootPinAlwaysVisible = false;
-			this.valueView.AllowExpanding = false;
-			this.valueView.PinnedWatchLine = 0;
-			this.valueView.CompactView = false;
-			this.GtkScrolledWindow.Add (this.valueView);
-			this.vbox2.Add (this.GtkScrolledWindow);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.GtkScrolledWindow]));
-			w7.Position = 1;
-			// Container child vbox2.Gtk.Box+BoxChild
-			this.GtkScrolledWindow1 = new global::Gtk.ScrolledWindow ();
-			this.GtkScrolledWindow1.HeightRequest = 128;
-			this.GtkScrolledWindow1.Name = "GtkScrolledWindow1";
-			this.GtkScrolledWindow1.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child GtkScrolledWindow1.Gtk.Container+ContainerChild
-			this.treeStack = new global::Gtk.TreeView ();
-			this.treeStack.CanFocus = true;
-			this.treeStack.Name = "treeStack";
-			this.treeStack.HeadersVisible = false;
-			this.GtkScrolledWindow1.Add (this.treeStack);
-			this.vbox2.Add (this.GtkScrolledWindow1);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.GtkScrolledWindow1]));
-			w9.Position = 2;
-			this.dialog1_VBox.Add (this.vbox2);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.dialog1_VBox [this.vbox2]));
-			w10.Position = 0;
-			this.Add (this.dialog1_VBox);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
-			}
-			this.Hide ();
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
index cf1c702984..650fc2b9ac 100644
--- a/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
@@ -1757,133 +1757,6 @@ Break when the hit count is a multiple of</property>
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Bin" id="MonoDevelop.Debugger.ExceptionCaughtWidget" design-size="612 362">
-    <property name="MemberName" />
-    <property name="Visible">False</property>
-    <child>
-      <widget class="Gtk.VBox" id="dialog1_VBox">
-        <property name="MemberName" />
-        <child>
-          <widget class="Gtk.VBox" id="vbox2">
-            <property name="MemberName" />
-            <child>
-              <widget class="Gtk.HBox" id="hbox2">
-                <property name="MemberName" />
-                <property name="Spacing">12</property>
-                <property name="BorderWidth">12</property>
-                <child>
-                  <widget class="Gtk.Image" id="imageWarning">
-                    <property name="MemberName" />
-                    <property name="Pixbuf">resource:exception-icon.png</property>
-                  </widget>
-                  <packing>
-                    <property name="Position">0</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.VBox" id="vboxExceptionInfo">
-                    <property name="MemberName" />
-                    <property name="Spacing">6</property>
-                    <child>
-                      <widget class="Gtk.Label" id="labelType">
-                        <property name="MemberName" />
-                        <property name="Xalign">0</property>
-                        <property name="LabelProp">&lt;b&gt;Exception&lt;/b&gt; has been thrown</property>
-                        <property name="UseMarkup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Label" id="labelMessage">
-                        <property name="MemberName" />
-                        <property name="WidthRequest">500</property>
-                        <property name="Xalign">0</property>
-                        <property name="LabelProp">test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test</property>
-                        <property name="Wrap">True</property>
-                        <property name="Selectable">True</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                    <property name="AutoSize">False</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">0</property>
-                <property name="AutoSize">True</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow">
-                <property name="MemberName" />
-                <property name="HeightRequest">128</property>
-                <property name="ShadowType">In</property>
-                <child>
-                  <widget class="MonoDevelop.Debugger.ObjectValueTreeView" id="valueView">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="ShowScrollbars">True</property>
-                        <property name="AllowAdding">False</property>
-                        <property name="AllowEditing">True</property>
-                        <property name="AllowPinning">False</property>
-                        <property name="RootPinAlwaysVisible">False</property>
-                        <property name="AllowExpanding">False</property>
-                        <property name="PinnedWatchLine">0</property>
-                        <property name="CompactView">False</property>
-                      </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">1</property>
-                <property name="AutoSize">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow1">
-                <property name="MemberName" />
-                <property name="HeightRequest">128</property>
-                <property name="ShadowType">In</property>
-                <child>
-                  <widget class="Gtk.TreeView" id="treeStack">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="ShowScrollbars">True</property>
-                    <property name="HeadersVisible">False</property>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">2</property>
-                <property name="AutoSize">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">False</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
   <widget class="Gtk.Dialog" id="MonoDevelop.Debugger.Viewers.ValueVisualizerDialog" design-size="628 433">
     <property name="MemberName" />
     <property name="Visible">False</property>