Mercurial > dwindows

changeset 1180:4c20df806370

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes to that last commit... bitmap not mask and forgot to return.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Mon, 19 Sep 2011 22:40:33 +0000
parents ebe0d27f6705
children 5d3c1b0686ce
files gtk/dw.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gtk/dw.c	Mon Sep 19 22:36:24 2011 +0000
+++ b/gtk/dw.c	Mon Sep 19 22:40:33 2011 +0000
@@ -8486,14 +8486,14 @@
 #endif
       if(srcp && srcp->image)
          cairo_set_source_surface (cr, srcp->image, xdest - xsrc, ydest - ysrc);
-      else if(srcp && srcp->pixmap && !srcp->mask)
+      else if(srcp && srcp->pixmap && !srcp->bitmap)
          gdk_cairo_set_source_pixmap (cr, srcp->pixmap, xdest - xsrc, ydest - ysrc);
-      else if(srcp && srcp->pixmap && srcp->mask)
+      else if(srcp && srcp->pixmap && srcp->bitmap)
       {
          cairo_pattern_t *mask_pattern;
          
          /* hack to get the mask pattern */
-         gdk_cairo_set_source_pixmap(cr, srcp->mask, xdest, ydest);
+         gdk_cairo_set_source_pixmap(cr, srcp->bitmap, xdest, ydest);
          mask_pattern = cairo_get_source(cr);
          cairo_pattern_reference(mask_pattern);
 
@@ -8503,6 +8503,7 @@
          cairo_mask(cr, mask_pattern);
          cairo_destroy(cr);
          DW_MUTEX_UNLOCK;
+         return;
       }
 
       cairo_rectangle(cr, xdest, ydest, width, height);