From 6492f30fe4d877fe1bf56c95194130eb356bca2f Mon Sep 17 00:00:00 2001 From: "briano%netscape.com" Date: Fri, 14 May 1999 22:33:42 +0000 Subject: [PATCH] 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 --- mozilla/widget/src/motif/nsMenu.cpp | 6 ++++-- mozilla/widget/src/motif/nsMenuItem.cpp | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mozilla/widget/src/motif/nsMenu.cpp b/mozilla/widget/src/motif/nsMenu.cpp index b4ca718a4ef..b4856176d56 100644 --- a/mozilla/widget/src/motif/nsMenu.cpp +++ b/mozilla/widget/src/motif/nsMenu.cpp @@ -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; } diff --git a/mozilla/widget/src/motif/nsMenuItem.cpp b/mozilla/widget/src/motif/nsMenuItem.cpp index ae8d09ee1fd..b8e1a98c8c2 100644 --- a/mozilla/widget/src/motif/nsMenuItem.cpp +++ b/mozilla/widget/src/motif/nsMenuItem.cpp @@ -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; }