X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16519fd473f79954ba503dfa74a5cc4544391846..11716cbe14313011016472f56edb51c55aabe852:/src/osx/core/hidjoystick.cpp

diff --git a/src/osx/core/hidjoystick.cpp b/src/osx/core/hidjoystick.cpp
index 5fb651f34a..51ddae0743 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:
@@ -157,8 +157,7 @@ wxJoystick::wxJoystick(int joystick)
     }
     else
     {
-        delete m_hid;
-        m_hid = NULL;
+        wxDELETE(m_hid);
     }
 }
 
@@ -192,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;
 }
 
@@ -779,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.
 //
@@ -901,4 +900,4 @@ void* wxJoystickThread::Entry()
     }
 }
 
-#endif // wxUSE_JOYSTICK 
+#endif // wxUSE_JOYSTICK