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

fix double menus on GTK

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@29446 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
saari%netscape.com 1999-04-27 18:10:47 +00:00
parent 5226f6c295
commit ac4931fc26
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/widget/src/gtk/nsMenu.cpp
View File

@ -240,7 +240,7 @@ NS_METHOD nsMenu::AddMenu(nsIMenu * aMenu)
nsresult rv = nsComponentManager::CreateInstance(
kMenuItemCID, nsnull, kIMenuItemIID, (void**)&pnsMenuItem);
if (NS_OK == rv) {
pnsMenuItem->Create(this, labelStr, 0);
pnsMenuItem->Create(this, labelStr, PR_FALSE); //PR_TRUE);
nsISupports * supports = nsnull;
pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
AddItem(supports); // Parent should now own menu item
@ -439,7 +439,6 @@ nsEventStatus nsMenu::MenuConstruct(
aWebShell = mWebShell;
}
printf("nsMenu::MenuConstruct called \n");
// Begin menuitem inner loop
nsCOMPtr<nsIDOMNode> menuitemNode;
((nsIDOMNode*)mDOMNode)->GetFirstChild(getter_AddRefs(menuitemNode));
@ -597,15 +596,15 @@ void nsMenu::LoadSubMenu(
supports = nsnull;
pnsMenu->QueryInterface(kISupportsIID, (void**) &supports);
pParentMenu->AddItem(supports); // parent takes ownership
NS_RELEASE(supports);
pParentMenu->AddItem(supports); // parent takes ownership
NS_RELEASE(supports);
NS_ASSERTION(mWebShell, "get debugger");
pnsMenu->SetWebShell(mWebShell);
pnsMenu->SetDOMNode(menuNode);
pnsMenu->SetWebShell(mWebShell);
pnsMenu->SetDOMNode(menuNode);
/*
// Begin menuitem inner loop
unsigned short menuIndex = 0;
unsigned short menuIndex = 0;
nsCOMPtr<nsIDOMNode> menuitemNode;
menuNode->GetFirstChild(getter_AddRefs(menuitemNode));
@ -633,5 +632,6 @@ void nsMenu::LoadSubMenu(
nsCOMPtr<nsIDOMNode> oldmenuitemNode(menuitemNode);
oldmenuitemNode->GetNextSibling(getter_AddRefs(menuitemNode));
} // end menu item innner loop
*/
}
}

1
mozilla/widget/src/gtk/nsMenuItem.cpp
View File

@ -88,6 +88,7 @@ nsMenuItem::nsMenuItem() : nsIMenuItem()
mIsSeparator = PR_FALSE;
mWebShell = nsnull;
mDOMElement = nsnull;
mIsSubMenu = PR_FALSE;
}
//-------------------------------------------------------------------------

1
mozilla/widget/src/gtk/nsMenuItem.h
View File

@ -101,6 +101,7 @@ protected:
GtkWidget *mMenuItem; // native cascade widget
PRBool mIsSeparator;
PRBool mIsSubMenu;
nsIWebShell * mWebShell;
nsIDOMElement * mDOMElement;