1945421 applied

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

diff --git a/src/mac/carbon/joystick.cpp b/src/mac/carbon/joystick.cpp
index 5a39ba118be58a1b68276499a04eed5b14e5d7a1..3f1a5a9f5e7e64eb5e9b38a85281cf5b75e069ee 100644 (file)
--- a/src/mac/carbon/joystick.cpp
+++ b/src/mac/carbon/joystick.cpp
@@ -6,18 +6,16 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:    wxWindows licence
+// 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)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 


@@ -30,6 +28,18 @@ wxPoint wxJoystick::GetPosition() const
     return wxPoint(0, 0);
 }
 
     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
 int wxJoystick::GetZPosition() const
 {
     // TODO


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

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

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


@@ -113,7 +123,7 @@ int wxJoystick::GetProductId() const
 wxString wxJoystick::GetProductName() const
 {
     // TODO
 wxString wxJoystick::GetProductName() const
 {
     // TODO

-    return wxString("");
+    return wxString(wxT(""));

 }
 
 int wxJoystick::GetXMin() const
 }
 
 int wxJoystick::GetXMin() const


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

+#endif 
+    // !OSX

 #endif
 #endif

-       // wxUSE_JOYSTICK
+    // wxUSE_JOYSTICK