diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-09-14 01:58:17 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-09-14 01:58:17 +0200 |
| commit | 9607cc4159b382a8c8d12467fe6fe3bc0cdc1f3c (patch) | |
| tree | ed8e5fb81090c0d695d4bdf76722046fe578a697 /Source/Core | |
| parent | 439068acae2a21388b9b8ac6479594769afb7ef8 (diff) | |
| parent | eae38fd339ba0cb791fface5972eb7aed630c6d8 (diff) | |
Merge pull request #1071 from archshift/patch-1
ConfigManager.cpp: Removed three elements from platform-ifdef
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/ConfigManager.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 132eaf8886..1f3ea14ae4 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -18,11 +18,10 @@ static const struct const int DefaultKey; const int DefaultModifier; } g_HKData[] = { -#ifdef __APPLE__ - { "Open", 79 /* 'O' */, 2 /* wxMOD_CMD */ }, + { "Open", 79 /* 'O' */, 2 /* wxMOD_CONTROL */}, { "ChangeDisc", 0, 0 /* wxMOD_NONE */ }, { "RefreshList", 0, 0 /* wxMOD_NONE */ }, - +#ifdef __APPLE__ { "PlayPause", 80 /* 'P' */, 2 /* wxMOD_CMD */ }, { "Stop", 87 /* 'W' */, 2 /* wxMOD_CMD */ }, { "Reset", 0, 0 /* wxMOD_NONE */ }, @@ -43,10 +42,6 @@ static const struct { "Wiimote4Connect", 52 /* '4' */, 2 /* wxMOD_CMD */ }, { "BalanceBoardConnect", 53 /* '4' */, 2 /* wxMOD_CMD */ }, #else - { "Open", 79 /* 'O' */, 2 /* wxMOD_CONTROL */}, - { "ChangeDisc", 0, 0 /* wxMOD_NONE */ }, - { "RefreshList", 0, 0 /* wxMOD_NONE */ }, - { "PlayPause", 349 /* WXK_F10 */, 0 /* wxMOD_NONE */ }, { "Stop", 27 /* WXK_ESCAPE */, 0 /* wxMOD_NONE */ }, { "Reset", 0, 0 /* wxMOD_NONE */ }, |