use memcpy() instead of wxTmemcpy() as the latter is defined in wx/wxcrt.h which...

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

diff --git a/include/wx/palmos/joystick.h b/include/wx/palmos/joystick.h
index 465c6d2a3974211cc28c69398038ad763edda5cf..d5f425761dbb9dff325a710cf0ef4954908e05c7 100644 (file)
--- a/include/wx/palmos/joystick.h
+++ b/include/wx/palmos/joystick.h
@@ -12,10 +12,6 @@
 #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
@@ -32,6 +28,8 @@ class WXDLLIMPEXP_ADV wxJoystick: public wxObject
   ////////////////////////////////////////////////////////////////////////////
 
   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;