Use global defines and cleanup

picoe · May 5, 2022 · 23f1d52 · 23f1d52
1 parent d84d5bb
commit 23f1d52
Show file tree

Hide file tree

Showing 178 changed files with 231 additions and 4,012 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -31,7 +31,7 @@
             "type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "build-macos",
-			"program": "${workspaceFolder}/artifacts/test/Eto.Test.macOS/${config:var.configuration}/net6.0-macos/osx-x64/Eto.Test.macOS.app/Contents/MacOS/Eto.Test.macOS",
+			"program": "${workspaceFolder}/artifacts/test/Eto.Test.macOS/${config:var.configuration}/net6.0-macos/Eto.Test.macOS.app/Contents/MacOS/Eto.Test.macOS",
             "args": [],
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart",

diff --git a/lib/monomac b/lib/monomac
diff --git a/src/Eto.Core.sln b/src/Eto.Core.sln
diff --git a/src/Eto.Mac/AppDelegate.cs b/src/Eto.Mac/AppDelegate.cs
@@ -2,35 +2,7 @@
 using System.ComponentModel;
 using Eto.Mac.Forms;
 
-#if XAMMAC2
-using AppKit;
-using Foundation;
-using CoreGraphics;
-using ObjCRuntime;
-using CoreAnimation;
-using CoreImage;
-#else
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.CoreGraphics;
-using MonoMac.ObjCRuntime;
-using MonoMac.CoreAnimation;
-using MonoMac.CoreImage;
-#if Mac64
-using nfloat = System.Double;
-using nint = System.Int64;
-using nuint = System.UInt64;
-#else
-using nfloat = System.Single;
-using nint = System.Int32;
-using nuint = System.UInt32;
-#endif
-#if SDCOMPAT
-using CGSize = System.Drawing.SizeF;
-using CGRect = System.Drawing.RectangleF;
-using CGPoint = System.Drawing.PointF;
-#endif
-#endif
+
 
 namespace Eto.Mac
 {

diff --git a/src/Eto.Mac/AsyncQueue.cs b/src/Eto.Mac/AsyncQueue.cs
@@ -2,12 +2,6 @@
 using System.Collections.Generic;
 using Eto.Forms;
 using Eto.Mac.Forms;
-#if XAMMAC2
-using AppKit;
-#else
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-#endif
 
 namespace Eto.Mac
 {
@@ -64,11 +58,7 @@ public static void Add(IQueueAction action)
 			if (_actionQueue.Count == 1)
 			{
 				// first one added, schedule a layout!
-#if XAMMAC1
-				NSApplication.SharedApplication.BeginInvokeOnMainThread(new NSAction(FlushQueue));
-#else
 				NSApplication.SharedApplication.BeginInvokeOnMainThread(FlushQueue);
-#endif
 			}
 		}
 

diff --git a/src/Eto.Mac/CGConversions.cs b/src/Eto.Mac/CGConversions.cs
@@ -1,34 +1,6 @@
 using System;
 using Eto.Drawing;
 
-#if XAMMAC2
-using AppKit;
-using Foundation;
-using CoreGraphics;
-using ObjCRuntime;
-using CoreAnimation;
-#elif OSX
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.CoreGraphics;
-using MonoMac.ObjCRuntime;
-using MonoMac.CoreAnimation;
-#if Mac64
-using nfloat = System.Double;
-using nint = System.Int64;
-using nuint = System.UInt64;
-#else
-using nfloat = System.Single;
-using nint = System.Int32;
-using nuint = System.UInt32;
-#endif
-#if SDCOMPAT
-using CGSize = System.Drawing.SizeF;
-using CGRect = System.Drawing.RectangleF;
-using CGPoint = System.Drawing.PointF;
-#endif
-#endif
-
 #if OSX
 using Eto.Mac.Drawing;
 

diff --git a/src/Eto.Mac/ColorizeView.cs b/src/Eto.Mac/ColorizeView.cs
@@ -1,33 +1,5 @@
 using System;
 using Eto.Drawing;
-#if XAMMAC2
-using AppKit;
-using Foundation;
-using CoreGraphics;
-using ObjCRuntime;
-using CoreImage;
-#else
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.CoreGraphics;
-using MonoMac.ObjCRuntime;
-using MonoMac.CoreAnimation;
-using MonoMac.CoreImage;
-#if Mac64
-using nfloat = System.Double;
-using nint = System.Int64;
-using nuint = System.UInt64;
-#else
-using nfloat = System.Single;
-using nint = System.Int32;
-using nuint = System.UInt32;
-#endif
-#if SDCOMPAT
-using CGSize = System.Drawing.SizeF;
-using CGRect = System.Drawing.RectangleF;
-using CGPoint = System.Drawing.PointF;
-#endif
-#endif
 
 namespace Eto.Mac
 {

diff --git a/src/Eto.Mac/Drawing/BitmapHandler.cs b/src/Eto.Mac/Drawing/BitmapHandler.cs
@@ -8,35 +8,7 @@
 using System.Collections.Generic;
 using Eto.Forms;
 
-#if XAMMAC2
-using AppKit;
-using Foundation;
-using CoreGraphics;
-using ObjCRuntime;
-using CoreAnimation;
-using CoreImage;
-#else
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.CoreGraphics;
-using MonoMac.ObjCRuntime;
-using MonoMac.CoreAnimation;
-using MonoMac.CoreImage;
-#if Mac64
-using nfloat = System.Double;
-using nint = System.Int64;
-using nuint = System.UInt64;
-#else
-using nfloat = System.Single;
-using nint = System.Int32;
-using nuint = System.UInt32;
-#endif
-#if SDCOMPAT
-using CGSize = System.Drawing.SizeF;
-using CGRect = System.Drawing.RectangleF;
-using CGPoint = System.Drawing.PointF;
-#endif
-#endif
+
 
 namespace Eto.Mac.Drawing
 {

diff --git a/src/Eto.Mac/Drawing/EtoFontManager.cs b/src/Eto.Mac/Drawing/EtoFontManager.cs
@@ -1,32 +1,4 @@
 using System;
-#if XAMMAC2
-using AppKit;
-using Foundation;
-using ObjCRuntime;
-using CoreAnimation;
-using CoreImage;
-#elif OSX
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.CoreGraphics;
-using MonoMac.ObjCRuntime;
-using MonoMac.CoreAnimation;
-using MonoMac.CoreImage;
-#if Mac64
-using nfloat = System.Double;
-using nint = System.Int64;
-using nuint = System.UInt64;
-#else
-using nfloat = System.Single;
-using nint = System.Int32;
-using nuint = System.UInt32;
-#endif
-#if SDCOMPAT
-using CGSize = System.Drawing.SizeF;
-using CGRect = System.Drawing.RectangleF;
-using CGPoint = System.Drawing.PointF;
-#endif
-#endif
 
 namespace Eto.Mac.Drawing
 {

diff --git a/src/Eto.Mac/Drawing/FontExtensions.cs b/src/Eto.Mac/Drawing/FontExtensions.cs
@@ -1,33 +1,4 @@
 using Eto.Drawing;
-#if XAMMAC2
-using AppKit;
-using Foundation;
-using CoreGraphics;
-using ObjCRuntime;
-using CoreAnimation;
-using CoreImage;
-#elif OSX
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.CoreGraphics;
-using MonoMac.ObjCRuntime;
-using MonoMac.CoreAnimation;
-using MonoMac.CoreImage;
-#if Mac64
-using nfloat = System.Double;
-using nint = System.Int64;
-using nuint = System.UInt64;
-#else
-using nfloat = System.Single;
-using nint = System.Int32;
-using nuint = System.UInt32;
-#endif
-#if SDCOMPAT
-using CGSize = System.Drawing.SizeF;
-using CGRect = System.Drawing.RectangleF;
-using CGPoint = System.Drawing.PointF;
-#endif
-#endif
 
 #if OSX
 namespace Eto.Mac.Drawing
@@ -72,7 +43,7 @@ public SizeF MeasureString(NSAttributedString str, SizeF? availableSize = null)
 		{
 			SetContainerSize(availableSize);
 			storage.SetString(str);
-#if MACOS
+#if MACOS_NET
 			return layout.GetBoundingRect(new NSRange(0, (int)str.Length), container).Size.ToEto();
 #else
 			return layout.BoundingRectForGlyphRange(new NSRange(0, (int)str.Length), container).Size.ToEto();

diff --git a/src/Eto.Mac/Drawing/FontFamilyHandler.cs b/src/Eto.Mac/Drawing/FontFamilyHandler.cs
@@ -3,22 +3,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.IO;
-#if XAMMAC2
-using AppKit;
-using Foundation;
-using CoreFoundation;
-using CoreGraphics;
-using ObjCRuntime;
-using CoreAnimation;
-using CoreText;
-#else
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.CoreGraphics;
-using MonoMac.ObjCRuntime;
-using MonoMac.CoreAnimation;
-using MonoMac.CoreText;
-#endif
 
 namespace Eto.Mac.Drawing
 {
@@ -40,7 +24,7 @@ public string LocalizedName
 					return Name;
 
 				var facePtr = IntPtr.Zero;
-#if XAMMAC && NET6_0_OR_GREATER
+#if USE_CFSTRING
 				var familyPtr = CFString.CreateNative(MacName);
 				var result = CFString.FromHandle(Messaging.IntPtr_objc_msgSend_IntPtr_IntPtr(NSFontManager.SharedFontManager.Handle, sel_LocalizedNameForFamilyFace, familyPtr, facePtr));
 				CFString.ReleaseNative(familyPtr);

diff --git a/src/Eto.Mac/Drawing/FontHandler.cs b/src/Eto.Mac/Drawing/FontHandler.cs
@@ -2,37 +2,6 @@
 using System.Globalization;
 using Eto.Drawing;
 
-#if XAMMAC2
-using AppKit;
-using Foundation;
-using CoreGraphics;
-using ObjCRuntime;
-using CoreAnimation;
-using CoreImage;
-#elif OSX
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.CoreGraphics;
-using MonoMac.ObjCRuntime;
-using MonoMac.CoreAnimation;
-using MonoMac.CoreImage;
-using MonoMac.CoreText;
-#if Mac64
-using nfloat = System.Double;
-using nint = System.Int64;
-using nuint = System.UInt64;
-#else
-using nfloat = System.Single;
-using nint = System.Int32;
-using nuint = System.UInt32;
-#endif
-#if SDCOMPAT
-using CGSize = System.Drawing.SizeF;
-using CGRect = System.Drawing.RectangleF;
-using CGPoint = System.Drawing.PointF;
-#endif
-#endif
-
 #if IOS
 
 using UIKit;
@@ -271,7 +240,7 @@ public float XHeight
 
 		public float Baseline => LineHeight - Leading - Descent;
 
-#if XAMMAC2 && NET6_0_OR_GREATER
+#if MACOS_NET
 		public float LineHeight => (float)SharedLayoutManager.GetDefaultLineHeight(Control);
 #else
 		public float LineHeight => (float)SharedLayoutManager.DefaultLineHeightForFont(Control);

diff --git a/src/Eto.Mac/Drawing/FontTypefaceHandler.cs b/src/Eto.Mac/Drawing/FontTypefaceHandler.cs
@@ -6,22 +6,6 @@
 using Eto.Forms;
 using System.IO;
 
-#if XAMMAC2
-using AppKit;
-using Foundation;
-using CoreGraphics;
-using ObjCRuntime;
-using CoreAnimation;
-using CoreText;
-#else
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.CoreGraphics;
-using MonoMac.ObjCRuntime;
-using MonoMac.CoreAnimation;
-using MonoMac.CoreText;
-#endif
-
 namespace Eto.Mac.Drawing
 {
 	public class FontTypefaceHandler : WidgetHandler<FontTypeface>, FontTypeface.IHandler

diff --git a/src/Eto.Mac/Drawing/FontsHandler.cs b/src/Eto.Mac/Drawing/FontsHandler.cs
@@ -3,19 +3,6 @@
 using System.Collections.Generic;
 using System.Linq;
 #if OSX
-#if XAMMAC2
-using AppKit;
-using Foundation;
-using CoreGraphics;
-using ObjCRuntime;
-using CoreAnimation;
-#else
-using MonoMac.AppKit;
-using MonoMac.Foundation;
-using MonoMac.CoreGraphics;
-using MonoMac.ObjCRuntime;
-using MonoMac.CoreAnimation;
-#endif
 
 namespace Eto.Mac.Drawing
 #elif IOS