Skip to content

W
wine-cw
Commit fd6c1d59 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

comctl32: Use HPROPSHEETPAGE directly in PROPSHEET_GetPageRect.

parent aefd67ff
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
dlls/comctl32/propsheet.c
View file @ fd6c1d59
...@@ -232,7 +232,7 @@ static VOID PROPSHEET_UnImplementedFlags(DWORD dwFlags) ...@@ -232,7 +232,7 @@ static VOID PROPSHEET_UnImplementedFlags(DWORD dwFlags)
* Retrieve rect from tab control and map into the dialog for SetWindowPos * Retrieve rect from tab control and map into the dialog for SetWindowPos
*/ */
static void PROPSHEET_GetPageRect(const PropSheetInfo * psInfo, HWND hwndDlg, static void PROPSHEET_GetPageRect(const PropSheetInfo * psInfo, HWND hwndDlg,
RECT *rc, LPCPROPSHEETPAGEW ppshpage) RECT *rc, HPROPSHEETPAGE hpsp)
{ {
if (psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD) { if (psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD) {
HWND hwndChild; HWND hwndChild;
...@@ -240,7 +240,7 @@ static void PROPSHEET_GetPageRect(const PropSheetInfo * psInfo, HWND hwndDlg, ...@@ -240,7 +240,7 @@ static void PROPSHEET_GetPageRect(const PropSheetInfo * psInfo, HWND hwndDlg,
if (((psInfo->ppshheader.dwFlags & (PSH_WIZARD97_NEW | PSH_WIZARD97_OLD)) && if (((psInfo->ppshheader.dwFlags & (PSH_WIZARD97_NEW | PSH_WIZARD97_OLD)) &&
(psInfo->ppshheader.dwFlags & PSH_HEADER) && (psInfo->ppshheader.dwFlags & PSH_HEADER) &&
!(ppshpage->dwFlags & PSP_HIDEHEADER)) || !(hpsp->psp.dwFlags & PSP_HIDEHEADER)) ||
(psInfo->ppshheader.dwFlags & PSH_WIZARD)) (psInfo->ppshheader.dwFlags & PSH_WIZARD))
{ {
rc->left = rc->top = WIZARD_PADDING; rc->left = rc->top = WIZARD_PADDING;
...@@ -255,7 +255,7 @@ static void PROPSHEET_GetPageRect(const PropSheetInfo * psInfo, HWND hwndDlg, ...@@ -255,7 +255,7 @@ static void PROPSHEET_GetPageRect(const PropSheetInfo * psInfo, HWND hwndDlg,
if ((psInfo->ppshheader.dwFlags & (PSH_WIZARD97_NEW | PSH_WIZARD97_OLD)) && if ((psInfo->ppshheader.dwFlags & (PSH_WIZARD97_NEW | PSH_WIZARD97_OLD)) &&
(psInfo->ppshheader.dwFlags & PSH_HEADER) && (psInfo->ppshheader.dwFlags & PSH_HEADER) &&
!(ppshpage->dwFlags & PSP_HIDEHEADER)) !(hpsp->psp.dwFlags & PSP_HIDEHEADER))
{ {
hwndChild = GetDlgItem(hwndDlg, IDC_SUNKEN_LINEHEADER); hwndChild = GetDlgItem(hwndDlg, IDC_SUNKEN_LINEHEADER);
GetClientRect(hwndChild, &r); GetClientRect(hwndChild, &r);
...@@ -1996,7 +1996,6 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg, ...@@ -1996,7 +1996,6 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg,
int result; int result;
PSHNOTIFY psn; PSHNOTIFY psn;
RECT rc; RECT rc;
LPCPROPSHEETPAGEW ppshpage = (LPCPROPSHEETPAGEW)psInfo->proppage[index].hpage;
if (hwndTabControl) if (hwndTabControl)
SendMessageW(hwndTabControl, TCM_SETCURSEL, index, 0); SendMessageW(hwndTabControl, TCM_SETCURSEL, index, 0);
...@@ -2029,7 +2028,7 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg, ...@@ -2029,7 +2028,7 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg,
* wizards). * wizards).
* NOTE: The resizing happens every time the page is selected and * NOTE: The resizing happens every time the page is selected and
* not only when it's created (some applications depend on it). */ * not only when it's created (some applications depend on it). */
PROPSHEET_GetPageRect(psInfo, hwndDlg, &rc, ppshpage); PROPSHEET_GetPageRect(psInfo, hwndDlg, &rc, psInfo->proppage[index].hpage);
TRACE("setting page %p, rc (%s) w=%ld, h=%ld\n", TRACE("setting page %p, rc (%s) w=%ld, h=%ld\n",
psInfo->proppage[index].hwndPage, wine_dbgstr_rect(&rc), psInfo->proppage[index].hwndPage, wine_dbgstr_rect(&rc),
rc.right - rc.left, rc.bottom - rc.top); rc.right - rc.left, rc.bottom - rc.top);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment