Cast needed to fix compilation on 10.4 --This line, and those below,

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

diff --git a/src/os2/joystick.cpp b/src/os2/joystick.cpp
index 6677277f48be151868fcbe292166c92cb0914462..2117fd31e3f3616ed94b06519cc418aff4b1b254 100644 (file)
--- a/src/os2/joystick.cpp
+++ b/src/os2/joystick.cpp
@@ -1,19 +1,31 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        joystick.cpp
+// Name:        src/os2/joystick.cpp

 // Purpose:     wxJoystick class
 // Purpose:     wxJoystick class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/09/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "joystick.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_JOYSTICK
+
+#include "wx/joystick.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include <wx/joystick.h>
+#define INCL_PM
+#define INCL_DOS
+#include "wx/os2/private.h"
+
+#define NO_JOYGETPOSEX

 
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 


@@ -74,7 +86,7 @@ int wxJoystick::GetMovementThreshold() const
     return 0;
 }
 
     return 0;
 }
 

-void wxJoystick::SetMovementThreshold(int threshold)
+void wxJoystick::SetMovementThreshold(int WXUNUSED(threshold))

 {
     // TODO
 }
 {
     // TODO
 }


@@ -85,10 +97,10 @@ void wxJoystick::SetMovementThreshold(int threshold)
 bool wxJoystick::IsOk() const
 {
     // TODO
 bool wxJoystick::IsOk() const
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 }
 

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

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


@@ -109,7 +121,7 @@ int wxJoystick::GetProductId() const
 wxString wxJoystick::GetProductName() const
 {
     // TODO
 wxString wxJoystick::GetProductName() const
 {
     // TODO

-    return wxString("");
+    return wxEmptyString;

 }
 
 int wxJoystick::GetXMin() const
 }
 
 int wxJoystick::GetXMin() const


@@ -223,57 +235,58 @@ int wxJoystick::GetVMax() const
 bool wxJoystick::HasRudder() const
 {
     // TODO
 bool wxJoystick::HasRudder() const
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 bool wxJoystick::HasZ() const
 {
     // TODO
 }
 
 bool wxJoystick::HasZ() const
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 bool wxJoystick::HasU() const
 {
     // TODO
 }
 
 bool wxJoystick::HasU() const
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 bool wxJoystick::HasV() const
 {
     // TODO
 }
 
 bool wxJoystick::HasV() const
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 bool wxJoystick::HasPOV() const
 {
     // TODO
 }
 
 bool wxJoystick::HasPOV() const
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 bool wxJoystick::HasPOV4Dir() const
 {
     // TODO
 }
 
 bool wxJoystick::HasPOV4Dir() const
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 bool wxJoystick::HasPOVCTS() const
 {
     // TODO
 }
 
 bool wxJoystick::HasPOVCTS() const
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 // Operations
 ////////////////////////////////////////////////////////////////////////////
 
 }
 
 // Operations
 ////////////////////////////////////////////////////////////////////////////
 

-bool wxJoystick::SetCapture(wxWindow* win, int pollingFreq)
+bool wxJoystick::SetCapture(wxWindow* WXUNUSED(win), int WXUNUSED(pollingFreq))

 {
     // TODO
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 bool wxJoystick::ReleaseCapture()
 {
     // TODO
 }
 
 bool wxJoystick::ReleaseCapture()
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 }
 

+#endif  // wxUSE_JOYSTICK