From aa503b2b5bbdfff5905be5aa3fa680df40499fa3 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Thu, 25 Dec 2014 19:57:22 +0000
Subject: [PATCH] CtrlLib: Changed PrintDlg handling in win32

git-svn-id: svn://ultimatepp.org/upp/trunk@8006 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlLib/PrinterJob.cpp | 6 +++---
 uppsrc/Painter/SvgParser.cpp  | 2 +-
 uppsrc/Painter/init           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/uppsrc/CtrlLib/PrinterJob.cpp b/uppsrc/CtrlLib/PrinterJob.cpp
index 0ac008c03..bfcd8a92d 100644
--- a/uppsrc/CtrlLib/PrinterJob.cpp
+++ b/uppsrc/CtrlLib/PrinterJob.cpp
@@ -69,7 +69,7 @@ bool PrinterJob::Execute0(bool dodlg)
 	}
 	HDC hdc;
 	if(dodlg) {
-		dlg.Flags = PD_DISABLEPRINTTOFILE|PD_NOSELECTION|PD_HIDEPRINTTOFILE|PD_RETURNDC;
+		dlg.Flags = PD_DISABLEPRINTTOFILE|PD_NOSELECTION|PD_HIDEPRINTTOFILE|PD_RETURNDC|PD_USEDEVMODECOPIESANDCOLLATE;
 		Vector< Ptr<Ctrl> > disabled = DisableCtrls(Ctrl::GetTopCtrls());
 		bool b = PrintDlg(&dlg);
 		EnableCtrls(disabled);
@@ -99,9 +99,9 @@ bool PrinterJob::Execute0(bool dodlg)
 			dlg.nFromPage = dlg.nMinPage;
 			dlg.nToPage = dlg.nMaxPage;
 		}
-		for(int c = 0; c < ((dlg.Flags & PD_COLLATE) ? dlg.nCopies : 1); c++)
+//		for(int c = 0; c < ((dlg.Flags & PD_COLLATE) ? dlg.nCopies : 1); c++)
 			for(int i = dlg.nFromPage - 1; i <= dlg.nToPage - 1; i++)
-				for(int c = 0; c < ((dlg.Flags & PD_COLLATE) ? 1 : dlg.nCopies); c++)
+//				for(int c = 0; c < ((dlg.Flags & PD_COLLATE) ? 1 : dlg.nCopies); c++)
 					page.Add(i);
 		return true;
 	}
diff --git a/uppsrc/Painter/SvgParser.cpp b/uppsrc/Painter/SvgParser.cpp
index 50b4ef593..5723465d9 100644
--- a/uppsrc/Painter/SvgParser.cpp
+++ b/uppsrc/Painter/SvgParser.cpp
@@ -307,7 +307,7 @@ Pointf GetSvgPos(XmlParser& xml)
 
 void SvgParser::ParseG() {
 #ifdef _DEBUG
-	if(IsTag()) LLOG("====== TAG " << PeekTag());
+	LLOG("====== TAG " << (IsTag() ? PeekTag() : String()));
 #endif
 	if(Tag("defs")) {
 		while(!End())
diff --git a/uppsrc/Painter/init b/uppsrc/Painter/init
index 83d3403ae..f401caed3 100644
--- a/uppsrc/Painter/init
+++ b/uppsrc/Painter/init
@@ -1,7 +1,7 @@
 #ifndef _Painter_icpp_init_stub
 #define _Painter_icpp_init_stub
 #include "Draw/init"
-#define BLITZ_INDEX__ Fb59219fc3bf1aed0b7289197596b0ec3
+#define BLITZ_INDEX__ Fcf1e6c345d9100ecf96ca5bd96de6ce3
 #include "PaintPainting.icpp"
 #undef BLITZ_INDEX__
 #endif