Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

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

diff --git a/include/wx/unix/joystick.h b/include/wx/unix/joystick.h
index 4ff41f134e890d5ac8c4e2bdc68d11f797f8baff..ef7a5db223d65928409a67860c810cb03d0ea9ce 100644 (file)
--- a/include/wx/unix/joystick.h
+++ b/include/wx/unix/joystick.h
@@ -4,20 +4,18 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     01/02/97
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) Guilhem Lavaux
 // 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:


@@ -32,6 +30,8 @@ class WXDLLEXPORT wxJoystick: public wxObject
     ////////////////////////////////////////////////////////////////////////////
 
     wxPoint GetPosition() const;
     ////////////////////////////////////////////////////////////////////////////
 
     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,5 +91,4 @@ protected:
     wxJoystickThread*   m_thread;
 };
 
     wxJoystickThread*   m_thread;
 };
 

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