added wxSocketBase::GetTimeout() to match existing SetTimeout()

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

diff --git a/include/wx/joystick.h b/include/wx/joystick.h
index 86134d92a3ffc6fc800e2fd9ea945f4eac808fa3..d29ba50b25b2233e53ad5968035f6f2be4999dc0 100644 (file)
--- a/include/wx/joystick.h
+++ b/include/wx/joystick.h
@@ -1,22 +1,35 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        joystick.h
+// Purpose:     wxJoystick base header
+// Author:      wxWidgets Team
+// Modified by:
+// Created:
+// Copyright:   (c) wxWidgets Team
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+

 #ifndef _WX_JOYSTICK_H_BASE_
 #define _WX_JOYSTICK_H_BASE_
 
 #ifndef _WX_JOYSTICK_H_BASE_
 #define _WX_JOYSTICK_H_BASE_
 

+#include "wx/defs.h"
+

 #if wxUSE_JOYSTICK
 
 #if defined(__WXMSW__)
 #include "wx/msw/joystick.h"
 #elif defined(__WXMOTIF__)
 #if wxUSE_JOYSTICK
 
 #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__)
 #elif defined(__WXX11__)

-#include "wx/x11/joystick.h"
+#include "wx/unix/joystick.h"
+#elif defined(__DARWIN__)
+#include "wx/osx/core/joystick.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-#include "wx/mac/joystick.h"
+#include "wx/osx/joystick.h"

 #elif defined(__WXPM__)
 #include "wx/os2/joystick.h"
 #elif defined(__WXPM__)
 #include "wx/os2/joystick.h"

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

 #endif
 
 #endif // wxUSE_JOYSTICK
 #endif
 
 #endif // wxUSE_JOYSTICK