more checks for non-scrolling windows, some code duplication cleanup

[wxWidgets.git] / src / mac / corefoundation / hidjoystick.cpp

diff --git a/src/mac/corefoundation/hidjoystick.cpp b/src/mac/corefoundation/hidjoystick.cpp
index d3017da77cf6b320d76fe293e990b23670f59d43..a0e63d71dbe084de5a7944b9f5a38050113e5f6d 100644 (file)
--- a/src/mac/corefoundation/hidjoystick.cpp
+++ b/src/mac/corefoundation/hidjoystick.cpp
@@ -33,12 +33,12 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/event.h"   //joystick wxEvents
+    #include "wx/window.h"  //for wxWindow to "capture" joystick
 #endif
 
-#include "wx/event.h"       //joystick wxEvents
 #include "wx/joystick.h"    //...
 #include "wx/thread.h"      //wxThread for polling thread/ wxCriticalSection
-#include "wx/window.h"      //for wxWindow to "capture" joystick
 
 //private headers
 #include "wx/mac/corefoundation/hid.h" //private mac hid stuff
@@ -75,7 +75,7 @@ class wxHIDJoystick : public wxHIDDevice
 {
 public:
     wxHIDJoystick();
-    ~wxHIDJoystick();
+    virtual ~wxHIDJoystick();
 
     bool Create(int nWhich);
     virtual void BuildCookies(CFArrayRef Array);