github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-25 22:03:45 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlLib: Changed PrintDlg handling in win32

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8006 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-12-25 19:57:22 +00:00
parent 96aa08ab3b
commit aa503b2b5b
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
uppsrc/CtrlLib/PrinterJob.cpp
View file

@ -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;
}

2
uppsrc/Painter/SvgParser.cpp
View file

@ -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())

2
uppsrc/Painter/init
View file

@ -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