no changes, just remove #if'd out code

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

diff --git a/include/wx/os2/joystick.h b/include/wx/os2/joystick.h
index 30324fc035da5e6d6e49504afff284bc508d31b9..ffd64308b8f2819c52fd9281de0712838cb3912e 100644 (file)
--- a/include/wx/os2/joystick.h
+++ b/include/wx/os2/joystick.h
@@ -1,24 +1,20 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        joystick.h
 // Purpose:     wxJoystick class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        joystick.h
 // Purpose:     wxJoystick class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/09/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// 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:


@@ -46,7 +42,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 ;