Applied Blit system options optimization to StretchBlit

[wxWidgets.git] / src / osx / core / hidjoystick.cpp

diff --git a/src/osx/core/hidjoystick.cpp b/src/osx/core/hidjoystick.cpp
index 637546c41458c247a4a867e0c3b5380e2c698c73..d1563b650c0e92236abcf1a6764be75b91f6bcd1 100644 (file)
--- 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:
 // Purpose:     wxJoystick class
 // Author:      Ryan Norton
 // Modified by:


@@ -41,7 +41,7 @@
 #include "wx/thread.h"      //wxThread for polling thread/ wxCriticalSection
 
 //private headers
 #include "wx/thread.h"      //wxThread for polling thread/ wxCriticalSection
 
 //private headers

-#include "wx/mac/corefoundation/hid.h" //private mac hid stuff
+#include "wx/osx/core/hid.h" //private mac hid stuff

 
 //mac headers
 #include <CoreServices/CoreServices.h>
 
 //mac headers
 #include <CoreServices/CoreServices.h>


@@ -157,8 +157,7 @@ wxJoystick::wxJoystick(int joystick)
     }
     else
     {
     }
     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_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)
 //
 //---------------------------------------------------------------------------
 // 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.
 //
 //
 // 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)
         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);
     }
 }
 
 
         ret = (*m_hid->GetQueue())->getNextEvent(m_hid->GetQueue(),
                     &hidevent, bogustime, 0);
     }
 }
 

-#endif // wxUSE_JOYSTICK 
+#endif // wxUSE_JOYSTICK