Minor header cleaning.

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

diff --git a/src/unix/joystick.cpp b/src/unix/joystick.cpp
index fcb266cc1d9cb9a82fff3aaa3f9c61a9cc2795ca..64afa78cb989e8286f7a8fec2b91cb99e1e378e9 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:
 // 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"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-

 #if wxUSE_JOYSTICK
 
 #include "wx/joystick.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>
 #include <linux/joystick.h>
 #include <sys/types.h>
 #include <sys/stat.h>


@@ -26,8 +29,10 @@
 #include <fcntl.h>
 #include <unistd.h>
 
 #include <fcntl.h>
 #include <unistd.h>
 

-#include "wx/event.h"
-#include "wx/window.h"
+#ifdef HAVE_SYS_SELECT_H
+#   include <sys/select.h>
+#endif
+

 #include "wx/unix/private.h"
 
 enum {
 #include "wx/unix/private.h"
 
 enum {


@@ -188,7 +193,7 @@ wxJoystick::wxJoystick(int joystick)
     if (m_device == -1)
     {
         dev_name.Printf( wxT("/dev/input/js%d"), 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)
     }
 
     if (m_device != -1)


@@ -283,7 +288,7 @@ bool wxJoystick::IsOk() const
     return (m_device != -1);
 }
 
     return (m_device != -1);
 }
 

-int wxJoystick::GetNumberJoysticks() const
+int wxJoystick::GetNumberJoysticks()

 {
     wxString dev_name;
     int fd, j;
 {
     wxString dev_name;
     int fd, j;


@@ -295,7 +300,7 @@ int wxJoystick::GetNumberJoysticks() const
             break;
         close(fd);
     }
             break;
         close(fd);
     }

-    
+

     if (j == 0) {
         for (j=0; j<4; j++) {
             dev_name.Printf(wxT("/dev/input/js%d"), j);
     if (j == 0) {
         for (j=0; j<4; j++) {
             dev_name.Printf(wxT("/dev/input/js%d"), j);


@@ -305,7 +310,7 @@ int wxJoystick::GetNumberJoysticks() const
             close(fd);
         }
     }
             close(fd);
         }
     }

-    
+

     return j;
 }
 
     return j;
 }
 


@@ -489,4 +494,3 @@ bool wxJoystick::ReleaseCapture()
     return false;
 }
 #endif  // wxUSE_JOYSTICK
     return false;
 }
 #endif  // wxUSE_JOYSTICK

-