summaryrefslogtreecommitdiffstats
path: root/platform/osx/joypad_osx.h
diff options
context:
space:
mode:
authorbruvzg <7645683+bruvzg@users.noreply.github.com>2020-03-07 18:02:54 +0200
committerbruvzg <7645683+bruvzg@users.noreply.github.com>2020-03-26 16:24:05 +0100
commit15a9f94346c211b7afe96af500cb3405aabcf6b8 (patch)
tree150287a257a89a0ff579bcc81baa75a0bbca8c79 /platform/osx/joypad_osx.h
parent197cb4e7718034aba35832a547477dfc858a7280 (diff)
downloadredot-engine-15a9f94346c211b7afe96af500cb3405aabcf6b8.tar.gz
Add macOS DisplayServer implementation.
Change global menu to use Callable, add support for check items and submenus.
Diffstat (limited to 'platform/osx/joypad_osx.h')
-rw-r--r--platform/osx/joypad_osx.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/osx/joypad_osx.h b/platform/osx/joypad_osx.h
index c8ed8fbfa9..62027c6a30 100644
--- a/platform/osx/joypad_osx.h
+++ b/platform/osx/joypad_osx.h
@@ -94,7 +94,7 @@ class JoypadOSX {
};
private:
- InputDefault *input;
+ InputFilter *input;
IOHIDManagerRef hid_manager;
Vector<joypad> device_list;
@@ -118,7 +118,7 @@ public:
void _device_added(IOReturn p_res, IOHIDDeviceRef p_device);
void _device_removed(IOReturn p_res, IOHIDDeviceRef p_device);
- JoypadOSX();
+ JoypadOSX(InputFilter *in);
~JoypadOSX();
};