X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb9010ed40454cc978a9cbaa6de2ee41ea8b6c84..8b4457965a0c0d0ef828dbf7cca3d2f947083054:/src/os2/joystick.cpp

diff --git a/src/os2/joystick.cpp b/src/os2/joystick.cpp
index 5f20af8209..7d9ec64512 100644
--- a/src/os2/joystick.cpp
+++ b/src/os2/joystick.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        joystick.cpp
+// Name:        src/os2/joystick.cpp
 // Purpose:     wxJoystick class
 // Author:      David Webster
 // Modified by:
@@ -9,15 +9,24 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+//
+// For compilers that support precompilation, includes "wx.h".
+//
+#include "wx/wxprec.h"
+
+#include "wx/defs.h"
+
+#if wxUSE_JOYSTICK
+
 #include "wx/string.h"
 #define INCL_PM
-#include "os2.h"
+#define INCL_DOS
 #include "wx/os2/private.h"
 
 #define NO_JOYGETPOSEX
 
-#include <wx/window.h>
-#include <wx/joystick.h>
+#include "wx/window.h"
+#include "wx/joystick.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
@@ -78,7 +87,7 @@ int wxJoystick::GetMovementThreshold() const
     return 0;
 }
 
-void wxJoystick::SetMovementThreshold(int threshold)
+void wxJoystick::SetMovementThreshold(int WXUNUSED(threshold))
 {
     // TODO
 }
@@ -89,10 +98,10 @@ void wxJoystick::SetMovementThreshold(int threshold)
 bool wxJoystick::IsOk() const
 {
     // TODO
-    return FALSE;
+    return false;
 }
 
-int wxJoystick::GetNumberJoysticks() const
+int wxJoystick::GetNumberJoysticks()
 {
     // TODO
     return 0;
@@ -113,7 +122,7 @@ int wxJoystick::GetProductId() const
 wxString wxJoystick::GetProductName() const
 {
     // TODO
-    return wxString("");
+    return wxEmptyString;
 }
 
 int wxJoystick::GetXMin() const
@@ -227,57 +236,57 @@ int wxJoystick::GetVMax() const
 bool wxJoystick::HasRudder() const
 {
     // TODO
-    return FALSE;
+    return false;
 }
 
 bool wxJoystick::HasZ() const
 {
     // TODO
-    return FALSE;
+    return false;
 }
 
 bool wxJoystick::HasU() const
 {
     // TODO
-    return FALSE;
+    return false;
 }
 
 bool wxJoystick::HasV() const
 {
     // TODO
-    return FALSE;
+    return false;
 }
 
 bool wxJoystick::HasPOV() const
 {
     // TODO
-    return FALSE;
+    return false;
 }
 
 bool wxJoystick::HasPOV4Dir() const
 {
     // TODO
-    return FALSE;
+    return false;
 }
 
 bool wxJoystick::HasPOVCTS() const
 {
     // TODO
-    return FALSE;
+    return false;
 }
 
 // Operations
 ////////////////////////////////////////////////////////////////////////////
 
-bool wxJoystick::SetCapture(wxWindow* win, int pollingFreq)
+bool wxJoystick::SetCapture(wxWindow* WXUNUSED(win), int WXUNUSED(pollingFreq))
 {
     // TODO
-    return FALSE;
+    return false;
 }
 
 bool wxJoystick::ReleaseCapture()
 {
     // TODO
-    return FALSE;
+    return false;
 }
-
+#endif  // wxUSE_JOYSTICK