From ea3c59fcd9b8638dbb24948cd138c58f4aa1a985 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= <gambas@users.sourceforge.net>
Date: Sat, 27 Mar 2010 08:14:06 +0000
Subject: [PATCH] [GB.GTK] * BUG: Printer.PaperWidth and Printer.PaperHeight
 should return the   expected values for predefined papers.

git-svn-id: svn://localhost/gambas/trunk@2833 867c0c6c-44f3-4631-809d-bfa615b0a4ec
---
 gb.gtk/src/gprinter.cpp | 33 ++++++++++++++++++++++++---------
 gb.gtk/src/gprinter.h   |  3 ++-
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/gb.gtk/src/gprinter.cpp b/gb.gtk/src/gprinter.cpp
index 115a8d44d..dfecc1763 100644
--- a/gb.gtk/src/gprinter.cpp
+++ b/gb.gtk/src/gprinter.cpp
@@ -291,12 +291,11 @@ void gPrinter::setOrientation(int v)
 	gtk_print_settings_set_orientation(_settings, orient);
 }
 
-void gPrinter::setPaperModel(int v)
+GtkPaperSize *gPrinter::getPaperSize()
 {
-	GtkPaperSize *paper;
 	const char *name;
 	
-	switch(v)
+	switch(_paper_size)
 	{
 		case GB_PRINT_A3: name = GTK_PAPER_NAME_A3; break;
 		case GB_PRINT_A4: name = GTK_PAPER_NAME_A4; break;
@@ -305,20 +304,36 @@ void gPrinter::setPaperModel(int v)
 		case GB_PRINT_LETTER: name = GTK_PAPER_NAME_LETTER; break;
 		case GB_PRINT_EXECUTIVE: name = GTK_PAPER_NAME_EXECUTIVE; break;
 		case GB_PRINT_LEGAL: name = GTK_PAPER_NAME_LEGAL; break;
-		default: name = GTK_PAPER_NAME_A4; v = GB_PRINT_A4;
+		default: name = GTK_PAPER_NAME_A4; _paper_size = GB_PRINT_A4;
 	}
 	
-	_paper_size = v;
+	return gtk_paper_size_new(name);
+}
+
+void gPrinter::setPaperModel(int v)
+{
+	GtkPaperSize *paper;
 	
-	paper = gtk_paper_size_new(name);
+	_paper_size = v;
+	paper = getPaperSize();
 	gtk_print_settings_set_paper_size(_settings, paper);
 	gtk_paper_size_free(paper);
 }
 
-void gPrinter::getPaperSize(double *width, double *height) const
+void gPrinter::getPaperSize(double *width, double *height)
 {
-	*width = gtk_print_settings_get_paper_width(_settings, GTK_UNIT_MM);
-	*height = gtk_print_settings_get_paper_height(_settings, GTK_UNIT_MM);
+	if (_paper_size == GB_PRINT_CUSTOM)
+	{
+		*width = gtk_print_settings_get_paper_width(_settings, GTK_UNIT_MM);
+		*height = gtk_print_settings_get_paper_height(_settings, GTK_UNIT_MM);
+	}
+	else
+	{
+		GtkPaperSize *paper = getPaperSize();
+		*width = gtk_paper_size_get_width(paper, GTK_UNIT_MM);
+		*height = gtk_paper_size_get_height(paper, GTK_UNIT_MM);
+		gtk_paper_size_free(paper);
+	}
 }
 
 void gPrinter::setPaperSize(double width, double height)
diff --git a/gb.gtk/src/gprinter.h b/gb.gtk/src/gprinter.h
index fd558667a..8ca726fa2 100644
--- a/gb.gtk/src/gprinter.h
+++ b/gb.gtk/src/gprinter.h
@@ -46,7 +46,7 @@ public:
 	int paperModel() const { return _paper_size; }
 	void setPaperModel(int v);
 	
-	void getPaperSize(double *width, double *height) const;
+	void getPaperSize(double *width, double *height);
 	void setPaperSize(double width, double height);
 	
 	bool collateCopies() const;
@@ -94,6 +94,7 @@ public:
 	
 private:
 	bool run(bool configure);
+	GtkPaperSize *getPaperSize();
 	
 	GtkPrintOperation *_operation;
 	GtkPrintSettings *_settings;