From 6503e41723e34afc8f8d5f605adc3beca22678cf Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@users.sf.net>
Date: Wed, 4 Mar 2009 16:03:43 +0000
Subject: [PATCH] Win32 - Fix bug so that Escape can be assigned as a hotkey

---
 changelog.txt                | 2 ++
 src/drivers/win/mapinput.cpp | 2 +-
 src/drivers/win/res.rc       | 2 +-
 src/drivers/win/resource.h   | 3 ++-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 84765742..4f88c392 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,6 @@
 ---version 2.0.4 yet to be released---
+04-mar-2009 - adelikat - win32 - Fix bug so that Escape can now be assigned as a hotkey
+03-mar-2009 - adelikat - win32 - Fix Directory Overrides so to allow users to have no override.  Also fixes directory override reset bug
 02-mar-2009 - adelikat - win32 - Drag & Drop for Memwatch dialog (.txt files)
 01-mar-2009 - adelikat - win32 - Drag & Drop Lua files
 25-feb-2009 - adelikat - win32 - Memwatch - added cancel to save changes? message box
diff --git a/src/drivers/win/mapinput.cpp b/src/drivers/win/mapinput.cpp
index 2e1b58dd..a9457c85 100644
--- a/src/drivers/win/mapinput.cpp
+++ b/src/drivers/win/mapinput.cpp
@@ -333,7 +333,7 @@ BOOL CALLBACK ChangeInputDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 		return FALSE;
 
 		case WM_COMMAND:
-			if(LOWORD(wParam) == BTN_CANCEL && HIWORD(wParam) == BN_CLICKED)
+			if(LOWORD(wParam) == BTN_CANCELED && HIWORD(wParam) == BN_CLICKED) //adelikat: changed BTN_CANCEL to BTN_CANCELED so that the esc key does not default to this button (so it can be assigned as a hotkey)
 			{
 				key = 0;
 
diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc
index a4b026b9..c532a8e7 100644
--- a/src/drivers/win/res.rc
+++ b/src/drivers/win/res.rc
@@ -691,7 +691,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Enter New Input"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    PUSHBUTTON      "Cancel",BTN_CANCEL,40,45,50,14
+    PUSHBUTTON      "Cancel",BTN_CANCELED,40,45,50,14
     CTEXT           "Press a key",LBL_KEY_COMBO,47,14,90,12
     PUSHBUTTON      "Clear",BTN_CLEAR,95,45,50,14
 END
diff --git a/src/drivers/win/resource.h b/src/drivers/win/resource.h
index fa3f98cf..22aa8f17 100644
--- a/src/drivers/win/resource.h
+++ b/src/drivers/win/resource.h
@@ -403,6 +403,7 @@
 #define IDC_MOVIE_SUBTITLESINAVI        1197
 #define IDC_MOVIE_AUTOBACKUP            1198
 #define IDC_SOUNDS_RESTOREDEFAULTS      1199
+#define BTN_CANCELED                    1200
 #define MENU_NETWORK                    40040
 #define MENU_PALETTE                    40041
 #define MENU_SOUND                      40042
@@ -686,7 +687,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        125
 #define _APS_NEXT_COMMAND_VALUE         40353
-#define _APS_NEXT_CONTROL_VALUE         1200
+#define _APS_NEXT_CONTROL_VALUE         1201
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif