Ver Fonte

2006-04-28 Sebastien Pouliot <[email protected]>

	* PrintController.cs: corcompare fix. No public ctor in 2.0.
	* PrinterSettings.cs: corcompare fix. Clone method isn't virtual.


svn path=/trunk/mcs/; revision=60052
Sebastien Pouliot há 19 anos atrás
pai
commit
fd0c615c45

+ 5 - 0
mcs/class/System.Drawing/System.Drawing.Printing/ChangeLog

@@ -1,3 +1,8 @@
+2006-04-28  Sebastien Pouliot  <[email protected]>
+
+	* PrintController.cs: corcompare fix. No public ctor in 2.0.
+	* PrinterSettings.cs: corcompare fix. Clone method isn't virtual.
+
 2006-03-21  Sebastien Pouliot  <[email protected]>
 
 	* PrintingServicesUnix.cs: cupsGetPrinters(char***) requires to free 

+ 9 - 14
mcs/class/System.Drawing/System.Drawing.Printing/PrintController.cs

@@ -5,10 +5,7 @@
 //   Dennis Hayes ([email protected])
 //
 // (C) 2002 Ximian, Inc
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004, 2006 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -30,19 +27,18 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
+namespace System.Drawing.Printing {
+
+	public abstract class PrintController {
 
-namespace System.Drawing.Printing
-{
-	public abstract class PrintController
-	{
-		public PrintController ()
-		{
-		}		
 #if NET_2_0		
 		public virtual bool IsPreview { 
 			get { return false; }
-		}
+		}
+#else
+		public PrintController ()
+		{
+		}		
 #endif
 		public virtual void OnEndPage (PrintDocument document, PrintPageEventArgs e)
 		{
@@ -56,7 +52,6 @@ namespace System.Drawing.Printing
 		{
 		}
 
-		
 		public virtual Graphics OnStartPage (PrintDocument document, PrintPageEventArgs e)
 		{
 			return null;

+ 2 - 7
mcs/class/System.Drawing/System.Drawing.Printing/PrinterSettings.cs

@@ -7,10 +7,7 @@
 //   Andreas Nahr ([email protected])
 //
 // (C) 2002 Ximian, Inc
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004,2006 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -32,10 +29,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using System.Runtime.InteropServices;
 using System.Collections;
-using System.Drawing.Printing;
 using System.ComponentModel;
 using System.Drawing.Imaging;
 
@@ -456,7 +451,7 @@ namespace System.Drawing.Printing
 		}
 
 		//methods		
-		public virtual object Clone()
+		public object Clone ()
 		{
 			PrinterSettings ps = new PrinterSettings (printer_name);
 			return ps;