projects / mono.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[bcl] Remove more NET_2_0 checks from class libs
[mono.git] / mcs / class / Managed.Windows.Forms / Test / System.Windows.Forms / FormHandleTest.cs
diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormHandleTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormHandleTest.cs
index 25f04bca89c1dcc6442445f43a6347f9a5644fe1..32d3232c4bf9d7d086da3e7d7eb93e615d8bd74c 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormHandleTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormHandleTest.cs
@@ -89,16 +89,14 @@ namespace MonoTests.System.Windows.Forms
                        o = c.Anchor;\r
                        c.Anchor = AnchorStyles.Right;\r
                        Assert.IsFalse (c.IsHandleCreated, "A6");\r
-#if !__MonoCS__ && NET_2_0\r
+#if !__MonoCS__\r
                        o = c.AutoScrollOffset;\r
                        c.AutoScrollOffset = new Point (40, 40);\r
                        Assert.IsFalse (c.IsHandleCreated, "A7");\r
 #endif\r
-#if NET_2_0\r
                        o = c.AutoSize;\r
                        c.AutoSize = true;\r
                        Assert.IsFalse (c.IsHandleCreated, "A8");\r
-#endif\r
 \r
                        // A - Form                     \r
                        o = c.AcceptButton;\r
@@ -116,7 +114,6 @@ namespace MonoTests.System.Windows.Forms
                        c.AllowTransparency = !c.AllowTransparency;\r
                        Assert.IsFalse (c.IsHandleCreated, "FA4");\r
 \r
-#if NET_2_0\r
                        o = c.AutoScaleDimensions;\r
                        c.AutoScaleDimensions = SizeF.Empty;\r
                        Assert.IsFalse (c.IsHandleCreated, "FA5");\r
@@ -124,7 +121,6 @@ namespace MonoTests.System.Windows.Forms
                        o = c.AutoScaleMode;\r
                        c.AutoScaleMode = AutoScaleMode.Dpi;\r
                        Assert.IsFalse (c.IsHandleCreated, "FA6");\r
-#endif\r
                        o = c.AutoScroll;\r
                        c.AutoScroll = !c.AutoScroll;\r
                        Assert.IsFalse (c.IsHandleCreated, "FA7");\r
@@ -137,7 +133,7 @@ namespace MonoTests.System.Windows.Forms
                        c.AutoScrollMinSize = new Size (c.AutoScrollMinSize.Width + 1, c.AutoScrollMinSize.Height + 1);\r
                        Assert.IsFalse (c.IsHandleCreated, "FA9");\r
 \r
-#if NET_2_0 && !__MonoCS__\r
+#if !__MonoCS__\r
                        o = c.AutoScrollOffset;\r
                        c.AutoScrollOffset = new Point (c.AutoScrollOffset.X + 1, c.AutoScrollOffset.Y + 1);\r
                        Assert.IsFalse (c.IsHandleCreated, "FA10"); \r
@@ -146,7 +142,6 @@ namespace MonoTests.System.Windows.Forms
                        o = c.AutoScrollPosition;\r
                        c.AutoScrollPosition = new Point (c.AutoScrollPosition.X + 1, c.AutoScrollPosition.Y + 1);\r
                        Assert.IsFalse (c.IsHandleCreated, "FA11");\r
-#if NET_2_0\r
 \r
                        o = c.AutoSize;\r
                        c.AutoSize = !c.AutoSize;\r
@@ -160,7 +155,6 @@ namespace MonoTests.System.Windows.Forms
                        c.AutoValidate = AutoValidate.EnableAllowFocusChange;\r
                        Assert.IsFalse (c.IsHandleCreated, "FA14");\r
 \r
-#endif\r
                        // B\r
                        o = c.BackColor;\r
                        c.BackColor = Color.Green;\r
@@ -168,11 +162,9 @@ namespace MonoTests.System.Windows.Forms
                        o = c.BackgroundImage;\r
                        c.BackgroundImage = new Bitmap (1, 1);\r
                        Assert.IsFalse (c.IsHandleCreated, "A10");\r
-#if NET_2_0\r
                        o = c.BackgroundImageLayout;\r
                        c.BackgroundImageLayout = ImageLayout.Stretch;\r
                        Assert.IsFalse (c.IsHandleCreated, "A11");\r
-#endif\r
                        o = c.BindingContext;\r
                        c.BindingContext = new BindingContext ();\r
                        Assert.IsFalse (c.IsHandleCreated, "A12");\r
@@ -217,11 +209,9 @@ namespace MonoTests.System.Windows.Forms
                        o = c.ContextMenu;\r
                        c.ContextMenu = new ContextMenu ();\r
                        Assert.IsFalse (c.IsHandleCreated, "A24");\r
-#if NET_2_0\r
                        o = c.ContextMenuStrip;\r
                        c.ContextMenuStrip = new ContextMenuStrip ();\r
                        Assert.IsFalse (c.IsHandleCreated, "A25");\r
-#endif\r
                        o = c.Controls;\r
                        Assert.IsFalse (c.IsHandleCreated, "A26");\r
                        o = c.Created;\r
@@ -245,11 +235,9 @@ namespace MonoTests.System.Windows.Forms
                        o = c.ControlBox;\r
                        c.ControlBox = !c.ControlBox;\r
                        Assert.IsFalse (c.IsHandleCreated, "FC4");\r
-#if NET_2_0\r
 \r
                        o = c.CurrentAutoScaleDimensions;\r
                        Assert.IsFalse (c.IsHandleCreated, "FC5"); \r
-#endif\r
 \r
                        // D\r
                        o = c.DataBindings;\r
@@ -323,7 +311,7 @@ namespace MonoTests.System.Windows.Forms
                        c.HelpButton = !c.HelpButton;\r
                        Assert.IsFalse (c.IsHandleCreated, "FH1");\r
 \r
-#if NET_2_0 && !__MonoCS__\r
+#if !__MonoCS__\r
                        o = c.HorizontalScroll;\r
                        Assert.IsFalse (c.IsHandleCreated, "FH2"); \r
 #endif\r
@@ -336,14 +324,12 @@ namespace MonoTests.System.Windows.Forms
                        Assert.IsFalse (c.IsHandleCreated, "A42");\r
                        o = c.IsDisposed;\r
                        Assert.IsFalse (c.IsHandleCreated, "A43");\r
-#if !__MonoCS__ && NET_2_0\r
+#if !__MonoCS__\r
                        o = c.IsMirrored;\r
                        Assert.IsFalse (c.IsHandleCreated, "A44");\r
 #endif\r
-#if NET_2_0\r
                        o = c.LayoutEngine;\r
                        Assert.IsFalse (c.IsHandleCreated, "A45");\r
-#endif\r
                        o = c.Left;\r
                        c.Left = 15;\r
                        Assert.IsFalse (c.IsHandleCreated, "A46");\r
@@ -377,7 +363,6 @@ namespace MonoTests.System.Windows.Forms
                        \r
                        \r
                        // M - N\r
-#if NET_2_0\r
                        o = c.Margin;\r
                        c.Margin = new Padding (6);\r
                        Assert.IsFalse (c.IsHandleCreated, "A48");\r
@@ -387,17 +372,14 @@ namespace MonoTests.System.Windows.Forms
                        o = c.MinimumSize;\r
                        c.MinimumSize = new Size (100, 100);\r
                        Assert.IsFalse (c.IsHandleCreated, "A50");\r
-#endif\r
                        o = c.Name;\r
                        c.Name = "web";\r
                        Assert.IsFalse (c.IsHandleCreated, "A51");\r
 \r
-#if NET_2_0\r
                        // M - O - Form\r
                        o = c.MainMenuStrip;\r
                        c.MainMenuStrip = null;\r
                        Assert.IsFalse (c.IsHandleCreated, "FM1"); \r
-#endif\r
                        \r
                        o = c.MaximizeBox;\r
                        c.MaximizeBox = !c.MaximizeBox;\r
@@ -444,11 +426,9 @@ namespace MonoTests.System.Windows.Forms
                        Assert.IsFalse (c.IsHandleCreated, "FO3");\r
                        \r
                        // P - R\r
-#if NET_2_0\r
                        o = c.Padding;\r
                        c.Padding = new Padding (4);\r
                        Assert.IsFalse (c.IsHandleCreated, "A52");\r
-#endif\r
                        o = c.Parent;\r
                        c.TopLevel = false;\r
                        c.Parent = new Form ();\r
@@ -456,10 +436,8 @@ namespace MonoTests.System.Windows.Forms
                        c.Close ();\r
                        \r
                        c = new Form ();\r
-#if NET_2_0\r
                        o = c.PreferredSize;\r
                        Assert.IsFalse (c.IsHandleCreated, "A54");\r
-#endif\r
                        o = c.ProductName;\r
                        Assert.IsFalse (c.IsHandleCreated, "A55");\r
                        o = c.ProductVersion;\r
@@ -479,7 +457,7 @@ namespace MonoTests.System.Windows.Forms
                        o = c.ParentForm;\r
                        Assert.IsFalse (c.IsHandleCreated, "FP1");\r
 \r
-#if NET_2_0 && !__MonoCS__\r
+#if !__MonoCS__\r
                        o = c.RestoreBounds;\r
                        Assert.IsFalse (c.IsHandleCreated, "FR1"); \r
 #endif\r
@@ -505,7 +483,7 @@ namespace MonoTests.System.Windows.Forms
                        Assert.IsFalse (c.IsHandleCreated, "A66");\r
                        o = c.TopLevelControl;\r
                        Assert.IsFalse (c.IsHandleCreated, "A67");\r
-#if !__MonoCS__ && NET_2_0\r
+#if !__MonoCS__\r
                        o = c.UseWaitCursor;\r
                        c.UseWaitCursor = true;\r
                        Assert.IsFalse (c.IsHandleCreated, "A68");\r
@@ -526,11 +504,9 @@ namespace MonoTests.System.Windows.Forms
 \r
                        // S - W - Form\r
 \r
-#if NET_2_0\r
                        o = c.ShowIcon;\r
                        c.ShowIcon = !c.ShowIcon;\r
                        Assert.IsFalse (c.IsHandleCreated, "FS1"); \r
-#endif\r
                        \r
                        o = c.ShowInTaskbar;\r
                        c.ShowInTaskbar = !c.ShowInTaskbar;\r
@@ -568,7 +544,7 @@ namespace MonoTests.System.Windows.Forms
                        c.TransparencyKey = Color.BurlyWood;\r
                        Assert.IsFalse (c.IsHandleCreated, "FT4");\r
 \r
-#if NET_2_0 && !__MonoCS__\r
+#if !__MonoCS__\r
                        o = c.VerticalScroll;\r
                        Assert.IsFalse (c.IsHandleCreated, "FV1"); \r
 #endif\r
@@ -589,19 +565,16 @@ namespace MonoTests.System.Windows.Forms
                        ProtectedPropertyForm c = new ProtectedPropertyForm ();\r
 \r
                        object o;\r
-#if !__MonoCS__ && NET_2_0\r
+#if !__MonoCS__\r
                        o = c.PublicCanRaiseEvents;\r
                        Assert.IsFalse (c.IsHandleCreated, "A1");\r
 #endif\r
                        o = c.PublicCreateParams;\r
                        Assert.IsFalse (c.IsHandleCreated, "A2");\r
-#if NET_2_0\r
                        o = c.PublicDefaultCursor;\r
                        Assert.IsFalse (c.IsHandleCreated, "A3");\r
-#endif\r
                        o = c.PublicDefaultImeMode;\r
                        Assert.IsFalse (c.IsHandleCreated, "A4");\r
-#if NET_2_0\r
                        o = c.PublicDefaultMargin;\r
                        Assert.IsFalse (c.IsHandleCreated, "A5");\r
                        o = c.PublicDefaultMaximumSize;\r
@@ -615,7 +588,6 @@ namespace MonoTests.System.Windows.Forms
                        o = c.PublicDoubleBuffered;\r
                        c.PublicDoubleBuffered = !c.PublicDoubleBuffered;\r
                        Assert.IsFalse (c.IsHandleCreated, "A10");\r
-#endif\r
                        o = c.PublicFontHeight;\r
                        c.PublicFontHeight = c.PublicFontHeight + 1;\r
                        Assert.IsFalse (c.IsHandleCreated, "A11");\r
@@ -624,7 +596,7 @@ namespace MonoTests.System.Windows.Forms
                        o = c.PublicResizeRedraw;\r
                        c.PublicResizeRedraw = !c.PublicResizeRedraw;\r
                        Assert.IsFalse (c.IsHandleCreated, "A13");\r
-#if !__MonoCS__ && NET_2_0\r
+#if !__MonoCS__\r
                        o = c.PublicScaleChildren;\r
                        Assert.IsFalse (c.IsHandleCreated, "A14");\r
 #endif\r
@@ -633,10 +605,8 @@ namespace MonoTests.System.Windows.Forms
                        o = c.PublicShowKeyboardCues;\r
                        Assert.IsFalse (c.IsHandleCreated, "A16");\r
 \r
-#if NET_2_0\r
                        o = c.PublicAutoScaleFactor;\r
                        Assert.IsFalse (c.IsHandleCreated, "F1"); \r
-#endif\r
                        \r
                        o = c.PublicDesignMode;\r
                        Assert.IsFalse (c.IsHandleCreated, "F2");\r
@@ -652,10 +622,8 @@ namespace MonoTests.System.Windows.Forms
                        c.PublicMaximizedBounds = new Rectangle (1, 1, 1, 1);\r
                        Assert.IsFalse (c.IsHandleCreated, "F5");\r
 \r
-#if NET_2_0\r
                        o = c.PublicShowWithoutActivation;\r
                        Assert.IsFalse (c.IsHandleCreated, "F6"); \r
-#endif\r
                                                \r
                        o = c.PublicVScroll;\r
                        c.PublicVScroll = !c.PublicVScroll;\r
@@ -733,10 +701,8 @@ namespace MonoTests.System.Windows.Forms
                        c = new Form ();\r
                        c.GetNextControl (new Control (), true);\r
                        Assert.IsFalse (c.IsHandleCreated, "A12");\r
-#if NET_2_0\r
                        c.GetPreferredSize (Size.Empty);\r
                        Assert.IsFalse (c.IsHandleCreated, "A13");\r
-#endif\r
                        c.Hide ();\r
                        Assert.IsFalse (c.IsHandleCreated, "A14");\r
                        \r
@@ -791,10 +757,8 @@ namespace MonoTests.System.Windows.Forms
                        Assert.IsFalse (c.IsHandleCreated, "A31");\r
                        c.ResumeLayout ();\r
                        Assert.IsFalse (c.IsHandleCreated, "A32");\r
-#if NET_2_0\r
                        c.Scale (new SizeF (1.5f, 1.5f));\r
                        Assert.IsFalse (c.IsHandleCreated, "A33");\r
-#endif\r
                        c.Select ();\r
                        Assert.IsTrue (c.IsHandleCreated, "A34");\r
                        c.Dispose ();\r
@@ -825,7 +789,7 @@ namespace MonoTests.System.Windows.Forms
                        c.LayoutMdi (MdiLayout.Cascade);\r
                        Assert.IsFalse (c.IsHandleCreated, "F5");\r
 \r
-#if NET_2_0 && !__MonoCS__\r
+#if !__MonoCS__\r
                        c.PerformAutoScale ();\r
                        Assert.IsFalse (c.IsHandleCreated, "F6"); \r
 #endif\r
@@ -849,13 +813,11 @@ namespace MonoTests.System.Windows.Forms
                        c.SetDesktopLocation (7, 13);\r
                        Assert.IsFalse (c.IsHandleCreated, "F12");\r
 \r
-#if NET_2_0\r
                        c = new Form ();\r
                        c.Show (null);\r
                        Assert.IsTrue (c.IsHandleCreated, "F13");\r
                        c.Close ();\r
                        c = new Form (); \r
-#endif\r
                        \r
                        //c.ShowDialog ()\r
                        \r
@@ -865,7 +827,7 @@ namespace MonoTests.System.Windows.Forms
                        c.Validate ();\r
                        Assert.IsFalse (c.IsHandleCreated, "F15");\r
 \r
-#if NET_2_0 && !__MonoCS__\r
+#if !__MonoCS__\r
                        c.ValidateChildren ();\r
                        Assert.IsFalse (c.IsHandleCreated, "F16"); \r
 #endif\r
@@ -902,42 +864,32 @@ namespace MonoTests.System.Windows.Forms
 \r
                public class ProtectedPropertyForm : Form\r
                {\r
-#if NET_2_0\r
                        public SizeF PublicAutoScaleFactor { get { return base.AutoScaleFactor; } } \r
-#endif\r
-#if !__MonoCS__ && NET_2_0\r
+#if !__MonoCS__\r
                        public bool PublicCanRaiseEvents { get { return base.CanRaiseEvents; } }\r
 #endif\r
                        public CreateParams PublicCreateParams { get { return base.CreateParams; } }\r
-#if NET_2_0\r
                        public Cursor PublicDefaultCursor { get { return base.DefaultCursor; } }\r
-#endif\r
                        public ImeMode PublicDefaultImeMode { get { return base.DefaultImeMode; } }\r
-#if NET_2_0\r
                        public Padding PublicDefaultMargin { get { return base.DefaultMargin; } }\r
                        public Size PublicDefaultMaximumSize { get { return base.DefaultMaximumSize; } }\r
                        public Size PublicDefaultMinimumSize { get { return base.DefaultMinimumSize; } }\r
                        public Padding PublicDefaultPadding { get { return base.DefaultPadding; } }\r
                        public Size PublicDefaultSize { get { return base.DefaultSize; } }\r
-#endif\r
                        public bool PublicDesignMode { get {return base.DesignMode; } }\r
-#if NET_2_0\r
                        public bool PublicDoubleBuffered { get { return base.DoubleBuffered; } set { base.DoubleBuffered = value; } }\r
-#endif\r
                        public EventHandlerList PublicEvents { get {return base.Events; } }                     \r
                        public int PublicFontHeight { get { return base.FontHeight; } set { base.FontHeight = value; } }\r
                        public bool PublicHScroll { get {return base.HScroll; } set { base.HScroll = value;} }\r
                        public Rectangle PublicMaximizedBounds { get {return base.MaximizedBounds; } set { base.MaximizedBounds = value; }}\r
                        public bool PublicRenderRightToLeft { get { return base.RenderRightToLeft; } }\r
                        public bool PublicResizeRedraw { get { return base.ResizeRedraw; } set { base.ResizeRedraw = value; } }\r
-#if !__MonoCS__ && NET_2_0\r
+#if !__MonoCS__\r
                        public bool PublicScaleChildren { get { return base.ScaleChildren; } }\r
 #endif\r
                        public bool PublicShowFocusCues { get { return base.ShowFocusCues; } }\r
                        public bool PublicShowKeyboardCues { get { return base.ShowKeyboardCues; } }\r
-#if NET_2_0\r
                        public bool PublicShowWithoutActivation { get { return base.ShowWithoutActivation; } } \r
-#endif\r
                        public bool PublicVScroll { get { return base.VScroll; } set { base.VScroll = value; } }\r
                }\r
 \r
@@ -955,11 +907,7 @@ namespace MonoTests.System.Windows.Forms
                        ProtectedMethodsForm c = new ProtectedMethodsForm ();\r
 \r
                        c.PublicAccessibilityNotifyClients (AccessibleEvents.Focus, 0);\r
-#if NET_2_0\r
                        Assert.IsFalse (c.IsHandleCreated, "A1");\r
-#else\r
-                       Assert.IsTrue (c.IsHandleCreated, "A1");\r
-#endif\r
                        c.PublicCreateAccessibilityInstance ();\r
                        Assert.IsTrue (c.IsHandleCreated, "A2");\r
                        c.Dispose ();\r
@@ -975,11 +923,9 @@ namespace MonoTests.System.Windows.Forms
                        Assert.IsFalse (c.IsHandleCreated, "A5");\r
                        c.Dispose ();\r
                        c = new ProtectedMethodsForm ();\r
-#if NET_2_0\r
                        c.PublicGetAccessibilityObjectById (0);\r
                        Assert.IsFalse (c.IsHandleCreated, "A6");\r
-#endif\r
-#if !__MonoCS__ && NET_2_0\r
+#if !__MonoCS__\r
                        c.PublicGetAutoSizeMode ();\r
                        Assert.IsFalse (c.IsHandleCreated, "A7");\r
                        c.PublicGetScaledBounds (new Rectangle (0, 0, 100, 100), new SizeF (1.5f, 1.5f), BoundsSpecified.All);\r
@@ -1037,7 +983,7 @@ namespace MonoTests.System.Windows.Forms
                        Assert.IsFalse (c.IsHandleCreated, "A29");\r
                        c.PublicRtlTranslateLeftRight (LeftRightAlignment.Left);\r
                        Assert.IsFalse (c.IsHandleCreated, "A30");\r
-#if !__MonoCS__ && NET_2_0\r
+#if !__MonoCS__\r
                        c.PublicScaleControl (new SizeF (1.5f, 1.5f), BoundsSpecified.All);\r
                        Assert.IsFalse (c.IsHandleCreated, "A31");\r
 #endif\r
@@ -1048,7 +994,7 @@ namespace MonoTests.System.Windows.Forms
                        c.Dispose ();\r
                        \r
                        c = new ProtectedMethodsForm ();\r
-#if !__MonoCS__ && NET_2_0\r
+#if !__MonoCS__\r
                        c.PublicSetAutoSizeMode (AutoSizeMode.GrowAndShrink);\r
                        Assert.IsFalse (c.IsHandleCreated, "A34");\r
 #endif\r
@@ -1070,10 +1016,8 @@ namespace MonoTests.System.Windows.Forms
                        c.Dispose ();\r
                        \r
                        c = new ProtectedMethodsForm ();\r
-#if NET_2_0\r
                        c.PublicSizeFromClientSize (new Size (160, 160));\r
                        Assert.IsFalse (c.IsHandleCreated, "A40");\r
-#endif\r
                        c.PublicUpdateBounds ();\r
                        Assert.IsFalse (c.IsHandleCreated, "A41");\r
                        c.PublicUpdateStyles ();\r
@@ -1137,7 +1081,7 @@ namespace MonoTests.System.Windows.Forms
                        c.PublicProcessTabKey (true);\r
                        Assert.IsFalse (c.IsHandleCreated, "F14");\r
 \r
-#if NET_2_0 && !__MonoCS__\r
+#if !__MonoCS__\r
                        c.Controls.Add (new Control ());\r
                        c.PublicScrollToControl (c.Controls [0]);\r
                        Assert.IsFalse (c.IsHandleCreated, "F15");\r
@@ -1174,10 +1118,8 @@ namespace MonoTests.System.Windows.Forms
                        public void PublicCreateControlsInstance () { base.CreateControlsInstance (); }\r
                        public void PublicCreateHandle () { base.CreateHandle (); }\r
                        public void PublicDestroyHandle () { base.DestroyHandle (); }\r
-#if NET_2_0\r
                        public AccessibleObject PublicGetAccessibilityObjectById (int objectId) { return base.GetAccessibilityObjectById (objectId); }\r
-#endif\r
-#if !__MonoCS__ && NET_2_0\r
+#if !__MonoCS__\r
                        public AutoSizeMode PublicGetAutoSizeMode () { return base.GetAutoSizeMode (); }\r
                        public Rectangle PublicGetScaledBounds (Rectangle bounds, SizeF factor, BoundsSpecified specified) { return base.GetScaledBounds (bounds, factor, specified); }\r
 #endif\r
@@ -1213,17 +1155,17 @@ namespace MonoTests.System.Windows.Forms
                        public ContentAlignment PublicRtlTranslateContent (ContentAlignment align) { return base.RtlTranslateContent (align); }\r
                        public HorizontalAlignment PublicRtlTranslateHorizontal (HorizontalAlignment align) { return base.RtlTranslateHorizontal (align); }\r
                        public LeftRightAlignment PublicRtlTranslateLeftRight (LeftRightAlignment align) { return base.RtlTranslateLeftRight (align); }\r
-#if !__MonoCS__ && NET_2_0\r
+#if !__MonoCS__\r
                        public void PublicScaleControl (SizeF factor, BoundsSpecified specified) { base.ScaleControl (factor, specified); }\r
 #endif\r
                        public void PublicScaleCore (float dx, float dy) { base.ScaleCore (dx, dy); }\r
-#if NET_2_0 && !__MonoCS__\r
+#if !__MonoCS__\r
                        public void PublicScrollToControl (Control activeControl) { base.ScrollToControl (activeControl); } \r
 #endif\r
                        public void PublicSelect () { base.Select (); }\r
                        public void PublicSelect (bool directed, bool forward) { base.Select (directed, forward); }\r
 \r
-#if !__MonoCS__ && NET_2_0\r
+#if !__MonoCS__\r
                        public void PublicSetAutoSizeMode (AutoSizeMode mode) { base.SetAutoSizeMode (mode); }\r
 #endif\r
                        public void PublicSetBoundsCore (int x, int y, int width, int height, BoundsSpecified specified) { base.SetBoundsCore (x, y, width, height, specified); }\r
@@ -1233,9 +1175,7 @@ namespace MonoTests.System.Windows.Forms
                        public void PublicSetStyle (ControlStyles flag, bool value) { base.SetStyle (flag, value); }\r
                        public void PublicSetTopLevel (bool value) { base.SetTopLevel (value); }\r
                        public void PublicSetVisibleCore (bool value) { base.SetVisibleCore (value); }\r
-#if NET_2_0\r
                        public Size PublicSizeFromClientSize (Size clientSize) { return base.SizeFromClientSize (clientSize); }\r
-#endif\r
                        public void PublicUpdateBounds () { base.UpdateBounds (); }\r
                        public void PublicUpdateDefaultButton (int bit, bool value) { base.UpdateDefaultButton (); }\r
                        public void PublicUpdateStyles () { base.UpdateStyles (); }\r
my mono mirror. check out Moved to http://github.com/mono/mono