Reset wxPGEditor singleton instance pointers in dtors. This is useful if wxPropertyGr...

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

diff --git a/src/palmos/joystick.cpp b/src/palmos/joystick.cpp
index 432244d1b18b44873e550ce90702014afb7ba9dc..528e6dc40852a2b364e487106a1a63e96a20cc81 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,13 +28,25 @@ IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 wxJoystick::wxJoystick(int joystick)
 {
-};
+}
 
 wxPoint wxJoystick::GetPosition() const
 {
     return wxPoint(0, 0);
 }
 
+int wxJoystick::GetPosition(unsigned axis) const
+{
+    // TODO
+    return 0;
+}
+
+bool wxJoystick::GetButtonState(unsigned id) const
+{
+    // TODO
+    return false;
+}
+
 int wxJoystick::GetZPosition() const
 {
     return 0;
@@ -107,7 +116,7 @@ int wxJoystick::GetProductId() const
 
 wxString wxJoystick::GetProductName() const
 {
-    return wxString("");
+    return wxEmptyString;
 }
 
 int wxJoystick::GetXMin() const
@@ -249,3 +258,4 @@ bool wxJoystick::ReleaseCapture()
     return false;
 }
 
+#endif  // wxUSE_JOYSTICK