* TextBoxBase.cs: When we move the caret we also need to move

        * the
        selection, this fixes some random crashing after doing select
        text, unselect, delete a char, paste.


svn path=/trunk/mcs/; revision=71611

2 files changed, 9 insertions, 2 deletions

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 9f3897cd398..cae7ad58197 100644
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-24  Jackson Harper  <jackson@ximian.com>
+
+	* TextBoxBase.cs: When we move the caret we also need to move the
+	selection, this fixes some random crashing after doing select
+	text, unselect, delete a char, paste.
+
 2007-01-24  Rolf Bjarne Kvinge  <RKvinge@novell.com>
 
 	* Form.cs: Update SizeGrip's location even if it's not visible (fixes #80592).
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
index 75571d4eae2..086364cc9c3 100644
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
@@ -1170,7 +1170,7 @@ namespace System.Windows.Forms {
 					document.Combine(line, document.CaretLine);
 					document.UpdateView(line, 1, 0);
 					document.PositionCaret(line, new_caret_pos);
-					//document.MoveCaret(CaretDirection.CharForward);
+					document.SetSelectionToCaret (true);
 					document.UpdateCaret();
 					fire_changed = true;
 				}
@@ -1183,7 +1183,7 @@ namespace System.Windows.Forms {
 					int pos = document.CaretPosition;
 					document.MoveCaret (CaretDirection.CharBack);
 					document.DeleteChar (tag, pos, false);
-
+					document.SetSelectionToCaret (true);
 				} else {
 					int start_pos;
 
@@ -1194,6 +1194,7 @@ namespace System.Windows.Forms {
 					}
 					document.DeleteChars(document.CaretTag, start_pos, document.CaretPosition - start_pos);
 					document.PositionCaret(document.CaretLine, start_pos);
+					document.SetSelectionToCaret (true);
 				}
 				document.UpdateCaret();
 				fire_changed = true;