[gedit] Use the new "draw" signal to draw to preview

[Paolo Borelli <pborelli src gnome org>]

commit 9453de86abac1cf1bf4702091944301ac800bdef
Author: Paolo Borelli <pborelli gnome org>
Date:   Wed Oct 6 13:47:43 2010 +0200

    Use the new "draw" signal to draw to preview

 gedit/gedit-print-preview.c |   58 +++++++++++++++++++++---------------------
 1 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/gedit/gedit-print-preview.c b/gedit/gedit-print-preview.c
index 3a8279e..0dad853 100644
--- a/gedit/gedit-print-preview.c
+++ b/gedit/gedit-print-preview.c
@@ -1110,53 +1110,53 @@ draw_page (cairo_t           *cr,
 }
 
 static gboolean
-preview_expose (GtkWidget         *widget,
-		GdkEventExpose    *event,
-		GeditPrintPreview *preview)
+preview_draw (GtkWidget         *widget,
+	      cairo_t           *cr,
+	      GeditPrintPreview *preview)
 {
 	GeditPrintPreviewPrivate *priv;
 	GdkWindow *bin_window;
-	cairo_t *cr;
 	gint pg;
 	gint i, j;
 
 	priv = preview->priv;
 
 	bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (priv->layout));
-	if (event->window != bin_window)
-		return FALSE;
 
-	cr = gdk_cairo_create (bin_window);
+	if (gtk_cairo_should_draw_window (cr, bin_window))
+	{
+		cairo_save (cr);
 
-	gdk_cairo_rectangle (cr, &event->area);
-	cairo_clip (cr);
+		gtk_cairo_transform_to_window (cr, widget, bin_window);
 
-	/* get the first page to display */
-	pg = get_first_page_displayed (preview);
+		/* get the first page to display */
+		pg = get_first_page_displayed (preview);
 
-	for (i = 0; i < priv->cols; ++i)
-	{
-		for (j = 0; j < priv->rows; ++j)
+		for (i = 0; i < priv->cols; ++i)
 		{
-			if (!gtk_print_operation_preview_is_selected (priv->gtk_preview,
-								      pg))
+			for (j = 0; j < priv->rows; ++j)
 			{
-				continue;
-			}
+				if (!gtk_print_operation_preview_is_selected (priv->gtk_preview,
+									      pg))
+				{
+					continue;
+				}
 
-			if (pg == priv->n_pages)
-				break;
+				if (pg == priv->n_pages)
+					break;
 
-			draw_page (cr,
-				   j * priv->tile_w,
-				   i * priv->tile_h,
-				   pg,
-				   preview);
+				draw_page (cr,
+					   j * priv->tile_w,
+					   i * priv->tile_h,
+					   pg,
+					   preview);
 
-			++pg;
+				++pg;
+			}
 		}
+
+		cairo_restore (cr);
 	}
-	cairo_destroy (cr);
 
 	return TRUE;
 }
@@ -1212,8 +1212,8 @@ preview_ready (GtkPrintOperationPreview *gtk_preview,
 
 	/* let the default gtklayout handler clear the background */
 	g_signal_connect_after (preview->priv->layout,
-				"expose-event",
-				G_CALLBACK (preview_expose),
+				"draw",
+				G_CALLBACK (preview_draw),
 				preview);
 
 	gtk_widget_queue_draw (preview->priv->layout);