remove unneeded DoGetClientSize

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

diff --git a/include/wx/unix/joystick.h b/include/wx/unix/joystick.h
index 37cca7c575a6782392394c7750b967e3720a6a0b..6267c1e19ac8df44227698a8e7eef6d023b74f49 100644 (file)
--- a/include/wx/unix/joystick.h
+++ b/include/wx/unix/joystick.h
@@ -12,10 +12,6 @@
 #ifndef __JOYSTICKH__
 #define __JOYSTICKH__
 
 #ifndef __JOYSTICKH__
 #define __JOYSTICKH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "joystick.h"
-#endif
-

 #include "wx/event.h"
 #include "wx/thread.h"
 
 #include "wx/event.h"
 #include "wx/thread.h"
 


@@ -30,7 +26,7 @@ class WXDLLEXPORT wxJoystick: public wxObject
      */
 
     wxJoystick(int joystick = wxJOYSTICK1);
      */
 
     wxJoystick(int joystick = wxJOYSTICK1);

-    ~wxJoystick();
+    virtual ~wxJoystick();

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


@@ -50,7 +46,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 ;