Author: janderwald Date: Fri Nov 14 13:08:29 2008 New Revision: 37361
URL: http://svn.reactos.org/svn/reactos?rev=37361&view=rev Log: - Pass the parent to PropertySheetW
See issue #3597 for more details.
Modified: trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/misc.c
Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?rev... ============================================================================== --- trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] Fri Nov 14 13:08:29 2008 @@ -391,7 +391,7 @@ if (NewLcid == (LCID)CB_ERR) break;
- SetupApplet(NewLcid); + SetupApplet(GetParent(hwndDlg), NewLcid); } break; }
Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=373... ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] Fri Nov 14 13:08:29 2008 @@ -75,7 +75,7 @@
LONG APIENTRY -SetupApplet(LCID lcid); +SetupApplet(HWND hwndDlg, LCID lcid);
#endif /* __CPL_INTL_H */
Modified: trunk/reactos/dll/cpl/intl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/misc.c?rev=373... ============================================================================== --- trunk/reactos/dll/cpl/intl/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/misc.c [iso-8859-1] Fri Nov 14 13:08:29 2008 @@ -190,7 +190,7 @@ /* Create applets */ LONG APIENTRY -SetupApplet(LCID lcid) +SetupApplet(HWND hwndDlg, LCID lcid) { PROPSHEETPAGE PsPage[NUM_SHEETS + 1]; PROPSHEETHEADER psh; @@ -207,7 +207,7 @@ 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;