X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4db172a3b318df9aff178eb6c5da149d56e0859..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/mac/corefoundation/hidjoystick.cpp diff --git a/src/mac/corefoundation/hidjoystick.cpp b/src/mac/corefoundation/hidjoystick.cpp index d3017da77c..637546c414 100644 --- a/src/mac/corefoundation/hidjoystick.cpp +++ b/src/mac/corefoundation/hidjoystick.cpp @@ -25,7 +25,7 @@ //--------------------------------------------------------------------------- //we only support HID on OSX (DARWIN), since it requires DARWIN... -#if wxUSE_JOYSTICK && defined(__DARWIN__) +#if wxUSE_JOYSTICK && wxUSE_THREADS //--------------------------------------------------------------------------- // Includes @@ -33,12 +33,12 @@ #ifndef WX_PRECOMP #include "wx/log.h" + #include "wx/event.h" //joystick wxEvents + #include "wx/window.h" //for wxWindow to "capture" joystick #endif -#include "wx/event.h" //joystick wxEvents #include "wx/joystick.h" //... #include "wx/thread.h" //wxThread for polling thread/ wxCriticalSection -#include "wx/window.h" //for wxWindow to "capture" joystick //private headers #include "wx/mac/corefoundation/hid.h" //private mac hid stuff @@ -75,7 +75,7 @@ class wxHIDJoystick : public wxHIDDevice { public: wxHIDJoystick(); - ~wxHIDJoystick(); + virtual ~wxHIDJoystick(); bool Create(int nWhich); virtual void BuildCookies(CFArrayRef Array); @@ -480,7 +480,7 @@ int wxJoystick::GetMovementThreshold() const return 0; } -void wxJoystick::SetMovementThreshold(int threshold) +void wxJoystick::SetMovementThreshold(int WXUNUSED(threshold)) { } @@ -795,8 +795,10 @@ void* wxJoystickThread::Entry() // 5) Sends the event to the polling window (if any) // 6) Gets the next event and goes back to (1) //--------------------------------------------------------------------------- -/*static*/ void wxJoystickThread::HIDCallback(void* target, IOReturn res, - void* context, void* sender) +/*static*/ void wxJoystickThread::HIDCallback(void* WXUNUSED(target), + IOReturn WXUNUSED(res), + void* context, + void* WXUNUSED(sender)) { IOHIDEventStruct hidevent; AbsoluteTime bogustime = {0,0}; @@ -900,4 +902,4 @@ void* wxJoystickThread::Entry() } } -#endif // wxUSE_JOYSTICK && defined(__DARWIN__) +#endif // wxUSE_JOYSTICK