diff options
Diffstat (limited to 'src/Geometry.c')
| -rw-r--r-- | src/Geometry.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/Geometry.c b/src/Geometry.c index 8d16c63..fdd5661 100644 --- a/src/Geometry.c +++ b/src/Geometry.c @@ -85,7 +85,7 @@ static void ClearRectObjAreas( bw2 = old->border_width << 1; XClearArea( XtDisplay(pw), XtWindow(pw), old->x, old->y, - old->width + bw2, old->height + bw2, + (unsigned)(old->width + bw2), (unsigned)(old->height + bw2), TRUE ); bw2 = r->rectangle.border_width << 1; @@ -168,7 +168,7 @@ _XtMakeGeometryRequest ( "invalidParent","xtMakeGeometryRequest", XtCXtToolkitError, "non-shell has no parent in XtMakeGeometryRequest", - (String *)NULL, (Cardinal *)NULL); + NULL, NULL); managed = XtIsManaged(widget); parentRealized = XtIsRealized(parent); @@ -201,7 +201,7 @@ _XtMakeGeometryRequest ( "invalidParent", "xtMakeGeometryRequest", XtCXtToolkitError, "XtMakeGeometryRequest - parent not composite", - (String *)NULL, (Cardinal *)NULL); + NULL, NULL); } else if (manager == (XtGeometryHandler) NULL) { @@ -209,7 +209,7 @@ _XtMakeGeometryRequest ( "invalidGeometryManager","xtMakeGeometryRequest", XtCXtToolkitError, "XtMakeGeometryRequest - parent has no geometry manager", - (String *)NULL, (Cardinal *)NULL); + NULL, NULL); } } #else @@ -430,7 +430,7 @@ _XtMakeGeometryRequest ( if (XtIsWidget(request->sibling)) req.changes.sibling = XtWindow(request->sibling); else - req.changeMask &= ~(CWStackMode | CWSibling); + req.changeMask = (XtGeometryMask) (req.changeMask & (unsigned long) (~(CWStackMode | CWSibling))); } } @@ -716,20 +716,20 @@ void XtTranslateCoords( *rooty = y; for (; w != NULL && ! XtIsShell(w); w = w->core.parent) { - *rootx += w->core.x + w->core.border_width; - *rooty += w->core.y + w->core.border_width; + *rootx = (Position) (*rootx + w->core.x + w->core.border_width); + *rooty = (Position) (*rooty + w->core.y + w->core.border_width); } if (w == NULL) XtAppWarningMsg(app, "invalidShell","xtTranslateCoords",XtCXtToolkitError, "Widget has no shell ancestor", - (String *)NULL, (Cardinal *)NULL); + NULL, NULL); else { Position x2, y2; _XtShellGetCoordinates( w, &x2, &y2 ); - *rootx += x2 + w->core.border_width; - *rooty += y2 + w->core.border_width; + *rootx = (Position) (*rootx + x2 + w->core.border_width); + *rooty = (Position) (*rooty + y2 + w->core.border_width); } UNLOCK_APP(app); } |