comctl32: Use style to distinguish between embedded and standalone propsheets.

Some programs alter propsheet style in the callback during creation to make "embedded" propsheets. PSH_MODELESS controls modal/modeless operation only.

comctl32: Use style to distinguish between embedded and standalone propsheets.
c80fdb88 · Vitaliy Margolen · Alexandre Julliard · 5276d886 · c80fdb88
Commit c80fdb88 authored Feb 08, 2009 by Vitaliy Margolen Committed by Alexandre Julliard Feb 09, 2009
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

propsheet.c dlls/comctl32/propsheet.c +4 -2

No files found.
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -743,6 +743,7 @@ static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo)
  int buttonHeight;
  PADDING_INFO padding = PROPSHEET_GetPaddingInfo(hwndDlg);
  RECT units;
+  LONG style;

  /* Get the height of buttons */
  GetClientRect(hwndButton, &rc);
@@ -798,8 +799,9 @@ static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo)
  rc.right += (padding.x * 2);
  rc.bottom += buttonHeight + (3 * padding.y);

-  if (!psInfo->isModeless)
-    AdjustWindowRect(&rc, GetWindowLongW(hwndDlg, GWL_STYLE), FALSE);
+  style = GetWindowLongW(hwndDlg, GWL_STYLE);
+  if (!(style & WS_CHILD))
+    AdjustWindowRect(&rc, style, FALSE);

  rc.right -= rc.left;
  rc.bottom -= rc.top;