2007-10-02 Jonathan Pobst <monkey@jpobst.com>

	* TextBoxBase.cs: For the 1.1 profile, the default SelectedText
	is null, not String.Empty.  See bug #323038.

2007-10-02  Jonathan Pobst  <monkey@jpobst.com>

	* TextBoxTest.cs: Remove NotWorking from FocusSelectsAllTest.

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 07d0200ce6f2995112740ce51b027f348201234f..c61a700760c7c13992cb95371ebd8aa380673c7d 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-02  Jonathan Pobst  <monkey@jpobst.com>
+
+       * TextBoxBase.cs: For the 1.1 profile, the default SelectedText
+       is null, not String.Empty.  See bug #323038.
+
 2007-10-01  Jonathan Pobst  <monkey@jpobst.com>
 
        * TextControl.cs: Change the margins to match MS a little better.

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 8b3e58cd48c2c225086306cb866876392849e858..a37a7396795c4c1a70d6e764b4abe2216a45ea2b 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
@@ -519,7 +519,13 @@ namespace System.Windows.Forms {
                [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
                public virtual string SelectedText {
                        get {
-                               return document.GetSelection();
+                               string retval = document.GetSelection ();
+
+#if ONLY_1_1
+                               if (!IsHandleCreated && retval == string.Empty)
+                                       return null;
+#endif
+                               return retval;
                        }
 
                        set {

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
index 39e574b820ca9eacf8abf5f11855ecc86a6060cf..e2b95ad9171a17b26ca967cb56c3f6c7b866eb4b 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-02  Jonathan Pobst  <monkey@jpobst.com>
+
+       * TextBoxTest.cs: Remove NotWorking from FocusSelectsAllTest.
+
 2007-09-29  Jonathan Pobst  <monkey@jpobst.com>
 
        * RadioButtonTest.cs: Fix test to not fail on monobuild.

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TextBoxTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TextBoxTest.cs
index de085df15fb5af10ea19f0852b5325e28c93323a..44279a1fa3a938cf763509bb762c547dec7ea5fc 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TextBoxTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TextBoxTest.cs
@@ -373,7 +373,6 @@ namespace MonoTests.System.Windows.Forms
                }
 
                [Test]
-               [Category ("NotWorking")]
                public void FocusSelectsAllTest ()
                {
                        Form form = new Form ();