projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blind fix for wxGIFDecoder::ReadGIF
[wxWidgets.git]
/
src
/
gtk
/
joystick.cpp
diff --git
a/src/gtk/joystick.cpp
b/src/gtk/joystick.cpp
index e783f1276df15bfcca2abebad01f3ace5d523401..334fefee346e035945f8cb4cfedabed9bf1bc994 100644
(file)
--- a/
src/gtk/joystick.cpp
+++ b/
src/gtk/joystick.cpp
@@
-13,6
+13,12
@@
#pragma implementation "joystick.h"
#endif
#pragma implementation "joystick.h"
#endif
+#include "wx/defs.h"
+
+#if wxUSE_JOYSTICK
+
+#include "wx/joystick.h"
+
#include <linux/joystick.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <linux/joystick.h>
#include <sys/types.h>
#include <sys/stat.h>
@@
-20,9
+26,9
@@
#include <sys/ioctl.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/ioctl.h>
#include <fcntl.h>
#include <unistd.h>
+
#include "wx/event.h"
#include "wx/window.h"
#include "wx/event.h"
#include "wx/window.h"
-#include "wx/gtk/joystick.h"
#define JOYSTICK_AXE_MAX 32767
#define JOYSTICK_AXE_MIN -32767
#define JOYSTICK_AXE_MAX 32767
#define JOYSTICK_AXE_MIN -32767
@@
-54,7
+60,6
@@
void *wxJoystick::Entry(void)
struct timeval time_out = {0, 0};
FD_ZERO(&read_fds);
struct timeval time_out = {0, 0};
FD_ZERO(&read_fds);
- DeferDestroy(TRUE);
while (1) {
TestDestroy();
while (1) {
TestDestroy();
@@
-202,7
+207,7
@@
int wxJoystick::GetProductId(void) const
wxString wxJoystick::GetProductName(void) const
{
wxString wxJoystick::GetProductName(void) const
{
- return
""
;
+ return
wxT("")
;
}
int wxJoystick::GetXMin(void) const
}
int wxJoystick::GetXMin(void) const
@@
-355,4
+360,5
@@
bool wxJoystick::ReleaseCapture(void)
m_polling = 0;
return TRUE;
}
m_polling = 0;
return TRUE;
}
+#endif // wxUSE_JOYSTICK