declare wxEntry() as taking char **Argv, not char *argv[]

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

diff --git a/include/wx/msw/joystick.h b/include/wx/msw/joystick.h
index 4b15a0245e4de2ceef48a52a456d6d390772331e..18cad55c797c632f29ff00a7303612f795d39010 100644 (file)
--- a/include/wx/msw/joystick.h
+++ b/include/wx/msw/joystick.h
@@ -26,7 +26,7 @@ class WXDLLEXPORT wxJoystick: public wxObject
    * Public interface
    */
 
    * Public interface
    */
 

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

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


@@ -45,8 +45,9 @@ class WXDLLEXPORT wxJoystick: public wxObject
   // Capabilities
   ////////////////////////////////////////////////////////////////////////////
 
   // Capabilities
   ////////////////////////////////////////////////////////////////////////////
 

+  static int GetNumberJoysticks(void);
+

   bool IsOk(void) const; // Checks that the joystick is functioning
   bool IsOk(void) const; // Checks that the joystick is functioning

-  int GetNumberJoysticks(void) const ;

   int GetManufacturerId(void) const ;
   int GetProductId(void) const ;
   wxString GetProductName(void) const ;
   int GetManufacturerId(void) const ;
   int GetProductId(void) const ;
   wxString GetProductName(void) const ;