Fixed wxHTML code in a Watcom Win32 DLL

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

diff --git a/src/gtk1/joystick.cpp b/src/gtk1/joystick.cpp
index e783f1276df15bfcca2abebad01f3ace5d523401..372046b52f2b21e9ed8f8eadbb865b2b792acec1 100644 (file)
--- a/src/gtk1/joystick.cpp
+++ b/src/gtk1/joystick.cpp
@@ -12,6 +12,7 @@
 #ifdef __GNUG__
 #pragma implementation "joystick.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "joystick.h"
 #endif

+#if wxUSE_JOYSTICK

 
 #include <linux/joystick.h>
 #include <sys/types.h>
 
 #include <linux/joystick.h>
 #include <sys/types.h>


@@ -54,7 +55,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 +202,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 +355,5 @@ bool wxJoystick::ReleaseCapture(void)
   m_polling = 0;
   return TRUE;
 }
   m_polling = 0;
   return TRUE;
 }

+#endif  // wxUSE_JOYSTICK