diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-10-05 05:31:45 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-10-05 05:31:48 -0400 |
| commit | 41ea4a28b2eacde51858f419e8f326d32be1cacd (patch) | |
| tree | f885a3b29a5630d8d264aa18a4d6b749324870d2 /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | ed7f0739ae31c07c31d013964986c549317aba6e (diff) | |
DolphinWX: Make WXInputBase part of the WxUtils namespace.
There's no need for the preprocessor checks for wx, since this is used in wx code. Also, this being a part of the InputCommon namespace is kind of wrong.
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 0d62bd5b53..bc4e6f5fdd 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -511,8 +511,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'; |
