Fixed inability to select no superscript and no subscript in wxRichTextCtrl's

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

diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index 51e617809459baca011d51245d147ac6fa6b5196..1b9f8b04cede331fa8819b936854cf4745c2daef 100644 (file)
--- a/src/msw/joystick.cpp
+++ b/src/msw/joystick.cpp
@@ -22,9 +22,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/msw/private.h"
 
 #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
@@ -36,7 +36,6 @@
 #define NO_JOYGETPOSEX
 #endif
 
-#include "wx/window.h"
 #include "wx/msw/registry.h"
 
 #include <regstr.h>
@@ -87,6 +86,26 @@ wxPoint wxJoystick::GetPosition() const
         return wxPoint(0,0);
 }
 
+int wxJoystick::GetPosition(unsigned axis) const
+{
+    switch (axis) {
+    case 0:
+        return GetPosition().x;
+    case 1:
+        return GetPosition().y;
+    case 2:
+        return GetZPosition();
+    case 3:
+        return GetRudderPosition();
+    case 4:
+        return GetUPosition();
+    case 5:
+        return GetVPosition();
+    default:
+        return 0;
+    }
+}
+
 int wxJoystick::GetZPosition() const
 {
     JOYINFO joyInfo;
@@ -128,6 +147,14 @@ int wxJoystick::GetButtonState() const
         return 0;
 }
 
+bool wxJoystick::GetButtonState(unsigned id) const
+{
+    if (id > sizeof(int) * 8)
+        return false;
+
+    return (GetButtonState() & (1 << id)) != 0;
+}
+
 /**
     JLI 2002-08-20:
     Returns -1 to signify error.