X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..058f225a44d83d42ba9d773efc705badbf0e5e3c:/include/wx/unix/joystick.h?ds=sidebyside diff --git a/include/wx/unix/joystick.h b/include/wx/unix/joystick.h index 6267c1e19a..614a9d8f53 100644 --- a/include/wx/unix/joystick.h +++ b/include/wx/unix/joystick.h @@ -1,23 +1,22 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: joystick.h +// Name: wx/unix/joystick.h // Purpose: wxJoystick class // Author: Guilhem Lavaux // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Guilhem Lavaux -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __JOYSTICKH__ -#define __JOYSTICKH__ +#ifndef _WX_UNIX_JOYSTICK_H_ +#define _WX_UNIX_JOYSTICK_H_ #include "wx/event.h" -#include "wx/thread.h" -class WXDLLEXPORT wxJoystickThread; +class WXDLLIMPEXP_FWD_CORE wxJoystickThread; -class WXDLLEXPORT wxJoystick: public wxObject +class WXDLLIMPEXP_ADV wxJoystick: public wxObject { DECLARE_DYNAMIC_CLASS(wxJoystick) public: @@ -32,6 +31,8 @@ class WXDLLEXPORT wxJoystick: public wxObject //////////////////////////////////////////////////////////////////////////// wxPoint GetPosition() const; + int GetPosition(unsigned axis) const; + bool GetButtonState(unsigned button) const; int GetZPosition() const; int GetButtonState() const; int GetPOVPosition() const; @@ -91,6 +92,4 @@ protected: wxJoystickThread* m_thread; }; -#endif -// __JOYSTICKH__ - +#endif // _WX_UNIX_JOYSTICK_H_