Merge pull request #1743 from Stevoisiak/variableNamingConsistency

Globals.h: Variable naming consistency

1 files changed, 118 insertions, 118 deletions

diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index 6799fd31eb..427ef26012 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -121,7 +121,7 @@ void CRenderFrame::OnDropFiles(wxDropFilesEvent& event)
 		{
 			// let's make the read-only flag consistent at the start of a movie.
 			Movie::SetReadOnly(true);
-			main_frame->GetMenuBar()->FindItem(IDM_RECORDREADONLY)->Check(true);
+			main_frame->GetMenuBar()->FindItem(IDM_RECORD_READ_ONLY)->Check(true);
 		}
 
 		if (Movie::PlayInput(filepath))
@@ -236,27 +236,27 @@ BEGIN_EVENT_TABLE(CFrame, CRenderFrame)
 // Menu bar
 EVT_MENU(wxID_OPEN, CFrame::OnOpen)
 EVT_MENU(wxID_EXIT, CFrame::OnQuit)
-EVT_MENU(IDM_HELPWEBSITE, CFrame::OnHelp)
-EVT_MENU(IDM_HELPONLINEDOCS, CFrame::OnHelp)
-EVT_MENU(IDM_HELPGITHUB, CFrame::OnHelp)
+EVT_MENU(IDM_HELP_WEBSITE, CFrame::OnHelp)
+EVT_MENU(IDM_HELP_ONLINE_DOCS, CFrame::OnHelp)
+EVT_MENU(IDM_HELP_GITHUB, CFrame::OnHelp)
 EVT_MENU(wxID_ABOUT, CFrame::OnHelp)
 EVT_MENU(wxID_REFRESH, CFrame::OnRefresh)
 EVT_MENU(IDM_PLAY, CFrame::OnPlay)
 EVT_MENU(IDM_STOP, CFrame::OnStop)
 EVT_MENU(IDM_RESET, CFrame::OnReset)
 EVT_MENU(IDM_RECORD, CFrame::OnRecord)
-EVT_MENU(IDM_PLAYRECORD, CFrame::OnPlayRecording)
-EVT_MENU(IDM_RECORDEXPORT, CFrame::OnRecordExport)
-EVT_MENU(IDM_RECORDREADONLY, CFrame::OnRecordReadOnly)
-EVT_MENU(IDM_TASINPUT, CFrame::OnTASInput)
-EVT_MENU(IDM_TOGGLE_PAUSEMOVIE, CFrame::OnTogglePauseMovie)
-EVT_MENU(IDM_SHOWLAG, CFrame::OnShowLag)
-EVT_MENU(IDM_SHOWFRAMECOUNT, CFrame::OnShowFrameCount)
-EVT_MENU(IDM_SHOWINPUTDISPLAY, CFrame::OnShowInputDisplay)
+EVT_MENU(IDM_PLAY_RECORD, CFrame::OnPlayRecording)
+EVT_MENU(IDM_RECORD_EXPORT, CFrame::OnRecordExport)
+EVT_MENU(IDM_RECORD_READ_ONLY, CFrame::OnRecordReadOnly)
+EVT_MENU(IDM_TAS_INPUT, CFrame::OnTASInput)
+EVT_MENU(IDM_TOGGLE_PAUSE_MOVIE, CFrame::OnTogglePauseMovie)
+EVT_MENU(IDM_SHOW_LAG, CFrame::OnShowLag)
+EVT_MENU(IDM_SHOW_FRAME_COUNT, CFrame::OnShowFrameCount)
+EVT_MENU(IDM_SHOW_INPUT_DISPLAY, CFrame::OnShowInputDisplay)
 EVT_MENU(IDM_FRAMESTEP, CFrame::OnFrameStep)
 EVT_MENU(IDM_SCREENSHOT, CFrame::OnScreenshot)
-EVT_MENU(IDM_TOGGLE_DUMPFRAMES, CFrame::OnToggleDumpFrames)
-EVT_MENU(IDM_TOGGLE_DUMPAUDIO, CFrame::OnToggleDumpAudio)
+EVT_MENU(IDM_TOGGLE_DUMP_FRAMES, CFrame::OnToggleDumpFrames)
+EVT_MENU(IDM_TOGGLE_DUMP_AUDIO, CFrame::OnToggleDumpAudio)
 EVT_MENU(wxID_PREFERENCES, CFrame::OnConfigMain)
 EVT_MENU(IDM_CONFIG_GFX_BACKEND, CFrame::OnConfigGFX)
 EVT_MENU(IDM_CONFIG_AUDIO, CFrame::OnConfigAudio)
@@ -272,46 +272,46 @@ EVT_MENU(IDM_ADD_PERSPECTIVE, CFrame::OnPerspectiveMenu)
 EVT_MENU(IDM_TAB_SPLIT, CFrame::OnPerspectiveMenu)
 EVT_MENU(IDM_NO_DOCKING, CFrame::OnPerspectiveMenu)
 // Drop down float
-EVT_MENU_RANGE(IDM_FLOAT_LOGWINDOW, IDM_FLOAT_CODEWINDOW, CFrame::OnFloatWindow)
+EVT_MENU_RANGE(IDM_FLOAT_LOG_WINDOW, IDM_FLOAT_CODE_WINDOW, CFrame::OnFloatWindow)
 
 EVT_MENU(IDM_NETPLAY, CFrame::OnNetPlay)
 EVT_MENU(IDM_BROWSE, CFrame::OnBrowse)
 EVT_MENU(IDM_MEMCARD, CFrame::OnMemcard)
-EVT_MENU(IDM_IMPORTSAVE, CFrame::OnImportSave)
-EVT_MENU(IDM_EXPORTALLSAVE, CFrame::OnExportAllSaves)
+EVT_MENU(IDM_IMPORT_SAVE, CFrame::OnImportSave)
+EVT_MENU(IDM_EXPORT_ALL_SAVE, CFrame::OnExportAllSaves)
 EVT_MENU(IDM_CHEATS, CFrame::OnShow_CheatsWindow)
-EVT_MENU(IDM_CHANGEDISC, CFrame::OnChangeDisc)
-EVT_MENU(IDM_MENU_INSTALLWAD, CFrame::OnInstallWAD)
-EVT_MENU(IDM_LIST_INSTALLWAD, CFrame::OnInstallWAD)
+EVT_MENU(IDM_CHANGE_DISC, CFrame::OnChangeDisc)
+EVT_MENU(IDM_MENU_INSTALL_WAD, CFrame::OnInstallWAD)
+EVT_MENU(IDM_LIST_INSTALL_WAD, CFrame::OnInstallWAD)
 EVT_MENU(IDM_LOAD_WII_MENU, CFrame::OnLoadWiiMenu)
 EVT_MENU(IDM_FIFOPLAYER, CFrame::OnFifoPlayer)
 
 EVT_MENU(IDM_TOGGLE_FULLSCREEN, CFrame::OnToggleFullscreen)
-EVT_MENU(IDM_TOGGLE_DUALCORE, CFrame::OnToggleDualCore)
-EVT_MENU(IDM_TOGGLE_SKIPIDLE, CFrame::OnToggleSkipIdle)
+EVT_MENU(IDM_TOGGLE_DUAL_CORE, CFrame::OnToggleDualCore)
+EVT_MENU(IDM_TOGGLE_SKIP_IDLE, CFrame::OnToggleSkipIdle)
 EVT_MENU(IDM_TOGGLE_TOOLBAR, CFrame::OnToggleToolbar)
 EVT_MENU(IDM_TOGGLE_STATUSBAR, CFrame::OnToggleStatusbar)
-EVT_MENU_RANGE(IDM_LOGWINDOW, IDM_VIDEOWINDOW, CFrame::OnToggleWindow)
+EVT_MENU_RANGE(IDM_LOG_WINDOW, IDM_VIDEO_WINDOW, CFrame::OnToggleWindow)
 EVT_MENU_RANGE(IDM_SHOW_SYSTEM, IDM_SHOW_STATE, CFrame::OnChangeColumnsVisible)
 
-EVT_MENU(IDM_PURGECACHE, CFrame::GameListChanged)
-
-EVT_MENU(IDM_SAVEFIRSTSTATE, CFrame::OnSaveFirstState)
-EVT_MENU(IDM_UNDOLOADSTATE,     CFrame::OnUndoLoadState)
-EVT_MENU(IDM_UNDOSAVESTATE,     CFrame::OnUndoSaveState)
-EVT_MENU(IDM_LOADSTATEFILE, CFrame::OnLoadStateFromFile)
-EVT_MENU(IDM_SAVESTATEFILE, CFrame::OnSaveStateToFile)
-EVT_MENU(IDM_SAVESELECTEDSLOT, CFrame::OnSaveCurrentSlot)
-EVT_MENU(IDM_LOADSELECTEDSLOT, CFrame::OnLoadCurrentSlot)
-
-EVT_MENU_RANGE(IDM_LOADSLOT1, IDM_LOADSLOT10, CFrame::OnLoadState)
-EVT_MENU_RANGE(IDM_LOADLAST1, IDM_LOADLAST8, CFrame::OnLoadLastState)
-EVT_MENU_RANGE(IDM_SAVESLOT1, IDM_SAVESLOT10, CFrame::OnSaveState)
-EVT_MENU_RANGE(IDM_SELECTSLOT1, IDM_SELECTSLOT10, CFrame::OnSelectSlot)
-EVT_MENU_RANGE(IDM_FRAMESKIP0, IDM_FRAMESKIP9, CFrame::OnFrameSkip)
+EVT_MENU(IDM_PURGE_CACHE, CFrame::GameListChanged)
+
+EVT_MENU(IDM_SAVE_FIRST_STATE, CFrame::OnSaveFirstState)
+EVT_MENU(IDM_UNDO_LOAD_STATE,     CFrame::OnUndoLoadState)
+EVT_MENU(IDM_UNDO_SAVE_STATE,     CFrame::OnUndoSaveState)
+EVT_MENU(IDM_LOAD_STATE_FILE, CFrame::OnLoadStateFromFile)
+EVT_MENU(IDM_SAVE_STATE_FILE, CFrame::OnSaveStateToFile)
+EVT_MENU(IDM_SAVE_SELECTED_SLOT, CFrame::OnSaveCurrentSlot)
+EVT_MENU(IDM_LOAD_SELECTED_SLOT, CFrame::OnLoadCurrentSlot)
+
+EVT_MENU_RANGE(IDM_LOAD_SLOT_1, IDM_LOAD_SLOT_10, CFrame::OnLoadState)
+EVT_MENU_RANGE(IDM_LOAD_LAST_1, IDM_LOAD_LAST_8, CFrame::OnLoadLastState)
+EVT_MENU_RANGE(IDM_SAVE_SLOT_1, IDM_SAVE_SLOT_10, CFrame::OnSaveState)
+EVT_MENU_RANGE(IDM_SELECT_SLOT_1, IDM_SELECT_SLOT_10, CFrame::OnSelectSlot)
+EVT_MENU_RANGE(IDM_FRAME_SKIP_0, IDM_FRAME_SKIP_9, CFrame::OnFrameSkip)
 EVT_MENU_RANGE(IDM_DRIVE1, IDM_DRIVE24, CFrame::OnBootDrive)
 EVT_MENU_RANGE(IDM_CONNECT_WIIMOTE1, IDM_CONNECT_BALANCEBOARD, CFrame::OnConnectWiimote)
-EVT_MENU_RANGE(IDM_LISTWAD, IDM_LISTDRIVES, CFrame::GameListChanged)
+EVT_MENU_RANGE(IDM_LIST_WAD, IDM_LIST_DRIVES, CFrame::GameListChanged)
 
 // Other
 EVT_ACTIVATE(CFrame::OnActive)
@@ -354,7 +354,7 @@ CFrame::CFrame(wxFrame* parent,
 	, m_bBatchMode(_BatchMode), m_bEdit(false), m_bTabSplit(false), m_bNoDocking(false)
 	, m_bGameLoading(false), m_bClosing(false), m_confirmStop(false), m_menubar_shadow(nullptr)
 {
-	for (int i = 0; i <= IDM_CODEWINDOW - IDM_LOGWINDOW; i++)
+	for (int i = 0; i <= IDM_CODE_WINDOW - IDM_LOG_WINDOW; i++)
 		bFloatWindow[i] = false;
 
 	if (ShowLogWindow)
@@ -367,7 +367,7 @@ CFrame::CFrame(wxFrame* parent,
 	// Debugger class
 	if (UseDebugger)
 	{
-		g_pCodeWindow = new CCodeWindow(SConfig::GetInstance().m_LocalCoreStartupParameter, this, IDM_CODEWINDOW);
+		g_pCodeWindow = new CCodeWindow(SConfig::GetInstance().m_LocalCoreStartupParameter, this, IDM_CODE_WINDOW);
 		LoadIniPerspectives();
 		g_pCodeWindow->Load();
 	}
@@ -417,7 +417,7 @@ CFrame::CFrame(wxFrame* parent,
 	RecreateToolbar();
 	if (!SConfig::GetInstance().m_InterfaceToolbar) DoToggleToolbar(false);
 
-	m_LogWindow = new CLogWindow(this, IDM_LOGWINDOW);
+	m_LogWindow = new CLogWindow(this, IDM_LOG_WINDOW);
 	m_LogWindow->Hide();
 	m_LogWindow->Disable();
 
@@ -685,20 +685,20 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
 {
 	switch (event.GetId())
 	{
-	case IDM_UPDATEGUI:
+	case IDM_UPDATE_GUI:
 		UpdateGUI();
 		break;
 
-	case IDM_UPDATESTATUSBAR:
+	case IDM_UPDATE_STATUS_BAR:
 		if (GetStatusBar() != nullptr)
 			GetStatusBar()->SetStatusText(event.GetString(), event.GetInt());
 		break;
 
-	case IDM_UPDATETITLE:
+	case IDM_UPDATE_TITLE:
 		UpdateTitle(WxStrToStr(event.GetString()));
 		break;
 
-	case IDM_WINDOWSIZEREQUEST:
+	case IDM_WINDOW_SIZE_REQUEST:
 		{
 			std::pair<int, int> *win_size = (std::pair<int, int> *)(event.GetClientData());
 			OnRenderWindowSizeRequest(win_size->first, win_size->second);
@@ -706,7 +706,7 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
 		}
 		break;
 
-	case IDM_FULLSCREENREQUEST:
+	case IDM_FULLSCREEN_REQUEST:
 		{
 			bool enable_fullscreen = event.GetInt() == 0 ? false : true;
 			ToggleDisplayMode(enable_fullscreen);
@@ -864,22 +864,22 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event))
 		SConfig::GetInstance().m_ListTaiwan =
 		SConfig::GetInstance().m_ListUnknown = true;
 
-		GetMenuBar()->FindItem(IDM_LISTGC)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTWII)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTWAD)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTJAP)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTUSA)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTPAL)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTAUSTRALIA)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTFRANCE)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTGERMANY)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTITALY)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTKOREA)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTNETHERLANDS)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTRUSSIA)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTSPAIN)->Check(true);
-		GetMenuBar()->FindItem(IDM_LISTTAIWAN)->Check(true);
-		GetMenuBar()->FindItem(IDM_LIST_UNK)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_GC)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_WII)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_WAD)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_JAP)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_USA)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_PAL)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_AUSTRALIA)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_FRANCE)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_GERMANY)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_ITALY)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_KOREA)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_NETHERLANDS)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_RUSSIA)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_SPAIN)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_TAIWAN)->Check(true);
+		GetMenuBar()->FindItem(IDM_LIST_UNKNOWN)->Check(true);
 
 		m_GameListCtrl->Update();
 	}
@@ -906,16 +906,16 @@ int GetCmdForHotkey(unsigned int key)
 	switch (key)
 	{
 	case HK_OPEN: return wxID_OPEN;
-	case HK_CHANGE_DISC: return IDM_CHANGEDISC;
+	case HK_CHANGE_DISC: return IDM_CHANGE_DISC;
 	case HK_REFRESH_LIST: return wxID_REFRESH;
 	case HK_PLAY_PAUSE: return IDM_PLAY;
 	case HK_STOP: return IDM_STOP;
 	case HK_RESET: return IDM_RESET;
 	case HK_FRAME_ADVANCE: return IDM_FRAMESTEP;
 	case HK_START_RECORDING: return IDM_RECORD;
-	case HK_PLAY_RECORDING: return IDM_PLAYRECORD;
-	case HK_EXPORT_RECORDING: return IDM_RECORDEXPORT;
-	case HK_READ_ONLY_MODE: return IDM_RECORDREADONLY;
+	case HK_PLAY_RECORDING: return IDM_PLAY_RECORD;
+	case HK_EXPORT_RECORDING: return IDM_RECORD_EXPORT;
+	case HK_READ_ONLY_MODE: return IDM_RECORD_READ_ONLY;
 	case HK_FULLSCREEN: return IDM_TOGGLE_FULLSCREEN;
 	case HK_SCREENSHOT: return IDM_SCREENSHOT;
 	case HK_EXIT: return wxID_EXIT;
@@ -926,55 +926,55 @@ int GetCmdForHotkey(unsigned int key)
 	case HK_WIIMOTE4_CONNECT: return IDM_CONNECT_WIIMOTE4;
 	case HK_BALANCEBOARD_CONNECT: return IDM_CONNECT_BALANCEBOARD;
 
-	case HK_LOAD_STATE_SLOT_1: return IDM_LOADSLOT1;
-	case HK_LOAD_STATE_SLOT_2: return IDM_LOADSLOT2;
-	case HK_LOAD_STATE_SLOT_3: return IDM_LOADSLOT3;
-	case HK_LOAD_STATE_SLOT_4: return IDM_LOADSLOT4;
-	case HK_LOAD_STATE_SLOT_5: return IDM_LOADSLOT5;
-	case HK_LOAD_STATE_SLOT_6: return IDM_LOADSLOT6;
-	case HK_LOAD_STATE_SLOT_7: return IDM_LOADSLOT7;
-	case HK_LOAD_STATE_SLOT_8: return IDM_LOADSLOT8;
-	case HK_LOAD_STATE_SLOT_9: return IDM_LOADSLOT9;
-	case HK_LOAD_STATE_SLOT_10: return IDM_LOADSLOT10;
-
-	case HK_SAVE_STATE_SLOT_1: return IDM_SAVESLOT1;
-	case HK_SAVE_STATE_SLOT_2: return IDM_SAVESLOT2;
-	case HK_SAVE_STATE_SLOT_3: return IDM_SAVESLOT3;
-	case HK_SAVE_STATE_SLOT_4: return IDM_SAVESLOT4;
-	case HK_SAVE_STATE_SLOT_5: return IDM_SAVESLOT5;
-	case HK_SAVE_STATE_SLOT_6: return IDM_SAVESLOT6;
-	case HK_SAVE_STATE_SLOT_7: return IDM_SAVESLOT7;
-	case HK_SAVE_STATE_SLOT_8: return IDM_SAVESLOT8;
-	case HK_SAVE_STATE_SLOT_9: return IDM_SAVESLOT9;
-	case HK_SAVE_STATE_SLOT_10: return IDM_SAVESLOT10;
-
-	case HK_LOAD_LAST_STATE_1: return IDM_LOADLAST1;
-	case HK_LOAD_LAST_STATE_2: return IDM_LOADLAST2;
-	case HK_LOAD_LAST_STATE_3: return IDM_LOADLAST3;
-	case HK_LOAD_LAST_STATE_4: return IDM_LOADLAST4;
-	case HK_LOAD_LAST_STATE_5: return IDM_LOADLAST5;
-	case HK_LOAD_LAST_STATE_6: return IDM_LOADLAST6;
-	case HK_LOAD_LAST_STATE_7: return IDM_LOADLAST7;
-	case HK_LOAD_LAST_STATE_8: return IDM_LOADLAST8;
-
-	case HK_SAVE_FIRST_STATE: return IDM_SAVEFIRSTSTATE;
-	case HK_UNDO_LOAD_STATE: return IDM_UNDOLOADSTATE;
-	case HK_UNDO_SAVE_STATE: return IDM_UNDOSAVESTATE;
-	case HK_LOAD_STATE_FILE: return IDM_LOADSTATEFILE;
-	case HK_SAVE_STATE_FILE: return IDM_SAVESTATEFILE;
-
-	case HK_SELECT_STATE_SLOT_1: return IDM_SELECTSLOT1;
-	case HK_SELECT_STATE_SLOT_2: return IDM_SELECTSLOT2;
-	case HK_SELECT_STATE_SLOT_3: return IDM_SELECTSLOT3;
-	case HK_SELECT_STATE_SLOT_4: return IDM_SELECTSLOT4;
-	case HK_SELECT_STATE_SLOT_5: return IDM_SELECTSLOT5;
-	case HK_SELECT_STATE_SLOT_6: return IDM_SELECTSLOT6;
-	case HK_SELECT_STATE_SLOT_7: return IDM_SELECTSLOT7;
-	case HK_SELECT_STATE_SLOT_8: return IDM_SELECTSLOT8;
-	case HK_SELECT_STATE_SLOT_9: return IDM_SELECTSLOT9;
-	case HK_SELECT_STATE_SLOT_10: return IDM_SELECTSLOT10;
-	case HK_SAVE_STATE_SLOT_SELECTED: return IDM_SAVESELECTEDSLOT;
-	case HK_LOAD_STATE_SLOT_SELECTED: return IDM_LOADSELECTEDSLOT;
+	case HK_LOAD_STATE_SLOT_1: return IDM_LOAD_SLOT_1;
+	case HK_LOAD_STATE_SLOT_2: return IDM_LOAD_SLOT_2;
+	case HK_LOAD_STATE_SLOT_3: return IDM_LOAD_SLOT_3;
+	case HK_LOAD_STATE_SLOT_4: return IDM_LOAD_SLOT_4;
+	case HK_LOAD_STATE_SLOT_5: return IDM_LOAD_SLOT_5;
+	case HK_LOAD_STATE_SLOT_6: return IDM_LOAD_SLOT_6;
+	case HK_LOAD_STATE_SLOT_7: return IDM_LOAD_SLOT_7;
+	case HK_LOAD_STATE_SLOT_8: return IDM_LOAD_SLOT_8;
+	case HK_LOAD_STATE_SLOT_9: return IDM_LOAD_SLOT_9;
+	case HK_LOAD_STATE_SLOT_10: return IDM_LOAD_SLOT_10;
+
+	case HK_SAVE_STATE_SLOT_1: return IDM_SAVE_SLOT_1;
+	case HK_SAVE_STATE_SLOT_2: return IDM_SAVE_SLOT_2;
+	case HK_SAVE_STATE_SLOT_3: return IDM_SAVE_SLOT_3;
+	case HK_SAVE_STATE_SLOT_4: return IDM_SAVE_SLOT_4;
+	case HK_SAVE_STATE_SLOT_5: return IDM_SAVE_SLOT_5;
+	case HK_SAVE_STATE_SLOT_6: return IDM_SAVE_SLOT_6;
+	case HK_SAVE_STATE_SLOT_7: return IDM_SAVE_SLOT_7;
+	case HK_SAVE_STATE_SLOT_8: return IDM_SAVE_SLOT_8;
+	case HK_SAVE_STATE_SLOT_9: return IDM_SAVE_SLOT_9;
+	case HK_SAVE_STATE_SLOT_10: return IDM_SAVE_SLOT_10;
+
+	case HK_LOAD_LAST_STATE_1: return IDM_LOAD_LAST_1;
+	case HK_LOAD_LAST_STATE_2: return IDM_LOAD_LAST_2;
+	case HK_LOAD_LAST_STATE_3: return IDM_LOAD_LAST_3;
+	case HK_LOAD_LAST_STATE_4: return IDM_LOAD_LAST_4;
+	case HK_LOAD_LAST_STATE_5: return IDM_LOAD_LAST_5;
+	case HK_LOAD_LAST_STATE_6: return IDM_LOAD_LAST_6;
+	case HK_LOAD_LAST_STATE_7: return IDM_LOAD_LAST_7;
+	case HK_LOAD_LAST_STATE_8: return IDM_LOAD_LAST_8;
+
+	case HK_SAVE_FIRST_STATE: return IDM_SAVE_FIRST_STATE;
+	case HK_UNDO_LOAD_STATE: return IDM_UNDO_LOAD_STATE;
+	case HK_UNDO_SAVE_STATE: return IDM_UNDO_SAVE_STATE;
+	case HK_LOAD_STATE_FILE: return IDM_LOAD_STATE_FILE;
+	case HK_SAVE_STATE_FILE: return IDM_SAVE_STATE_FILE;
+
+	case HK_SELECT_STATE_SLOT_1: return IDM_SELECT_SLOT_1;
+	case HK_SELECT_STATE_SLOT_2: return IDM_SELECT_SLOT_2;
+	case HK_SELECT_STATE_SLOT_3: return IDM_SELECT_SLOT_3;
+	case HK_SELECT_STATE_SLOT_4: return IDM_SELECT_SLOT_4;
+	case HK_SELECT_STATE_SLOT_5: return IDM_SELECT_SLOT_5;
+	case HK_SELECT_STATE_SLOT_6: return IDM_SELECT_SLOT_6;
+	case HK_SELECT_STATE_SLOT_7: return IDM_SELECT_SLOT_7;
+	case HK_SELECT_STATE_SLOT_8: return IDM_SELECT_SLOT_8;
+	case HK_SELECT_STATE_SLOT_9: return IDM_SELECT_SLOT_9;
+	case HK_SELECT_STATE_SLOT_10: return IDM_SELECT_SLOT_10;
+	case HK_SAVE_STATE_SLOT_SELECTED: return IDM_SAVE_SELECTED_SLOT;
+	case HK_LOAD_STATE_SLOT_SELECTED: return IDM_LOAD_SELECTED_SLOT;
 
 	case HK_FREELOOK_INCREASE_SPEED: return IDM_FREELOOK_INCREASE_SPEED;
 	case HK_FREELOOK_DECREASE_SPEED: return IDM_FREELOOK_DECREASE_SPEED;
@@ -996,7 +996,7 @@ void OnAfterLoadCallback()
 	// warning: this gets called from the CPU thread, so we should only queue things to do on the proper thread
 	if (main_frame)
 	{
-		wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATEGUI);
+		wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATE_GUI);
 		main_frame->GetEventHandler()->AddPendingEvent(event);
 	}
 }
@@ -1151,7 +1151,7 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
 				if (IsHotkey (event, i))
 				{
 					wxCommandEvent slot_event;
-					slot_event.SetId(i + IDM_SELECTSLOT1 - HK_SELECT_STATE_SLOT_1);
+					slot_event.SetId(i + IDM_SELECT_SLOT_1 - HK_SELECT_STATE_SLOT_1);
 					CFrame::OnSelectSlot(slot_event);
 				}
 			}