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

merge #4 from 2.6 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-01-10 23:15:38 +00:00
parent f01fbad837
commit 17991ec034
5 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
wxPython/contrib/activex/wxie/wxactivex.cpp
View File

@@ -1170,6 +1170,31 @@ void wxActiveX::GetTypeInfo(ITypeInfo *ti, bool defInterface, bool defEventSink)
ConnectAdvise(ta->guid, disp);
};
// Get properties
// See bug #1280715 in the wxActiveX SF project
for (int i = 0; i < ta->cVars; i++) {
VARDESC FAR *vd = NULL;
typeInfo->GetVarDesc(i, &vd) ;
BSTR bstrProperty = NULL;
typeInfo->GetDocumentation(vd->memid, &bstrProperty,
NULL, NULL, NULL);
wxString propName(bstrProperty);
m_props.push_back(PropX());
int idx = m_props.size() - 1;
m_propNames[propName] = idx;
m_props[idx].name = propName;
m_props[idx].memid = vd->memid;
ParamX param;
param.isSafeArray = false;
param.isPtr = false;
param.flags = vd->elemdescVar.idldesc.wIDLFlags;
param.vt = vd->elemdescVar.tdesc.vt;
m_props[idx].arg = param;
m_props[idx].type = param;
}
// Get Function Names
for (int i = 0; i < ta->cFuncs; i++)