removed corrected detection of wchar_t under Mac OS X (added in revision 1.355)

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

diff --git a/src/gtk1/joystick.cpp b/src/gtk1/joystick.cpp
index 0b7cf394f4eafd6f81dfc32edb851910d74d4342..334fefee346e035945f8cb4cfedabed9bf1bc994 100644 (file)
--- a/src/gtk1/joystick.cpp
+++ b/src/gtk1/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


@@ -201,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


@@ -354,4 +360,5 @@ bool wxJoystick::ReleaseCapture(void)
   m_polling = 0;
   return TRUE;
 }
   m_polling = 0;
   return TRUE;
 }

+#endif  // wxUSE_JOYSTICK