Changeset 10267 for trunk/src

Timestamp:

Oct 13, 2003, 11:14:54 AM (22 years ago)

Author:

sandervl

Message:

Printer dialog fixes

File:

• trunk/src/comdlg32/printdlg.c (modified) (9 diffs)

trunk/src/comdlg32/printdlg.c

@@ -1778 +1778 @@
                                 (WPARAM) hDlg, (LPARAM) lppd);
         break;
-
+#ifdef __WIN32OS2__
+     //PF Surely we need to clear/set this flag during runtime as well!
+     case chx1:
+        if (IsDlgButtonChecked(hDlg, chx1) == BST_CHECKED)
+            lppd->Flags |= PD_PRINTTOFILE;
+        else
+            lppd->Flags &= ~PD_PRINTTOFILE;
+        break;    
+#endif
      case chx2:                         /* collate pages checkbox */
         if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED)
@@ -1852 +1860 @@
         if (lppd->Flags & PD_PRINTSETUP)
         {
+#ifdef __WIN32OS2__
+              lpdm->dmFields |= DM_ORIENTATION;
+#endif
               lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
               SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
@@ -1861 +1872 @@
         if (lppd->Flags & PD_PRINTSETUP)
         {
+#ifdef __WIN32OS2__
+              lpdm->dmFields |= DM_ORIENTATION;
+#endif
               lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
               SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
@@ -2019 +2033 @@
         if (lppd->Flags & PD_PRINTSETUP)
         {
+#ifdef __WIN32OS2__
+              lpdm->dmFields |= DM_ORIENTATION;
+#endif
               lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
               SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
@@ -2028 +2045 @@
         if (lppd->Flags & PD_PRINTSETUP)
         {
+#ifdef __WIN32OS2__
+              lpdm->dmFields |= DM_ORIENTATION;
+#endif
               lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
               SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
@@ -3126 +3146 @@
         pda->dlga->ptPaperSize.x = pda->dlga->ptPaperSize.y;
         pda->dlga->ptPaperSize.y = tmp;
+
+#ifdef __WIN32OS2__
+        dm->dmFields |= DM_ORIENTATION;
+        dm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
+#endif
+
     }
     GlobalUnlock(pda->pdlg.hDevNames);
@@ -3167 +3193 @@
         pda->dlga->ptPaperSize.x = pda->dlga->ptPaperSize.y;
         pda->dlga->ptPaperSize.y = tmp;
+
+#ifdef __WIN32OS2__
+        dm->dmFields |= DM_ORIENTATION;
+        dm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
+#endif
+
     }
     GlobalUnlock(pda->pdlg.hDevNames);
@@ -3497 +3529 @@
                 (LPARAM)pda)
     );
+#ifdef __WIN32OS2__
+    //On return we should overwrite the input devmode & devnames with the one
+    //set up by the dialog
+    setupdlg->hDevMode  = pdlg.hDevMode;
+    setupdlg->hDevNames = pdlg.hDevNames;
+#endif
     return bRet;
 }
@@ -3564 +3602 @@
                 (LPARAM)pdw)
     );
+#ifdef __WIN32OS2__
+    //On return we should overwrite the input devmode & devnames with the one
+    //set up by the dialog
+    setupdlg->hDevMode  = pdlg.hDevMode;
+    setupdlg->hDevNames = pdlg.hDevNames;
+#endif
     return bRet;
 }