diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-12-01 04:19:44 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-12-01 04:19:44 -0500 |
| commit | 3210a942ecc479f8d1fd6f45ee72a6e53396ed08 (patch) | |
| tree | a7fd3ec48029cf3180036337f1c445ef858398bf /Source/Core/DolphinWX/Frame.cpp | |
| parent | 6df67bf38f52151ee5efb64edb4bc60ecce601ef (diff) | |
| parent | 21d039059eed7dbd23dadb7080fbf0ff1cd14a91 (diff) | |
Merge pull request #1587 from lioncash/input-move
Unify the controller configuration dialogs.
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 96752dfbcc..8785fa93df 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -260,8 +260,7 @@ EVT_MENU(IDM_TOGGLE_DUMPAUDIO, CFrame::OnToggleDumpAudio) EVT_MENU(wxID_PREFERENCES, CFrame::OnConfigMain) EVT_MENU(IDM_CONFIG_GFX_BACKEND, CFrame::OnConfigGFX) EVT_MENU(IDM_CONFIG_DSP_EMULATOR, CFrame::OnConfigDSP) -EVT_MENU(IDM_CONFIG_PAD_PLUGIN, CFrame::OnConfigPAD) -EVT_MENU(IDM_CONFIG_WIIMOTE_PLUGIN, CFrame::OnConfigWiimote) +EVT_MENU(IDM_CONFIG_CONTROLLERS, CFrame::OnConfigControllers) EVT_MENU(IDM_CONFIG_HOTKEYS, CFrame::OnConfigHotkey) EVT_MENU(IDM_SAVE_PERSPECTIVE, CFrame::OnPerspectiveMenu) |
