X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da9e956384a0619a0ecaa0bd1e4ba26b133b60a9..434e29032fdbff103182aa97bb66af48332f9dc8:/include/wx/unix/joystick.h

diff --git a/include/wx/unix/joystick.h b/include/wx/unix/joystick.h
index c52edff09a..955db788d9 100644
--- a/include/wx/unix/joystick.h
+++ b/include/wx/unix/joystick.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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__
@@ -15,7 +15,7 @@
 #include "wx/event.h"
 #include "wx/thread.h"
 
-class WXDLLEXPORT wxJoystickThread;
+class WXDLLIMPEXP_FWD_CORE wxJoystickThread;
 
 class WXDLLEXPORT wxJoystick: public wxObject
 {
@@ -26,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;
@@ -92,5 +94,4 @@ protected:
 };
 
 #endif
-// __JOYSTICKH__
-
+    // __JOYSTICKH__