safer definitions for wx(U)Int32,16 (taken from intl.cpp)

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

diff --git a/include/wx/joystick.h b/include/wx/joystick.h
index 5391c9c5c349b222facf4f0b5897b34c62eb4d81..86134d92a3ffc6fc800e2fd9ea945f4eac808fa3 100644 (file)
--- a/include/wx/joystick.h
+++ b/include/wx/joystick.h
@@ -1,17 +1,25 @@
 #ifndef _WX_JOYSTICK_H_BASE_
 #define _WX_JOYSTICK_H_BASE_
 
+#if wxUSE_JOYSTICK
+
 #if defined(__WXMSW__)
 #include "wx/msw/joystick.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/joystick.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/joystick.h"
+#elif defined(__WXX11__)
+#include "wx/x11/joystick.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/joystick.h"
+#elif defined(__WXPM__)
+#include "wx/os2/joystick.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/joystick.h"
 #endif
 
+#endif // wxUSE_JOYSTICK
+
 #endif
     // _WX_JOYSTICK_H_BASE_