Imported Upstream version 5.8.0.22

Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions

View File

@@ -139,7 +139,7 @@ namespace System.Drawing.Printing
y = Marshal.ReadInt32 (ptr);
ptr = new IntPtr (ptr.ToInt64 () + Marshal.SizeOf (y));
settings.PrinterResolutions.Add (new PrinterResolution
(x,y, PrinterResolutionKind.Custom));
(PrinterResolutionKind.Custom, x, y));
}
}
Marshal.FreeHGlobal (buff);
@@ -197,7 +197,7 @@ namespace System.Drawing.Printing
ptr_sizes_enum = new IntPtr (ptr_sizes_enum.ToInt64 () + 2);
ps = new PaperSize (name, x,y);
ps.SetKind (kind);
ps.RawKind = (int)kind;
settings.PaperSizes.Add (ps);
}
}
@@ -261,7 +261,7 @@ namespace System.Drawing.Printing
for (int i = 0; i < ret; i++) {
name = Marshal.PtrToStringUni (ptr_names);
kind = (PaperSourceKind) Marshal.ReadInt16 (ptr_bins);
settings.PaperSources.Add (new PaperSource (name, kind));
settings.PaperSources.Add (new PaperSource (kind, name));
ptr_names = new IntPtr (ptr_names.ToInt64 () + 24 * 2);
ptr_bins = new IntPtr (ptr_bins.ToInt64 () + 2);