Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-01 14:45:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

more menu ownership model cleaning

Browse Source
This commit is contained in:
saari%netscape.com 1999-04-26 23:35:41 +00:00
parent 5ed73a3528
commit 64a5bc199e
2 changed files with 21 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
widget/src/gtk/nsMenu.cpp
View File

@ -99,8 +99,6 @@ nsMenu::nsMenu() : nsIMenu()
//-------------------------------------------------------------------------
nsMenu::~nsMenu()
{
NS_IF_RELEASE(mMenuBarParent);
NS_IF_RELEASE(mMenuParent);
NS_IF_RELEASE(mListener);
}
@ -117,8 +115,6 @@ NS_METHOD nsMenu::Create(nsISupports *aParent, const nsString &aLabel)
if(menubar)
{
mMenuBarParent = menubar;
//NS_ADDREF(mMenuBarParent);
//NS_RELEASE(menubar);
}
else
{
@ -127,8 +123,6 @@ NS_METHOD nsMenu::Create(nsISupports *aParent, const nsString &aLabel)
if(menu)
{
mMenuParent = menu;
//NS_ADDREF(mMenuParent);
//NS_RELEASE(menu);
}
}
}
@ -184,7 +178,7 @@ NS_METHOD nsMenu::AddItem(nsISupports * aItem)
aItem->QueryInterface(kIMenuItemIID, (void**) &menuitem);
if(menuitem)
{
AddMenuItem(menuitem);
AddMenuItem(menuitem); // nsMenu now owns this
NS_RELEASE(menuitem);
}
else
@ -193,7 +187,7 @@ NS_METHOD nsMenu::AddItem(nsISupports * aItem)
aItem->QueryInterface(kIMenuIID, (void**) &menu);
if(menu)
{
AddMenu(menu);
AddMenu(menu); // nsMenu now owns this
NS_RELEASE(menu);
}
}
@ -243,54 +237,40 @@ NS_METHOD nsMenu::AddMenu(nsIMenu * aMenu)
AddItem(supports); // Parent should now own menu item
NS_RELEASE(supports);
//NS_RELEASE(pnsMenuItem);
void * menuitem = nsnull;
pnsMenuItem->GetNativeData(menuitem);
voidData = NULL;
aMenu->GetNativeData(&voidData);
newmenu = GTK_WIDGET(voidData);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), newmenu);
NS_RELEASE(pnsMenuItem);
}
//item = gtk_menu_item_new_with_label (labelStr);
//gtk_widget_show(item);
//gtk_menu_shell_append (GTK_MENU_SHELL (mMenu), item);
delete[] labelStr;
void * menuitem = nsnull;
pnsMenuItem->GetNativeData(menuitem);
voidData = NULL;
aMenu->GetNativeData(&voidData);
newmenu = GTK_WIDGET(voidData);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), newmenu);
// XXX add aMenuItem to internal data structor list
//NS_IF_ADDREF(aMenu);
//mMenuItemVoidArray.AppendElement(aMenu);
//mNumMenuItems++;
NS_RELEASE(pnsMenuItem);
return NS_OK;
}
//-------------------------------------------------------------------------
NS_METHOD nsMenu::AddSeparator()
{
//GtkWidget *widget;
//widget = gtk_menu_item_new ();
//gtk_widget_show(widget);
//gtk_menu_shell_append (GTK_MENU_SHELL (mMenu), widget);
// Create nsMenuItem
nsIMenuItem * pnsMenuItem = nsnull;
nsresult rv = nsComponentManager::CreateInstance(
kMenuItemCID, nsnull, kIMenuItemIID, (void**)&pnsMenuItem);
if (NS_OK == rv) {
// This is gross and I'll make it go away ASAP -cps
nsString tmp = "separator";
pnsMenuItem->Create(this, tmp, PR_TRUE);
pnsMenuItem->Create(this, tmp, PR_TRUE);
nsISupports * supports = nsnull;
pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
AddItem(supports); // Parent should now own menu item
NS_RELEASE(supports);
NS_RELEASE(supports);
//NS_RELEASE(pnsMenuItem);
NS_RELEASE(pnsMenuItem);
}
return NS_OK;
@ -498,9 +478,7 @@ nsEventStatus nsMenu::MenuDestruct(const nsMenuEvent & aMenuEvent)
*/
NS_METHOD nsMenu::SetDOMNode(nsIDOMNode * aMenuNode)
{
//NS_IF_RELEASE(mDOMNode);
mDOMNode = aMenuNode;
//NS_IF_ADDREF(mDOMNode);
return NS_OK;
}
@ -511,9 +489,7 @@ NS_METHOD nsMenu::SetDOMNode(nsIDOMNode * aMenuNode)
*/
NS_METHOD nsMenu::SetDOMElement(nsIDOMElement * aMenuElement)
{
//NS_IF_RELEASE(mDOMElement);
mDOMElement = aMenuElement;
//NS_IF_ADDREF(mDOMElement);
return NS_OK;
}
@ -524,9 +500,7 @@ NS_METHOD nsMenu::SetDOMElement(nsIDOMElement * aMenuElement)
*/
NS_METHOD nsMenu::SetWebShell(nsIWebShell * aWebShell)
{
//NS_IF_RELEASE(mWebShell);
mWebShell = aWebShell;
//NS_IF_ADDREF(mWebShell);
return NS_OK;
}
@ -551,11 +525,11 @@ void nsMenu::LoadMenuItem(
nsIMenuItem * pnsMenuItem = nsnull;
nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID, nsnull, kIMenuItemIID, (void**)&pnsMenuItem);
if (NS_OK == rv) {
pnsMenuItem->Create(pParentMenu, menuitemName, PR_FALSE);
pnsMenuItem->Create(pParentMenu, menuitemName, PR_FALSE);
nsISupports * supports = nsnull;
pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
pParentMenu->AddItem(supports); // Parent should now own menu item
NS_RELEASE(supports);
if(disabled == NS_STRING_TRUE ) {
@ -611,11 +585,10 @@ void nsMenu::LoadSubMenu(
// Set nsMenu Name
pnsMenu->SetLabel(menuName);
// Make nsMenu a child of parent nsMenu
//pParentMenu->AddMenu(pnsMenu);
supports = nsnull;
pnsMenu->QueryInterface(kISupportsIID, (void**) &supports);
pParentMenu->AddItem(supports);
pParentMenu->AddItem(supports); // parent takes ownership
NS_RELEASE(supports);
NS_ASSERTION(mWebShell, "get debugger");

7
widget/src/gtk/nsMenuItem.cpp
View File

@ -41,7 +41,6 @@ static NS_DEFINE_IID(kIMenuBarIID, NS_IMENUBAR_IID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIPopUpMenuIID, NS_IPOPUPMENU_IID);
static NS_DEFINE_IID(kIMenuItemIID, NS_IMENUITEM_IID);
//NS_IMPL_ISUPPORTS(nsMenuItem, kIMenuItemIID)
nsresult nsMenuItem::QueryInterface(REFNSIID aIID, void** aInstancePtr)
{
@ -98,8 +97,6 @@ nsMenuItem::nsMenuItem() : nsIMenuItem()
//-------------------------------------------------------------------------
nsMenuItem::~nsMenuItem()
{
NS_IF_RELEASE(mMenuParent);
NS_IF_RELEASE(mPopUpParent);
NS_IF_RELEASE(mTarget);
}
@ -110,7 +107,6 @@ void nsMenuItem::Create(nsIWidget *aMBParent,
PRBool aIsSeparator)
{
mTarget = aMBParent;
//mCommand = aCommand;
mLabel = aLabel;
if (NULL == aParent || nsnull == aMBParent) {
@ -218,7 +214,6 @@ NS_METHOD nsMenuItem::Create(nsIMenu * aParent,
}
mMenuParent = aParent;
NS_ADDREF(mMenuParent);
nsIWidget * widget = nsnull; // MenuBar's Parent
nsISupports * sups;
@ -239,7 +234,7 @@ NS_METHOD nsMenuItem::Create(nsIPopUpMenu *aParent,
PRUint32 aCommand)
{
mPopUpParent = aParent;
NS_ADDREF(mPopUpParent);
//NS_ADDREF(mPopUpParent);
nsIWidget * widget = nsnull;
if (NS_OK != aParent->GetParent(widget)) {