зеркало из https://github.com/mozilla/pjs.git
NOT PART OF BUILD. Remove name parameter from control site
This commit is contained in:
Родитель
060d1d400e
Коммит
6b0a400cd6
|
@ -136,13 +136,12 @@ static const CATID CATID_SafeForScripting =
|
|||
|
||||
// Create the specified control, optionally providing properties to initialise
|
||||
// it with and a name.
|
||||
HRESULT CControlSite::Create(REFCLSID clsid, PropertyList &pl, const tstring szName)
|
||||
HRESULT CControlSite::Create(REFCLSID clsid, PropertyList &pl)
|
||||
{
|
||||
NG_TRACE_METHOD_ARGS(CControlSite::Create, "...,...,\"%s\"", szName.c_str());
|
||||
NG_TRACE_METHOD(CControlSite::Create);
|
||||
|
||||
m_clsid = clsid;
|
||||
m_ParameterList = pl;
|
||||
m_szName = szName;
|
||||
|
||||
// See if object is script safe
|
||||
if (m_bSafeForScriptingObjectsOnly &&
|
||||
|
|
|
@ -128,8 +128,6 @@ protected:
|
|||
CComQIPtr<IOleInPlaceObjectWindowless, &IID_IOleInPlaceObjectWindowless> m_spIOleInPlaceObjectWindowless;
|
||||
// Pointer to an externally registered service provider
|
||||
CComPtr<IServiceProvider> m_spServiceProvider;
|
||||
// Name of this control
|
||||
tstring m_szName;
|
||||
// CLSID of the control
|
||||
CLSID m_clsid;
|
||||
// Parameter list
|
||||
|
@ -197,7 +195,7 @@ END_OLECOMMAND_TABLE()
|
|||
|
||||
// Object creation and management functions
|
||||
// Creates and initialises an object
|
||||
virtual HRESULT Create(REFCLSID clsid, PropertyList &pl = PropertyList(), const tstring szName = _T(""));
|
||||
virtual HRESULT Create(REFCLSID clsid, PropertyList &pl = PropertyList());
|
||||
// Attaches the object to the site
|
||||
virtual HRESULT Attach(HWND hwndParent, const RECT &rcPos, IUnknown *pInitStream = NULL);
|
||||
// Detaches the object from the site
|
||||
|
@ -229,11 +227,6 @@ END_OLECOMMAND_TABLE()
|
|||
{
|
||||
return m_clsid;
|
||||
}
|
||||
// Returns the name of the object
|
||||
virtual const tstring &GetObjectName() const
|
||||
{
|
||||
return m_szName;
|
||||
}
|
||||
// Tests if the object is valid or not
|
||||
virtual BOOL IsObjectValid() const
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче