added a dummy return to GetItemState() to suppress gcc warning (but shouldn't we...

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

diff --git a/src/mac/carbon/joystick.cpp b/src/mac/carbon/joystick.cpp
index 6a45f419fdc0a85c422b9a1e68fda81f0f7bdeff..c56cf2001ac456c465ae792df6327c7c10f3b046 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)
 
@@ -92,7 +90,7 @@ bool wxJoystick::IsOk() const
     return FALSE;
 }
 
-int wxJoystick::GetNumberJoysticks() const
+int wxJoystick::GetNumberJoysticks()
 {
     // TODO
     return 0;
@@ -113,7 +111,7 @@ int wxJoystick::GetProductId() const
 wxString wxJoystick::GetProductName() const
 {
     // TODO
-    return wxString("");
+    return wxString(wxT(""));
 }
 
 int wxJoystick::GetXMin() const
@@ -281,6 +279,8 @@ bool wxJoystick::ReleaseCapture()
     return FALSE;
 }
 
+#endif 
+    // !OSX
 #endif
     // wxUSE_JOYSTICK