Fixed OpenWatcom (strange) scope related crash.

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

diff --git a/src/mac/classic/joystick.cpp b/src/mac/classic/joystick.cpp
index 156b9b26570395a30a0686d8e3dda3480fdc2f02..d0127f52e2f952157b9bfe602a32f62b02f6bab7 100644 (file)
--- a/src/mac/classic/joystick.cpp
+++ b/src/mac/classic/joystick.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        joystick.cpp
+// Name:        src/mac/classic/joystick.cpp
 // Purpose:     wxJoystick class
 // Author:      Stefan Csomor
 // Modified by:
@@ -9,16 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "joystick.h"
-#endif
+#include "wx/wxprec.h"
 
-#include "wx/setup.h"
+#if wxUSE_JOYSTICK
 
 #include "wx/joystick.h"
 
-#if wxUSE_JOYSTICK
-
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 // Attributes
@@ -89,10 +85,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 +109,7 @@ int wxJoystick::GetProductId() const
 wxString wxJoystick::GetProductName() const
 {
     // TODO
-    return wxString(wxT(""));
+    return wxEmptyString;
 }
 
 int wxJoystick::GetXMin() const
@@ -227,43 +223,43 @@ 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
@@ -272,15 +268,14 @@ bool wxJoystick::HasPOVCTS() const
 bool wxJoystick::SetCapture(wxWindow* win, int pollingFreq)
 {
     // TODO
-    return FALSE;
+    return false;
 }
 
 bool wxJoystick::ReleaseCapture()
 {
     // TODO
-    return FALSE;
+    return false;
 }
 
 #endif
     // wxUSE_JOYSTICK
-