Skip to content

W
wine-winehq
Commit 07cf778b authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

winhelp: Properly display the page title.

parent e862e7d8
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
programs/winhelp/winhelp.c
View file @ 07cf778b
...@@ -112,6 +112,12 @@ BOOL WINHELP_GetOpenFileName(LPSTR lpszFile, int len) ...@@ -112,6 +112,12 @@ BOOL WINHELP_GetOpenFileName(LPSTR lpszFile, int len)
return GetOpenFileName(&openfilename); return GetOpenFileName(&openfilename);
} }
static char* WINHELP_GetCaption(WINHELP_WNDPAGE* wpage)
{
if (wpage->wininfo->caption[0]) return wpage->wininfo->caption;
return wpage->page->file->lpszTitle;
}
/*********************************************************************** /***********************************************************************
* *
* WINHELP_LookupHelpFile * WINHELP_LookupHelpFile
...@@ -540,7 +546,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow) ...@@ -540,7 +546,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow)
{ {
WINHELP_DeleteButtons(win); WINHELP_DeleteButtons(win);
bReUsed = TRUE; bReUsed = TRUE;
SetWindowText(win->hMainWnd, wpage->wininfo->caption); SetWindowText(win->hMainWnd, WINHELP_GetCaption(wpage));
if (wpage->wininfo->origin.x != CW_USEDEFAULT && if (wpage->wininfo->origin.x != CW_USEDEFAULT &&
wpage->wininfo->origin.y != CW_USEDEFAULT) wpage->wininfo->origin.y != CW_USEDEFAULT)
SetWindowPos(win->hMainWnd, HWND_TOP, SetWindowPos(win->hMainWnd, HWND_TOP,
...@@ -623,7 +629,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow) ...@@ -623,7 +629,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow)
if (!bReUsed) if (!bReUsed)
{ {
win->hMainWnd = CreateWindowEx((bPopup) ? WS_EX_TOOLWINDOW : 0, MAIN_WIN_CLASS_NAME, win->hMainWnd = CreateWindowEx((bPopup) ? WS_EX_TOOLWINDOW : 0, MAIN_WIN_CLASS_NAME,
wpage->wininfo->caption, WINHELP_GetCaption(wpage),
bPrimary ? WS_OVERLAPPEDWINDOW : wpage->wininfo->win_style, bPrimary ? WS_OVERLAPPEDWINDOW : wpage->wininfo->win_style,
wpage->wininfo->origin.x, wpage->wininfo->origin.y, wpage->wininfo->origin.x, wpage->wininfo->origin.y,
wpage->wininfo->size.cx, wpage->wininfo->size.cy, wpage->wininfo->size.cx, wpage->wininfo->size.cy,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment