Separate label with wx mnemonics (&) and with gtk mnemonics (_) into m_text and m_gtk...

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

diff --git a/include/wx/os2/joystick.h b/include/wx/os2/joystick.h
index 66826c6ee515fc07419254479c7028bc1f56d3c7..ffd64308b8f2819c52fd9281de0712838cb3912e 100644 (file)
--- a/include/wx/os2/joystick.h
+++ b/include/wx/os2/joystick.h
@@ -6,7 +6,7 @@
 // Created:     10/09/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_JOYSTICK_H_
@@ -14,7 +14,7 @@
 
 #include "wx/event.h"
 
-class WXDLLEXPORT wxJoystick: public wxObject
+class WXDLLIMPEXP_ADV wxJoystick: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxJoystick)
  public:
@@ -42,7 +42,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 ;