diff options
30 files changed, 1 insertions, 167 deletions
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementCollection.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementCollection.cs index 8b0bb117053..efa7eb3991f 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementCollection.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementCollection.cs @@ -22,7 +22,6 @@ // Authors:
// Andreia Gaita <avidigal@novell.com>
-#if NET_2_0
using System;
using System.Collections;
@@ -115,5 +114,3 @@ namespace System.Windows.Forms }
}
}
-
-#endif
\ No newline at end of file diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementErrorEventArgs.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementErrorEventArgs.cs index 1cff28c6132..513c96e6be5 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementErrorEventArgs.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementErrorEventArgs.cs @@ -23,7 +23,6 @@ // Jonathan Pobst monkey@jpobst.com
//
-#if NET_2_0
namespace System.Windows.Forms
{
public sealed class HtmlElementErrorEventArgs : EventArgs
@@ -64,4 +63,3 @@ namespace System.Windows.Forms #endregion
}
}
-#endif
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementErrorEventHandler.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementErrorEventHandler.cs index edb372905ab..3d84dfd365c 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementErrorEventHandler.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementErrorEventHandler.cs @@ -23,9 +23,7 @@ // Jonathan Pobst monkey@jpobst.com
//
-#if NET_2_0
namespace System.Windows.Forms
{
public delegate void HtmlElementErrorEventHandler (object sender, HtmlElementErrorEventArgs e);
}
-#endif
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementEventArgs.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementEventArgs.cs index afd6dfcc83b..0c88ff95ee5 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementEventArgs.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementEventArgs.cs @@ -23,7 +23,6 @@ // Andreia Gaita avidigal@novell.com
//
-#if NET_2_0
using System.Drawing;
using System.ComponentModel;
namespace System.Windows.Forms
@@ -126,4 +125,3 @@ namespace System.Windows.Forms #endregion
}
}
-#endif
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementEventHandler.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementEventHandler.cs index fae599c3d82..a5824f95669 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementEventHandler.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementEventHandler.cs @@ -23,9 +23,7 @@ // Andreia Gaita avidigal@novell.com
//
-#if NET_2_0
namespace System.Windows.Forms
{
public delegate void HtmlElementEventHandler (object sender, HtmlElementEventArgs e);
}
-#endif
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementInsertionOrientation.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementInsertionOrientation.cs index f7580e37022..4de6c79b78b 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementInsertionOrientation.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlElementInsertionOrientation.cs @@ -27,7 +27,6 @@ // -#if NET_2_0 namespace System.Windows.Forms { public enum HtmlElementInsertionOrientation @@ -38,4 +37,3 @@ namespace System.Windows.Forms AfterEnd = 3 } } -#endif
\ No newline at end of file diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlHistory.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlHistory.cs index 105e17d14cd..840ba814dfd 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlHistory.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlHistory.cs @@ -23,7 +23,6 @@ // Andreia Gaita (avidigal@novell.com) // -#if NET_2_0 using System; using Mono.WebBrowser.DOM; @@ -98,5 +97,3 @@ namespace System.Windows.Forms } } } - -#endif diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlWindow.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlWindow.cs index a902155cb09..480a9b4b57e 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlWindow.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlWindow.cs @@ -23,7 +23,6 @@ // Andreia Gaita (avidigal@novell.com) // -#if NET_2_0 using System; using System.Drawing; @@ -430,5 +429,3 @@ namespace System.Windows.Forms #endregion } } - -#endif diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlWindowCollection.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlWindowCollection.cs index d9099dc8822..cb93fce1e1d 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlWindowCollection.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/HtmlWindowCollection.cs @@ -23,7 +23,6 @@ // Andreia Gaita (avidigal@novell.com)
//
-#if NET_2_0
using System;
using System.Collections;
@@ -86,5 +85,3 @@ namespace System.Windows.Forms }
}
}
-
-#endif
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IBindableComponent.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IBindableComponent.cs index 3859b4dccfa..b1a0dec0d44 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IBindableComponent.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IBindableComponent.cs @@ -20,7 +20,6 @@ // Copyright (c) 2006 Novell, Inc. (http://www.novell.com) // -#if NET_2_0 using System; using System.ComponentModel; @@ -33,5 +32,3 @@ namespace System.Windows.Forms { ControlBindingsCollection DataBindings { get; } } } - -#endif diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IBounds.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IBounds.cs index 486d3c638d2..9d06790c832 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IBounds.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IBounds.cs @@ -26,7 +26,6 @@ // Jonathan Pobst (monkey@jpobst.com) // -#if NET_2_0 using System; using System.Collections.Generic; using System.Text; @@ -39,4 +38,3 @@ namespace System.Windows.Forms Rectangle Bounds { get; } } } -#endif
\ No newline at end of file diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ICurrencyManagerProvider.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ICurrencyManagerProvider.cs index 083f28b5cb2..33b3fa83205 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ICurrencyManagerProvider.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ICurrencyManagerProvider.cs @@ -20,7 +20,6 @@ // Copyright (c) 2006 Novell, Inc. (http://www.novell.com) // -#if NET_2_0 namespace System.Windows.Forms { @@ -31,5 +30,3 @@ namespace System.Windows.Forms { } } - -#endif diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IDataGridViewEditingCell.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IDataGridViewEditingCell.cs index aadf51ad3f3..4e50b4f2694 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IDataGridViewEditingCell.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IDataGridViewEditingCell.cs @@ -24,8 +24,6 @@ // -#if NET_2_0 - namespace System.Windows.Forms { public interface IDataGridViewEditingCell { @@ -41,5 +39,3 @@ namespace System.Windows.Forms { } } - -#endif diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IDataGridViewEditingControl.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IDataGridViewEditingControl.cs index aa3bf7c175a..b9a3d6878c7 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IDataGridViewEditingControl.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IDataGridViewEditingControl.cs @@ -24,8 +24,6 @@ // -#if NET_2_0 - namespace System.Windows.Forms { public interface IDataGridViewEditingControl { @@ -53,5 +51,3 @@ namespace System.Windows.Forms { } } - -#endif diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IDropTarget.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IDropTarget.cs index b879e414523..ced3ee50d12 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IDropTarget.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IDropTarget.cs @@ -19,7 +19,6 @@ // // Copyright (c) 2006 Novell, Inc. // -#if NET_2_0 using System; using System.Drawing; @@ -35,4 +34,3 @@ namespace System.Windows.Forms { } } -#endif diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IToolStripData.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IToolStripData.cs index 7f05dc66470..c341bb51667 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IToolStripData.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/IToolStripData.cs @@ -26,7 +26,6 @@ // Jonathan Pobst (monkey@jpobst.com) // -#if NET_2_0 using System; using System.Collections.Generic; using System.Text; @@ -40,4 +39,3 @@ namespace System.Windows.Forms bool Stretch { get; set; } } } -#endif
\ No newline at end of file diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImageKeyConverter.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImageKeyConverter.cs index 91f3193c66a..cdcfdd405c2 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImageKeyConverter.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImageKeyConverter.cs @@ -23,7 +23,6 @@ // Jonathan Pobst monkey@jpobst.com
//
-#if NET_2_0
using System.Drawing;
using System.ComponentModel;
using System.Collections;
@@ -95,4 +94,3 @@ namespace System.Windows.Forms #endregion Public Methods
}
}
-#endif
\ No newline at end of file diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImageLayout.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImageLayout.cs index 7b2f4574b45..391015faeb6 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImageLayout.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImageLayout.cs @@ -24,8 +24,6 @@ // -#if NET_2_0 - namespace System.Windows.Forms { public enum ImageLayout { @@ -37,5 +35,3 @@ namespace System.Windows.Forms { } } - -#endif diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImageList.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImageList.cs index e9d7a6426bc..b4a72803ffd 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImageList.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImageList.cs @@ -74,9 +74,7 @@ namespace System.Windows.Forms { [DefaultProperty("Images")] [Designer("System.Windows.Forms.Design.ImageListDesigner, " + Consts.AssemblySystem_Design)] -#if NET_2_0 [DesignerSerializer("System.Windows.Forms.Design.ImageListCodeDomSerializer, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.Serialization.CodeDomSerializer, " + Consts.AssemblySystem_Design)] -#endif [ToolboxItemFilter("System.Windows.Forms")] [TypeConverter(typeof(ImageListConverter))] public sealed class ImageList : System.ComponentModel.Component @@ -85,10 +83,7 @@ namespace System.Windows.Forms private const ColorDepth DefaultColorDepth = ColorDepth.Depth8Bit; private static readonly Size DefaultImageSize = new Size(16, 16); private static readonly Color DefaultTransparentColor = Color.Transparent; - -#if NET_2_0 private object tag; -#endif private readonly ImageCollection images; #endregion // Private Fields @@ -98,19 +93,8 @@ namespace System.Windows.Forms { private const int AlphaMask = unchecked((int)0xFF000000); - private -#if NET_2_0 - static -#else - sealed -#endif - class IndexedColorDepths + private static class IndexedColorDepths { -#if !NET_2_0 - private IndexedColorDepths() - { - } -#endif internal static readonly ColorPalette Palette4Bit; internal static readonly ColorPalette Palette8Bit; private static readonly int[] squares; @@ -219,14 +203,10 @@ namespace System.Windows.Forms private Size imageSize = DefaultImageSize; private Color transparentColor = DefaultTransparentColor; private ArrayList list = new ArrayList(); -#if NET_2_0 private ArrayList keys = new ArrayList(); -#endif private int count; private bool handleCreated; -#if NET_2_0 private int lastKeyIndex = -1; -#endif private readonly ImageList owner; #endregion // ImageCollection Private Fields @@ -299,27 +279,21 @@ namespace System.Windows.Forms Image[] streamImages; if (value == null) { -#if NET_2_0 if (this.handleCreated) DestroyHandle(); else this.Clear(); -#endif } // Only deserialized ImageListStreamers are used. else if ((streamImages = value.Images) != null) { this.list = new ArrayList(streamImages.Length); this.count = 0; this.handleCreated = true; -#if NET_2_0 this.keys = new ArrayList(streamImages.Length); -#endif for (index = 0; index < streamImages.Length; index++) { list.Add((Image)streamImages[index].Clone()); -#if NET_2_0 keys.Add(null); -#endif } // Invalid ColorDepth values are ignored. @@ -327,10 +301,8 @@ namespace System.Windows.Forms this.colorDepth = (ColorDepth)value.ColorDepth; this.imageSize = value.ImageSize; -#if NET_2_0 // Event is raised even when handle was not created yet. owner.OnRecreateHandle(); -#endif } } } @@ -392,7 +364,6 @@ namespace System.Windows.Forms } } -#if NET_2_0 public Image this[string key] { get { int index; @@ -417,11 +388,9 @@ namespace System.Windows.Forms return keyCollection; } } -#endif #endregion // ImageCollection Public Instance Properties #region ImageCollection Private Static Methods -#if NET_2_0 private static bool CompareKeys(string key1, string key2) { // Keys are case-insensitive and keys with different length @@ -432,20 +401,13 @@ namespace System.Windows.Forms return string.Compare(key1, key2, true, CultureInfo.InvariantCulture) == 0; } -#endif #endregion // ImageCollection Private Static Methods #region ImageCollection Private Instance Methods -#if NET_2_0 private int AddItem(string key, ImageListItem item) -#else - private int AddItem(ImageListItem item) -#endif { int itemIndex; -#if NET_2_0 int index; -#endif if (this.handleCreated) itemIndex = AddItemInternal(item); @@ -457,13 +419,11 @@ namespace System.Windows.Forms this.count += item.ImageCount; } -#if NET_2_0 if ((item.Flags & ItemFlags.ImageStrip) == 0) keys.Add(key); else for (index = 0; index < item.ImageCount; index++) keys.Add(null); -#endif return itemIndex; } @@ -659,9 +619,7 @@ namespace System.Windows.Forms this.list = new ArrayList(); this.count = 0; this.handleCreated = false; -#if NET_2_0 keys = new ArrayList(); -#endif } } @@ -691,32 +649,19 @@ namespace System.Windows.Forms #region ImageCollection Public Instance Methods public void Add(Icon value) { -#if NET_2_0 Add(null, value); -#else - AddItem(new ImageListItem(value)); -#endif } public void Add(Image value) { -#if NET_2_0 Add(null, value); -#else - AddItem(new ImageListItem(value)); -#endif } public int Add(Image value, Color transparentColor) { -#if NET_2_0 return AddItem(null, new ImageListItem(value, transparentColor)); -#else - return AddItem(new ImageListItem(value, transparentColor)); -#endif } -#if NET_2_0 public void Add(string key, Icon icon) { // Argument has name icon but exceptions use name value. @@ -739,7 +684,6 @@ namespace System.Windows.Forms for (index = 0; index < images.Length; index++) Add(images[index]); } -#endif public int AddStrip(Image value) { @@ -755,11 +699,7 @@ namespace System.Windows.Forms if (value.Height != this.imageSize.Height) throw new ArgumentException("Height of image strip must be equal to ImageSize.Height.", "value"); -#if NET_2_0 return AddItem(null, new ImageListItem(value, width / imageWidth)); -#else - return AddItem(new ImageListItem(value, width / imageWidth)); -#endif } public void Clear() @@ -767,25 +707,19 @@ namespace System.Windows.Forms list.Clear(); if (this.handleCreated) this.count = 0; -#if NET_2_0 keys.Clear(); -#endif } -#if NET_2_0 [EditorBrowsable(EditorBrowsableState.Never)] -#endif public bool Contains(Image image) { throw new NotSupportedException(); } -#if NET_2_0 public bool ContainsKey(string key) { return IndexOfKey(key) != -1; } -#endif public IEnumerator GetEnumerator() { @@ -803,15 +737,12 @@ namespace System.Windows.Forms return images.GetEnumerator(); } -#if NET_2_0 [EditorBrowsable(EditorBrowsableState.Never)] -#endif public int IndexOf(Image image) { throw new NotSupportedException(); } -#if NET_2_0 public int IndexOfKey(string key) { int index; @@ -833,11 +764,8 @@ namespace System.Windows.Forms return this.lastKeyIndex = -1; } -#endif -#if NET_2_0 [EditorBrowsable(EditorBrowsableState.Never)] -#endif public void Remove(Image image) { throw new NotSupportedException(); @@ -850,14 +778,11 @@ namespace System.Windows.Forms CreateHandle(); list.RemoveAt(index); -#if NET_2_0 keys.RemoveAt(index); -#endif if (Changed != null) Changed (this, EventArgs.Empty); } -#if NET_2_0 public void RemoveByKey(string key) { int index; @@ -874,7 +799,6 @@ namespace System.Windows.Forms keys[index] = name; } -#endif #endregion // ImageCollection Public Instance Methods #region ImageCollection Interface Properties @@ -996,20 +920,14 @@ namespace System.Windows.Forms { // ImageSize is serialized in ImageStream when non-empty. // It is serialized even if it has its default value when empty. -#if NET_2_0 return images.Empty; -#else - return this.ImageSize != DefaultImageSize; -#endif } - internal void ResetColorDepth () { this.ColorDepth = DefaultColorDepth; } -#if NET_2_0 internal void ResetImageSize () { this.ImageSize = DefaultImageSize; @@ -1019,13 +937,9 @@ namespace System.Windows.Forms { this.TransparentColor = Color.LightGray; } -#endif #endregion // Private Instance Methods #region Public Instance Properties -#if !NET_2_0 - [DefaultValue(DefaultColorDepth)] -#endif public ColorDepth ColorDepth { get { return images.ColorDepth; @@ -1087,7 +1001,6 @@ namespace System.Windows.Forms } } -#if NET_2_0 [Bindable(true)] [DefaultValue(null)] [Localizable(false)] @@ -1101,7 +1014,6 @@ namespace System.Windows.Forms this.tag = value; } } -#endif public Color TransparentColor { get { diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImeMode.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImeMode.cs index 4752a7657b8..e411d7185f3 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImeMode.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImeMode.cs @@ -42,9 +42,7 @@ namespace System.Windows.Forms HangulFull = 9, Hangul = 10, Inherit = -1, -#if NET_2_0 Close = 11, OnHalf = 12 -#endif } } diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/InsertKeyMode.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/InsertKeyMode.cs index be36b0dacba..ff87e443c11 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/InsertKeyMode.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/InsertKeyMode.cs @@ -27,7 +27,6 @@ // -#if NET_2_0 namespace System.Windows.Forms { public enum InsertKeyMode @@ -37,4 +36,3 @@ namespace System.Windows.Forms Overwrite = 2 } } -#endif
\ No newline at end of file diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/InternalWindowManager.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/InternalWindowManager.cs index 4d7609958d6..ea58417925e 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/InternalWindowManager.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/InternalWindowManager.cs @@ -431,10 +431,8 @@ namespace System.Windows.Forms { public bool ShowIcon { get { -#if NET_2_0 if (!Form.ShowIcon) return false; -#endif if (!HasBorders) return false; if (IsMinimized) diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemActivation.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemActivation.cs index 1ba5bc9871a..14e2791fa6b 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemActivation.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemActivation.cs @@ -30,9 +30,6 @@ namespace System.Windows.Forms { -#if !NET_2_0 - [Serializable] -#endif public enum ItemActivation { OneClick = 1, diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemBoundsPortion.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemBoundsPortion.cs index 3aec1feb45f..a028d9de37e 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemBoundsPortion.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemBoundsPortion.cs @@ -26,9 +26,6 @@ namespace System.Windows.Forms { -#if !NET_2_0 - [Serializable] -#endif public enum ItemBoundsPortion { Entire = 0, diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemChangedEventHandler.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemChangedEventHandler.cs index 507342a2d42..5a03ce90cdf 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemChangedEventHandler.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemChangedEventHandler.cs @@ -29,8 +29,5 @@ namespace System.Windows.Forms { -#if !NET_2_0 - [Serializable] -#endif public delegate void ItemChangedEventHandler (object sender, ItemChangedEventArgs e); } diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemCheckEventHandler.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemCheckEventHandler.cs index b436d0ca09c..93a4ac2a5e4 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemCheckEventHandler.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemCheckEventHandler.cs @@ -29,8 +29,5 @@ namespace System.Windows.Forms { -#if !NET_2_0 - [Serializable] -#endif public delegate void ItemCheckEventHandler (object sender, ItemCheckEventArgs e); } diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemCheckedEventArgs.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemCheckedEventArgs.cs index 365721dd508..19655eb19a7 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemCheckedEventArgs.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemCheckedEventArgs.cs @@ -26,7 +26,6 @@ // Jonathan Pobst (monkey@jpobst.com) // -#if NET_2_0 namespace System.Windows.Forms { public class ItemCheckedEventArgs : EventArgs @@ -47,4 +46,3 @@ namespace System.Windows.Forms #endregion // Public Instance Properties } } -#endif
\ No newline at end of file diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemCheckedEventHandler.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemCheckedEventHandler.cs index a7548047072..8593d57455d 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemCheckedEventHandler.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemCheckedEventHandler.cs @@ -26,9 +26,7 @@ // Jonathan Pobst (monkey@jpobst.com) // -#if NET_2_0 namespace System.Windows.Forms { public delegate void ItemCheckedEventHandler (object sender, ItemCheckedEventArgs e); } -#endif
\ No newline at end of file diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemDragEventHandler.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemDragEventHandler.cs index 3e0380365f6..b83cda779d6 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemDragEventHandler.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ItemDragEventHandler.cs @@ -29,8 +29,5 @@ namespace System.Windows.Forms { -#if !NET_2_0 - [Serializable] -#endif public delegate void ItemDragEventHandler (object sender, ItemDragEventArgs e); } diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/KeyEventArgs.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/KeyEventArgs.cs index cef4c6c6728..3ddf114f83e 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/KeyEventArgs.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/KeyEventArgs.cs @@ -34,10 +34,7 @@ namespace System.Windows.Forms { public class KeyEventArgs : EventArgs { private Keys key_data; private bool event_handled; - -#if NET_2_0 private bool supress_key_press; -#endif #region Public Constructors public KeyEventArgs(Keys keyData) { @@ -111,7 +108,6 @@ namespace System.Windows.Forms { } } -#if NET_2_0 public bool SuppressKeyPress { get { return supress_key_press; @@ -121,7 +117,6 @@ namespace System.Windows.Forms { event_handled = value; } } -#endif #endregion // Public Instance Properties } } |