/////////////////////////////////////////////////////////////////////////////
-// Name: joystick.cpp
+// Name: src/msw/joystick.cpp
// Purpose: wxJoystick class
// Author: Julian Smart
// Modified by:
// 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"
#pragma hdrstop
#endif
+#if wxUSE_JOYSTICK
+
+#include "wx/joystick.h"
#include "wx/string.h"
#include "wx/window.h"
#include "wx/msw/private.h"
#include <mmsystem.h>
#endif
-#if !defined(__WIN32__) && !defined(_MMRESULT_)
-typedef UINT MMRESULT;
-#endif
-
-#ifdef __GNUWIN32_OLD__
-#include "wx/msw/gnuwin32/extra.h"
-#endif
-
// Why doesn't BC++ have joyGetPosEx?
#if !defined(__WIN32__) || defined(__BORLANDC__)
#define NO_JOYGETPOSEX
#endif
#include "wx/window.h"
-#include "wx/msw/joystick.h"
+#include "wx/msw/registry.h"
+
+#include <regstr.h>
IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
/* No such joystick, return ID 0 */
m_joystick = 0;
return;
-};
+}
wxPoint wxJoystick::GetPosition() const
{
if (res == JOYERR_NOERROR )
return wxPoint(joyInfo.wXpos, joyInfo.wYpos);
else
- return wxPoint();
+ return wxPoint(0,0);
}
int wxJoystick::GetZPosition() const
wxString wxJoystick::GetProductName() const
{
+ wxString str;
+#ifndef __WINE__
JOYCAPS joyCaps;
- if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
+ if (joyGetDevCaps(m_joystick, &joyCaps, sizeof(joyCaps)) != JOYERR_NOERROR)
return wxEmptyString;
- else
- return wxString(joyCaps.szPname);
+
+ wxRegKey key1(wxString::Format(wxT("HKEY_LOCAL_MACHINE\\%s\\%s\\%s"),
+ REGSTR_PATH_JOYCONFIG, joyCaps.szRegKey, REGSTR_KEY_JOYCURR));
+
+ key1.QueryValue(wxString::Format(wxT("Joystick%d%s"),
+ m_joystick + 1, REGSTR_VAL_JOYOEMNAME),
+ str);
+
+ 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;
}
int wxJoystick::GetXMin() const
return (res == JOYERR_NOERROR);
}
+#endif // wxUSE_JOYSTICK