Support using GetTextExtent() with empty string to get descent in wxOSX.

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

diff --git a/include/wx/unix/joystick.h b/include/wx/unix/joystick.h
index 4ff41f134e890d5ac8c4e2bdc68d11f797f8baff..614a9d8f53194b498dc0abcf11f8d46e3d11161f 100644 (file)
--- a/include/wx/unix/joystick.h
+++ b/include/wx/unix/joystick.h
@@ -9,15 +9,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __JOYSTICKH__
-#define __JOYSTICKH__
+#ifndef _WX_UNIX_JOYSTICK_H_
+#define _WX_UNIX_JOYSTICK_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:
@@ -32,6 +31,8 @@ class WXDLLEXPORT wxJoystick: public wxObject
     ////////////////////////////////////////////////////////////////////////////
 
     wxPoint GetPosition() const;
+    int GetPosition(unsigned axis) const;
+    bool GetButtonState(unsigned button) const;
     int GetZPosition() const;
     int GetButtonState() const;
     int GetPOVPosition() const;
@@ -91,5 +92,4 @@ protected:
     wxJoystickThread*   m_thread;
 };
 
-#endif
-    // __JOYSTICKH__
+#endif // _WX_UNIX_JOYSTICK_H_