Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/System.Design/System.Windows.Forms.Design/AxImporter.cs

@@ -155,10 +155,8 @@ namespace System.Windows.Forms.Design
 			public bool silentMode;
 			[MonoTODO]
 			public bool verboseMode;
-#if NET_2_0
 			[MonoTODO]
 			public bool msBuildErrors;
-#endif
 
 			#endregion Public Instance Fields
 		}

mcs/class/System.Design/System.Windows.Forms.Design/BorderSidesEditor.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System;
 using System.ComponentModel;
@@ -59,4 +58,3 @@ namespace System.Windows.Forms.Design
 	}
 }
 
-#endif

mcs/class/System.Design/System.Windows.Forms.Design/ComponentTray.cs

@@ -110,13 +110,11 @@ namespace System.Windows.Forms.Design
 		{
 		}
 
-#if NET_2_0
 		[Browsable (false)]
 		[Category ("Layout")]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		[DesignOnly (true)]
 		[Localizable (false)]
-#endif
 		[MonoTODO]
 		public Point GetLocation (IComponent receiver)
 		{
@@ -128,7 +126,6 @@ namespace System.Windows.Forms.Design
 		{
 		}
 
-#if NET_2_0
 		[MonoTODO]
 		public IComponent GetNextComponent (IComponent component, bool forward)
 		{
@@ -161,12 +158,6 @@ namespace System.Windows.Forms.Design
 		protected override void OnMouseDoubleClick (MouseEventArgs e)
 		{
 		}
-#else
-		[MonoTODO]
-		protected override void OnDoubleClick (EventArgs e)
-		{
-		}
-#endif
 
 		[MonoTODO]
 		protected override void OnDragDrop (DragEventArgs de)

mcs/class/System.Design/System.Windows.Forms.Design/ControlBindingsConverter.cs

@@ -45,11 +45,7 @@ namespace System.Windows.Forms.Design
 		{
 			PropertyDescriptorCollection properties = new PropertyDescriptorCollection (new PropertyDescriptor[0]);
 			ControlBindingsCollection collection = value as ControlBindingsCollection;
-#if NET_2_0
 			object bindableComponent = collection.BindableComponent;
-#else
-			object bindableComponent = collection.Control;
-#endif
 			if (collection != null && bindableComponent != null) {
 				foreach (PropertyDescriptor property in 
 					 TypeDescriptor.GetProperties (bindableComponent, attributes)) {

mcs/class/System.Design/System.Windows.Forms.Design/ControlCodeDomSerializer.cs

@@ -27,7 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System;
 using System.Collections;
@@ -81,4 +80,3 @@ namespace System.Windows.Forms.Design
 		}
 	}
 }
-#endif

mcs/class/System.Design/System.Windows.Forms.Design/ControlCollectionCodeDomSerializer.cs

@@ -27,7 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System;
 using System.Collections;
@@ -48,4 +47,3 @@ namespace System.Windows.Forms.Design
 		}
 	}
 }
-#endif

mcs/class/System.Design/System.Windows.Forms.Design/ControlDesigner.cs

@@ -36,9 +36,7 @@ using System.Windows.Forms;
 using System.Drawing;
 using System.Drawing.Design;
 using System.Collections;
-#if NET_2_0
 using System.Windows.Forms.Design.Behavior;
-#endif
 
 namespace System.Windows.Forms.Design
 {
@@ -113,11 +111,9 @@ namespace System.Windows.Forms.Design
 #region Properties and Fields - AccessabilityObject Left
 		protected static readonly Point InvalidPoint = new Point (int.MinValue, int.MinValue);
 
-#if NET_2_0
 		protected internal BehaviorService BehaviorService {
 			get { throw new NotImplementedException (); }
 		}
-#endif
 
 		public virtual Control Control {
 			get { return (Control) base.Component; }
@@ -178,11 +174,9 @@ namespace System.Windows.Forms.Design
 			}
 		}
 
-#if NET_2_0
 		protected override IComponent ParentComponent {
 			get { return this.GetValue (this.Control,  "Parent") as Control;}
 		}
-#endif
 		// TODO: implement ControlDesigner.ControlAccessabilityObject
 		//
 		public virtual AccessibleObject AccessibilityObject {
@@ -829,7 +823,6 @@ namespace System.Windows.Forms.Design
 
 
 
-#if NET_2_0
 		public virtual ControlDesigner InternalControlDesigner (int internalControlIndex)
 		{
 			return null;
@@ -989,7 +982,6 @@ namespace System.Windows.Forms.Design
 			set { throw new NotImplementedException (); }
 		}
 #endregion
-#endif
 
 
 	}

mcs/class/System.Design/System.Windows.Forms.Design/DefaultMenuCommands.cs

@@ -193,11 +193,7 @@ namespace System.Windows.Forms.Design
 					host.DestroyComponent ((IComponent)component);
 				}
 			}
-#if NET_2_0
 			selection.SetSelectedComponents (selectedComponents, SelectionTypes.Remove);
-#else
-			selection.SetSelectedComponents (selectedComponents);
-#endif
 			transaction.Commit ();
 		}
 

mcs/class/System.Design/System.Windows.Forms.Design/DesignerOptions.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System;
 using System.ComponentModel;
@@ -93,4 +92,3 @@ namespace System.Windows.Forms.Design
 	}
 }
 
-#endif

mcs/class/System.Design/System.Windows.Forms.Design/DocumentDesigner.cs

@@ -34,15 +34,11 @@ using System.Windows.Forms;
 using System.Drawing;
 using System.Drawing.Design;
 using System.Collections;
-#if NET_2_0
 using System.Windows.Forms.Design.Behavior;
-#endif
 
 namespace System.Windows.Forms.Design
 {
-#if NET_2_0
 	[ToolboxItemFilter ("System.Windows.Forms")]
-#endif
 	public class DocumentDesigner : ScrollableControlDesigner, IRootDesigner, IToolboxUser
 	{
 
@@ -299,14 +295,6 @@ namespace System.Windows.Forms.Design
 			selectionService.SetSelectedComponents (new IComponent[] { this.Component });
 		}
 
-#if !NET_2_0
-		// MSDN says overriden
-		// 
-		public override void OnSetComponentDefaults ()
-		{
-			base.OnSetComponentDefaults ();
-		}
-#endif
 
 		protected override void Dispose (bool disposing)
 		{
@@ -329,12 +317,10 @@ namespace System.Windows.Forms.Design
 
 #region MSDN says overriden
 
-#if NET_2_0
 		public override GlyphCollection GetGlyphs (GlyphSelectionType selectionType)
 		{
 			return base.GetGlyphs (selectionType);
 		}
-#endif
 
 		protected override void WndProc (ref Message m)
 		{
@@ -384,23 +370,14 @@ namespace System.Windows.Forms.Design
 
 		object IRootDesigner.GetView (ViewTechnology technology)
 		{
-#if NET_2_0
 			if (technology != ViewTechnology.Default)
 				throw new ArgumentException ("Only ViewTechnology.WindowsForms is supported.");
-#else
-			if (technology != ViewTechnology.WindowsForms)
-				throw new ArgumentException ("Only ViewTechnology.WindowsForms is supported.");
-#endif
 			return _designerViewFrame;
 		}
 
 		ViewTechnology[] IRootDesigner.SupportedTechnologies {
 			get {
-#if NET_2_0
 				return new ViewTechnology[] { ViewTechnology.Default };
-#else
-				return new ViewTechnology[] { ViewTechnology.WindowsForms };
-#endif	
 			}
 		}
 #endregion

mcs/class/System.Design/System.Windows.Forms.Design/ImageListCodeDomSerializer.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System;
 using System.ComponentModel.Design.Serialization;
@@ -55,4 +54,3 @@ namespace System.Windows.Forms.Design
 	}
 }
 
-#endif

mcs/class/System.Design/System.Windows.Forms.Design/ImageListImageEditor.cs

@@ -28,7 +28,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 && DRAWING_DESIGN_DEP
+#if DRAWING_DESIGN_DEP
 
 using System;
 using System.ComponentModel;

mcs/class/System.Design/System.Windows.Forms.Design/MaskDescriptor.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System;
 using System.Globalization;
@@ -86,4 +85,3 @@ namespace System.Windows.Forms.Design
 	}
 }
 
-#endif

mcs/class/System.Design/System.Windows.Forms.Design/MenuCommands.cs

@@ -79,7 +79,6 @@ namespace System.Windows.Forms.Design
 			MenuCommands.KeySelectNext = new CommandID (MenuCommands.guidVSStd2K, 4);
 			MenuCommands.KeySelectPrevious = new CommandID (MenuCommands.guidVSStd2K, 5);
 			MenuCommands.KeyTabOrderSelect = new CommandID (MenuCommands.wfCommandSet, 16405);
-#if NET_2_0
 			MenuCommands.KeyHome = new CommandID (MenuCommands.guidVSStd2K, 15);
 			MenuCommands.KeyShiftHome = new CommandID (MenuCommands.guidVSStd2K, 16);
 			MenuCommands.KeyEnd = new CommandID (MenuCommands.guidVSStd2K, 17);
@@ -88,7 +87,6 @@ namespace System.Windows.Forms.Design
 			MenuCommands.EditLabel = new CommandID (MenuCommands.guidVSStd97, 338);
 			MenuCommands.SetStatusText = new CommandID (MenuCommands.wfCommandSet, 16387);
 			MenuCommands.SetStatusRectangle = new CommandID (MenuCommands.wfCommandSet, 16388);
-#endif
 		}
 
 		#endregion Static Constructor
@@ -122,7 +120,6 @@ namespace System.Windows.Forms.Design
 		public static readonly CommandID KeyTabOrderSelect;
 		public static readonly CommandID SelectionMenu;
 		public static readonly CommandID TraySelectionMenu;
-#if NET_2_0
 		public static readonly CommandID EditLabel;
 		public static readonly CommandID KeyEnd;
 		public static readonly CommandID KeyHome;
@@ -131,7 +128,6 @@ namespace System.Windows.Forms.Design
 		public static readonly CommandID KeyShiftHome;
 		public static readonly CommandID SetStatusRectangle;
 		public static readonly CommandID SetStatusText;
-#endif
 
 		#endregion Public Static Fields
 

mcs/class/System.Design/System.Windows.Forms.Design/ParentControlDesigner.cs

@@ -35,9 +35,7 @@ using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Design;
 using System.Collections;
-#if NET_2_0
 using System.Windows.Forms.Design.Behavior;
-#endif
 
 namespace System.Windows.Forms.Design
 
@@ -538,12 +536,10 @@ namespace System.Windows.Forms.Design
 			}
 		}
 
-#if NET_2_0
 		protected override void OnDragComplete (DragEventArgs de)
 		{
 			base.OnDragComplete (de);
 		}
-#endif
 
 		Point _mouseDownPoint = Point.Empty;
 
@@ -664,7 +660,6 @@ namespace System.Windows.Forms.Design
 		}
 
 #region NET_2_0 Stubs
-#if NET_2_0
 		[MonoTODO]
 		protected virtual bool AllowControlLasso {
 			get { return false; }
@@ -725,7 +720,6 @@ namespace System.Windows.Forms.Design
 		{
 			throw new NotImplementedException ();
 		}
-#endif
 #endregion
 
 	}

mcs/class/System.Design/System.Windows.Forms.Design/ShortcutKeysEditor.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System;
 using System.ComponentModel;
@@ -60,4 +59,3 @@ namespace System.Windows.Forms.Design
 	}
 }
 
-#endif

mcs/class/System.Design/System.Windows.Forms.Design/SplitContainerDesigner.cs

@@ -27,7 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System;
 using System.ComponentModel;
@@ -83,4 +82,3 @@ namespace System.Windows.Forms.Design
 		}
 	}
 }
-#endif

mcs/class/System.Design/System.Windows.Forms.Design/WindowsFormsDesignerOptionService.cs

@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System;
 using System.ComponentModel.Design;
@@ -53,4 +52,3 @@ namespace System.Windows.Forms.Design
 	}
 }
 
-#endif