X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..831b64f32f204d1424e248d100c109974aa4238c:/include/wx/x11/joystick.h

diff --git a/include/wx/x11/joystick.h b/include/wx/x11/joystick.h
index 7148fcd4c9..bc7c583e6a 100644
--- a/include/wx/x11/joystick.h
+++ b/include/wx/x11/joystick.h
@@ -1,36 +1,32 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        joystick.h
+// Name:        wx/x11/joystick.h
 // Purpose:     wxJoystick class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_JOYSTICK_H_
 #define _WX_JOYSTICK_H_
 
-#ifdef __GNUG__
-#pragma interface "joystick.h"
-#endif
-
 #include "wx/event.h"
 
-class WXDLLEXPORT wxJoystick: public wxObject
+class WXDLLIMPEXP_ADV wxJoystick: public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxJoystick)
 public:
 /*
 * Public interface
     */
-    
+
     wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; };
-    
+
     // Attributes
     ////////////////////////////////////////////////////////////////////////////
-    
+
     wxPoint GetPosition() const;
     int GetZPosition() const;
     int GetButtonState() const;
@@ -41,12 +37,12 @@ public:
     int GetVPosition() const;
     int GetMovementThreshold() const;
     void SetMovementThreshold(int threshold) ;
-    
+
     // Capabilities
     ////////////////////////////////////////////////////////////////////////////
-    
+
     bool IsOk() const; // Checks that the joystick is functioning
-    int GetNumberJoysticks() const ;
+    static int GetNumberJoysticks() ;
     int GetManufacturerId() const ;
     int GetProductId() const ;
     wxString GetProductName() const ;
@@ -68,7 +64,7 @@ public:
     int GetUMax() const;
     int GetVMin() const;
     int GetVMax() const;
-    
+
     bool HasRudder() const;
     bool HasZ() const;
     bool HasU() const;
@@ -76,18 +72,18 @@ public:
     bool HasPOV() const;
     bool HasPOV4Dir() const;
     bool HasPOVCTS() const;
-    
+
     // Operations
     ////////////////////////////////////////////////////////////////////////////
-    
+
     // pollingFreq = 0 means that movement events are sent when above the threshold.
     // If pollingFreq > 0, events are received every this many milliseconds.
     bool SetCapture(wxWindow* win, int pollingFreq = 0);
     bool ReleaseCapture();
-    
+
 protected:
     int       m_joystick;
 };
 
 #endif
-// _WX_JOYSTICK_H_
+    // _WX_JOYSTICK_H_