Resolve GCC's 'type-punned pointer will break strict-aliasing rules' warning by break...

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

diff --git a/include/wx/unix/joystick.h b/include/wx/unix/joystick.h
index c52edff09ac65a943bec837cca797234c8859158..614a9d8f53194b498dc0abcf11f8d46e3d11161f 100644 (file)
--- a/include/wx/unix/joystick.h
+++ b/include/wx/unix/joystick.h
@@ -1,23 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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__
-#define __JOYSTICKH__
+#ifndef _WX_UNIX_JOYSTICK_H_
+#define _WX_UNIX_JOYSTICK_H_

 
 #include "wx/event.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 +25,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;


@@ -91,6 +92,4 @@ protected:
     wxJoystickThread*   m_thread;
 };
 
     wxJoystickThread*   m_thread;
 };
 

-#endif
-// __JOYSTICKH__
-
+#endif // _WX_UNIX_JOYSTICK_H_