[Mono-winforms-list] [PATCH] Correct behavior for PrintDialog.PrinterSettings/Document

[Carlos Alberto Cortez]

Hey,



The attached patch fixes the behaviour in

PrintDialog.PrinterSettings/Document, to be consistent with .Net.



I also included some simple nunit tests that ran fine with .Net too.



Carlos.







      





Index: PrintDialog.cs
===================================================================
--- PrintDialog.cs	(revisión: 63089)
+++ PrintDialog.cs	(copia de trabajo)
@@ -40,7 +40,6 @@
 	[DefaultProperty("Document")]
 	public sealed class PrintDialog : CommonDialog {
 		PrintDocument document;
-		PrinterSettings printer_settings;
 		bool allow_current_page;
 		bool allow_print_to_file;
 		bool allow_selection;
@@ -83,7 +82,7 @@
 
 		public override void Reset ()
 		{
-			current_settings = null;
+			current_settings = new PrinterSettings ();
 			AllowPrintToFile = true;
 			AllowSelection = false;
 			AllowSomePages = false;
@@ -157,12 +156,8 @@
 			}
 
 			set {
-				if (value == null)
-					return;
-
 				document = value;
-				current_settings = value.PrinterSettings;
-				printer_settings  = null;
+				current_settings = value == null ? new PrinterSettings () : value.PrinterSettings;
 			}
 		}
 
@@ -171,11 +166,14 @@
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
 		public PrinterSettings PrinterSettings {
 			get {
-				return printer_settings;
+				return current_settings;
 			}
 
 			set {
-				current_settings = printer_settings = value;
+				if (value != null && value == current_settings)
+					return;
+
+				current_settings = value == null ? new PrinterSettings () : value;
 				document = null;
 			}
 		}
//
// PrintDialogTest.cs: Tests for PrintDialog class.
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
//
// Authors:
//	Carlos Alberto Cortez <[EMAIL PROTECTED]>
//
using System;
using System.Collections;
using System.Drawing;
using System.Drawing.Printing;
using System.Windows.Forms;
using NUnit.Framework;

namespace MonoTests.System.Windows.Forms
{
	[TestFixture]
	public class PrintDialogTest
	{
		[Test]
		public void DefaultValues ()
		{
			PrintDialog pd = new PrintDialog ();

			Assert.IsTrue (pd.AllowPrintToFile, "#1");
			Assert.IsFalse (pd.AllowSelection, "#2");
			Assert.IsFalse (pd.AllowSomePages, "#3");
			Assert.IsNull (pd.Document, "#4");
			Assert.IsNotNull (pd.PrinterSettings, "#5");
			Assert.IsFalse (pd.PrintToFile, "#6");
			Assert.IsFalse (pd.ShowHelp, "#7");
			Assert.IsTrue (pd.ShowNetwork, "#8");
		}

		[Test]
		public void DocumentTest ()
		{
			PrintDialog pd = new PrintDialog ();

			PrintDocument pdoc1 = new PrintDocument ();
			PrinterSettings ps1 = new PrinterSettings ();
			pdoc1.PrinterSettings = ps1;
			pd.Document = pdoc1;
			Assert.AreEqual (pdoc1, pd.Document, "#1");
			Assert.AreEqual (ps1, pd.PrinterSettings, "#2");

			PrinterSettings ps2 = new PrinterSettings ();
			pdoc1.PrinterSettings = ps2;
			pd.Document = pdoc1;
			Assert.AreEqual (pdoc1, pd.Document, "#3");
			Assert.AreEqual (ps2, pd.PrinterSettings, "#4");

			pd.Document = null;
			Assert.IsNull (pd.Document, "#5");
			Assert.IsNotNull (pd.PrinterSettings, "#6");
			if (pd.PrinterSettings == ps1)
				Assert.Fail ("#7");
		}

		[Test]
		public void PrinterSettingsTest ()
		{
			PrintDialog pd = new PrintDialog ();

			PrinterSettings ps1 = new PrinterSettings ();
			pd.PrinterSettings = ps1;
			Assert.AreEqual (ps1, pd.PrinterSettings, "#1");
			Assert.IsNull (pd.Document, "#2");

			pd.PrinterSettings = null;
			Assert.IsNotNull (pd.PrinterSettings, "#3");
			Assert.IsNull (pd.Document, "#4");
			if (pd.PrinterSettings == ps1)
				Assert.Fail ("#5");
		}
	}
}

_______________________________________________
Mono-winforms-list maillist  -  Mono-winforms-list@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-winforms-list