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

avoid shadowed variable warnings with VS2015

Browse Source
This commit is contained in:
Paul Cornett
2015-07-24 20:56:11 -07:00
parent 64308117e8
commit 36e31e515e
18 changed files with 88 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1007,13 +1007,13 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
// wxAutoOleInterface<> assumes a ref has already been added
// TYPEATTR
TYPEATTR *ta = NULL;
hret = ti->GetTypeAttr(&ta);
TYPEATTR *ta2 = NULL;
hret = ti->GetTypeAttr(&ta2);
CHECK_HR(hret);
if (ta->typekind == TKIND_DISPATCH)
if (ta2->typekind == TKIND_DISPATCH)
{
// WXOLE_TRACEOUT("GUID = " << GetIIDName(ta->guid).c_str());
// WXOLE_TRACEOUT("GUID = " << GetIIDName(ta2->guid).c_str());
if (defEventSink)
{
wxAutoIConnectionPoint cp;
@@ -1022,8 +1022,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
wxAutoIConnectionPointContainer cpContainer(IID_IConnectionPointContainer, m_ActiveX);
wxASSERT( cpContainer.IsOk());
HRESULT hret =
cpContainer->FindConnectionPoint(ta->guid, cp.GetRef());
hret = cpContainer->FindConnectionPoint(ta2->guid, cp.GetRef());
// Notice that the return value of CONNECT_E_NOCONNECTION is
// expected if the interface doesn't support connection points.
@@ -1035,7 +1034,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
if ( cp )
{
wxActiveXEvents * const
events = new wxActiveXEvents(this, ta->guid);
events = new wxActiveXEvents(this, ta2->guid);
hret = cp->Advise(events, &adviseCookie);
// We don't need this object any more and cp will keep a
@@ -1048,7 +1047,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
}
}
ti->ReleaseTypeAttr(ta);
ti->ReleaseTypeAttr(ta2);
}
// free