From 41ea4a28b2eacde51858f419e8f326d32be1cacd Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 5 Oct 2014 05:31:45 -0400 Subject: 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. --- Source/Core/DolphinWX/FrameTools.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/DolphinWX/FrameTools.cpp') 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'; -- cgit v1.2.3