[Debugger] Implemented function breakpoints

Fixes bug #2850

2 files changed, 254 insertions, 181 deletions

diff --git a/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs b/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs
index 913e79a388..4e88dc4eaf 100644
--- a/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs
@@ -7,12 +7,15 @@ namespace MonoDevelop.Debugger
 		private global::Gtk.VBox vbox2;
 		private global::Gtk.Label label1;
 		private global::Gtk.Table table1;
-		private global::Gtk.Entry entryFile;
-		private global::Gtk.HBox hbox1;
+		private global::Gtk.Entry entryFileFunction;
+		private global::Gtk.HBox hboxLineColumn;
 		private global::Gtk.SpinButton spinLine;
-		private global::Gtk.Label label4;
-		private global::Gtk.Label label5;
+		private global::Gtk.HBox hboxColumn;
+		private global::Gtk.Label label9;
+		private global::Gtk.SpinButton spinColumn;
 		private global::Gtk.Label label6;
+		private global::Gtk.Label labelFileFunction;
+		private global::Gtk.Label labelLine;
 		private global::Gtk.Label label2;
 		private global::Gtk.HBox hbox4;
 		private global::Gtk.Label label14;
@@ -76,21 +79,21 @@ namespace MonoDevelop.Debugger
 			this.table1.RowSpacing = ((uint)(6));
 			this.table1.ColumnSpacing = ((uint)(6));
 			// Container child table1.Gtk.Table+TableChild
-			this.entryFile = new global::Gtk.Entry ();
-			this.entryFile.CanFocus = true;
-			this.entryFile.Name = "entryFile";
-			this.entryFile.IsEditable = true;
-			this.entryFile.InvisibleChar = '●';
-			this.table1.Add (this.entryFile);
-			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.entryFile]));
+			this.entryFileFunction = new global::Gtk.Entry ();
+			this.entryFileFunction.CanFocus = true;
+			this.entryFileFunction.Name = "entryFileFunction";
+			this.entryFileFunction.IsEditable = true;
+			this.entryFileFunction.InvisibleChar = '●';
+			this.table1.Add (this.entryFileFunction);
+			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.entryFileFunction]));
 			w3.LeftAttach = ((uint)(2));
 			w3.RightAttach = ((uint)(3));
 			w3.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.hbox1 = new global::Gtk.HBox ();
-			this.hbox1.Name = "hbox1";
-			this.hbox1.Spacing = 6;
-			// Container child hbox1.Gtk.Box+BoxChild
+			this.hboxLineColumn = new global::Gtk.HBox ();
+			this.hboxLineColumn.Name = "hboxLineColumn";
+			this.hboxLineColumn.Spacing = 6;
+			// Container child hboxLineColumn.Gtk.Box+BoxChild
 			this.spinLine = new global::Gtk.SpinButton (1, 100, 1);
 			this.spinLine.CanFocus = true;
 			this.spinLine.Name = "spinLine";
@@ -98,53 +101,84 @@ namespace MonoDevelop.Debugger
 			this.spinLine.ClimbRate = 1;
 			this.spinLine.Numeric = true;
 			this.spinLine.Value = 1;
-			this.hbox1.Add (this.spinLine);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.spinLine]));
+			this.hboxLineColumn.Add (this.spinLine);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hboxLineColumn [this.spinLine]));
 			w4.Position = 0;
 			w4.Expand = false;
 			w4.Fill = false;
-			this.table1.Add (this.hbox1);
-			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1 [this.hbox1]));
-			w5.TopAttach = ((uint)(1));
-			w5.BottomAttach = ((uint)(2));
-			w5.LeftAttach = ((uint)(2));
-			w5.RightAttach = ((uint)(3));
-			w5.XOptions = ((global::Gtk.AttachOptions)(4));
-			w5.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label4 = new global::Gtk.Label ();
-			this.label4.Name = "label4";
-			this.label4.Xalign = 0F;
-			this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("File:");
-			this.table1.Add (this.label4);
-			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1 [this.label4]));
-			w6.LeftAttach = ((uint)(1));
-			w6.RightAttach = ((uint)(2));
-			w6.XOptions = ((global::Gtk.AttachOptions)(4));
-			w6.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label5 = new global::Gtk.Label ();
-			this.label5.Name = "label5";
-			this.label5.LabelProp = global::Mono.Unix.Catalog.GetString ("Line:");
-			this.table1.Add (this.label5);
-			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1 [this.label5]));
-			w7.TopAttach = ((uint)(1));
-			w7.BottomAttach = ((uint)(2));
-			w7.LeftAttach = ((uint)(1));
-			w7.RightAttach = ((uint)(2));
-			w7.XOptions = ((global::Gtk.AttachOptions)(4));
-			w7.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child hboxLineColumn.Gtk.Box+BoxChild
+			this.hboxColumn = new global::Gtk.HBox ();
+			this.hboxColumn.Name = "hboxColumn";
+			this.hboxColumn.Spacing = 6;
+			// Container child hboxColumn.Gtk.Box+BoxChild
+			this.label9 = new global::Gtk.Label ();
+			this.label9.Name = "label9";
+			this.label9.LabelProp = global::Mono.Unix.Catalog.GetString ("Column:");
+			this.label9.Justify = ((global::Gtk.Justification)(1));
+			this.hboxColumn.Add (this.label9);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hboxColumn [this.label9]));
+			w5.Position = 0;
+			w5.Expand = false;
+			w5.Fill = false;
+			// Container child hboxColumn.Gtk.Box+BoxChild
+			this.spinColumn = new global::Gtk.SpinButton (1, 100, 1);
+			this.spinColumn.CanFocus = true;
+			this.spinColumn.Name = "spinColumn";
+			this.spinColumn.Adjustment.PageIncrement = 10;
+			this.spinColumn.ClimbRate = 1;
+			this.spinColumn.Numeric = true;
+			this.hboxColumn.Add (this.spinColumn);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hboxColumn [this.spinColumn]));
+			w6.Position = 1;
+			w6.Expand = false;
+			w6.Fill = false;
+			this.hboxLineColumn.Add (this.hboxColumn);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hboxLineColumn [this.hboxColumn]));
+			w7.Position = 1;
+			w7.Expand = false;
+			w7.Fill = false;
+			this.table1.Add (this.hboxLineColumn);
+			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1 [this.hboxLineColumn]));
+			w8.TopAttach = ((uint)(1));
+			w8.BottomAttach = ((uint)(2));
+			w8.LeftAttach = ((uint)(2));
+			w8.RightAttach = ((uint)(3));
+			w8.XOptions = ((global::Gtk.AttachOptions)(4));
+			w8.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
 			this.label6 = new global::Gtk.Label ();
 			this.label6.WidthRequest = 12;
 			this.label6.Name = "label6";
 			this.table1.Add (this.label6);
-			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1 [this.label6]));
-			w8.XOptions = ((global::Gtk.AttachOptions)(4));
-			w8.YOptions = ((global::Gtk.AttachOptions)(4));
+			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table1 [this.label6]));
+			w9.XOptions = ((global::Gtk.AttachOptions)(4));
+			w9.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table1.Gtk.Table+TableChild
+			this.labelFileFunction = new global::Gtk.Label ();
+			this.labelFileFunction.Name = "labelFileFunction";
+			this.labelFileFunction.Xalign = 0F;
+			this.labelFileFunction.LabelProp = global::Mono.Unix.Catalog.GetString ("File:");
+			this.table1.Add (this.labelFileFunction);
+			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table1 [this.labelFileFunction]));
+			w10.LeftAttach = ((uint)(1));
+			w10.RightAttach = ((uint)(2));
+			w10.XOptions = ((global::Gtk.AttachOptions)(4));
+			w10.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table1.Gtk.Table+TableChild
+			this.labelLine = new global::Gtk.Label ();
+			this.labelLine.Name = "labelLine";
+			this.labelLine.LabelProp = global::Mono.Unix.Catalog.GetString ("Line:");
+			this.table1.Add (this.labelLine);
+			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1 [this.labelLine]));
+			w11.TopAttach = ((uint)(1));
+			w11.BottomAttach = ((uint)(2));
+			w11.LeftAttach = ((uint)(1));
+			w11.RightAttach = ((uint)(2));
+			w11.XOptions = ((global::Gtk.AttachOptions)(4));
+			w11.YOptions = ((global::Gtk.AttachOptions)(4));
 			this.vbox2.Add (this.table1);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.table1]));
-			w9.Position = 1;
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.table1]));
+			w12.Position = 1;
 			// Container child vbox2.Gtk.Box+BoxChild
 			this.label2 = new global::Gtk.Label ();
 			this.label2.Name = "label2";
@@ -152,10 +186,10 @@ namespace MonoDevelop.Debugger
 			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Condition</b>");
 			this.label2.UseMarkup = true;
 			this.vbox2.Add (this.label2);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.label2]));
-			w10.Position = 2;
-			w10.Expand = false;
-			w10.Fill = false;
+			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.label2]));
+			w13.Position = 2;
+			w13.Expand = false;
+			w13.Fill = false;
 			// Container child vbox2.Gtk.Box+BoxChild
 			this.hbox4 = new global::Gtk.HBox ();
 			this.hbox4.Name = "hbox4";
@@ -165,10 +199,10 @@ namespace MonoDevelop.Debugger
 			this.label14.WidthRequest = 12;
 			this.label14.Name = "label14";
 			this.hbox4.Add (this.label14);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.label14]));
-			w11.Position = 0;
-			w11.Expand = false;
-			w11.Fill = false;
+			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.label14]));
+			w14.Position = 0;
+			w14.Expand = false;
+			w14.Fill = false;
 			// Container child hbox4.Gtk.Box+BoxChild
 			this.boxConditionOptions = new global::Gtk.VBox ();
 			this.boxConditionOptions.Name = "boxConditionOptions";
@@ -181,10 +215,10 @@ namespace MonoDevelop.Debugger
 			this.radioBreakAlways.UseUnderline = true;
 			this.radioBreakAlways.Group = new global::GLib.SList (global::System.IntPtr.Zero);
 			this.boxConditionOptions.Add (this.radioBreakAlways);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.boxConditionOptions [this.radioBreakAlways]));
-			w12.Position = 0;
-			w12.Expand = false;
-			w12.Fill = false;
+			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.boxConditionOptions [this.radioBreakAlways]));
+			w15.Position = 0;
+			w15.Expand = false;
+			w15.Fill = false;
 			// Container child boxConditionOptions.Gtk.Box+BoxChild
 			this.radioBreakTrue = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("Break when condition is true"));
 			this.radioBreakTrue.CanFocus = true;
@@ -193,10 +227,10 @@ namespace MonoDevelop.Debugger
 			this.radioBreakTrue.UseUnderline = true;
 			this.radioBreakTrue.Group = this.radioBreakAlways.Group;
 			this.boxConditionOptions.Add (this.radioBreakTrue);
-			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.boxConditionOptions [this.radioBreakTrue]));
-			w13.Position = 1;
-			w13.Expand = false;
-			w13.Fill = false;
+			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.boxConditionOptions [this.radioBreakTrue]));
+			w16.Position = 1;
+			w16.Expand = false;
+			w16.Fill = false;
 			// Container child boxConditionOptions.Gtk.Box+BoxChild
 			this.radioBreakChange = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("Break when the expression changes"));
 			this.radioBreakChange.CanFocus = true;
@@ -205,10 +239,10 @@ namespace MonoDevelop.Debugger
 			this.radioBreakChange.UseUnderline = true;
 			this.radioBreakChange.Group = this.radioBreakAlways.Group;
 			this.boxConditionOptions.Add (this.radioBreakChange);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.boxConditionOptions [this.radioBreakChange]));
-			w14.Position = 2;
-			w14.Expand = false;
-			w14.Fill = false;
+			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.boxConditionOptions [this.radioBreakChange]));
+			w17.Position = 2;
+			w17.Expand = false;
+			w17.Fill = false;
 			// Container child boxConditionOptions.Gtk.Box+BoxChild
 			this.boxCondition = new global::Gtk.HBox ();
 			this.boxCondition.Name = "boxCondition";
@@ -218,20 +252,20 @@ namespace MonoDevelop.Debugger
 			this.label15.WidthRequest = 12;
 			this.label15.Name = "label15";
 			this.boxCondition.Add (this.label15);
-			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.boxCondition [this.label15]));
-			w15.Position = 0;
-			w15.Expand = false;
-			w15.Fill = false;
+			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.boxCondition [this.label15]));
+			w18.Position = 0;
+			w18.Expand = false;
+			w18.Fill = false;
 			// Container child boxCondition.Gtk.Box+BoxChild
 			this.label7 = new global::Gtk.Label ();
 			this.label7.Name = "label7";
 			this.label7.Xalign = 0F;
 			this.label7.LabelProp = global::Mono.Unix.Catalog.GetString ("Condition expression:");
 			this.boxCondition.Add (this.label7);
-			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.boxCondition [this.label7]));
-			w16.Position = 1;
-			w16.Expand = false;
-			w16.Fill = false;
+			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.boxCondition [this.label7]));
+			w19.Position = 1;
+			w19.Expand = false;
+			w19.Fill = false;
 			// Container child boxCondition.Gtk.Box+BoxChild
 			this.entryCondition = new global::Gtk.Entry ();
 			this.entryCondition.CanFocus = true;
@@ -239,19 +273,19 @@ namespace MonoDevelop.Debugger
 			this.entryCondition.IsEditable = true;
 			this.entryCondition.InvisibleChar = '●';
 			this.boxCondition.Add (this.entryCondition);
-			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.boxCondition [this.entryCondition]));
-			w17.Position = 2;
+			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.boxCondition [this.entryCondition]));
+			w20.Position = 2;
 			this.boxConditionOptions.Add (this.boxCondition);
-			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.boxConditionOptions [this.boxCondition]));
-			w18.Position = 3;
+			global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.boxConditionOptions [this.boxCondition]));
+			w21.Position = 3;
 			// Container child boxConditionOptions.Gtk.Box+BoxChild
 			this.hseparator1 = new global::Gtk.HSeparator ();
 			this.hseparator1.Name = "hseparator1";
 			this.boxConditionOptions.Add (this.hseparator1);
-			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.boxConditionOptions [this.hseparator1]));
-			w19.Position = 4;
-			w19.Expand = false;
-			w19.Fill = false;
+			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.boxConditionOptions [this.hseparator1]));
+			w22.Position = 4;
+			w22.Expand = false;
+			w22.Fill = false;
 			// Container child boxConditionOptions.Gtk.Box+BoxChild
 			this.hbox7 = new global::Gtk.HBox ();
 			this.hbox7.Name = "hbox7";
@@ -262,10 +296,10 @@ namespace MonoDevelop.Debugger
 			this.label8.Xalign = 0F;
 			this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("Hit count before breaking:");
 			this.hbox7.Add (this.label8);
-			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.hbox7 [this.label8]));
-			w20.Position = 0;
-			w20.Expand = false;
-			w20.Fill = false;
+			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.hbox7 [this.label8]));
+			w23.Position = 0;
+			w23.Expand = false;
+			w23.Fill = false;
 			// Container child hbox7.Gtk.Box+BoxChild
 			this.spinHitCount = new global::Gtk.SpinButton (0, 100000000, 1);
 			this.spinHitCount.CanFocus = true;
@@ -275,23 +309,23 @@ namespace MonoDevelop.Debugger
 			this.spinHitCount.Numeric = true;
 			this.spinHitCount.Value = 1;
 			this.hbox7.Add (this.spinHitCount);
-			global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox7 [this.spinHitCount]));
-			w21.Position = 1;
-			w21.Expand = false;
-			w21.Fill = false;
+			global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.hbox7 [this.spinHitCount]));
+			w24.Position = 1;
+			w24.Expand = false;
+			w24.Fill = false;
 			this.boxConditionOptions.Add (this.hbox7);
-			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.boxConditionOptions [this.hbox7]));
-			w22.Position = 5;
-			w22.Expand = false;
-			w22.Fill = false;
+			global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.boxConditionOptions [this.hbox7]));
+			w25.Position = 5;
+			w25.Expand = false;
+			w25.Fill = false;
 			this.hbox4.Add (this.boxConditionOptions);
-			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.boxConditionOptions]));
-			w23.Position = 1;
+			global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.boxConditionOptions]));
+			w26.Position = 1;
 			this.vbox2.Add (this.hbox4);
-			global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox4]));
-			w24.Position = 3;
-			w24.Expand = false;
-			w24.Fill = false;
+			global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox4]));
+			w27.Position = 3;
+			w27.Expand = false;
+			w27.Fill = false;
 			// Container child vbox2.Gtk.Box+BoxChild
 			this.label3 = new global::Gtk.Label ();
 			this.label3.Name = "label3";
@@ -299,10 +333,10 @@ namespace MonoDevelop.Debugger
 			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Action</b>");
 			this.label3.UseMarkup = true;
 			this.vbox2.Add (this.label3);
-			global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.label3]));
-			w25.Position = 4;
-			w25.Expand = false;
-			w25.Fill = false;
+			global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.label3]));
+			w28.Position = 4;
+			w28.Expand = false;
+			w28.Fill = false;
 			// Container child vbox2.Gtk.Box+BoxChild
 			this.hbox2 = new global::Gtk.HBox ();
 			this.hbox2.Name = "hbox2";
@@ -312,10 +346,10 @@ namespace MonoDevelop.Debugger
 			this.label10.WidthRequest = 12;
 			this.label10.Name = "label10";
 			this.hbox2.Add (this.label10);
-			global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.label10]));
-			w26.Position = 0;
-			w26.Expand = false;
-			w26.Fill = false;
+			global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.label10]));
+			w29.Position = 0;
+			w29.Expand = false;
+			w29.Fill = false;
 			// Container child hbox2.Gtk.Box+BoxChild
 			this.boxAction = new global::Gtk.VBox ();
 			this.boxAction.Name = "boxAction";
@@ -326,10 +360,10 @@ namespace MonoDevelop.Debugger
 			this.label11.Xalign = 0F;
 			this.label11.LabelProp = global::Mono.Unix.Catalog.GetString ("When the breakpoint is hit:");
 			this.boxAction.Add (this.label11);
-			global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.boxAction [this.label11]));
-			w27.Position = 0;
-			w27.Expand = false;
-			w27.Fill = false;
+			global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.boxAction [this.label11]));
+			w30.Position = 0;
+			w30.Expand = false;
+			w30.Fill = false;
 			// Container child boxAction.Gtk.Box+BoxChild
 			this.radioActionBreak = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("Break"));
 			this.radioActionBreak.CanFocus = true;
@@ -338,10 +372,10 @@ namespace MonoDevelop.Debugger
 			this.radioActionBreak.UseUnderline = true;
 			this.radioActionBreak.Group = new global::GLib.SList (global::System.IntPtr.Zero);
 			this.boxAction.Add (this.radioActionBreak);
-			global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.boxAction [this.radioActionBreak]));
-			w28.Position = 1;
-			w28.Expand = false;
-			w28.Fill = false;
+			global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(this.boxAction [this.radioActionBreak]));
+			w31.Position = 1;
+			w31.Expand = false;
+			w31.Fill = false;
 			// Container child boxAction.Gtk.Box+BoxChild
 			this.radioActionTrace = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("Write expression to the output"));
 			this.radioActionTrace.CanFocus = true;
@@ -350,10 +384,10 @@ namespace MonoDevelop.Debugger
 			this.radioActionTrace.UseUnderline = true;
 			this.radioActionTrace.Group = this.radioActionBreak.Group;
 			this.boxAction.Add (this.radioActionTrace);
-			global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.boxAction [this.radioActionTrace]));
-			w29.Position = 2;
-			w29.Expand = false;
-			w29.Fill = false;
+			global::Gtk.Box.BoxChild w32 = ((global::Gtk.Box.BoxChild)(this.boxAction [this.radioActionTrace]));
+			w32.Position = 2;
+			w32.Expand = false;
+			w32.Fill = false;
 			// Container child boxAction.Gtk.Box+BoxChild
 			this.boxTraceExpression = new global::Gtk.HBox ();
 			this.boxTraceExpression.Name = "boxTraceExpression";
@@ -363,19 +397,19 @@ namespace MonoDevelop.Debugger
 			this.label13.WidthRequest = 12;
 			this.label13.Name = "label13";
 			this.boxTraceExpression.Add (this.label13);
-			global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.boxTraceExpression [this.label13]));
-			w30.Position = 0;
-			w30.Expand = false;
-			w30.Fill = false;
+			global::Gtk.Box.BoxChild w33 = ((global::Gtk.Box.BoxChild)(this.boxTraceExpression [this.label13]));
+			w33.Position = 0;
+			w33.Expand = false;
+			w33.Fill = false;
 			// Container child boxTraceExpression.Gtk.Box+BoxChild
 			this.label12 = new global::Gtk.Label ();
 			this.label12.Name = "label12";
 			this.label12.LabelProp = global::Mono.Unix.Catalog.GetString ("Expression:");
 			this.boxTraceExpression.Add (this.label12);
-			global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(this.boxTraceExpression [this.label12]));
-			w31.Position = 1;
-			w31.Expand = false;
-			w31.Fill = false;
+			global::Gtk.Box.BoxChild w34 = ((global::Gtk.Box.BoxChild)(this.boxTraceExpression [this.label12]));
+			w34.Position = 1;
+			w34.Expand = false;
+			w34.Fill = false;
 			// Container child boxTraceExpression.Gtk.Box+BoxChild
 			this.entryTraceExpr = new global::Gtk.Entry ();
 			this.entryTraceExpr.CanFocus = true;
@@ -383,32 +417,32 @@ namespace MonoDevelop.Debugger
 			this.entryTraceExpr.IsEditable = true;
 			this.entryTraceExpr.InvisibleChar = '●';
 			this.boxTraceExpression.Add (this.entryTraceExpr);
-			global::Gtk.Box.BoxChild w32 = ((global::Gtk.Box.BoxChild)(this.boxTraceExpression [this.entryTraceExpr]));
-			w32.Position = 2;
+			global::Gtk.Box.BoxChild w35 = ((global::Gtk.Box.BoxChild)(this.boxTraceExpression [this.entryTraceExpr]));
+			w35.Position = 2;
 			this.boxAction.Add (this.boxTraceExpression);
-			global::Gtk.Box.BoxChild w33 = ((global::Gtk.Box.BoxChild)(this.boxAction [this.boxTraceExpression]));
-			w33.Position = 3;
-			w33.Expand = false;
-			w33.Fill = false;
+			global::Gtk.Box.BoxChild w36 = ((global::Gtk.Box.BoxChild)(this.boxAction [this.boxTraceExpression]));
+			w36.Position = 3;
+			w36.Expand = false;
+			w36.Fill = false;
 			this.hbox2.Add (this.boxAction);
-			global::Gtk.Box.BoxChild w34 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.boxAction]));
-			w34.Position = 1;
+			global::Gtk.Box.BoxChild w37 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.boxAction]));
+			w37.Position = 1;
 			this.vbox2.Add (this.hbox2);
-			global::Gtk.Box.BoxChild w35 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox2]));
-			w35.Position = 5;
-			w35.Expand = false;
-			w35.Fill = false;
+			global::Gtk.Box.BoxChild w38 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox2]));
+			w38.Position = 5;
+			w38.Expand = false;
+			w38.Fill = false;
 			w1.Add (this.vbox2);
-			global::Gtk.Box.BoxChild w36 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2]));
-			w36.Position = 0;
-			w36.Expand = false;
-			w36.Fill = false;
+			global::Gtk.Box.BoxChild w39 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2]));
+			w39.Position = 0;
+			w39.Expand = false;
+			w39.Fill = false;
 			// Internal child MonoDevelop.Debugger.BreakpointPropertiesDialog.ActionArea
-			global::Gtk.HButtonBox w37 = this.ActionArea;
-			w37.Name = "dialog1_ActionArea";
-			w37.Spacing = 6;
-			w37.BorderWidth = ((uint)(5));
-			w37.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
+			global::Gtk.HButtonBox w40 = this.ActionArea;
+			w40.Name = "dialog1_ActionArea";
+			w40.Spacing = 6;
+			w40.BorderWidth = ((uint)(5));
+			w40.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
 			this.buttonCancel = new global::Gtk.Button ();
 			this.buttonCancel.CanDefault = true;
@@ -418,9 +452,9 @@ namespace MonoDevelop.Debugger
 			this.buttonCancel.UseUnderline = true;
 			this.buttonCancel.Label = "gtk-cancel";
 			this.AddActionWidget (this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w38 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w37 [this.buttonCancel]));
-			w38.Expand = false;
-			w38.Fill = false;
+			global::Gtk.ButtonBox.ButtonBoxChild w41 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w40 [this.buttonCancel]));
+			w41.Expand = false;
+			w41.Fill = false;
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
 			this.buttonOk = new global::Gtk.Button ();
 			this.buttonOk.CanDefault = true;
@@ -429,11 +463,11 @@ namespace MonoDevelop.Debugger
 			this.buttonOk.UseStock = true;
 			this.buttonOk.UseUnderline = true;
 			this.buttonOk.Label = "gtk-ok";
-			w37.Add (this.buttonOk);
-			global::Gtk.ButtonBox.ButtonBoxChild w39 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w37 [this.buttonOk]));
-			w39.Position = 1;
-			w39.Expand = false;
-			w39.Fill = false;
+			w40.Add (this.buttonOk);
+			global::Gtk.ButtonBox.ButtonBoxChild w42 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w40 [this.buttonOk]));
+			w42.Position = 1;
+			w42.Expand = false;
+			w42.Fill = false;
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();
 			}
diff --git a/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
index f60ce2f186..d0f69b9ecb 100644
--- a/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
@@ -583,7 +583,7 @@
                   <placeholder />
                 </child>
                 <child>
-                  <widget class="Gtk.Entry" id="entryFile">
+                  <widget class="Gtk.Entry" id="entryFileFunction">
                     <property name="MemberName" />
                     <property name="CanFocus">True</property>
                     <property name="IsEditable">True</property>
@@ -603,7 +603,7 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="Gtk.HBox" id="hbox1">
+                  <widget class="Gtk.HBox" id="hboxLineColumn">
                     <property name="MemberName" />
                     <property name="Spacing">6</property>
                     <child>
@@ -626,10 +626,47 @@
                       </packing>
                     </child>
                     <child>
-                      <placeholder />
-                    </child>
-                    <child>
-                      <placeholder />
+                      <widget class="Gtk.HBox" id="hboxColumn">
+                        <property name="MemberName" />
+                        <property name="Spacing">6</property>
+                        <child>
+                          <widget class="Gtk.Label" id="label9">
+                            <property name="MemberName" />
+                            <property name="LabelProp" translatable="yes">Column:</property>
+                            <property name="Justify">Right</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.SpinButton" id="spinColumn">
+                            <property name="MemberName" />
+                            <property name="CanFocus">True</property>
+                            <property name="Lower">1</property>
+                            <property name="Upper">100</property>
+                            <property name="PageIncrement">10</property>
+                            <property name="StepIncrement">1</property>
+                            <property name="ClimbRate">1</property>
+                            <property name="Numeric">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">True</property>
+                        <property name="Expand">False</property>
+                        <property name="Fill">False</property>
+                      </packing>
                     </child>
                   </widget>
                   <packing>
@@ -649,14 +686,11 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="Gtk.Label" id="label4">
+                  <widget class="Gtk.Label" id="label6">
                     <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp" translatable="yes">File:</property>
+                    <property name="WidthRequest">12</property>
                   </widget>
                   <packing>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
                     <property name="AutoSize">True</property>
                     <property name="XOptions">Fill</property>
                     <property name="YOptions">Fill</property>
@@ -669,13 +703,12 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="Gtk.Label" id="label5">
+                  <widget class="Gtk.Label" id="labelFileFunction">
                     <property name="MemberName" />
-                    <property name="LabelProp" translatable="yes">Line:</property>
+                    <property name="Xalign">0</property>
+                    <property name="LabelProp" translatable="yes">File:</property>
                   </widget>
                   <packing>
-                    <property name="TopAttach">1</property>
-                    <property name="BottomAttach">2</property>
                     <property name="LeftAttach">1</property>
                     <property name="RightAttach">2</property>
                     <property name="AutoSize">True</property>
@@ -690,11 +723,15 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="Gtk.Label" id="label6">
+                  <widget class="Gtk.Label" id="labelLine">
                     <property name="MemberName" />
-                    <property name="WidthRequest">12</property>
+                    <property name="LabelProp" translatable="yes">Line:</property>
                   </widget>
                   <packing>
+                    <property name="TopAttach">1</property>
+                    <property name="BottomAttach">2</property>
+                    <property name="LeftAttach">1</property>
+                    <property name="RightAttach">2</property>
                     <property name="AutoSize">True</property>
                     <property name="XOptions">Fill</property>
                     <property name="YOptions">Fill</property>
@@ -751,6 +788,7 @@
                         <property name="MemberName" />
                         <property name="CanFocus">True</property>
                         <property name="Label" translatable="yes">Always break</property>
+                        <property name="Active">True</property>
                         <property name="DrawIndicator">True</property>
                         <property name="HasLabel">True</property>
                         <property name="UseUnderline">True</property>
@@ -967,6 +1005,7 @@
                         <property name="MemberName" />
                         <property name="CanFocus">True</property>
                         <property name="Label" translatable="yes">Break</property>
+                        <property name="Active">True</property>
                         <property name="DrawIndicator">True</property>
                         <property name="HasLabel">True</property>
                         <property name="UseUnderline">True</property>