ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1225 from lioncash/lolwx 

DolphinWX: Make WXInputBase part of the WxUtils namespace.
This commit is contained in:
skidau 2014-10-07 13:28:25 +11:00
parent b3b34d16e6 41ea4a28b2
commit 1b573c4ca0
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -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';

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);

2
Source/Core/DolphinWX/WXInputBase.cpp
View File

@ -9,7 +9,7 @@
#include "DolphinWX/WXInputBase.h"
namespace InputCommon
namespace WxUtils
{
const wxString WXKeyToString(int keycode)

6
Source/Core/DolphinWX/WXInputBase.h
View File

@ -4,14 +4,10 @@
#pragma once
#if defined(HAVE_WX) && HAVE_WX
#include <wx/string.h>
#endif
namespace InputCommon
namespace WxUtils
{
#if defined(HAVE_WX) && HAVE_WX
const wxString WXKeyToString(int keycode);
const wxString WXKeymodToString(int modifier);
#endif
}