dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

MakeNsisW About dialog close button should close the dialog

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6401 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2013-08-05 14:53:57 +00:00
parent 55738e1385
commit 9a63b529dd
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Contrib/Makensisw/makensisw.cpp
View file

@ -504,8 +504,7 @@ INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
} }
case IDM_ABOUT: case IDM_ABOUT:
{ {
DialogBox(g_sdata.hInstance,MAKEINTRESOURCE(DLG_ABOUT),g_sdata.hwnd,(DLGPROC)AboutProc); return DialogBox(g_sdata.hInstance,MAKEINTRESOURCE(DLG_ABOUT),hwndDlg,(DLGPROC)AboutProc);
return TRUE;
} }
case IDM_NSISHOME: case IDM_NSISHOME:
{ {
@ -843,8 +842,10 @@ INT_PTR CALLBACK AboutProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
break; break;
} }
case WM_COMMAND: case WM_COMMAND:
if (IDOK == LOWORD(wParam)) EndDialog(hwndDlg, TRUE); if (IDOK != LOWORD(wParam)) break;
break; // fall through
case WM_CLOSE:
return EndDialog(hwndDlg, TRUE);
case WM_DESTROY: case WM_DESTROY:
DeleteObject((HGDIOBJ)SendDlgItemMessage(hwndDlg, IDC_ABOUTVERSION, WM_GETFONT, 0, 0)); DeleteObject((HGDIOBJ)SendDlgItemMessage(hwndDlg, IDC_ABOUTVERSION, WM_GETFONT, 0, 0));
DeleteObject((HGDIOBJ)SendDlgItemMessage(hwndDlg, IDC_ABOUTCOPY, WM_GETFONT, 0, 0)); DeleteObject((HGDIOBJ)SendDlgItemMessage(hwndDlg, IDC_ABOUTCOPY, WM_GETFONT, 0, 0));