trying to resolve GSocketManager API mess: the meaning of Install/Uninstall_Callback...

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

diff --git a/include/wx/msw/joystick.h b/include/wx/msw/joystick.h
index 4b15a0245e4de2ceef48a52a456d6d390772331e..7a655137a917c4d7348bbad69a16fdaf7a32dd99 100644 (file)
--- a/include/wx/msw/joystick.h
+++ b/include/wx/msw/joystick.h
@@ -6,19 +6,15 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_JOYSTICK_H_
 #define _WX_JOYSTICK_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_JOYSTICK_H_
 #define _WX_JOYSTICK_H_
 

-#ifdef __GNUG__
-#pragma interface "joystick.h"
-#endif
-

 #include "wx/event.h"
 
 #include "wx/event.h"
 

-class WXDLLEXPORT wxJoystick: public wxObject
+class WXDLLIMPEXP_ADV wxJoystick: public wxObject

 {
   DECLARE_DYNAMIC_CLASS(wxJoystick)
  public:
 {
   DECLARE_DYNAMIC_CLASS(wxJoystick)
  public:


@@ -26,12 +22,14 @@ class WXDLLEXPORT wxJoystick: public wxObject
    * Public interface
    */
 
    * Public interface
    */
 

-  wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; };
+  wxJoystick(int joystick = wxJOYSTICK1);

 
   // Attributes
   ////////////////////////////////////////////////////////////////////////////
 
   wxPoint GetPosition(void) const;
 
   // Attributes
   ////////////////////////////////////////////////////////////////////////////
 
   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;


@@ -45,8 +43,9 @@ class WXDLLEXPORT wxJoystick: public wxObject
   // Capabilities
   ////////////////////////////////////////////////////////////////////////////
 
   // Capabilities
   ////////////////////////////////////////////////////////////////////////////
 

+  static int GetNumberJoysticks(void);
+

   bool IsOk(void) const; // Checks that the joystick is functioning
   bool IsOk(void) const; // Checks that the joystick is functioning

-  int GetNumberJoysticks(void) const ;

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