Commit fa4ef1a2 authored by Kaleb Keithley Keithley's avatar Kaleb Keithley Keithley
Browse files

merge latest (4.3.99.16) from XFree86 (vendor) branch

parent ef6bf0e7
......@@ -23,7 +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/actions.c,v 1.6 2001/12/14 20:00:42 dawes Exp $ */
/* $XFree86: xc/programs/editres/actions.c,v 1.7 2003/05/27 22:26:55 tsi Exp $ */
#include <stdio.h>
#include <stdlib.h>
......@@ -133,7 +133,7 @@ Cardinal * num_params;
case SelectAll:
case SelectNone:
case SelectInvert:
_TreeSelect(global_tree_info, type);
_TreeSelect(global_tree_info, (SelectTypes)type);
break;
case SelectWidget:
_FindWidget(XtParent(w));
......@@ -141,9 +141,9 @@ Cardinal * num_params;
default:
node = FindTreeNodeFromWidget(w);
if (node)
_TreeActivateNode(node, type);
_TreeActivateNode(node, (SelectTypes)type);
else
_TreeSelect(global_tree_info, type);
_TreeSelect(global_tree_info, (SelectTypes)type);
break;
}
}
......@@ -175,10 +175,10 @@ Cardinal * num_params;
return;
if ((node = FindTreeNodeFromWidget(w)) == NULL)
_TreeRelabel(global_tree_info, type);
_TreeRelabel(global_tree_info, (LabelTypes)type);
else {
PrepareToLayoutTree(global_tree_info->tree_widget);
_TreeRelabelNode(node, type, FALSE);
_TreeRelabelNode(node, (LabelTypes)type, FALSE);
LayoutTree(global_tree_info->tree_widget);
}
}
......
......@@ -24,7 +24,7 @@ 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/handler.c,v 1.7 2001/12/14 20:00:43 dawes Exp $ */
/* $XFree86: xc/programs/editres/handler.c,v 1.8 2003/10/24 20:38:10 tsi Exp $ */
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
......@@ -152,7 +152,7 @@ TreeSelect(w, client_data, call_data)
Widget w;
XtPointer call_data, client_data;
{
SelectTypes type = (SelectTypes) client_data;
SelectTypes type = (SelectTypes) (unsigned long) client_data;
_TreeSelect(global_tree_info, type);
}
......@@ -171,7 +171,7 @@ TreeRelabel(w, client_data, call_data)
Widget w;
XtPointer call_data, client_data;
{
LabelTypes type = (LabelTypes) client_data;
LabelTypes type = (LabelTypes) (unsigned long) client_data;
_TreeRelabel(global_tree_info, type);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment