Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/os2/joystick.h b/include/wx/os2/joystick.h
index 6e5a4c92365d495d543fc647a541d4230b692d33..1b348da46f7df8e1797a3df50ee1a4722a0c0a34 100644 (file)
--- a/include/wx/os2/joystick.h
+++ b/include/wx/os2/joystick.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        joystick.h
+// Name:        wx/os2/joystick.h

 // Purpose:     wxJoystick class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxJoystick class
 // Author:      David Webster
 // Modified by:


@@ -14,7 +14,7 @@
 
 #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:


@@ -22,7 +22,7 @@ class WXDLLEXPORT wxJoystick: public wxObject
    * Public interface
    */
 
    * Public interface
    */
 

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

 
   // Attributes
   ////////////////////////////////////////////////////////////////////////////
 
   // Attributes
   ////////////////////////////////////////////////////////////////////////////


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