Fix build errors

picoe · Oct 17, 2021 · 91556c4 · 91556c4
1 parent 52ad460
commit 91556c4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/src/Eto.Gtk/Forms/Printing/PrintDocumentHandler.cs b/src/Eto.Gtk/Forms/Printing/PrintDocumentHandler.cs
@@ -114,7 +114,9 @@ private void Control_DrawPage(object o, Gtk.DrawPageArgs args)
 				context.Clip();
 				var ctl = _control.GetContainerWidget();
 				context.Translate(0, -pageNumber * height);
+#if !GTK2
 				ctl.Draw(context);
+#endif
 				context.Restore();
 			}
 

diff --git a/src/Eto.Mac/Eto.XamMac2.csproj b/src/Eto.Mac/Eto.XamMac2.csproj
@@ -8,6 +8,7 @@
     <DefineConstants>$(DefineConstants);OSX;DESKTOP;XAMMAC;XAMMAC2;UNIFIED</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefaultItemExcludes>build\*</DefaultItemExcludes>
+    <NoWarn>CA1416</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/src/Eto.Mac/Forms/Printing/PrintDocumentHandler.cs b/src/Eto.Mac/Forms/Printing/PrintDocumentHandler.cs
@@ -249,7 +249,7 @@ public override CGRect RectForPage(nint pageNumber)
 				size.Width = (nfloat)Math.Min(size.Width, paperSize.Width);
 				size.Height = (nfloat)Math.Min(size.Height, paperSize.Height);
 				var location = new CGPoint(0, 0);
-				location.Y = Math.Max(0, _preferredSize.Height - paperSize.Height * pageNumber);
+				location.Y = (nfloat)Math.Max(0, _preferredSize.Height - paperSize.Height * pageNumber);
 				return new CGRect(location, size);
 			}
 

diff --git a/test/Eto.Test.Mac/Eto.Test.XamMac2.csproj b/test/Eto.Test.Mac/Eto.Test.XamMac2.csproj
@@ -12,6 +12,8 @@
     <PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey>
     <MonoBundlingExtraArgs>--nowarn:2006 --nowarn:0176</MonoBundlingExtraArgs>
     <DefineConstants>XAMMAC;XAMMAC2</DefineConstants>
+    <SupportedOSPlatformVersion>10.15</SupportedOSPlatformVersion>
+    <NoWarn>CA1416</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="$(TargetFramework) == 'xamarinmac20'">

diff --git a/test/Eto.Test.Mac/Info.plist b/test/Eto.Test.Mac/Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.14</string>
+	<string>10.15</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSRequiresAquaSystemAppearance</key>