renamed IsRefTo() to IsSameAs() (do complain if this is not more clear) and

[wxWidgets.git] / src / mac / carbon / joystick.cpp

diff --git a/src/mac/carbon/joystick.cpp b/src/mac/carbon/joystick.cpp
index 8136d9e59b35a08a1bd17ffc7f2e8e9e0000a983..c56cf2001ac456c465ae792df6327c7c10f3b046 100644 (file)
--- a/src/mac/carbon/joystick.cpp
+++ b/src/mac/carbon/joystick.cpp
@@ -9,14 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 #include "wx/wxprec.h"
 
 #if wxUSE_JOYSTICK
 
 #include "wx/wxprec.h"
 
 #if wxUSE_JOYSTICK
 

+#if !defined (__WXMAC_OSX__)
+

 #include "wx/joystick.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 #include "wx/joystick.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)


@@ -92,7 +90,7 @@ bool wxJoystick::IsOk() const
     return FALSE;
 }
 
     return FALSE;
 }
 

-int wxJoystick::GetNumberJoysticks() const
+int wxJoystick::GetNumberJoysticks()

 {
     // TODO
     return 0;
 {
     // TODO
     return 0;


@@ -281,6 +279,8 @@ bool wxJoystick::ReleaseCapture()
     return FALSE;
 }
 
     return FALSE;
 }
 

+#endif 
+    // !OSX

 #endif
     // wxUSE_JOYSTICK
 
 #endif
     // wxUSE_JOYSTICK