don't use -q option with egrep, Solaris doesn't have it (bug 517145)

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

diff --git a/src/gtk1/joystick.cpp b/src/gtk1/joystick.cpp
index 810ebb4a5951f1fad8d77f47fb435a5decda2fce..334fefee346e035945f8cb4cfedabed9bf1bc994 100644 (file)
--- a/src/gtk1/joystick.cpp
+++ b/src/gtk1/joystick.cpp
@@ -12,8 +12,13 @@
 #ifdef __GNUG__
 #pragma implementation "joystick.h"
 #endif
+
+#include "wx/defs.h"
+
 #if wxUSE_JOYSTICK
 
+#include "wx/joystick.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 "wx/event.h"
 #include "wx/window.h"
-#include "wx/gtk/joystick.h"
 
 #define JOYSTICK_AXE_MAX 32767
 #define JOYSTICK_AXE_MIN -32767
@@ -355,5 +360,5 @@ bool wxJoystick::ReleaseCapture(void)
   m_polling = 0;
   return TRUE;
 }
-#endif
+#endif  // wxUSE_JOYSTICK