Malcolm Rowe's UI tweak patch for About/Licence: recognise `Esc' to close

[sgt/putty] / windlg.c

diff --git a/windlg.c b/windlg.c
index 3bdceff..272196d 100644 (file)
--- a/windlg.c
+++ b/windlg.c
@@ -13,6 +13,7 @@
 
 #include <commctrl.h>
 #include <commdlg.h>
+#include <shellapi.h>
 
 #ifdef MSVC4
 #define TVINSERTSTRUCT  TV_INSERTSTRUCT
@@ -174,6 +175,7 @@ static int CALLBACK LicenceProc(HWND hwnd, UINT msg,
       case WM_COMMAND:
        switch (LOWORD(wParam)) {
          case IDOK:
+         case IDCANCEL:
            EndDialog(hwnd, 1);
            return 0;
        }
@@ -207,7 +209,7 @@ static int CALLBACK AboutProc(HWND hwnd, UINT msg,
          case IDA_LICENCE:
            EnableWindow(hwnd, 0);
            DialogBox(hinst, MAKEINTRESOURCE(IDD_LICENCEBOX),
-                     NULL, LicenceProc);
+                     hwnd, LicenceProc);
            EnableWindow(hwnd, 1);
            SetActiveWindow(hwnd);
            return 0;
@@ -648,7 +650,6 @@ int do_reconfig(HWND hwnd)
     ctrl_free_box(ctrlbox);
     winctrl_cleanup(&ctrls_base);
     winctrl_cleanup(&ctrls_panel);
-    sfree(dp.errtitle);
     dp_cleanup(&dp);
 
     if (!ret)