From 07cf778b2bed2c2dbbfb9408b556850f1d40876b Mon Sep 17 00:00:00 2001 From: Eric Pouech Date: Tue, 22 Apr 2008 22:00:14 +0200 Subject: [PATCH] winhelp: Properly display the page title. --- programs/winhelp/winhelp.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index a33c470bf59..ee7925fbbf7 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -112,6 +112,12 @@ BOOL WINHELP_GetOpenFileName(LPSTR lpszFile, int len) 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 @@ -540,7 +546,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow) { WINHELP_DeleteButtons(win); bReUsed = TRUE; - SetWindowText(win->hMainWnd, wpage->wininfo->caption); + SetWindowText(win->hMainWnd, WINHELP_GetCaption(wpage)); if (wpage->wininfo->origin.x != CW_USEDEFAULT && wpage->wininfo->origin.y != CW_USEDEFAULT) SetWindowPos(win->hMainWnd, HWND_TOP, @@ -623,7 +629,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow) if (!bReUsed) { 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, wpage->wininfo->origin.x, wpage->wininfo->origin.y, wpage->wininfo->size.cx, wpage->wininfo->size.cy, -- 2.11.4.GIT