X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/197380a09fb9b151f227edee850e251f28053309..5d3056f180e54cca794622285281491bd1af0e89:/src/gtk/print.cpp diff --git a/src/gtk/print.cpp b/src/gtk/print.cpp index 563e214334..32b2c08b1e 100644 --- a/src/gtk/print.cpp +++ b/src/gtk/print.cpp @@ -3,7 +3,7 @@ // Author: Anthony Bretaudeau // Purpose: GTK printing support // Created: 2007-08-25 -// RCS-ID: $Id: print.cpp,v 1 2007-08-25 05:44:44 PC Exp $ +// RCS-ID: $Id$ // Copyright: (c) 2007 wxWidgets development team // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -211,25 +211,6 @@ extern "C" printout->OnEndPrinting(); } - - static gboolean - gtk_preview_print_callback(GtkPrintOperation * WXUNUSED(operation), - GtkPrintOperationPreview * WXUNUSED(preview), - GtkPrintContext *context, - GtkWindow *parent, - gpointer user_data) - { - wxPrintout *printout = (wxPrintout *) user_data; - - printout->SetIsPreview(true); - - /* We create a Cairo context with 72dpi resolution. This resolution is - * only used for positioning. */ - cairo_t *cairo = gdk_cairo_create(GTK_WIDGET(parent)->window); - gtk_print_context_set_cairo_context(context, cairo, 72, 72); - - return false; - } } //---------------------------------------------------------------------------- @@ -855,8 +836,6 @@ bool wxGtkPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) native->SetPrintJob( printOp ); - printout->SetIsPreview(false); - wxPrinterToGtkData dataToSend; dataToSend.printer = this; dataToSend.printout = printout; @@ -865,7 +844,6 @@ bool wxGtkPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) g_signal_connect (printOp, "begin-print", G_CALLBACK (gtk_begin_print_callback), &dataToSend); g_signal_connect (printOp, "draw-page", G_CALLBACK (gtk_draw_page_print_callback), &dataToSend); g_signal_connect (printOp, "end-print", G_CALLBACK (gtk_end_print_callback), printout); - g_signal_connect (printOp, "preview", G_CALLBACK (gtk_preview_print_callback), printout); // This is used to setup the DC and // show the dialog if desired @@ -1427,8 +1405,8 @@ void wxGtkPrinterDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, w cairo_stroke ( m_cairo); } -void wxGtkPrinterDCImpl::DoDrawPolygon(int n, wxPoint points[], - wxCoord xoffset, wxCoord yoffset, +void wxGtkPrinterDCImpl::DoDrawPolygon(int n, wxPoint points[], + wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle) { if (n==0) return; @@ -1464,7 +1442,7 @@ void wxGtkPrinterDCImpl::DoDrawPolygon(int n, wxPoint points[], } void wxGtkPrinterDCImpl::DoDrawPolyPolygon(int n, int count[], wxPoint points[], - wxCoord xoffset, wxCoord yoffset, + wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle) { wxDCImpl::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );