From c4c04facf82078b66673e1dfc607ee27f1adc490 Mon Sep 17 00:00:00 2001
From: jacob <jacob@cda61777-01e9-0310-a592-d414129be87e>
Date: Wed, 27 Oct 2004 15:50:52 +0000
Subject: [PATCH] Malcolm Rowe's UI tweak patch for About/Licence: recognise
 `Esc' to close windows (PuTTY, Pageant, PuTTYgen); Licence window parent in
 PuTTY.

git-svn-id: svn://svn.tartarus.org/sgt/putty@4715 cda61777-01e9-0310-a592-d414129be87e
---
 pageant.c  | 2 ++
 puttygen.c | 2 ++
 windlg.c   | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pageant.c b/pageant.c
index 2ebf3ab1..e0def27a 100644
--- a/pageant.c
+++ b/pageant.c
@@ -197,6 +197,7 @@ static int CALLBACK LicenceProc(HWND hwnd, UINT msg,
       case WM_COMMAND:
 	switch (LOWORD(wParam)) {
 	  case IDOK:
+	  case IDCANCEL:
 	    EndDialog(hwnd, 1);
 	    return 0;
 	}
@@ -221,6 +222,7 @@ static int CALLBACK AboutProc(HWND hwnd, UINT msg,
       case WM_COMMAND:
 	switch (LOWORD(wParam)) {
 	  case IDOK:
+	  case IDCANCEL:
 	    aboutbox = NULL;
 	    DestroyWindow(hwnd);
 	    return 0;
diff --git a/puttygen.c b/puttygen.c
index ff3f9f73..3f2be92e 100644
--- a/puttygen.c
+++ b/puttygen.c
@@ -253,6 +253,7 @@ static int CALLBACK LicenceProc(HWND hwnd, UINT msg,
       case WM_COMMAND:
 	switch (LOWORD(wParam)) {
 	  case IDOK:
+	  case IDCANCEL:
 	    EndDialog(hwnd, 1);
 	    return 0;
 	}
@@ -292,6 +293,7 @@ static int CALLBACK AboutProc(HWND hwnd, UINT msg,
       case WM_COMMAND:
 	switch (LOWORD(wParam)) {
 	  case IDOK:
+	  case IDCANCEL:
 	    EndDialog(hwnd, 1);
 	    return 0;
 	  case 101:
diff --git a/windlg.c b/windlg.c
index 9c24449b..272196df 100644
--- a/windlg.c
+++ b/windlg.c
@@ -175,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;
 	}
@@ -208,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;
-- 
2.11.0