X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..44ba8f0ea92f65d9893ce0780971745a5d8e80ea:/src/gtk/joystick.cpp diff --git a/src/gtk/joystick.cpp b/src/gtk/joystick.cpp index 372046b52f..bbc4d826c0 100644 --- a/src/gtk/joystick.cpp +++ b/src/gtk/joystick.cpp @@ -12,8 +12,13 @@ #ifdef __GNUG__ #pragma implementation "joystick.h" #endif + +#include "wx/defs.h" + #if wxUSE_JOYSTICK +#include "wx/joystick.h" + #include #include #include @@ -21,9 +26,9 @@ #include #include #include + #include "wx/event.h" #include "wx/window.h" -#include "wx/gtk/joystick.h" #define JOYSTICK_AXE_MAX 32767 #define JOYSTICK_AXE_MIN -32767 @@ -34,9 +39,9 @@ wxJoystick::wxJoystick(int joystick) { wxString dev_name; // Assume it's the same device name on all Linux systems ... - dev_name.Printf("/dev/js%d", (joystick == wxJOYSTICK1) ? 0 : 1); + dev_name.Printf( wxT("/dev/js%d"), (joystick == wxJOYSTICK1) ? 0 : 1); // FIXME Unicode? - m_joystick = open(dev_name, O_RDWR); + m_joystick = open(dev_name.fn_str(), O_RDWR); m_lastposition = wxPoint(-1, -1); for (int i=0;i<15;i++) m_axe[i] = 0; @@ -134,12 +139,12 @@ int wxJoystick::GetButtonState(void) const int wxJoystick::GetPOVPosition(void) const { - return 0; + return -1; } int wxJoystick::GetPOVCTSPosition(void) const { - return 0; + return -1; } int wxJoystick::GetRudderPosition(void) const @@ -181,8 +186,8 @@ int wxJoystick::GetNumberJoysticks(void) const int fd, j; for (j=0;j<2;j++) { - dev_name.Printf("/dev/js%d", j); - fd = open(dev_name, O_RDONLY); + dev_name.Printf(wxT("/dev/js%d"), j); + fd = open(dev_name.fn_str(), O_RDONLY); if (fd == -1) return j; close(fd); @@ -202,7 +207,11 @@ int wxJoystick::GetProductId(void) const wxString wxJoystick::GetProductName(void) const { - return wxT(""); + wxString dev_name; + // 2002-08-20 johan@linkdata.se + // Return the device name in lieu of a better one + dev_name.Printf( wxT("/dev/js%d"), (m_joystick == wxJOYSTICK1) ? 0 : 1); // FIXME Unicode? + return dev_name; } int wxJoystick::GetXMin(void) const @@ -342,7 +351,7 @@ bool wxJoystick::HasPOVCTS(void) const // Operations //////////////////////////////////////////////////////////////////////////// -bool wxJoystick::SetCapture(wxWindow* win, int pollingFreq = 0) +bool wxJoystick::SetCapture(wxWindow* win, int pollingFreq) { m_catchwin = win; m_polling = pollingFreq;