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

This commit was manufactured by cvs2svn to create tag

Browse Source 
'wxPy_last_2_6_merge_point'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/wxPy_last_2_6_merge_point@36829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2006-01-10 23:49:18 +00:00
parent f58a6c817e
commit bd72e111fa
8491 changed files with 27025 additions and 2978419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -305,8 +305,6 @@ wxActiveX::~wxActiveX()
void wxActiveX::CreateActiveX(REFCLSID clsid)
{
SetTransparent();
HRESULT hret;
////////////////////////////////////////////////////////
@@ -1172,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++)
@@ -1777,6 +1800,16 @@ void wxActiveX::OnMouse(wxMouseEvent& event)
wxLogTrace(wxT(""),wxT("msg sent"));
}
bool wxActiveX::MSWTranslateMessage(WXMSG *msg){
if (msg->message == WM_KEYDOWN){
HRESULT result = m_oleInPlaceActiveObject->TranslateAccelerator(msg);
return (result == S_OK);
}
return wxWindow::MSWTranslateMessage(msg);
}
long wxActiveX::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{
if (m_oleObjectHWND == NULL)