X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88ac883a0d005437c97a60d8195bd5e4719b1154..4cdc2c137ebe5357e320e2794f085f29be2c74b9:/src/gtk1/joystick.cpp

diff --git a/src/gtk1/joystick.cpp b/src/gtk1/joystick.cpp
index 0b7cf394f4..9994f9a667 100644
--- a/src/gtk1/joystick.cpp
+++ b/src/gtk1/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
@@ -201,7 +205,7 @@ int wxJoystick::GetProductId(void) const
 
 wxString wxJoystick::GetProductName(void) const
 {
-  return "";
+  return wxT("");
 }
 
 int wxJoystick::GetXMin(void) const
@@ -354,4 +358,5 @@ bool wxJoystick::ReleaseCapture(void)
   m_polling = 0;
   return TRUE;
 }
+#endif  // wxUSE_JOYSTICK