[bcl] Remove more NET_2_0 checks from class libs

[mono.git] / mcs / class / Managed.Windows.Forms / Test / System.Windows.Forms / LabelTest.cs

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/LabelTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/LabelTest.cs
index dcaf0b5ca516d3c7fae4e787318a6facedbf4d8b..fee5db740e38d73528511e539645d5475b2a7723 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/LabelTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/LabelTest.cs
@@ -66,7 +66,6 @@ namespace MonoTests.System.Windows.Forms
                        l.BorderStyle = BorderStyle.Fixed3D;
                        Assert.AreEqual (l.PreferredHeight, (l.Font.Height + 6), "#4");
 
-#if NET_2_0                    
                        l.UseCompatibleTextRendering = false;
                        
                        l.BorderStyle = BorderStyle.None;
@@ -77,7 +76,6 @@ namespace MonoTests.System.Windows.Forms
                        
                        l.BorderStyle = BorderStyle.Fixed3D;
                        Assert.AreEqual (l.PreferredHeight, (l.Font.Height), "#7");
-#endif
                }
                
                [Test]
@@ -114,11 +112,7 @@ namespace MonoTests.System.Windows.Forms
                        // Height: autosize = false
                        Assert.IsFalse (l1.Height.Equals (l2.Height), "#7");
                        Assert.IsTrue (l1.Height.Equals (l3.Height), "#8");
-#if NET_2_0
                        Assert.IsTrue ((l4.Height > l1.Height), "#9");
-#else
-                       Assert.IsTrue (l1.Height.Equals (l4.Height), "#9");
-#endif
                        
                        // Width: autosize = false
                        Assert.IsFalse (l1.Width.Equals (l2.Width), "#10");
@@ -252,7 +246,6 @@ namespace MonoTests.System.Windows.Forms
                   Assert.AreEqual ("System.Windows.Forms.Label, Text: My Label", l.ToString (), "T1");
           }
           
-#if NET_2_0
        [Test]
        public void AutoSizeExplicitSize ()
        {
@@ -331,7 +324,6 @@ namespace MonoTests.System.Windows.Forms
                   Assert.AreEqual (-1, b.ImageIndex, "D14");
                   Assert.AreEqual (string.Empty, b.ImageKey, "D15");
           }
-#endif
    }
 
    [TestFixture]
@@ -348,9 +340,7 @@ namespace MonoTests.System.Windows.Forms
                   eventhandled = true;
           }
 
-#if NET_2_0
           [Ignore ("AutoSize moved to Control in 2.0, Label.AutoSize needs to be reworked a bit.")]
-#endif
           [Test]
           public void AutoSizeChangedChangedTest ()
             {