Hacks to get it to compile. Needs help from someone with a clue.
git-svn-id: svn://10.0.0.236/trunk@31677 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -147,7 +147,8 @@ NS_METHOD nsMenu::Create(nsIMenuBar *aParent, const nsString &aLabel)
|
||||
mMenuBarParent = aParent;
|
||||
NS_ADDREF(mMenuBarParent);
|
||||
Create(GetNativeParent(), aLabel);
|
||||
aParent->AddMenu(this);
|
||||
NS_ASSERTION(0, "nsIMenu has changed. fix me!");
|
||||
//aParent->AddMenu(this);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@@ -157,7 +158,8 @@ NS_METHOD nsMenu::Create(nsIMenu *aParent, const nsString &aLabel)
|
||||
mMenuParent = aParent;
|
||||
NS_ADDREF(mMenuParent);
|
||||
Create(GetNativeParent(), aLabel);
|
||||
aParent->AddMenu(this);
|
||||
NS_ASSERTION(0, "nsIMenu has changed. fix me!");
|
||||
//aParent->AddMenu(this);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
@@ -120,7 +120,7 @@ Widget nsMenuItem::GetNativeParent()
|
||||
{
|
||||
void * voidData;
|
||||
if (nsnull != mMenuParent) {
|
||||
mMenuParent->GetNativeData(voidData);
|
||||
mMenuParent->GetNativeData(&voidData);
|
||||
} else if (nsnull != mPopUpParent) {
|
||||
mPopUpParent->GetNativeData(voidData);
|
||||
} else {
|
||||
@@ -194,7 +194,7 @@ NS_METHOD nsMenuItem::Create(nsIMenu *aParent,
|
||||
}
|
||||
|
||||
Create(widget, GetNativeParent(), aLabel, aCommand);
|
||||
aParent->AddItem(this);
|
||||
//aParent->AddItem(this);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user