diff --git a/mozilla/content/shared/public/nsXULAtoms.h b/mozilla/content/shared/public/nsXULAtoms.h
index ef8e33924b0..31cf0bbc399 100644
--- a/mozilla/content/shared/public/nsXULAtoms.h
+++ b/mozilla/content/shared/public/nsXULAtoms.h
@@ -66,9 +66,6 @@ public:
   static nsIAtom* titledbutton;
   static nsIAtom* mode; 
 
-  static nsIAtom* box; 
-  static nsIAtom* flex; 
-
   static nsIAtom* widget;
   static nsIAtom* window;
 };
diff --git a/mozilla/content/shared/src/nsXULAtoms.cpp b/mozilla/content/shared/src/nsXULAtoms.cpp
index 1518de97727..93aa0803c17 100644
--- a/mozilla/content/shared/src/nsXULAtoms.cpp
+++ b/mozilla/content/shared/src/nsXULAtoms.cpp
@@ -48,8 +48,6 @@ nsIAtom* nsXULAtoms::progressmeter;
 nsIAtom* nsXULAtoms::titledbutton;
 nsIAtom* nsXULAtoms::mode;
 
-nsIAtom* nsXULAtoms::box;
-nsIAtom* nsXULAtoms::flex;
 
 nsIAtom* nsXULAtoms::widget;
 nsIAtom* nsXULAtoms::window;
@@ -93,8 +91,6 @@ void nsXULAtoms::AddrefAtoms() {
 	titledbutton = NS_NewAtom("titledbutton");
 
 	mode = NS_NewAtom("mode");
-	box = NS_NewAtom("box");
-	flex = NS_NewAtom("flex");
 
     widget = NS_NewAtom("widget");
     window = NS_NewAtom("window");
@@ -128,10 +124,6 @@ void nsXULAtoms::ReleaseAtoms() {
     NS_RELEASE(progressmeter);
 	NS_RELEASE(mode);
 
-	NS_RELEASE(box);
-	NS_RELEASE(flex);
-
-
 	NS_RELEASE(widget);
     NS_RELEASE(window);
     NS_IF_RELEASE(gNameSpaceManager);
diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp
index 976c0103e25..1f616fde037 100644
--- a/mozilla/layout/base/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp
@@ -70,9 +70,10 @@ NS_NewProgressMeterFrame ( nsIFrame*& aNewFrame );
 nsresult
 NS_NewTitledButtonFrame ( nsIFrame*& aNewFrame );
 
-nsresult
-NS_NewBoxFrame ( nsIFrame*& aNewFrame );
-
+/*
+#include "nsProgressMeterFrame.h"
+#include "nsTitledButtonFrame.h"
+*/
 #endif
 
 //static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID);
@@ -1297,7 +1298,6 @@ nsCSSFrameConstructor::TableIsValidCellContent(nsIPresContext* aPresContext,
         (nsXULAtoms::treeindentation == tag.get())  ||
         (nsXULAtoms::toolbox         == tag.get())  ||
         (nsXULAtoms::toolbar         == tag.get())  ||
-        (nsXULAtoms::box             == tag.get())  ||
         (nsXULAtoms::progressmeter   == tag.get()  )) {
     return PR_TRUE;
   }
@@ -2246,14 +2246,6 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresContext*  aPresContext,
     }
     // End of PROGRESS METER CONSTRUCTION logic
 
-    // BOX CONSTRUCTION
-    else if (aTag == nsXULAtoms::box) {
-      processChildren = PR_TRUE;
-      isReplaced = PR_TRUE;
-      rv = NS_NewBoxFrame(newFrame);
-    }
-    // End of BOX CONSTRUCTION logic
-
     // TITLED BUTTON CONSTRUCTION
     else if (aTag == nsXULAtoms::titledbutton) {
       processChildren = PR_TRUE;
diff --git a/mozilla/layout/forms/nsButtonFrameRenderer.cpp b/mozilla/layout/forms/nsButtonFrameRenderer.cpp
index a5d39c7430c..446c8b87f75 100644
--- a/mozilla/layout/forms/nsButtonFrameRenderer.cpp
+++ b/mozilla/layout/forms/nsButtonFrameRenderer.cpp
@@ -27,17 +27,12 @@ nsButtonFrameRenderer::SetNameSpace(PRInt32 aNameSpace)
 }
 
 void
-nsButtonFrameRenderer::SetFrame(nsFrame* aFrame, nsIPresContext& aPresContext)
+nsButtonFrameRenderer::SetFrame(nsIFrame* aFrame, nsIPresContext& aPresContext)
 {
 	mFrame = aFrame;
 	ReResolveStyles(aPresContext);
 }
 
-void
-nsButtonFrameRenderer::Redraw()
-{
-  mFrame->Invalidate(mOutlineRect, PR_TRUE);
-}
 
 nsString
 nsButtonFrameRenderer::GetPseudoClassAttribute()
@@ -339,14 +334,8 @@ nsButtonFrameRenderer::PaintOutlineAndFocusBorders(nsIPresContext& aPresContext,
 
 	nsRect rect;
 
-  if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) 
+    if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) 
 	{
-    // because we have and outline rect we need to 
-    // store our bounds for redraw. We will change
-    // these bounds when outline appears
-    mOutlineRect = rect;
-    mOutlineRect.width = 0;
-    mOutlineRect.height= 0;
 
 		if (mOuterFocusStyle) {
 			// ---------- paint the outer focus border -------------
@@ -371,11 +360,11 @@ nsButtonFrameRenderer::PaintOutlineAndFocusBorders(nsIPresContext& aPresContext,
 		}
 	}
 
-  if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) 
+    if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) 
 	{
-		if (mOutlineStyle) {
+		if /*(mOutlineStyle) */ (PR_FALSE) {
 
-			 GetButtonOutlineRect(aRect, mOutlineRect);
+			 GetButtonOutlineRect(aRect, rect);
  
 			 const nsStyleSpacing* spacing = (const nsStyleSpacing*)mOutlineStyle ->GetStyleData(eStyleStruct_Spacing);
 
@@ -385,7 +374,7 @@ nsButtonFrameRenderer::PaintOutlineAndFocusBorders(nsIPresContext& aPresContext,
 
 		     aRenderingContext.SetClipRect(rect, nsClipCombine_kReplace, clipEmpty);
 			 nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, mFrame,
-							   aDirtyRect, mOutlineRect, *spacing, mOutlineStyle, 0);
+							   aDirtyRect, rect, *spacing, mOutlineStyle, 0);
 
 			 aRenderingContext.PopState(clipEmpty);
 		}
@@ -540,18 +529,10 @@ nsButtonFrameRenderer::GetButtonOutlineBorderAndPadding()
 	return borderAndPadding;
 }
 
-// gets the full size of our border with all the focus borders
 nsMargin
 nsButtonFrameRenderer::GetFullButtonBorderAndPadding()
 {
-  return GetAddedButtonBorderAndPadding() + GetButtonBorderAndPadding();
-}
-
-// gets all the focus borders and padding that will be added to the regular border
-nsMargin
-nsButtonFrameRenderer::GetAddedButtonBorderAndPadding()
-{
-  return GetButtonOuterFocusBorderAndPadding() + GetButtonInnerFocusMargin() + GetButtonInnerFocusBorderAndPadding();
+  return GetButtonOuterFocusBorderAndPadding() + GetButtonBorderAndPadding() + GetButtonInnerFocusMargin() + GetButtonInnerFocusBorderAndPadding();
 }
 
 void 
diff --git a/mozilla/layout/forms/nsButtonFrameRenderer.h b/mozilla/layout/forms/nsButtonFrameRenderer.h
index 2432dd92566..2076015711b 100644
--- a/mozilla/layout/forms/nsButtonFrameRenderer.h
+++ b/mozilla/layout/forms/nsButtonFrameRenderer.h
@@ -65,7 +65,7 @@ public:
 						  const nsRect& aRect);
 
 	virtual void SetNameSpace(PRInt32 aNameSpace);
-	virtual void SetFrame(nsFrame* aFrame, nsIPresContext& aPresContext);
+	virtual void SetFrame(nsIFrame* aFrame, nsIPresContext& aPresContext);
  
 	virtual void SetActive(PRBool aActive, PRBool notify);
 	virtual void SetHover(PRBool aHover, PRBool notify);
@@ -82,13 +82,12 @@ public:
 	virtual void GetButtonRect(const nsRect& aRect, nsRect& aResult);
 	virtual void GetButtonInnerFocusRect(const nsRect& aRect, nsRect& aResult);
 	virtual void GetButtonContentRect(const nsRect& aRect, nsRect& aResult);
-  virtual nsMargin GetButtonOuterFocusBorderAndPadding();
-  virtual nsMargin GetButtonBorderAndPadding();
-  virtual nsMargin GetButtonInnerFocusMargin();
-  virtual nsMargin GetButtonInnerFocusBorderAndPadding();
-  virtual nsMargin GetButtonOutlineBorderAndPadding();
-  virtual nsMargin GetFullButtonBorderAndPadding();
-  virtual nsMargin GetAddedButtonBorderAndPadding();
+    virtual nsMargin GetButtonOuterFocusBorderAndPadding();
+    virtual nsMargin GetButtonBorderAndPadding();
+    virtual nsMargin GetButtonInnerFocusMargin();
+    virtual nsMargin GetButtonInnerFocusBorderAndPadding();
+    virtual nsMargin GetButtonOutlineBorderAndPadding();
+    virtual nsMargin GetFullButtonBorderAndPadding();
 
 	virtual void ReResolveStyles(nsIPresContext& aPresContext);
 
@@ -100,7 +99,6 @@ public:
 							nsHTMLReflowMetrics& aDesiredSize,
 							nsMargin& aBorderPadding);
 
-  virtual void Redraw();
 
 protected:
 
@@ -120,9 +118,7 @@ private:
 	nsCOMPtr<nsIStyleContext> mOutlineStyle;
 
 	PRInt32 mNameSpace;
-	nsFrame* mFrame;
-
-  nsRect mOutlineRect;
+	nsIFrame* mFrame;
 };
 
 
diff --git a/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp b/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp
index a5d39c7430c..446c8b87f75 100644
--- a/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp
+++ b/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp
@@ -27,17 +27,12 @@ nsButtonFrameRenderer::SetNameSpace(PRInt32 aNameSpace)
 }
 
 void
-nsButtonFrameRenderer::SetFrame(nsFrame* aFrame, nsIPresContext& aPresContext)
+nsButtonFrameRenderer::SetFrame(nsIFrame* aFrame, nsIPresContext& aPresContext)
 {
 	mFrame = aFrame;
 	ReResolveStyles(aPresContext);
 }
 
-void
-nsButtonFrameRenderer::Redraw()
-{
-  mFrame->Invalidate(mOutlineRect, PR_TRUE);
-}
 
 nsString
 nsButtonFrameRenderer::GetPseudoClassAttribute()
@@ -339,14 +334,8 @@ nsButtonFrameRenderer::PaintOutlineAndFocusBorders(nsIPresContext& aPresContext,
 
 	nsRect rect;
 
-  if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) 
+    if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) 
 	{
-    // because we have and outline rect we need to 
-    // store our bounds for redraw. We will change
-    // these bounds when outline appears
-    mOutlineRect = rect;
-    mOutlineRect.width = 0;
-    mOutlineRect.height= 0;
 
 		if (mOuterFocusStyle) {
 			// ---------- paint the outer focus border -------------
@@ -371,11 +360,11 @@ nsButtonFrameRenderer::PaintOutlineAndFocusBorders(nsIPresContext& aPresContext,
 		}
 	}
 
-  if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) 
+    if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) 
 	{
-		if (mOutlineStyle) {
+		if /*(mOutlineStyle) */ (PR_FALSE) {
 
-			 GetButtonOutlineRect(aRect, mOutlineRect);
+			 GetButtonOutlineRect(aRect, rect);
  
 			 const nsStyleSpacing* spacing = (const nsStyleSpacing*)mOutlineStyle ->GetStyleData(eStyleStruct_Spacing);
 
@@ -385,7 +374,7 @@ nsButtonFrameRenderer::PaintOutlineAndFocusBorders(nsIPresContext& aPresContext,
 
 		     aRenderingContext.SetClipRect(rect, nsClipCombine_kReplace, clipEmpty);
 			 nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, mFrame,
-							   aDirtyRect, mOutlineRect, *spacing, mOutlineStyle, 0);
+							   aDirtyRect, rect, *spacing, mOutlineStyle, 0);
 
 			 aRenderingContext.PopState(clipEmpty);
 		}
@@ -540,18 +529,10 @@ nsButtonFrameRenderer::GetButtonOutlineBorderAndPadding()
 	return borderAndPadding;
 }
 
-// gets the full size of our border with all the focus borders
 nsMargin
 nsButtonFrameRenderer::GetFullButtonBorderAndPadding()
 {
-  return GetAddedButtonBorderAndPadding() + GetButtonBorderAndPadding();
-}
-
-// gets all the focus borders and padding that will be added to the regular border
-nsMargin
-nsButtonFrameRenderer::GetAddedButtonBorderAndPadding()
-{
-  return GetButtonOuterFocusBorderAndPadding() + GetButtonInnerFocusMargin() + GetButtonInnerFocusBorderAndPadding();
+  return GetButtonOuterFocusBorderAndPadding() + GetButtonBorderAndPadding() + GetButtonInnerFocusMargin() + GetButtonInnerFocusBorderAndPadding();
 }
 
 void 
diff --git a/mozilla/layout/html/forms/src/nsButtonFrameRenderer.h b/mozilla/layout/html/forms/src/nsButtonFrameRenderer.h
index 2432dd92566..2076015711b 100644
--- a/mozilla/layout/html/forms/src/nsButtonFrameRenderer.h
+++ b/mozilla/layout/html/forms/src/nsButtonFrameRenderer.h
@@ -65,7 +65,7 @@ public:
 						  const nsRect& aRect);
 
 	virtual void SetNameSpace(PRInt32 aNameSpace);
-	virtual void SetFrame(nsFrame* aFrame, nsIPresContext& aPresContext);
+	virtual void SetFrame(nsIFrame* aFrame, nsIPresContext& aPresContext);
  
 	virtual void SetActive(PRBool aActive, PRBool notify);
 	virtual void SetHover(PRBool aHover, PRBool notify);
@@ -82,13 +82,12 @@ public:
 	virtual void GetButtonRect(const nsRect& aRect, nsRect& aResult);
 	virtual void GetButtonInnerFocusRect(const nsRect& aRect, nsRect& aResult);
 	virtual void GetButtonContentRect(const nsRect& aRect, nsRect& aResult);
-  virtual nsMargin GetButtonOuterFocusBorderAndPadding();
-  virtual nsMargin GetButtonBorderAndPadding();
-  virtual nsMargin GetButtonInnerFocusMargin();
-  virtual nsMargin GetButtonInnerFocusBorderAndPadding();
-  virtual nsMargin GetButtonOutlineBorderAndPadding();
-  virtual nsMargin GetFullButtonBorderAndPadding();
-  virtual nsMargin GetAddedButtonBorderAndPadding();
+    virtual nsMargin GetButtonOuterFocusBorderAndPadding();
+    virtual nsMargin GetButtonBorderAndPadding();
+    virtual nsMargin GetButtonInnerFocusMargin();
+    virtual nsMargin GetButtonInnerFocusBorderAndPadding();
+    virtual nsMargin GetButtonOutlineBorderAndPadding();
+    virtual nsMargin GetFullButtonBorderAndPadding();
 
 	virtual void ReResolveStyles(nsIPresContext& aPresContext);
 
@@ -100,7 +99,6 @@ public:
 							nsHTMLReflowMetrics& aDesiredSize,
 							nsMargin& aBorderPadding);
 
-  virtual void Redraw();
 
 protected:
 
@@ -120,9 +118,7 @@ private:
 	nsCOMPtr<nsIStyleContext> mOutlineStyle;
 
 	PRInt32 mNameSpace;
-	nsFrame* mFrame;
-
-  nsRect mOutlineRect;
+	nsIFrame* mFrame;
 };
 
 
diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
index 976c0103e25..1f616fde037 100644
--- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
@@ -70,9 +70,10 @@ NS_NewProgressMeterFrame ( nsIFrame*& aNewFrame );
 nsresult
 NS_NewTitledButtonFrame ( nsIFrame*& aNewFrame );
 
-nsresult
-NS_NewBoxFrame ( nsIFrame*& aNewFrame );
-
+/*
+#include "nsProgressMeterFrame.h"
+#include "nsTitledButtonFrame.h"
+*/
 #endif
 
 //static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID);
@@ -1297,7 +1298,6 @@ nsCSSFrameConstructor::TableIsValidCellContent(nsIPresContext* aPresContext,
         (nsXULAtoms::treeindentation == tag.get())  ||
         (nsXULAtoms::toolbox         == tag.get())  ||
         (nsXULAtoms::toolbar         == tag.get())  ||
-        (nsXULAtoms::box             == tag.get())  ||
         (nsXULAtoms::progressmeter   == tag.get()  )) {
     return PR_TRUE;
   }
@@ -2246,14 +2246,6 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresContext*  aPresContext,
     }
     // End of PROGRESS METER CONSTRUCTION logic
 
-    // BOX CONSTRUCTION
-    else if (aTag == nsXULAtoms::box) {
-      processChildren = PR_TRUE;
-      isReplaced = PR_TRUE;
-      rv = NS_NewBoxFrame(newFrame);
-    }
-    // End of BOX CONSTRUCTION logic
-
     // TITLED BUTTON CONSTRUCTION
     else if (aTag == nsXULAtoms::titledbutton) {
       processChildren = PR_TRUE;
diff --git a/mozilla/layout/macbuild/layout.mcp b/mozilla/layout/macbuild/layout.mcp
index c4e4a65e662..f4edbbc1d3d 100644
Binary files a/mozilla/layout/macbuild/layout.mcp and b/mozilla/layout/macbuild/layout.mcp differ
diff --git a/mozilla/layout/xul/base/src/Makefile.in b/mozilla/layout/xul/base/src/Makefile.in
index 2c1fe21952b..37d6280944a 100644
--- a/mozilla/layout/xul/base/src/Makefile.in
+++ b/mozilla/layout/xul/base/src/Makefile.in
@@ -35,8 +35,7 @@ LOCAL_INCLUDES = \
 
 # Note the sophisticated alphabetical ordering :-|
 CPPSRCS =				\
-    nsBoxFrame.cpp \
-    nsProgressMeterFrame.cpp \
+        nsProgressMeterFrame.cpp \
 	nsTitledButtonFrame.cpp \
 	nsToolbarFrame.cpp			\
 	nsToolboxFrame.cpp			\
diff --git a/mozilla/layout/xul/base/src/makefile.win b/mozilla/layout/xul/base/src/makefile.win
index 6e207b10db3..a99e3618ac4 100644
--- a/mozilla/layout/xul/base/src/makefile.win
+++ b/mozilla/layout/xul/base/src/makefile.win
@@ -24,7 +24,6 @@ REQUIRES=xpcom raptor pref
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
 CPPSRCS=					\
-        nsBoxFrame.cpp        \
         nsProgressMeterFrame.cpp        \
         nsTitledButtonFrame.cpp        \
 	nsToolboxFrame.cpp		\
@@ -35,7 +34,6 @@ CPPSRCS=					\
 	$(NULL)
 
 CPP_OBJS=					\
-        .\$(OBJDIR)\nsBoxFrame.obj    \
         .\$(OBJDIR)\nsProgressMeterFrame.obj    \
         .\$(OBJDIR)\nsTitledButtonFrame.obj    \
 	.\$(OBJDIR)\nsToolboxFrame.obj		\
diff --git a/mozilla/layout/xul/base/src/nsBoxFrame.cpp b/mozilla/layout/xul/base/src/nsBoxFrame.cpp
deleted file mode 100644
index 0f52c8462cf..00000000000
--- a/mozilla/layout/xul/base/src/nsBoxFrame.cpp
+++ /dev/null
@@ -1,761 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are Copyright (C) 1998
- * Netscape Communications Corporation.  All Rights Reserved.
- */
-
-//
-// Eric Vaughan
-// Netscape Communications
-//
-// See documentation in associated header file
-//
-
-#include "nsBoxFrame.h"
-#include "nsIStyleContext.h"
-#include "nsIPresContext.h"
-#include "nsCOMPtr.h"
-#include "nsHTMLIIDs.h"
-#include "nsUnitConversion.h"
-#include "nsINameSpaceManager.h"
-#include "nsHTMLAtoms.h"
-#include "nsXULAtoms.h"
-
-
-//
-// NS_NewToolbarFrame
-//
-// Creates a new Toolbar frame and returns it in |aNewFrame|
-//
-nsresult
-NS_NewBoxFrame ( nsIFrame*& aNewFrame )
-{
-  nsBoxFrame* it = new nsBoxFrame;
-  if (nsnull == it)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  // it->SetFlags(aFlags);
-  aNewFrame = it;
-  return NS_OK;
-  
-} // NS_NewBoxFrame
-
-nsBoxFrame::nsBoxFrame()
-{
-  mHorizontal = PR_TRUE;
-}
-
-
-NS_IMETHODIMP
-nsBoxFrame::Init(nsIPresContext&  aPresContext,
-              nsIContent*      aContent,
-              nsIFrame*        aParent,
-              nsIStyleContext* aContext,
-              nsIFrame*        aPrevInFlow)
-{
-  nsresult  rv = nsHTMLContainerFrame::Init(aPresContext, aContent, aParent, aContext, aPrevInFlow);
-  nsString value;
-  mContent->GetAttribute(kNameSpaceID_None, nsHTMLAtoms::align, value);
-  if (value.EqualsIgnoreCase("vertical"))
-    mHorizontal = PR_FALSE;
-  else
-    mHorizontal = PR_TRUE;
-
-  return rv;
-}
-
-
-NS_IMETHODIMP
-nsBoxFrame::AttributeChanged(nsIPresContext* aPresContext,
-                               nsIContent* aChild,
-                               nsIAtom* aAttribute,
-                               PRInt32 aHint)
-{
-  nsresult rv = nsHTMLContainerFrame::AttributeChanged(aPresContext, aChild,
-                                              aAttribute, aHint);
-
-  if (NS_OK != rv) {
-    return rv;
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsBoxFrame::Paint(nsIPresContext& aPresContext,
-                                nsIRenderingContext& aRenderingContext,
-                                const nsRect& aDirtyRect,
-                                nsFramePaintLayer aWhichLayer)
-{	
-	nsresult result = nsHTMLContainerFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer);
-  return NS_OK;
-}
-
-class nsBoxDataSpring {
-public:
-    nscoord preferredSize;
-    nscoord minSize;
-    nscoord maxSize;
-    float  springConstant;
-
-    nscoord calculatedSize;
-    PRBool  sizeValid;
-
-    void init()
-    {
-        preferredSize = 0;
-        springConstant = 0.0;
-        minSize = 0;
-        maxSize = NS_INTRINSICSIZE;
-        calculatedSize = 0;
-        sizeValid = PR_FALSE;
-    }
-
-};
-
-
-NS_IMETHODIMP
-nsBoxFrame::FlowChildAt(nsIFrame* childFrame, 
-                     nsIPresContext& aPresContext,
-                     nsHTMLReflowMetrics&     desiredSize,
-                     const nsHTMLReflowState& aReflowState,
-                     nsReflowStatus&          aStatus,
-                     const nsSize& size)
-{
-      // subtract out the childs margin and border 
-      const nsStyleSpacing* spacing;
-      nsresult rv = childFrame->GetStyleData(eStyleStruct_Spacing,
-                     (const nsStyleStruct*&) spacing);
-
-      nsMargin margin;
-      spacing->GetMargin(margin);
-      nsMargin border;
-      spacing->GetBorderPadding(border);
-      nsMargin total = margin + border;
-
-
-      const nsStylePosition* position;
-      rv = childFrame->GetStyleData(eStyleStruct_Position,
-                     (const nsStyleStruct*&) position);
-
-
-      // start off with an empty size
-      desiredSize.width = 0; 
-      desiredSize.height = 0;
-
-      // flow the child
-      const nsStylePosition* pos;
-      childFrame->GetStyleData(eStyleStruct_Position, (const nsStyleStruct*&)pos);
-
-      nsStyleCoord* w = (nsStyleCoord*)&pos->mWidth;
-      nsStyleCoord wcopy(*w);
-      *w = nsStyleCoord();
-      w->SetPercentValue(1);
-
-      nsStyleCoord* h = (nsStyleCoord*)&pos->mHeight;
-      nsStyleCoord hcopy(*h);
-      *h = nsStyleCoord();
-      h->SetPercentValue(1);
-
-      nsHTMLReflowState   reflowState(aPresContext, aReflowState, childFrame, size);
-
-      reflowState.computedWidth = size.width;
-      reflowState.computedHeight = size.height;
-
-      // only subrtact margin and border if the size is not intrinsic
-      if (NS_INTRINSICSIZE != reflowState.computedWidth) 
-      {
-        reflowState.computedWidth -= (total.left + total.right);
-      }
-
-
-      if (NS_INTRINSICSIZE != reflowState.computedHeight) 
-      {
-        reflowState.computedHeight -= (total.top + total.bottom);
-      }
-      
-      nsIHTMLReflow*      htmlReflow;
-
-      rv = childFrame->QueryInterface(kIHTMLReflowIID, (void**)&htmlReflow);
-      NS_ASSERTION(rv == NS_OK,"failed to get htmlReflow interface.");
-
-      htmlReflow->WillReflow(aPresContext);
-      htmlReflow->Reflow(aPresContext, desiredSize, reflowState, aStatus);
-      NS_ASSERTION(NS_FRAME_IS_COMPLETE(aStatus), "bad status");
-
-      *w = wcopy;
-      *h = hcopy;
-
-      // set the rect
-      childFrame->SetRect(nsRect(0,0,desiredSize.width, desiredSize.height));
-
-      // add the margin back in. The child should add its border automatically
-      desiredSize.height += (margin.top + margin.bottom);
-      desiredSize.width += (margin.left + margin.right); 
-      
-      return NS_OK;
-}
-
-/*
- * This method flows the given child at the given size.
- * Its a little complex because it more or less has to trick the 
- * reflow system to flowing it at the size we want.
- * this is achieved by creating a new reflow state and mucking 
- * with the parent computed size so that when the child figures
- * its computed size it ends up with the one we want. 
- *
-NS_IMETHODIMP
-nsBoxFrame::FlowChildAt(nsIFrame* childFrame, 
-                     nsIPresContext& aPresContext,
-                     nsHTMLReflowMetrics&     desiredSize,
-                     const nsHTMLReflowState& aReflowState,
-                     nsReflowStatus&          aStatus,
-                     const nsSize& size)
-{
-  
-      // create a parent state that will hold the size we will set
-      nsHTMLReflowState parentState(aPresContext, aReflowState, this,
-                                    size);
-
-      // set the computed size to what we want
-      parentState.computedWidth = size.width;
-      parentState.computedHeight = size.height;
-
-      // subtract out the childs margin and border 
-      const nsStyleSpacing* spacing;
-      nsresult rv = childFrame->GetStyleData(eStyleStruct_Spacing,
-                     (const nsStyleStruct*&) spacing);
-
-      nsMargin margin;
-      spacing->GetMargin(margin);
-      nsMargin border;
-      spacing->GetBorderPadding(border);
-      nsMargin total = margin + border;
-
-
-      const nsStylePosition* position;
-      rv = childFrame->GetStyleData(eStyleStruct_Position,
-                     (const nsStyleStruct*&) position);
-
-      
-      // adjust it by the percent so when the child scales itself it 
-      // will come out the right size.
-      nsStyleUnit wunit;
-      nsStyleUnit hunit;
-
-      // only subrtact margin and border if the size is not intrinsic
-      if (NS_INTRINSICSIZE != parentState.computedWidth) 
-      {
-        parentState.computedWidth -= (total.left + total.right);
-        
-        wunit = position->mWidth.GetUnit();
-        if (wunit == eStyleUnit_Percent) {
-          float percent = position->mWidth.GetPercentValue();
-          parentState.computedWidth = nscoord(float(parentState.computedWidth)/percent);
-        }
-      }
-
-
-      if (NS_INTRINSICSIZE != parentState.computedHeight) 
-      {
-        parentState.computedHeight -= (total.top + total.bottom);
-
-        
-        hunit =  position->mHeight.GetUnit();
-        if (hunit == eStyleUnit_Percent) {
-          float percent = position->mHeight.GetPercentValue();
-          parentState.computedHeight = nscoord(float(parentState.computedHeight)/percent);
-        }
-        
-      }
-      
-
-      // start off with an empty size
-      desiredSize.width = 0; 
-      desiredSize.height = 0;
-
-      nsHTMLReflowState   reflowState(aPresContext, parentState, childFrame, size);
-
-
-
-      nsIHTMLReflow*      htmlReflow;
-
-      rv = childFrame->QueryInterface(kIHTMLReflowIID, (void**)&htmlReflow);
-      NS_ASSERTION(rv == NS_OK,"failed to get htmlReflow interface.");
-
-      htmlReflow->WillReflow(aPresContext);
-      htmlReflow->Reflow(aPresContext, desiredSize, reflowState, aStatus);
-      NS_ASSERTION(NS_FRAME_IS_COMPLETE(aStatus), "bad status");
-
-      // set the rect
-      childFrame->SetRect(nsRect(0,0,desiredSize.width, desiredSize.height));
-
-      // add the margin back in. The child should add its border automatically
-      desiredSize.height += (margin.top + margin.bottom);
-      desiredSize.width += (margin.left + margin.right); 
-      
-      return NS_OK;
-}
-*/
-
-/**
- * Ok what we want to do here is get all the children, figure out
- * their flexibility, preferred, min, max sizes and then stretch or
- * shrink them to fit in the given space.
- *
- * So we will have 3 passes. 
- * 1) get each childs flex, min, max, pref 
- * 2) flow all the children stretched out to fit in the given area
- * 3) move all the children to the right locations.
- */
-NS_IMETHODIMP
-nsBoxFrame::Reflow(nsIPresContext&   aPresContext,
-                     nsHTMLReflowMetrics&     aDesiredSize,
-                     const nsHTMLReflowState& aReflowState,
-                     nsReflowStatus&          aStatus)
-{
-  // first figure out our size. Are we intrinsic? Computed?
-  const nsMargin& borderPadding = aReflowState.mComputedBorderPadding;
-
-  nsSize availableSize(0,0);
-
-  PRBool fixedWidthContent = aReflowState.HaveFixedContentWidth();
-  if (NS_INTRINSICSIZE == aReflowState.computedWidth) {
-		fixedWidthContent = PR_FALSE;
-  }
-
-  PRBool fixedHeightContent = aReflowState.HaveFixedContentHeight();
-  if (NS_INTRINSICSIZE == aReflowState.computedHeight) {
-		fixedHeightContent = PR_FALSE;
-  }
- 
-  if (fixedWidthContent) {
-	    availableSize.width = aReflowState.computedWidth;
-  } else
-      availableSize.width = aReflowState.availableWidth;
-
-  if (fixedHeightContent) {
-	    availableSize.height = aReflowState.computedHeight;
-  } else
-      availableSize.height = aReflowState.availableHeight;
-
-
-  // ------ first pass build springs -------
-  
-  nsBoxDataSpring springs[100];
-  
-  // go though each child
-  nsHTMLReflowMetrics desiredSize = aDesiredSize;
-  
-  nscoord count = 0;
-  nsIFrame* childFrame = mFrames.FirstChild(); 
-  while (nsnull != childFrame) 
-  {  
-    // create a spring
-    springs[count].init();
-
-    desiredSize.width = 0;
-    desiredSize.height = 0;
-
-    // get the preferred size
-    const nsStylePosition* position;
-    nsresult rv = childFrame->GetStyleData(eStyleStruct_Position,
-                  (const nsStyleStruct*&) position);
-
-    nsStyleUnit wunit = position->mWidth.GetUnit();
-    nsStyleUnit hunit = position->mHeight.GetUnit();
-
-    // if we don't know the exact width or height then
-    // get the instrinsic size for our preferred.
-    if (wunit != eStyleUnit_Coord || hunit != eStyleUnit_Coord)
-       FlowChildAt(childFrame,aPresContext, desiredSize, aReflowState, aStatus, nsSize(NS_INTRINSICSIZE,NS_INTRINSICSIZE));
-
-    if (wunit == eStyleUnit_Coord) 
-        desiredSize.width = position->mWidth.GetCoordValue();
-
-    if (hunit == eStyleUnit_Coord)  
-        desiredSize.height = position->mHeight.GetCoordValue();
-
-    if (mHorizontal)
-        springs[count].preferredSize = desiredSize.width;
-    else
-        springs[count].preferredSize = desiredSize.height;
-
-
-    const nsStyleCoord* min;
-    const nsStyleCoord* max;
-
-    if (mHorizontal)
-    {
-       min = &position->mMinWidth;
-       max = &position->mMaxWidth;
-    } else {
-       min = &position->mMinHeight;
-       max = &position->mMaxHeight;
-    }
-
-    if (min->GetUnit() == eStyleUnit_Coord) 
-      springs[count].minSize = min->GetCoordValue();
-
-    if (max->GetUnit() == eStyleUnit_Coord) 
-      springs[count].maxSize = max->GetCoordValue();
-
-
-    // get the content
-    nsCOMPtr<nsIContent> content;
-    childFrame->GetContent(getter_AddRefs(content));
-
-    PRInt32 error;
-    nsString value;
-
-    /*
-     float p2t;
-     aPresContext.GetScaledPixelsToTwips(&p2t);
-     nscoord onePixel = NSIntPixelsToTwips(1, p2t);
-
-    // get min size
-    if (NS_CONTENT_ATTR_HAS_VALUE == content->GetAttribute(kNameSpaceID_None, nsXULAtoms::min, value))
-    {
-       PRInt32 min = value.ToInteger(&error);
-       springs[count].minSize = min*onePixel;
-    }
-
-    // get max size
-    if (NS_CONTENT_ATTR_HAS_VALUE == content->GetAttribute(kNameSpaceID_None, nsXULAtoms::max, value))
-    {
-       PRInt32 max = value.ToInteger(&error);
-       springs[count].maxSize = max*onePixel;
-    }
-    */
-    
-    // get the spring constant
-    if (NS_CONTENT_ATTR_HAS_VALUE == content->GetAttribute(kNameSpaceID_None, nsXULAtoms::flex, value))
-    {
-      value.Trim("%");
-      float percent = value.ToFloat(&error);
-      springs[count].springConstant = percent;    
-    }
-    
-    if (mHorizontal) {
-      if (wunit == eStyleUnit_Percent) 
-          springs[count].springConstant = position->mWidth.GetPercentValue();
-    } else {
-      if (hunit == eStyleUnit_Percent)  
-          springs[count].springConstant = position->mHeight.GetPercentValue();
-    }
-
-
-    rv = childFrame->GetNextSibling(&childFrame);
-    NS_ASSERTION(rv == NS_OK,"failed to get next child");
-    count++;
-  }
-
-  // total number of children
-  nscoord totalCount = count;
- 
-  // ------ second pass flow -------
-
-  // now stretch it to fit the size we were given
-  nscoord s;
-  if (mHorizontal)
-      s = availableSize.width;
-  else
-      s = availableSize.height;
-
-  Stretch(springs, totalCount, s);
-
-  // flow everyone. 
-  PRBool changedHeight;
-  int passes = 0;
-  do 
-  {
-    changedHeight = PR_FALSE;
-    count = 0;
-    childFrame = mFrames.FirstChild(); 
-    while (nsnull != childFrame) 
-    {    
-        desiredSize.width = 0; 
-        desiredSize.height = 0;
-
-        // set the size to be based on the spring
-        nsSize size = availableSize;
-
-        if (mHorizontal)
-          size.width = springs[count].calculatedSize;
-        else
-          size.height = springs[count].calculatedSize;
-
-        // flow child
-        FlowChildAt(childFrame,aPresContext, desiredSize, aReflowState, aStatus, size);
-      
-        // if its height greater than the max. Set the max to this height and set a flag
-        // saying we will need to do another pass. But keep going there
-        // may be another child that is bigger
-        if (mHorizontal) {
-          if (availableSize.height == NS_INTRINSICSIZE || desiredSize.height > availableSize.height) {
-              availableSize.height = desiredSize.height;
-              changedHeight = PR_TRUE;
-          } 
-
-          // if we are wider than we anticipated then
-          // then this child can't get smaller then the size returned
-          // so set its minSize to be the desired and restretch. Then
-          // just start over because the springs are all messed up 
-          // anyway.
-          
-          if (desiredSize.width > size.width) {
-              springs[count].preferredSize = desiredSize.width;
-              springs[count].minSize = desiredSize.width;
-              Stretch(springs, totalCount, availableSize.width);
-              changedHeight = PR_TRUE;
-              break;
-          } 
-          
- 
-        } else {
-          if (availableSize.width == NS_INTRINSICSIZE || desiredSize.width > availableSize.width) {
-              availableSize.width = desiredSize.width;
-              changedHeight = PR_TRUE;
-          } 
-
-          
-          if (desiredSize.height > size.height) {
-              springs[count].preferredSize = desiredSize.height;
-              springs[count].minSize = desiredSize.height;
-              Stretch(springs, totalCount, availableSize.height);
-              changedHeight = PR_TRUE;
-              break;
-          } 
-          
-        }
-
-      nsresult rv = childFrame->GetNextSibling(&childFrame);
-      NS_ASSERTION(rv == NS_OK,"failed to get next child");
-      count++;
-    }
-
-    // if we get over 10 passes something probably when wrong.
-    passes++;
-    if (passes > 5)
-      NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
-                 ("bug"));
-
-    NS_ASSERTION(passes <= 10,"Error infinte loop too many passes");
-
-  } while (PR_TRUE == changedHeight);
-  
-  // ---- 3th pass. Layout ---
-  nscoord x = borderPadding.left;
-  nscoord y = borderPadding.top;
-  nscoord width = 0;
-  nscoord height = 0;
-
-  childFrame = mFrames.FirstChild(); 
-  while (nsnull != childFrame) 
-  {
-    // add in the left margin
-    const nsStyleSpacing* spacing;
-    nsresult rv = childFrame->GetStyleData(eStyleStruct_Spacing,
-                 (const nsStyleStruct*&) spacing);
-    nsMargin margin;
-    spacing->GetMargin(margin);
-
-    if (mHorizontal) {
-      x += margin.left;
-      y = borderPadding.top + margin.top;
-    } else {
-      y += margin.top;
-      x = borderPadding.left + margin.left;
-    }
-
-    nsRect rect;
-    childFrame->GetRect(rect);
-    rect.x = x;
-    rect.y = y;
-    childFrame->SetRect(rect);
-
-    // add in the right margin
-    if (mHorizontal)
-      x += margin.right;
-    else
-      y += margin.bottom;
-     
-    if (mHorizontal) {
-      x += rect.width;
-      width += rect.width + margin.left + margin.right;
-    } else {
-      y += rect.height;
-      height += rect.height + margin.top + margin.bottom;
-    }
-
-    rv = childFrame->GetNextSibling(&childFrame);
-    NS_ASSERTION(rv == NS_OK,"failed to get next child");
-  }
-
-  
-  if (mHorizontal) {
-      height = availableSize.height;
-  } else {
-      width = availableSize.width;
-  }
-   // if the width is set
-  if (fixedWidthContent) 
-	    aDesiredSize.width = aReflowState.computedWidth;
-  else
-      aDesiredSize.width = width;
-
-  // if the height is set
-  if (fixedHeightContent) 
-	    aDesiredSize.height = aReflowState.computedHeight; 
-  else
-      aDesiredSize.height = height;
-
-
-  if (width > aDesiredSize.width)
-      aDesiredSize.width = width;
-
-  if (height > aDesiredSize.height)
-      aDesiredSize.height = height;
-
-
-  aDesiredSize.width += borderPadding.left + borderPadding.right;
-  aDesiredSize.height += borderPadding.top + borderPadding.bottom;
-  aDesiredSize.ascent = aDesiredSize.height;
-  aDesiredSize.descent = 0;
- 
-  aStatus = NS_FRAME_COMPLETE;
-  
-  return NS_OK;
-}
-
-
-
-void
-nsBoxFrame::Stretch(nsBoxDataSpring* springs, PRInt32 nSprings, nscoord& size)
-{
- 
-      PRInt32 sizeRemaining = size;
-      float springConstantsRemaining = (float)0.0;
-      int i;
-
-      for (i=0; i<nSprings; i++) {
-          nsBoxDataSpring& spring = springs[i];
-          spring.sizeValid = PR_FALSE;
-          if (spring.springConstant == 0.0)
-          {
-              spring.springConstant = (float)0.001;
-              spring.maxSize = spring.preferredSize;
-              spring.minSize = spring.preferredSize;
-          }
-          springConstantsRemaining += spring.springConstant;
-          sizeRemaining -= spring.preferredSize;
-      }
-
-      if (NS_INTRINSICSIZE == size) {
-          size = 0;
-          for (i=0; i<nSprings; i++) {
-              nsBoxDataSpring& spring=springs[i];
-              spring.calculatedSize = spring.preferredSize;
-              spring.sizeValid = PR_TRUE;
-              size += spring.calculatedSize;
-          }
-          return;
-      }
-
-      PRBool limit = PR_TRUE;
-      for (int pass=1; PR_TRUE == limit; pass++) {
-          limit = PR_FALSE;
-          for (i=0; i<nSprings; i++) {
-              nsBoxDataSpring& spring=springs[i];
-              if (spring.sizeValid==PR_FALSE) {
-                  PRInt32 newSize = spring.preferredSize + NSToIntRound(sizeRemaining*(spring.springConstant/springConstantsRemaining));
-                  if (newSize<=spring.minSize) {
-                      spring.calculatedSize = spring.minSize;
-                      springConstantsRemaining -= spring.springConstant;
-                      //sizeRemaining -= spring.minSize-spring.preferredSize;
-                      sizeRemaining += spring.preferredSize;
-                      sizeRemaining -= spring.calculatedSize;
- 
-                      spring.sizeValid = PR_TRUE;
-                      limit = PR_TRUE;
-                  }
-                  else if (newSize>=spring.maxSize) {
-                      spring.calculatedSize = spring.maxSize;
-                      springConstantsRemaining -= spring.springConstant;
-                      //sizeRemaining -= spring.minSize-spring.preferredSize;
-                      sizeRemaining += spring.preferredSize;
-                      sizeRemaining -= spring.calculatedSize;
-                      spring.sizeValid = PR_TRUE;
-                      limit = PR_TRUE;
-                  }
-              }
-          }
-      }
-      float stretchFactor = sizeRemaining/springConstantsRemaining;
-      size = 0;
-      for (i=0; i<nSprings; i++) {
-           nsBoxDataSpring& spring=springs[i];
-          if (spring.sizeValid==PR_FALSE) {
-              spring.calculatedSize = spring.preferredSize + NSToIntFloor(spring.springConstant*stretchFactor);
-              spring.sizeValid = PR_TRUE;
-          }
-          size += spring.calculatedSize;
-      }
-}
-
-    
-void
-nsBoxFrame::GetDesiredSize(nsIPresContext* aPresContext,
-                             const nsHTMLReflowState& aReflowState,
-                             nsHTMLReflowMetrics& aDesiredSize)
-{
-
-}
-
-
-NS_IMETHODIMP
-nsBoxFrame::HandleEvent(nsIPresContext& aPresContext, 
-                                      nsGUIEvent* aEvent,
-                                      nsEventStatus& aEventStatus)
-{
-  nsresult rv = nsHTMLContainerFrame::HandleEvent(aPresContext, aEvent, aEventStatus);
-
-  return rv;
-}
-
-//
-// ReResolveStyleContext
-//
-// When the style context changes, make sure that all of our styles are still up to date.
-//
-NS_IMETHODIMP
-nsBoxFrame :: ReResolveStyleContext ( nsIPresContext* aPresContext, nsIStyleContext* aParentContext,
-                                                PRInt32 aParentChange, nsStyleChangeList* aChangeList, 
-                                                PRInt32* aLocalChange)
-{
-
-  nsCOMPtr<nsIStyleContext> old ( dont_QueryInterface(mStyleContext) );
-  
-  // this re-resolves |mStyleContext|, so it may change
-  nsresult rv = nsFrame::ReResolveStyleContext(aPresContext, aParentContext, aParentChange, aChangeList, aLocalChange); 
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  return NS_OK;  
-} // ReResolveStyleContext
-
-
diff --git a/mozilla/layout/xul/base/src/nsBoxFrame.h b/mozilla/layout/xul/base/src/nsBoxFrame.h
deleted file mode 100644
index d2b6c7180fe..00000000000
--- a/mozilla/layout/xul/base/src/nsBoxFrame.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
- * the License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are Copyright (C) 1998
- * Netscape Communications Corporation.  All Rights Reserved.
- */
-
-/**
-
-  Eric D Vaughan
-  This class lays out its children either vertically or horizontally
- 
-**/
-
-#include "nsHTMLContainerFrame.h"
-class nsBoxDataSpring;
-
-class nsBoxFrame : public nsHTMLContainerFrame
-{
-public:
-
-  friend nsresult NS_NewBoxFrame(nsIFrame*& aNewFrame);
-
-  NS_IMETHOD FlowChildAt(nsIFrame* frame, 
-                     nsIPresContext& aPresContext,
-                     nsHTMLReflowMetrics&     aDesiredSize,
-                     const nsHTMLReflowState& aReflowState,
-                     nsReflowStatus&          aStatus,
-                     const nsSize& size);
-
-
-    NS_IMETHOD  Init(nsIPresContext&  aPresContext,
-                   nsIContent*      aContent,
-                   nsIFrame*        aParent,
-                   nsIStyleContext* aContext,
-                   nsIFrame*        asPrevInFlow);
-
-   NS_IMETHOD  ReResolveStyleContext ( nsIPresContext* aPresContext, 
-                                      nsIStyleContext* aParentContext,
-                                      PRInt32 aParentChange,
-                                      nsStyleChangeList* aChangeList,
-                                      PRInt32* aLocalChange) ;
-
-  NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext,
-                              nsIContent* aChild,
-                              nsIAtom* aAttribute,
-                              PRInt32 aHint);
-
-
-    // nsIHTMLReflow overrides
-  NS_IMETHOD Reflow(nsIPresContext&          aPresContext,
-                    nsHTMLReflowMetrics&     aDesiredSize,
-                    const nsHTMLReflowState& aReflowState,
-                    nsReflowStatus&          aStatus);
-
-  NS_IMETHOD  Paint(nsIPresContext& aPresContext,
-                    nsIRenderingContext& aRenderingContext,
-                    const nsRect& aDirtyRect,
-                    nsFramePaintLayer aWhichLayer);
-
-  NS_IMETHOD HandleEvent(nsIPresContext& aPresContext, 
-                         nsGUIEvent* aEvent,
-                         nsEventStatus& aEventStatus);
-
- 
-protected:
-
-	  virtual void GetDesiredSize(nsIPresContext* aPresContext,
-                              const nsHTMLReflowState& aReflowState,
-                              nsHTMLReflowMetrics& aDesiredSize);
-
-    virtual PRIntn GetSkipSides() const { return 0; }
-
-    nsBoxFrame();
-
-    virtual void Stretch(nsBoxDataSpring* springs, PRInt32 nSprings, nscoord& size);
-
-private: 
-
-  PRBool mHorizontal;
- 
-}; // class nsBoxFrame
-
diff --git a/mozilla/layout/xul/base/src/nsProgressMeterFrame.cpp b/mozilla/layout/xul/base/src/nsProgressMeterFrame.cpp
index 0ac6076d6a8..d150b759bc3 100644
--- a/mozilla/layout/xul/base/src/nsProgressMeterFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsProgressMeterFrame.cpp
@@ -601,7 +601,10 @@ nsProgressMeterFrame :: Reflow ( nsIPresContext&          aPresContext,
                             nsHTMLReflowMetrics&     aDesiredSize,
                             const nsHTMLReflowState& aReflowState,
                             nsReflowStatus&          aStatus)
-{	
+{
+
+  ReResolveStyleContext(&aPresContext, mStyleContext, NS_STYLE_HINT_REFLOW, nsnull, nsnull);
+	
   if (mUndetermined)
      gStripeAnimator->AddFrame(this);
   else 
diff --git a/mozilla/layout/xul/base/src/nsTitledButtonFrame.cpp b/mozilla/layout/xul/base/src/nsTitledButtonFrame.cpp
index b105fb5bebc..ad1f6797835 100644
--- a/mozilla/layout/xul/base/src/nsTitledButtonFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsTitledButtonFrame.cpp
@@ -193,7 +193,11 @@ nsTitledButtonFrame::AttributeChanged(nsIPresContext* aPresContext,
   mNeedsLayout = PR_TRUE;
   UpdateAttributes(*aPresContext);
 
-  mRenderer.Redraw();
+  // redraw
+  nsRect frameRect;
+  GetRect(frameRect);
+  nsRect rect(0,0,frameRect.width, frameRect.height);
+  Invalidate(rect, PR_TRUE);
   return NS_OK;
 }
 
@@ -796,28 +800,18 @@ nsTitledButtonFrame::GetDesiredSize(nsIPresContext* aPresContext,
  
   nsRect minSize(0,0,mMinSize.width, mMinSize.height);
  
-  // we need to factory or focus stuff into our computed size.
-  nscoord computedWidth = aReflowState.computedWidth;
-  nscoord computedHeight = aReflowState.computedHeight;
-
-  
-  nsMargin added = mRenderer.GetAddedButtonBorderAndPadding();
-
-  computedWidth -= (added.left + added.right);
-  computedHeight -= (added.top + added.bottom);
-
   // if the width is set
   if (fixedWidthContent)
-	  if (computedWidth >= minSize.width)
-	      aDesiredSize.width = computedWidth;
+	  if (aReflowState.computedWidth >= minSize.width)
+	      aDesiredSize.width = aReflowState.computedWidth;
 	  else
-        aDesiredSize.width = minSize.width;
+          aDesiredSize.width = minSize.width;
   
 
   // if the height is set
   if (fixedHeightContent) 
-	  if (computedHeight >= minSize.height)
-	      aDesiredSize.height = computedHeight;
+	  if (aReflowState.computedWidth >= minSize.height)
+	      aDesiredSize.height = aReflowState.computedHeight;
 	  else
         aDesiredSize.height = minSize.height;
 }
diff --git a/mozilla/layout/xul/content/src/nsXULAtoms.cpp b/mozilla/layout/xul/content/src/nsXULAtoms.cpp
index 1518de97727..93aa0803c17 100644
--- a/mozilla/layout/xul/content/src/nsXULAtoms.cpp
+++ b/mozilla/layout/xul/content/src/nsXULAtoms.cpp
@@ -48,8 +48,6 @@ nsIAtom* nsXULAtoms::progressmeter;
 nsIAtom* nsXULAtoms::titledbutton;
 nsIAtom* nsXULAtoms::mode;
 
-nsIAtom* nsXULAtoms::box;
-nsIAtom* nsXULAtoms::flex;
 
 nsIAtom* nsXULAtoms::widget;
 nsIAtom* nsXULAtoms::window;
@@ -93,8 +91,6 @@ void nsXULAtoms::AddrefAtoms() {
 	titledbutton = NS_NewAtom("titledbutton");
 
 	mode = NS_NewAtom("mode");
-	box = NS_NewAtom("box");
-	flex = NS_NewAtom("flex");
 
     widget = NS_NewAtom("widget");
     window = NS_NewAtom("window");
@@ -128,10 +124,6 @@ void nsXULAtoms::ReleaseAtoms() {
     NS_RELEASE(progressmeter);
 	NS_RELEASE(mode);
 
-	NS_RELEASE(box);
-	NS_RELEASE(flex);
-
-
 	NS_RELEASE(widget);
     NS_RELEASE(window);
     NS_IF_RELEASE(gNameSpaceManager);
diff --git a/mozilla/layout/xul/content/src/nsXULAtoms.h b/mozilla/layout/xul/content/src/nsXULAtoms.h
index ef8e33924b0..31cf0bbc399 100644
--- a/mozilla/layout/xul/content/src/nsXULAtoms.h
+++ b/mozilla/layout/xul/content/src/nsXULAtoms.h
@@ -66,9 +66,6 @@ public:
   static nsIAtom* titledbutton;
   static nsIAtom* mode; 
 
-  static nsIAtom* box; 
-  static nsIAtom* flex; 
-
   static nsIAtom* widget;
   static nsIAtom* window;
 };