X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/mac/carbon/joystick.h diff --git a/include/wx/mac/carbon/joystick.h b/include/wx/mac/carbon/joystick.h index 271db26b0a..94de2470e1 100644 --- a/include/wx/mac/carbon/joystick.h +++ b/include/wx/mac/carbon/joystick.h @@ -14,7 +14,7 @@ #include "wx/event.h" -class WXDLLEXPORT wxJoystick: public wxObject +class WXDLLIMPEXP_ADV wxJoystick: public wxObject { DECLARE_DYNAMIC_CLASS(wxJoystick) public: @@ -28,6 +28,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; @@ -42,7 +44,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 ;