Added atoms for the tree widget. Modified the makefile to make sure

that nsTreeView.cpp builds.


git-svn-id: svn://10.0.0.236/trunk@18254 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/content/shared/public/nsXULAtoms.h

@@ -48,7 +48,16 @@ public:
   static nsIAtom* text;
   static nsIAtom* toolbar;
   static nsIAtom* toolbox;
-  static nsIAtom* tree;
+  
+  // The tree atoms
+  static nsIAtom* tree; // The start of a tree view
+  static nsIAtom* treecaption; // The caption of a tree view
+  static nsIAtom* treehead; // The header of the tree view
+  static nsIAtom* treebody; // The body of the tree view
+  static nsIAtom* treeitem; // An item in the tree view
+  static nsIAtom* treerow; // A row in the tree view
+  static nsIAtom* treecell; // A cell in the tree view
+  static nsIAtom* treechildren; // The children of an item in the tree viw
 
   static nsIAtom* widget;
   static nsIAtom* window;

mozilla/content/shared/src/nsXULAtoms.cpp

@@ -31,7 +31,16 @@ nsIAtom* nsXULAtoms::radio;
 nsIAtom* nsXULAtoms::text;
 nsIAtom* nsXULAtoms::toolbar;
 nsIAtom* nsXULAtoms::toolbox;
+
 nsIAtom* nsXULAtoms::tree;
+nsIAtom* nsXULAtoms::treecaption;
+nsIAtom* nsXULAtoms::treehead;
+nsIAtom* nsXULAtoms::treebody;
+nsIAtom* nsXULAtoms::treeitem;
+nsIAtom* nsXULAtoms::treerow;
+nsIAtom* nsXULAtoms::treecell;
+nsIAtom* nsXULAtoms::treechildren;
+
 nsIAtom* nsXULAtoms::widget;
 nsIAtom* nsXULAtoms::window;
 
@@ -57,7 +66,16 @@ void nsXULAtoms::AddrefAtoms() {
     text = NS_NewAtom("text");
     toolbar = NS_NewAtom("toolbar");
     toolbox = NS_NewAtom("toolbox");
+
     tree = NS_NewAtom("tree");
+	treecaption = NS_NewAtom("treecaption");
+	treehead = NS_NewAtom("treehead");
+	treebody = NS_NewAtom("treebody");
+	treerow = NS_NewAtom("treerow");
+	treecell = NS_NewAtom("treecell");
+	treeitem = NS_NewAtom("treeitem");
+	treechildren = NS_NewAtom("treechildren");
+
     widget = NS_NewAtom("widget");
     window = NS_NewAtom("window");
   }
@@ -74,7 +92,16 @@ void nsXULAtoms::ReleaseAtoms() {
     NS_RELEASE(text);
     NS_RELEASE(toolbar);
     NS_RELEASE(toolbox);
+
     NS_RELEASE(tree);
+	NS_RELEASE(treecaption);
+	NS_RELEASE(treehead);
+	NS_RELEASE(treebody);
+	NS_RELEASE(treerow);
+	NS_RELEASE(treecell);
+	NS_RELEASE(treeitem);
+	NS_RELEASE(treechildren);
+
 	NS_RELEASE(widget);
     NS_RELEASE(window);
     NS_IF_RELEASE(gNameSpaceManager);

mozilla/layout/xul/base/src/Makefile.in

@@ -30,6 +30,7 @@ DEFINES += -D_IMPL_NS_HTML
 
 INCLUDES += \
 	-I$(srcdir)/../../../base/src		\
+	-I$(srcdir)/../../../html/table/src \
 	-I$(DIST)/public/raptor			\
 	$(NULL)
 
@@ -37,6 +38,7 @@ INCLUDES += \
 CPPSRCS =				\
 	nsToolbarFrame.cpp			\
 	nsToolboxFrame.cpp			\
+	nsTreeFrame.cpp \
 	$(NULL)
 
 EXPORTS = \

mozilla/layout/xul/base/src/makefile.win

@@ -17,7 +17,7 @@
 
 DEPTH=..\..\..\.. 
 
-LIBRARY_NAME=raptorxulcontent_s 
+LIBRARY_NAME=raptorxulbase_s 
 MODULE=raptor 
 REQUIRES=xpcom raptor pref
 
@@ -26,11 +26,13 @@ DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 CPPSRCS=					\
 	nsToolboxFrame.cpp		\
 	nsToolbarFrame.cpp		\
+	nsTreeFrame.cpp			\
 	$(NULL)
 
 CPP_OBJS=					\
 	.\$(OBJDIR)\nsToolboxFrame.obj		\
 	.\$(OBJDIR)\nsToolbarFrame.obj		\
+	.\$(OBJDIR)\nsTreeFrame.obj	\
 	$(NULL)
 
 EXPORTS =					\
@@ -39,6 +41,7 @@ EXPORTS =					\
 LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \
   -I..\..\..\html\style\src -I..\..\..\html\base\src -I$(PUBLIC)\dom \
    -I..\..\..\html\document\src \
+   -I..\..\..\html\table\src \
   -I$(PUBLIC)\netlib -I..\..\..\base\src -I$(PUBLIC)\pref
 
 LCFLAGS = \

mozilla/layout/xul/content/src/nsXULAtoms.cpp

@@ -31,7 +31,16 @@ nsIAtom* nsXULAtoms::radio;
 nsIAtom* nsXULAtoms::text;
 nsIAtom* nsXULAtoms::toolbar;
 nsIAtom* nsXULAtoms::toolbox;
+
 nsIAtom* nsXULAtoms::tree;
+nsIAtom* nsXULAtoms::treecaption;
+nsIAtom* nsXULAtoms::treehead;
+nsIAtom* nsXULAtoms::treebody;
+nsIAtom* nsXULAtoms::treeitem;
+nsIAtom* nsXULAtoms::treerow;
+nsIAtom* nsXULAtoms::treecell;
+nsIAtom* nsXULAtoms::treechildren;
+
 nsIAtom* nsXULAtoms::widget;
 nsIAtom* nsXULAtoms::window;
 
@@ -57,7 +66,16 @@ void nsXULAtoms::AddrefAtoms() {
     text = NS_NewAtom("text");
     toolbar = NS_NewAtom("toolbar");
     toolbox = NS_NewAtom("toolbox");
+
     tree = NS_NewAtom("tree");
+	treecaption = NS_NewAtom("treecaption");
+	treehead = NS_NewAtom("treehead");
+	treebody = NS_NewAtom("treebody");
+	treerow = NS_NewAtom("treerow");
+	treecell = NS_NewAtom("treecell");
+	treeitem = NS_NewAtom("treeitem");
+	treechildren = NS_NewAtom("treechildren");
+
     widget = NS_NewAtom("widget");
     window = NS_NewAtom("window");
   }
@@ -74,7 +92,16 @@ void nsXULAtoms::ReleaseAtoms() {
     NS_RELEASE(text);
     NS_RELEASE(toolbar);
     NS_RELEASE(toolbox);
+
     NS_RELEASE(tree);
+	NS_RELEASE(treecaption);
+	NS_RELEASE(treehead);
+	NS_RELEASE(treebody);
+	NS_RELEASE(treerow);
+	NS_RELEASE(treecell);
+	NS_RELEASE(treeitem);
+	NS_RELEASE(treechildren);
+
 	NS_RELEASE(widget);
     NS_RELEASE(window);
     NS_IF_RELEASE(gNameSpaceManager);

mozilla/layout/xul/content/src/nsXULAtoms.h

@@ -48,7 +48,16 @@ public:
   static nsIAtom* text;
   static nsIAtom* toolbar;
   static nsIAtom* toolbox;
-  static nsIAtom* tree;
+  
+  // The tree atoms
+  static nsIAtom* tree; // The start of a tree view
+  static nsIAtom* treecaption; // The caption of a tree view
+  static nsIAtom* treehead; // The header of the tree view
+  static nsIAtom* treebody; // The body of the tree view
+  static nsIAtom* treeitem; // An item in the tree view
+  static nsIAtom* treerow; // A row in the tree view
+  static nsIAtom* treecell; // A cell in the tree view
+  static nsIAtom* treechildren; // The children of an item in the tree viw
 
   static nsIAtom* widget;
   static nsIAtom* window;