X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5260937e7460a1b58ad51a5b3b3b91fbf4e83dd4..db70a2f20ac7b47299fe7ab66bae9ef613a0fe6b:/src/gtk/joystick.cpp diff --git a/src/gtk/joystick.cpp b/src/gtk/joystick.cpp index 334fefee34..e53af61ccf 100644 --- a/src/gtk/joystick.cpp +++ b/src/gtk/joystick.cpp @@ -39,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; @@ -186,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); @@ -347,7 +347,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;