X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..f98bd6d6cf33f0475b5d737a2968b42b7ea0009f:/include/wx/unix/joystick.h diff --git a/include/wx/unix/joystick.h b/include/wx/unix/joystick.h index ec38965284..6267c1e19a 100644 --- a/include/wx/unix/joystick.h +++ b/include/wx/unix/joystick.h @@ -5,17 +5,13 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: +// Copyright: (c) Guilhem Lavaux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __JOYSTICKH__ #define __JOYSTICKH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "joystick.h" -#endif - #include "wx/event.h" #include "wx/thread.h" @@ -30,7 +26,7 @@ class WXDLLEXPORT wxJoystick: public wxObject */ wxJoystick(int joystick = wxJOYSTICK1); - ~wxJoystick(); + virtual ~wxJoystick(); // Attributes //////////////////////////////////////////////////////////////////////////// @@ -50,7 +46,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 ;