author | Brian R. Bondy <netzen@gmail.com> |
Thu, 29 Sep 2011 09:21:32 -0400 | |
changeset 77855 | 13ab1afb123a4282fd419e5f7f1dd74ee6b9f4b8 |
parent 77854 | 65e060c81a59c41912857e730059f2104c6f6068 |
child 77856 | 934fd93abd8678d0215ee8296995cb5b296288bf |
push id | 21245 |
push user | eakhgari@mozilla.com |
push date | Thu, 29 Sep 2011 21:38:47 +0000 |
treeherder | mozilla-central@6ced8d07826c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bsmedberg |
bugs | 366347 |
milestone | 10.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
embedding/components/printingui/src/win/nsPrintDialogUtil.cpp | file | annotate | diff | comparison | revisions |
--- a/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp +++ b/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp @@ -904,17 +904,18 @@ ShowNativePrintDialog(HWND PRINTDLGW prntdlg; memset(&prntdlg, 0, sizeof(PRINTDLGW)); prntdlg.lStructSize = sizeof(prntdlg); prntdlg.hwndOwner = aHWnd; prntdlg.hDevMode = hGlobalDevMode; prntdlg.hDevNames = hDevNames; prntdlg.hDC = NULL; - prntdlg.Flags = PD_ALLPAGES | PD_RETURNIC | PD_USEDEVMODECOPIESANDCOLLATE; + prntdlg.Flags = PD_ALLPAGES | PD_RETURNIC | + PD_USEDEVMODECOPIESANDCOLLATE | PD_COLLATE; // if there is a current selection then enable the "Selection" radio button PRInt16 howToEnableFrameUI = nsIPrintSettings::kFrameEnableNone; bool isOn; aPrintSettings->GetPrintOptions(nsIPrintSettings::kEnableSelectionRB, &isOn); if (!isOn) { prntdlg.Flags |= PD_NOSELECTION; } @@ -1235,17 +1236,17 @@ ShowNativePrintDialogEx(HWND // Prepare to Display the Print Dialog PRINTDLGEX prntdlg; memset(&prntdlg, 0, sizeof(PRINTDLGEX)); prntdlg.lStructSize = sizeof(prntdlg); prntdlg.hwndOwner = aHWnd; prntdlg.hDevMode = hGlobalDevMode; prntdlg.Flags = PD_ALLPAGES | PD_RETURNDC | PD_USEDEVMODECOPIESANDCOLLATE | - PD_NOCURRENTPAGE; + PD_NOCURRENTPAGE | PD_COLLATE; prntdlg.nStartPage = START_PAGE_GENERAL; // if there is a current selection then enable the "Selection" radio button PRInt16 howToEnableFrameUI = nsIPrintSettings::kFrameEnableNone; if (aPrintSettings != nsnull) { bool isOn; aPrintSettings->GetPrintOptions(nsIPrintSettings::kEnableSelectionRB, &isOn); if (!isOn) {