X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da9e956384a0619a0ecaa0bd1e4ba26b133b60a9..56614e51f9cd06ead4a43d318426d37a6378b710:/src/unix/joystick.cpp diff --git a/src/unix/joystick.cpp b/src/unix/joystick.cpp index 92e36ad5d7..64afa78cb9 100644 --- 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 #include #include @@ -26,8 +29,10 @@ #include #include -#include "wx/event.h" -#include "wx/window.h" +#ifdef HAVE_SYS_SELECT_H +# include +#endif + #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); - m_device = open(dev_name.fn_str(), O_RDONLY); + m_device = open(dev_name.fn_str(), O_RDONLY); } if (m_device != -1) @@ -295,7 +300,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 +310,7 @@ int wxJoystick::GetNumberJoysticks() close(fd); } } - + return j; } @@ -489,4 +494,3 @@ bool wxJoystick::ReleaseCapture() return false; } #endif // wxUSE_JOYSTICK -