avoid a bug in Carbon headers

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

diff --git a/include/wx/joystick.h b/include/wx/joystick.h
index 5391c9c5c349b222facf4f0b5897b34c62eb4d81..3171fca87bcfb7e902d2b13fc4c533ea9ebbf946 100644 (file)
--- a/include/wx/joystick.h
+++ b/include/wx/joystick.h
@@ -1,17 +1,23 @@
 #ifndef _WX_JOYSTICK_H_BASE_
 #define _WX_JOYSTICK_H_BASE_
 
 #ifndef _WX_JOYSTICK_H_BASE_
 #define _WX_JOYSTICK_H_BASE_
 

+#if wxUSE_JOYSTICK
+

 #if defined(__WXMSW__)
 #include "wx/msw/joystick.h"
 #elif defined(__WXMOTIF__)
 #if defined(__WXMSW__)
 #include "wx/msw/joystick.h"
 #elif defined(__WXMOTIF__)

-#include "wx/motif/joystick.h"
+#include "wx/unix/joystick.h"

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-#include "wx/gtk/joystick.h"
+#include "wx/unix/joystick.h"
+#elif defined(__WXX11__)
+#include "wx/unix/joystick.h"

 #elif defined(__WXMAC__)
 #include "wx/mac/joystick.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/joystick.h"

-#elif defined(__WXSTUBS__)
-#include "wx/stubs/joystick.h"
+#elif defined(__WXPM__)
+#include "wx/os2/joystick.h"

 #endif
 
 #endif
 

+#endif // wxUSE_JOYSTICK
+

 #endif
     // _WX_JOYSTICK_H_BASE_
 #endif
     // _WX_JOYSTICK_H_BASE_