Index: cw_ops.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/miext/cw/cw_ops.c,v
retrieving revision 1.5
diff -u -r1.5 cw_ops.c
--- cw_ops.c	18 Aug 2004 21:11:17 -0000	1.5
+++ cw_ops.c	21 Aug 2004 04:48:43 -0000
@@ -37,10 +37,12 @@
 	&src_off_y)
 
 #define PROLOGUE(pGC) do { \
+    pGC->funcs = pGCPrivate->wrapFuncs;\
     pGC->ops = pGCPrivate->wrapOps;\
 } while (0)
 
 #define EPILOGUE(pGC) do { \
+    pGCPrivate->wrapFuncs = (pGC)->funcs; \
     pGCPrivate->wrapOps = (pGC)->ops; \
     (pGC)->ops = &cwGCOps; \
 } while (0)