* Corrected #include "thread.h" => #include "wx/thread.h"

* Corrected the joystick.h detection stuff in configure.in

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/install/gtk/configure b/install/gtk/configure
index a1cf20cca52cf80b4c05928c9fa0876871ee5a17..cbf6463a2a83f58b7feb45432921793292e5216c 100755 (executable)
--- a/install/gtk/configure
+++ b/install/gtk/configure
@@ -2712,7 +2712,7 @@ else
 fi
 
 GTK_JOYSTICK=""
-if test "$ac_cv_header_linux_joystick_h" != ""; then
+if test "$ac_cv_header_linux_joystick_h" = "yes"; then
   GTK_JOYSTICK="gtk/joystick.cpp"
 fi
 

diff --git a/install/gtk/configure.in b/install/gtk/configure.in
index e1c60efb5f3bbc27f6385fb26eae69053d245a22..4e2e279986f72b3c29c572c317cb5fdf0e6acf09 100644 (file)
--- a/install/gtk/configure.in
+++ b/install/gtk/configure.in
@@ -422,7 +422,7 @@ dnl   defines HAVE_UNISTD_H
 dnl As it needs Linux 2.1.x for the moment: check whether the file exists (GL).
 AC_CHECK_HEADER(linux/joystick.h)
 GTK_JOYSTICK=""
-if test "$ac_cv_header_linux_joystick_h" != ""; then
+if test "$ac_cv_header_linux_joystick_h" = "yes"; then
   GTK_JOYSTICK="gtk/joystick.cpp"
 fi
 AC_SUBST(GTK_JOYSTICK)

diff --git a/src/gtk/threadno.cpp b/src/gtk/threadno.cpp
index 126a211fcacb3b039b2daf085deea32541b04664..deccf57775bc06b0cae7b67ccaa1ecd1a18b172a 100644 (file)
--- a/src/gtk/threadno.cpp
+++ b/src/gtk/threadno.cpp
@@ -13,6 +13,7 @@
 #endif
 
 #include "wx/wx.h"
+#include "wx/thread.h"
 
 wxMutex::wxMutex()
 {

diff --git a/src/gtk/threadpsx.cpp b/src/gtk/threadpsx.cpp
index 9f6620f0c1f7293973c2da2f5a84aeb8a43f3749..f6ffab19b9c7213fd7010e6f2a175924d7e51a27 100644 (file)
--- a/src/gtk/threadpsx.cpp
+++ b/src/gtk/threadpsx.cpp
@@ -28,7 +28,7 @@ enum thread_state {
 // Static variables
 /////////////////////////////////////////////////////////////////////////////
 
-#include "thread.h"
+#include "wx/thread.h"
 
 static pthread_t p_mainid;
 wxMutex wxMainMutex; // controls access to all GUI functions

diff --git a/src/gtk/threadsgi.cpp b/src/gtk/threadsgi.cpp
index ea652677e1af0f8af54a7321b386de08697bb42a..10945b3900324398e99ca6e460f08017a486c4d5 100644 (file)
--- a/src/gtk/threadsgi.cpp
+++ b/src/gtk/threadsgi.cpp
@@ -30,6 +30,8 @@ enum thread_state {
 // Static variables
 /////////////////////////////////////////////////////////////////////////////
 
+#include "wx/thread.h"
+
 static int p_mainid;
 wxMutex wxMainMutex;
 

diff --git a/src/gtk1/threadno.cpp b/src/gtk1/threadno.cpp
index 126a211fcacb3b039b2daf085deea32541b04664..deccf57775bc06b0cae7b67ccaa1ecd1a18b172a 100644 (file)
--- a/src/gtk1/threadno.cpp
+++ b/src/gtk1/threadno.cpp
@@ -13,6 +13,7 @@
 #endif
 
 #include "wx/wx.h"
+#include "wx/thread.h"
 
 wxMutex::wxMutex()
 {

diff --git a/src/gtk1/threadpsx.cpp b/src/gtk1/threadpsx.cpp
index 9f6620f0c1f7293973c2da2f5a84aeb8a43f3749..f6ffab19b9c7213fd7010e6f2a175924d7e51a27 100644 (file)
--- a/src/gtk1/threadpsx.cpp
+++ b/src/gtk1/threadpsx.cpp
@@ -28,7 +28,7 @@ enum thread_state {
 // Static variables
 /////////////////////////////////////////////////////////////////////////////
 
-#include "thread.h"
+#include "wx/thread.h"
 
 static pthread_t p_mainid;
 wxMutex wxMainMutex; // controls access to all GUI functions

diff --git a/src/gtk1/threadsgi.cpp b/src/gtk1/threadsgi.cpp
index ea652677e1af0f8af54a7321b386de08697bb42a..10945b3900324398e99ca6e460f08017a486c4d5 100644 (file)
--- a/src/gtk1/threadsgi.cpp
+++ b/src/gtk1/threadsgi.cpp
@@ -30,6 +30,8 @@ enum thread_state {
 // Static variables
 /////////////////////////////////////////////////////////////////////////////
 
+#include "wx/thread.h"
+
 static int p_mainid;
 wxMutex wxMainMutex;