X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..82008f15b709fd4544468aec286663be1b24fc69:/include/wx/unix/joystick.h diff --git a/include/wx/unix/joystick.h b/include/wx/unix/joystick.h index ec38965284..5145446311 100644 --- a/include/wx/unix/joystick.h +++ b/include/wx/unix/joystick.h @@ -1,21 +1,17 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: joystick.h +// Name: wx/unix/joystick.h // Purpose: wxJoystick class // Author: Guilhem Lavaux // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: -// Licence: wxWindows licence +// Copyright: (c) Guilhem Lavaux +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __JOYSTICKH__ #define __JOYSTICKH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "joystick.h" -#endif - #include "wx/event.h" #include "wx/thread.h" @@ -30,12 +26,14 @@ class WXDLLEXPORT wxJoystick: public wxObject */ wxJoystick(int joystick = wxJOYSTICK1); - ~wxJoystick(); + virtual ~wxJoystick(); // Attributes //////////////////////////////////////////////////////////////////////////// wxPoint GetPosition() const; + int GetPosition(unsigned axis) const; + bool GetButtonState(unsigned button) const; int GetZPosition() const; int GetButtonState() const; int GetPOVPosition() const; @@ -50,7 +48,7 @@ class WXDLLEXPORT wxJoystick: public wxObject //////////////////////////////////////////////////////////////////////////// bool IsOk() const; // Checks that the joystick is functioning - int GetNumberJoysticks() const ; + static int GetNumberJoysticks() ; int GetManufacturerId() const ; int GetProductId() const ; wxString GetProductName() const ; @@ -96,5 +94,4 @@ protected: }; #endif -// __JOYSTICKH__ - + // __JOYSTICKH__