Trying to commit wxDirDialog patch.

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

diff --git a/include/wx/mac/carbon/joystick.h b/include/wx/mac/carbon/joystick.h
index 6db596e3b3cb4bc42e449ea57db1fec7fdc345b4..dce79f8a374f7c5f7d2bb407b883a2920534851e 100644 (file)
--- a/include/wx/mac/carbon/joystick.h
+++ b/include/wx/mac/carbon/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 wxJoystick: public wxObject
 #include "wx/event.h"
 
 class WXDLLEXPORT wxJoystick: public wxObject


@@ -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 ;