better file data support

[wxWidgets.git] / include / wx / mac / corefoundation / joystick.h

diff --git a/include/wx/mac/corefoundation/joystick.h b/include/wx/mac/corefoundation/joystick.h
index 4243271abb4fd31614dcfe99ed8725b6d1cdcfc8..13024b27313c3e07f1063596428cda646e7fc704 100644 (file)
--- a/include/wx/mac/corefoundation/joystick.h
+++ b/include/wx/mac/corefoundation/joystick.h
@@ -12,10 +12,6 @@
 #ifndef _WX_JOYSTICK_H_
 #define _WX_JOYSTICK_H_
 
 #ifndef _WX_JOYSTICK_H_
 #define _WX_JOYSTICK_H_
 

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

 #include "wx/event.h"
 
 class WXDLLEXPORT wxJoystickThread;
 #include "wx/event.h"
 
 class WXDLLEXPORT wxJoystickThread;


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