add casts to quiet gcc conversion-warnings, no object change

Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>

1 files changed, 43 insertions, 37 deletions

diff --git a/src/Form.c b/src/Form.c
index dcc26f3..786c130 100644
--- a/src/Form.c
+++ b/src/Form.c
@@ -304,7 +304,7 @@ XawFormRealize(Widget w, Mask *mask, XSetWindowAttributes *attr)
 
     if (w->core.background_pixmap > XtUnspecifiedPixmap) {
 	pixmap = XawPixmapFromXPixmap(w->core.background_pixmap, XtScreen(w),
-				      w->core.colormap, w->core.depth);
+				      w->core.colormap, (int)w->core.depth);
 	if (pixmap && pixmap->mask)
 	    XawReshapeWidget(w, pixmap);
     }
@@ -384,7 +384,7 @@ CvtEdgeTypeToString(Display *dpy, XrmValuePtr args, Cardinal *num_args,
 	    return (False);
     }
 
-    size = strlen(buffer) + 1;
+    size = (Cardinal)strlen(buffer) + 1;
     if (toVal->addr != NULL) {
 	if (toVal->size < size)	{
 	    toVal->size = size;
@@ -490,8 +490,8 @@ ChangeFormGeometry(Widget w, Bool query_only,
     if (width == XtWidth(fw) && height == XtHeight(fw))
 	return (True);
 
-    request.width = width;
-    request.height = height;
+    request.width = (Dimension)width;
+    request.height = (Dimension)height;
     request.request_mode = CWWidth | CWHeight;
     if (query_only)
 	request.request_mode |= XtCWQueryOnly;
@@ -543,7 +543,7 @@ static Boolean
 Layout(FormWidget fw, unsigned int width, unsigned int height,
        Bool force_relayout)
 {
-    int num_children = fw->composite.num_children;
+    int num_children = (int)fw->composite.num_children;
     WidgetList children = fw->composite.children;
     Widget *childP;
     Dimension maxx, maxy;
@@ -564,26 +564,26 @@ Layout(FormWidget fw, unsigned int width, unsigned int height,
 
 	    LayoutChild(*childP);
 
-	    x = form->form.new_x + XtWidth(*childP)
-		+ (XtBorderWidth(*childP) << 1);
+	    x = (Position)(form->form.new_x + XtWidth(*childP)
+		+ (XtBorderWidth(*childP) << 1));
 	    if (x > (int)maxx)
-		maxx = x;
+		maxx = (Dimension)x;
 
-	    y = form->form.new_y + XtHeight(*childP)
-		+ (XtBorderWidth(*childP) << 1);
+	    y = (Position)(form->form.new_y + XtHeight(*childP)
+		+ (XtBorderWidth(*childP) << 1));
 	    if (y > (int)maxy)
-		maxy = y;
+		maxy = (Dimension)y;
 	}
     }
 
-    fw->form.preferred_width = (maxx += fw->form.default_spacing);
-    fw->form.preferred_height = (maxy += fw->form.default_spacing);
+    fw->form.preferred_width = (maxx = (Dimension)(maxx + fw->form.default_spacing));
+    fw->form.preferred_height = (maxy = (Dimension)(maxy + fw->form.default_spacing));
 
     if (fw->form.resize_in_layout) {
 	Boolean always_resize_children;
 
 	always_resize_children =
-	    ChangeFormGeometry((Widget)fw, False, maxx, maxy, NULL, NULL);
+	    (Boolean)ChangeFormGeometry((Widget)fw, False, maxx, maxy, NULL, NULL);
 
 #ifdef OLDXAW
 	fw->form.old_width  = fw->core.width;
@@ -621,7 +621,7 @@ static void
 ResizeChildren(Widget w)
 {
     FormWidget fw = (FormWidget)w;
-    int num_children = fw->composite.num_children;
+    int num_children = (int)fw->composite.num_children;
     WidgetList children = fw->composite.children;
     Widget *childP;
 
@@ -635,9 +635,9 @@ ResizeChildren(Widget w)
 	form = (FormConstraints)(*childP)->core.constraints;
 
 	if (fw->form.old_width && fw->form.old_height) {
-	    x = TransformCoord(form->form.new_x, fw->form.old_width,
+	    x = (Position)TransformCoord(form->form.new_x, fw->form.old_width,
 			       XtWidth(fw), form->form.left);
-	    y = TransformCoord(form->form.new_y, fw->form.old_height,
+	    y = (Position)TransformCoord(form->form.new_y, fw->form.old_height,
 			       XtHeight(fw), form->form.top);
 	}
 	else {
@@ -687,21 +687,25 @@ LayoutChild(Widget w)
 	}   return;
     }
 
-    form->form.new_x = form->form.dx;
-    form->form.new_y = form->form.dy;
+    form->form.new_x = (Position)form->form.dx;
+    form->form.new_y = (Position)form->form.dy;
     if ((ref = form->form.horiz_base) != NULL) {
 	FormConstraints ref_form = (FormConstraints)ref->core.constraints;
 
 	LayoutChild(ref);
-	form->form.new_x += ref_form->form.new_x + XtWidth(ref) +
-			    (XtBorderWidth(ref) << 1);
+	form->form.new_x = (Position)(form->form.new_x
+				      + (ref_form->form.new_x
+				      + XtWidth(ref)
+				      + (XtBorderWidth(ref) << 1)));
     }
     if ((ref = form->form.vert_base) != NULL) {
 	FormConstraints ref_form = (FormConstraints)ref->core.constraints;
 
 	LayoutChild(ref);
-	form->form.new_y += ref_form->form.new_y + XtHeight(ref) +
-			    (XtBorderWidth(ref) << 1);
+	form->form.new_y = (Position)(form->form.new_y
+				      + (ref_form->form.new_y
+				      + XtHeight(ref)
+				      + (XtBorderWidth(ref) << 1)));
     }
 
     form->form.layout_state = LayoutDone;
@@ -725,7 +729,7 @@ XawFormResize(Widget w)
 {
     FormWidget fw = (FormWidget)w;
     WidgetList children = fw->composite.children;
-    int num_children = fw->composite.num_children;
+    int num_children = (int)fw->composite.num_children;
     Widget *childP;
     int x, y;
     int width, height;
@@ -781,7 +785,9 @@ XawFormResize(Widget w)
 	    width = width < 1 ? 1 : width;
 	    height = height < 1 ? 1 : height;
 
-	    XtConfigureWidget(*childP, x, y, width, height,
+	    XtConfigureWidget(*childP,
+			      (Position)x, (Position)y,
+			      (Dimension)width, (Dimension)height,
 			      XtBorderWidth(*childP));
 	}
 
@@ -863,7 +869,7 @@ XawFormGeometryManager(Widget w, XtWidgetGeometry *request,
 
 	fw->form.resize_in_layout = True;
 
-	always_resize_children = ChangeFormGeometry(w, True,
+	always_resize_children = (Boolean)ChangeFormGeometry(w, True,
 				   fw->form.preferred_width,
 				   fw->form.preferred_height,
 				   &ret_width, &ret_height);
@@ -879,7 +885,7 @@ XawFormGeometryManager(Widget w, XtWidgetGeometry *request,
 	if ((*((FormWidgetClass)fw->core.widget_class)->form_class.layout)
 		(fw, XtWidth(w), XtHeight(w), False)) {
 	    Widget *childP;
-	    int num_children = fw->composite.num_children;
+	    int num_children = (int)fw->composite.num_children;
 	    WidgetList children = fw->composite.children;
 
 	    if (fw->form.no_refigure) {
@@ -913,8 +919,8 @@ XawFormGeometryManager(Widget w, XtWidgetGeometry *request,
 		    nform->form.virtual_x = XtX(nw);
 		    nform->form.virtual_y = XtY(nw);
 #endif
-		    nform->form.virtual_width = XtWidth(nw);
-		    nform->form.virtual_height = XtHeight(nw);
+		    nform->form.virtual_width = (short)XtWidth(nw);
+		    nform->form.virtual_height = (short)XtHeight(nw);
 		}
 	    }
 	}
@@ -941,9 +947,9 @@ XawFormSetValues(Widget current, Widget request, Widget cnew,
 	XawPixmap *opix, *npix;
 
 	opix = XawPixmapFromXPixmap(f_old->core.background_pixmap, XtScreen(f_old),
-				    f_old->core.colormap, f_old->core.depth);
+				    f_old->core.colormap, (int)f_old->core.depth);
 	npix = XawPixmapFromXPixmap(f_new->core.background_pixmap, XtScreen(f_new),
-				    f_new->core.colormap, f_new->core.depth);
+				    f_new->core.colormap, (int)f_new->core.depth);
 	if ((npix && npix->mask) || (opix && opix->mask))
 	    XawReshapeWidget(cnew, npix);
     }
@@ -964,8 +970,8 @@ XawFormConstraintInitialize(Widget request, Widget cnew,
     form->form.virtual_x = XtX(cnew);
     form->form.virtual_y = XtY(cnew);
 #endif
-    form->form.virtual_width = XtWidth(cnew);
-    form->form.virtual_height = XtHeight(cnew);
+    form->form.virtual_width = (short)XtWidth(cnew);
+    form->form.virtual_height = (short)XtHeight(cnew);
 
     if (form->form.dx == default_value)
 	form->form.dx = fw->form.default_spacing;
@@ -1015,7 +1021,7 @@ XawFormChangeManaged(Widget w)
     FormWidget fw = (FormWidget)w;
     FormConstraints form;
     WidgetList children, childP;
-    int num_children = fw->composite.num_children;
+    int num_children = (int)fw->composite.num_children;
     Widget child;
 
     (*((FormWidgetClass)w->core.widget_class)->form_class.layout)
@@ -1034,8 +1040,8 @@ XawFormChangeManaged(Widget w)
 	form->form.virtual_x = XtX(child);
 	form->form.virtual_y = XtY(child);
 #endif
-	form->form.virtual_width = XtWidth(child);
-	form->form.virtual_height = XtHeight(child);
+	form->form.virtual_width = (short)XtWidth(child);
+	form->form.virtual_height = (short)XtHeight(child);
     }
 }
 
@@ -1076,7 +1082,7 @@ XawFormDoLayout(Widget w,
 {
     Widget *childP;
     FormWidget fw = (FormWidget)w;
-    int num_children = fw->composite.num_children;
+    int num_children = (int)fw->composite.num_children;
     WidgetList children = fw->composite.children;
 
     if ((fw->form.no_refigure = !force) == True || !XtIsRealized(w))