commit c0e4c40bbbbb9d46d672d1fba77a99609f685d43
author James Hawkins <truiken@gmail.com> Mon Jul 19 19:35:28 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Jul 19 19:35:28 2004 +0000
tree e9f37b8ed3617e0df7ff806e847d2aad234508d6
parent f3c8b83055d9c0680687353e1230f7f81533f8d5

Better fix for collate icon behavior.

dlls/commdlg/printdlg.c

diff --git a/dlls/commdlg/printdlg.c b/dlls/commdlg/printdlg.c
index 4f9e483..c7eadd0 100644
--- a/dlls/commdlg/printdlg.c
+++ b/dlls/commdlg/printdlg.c
@@ -1204,6 +1204,10 @@
     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 @@
     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 @@
         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;