more compilation fixes for VC6 (#9492)

[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 13024b27313c3e07f1063596428cda646e7fc704..a90907007218ea1b263acecd101445dd4e8a071c 100644 (file)
--- a/include/wx/mac/corefoundation/joystick.h
+++ b/include/wx/mac/corefoundation/joystick.h
@@ -14,9 +14,9 @@
 
 #include "wx/event.h"
 
 
 #include "wx/event.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:
 {
     DECLARE_DYNAMIC_CLASS(wxJoystick)
  public:


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