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

Timestamp:

Aug 17, 2000, 7:08:15 PM (25 years ago)

Author:

cbratschi

Message:

wizard workaround

File:

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

trunk/src/comctl32/propsheet.cpp

@@ -1 @@
-/* $Id: propsheet.cpp,v 1.7 2000-08-13 17:12:39 cbratschi Exp $ */
+/* $Id: propsheet.cpp,v 1.8 2000-08-17 17:08:15 cbratschi Exp $ */
 /*
  * Property Sheets
@@ -11 +11 @@
  *   - Tab order
  *   - Unicode property sheets
+ *   - Wizard bugs
  */
 
@@ -133 +134 @@
 static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE hpage, PropSheetInfo* psInfo);
 static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags);
-static PADDING_INFO PROPSHEET_GetPaddingInfoWizard(HWND hwndDlg);
+static PADDING_INFO PROPSHEET_GetPaddingInfoWizard(HWND hwndDlg,PropSheetInfo* psInfo);
 static BOOL PROPSHEET_IsDialogMessage(HWND hwnd, LPMSG lpMsg);
 static INT PROPSHEET_DoDialogBox( HWND hwnd, HWND owner);
@@ -551 +552 @@
   RECT rcSheetRect, rcPage, rcLine, rcSheetClient;
   HWND hwndLine = GetDlgItem(hwndDlg, IDC_SUNKEN_LINE);
-  PADDING_INFO padding = PROPSHEET_GetPaddingInfoWizard(hwndDlg);
+  PADDING_INFO padding = PROPSHEET_GetPaddingInfoWizard(hwndDlg,psInfo);
 
   GetClientRect(hwndDlg, &rcSheetClient);
@@ -653 +654 @@
   RECT rc;
   int buttonHeight, lineHeight;
-  PADDING_INFO padding = PROPSHEET_GetPaddingInfoWizard(hwndDlg);
+  PADDING_INFO padding = PROPSHEET_GetPaddingInfoWizard(hwndDlg,psInfo);
 
   /* Get the height of buttons */
@@ -796 +797 @@
   int num_buttons = 3;
   int buttonWidth, buttonHeight, lineHeight, lineWidth;
-  PADDING_INFO padding = PROPSHEET_GetPaddingInfoWizard(hwndParent);
+  PADDING_INFO padding = PROPSHEET_GetPaddingInfoWizard(hwndParent,psInfo);
 
   if (psInfo->hasHelp)
@@ -920 +921 @@
  * Vertical spacing is the distance between the line and the buttons.
  */
-static PADDING_INFO PROPSHEET_GetPaddingInfoWizard(HWND hwndDlg)
+static PADDING_INFO PROPSHEET_GetPaddingInfoWizard(HWND hwndDlg,PropSheetInfo* psInfo)
 {
   PADDING_INFO padding;
@@ -956 +957 @@
   padding.x = ptHelp.x - ptCancel.x;
   padding.y = ptHelp.y - ptLine.y;
+
+//CB: BUG: psInfo->hasHelp not checked -> negative values
+//    add better wizard handling, fix button placement bugs FIXME
+//
+//    workaround for now:
+if (padding.x < 0) padding.x = 0;
+if (padding.y < 0) padding.y = 0;
 
   return padding;
@@ -1175 +1183 @@
 
   if (psInfo->ppshheader->dwFlags & PSH_WIZARD)
-    padding = PROPSHEET_GetPaddingInfoWizard(hwndDlg);
+    padding = PROPSHEET_GetPaddingInfoWizard(hwndDlg,psInfo);
   else
   {
@@ -1187 +1195 @@
   }
 
-  SetWindowPos(psInfo->proppage[index].hwndPage, HWND_TOP,
-               rc.left + padding.x,
-               rc.top + padding.y,
-               pageWidth, pageHeight, SWP_SHOWWINDOW);
+  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))