From b9b810a57190946bb736352c7fe07c7d15422e33 Mon Sep 17 00:00:00 2001 From: Stephen Toub Date: Wed, 16 May 2018 18:36:49 -0400 Subject: [PATCH] Remove MonoTODO and MonoLimitation from System.Drawing.Common (dotnet/corefx#29739) Commit migrated from https://github.com/dotnet/corefx/commit/165e65f14c1499fdcd86a1e62319e2cf3b5beb41 --- .../System.Drawing.Common/src/MonoTODOAttribute.cs | 114 --------------------- .../src/System.Drawing.Common.csproj | 1 - .../src/System/Drawing/BufferedGraphics.Unix.cs | 1 - .../System/Drawing/BufferedGraphicsContext.Unix.cs | 1 - .../System/Drawing/Drawing2D/GraphicsPath.Unix.cs | 11 -- .../src/System/Drawing/Font.Unix.cs | 2 - .../src/System/Drawing/Graphics.Unix.cs | 52 +--------- .../src/System/Drawing/Icon.Unix.cs | 1 - .../src/System/Drawing/Image.Unix.cs | 1 - .../src/System/Drawing/Imaging/Metafile.Unix.cs | 8 -- .../System/Drawing/Imaging/MetafileHeader.Unix.cs | 2 - .../System/Drawing/Printing/PageSettings.Unix.cs | 2 - .../Printing/PreviewPrintController.Unix.cs | 4 - .../Drawing/Printing/PrinterSettings.Unix.cs | 13 +-- 14 files changed, 2 insertions(+), 211 deletions(-) delete mode 100644 src/libraries/System.Drawing.Common/src/MonoTODOAttribute.cs diff --git a/src/libraries/System.Drawing.Common/src/MonoTODOAttribute.cs b/src/libraries/System.Drawing.Common/src/MonoTODOAttribute.cs deleted file mode 100644 index a8193e7..0000000 --- a/src/libraries/System.Drawing.Common/src/MonoTODOAttribute.cs +++ /dev/null @@ -1,114 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// See the LICENSE file in the project root for more information. -// -// MonoTODOAttribute.cs -// -// Authors: -// Ravi Pratap (ravi@ximian.com) -// Eyal Alaluf -// -// (C) Ximian, Inc. http://www.ximian.com -// - -// -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) -// Copyright (C) 2006 Mainsoft, Inc (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.Diagnostics; - -namespace System -{ -#pragma warning disable 436 - [AttributeUsage(AttributeTargets.All, AllowMultiple = true)] - [Conditional("MONO")] - internal class MonoTODOAttribute : Attribute - { - - string comment; - - public MonoTODOAttribute() - { - } - - public MonoTODOAttribute(string comment) - { - this.comment = comment; - } - - public string Comment - { - get { return comment; } - } - } - - [AttributeUsage(AttributeTargets.All, AllowMultiple = true)] - internal class MonoDocumentationNoteAttribute : MonoTODOAttribute - { - - public MonoDocumentationNoteAttribute(string comment) - : base(comment) - { - } - } - - [AttributeUsage(AttributeTargets.All, AllowMultiple = true)] - internal class MonoExtensionAttribute : MonoTODOAttribute - { - - public MonoExtensionAttribute(string comment) - : base(comment) - { - } - } - - [AttributeUsage(AttributeTargets.All, AllowMultiple = true)] - internal class MonoInternalNoteAttribute : MonoTODOAttribute - { - - public MonoInternalNoteAttribute(string comment) - : base(comment) - { - } - } - - [AttributeUsage(AttributeTargets.All, AllowMultiple = true)] - internal class MonoLimitationAttribute : MonoTODOAttribute - { - - public MonoLimitationAttribute(string comment) - : base(comment) - { - } - } - - [AttributeUsage(AttributeTargets.All, AllowMultiple = true)] - internal class MonoNotSupportedAttribute : MonoTODOAttribute - { - - public MonoNotSupportedAttribute(string comment) - : base(comment) - { - } - } -#pragma warning restore 436 -} diff --git a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj index f23ae33..b7b237e 100644 --- a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj +++ b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj @@ -333,7 +333,6 @@ - Common\Interop\Unix\Interop.Libraries.cs diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/BufferedGraphics.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/BufferedGraphics.Unix.cs index 298aa8e..f87940f 100644 --- a/src/libraries/System.Drawing.Common/src/System/Drawing/BufferedGraphics.Unix.cs +++ b/src/libraries/System.Drawing.Common/src/System/Drawing/BufferedGraphics.Unix.cs @@ -111,7 +111,6 @@ namespace System.Drawing target.DrawImage(membmp, size); } - [MonoTODO("The targetDC parameter has no equivalent in libgdiplus.")] public void Render(IntPtr targetDC) { throw new NotImplementedException(); diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/BufferedGraphicsContext.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/BufferedGraphicsContext.Unix.cs index de0d434..7a484a1 100644 --- a/src/libraries/System.Drawing.Common/src/System/Drawing/BufferedGraphicsContext.Unix.cs +++ b/src/libraries/System.Drawing.Common/src/System/Drawing/BufferedGraphicsContext.Unix.cs @@ -56,7 +56,6 @@ namespace System.Drawing return graphics; } - [MonoTODO("The targetDC parameter has no equivalent in libgdiplus.")] public BufferedGraphics Allocate(IntPtr targetDC, Rectangle targetRectangle) { throw new NotImplementedException(); diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Drawing2D/GraphicsPath.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Drawing2D/GraphicsPath.Unix.cs index bcc999c..0f9e397 100644 --- a/src/libraries/System.Drawing.Common/src/System/Drawing/Drawing2D/GraphicsPath.Unix.cs +++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Drawing2D/GraphicsPath.Unix.cs @@ -622,7 +622,6 @@ namespace System.Drawing.Drawing2D SafeNativeMethods.Gdip.CheckStatus(status); } - [MonoTODO("The StringFormat parameter is ignored when using libgdiplus.")] public void AddString(string s, FontFamily family, int style, float emSize, Point origin, StringFormat format) { Rectangle layout = new Rectangle(); @@ -631,7 +630,6 @@ namespace System.Drawing.Drawing2D AddString(s, family, style, emSize, layout, format); } - [MonoTODO("The StringFormat parameter is ignored when using libgdiplus.")] public void AddString(string s, FontFamily family, int style, float emSize, PointF origin, StringFormat format) { RectangleF layout = new RectangleF(); @@ -640,7 +638,6 @@ namespace System.Drawing.Drawing2D AddString(s, family, style, emSize, layout, format); } - [MonoTODO("The layoutRect and StringFormat parameters are ignored when using libgdiplus.")] public void AddString(string s, FontFamily family, int style, float emSize, Rectangle layoutRect, StringFormat format) { if (family == null) @@ -652,7 +649,6 @@ namespace System.Drawing.Drawing2D SafeNativeMethods.Gdip.CheckStatus(status); } - [MonoTODO("The layoutRect and StringFormat parameters are ignored when using libgdiplus.")] public void AddString(string s, FontFamily family, int style, float emSize, RectangleF layoutRect, StringFormat format) { if (family == null) @@ -854,25 +850,21 @@ namespace System.Drawing.Drawing2D SafeNativeMethods.Gdip.CheckStatus(s); } - [MonoTODO("GdipWarpPath isn't implemented in libgdiplus")] public void Warp(PointF[] destPoints, RectangleF srcRect) { Warp(destPoints, srcRect, null, WarpMode.Perspective, FlatnessDefault); } - [MonoTODO("GdipWarpPath isn't implemented in libgdiplus")] public void Warp(PointF[] destPoints, RectangleF srcRect, Matrix matrix) { Warp(destPoints, srcRect, matrix, WarpMode.Perspective, FlatnessDefault); } - [MonoTODO("GdipWarpPath isn't implemented in libgdiplus")] public void Warp(PointF[] destPoints, RectangleF srcRect, Matrix matrix, WarpMode warpMode) { Warp(destPoints, srcRect, matrix, warpMode, FlatnessDefault); } - [MonoTODO("GdipWarpPath isn't implemented in libgdiplus")] public void Warp(PointF[] destPoints, RectangleF srcRect, Matrix matrix, WarpMode warpMode, float flatness) { if (destPoints == null) @@ -886,19 +878,16 @@ namespace System.Drawing.Drawing2D SafeNativeMethods.Gdip.CheckStatus(s); } - [MonoTODO("GdipWidenPath isn't implemented in libgdiplus")] public void Widen(Pen pen) { Widen(pen, null, FlatnessDefault); } - [MonoTODO("GdipWidenPath isn't implemented in libgdiplus")] public void Widen(Pen pen, Matrix matrix) { Widen(pen, matrix, FlatnessDefault); } - [MonoTODO("GdipWidenPath isn't implemented in libgdiplus")] public void Widen(Pen pen, Matrix matrix, float flatness) { if (pen == null) diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Font.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Font.Unix.cs index 322b8f1..222c9bd 100644 --- a/src/libraries/System.Drawing.Common/src/System/Drawing/Font.Unix.cs +++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Font.Unix.cs @@ -562,13 +562,11 @@ namespace System.Drawing return _hashCode; } - [MonoTODO("The hdc parameter has no direct equivalent in libgdiplus.")] public static Font FromHdc(IntPtr hdc) { throw new NotImplementedException(); } - [MonoTODO("The returned font may not have all it's properties initialized correctly.")] public static Font FromLogFont(object lf, IntPtr hdc) { IntPtr newObject; diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Graphics.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Graphics.Unix.cs index 8eb4a78..be94538 100644 --- a/src/libraries/System.Drawing.Common/src/System/Drawing/Graphics.Unix.cs +++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Graphics.Unix.cs @@ -115,7 +115,6 @@ namespace System.Drawing } } - [MonoTODO("Metafiles, both WMF and EMF formats, aren't supported.")] public void AddMetafileComment(byte[] data) { throw new NotImplementedException(); @@ -130,7 +129,6 @@ namespace System.Drawing return new GraphicsContainer(state); } - [MonoTODO("The rectangles and unit parameters aren't supported in libgdiplus")] public GraphicsContainer BeginContainer(Rectangle dstrect, Rectangle srcrect, GraphicsUnit unit) { int state; @@ -144,7 +142,6 @@ namespace System.Drawing return new GraphicsContainer(state); } - [MonoTODO("The rectangles and unit parameters aren't supported in libgdiplus")] public GraphicsContainer BeginContainer(RectangleF dstrect, RectangleF srcrect, GraphicsUnit unit) { int state; @@ -165,28 +162,25 @@ namespace System.Drawing status = SafeNativeMethods.Gdip.GdipGraphicsClear(nativeObject, color.ToArgb()); SafeNativeMethods.Gdip.CheckStatus(status); } - [MonoLimitation("Works on Win32 and on X11 (but not on Cocoa and Quartz)")] + public void CopyFromScreen(Point upperLeftSource, Point upperLeftDestination, Size blockRegionSize) { CopyFromScreen(upperLeftSource.X, upperLeftSource.Y, upperLeftDestination.X, upperLeftDestination.Y, blockRegionSize, CopyPixelOperation.SourceCopy); } - [MonoLimitation("Works on Win32 and (for CopyPixelOperation.SourceCopy only) on X11 but not on Cocoa and Quartz")] public void CopyFromScreen(Point upperLeftSource, Point upperLeftDestination, Size blockRegionSize, CopyPixelOperation copyPixelOperation) { CopyFromScreen(upperLeftSource.X, upperLeftSource.Y, upperLeftDestination.X, upperLeftDestination.Y, blockRegionSize, copyPixelOperation); } - [MonoLimitation("Works on Win32 and on X11 (but not on Cocoa and Quartz)")] public void CopyFromScreen(int sourceX, int sourceY, int destinationX, int destinationY, Size blockRegionSize) { CopyFromScreen(sourceX, sourceY, destinationX, destinationY, blockRegionSize, CopyPixelOperation.SourceCopy); } - [MonoLimitation("Works on Win32 and (for CopyPixelOperation.SourceCopy only) on X11 but not on Cocoa and Quartz")] public void CopyFromScreen(int sourceX, int sourceY, int destinationX, int destinationY, Size blockRegionSize, CopyPixelOperation copyPixelOperation) { if (!Enum.IsDefined(typeof(CopyPixelOperation), copyPixelOperation)) @@ -1198,219 +1192,181 @@ namespace System.Drawing SafeNativeMethods.Gdip.CheckStatus(status); } - private const string MetafileEnumeration = "Metafiles enumeration, for both WMF and EMF formats, isn't supported."; - - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, Point[] destPoints, EnumerateMetafileProc callback) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, RectangleF destRect, EnumerateMetafileProc callback) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, PointF[] destPoints, EnumerateMetafileProc callback) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, Rectangle destRect, EnumerateMetafileProc callback) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, Point destPoint, EnumerateMetafileProc callback) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, PointF destPoint, EnumerateMetafileProc callback) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, PointF destPoint, EnumerateMetafileProc callback, IntPtr callbackData) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, Rectangle destRect, EnumerateMetafileProc callback, IntPtr callbackData) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, PointF[] destPoints, EnumerateMetafileProc callback, IntPtr callbackData) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, Point destPoint, EnumerateMetafileProc callback, IntPtr callbackData) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, Point[] destPoints, EnumerateMetafileProc callback, IntPtr callbackData) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, RectangleF destRect, EnumerateMetafileProc callback, IntPtr callbackData) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, PointF destPoint, RectangleF srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, Point destPoint, Rectangle srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, PointF[] destPoints, RectangleF srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, Point[] destPoints, Rectangle srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, RectangleF destRect, RectangleF srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, Rectangle destRect, Rectangle srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, RectangleF destRect, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, Point destPoint, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, PointF destPoint, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, Point[] destPoints, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, PointF[] destPoints, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, Rectangle destRect, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, Rectangle destRect, Rectangle srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback, IntPtr callbackData) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, PointF[] destPoints, RectangleF srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback, IntPtr callbackData) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, RectangleF destRect, RectangleF srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback, IntPtr callbackData) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, PointF destPoint, RectangleF srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback, IntPtr callbackData) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, Point destPoint, Rectangle srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback, IntPtr callbackData) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, Point[] destPoints, Rectangle srcRect, GraphicsUnit srcUnit, EnumerateMetafileProc callback, IntPtr callbackData) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, Point[] destPoints, Rectangle srcRect, GraphicsUnit unit, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, Rectangle destRect, Rectangle srcRect, GraphicsUnit unit, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, Point destPoint, Rectangle srcRect, GraphicsUnit unit, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, RectangleF destRect, RectangleF srcRect, GraphicsUnit unit, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, PointF[] destPoints, RectangleF srcRect, GraphicsUnit unit, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr) { throw new NotImplementedException(); } - [MonoTODO(MetafileEnumeration)] public void EnumerateMetafile(Metafile metafile, PointF destPoint, RectangleF srcRect, GraphicsUnit unit, EnumerateMetafileProc callback, IntPtr callbackData, ImageAttributes imageAttr) { throw new NotImplementedException(); @@ -1656,7 +1612,6 @@ namespace System.Drawing return new Graphics(graphics); } - [MonoTODO] [EditorBrowsable(EditorBrowsableState.Advanced)] public static Graphics FromHdc(IntPtr hdc, IntPtr hdevice) { @@ -1737,7 +1692,6 @@ namespace System.Drawing return new Graphics(graphics); } - [MonoTODO] public static IntPtr GetHalftonePalette() { throw new NotImplementedException(); @@ -1869,7 +1823,6 @@ namespace System.Drawing return new SizeF(boundingBox.Width, boundingBox.Height); } - [MonoLimitation("Can only be used when hdc was provided by Graphics.GetHdc() method")] [EditorBrowsable(EditorBrowsableState.Never)] public void ReleaseHdcInternal(IntPtr hdc) { @@ -2035,7 +1988,6 @@ namespace System.Drawing } } - [MonoTODO("This property does not do anything when used with libgdiplus.")] public PixelOffsetMode PixelOffsetMode { get @@ -2088,7 +2040,6 @@ namespace System.Drawing } } - [MonoTODO("This property does not do anything when used with libgdiplus.")] public int TextContrast { get @@ -2137,7 +2088,6 @@ namespace System.Drawing } } - [MonoTODO] [EditorBrowsable(EditorBrowsableState.Never)] public object GetContextInfo() { diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Icon.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Icon.Unix.cs index f6dc345..b3b5b63 100644 --- a/src/libraries/System.Drawing.Common/src/System/Drawing/Icon.Unix.cs +++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Icon.Unix.cs @@ -292,7 +292,6 @@ namespace System.Drawing } } - [MonoLimitation("The same icon, SystemIcons.WinLogo, is returned for all file types.")] public static Icon ExtractAssociatedIcon(string filePath) { if (filePath == null) diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Image.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Image.Unix.cs index 2dfe2b6..ee88007 100644 --- a/src/libraries/System.Drawing.Common/src/System/Drawing/Image.Unix.cs +++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Image.Unix.cs @@ -71,7 +71,6 @@ namespace System.Drawing } // See http://support.microsoft.com/default.aspx?scid=kb;en-us;831419 for performance discussion - [MonoLimitation("useEmbeddedColorManagement and validateImageData aren't supported.")] public static Image FromStream(Stream stream, bool useEmbeddedColorManagement, bool validateImageData) { return LoadFromStream(stream, false); diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.Unix.cs index d61256c..32d2172 100644 --- a/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.Unix.cs +++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.Unix.cs @@ -38,8 +38,6 @@ using System.Runtime.InteropServices; namespace System.Drawing.Imaging { - - [MonoTODO("Metafiles, both WMF and EMF formats, are only partially supported.")] #if !NETCORE [Serializable] [Editor ("System.Drawing.Design.MetafileEditor, " + Consts.AssemblySystem_Drawing_Design, typeof (System.Drawing.Design.UITypeEditor))] @@ -318,7 +316,6 @@ namespace System.Drawing.Imaging return nativeImage; } - [MonoLimitation("Metafiles aren't only partially supported by libgdiplus.")] public MetafileHeader GetMetafileHeader() { IntPtr header = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(MetafileHeader))); @@ -334,7 +331,6 @@ namespace System.Drawing.Imaging } } - [MonoLimitation("Metafiles aren't only partially supported by libgdiplus.")] public static MetafileHeader GetMetafileHeader(IntPtr henhmetafile) { IntPtr header = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(MetafileHeader))); @@ -350,7 +346,6 @@ namespace System.Drawing.Imaging } } - [MonoLimitation("Metafiles aren't only partially supported by libgdiplus.")] public static MetafileHeader GetMetafileHeader(Stream stream) { if (stream == null) @@ -375,7 +370,6 @@ namespace System.Drawing.Imaging } } - [MonoLimitation("Metafiles aren't only partially supported by libgdiplus.")] public static MetafileHeader GetMetafileHeader(string fileName) { if (fileName == null) @@ -394,7 +388,6 @@ namespace System.Drawing.Imaging } } - [MonoLimitation("Metafiles aren't only partially supported by libgdiplus.")] public static MetafileHeader GetMetafileHeader(IntPtr hmetafile, WmfPlaceableFileHeader wmfHeader) { IntPtr header = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(MetafileHeader))); @@ -410,7 +403,6 @@ namespace System.Drawing.Imaging } } - [MonoLimitation("Metafiles aren't only partially supported by libgdiplus.")] public void PlayRecord(EmfPlusRecordType recordType, int flags, int dataSize, byte[] data) { int status = SafeNativeMethods.Gdip.GdipPlayMetafileRecord(nativeImage, recordType, flags, dataSize, data); diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/MetafileHeader.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/MetafileHeader.Unix.cs index f4f2cdd..baa90ea 100644 --- a/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/MetafileHeader.Unix.cs +++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/MetafileHeader.Unix.cs @@ -92,7 +92,6 @@ namespace System.Drawing.Imaging public int logical_dpi_y; } - [MonoTODO("Metafiles, both WMF and EMF formats, aren't supported.")] [StructLayout(LayoutKind.Sequential)] public sealed class MetafileHeader { @@ -108,7 +107,6 @@ namespace System.Drawing.Imaging // methods - [MonoTODO("always returns false")] public bool IsDisplay() { return false; diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PageSettings.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PageSettings.Unix.cs index ca64383..976f5d6 100644 --- a/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PageSettings.Unix.cs +++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PageSettings.Unix.cs @@ -243,14 +243,12 @@ namespace System.Drawing.Printing } - [MonoTODO("PageSettings.CopyToHdevmode")] public void CopyToHdevmode(IntPtr hdevmode) { throw new NotImplementedException(); } - [MonoTODO("PageSettings.SetHdevmode")] public void SetHdevmode(IntPtr hdevmode) { throw new NotImplementedException(); diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PreviewPrintController.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PreviewPrintController.Unix.cs index 7514415..7817022 100644 --- a/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PreviewPrintController.Unix.cs +++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PreviewPrintController.Unix.cs @@ -52,12 +52,10 @@ namespace System.Drawing.Printing get { return true; } } - [MonoTODO] public override void OnEndPage(PrintDocument document, PrintPageEventArgs e) { } - [MonoTODO] public override void OnStartPrint(PrintDocument document, PrintEventArgs e) { if (!document.PrinterSettings.IsValid) @@ -70,12 +68,10 @@ namespace System.Drawing.Printing pageInfoList.Clear(); } - [MonoTODO] public override void OnEndPrint(PrintDocument document, PrintEventArgs e) { } - [MonoTODO] public override Graphics OnStartPage(PrintDocument document, PrintPageEventArgs e) { Image image = new Bitmap(e.PageSettings.PaperSize.Width, e.PageSettings.PaperSize.Height); diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Unix.cs index 337713c..9b522f1 100644 --- a/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Unix.cs +++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrinterSettings.Unix.cs @@ -310,67 +310,56 @@ namespace System.Drawing.Printing return ps; } - [MonoTODO("PrinterSettings.CreateMeasurementGraphics")] public Graphics CreateMeasurementGraphics() { throw new NotImplementedException(); } - [MonoTODO("PrinterSettings.CreateMeasurementGraphics")] + public Graphics CreateMeasurementGraphics(bool honorOriginAtMargins) { throw new NotImplementedException(); } - [MonoTODO("PrinterSettings.CreateMeasurementGraphics")] public Graphics CreateMeasurementGraphics(PageSettings pageSettings) { throw new NotImplementedException(); } - [MonoTODO("PrinterSettings.CreateMeasurementGraphics")] public Graphics CreateMeasurementGraphics(PageSettings pageSettings, bool honorOriginAtMargins) { throw new NotImplementedException(); } - [MonoTODO("PrinterSettings.GetHdevmode")] public IntPtr GetHdevmode() { throw new NotImplementedException(); } - [MonoTODO("PrinterSettings.GetHdevmode")] public IntPtr GetHdevmode(PageSettings pageSettings) { throw new NotImplementedException(); } - [MonoTODO("PrinterSettings.GetHdevname")] public IntPtr GetHdevnames() { throw new NotImplementedException(); } - - [MonoTODO("IsDirectPrintingSupported")] public bool IsDirectPrintingSupported(Image image) { throw new NotImplementedException(); } - [MonoTODO("IsDirectPrintingSupported")] public bool IsDirectPrintingSupported(ImageFormat imageFormat) { throw new NotImplementedException(); } - [MonoTODO("PrinterSettings.SetHdevmode")] public void SetHdevmode(IntPtr hdevmode) { throw new NotImplementedException(); } - [MonoTODO("PrinterSettings.SetHdevnames")] public void SetHdevnames(IntPtr hdevnames) { throw new NotImplementedException(); -- 2.7.4