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

Adding Mac dynamic menus support. This touches a little XP code, notably, adding GetDOMNode and SetDOMNode to nsIMenuItem.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@42778 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
saari%netscape.com
1999-08-09 19:14:38 +00:00
parent fe08914eae
commit b8230c0e68
15 changed files with 846 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -898,6 +898,8 @@ void nsWebShellWindow::DynamicLoadMenus(nsIDOMDocument * aDOMDoc, nsIWidget * aP
nsMenuEvent fake;
menuListener->MenuConstruct(fake, aParentWindow, menubarNode, mWebShell);
#ifdef XP_MAC
#else
// Resize around the menu.
rv = NS_ERROR_FAILURE;
@@ -947,6 +949,7 @@ void nsWebShellWindow::DynamicLoadMenus(nsIDOMDocument * aDOMDoc, nsIWidget * aP
GetWindowBounds(currentBounds);
SizeWindowTo(currentBounds.width, currentBounds.height + heightDelta);
// END REFLOW CODE
#endif
} // end if ( nsnull != pnsMenuBar )
}
@@ -1836,7 +1839,7 @@ nsWebShellWindow::OnEndDocumentLoad(nsIDocumentLoader* loader,
nsCOMPtr<nsIDOMDocument> menubarDOMDoc(GetNamedDOMDoc(nsAutoString("this"))); // XXX "this" is a small kludge for code reused
if (menubarDOMDoc)
{
#ifdef XP_MAC // Anyone using native non-dynamic menus should add themselves here.
#ifdef SOME_PLATFORM // Anyone using native non-dynamic menus should add themselves here.
LoadMenus(menubarDOMDoc, mWindow);
// Context Menu test
nsCOMPtr<nsIDOMElement> element;
@@ -1848,7 +1851,7 @@ nsWebShellWindow::OnEndDocumentLoad(nsIDocumentLoader* loader,
// End Context Menu test
#else
DynamicLoadMenus(menubarDOMDoc, mWindow);
#endif // XP_MAC
#endif
}
#endif // XP_MAC