EVT_KILL_FOCUS(wxActiveX::OnKillFocus)
END_EVENT_TABLE()
+IMPLEMENT_CLASS(wxActiveX, wxWindow)
+
class wxActiveX;
class FrameSite :
m_oleObject->Close(OLECLOSE_NOSAVE);
m_oleObject->SetClientSite(NULL);
}
+
+ // Unregister object as active
+ RevokeActiveObject(m_pdwRegister, NULL);
}
void wxActiveX::CreateActiveX(REFCLSID clsid)
{
- SetTransparent();
-
HRESULT hret;
////////////////////////////////////////////////////////
wxCHECK_RET(adviseSink.Ok(), _T("adviseSink not Ok"));
- // // Create Object, get IUnknown interface
+ // Create Object, get IUnknown interface
m_ActiveX.CreateInstance(clsid, IID_IUnknown);
wxCHECK_RET(m_ActiveX.Ok(), _T("m_ActiveX.CreateInstance failed"));
+ // Register object as active
+ unsigned long pdwRegister;
+ hret = RegisterActiveObject(m_ActiveX, clsid, ACTIVEOBJECT_WEAK, &m_pdwRegister);
+ WXOLE_WARN(hret, "Unable to register object as active");
+
// Get Dispatch interface
hret = m_Dispatch.QueryInterface(IID_IDispatch, m_ActiveX);
WXOLE_WARN(hret, "Unable to get dispatch interface");
// Update by GBR to resize older controls
wxSizeEvent szEvent;
szEvent.m_size = wxSize(w, h) ;
- AddPendingEvent(szEvent);
+ GetEventHandler()->AddPendingEvent(szEvent);
};
}
{
// cdecl call
// sometimes the pDispParams does not match the param info for a activex control
- int nArg = min(func.params.size(), pDispParams->cArgs);
+ int nArg = wxMin(func.params.size(), pDispParams->cArgs);
for (int i = nArg - 1; i >= 0; i--)
{
VARIANTARG& va = pDispParams->rgvarg[i];
if (func.hasOut)
{
- int nArg = min(func.params.size(), pDispParams->cArgs);
- m_activeX->GetParent()->ProcessEvent(event);
+ int nArg = wxMin(func.params.size(), pDispParams->cArgs);
+ m_activeX->GetEventHandler()->ProcessEvent(event);
for (int i = 0; i < nArg; i++)
{
VARIANTARG& va = pDispParams->rgvarg[i];
};
}
else
- m_activeX->GetParent()->AddPendingEvent(event);
+ m_activeX->GetEventHandler()->AddPendingEvent(event);
};
return m_params[i];
};
- wxString err = "wxActiveXEvent::operator[] invalid name <" + name + ">";
- err += "\r\nValid Names = :\r\n";
+ wxString err = _T("wxActiveXEvent::operator[] invalid name <") + name + _T(">");
+ err += _T("\r\nValid Names = :\r\n");
for (i = 0; i < m_params.GetCount(); i++)
{
err += m_params[i].GetName();
- err += "\r\n";
+ err += _T("\r\n");
};
wxASSERT_MSG(false, err);
ConnectAdvise(ta->guid, disp);
};
+ // Get properties
+ // See bug #1280715 in the wxActiveX SF project
+ int i;
+ for (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++)
+ for (i = 0; i < ta->cFuncs; i++)
{
FUNCDESC FAR *fd = NULL;
if (it == m_propNames.end())
{
wxString s;
- s << "property <" << name << "> not found";
+ s << _T("property <") << name << _T("> not found");
throw exception(s.mb_str());
};
if (it == m_methodNames.end())
{
wxString s;
- s << "method <" << name << "> not found";
+ s << _T("method <") << name << _T("> not found");
throw exception(s.mb_str());
};
if (! prop.CanSet())
{
wxString s;
- s << "property <" << name << "> is readonly";
+ s << _T("property <") << name << _T("> is readonly");
throw exception(s.mb_str());
};
if (! prop.CanGet())
{
wxString s;
- s << "property <" << name << "> is writeonly";
+ s << _T("property <") << name << _T("> is writeonly");
throw exception(s.mb_str());
};
{
wxLogTrace(wxT(""),wxT("repainting activex win"));
wxPaintDC dc(this);
- dc.BeginDrawing();
int w, h;
GetSize(&w, &h);
RECT posRect;
dc.DrawRectangle(0, 0, w, h);
dc.SetBrush(wxNullBrush);
}
- dc.EndDrawing();
}
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)
bool GetSysErrMessage(int err, wxString& s)
{
- char buf[256];
+ wxChar buf[256];
if (FormatMessage(
FORMAT_MESSAGE_FROM_SYSTEM, NULL,
err,0, buf, sizeof(buf), NULL) == 0)
switch (hr)
{
case S_OK:
- return "";
+ return wxEmptyString;
case CONNECT_E_CANNOTCONNECT:
- return "Cannot connect to event interface (maybe not there ?) - see MSDN";
+ return _T("Cannot connect to event interface (maybe not there ?) - see MSDN");
case DISP_E_MEMBERNOTFOUND:
- return "The requested member does not exist, or the call to Invoke tried to set the value of a read-only property.";
+ return _T("The requested member does not exist, or the call to Invoke tried to set the value of a read-only property.");
case DISP_E_BADVARTYPE:
- return "One of the parameters in rgvarg is not a valid variant type.";
+ return _T("One of the parameters in rgvarg is not a valid variant type.");
case DISP_E_BADPARAMCOUNT:
- return "The number of elements provided to DISPPARAMS is different from the number of parameters accepted by the method or property";
+ return _T("The number of elements provided to DISPPARAMS is different from the number of parameters accepted by the method or property");
case DISP_E_EXCEPTION:
- return "The application needs to raise an exception. In this case, the structure passed in pExcepInfo should be filled in.";
+ return _T("The application needs to raise an exception. In this case, the structure passed in pExcepInfo should be filled in.");
case DISP_E_TYPEMISMATCH:
- return "One or more of the parameters could not be coerced. The index within rgvarg of the first parameter with the incorrect type is returned in the puArgErr parameter.";
+ return _T("One or more of the parameters could not be coerced. The index within rgvarg of the first parameter with the incorrect type is returned in the puArgErr parameter.");
case DISP_E_PARAMNOTOPTIONAL:
- return "A required parameter was omitted.";
+ return _T("A required parameter was omitted.");
case DISP_E_PARAMNOTFOUND:
- return "One of the parameter DISPIDs does not correspond to a parameter on the method. In this case, puArgErr should be set to the first parameter that contains the error.";
+ return _T("One of the parameter DISPIDs does not correspond to a parameter on the method. In this case, puArgErr should be set to the first parameter that contains the error.");
case OLECMDERR_E_UNKNOWNGROUP:
- return "The pguidCmdGroup parameter is not NULL but does not specify a recognized command group.";
+ return _T("The pguidCmdGroup parameter is not NULL but does not specify a recognized command group.");
case OLECMDERR_E_NOTSUPPORTED:
- return "The nCmdID parameter is not a valid command in the group identified by pguidCmdGroup.";
+ return _T("The nCmdID parameter is not a valid command in the group identified by pguidCmdGroup.");
case OLECMDERR_E_DISABLED:
- return "The command identified by nCmdID is currently disabled and cannot be executed.";
+ return _T("The command identified by nCmdID is currently disabled and cannot be executed.");
case OLECMDERR_E_NOHELP:
- return "The caller has asked for help on the command identified by nCmdID, but no help is available.";
+ return _T("The caller has asked for help on the command identified by nCmdID, but no help is available.");
case OLECMDERR_E_CANCELED:
- return "The user canceled the execution of the command.";
+ return _T("The user canceled the execution of the command.");
case E_INVALIDARG:
- return "E_INVALIDARG";
+ return _T("E_INVALIDARG");
case E_OUTOFMEMORY:
- return "E_OUTOFMEMORY";
+ return _T("E_OUTOFMEMORY");
case E_NOINTERFACE:
- return "E_NOINTERFACE";
+ return _T("E_NOINTERFACE");
case E_UNEXPECTED:
- return "E_UNEXPECTED";
+ return _T("E_UNEXPECTED");
case STG_E_INVALIDFLAG:
- return "STG_E_INVALIDFLAG";
+ return _T("STG_E_INVALIDFLAG");
case E_FAIL:
- return "E_FAIL";
+ return _T("E_FAIL");
case E_NOTIMPL:
- return "E_NOTIMPL";
+ return _T("E_NOTIMPL");
default:
{
- char buf[64];
- sprintf(buf, "Unknown - 0x%X", hr);
- return wxString(buf);
+ wxString buf;
+ buf.Printf(_T("Unknown - 0x%X"), hr);
+ return buf;
}
};
};
return s;
}
else
- return "StringFromIID() error";
+ return _T("StringFromIID() error");
}
projects / wxWidgets.git / blobdiff