renamed GetColHeader() to GetGridColHeader() for consistency with the other existing...

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

diff --git a/include/wx/palmos/joystick.h b/include/wx/palmos/joystick.h
index 2f30f3fb664646d0b215405ca806966c4f8cf372..d5f425761dbb9dff325a710cf0ef4954908e05c7 100644 (file)
--- a/include/wx/palmos/joystick.h
+++ b/include/wx/palmos/joystick.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        joystick.h
+// Name:        wx/palmos/joystick.h

 // Purpose:     wxJoystick class
 // Purpose:     wxJoystick class

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,10 +12,6 @@
 #ifndef _WX_JOYSTICK_H_
 #define _WX_JOYSTICK_H_
 
 #ifndef _WX_JOYSTICK_H_
 #define _WX_JOYSTICK_H_
 

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

 #include "wx/event.h"
 
 class WXDLLIMPEXP_ADV wxJoystick: public wxObject
 #include "wx/event.h"
 
 class WXDLLIMPEXP_ADV wxJoystick: public wxObject


@@ -32,6 +28,8 @@ class WXDLLIMPEXP_ADV wxJoystick: public wxObject
   ////////////////////////////////////////////////////////////////////////////
 
   wxPoint GetPosition(void) const;
   ////////////////////////////////////////////////////////////////////////////
 
   wxPoint GetPosition(void) const;

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

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