From aaeebbb670003ccb0cd13647a74e57ef3d611f0e Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Fri, 14 Nov 2008 19:08:29 +0000 Subject: [PATCH] - Pass the parent to PropertySheetW See issue #3597 for more details. svn path=/trunk/; revision=37361 --- reactos/dll/cpl/intl/generalp.c | 2 +- reactos/dll/cpl/intl/intl.h | 2 +- reactos/dll/cpl/intl/misc.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reactos/dll/cpl/intl/generalp.c b/reactos/dll/cpl/intl/generalp.c index f0720be28cf..3ca5ba5ffb6 100644 --- a/reactos/dll/cpl/intl/generalp.c +++ b/reactos/dll/cpl/intl/generalp.c @@ -391,7 +391,7 @@ GeneralPageProc(HWND hwndDlg, if (NewLcid == (LCID)CB_ERR) break; - SetupApplet(NewLcid); + SetupApplet(GetParent(hwndDlg), NewLcid); } break; } diff --git a/reactos/dll/cpl/intl/intl.h b/reactos/dll/cpl/intl/intl.h index b8f0aea8534..86109e9ad32 100644 --- a/reactos/dll/cpl/intl/intl.h +++ b/reactos/dll/cpl/intl/intl.h @@ -75,7 +75,7 @@ ReplaceSubStr(LPCTSTR szSourceStr, LPCTSTR szStrToReplace, LPCTSTR szTempl); LONG APIENTRY -SetupApplet(LCID lcid); +SetupApplet(HWND hwndDlg, LCID lcid); #endif /* __CPL_INTL_H */ diff --git a/reactos/dll/cpl/intl/misc.c b/reactos/dll/cpl/intl/misc.c index 5cdec08d5e2..7a9be0e3e3d 100644 --- a/reactos/dll/cpl/intl/misc.c +++ b/reactos/dll/cpl/intl/misc.c @@ -190,7 +190,7 @@ InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, PGLOBALDATA p /* Create applets */ LONG APIENTRY -SetupApplet(LCID lcid) +SetupApplet(HWND hwndDlg, LCID lcid) { PROPSHEETPAGE PsPage[NUM_SHEETS + 1]; PROPSHEETHEADER psh; @@ -207,7 +207,7 @@ SetupApplet(LCID lcid) ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USECALLBACK | PSH_PROPTITLE; - psh.hwndParent = NULL; + psh.hwndParent = hwndDlg; psh.hInstance = hApplet; psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON)); psh.pszCaption = Caption;