Imported Upstream version 3.6.0

Former-commit-id: da6be194a6b1221998fc28233f2503bd61dd9d14

mcs/class/System.Drawing/System.Drawing.Drawing2D/AdjustableArrowCap.cs

@@ -0,0 +1,122 @@
+//
+// System.Drawing.Drawing2D.AdjustableArrowCap.cs
+//
+// Authors:
+//	Dennis Hayes (dennish@Raytek.com)
+//	Ravindra (rkumar@novell.com)
+//
+// Copyright (C) 2002/3 Ximian, Inc. http://www.ximian.com
+// Copyright (C) 2004 Novell, Inc. http://www.novell.com
+//
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace System.Drawing.Drawing2D
+{
+	/// <summary>
+	/// Summary description for AdjustableArrowCap.
+	/// </summary>
+	public sealed class AdjustableArrowCap : CustomLineCap
+	{
+		// Constructors
+
+		internal AdjustableArrowCap (IntPtr ptr) : base (ptr)
+		{
+		}
+
+		public AdjustableArrowCap (float width, float height) : this (width, height, true)
+		{
+		}
+
+		public AdjustableArrowCap (float width, float height, bool isFilled)
+		{
+			Status status = GDIPlus.GdipCreateAdjustableArrowCap (height, width, isFilled, out nativeObject);
+			GDIPlus.CheckStatus (status);
+		}
+
+		// Public Properities
+
+		public bool Filled {
+			get {
+				bool isFilled;
+				Status status = GDIPlus.GdipGetAdjustableArrowCapFillState (nativeObject, out isFilled);
+				GDIPlus.CheckStatus (status);
+
+				return isFilled;
+			}
+
+			set {
+				Status status = GDIPlus.GdipSetAdjustableArrowCapFillState (nativeObject, value);
+				GDIPlus.CheckStatus (status);
+			}
+		}
+
+		public float Width {
+			get {
+				float width;
+				Status status = GDIPlus.GdipGetAdjustableArrowCapWidth (nativeObject, out width);
+				GDIPlus.CheckStatus (status);
+
+				return width;
+			}
+
+			set {
+				Status status = GDIPlus.GdipSetAdjustableArrowCapWidth (nativeObject, value);
+				GDIPlus.CheckStatus (status);
+			}
+		}
+
+		public float Height {
+			get {
+				float height;
+				Status status = GDIPlus.GdipGetAdjustableArrowCapHeight (nativeObject, out height);
+				GDIPlus.CheckStatus (status);
+
+				return height;
+			}
+
+			set {
+				Status status = GDIPlus.GdipSetAdjustableArrowCapHeight (nativeObject, value);
+				GDIPlus.CheckStatus (status);
+			}
+		}
+
+		public float MiddleInset {
+			get {
+				float middleInset;
+				Status status = GDIPlus.GdipGetAdjustableArrowCapMiddleInset (nativeObject, out middleInset);
+				GDIPlus.CheckStatus (status);
+
+				return middleInset;
+			}
+
+			set {
+				Status status = GDIPlus.GdipSetAdjustableArrowCapMiddleInset (nativeObject, value);
+				GDIPlus.CheckStatus (status);
+			}
+		}
+	}
+}

mcs/class/System.Drawing/System.Drawing.Drawing2D/AdjustableArrowCap.jvm.cs

@@ -0,0 +1,103 @@
+//
+// System.Drawing.Drawing2D.AdjustableArrowCap.cs
+//
+// Authors:
+//	Dennis Hayes (dennish@Raytek.com)
+//	Ravindra (rkumar@novell.com)
+//
+// Copyright (C) 2002/3 Ximian, Inc. http://www.ximian.com
+// Copyright (C) 2004 Novell, Inc. http://www.novell.com
+//
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace System.Drawing.Drawing2D
+{
+	/// <summary>
+	/// Summary description for AdjustableArrowCap.
+	/// </summary>
+	[MonoNotSupported ("")]
+	public sealed class AdjustableArrowCap : CustomLineCap
+	{
+		// Constructors
+
+		[MonoNotSupported ("")]
+		public AdjustableArrowCap (float width, float height) : this (width, height, true)
+		{
+		}
+
+		[MonoNotSupported ("")]
+		public AdjustableArrowCap (float width, float height, bool isFilled)
+		{
+			throw new NotImplementedException();
+		}
+
+		// Public Properities
+		[MonoTODO]
+		public bool Filled {
+			get {
+				throw new NotImplementedException();
+			}
+
+			set {
+				throw new NotImplementedException();
+			}
+		}
+
+		[MonoTODO]
+		public float Width {
+			get {
+				throw new NotImplementedException();
+			}
+
+			set {
+				throw new NotImplementedException();
+			}
+		}
+
+		[MonoTODO]
+		public float Height {
+			get {
+				throw new NotImplementedException();
+			}
+
+			set {
+				throw new NotImplementedException();
+			}
+		}
+
+		[MonoTODO]
+		public float MiddleInset {
+			get {
+				throw new NotImplementedException();
+			}
+
+			set {
+				throw new NotImplementedException();
+			}
+		}
+	}
+}

mcs/class/System.Drawing/System.Drawing.Drawing2D/Blend.cs

@@ -0,0 +1,81 @@
+//
+// System.Drawing.Drawing2D.Blend.cs
+//
+// Authors:
+//   Dennis Hayes (dennish@Raytek.com)
+//   Ravindra (rkumar@novell.com)
+//
+// (C) 2002/3 Ximian, Inc. http://www.ximian.com
+// (C) 2004 Novell, Inc. http://www.novell.com
+//
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+using System;
+
+namespace System.Drawing.Drawing2D
+{
+	/// <summary>
+	/// Summary description for Blend.
+	/// </summary>
+#if TARGET_JVM
+	[MonoTODO]
+#endif
+	public sealed class Blend
+	{
+		private float [] positions;
+		private float [] factors;
+
+		public Blend ()
+		{
+			positions = new float [1];
+			factors = new float [1];
+		}
+
+		public Blend (int count)
+		{
+			positions = new float [count];
+			factors = new float [count];
+		}
+
+		public float [] Factors {
+			get {
+				return factors;
+			}
+
+			set {
+				factors = value;
+			}
+		}
+
+		public float [] Positions {
+			get {
+				return positions;
+			}
+
+			set {
+				positions = value;
+			}
+		}
+	}
+}

mcs/class/System.Drawing/System.Drawing.Drawing2D/ColorBlend.cs

@@ -0,0 +1,70 @@
+//
+// System.Drawing.Drawing2D.ColorBlend.cs
+//
+// Authors:
+//   Dennis Hayes (dennish@Raytek.com)
+//   Ravindra (rkumar@novell.com)
+//
+// (C) 2002/3 Ximian, Inc. http://www.ximian.com
+// Copyright (C) 2004, 2006 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace System.Drawing.Drawing2D
+{
+	public sealed class ColorBlend
+	{
+		private float [] positions;
+		private Color [] colors;
+
+		public ColorBlend ()
+		{
+			positions = new float [1];
+			colors = new Color [1];
+		}
+
+		public ColorBlend (int count)
+		{
+			positions = new float [count];
+			colors = new Color [count];
+		}
+
+		public Color [] Colors {
+			get {
+				return colors;
+			}
+
+			set {
+				colors = value;
+			}
+		}
+
+		public float [] Positions {
+			get {
+				return positions;
+			}
+
+			set {
+				positions = value;				
+			}
+		}
+	}
+}

mcs/class/System.Drawing/System.Drawing.Drawing2D/CombineMode.cs

@@ -0,0 +1,44 @@
+//
+// System.Drawing.Drawing2D.CombineMode.cs
+//
+// Author:
+//   Stefan Maierhofer <sm@cg.tuwien.ac.at>
+//   Dennis Hayes (dennish@Raytek.com)
+//
+// (C) 2002/3 Ximian, Inc
+// Copyright (C) 2004,2006 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace System.Drawing.Drawing2D {
+
+#if ONLY_1_1
+	[Serializable]
+#endif
+	public enum CombineMode	{
+		Complement = 5,
+		Exclude = 4,
+		Intersect = 1,
+		Replace = 0,
+		Union = 2,
+		Xor = 3
+	}
+}

mcs/class/System.Drawing/System.Drawing.Drawing2D/CompostingMode.cs

@@ -0,0 +1,40 @@
+//
+// System.Drawing.Drawing2D.CompostingMode.cs
+//
+// Author:
+//   Stefan Maierhofer <sm@cg.tuwien.ac.at>
+//   Dennis Hayes (dennish@Raytek.com)
+//
+// (C) 2002/3 Ximian, Inc
+// Copyright (C) 2004,2006 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace System.Drawing.Drawing2D {
+
+#if ONLY_1_1
+	[Serializable]
+#endif
+	public enum CompositingMode {
+		SourceCopy = 1,
+		SourceOver = 0
+	}
+}

mcs/class/System.Drawing/System.Drawing.Drawing2D/CompostingQuality.cs

@@ -0,0 +1,44 @@
+//
+// System.Drawing.Drawing2D.CompostingQuality.cs
+//
+// Author:
+//   Stefan Maierhofer <sm@cg.tuwien.ac.at>
+//   Dennis Hayes (dennish@Raytek.com)
+//
+// (C) 2002/3 Ximian, Inc
+// Copyright (C) 2004,2006 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace System.Drawing.Drawing2D {
+
+#if ONLY_1_1
+	[Serializable]
+#endif
+	public enum CompositingQuality {
+		AssumeLinear = 4,
+		Default = 0,
+		GammaCorrected = 3,
+		HighQuality = 2,
+		HighSpeed = 1,
+		Invalid = -1
+	}
+}

mcs/class/System.Drawing/System.Drawing.Drawing2D/CoordinateSpace.cs

@@ -0,0 +1,41 @@
+//
+// System.Drawing.Drawing2D.CoordinateSpace.cs
+//
+// Author:
+//   Stefan Maierhofer <sm@cg.tuwien.ac.at>
+//   Dennis Hayes (dennish@Raytek.com)
+//
+// (C) 2002/3 Ximian, Inc
+// Copyright (C) 2004,2006 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace System.Drawing.Drawing2D {
+
+#if ONLY_1_1
+	[Serializable]
+#endif
+	public enum CoordinateSpace {
+		Device = 2,
+		Page = 1,
+		World = 0
+	}
+}

mcs/class/System.Drawing/System.Drawing.Drawing2D/CustomLineCap.cs

@@ -0,0 +1,176 @@
+//
+// System.Drawing.Drawing2D.CustomLineCap.cs
+//
+// Authors:
+//	Dennis Hayes (dennish@Raytek.com)
+//	Andreas Nahr (ClassDevelopment@A-SoftTech.com)
+//	Ravindra (rkumar@novell.com)
+//
+// Copyright (C) 2002/3 Ximian, Inc. http://www.ximian.com
+// Copyright (C) 2004,2006 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace System.Drawing.Drawing2D {
+
+	public class CustomLineCap : MarshalByRefObject, ICloneable, IDisposable
+	{
+		private bool disposed;
+		internal IntPtr nativeObject;
+
+		// Constructors
+
+		internal CustomLineCap ()
+		{
+		}
+
+		internal CustomLineCap (IntPtr ptr)
+		{
+			nativeObject = ptr;
+		}
+
+		public CustomLineCap (GraphicsPath fillPath, GraphicsPath strokePath) : this (fillPath, strokePath, LineCap.Flat, 0)
+		{
+		}
+
+		public CustomLineCap (GraphicsPath fillPath, GraphicsPath strokePath, LineCap baseCap) : this (fillPath, strokePath, baseCap, 0)
+		{
+		}
+
+		public CustomLineCap(GraphicsPath fillPath, GraphicsPath strokePath, LineCap baseCap, float baseInset)
+		{
+			IntPtr fill = IntPtr.Zero;
+			IntPtr stroke = IntPtr.Zero;
+
+			if (fillPath != null)
+				fill = fillPath.nativePath;
+			if (strokePath != null)
+				stroke = strokePath.nativePath;
+
+			Status status = GDIPlus.GdipCreateCustomLineCap (fill, stroke, baseCap, baseInset, out nativeObject);
+			GDIPlus.CheckStatus (status);
+		}
+
+		public LineCap BaseCap {
+			get {
+				LineCap baseCap;
+				Status status = GDIPlus.GdipGetCustomLineCapBaseCap (nativeObject, out baseCap);
+				GDIPlus.CheckStatus (status);
+
+				return baseCap;
+			}
+
+			set {
+				Status status = GDIPlus.GdipSetCustomLineCapBaseCap (nativeObject, value);
+				GDIPlus.CheckStatus (status);
+			}
+		}
+
+		public LineJoin StrokeJoin {
+			get {
+				LineJoin strokeJoin;
+				Status status = GDIPlus.GdipGetCustomLineCapStrokeJoin (nativeObject, out strokeJoin);
+				GDIPlus.CheckStatus (status);
+
+				return strokeJoin;
+			}
+
+			set {
+				Status status = GDIPlus.GdipSetCustomLineCapStrokeJoin (nativeObject, value);
+				GDIPlus.CheckStatus (status);
+			}
+		}
+
+		public float BaseInset {
+			get {
+				float baseInset;
+				Status status = GDIPlus.GdipGetCustomLineCapBaseInset (nativeObject, out baseInset);
+				GDIPlus.CheckStatus (status);
+
+				return baseInset;
+			}
+
+			set {
+				Status status = GDIPlus.GdipSetCustomLineCapBaseInset (nativeObject, value);
+				GDIPlus.CheckStatus (status);
+			}
+		}
+
+		public float WidthScale {
+			get {
+				float widthScale;
+				Status status = GDIPlus.GdipGetCustomLineCapWidthScale (nativeObject, out widthScale);
+				GDIPlus.CheckStatus (status);
+
+				return widthScale;
+			}
+
+			set {
+				Status status = GDIPlus.GdipSetCustomLineCapWidthScale (nativeObject, value);
+				GDIPlus.CheckStatus (status);
+			}
+		}
+
+		// Public Methods
+
+		public object Clone ()
+		{
+			IntPtr clonePtr;
+			Status status = GDIPlus.GdipCloneCustomLineCap (nativeObject, out clonePtr);
+			GDIPlus.CheckStatus (status);
+
+			return new CustomLineCap (clonePtr);
+		}
+		
+		public void Dispose ()
+		{
+			Dispose (true);
+			System.GC.SuppressFinalize (this);
+		}
+
+		protected virtual void Dispose (bool disposing)
+		{
+			if (! disposed) {
+				Status status = GDIPlus.GdipDeleteCustomLineCap (nativeObject);
+				GDIPlus.CheckStatus (status);
+				disposed = true;
+				nativeObject = IntPtr.Zero;
+			}
+		}
+		
+		~CustomLineCap ()
+		{
+			Dispose (false);
+		}
+
+		public void GetStrokeCaps (out LineCap startCap, out LineCap endCap)
+		{
+			Status status = GDIPlus.GdipGetCustomLineCapStrokeCaps (nativeObject, out startCap, out endCap);
+			GDIPlus.CheckStatus (status);
+		}
+
+		public void SetStrokeCaps(LineCap startCap, LineCap endCap)
+		{
+			Status status = GDIPlus.GdipSetCustomLineCapStrokeCaps (nativeObject, startCap, endCap);
+			GDIPlus.CheckStatus (status);
+		}
+	}
+}

mcs/class/System.Drawing/System.Drawing.Drawing2D/CustomLineCap.jvm.cs

@@ -0,0 +1,131 @@
+//
+// System.Drawing.Drawing2D.CustomLineCap.cs
+//
+// Authors:
+//	Dennis Hayes (dennish@Raytek.com)
+//	Andreas Nahr (ClassDevelopment@A-SoftTech.com)
+//	Ravindra (rkumar@novell.com)
+//
+// Copyright (C) 2002/3 Ximian, Inc. http://www.ximian.com
+// Copyright (C) 2004 Novell, Inc. http://www.novell.com
+//
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace System.Drawing.Drawing2D
+{
+	/// <summary>
+	/// Summary description for CustomLineCap.
+	/// </summary>
+	[MonoNotSupported ("")]
+	public class CustomLineCap : MarshalByRefObject, ICloneable
+	{
+		private bool disposed;
+
+		// Constructors
+
+		internal CustomLineCap () { }
+
+		[MonoNotSupported ("")]
+		public CustomLineCap (GraphicsPath fillPath, GraphicsPath strokePath) : this (fillPath, strokePath, LineCap.Flat, 0)
+		{
+		}
+
+		[MonoNotSupported ("")]
+		public CustomLineCap (GraphicsPath fillPath, GraphicsPath strokePath, LineCap baseCap) : this (fillPath, strokePath, baseCap, 0)
+		{
+		}
+
+		[MonoNotSupported ("")]
+		public CustomLineCap(GraphicsPath fillPath, GraphicsPath strokePath, LineCap baseCap, float baseInset)
+		{
+			throw new NotImplementedException();
+		}
+
+		[MonoTODO]
+		public LineCap BaseCap {
+			get {
+				throw new NotImplementedException();
+			}
+
+			set {
+				throw new NotImplementedException();
+			}
+		}
+
+		[MonoTODO]
+		public LineJoin StrokeJoin {
+			get {
+				throw new NotImplementedException();
+			}
+
+			set {
+				throw new NotImplementedException();
+			}
+		}
+
+		[MonoTODO]
+		public float BaseInset {
+			get {
+				throw new NotImplementedException();
+			}
+
+			set {
+				throw new NotImplementedException();
+			}
+		}
+
+		[MonoTODO]
+		public float WidthScale {
+			get {
+				throw new NotImplementedException();
+			}
+
+			set {
+				throw new NotImplementedException();
+			}
+		}
+
+		// Public Methods
+		[MonoTODO]
+		public virtual object Clone ()
+		{
+			throw new NotImplementedException();
+		}
+		
+		[MonoTODO]
+		public void GetStrokeCaps (out LineCap startCap, out LineCap endCap)
+		{
+			throw new NotImplementedException();
+		}
+
+		[MonoTODO]
+		public void SetStrokeCaps(LineCap startCap, LineCap endCap)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}

mcs/class/System.Drawing/System.Drawing.Drawing2D/DashCap.cs

@@ -0,0 +1,41 @@
+//
+// System.Drawing.Drawing2D.DashCap.cs
+//
+// Author:
+//   Stefan Maierhofer <sm@cg.tuwien.ac.at>
+//   Dennis Hayes (dennish@Raytek.com)
+//
+// (C) 2002/3 Ximian, Inc
+// Copyright (C) 2004,2006 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace System.Drawing.Drawing2D {
+
+#if ONLY_1_1
+	[Serializable]
+#endif
+	public enum DashCap {
+		Flat,
+		Round = 2,
+		Triangle = 3
+	}
+}

mcs/class/System.Drawing/System.Drawing.Drawing2D/DashStyle.cs

@@ -0,0 +1,43 @@
+//
+// System.Drawing.Drawing2D.DashStyle.cs
+//
+// Author:
+//   Dennis Hayes (dennish@Raytek.com)
+//
+// (C) 2002/3 Ximian, Inc
+// Copyright (C) 2004,2006 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace System.Drawing.Drawing2D {
+
+#if ONLY_1_1
+	[Serializable]
+#endif
+	public enum DashStyle {
+		Custom = 5,
+		Dash = 1,
+		DashDot = 3,
+		DashDotDot = 4,
+		Dot = 2,
+		Solid = 0
+	}
+}

mcs/class/System.Drawing/System.Drawing.Drawing2D/FillMode.cs

@@ -0,0 +1,40 @@
+//
+// System.Drawing.Drawing2D.FillMode.cs
+//
+// Author:
+//   Stefan Maierhofer <sm@cg.tuwien.ac.at>
+//   Dennis Hayes (dennish@Raytek.com)
+//
+// (C) 2002/3 Ximian, Inc
+// Copyright (C) 2004,2006 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace System.Drawing.Drawing2D {
+
+#if ONLY_1_1
+	[Serializable]
+#endif
+	public enum FillMode {
+		Alternate = 0,
+		Winding = 1
+	}
+}

mcs/class/System.Drawing/System.Drawing.Drawing2D/FlushIntention.cs

@@ -0,0 +1,40 @@
+//
+// System.Drawing.Drawing2D.FlushIntention.cs
+//
+// Author:
+//   Stefan Maierhofer <sm@cg.tuwien.ac.at>
+//   Dennis Hayes (dennish@Raytek.com)
+//
+// (C) 2002/3 Ximian, Inc
+// Copyright (C) 2004,2006 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace System.Drawing.Drawing2D {
+
+#if ONLY_1_1
+	[Serializable]
+#endif
+	public enum FlushIntention {
+		Flush = 0,
+		Sync = 1
+	}
+}

mcs/class/System.Drawing/System.Drawing.Drawing2D/GeneralPathIterator.jvm.cs

@@ -0,0 +1,105 @@
+//
+// System.Drawing.Drawing2D.GeneralPathIterator.cs
+//
+// Author:
+// Bors Kirzner <boris@mainsoft.com>	
+//
+// Copyright (C) 2005 Mainsoft Corporation, (http://www.mainsoft.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using java.awt.geom;
+
+namespace System.Drawing.Drawing2D
+{
+	internal class GeneralPathIterator : PathIterator
+	{
+		#region Fields
+
+		int typeIdx = 0;
+		int pointIdx   = 0;
+		ExtendedGeneralPath _path;
+		AffineTransform _affine;
+
+		private static readonly int [] curvesize = {2, 2, 4, 6, 0};
+
+		#endregion // Fileds
+
+		#region Constructors
+
+		public GeneralPathIterator(ExtendedGeneralPath _path) : this (_path, null)
+		{
+		}
+
+		public GeneralPathIterator(ExtendedGeneralPath _path, AffineTransform at) 
+		{
+			this._path = _path;
+			this._affine = at;
+		}
+
+		#endregion // Constructors
+
+		#region Methods
+
+		public int getWindingRule() 
+		{
+			return _path.getWindingRule ();
+		}
+
+		public bool isDone() 
+		{
+			return (typeIdx >= _path.TypesCount);
+		}
+
+		public void next() 
+		{
+			int type = _path.Types [typeIdx++] & ExtendedGeneralPath.SEG_MASK;
+			pointIdx += curvesize [type];
+		}
+
+		public int currentSegment(float [] coords) {
+			int type = _path.Types [typeIdx] & ExtendedGeneralPath.SEG_MASK;
+			int numCoords = curvesize [type];
+			if (numCoords > 0 && _affine != null)
+				_affine.transform (_path.Coords, pointIdx, coords, 0, numCoords/2);
+			else
+				Array.Copy (_path.Coords, pointIdx, coords, 0, numCoords);
+			return type;
+		}
+
+		public int currentSegment(double [] coords) 
+		{
+			int type = _path.Types [typeIdx] & ExtendedGeneralPath.SEG_MASK;
+			int numCoords = curvesize [type];
+			if (numCoords > 0 && _affine != null)
+				_affine.transform (_path.Coords, pointIdx, coords, 0, numCoords/2);
+			else 
+				for (int i=0; i < numCoords; i++)
+					coords [i] = _path.Coords [pointIdx + i];
+		
+			return type;
+		}
+
+		#endregion // Methods
+	}  
+}

mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsContainer.cs

@@ -0,0 +1,48 @@
+//
+// System.Drawing.Drawing2D.GraphicsContainer.cs
+//
+// Authors:
+//   Dennis Hayes (dennish@Raytek.com)
+//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
+//
+// (C) 2002/3 Ximian, Inc
+// Copyright (C) 2004,2006 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace System.Drawing.Drawing2D {
+
+	public sealed class GraphicsContainer : MarshalByRefObject {
+		
+		private uint nativeState;
+
+		internal GraphicsContainer (uint state)
+		{
+			nativeState = state;
+		}
+		
+		internal uint NativeObject {
+			get {
+				return nativeState;
+			}
+		}
+	}
+}

mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsContainer.jvm.cs

@@ -0,0 +1,54 @@
+//
+// System.Drawing.Drawing2D.GraphicsContainer.cs
+//
+// Authors:
+//   Dennis Hayes (dennish@Raytek.com)
+//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
+//
+// (C) 2002/3 Ximian, Inc
+//
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+using System;
+
+namespace System.Drawing.Drawing2D 
+{
+	/// <summary>
+	/// Summary description for GraphicsContainer.
+	/// </summary>
+	public sealed class GraphicsContainer : MarshalByRefObject
+	{
+		readonly GraphicsState _stateObject;
+		
+		internal GraphicsContainer (GraphicsState stateObject)
+		{
+			_stateObject = stateObject;
+		}
+
+		internal GraphicsState StateObject
+		{
+			get {return _stateObject;}
+		}
+	}
+}