From f430e67cb850375e4bf4a92d3b67f3ac61c80188 Mon Sep 17 00:00:00 2001 From: "locka%iol.ie" Date: Tue, 12 Jun 2001 16:23:35 +0000 Subject: [PATCH] Added code to fire TitleChange events. b=84496 r=ccarlen@netscape.com sr=blizzard@mozilla.org a=asa@mozilla.org --- .../src/control/IOleCommandTargetImpl.h | 3 ++- .../src/control/WebBrowserContainer.cpp | 21 +++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/embedding/browser/activex/src/control/IOleCommandTargetImpl.h b/embedding/browser/activex/src/control/IOleCommandTargetImpl.h index 910cb0cc5546..0c949e851069 100644 --- a/embedding/browser/activex/src/control/IOleCommandTargetImpl.h +++ b/embedding/browser/activex/src/control/IOleCommandTargetImpl.h @@ -224,7 +224,8 @@ public: { pCI->pfnCommandProc(pT, pCI->pCmdGUID, pCI->nCmdID, nCmdexecopt, pvaIn, pvaOut); } - else if (pCI->nWindowsCmdID != 0) + else if (pCI->nWindowsCmdID != 0 && + !(nCmdexecopt & OLECMDEXECOPT_SHOWHELP)) { HWND hwndTarget = pT->GetCommandTargetWindow(); if (hwndTarget) diff --git a/embedding/browser/activex/src/control/WebBrowserContainer.cpp b/embedding/browser/activex/src/control/WebBrowserContainer.cpp index 7ca9fe3bd13f..e2474f427e0f 100644 --- a/embedding/browser/activex/src/control/WebBrowserContainer.cpp +++ b/embedding/browser/activex/src/control/WebBrowserContainer.cpp @@ -479,14 +479,31 @@ CWebBrowserContainer::SetFocus(void) NS_IMETHODIMP CWebBrowserContainer::GetTitle(PRUnichar * *aTitle) { - return NS_ERROR_FAILURE; + NG_ASSERT_POINTER(aTitle, PRUnichar **); + if (!aTitle) + return E_INVALIDARG; + + *aTitle = m_sTitle.ToNewUnicode(); + + return NS_OK; } NS_IMETHODIMP CWebBrowserContainer::SetTitle(const PRUnichar * aTitle) { - return NS_ERROR_FAILURE; + NG_ASSERT_POINTER(aTitle, PRUnichar *); + if (!aTitle) + return E_INVALIDARG; + + m_sTitle = aTitle; + // Fire a TitleChange event + BSTR bstrTitle = SysAllocString(aTitle); + m_pEvents1->Fire_TitleChange(bstrTitle); + m_pEvents2->Fire_TitleChange(bstrTitle); + SysFreeString(bstrTitle); + + return NS_OK; }