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

accelerators in main window

This commit is contained in:
zeromus 2008-05-27 23:24:43 +00:00
parent 42a62e0e60
commit 750d897b89
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/drivers/win/main.cpp
View File

@ -303,13 +303,19 @@ int BlockingCheck()
if(IsChild(hwndMemWatch,msg.hwnd)) if(IsChild(hwndMemWatch,msg.hwnd))
handled = TranslateAccelerator(hwndMemWatch,fceu_hAccel,&msg); handled = TranslateAccelerator(hwndMemWatch,fceu_hAccel,&msg);
if(!handled) if(!handled)
{ handled = IsDialogMessage(hwndMemWatch,&msg);
int resylt = IsDialogMessage(hwndMemWatch,&msg);
handled = resylt;
}
} }
if(!handled)
if(msg.hwnd == hAppWnd)
{
handled = TranslateAccelerator(hAppWnd,fceu_hAccel,&msg);
if(handled)
{
int zzz=9;
}
}
if(!handled) if(!handled)
{ {
TranslateMessage(&msg); TranslateMessage(&msg);

1
src/drivers/win/memwatch.cpp
View File

@ -791,6 +791,7 @@ static BOOL CALLBACK MemWatchCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
CloseMemoryWatch(); CloseMemoryWatch();
break; break;
case ACCEL_CTRL_O:
case MEMW_FILE_OPEN: case MEMW_FILE_OPEN:
LoadMemWatch(); LoadMemWatch();
break; break;

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

@ -1610,7 +1610,7 @@ END
IDR_ACCELERATOR1 ACCELERATORS IDR_ACCELERATOR1 ACCELERATORS
BEGIN BEGIN
"O", MEMW_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT "O", ACCEL_CTRL_O, VIRTKEY, CONTROL, NOINVERT
END END
#endif // English (U.S.) resources #endif // English (U.S.) resources

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

@ -332,6 +332,7 @@
#define MENU_TASEDIT 40124 #define MENU_TASEDIT 40124
#define ID_CONFIG_PAUSEAFTERPLAYBACK 40125 #define ID_CONFIG_PAUSEAFTERPLAYBACK 40125
#define MENU_PAUSEAFTERPLAYBACK 40126 #define MENU_PAUSEAFTERPLAYBACK 40126
#define ACCEL_CTRL_O 40130
#define MW_ValueLabel2 65423 #define MW_ValueLabel2 65423
#define MW_ValueLabel1 65426 #define MW_ValueLabel1 65426
#define GUI_BOT_DEBUG 65436 #define GUI_BOT_DEBUG 65436
@ -343,7 +344,7 @@
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 110 #define _APS_NEXT_RESOURCE_VALUE 110
#define _APS_NEXT_COMMAND_VALUE 40127 #define _APS_NEXT_COMMAND_VALUE 40131
#define _APS_NEXT_CONTROL_VALUE 1131 #define _APS_NEXT_CONTROL_VALUE 1131
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif

5
src/drivers/win/window.cpp
View File

@ -697,7 +697,7 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
case WM_COMMAND: case WM_COMMAND:
if(!(wParam>>16)) if(HIWORD(wParam) == 0 || HIWORD(wParam) == 1)
{ {
wParam &= 0xFFFF; wParam &= 0xFFFF;
@ -715,7 +715,7 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
if(recent_directories[wParam-700]) if(recent_directories[wParam-700])
LoadNewGamey(hWnd, recent_directories[wParam - 700]); LoadNewGamey(hWnd, recent_directories[wParam - 700]);
} }
switch(wParam) switch(LOWORD(wParam))
{ {
//------- //-------
//mbg merge 7/18/06 added XD tools //mbg merge 7/18/06 added XD tools
@ -1025,6 +1025,7 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
CreateMemWatch(); CreateMemWatch();
break; break;
case ACCEL_CTRL_O:
case MENU_OPEN_FILE: case MENU_OPEN_FILE:
// User selected the Open File menu => Show the file selection dialog // User selected the Open File menu => Show the file selection dialog
LoadNewGamey(hWnd, 0); LoadNewGamey(hWnd, 0);