menu patch for rods, r=ben

git-svn-id: svn://10.0.0.236/trunk@70728 18797224-902f-48f8-a5cc-f745e15eee43
2000-05-24 08:26:04 +00:00
parent 221d93b578
commit 94cf1a9da7
1 changed files with 8 additions and 3 deletions
--- a/mozilla/layout/xul/base/src/nsMenuFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsMenuFrame.cpp
@@ -139,9 +139,14 @@ nsMenuFrame::Init(nsIPresContext*  aPresContext,

  nsresult  rv = nsBoxFrame::Init(aPresContext, aContent, aParent, aContext, aPrevInFlow);

-  // Set our menu parent.
-  nsCOMPtr<nsIMenuParent> menuparent = do_QueryInterface(aParent);
-  mMenuParent = menuparent.get();
+  nsIFrame* currFrame = aParent;
+  while (!mMenuParent && currFrame) {
+    // Set our menu parent.
+    nsCOMPtr<nsIMenuParent> menuparent(do_QueryInterface(currFrame));
+    mMenuParent = menuparent.get();
+
+    currFrame->GetParent(&currFrame);
+  }

  // Do the type="checkbox" magic
  UpdateMenuType(aPresContext);