MWF: Remove #if NET_2_0 and #if ONLY_1_1 conditions (part 10).

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownClosingEventHandler.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownClosingEventHandler.cs
index d482c129cfeafcfd7030557f36d034fa9019095f..1be01f2f8125f28431e075fe78aa88de3fc3091d 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownClosingEventHandler.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownClosingEventHandler.cs
@@ -26,9 +26,7 @@
 //     Jonathan Pobst (monkey@jpobst.com)
 //
 
-#if NET_2_0
 namespace System.Windows.Forms
 {
        public delegate void ToolStripDropDownClosingEventHandler (object sender, ToolStripDropDownClosingEventArgs e);
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownDirection.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownDirection.cs
index f6a9cbcd003968f7de6a9c3e9f1f899297d705da..08c6a6745dc26819a6337aa65bb4b716b9aa81b0 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownDirection.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownDirection.cs
@@ -27,7 +27,6 @@
 //
 
 
-#if NET_2_0
 namespace System.Windows.Forms
 {
        public enum ToolStripDropDownDirection
@@ -41,4 +40,3 @@ namespace System.Windows.Forms
                Default = 7
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownItem.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownItem.cs
index 3d9a76c2bfb0ae3e38dc6a5f66eaf56664c954cc..d7ad8e902530039059fe6c4fb909501884603dde 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownItem.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownItem.cs
@@ -25,7 +25,6 @@
 // Authors:
 //     Jonathan Pobst (monkey@jpobst.com)
 //
-#if NET_2_0
 
 using System;
 using System.Drawing;
@@ -346,4 +345,3 @@ namespace System.Windows.Forms
                #endregion
        }
 }
-#endif

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownItemAccessibleObject.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownItemAccessibleObject.cs
index 1d7dc5ff91d345b2c32091f5467297bbcfb25fcf..17ae898fe19861aa458fb70ebaa2299e91044b68 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownItemAccessibleObject.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownItemAccessibleObject.cs
@@ -25,7 +25,6 @@
 // Authors:\r
 //     Jonathan Pobst (monkey@jpobst.com)\r
 //\r
-#if NET_2_0\r
 \r
 using System.Drawing;\r
 using System.ComponentModel;\r
@@ -65,4 +64,3 @@ namespace System.Windows.Forms
                #endregion\r
        }\r
 }\r
-#endif\r

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownMenu.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownMenu.cs
index 237719e2643c9186609a525989ad830b2bbcf619..d2ef6821f855609af11529f44a954be86d5019ce 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownMenu.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownMenu.cs
@@ -25,7 +25,7 @@
 // Authors:
 //     Jonathan Pobst (monkey@jpobst.com)
 //
-#if NET_2_0
+
 using System.Drawing;
 using System.ComponentModel;
 using System.Runtime.InteropServices;
@@ -193,4 +193,3 @@ namespace System.Windows.Forms
                #endregion
        }
 }
-#endif

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripGripDisplayStyle.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripGripDisplayStyle.cs
index 667c4890a0b74bd4baa76403938ca159b36bc9eb..f0acb56bd54fd0f7539943e22f08ef0baf4b0647 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripGripDisplayStyle.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripGripDisplayStyle.cs
@@ -27,7 +27,6 @@
 //
 
 
-#if NET_2_0
 namespace System.Windows.Forms
 {
        public enum ToolStripGripDisplayStyle
@@ -36,4 +35,3 @@ namespace System.Windows.Forms
                Vertical = 1
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripGripRenderEventArgs.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripGripRenderEventArgs.cs
index 98fd46b5b0bc1282d6effafdfe7974bd85446fd4..91c05e4f86e43d9cb367e8e9af7eb510622063bd 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripGripRenderEventArgs.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripGripRenderEventArgs.cs
@@ -26,7 +26,6 @@
 //     Jonathan Pobst (monkey@jpobst.com)
 //
 
-#if NET_2_0
 using System.Drawing;
 
 namespace System.Windows.Forms
@@ -69,4 +68,3 @@ namespace System.Windows.Forms
                #endregion
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripGripRenderEventHandler.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripGripRenderEventHandler.cs
index 7e534591eea0cea20971588d35598a206636a480..4ebf654d4131b9adaffd5a5a426798ba9e1a7643 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripGripRenderEventHandler.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripGripRenderEventHandler.cs
@@ -26,9 +26,7 @@
 //     Jonathan Pobst (monkey@jpobst.com)
 //
 
-#if NET_2_0
 namespace System.Windows.Forms
 {
        public delegate void ToolStripGripRenderEventHandler (object sender, ToolStripGripRenderEventArgs e);
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripGripStyle.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripGripStyle.cs
index 2d242c26dee0396079545d9d809567796a184b41..54b8e4361ad064129c2b834ef76c5354af39d58e 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripGripStyle.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripGripStyle.cs
@@ -27,7 +27,6 @@
 //
 
 
-#if NET_2_0
 namespace System.Windows.Forms
 {
        public enum ToolStripGripStyle
@@ -36,4 +35,3 @@ namespace System.Windows.Forms
                Visible = 1
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItem.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItem.cs
index 3e5e051e1f6e1a02f5388643b3fd9c2157a3ffac..0981fb69f16a57e847936143127eddf0a64c9a19 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItem.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItem.cs
@@ -26,7 +26,6 @@
 //     Jonathan Pobst (monkey@jpobst.com)
 //
 
-#if NET_2_0
 
 using System;
 using System.Drawing;
@@ -2071,5 +2070,3 @@ namespace System.Windows.Forms
        {
        }
 }
-
-#endif

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemAlignment.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemAlignment.cs
index ad01118c1720e9fa783eca781c9c2e102fded644..ad561619fd9cda5da02a5ccebc2a39d5b0fe5ced 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemAlignment.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemAlignment.cs
@@ -27,7 +27,6 @@
 //
 
 
-#if NET_2_0
 namespace System.Windows.Forms
 {
        public enum ToolStripItemAlignment
@@ -36,4 +35,3 @@ namespace System.Windows.Forms
                Right = 1
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemClickedEventArgs.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemClickedEventArgs.cs
index 526631d222c9fb8ce7a03e55b3dd5901bf27a07c..e07a461d2dfba703c812a6ccd103fc16741499cb 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemClickedEventArgs.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemClickedEventArgs.cs
@@ -26,7 +26,6 @@
 //     Jonathan Pobst (monkey@jpobst.com)
 //
 
-#if NET_2_0
 namespace System.Windows.Forms
 {
        public class ToolStripItemClickedEventArgs : EventArgs
@@ -45,4 +44,3 @@ namespace System.Windows.Forms
                #endregion
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemClickedEventHandler.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemClickedEventHandler.cs
index afd7517025567e3b3e8b51d46240dca025da9c45..4354885228730b2d4eddbee78bf41e5239d80cea 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemClickedEventHandler.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemClickedEventHandler.cs
@@ -26,9 +26,7 @@
 //     Jonathan Pobst (monkey@jpobst.com)
 //
 
-#if NET_2_0
 namespace System.Windows.Forms
 {
        public delegate void ToolStripItemClickedEventHandler (object sender, ToolStripItemClickedEventArgs e);
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemCollection.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemCollection.cs
index 2393c4ef9a4799793a4a76ab8cb6aeab4dc1d89e..fe5d5e8231cae9629aa50f256728bf638c87a0d2 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemCollection.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemCollection.cs
@@ -25,7 +25,6 @@
 // Authors:
 //     Jonathan Pobst (monkey@jpobst.com)
 //
-#if NET_2_0
 
 using System.Drawing;
 using System.Collections;
@@ -383,4 +382,3 @@ namespace System.Windows.Forms
                #endregion
        }
 }
-#endif

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemDisplayStyle.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemDisplayStyle.cs
index 49d451091226fafb7c0e3cf8caa0353bc1abc478..6f0a75eedb8762c0d1eb678a3f1c9ae58fadca20 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemDisplayStyle.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemDisplayStyle.cs
@@ -27,7 +27,6 @@
 //
 
 
-#if NET_2_0
 namespace System.Windows.Forms
 {
        public enum ToolStripItemDisplayStyle
@@ -38,4 +37,3 @@ namespace System.Windows.Forms
                ImageAndText = 3
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemEventArgs.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemEventArgs.cs
index c3d613453e1c839f31a0491a1b81e0e2b8b544cc..b134568cd2cc58a65db1980a846ccfbf585c6105 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemEventArgs.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemEventArgs.cs
@@ -26,7 +26,6 @@
 //     Jonathan Pobst (monkey@jpobst.com)
 //
 
-#if NET_2_0
 using System.Drawing;
 
 namespace System.Windows.Forms
@@ -48,4 +47,3 @@ namespace System.Windows.Forms
                #endregion
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemEventHandler.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemEventHandler.cs
index 4aabbadf88b192de1b708ee719de91d76a3c529b..19e974e542b4cfa93ec5218bb0c0745504c8c02a 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemEventHandler.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemEventHandler.cs
@@ -26,9 +26,7 @@
 //     Jonathan Pobst (monkey@jpobst.com)
 //
 
-#if NET_2_0
 namespace System.Windows.Forms
 {
        public delegate void ToolStripItemEventHandler (object sender, ToolStripItemEventArgs e);
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemEventType.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemEventType.cs
index 16c14bade968282d6c5d156c7afb66eb343e1365..3ef0e113e91ba0b5d9be9c985edd55dd0871400e 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemEventType.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemEventType.cs
@@ -26,7 +26,6 @@
 //     Jonathan Pobst (monkey@jpobst.com)
 //
 
-#if NET_2_0
 namespace System.Windows.Forms
 {
        internal enum ToolStripItemEventType
@@ -41,4 +40,3 @@ namespace System.Windows.Forms
                Click = 8
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemImageRenderEventArgs.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemImageRenderEventArgs.cs
index c02c8aca211ea9fc48f586b73e1a59d3bc38f244..6d0c823f597c8757de2aaa91912b6f6f9057620d 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemImageRenderEventArgs.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemImageRenderEventArgs.cs
@@ -26,7 +26,6 @@
 //     Jonathan Pobst (monkey@jpobst.com)
 //
 
-#if NET_2_0
 using System.Drawing;
 
 namespace System.Windows.Forms
@@ -59,4 +58,3 @@ namespace System.Windows.Forms
                #endregion
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemImageRenderEventHandler.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemImageRenderEventHandler.cs
index 40e6e24b321e71153cd5a2900354a5e41df71188..4754d2c50f023f76b9985928afbd2c23ec56b9ea 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemImageRenderEventHandler.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemImageRenderEventHandler.cs
@@ -26,9 +26,7 @@
 //     Jonathan Pobst (monkey@jpobst.com)
 //
 
-#if NET_2_0
 namespace System.Windows.Forms
 {
        public delegate void ToolStripItemImageRenderEventHandler (object sender, ToolStripItemImageRenderEventArgs e);
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemImageScaling.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemImageScaling.cs
index 7ff6fc725940bf512712bc2400618071575f523e..49bae299693a94bcb37b6d324db318e3036e2280 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemImageScaling.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemImageScaling.cs
@@ -27,7 +27,6 @@
 //
 
 
-#if NET_2_0
 namespace System.Windows.Forms
 {
        public enum ToolStripItemImageScaling
@@ -36,4 +35,3 @@ namespace System.Windows.Forms
                SizeToFit = 1
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemOverflow.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemOverflow.cs
index 6fc0ae911c813224a607e2aba243b257cc088a82..c3ce92eef25e00aac84525b0898a1700b6ab659e 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemOverflow.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemOverflow.cs
@@ -27,7 +27,6 @@
 //
 
 
-#if NET_2_0
 namespace System.Windows.Forms
 {
        public enum ToolStripItemOverflow
@@ -37,4 +36,3 @@ namespace System.Windows.Forms
                AsNeeded = 2
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemPlacement.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemPlacement.cs
index 7f63a5d3a0bb042fc69614d8db760e87983fd391..d736b46c71f3e6131eaf0dcea8db0156cd6b0124 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemPlacement.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemPlacement.cs
@@ -27,7 +27,6 @@
 //
 
 
-#if NET_2_0
 namespace System.Windows.Forms
 {
        public enum ToolStripItemPlacement
@@ -37,4 +36,3 @@ namespace System.Windows.Forms
                None = 2
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemRenderEventArgs.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemRenderEventArgs.cs
index f4ab5600d72eb38b0d9b3d0eaf6e1bfabf51496f..e67323d56105df1706c488b3234cfa9558855f89 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemRenderEventArgs.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemRenderEventArgs.cs
@@ -26,7 +26,6 @@
 //     Jonathan Pobst (monkey@jpobst.com)
 //
 
-#if NET_2_0
 using System.Drawing;
 
 namespace System.Windows.Forms
@@ -57,4 +56,3 @@ namespace System.Windows.Forms
                #endregion
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemRenderEventHandler.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemRenderEventHandler.cs
index f2cd685c29b07594fc6881c2d82507fbe4bec790..5cb9ee924e26f22092ef97bfb0548677822bfd55 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemRenderEventHandler.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemRenderEventHandler.cs
@@ -26,9 +26,7 @@
 //     Jonathan Pobst (monkey@jpobst.com)
 //
 
-#if NET_2_0
 namespace System.Windows.Forms
 {
        public delegate void ToolStripItemRenderEventHandler (object sender, ToolStripItemRenderEventArgs e);
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemTextRenderEventArgs.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemTextRenderEventArgs.cs
index 185f95f348be925b6b49c59baf3fdd5567d1cf06..282c1a21a5024d02d1d0373f0bf975377a8678dd 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemTextRenderEventArgs.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemTextRenderEventArgs.cs
@@ -26,7 +26,6 @@
 //     Jonathan Pobst (monkey@jpobst.com)
 //
 
-#if NET_2_0
 using System.Drawing;
 
 namespace System.Windows.Forms
@@ -130,4 +129,3 @@ namespace System.Windows.Forms
                #endregion
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemTextRenderEventHandler.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemTextRenderEventHandler.cs
index 2e8fe7dc39439c1703b53419f2f22eda4651c130..850c7df8f7b115c30f9692873d127fad8caf6a07 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemTextRenderEventHandler.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItemTextRenderEventHandler.cs
@@ -26,9 +26,7 @@
 //     Jonathan Pobst (monkey@jpobst.com)
 //
 
-#if NET_2_0
 namespace System.Windows.Forms
 {
        public delegate void ToolStripItemTextRenderEventHandler (object sender, ToolStripItemTextRenderEventArgs e);
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripLabel.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripLabel.cs
index 59c73bd053242190d0dd43785f7f1c5f52d5a037..a6db72493ab1edab647e10a162e714bf3d0288f0 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripLabel.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripLabel.cs
@@ -25,7 +25,6 @@
 // Authors:
 //     Jonathan Pobst (monkey@jpobst.com)
 //
-#if NET_2_0
 
 using System.Drawing;
 using System.ComponentModel;
@@ -44,7 +43,6 @@ namespace System.Windows.Forms
                private Color visited_link_color;
 
                #region UIA FrameWork Events
-#if NET_2_0
                static object UIAIsLinkChangedEvent = new object ();
 
                internal event EventHandler UIAIsLinkChanged {
@@ -58,7 +56,6 @@ namespace System.Windows.Forms
                        if (eh != null)
                                eh (this, e);
                }
-#endif
                #endregion
 
                #region Public Constructors
@@ -121,10 +118,9 @@ namespace System.Windows.Forms
                        set {
                                this.is_link = value; 
                                this.Invalidate ();
-#if NET_2_0
+
                                // UIA Framework Event: IsLink Changed
                                OnUIAIsLinkChanged (EventArgs.Empty);
-#endif
                        }
                }
 
@@ -289,4 +285,3 @@ namespace System.Windows.Forms
                #endregion
        }
 }
-#endif

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripLayoutStyle.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripLayoutStyle.cs
index fb7124c9c5532affd723b4f43e39a17629424777..78bb6d22850fee5c72a76ad01f41fc76d6b86ba4 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripLayoutStyle.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripLayoutStyle.cs
@@ -27,7 +27,6 @@
 //
 
 
-#if NET_2_0
 namespace System.Windows.Forms
 {
        public enum ToolStripLayoutStyle
@@ -39,4 +38,3 @@ namespace System.Windows.Forms
                Table = 4
        }
 }
-#endif
\ No newline at end of file

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripManager.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripManager.cs
index a38686ca8b1f7e1101a3ec28560484253c711b20..d85ae420f05b30d196a0cd8c212e03b4adfe5508 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripManager.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripManager.cs
@@ -26,7 +26,6 @@
 //     Jonathan Pobst (monkey@jpobst.com)
 //
 
-#if NET_2_0
 using System.Drawing;
 using System.Runtime.InteropServices;
 using System.ComponentModel;
@@ -629,4 +628,3 @@ namespace System.Windows.Forms
                #endregion
        }
 }
-#endif