[bcl] Remove more NET_2_0 checks from class libs

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

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ControlHandleTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ControlHandleTest.cs
index 8da096caa3128a2d4303f17c404ec0d67fd289f7..ad35b7eb22cc60aaac91e02fc82a855ce954c30b 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ControlHandleTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ControlHandleTest.cs
@@ -65,16 +65,14 @@ namespace MonoTests.System.Windows.Forms
                        o = c.Anchor;
                        c.Anchor = AnchorStyles.Right;
                        Assert.IsFalse (c.IsHandleCreated, "A6");
-#if !__MonoCS__ && NET_2_0
+#if !__MonoCS__
                        o = c.AutoScrollOffset;
                        c.AutoScrollOffset = new Point (40, 40);
                        Assert.IsFalse (c.IsHandleCreated, "A7");
 #endif
-#if NET_2_0
                        o = c.AutoSize;
                        c.AutoSize = true;
                        Assert.IsFalse (c.IsHandleCreated, "A8");
-#endif
                
                        // B
                        o = c.BackColor;
@@ -83,11 +81,9 @@ namespace MonoTests.System.Windows.Forms
                        o = c.BackgroundImage;
                        c.BackgroundImage = new Bitmap (1, 1);
                        Assert.IsFalse (c.IsHandleCreated, "A10");
-#if NET_2_0
                        o = c.BackgroundImageLayout;
                        c.BackgroundImageLayout = ImageLayout.Stretch;
                        Assert.IsFalse (c.IsHandleCreated, "A11");
-#endif
                        o = c.BindingContext;
                        c.BindingContext = new BindingContext ();
                        Assert.IsFalse (c.IsHandleCreated, "A12");
@@ -124,11 +120,9 @@ namespace MonoTests.System.Windows.Forms
                        o = c.ContextMenu;
                        c.ContextMenu = new ContextMenu ();
                        Assert.IsFalse (c.IsHandleCreated, "A24");
-#if NET_2_0
                        o = c.ContextMenuStrip;
                        c.ContextMenuStrip = new ContextMenuStrip ();
                        Assert.IsFalse (c.IsHandleCreated, "A25");
-#endif
                        o = c.Controls;
                        Assert.IsFalse (c.IsHandleCreated, "A26");
                        o = c.Created;
@@ -180,14 +174,12 @@ namespace MonoTests.System.Windows.Forms
                        Assert.IsFalse (c.IsHandleCreated, "A42");
                        o = c.IsDisposed;
                        Assert.IsFalse (c.IsHandleCreated, "A43");
-#if !__MonoCS__ && NET_2_0
+#if !__MonoCS__
                        o = c.IsMirrored;
                        Assert.IsFalse (c.IsHandleCreated, "A44");
 #endif
-#if NET_2_0
                        o = c.LayoutEngine;
                        Assert.IsFalse (c.IsHandleCreated, "A45");
-#endif
                        o = c.Left;
                        c.Left = 15;
                        Assert.IsFalse (c.IsHandleCreated, "A46");
@@ -196,7 +188,6 @@ namespace MonoTests.System.Windows.Forms
                        Assert.IsFalse (c.IsHandleCreated, "A47");
 
                        // M - N
-#if NET_2_0
                        o = c.Margin;
                        c.Margin = new Padding (6);
                        Assert.IsFalse (c.IsHandleCreated, "A48");
@@ -206,24 +197,19 @@ namespace MonoTests.System.Windows.Forms
                        o = c.MinimumSize;
                        c.MinimumSize = new Size (100, 100);
                        Assert.IsFalse (c.IsHandleCreated, "A50");
-#endif
                        o = c.Name;
                        c.Name = "web";
                        Assert.IsFalse (c.IsHandleCreated, "A51");
                        
                        // P - R
-#if NET_2_0
                        o = c.Padding;
                        c.Padding = new Padding (4);
                        Assert.IsFalse (c.IsHandleCreated, "A52");
-#endif
                        o = c.Parent;
                        c.Parent = new Control ();
                        Assert.IsFalse (c.IsHandleCreated, "A53");
-#if NET_2_0
                        o = c.PreferredSize;
                        Assert.IsFalse (c.IsHandleCreated, "A54");
-#endif
                        o = c.ProductName;
                        Assert.IsFalse (c.IsHandleCreated, "A55");
                        o = c.ProductVersion;
@@ -259,7 +245,7 @@ namespace MonoTests.System.Windows.Forms
                        Assert.IsFalse (c.IsHandleCreated, "A66");
                        o = c.TopLevelControl;
                        Assert.IsFalse (c.IsHandleCreated, "A67");
-#if !__MonoCS__ && NET_2_0
+#if !__MonoCS__
                        o = c.UseWaitCursor;
                        c.UseWaitCursor = true;
                        Assert.IsFalse (c.IsHandleCreated, "A68");
@@ -284,19 +270,16 @@ namespace MonoTests.System.Windows.Forms
                        ProtectedPropertyControl c = new ProtectedPropertyControl ();
 
                        object o;
-#if !__MonoCS__ && NET_2_0
+#if !__MonoCS__
                        o = c.PublicCanRaiseEvents;
                        Assert.IsFalse (c.IsHandleCreated, "A1");
 #endif
                        o = c.PublicCreateParams;
                        Assert.IsFalse (c.IsHandleCreated, "A2");
-#if NET_2_0
                        o = c.PublicDefaultCursor;
                        Assert.IsFalse (c.IsHandleCreated, "A3");
-#endif
                        o = c.PublicDefaultImeMode;
                        Assert.IsFalse (c.IsHandleCreated, "A4");
-#if NET_2_0
                        o = c.PublicDefaultMargin;
                        Assert.IsFalse (c.IsHandleCreated, "A5");
                        o = c.PublicDefaultMaximumSize;
@@ -310,7 +293,6 @@ namespace MonoTests.System.Windows.Forms
                        o = c.PublicDoubleBuffered;
                        c.PublicDoubleBuffered = !c.PublicDoubleBuffered;
                        Assert.IsFalse (c.IsHandleCreated, "A10");
-#endif
                        o = c.PublicFontHeight;
                        c.PublicFontHeight = c.PublicFontHeight + 1;
                        Assert.IsFalse (c.IsHandleCreated, "A11");
@@ -319,7 +301,7 @@ namespace MonoTests.System.Windows.Forms
                        o = c.PublicResizeRedraw;
                        c.PublicResizeRedraw = !c.PublicResizeRedraw;
                        Assert.IsFalse (c.IsHandleCreated, "A13");
-#if !__MonoCS__ && NET_2_0
+#if !__MonoCS__
                        o = c.PublicScaleChildren;
                        Assert.IsFalse (c.IsHandleCreated, "A14");
 #endif
@@ -380,10 +362,8 @@ namespace MonoTests.System.Windows.Forms
                        Assert.IsFalse (c.IsHandleCreated, "A11");
                        c.GetNextControl (new Control (), true);
                        Assert.IsFalse (c.IsHandleCreated, "A12");
-#if NET_2_0
                        c.GetPreferredSize (Size.Empty);
                        Assert.IsFalse (c.IsHandleCreated, "A13");
-#endif
                        c.Hide ();
                        Assert.IsFalse (c.IsHandleCreated, "A14");
                        c.Invalidate ();
@@ -428,10 +408,8 @@ namespace MonoTests.System.Windows.Forms
                        Assert.IsFalse (c.IsHandleCreated, "A31");
                        c.ResumeLayout ();
                        Assert.IsFalse (c.IsHandleCreated, "A32");
-#if NET_2_0
                        c.Scale (new SizeF (1.5f, 1.5f));
                        Assert.IsFalse (c.IsHandleCreated, "A33");
-#endif
                        c.Select ();
                        Assert.IsFalse (c.IsHandleCreated, "A34");
                        c.SelectNextControl (new Control (), true, true, true, true);
@@ -470,26 +448,22 @@ namespace MonoTests.System.Windows.Forms
                
                private class ProtectedPropertyControl : Control
                {
-#if !__MonoCS__ && NET_2_0
+#if !__MonoCS__
                        public bool PublicCanRaiseEvents { get { return base.CanRaiseEvents; } }
 #endif
                        public CreateParams PublicCreateParams { get { return base.CreateParams; } }
-#if NET_2_0
                        public Cursor PublicDefaultCursor { get { return base.DefaultCursor; } }
-#endif
                        public ImeMode PublicDefaultImeMode { get { return base.DefaultImeMode; } }
-#if NET_2_0
                        public Padding PublicDefaultMargin { get { return base.DefaultMargin; } }
                        public Size PublicDefaultMaximumSize { get { return base.DefaultMaximumSize; } }
                        public Size PublicDefaultMinimumSize { get { return base.DefaultMinimumSize; } }
                        public Padding PublicDefaultPadding { get { return base.DefaultPadding; } }
                        public Size PublicDefaultSize { get { return base.DefaultSize; } }
                        public bool PublicDoubleBuffered { get { return base.DoubleBuffered; } set { base.DoubleBuffered = value; } }
-#endif
                        public int PublicFontHeight { get { return base.FontHeight; } set { base.FontHeight = value; } }
                        public bool PublicRenderRightToLeft { get { return base.RenderRightToLeft; } }
                        public bool PublicResizeRedraw { get { return base.ResizeRedraw; } set { base.ResizeRedraw = value; } }
-#if !__MonoCS__ && NET_2_0
+#if !__MonoCS__
                        public bool PublicScaleChildren { get { return base.ScaleChildren; } }
 #endif
                        public bool PublicShowFocusCues { get { return base.ShowFocusCues; } }
@@ -507,11 +481,7 @@ namespace MonoTests.System.Windows.Forms
                        ProtectedMethodsControl c = new ProtectedMethodsControl ();
                        
                        c.PublicAccessibilityNotifyClients (AccessibleEvents.Focus, 0);
-#if NET_2_0
                        Assert.IsFalse (c.IsHandleCreated, "A1");
-#else
-                       Assert.IsTrue (c.IsHandleCreated, "A1");
-#endif
                        c.PublicCreateAccessibilityInstance ();
                        Assert.IsTrue (c.IsHandleCreated, "A2");
                        c = new ProtectedMethodsControl (); 
@@ -523,11 +493,9 @@ namespace MonoTests.System.Windows.Forms
                        c.PublicDestroyHandle ();
                        Assert.IsFalse (c.IsHandleCreated, "A5");
                        c = new ProtectedMethodsControl ();
-#if NET_2_0
                        c.PublicGetAccessibilityObjectById (0);
                        Assert.IsFalse (c.IsHandleCreated, "A6");
-#endif
-#if !__MonoCS__ && NET_2_0
+#if !__MonoCS__
                        c.PublicGetAutoSizeMode ();
                        Assert.IsFalse (c.IsHandleCreated, "A7");
                        c.PublicGetScaledBounds (new Rectangle (0, 0, 100, 100), new SizeF (1.5f, 1.5f), BoundsSpecified.All);
@@ -581,7 +549,7 @@ namespace MonoTests.System.Windows.Forms
                        Assert.IsFalse (c.IsHandleCreated, "A29");
                        c.PublicRtlTranslateLeftRight (LeftRightAlignment.Left);
                        Assert.IsFalse (c.IsHandleCreated, "A30");
-#if !__MonoCS__ && NET_2_0
+#if !__MonoCS__
                        c.PublicScaleControl (new SizeF (1.5f, 1.5f), BoundsSpecified.All);
                        Assert.IsFalse (c.IsHandleCreated, "A31");
 #endif
@@ -589,7 +557,7 @@ namespace MonoTests.System.Windows.Forms
                        Assert.IsFalse (c.IsHandleCreated, "A32");
                        c.PublicSelect ();
                        Assert.IsFalse (c.IsHandleCreated, "A33");
-#if !__MonoCS__ && NET_2_0
+#if !__MonoCS__
                        c.PublicSetAutoSizeMode (AutoSizeMode.GrowAndShrink);
                        Assert.IsFalse (c.IsHandleCreated, "A34");
 #endif
@@ -604,10 +572,8 @@ namespace MonoTests.System.Windows.Forms
                        c = new ProtectedMethodsControl ();
                        c.PublicSetVisibleCore (true);
                        Assert.IsFalse (c.IsHandleCreated, "A39");
-#if NET_2_0
                        c.PublicSizeFromClientSize (new Size (160, 160));
                        Assert.IsFalse (c.IsHandleCreated, "A40");
-#endif
                        c.PublicUpdateBounds ();
                        Assert.IsFalse (c.IsHandleCreated, "A41");
                        c.PublicUpdateBounds (1, 2, 3, 4);
@@ -627,10 +593,8 @@ namespace MonoTests.System.Windows.Forms
                        public void PublicCreateControlsInstance () { base.CreateControlsInstance (); }
                        public void PublicCreateHandle () { base.CreateHandle (); }
                        public void PublicDestroyHandle () { base.DestroyHandle (); }
-#if NET_2_0
                        public AccessibleObject PublicGetAccessibilityObjectById (int objectId) { return base.GetAccessibilityObjectById (objectId); }
-#endif
-#if !__MonoCS__ && NET_2_0
+#if !__MonoCS__
                        public AutoSizeMode PublicGetAutoSizeMode () { return base.GetAutoSizeMode (); }
                        public Rectangle PublicGetScaledBounds (Rectangle bounds, SizeF factor, BoundsSpecified specified) { return base.GetScaledBounds (bounds, factor, specified); }
 #endif
@@ -656,12 +620,12 @@ namespace MonoTests.System.Windows.Forms
                        public ContentAlignment PublicRtlTranslateContent (ContentAlignment align) { return base.RtlTranslateContent (align); }
                        public HorizontalAlignment PublicRtlTranslateHorizontal (HorizontalAlignment align) { return base.RtlTranslateHorizontal (align); }
                        public LeftRightAlignment PublicRtlTranslateLeftRight (LeftRightAlignment align) { return base.RtlTranslateLeftRight (align); }
-#if !__MonoCS__ && NET_2_0
+#if !__MonoCS__
                        public void PublicScaleControl (SizeF factor, BoundsSpecified specified) { base.ScaleControl (factor, specified); }
 #endif
                        public void PublicScaleCore (float dx, float dy) { base.ScaleCore (dx, dy); }
                        public void PublicSelect () { base.Select (); }
-#if !__MonoCS__ && NET_2_0
+#if !__MonoCS__
                        public void PublicSetAutoSizeMode (AutoSizeMode mode) { base.SetAutoSizeMode (mode); }
 #endif
                        public void PublicSetBoundsCore (int x, int y, int width, int height, BoundsSpecified specified) { base.SetBoundsCore (x, y, width, height, specified); }
@@ -669,9 +633,7 @@ namespace MonoTests.System.Windows.Forms
                        public void PublicSetStyle (ControlStyles flag, bool value) { base.SetStyle (flag, value); }
                        public void PublicSetTopLevel (bool value) { base.SetTopLevel (value); }
                        public void PublicSetVisibleCore (bool value) { base.SetVisibleCore (value); }
-#if NET_2_0
                        public Size PublicSizeFromClientSize (Size clientSize) { return base.SizeFromClientSize (clientSize); }
-#endif
                        public void PublicUpdateBounds () { base.UpdateBounds (); }
                        public void PublicUpdateBounds (int x, int y, int width, int height) { base.UpdateBounds (x, y, width, height); }
                        public void PublicUpdateBounds (int x, int y, int width, int height, int clientWidth, int clientHeight) { base.UpdateBounds (x, y, width, height, clientWidth, clientHeight); }