forward port from 2.8

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

diff --git a/include/wx/unix/joystick.h b/include/wx/unix/joystick.h
index 7359bfa05e12c2a1e2c5f316afecbdeae0c7e553..62b4ec7effeb03729215ec0860b29b8a00d39c28 100644 (file)
--- 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
 // 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__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __JOYSTICKH__


@@ -15,9 +15,9 @@
 #include "wx/event.h"
 #include "wx/thread.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:
 {
     DECLARE_DYNAMIC_CLASS(wxJoystick)
         public:


@@ -26,12 +26,14 @@ class WXDLLEXPORT wxJoystick: public wxObject
      */
 
     wxJoystick(int joystick = wxJOYSTICK1);
      */
 
     wxJoystick(int joystick = wxJOYSTICK1);

-    ~wxJoystick();
+    virtual ~wxJoystick();

 
     // Attributes
     ////////////////////////////////////////////////////////////////////////////
 
     wxPoint GetPosition() const;
 
     // Attributes
     ////////////////////////////////////////////////////////////////////////////
 
     wxPoint GetPosition() const;

+    int GetPosition(unsigned axis) const;
+    bool GetButtonState(unsigned button) const;

     int GetZPosition() const;
     int GetButtonState() const;
     int GetPOVPosition() const;
     int GetZPosition() const;
     int GetButtonState() const;
     int GetPOVPosition() const;


@@ -46,7 +48,7 @@ class WXDLLEXPORT wxJoystick: public wxObject
     ////////////////////////////////////////////////////////////////////////////
 
     bool IsOk() const; // Checks that the joystick is functioning
     ////////////////////////////////////////////////////////////////////////////
 
     bool IsOk() const; // Checks that the joystick is functioning

-    int GetNumberJoysticks() const ;
+    static int GetNumberJoysticks() ;

     int GetManufacturerId() const ;
     int GetProductId() const ;
     wxString GetProductName() const ;
     int GetManufacturerId() const ;
     int GetProductId() const ;
     wxString GetProductName() const ;


@@ -92,5 +94,4 @@ protected:
 };
 
 #endif
 };
 
 #endif

-// __JOYSTICKH__
-
+    // __JOYSTICKH__