X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..55f5548f782e57d1067cf0ab10c51d7ec5af61ac:/src/mac/carbon/joystick.cpp?ds=sidebyside

diff --git a/src/mac/carbon/joystick.cpp b/src/mac/carbon/joystick.cpp
index 6677277f48..c56cf2001a 100644
--- a/src/mac/carbon/joystick.cpp
+++ b/src/mac/carbon/joystick.cpp
@@ -1,19 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        joystick.cpp
 // Purpose:     wxJoystick class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "joystick.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_JOYSTICK
+
+#if !defined (__WXMAC_OSX__)
 
-#include <wx/joystick.h>
+#include "wx/joystick.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
@@ -88,7 +90,7 @@ bool wxJoystick::IsOk() const
     return FALSE;
 }
 
-int wxJoystick::GetNumberJoysticks() const
+int wxJoystick::GetNumberJoysticks()
 {
     // TODO
     return 0;
@@ -109,7 +111,7 @@ int wxJoystick::GetProductId() const
 wxString wxJoystick::GetProductName() const
 {
     // TODO
-    return wxString("");
+    return wxString(wxT(""));
 }
 
 int wxJoystick::GetXMin() const
@@ -277,3 +279,8 @@ bool wxJoystick::ReleaseCapture()
     return FALSE;
 }
 
+#endif 
+    // !OSX
+#endif
+    // wxUSE_JOYSTICK
+