Since there was no #include before the #if wxUSE_JOYSTICK then nothing

would ever be compiled in this module.

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

diff --git a/src/gtk/joystick.cpp b/src/gtk/joystick.cpp
index 372046b52f2b21e9ed8f8eadbb865b2b792acec1..9994f9a66706398e713a9a0a383ace1ee992b46f 100644 (file)
--- a/src/gtk/joystick.cpp
+++ b/src/gtk/joystick.cpp
@@ -12,6 +12,9 @@
 #ifdef __GNUG__
 #pragma implementation "joystick.h"
 #endif
+
+#include <wx/joystick.h>
+
 #if wxUSE_JOYSTICK
 
 #include <linux/joystick.h>
@@ -21,9 +24,9 @@
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <unistd.h>
+
 #include "wx/event.h"
 #include "wx/window.h"
-#include "wx/gtk/joystick.h"
 
 #define JOYSTICK_AXE_MAX 32767
 #define JOYSTICK_AXE_MIN -32767

diff --git a/src/gtk1/joystick.cpp b/src/gtk1/joystick.cpp
index 372046b52f2b21e9ed8f8eadbb865b2b792acec1..9994f9a66706398e713a9a0a383ace1ee992b46f 100644 (file)
--- a/src/gtk1/joystick.cpp
+++ b/src/gtk1/joystick.cpp
@@ -12,6 +12,9 @@
 #ifdef __GNUG__
 #pragma implementation "joystick.h"
 #endif
+
+#include <wx/joystick.h>
+
 #if wxUSE_JOYSTICK
 
 #include <linux/joystick.h>
@@ -21,9 +24,9 @@
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <unistd.h>
+
 #include "wx/event.h"
 #include "wx/window.h"
-#include "wx/gtk/joystick.h"
 
 #define JOYSTICK_AXE_MAX 32767
 #define JOYSTICK_AXE_MIN -32767