fixing osx_carbon

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

diff --git a/src/os2/joystick.cpp b/src/os2/joystick.cpp
index 51352cf319d295cc70c6a74894f35b0c984ddb97..2117fd31e3f3616ed94b06519cc418aff4b1b254 100644 (file)
--- a/src/os2/joystick.cpp
+++ b/src/os2/joystick.cpp
@@ -1,28 +1,32 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        joystick.cpp
+// Name:        src/os2/joystick.cpp
 // Purpose:     wxJoystick class
 // Author:      David Webster
 // Modified by:
 // Created:     10/09/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #if wxUSE_JOYSTICK
 
-#include "wx/string.h"
+#include "wx/joystick.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/window.h"
+#endif
+
 #define INCL_PM
 #define INCL_DOS
 #include "wx/os2/private.h"
 
 #define NO_JOYGETPOSEX
 
-#include <wx/window.h>
-#include <wx/joystick.h>
-
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 // Attributes
@@ -82,7 +86,7 @@ int wxJoystick::GetMovementThreshold() const
     return 0;
 }
 
-void wxJoystick::SetMovementThreshold(int threshold)
+void wxJoystick::SetMovementThreshold(int WXUNUSED(threshold))
 {
     // TODO
 }
@@ -93,10 +97,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;
@@ -117,7 +121,7 @@ int wxJoystick::GetProductId() const
 wxString wxJoystick::GetProductName() const
 {
     // TODO
-    return wxString("");
+    return wxEmptyString;
 }
 
 int wxJoystick::GetXMin() const
@@ -231,58 +235,58 @@ 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
 
+#endif  // wxUSE_JOYSTICK