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

- made NSIS ignore WM_COMMAND from disabled controls

Browse source 
- made NSISdl set the cancel button as the default button


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3330 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-12-29 15:12:41 +00:00
parent 8a85e1c0dd
commit 466e93ea11
5 changed files with 47 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Contrib/NSISdl/nsisdl.cpp
View file

@ -233,8 +233,6 @@ __declspec(dllexport) void download (HWND parent,
if (IsWindowVisible(hwndB)) ShowWindow(hwndB,SW_HIDE);
else hwndB=NULL;
wasen=EnableWindow(GetDlgItem(parent,IDCANCEL),1);
lpWndProcOld = (void *)SetWindowLong(parent,GWL_WNDPROC,(long)ParentWndProc);
dlg = CreateDialog((HINSTANCE)hModule,
@ -307,6 +305,13 @@ __declspec(dllexport) void download (HWND parent,
SendDlgItemMessage(dlg, pbid, WM_SETFONT, hFont, 0);
SendDlgItemMessage(dlg, IDC_STATIC2, WM_SETFONT, hFont, 0);
}
// enable the cancel button
wasen=EnableWindow(GetDlgItem(parent,IDCANCEL),TRUE);
SendMessage(parent, DM_SETDEFID, IDCANCEL, 0);
// remove the BS_DEFPUSHBUTTON style from IDOK
SendMessage(GetDlgItem(parent, IDOK), BM_SETSTYLE, BS_PUSHBUTTON, TRUE);
SetFocus(GetDlgItem(parent,IDCANCEL));
}
{
WSADATA wsaData;
@ -385,7 +390,7 @@ __declspec(dllexport) void download (HWND parent,
SetWindowPos(childwnd,0,0,0,orig_childRc.right-orig_childRc.left,orig_childRc.bottom-orig_childRc.top,SWP_NOACTIVATE|SWP_NOZORDER|SWP_NOMOVE);
if (wasen) EnableWindow(GetDlgItem(parent,IDCANCEL),0);
if (wasen) EnableWindow(GetDlgItem(parent,IDCANCEL),FALSE);
}
if ( !error )
error = "cancel";