From c0e4c40bbbbb9d46d672d1fba77a99609f685d43 Mon Sep 17 00:00:00 2001 From: James Hawkins Date: Mon, 19 Jul 2004 19:35:28 +0000 Subject: [PATCH] Better fix for collate icon behavior. --- dlls/commdlg/printdlg.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/commdlg/printdlg.c b/dlls/commdlg/printdlg.c index 4f9e4839a1..c7eadd0072 100644 --- a/dlls/commdlg/printdlg.c +++ b/dlls/commdlg/printdlg.c @@ -1204,6 +1204,10 @@ static LRESULT PRINTDLG_WMInitDialog(HWND hDlg, WPARAM wParam, PrintStructures->hLandscapeIcon = LoadIconA(COMDLG32_hInstance, "PD32_LANDSCAPE"); + /* display the collate/no_collate icon */ + SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, + (LPARAM)PrintStructures->hNoCollateIcon); + if(PrintStructures->hCollateIcon == 0 || PrintStructures->hNoCollateIcon == 0 || PrintStructures->hPortraitIcon == 0 || @@ -1308,6 +1312,10 @@ static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg, WPARAM wParam, PrintStructures->hLandscapeIcon = LoadIconA(COMDLG32_hInstance, "PD32_LANDSCAPE"); + /* display the collate/no_collate icon */ + SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, + (LPARAM)PrintStructures->hNoCollateIcon); + if(PrintStructures->hCollateIcon == 0 || PrintStructures->hNoCollateIcon == 0 || PrintStructures->hPortraitIcon == 0 || @@ -1622,20 +1630,9 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, if(HIWORD(wParam) == EN_CHANGE) { INT copies = GetDlgItemInt(hDlg, edt3, NULL, FALSE); if(copies <= 1) - { - CheckDlgButton(hDlg, chx2, BST_UNCHECKED); - SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, - (WPARAM) IMAGE_ICON, 0); EnableWindow(GetDlgItem(hDlg, chx2), FALSE); - } else - { EnableWindow(GetDlgItem(hDlg, chx2), TRUE); - - SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, - (WPARAM) IMAGE_ICON, - (LPARAM)PrintStructures->hNoCollateIcon); - } } break; -- 2.32.0.93.g670b81a890