- made NSIS ignore WM_COMMAND from disabled controls

- 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

Contrib/InstallOptions/InstallerOptions.cpp

@@ -644,7 +644,11 @@ LRESULT WINAPI WMCommandProc(HWND hWnd, UINT id, HWND hwndCtl, UINT codeNotify)
       if (pField->nFlags & FLAG_NOTIFY) {
         // Remember which control was activated then pretend the user clicked Next
         g_NotifyField = nIdx + 1;
+        // the next button must be enabled or nsis will ignore WM_COMMAND
+        BOOL bWasDisabled = EnableWindow(hNextButton, TRUE);
         FORWARD_WM_COMMAND(hMainWindow, IDOK, hNextButton, codeNotify, mySendMessage);
+        if (bWasDisabled)
+          EnableWindow(hNextButton, FALSE);
       }
     }
     break;