GetIcon() returns wxIconLocation, not wxIcon, now

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

diff --git a/src/mac/joystick.cpp b/src/mac/joystick.cpp
index 6677277f48be151868fcbe292166c92cb0914462..156b9b26570395a30a0686d8e3dda3480fdc2f02 100644 (file)
--- a/src/mac/joystick.cpp
+++ b/src/mac/joystick.cpp
@@ -1,19 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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/joystick.h>
+#include "wx/setup.h"
+
+#include "wx/joystick.h"
+
+#if wxUSE_JOYSTICK
 
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
@@ -109,7 +113,7 @@ int wxJoystick::GetProductId() const
 wxString wxJoystick::GetProductName() const
 {
     // TODO
-    return wxString("");
+    return wxString(wxT(""));
 }
 
 int wxJoystick::GetXMin() const
@@ -277,3 +281,6 @@ bool wxJoystick::ReleaseCapture()
     return FALSE;
 }
 
+#endif
+    // wxUSE_JOYSTICK
+