Applied patch for wxComboBox and wxListBox to

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

diff --git a/include/wx/joystick.h b/include/wx/joystick.h
index b6aff395c670c4e72a53fcdb327ef0630059ea2b..7203acb5bb52b24afd966bb2dd43a61695f47566 100644 (file)
--- a/include/wx/joystick.h
+++ b/include/wx/joystick.h
@@ -1,12 +1,23 @@
-#ifndef __JOYSTICKH_BASE__
-#define __JOYSTICKH_BASE__
+#ifndef _WX_JOYSTICK_H_BASE_
+#define _WX_JOYSTICK_H_BASE_

 
 

-#if defined(__WINDOWS__)
+#if wxUSE_JOYSTICK
+
+#if defined(__WXMSW__)

 #include "wx/msw/joystick.h"
 #include "wx/msw/joystick.h"

-#elif defined(__MOTIF__)
-#elif defined(__GTK__)
+#elif defined(__WXMOTIF__)
+#include "wx/motif/joystick.h"
+#elif defined(__WXGTK__)

 #include "wx/gtk/joystick.h"
 #include "wx/gtk/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
 

+#endif // wxUSE_JOYSTICK
+

 #endif
 #endif

-    // __JOYSTICKH_BASE__
+    // _WX_JOYSTICK_H_BASE_