move Freeze() and Thaw() to wxWindowBase to ensure that they behave consistently...

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

diff --git a/src/mac/carbon/joystick.cpp b/src/mac/carbon/joystick.cpp
index 156b9b26570395a30a0686d8e3dda3480fdc2f02..3f1a5a9f5e7e64eb5e9b38a85281cf5b75e069ee 100644 (file)
--- a/src/mac/carbon/joystick.cpp
+++ b/src/mac/carbon/joystick.cpp
@@ -9,15 +9,13 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "joystick.h"
-#endif
+#include "wx/wxprec.h"
 
-#include "wx/setup.h"
+#if wxUSE_JOYSTICK
 
-#include "wx/joystick.h"
+#if !defined (__WXMAC_OSX__)
 
-#if wxUSE_JOYSTICK
+#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