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

Mac menus destroying themselves more properly

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@26555 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
saari%netscape.com
1999-04-06 22:19:09 +00:00
parent 9ac39587db
commit 01c62fc613
2 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/widget/src/mac/nsMenu.cpp
View File

@@ -94,6 +94,32 @@ nsMenu::~nsMenu()
NS_IF_RELEASE(mMenuBarParent);
NS_IF_RELEASE(mMenuParent);
NS_IF_RELEASE(mListener);
while(mNumMenuItems)
{
--mNumMenuItems;
// Figure out what we're releasing
nsIMenuItem * menuitem = nsnull;
((nsISupports*)mMenuItemVoidArray[mNumMenuItems])->QueryInterface(kIMenuItemIID, (void**) &menuitem);
if(menuitem)
{
// case menuitem
NS_RELEASE(menuitem); // Release our hold
NS_RELEASE(menuitem); // Balance QI
}
else
{
nsIMenu * menu = nsnull;
((nsISupports*)mMenuItemVoidArray[mNumMenuItems])->QueryInterface(kIMenuIID, (void**) &menu);
if(menu)
{
// case menu
NS_RELEASE(menu); // Release our hold
NS_RELEASE(menu); // Balance QI
}
}
}
}
//-------------------------------------------------------------------------

8
mozilla/widget/src/mac/nsMenuBar.cpp
View File

@@ -110,7 +110,6 @@ nsMenuBar::nsMenuBar() : nsIMenuBar(), nsIMenuListener()
mOriginalMacMBarHandle = nsnull;
mMacMBarHandle = nsnull;
mMacMBarHandle = ::GetMenuBar(); // Get a copy of the menu list
//::SetMenuBar(mMacMBarHandle); // Make the copy the current menu list
::ClearMenuBar(); // Clear the copy
}
@@ -122,6 +121,13 @@ nsMenuBar::nsMenuBar() : nsIMenuBar(), nsIMenuListener()
nsMenuBar::~nsMenuBar()
{
NS_IF_RELEASE(mParent);
while(mNumMenus)
{
--mNumMenus;
nsIMenu* menu = (nsIMenu*)mMenuVoidArray[mNumMenus];
NS_IF_RELEASE( menu );
}
}
//-------------------------------------------------------------------------