piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

DolphinWX: Make WXInputBase part of the WxUtils namespace.

Browse Source 
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.
This commit is contained in:
Lioncash
2014-10-05 05:31:45 -04:00
parent ed7f0739ae
commit 41ea4a28b2
4 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DolphinWX/HotkeyDlg.cpp
View File

@ -97,8 +97,8 @@ void HotkeyConfigDialog::OnKeyDown(wxKeyEvent& event)
// We compare against this to see if we have a duplicate bind attempt.
wxString existingHotkey = btn->GetLabel();
wxString tentativeModKey = InputCommon::WXKeymodToString(g_Modkey);
wxString tentativePressedKey = InputCommon::WXKeyToString(g_Pressed);
wxString tentativeModKey = WxUtils::WXKeymodToString(g_Modkey);
wxString tentativePressedKey = WxUtils::WXKeyToString(g_Pressed);
wxString tentativeHotkey(tentativeModKey + tentativePressedKey);
// Found a button that already has this binding. Unbind it.
@ -111,8 +111,8 @@ void HotkeyConfigDialog::OnKeyDown(wxKeyEvent& event)
// Proceed to apply the binding to the selected button.
SetButtonText(ClickedButton->GetId(),
InputCommon::WXKeyToString(g_Pressed),
InputCommon::WXKeymodToString(g_Modkey));
WxUtils::WXKeyToString(g_Pressed),
WxUtils::WXKeymodToString(g_Modkey));
SaveButtonMapping(ClickedButton->GetId(), g_Pressed, g_Modkey);
}
EndGetButtons();
@ -322,8 +322,8 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls()
m_Button_Hotkeys[i]->SetFont(m_SmallFont);
m_Button_Hotkeys[i]->SetToolTip(_("Left click to detect hotkeys.\nEnter space to clear."));
SetButtonText(i,
InputCommon::WXKeyToString(SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[i]),
InputCommon::WXKeymodToString(
WxUtils::WXKeyToString(SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[i]),
WxUtils::WXKeymodToString(
SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[i]));
wxBoxSizer *sHotkey = new wxBoxSizer(wxHORIZONTAL);