Fixed the build
git-svn-id: svn://10.0.0.236/trunk@10737 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -24,7 +24,6 @@ LIBRARY_NAME = raptorhtmltable_s
|
||||
# Note the sophisticated alphabetical ordering :-|
|
||||
CPPSRCS = \
|
||||
BasicTableLayoutStrategy.cpp \
|
||||
FixedTableLayoutStrategy.cpp \
|
||||
nsCellMap.cpp \
|
||||
nsTableCellFrame.cpp \
|
||||
nsTableColFrame.cpp \
|
||||
|
||||
@@ -31,8 +31,7 @@ CPPSRCS= nsCellMap.cpp \
|
||||
nsTableOuterFrame.cpp \
|
||||
nsTableRowFrame.cpp \
|
||||
nsTableRowGroupFrame.cpp \
|
||||
BasicTableLayoutStrategy.cpp \
|
||||
FixedTableLayoutStrategy.cpp
|
||||
BasicTableLayoutStrategy.cpp
|
||||
|
||||
CPP_OBJS= .\$(OBJDIR)\nsCellMap.obj \
|
||||
.\$(OBJDIR)\nsTableCellFrame.obj .\$(OBJDIR)\nsTableColFrame.obj \
|
||||
@@ -41,8 +40,7 @@ CPP_OBJS= .\$(OBJDIR)\nsCellMap.obj \
|
||||
.\$(OBJDIR)\nsTableOuterFrame.obj \
|
||||
.\$(OBJDIR)\nsTableRowFrame.obj \
|
||||
.\$(OBJDIR)\nsTableRowGroupFrame.obj \
|
||||
.\$(OBJDIR)\BasicTableLayoutStrategy.obj \
|
||||
.\$(OBJDIR)\FixedTableLayoutStrategy.obj
|
||||
.\$(OBJDIR)\BasicTableLayoutStrategy.obj
|
||||
|
||||
LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor \
|
||||
-I..\..\base\src -I..\..\style\src -I..\..\content\src \
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "nsIHTMLContent.h"
|
||||
|
||||
#include "BasicTableLayoutStrategy.h"
|
||||
#include "FixedTableLayoutStrategy.h"
|
||||
// #include "FixedTableLayoutStrategy.h"
|
||||
|
||||
#include "nsIPresContext.h"
|
||||
#include "nsCSSRendering.h"
|
||||
@@ -2298,9 +2298,11 @@ void nsTableFrame::BalanceColumnWidths(nsIPresContext* aPresContext,
|
||||
{
|
||||
nsStyleTable* tableStyle;
|
||||
GetStyleData(eStyleStruct_Table, (nsStyleStruct *&)tableStyle);
|
||||
#if XXX
|
||||
if (NS_STYLE_TABLE_LAYOUT_FIXED==tableStyle->mLayoutStrategy)
|
||||
mTableLayoutStrategy = new FixedTableLayoutStrategy(this, numCols);
|
||||
else
|
||||
#endif
|
||||
mTableLayoutStrategy = new BasicTableLayoutStrategy(this, numCols);
|
||||
mTableLayoutStrategy->Initialize(aMaxElementSize);
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "nsIHTMLContent.h"
|
||||
|
||||
#include "BasicTableLayoutStrategy.h"
|
||||
#include "FixedTableLayoutStrategy.h"
|
||||
// #include "FixedTableLayoutStrategy.h"
|
||||
|
||||
#include "nsIPresContext.h"
|
||||
#include "nsCSSRendering.h"
|
||||
@@ -2298,9 +2298,11 @@ void nsTableFrame::BalanceColumnWidths(nsIPresContext* aPresContext,
|
||||
{
|
||||
nsStyleTable* tableStyle;
|
||||
GetStyleData(eStyleStruct_Table, (nsStyleStruct *&)tableStyle);
|
||||
#if XXX
|
||||
if (NS_STYLE_TABLE_LAYOUT_FIXED==tableStyle->mLayoutStrategy)
|
||||
mTableLayoutStrategy = new FixedTableLayoutStrategy(this, numCols);
|
||||
else
|
||||
#endif
|
||||
mTableLayoutStrategy = new BasicTableLayoutStrategy(this, numCols);
|
||||
mTableLayoutStrategy->Initialize(aMaxElementSize);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user