Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-14 04:03:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adding saftey checks to Mac dynamic menu MDEF to stop some crashes brade has been seeing.

Browse Source
This commit is contained in:
saari%netscape.com 2000-04-14 21:39:27 +00:00
parent 673a539153
commit 2e98b4944e
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
widget/src/mac/nsDynamicMDEF.cpp
View File

@ -285,11 +285,13 @@ void nsDoMagic(MenuHandle theMenu)
// ask if this is a child of the previous menu
PRBool isChild = PR_FALSE;
if(gPreviousMenuStack[gPreviousMenuStack.Count() - 1]) {
if(nsIsHierChild(theMenu)) {
isChild = PR_TRUE;
}
}
if(gPreviousMenuStack.Count() > 0) {
if(gPreviousMenuStack[gPreviousMenuStack.Count() - 1]) {
if(nsIsHierChild(theMenu)) {
isChild = PR_TRUE;
}
}
}
if(theMenu == gLevel2HierMenu) {
gCurrentMenuDepth = 2;
@ -360,18 +362,20 @@ void nsBuildMenu(MenuHandle theMenu, PRBool isChild)
nsISupports * supports = nsnull;
//printf("gCurrentMenuItem = %d \n", gCurrentMenuItem);
if(gCurrentMenuItem) {
nsIMenu * prevMenu = (nsIMenu *) gPreviousMenuStack[gPreviousMenuStack.Count() - 1];
//printf("gPreviousMenuStack.Count() = %d \n", gPreviousMenuStack.Count() );
if(prevMenu) {
prevMenu->GetItemAt(gCurrentMenuItem - 1, supports);
nsCOMPtr<nsIMenu> menu(do_QueryInterface(supports));
if(menu) {
nsCOMPtr<nsIMenuListener> menulistener(do_QueryInterface(supports));
menulistener->MenuSelected(mevent);
nsPostBuild(menu, theMenu, isChild);
}
}
if(gPreviousMenuStack.Count() > 0) {
nsIMenu * prevMenu = (nsIMenu *) gPreviousMenuStack[gPreviousMenuStack.Count() - 1];
//printf("gPreviousMenuStack.Count() = %d \n", gPreviousMenuStack.Count() );
if(prevMenu) {
prevMenu->GetItemAt(gCurrentMenuItem - 1, supports);
nsCOMPtr<nsIMenu> menu(do_QueryInterface(supports));
if(menu) {
nsCOMPtr<nsIMenuListener> menulistener(do_QueryInterface(supports));
menulistener->MenuSelected(mevent);
nsPostBuild(menu, theMenu, isChild);
}
}
}
}
}
//printf("exit BuildMenu \n");
@ -427,8 +431,11 @@ void nsPushMenu(nsIMenu * aMenu)
//------------------------------------------------------------------------------
void nsPopMenu(nsIMenu ** aMenu)
{
*aMenu = (nsIMenu *) gPreviousMenuStack[gPreviousMenuStack.Count() - 1];
gPreviousMenuStack.RemoveElementAt(gPreviousMenuStack.Count() - 1);
if(gPreviousMenuStack.Count() > 0) {
*aMenu = (nsIMenu *) gPreviousMenuStack[gPreviousMenuStack.Count() - 1];
gPreviousMenuStack.RemoveElementAt(gPreviousMenuStack.Count() - 1);
} else
*aMenu = nsnull;
}
//------------------------------------------------------------------------------