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

Fixing nsIXUlWindowCallbacks bustage. I accidentally commented out the

Browse Source 
ExecuteStartupCode() function, which still needs to be called for now.


git-svn-id: svn://10.0.0.236/trunk@41741 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
hyatt%netscape.com
1999-07-31 21:08:10 +00:00
parent c04c9dedc0
commit c558d21cc3
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
View File

@@ -1812,7 +1812,7 @@ nsWebShellWindow::OnEndDocumentLoad(nsIDocumentLoader* loader,
mLockedUntilChromeLoad = PR_FALSE;
}
#ifdef XP_MAC
#ifdef XP_MAC // Anyone still using native menus should add themselves here.
// register as document listener
// this is needed for menus
nsCOMPtr<nsIContentViewer> cv;
@@ -1830,16 +1830,18 @@ nsWebShellWindow::OnEndDocumentLoad(nsIDocumentLoader* loader,
doc->AddObserver(NS_STATIC_CAST(nsIDocumentObserver*, this));
}
#endif
ExecuteStartupCode();
#ifdef XP_MAC // Anyone still using native menus should add themselves here.
///////////////////////////////
// Find the Menubar DOM and Load the menus, hooking them up to the loaded commands
///////////////////////////////
nsCOMPtr<nsIDOMDocument> menubarDOMDoc(GetNamedDOMDoc(nsAutoString("this"))); // XXX "this" is a small kludge for code reused
if (menubarDOMDoc)
{
#ifdef XP_MAC
#ifdef XP_MAC // Anyone using native non-dynamic menus should add themselves here.
LoadMenus(menubarDOMDoc, mWindow);
// Context Menu test
nsCOMPtr<nsIDOMElement> element;
@@ -2220,13 +2222,9 @@ void nsWebShellWindow::ExecuteStartupCode()
// Execute the string in the onLoad attribute of the webshellElement.
nsString startupCode;
// This is now triggered from elsewhere.
//if (webshellElement && NS_SUCCEEDED(webshellElement->GetAttribute("onload", startupCode)))
// ExecuteJavaScriptString(startupCode);
if (mCallbacks)
mCallbacks->ConstructAfterJavaScript(mWebShell);
}