removed TTN_NEEDTEXT handlers, we don't use tooltips on demand

[wxWidgets.git] / src / unix / joystick.cpp

diff --git a/src/unix/joystick.cpp b/src/unix/joystick.cpp
index 92e36ad5d795372fed3f81769b006cfda067bace..49a4cad688e7349d9cfaf6381fba283e21859f08 100644 (file)
--- a/src/unix/joystick.cpp
+++ b/src/unix/joystick.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        joystick.cpp
+// Name:        src/unix/joystick.cpp
 // Purpose:     wxJoystick class
 // Author:      Ported to Linux by Guilhem Lavaux
 // Modified by:
@@ -12,12 +12,15 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_JOYSTICK
 
 #include "wx/joystick.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/event.h"
+    #include "wx/window.h"
+#endif //WX_PRECOMP
+
 #include <linux/joystick.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -26,8 +29,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "wx/event.h"
-#include "wx/window.h"
 #include "wx/unix/private.h"
 
 enum {
@@ -188,7 +189,7 @@ wxJoystick::wxJoystick(int joystick)
     if (m_device == -1)
     {
         dev_name.Printf( wxT("/dev/input/js%d"), joystick);
-        m_device = open(dev_name.fn_str(), O_RDONLY);             
+        m_device = open(dev_name.fn_str(), O_RDONLY);
     }
 
     if (m_device != -1)
@@ -295,7 +296,7 @@ int wxJoystick::GetNumberJoysticks()
             break;
         close(fd);
     }
-    
+
     if (j == 0) {
         for (j=0; j<4; j++) {
             dev_name.Printf(wxT("/dev/input/js%d"), j);
@@ -305,7 +306,7 @@ int wxJoystick::GetNumberJoysticks()
             close(fd);
         }
     }
-    
+
     return j;
 }
 
@@ -489,4 +490,3 @@ bool wxJoystick::ReleaseCapture()
     return false;
 }
 #endif  // wxUSE_JOYSTICK
-