From d8eb8c54b18e0f43551e10ad17ffa477f654b1b5 Mon Sep 17 00:00:00 2001 From: Ulrich Czekalla Date: Sat, 23 Oct 1999 16:57:28 +0000 Subject: [PATCH] - adds calling application defined callback function once PropertSheet Dialogbox has been initialized just after creating the tab control - handle the case when pszCaption specifies a resource instead of a string --- dlls/comctl32/propsheet.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 9e379c908b3..cb9384978ab 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1528,7 +1528,7 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, PropPageInfo* oldPages; if (!psInfo) { - FIXME("No psInfo for propertysheet at windows 0x%04x? returning FALSE...\n"); + FIXME("No psInfo for propertysheet at windows 0x%04x, returning FALSE...\n", hwndDlg); return FALSE; } oldPages = psInfo->proppage; @@ -1839,6 +1839,10 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } } + if (psInfo->useCallback) + (*(psInfo->ppshheader->pfnCallback))(hwnd, + PSCB_INITIALIZED, (LPARAM)0); + ppshpage = PROPSHEET_GetPSPPage(psInfo, psInfo->active_page); PROPSHEET_CreatePage(hwnd, psInfo->active_page, psInfo, ppshpage, TRUE); @@ -1847,9 +1851,21 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) SetPropA(hwnd, PropSheetInfoStr, (HANDLE)psInfo); - PROPSHEET_SetTitleA(hwnd, - psInfo->ppshheader->dwFlags, - psInfo->ppshheader->pszCaption); + + if (!HIWORD(psInfo->ppshheader->pszCaption) && + psInfo->ppshheader->hInstance) + { + char szText[256]; + + if (LoadStringA(psInfo->ppshheader->hInstance, + (UINT)psInfo->ppshheader->pszCaption, szText, 255)) + PROPSHEET_SetTitleA(hwnd, psInfo->ppshheader->dwFlags, szText); + } + else + { + PROPSHEET_SetTitleA(hwnd, psInfo->ppshheader->dwFlags, + psInfo->ppshheader->pszCaption); + } return TRUE; }