X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e6733873f5bc5de9ef538533da786250de9dd9c7..07aaf32633ecf18ec3edfbb41793a112914792d0:/src/unix/joystick.cpp?ds=sidebyside diff --git a/src/unix/joystick.cpp b/src/unix/joystick.cpp index f5ad718346..f9f2ba9d41 100644 --- a/src/unix/joystick.cpp +++ b/src/unix/joystick.cpp @@ -21,6 +21,8 @@ #include "wx/window.h" #endif //WX_PRECOMP +#include "wx/thread.h" + #include #include #include @@ -100,7 +102,7 @@ void wxJoystickThread::SendEvent(wxEventType type, long ts, int change) jwx_event.SetEventObject(m_catchwin); if (m_catchwin) - m_catchwin->AddPendingEvent(jwx_event); + m_catchwin->GetEventHandler()->AddPendingEvent(jwx_event); } void* wxJoystickThread::Entry() @@ -394,7 +396,7 @@ int wxJoystick::GetNumberButtons() const if (m_device != -1) ioctl(m_device, JSIOCGBUTTONS, &nb); - if (nb > wxJS_MAX_BUTTONS) + if ((int)nb > wxJS_MAX_BUTTONS) nb = wxJS_MAX_BUTTONS; return nb; @@ -407,7 +409,7 @@ int wxJoystick::GetNumberAxes() const if (m_device != -1) ioctl(m_device, JSIOCGAXES, &nb); - if (nb > wxJS_MAX_AXES) + if ((int)nb > wxJS_MAX_AXES) nb = wxJS_MAX_AXES; return nb;