summaryrefslogtreecommitdiffstats
path: root/xlib
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-07 04:30:52 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-07 04:30:52 (GMT)
commite05c1d71ec11cc892731a999a9d521781ea8567e (patch)
tree9e4ba40f867e41451c5cf5bc10bd1871191d2cad /xlib
parente35d614587b25a1a03ededdf2d04bcbfca86be70 (diff)
parent0f3a2fcdd9d1f4c2d5659ae50ce1a5cba322f62c (diff)
downloadtk-e05c1d71ec11cc892731a999a9d521781ea8567e.zip
tk-e05c1d71ec11cc892731a999a9d521781ea8567e.tar.gz
tk-e05c1d71ec11cc892731a999a9d521781ea8567e.tar.bz2
Change XChangeWindowAttributes signature and many others to match Xorg, needed for Cygwin
Diffstat (limited to 'xlib')
-rw-r--r--xlib/xgc.c42
1 files changed, 28 insertions, 14 deletions
diff --git a/xlib/xgc.c b/xlib/xgc.c
index a741b76..083731a 100644
--- a/xlib/xgc.c
+++ b/xlib/xgc.c
@@ -181,7 +181,7 @@ XCreateGC(display, d, mask, values)
*----------------------------------------------------------------------
*/
-void
+int
XChangeGC(d, gc, mask, values)
Display * d;
GC gc;
@@ -211,6 +211,7 @@ XChangeGC(d, gc, mask, values)
if (mask & GCClipMask) { XSetClipMask(d, gc, values->clip_mask); }
if (mask & GCDashOffset) { gc->dash_offset = values->dash_offset; }
if (mask & GCDashList) { gc->dashes = values->dashes; (&(gc->dashes))[1] = 0;}
+ return Success;
}
/*
@@ -229,7 +230,7 @@ XChangeGC(d, gc, mask, values)
*----------------------------------------------------------------------
*/
-void XFreeGC(d, gc)
+int XFreeGC(d, gc)
Display * d;
GC gc;
{
@@ -237,6 +238,7 @@ void XFreeGC(d, gc)
FreeClipMask(gc);
ckfree((char *) gc);
}
+ return Success;
}
/*
@@ -256,22 +258,24 @@ void XFreeGC(d, gc)
*----------------------------------------------------------------------
*/
-void
+int
XSetForeground(display, gc, foreground)
Display *display;
GC gc;
unsigned long foreground;
{
gc->foreground = foreground;
+ return Success;
}
-void
+int
XSetBackground(display, gc, background)
Display *display;
GC gc;
unsigned long background;
{
gc->background = background;
+ return Success;
}
int
@@ -299,34 +303,37 @@ XSetDashes(display, gc, dash_offset, dash_list, n)
return Success;
}
-void
+int
XSetFunction(display, gc, function)
Display *display;
GC gc;
int function;
{
gc->function = function;
+ return Success;
}
-void
+int
XSetFillRule(display, gc, fill_rule)
Display *display;
GC gc;
int fill_rule;
{
gc->fill_rule = fill_rule;
+ return Success;
}
-void
+int
XSetFillStyle(display, gc, fill_style)
Display *display;
GC gc;
int fill_style;
{
gc->fill_style = fill_style;
+ return Success;
}
-void
+int
XSetTSOrigin(display, gc, x, y)
Display *display;
GC gc;
@@ -334,36 +341,40 @@ XSetTSOrigin(display, gc, x, y)
{
gc->ts_x_origin = x;
gc->ts_y_origin = y;
+ return Success;
}
-void
+int
XSetFont(display, gc, font)
Display *display;
GC gc;
Font font;
{
gc->font = font;
+ return Success;
}
-void
+int
XSetArcMode(display, gc, arc_mode)
Display *display;
GC gc;
int arc_mode;
{
gc->arc_mode = arc_mode;
+ return Success;
}
-void
+int
XSetStipple(display, gc, stipple)
Display *display;
GC gc;
Pixmap stipple;
{
gc->stipple = stipple;
+ return Success;
}
-void
+int
XSetLineAttributes(display, gc, line_width, line_style, cap_style,
join_style)
Display *display;
@@ -377,9 +388,10 @@ XSetLineAttributes(display, gc, line_width, line_style, cap_style,
gc->line_style = line_style;
gc->cap_style = cap_style;
gc->join_style = join_style;
+ return Success;
}
-void
+int
XSetClipOrigin(display, gc, clip_x_origin, clip_y_origin)
Display* display;
GC gc;
@@ -388,6 +400,7 @@ XSetClipOrigin(display, gc, clip_x_origin, clip_y_origin)
{
gc->clip_x_origin = clip_x_origin;
gc->clip_y_origin = clip_y_origin;
+ return Success;
}
/*
@@ -430,7 +443,7 @@ TkSetRegion(display, gc, r)
}
}
-void
+int
XSetClipMask(display, gc, pixmap)
Display* display;
GC gc;
@@ -444,6 +457,7 @@ XSetClipMask(display, gc, pixmap)
clip_mask->type = TKP_CLIP_PIXMAP;
clip_mask->value.pixmap = pixmap;
}
+ return Success;
}
/*