X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c8ef3d5565e6f1c1a23baa3be7d6a7b42151c616..60372b0d54379701d62edf5595a7dc25c48330e1:/src/osx/core/hidjoystick.cpp?ds=sidebyside diff --git a/src/osx/core/hidjoystick.cpp b/src/osx/core/hidjoystick.cpp index 95bc4a7bf0..d1563b650c 100644 --- a/src/osx/core/hidjoystick.cpp +++ b/src/osx/core/hidjoystick.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/mac/corefoundation/joystick.cpp +// Name: src/osx/core/joystick.cpp // Purpose: wxJoystick class // Author: Ryan Norton // Modified by: @@ -157,8 +157,7 @@ wxJoystick::wxJoystick(int joystick) } else { - delete m_hid; - m_hid = NULL; + wxDELETE(m_hid); } } @@ -174,8 +173,7 @@ wxJoystick::~wxJoystick() if (m_thread) m_thread->Delete(); // It's detached so it will delete itself - if (m_hid) - delete m_hid; + delete m_hid; } //--------------------------------------------------------------------------- @@ -780,7 +778,7 @@ void* wxJoystickThread::Entry() //--------------------------------------------------------------------------- // wxJoystickThread::HIDCallback (static) // -// Callback for the native HID device when it recieves input. +// Callback for the native HID device when it receives input. // // This is where the REAL dirty work gets done. // @@ -895,11 +893,11 @@ void* wxJoystickThread::Entry() wxevent.SetEventObject(pThis->m_catchwin); if (pThis->m_catchwin) - pThis->m_catchwin->AddPendingEvent(wxevent); + pThis->m_catchwin->GetEventHandler()->AddPendingEvent(wxevent); ret = (*m_hid->GetQueue())->getNextEvent(m_hid->GetQueue(), &hidevent, bogustime, 0); } } -#endif // wxUSE_JOYSTICK +#endif // wxUSE_JOYSTICK