diff --git a/src/drivers/win/memwatch.cpp b/src/drivers/win/memwatch.cpp
index 04485408..052662b2 100644
--- a/src/drivers/win/memwatch.cpp
+++ b/src/drivers/win/memwatch.cpp
@@ -702,6 +702,7 @@ static BOOL CALLBACK MemWatchCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
OpenMemwatchRecentFile(4);
break;
+ case ACCEL_CTRL_W:
case MEMW_FILE_CLOSE:
CloseMemoryWatch();
break;
@@ -711,14 +712,17 @@ static BOOL CALLBACK MemWatchCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
LoadMemWatch();
break;
+ case ACCEL_CTRL_S:
case MEMW_FILE_SAVE:
QuickSaveMemWatch();
break;
+ case ACCEL_CTRL_SHIFT_S:
case MEMW_FILE_SAVEAS:
SaveMemWatch();
break;
+ case ACCEL_CTRL_N:
case MEMW_FILE_NEW:
ClearAllText();
break;
diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc
index 6ea9b0cc..c53951c8 100644
--- a/src/drivers/win/res.rc
+++ b/src/drivers/win/res.rc
@@ -39,7 +39,7 @@ FCEUMENU MENU
BEGIN
POPUP "&File"
BEGIN
- MENUITEM "&Open...", MENU_OPEN_FILE
+ MENUITEM "&Open... Ctrl+O", MENU_OPEN_FILE
MENUITEM "&Close", MENU_CLOSE_FILE
MENUITEM "&Recent", MENU_RECENT_FILES
MENUITEM SEPARATOR
@@ -1514,13 +1514,13 @@ MEMWATCHMENU MENU
BEGIN
POPUP "File "
BEGIN
- MENUITEM "New... Ctrl+N", MEMW_FILE_NEW
- MENUITEM "Open... Ctrl+O", MEMW_FILE_OPEN
- MENUITEM "Save Ctrl+S", MEMW_FILE_SAVE
- MENUITEM "Save As...", MEMW_FILE_SAVEAS
+ MENUITEM "New... Ctrl+N", MEMW_FILE_NEW
+ MENUITEM "Open... Ctrl+O", MEMW_FILE_OPEN
+ MENUITEM "Save Ctrl+S", MEMW_FILE_SAVE
+ MENUITEM "Save As.. Ctrl+Shift+S", MEMW_FILE_SAVEAS
MENUITEM "&Recent", ID_FILE_RECENT
MENUITEM SEPARATOR
- MENUITEM "Close", MEMW_FILE_CLOSE
+ MENUITEM "Close Ctrl+W", MEMW_FILE_CLOSE
END
POPUP "Options"
BEGIN
@@ -1615,6 +1615,9 @@ BEGIN
"E", ACCEL_CTRL_E, VIRTKEY, CONTROL, NOINVERT
"O", ACCEL_CTRL_O, VIRTKEY, CONTROL, NOINVERT
"W", ACCEL_CTRL_W, VIRTKEY, CONTROL, NOINVERT
+ "S", ACCEL_CTRL_S, VIRTKEY, CONTROL, NOINVERT
+ "S", ACCEL_CTRL_SHIFT_S, VIRTKEY, SHIFT, CONTROL, NOINVERT
+ "N", ACCEL_CTRL_N, VIRTKEY, CONTROL, NOINVERT
END
diff --git a/src/drivers/win/resource.h b/src/drivers/win/resource.h
index 7d952eca..eb7c018d 100644
--- a/src/drivers/win/resource.h
+++ b/src/drivers/win/resource.h
@@ -339,6 +339,9 @@
#define ACCEL_CTRL_O 40130
#define ACCEL_CTRL_E 40131
#define ACCEL_CTRL_W 40132
+#define ACCEL_CTRL_S 40134
+#define ACCEL_CTRL_SHIFT_S 40135
+#define ACCEL_CTRL_N 40136
#define MW_ValueLabel2 65423
#define MW_ValueLabel1 65426
#define GUI_BOT_DEBUG 65436
@@ -350,7 +353,7 @@
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 111
-#define _APS_NEXT_COMMAND_VALUE 40134
+#define _APS_NEXT_COMMAND_VALUE 40138
#define _APS_NEXT_CONTROL_VALUE 1132
#define _APS_NEXT_SYMED_VALUE 101
#endif
diff --git a/vc8/fceux.vcproj b/vc8/fceux.vcproj
index 3716c4ee..8e824892 100644
--- a/vc8/fceux.vcproj
+++ b/vc8/fceux.vcproj
@@ -2284,6 +2284,10 @@
RelativePath="..\src\state.cpp"
>
+
+