Wine corrections

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-10-22 10:22:48 +00:00
parent 9e31a66087
commit 4708068cb6
2 changed files with 5 additions and 4 deletions

View File

@@ -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;
}