ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winhelp: Pick nicer fonts for buttons.

This commit is contained in:
Eric Pouech 2008-07-12 10:36:49 +02:00 committed by Alexandre Julliard
parent b04ae273de
commit 6346250ed8
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
programs/winhlp32/winhelp.c
View File

@ -58,7 +58,7 @@ static void WINHELP_DeleteButtons(WINHELP_WINDOW*);
static void WINHELP_SetupText(HWND hWnd, WINHELP_WINDOW *win, ULONG relative); static void WINHELP_SetupText(HWND hWnd, WINHELP_WINDOW *win, ULONG relative);
static void WINHELP_DeletePageLinks(HLPFILE_PAGE* page); static void WINHELP_DeletePageLinks(HLPFILE_PAGE* page);
WINHELP_GLOBALS Globals = {3, NULL, TRUE, NULL, NULL, NULL, NULL, NULL, {{{NULL,NULL}},0}}; WINHELP_GLOBALS Globals = {3, NULL, TRUE, NULL, NULL, NULL, NULL, NULL, {{{NULL,NULL}},0}, NULL};
#define CTL_ID_BUTTON 0x700 #define CTL_ID_BUTTON 0x700
#define CTL_ID_TEXT 0x701 #define CTL_ID_TEXT 0x701
@ -1169,10 +1169,21 @@ static LRESULT CALLBACK WINHELP_ButtonBoxWndProc(HWND hWnd, UINT msg, WPARAM wPa
0, 0, 0, 0, 0, 0, 0, 0,
hWnd, (HMENU) button->wParam, hWnd, (HMENU) button->wParam,
Globals.hInstance, 0); Globals.hInstance, 0);
if (button->hWnd) { if (button->hWnd)
{
if (Globals.button_proc == NULL) if (Globals.button_proc == NULL)
{
NONCLIENTMETRICSW ncm;
Globals.button_proc = (WNDPROC) GetWindowLongPtr(button->hWnd, GWLP_WNDPROC); Globals.button_proc = (WNDPROC) GetWindowLongPtr(button->hWnd, GWLP_WNDPROC);
ncm.cbSize = sizeof(NONCLIENTMETRICSW);
SystemParametersInfoW(SPI_GETNONCLIENTMETRICS,
sizeof(NONCLIENTMETRICSW), &ncm, 0);
Globals.hButtonFont = CreateFontIndirectW(&ncm.lfMenuFont);
}
SetWindowLongPtr(button->hWnd, GWLP_WNDPROC, (LONG_PTR) WINHELP_ButtonWndProc); SetWindowLongPtr(button->hWnd, GWLP_WNDPROC, (LONG_PTR) WINHELP_ButtonWndProc);
if (Globals.hButtonFont)
SendMessage(button->hWnd, WM_SETFONT, (WPARAM)Globals.hButtonFont, TRUE);
} }
} }
hDc = GetDC(button->hWnd); hDc = GetDC(button->hWnd);

1
programs/winhlp32/winhelp.h
View File

@ -137,6 +137,7 @@ typedef struct
WNDPROC button_proc; WNDPROC button_proc;
WINHELP_DLL* dlls; WINHELP_DLL* dlls;
WINHELP_PAGESET history; WINHELP_PAGESET history;
HFONT hButtonFont;
} WINHELP_GLOBALS; } WINHELP_GLOBALS;
extern WINHELP_GLOBALS Globals; extern WINHELP_GLOBALS Globals;