Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@@ -48,11 +48,12 @@ namespace System.Drawing.Printing
// create a new default Margins object (is 1 inch for all margins)
Margins margins = new Margins();
#pragma warning disable 649
float hardMarginX;
float hardMarginY;
RectangleF printableArea;
PrinterSettings printerSettings;
#pragma warning restore 649
public PageSettings() : this(new PrinterSettings())
{

View File

@@ -39,11 +39,17 @@ namespace System.Drawing.Printing
public class PrintEventArgs : System.ComponentModel.CancelEventArgs
{
private GraphicsPrinter graphics_context;
internal PrintAction action;
private PrintAction action;
public PrintEventArgs()
{
}
internal PrintEventArgs (PrintAction action)
{
this.action = action;
}
public PrintAction PrintAction {
get { return action; }
}

View File

@@ -114,13 +114,13 @@ namespace System.Drawing.Printing
}
internal class Printer {
public readonly string Name;
//public readonly string Name;
public readonly string Comment;
public readonly string Port;
public readonly string Type;
public readonly string Status;
public PrinterSettings Settings;
public bool IsDefault;
//public bool IsDefault;
public Printer (string port, string type, string status, string comment) {
Port = port;

View File

@@ -925,6 +925,7 @@ namespace System.Drawing.Printing
#endregion
#pragma warning disable 649
#region Struct
public struct DOCINFO
{
@@ -1037,6 +1038,7 @@ namespace System.Drawing.Printing
}
#endregion
#pragma warning restore 649
}
class GlobalPrintingServicesUnix : GlobalPrintingServices