X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/99d800190a04a2deaf769017a5fae04a4ae50378..25eb10d2e119b278be3ff51b3c96c297cc3ac6ef:/include/wx/unix/joystick.h diff --git a/include/wx/unix/joystick.h b/include/wx/unix/joystick.h index 37cca7c575..6267c1e19a 100644 --- a/include/wx/unix/joystick.h +++ b/include/wx/unix/joystick.h @@ -12,10 +12,6 @@ #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 ;