Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/AppKit/NSOpenGLContext.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#if !__MACCATALYST__
#if !NO_SYSTEM_DRAWING
using System.Drawing;
#endif

#nullable enable

Expand All @@ -24,7 +22,6 @@ unsafe void SetValue (int /* GLint */ val, NSOpenGLContextParameter par)
return ret;
}

#if !NO_SYSTEM_DRAWING
/// <summary>To be added.</summary>
/// <value>To be added.</value>
/// <remarks>To be added.</remarks>
Expand All @@ -38,7 +35,6 @@ unsafe public Rectangle SwapRectangle {
SetValues ((IntPtr) (&value), NSOpenGLContextParameter.SwapRectangle);
}
}
#endif

/// <summary>To be added.</summary>
/// <value>To be added.</value>
Expand Down
3 changes: 1 addition & 2 deletions src/CoreGraphics/CGEventTypes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@

#if MONOMAC || __MACCATALYST__

#if !NO_SYSTEM_DRAWING
using System.Drawing;
#endif

using CoreFoundation;

namespace CoreGraphics {
Expand Down
7 changes: 1 addition & 6 deletions src/CoreGraphics/CGPoint.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
#nullable enable

using System.Drawing;
using System.Globalization;
using System.Runtime.CompilerServices;

#if !NO_SYSTEM_DRAWING
using System.Drawing;
#endif

using CoreFoundation;

namespace CoreGraphics {
Expand Down Expand Up @@ -47,7 +44,6 @@ public struct CGPoint : IEquatable<CGPoint> {
return new CGPoint (l.x - r.Width, l.y - r.Height);
}

#if !NO_SYSTEM_DRAWING
public static implicit operator CGPoint (PointF point)
{
return new CGPoint (point.X, point.Y);
Expand All @@ -67,7 +63,6 @@ public static explicit operator Point (CGPoint point)
{
return new Point ((int) point.X, (int) point.Y);
}
#endif

/// <param name="point">To be added.</param>
/// <param name="size">To be added.</param>
Expand Down
7 changes: 1 addition & 6 deletions src/CoreGraphics/CGRect.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
#nullable enable

using System.Drawing;
using System.Globalization;
using System.Runtime.CompilerServices;

#if !NO_SYSTEM_DRAWING
using System.Drawing;
#endif

using CoreFoundation;

namespace CoreGraphics {
Expand Down Expand Up @@ -75,7 +72,6 @@ public static CGRect Infinite {
left.Height != right.Height;
}

#if !NO_SYSTEM_DRAWING
public static implicit operator CGRect (RectangleF rect)
{
return new CGRect (rect.X, rect.Y, rect.Width, rect.Height);
Expand All @@ -95,7 +91,6 @@ public static explicit operator Rectangle (CGRect rect)
{
return new Rectangle ((int) rect.X, (int) rect.Y, (int) rect.Width, (int) rect.Height);
}
#endif

/// <param name="a">
/// <attribution license="cc4" from="Microsoft" modified="false" />A rectangle to intersect. </param>
Expand Down
7 changes: 1 addition & 6 deletions src/CoreGraphics/CGSize.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
#nullable enable

using System.Drawing;
using System.Globalization;
using System.Runtime.CompilerServices;

#if !NO_SYSTEM_DRAWING
using System.Drawing;
#endif

using CoreFoundation;

namespace CoreGraphics {
Expand Down Expand Up @@ -44,7 +41,6 @@ public struct CGSize : IEquatable<CGSize> {
return new CGSize (l.width - r.Width, l.height - r.Height);
}

#if !NO_SYSTEM_DRAWING
public static implicit operator CGSize (SizeF size)
{
return new CGSize (size.Width, size.Height);
Expand All @@ -64,7 +60,6 @@ public static explicit operator Size (CGSize size)
{
return new Size ((int) size.Width, (int) size.Height);
}
#endif

public static explicit operator CGPoint (CGSize size)
{
Expand Down
4 changes: 0 additions & 4 deletions src/Foundation/NSObject2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
using System.ComponentModel;
using System.Runtime.CompilerServices;
using System.Threading;
#if !NO_SYSTEM_DRAWING
using System.Drawing;
#endif
using System.Diagnostics;

using System.Runtime.InteropServices.ObjectiveC;
Expand Down Expand Up @@ -881,14 +879,12 @@ public static NSObject FromObject (object obj)
default:
if (t == typeof (NativeHandle))
return NSValue.ValueFromPointer ((NativeHandle) obj);
#if !NO_SYSTEM_DRAWING
if (t == typeof (SizeF))
return NSValue.FromSizeF ((SizeF) obj);
else if (t == typeof (RectangleF))
return NSValue.FromRectangleF ((RectangleF) obj);
else if (t == typeof (PointF))
return NSValue.FromPointF ((PointF) obj);
#endif
if (t == typeof (nint))
return NSNumber.FromNInt ((nint) obj);
else if (t == typeof (nuint))
Expand Down
4 changes: 1 addition & 3 deletions src/ObjCRuntime/Dlfcn.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,12 @@
#nullable enable

using System.ComponentModel;
using System.Drawing;
#if !COREBUILD
using CoreFoundation;
using CoreGraphics;
using CoreMedia;
#endif
#if !NO_SYSTEM_DRAWING
using System.Drawing;
#endif

namespace ObjCRuntime {

Expand Down
2 changes: 0 additions & 2 deletions src/SpriteKit/SKKeyframeSequence.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
//

using System.Collections.Generic;
#if !NO_SYSTEM_DRAWING
using System.Drawing;
#endif

#nullable enable

Expand Down
Loading