From ab78f88559e3048d792d0f53319088b85acbd649 Mon Sep 17 00:00:00 2001 From: "alecf%netscape.com" Date: Tue, 14 Dec 1999 00:24:33 +0000 Subject: [PATCH] fix unix bustage once and for all --- layout/html/table/src/FixedTableLayoutStrategy.cpp | 1 - layout/html/table/src/nsTableCellFrame.cpp | 3 ++- layout/html/table/src/nsTableColFrame.h | 1 - layout/html/table/src/nsTableColGroupFrame.h | 2 +- layout/html/table/src/nsTableFrame.h | 10 +++++----- layout/tables/FixedTableLayoutStrategy.cpp | 1 - layout/tables/nsTableCellFrame.cpp | 3 ++- layout/tables/nsTableColFrame.h | 1 - layout/tables/nsTableColGroupFrame.h | 2 +- layout/tables/nsTableFrame.h | 10 +++++----- 10 files changed, 16 insertions(+), 18 deletions(-) diff --git a/layout/html/table/src/FixedTableLayoutStrategy.cpp b/layout/html/table/src/FixedTableLayoutStrategy.cpp index 54a017944e26..2a240a499276 100644 --- a/layout/html/table/src/FixedTableLayoutStrategy.cpp +++ b/layout/html/table/src/FixedTableLayoutStrategy.cpp @@ -22,7 +22,6 @@ #include "FixedTableLayoutStrategy.h" #include "nsTableFrame.h" -#include "nsTableColFrame.h" #include "nsTableCellFrame.h" #include "nsIStyleContext.h" #include "nsStyleConsts.h" diff --git a/layout/html/table/src/nsTableCellFrame.cpp b/layout/html/table/src/nsTableCellFrame.cpp index cf9dd330f236..25f2facf26bc 100644 --- a/layout/html/table/src/nsTableCellFrame.cpp +++ b/layout/html/table/src/nsTableCellFrame.cpp @@ -19,8 +19,9 @@ * * Contributor(s): */ -#include "nsTableCellFrame.h" +#include "nsTableFrame.h" #include "nsTableColFrame.h" +#include "nsTableCellFrame.h" #include "nsTableFrame.h" #include "nsIReflowCommand.h" #include "nsIStyleContext.h" diff --git a/layout/html/table/src/nsTableColFrame.h b/layout/html/table/src/nsTableColFrame.h index 3a50b6e28596..543417d3b430 100644 --- a/layout/html/table/src/nsTableColFrame.h +++ b/layout/html/table/src/nsTableColFrame.h @@ -24,7 +24,6 @@ #include "nscore.h" #include "nsContainerFrame.h" -#include "nsTableFrame.h" class nsVoidArray; class nsTableCellFrame; diff --git a/layout/html/table/src/nsTableColGroupFrame.h b/layout/html/table/src/nsTableColGroupFrame.h index 93125656a539..1d41b40d9343 100644 --- a/layout/html/table/src/nsTableColGroupFrame.h +++ b/layout/html/table/src/nsTableColGroupFrame.h @@ -24,10 +24,10 @@ #include "nscore.h" #include "nsHTMLContainerFrame.h" +#include "nsTableColFrame.h" class nsTableColFrame; class nsTableFrame; -enum nsTableColType; enum nsTableColGroupType { eColGroupContent = 0, // there is real col group content associated diff --git a/layout/html/table/src/nsTableFrame.h b/layout/html/table/src/nsTableFrame.h index 44d900996712..19b98f369500 100644 --- a/layout/html/table/src/nsTableFrame.h +++ b/layout/html/table/src/nsTableFrame.h @@ -29,6 +29,8 @@ #include "nsStyleConsts.h" #include "nsIStyleContext.h" #include "nsITableLayout.h" +#include "nsTableColFrame.h" +#include "nsTableColGroupFrame.h" class nsCellMap; class nsTableCellFrame; @@ -43,8 +45,6 @@ class nsHTMLValue; struct InnerTableReflowState; struct nsStylePosition; struct nsStyleSpacing; -enum nsTableColType; -enum nsTableColGroupType; /** * Child list name indices @@ -131,9 +131,9 @@ public: // Return the closest sibling of aPriorChildFrame (including aPriroChildFrame) // of type aChildType. - static nsIFrame* nsTableFrame::GetFrameAtOrBefore(nsIFrame* aParentFrame, - nsIFrame* aPriorChildFrame, - nsIAtom* aChildType); + static nsIFrame* GetFrameAtOrBefore(nsIFrame* aParentFrame, + nsIFrame* aPriorChildFrame, + nsIAtom* aChildType); /** * @param aReflowState the context within which we're to determine the table width info * @param aSpecifiedTableWidth [OUT] if the table is not auto-width, diff --git a/layout/tables/FixedTableLayoutStrategy.cpp b/layout/tables/FixedTableLayoutStrategy.cpp index 54a017944e26..2a240a499276 100644 --- a/layout/tables/FixedTableLayoutStrategy.cpp +++ b/layout/tables/FixedTableLayoutStrategy.cpp @@ -22,7 +22,6 @@ #include "FixedTableLayoutStrategy.h" #include "nsTableFrame.h" -#include "nsTableColFrame.h" #include "nsTableCellFrame.h" #include "nsIStyleContext.h" #include "nsStyleConsts.h" diff --git a/layout/tables/nsTableCellFrame.cpp b/layout/tables/nsTableCellFrame.cpp index cf9dd330f236..25f2facf26bc 100644 --- a/layout/tables/nsTableCellFrame.cpp +++ b/layout/tables/nsTableCellFrame.cpp @@ -19,8 +19,9 @@ * * Contributor(s): */ -#include "nsTableCellFrame.h" +#include "nsTableFrame.h" #include "nsTableColFrame.h" +#include "nsTableCellFrame.h" #include "nsTableFrame.h" #include "nsIReflowCommand.h" #include "nsIStyleContext.h" diff --git a/layout/tables/nsTableColFrame.h b/layout/tables/nsTableColFrame.h index 3a50b6e28596..543417d3b430 100644 --- a/layout/tables/nsTableColFrame.h +++ b/layout/tables/nsTableColFrame.h @@ -24,7 +24,6 @@ #include "nscore.h" #include "nsContainerFrame.h" -#include "nsTableFrame.h" class nsVoidArray; class nsTableCellFrame; diff --git a/layout/tables/nsTableColGroupFrame.h b/layout/tables/nsTableColGroupFrame.h index 93125656a539..1d41b40d9343 100644 --- a/layout/tables/nsTableColGroupFrame.h +++ b/layout/tables/nsTableColGroupFrame.h @@ -24,10 +24,10 @@ #include "nscore.h" #include "nsHTMLContainerFrame.h" +#include "nsTableColFrame.h" class nsTableColFrame; class nsTableFrame; -enum nsTableColType; enum nsTableColGroupType { eColGroupContent = 0, // there is real col group content associated diff --git a/layout/tables/nsTableFrame.h b/layout/tables/nsTableFrame.h index 44d900996712..19b98f369500 100644 --- a/layout/tables/nsTableFrame.h +++ b/layout/tables/nsTableFrame.h @@ -29,6 +29,8 @@ #include "nsStyleConsts.h" #include "nsIStyleContext.h" #include "nsITableLayout.h" +#include "nsTableColFrame.h" +#include "nsTableColGroupFrame.h" class nsCellMap; class nsTableCellFrame; @@ -43,8 +45,6 @@ class nsHTMLValue; struct InnerTableReflowState; struct nsStylePosition; struct nsStyleSpacing; -enum nsTableColType; -enum nsTableColGroupType; /** * Child list name indices @@ -131,9 +131,9 @@ public: // Return the closest sibling of aPriorChildFrame (including aPriroChildFrame) // of type aChildType. - static nsIFrame* nsTableFrame::GetFrameAtOrBefore(nsIFrame* aParentFrame, - nsIFrame* aPriorChildFrame, - nsIAtom* aChildType); + static nsIFrame* GetFrameAtOrBefore(nsIFrame* aParentFrame, + nsIFrame* aPriorChildFrame, + nsIAtom* aChildType); /** * @param aReflowState the context within which we're to determine the table width info * @param aSpecifiedTableWidth [OUT] if the table is not auto-width,