X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cf694d4eab7cf96423456a543bafb211b7ac779..e83c4d401206ff9d5568f03ade6d9713c57bdd51:/src/gtk/print.cpp diff --git a/src/gtk/print.cpp b/src/gtk/print.cpp index 02f8376d5d..6ead615168 100644 --- a/src/gtk/print.cpp +++ b/src/gtk/print.cpp @@ -1,9 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/print.cpp +// Name: src/gtk/print.cpp // 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 ///////////////////////////////////////////////////////////////////////////// @@ -31,13 +31,17 @@ #endif #include "wx/fontutil.h" -#include "wx/gtk/private.h" #include "wx/dynlib.h" #include "wx/paper.h" -#include "wx/rawbmp.h" #include + +#if GTK_CHECK_VERSION(2,14,0) +#include +#else #include +#endif + #if wxUSE_GRAPHICS_CONTEXT #include "wx/graphics.h" @@ -50,7 +54,9 @@ wxFORCE_LINK_THIS_MODULE(gtk_print) #include "wx/gtk/gnome/gprint.h" #endif -// Usefull to convert angles from/to Rad to/from Deg. +#include "wx/gtk/private/object.h" + +// Useful to convert angles from/to Rad to/from Deg. static const double RAD2DEG = 180.0 / M_PI; static const double DEG2RAD = M_PI / 180.0; @@ -68,7 +74,7 @@ public: { #if wxUSE_LIBGNOMEPRINT // This module must be initialized AFTER gnomeprint's one - AddDependency(CLASSINFO(wxGnomePrintModule)); + AddDependency(wxCLASSINFO(wxGnomePrintModule)); #endif } bool OnInit(); @@ -80,8 +86,12 @@ private: bool wxGtkPrintModule::OnInit() { +#ifndef __WXGTK3__ if (gtk_check_version(2,10,0) == NULL) +#endif + { wxPrintFactory::SetPrintFactory( new wxGtkPrintFactory ); + } return true; } @@ -213,25 +223,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; - } } //---------------------------------------------------------------------------- @@ -243,11 +234,14 @@ IMPLEMENT_CLASS(wxGtkPrintNativeData, wxPrintNativeDataBase) wxGtkPrintNativeData::wxGtkPrintNativeData() { m_config = gtk_print_settings_new(); + m_job = gtk_print_operation_new(); + m_context = NULL; } wxGtkPrintNativeData::~wxGtkPrintNativeData() { - g_object_unref (m_config); + g_object_unref(m_job); + g_object_unref(m_config); } // Convert datas stored in m_config to a wxPrintData. @@ -407,6 +401,9 @@ bool wxGtkPrintNativeData::TransferTo( wxPrintData &data ) data.SetPaperId( wxPAPER_FANFOLD_LGL_GERMAN); else data.SetPaperId(wxPAPER_NONE); + + data.SetPrinterName(gtk_print_settings_get_printer(m_config)); + return true; } @@ -555,6 +552,8 @@ bool wxGtkPrintNativeData::TransferFrom( const wxPrintData &data ) default: break; } + gtk_print_settings_set_printer(m_config, data.GetPrinterName().utf8_str()); + return true; } @@ -624,8 +623,6 @@ wxGtkPrintDialog::~wxGtkPrintDialog() // This is called even if we actually don't want the dialog to appear. int wxGtkPrintDialog::ShowModal() { - GtkPrintOperationResult response; - // We need to restore the settings given in the constructor. wxPrintData data = m_printDialogData.GetPrintData(); wxGtkPrintNativeData *native = @@ -650,17 +647,26 @@ int wxGtkPrintDialog::ShowModal() gtk_print_settings_set_page_ranges (settings, range, 1); } + GtkPrintOperation * const printOp = native->GetPrintJob(); + // If the settings are OK, we restore it. if (settings != NULL) - gtk_print_operation_set_print_settings (native->GetPrintJob(), settings); - gtk_print_operation_set_default_page_setup (native->GetPrintJob(), native->GetPageSetupFromSettings(settings)); + gtk_print_operation_set_print_settings (printOp, settings); + gtk_print_operation_set_default_page_setup (printOp, native->GetPageSetupFromSettings(settings)); // Show the dialog if needed. GError* gError = NULL; - if (GetShowDialog()) - response = gtk_print_operation_run (native->GetPrintJob(), GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, GTK_WINDOW(gtk_widget_get_toplevel(m_parent->m_widget) ), &gError); - else - response = gtk_print_operation_run (native->GetPrintJob(), GTK_PRINT_OPERATION_ACTION_PRINT, GTK_WINDOW(gtk_widget_get_toplevel(m_parent->m_widget)), &gError); + GtkPrintOperationResult response = gtk_print_operation_run + ( + printOp, + GetShowDialog() + ? GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG + : GTK_PRINT_OPERATION_ACTION_PRINT, + m_parent + ? GTK_WINDOW(gtk_widget_get_toplevel(m_parent->m_widget)) + : NULL, + &gError + ); // Does everything went well? if (response == GTK_PRINT_OPERATION_RESULT_CANCEL) @@ -669,16 +675,22 @@ int wxGtkPrintDialog::ShowModal() } else if (response == GTK_PRINT_OPERATION_RESULT_ERROR) { + wxLogError(_("Error while printing: ") + wxString(gError ? gError->message : "???")); g_error_free (gError); - wxLogError(_("Error while printing: ") + wxString::Format(_("%s"), gError->message)); return wxID_NO; // We use wxID_NO because there is no wxID_ERROR available } // Now get the settings and save it. - GtkPrintSettings* newSettings = gtk_print_operation_get_print_settings (native->GetPrintJob()); + GtkPrintSettings* newSettings = gtk_print_operation_get_print_settings(printOp); native->SetPrintConfig(newSettings); data.ConvertFromNative(); + // Set PrintDialogData variables + m_printDialogData.SetPrintData(data); + m_printDialogData.SetCollate(data.GetCollate()); + m_printDialogData.SetNoCopies(data.GetNoCopies()); + m_printDialogData.SetPrintToFile(data.GetPrinterName() == "Print to File"); + // Same problem as a few lines before. switch (gtk_print_settings_get_print_pages(newSettings)) { @@ -756,43 +768,82 @@ int wxGtkPageSetupDialog::ShowModal() } } - // Now show the dialog. - GtkPageSetup* newPageSetup = gtk_print_run_page_setup_dialog (GTK_WINDOW(m_parent->m_widget), - oldPageSetup, - nativeData); - - int ret; - if (newPageSetup != oldPageSetup) - { - native->SetPageSetupToSettings(nativeData, newPageSetup); - m_pageDialogData.GetPrintData().ConvertFromNative(); - // Store custom paper format if any. - if (m_pageDialogData.GetPrintData().GetPaperId() == wxPAPER_NONE) - { - gdouble ml,mr,mt,mb,pw,ph; - ml = gtk_page_setup_get_left_margin (newPageSetup, GTK_UNIT_MM); - mr = gtk_page_setup_get_right_margin (newPageSetup, GTK_UNIT_MM); - mt = gtk_page_setup_get_top_margin (newPageSetup, GTK_UNIT_MM); - mb = gtk_page_setup_get_bottom_margin (newPageSetup, GTK_UNIT_MM); + // Set selected printer + gtk_print_settings_set(nativeData, "format-for-printer", + gtk_print_settings_get_printer(nativeData)); - pw = gtk_page_setup_get_paper_width (newPageSetup, GTK_UNIT_MM); - ph = gtk_page_setup_get_paper_height (newPageSetup, GTK_UNIT_MM); + // Create custom dialog + wxString title(GetTitle()); + if ( title.empty() ) + title = _("Page Setup"); + GtkWidget * + dlg = gtk_page_setup_unix_dialog_new(title.utf8_str(), + m_parent + ? GTK_WINDOW(m_parent->m_widget) + : NULL); - m_pageDialogData.SetMarginTopLeft( wxPoint( (int)(ml+0.5), (int)(mt+0.5)) ); - m_pageDialogData.SetMarginBottomRight( wxPoint( (int)(mr+0.5), (int)(mb+0.5)) ); + gtk_page_setup_unix_dialog_set_print_settings( + GTK_PAGE_SETUP_UNIX_DIALOG(dlg), nativeData); + gtk_page_setup_unix_dialog_set_page_setup( + GTK_PAGE_SETUP_UNIX_DIALOG(dlg), oldPageSetup); - m_pageDialogData.SetPaperSize( wxSize( (int)(pw+0.5), (int)(ph+0.5) ) ); - } + int result = gtk_dialog_run(GTK_DIALOG(dlg)); + gtk_widget_hide(dlg); - ret = wxID_OK; - } - else + switch ( result ) { - ret = wxID_CANCEL; + case GTK_RESPONSE_OK: + case GTK_RESPONSE_APPLY: + { + // Store Selected Printer Name + gtk_print_settings_set_printer + ( + nativeData, + gtk_print_settings_get(nativeData, "format-for-printer") + ); + + wxGtkObject + newPageSetup(gtk_page_setup_unix_dialog_get_page_setup( + GTK_PAGE_SETUP_UNIX_DIALOG(dlg))); + native->SetPageSetupToSettings(nativeData, newPageSetup); + + m_pageDialogData.GetPrintData().ConvertFromNative(); + + // Store custom paper format if any. + if ( m_pageDialogData.GetPrintData().GetPaperId() == wxPAPER_NONE ) + { + gdouble ml,mr,mt,mb,pw,ph; + ml = gtk_page_setup_get_left_margin (newPageSetup, GTK_UNIT_MM); + mr = gtk_page_setup_get_right_margin (newPageSetup, GTK_UNIT_MM); + mt = gtk_page_setup_get_top_margin (newPageSetup, GTK_UNIT_MM); + mb = gtk_page_setup_get_bottom_margin (newPageSetup, GTK_UNIT_MM); + + pw = gtk_page_setup_get_paper_width (newPageSetup, GTK_UNIT_MM); + ph = gtk_page_setup_get_paper_height (newPageSetup, GTK_UNIT_MM); + + m_pageDialogData.SetMarginTopLeft(wxPoint((int)(ml+0.5), + (int)(mt+0.5))); + m_pageDialogData.SetMarginBottomRight(wxPoint((int)(mr+0.5), + (int)(mb+0.5))); + + m_pageDialogData.SetPaperSize(wxSize((int)(pw+0.5), + (int)(ph+0.5))); + } + + result = wxID_OK; + } + break; + + default: + case GTK_RESPONSE_CANCEL: + result = wxID_CANCEL; + break; } - return ret; + gtk_widget_destroy(dlg); + + return result; } //---------------------------------------------------------------------------- @@ -853,11 +904,7 @@ bool wxGtkPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) wxPrintData printdata = GetPrintDialogData().GetPrintData(); wxGtkPrintNativeData *native = (wxGtkPrintNativeData*) printdata.GetNativeData(); - GtkPrintOperation *printOp = gtk_print_operation_new (); - - native->SetPrintJob( printOp ); - - printout->SetIsPreview(false); + GtkPrintOperation * const printOp = native->GetPrintJob(); wxPrinterToGtkData dataToSend; dataToSend.printer = this; @@ -867,7 +914,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 @@ -887,8 +933,6 @@ bool wxGtkPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) wxFAIL_MSG(_("The print dialog returned an error.")); } - g_object_unref (printOp); - return (sm_lastError == wxPRINTER_NO_ERROR); } @@ -1074,7 +1118,7 @@ wxDC* wxGtkPrinter::PrintDialog( wxWindow *parent ) } m_printDialogData = dialog.GetPrintDialogData(); - + return new wxPrinterDC( m_printDialogData.GetPrintData() ); } @@ -1132,7 +1176,7 @@ wxGtkPrinterDCImpl::wxGtkPrinterDCImpl(wxPrinterDC *owner, const wxPrintData& da #if wxCAIRO_SCALE m_PS2DEV = 1.0; m_DEV2PS = 1.0; - + cairo_scale( m_cairo, 72.0 / (double)m_resolution, 72.0 / (double)m_resolution ); #else m_PS2DEV = (double)m_resolution / 72.0; @@ -1175,7 +1219,7 @@ void* wxGtkPrinterDCImpl::GetCairoContext() const bool wxGtkPrinterDCImpl::DoFloodFill(wxCoord WXUNUSED(x1), wxCoord WXUNUSED(y1), const wxColour& WXUNUSED(col), - int WXUNUSED(style)) + wxFloodFillStyle WXUNUSED(style)) { // We can't access the given coord as a Cairo context is scalable, ie a // coord doesn't mean anything in this context. @@ -1192,7 +1236,8 @@ void wxGtkPrinterDCImpl::DoGradientFillConcentric(const wxRect& rect, const wxCo wxCoord w = rect.width; wxCoord h = rect.height; - double radius = sqrt((w/2)*(w/2)+(h/2)*(h/2)); + const double r2 = (w/2)*(w/2)+(h/2)*(h/2); + double radius = sqrt(r2); unsigned char redI = initialColour.Red(); unsigned char blueI = initialColour.Blue(); @@ -1289,7 +1334,8 @@ bool wxGtkPrinterDCImpl::DoGetPixel(wxCoord WXUNUSED(x1), void wxGtkPrinterDCImpl::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) { - if (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return; + if ( m_pen.IsTransparent() ) + return; SetPen( m_pen ); cairo_move_to ( m_cairo, XLOG2DEV(x1), YLOG2DEV(y1) ); @@ -1397,7 +1443,8 @@ void wxGtkPrinterDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord void wxGtkPrinterDCImpl::DoDrawPoint(wxCoord x, wxCoord y) { - if (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return; + if ( m_pen.IsTransparent() ) + return; SetPen( m_pen ); @@ -1410,7 +1457,9 @@ void wxGtkPrinterDCImpl::DoDrawPoint(wxCoord x, wxCoord y) void wxGtkPrinterDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) { - if (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return; + if ( m_pen.IsTransparent() ) + return; + if (n <= 0) return; @@ -1428,7 +1477,9 @@ 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, int fillStyle) +void wxGtkPrinterDCImpl::DoDrawPolygon(int n, wxPoint points[], + wxCoord xoffset, wxCoord yoffset, + wxPolygonFillMode fillStyle) { if (n==0) return; @@ -1462,7 +1513,9 @@ void wxGtkPrinterDCImpl::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, cairo_restore(m_cairo); } -void wxGtkPrinterDCImpl::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle) +void wxGtkPrinterDCImpl::DoDrawPolyPolygon(int n, int count[], wxPoint points[], + wxCoord xoffset, wxCoord yoffset, + wxPolygonFillMode fillStyle) { wxDCImpl::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle ); } @@ -1621,7 +1674,7 @@ void wxGtkPrinterDCImpl::DoDrawSpline(const wxPointList *points) bool wxGtkPrinterDCImpl::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, - int rop, bool useMask, + wxRasterOperationMode rop, bool useMask, wxCoord WXUNUSED_UNLESS_DEBUG(xsrcMask), wxCoord WXUNUSED_UNLESS_DEBUG(ysrcMask)) { @@ -1652,84 +1705,15 @@ void wxGtkPrinterDCImpl::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoor { wxCHECK_RET( bitmap.IsOk(), wxT("Invalid bitmap in wxGtkPrinterDCImpl::DoDrawBitmap")); - cairo_surface_t* surface; x = wxCoord(XLOG2DEV(x)); y = wxCoord(YLOG2DEV(y)); int bw = bitmap.GetWidth(); int bh = bitmap.GetHeight(); +#ifndef __WXGTK3__ wxBitmap bmpSource = bitmap; // we need a non-const instance. - unsigned char* buffer = new unsigned char[bw*bh*4]; - wxUint32* data = (wxUint32*)buffer; - - wxMask *mask = NULL; - if (useMask) mask = bmpSource.GetMask(); - - // Create a surface object and copy the bitmap pixel data to it. If the image has alpha (or a mask represented as alpha) - // then we'll use a different format and iterator than if it doesn't. - if (bmpSource.HasAlpha() || mask) - { - surface = cairo_image_surface_create_for_data( - buffer, CAIRO_FORMAT_ARGB32, bw, bh, bw*4); - wxAlphaPixelData pixData(bmpSource, wxPoint(0,0), wxSize(bw, bh)); - wxCHECK_RET( pixData, wxT("Failed to gain raw access to bitmap data.")); - - wxAlphaPixelData::Iterator p(pixData); - int y, x; - for (y=0; ystart_index = 0; - a->end_index = datalen; - pango_attr_list_insert(attrs, a); - pango_layout_set_attributes(m_layout, attrs); - pango_attr_list_unref(attrs); - } + pango_layout_set_text(m_layout, data, data.length()); - if (m_textForegroundColour.Ok()) + const bool setAttrs = m_font.GTKSetPangoAttrs(m_layout); + if (m_textForegroundColour.IsOk()) { unsigned char red = m_textForegroundColour.Red(); unsigned char blue = m_textForegroundColour.Blue(); @@ -1851,7 +1819,7 @@ void wxGtkPrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wxCo cairo_restore( m_cairo ); - if (underlined) + if (setAttrs) { // Undo underline attributes setting pango_layout_set_attributes(m_layout, NULL); @@ -1865,7 +1833,7 @@ void wxGtkPrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wxCo void wxGtkPrinterDCImpl::Clear() { // Clear does nothing for printing, but keep the code -// for later reuse +// for later reuse /* cairo_save(m_cairo); cairo_set_operator (m_cairo, CAIRO_OPERATOR_SOURCE); @@ -1879,7 +1847,7 @@ void wxGtkPrinterDCImpl::SetFont( const wxFont& font ) { m_font = font; - if (m_font.Ok()) + if (m_font.IsOk()) { if (m_fontdesc) pango_font_description_free( m_fontdesc ); @@ -1896,12 +1864,12 @@ void wxGtkPrinterDCImpl::SetFont( const wxFont& font ) void wxGtkPrinterDCImpl::SetPen( const wxPen& pen ) { - if (!pen.Ok()) return; + if (!pen.IsOk()) return; m_pen = pen; double width; - + if (m_pen.GetWidth() <= 0) width = 0.1; else @@ -1975,7 +1943,7 @@ void wxGtkPrinterDCImpl::SetPen( const wxPen& pen ) void wxGtkPrinterDCImpl::SetBrush( const wxBrush& brush ) { - if (!brush.Ok()) return; + if (!brush.IsOk()) return; m_brush = brush; @@ -2066,7 +2034,7 @@ void wxGtkPrinterDCImpl::SetBrush( const wxBrush& brush ) } } -void wxGtkPrinterDCImpl::SetLogicalFunction( int function ) +void wxGtkPrinterDCImpl::SetLogicalFunction( wxRasterOperationMode function ) { if (function == wxCLEAR) cairo_set_operator (m_cairo, CAIRO_OPERATOR_CLEAR); @@ -2177,15 +2145,15 @@ void wxGtkPrinterDCImpl::DoGetTextExtent(const wxString& string, wxCoord *width, cairo_scale(m_cairo, m_scaleX, m_scaleY); // Set layout's text - const wxUTF8Buf dataUTF8 = string.utf8_str(); + const wxScopedCharBuffer dataUTF8 = string.utf8_str(); gint oldSize=0; if ( theFont ) { // scale the font and apply it PangoFontDescription *desc = theFont->GetNativeFontInfo()->description; - float size = pango_font_description_get_size(desc); - size = size * GetFontPointSizeAdjustment(72.0); + oldSize = pango_font_description_get_size(desc); + const float size = oldSize * GetFontPointSizeAdjustment(72.0); pango_font_description_set_size(desc, (gint)size); pango_layout_set_font_description(m_layout, desc); @@ -2248,9 +2216,9 @@ void wxGtkPrinterDCImpl::SetPrintData(const wxPrintData& data) m_printData = data; } -// overriden for wxPrinterDC Impl +// overridden for wxPrinterDC Impl -wxRect wxGtkPrinterDCImpl::GetPaperRect() +wxRect wxGtkPrinterDCImpl::GetPaperRect() const { // Does GtkPrint support printer margins? int w = 0; @@ -2259,7 +2227,7 @@ wxRect wxGtkPrinterDCImpl::GetPaperRect() return wxRect( 0,0,w,h ); } -int wxGtkPrinterDCImpl::GetResolution() +int wxGtkPrinterDCImpl::GetResolution() const { return m_resolution; } @@ -2349,14 +2317,20 @@ void wxGtkPrintPreview::DetermineScaling() if (paper) { - m_previewPrintout->SetPPIScreen(wxGetDisplayPPI()); - m_previewPrintout->SetPPIPrinter( m_resolution, m_resolution ); + const wxSize screenPPI = wxGetDisplayPPI(); + int logPPIScreenX = screenPPI.GetWidth(); + int logPPIScreenY = screenPPI.GetHeight(); + int logPPIPrinterX = m_resolution; + int logPPIPrinterY = m_resolution; + + m_previewPrintout->SetPPIScreen( logPPIScreenX, logPPIScreenY ); + m_previewPrintout->SetPPIPrinter( logPPIPrinterX, logPPIPrinterY ); // Get width and height in points (1/72th of an inch) wxSize sizeDevUnits(paper->GetSizeDeviceUnits()); sizeDevUnits.x = wxRound((double)sizeDevUnits.x * (double)m_resolution / 72.0); sizeDevUnits.y = wxRound((double)sizeDevUnits.y * (double)m_resolution / 72.0); - + wxSize sizeTenthsMM(paper->GetSize()); wxSize sizeMM(sizeTenthsMM.x / 10, sizeTenthsMM.y / 10); @@ -2377,8 +2351,8 @@ void wxGtkPrintPreview::DetermineScaling() m_previewPrintout->SetPaperRectPixels(wxRect(0, 0, m_pageWidth, m_pageHeight)); // At 100%, the page should look about page-size on the screen. - m_previewScaleX = 0.8 * 72.0 / (double)m_resolution; - m_previewScaleY = m_previewScaleX; + m_previewScaleX = float(logPPIScreenX) / logPPIPrinterX; + m_previewScaleY = float(logPPIScreenY) / logPPIPrinterY; } }