make wxTmemchr() return (and take) char* instead of void* in ANSI build too

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

diff --git a/include/wx/mac/corefoundation/joystick.h b/include/wx/mac/corefoundation/joystick.h
index 4243271abb4fd31614dcfe99ed8725b6d1cdcfc8..e57bf28cb7ca5838c8bfb98afb99ed79cc456f51 100644 (file)
--- a/include/wx/mac/corefoundation/joystick.h
+++ b/include/wx/mac/corefoundation/joystick.h
@@ -12,13 +12,9 @@
 #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"
 
 #include "wx/event.h"
 

-class WXDLLEXPORT wxJoystickThread;
+class WXDLLIMPEXP_FWD_CORE wxJoystickThread;

 
 class WXDLLEXPORT wxJoystick: public wxObject
 {
 
 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 ;