bakefile-generated makefiles for the sample

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

diff --git a/src/palmos/joystick.cpp b/src/palmos/joystick.cpp
index 432244d1b18b44873e550ce90702014afb7ba9dc..01a44cd3e3c20f7dc97b6b3f49dc92911d71b625 100644 (file)
--- a/src/palmos/joystick.cpp
+++ b/src/palmos/joystick.cpp
@@ -9,20 +9,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "joystick.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
+#if wxUSE_JOYSTICK
 
-#include "wx/string.h"
-#include "wx/window.h"
-#include "wx/palmos/joystick.h"
+#include "wx/joystick.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/window.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
@@ -31,7 +28,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 wxJoystick::wxJoystick(int joystick)
 {
-};
+}
 
 wxPoint wxJoystick::GetPosition() const
 {
@@ -107,7 +104,7 @@ int wxJoystick::GetProductId() const
 
 wxString wxJoystick::GetProductName() const
 {
-    return wxString("");
+    return wxEmptyString;
 }
 
 int wxJoystick::GetXMin() const
@@ -249,3 +246,4 @@ bool wxJoystick::ReleaseCapture()
     return false;
 }
 
+#endif  // wxUSE_JOYSTICK