diff options
Diffstat (limited to 'Source/Core/InputCommon')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h | 5 | ||||
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h index 930f849a17..e5c2c1b3d4 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h @@ -26,7 +26,7 @@ private: public: std::string GetName() const; bool IsDetectable() { return false; } - Cursor(u8 index, const float& axis, const bool positive) : m_index(index), m_axis(axis), m_positive(positive) {} + Cursor(u8 index, const float& axis, const bool positive) : m_axis(axis), m_index(index), m_positive(positive) {} ControlState GetState() const; private: const float& m_axis; @@ -37,7 +37,7 @@ private: { public: std::string GetName() const; - Button(u8 index, const unsigned char& button) : m_index(index), m_button(button) {} + Button(u8 index, const unsigned char& button) : m_button(button), m_index(index) {} ControlState GetState() const; private: const unsigned char& m_button; @@ -63,7 +63,6 @@ private: const IOHIDDeviceRef m_device; const std::string m_device_name; int m_index; - void *m_window; uint32_t m_windowid; unsigned char m_mousebuttons[3]; }; diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm index 003240d4a9..6473f00e77 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm +++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm @@ -16,7 +16,6 @@ Keyboard::Keyboard(IOHIDDeviceRef device, std::string name, int index, void *win : m_device(device) , m_device_name(name) , m_index(index) - , m_window(window) { // This class should only recieve Keyboard or Keypad devices // Now, filter on just the buttons we can handle sanely |