Enable graphics context by default

[wxWidgets.git] / src / gtk / print.cpp

diff --git a/src/gtk/print.cpp b/src/gtk/print.cpp
index cf5103035307e937022e5112da26a7cec0a03259..a1cd4c3043d578abf9a0f9f28bcfe2def6b8fdbb 100644 (file)
--- a/src/gtk/print.cpp
+++ b/src/gtk/print.cpp
@@ -22,6 +22,7 @@
 #ifndef WX_PRECOMP
 #include "wx/log.h"
 #include "wx/dcmemory.h"
 #ifndef WX_PRECOMP
 #include "wx/log.h"
 #include "wx/dcmemory.h"

+#include "wx/dcprint.h"

 #include "wx/icon.h"
 #include "wx/math.h"
 #include "wx/image.h"
 #include "wx/icon.h"
 #include "wx/math.h"
 #include "wx/image.h"


@@ -38,6 +39,10 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkpagesetupunixdialog.h>
 
 #include <gtk/gtk.h>
 #include <gtk/gtkpagesetupunixdialog.h>
 

+#if wxUSE_GRAPHICS_CONTEXT
+#include "wx/graphics.h"
+#endif
+

 #include "wx/link.h"
 wxFORCE_LINK_THIS_MODULE(gtk_print)
 
 #include "wx/link.h"
 wxFORCE_LINK_THIS_MODULE(gtk_print)
 


@@ -136,14 +141,16 @@ bool wxGtkPrintFactory::HasPrintSetupDialog()
     return false;
 }
 
     return false;
 }
 

-wxDialog *wxGtkPrintFactory::CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data )
+wxDialog *
+wxGtkPrintFactory::CreatePrintSetupDialog(wxWindow * WXUNUSED(parent),
+                                          wxPrintData * WXUNUSED(data))

 {
     return NULL;
 }
 
 {
     return NULL;
 }
 

-wxDC* wxGtkPrintFactory::CreatePrinterDC( const wxPrintData& data )
+wxDCImpl* wxGtkPrintFactory::CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data )

 {
 {

-    return new wxGtkPrintDC(data);
+    return new wxGtkPrinterDCImpl( owner, data );

 }
 
 bool wxGtkPrintFactory::HasOwnPrintToFile()
 }
 
 bool wxGtkPrintFactory::HasOwnPrintToFile()


@@ -183,7 +190,7 @@ wxPrintNativeDataBase *wxGtkPrintFactory::CreatePrintNativeData()
 // Callback functions for Gtk Printings.
 //----------------------------------------------------------------------------
 
 // Callback functions for Gtk Printings.
 //----------------------------------------------------------------------------
 

-// We use it to pass useful objets to gtk printing callback functions.
+// We use it to pass useful objects to GTK printing callback functions.

 struct wxPrinterToGtkData
 {
    wxGtkPrinter * printer;
 struct wxPrinterToGtkData
 {
    wxGtkPrinter * printer;


@@ -206,20 +213,28 @@ extern "C"
         data->printer->DrawPage(data->printout, operation, context, page_nr);
     }
 
         data->printer->DrawPage(data->printout, operation, context, page_nr);
     }
 

-    static void gtk_end_print_callback (GtkPrintOperation *operation, GtkPrintContext *context, gpointer user_data)
+    static void gtk_end_print_callback(GtkPrintOperation * WXUNUSED(operation),
+                                       GtkPrintContext * WXUNUSED(context),
+                                       gpointer user_data)

     {
         wxPrintout *printout = (wxPrintout *) user_data;
 
         printout->OnEndPrinting();
     }
 
     {
         wxPrintout *printout = (wxPrintout *) user_data;
 
         printout->OnEndPrinting();
     }
 

-    static gboolean gtk_preview_print_callback (GtkPrintOperation *operation, GtkPrintOperationPreview *preview, GtkPrintContext *context, GtkWindow *parent, gpointer user_data)
+    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);
 
     {
         wxPrintout *printout = (wxPrintout *) user_data;
 
         printout->SetIsPreview(true);
 

-        /* We create a cairo context with 72dpi resolution. This resolution is only used for positionning. */
+        /* 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);
 
         cairo_t *cairo = gdk_cairo_create(GTK_WIDGET(parent)->window);
         gtk_print_context_set_cairo_context(context, cairo, 72, 72);
 


@@ -250,15 +265,24 @@ bool wxGtkPrintNativeData::TransferTo( wxPrintData &data )
     if(!m_config)
         return false;
 
     if(!m_config)
         return false;
 

-    GtkPrintQuality quality = gtk_print_settings_get_quality(m_config);
-    if (quality == GTK_PRINT_QUALITY_HIGH)
-        data.SetQuality(wxPRINT_QUALITY_HIGH);
-    else if (quality == GTK_PRINT_QUALITY_LOW)
-        data.SetQuality(wxPRINT_QUALITY_LOW);
-    else if (quality == GTK_PRINT_QUALITY_DRAFT)
-        data.SetQuality(wxPRINT_QUALITY_DRAFT);
-    else
-        data.SetQuality(wxPRINT_QUALITY_MEDIUM);
+    int resolution = gtk_print_settings_get_resolution(m_config);
+    if ( resolution > 0 )
+    {
+        // if resolution is explicitly set, use it
+        data.SetQuality(resolution);
+    }
+    else // use more vague "quality"
+    {
+        GtkPrintQuality quality = gtk_print_settings_get_quality(m_config);
+        if (quality == GTK_PRINT_QUALITY_HIGH)
+            data.SetQuality(wxPRINT_QUALITY_HIGH);
+        else if (quality == GTK_PRINT_QUALITY_LOW)
+            data.SetQuality(wxPRINT_QUALITY_LOW);
+        else if (quality == GTK_PRINT_QUALITY_DRAFT)
+            data.SetQuality(wxPRINT_QUALITY_DRAFT);
+        else
+            data.SetQuality(wxPRINT_QUALITY_MEDIUM);
+    }

 
     data.SetNoCopies(gtk_print_settings_get_n_copies(m_config));
 
 
     data.SetNoCopies(gtk_print_settings_get_n_copies(m_config));
 


@@ -881,10 +905,16 @@ void wxGtkPrinter::BeginPrint(wxPrintout *printout, GtkPrintOperation *operation
     wxPrintData printdata = GetPrintDialogData().GetPrintData();
     wxGtkPrintNativeData *native = (wxGtkPrintNativeData*) printdata.GetNativeData();
 
     wxPrintData printdata = GetPrintDialogData().GetPrintData();
     wxGtkPrintNativeData *native = (wxGtkPrintNativeData*) printdata.GetNativeData();
 

+    // We need to update printdata with the new data from the dialog and we
+    // have to do this here because this method needs this new data and we
+    // cannot update it earlier
+    native->SetPrintConfig(gtk_print_operation_get_print_settings(operation));
+    printdata.ConvertFromNative();
+

     SetPrintContext(context);
     native->SetPrintContext( context );
 
     SetPrintContext(context);
     native->SetPrintContext( context );
 

-    wxGtkPrintDC *printDC = new wxGtkPrintDC( printdata );
+    wxPrinterDC *printDC = new wxPrinterDC( printdata );

     m_dc = printDC;
 
     if (!m_dc->IsOk())
     m_dc = printDC;
 
     if (!m_dc->IsOk())


@@ -892,7 +922,7 @@ void wxGtkPrinter::BeginPrint(wxPrintout *printout, GtkPrintOperation *operation
         if (sm_lastError != wxPRINTER_CANCELLED)
         {
             sm_lastError = wxPRINTER_ERROR;
         if (sm_lastError != wxPRINTER_CANCELLED)
         {
             sm_lastError = wxPRINTER_ERROR;

-            wxFAIL_MSG(_("The wxGtkPrintDC cannot be used."));
+            wxFAIL_MSG(_("The wxGtkPrinterDC cannot be used."));

         }
         return;
     }
         }
         return;
     }


@@ -968,7 +998,10 @@ void wxGtkPrinter::BeginPrint(wxPrintout *printout, GtkPrintOperation *operation
     gtk_print_operation_set_n_pages(operation, numPages);
 }
 
     gtk_print_operation_set_n_pages(operation, numPages);
 }
 

-void wxGtkPrinter::DrawPage(wxPrintout *printout, GtkPrintOperation *operation, GtkPrintContext *context, int page_nr)
+void wxGtkPrinter::DrawPage(wxPrintout *printout,
+                            GtkPrintOperation *operation,
+                            GtkPrintContext * WXUNUSED(context),
+                            int page_nr)

 {
     int fromPage, toPage, minPage, maxPage, startPage, endPage;
     printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
 {
     int fromPage, toPage, minPage, maxPage, startPage, endPage;
     printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);


@@ -1052,27 +1085,42 @@ wxDC* wxGtkPrinter::PrintDialog( wxWindow *parent )
     }
 
     m_printDialogData = dialog.GetPrintDialogData();
     }
 
     m_printDialogData = dialog.GetPrintDialogData();

-    return new wxGtkPrintDC( m_printDialogData.GetPrintData() );
+    
+    return new wxPrinterDC( m_printDialogData.GetPrintData() );

 }
 
 }
 

-bool wxGtkPrinter::Setup( wxWindow *parent )
+bool wxGtkPrinter::Setup( wxWindow * WXUNUSED(parent) )

 {
     // Obsolete, for backward compatibility.
     return false;
 }
 
 //-----------------------------------------------------------------------------
 {
     // Obsolete, for backward compatibility.
     return false;
 }
 
 //-----------------------------------------------------------------------------

-// wxGtkPrintDC
+// wxGtkPrinterDC

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

+#define wxCAIRO_SCALE 1
+
+#if wxCAIRO_SCALE
+
+#define XLOG2DEV(x)     LogicalToDeviceX(x)
+#define XLOG2DEVREL(x)  LogicalToDeviceXRel(x)
+#define YLOG2DEV(x)     LogicalToDeviceY(x)
+#define YLOG2DEVREL(x)  LogicalToDeviceYRel(x)
+
+#else
+

 #define XLOG2DEV(x)     ((double)(LogicalToDeviceX(x)) * m_DEV2PS)
 #define XLOG2DEVREL(x)  ((double)(LogicalToDeviceXRel(x)) * m_DEV2PS)
 #define YLOG2DEV(x)     ((double)(LogicalToDeviceY(x)) * m_DEV2PS)
 #define YLOG2DEVREL(x)  ((double)(LogicalToDeviceYRel(x)) * m_DEV2PS)
 
 #define XLOG2DEV(x)     ((double)(LogicalToDeviceX(x)) * m_DEV2PS)
 #define XLOG2DEVREL(x)  ((double)(LogicalToDeviceXRel(x)) * m_DEV2PS)
 #define YLOG2DEV(x)     ((double)(LogicalToDeviceY(x)) * m_DEV2PS)
 #define YLOG2DEVREL(x)  ((double)(LogicalToDeviceYRel(x)) * m_DEV2PS)
 

-IMPLEMENT_CLASS(wxGtkPrintDC, wxDC)
+#endif
+
+IMPLEMENT_ABSTRACT_CLASS(wxGtkPrinterDCImpl, wxDCImpl)

 
 

-wxGtkPrintDC::wxGtkPrintDC( const wxPrintData& data )
+wxGtkPrinterDCImpl::wxGtkPrinterDCImpl(wxPrinterDC *owner, const wxPrintData& data)
+                  : wxDCImpl( owner )

 {
     m_printData = data;
 
 {
     m_printData = data;
 


@@ -1086,15 +1134,22 @@ wxGtkPrintDC::wxGtkPrintDC( const wxPrintData& data )
     if (m_resolution < 0)
         m_resolution = (1 << (m_resolution+4)) *150;
 
     if (m_resolution < 0)
         m_resolution = (1 << (m_resolution+4)) *150;
 

-    m_PS2DEV = (double)m_resolution / 72.0;
-    m_DEV2PS = 72.0 / (double)m_resolution;
-

     m_context = gtk_print_context_create_pango_context( m_gpc );
     m_layout = gtk_print_context_create_pango_layout ( m_gpc );
     m_fontdesc = pango_font_description_from_string( "Sans 12" );
 
     m_cairo = gtk_print_context_get_cairo_context ( m_gpc );
 
     m_context = gtk_print_context_create_pango_context( m_gpc );
     m_layout = gtk_print_context_create_pango_layout ( m_gpc );
     m_fontdesc = pango_font_description_from_string( "Sans 12" );
 
     m_cairo = gtk_print_context_get_cairo_context ( m_gpc );
 

+#if wxCAIRO_SCALE
+    m_PS2DEV = 1.0;
+    m_DEV2PS = 1.0;
+    
+    gs_cairo->cairo_scale( m_cairo, 72.0 / (double)m_resolution, 72.0 / (double)m_resolution );
+#else
+    m_PS2DEV = (double)m_resolution / 72.0;
+    m_DEV2PS = 72.0 / (double)m_resolution;
+#endif
+

     m_currentRed = 0;
     m_currentBlue = 0;
     m_currentGreen = 0;
     m_currentRed = 0;
     m_currentBlue = 0;
     m_currentGreen = 0;


@@ -1102,7 +1157,7 @@ wxGtkPrintDC::wxGtkPrintDC( const wxPrintData& data )
     m_signX = 1;  // default x-axis left to right.
     m_signY = 1;  // default y-axis bottom up -> top down.
 
     m_signX = 1;  // default x-axis left to right.
     m_signY = 1;  // default y-axis bottom up -> top down.
 

-    // By default the origin of the cairo context is in the upper left
+    // By default the origin of the Cairo context is in the upper left

     // corner of the printable area. We need to translate it so that it
     // is in the upper left corner of the paper (without margins)
     GtkPageSetup *setup = gtk_print_context_get_page_setup( m_gpc );
     // corner of the printable area. We need to translate it so that it
     // is in the upper left corner of the paper (without margins)
     GtkPageSetup *setup = gtk_print_context_get_page_setup( m_gpc );


@@ -1112,25 +1167,34 @@ wxGtkPrintDC::wxGtkPrintDC( const wxPrintData& data )
     gs_cairo->cairo_translate(m_cairo, -ml, -mt);
 }
 
     gs_cairo->cairo_translate(m_cairo, -ml, -mt);
 }
 

-wxGtkPrintDC::~wxGtkPrintDC()
+wxGtkPrinterDCImpl::~wxGtkPrinterDCImpl()

 {
     g_object_unref(m_context);
     g_object_unref(m_layout);
 }
 
 {
     g_object_unref(m_context);
     g_object_unref(m_layout);
 }
 

-bool wxGtkPrintDC::IsOk() const
+bool wxGtkPrinterDCImpl::IsOk() const
+{
+    return m_gpc != NULL;
+}
+
+void* wxGtkPrinterDCImpl::GetCairoContext() const

 {
 {

-    return (m_gpc != NULL);
+    return (void*) cairo_reference( m_cairo );

 }
 
 }
 

-bool wxGtkPrintDC::DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style )
+bool wxGtkPrinterDCImpl::DoFloodFill(wxCoord WXUNUSED(x1),
+                               wxCoord WXUNUSED(y1),
+                               const wxColour& WXUNUSED(col),
+                               int 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.
+    // We can't access the given coord as a Cairo context is scalable, ie a
+    // coord doesn't mean anything in this context.

     wxFAIL_MSG(_("not implemented"));
     return false;
 }
 
     wxFAIL_MSG(_("not implemented"));
     return false;
 }
 

-void wxGtkPrintDC::DoGradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, const wxPoint& circleCenter)
+void wxGtkPrinterDCImpl::DoGradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, const wxPoint& circleCenter)

 {
     wxCoord xC = circleCenter.x;
     wxCoord yC = circleCenter.y;
 {
     wxCoord xC = circleCenter.x;
     wxCoord yC = circleCenter.y;


@@ -1176,7 +1240,7 @@ void wxGtkPrintDC::DoGradientFillConcentric(const wxRect& rect, const wxColour&
     CalcBoundingBox(xR+w, yR+h);
 }
 
     CalcBoundingBox(xR+w, yR+h);
 }
 

-void wxGtkPrintDC::DoGradientFillLinear(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, wxDirection nDirection)
+void wxGtkPrinterDCImpl::DoGradientFillLinear(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, wxDirection nDirection)

 {
     wxCoord x = rect.x;
     wxCoord y = rect.y;
 {
     wxCoord x = rect.x;
     wxCoord y = rect.y;


@@ -1226,16 +1290,17 @@ void wxGtkPrintDC::DoGradientFillLinear(const wxRect& rect, const wxColour& init
     CalcBoundingBox(x+w, y+h);
 }
 
     CalcBoundingBox(x+w, y+h);
 }
 

-bool wxGtkPrintDC::DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const
+bool wxGtkPrinterDCImpl::DoGetPixel(wxCoord WXUNUSED(x1),
+                              wxCoord WXUNUSED(y1),
+                              wxColour * WXUNUSED(col)) const

 {
 {

-    // We can't access the given coord as a cairo context is scalable, ie a coord doesn't mean anything in this context.

     wxFAIL_MSG(_("not implemented"));
     return false;
 }
 
     wxFAIL_MSG(_("not implemented"));
     return false;
 }
 

-void wxGtkPrintDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
+void wxGtkPrinterDCImpl::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)

 {
 {

-    if  (m_pen.GetStyle() == wxTRANSPARENT) return;
+    if  (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return;

 
     SetPen( m_pen );
     gs_cairo->cairo_move_to ( m_cairo, XLOG2DEV(x1), YLOG2DEV(y1) );
 
     SetPen( m_pen );
     gs_cairo->cairo_move_to ( m_cairo, XLOG2DEV(x1), YLOG2DEV(y1) );


@@ -1246,7 +1311,7 @@ void wxGtkPrintDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
     CalcBoundingBox( x2, y2 );
 }
 
     CalcBoundingBox( x2, y2 );
 }
 

-void wxGtkPrintDC::DoCrossHair(wxCoord x, wxCoord y)
+void wxGtkPrinterDCImpl::DoCrossHair(wxCoord x, wxCoord y)

 {
     int w, h;
     DoGetSize(&w, &h);
 {
     int w, h;
     DoGetSize(&w, &h);


@@ -1263,7 +1328,7 @@ void wxGtkPrintDC::DoCrossHair(wxCoord x, wxCoord y)
     CalcBoundingBox( w, h );
 }
 
     CalcBoundingBox( w, h );
 }
 

-void wxGtkPrintDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc)
+void wxGtkPrinterDCImpl::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc)

 {
     double dx = x1 - xc;
     double dy = y1 - yc;
 {
     double dx = x1 - xc;
     double dy = y1 - yc;


@@ -1315,7 +1380,7 @@ void wxGtkPrintDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord
     CalcBoundingBox (x2, y2);
 }
 
     CalcBoundingBox (x2, y2);
 }
 

-void wxGtkPrintDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
+void wxGtkPrinterDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)

 {
     gs_cairo->cairo_save( m_cairo );
 
 {
     gs_cairo->cairo_save( m_cairo );
 


@@ -1341,9 +1406,9 @@ void wxGtkPrintDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,dou
     CalcBoundingBox( x+w, y+h );
 }
 
     CalcBoundingBox( x+w, y+h );
 }
 

-void wxGtkPrintDC::DoDrawPoint(wxCoord x, wxCoord y)
+void wxGtkPrinterDCImpl::DoDrawPoint(wxCoord x, wxCoord y)

 {
 {

-    if  (m_pen.GetStyle() == wxTRANSPARENT) return;
+    if  (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return;

 
     SetPen( m_pen );
 
 
     SetPen( m_pen );
 


@@ -1354,9 +1419,9 @@ void wxGtkPrintDC::DoDrawPoint(wxCoord x, wxCoord y)
     CalcBoundingBox( x, y );
 }
 
     CalcBoundingBox( x, y );
 }
 

-void wxGtkPrintDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
+void wxGtkPrinterDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)

 {
 {

-    if (m_pen.GetStyle() == wxTRANSPARENT) return;
+    if (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return;

 
     if (n <= 0) return;
 
 
     if (n <= 0) return;
 


@@ -1374,7 +1439,7 @@ void wxGtkPrintDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord
     gs_cairo->cairo_stroke ( m_cairo);
 }
 
     gs_cairo->cairo_stroke ( m_cairo);
 }
 

-void wxGtkPrintDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
+void wxGtkPrinterDCImpl::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)

 {
     if (n==0) return;
 
 {
     if (n==0) return;
 


@@ -1408,12 +1473,12 @@ void wxGtkPrintDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoo
     gs_cairo->cairo_restore(m_cairo);
 }
 
     gs_cairo->cairo_restore(m_cairo);
 }
 

-void wxGtkPrintDC::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, int fillStyle)

 {
 {

-    wxDC::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );
+    wxDCImpl::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );

 }
 
 }
 

-void wxGtkPrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxGtkPrinterDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)

 {
     width--;
     height--;
 {
     width--;
     height--;


@@ -1431,7 +1496,7 @@ void wxGtkPrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord
     CalcBoundingBox( x + width, y + height );
 }
 
     CalcBoundingBox( x + width, y + height );
 }
 

-void wxGtkPrintDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
+void wxGtkPrinterDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)

 {
     width--;
     height--;
 {
     width--;
     height--;


@@ -1479,7 +1544,7 @@ void wxGtkPrintDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, w
     CalcBoundingBox(x+width,y+height);
 }
 
     CalcBoundingBox(x+width,y+height);
 }
 

-void wxGtkPrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxGtkPrinterDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)

 {
     width--;
     height--;
 {
     width--;
     height--;


@@ -1505,7 +1570,7 @@ void wxGtkPrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord he
 }
 
 #if wxUSE_SPLINES
 }
 
 #if wxUSE_SPLINES

-void wxGtkPrintDC::DoDrawSpline(const wxPointList *points)
+void wxGtkPrinterDCImpl::DoDrawSpline(const wxPointList *points)

 {
     SetPen (m_pen);
 
 {
     SetPen (m_pen);
 


@@ -1564,10 +1629,16 @@ void wxGtkPrintDC::DoDrawSpline(const wxPointList *points)
 }
 #endif // wxUSE_SPLINES
 
 }
 #endif // wxUSE_SPLINES
 

-bool wxGtkPrintDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
-            wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop, bool useMask,
-            wxCoord xsrcMask, wxCoord ysrcMask)
+bool wxGtkPrinterDCImpl::DoBlit(wxCoord xdest, wxCoord ydest,
+                          wxCoord width, wxCoord height,
+                          wxDC *source, wxCoord xsrc, wxCoord ysrc,
+                          int rop, bool useMask,
+                          wxCoord WXUNUSED_UNLESS_DEBUG(xsrcMask),
+                          wxCoord WXUNUSED_UNLESS_DEBUG(ysrcMask))

 {
 {

+    wxASSERT_MSG( xsrcMask == wxDefaultCoord && ysrcMask == wxDefaultCoord,
+                  wxT("mask coordinates are not supported") );
+

     wxCHECK_MSG( source, false, wxT("invalid source dc") );
 
     // Blit into a bitmap.
     wxCHECK_MSG( source, false, wxT("invalid source dc") );
 
     // Blit into a bitmap.


@@ -1578,19 +1649,19 @@ bool wxGtkPrintDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord h
     memDC.SelectObject(wxNullBitmap);
 
     // Draw bitmap. scaling and positioning is done there.
     memDC.SelectObject(wxNullBitmap);
 
     // Draw bitmap. scaling and positioning is done there.

-    DrawBitmap( bitmap, xdest, ydest, useMask );
+    GetOwner()->DrawBitmap( bitmap, xdest, ydest, useMask );

 
     return true;
 }
 
 
     return true;
 }
 

-void wxGtkPrintDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
+void wxGtkPrinterDCImpl::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )

 {
     DoDrawBitmap( icon, x, y, true );
 }
 
 {
     DoDrawBitmap( icon, x, y, true );
 }
 

-void wxGtkPrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask )
+void wxGtkPrinterDCImpl::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask )

 {
 {

-    wxCHECK_RET( bitmap.IsOk(), wxT("Invalid bitmap in wxGtkPrintDC::DoDrawBitmap"));
+    wxCHECK_RET( bitmap.IsOk(), wxT("Invalid bitmap in wxGtkPrinterDCImpl::DoDrawBitmap"));

 
     cairo_surface_t* surface;
     x = wxCoord(XLOG2DEV(x));
 
     cairo_surface_t* surface;
     x = wxCoord(XLOG2DEV(x));


@@ -1701,12 +1772,12 @@ void wxGtkPrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, b
     gs_cairo->cairo_restore(m_cairo);
 }
 
     gs_cairo->cairo_restore(m_cairo);
 }
 

-void wxGtkPrintDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y )
+void wxGtkPrinterDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y )

 {
     DoDrawRotatedText( text, x, y, 0.0 );
 }
 
 {
     DoDrawRotatedText( text, x, y, 0.0 );
 }
 

-void wxGtkPrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)
+void wxGtkPrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)

 {
     double xx = XLOG2DEV(x);
     double yy = YLOG2DEV(y);
 {
     double xx = XLOG2DEV(x);
     double yy = YLOG2DEV(y);


@@ -1715,12 +1786,7 @@ void wxGtkPrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
 
     bool underlined = m_font.Ok() && m_font.GetUnderlined();
 
 
     bool underlined = m_font.Ok() && m_font.GetUnderlined();
 

-// FIXME-UTF8: wouldn't be needed if utf8_str() always returned a buffer
-#if wxUSE_UNICODE_UTF8
-    const char *data = text.utf8_str();
-#else
-    const wxCharBuffer data = text.utf8_str();
-#endif
+    const wxUTF8Buf data = text.utf8_str();

 
     size_t datalen = strlen(data);
     pango_layout_set_text( m_layout, data, datalen);
 
     size_t datalen = strlen(data);
     pango_layout_set_text( m_layout, data, datalen);


@@ -1772,7 +1838,7 @@ void wxGtkPrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
 
     pango_layout_get_pixel_size( m_layout, &w, &h );
 
 
     pango_layout_get_pixel_size( m_layout, &w, &h );
 

-        if ( m_backgroundMode == wxSOLID )
+        if ( m_backgroundMode == wxBRUSHSTYLE_SOLID )

         {
             unsigned char red = m_textBackgroundColour.Red();
             unsigned char blue = m_textBackgroundColour.Blue();
         {
             unsigned char red = m_textBackgroundColour.Red();
             unsigned char blue = m_textBackgroundColour.Blue();


@@ -1823,7 +1889,7 @@ void wxGtkPrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
     CalcBoundingBox (x + w, y + h);
 }
 
     CalcBoundingBox (x + w, y + h);
 }
 

-void wxGtkPrintDC::Clear()
+void wxGtkPrinterDCImpl::Clear()

 {
 // Clear does nothing for printing, but keep the code
 // for later reuse 
 {
 // Clear does nothing for printing, but keep the code
 // for later reuse 


@@ -1836,7 +1902,7 @@ void wxGtkPrintDC::Clear()
 */
 }
 
 */
 }
 

-void wxGtkPrintDC::SetFont( const wxFont& font )
+void wxGtkPrinterDCImpl::SetFont( const wxFont& font )

 {
     m_font = font;
 
 {
     m_font = font;
 


@@ -1857,7 +1923,7 @@ void wxGtkPrintDC::SetFont( const wxFont& font )
     }
 }
 
     }
 }
 

-void wxGtkPrintDC::SetPen( const wxPen& pen )
+void wxGtkPrinterDCImpl::SetPen( const wxPen& pen )

 {
     if (!pen.Ok()) return;
 
 {
     if (!pen.Ok()) return;
 


@@ -1878,11 +1944,11 @@ void wxGtkPrintDC::SetPen( const wxPen& pen )
 
     switch (m_pen.GetStyle())
     {
 
     switch (m_pen.GetStyle())
     {

-        case wxDOT:           gs_cairo->cairo_set_dash( m_cairo, dotted, 2, 0 ); break;
-        case wxSHORT_DASH:    gs_cairo->cairo_set_dash( m_cairo, short_dashed, 2, 0 ); break;
-        case wxLONG_DASH:     gs_cairo->cairo_set_dash( m_cairo, long_dashed, 2, 0 ); break;
-        case wxDOT_DASH:      gs_cairo->cairo_set_dash( m_cairo, dotted_dashed, 4, 0 );  break;
-        case wxUSER_DASH:
+        case wxPENSTYLE_DOT:        gs_cairo->cairo_set_dash( m_cairo, dotted, 2, 0 ); break;
+        case wxPENSTYLE_SHORT_DASH: gs_cairo->cairo_set_dash( m_cairo, short_dashed, 2, 0 ); break;
+        case wxPENSTYLE_LONG_DASH:  gs_cairo->cairo_set_dash( m_cairo, long_dashed, 2, 0 ); break;
+        case wxPENSTYLE_DOT_DASH:   gs_cairo->cairo_set_dash( m_cairo, dotted_dashed, 4, 0 );  break;
+        case wxPENSTYLE_USER_DASH:

         {
             wxDash *wx_dashes;
             int num = m_pen.GetDashes (&wx_dashes);
         {
             wxDash *wx_dashes;
             int num = m_pen.GetDashes (&wx_dashes);


@@ -1894,8 +1960,8 @@ void wxGtkPrintDC::SetPen( const wxPen& pen )
             g_free( g_dashes );
         }
         break;
             g_free( g_dashes );
         }
         break;

-        case wxSOLID:
-        case wxTRANSPARENT:
+        case wxPENSTYLE_SOLID:
+        case wxPENSTYLE_TRANSPARENT:

         default:              gs_cairo->cairo_set_dash( m_cairo, NULL, 0, 0 );   break;
     }
 
         default:              gs_cairo->cairo_set_dash( m_cairo, NULL, 0, 0 );   break;
     }
 


@@ -1936,13 +2002,13 @@ void wxGtkPrintDC::SetPen( const wxPen& pen )
     }
 }
 
     }
 }
 

-void wxGtkPrintDC::SetBrush( const wxBrush& brush )
+void wxGtkPrinterDCImpl::SetBrush( const wxBrush& brush )

 {
     if (!brush.Ok()) return;
 
     m_brush = brush;
 
 {
     if (!brush.Ok()) return;
 
     m_brush = brush;
 

-    if (m_brush.GetStyle() == wxTRANSPARENT)
+    if (m_brush.GetStyle() == wxBRUSHSTYLE_TRANSPARENT)

     {
         gs_cairo->cairo_set_source_rgba( m_cairo, 0, 0, 0, 0 );
         m_currentRed = 0;
     {
         gs_cairo->cairo_set_source_rgba( m_cairo, 0, 0, 0, 0 );
         m_currentRed = 0;


@@ -1985,31 +2051,31 @@ void wxGtkPrintDC::SetBrush( const wxBrush& brush )
 
         switch (m_brush.GetStyle())
         {
 
         switch (m_brush.GetStyle())
         {

-            case wxCROSS_HATCH:
+            case wxBRUSHSTYLE_CROSS_HATCH:

                 gs_cairo->cairo_move_to(cr, 5, 0);
                 gs_cairo->cairo_line_to(cr, 5, 10);
                 gs_cairo->cairo_move_to(cr, 0, 5);
                 gs_cairo->cairo_line_to(cr, 10, 5);
                 break;
                 gs_cairo->cairo_move_to(cr, 5, 0);
                 gs_cairo->cairo_line_to(cr, 5, 10);
                 gs_cairo->cairo_move_to(cr, 0, 5);
                 gs_cairo->cairo_line_to(cr, 10, 5);
                 break;

-            case wxBDIAGONAL_HATCH:
+            case wxBRUSHSTYLE_BDIAGONAL_HATCH:

                 gs_cairo->cairo_move_to(cr, 0, 10);
                 gs_cairo->cairo_line_to(cr, 10, 0);
                 break;
                 gs_cairo->cairo_move_to(cr, 0, 10);
                 gs_cairo->cairo_line_to(cr, 10, 0);
                 break;

-            case wxFDIAGONAL_HATCH:
+            case wxBRUSHSTYLE_FDIAGONAL_HATCH:

                 gs_cairo->cairo_move_to(cr, 0, 0);
                 gs_cairo->cairo_line_to(cr, 10, 10);
                 break;
                 gs_cairo->cairo_move_to(cr, 0, 0);
                 gs_cairo->cairo_line_to(cr, 10, 10);
                 break;

-            case wxCROSSDIAG_HATCH:
+            case wxBRUSHSTYLE_CROSSDIAG_HATCH:

                 gs_cairo->cairo_move_to(cr, 0, 0);
                 gs_cairo->cairo_line_to(cr, 10, 10);
                 gs_cairo->cairo_move_to(cr, 10, 0);
                 gs_cairo->cairo_line_to(cr, 0, 10);
                 break;
                 gs_cairo->cairo_move_to(cr, 0, 0);
                 gs_cairo->cairo_line_to(cr, 10, 10);
                 gs_cairo->cairo_move_to(cr, 10, 0);
                 gs_cairo->cairo_line_to(cr, 0, 10);
                 break;

-            case wxHORIZONTAL_HATCH:
+            case wxBRUSHSTYLE_HORIZONTAL_HATCH:

                 gs_cairo->cairo_move_to(cr, 0, 5);
                 gs_cairo->cairo_line_to(cr, 10, 5);
                 break;
                 gs_cairo->cairo_move_to(cr, 0, 5);
                 gs_cairo->cairo_line_to(cr, 10, 5);
                 break;

-            case wxVERTICAL_HATCH:
+            case wxBRUSHSTYLE_VERTICAL_HATCH:

                 gs_cairo->cairo_move_to(cr, 5, 0);
                 gs_cairo->cairo_line_to(cr, 5, 10);
                 break;
                 gs_cairo->cairo_move_to(cr, 5, 0);
                 gs_cairo->cairo_line_to(cr, 5, 10);
                 break;


@@ -2029,7 +2095,7 @@ void wxGtkPrintDC::SetBrush( const wxBrush& brush )
     }
 }
 
     }
 }
 

-void wxGtkPrintDC::SetLogicalFunction( int function )
+void wxGtkPrinterDCImpl::SetLogicalFunction( int function )

 {
     if (function == wxCLEAR)
         gs_cairo->cairo_set_operator (m_cairo, CAIRO_OPERATOR_CLEAR);
 {
     if (function == wxCLEAR)
         gs_cairo->cairo_set_operator (m_cairo, CAIRO_OPERATOR_CLEAR);


@@ -2047,7 +2113,7 @@ void wxGtkPrintDC::SetLogicalFunction( int function )
         gs_cairo->cairo_set_operator (m_cairo, CAIRO_OPERATOR_SOURCE);
 }
 
         gs_cairo->cairo_set_operator (m_cairo, CAIRO_OPERATOR_SOURCE);
 }
 

-void wxGtkPrintDC::SetBackground( const wxBrush& brush )
+void wxGtkPrinterDCImpl::SetBackground( const wxBrush& brush )

 {
     m_backgroundBrush = brush;
     gs_cairo->cairo_save(m_cairo);
 {
     m_backgroundBrush = brush;
     gs_cairo->cairo_save(m_cairo);


@@ -2058,44 +2124,46 @@ void wxGtkPrintDC::SetBackground( const wxBrush& brush )
     gs_cairo->cairo_restore(m_cairo);
 }
 
     gs_cairo->cairo_restore(m_cairo);
 }
 

-void wxGtkPrintDC::SetBackgroundMode(int mode)
+void wxGtkPrinterDCImpl::SetBackgroundMode(int mode)

 {
 {

-    if (mode == wxSOLID) m_backgroundMode = wxSOLID;
-    else m_backgroundMode = wxTRANSPARENT;
+    if (mode == wxBRUSHSTYLE_SOLID)
+        m_backgroundMode = wxBRUSHSTYLE_SOLID;
+    else
+        m_backgroundMode = wxBRUSHSTYLE_TRANSPARENT;

 }
 
 }
 

-void wxGtkPrintDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxGtkPrinterDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)

 {
     gs_cairo->cairo_rectangle ( m_cairo, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEVREL(width), YLOG2DEVREL(height));
     gs_cairo->cairo_clip(m_cairo);
 }
 
 {
     gs_cairo->cairo_rectangle ( m_cairo, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEVREL(width), YLOG2DEVREL(height));
     gs_cairo->cairo_clip(m_cairo);
 }
 

-void wxGtkPrintDC::DestroyClippingRegion()
+void wxGtkPrinterDCImpl::DestroyClippingRegion()

 {
     gs_cairo->cairo_reset_clip(m_cairo);
 }
 
 {
     gs_cairo->cairo_reset_clip(m_cairo);
 }
 

-bool wxGtkPrintDC::StartDoc(const wxString& message)
+bool wxGtkPrinterDCImpl::StartDoc(const wxString& WXUNUSED(message))

 {
     return true;
 }
 
 {
     return true;
 }
 

-void wxGtkPrintDC::EndDoc()
+void wxGtkPrinterDCImpl::EndDoc()

 {
     return;
 }
 
 {
     return;
 }
 

-void wxGtkPrintDC::StartPage()
+void wxGtkPrinterDCImpl::StartPage()

 {
     return;
 }
 
 {
     return;
 }
 

-void wxGtkPrintDC::EndPage()
+void wxGtkPrinterDCImpl::EndPage()

 {
     return;
 }
 
 {
     return;
 }
 

-wxCoord wxGtkPrintDC::GetCharHeight() const
+wxCoord wxGtkPrinterDCImpl::GetCharHeight() const

 {
     pango_layout_set_text( m_layout, "H", 1 );
 
 {
     pango_layout_set_text( m_layout, "H", 1 );
 


@@ -2105,7 +2173,7 @@ wxCoord wxGtkPrintDC::GetCharHeight() const
     return wxRound( h * m_PS2DEV );
 }
 
     return wxRound( h * m_PS2DEV );
 }
 

-wxCoord wxGtkPrintDC::GetCharWidth() const
+wxCoord wxGtkPrinterDCImpl::GetCharWidth() const

 {
     pango_layout_set_text( m_layout, "H", 1 );
 
 {
     pango_layout_set_text( m_layout, "H", 1 );
 


@@ -2115,7 +2183,7 @@ wxCoord wxGtkPrintDC::GetCharWidth() const
     return wxRound( w * m_PS2DEV );
 }
 
     return wxRound( w * m_PS2DEV );
 }
 

-void wxGtkPrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height,
+void wxGtkPrinterDCImpl::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height,

                      wxCoord *descent,
                      wxCoord *externalLeading,
                      const wxFont *theFont ) const
                      wxCoord *descent,
                      wxCoord *externalLeading,
                      const wxFont *theFont ) const


@@ -2135,12 +2203,7 @@ void wxGtkPrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoo
     }
 
     // Set layout's text
     }
 
     // Set layout's text

-    // FIXME-UTF8: wouldn't be needed if utf8_str() always returned a buffer
-#if wxUSE_UNICODE_UTF8
-    const char *dataUTF8 = string.utf8_str();
-#else
-    const wxCharBuffer dataUTF8 = string.utf8_str();
-#endif
+    const wxUTF8Buf dataUTF8 = string.utf8_str();

 
     PangoFontDescription *desc = m_fontdesc;
     if (theFont) desc = theFont->GetNativeFontInfo()->description;
 
     PangoFontDescription *desc = m_fontdesc;
     if (theFont) desc = theFont->GetNativeFontInfo()->description;


@@ -2178,17 +2241,17 @@ void wxGtkPrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoo
     pango_layout_set_font_description( m_layout, m_fontdesc );
 }
 
     pango_layout_set_font_description( m_layout, m_fontdesc );
 }
 

-void wxGtkPrintDC::DoGetSize(int* width, int* height) const
+void wxGtkPrinterDCImpl::DoGetSize(int* width, int* height) const

 {
     GtkPageSetup *setup = gtk_print_context_get_page_setup( m_gpc );
 
     if (width)
 {
     GtkPageSetup *setup = gtk_print_context_get_page_setup( m_gpc );
 
     if (width)

-        *width = wxRound( gtk_page_setup_get_paper_width( setup, GTK_UNIT_POINTS ) * m_PS2DEV );
+        *width = wxRound( (double)gtk_page_setup_get_paper_width( setup, GTK_UNIT_POINTS ) * (double)m_resolution / 72.0 );

     if (height)
     if (height)

-        *height = wxRound( gtk_page_setup_get_paper_height( setup, GTK_UNIT_POINTS ) * m_PS2DEV );
+        *height = wxRound( (double)gtk_page_setup_get_paper_height( setup, GTK_UNIT_POINTS ) * (double)m_resolution / 72.0 );

 }
 
 }
 

-void wxGtkPrintDC::DoGetSizeMM(int *width, int *height) const
+void wxGtkPrinterDCImpl::DoGetSizeMM(int *width, int *height) const

 {
     GtkPageSetup *setup = gtk_print_context_get_page_setup( m_gpc );
 
 {
     GtkPageSetup *setup = gtk_print_context_get_page_setup( m_gpc );
 


@@ -2198,23 +2261,28 @@ void wxGtkPrintDC::DoGetSizeMM(int *width, int *height) const
         *height = wxRound( gtk_page_setup_get_paper_height( setup, GTK_UNIT_MM ) );
 }
 
         *height = wxRound( gtk_page_setup_get_paper_height( setup, GTK_UNIT_MM ) );
 }
 

-wxSize wxGtkPrintDC::GetPPI() const
+wxSize wxGtkPrinterDCImpl::GetPPI() const

 {
     return wxSize( (int)m_resolution, (int)m_resolution );
 }
 
 {
     return wxSize( (int)m_resolution, (int)m_resolution );
 }
 

-void wxGtkPrintDC::SetPrintData(const wxPrintData& data)
+void wxGtkPrinterDCImpl::SetPrintData(const wxPrintData& data)

 {
     m_printData = data;
 }
 
 {
     m_printData = data;
 }
 

-void wxGtkPrintDC::SetResolution(int ppi)
+// overriden for wxPrinterDC Impl
+
+wxRect wxGtkPrinterDCImpl::GetPaperRect()

 {
 {

-    // We can't change ppi of the GtkPrintContext.
-    // TODO: should we really support this?
+    // Does GtkPrint support printer margins?
+    int w = 0;
+    int h = 0;
+    DoGetSize( &w, &h );
+    return wxRect( 0,0,w,h );

 }
 
 }
 

-int wxGtkPrintDC::GetResolution()
+int wxGtkPrinterDCImpl::GetResolution()

 {
     return m_resolution;
 }
 {
     return m_resolution;
 }


@@ -2226,25 +2294,59 @@ int wxGtkPrintDC::GetResolution()
 IMPLEMENT_CLASS(wxGtkPrintPreview, wxPrintPreviewBase)
 
 void wxGtkPrintPreview::Init(wxPrintout * WXUNUSED(printout),
 IMPLEMENT_CLASS(wxGtkPrintPreview, wxPrintPreviewBase)
 
 void wxGtkPrintPreview::Init(wxPrintout * WXUNUSED(printout),

-                                    wxPrintout * WXUNUSED(printoutForPrinting))
+                             wxPrintout * WXUNUSED(printoutForPrinting),
+                             wxPrintData *data)

 {
 {

+    // convert wxPrintQuality to resolution (input pointer can be NULL)
+    wxPrintQuality quality = data ? data->GetQuality() : wxPRINT_QUALITY_MEDIUM;
+    switch ( quality )
+    {
+        case wxPRINT_QUALITY_HIGH:
+            m_resolution = 1200;
+            break;
+
+        case wxPRINT_QUALITY_LOW:
+            m_resolution = 300;
+            break;
+
+        case wxPRINT_QUALITY_DRAFT:
+            m_resolution = 150;
+            break;
+
+        default:
+            if ( quality > 0 )
+            {
+                // positive values directly indicate print resolution
+                m_resolution = quality;
+                break;
+            }
+
+            wxFAIL_MSG( "unknown print quality" );
+            // fall through
+
+        case wxPRINT_QUALITY_MEDIUM:
+            m_resolution = 600;
+            break;
+
+    }
+

     DetermineScaling();
 }
 
 wxGtkPrintPreview::wxGtkPrintPreview(wxPrintout *printout,
     DetermineScaling();
 }
 
 wxGtkPrintPreview::wxGtkPrintPreview(wxPrintout *printout,

-                                                   wxPrintout *printoutForPrinting,
-                                                   wxPrintDialogData *data)
-                        : wxPrintPreviewBase(printout, printoutForPrinting, data)
+                                     wxPrintout *printoutForPrinting,
+                                     wxPrintDialogData *data)
+                 : wxPrintPreviewBase(printout, printoutForPrinting, data)

 {
 {

-    Init(printout, printoutForPrinting);
+    Init(printout, printoutForPrinting, data ? &data->GetPrintData() : NULL);

 }
 
 wxGtkPrintPreview::wxGtkPrintPreview(wxPrintout *printout,
 }
 
 wxGtkPrintPreview::wxGtkPrintPreview(wxPrintout *printout,

-                                                   wxPrintout *printoutForPrinting,
-                                                   wxPrintData *data)
-                        : wxPrintPreviewBase(printout, printoutForPrinting, data)
+                                     wxPrintout *printoutForPrinting,
+                                     wxPrintData *data)
+                 : wxPrintPreviewBase(printout, printoutForPrinting, data)

 {
 {

-    Init(printout, printoutForPrinting);
+    Init(printout, printoutForPrinting, data);

 }
 
 wxGtkPrintPreview::~wxGtkPrintPreview()
 }
 
 wxGtkPrintPreview::~wxGtkPrintPreview()


@@ -2276,15 +2378,13 @@ void wxGtkPrintPreview::DetermineScaling()
         m_previewPrintout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
                                          (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
 
         m_previewPrintout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
                                          (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
 

-        // TODO !!!!!!!!!!!!!!!      
-        int resolution = 600;
-        m_previewPrintout->SetPPIPrinter( resolution, resolution );
+        m_previewPrintout->SetPPIPrinter( m_resolution, m_resolution );

 
         // Get width and height in points (1/72th of an inch)
         wxSize sizeDevUnits(paper->GetSizeDeviceUnits());
 
         // Get width and height in points (1/72th of an inch)
         wxSize sizeDevUnits(paper->GetSizeDeviceUnits());

-
-        sizeDevUnits.x = wxRound((double)sizeDevUnits.x * (double)resolution / 72.0);
-        sizeDevUnits.y = wxRound((double)sizeDevUnits.y * (double)resolution / 72.0);
+        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);
 
         wxSize sizeTenthsMM(paper->GetSize());
         wxSize sizeMM(sizeTenthsMM.x / 10, sizeTenthsMM.y / 10);
 


@@ -2305,7 +2405,7 @@ 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_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)resolution;
+        m_previewScaleX = 0.8 * 72.0 / (double)m_resolution;

         m_previewScaleY = m_previewScaleX;
     }
 }
         m_previewScaleY = m_previewScaleX;
     }
 }