From 21a5a4133c5d4aac71fa4dd7cb746edfa5b542b7 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Thu, 13 Nov 2003 22:36:20 +0000 Subject: [PATCH] 2003-11-13 Andreas Nahr * QualityMode.cs: Fixed typo * InterpolationMode.cs: Fixed typo * RegionData.cs: Fixed signatures, partially implemented * PathGradientBrush.cs: Fixed signatures * PathData.cs: Fixed signature, implemented * LinearGradientBrush.cs: Added missing MonoTODOs, fixed typo * GraphicsContainer.cs: Added private constructor * CustomLineCap.cs: Fixed typos, fixed inheritance, removed unneeded member svn path=/trunk/mcs/; revision=19970 --- .../System.Drawing.Drawing2D/ChangeLog | 11 +++++ .../System.Drawing.Drawing2D/CustomLineCap.cs | 29 ++++++-------- .../GraphicsContainer.cs | 9 +++-- .../InterpolationMode.cs | 2 +- .../LinearGradientBrush.cs | 40 +++++++++++++------ .../System.Drawing.Drawing2D/PathData.cs | 26 +++++++++--- .../PathGradientBrush.cs | 15 +++++-- .../System.Drawing.Drawing2D/QualityMode.cs | 2 +- .../System.Drawing.Drawing2D/RegionData.cs | 22 +++++++--- 9 files changed, 107 insertions(+), 49 deletions(-) diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/ChangeLog b/mcs/class/System.Drawing/System.Drawing.Drawing2D/ChangeLog index 99bcf9c5ad9..ce2164e9e70 100644 --- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/ChangeLog +++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/ChangeLog @@ -1,3 +1,14 @@ +2003-11-13 Andreas Nahr + + * QualityMode.cs: Fixed typo + * InterpolationMode.cs: Fixed typo + * RegionData.cs: Fixed signatures, partially implemented + * PathGradientBrush.cs: Fixed signatures + * PathData.cs: Fixed signature, implemented + * LinearGradientBrush.cs: Added missing MonoTODOs, fixed typo + * GraphicsContainer.cs: Added private constructor + * CustomLineCap.cs: Fixed typos, fixed inheritance, removed unneeded member + 2003-11-11 Ben Maurer * ColorBlend.cs (Positions): another one. diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/CustomLineCap.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/CustomLineCap.cs index f840345d9c4..35fb4286ebb 100644 --- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/CustomLineCap.cs +++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/CustomLineCap.cs @@ -1,8 +1,9 @@ // // System.Drawing.Drawing2D.CustomLineCap.cs // -// Author: -// Dennis Hayes (dennish@Raytek.com) +// Authors: +// Dennis Hayes (dennish@Raytek.com) +// Andreas Nahr (ClassDevelopment@A-SoftTech.com) // // (C) 2002/3 Ximian, Inc // @@ -12,9 +13,9 @@ namespace System.Drawing.Drawing2D { /// /// Summary description for CustomLineCap. /// - public class CustomLineCap {// : MarshalByRefObject, ICloneable, IDisposable { + public class CustomLineCap : MarshalByRefObject, ICloneable, IDisposable { private LineCap baseCap; - private float baseInsert; + private float baseInset; private LineJoin strokeJoin; private float widthScale; @@ -23,7 +24,7 @@ namespace System.Drawing.Drawing2D { protected CustomLineCap() { } public CustomLineCap(GraphicsPath fillPAth, GraphicsPath strokePath, LineCap baseCap, float baseInset) { - this.baseInsert = baseInsert; + this.baseInset = baseInset; } public CustomLineCap(GraphicsPath fillPAth, GraphicsPath strokePAth, LineCap baseCap) { this.baseCap = baseCap; @@ -47,12 +48,12 @@ namespace System.Drawing.Drawing2D { strokeJoin = value; } } - public float BaseInsert{ + public float BaseInset{ get { - return baseInsert; + return baseInset; } set { - baseInsert = value; + baseInset = value; } } @@ -68,9 +69,10 @@ namespace System.Drawing.Drawing2D { //Public Methods // Implment IConeable.Clone - //public virtural object Clone(){ - // //CustomLineCap newcustomlinecap = new CustomLineCap( - //} + public object Clone(){ + //FIXME + return new CustomLineCap(); + } public virtual void Dispose(){ Dispose(true); @@ -85,10 +87,5 @@ namespace System.Drawing.Drawing2D { public void SetStrokeCaps(LineCap startCap, LineCap endCap){ } - - // Protected Methods - - ~CustomLineCap(){ - } } } diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsContainer.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsContainer.cs index 5dde4b3200e..97c2a42b507 100644 --- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsContainer.cs +++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/GraphicsContainer.cs @@ -1,8 +1,9 @@ // // System.Drawing.Drawing2D.GraphicsContainer.cs // -// Author: -// Dennis Hayes (dennish@Raytek.com) +// Authors: +// Dennis Hayes (dennish@Raytek.com) +// Andreas Nahr (ClassDevelopment@A-SoftTech.com) // // (C) 2002/3 Ximian, Inc // @@ -13,6 +14,8 @@ namespace System.Drawing.Drawing2D { /// Summary description for GraphicsContainer. /// public sealed class GraphicsContainer : MarshalByRefObject { - //Everything is inherited! + private GraphicsContainer () + { + } } } diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/InterpolationMode.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/InterpolationMode.cs index 36427b5ac33..00f9b0ca783 100644 --- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/InterpolationMode.cs +++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/InterpolationMode.cs @@ -22,6 +22,6 @@ namespace System.Drawing.Drawing2D { HighQualityBilinear = 6, Invalid = -1, Low = 1, - NearestNeighbour = 5 + NearestNeighbor = 5 } } diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/LinearGradientBrush.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/LinearGradientBrush.cs index 44fff8831a2..412738f78c6 100644 --- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/LinearGradientBrush.cs +++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/LinearGradientBrush.cs @@ -31,7 +31,8 @@ namespace System.Drawing.Drawing2D } - //public Properties + //public Properties + [MonoTODO()] public Blend Blend { get { throw new NotImplementedException (); @@ -39,7 +40,8 @@ namespace System.Drawing.Drawing2D set { } } - + + [MonoTODO()] public bool GammaCorrection { get { throw new NotImplementedException (); @@ -47,7 +49,8 @@ namespace System.Drawing.Drawing2D set { } } - + + [MonoTODO()] public ColorBlend InterpolationColors { get { throw new NotImplementedException (); @@ -64,12 +67,16 @@ namespace System.Drawing.Drawing2D linear_colors[0] = value[0]; linear_colors[1] = value[1]; } - } - public RectangleF Rectange { + } + + [MonoTODO()] + public RectangleF Rectangle { get { throw new NotImplementedException (); } - } + } + + [MonoTODO()] public Matrix Transform { get { throw new NotImplementedException (); @@ -77,7 +84,8 @@ namespace System.Drawing.Drawing2D set { } } - + + [MonoTODO()] public WrapMode WrapMode { get { throw new NotImplementedException (); @@ -87,27 +95,33 @@ namespace System.Drawing.Drawing2D } // Public Methods - + + [MonoTODO()] public override object Clone (){ throw new NotImplementedException (); } - + + [MonoTODO()] public void MultiplyTransform (Matrix matrix){ throw new NotImplementedException (); } - + + [MonoTODO()] public void MultiplyTransform (Matrix matrix, MatrixOrder order){ throw new NotImplementedException (); } - + + [MonoTODO()] public void ResetTransform (){ throw new NotImplementedException (); } - + + [MonoTODO()] public void RotateTransform (float angle, MatrixOrder order){ throw new NotImplementedException (); } - + + [MonoTODO()] public void RotateTransform (float angle){ throw new NotImplementedException (); } diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/PathData.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/PathData.cs index 60a1deb12f4..b1f28ce08c5 100644 --- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/PathData.cs +++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/PathData.cs @@ -1,11 +1,13 @@ // // System.Drawing.Drawing2D.PathData.cs // -// Author: -// Dennis Hayes (dennish@Raytek.com) +// Authors: +// Dennis Hayes (dennish@Raytek.com) +// Andreas Nahr (ClassDevelopment@A-SoftTech.com) // // (C) 2002/3 Ximian, Inc -// +// + using System; namespace System.Drawing.Drawing2D @@ -13,10 +15,24 @@ namespace System.Drawing.Drawing2D /// /// Summary description for PathData. /// - public class PathData - { + public sealed class PathData + { + + PointF[] points = null; + byte[] types = null; + public PathData() { + } + + public PointF[] Points { + get { return points; } + set { points = value; } + } + + public byte[] Types { + get { return types; } + set { types = value; } } } } diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/PathGradientBrush.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/PathGradientBrush.cs index 99d1eeff68a..aec58b4b219 100644 --- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/PathGradientBrush.cs +++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/PathGradientBrush.cs @@ -1,8 +1,9 @@ // // System.Drawing.Drawing2D.PathGradientBrush.cs // -// Author: -// Dennis Hayes (dennish@Raytek.com) +// Authors: +// Dennis Hayes (dennish@Raytek.com) +// Andreas Nahr (ClassDevelopment@A-SoftTech.com) // // (C) 2002/3 Ximian, Inc // @@ -13,10 +14,16 @@ namespace System.Drawing.Drawing2D /// /// Summary description for PathGradientBrush. /// - public class PathGradientBrush + public sealed class PathGradientBrush : Brush { - public PathGradientBrush() + internal PathGradientBrush() { + } + + [MonoTODO("implement")] + public override object Clone () + { + throw new NotImplementedException (); } } } diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/QualityMode.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/QualityMode.cs index 29f619b3caa..8c986092e4d 100644 --- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/QualityMode.cs +++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/QualityMode.cs @@ -15,7 +15,7 @@ namespace System.Drawing.Drawing2D { /// public enum QualityMode { Default = 0, - Hight = 2, + High = 2, Invalid = -1, Low = 1 } diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/RegionData.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/RegionData.cs index ebd92d3db26..aaf7dbdc542 100644 --- a/mcs/class/System.Drawing/System.Drawing.Drawing2D/RegionData.cs +++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/RegionData.cs @@ -1,11 +1,13 @@ // // System.Drawing.Drawing2D.RegionData.cs // -// Author: -// Dennis Hayes (dennish@Raytek.com) +// Authors: +// Dennis Hayes (dennish@Raytek.com) +// Andreas Nahr (ClassDevelopment@A-SoftTech.com) // // (C) 2002/3 Ximian, Inc -// +// + using System; namespace System.Drawing.Drawing2D @@ -13,10 +15,18 @@ namespace System.Drawing.Drawing2D /// /// Summary description for RegionData. /// - public class RegionData - { - public RegionData() + public sealed class RegionData + { + + byte[] data; + + internal RegionData() { + } + + public byte[] Data { + get {return data;} + set {data = value;} } } } -- 2.25.1