diff options
| author | skidau <skidau@gmail.com> | 2014-10-07 13:28:25 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2014-10-07 13:28:25 +1100 |
| commit | 1b573c4ca09889e9e45fcf53db2cafb9f5312d64 (patch) | |
| tree | 9429f85d5899b28710ea79cc91c8e5e7922d3868 /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | b3b34d16e6591cfe3aa879b2d4643c1415424a3b (diff) | |
| parent | 41ea4a28b2eacde51858f419e8f326d32be1cacd (diff) | |
Merge pull request #1225 from lioncash/lolwx
DolphinWX: Make WXInputBase part of the WxUtils namespace.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 659437530a..4da987f7c8 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -513,8 +513,8 @@ wxString CFrame::GetMenuLabel(int Id) hotkeymodifier &= wxMOD_CONTROL | wxMOD_ALT | wxMOD_SHIFT; - Modifier = InputCommon::WXKeymodToString(hotkeymodifier); - Hotkey = InputCommon::WXKeyToString(hotkey); + Modifier = WxUtils::WXKeymodToString(hotkeymodifier); + Hotkey = WxUtils::WXKeyToString(hotkey); if (Modifier.Len() + Hotkey.Len() > 0) Label += '\t'; |