From 7b45ac6e01fd6b817cec19a277241888a60e50dc Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 19 Oct 2010 23:11:22 +0000 Subject: Made it easer to use mouse/keyboard and a gamepad together on the same emulated wiimote. Renamed mouse buttons from "Button N" to "Click N" so they do not conflict with gamepad buttons.(hopefully not too ugly, mouse buttons will need to be reconfigured) (Fixes issue 3363) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6289 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXMouse.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/InputCommon/Src/ControllerInterface/OSX') diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXMouse.mm b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXMouse.mm index e55533aeba..b853d3b992 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXMouse.mm +++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXMouse.mm @@ -115,7 +115,7 @@ Mouse::Button::Button(IOHIDElementRef element) { std::ostringstream s; s << IOHIDElementGetUsage(m_element); - m_name = std::string("Button ") + s.str(); + m_name = std::string("Click ") + s.str(); } ControlState Mouse::Button::GetState(IOHIDDeviceRef device) const -- cgit v1.2.3