reintroducing direct access, cleanup

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

diff --git a/src/mac/carbon/joystick.cpp b/src/mac/carbon/joystick.cpp
index 6a45f419fdc0a85c422b9a1e68fda81f0f7bdeff..83ef3bf68dabbe2383d1bd0cd0bb68fdf2658ce3 100644 (file)
--- a/src/mac/carbon/joystick.cpp
+++ b/src/mac/carbon/joystick.cpp
@@ -9,16 +9,18 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "joystick.h"
 #endif
 
-#include "wx/setup.h"
-
-#include "wx/joystick.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_JOYSTICK
 
+#if !defined (__WXMAC_OSX__)
+
+#include "wx/joystick.h"
+
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 // Attributes
@@ -113,7 +115,7 @@ int wxJoystick::GetProductId() const
 wxString wxJoystick::GetProductName() const
 {
     // TODO
-    return wxString("");
+    return wxString(wxT(""));
 }
 
 int wxJoystick::GetXMin() const
@@ -281,6 +283,8 @@ bool wxJoystick::ReleaseCapture()
     return FALSE;
 }
 
+#endif 
+    // !OSX
 #endif
     // wxUSE_JOYSTICK