- fixed limit on LangStrings and user variables number which was lower than designed. limit is now 16383 for both.
- made log window respond to the context menu key and not just right click - set back the default style for the next after it's re-enabled - set focus on main controls for every page (can still hit enter for next) - added code to prevent weird usage of WM_COMMAND which can cause weird behavior such as disabled next button on the components page - eccles fixed a bug which caused beeping when the space key is hit on the components tree git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3351 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
e1c4b80991
commit
fcd2c16685
15 changed files with 266 additions and 188 deletions
|
@ -112,6 +112,7 @@ static LRESULT CALLBACK ParentWndProc(HWND hwnd, UINT message, WPARAM wParam, LP
|
|||
while ( !TryEnterCS() ) Sleep(0);
|
||||
if (message == WM_COMMAND && LOWORD(wParam) == IDCANCEL)
|
||||
{
|
||||
SendMessage(GetDlgItem(hwnd, IDCANCEL), BM_SETSTATE, FALSE, 0);
|
||||
g_cancelled = 1;
|
||||
}
|
||||
else
|
||||
|
@ -308,10 +309,7 @@ __declspec(dllexport) void download (HWND parent,
|
|||
|
||||
// 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));
|
||||
SendMessage(parent, WM_NEXTDLGCTL, (WPARAM) GetDlgItem(parent, IDCANCEL), TRUE);
|
||||
}
|
||||
{
|
||||
WSADATA wsaData;
|
||||
|
@ -387,10 +385,16 @@ __declspec(dllexport) void download (HWND parent,
|
|||
|
||||
if (hwndB) ShowWindow(hwndB,SW_SHOWNA);
|
||||
if (hwndL) ShowWindow(hwndL,SW_SHOWNA);
|
||||
|
||||
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),FALSE);
|
||||
|
||||
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), FALSE);
|
||||
}
|
||||
if ( !error )
|
||||
error = "cancel";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue