force wxUSE_THREADS/EXCEPTIONS to 0 if wxNO_THREADS/EXCEPTIONS is defined

[wxWidgets.git] / include / wx / joystick.h

diff --git a/include/wx/joystick.h b/include/wx/joystick.h
index 7203acb5bb52b24afd966bb2dd43a61695f47566..c458f487b982f0f913f5242328e91d22de3bbe1d 100644 (file)
--- a/include/wx/joystick.h
+++ b/include/wx/joystick.h
@@ -6,15 +6,15 @@
 #if defined(__WXMSW__)
 #include "wx/msw/joystick.h"
 #elif defined(__WXMOTIF__)
-#include "wx/motif/joystick.h"
+#include "wx/unix/joystick.h"
 #elif defined(__WXGTK__)
-#include "wx/gtk/joystick.h"
-#elif defined(__WXMAC__)
-#include "wx/mac/joystick.h"
+#include "wx/unix/joystick.h"
+#elif defined(__WXX11__)
+#include "wx/unix/joystick.h"
+#elif defined(__DARWIN__)
+#include "wx/mac/corefoundation/joystick.h"
 #elif defined(__WXPM__)
 #include "wx/os2/joystick.h"
-#elif defined(__WXSTUBS__)
-#include "wx/stubs/joystick.h"
 #endif
 
 #endif // wxUSE_JOYSTICK