Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support for DWebBrowserEvents2 to control, regenerated proxy event firing header and implemented a few more methods

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@13077 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
locka%iol.ie
1998-10-18 22:14:47 +00:00
parent e40b183083
commit 32f8ab11a9
8 changed files with 769 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mozilla/webshell/embed/ActiveX/WebShellContainer.cpp
View File

@@ -10,6 +10,8 @@ static NS_DEFINE_IID(kIStreamObserverIID, NS_ISTREAMOBSERVER_IID);
CWebShellContainer::CWebShellContainer(CMozillaBrowser *pOwner)
{
m_pOwner = pOwner;
m_pEvents1 = m_pOwner;
m_pEvents2 = m_pOwner;
}
@@ -92,11 +94,14 @@ CWebShellContainer::BeginLoadURL(nsIWebShell* aShell, const PRUnichar* aURL)
VARIANT_BOOL bCancel = VARIANT_FALSE;
long lFlags = 0;
m_pOwner->Fire_BeforeNavigate(bstrURL, lFlags, bstrTargetFrameName, pvPostData, bstrHeaders, &bCancel);
m_pEvents1->Fire_BeforeNavigate(bstrURL, lFlags, bstrTargetFrameName, pvPostData, bstrHeaders, &bCancel);
// TODO m_pEvents2->Fire_BeforeNavigate2(...)
SysFreeString(bstrURL);
SysFreeString(bstrTargetFrameName);
SysFreeString(bstrHeaders);
if (bCancel == VARIANT_TRUE)
{
if (aShell)
@@ -116,7 +121,8 @@ NS_IMETHODIMP
CWebShellContainer::ProgressLoadURL(nsIWebShell* aShell, const PRUnichar* aURL, PRInt32 aProgress, PRInt32 aProgressMax)
{
ATLTRACE(_T("CWebShellContainer::ProgressLoadURL()\n"));
m_pOwner->Fire_ProgressChange(aProgress, aProgressMax);
m_pEvents1->Fire_ProgressChange(aProgress, aProgressMax);
m_pEvents2->Fire_ProgressChange(aProgress, aProgressMax);
return NS_OK;
}
@@ -128,7 +134,8 @@ CWebShellContainer::EndLoadURL(nsIWebShell* aShell, const PRUnichar* aURL, PRInt
USES_CONVERSION;
OLECHAR *pszURL = W2OLE((WCHAR *) aURL);
BSTR bstrURL = SysAllocString(pszURL);
m_pOwner->Fire_NavigateComplete(bstrURL);
m_pEvents1->Fire_NavigateComplete(bstrURL);
// TODO m_pEvents2->Fire_NavigateComplete2(...)
m_pOwner->m_bBusy = FALSE;
SysFreeString(bstrURL);
@@ -161,7 +168,7 @@ NS_IMETHODIMP
CWebShellContainer::OnStartBinding(nsIURL* aURL, const char *aContentType)
{
ATLTRACE(_T("CWebShellContainer::OnStartBinding()\n"));
return NS_ERROR_FAILURE;
return NS_OK;
}
@@ -169,7 +176,7 @@ NS_IMETHODIMP
CWebShellContainer::OnProgress(nsIURL* aURL, PRInt32 aProgress, PRInt32 aProgressMax)
{
ATLTRACE(_T("CWebShellContainer::OnProgress()\n"));
return NS_ERROR_FAILURE;
return NS_OK;
}
@@ -177,7 +184,14 @@ NS_IMETHODIMP
CWebShellContainer::OnStatus(nsIURL* aURL, const nsString &aMsg)
{
ATLTRACE(_T("CWebShellContainer::OnStatus()\n"));
return NS_ERROR_FAILURE;
USES_CONVERSION;
BSTR bstrText = SysAllocString(W2OLE((PRUnichar *) aMsg));
m_pEvents1->Fire_StatusTextChange(bstrText);
m_pEvents2->Fire_StatusTextChange(bstrText);
SysFreeString(bstrText);
return NS_OK;
}
@@ -185,5 +199,5 @@ NS_IMETHODIMP
CWebShellContainer::OnStopBinding(nsIURL* aURL, PRInt32 aStatus, const nsString &aMsg)
{
ATLTRACE(_T("CWebShellContainer::OnStopBinding()\n"));
return NS_ERROR_FAILURE;
return NS_OK;
}