aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/CopyGC.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 12:47:39 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 12:47:39 +0000
commitcb897b8ffca0a68c017c2edfa523cb5ff0491962 (patch)
tree8b4e9e320258d5280ce454163c49363030626c1a /libX11/src/CopyGC.c
parent213d71f78d6f9e35b23c00e35f9919efc9670b1e (diff)
parentc87efef42f76c2ff0dcfad2842ab369beffd21de (diff)
downloadvcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.gz
vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.bz2
vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.zip
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'libX11/src/CopyGC.c')
-rw-r--r--libX11/src/CopyGC.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/libX11/src/CopyGC.c b/libX11/src/CopyGC.c
index f94914ae4..9e78c3519 100644
--- a/libX11/src/CopyGC.c
+++ b/libX11/src/CopyGC.c
@@ -46,7 +46,7 @@ XCopyGC (
LockDisplay(dpy);
mask &= (1L << (GCLastBit + 1)) - 1;
- /* if some of the source values to be copied are "dirty", flush them
+ /* if some of the source values to be copied are "dirty", flush them
out before sending the CopyGC request. */
if (srcGC->dirty & mask)
_XFlushGCCache(dpy, srcGC);
@@ -61,7 +61,7 @@ XCopyGC (
if (mask & GCFunction)
destgv->function = srcgv->function;
-
+
if (mask & GCPlaneMask)
destgv->plane_mask = srcgv->plane_mask;
@@ -79,14 +79,14 @@ XCopyGC (
if (mask & GCCapStyle)
destgv->cap_style = srcgv->cap_style;
-
+
if (mask & GCJoinStyle)
destgv->join_style = srcgv->join_style;
if (mask & GCFillStyle)
destgv->fill_style = srcgv->fill_style;
- if (mask & GCFillRule)
+ if (mask & GCFillRule)
destgv->fill_rule = srcgv->fill_rule;
if (mask & GCArcMode)
@@ -104,19 +104,19 @@ XCopyGC (
if (mask & GCTileStipYOrigin)
destgv->ts_y_origin = srcgv->ts_y_origin;
- if (mask & GCFont)
+ if (mask & GCFont)
destgv->font = srcgv->font;
- if (mask & GCSubwindowMode)
+ if (mask & GCSubwindowMode)
destgv->subwindow_mode = srcgv->subwindow_mode;
- if (mask & GCGraphicsExposures)
+ if (mask & GCGraphicsExposures)
destgv->graphics_exposures = srcgv->graphics_exposures;
- if (mask & GCClipXOrigin)
+ if (mask & GCClipXOrigin)
destgv->clip_x_origin = srcgv->clip_x_origin;
- if (mask & GCClipYOrigin)
+ if (mask & GCClipYOrigin)
destgv->clip_y_origin = srcgv->clip_y_origin;
if (mask & GCClipMask) {
@@ -124,7 +124,7 @@ XCopyGC (
destgv->clip_mask = srcgv->clip_mask;
}
- if (mask & GCDashOffset)
+ if (mask & GCDashOffset)
destgv->dash_offset = srcgv->dash_offset;
if (mask & GCDashList) {