Reduced deprecation warning frequency

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

diff --git a/src/mac/carbon/joystick.cpp b/src/mac/carbon/joystick.cpp
index 6677277f48be151868fcbe292166c92cb0914462..c56cf2001ac456c465ae792df6327c7c10f3b046 100644 (file)
--- a/src/mac/carbon/joystick.cpp
+++ b/src/mac/carbon/joystick.cpp
@@ -1,19 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        joystick.cpp
 // Purpose:     wxJoystick class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        joystick.cpp
 // Purpose:     wxJoystick class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // 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)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 


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

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

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


@@ -109,7 +111,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


@@ -277,3 +279,8 @@ bool wxJoystick::ReleaseCapture()
     return FALSE;
 }
 
     return FALSE;
 }
 

+#endif 
+    // !OSX
+#endif
+    // wxUSE_JOYSTICK
+