merge XFree86 4.3.0.1 to -CURRENT

1 files changed, 13 insertions, 28 deletions

diff --git a/wtree.c b/wtree.c
index 07a6920..254f5d0 100644
--- a/wtree.c
+++ b/wtree.c
@@ -23,6 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  */
+/* $XFree86: xc/programs/editres/wtree.c,v 1.5 2001/12/14 20:00:44 dawes Exp $ */
 
 #include <stdio.h>
 #include <X11/Intrinsic.h>
@@ -36,20 +37,15 @@ in this Software without prior written authorization from The Open Group.
 
 #include "editresP.h"
 
-extern ScreenData global_screen_data;
-extern void SetMessage();
-
-static Boolean IsActiveNode();
-static void AddChild(), FillNode();
-static void AddNode();
-static void AddNodeToActiveList(), RemoveNodeFromActiveList();
-
-extern void PrepareToLayoutTree(), LayoutTree();
-
-extern void _TreeSelectNode(), _TreeActivateNode(), _TreeRelabelNode();
-static WNode ** CopyActiveNodes();
-
-void TreeToggle();
+static void AddNodeToActiveList ( WNode * node );
+static void RemoveNodeFromActiveList ( WNode * node );
+static Boolean IsActiveNode ( WNode * node );
+static void AddNode ( WNode ** top_node, WidgetTreeInfo * info, 
+		      TreeInfo * tree_info );
+static void FillNode ( WidgetTreeInfo * info, WNode * node, 
+		       TreeInfo * tree_info );
+static void AddChild ( WNode * parent, WNode * child );
+static WNode ** CopyActiveNodes ( TreeInfo * tree_info );
 
 /*	Function Name: BuildVisualTree
  *	Description: Creates the Tree and shows it.
@@ -65,8 +61,6 @@ Widget tree_parent;
 Event * event;
 {
     WNode * top;
-    TreeInfo *CreateTree();
-    void AddTreeNode();
     char msg[BUFSIZ];
 
     if (global_tree_info != NULL) {
@@ -326,9 +320,7 @@ LabelTypes type;
  */
 
 void
-_TreeSelect(tree_info, type)
-TreeInfo * tree_info;
-SelectTypes type;
+_TreeSelect(TreeInfo *tree_info, SelectTypes type)
 {
     WNode ** active_nodes;
     Cardinal num_active_nodes;
@@ -374,10 +366,7 @@ SelectTypes type;
  */
 
 void
-_TreeSelectNode(node, type, recurse)
-WNode * node;
-SelectTypes type;
-Boolean recurse;
+_TreeSelectNode(WNode *node, SelectTypes type, Boolean recurse)
 {
     int i;
     Arg args[1];
@@ -422,10 +411,7 @@ Boolean recurse;
  */
 
 void
-_TreeRelabelNode(node, type, recurse)
-WNode * node;
-LabelTypes type;
-Boolean recurse;
+_TreeRelabelNode(WNode *node, LabelTypes type, Boolean recurse)
 {
     int i;
     Arg args[1];
@@ -523,7 +509,6 @@ SelectTypes type;
  *
  ************************************************************/
 
-WNode * FindNode();
 
 /*	Function Name: AddNode
  *	Description: adds a node to the widget tree.