mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-18 15:55:36 +00:00
Turning on new grid code
-r bryner -sr hyatt
This commit is contained in:
parent
100a1b792a
commit
29e11c6ee6
@ -24,9 +24,7 @@ DEPTH=..\..\..\..
|
||||
LIBRARY_NAME=layoutxulbase_s
|
||||
MODULE=layout_xul
|
||||
DIRS=outliner \
|
||||
!ifdef MOZ_GRID2
|
||||
grid
|
||||
!endif
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
@ -62,12 +60,6 @@ CPPSRCS= \
|
||||
nsPopupBoxObject.cpp \
|
||||
nsMenuBoxObject.cpp \
|
||||
nsBoxObject.cpp \
|
||||
!ifndef MOZ_GRID2
|
||||
nsGridLayout.cpp \
|
||||
nsTempleLayout.cpp \
|
||||
nsObeliskLayout.cpp \
|
||||
nsMonumentLayout.cpp \
|
||||
!endif
|
||||
nsImageBoxFrame.cpp \
|
||||
nsRootBoxFrame.cpp \
|
||||
nsDocElementBoxFrame.cpp \
|
||||
@ -123,12 +115,6 @@ CPP_OBJS= \
|
||||
.\$(OBJDIR)\nsPopupBoxObject.obj \
|
||||
.\$(OBJDIR)\nsMenuBoxObject.obj \
|
||||
.\$(OBJDIR)\nsBoxObject.obj \
|
||||
!ifndef MOZ_GRID2
|
||||
.\$(OBJDIR)\nsGridLayout.obj \
|
||||
.\$(OBJDIR)\nsTempleLayout.obj \
|
||||
.\$(OBJDIR)\nsObeliskLayout.obj \
|
||||
.\$(OBJDIR)\nsMonumentLayout.obj \
|
||||
!endif
|
||||
.\$(OBJDIR)\nsImageBoxFrame.obj \
|
||||
.\$(OBJDIR)\nsRootBoxFrame.obj \
|
||||
.\$(OBJDIR)\nsDocElementBoxFrame.obj \
|
||||
|
@ -45,7 +45,7 @@
|
||||
#ifndef nsTreeLayout_h___
|
||||
#define nsTreeLayout_h___
|
||||
|
||||
//#define MOZ_GRID2 1
|
||||
#define MOZ_GRID2 1
|
||||
|
||||
#ifdef MOZ_GRID2
|
||||
#include "nsGridRowGroupLayout.h"
|
||||
|
@ -47,7 +47,7 @@
|
||||
#include "nsIBoxLayout.h"
|
||||
#include "nsMonumentLayout.h"
|
||||
|
||||
//#define MOZ_GRID2 1
|
||||
#define MOZ_GRID2 1
|
||||
|
||||
#ifdef MOZ_GRID2
|
||||
#include "nsGrid.h"
|
||||
|
@ -65,7 +65,7 @@
|
||||
#include "nsIStyleContext.h"
|
||||
#include "nsIDOMText.h"
|
||||
|
||||
//#define MOZ_GRID2 1
|
||||
#define MOZ_GRID2 1
|
||||
|
||||
#ifdef MOZ_GRID2
|
||||
#include "nsGridRowGroupLayout.h"
|
||||
|
Loading…
Reference in New Issue
Block a user