correct access for virtuals

[wxWidgets.git] / include / wx / mac / carbon / joystick.h

diff --git a/include/wx/mac/carbon/joystick.h b/include/wx/mac/carbon/joystick.h
index 6db596e3b3cb4bc42e449ea57db1fec7fdc345b4..2aabceb8c3330e3c0c1727bec24b2e53f3df5c69 100644 (file)
--- a/include/wx/mac/carbon/joystick.h
+++ b/include/wx/mac/carbon/joystick.h
@@ -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 WXDLLEXPORT wxJoystick: public wxObject
 #include "wx/event.h"
 
 class WXDLLEXPORT wxJoystick: public wxObject


@@ -32,6 +28,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;


@@ -46,7 +44,7 @@ class WXDLLEXPORT wxJoystick: public wxObject
   ////////////////////////////////////////////////////////////////////////////
 
   bool IsOk() const; // Checks that the joystick is functioning
   ////////////////////////////////////////////////////////////////////////////
 
   bool IsOk() const; // Checks that the joystick is functioning

-  int GetNumberJoysticks() const ;
+  static int GetNumberJoysticks() ;

   int GetManufacturerId() const ;
   int GetProductId() const ;
   wxString GetProductName() const ;
   int GetManufacturerId() const ;
   int GetProductId() const ;
   wxString GetProductName() const ;