Author: jackson
Date: 2006-11-10 12:48:38 -0500 (Fri, 10 Nov 2006)
New Revision: 67679
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextControl.cs
Log:
- CanUndo means 'is there any undo operations', not 'is undo
allowed on this textcontrol. Fixed ClearUndo unit test.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-11-10 17:37:10 UTC (rev 67678)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-11-10 17:48:38 UTC (rev 67679)
@@ -4,6 +4,8 @@
BeforeSelect event.
* TextBoxBase.cs: There is no need to expand selection on
MouseMove.
+ - CanUndo means 'is there any undo operations', not 'is undo
+ allowed on this textcontrol. Fixed ClearUndo unit test.
2006-11-10 Andreia Gaita <[EMAIL PROTECTED]>
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextControl.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextControl.cs
2006-11-10 17:37:10 UTC (rev 67678)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextControl.cs
2006-11-10 17:48:38 UTC (rev 67679)
@@ -1888,7 +1888,11 @@
// regular drawing, no
selection to deal with
//g.DrawString(s.Substring(tag.start-1, tag.length), tag.font, tag.color, tag.X
+ line.align_shift - viewport_x, line.Y + tag.shift - viewport_y,
StringFormat.GenericTypographic);
if (owner.is_enabled) {
-
g.DrawString(text.ToString(tag.start-1, tag.length), tag.font, tag.color, tag.X
+ line.align_shift - viewport_x, line.Y + tag.shift - viewport_y,
StringFormat.GenericTypographic);
+ try {
+
g.DrawString(text.ToString(tag.start-1, tag.length), tag.font, tag.color, tag.X
+ line.align_shift - viewport_x, line.Y + tag.shift - viewport_y,
StringFormat.GenericTypographic);
+ } catch
(Exception e) {
+
Console.WriteLine ("CRASHED: {0} {1} {2}", text, tag.start, tag.length);
+ }
} else {
Color a;
Color b;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches