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

windows (PuTTY, Pageant, PuTTYgen); Licence window parent in PuTTY.

[originally from svn r4715]

diff --git a/pageant.c b/pageant.c
index 2ebf3ab10146ce813d0f00d3059b56a6ee32c0b1..e0def27a839d4a2b258d66b7d9eb2970f20c2423 100644 (file)
--- 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 ff3f9f73b3ad06a432af9382985ebe2e78200f14..3f2be92e6f970dbec86909691a1b9a1592573d9e 100644 (file)
--- 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 9c24449be168ff450846185fdbceae4c4e1c2f86..272196dfdb336fcc198432d33dc1023855c2676f 100644 (file)
--- 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;