X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d1a4878f36ba4b5f66c2ccfd2cb27a9dc528b6f..b3c1d21c7f6a88bd82cee5d3a64fa1bfecd50ed4:/src/mac/carbon/joystick.cpp

diff --git a/src/mac/carbon/joystick.cpp b/src/mac/carbon/joystick.cpp
index 8136d9e59b..3f1a5a9f5e 100644
--- a/src/mac/carbon/joystick.cpp
+++ b/src/mac/carbon/joystick.cpp
@@ -9,14 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "joystick.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #if wxUSE_JOYSTICK
 
+#if !defined (__WXMAC_OSX__)
+
 #include "wx/joystick.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
@@ -30,6 +28,18 @@ wxPoint wxJoystick::GetPosition() const
     return wxPoint(0, 0);
 }
 
+int wxJoystick::GetPosition(unsigned axis) const
+{
+    // TODO
+    return 0;
+}
+
+bool wxJoystick::GetButtonState(unsigned id) const
+{
+    // TODO
+    return false;
+}
+
 int wxJoystick::GetZPosition() const
 {
     // TODO
@@ -92,7 +102,7 @@ bool wxJoystick::IsOk() const
     return FALSE;
 }
 
-int wxJoystick::GetNumberJoysticks() const
+int wxJoystick::GetNumberJoysticks()
 {
     // TODO
     return 0;
@@ -281,6 +291,8 @@ bool wxJoystick::ReleaseCapture()
     return FALSE;
 }
 
+#endif 
+    // !OSX
 #endif
     // wxUSE_JOYSTICK