X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c9ee46c3a536bc4008aa93825b7d771d08d51af0..69d31e313035d5e22d9400ec946f6007f710910c:/src/msw/joystick.cpp diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp index 2a7c933f84..1b9f8b04ce 100644 --- a/src/msw/joystick.cpp +++ b/src/msw/joystick.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: joystick.cpp +// Name: src/msw/joystick.cpp // Purpose: wxJoystick class // Author: Julian Smart // Modified by: @@ -9,19 +9,22 @@ // 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 + #pragma hdrstop +#endif + +#if wxUSE_JOYSTICK + +#include "wx/joystick.h" + +#ifndef WX_PRECOMP + #include "wx/string.h" + #include "wx/window.h" #endif -#include "wx/string.h" -#include "wx/window.h" #include "wx/msw/private.h" #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__) @@ -33,9 +36,7 @@ #define NO_JOYGETPOSEX #endif -#include "wx/window.h" #include "wx/msw/registry.h" -#include "wx/msw/joystick.h" #include @@ -73,7 +74,7 @@ wxJoystick::wxJoystick(int joystick) /* No such joystick, return ID 0 */ m_joystick = 0; return; -}; +} wxPoint wxJoystick::GetPosition() const { @@ -85,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; @@ -126,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. @@ -297,6 +326,8 @@ int wxJoystick::GetProductId() const wxString wxJoystick::GetProductName() const { + wxString str; +#ifndef __WINE__ JOYCAPS joyCaps; if (joyGetDevCaps(m_joystick, &joyCaps, sizeof(joyCaps)) != JOYERR_NOERROR) return wxEmptyString; @@ -304,7 +335,6 @@ wxString wxJoystick::GetProductName() const wxRegKey key1(wxString::Format(wxT("HKEY_LOCAL_MACHINE\\%s\\%s\\%s"), REGSTR_PATH_JOYCONFIG, joyCaps.szRegKey, REGSTR_KEY_JOYCURR)); - wxString str; key1.QueryValue(wxString::Format(wxT("Joystick%d%s"), m_joystick + 1, REGSTR_VAL_JOYOEMNAME), str); @@ -312,7 +342,7 @@ wxString wxJoystick::GetProductName() const wxRegKey key2(wxString::Format(wxT("HKEY_LOCAL_MACHINE\\%s\\%s"), REGSTR_PATH_JOYOEM, str.c_str())); key2.QueryValue(REGSTR_VAL_JOYOEMNAME, str); - +#endif return str; } @@ -622,3 +652,4 @@ bool wxJoystick::ReleaseCapture() return (res == JOYERR_NOERROR); } +#endif // wxUSE_JOYSTICK