hhctrl.ocx: Set window owner in HtmlHelp function if WS_CHILD flag is not specified.
Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
badcabc188
commit
ace66d3540
|
@ -1603,7 +1603,7 @@ static LRESULT CALLBACK Help_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPA
|
||||||
|
|
||||||
static BOOL HH_CreateHelpWindow(HHInfo *info)
|
static BOOL HH_CreateHelpWindow(HHInfo *info)
|
||||||
{
|
{
|
||||||
HWND hWnd, parent = 0;
|
HWND hWnd;
|
||||||
RECT winPos = info->WinType.rcWindowPos;
|
RECT winPos = info->WinType.rcWindowPos;
|
||||||
WNDCLASSEXW wcex;
|
WNDCLASSEXW wcex;
|
||||||
DWORD dwStyles, dwExStyles;
|
DWORD dwStyles, dwExStyles;
|
||||||
|
@ -1677,11 +1677,8 @@ static BOOL HH_CreateHelpWindow(HHInfo *info)
|
||||||
caption = info->WinType.pszCaption;
|
caption = info->WinType.pszCaption;
|
||||||
if (!*caption) caption = info->pCHMInfo->defTitle;
|
if (!*caption) caption = info->pCHMInfo->defTitle;
|
||||||
|
|
||||||
if (info->WinType.dwStyles & WS_CHILD)
|
hWnd = CreateWindowExW(dwExStyles, windowClassW, caption, dwStyles, x, y, width, height,
|
||||||
parent = info->WinType.hwndCaller;
|
info->WinType.hwndCaller, NULL, hhctrl_hinstance, NULL);
|
||||||
|
|
||||||
hWnd = CreateWindowExW(dwExStyles, windowClassW, caption,
|
|
||||||
dwStyles, x, y, width, height, parent, NULL, hhctrl_hinstance, NULL);
|
|
||||||
if (!hWnd)
|
if (!hWnd)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue