From 348a70188ac547fdbbf9f2663641e7cf90098487 Mon Sep 17 00:00:00 2001 From: infirit Date: Wed, 22 Jul 2015 15:39:28 +0200 Subject: coco: Drop GdkPixmap usage for cairo in Gtk2 --- src/themes/coco/coco-theme.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/src/themes/coco/coco-theme.c b/src/themes/coco/coco-theme.c index 72f0d31..d31de8b 100644 --- a/src/themes/coco/coco-theme.c +++ b/src/themes/coco/coco-theme.c @@ -175,7 +175,7 @@ paint_window(GtkWidget *widget, cairo_t *context; GtkAllocation allocation; #if !GTK_CHECK_VERSION (3, 0, 0) - cairo_t *cr; + cairo_t *cr = gdk_cairo_create (event->window); #endif if (windata->width == 0) { @@ -186,7 +186,6 @@ paint_window(GtkWidget *widget, if (!(windata->enable_transparency)) { -#if GTK_CHECK_VERSION (3, 0, 0) surface = cairo_surface_create_similar (cairo_get_target (cr), CAIRO_CONTENT_COLOR_ALPHA, windata->width, @@ -206,27 +205,6 @@ paint_window(GtkWidget *widget, cairo_restore (cr); cairo_surface_destroy(surface); -#else - GdkPixmap *mask; - cairo_t *mask_cr; - mask = gdk_pixmap_new (NULL, windata->width, - windata->height, 1); - mask_cr = gdk_cairo_create ((GdkDrawable *) mask); - cairo_set_operator (mask_cr, CAIRO_OPERATOR_CLEAR); - cairo_paint (mask_cr); - - cairo_set_operator (mask_cr, CAIRO_OPERATOR_OVER); - cairo_set_source_rgba (mask_cr, 1, 1, 1, 1); - nodoka_rounded_rectangle (mask_cr, 0, 0, - windata->width, - windata->height, - 6); - cairo_fill (mask_cr); - gdk_window_shape_combine_mask (windata->win->window, - (GdkBitmap *) mask, 0,0); - gdk_pixmap_unref (mask); - cairo_destroy (mask_cr); -#endif } context = gdk_cairo_create(gtk_widget_get_window(widget)); -- cgit v1.2.1