Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 07:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NOT PART OF BUILD. Remove name parameter from control site

Browse Source
This commit is contained in:
locka%iol.ie 2002-10-15 18:19:09 +00:00
parent 1d5e85e876
commit c83338e2b5
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
embedding/browser/activex/src/control/ControlSite.cpp
View File

@ -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 &&

9
embedding/browser/activex/src/control/ControlSite.h
View File

@ -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
{