merge XFree86 4.3.0.1 to -CURRENT

1 files changed, 19 insertions, 18 deletions

diff --git a/src/Manage.c b/src/Manage.c
index 98ad68e..03c1472 100644
--- a/src/Manage.c
+++ b/src/Manage.c
@@ -32,6 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
+/* $XFree86: xc/lib/Xt/Manage.c,v 3.8 2001/12/14 19:56:26 dawes Exp $ */
 
 /*
 
@@ -66,18 +67,18 @@ static String XtNxtUnmanageChildren = "xtUnmanageChildren";
 static String XtNxtManageChildren = "xtManageChildren";
 static String XtNxtChangeManagedSet = "xtChangeManagedSet";
 
-static void UnmanageChildren(children, num_children, parent, num_unique_children, call_change_managed, caller_func)
-    WidgetList children;
-    Cardinal num_children;
-    Widget parent;
-    Cardinal* num_unique_children;
-    Boolean call_change_managed;
-    String caller_func;
+static void UnmanageChildren(
+    WidgetList children,
+    Cardinal num_children,
+    Widget parent,
+    Cardinal* num_unique_children,
+    Boolean call_change_managed,
+    String caller_func)
 {
     Widget		child;
     Cardinal		i;
-    XtWidgetProc	change_managed;
-    Bool		parent_realized;
+    XtWidgetProc	change_managed = NULL;
+    Bool		parent_realized = False;
 
     *num_unique_children = 0;
 
@@ -189,20 +190,20 @@ void XtUnmanageChild(child)
 } /* XtUnmanageChild */
 
 
-static void ManageChildren(children, num_children, parent, call_change_managed, caller_func)
-    WidgetList  children;
-    Cardinal    num_children;
-    Widget	parent;
-    Boolean	call_change_managed;
-    String	caller_func;
+static void ManageChildren(
+    WidgetList  children,
+    Cardinal    num_children,
+    Widget	parent,
+    Boolean	call_change_managed,
+    String	caller_func)
 {
 #define MAXCHILDREN 100
     Widget		child;
     Cardinal		num_unique_children, i;
-    XtWidgetProc	change_managed;
+    XtWidgetProc	change_managed = NULL;
     WidgetList		unique_children;
     Widget		cache[MAXCHILDREN];
-    Bool		parent_realized;
+    Bool		parent_realized = False;
 
     if (XtIsComposite((Widget) parent)) {
 	LOCK_PROCESS;
@@ -368,7 +369,7 @@ void XtSetMappedWhenManaged(widget, mapped_when_managed)
 
 	call_data.type = XtHsetMappedWhenManaged;
 	call_data.widget = widget;
-	call_data.event_data = (XtPointer) mapped_when_managed;
+	call_data.event_data = (XtPointer) (unsigned long) mapped_when_managed;
 	XtCallCallbackList(hookobj, 
 		((HookObject)hookobj)->hooks.changehook_callbacks, 
 		(XtPointer)&call_data);