wxChoice/wxComboBox background colour change (to get back to where we were);

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

diff --git a/src/gtk/joystick.cpp b/src/gtk/joystick.cpp
index e783f1276df15bfcca2abebad01f3ace5d523401..3b80491d4c5dbfe779579ca138b6dd62e29978b6 100644 (file)
--- a/src/gtk/joystick.cpp
+++ b/src/gtk/joystick.cpp
@@ -54,7 +54,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 +201,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