Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Safar <marek.safar@gmail.com>2016-11-29 21:16:02 +0300
committerMarek Safar <marek.safar@gmail.com>2016-11-29 21:16:02 +0300
commit47a6f56439c9deab287be770c902d41e91480799 (patch)
tree2b9783dbafd4e4b22d533561425b519832db22b4 /mcs/class/System.Drawing/System.Drawing.Printing
parent6b0763dd4a51458164d828bd3aee102553f7752d (diff)
[bcl] Clean up some warnings
Diffstat (limited to 'mcs/class/System.Drawing/System.Drawing.Printing')
-rw-r--r--mcs/class/System.Drawing/System.Drawing.Printing/PageSettings.cs3
-rw-r--r--mcs/class/System.Drawing/System.Drawing.Printing/PrintEventArgs.cs8
-rw-r--r--mcs/class/System.Drawing/System.Drawing.Printing/PrintingServices.cs4
-rw-r--r--mcs/class/System.Drawing/System.Drawing.Printing/PrintingServicesUnix.cs2
4 files changed, 13 insertions, 4 deletions
diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/PageSettings.cs b/mcs/class/System.Drawing/System.Drawing.Printing/PageSettings.cs
index abe3c1ff815..00bb942e78b 100644
--- a/mcs/class/System.Drawing/System.Drawing.Printing/PageSettings.cs
+++ b/mcs/class/System.Drawing/System.Drawing.Printing/PageSettings.cs
@@ -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())
{
diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/PrintEventArgs.cs b/mcs/class/System.Drawing/System.Drawing.Printing/PrintEventArgs.cs
index 59b6d654e19..ca1f980be09 100644
--- a/mcs/class/System.Drawing/System.Drawing.Printing/PrintEventArgs.cs
+++ b/mcs/class/System.Drawing/System.Drawing.Printing/PrintEventArgs.cs
@@ -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; }
}
diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/PrintingServices.cs b/mcs/class/System.Drawing/System.Drawing.Printing/PrintingServices.cs
index 4725c2baf4b..5eb31d5e1f0 100644
--- a/mcs/class/System.Drawing/System.Drawing.Printing/PrintingServices.cs
+++ b/mcs/class/System.Drawing/System.Drawing.Printing/PrintingServices.cs
@@ -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;
diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/PrintingServicesUnix.cs b/mcs/class/System.Drawing/System.Drawing.Printing/PrintingServicesUnix.cs
index e9e90c3e834..3386004199a 100644
--- a/mcs/class/System.Drawing/System.Drawing.Printing/PrintingServicesUnix.cs
+++ b/mcs/class/System.Drawing/System.Drawing.Printing/PrintingServicesUnix.cs
@@ -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