Changeset 3585 for trunk/src/comctl32/propsheet.cpp

Timestamp:

May 22, 2000, 7:25:13 PM (25 years ago)

Author:

cbratschi

Message:

merged with Corel WINE 20000513, added new DPA_* functions

File:

• trunk/src/comctl32/propsheet.cpp (modified) (13 diffs)

trunk/src/comctl32/propsheet.cpp

@@ -1 @@
-/* $Id: propsheet.cpp,v 1.3 2000-03-18 16:17:26 cbratschi Exp $ */
+/* $Id: propsheet.cpp,v 1.4 2000-05-22 17:25:10 cbratschi Exp $ */
 /*
  * Property Sheets
@@ -14 +14 @@
 
 /*
- - Corel WINE 20000317 level
+ - Corel WINE 20000513 level
  - (WINE 991212 level)
 */
@@ -380 +380 @@
        EnableWindow( owner, TRUE );
    }
-   retval = dlgInfo->idResult;
+   retval = dlgInfo->dlgExtra->idResult;
 #endif
    DestroyWindow( hwnd );
@@ -1001 +1001 @@
   DLGTEMPLATE* pTemplate;
   HWND hwndPage;
-  RECT rc;
+
   PropPageInfo* ppInfo = psInfo->proppage;
-  PADDING_INFO padding;
 
 //  TRACE("index %d\n", index);
@@ -1044 +1043 @@
   else
   {
-    pTemplate->style |= WS_CHILD | DS_CONTROL;
+    pTemplate->style |= WS_CHILDWINDOW | DS_CONTROL;
     pTemplate->style &= ~DS_MODALFRAME;
     pTemplate->style &= ~WS_CAPTION;
@@ -1066 +1065 @@
   ppInfo[index].hwndPage = hwndPage;
 
-  rc.left = psInfo->x;
-  rc.top = psInfo->y;
-  rc.right = psInfo->width;
-  rc.bottom = psInfo->height;
-
-  MapDialogRect(hwndParent, &rc);
-
-  if (psInfo->ppshheader->dwFlags & PSH_WIZARD)
-    padding = PROPSHEET_GetPaddingInfoWizard(hwndParent);
-  else
-  {
-    /*
-     * Ask the Tab control to fit this page in.
-     */
-
-    HWND hwndTabCtrl = GetDlgItem(hwndParent, IDC_TABCONTROL);
-    SendMessageA(hwndTabCtrl, TCM_ADJUSTRECT, FALSE, (LPARAM)&rc);
-    padding = PROPSHEET_GetPaddingInfo(hwndParent);
-  }
-
-  SetWindowPos(hwndPage, HWND_TOP,
-               rc.left + padding.x,
-               rc.top + padding.y,
-               0, 0, SWP_NOSIZE);
-
   return TRUE;
 }
@@ -1101 +1075 @@
 static BOOL PROPSHEET_ShowPage(HWND hwndDlg, int index, PropSheetInfo * psInfo)
 {
+  RECT rc;
+  PADDING_INFO padding;
+  UINT pageWidth,pageHeight;
+
   if (index == psInfo->active_page)
     {
@@ -1133 +1111 @@
   }
 
-  ShowWindow(psInfo->proppage[index].hwndPage, SW_SHOW);
+  if (psInfo->active_page != -1)
+  {
+     ShowWindow(psInfo->proppage[psInfo->active_page].hwndPage, SW_HIDE);
+  }
+
+  /* HACK: Sometimes a property page doesn't get displayed at the right place inside the
+   *       property sheet. This will force the window to be placed at the proper location
+   *       before it is displayed.
+   */
+  rc.left = psInfo->x;
+  rc.top = psInfo->y;
+  rc.right = psInfo->width;
+  rc.bottom = psInfo->height;
+
+  MapDialogRect(hwndDlg, &rc);
+
+  pageWidth = rc.right - rc.left;
+  pageHeight = rc.bottom - rc.top;
+
+  if (psInfo->ppshheader->dwFlags & PSH_WIZARD)
+    padding = PROPSHEET_GetPaddingInfoWizard(hwndDlg);
+  else
+  {
+    /*
+     * Ask the Tab control to fit this page in.
+     */
+
+    HWND hwndTabCtrl = GetDlgItem(hwndDlg, IDC_TABCONTROL);
+    SendMessageA(hwndTabCtrl, TCM_ADJUSTRECT, FALSE, (LPARAM)&rc);
+    padding = PROPSHEET_GetPaddingInfo(hwndDlg);
+  }
+
+  SetWindowPos(psInfo->proppage[index].hwndPage, HWND_TOP,
+               rc.left + padding.x,
+               rc.top + padding.y,
+               pageWidth, pageHeight, SWP_SHOWWINDOW);
 
   if (!(psInfo->ppshheader->dwFlags & PSH_WIZARD))
@@ -1305 +1318 @@
   }
 
+  EnableWindow(GetDlgItem(hwndDlg, IDC_APPLY_BUTTON), FALSE);
+
   if(lParam)
   {
+     int result = TRUE;
+
      psInfo->activeValid = FALSE;
+
+     if (psInfo->restartWindows)
+        result = ID_PSRESTARTWINDOWS;
+
+     /* reboot system takes precedence over restart windows */
+     if (psInfo->rebootSystem)
+        result = ID_PSREBOOTSYSTEM;
+
+     if (!psInfo->isModeless)
+        EndDialog(hwndDlg, result);
   }
   else if(psInfo->active_page >= 0)
@@ -1451 +1478 @@
   {
     case PSBTN_APPLYNOW:
-      SendMessageA(hwndDlg, WM_COMMAND, IDC_APPLY_BUTTON, 0);
+      PROPSHEET_Apply(hwndDlg, 0);
       break;
+
     case PSBTN_BACK:
       PROPSHEET_Back(hwndDlg);
       break;
+
     case PSBTN_CANCEL:
-      SendMessageA(hwndDlg, WM_COMMAND, IDCANCEL, 0);
+      PROPSHEET_Cancel(hwndDlg, 0);
       break;
+
     case PSBTN_FINISH:
       PROPSHEET_Finish(hwndDlg);
       break;
+
     case PSBTN_HELP:
-      SendMessageA(hwndDlg, WM_COMMAND, IDHELP, 0);
+      PROPSHEET_Help(hwndDlg);
       break;
+
     case PSBTN_NEXT:
       PROPSHEET_Next(hwndDlg);
       break;
+
     case PSBTN_OK:
-      SendMessageA(hwndDlg, WM_COMMAND, IDOK, 0);
+      PROPSHEET_Apply(hwndDlg, 1);
       break;
-    default:
-        //FIXME(propsheet, "Invalid button index %d\n", buttonID);
-        break;
+
+    //default:
+    //  FIXME("Invalid button index %d\n", buttonID);
   }
 }
@@ -2185 +2218 @@
     {
       WORD wID = LOWORD(wParam);
+      PropSheetInfo* psInfo = (PropSheetInfo*) GetPropA(hwnd,PropSheetInfoStr);
 
       switch (wID)
@@ -2190 +2224 @@
         case IDOK:
         case IDC_APPLY_BUTTON:
-        {
-          HWND hwndApplyBtn = GetDlgItem(hwnd, IDC_APPLY_BUTTON);
-
-          if (PROPSHEET_Apply(hwnd, wID == IDOK ? 1: 0) == FALSE)
-            break;
-
-          if (wID == IDOK)
-          {
-            PropSheetInfo* psInfo = (PropSheetInfo*) GetPropA(hwnd,
-                                                            PropSheetInfoStr);
-            int result = TRUE;
-
-            if (psInfo->restartWindows)
-              result = ID_PSRESTARTWINDOWS;
-
-            /* reboot system takes precedence over restart windows */
-            if (psInfo->rebootSystem)
-              result = ID_PSREBOOTSYSTEM;
-
-            if (psInfo->isModeless)
-              psInfo->activeValid = FALSE;
-            else
-              EndDialog(hwnd, result);
-          }
-          else
-             EnableWindow(hwndApplyBtn, FALSE);
-
+          PROPSHEET_Apply(hwnd, wID == IDOK ? 1: 0);
           break;
-        }
 
         case IDC_BACK_BUTTON:
@@ -2239 +2246 @@
           PROPSHEET_Help(hwnd);
           break;
+
+        default:
+          if(psInfo->active_page != -1)
+          {
+             return SendMessageA(psInfo->proppage[psInfo->active_page].hwndPage,
+                                 uMsg, wParam, lParam);
+          }
       }