Author: jackson
Date: 2006-12-07 16:12:13 -0500 (Thu, 07 Dec 2006)
New Revision: 69203
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
Log:
* TextBoxBase.cs: Take HideSelection into account when
* determining
whether or not to show the selection.
* RichTextBox.cs: After inserting the RTF into the document move
the cursor to the beginning of the document.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-12-07 20:45:29 UTC (rev 69202)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-12-07 21:12:13 UTC (rev 69203)
@@ -1,3 +1,10 @@
+2006-12-07 Jackson Harper <[EMAIL PROTECTED]>
+
+ * TextBoxBase.cs: Take HideSelection into account when determining
+ whether or not to show the selection.
+ * RichTextBox.cs: After inserting the RTF into the document move
+ the cursor to the beginning of the document.
+
2006-12-07 Jonathan Pobst <[EMAIL PROTECTED]>
* Control.cs: Remove static ArrayList "controls" which maintained
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs
2006-12-07 20:45:29 UTC (rev 69202)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs
2006-12-07 21:12:13 UTC (rev 69203)
@@ -873,6 +873,10 @@
}
InsertRTFFromStream(data, 0, 1);
+
+ document.PositionCaret (document.GetLine (1), 0);
+ document.SetSelectionToCaret (true);
+ ScrollToCaret ();
}
[MonoTODO("Make smarter RTF detection?")]
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
2006-12-07 20:45:29 UTC (rev 69202)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
2006-12-07 21:12:13 UTC (rev 69203)
@@ -1374,7 +1374,7 @@
internal bool ShowSelection {
get {
- if (show_selection) {
+ if (show_selection || !hide_selection) {
return true;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
