From 63d4b51e6ca3d0c831d0c8d1a81984a5c2305f69 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@users.sf.net>
Date: Wed, 10 Sep 2008 03:05:26 +0000
Subject: [PATCH] Removed execute from main menu and moved pause to the
 spacebar Hopefully spacebar won't interefere with people's key binding
 preferences but it is temporary until a hotkey mapping system is in place.

---
 desmume/src/windows/main.cpp     | 2 +-
 desmume/src/windows/resource.h   | 1 +
 desmume/src/windows/resources.rc | 5 +----
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp
index a2e730342..66b038278 100644
--- a/desmume/src/windows/main.cpp
+++ b/desmume/src/windows/main.cpp
@@ -1593,7 +1593,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
                   //     EnableMenuItem(menu, IDM_PAUSE, MF_ENABLED);
                   //     NDS_UnPause();
 				  // 	return 0;
-				  case ACCEL_P:
+				  case ACCEL_SPACEBAR:
 				  case IDM_PAUSE:
 					  if (emu_paused) NDS_UnPause();
 					  else NDS_Pause();
diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h
index 7194a920f..f1d5cad82 100644
--- a/desmume/src/windows/resource.h
+++ b/desmume/src/windows/resource.h
@@ -284,6 +284,7 @@
 #define IDC_LIGHT_VIEWER_LIGHT3VECTOR_EDIT 1334
 #define IDM_ABOUT                       40003
 #define ACCEL_P                         40004
+#define ACCEL_SPACEBAR                  40004
 
 // Next default values for new objects
 // 
diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc
index babdb8b40..593e7b18a 100644
--- a/desmume/src/windows/resources.rc
+++ b/desmume/src/windows/resources.rc
@@ -27,7 +27,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDR_MAIN_ACCEL ACCELERATORS 
 BEGIN
-    "P",            ACCEL_P,                VIRTKEY, NOINVERT
+    VK_SPACE,       ACCEL_SPACEBAR,         VIRTKEY, NOINVERT
     VK_F1,          IDM_STATE_LOAD_F1,      VIRTKEY, NOINVERT
     VK_F10,         IDM_STATE_LOAD_F10,     VIRTKEY, NOINVERT
     VK_F2,          IDM_STATE_LOAD_F2,      VIRTKEY, NOINVERT
@@ -113,7 +113,6 @@ BEGIN
     END
     POPUP "&Emulation"
     BEGIN
-        MENUITEM "&Start",                      IDM_EXEC
         MENUITEM "&Pause",                      IDM_PAUSE
         MENUITEM "&Genstart",                   IDM_RESET
     END
@@ -646,7 +645,6 @@ BEGIN
     END
     POPUP "&Emulation"
     BEGIN
-        MENUITEM "&Execute",                    IDM_EXEC
         MENUITEM "&Pause",                      IDM_PAUSE
         MENUITEM "&Reset",                      IDM_RESET
     END
@@ -1198,7 +1196,6 @@ BEGIN
     END
     POPUP "&Emulation"
     BEGIN
-        MENUITEM "&Execute",                    IDM_EXEC
         MENUITEM "&Pause",                      IDM_PAUSE
         MENUITEM "&Reset",                      IDM_RESET
     END