aboutsummaryrefslogtreecommitdiff
path: root/libXmu/src/ShapeWidg.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-19 13:39:03 +0200
committermarha <marha@users.sourceforge.net>2011-09-19 13:39:03 +0200
commit1678a69116d1c6ce900fe15f7813613bb28416dd (patch)
tree9589536f6b4bd60b34f90cf5ed20240d40bbb38c /libXmu/src/ShapeWidg.c
parent9d911bc1246139019e555f443e934677a067bc0a (diff)
parentb2c925e360e2c366526de15b44603f855f94139c (diff)
downloadvcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.gz
vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.bz2
vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.zip
Merge remote-tracking branch 'origin/released'
Conflicts: libfontenc/src/fontenc.c
Diffstat (limited to 'libXmu/src/ShapeWidg.c')
-rw-r--r--libXmu/src/ShapeWidg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libXmu/src/ShapeWidg.c b/libXmu/src/ShapeWidg.c
index bb8c4fbb3..32388ee46 100644
--- a/libXmu/src/ShapeWidg.c
+++ b/libXmu/src/ShapeWidg.c
@@ -1,5 +1,5 @@
-/*
-
+/*
+
Copyright 1988, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
@@ -142,7 +142,7 @@ ShapeOval(Widget w)
rad = height >> 1;
XDrawLine(dpy, p, gc, rad, rad, width - rad - 1, rad);
}
- XShapeCombineMask(dpy, XtWindow(w), ShapeBounding,
+ XShapeCombineMask(dpy, XtWindow(w), ShapeBounding,
-(int)w->core.border_width, -(int)w->core.border_width,
p, ShapeSet);
if (w->core.border_width)