2011-10-07 [colin] 3.7.10cvs21

[claws.git] / src / printing.c

diff --git a/src/printing.c b/src/printing.c
index e7b93ef56cd7320803c404d1a0cf64638e696dc3..7df939c543a1007acaf438fb7c460fb890f1007c 100644 (file)
--- a/src/printing.c
+++ b/src/printing.c
@@ -91,7 +91,11 @@ static gboolean cb_preview_close(GtkWidget*, GdkEventAny*, gpointer);
 static void     cb_preview_size_allocate(GtkWidget*, GtkAllocation*);
 static void     cb_preview_ready(GtkPrintOperationPreview*,
                                 GtkPrintContext*, gpointer);
+#if !GTK_CHECK_VERSION(3, 0, 0)
 static gboolean cb_preview_expose(GtkWidget*, GdkEventExpose*, gpointer);
+#else
+static gboolean cb_preview_expose(GtkWidget*, cairo_t*, gpointer);
+#endif
 static void     cb_preview_got_page_size(GtkPrintOperationPreview*,
                                         GtkPrintContext*,
                                         GtkPageSetup*, gpointer);
@@ -620,9 +624,15 @@ static void cb_preview_ready(GtkPrintOperationPreview *preview,
        preview_data->current_page = preview_data->pages_to_print;
        preview_data->context = context;
 
+#if !GTK_CHECK_VERSION(3, 0, 0)
        g_signal_connect(preview_data->area, "expose_event",
                         G_CALLBACK(cb_preview_expose),
                         preview_data);
+#else
+       g_signal_connect(preview_data->area, "draw",
+                        G_CALLBACK(cb_preview_expose),
+                        preview_data);
+#endif
 
        gtk_widget_queue_draw(preview_data->area);
 }
@@ -655,19 +665,32 @@ static void cb_preview_got_page_size(GtkPrintOperationPreview *preview,
                                    paper_width, paper_height);
 }
 
+#if !GTK_CHECK_VERSION(3, 0, 0)
 static gboolean cb_preview_expose(GtkWidget *widget, GdkEventExpose *event,
                                  gpointer data)
+#else
+static gboolean cb_preview_expose(GtkWidget *widget, cairo_t *event,
+                                 gpointer data)
+#endif
 {
        PreviewData *preview_data = data;
+#if !GTK_CHECK_VERSION(3, 0, 0)
        cairo_t *cr;
+#endif
 
        debug_print("preview_expose (current %p)\n", preview_data->current_page);
 
+#if !GTK_CHECK_VERSION(3, 0, 0)
        cr = gdk_cairo_create(gtk_widget_get_window(preview_data->area));
+#endif
 
        /* background */
        cairo_set_source_rgb(cr, 0.5, 0.5, 0.5);
+#if !GTK_CHECK_VERSION(3, 0, 0)
        cairo_rectangle(cr, event->area.x, event->area.y, event->area.width, event->area.height);
+#else
+       cairo_rectangle(cr, 0, 0, event->area.width, event->area.height);
+#endif
        cairo_fill(cr);
 
        /* shadow */
@@ -685,7 +708,9 @@ static gboolean cb_preview_expose(GtkWidget *widget, GdkEventExpose *event,
        cairo_fill(cr);
 
        gtk_print_context_set_cairo_context(preview_data->context, cr, PREVIEW_SCALE, PREVIEW_SCALE);
+#if !GTK_CHECK_VERSION(3, 0, 0)
        cairo_destroy(cr);
+#endif
 
        if (preview_data->current_page) {
                preview_data->rendering = TRUE;