Changes related to OpenGL context handling (only one context per display) and patches to avoid using widget structure in image cache */

1 files changed, 4 insertions, 4 deletions

diff --git a/generic/Curve.c b/generic/Curve.c
index 7798add..b896215 100644
--- a/generic/Curve.c
+++ b/generic/Curve.c
@@ -1211,14 +1211,14 @@ Draw(ZnItem	item)
     if (cv->tile != ZnUnspecifiedImage) {
       if (!ZnImageIsBitmap(cv->tile)) { /* Fill tiled */
 	values.fill_style = FillTiled;
-	values.tile = ZnImagePixmap(cv->tile);
+	values.tile = ZnImagePixmap(cv->tile, wi->win);
 	values.ts_x_origin = ZnNearestInt(item->item_bounding_box.orig.x);
 	values.ts_y_origin = ZnNearestInt(item->item_bounding_box.orig.y);
 	gc_mask |= GCTileStipXOrigin|GCTileStipYOrigin|GCTile;
       }
       else { /* Fill stippled */
 	values.fill_style = FillStippled;
-	values.stipple = ZnImagePixmap(cv->tile);
+	values.stipple = ZnImagePixmap(cv->tile, wi->win);
 	values.ts_x_origin = ZnNearestInt(item->item_bounding_box.orig.x);
 	values.ts_y_origin = ZnNearestInt(item->item_bounding_box.orig.y);
 	gc_mask |= GCTileStipXOrigin|GCTileStipYOrigin|GCStipple|GCForeground;
@@ -1298,7 +1298,7 @@ Draw(ZnItem	item)
       }
       else {
 	values.fill_style = FillStippled;
-	values.stipple = ZnImagePixmap(cv->line_pattern);
+	values.stipple = ZnImagePixmap(cv->line_pattern, wi->win);
 	XChangeGC(wi->dpy, wi->gc,
 		  GCFillStyle|GCStipple|GCLineWidth|GCJoinStyle|GCCapStyle|GCForeground,
 		  &values);
@@ -1350,7 +1350,7 @@ Draw(ZnItem	item)
     h_width = (width+1)/2;
     h_height = (height+1)/2;
     values.fill_style = FillStippled;
-    values.stipple = ZnImagePixmap(cv->marker);
+    values.stipple = ZnImagePixmap(cv->marker, wi->win);
     values.foreground = ZnGetGradientPixel(cv->marker_color, 0.0);
     XChangeGC(wi->dpy, wi->gc, GCFillStyle|GCStipple|GCForeground, &values);
     for (j = 0; j < cv->outlines.num_contours; j++) {