X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae199d6e4d36708ec604c2b743e4b3d93213bebd..38c39207e99b6446b3a5b09667f2706c64aae91a:/src/msw/joystick.cpp diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp index c2ef23d741..ded5a5fc63 100644 --- a/src/msw/joystick.cpp +++ b/src/msw/joystick.cpp @@ -293,6 +293,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; @@ -300,7 +302,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); @@ -308,7 +309,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; }