system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:19:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ignore window caption from PROPSHEETHEADER in wizards. Update window

Browse source 
caption when changing pages.
This commit is contained in:
Pavel Roskin 2003-10-02 04:26:53 +00:00 committed by Alexandre Julliard
parent 4020a21f97
commit 5b7f03cf9f
1 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
dlls/comctl32/propsheet.c
View file

@ -305,12 +305,17 @@ static BOOL PROPSHEET_CollectSheetInfoA(LPCPROPSHEETHEADERA lppsh,
PROPSHEET_UnImplementedFlags(lppsh->dwFlags); PROPSHEET_UnImplementedFlags(lppsh->dwFlags);
if (HIWORD(lppsh->pszCaption)) if (lppsh->dwFlags & INTRNL_ANY_WIZARD)
psInfo->ppshheader.pszCaption = NULL;
else
{ {
int len = strlen(lppsh->pszCaption); if (HIWORD(lppsh->pszCaption))
psInfo->ppshheader.pszCaption = HeapAlloc( GetProcessHeap(), 0, (len+1)*sizeof (WCHAR) ); {
MultiByteToWideChar(CP_ACP, 0, lppsh->pszCaption, -1, (LPWSTR) psInfo->ppshheader.pszCaption, len+1); int len = strlen(lppsh->pszCaption);
/* strcpy( (char *)psInfo->ppshheader.pszCaption, lppsh->pszCaption ); */ psInfo->ppshheader.pszCaption = HeapAlloc( GetProcessHeap(), 0, (len+1)*sizeof (WCHAR) );
MultiByteToWideChar(CP_ACP, 0, lppsh->pszCaption, -1, (LPWSTR) psInfo->ppshheader.pszCaption, len+1);
/* strcpy( (char *)psInfo->ppshheader.pszCaption, lppsh->pszCaption ); */
}
} }
psInfo->nPages = lppsh->nPages; psInfo->nPages = lppsh->nPages;
@ -355,11 +360,16 @@ static BOOL PROPSHEET_CollectSheetInfoW(LPCPROPSHEETHEADERW lppsh,
PROPSHEET_UnImplementedFlags(lppsh->dwFlags); PROPSHEET_UnImplementedFlags(lppsh->dwFlags);
if (HIWORD(lppsh->pszCaption)) if (lppsh->dwFlags & INTRNL_ANY_WIZARD)
psInfo->ppshheader.pszCaption = NULL;
else
{ {
int len = strlenW(lppsh->pszCaption); if (!(lppsh->dwFlags & INTRNL_ANY_WIZARD) && HIWORD(lppsh->pszCaption))
psInfo->ppshheader.pszCaption = HeapAlloc( GetProcessHeap(), 0, (len+1)*sizeof(WCHAR) ); {
strcpyW( (WCHAR *)psInfo->ppshheader.pszCaption, lppsh->pszCaption ); int len = strlenW(lppsh->pszCaption);
psInfo->ppshheader.pszCaption = HeapAlloc( GetProcessHeap(), 0, (len+1)*sizeof(WCHAR) );
strcpyW( (WCHAR *)psInfo->ppshheader.pszCaption, lppsh->pszCaption );
}
} }
psInfo->nPages = lppsh->nPages; psInfo->nPages = lppsh->nPages;
@ -1554,6 +1564,9 @@ static BOOL PROPSHEET_ShowPage(HWND hwndDlg, int index, PropSheetInfo * psInfo)
PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppshpage); PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppshpage);
} }
PROPSHEET_SetTitleW(hwndDlg, psInfo->ppshheader.dwFlags,
psInfo->proppage[index].pszText);
if (psInfo->active_page != -1) if (psInfo->active_page != -1)
ShowWindow(psInfo->proppage[psInfo->active_page].hwndPage, SW_HIDE); ShowWindow(psInfo->proppage[psInfo->active_page].hwndPage, SW_HIDE);