marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PropertySheet didn't destroy page dialog's window while removing page.

oldstable
Ulrich Czekalla 1999-10-23 23:59:47 +00:00 committed by Alexandre Julliard
parent 50f8e4b171
commit 6966c65b87
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/comctl32/propsheet.c
View File

@ -1550,13 +1550,14 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg,
if (hpage != 0)
{
index = PROPSHEET_GetPageIndex(hpage, psInfo);
}
if (index == -1)
/* Make shure that index is within range */
if (index < 0 || index >= psInfo->nPages)
{
TRACE("Could not find page to remove!\n");
return FALSE;
}
}
TRACE("total pages %d removing page %d active page %d\n",
psInfo->nPages, index, psInfo->active_page);
@ -1594,6 +1595,12 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg,
if (index < psInfo->active_page)
psInfo->active_page--;
/* Destroy page dialog window.
* If it's last page in modal dialog, it has been destroyed by EndDialog
*/
if (psInfo->isModeless || psInfo->nPages > 1)
DestroyWindow(psInfo->proppage[index].hwndPage);
/* Remove the tab */
SendMessageA(hwndTabControl, TCM_DELETEITEM, index, 0);