From 8302d94b1631f4cfa1ea8a77902a4bce168ddebc Mon Sep 17 00:00:00 2001
From: "hyatt%netscape.com"
 <hyatt%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 18 Jul 1999 08:18:58 +0000
Subject: [PATCH] The menu frame can be an area frame.  In fact that makes more
 sense.  It should be thought of as an HTML container and not as a funky box.

git-svn-id: svn://10.0.0.236/trunk@40003 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/xul/base/src/nsMenuFrame.cpp | 8 ++++----
 mozilla/layout/xul/base/src/nsMenuFrame.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mozilla/layout/xul/base/src/nsMenuFrame.cpp b/mozilla/layout/xul/base/src/nsMenuFrame.cpp
index 12e129bab97..7b15ed0ce41 100644
--- a/mozilla/layout/xul/base/src/nsMenuFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsMenuFrame.cpp
@@ -67,7 +67,7 @@ nsMenuFrame::FirstChild(nsIAtom*   aListName,
   if (nsLayoutAtoms::popupList == aListName) {
     *aFirstChild = mPopupFrames.FirstChild();
   } else {
-    nsBoxFrame::FirstChild(aListName, aFirstChild);
+    nsAreaFrame::FirstChild(aListName, aFirstChild);
   }
   return NS_OK;
 }
@@ -81,7 +81,7 @@ nsMenuFrame::SetInitialChildList(nsIPresContext& aPresContext,
   if (nsLayoutAtoms::popupList == aListName) {
     mPopupFrames.SetFrames(aChildList);
   } else {
-    rv = nsBoxFrame::SetInitialChildList(aPresContext, aListName, aChildList);
+    rv = nsAreaFrame::SetInitialChildList(aPresContext, aListName, aChildList);
   }
   return rv;
 }
@@ -102,7 +102,7 @@ nsMenuFrame::GetAdditionalChildListName(PRInt32   aIndex,
     NS_ADDREF(*aListName);
     return NS_OK;
   }
-  return nsBoxFrame::GetAdditionalChildListName(aIndex, aListName);
+  return nsAreaFrame::GetAdditionalChildListName(aIndex, aListName);
 }
 
 NS_IMETHODIMP
@@ -110,5 +110,5 @@ nsMenuFrame::DeleteFrame(nsIPresContext& aPresContext)
 {
    // Cleanup frames in popup child list
   mPopupFrames.DeleteFrames(aPresContext);
-  return nsBoxFrame::DeleteFrame(aPresContext);
+  return nsAreaFrame::DeleteFrame(aPresContext);
 }
diff --git a/mozilla/layout/xul/base/src/nsMenuFrame.h b/mozilla/layout/xul/base/src/nsMenuFrame.h
index 2eccbedfee7..3fbc3d122b6 100644
--- a/mozilla/layout/xul/base/src/nsMenuFrame.h
+++ b/mozilla/layout/xul/base/src/nsMenuFrame.h
@@ -27,13 +27,13 @@
 #include "nsIAtom.h"
 #include "nsCOMPtr.h"
 
-#include "nsBoxFrame.h"
+#include "nsAreaFrame.h"
 #include "nsFrameList.h"
 
 nsresult NS_NewMenuFrame(nsIFrame** aResult) ;
 
 
-class nsMenuFrame : public nsBoxFrame
+class nsMenuFrame : public nsAreaFrame
 {
 public:
   nsMenuFrame();