X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5276b0a53cef4815230e39b54d2ecda14f72cbd1..cb04da13bddf9c70028b7adb55ac4efbb92ce4d4:/src/osx/core/hidjoystick.cpp diff --git a/src/osx/core/hidjoystick.cpp b/src/osx/core/hidjoystick.cpp index 3bd17b1f33..fcc0889e90 100644 --- a/src/osx/core/hidjoystick.cpp +++ b/src/osx/core/hidjoystick.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/osx/corefoundation/joystick.cpp +// Name: src/osx/core/joystick.cpp // Purpose: wxJoystick class // Author: Ryan Norton // Modified by: @@ -191,25 +191,25 @@ wxPoint wxJoystick::GetPosition() const int wxJoystick::GetZPosition() const { if (m_thread) - return m_thread->m_axe[wxJS_AXIS_Z]; + return m_thread->m_axe[wxJS_AXIS_Z-wxJS_AXIS_X]; return 0; } int wxJoystick::GetRudderPosition() const { if (m_thread) - return m_thread->m_axe[wxJS_AXIS_RUDDER]; + return m_thread->m_axe[wxJS_AXIS_RUDDER-wxJS_AXIS_X]; return 0; } int wxJoystick::GetUPosition() const { if (m_thread) - return m_thread->m_axe[wxJS_AXIS_U]; + return m_thread->m_axe[wxJS_AXIS_U-wxJS_AXIS_X]; return 0; } int wxJoystick::GetVPosition() const { if (m_thread) - return m_thread->m_axe[wxJS_AXIS_V]; + return m_thread->m_axe[wxJS_AXIS_V-wxJS_AXIS_X]; return 0; } @@ -778,11 +778,11 @@ 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. // -// 1) Loops through each event the queue has recieved +// 1) Loops through each event the queue has received // 2) First, checks if the thread that is running the loop for // the polling has ended - if so it breaks out // 3) Next, it checks if there was an error getting this event from