Since there was no #include before the #if wxUSE_JOYSTICK then nothing

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

diff --git a/src/gtk/joystick.cpp b/src/gtk/joystick.cpp
index e783f1276df15bfcca2abebad01f3ace5d523401..9994f9a66706398e713a9a0a383ace1ee992b46f 100644 (file)
--- a/src/gtk/joystick.cpp
+++ b/src/gtk/joystick.cpp
@@ -13,6 +13,10 @@
 #pragma implementation "joystick.h"
 #endif
 
+#include <wx/joystick.h>
+
+#if wxUSE_JOYSTICK
+
 #include <linux/joystick.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -20,9 +24,9 @@
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <unistd.h>
+
 #include "wx/event.h"
 #include "wx/window.h"
-#include "wx/gtk/joystick.h"
 
 #define JOYSTICK_AXE_MAX 32767
 #define JOYSTICK_AXE_MIN -32767
@@ -54,7 +58,6 @@ void *wxJoystick::Entry(void)
   struct timeval time_out = {0, 0};
 
   FD_ZERO(&read_fds);
-  DeferDestroy(TRUE);
   while (1) {
     TestDestroy();
 
@@ -202,7 +205,7 @@ int wxJoystick::GetProductId(void) const
 
 wxString wxJoystick::GetProductName(void) const
 {
-  return "";
+  return wxT("");
 }
 
 int wxJoystick::GetXMin(void) const
@@ -355,4 +358,5 @@ bool wxJoystick::ReleaseCapture(void)
   m_polling = 0;
   return TRUE;
 }
+#endif  // wxUSE_JOYSTICK