Merge pull request #2204 from Stevoisiak/CheatWindowConsistency

DolphinWX: Changed "OnShow_CheatsWindow" to "OnShowCheatsWindow"
dolphin-emu · Mar 13, 2015 · 41ad0f6 · 41ad0f6
2 parents 46a67dd + 2f0e3d2
commit 41ad0f6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
@@ -295,7 +295,7 @@ EVT_MENU(IDM_BROWSE, CFrame::OnBrowse)
 EVT_MENU(IDM_MEMCARD, CFrame::OnMemcard)
 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_CHEATS, CFrame::OnShowCheatsWindow)
 EVT_MENU(IDM_CHANGE_DISC, CFrame::OnChangeDisc)
 EVT_MENU(IDM_MENU_INSTALL_WAD, CFrame::OnInstallWAD)
 EVT_MENU(IDM_LIST_INSTALL_WAD, CFrame::OnInstallWAD)
@@ -313,8 +313,8 @@ EVT_MENU_RANGE(IDM_SHOW_SYSTEM, IDM_SHOW_STATE, CFrame::OnChangeColumnsVisible)
 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_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)

diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h
@@ -342,7 +342,7 @@ class CFrame : public CRenderFrame
 
 	void OnNetPlay(wxCommandEvent& event);
 
-	void OnShow_CheatsWindow(wxCommandEvent& event);
+	void OnShowCheatsWindow(wxCommandEvent& event);
 	void OnLoadWiiMenu(wxCommandEvent& event);
 	void OnInstallWAD(wxCommandEvent& event);
 	void OnFifoPlayer(wxCommandEvent& event);

diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
@@ -1484,7 +1484,7 @@ void CFrame::OnImportSave(wxCommandEvent& WXUNUSED (event))
 	}
 }
 
-void CFrame::OnShow_CheatsWindow(wxCommandEvent& WXUNUSED (event))
+void CFrame::OnShowCheatsWindow(wxCommandEvent& WXUNUSED (event))
 {
 	if (!g_CheatsWindow)
 		g_CheatsWindow = new wxCheatsWindow(this);