Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wine corrections

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

5
src/msw/joystick.cpp
View File

@@ -293,6 +293,8 @@ int wxJoystick::GetProductId() const
wxString wxJoystick::GetProductName() const wxString wxJoystick::GetProductName() const
{ {
wxString str;
#ifndef __WINE__
JOYCAPS joyCaps; JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, &joyCaps, sizeof(joyCaps)) != JOYERR_NOERROR) if (joyGetDevCaps(m_joystick, &joyCaps, sizeof(joyCaps)) != JOYERR_NOERROR)
return wxEmptyString; return wxEmptyString;
@@ -300,7 +302,6 @@ wxString wxJoystick::GetProductName() const
wxRegKey key1(wxString::Format(wxT("HKEY_LOCAL_MACHINE\\%s\\%s\\%s"), wxRegKey key1(wxString::Format(wxT("HKEY_LOCAL_MACHINE\\%s\\%s\\%s"),
REGSTR_PATH_JOYCONFIG, joyCaps.szRegKey, REGSTR_KEY_JOYCURR)); REGSTR_PATH_JOYCONFIG, joyCaps.szRegKey, REGSTR_KEY_JOYCURR));
wxString str;
key1.QueryValue(wxString::Format(wxT("Joystick%d%s"), key1.QueryValue(wxString::Format(wxT("Joystick%d%s"),
m_joystick + 1, REGSTR_VAL_JOYOEMNAME), m_joystick + 1, REGSTR_VAL_JOYOEMNAME),
str); str);
@@ -308,7 +309,7 @@ wxString wxJoystick::GetProductName() const
wxRegKey key2(wxString::Format(wxT("HKEY_LOCAL_MACHINE\\%s\\%s"), wxRegKey key2(wxString::Format(wxT("HKEY_LOCAL_MACHINE\\%s\\%s"),
REGSTR_PATH_JOYOEM, str.c_str())); REGSTR_PATH_JOYOEM, str.c_str()));
key2.QueryValue(REGSTR_VAL_JOYOEMNAME, str); key2.QueryValue(REGSTR_VAL_JOYOEMNAME, str);
#endif
return str; return str;
} }

4
src/msw/ole/activex.cpp
View File

@@ -206,7 +206,7 @@ public:
case DISPID_AMBIENT_SILENT: case DISPID_AMBIENT_SILENT:
V_BOOL(pVarResult)= TRUE; V_BOOL(pVarResult)= TRUE;
return S_OK; return S_OK;
#ifndef __WINE__
case DISPID_AMBIENT_APPEARANCE: case DISPID_AMBIENT_APPEARANCE:
pVarResult->vt = VT_BOOL; pVarResult->vt = VT_BOOL;
pVarResult->boolVal = m_bAmbientAppearance; pVarResult->boolVal = m_bAmbientAppearance;
@@ -241,7 +241,7 @@ public:
pVarResult->vt = VT_BOOL; pVarResult->vt = VT_BOOL;
pVarResult->boolVal = m_bAmbientShowHatching; pVarResult->boolVal = m_bAmbientShowHatching;
break; break;
#endif
default: default:
return DISP_E_MEMBERNOTFOUND; return DISP_E_MEMBERNOTFOUND;
} }