don't pass 0 time_t to Borland localtime(), it crashes (bug 1704438); also check...

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

diff --git a/include/wx/unix/joystick.h b/include/wx/unix/joystick.h
index ec389652843c75e8bba28c6c95c133ba6e26c02f..5145446311da3fdb001debb961607993c9bef7dc 100644 (file)
--- 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$
 // 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__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __JOYSTICKH__
 #define __JOYSTICKH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "joystick.h"
-#endif
-

 #include "wx/event.h"
 #include "wx/thread.h"
 
 #include "wx/event.h"
 #include "wx/thread.h"
 


@@ -30,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;


@@ -50,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 ;


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

-// __JOYSTICKH__
-
+    // __JOYSTICKH__