Corrections to config checking; tweaking wxUniv's setup.h; added fix to makeb32.env

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

diff --git a/src/gtk/joystick.cpp b/src/gtk/joystick.cpp
index 372046b52f2b21e9ed8f8eadbb865b2b792acec1..334fefee346e035945f8cb4cfedabed9bf1bc994 100644 (file)
--- a/src/gtk/joystick.cpp
+++ b/src/gtk/joystick.cpp
@@ -12,8 +12,13 @@
 #ifdef __GNUG__
 #pragma implementation "joystick.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "joystick.h"
 #endif

+
+#include "wx/defs.h"
+

 #if wxUSE_JOYSTICK
 
 #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>


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