X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e320a79f187558effb04d92020b470372bbe456..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/os2/joystick.h?ds=sidebyside

diff --git a/include/wx/os2/joystick.h b/include/wx/os2/joystick.h
index 30324fc035..dd431d71d8 100644
--- a/include/wx/os2/joystick.h
+++ b/include/wx/os2/joystick.h
@@ -1,24 +1,19 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        joystick.h
+// Name:        wx/os2/joystick.h
 // Purpose:     wxJoystick class
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
-// RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Created:     10/09/99
+// Copyright:   (c) David Webster
+// 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:
@@ -26,7 +21,7 @@ class WXDLLEXPORT wxJoystick: public wxObject
    * Public interface
    */
 
-  wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; };
+  wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; }
 
   // Attributes
   ////////////////////////////////////////////////////////////////////////////
@@ -46,7 +41,7 @@ class WXDLLEXPORT wxJoystick: public wxObject
   ////////////////////////////////////////////////////////////////////////////
 
   bool IsOk() const; // Checks that the joystick is functioning
-  int GetNumberJoysticks() const ;
+  static int GetNumberJoysticks() ;
   int GetManufacturerId() const ;
   int GetProductId() const ;
   wxString GetProductName() const ;