ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Win32 - Fix bug so that Escape can be assigned as a hotkey

This commit is contained in:
adelikat 2009-03-04 16:03:43 +00:00
parent e75d9e52dc
commit 6503e41723
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.txt
View File

@ -1,4 +1,6 @@
---version 2.0.4 yet to be released--- ---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) 02-mar-2009 - adelikat - win32 - Drag & Drop for Memwatch dialog (.txt files)
01-mar-2009 - adelikat - win32 - Drag & Drop Lua files 01-mar-2009 - adelikat - win32 - Drag & Drop Lua files
25-feb-2009 - adelikat - win32 - Memwatch - added cancel to save changes? message box 25-feb-2009 - adelikat - win32 - Memwatch - added cancel to save changes? message box

2
src/drivers/win/mapinput.cpp
View File

@ -333,7 +333,7 @@ BOOL CALLBACK ChangeInputDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
return FALSE; return FALSE;
case WM_COMMAND: 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; key = 0;

2
src/drivers/win/res.rc
View File

@ -691,7 +691,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Enter New Input" CAPTION "Enter New Input"
FONT 8, "MS Sans Serif", 0, 0, 0x0 FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN 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 CTEXT "Press a key",LBL_KEY_COMBO,47,14,90,12
PUSHBUTTON "Clear",BTN_CLEAR,95,45,50,14 PUSHBUTTON "Clear",BTN_CLEAR,95,45,50,14
END END

3
src/drivers/win/resource.h
View File

@ -403,6 +403,7 @@
#define IDC_MOVIE_SUBTITLESINAVI 1197 #define IDC_MOVIE_SUBTITLESINAVI 1197
#define IDC_MOVIE_AUTOBACKUP 1198 #define IDC_MOVIE_AUTOBACKUP 1198
#define IDC_SOUNDS_RESTOREDEFAULTS 1199 #define IDC_SOUNDS_RESTOREDEFAULTS 1199
#define BTN_CANCELED 1200
#define MENU_NETWORK 40040 #define MENU_NETWORK 40040
#define MENU_PALETTE 40041 #define MENU_PALETTE 40041
#define MENU_SOUND 40042 #define MENU_SOUND 40042
@ -686,7 +687,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 125 #define _APS_NEXT_RESOURCE_VALUE 125
#define _APS_NEXT_COMMAND_VALUE 40353 #define _APS_NEXT_COMMAND_VALUE 40353
#define _APS_NEXT_CONTROL_VALUE 1200 #define _APS_NEXT_CONTROL_VALUE 1201
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif
#endif #endif