Remove m_blockEvents and use Disable/Enable instead, some more rearraging

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

diff --git a/src/gtk/print.cpp b/src/gtk/print.cpp
index d3c20a3d0b5af47ab903b6f21f280ee9a081dc6f..a1cd4c3043d578abf9a0f9f28bcfe2def6b8fdbb 100644 (file)
--- a/src/gtk/print.cpp
+++ b/src/gtk/print.cpp
@@ -22,10 +22,12 @@
 #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/module.h"
 #include "wx/icon.h"
 #include "wx/math.h"
 #include "wx/image.h"
 #include "wx/module.h"

+#include "wx/crt.h"

 #endif
 
 #include "wx/fontutil.h"
 #endif
 
 #include "wx/fontutil.h"


@@ -37,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)
 


@@ -48,6 +54,8 @@ wxFORCE_LINK_THIS_MODULE(gtk_print)
 static const double RAD2DEG  = 180.0 / M_PI;
 static const double DEG2RAD  = M_PI / 180.0;
 
 static const double RAD2DEG  = 180.0 / M_PI;
 static const double DEG2RAD  = M_PI / 180.0;
 

+static wxCairoLibrary* gs_cairo = NULL;
+

 //----------------------------------------------------------------------------
 // wxGtkPrintModule
 // Initialized when starting the app : if it successfully load the gtk-print framework,
 //----------------------------------------------------------------------------
 // wxGtkPrintModule
 // Initialized when starting the app : if it successfully load the gtk-print framework,


@@ -58,7 +66,7 @@ static const double DEG2RAD  = M_PI / 180.0;
 class wxGtkPrintModule: public wxModule
 {
 public:
 class wxGtkPrintModule: public wxModule
 {
 public:

-    wxGtkPrintModule() 
+    wxGtkPrintModule()

     {
 #if wxUSE_LIBGNOMEPRINT
         // This module must be initialized AFTER gnomeprint's one
     {
 #if wxUSE_LIBGNOMEPRINT
         // This module must be initialized AFTER gnomeprint's one


@@ -74,19 +82,19 @@ private:
 
 bool wxGtkPrintModule::OnInit()
 {
 
 bool wxGtkPrintModule::OnInit()
 {

-    if (gtk_check_version(2,10,0) == NULL)
+    gs_cairo = wxCairoLibrary::Get();
+    if (gs_cairo && gtk_check_version(2,10,0) == NULL)

         wxPrintFactory::SetPrintFactory( new wxGtkPrintFactory );
         wxPrintFactory::SetPrintFactory( new wxGtkPrintFactory );

-        

     return true;
 }
 
 void wxGtkPrintModule::OnExit()
 {
     return true;
 }
 
 void wxGtkPrintModule::OnExit()
 {

+    gs_cairo = NULL;

 }
 
 IMPLEMENT_DYNAMIC_CLASS(wxGtkPrintModule, wxModule)
 
 }
 
 IMPLEMENT_DYNAMIC_CLASS(wxGtkPrintModule, wxModule)
 

-

 //----------------------------------------------------------------------------
 // wxGtkPrintFactory
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // wxGtkPrintFactory
 //----------------------------------------------------------------------------


@@ -133,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()


@@ -180,13 +190,12 @@ 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.
-typedef struct
+// We use it to pass useful objects to GTK printing callback functions.
+struct wxPrinterToGtkData

 {
    wxGtkPrinter * printer;
    wxPrintout * printout;
 {
    wxGtkPrinter * printer;
    wxPrintout * printout;

-}
-wxPrinterToGtkData;
+};

 
 extern "C"
 {
 
 extern "C"
 {


@@ -204,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);
 


@@ -248,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));
 


@@ -550,11 +576,11 @@ void wxGtkPrintNativeData::SetPrintConfig( GtkPrintSettings * config )
 GtkPageSetup* wxGtkPrintNativeData::GetPageSetupFromSettings(GtkPrintSettings* settings)
 {
     GtkPageSetup* page_setup = gtk_page_setup_new();
 GtkPageSetup* wxGtkPrintNativeData::GetPageSetupFromSettings(GtkPrintSettings* settings)
 {
     GtkPageSetup* page_setup = gtk_page_setup_new();

-       gtk_page_setup_set_orientation (page_setup, gtk_print_settings_get_orientation (settings));
+    gtk_page_setup_set_orientation (page_setup, gtk_print_settings_get_orientation (settings));

 
 

-       GtkPaperSize *paper_size = gtk_print_settings_get_paper_size (settings);
-       if (paper_size != NULL)
-               gtk_page_setup_set_paper_size_and_default_margins (page_setup, paper_size);
+    GtkPaperSize *paper_size = gtk_print_settings_get_paper_size (settings);
+    if (paper_size != NULL)
+        gtk_page_setup_set_paper_size_and_default_margins (page_setup, paper_size);

 
     return page_setup;
 }
 
     return page_setup;
 }


@@ -563,7 +589,7 @@ GtkPageSetup* wxGtkPrintNativeData::GetPageSetupFromSettings(GtkPrintSettings* s
 void wxGtkPrintNativeData::SetPageSetupToSettings(GtkPrintSettings* settings, GtkPageSetup* page_setup)
 {
     gtk_print_settings_set_orientation ( settings, gtk_page_setup_get_orientation (page_setup));
 void wxGtkPrintNativeData::SetPageSetupToSettings(GtkPrintSettings* settings, GtkPageSetup* page_setup)
 {
     gtk_print_settings_set_orientation ( settings, gtk_page_setup_get_orientation (page_setup));

-       gtk_print_settings_set_paper_size ( settings, gtk_page_setup_get_paper_size (page_setup));
+    gtk_print_settings_set_paper_size ( settings, gtk_page_setup_get_paper_size (page_setup));

 }
 
 //----------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------


@@ -635,14 +661,14 @@ int wxGtkPrintDialog::ShowModal()
     // If the settings are OK, we restore it.
     if (settings != NULL)
         gtk_print_operation_set_print_settings (native->GetPrintJob(), settings);
     // 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_default_page_setup (native->GetPrintJob(), 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
 
     // 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, (GtkWindow *) m_parent, &gError);
+        response = gtk_print_operation_run (native->GetPrintJob(), GTK_PRINT_OPERATION_ACTION_PRINT, GTK_WINDOW(gtk_widget_get_toplevel(m_parent->m_widget)), &gError);

 
     // Does everything went well?
     if (response == GTK_PRINT_OPERATION_RESULT_CANCEL)
 
     // Does everything went well?
     if (response == GTK_PRINT_OPERATION_RESULT_CANCEL)


@@ -667,21 +693,29 @@ int wxGtkPrintDialog::ShowModal()
         case GTK_PRINT_PAGES_CURRENT:
             m_printDialogData.SetSelection( true );
             break;
         case GTK_PRINT_PAGES_CURRENT:
             m_printDialogData.SetSelection( true );
             break;

-        case GTK_PRINT_PAGES_ALL:
-            m_printDialogData.SetAllPages( true );
-            m_printDialogData.SetFromPage( 0 );
-            m_printDialogData.SetToPage( 9999 );
-            break;

         case GTK_PRINT_PAGES_RANGES:
         case GTK_PRINT_PAGES_RANGES:

-        default:
-            // wxWidgets doesn't support multiple ranges, so we can only save the first one even if the user wants to print others.
+            {// wxWidgets doesn't support multiple ranges, so we can only save the first one even if the user wants to print others.

             // For example, the user enters "1-3;5-7" in the dialog: pages 1-3 and 5-7 will be correctly printed when the user
             // will hit "OK" button. However we can only save 1-3 in the print data.
             gint num_ranges = 0;
             GtkPageRange* range;
             range = gtk_print_settings_get_page_ranges (newSettings, &num_ranges);
             // For example, the user enters "1-3;5-7" in the dialog: pages 1-3 and 5-7 will be correctly printed when the user
             // will hit "OK" button. However we can only save 1-3 in the print data.
             gint num_ranges = 0;
             GtkPageRange* range;
             range = gtk_print_settings_get_page_ranges (newSettings, &num_ranges);

-            m_printDialogData.SetFromPage( range[0].start );
-            m_printDialogData.SetToPage( range[0].end );
+            if (num_ranges >= 1)
+            {
+                m_printDialogData.SetFromPage( range[0].start );
+                m_printDialogData.SetToPage( range[0].end );
+            }
+            else {
+                m_printDialogData.SetAllPages( true );
+                m_printDialogData.SetFromPage( 0 );
+                m_printDialogData.SetToPage( 9999 );
+            }
+            break;}
+        case GTK_PRINT_PAGES_ALL:
+        default:
+            m_printDialogData.SetAllPages( true );
+            m_printDialogData.SetFromPage( 0 );
+            m_printDialogData.SetToPage( 9999 );

             break;
     }
 
             break;
     }
 


@@ -837,19 +871,29 @@ bool wxGtkPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
     dataToSend.printer = this;
     dataToSend.printout = printout;
 
     dataToSend.printer = this;
     dataToSend.printout = printout;
 

-    // These Gtk signals are catched here.
+    // These Gtk signals are caught here.

     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);
 
     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);
 

-    m_showDialog = true;
-    if (!prompt)
-        m_showDialog = false;
+    // This is used to setup the DC and
+    // show the dialog if desired
+    wxGtkPrintDialog dialog( parent, &m_printDialogData );
+    dialog.SetPrintDC(m_dc);
+    dialog.SetShowDialog(prompt);

 
 

-    // PrintDialog returns a wxDC but we created it before so we don't need it anymore: we just delete it.
-    wxDC* uselessdc = PrintDialog( parent );
-    delete uselessdc;
+    // doesn't necessarily show
+    int ret = dialog.ShowModal();
+    if (ret == wxID_CANCEL)
+    {
+        sm_lastError = wxPRINTER_CANCELLED;
+    }
+    if (ret == wxID_NO)
+    {
+        sm_lastError = wxPRINTER_ERROR;
+        wxFAIL_MSG(_("The print dialog returned an error."));
+    }

 
     g_object_unref (printOp);
 
 
     g_object_unref (printOp);
 


@@ -861,17 +905,24 @@ 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 );
 

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

 
     if (!m_dc->IsOk())
     {
         if (sm_lastError != wxPRINTER_CANCELLED)
         {
             sm_lastError = wxPRINTER_ERROR;
 
     if (!m_dc->IsOk())
     {
         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;
     }


@@ -880,8 +931,8 @@ void wxGtkPrinter::BeginPrint(wxPrintout *printout, GtkPrintOperation *operation
 
     printout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
                             (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
 
     printout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
                             (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );

-    printout->SetPPIPrinter( wxGtkPrintDC::GetResolution(),
-                             wxGtkPrintDC::GetResolution() );
+    printout->SetPPIPrinter( printDC->GetResolution(),
+                             printDC->GetResolution() );

 
     printout->SetDC(m_dc);
 
 
     printout->SetDC(m_dc);
 


@@ -947,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);


@@ -968,8 +1022,15 @@ void wxGtkPrinter::DrawPage(wxPrintout *printout, GtkPrintOperation *operation,
             GtkPageRange* range;
             range = gtk_print_settings_get_page_ranges (settings, &num_ranges);
             // We don't need to verify these values as it has already been done in wxGtkPrinter::BeginPrint.
             GtkPageRange* range;
             range = gtk_print_settings_get_page_ranges (settings, &num_ranges);
             // We don't need to verify these values as it has already been done in wxGtkPrinter::BeginPrint.

-            startPage = range[0].start + 1;
-            endPage = range[0].end + 1;
+            if (num_ranges >= 1)
+            {
+                startPage = range[0].start + 1;
+                endPage = range[0].end + 1;
+            }
+            else {
+                startPage = minPage;
+                endPage = maxPage;
+            }

             break;}
         case GTK_PRINT_PAGES_ALL:
         default:
             break;}
         case GTK_PRINT_PAGES_ALL:
         default:


@@ -1005,13 +1066,11 @@ void wxGtkPrinter::DrawPage(wxPrintout *printout, GtkPrintOperation *operation,
 wxDC* wxGtkPrinter::PrintDialog( wxWindow *parent )
 {
     wxGtkPrintDialog dialog( parent, &m_printDialogData );
 wxDC* wxGtkPrinter::PrintDialog( wxWindow *parent )
 {
     wxGtkPrintDialog dialog( parent, &m_printDialogData );

-    int ret;

 
     dialog.SetPrintDC(m_dc);
 
     dialog.SetPrintDC(m_dc);

+    dialog.SetShowDialog(true);

 
 

-    dialog.SetShowDialog(m_showDialog);
-
-    ret = dialog.ShowModal();
+    int ret = dialog.ShowModal();

 
     if (ret == wxID_CANCEL)
     {
 
     if (ret == wxID_CANCEL)
     {


@@ -1026,25 +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

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

-IMPLEMENT_CLASS(wxGtkPrintDC, wxDC)
+#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)
+
+#endif

 
 

-// Define the default resolution for this DC. This resolution is just used for positioning as the cairo context is scalable.
-int wxGtkPrintDC::ms_resolution = 72;
+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;
 


@@ -1053,52 +1129,72 @@ wxGtkPrintDC::wxGtkPrintDC( const wxPrintData& data )
 
     m_gpc = native->GetPrintContext();
 
 
     m_gpc = native->GetPrintContext();
 

-    ms_resolution = (int) gtk_print_context_get_dpi_x(m_gpc);
+    // Match print quality to resolution (high = 1200dpi)
+    m_resolution = m_printData.GetQuality(); // (int) gtk_print_context_get_dpi_x( m_gpc );
+    if (m_resolution < 0)
+        m_resolution = (1 << (m_resolution+4)) *150;
+

     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;
 

-    m_signX =  1;  // default x-axis left to right.
+    m_signX = 1;  // default x-axis left to right.

     m_signY = 1;  // default y-axis bottom up -> top down.
 
     m_signY = 1;  // default y-axis bottom up -> top down.
 

-    GetSize( &m_deviceOffsetX, &m_deviceOffsetY );
+    // 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 );
+    gdouble ml, mt;
+    ml = gtk_page_setup_get_left_margin (setup, GTK_UNIT_POINTS);
+    mt = gtk_page_setup_get_top_margin (setup, GTK_UNIT_POINTS);
+    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 true;
+    return m_gpc != NULL;

 }
 
 }
 

-void wxGtkPrintDC::ComputeScaleAndOrigin()
+void* wxGtkPrinterDCImpl::GetCairoContext() const

 {
 {

-    // Called when the scale and/or origin of the context has to be changed.
-    m_scaleX = m_logicalScaleX * m_userScaleX;
-    m_scaleY = m_logicalScaleY * m_userScaleY;
-
-    cairo_translate(m_cairo, m_deviceOriginX, m_deviceOriginY);
-    cairo_scale(m_cairo, m_scaleX, m_scaleY );
+    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;


@@ -1129,22 +1225,22 @@ void wxGtkPrintDC::DoGradientFillConcentric(const wxRect& rect, const wxColour&
 
     // Create a pattern with the gradient.
     cairo_pattern_t* gradient;
 
     // Create a pattern with the gradient.
     cairo_pattern_t* gradient;

-    gradient = cairo_pattern_create_radial (LogicalToDeviceX(xC+xR), LogicalToDeviceY(yC+yR), 0, LogicalToDeviceX(xC+xR), LogicalToDeviceY(yC+yR), radius);
-    cairo_pattern_add_color_stop_rgba (gradient, 0.0, redIPS, greenIPS, blueIPS, alphaIPS);
-    cairo_pattern_add_color_stop_rgba (gradient, 1.0, redDPS, greenDPS, blueDPS, alphaDPS);
+    gradient = gs_cairo->cairo_pattern_create_radial (XLOG2DEV(xC+xR), YLOG2DEV(yC+yR), 0, XLOG2DEV(xC+xR), YLOG2DEV(yC+yR), radius * m_DEV2PS );
+    gs_cairo->cairo_pattern_add_color_stop_rgba (gradient, 0.0, redIPS, greenIPS, blueIPS, alphaIPS);
+    gs_cairo->cairo_pattern_add_color_stop_rgba (gradient, 1.0, redDPS, greenDPS, blueDPS, alphaDPS);

 
     // Fill the rectangle with this pattern.
 
     // Fill the rectangle with this pattern.

-    cairo_set_source(m_cairo, gradient);
-    cairo_rectangle (m_cairo, LogicalToDeviceX(xR), LogicalToDeviceY(yR), LogicalToDeviceXRel(w), LogicalToDeviceYRel(h) );
-    cairo_fill(m_cairo);
+    gs_cairo->cairo_set_source(m_cairo, gradient);
+    gs_cairo->cairo_rectangle (m_cairo, XLOG2DEV(xR), YLOG2DEV(yR), XLOG2DEVREL(w), YLOG2DEVREL(h) );
+    gs_cairo->cairo_fill(m_cairo);

 
 

-    cairo_pattern_destroy(gradient);
+    gs_cairo->cairo_pattern_destroy(gradient);

 
     CalcBoundingBox(xR, yR);
     CalcBoundingBox(xR+w, yR+h);
 }
 
 
     CalcBoundingBox(xR, yR);
     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;


@@ -1171,72 +1267,68 @@ void wxGtkPrintDC::DoGradientFillLinear(const wxRect& rect, const wxColour& init
 
     // Create a pattern with the gradient.
     cairo_pattern_t* gradient;
 
     // Create a pattern with the gradient.
     cairo_pattern_t* gradient;

-    gradient = cairo_pattern_create_linear (LogicalToDeviceX(x), LogicalToDeviceY(y), LogicalToDeviceX(x+w), LogicalToDeviceY(y));
+    gradient = gs_cairo->cairo_pattern_create_linear (XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x+w), YLOG2DEV(y));

 
     if (nDirection == wxWEST)
     {
 
     if (nDirection == wxWEST)
     {

-        cairo_pattern_add_color_stop_rgba (gradient, 0.0, redDPS, greenDPS, blueDPS, alphaDPS);
-        cairo_pattern_add_color_stop_rgba (gradient, 1.0, redIPS, greenIPS, blueIPS, alphaIPS);
+        gs_cairo->cairo_pattern_add_color_stop_rgba (gradient, 0.0, redDPS, greenDPS, blueDPS, alphaDPS);
+        gs_cairo->cairo_pattern_add_color_stop_rgba (gradient, 1.0, redIPS, greenIPS, blueIPS, alphaIPS);

     }
     else {
     }
     else {

-        cairo_pattern_add_color_stop_rgba (gradient, 0.0, redIPS, greenIPS, blueIPS, alphaIPS);
-        cairo_pattern_add_color_stop_rgba (gradient, 1.0, redDPS, greenDPS, blueDPS, alphaDPS);
+        gs_cairo->cairo_pattern_add_color_stop_rgba (gradient, 0.0, redIPS, greenIPS, blueIPS, alphaIPS);
+        gs_cairo->cairo_pattern_add_color_stop_rgba (gradient, 1.0, redDPS, greenDPS, blueDPS, alphaDPS);

     }
 
     // Fill the rectangle with this pattern.
     }
 
     // Fill the rectangle with this pattern.

-    cairo_set_source(m_cairo, gradient);
-    cairo_rectangle (m_cairo, LogicalToDeviceX(x), LogicalToDeviceY(y), LogicalToDeviceXRel(w), LogicalToDeviceYRel(h) );
-    cairo_fill(m_cairo);
+    gs_cairo->cairo_set_source(m_cairo, gradient);
+    gs_cairo->cairo_rectangle (m_cairo, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEVREL(w), YLOG2DEVREL(h) );
+    gs_cairo->cairo_fill(m_cairo);

 
 

-    cairo_pattern_destroy(gradient);
+    gs_cairo->cairo_pattern_destroy(gradient);

 
     CalcBoundingBox(x, y);
     CalcBoundingBox(x+w, y+h);
 }
 
 
     CalcBoundingBox(x, y);
     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 );
 
     SetPen( m_pen );

-    cairo_move_to ( m_cairo, LogicalToDeviceX(x1), LogicalToDeviceY(y1) );
-    cairo_line_to ( m_cairo, LogicalToDeviceX(x2), LogicalToDeviceY(y2) );
-    cairo_stroke ( m_cairo );
+    gs_cairo->cairo_move_to ( m_cairo, XLOG2DEV(x1), YLOG2DEV(y1) );
+    gs_cairo->cairo_line_to ( m_cairo, XLOG2DEV(x2), YLOG2DEV(y2) );
+    gs_cairo->cairo_stroke ( m_cairo );

 
     CalcBoundingBox( x1, y1 );
     CalcBoundingBox( x2, y2 );
 }
 
 
     CalcBoundingBox( x1, y1 );
     CalcBoundingBox( x2, y2 );
 }
 

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

 {
 {

-    int *w, *h;
-    w = new int;
-    h = new int;
-    DoGetSize(w, h);
+    int w, h;
+    DoGetSize(&w, &h);

 
     SetPen(m_pen);
 
 
     SetPen(m_pen);
 

-    cairo_move_to (m_cairo, LogicalToDeviceX(x), 0);
-    cairo_line_to (m_cairo, LogicalToDeviceX(x), *h);
-    cairo_move_to (m_cairo, 0, LogicalToDeviceY(y));
-    cairo_line_to (m_cairo, *w, LogicalToDeviceY(y));
+    gs_cairo->cairo_move_to (m_cairo, XLOG2DEV(x), 0);
+    gs_cairo->cairo_line_to (m_cairo, XLOG2DEV(x), YLOG2DEVREL(h));
+    gs_cairo->cairo_move_to (m_cairo, 0, YLOG2DEV(y));
+    gs_cairo->cairo_line_to (m_cairo, XLOG2DEVREL(w), YLOG2DEV(y));

 
 

-    cairo_stroke (m_cairo);
+    gs_cairo->cairo_stroke (m_cairo);

     CalcBoundingBox( 0, 0 );
     CalcBoundingBox( 0, 0 );

-    CalcBoundingBox( *w, *h );
-
-    delete w;
-    delete 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;


@@ -1271,61 +1363,65 @@ void wxGtkPrintDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord
     alpha1 *= DEG2RAD;
     alpha2 *= DEG2RAD;
 
     alpha1 *= DEG2RAD;
     alpha2 *= DEG2RAD;
 

-    cairo_arc_negative ( m_cairo, LogicalToDeviceX(xc), LogicalToDeviceY(yc), LogicalToDeviceXRel((int)radius), alpha1, alpha2);
-    cairo_line_to(m_cairo, LogicalToDeviceX(xc), LogicalToDeviceY(yc));
-    cairo_close_path (m_cairo);
+    gs_cairo->cairo_new_path(m_cairo);
+
+    gs_cairo->cairo_arc_negative ( m_cairo, XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL((int)radius), alpha1, alpha2);
+    gs_cairo->cairo_line_to(m_cairo, XLOG2DEV(xc), YLOG2DEV(yc));
+    gs_cairo->cairo_close_path (m_cairo);

 
     SetBrush( m_brush );
 
     SetBrush( m_brush );

-    cairo_fill_preserve( m_cairo );
+    gs_cairo->cairo_fill_preserve( m_cairo );

 
     SetPen (m_pen);
 
     SetPen (m_pen);

-    cairo_stroke( m_cairo );
+    gs_cairo->cairo_stroke( m_cairo );

 
     CalcBoundingBox (x1, y1);
     CalcBoundingBox (xc, yc);
     CalcBoundingBox (x2, y2);
 }
 
 
     CalcBoundingBox (x1, y1);
     CalcBoundingBox (xc, yc);
     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)

 {
 {

-    cairo_save( m_cairo );
+    gs_cairo->cairo_save( m_cairo );
+
+    gs_cairo->cairo_new_path(m_cairo);

 
 

-    cairo_translate( m_cairo, LogicalToDeviceX((wxCoord) (x + w / 2.)), LogicalToDeviceX((wxCoord) (y + h / 2.)) );
-    double scale = (double)LogicalToDeviceYRel(h) / (double) LogicalToDeviceXRel(w);
-    cairo_scale( m_cairo, 1.0, scale );
+    gs_cairo->cairo_translate( m_cairo, XLOG2DEV((wxCoord) (x + w / 2.)), XLOG2DEV((wxCoord) (y + h / 2.)) );
+    double scale = (double)YLOG2DEVREL(h) / (double) XLOG2DEVREL(w);
+    gs_cairo->cairo_scale( m_cairo, 1.0, scale );

 
 

-    cairo_arc_negative ( m_cairo, 0, 0, LogicalToDeviceXRel(w/2), -sa*DEG2RAD, -ea*DEG2RAD);
+    gs_cairo->cairo_arc_negative ( m_cairo, 0, 0, XLOG2DEVREL(w/2), -sa*DEG2RAD, -ea*DEG2RAD);

 
     SetPen (m_pen);
 
     SetPen (m_pen);

-    cairo_stroke_preserve( m_cairo );
+    gs_cairo->cairo_stroke_preserve( m_cairo );

 
 

-    cairo_line_to(m_cairo, 0,0);
+    gs_cairo->cairo_line_to(m_cairo, 0,0);

 
     SetBrush( m_brush );
 
     SetBrush( m_brush );

-    cairo_fill( m_cairo );
+    gs_cairo->cairo_fill( m_cairo );

 
 

-    cairo_restore( m_cairo );
+    gs_cairo->cairo_restore( m_cairo );

 
     CalcBoundingBox( x, y);
     CalcBoundingBox( x+w, y+h );
 }
 
 
     CalcBoundingBox( x, y);
     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 );
 

-    cairo_move_to ( m_cairo, LogicalToDeviceX(x), LogicalToDeviceY(y) );
-    cairo_line_to ( m_cairo, LogicalToDeviceX(x), LogicalToDeviceY(y) );
-    cairo_stroke ( m_cairo );
+    gs_cairo->cairo_move_to ( m_cairo, XLOG2DEV(x), YLOG2DEV(y) );
+    gs_cairo->cairo_line_to ( m_cairo, XLOG2DEV(x), YLOG2DEV(y) );
+    gs_cairo->cairo_stroke ( m_cairo );

 
     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;
 


@@ -1335,69 +1431,76 @@ void wxGtkPrintDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord
     for ( i =0; i<n ; i++ )
         CalcBoundingBox( points[i].x+xoffset, points[i].y+yoffset);
 
     for ( i =0; i<n ; i++ )
         CalcBoundingBox( points[i].x+xoffset, points[i].y+yoffset);
 

-    cairo_move_to ( m_cairo, LogicalToDeviceX(points[0].x+xoffset), LogicalToDeviceY(points[0].y+yoffset) );
+    gs_cairo->cairo_move_to ( m_cairo, XLOG2DEV(points[0].x+xoffset), YLOG2DEV(points[0].y+yoffset) );

 
     for (i = 1; i < n; i++)
 
     for (i = 1; i < n; i++)

-        cairo_line_to ( m_cairo, LogicalToDeviceX(points[i].x+xoffset), LogicalToDeviceY(points[i].y+yoffset) );
+        gs_cairo->cairo_line_to ( m_cairo, XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset) );

 
 

-    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;
 

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

     if (fillStyle == wxWINDING_RULE)
     if (fillStyle == wxWINDING_RULE)

-        cairo_set_fill_rule( m_cairo, CAIRO_FILL_RULE_WINDING);
+        gs_cairo->cairo_set_fill_rule( m_cairo, CAIRO_FILL_RULE_WINDING);

     else
     else

-        cairo_set_fill_rule( m_cairo, CAIRO_FILL_RULE_EVEN_ODD);
+        gs_cairo->cairo_set_fill_rule( m_cairo, CAIRO_FILL_RULE_EVEN_ODD);

 
     int x = points[0].x + xoffset;
     int y = points[0].y + yoffset;
 
     int x = points[0].x + xoffset;
     int y = points[0].y + yoffset;

-    cairo_new_path(m_cairo);
-    cairo_move_to( m_cairo, LogicalToDeviceX(x), LogicalToDeviceY(y) );
+    gs_cairo->cairo_new_path(m_cairo);
+    gs_cairo->cairo_move_to( m_cairo, XLOG2DEV(x), YLOG2DEV(y) );

     int i;
     for (i = 1; i < n; i++)
     {
         int x = points[i].x + xoffset;
         int y = points[i].y + yoffset;
     int i;
     for (i = 1; i < n; i++)
     {
         int x = points[i].x + xoffset;
         int y = points[i].y + yoffset;

-        cairo_line_to( m_cairo, LogicalToDeviceX(x), LogicalToDeviceY(y) );
+        gs_cairo->cairo_line_to( m_cairo, XLOG2DEV(x), YLOG2DEV(y) );

     }
     }

-    cairo_close_path(m_cairo);
+    gs_cairo->cairo_close_path(m_cairo);

 
     SetBrush( m_brush );
 
     SetBrush( m_brush );

-    cairo_fill_preserve( m_cairo );
+    gs_cairo->cairo_fill_preserve( m_cairo );

 
     SetPen (m_pen);
 
     SetPen (m_pen);

-    cairo_stroke( m_cairo );
+    gs_cairo->cairo_stroke( m_cairo );

 
     CalcBoundingBox( x, y );
 
 
     CalcBoundingBox( x, y );
 

-    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)

 {
 {

-    cairo_rectangle ( m_cairo, LogicalToDeviceX(x), LogicalToDeviceY(y), LogicalToDeviceXRel(width), LogicalToDeviceYRel(height));
+    width--;
+    height--;
+
+    gs_cairo->cairo_new_path(m_cairo);
+    gs_cairo->cairo_rectangle ( m_cairo, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEVREL(width), YLOG2DEVREL(height));

 
     SetBrush( m_brush );
 
     SetBrush( m_brush );

-    cairo_fill_preserve( m_cairo );
+    gs_cairo->cairo_fill_preserve( m_cairo );

 
     SetPen (m_pen);
 
     SetPen (m_pen);

-    cairo_stroke( m_cairo );
+    gs_cairo->cairo_stroke( m_cairo );

 
     CalcBoundingBox( x, y );
     CalcBoundingBox( x + width, y + height );
 }
 
 
     CalcBoundingBox( x, y );
     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--;
+

     if (radius < 0.0) radius = - radius * ((width < height) ? width : height);
 
     wxCoord dd = 2 * (wxCoord) radius;
     if (radius < 0.0) radius = - radius * ((width < height) ? width : height);
 
     wxCoord dd = 2 * (wxCoord) radius;


@@ -1407,75 +1510,80 @@ void wxGtkPrintDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, w
 
     wxCoord rad = (wxCoord) radius;
 
 
     wxCoord rad = (wxCoord) radius;
 

-    cairo_new_path(m_cairo);
-    cairo_move_to(m_cairo,LogicalToDeviceX(x + rad),LogicalToDeviceY(y));
-    cairo_curve_to(m_cairo,
-                                LogicalToDeviceX(x + rad),LogicalToDeviceY(y),
-                                LogicalToDeviceX(x),LogicalToDeviceY(y),
-                                LogicalToDeviceX(x),LogicalToDeviceY(y + rad));
-    cairo_line_to(m_cairo,LogicalToDeviceX(x),LogicalToDeviceY(y + height - rad));
-    cairo_curve_to(m_cairo,
-                                LogicalToDeviceX(x),LogicalToDeviceY(y + height - rad),
-                                LogicalToDeviceX(x),LogicalToDeviceY(y + height),
-                                LogicalToDeviceX(x + rad),LogicalToDeviceY(y + height));
-    cairo_line_to(m_cairo,LogicalToDeviceX(x + width - rad),LogicalToDeviceY(y + height));
-    cairo_curve_to(m_cairo,
-                                LogicalToDeviceX(x + width - rad),LogicalToDeviceY(y + height),
-                                LogicalToDeviceX(x + width),LogicalToDeviceY(y + height),
-                                LogicalToDeviceX(x + width),LogicalToDeviceY(y + height - rad));
-    cairo_line_to(m_cairo,LogicalToDeviceX(x + width),LogicalToDeviceY(y + rad));
-    cairo_curve_to(m_cairo,
-                                LogicalToDeviceX(x + width),LogicalToDeviceY(y + rad),
-                                LogicalToDeviceX(x + width),LogicalToDeviceY(y),
-                                LogicalToDeviceX(x + width - rad),LogicalToDeviceY(y));
-    cairo_line_to(m_cairo,LogicalToDeviceX(x + rad),LogicalToDeviceY(y));
-    cairo_close_path(m_cairo);
+    gs_cairo->cairo_new_path(m_cairo);
+    gs_cairo->cairo_move_to(m_cairo,XLOG2DEV(x + rad),YLOG2DEV(y));
+    gs_cairo->cairo_curve_to(m_cairo,
+                                XLOG2DEV(x + rad),YLOG2DEV(y),
+                                XLOG2DEV(x),YLOG2DEV(y),
+                                XLOG2DEV(x),YLOG2DEV(y + rad));
+    gs_cairo->cairo_line_to(m_cairo,XLOG2DEV(x),YLOG2DEV(y + height - rad));
+    gs_cairo->cairo_curve_to(m_cairo,
+                                XLOG2DEV(x),YLOG2DEV(y + height - rad),
+                                XLOG2DEV(x),YLOG2DEV(y + height),
+                                XLOG2DEV(x + rad),YLOG2DEV(y + height));
+    gs_cairo->cairo_line_to(m_cairo,XLOG2DEV(x + width - rad),YLOG2DEV(y + height));
+    gs_cairo->cairo_curve_to(m_cairo,
+                                XLOG2DEV(x + width - rad),YLOG2DEV(y + height),
+                                XLOG2DEV(x + width),YLOG2DEV(y + height),
+                                XLOG2DEV(x + width),YLOG2DEV(y + height - rad));
+    gs_cairo->cairo_line_to(m_cairo,XLOG2DEV(x + width),YLOG2DEV(y + rad));
+    gs_cairo->cairo_curve_to(m_cairo,
+                                XLOG2DEV(x + width),YLOG2DEV(y + rad),
+                                XLOG2DEV(x + width),YLOG2DEV(y),
+                                XLOG2DEV(x + width - rad),YLOG2DEV(y));
+    gs_cairo->cairo_line_to(m_cairo,XLOG2DEV(x + rad),YLOG2DEV(y));
+    gs_cairo->cairo_close_path(m_cairo);

 
     SetBrush(m_brush);
 
     SetBrush(m_brush);

-    cairo_fill_preserve(m_cairo);
+    gs_cairo->cairo_fill_preserve(m_cairo);

 
     SetPen(m_pen);
 
     SetPen(m_pen);

-    cairo_stroke(m_cairo);
+    gs_cairo->cairo_stroke(m_cairo);

 
     CalcBoundingBox(x,y);
     CalcBoundingBox(x+width,y+height);
 }
 
 
     CalcBoundingBox(x,y);
     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)

 {
 {

-    cairo_save (m_cairo);
+    width--;
+    height--;
+
+    gs_cairo->cairo_save (m_cairo);
+
+    gs_cairo->cairo_new_path(m_cairo);

 
 

-    cairo_translate (m_cairo, LogicalToDeviceX((wxCoord) (x + width / 2.)), LogicalToDeviceY((wxCoord) (y + height / 2.)));
-    cairo_scale(m_cairo, 1, (double)LogicalToDeviceYRel(height)/(double)LogicalToDeviceXRel(width));
-    cairo_arc ( m_cairo, 0, 0, LogicalToDeviceXRel(width/2), 0, 2 * M_PI);
+    gs_cairo->cairo_translate (m_cairo, XLOG2DEV((wxCoord) (x + width / 2.)), YLOG2DEV((wxCoord) (y + height / 2.)));
+    gs_cairo->cairo_scale(m_cairo, 1, (double)YLOG2DEVREL(height)/(double)XLOG2DEVREL(width));
+    gs_cairo->cairo_arc ( m_cairo, 0, 0, XLOG2DEVREL(width/2), 0, 2 * M_PI);

 
     SetBrush( m_brush );
 
     SetBrush( m_brush );

-    cairo_fill_preserve( m_cairo );
+    gs_cairo->cairo_fill_preserve( m_cairo );

 
     SetPen (m_pen);
 
     SetPen (m_pen);

-    cairo_stroke( m_cairo );
+    gs_cairo->cairo_stroke( m_cairo );

 
     CalcBoundingBox( x, y );
     CalcBoundingBox( x + width, y + height );
 
 
     CalcBoundingBox( x, y );
     CalcBoundingBox( x + width, y + height );
 

-    cairo_restore (m_cairo);
+    gs_cairo->cairo_restore (m_cairo);

 }
 
 #if wxUSE_SPLINES
 }
 
 #if wxUSE_SPLINES

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

 {
     SetPen (m_pen);
 
     double c, d, x1, y1, x2, y2, x3, y3;
     wxPoint *p, *q;
 
 {
     SetPen (m_pen);
 
     double c, d, x1, y1, x2, y2, x3, y3;
     wxPoint *p, *q;
 

-    wxList::compatibility_iterator node = points->GetFirst();
-    p = (wxPoint *)node->GetData();
+    wxPointList::compatibility_iterator node = points->GetFirst();
+    p = node->GetData();

     x1 = p->x;
     y1 = p->y;
 
     node = node->GetNext();
     x1 = p->x;
     y1 = p->y;
 
     node = node->GetNext();

-    p = (wxPoint *)node->GetData();
+    p = node->GetData();

     c = p->x;
     d = p->y;
     x3 =
     c = p->x;
     d = p->y;
     x3 =


@@ -1483,9 +1591,9 @@ void wxGtkPrintDC::DoDrawSpline(wxList *points)
     y3 =
          (double)(y1 + d) / 2;
 
     y3 =
          (double)(y1 + d) / 2;
 

-    cairo_new_path( m_cairo );
-    cairo_move_to( m_cairo, LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1) );
-    cairo_line_to( m_cairo, LogicalToDeviceX((wxCoord)x3), LogicalToDeviceY((wxCoord)y3) );
+    gs_cairo->cairo_new_path( m_cairo );
+    gs_cairo->cairo_move_to( m_cairo, XLOG2DEV((wxCoord)x1), YLOG2DEV((wxCoord)y1) );
+    gs_cairo->cairo_line_to( m_cairo, XLOG2DEV((wxCoord)x3), YLOG2DEV((wxCoord)y3) );

 
     CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
     CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );
 
     CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
     CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );


@@ -1493,7 +1601,7 @@ void wxGtkPrintDC::DoDrawSpline(wxList *points)
     node = node->GetNext();
     while (node)
     {
     node = node->GetNext();
     while (node)
     {

-        q = (wxPoint *)node->GetData();
+        q = node->GetData();

 
         x1 = x3;
         y1 = y3;
 
         x1 = x3;
         y1 = y3;


@@ -1504,10 +1612,10 @@ void wxGtkPrintDC::DoDrawSpline(wxList *points)
         x3 = (double)(x2 + c) / 2;
         y3 = (double)(y2 + d) / 2;
 
         x3 = (double)(x2 + c) / 2;
         y3 = (double)(y2 + d) / 2;
 

-        cairo_curve_to(m_cairo,
-            LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1),
-            LogicalToDeviceX((wxCoord)x2), LogicalToDeviceY((wxCoord)y2),
-            LogicalToDeviceX((wxCoord)x3), LogicalToDeviceY((wxCoord)y3) );
+        gs_cairo->cairo_curve_to(m_cairo,
+            XLOG2DEV((wxCoord)x1), YLOG2DEV((wxCoord)y1),
+            XLOG2DEV((wxCoord)x2), YLOG2DEV((wxCoord)y2),
+            XLOG2DEV((wxCoord)x3), YLOG2DEV((wxCoord)y3) );

 
         CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
         CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );
 
         CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
         CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );


@@ -1515,16 +1623,22 @@ void wxGtkPrintDC::DoDrawSpline(wxList *points)
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-    cairo_line_to ( m_cairo, LogicalToDeviceX((wxCoord)c), LogicalToDeviceY((wxCoord)d) );
+    gs_cairo->cairo_line_to ( m_cairo, XLOG2DEV((wxCoord)c), YLOG2DEV((wxCoord)d) );

 
 

-    cairo_stroke( m_cairo );
+    gs_cairo->cairo_stroke( m_cairo );

 }
 #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.


@@ -1535,23 +1649,23 @@ 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;
 
     cairo_surface_t* surface;

-    x = LogicalToDeviceX(x);
-    y = LogicalToDeviceY(y);
+    x = wxCoord(XLOG2DEV(x));
+    y = wxCoord(YLOG2DEV(y));

     int bw = bitmap.GetWidth();
     int bh = bitmap.GetHeight();
     wxBitmap bmpSource = bitmap;  // we need a non-const instance.
     int bw = bitmap.GetWidth();
     int bh = bitmap.GetHeight();
     wxBitmap bmpSource = bitmap;  // we need a non-const instance.


@@ -1565,7 +1679,7 @@ void wxGtkPrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, b
     // then we'll use a different format and iterator than if it doesn't.
     if (bmpSource.HasAlpha() || mask)
     {
     // 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(
+        surface = gs_cairo->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."));
             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."));


@@ -1582,111 +1696,10 @@ void wxGtkPrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, b
                 // blue. The 32-bit quantities are stored native-endian.
                 // Pre-multiplied alpha is used.
                 unsigned char alpha = p.Alpha();
                 // blue. The 32-bit quantities are stored native-endian.
                 // Pre-multiplied alpha is used.
                 unsigned char alpha = p.Alpha();

-                if (alpha == 0)
-                    *data = 0;
-                else
-                    *data = ( alpha/255                  << 24
-                              | (p.Red() * alpha/255)    << 16
-                              | (p.Green() * alpha/255)  <<  8
-                              | (p.Blue() * alpha/255) );
-                ++data;
-                ++p;
-            }
-            p = rowStart;
-            p.OffsetY(pixData, 1);
-        }
-    }
-    else  // no alpha
-    {
-        surface = cairo_image_surface_create_for_data(
-            buffer, CAIRO_FORMAT_RGB24, bw, bh, bw*4);
-        wxNativePixelData pixData(bmpSource, wxPoint(0,0), wxSize(bw, bh));
-        wxCHECK_RET( pixData, wxT("Failed to gain raw access to bitmap data."));
-
-        wxNativePixelData::Iterator p(pixData);
-        int y, x;
-        for (y=0; y<bh; y++)
-        {
-            wxNativePixelData::Iterator rowStart = p;
-            for (x=0; x<bw; x++)
-            {
-                // Each pixel in CAIRO_FORMAT_RGB24 is a 32-bit quantity, with
-                // the upper 8 bits unused. Red, Green, and Blue are stored in
-                // the remaining 24 bits in that order.  The 32-bit quantities
-                // are stored native-endian.
-                *data = ( p.Red() << 16 | p.Green() << 8 | p.Blue() );
-                ++data;
-                ++p;
-            }
-            p = rowStart;
-            p.OffsetY(pixData, 1);
-        }
-    }
-
-
-    cairo_save(m_cairo);
-    // In case we're scaling the image by using a width and height different
-    // than the bitmap's size create a pattern transformation on the surface and
-    // draw the transformed pattern.
-    cairo_pattern_t* pattern = cairo_pattern_create_for_surface(surface);
-
-    // Prepare to draw the image.
-    cairo_translate(m_cairo, x, y);
-    cairo_set_source(m_cairo, pattern);
-    // Use the original size here since the context is scaled already.
-    cairo_rectangle(m_cairo, 0, 0, bw, bh);
-    // Fill the rectangle using the pattern.
-    cairo_fill(m_cairo);
-
-    // Clean up.
-    cairo_pattern_destroy(pattern);
-    cairo_surface_destroy(surface);
-    delete [] buffer;
-
-    CalcBoundingBox(0,0);
-    CalcBoundingBox(bw,bh);
-
-    cairo_restore(m_cairo);
-}

 
 

-// wxGtkPrintDC has a constant resolution of 72dpi. If we want an higher resolution for printing
-// an image, the scaling has to be done by cairo.
-void wxGtkPrintDC::DoDrawScaledBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, wxCoord w, wxCoord h, bool useMask, int quality )
-{
-    wxCHECK_RET( bitmap.IsOk(), wxT("Invalid bitmap in wxGtkPrintDC::DoDrawBitmap"));
+                if (!bmpSource.HasAlpha() && mask)
+                    alpha = 255;

 
 

-    cairo_surface_t* surface;
-    int bw = bitmap.GetWidth();
-    int bh = bitmap.GetHeight();
-    x = LogicalToDeviceX(x);
-    y = LogicalToDeviceY(y);
-    w = LogicalToDeviceXRel(w);
-    h = LogicalToDeviceYRel(h);
-    wxBitmap bmpSource = bitmap;  // we need a non-const instance.
-    unsigned char* buffer = new unsigned char[bw*bh*4];
-    wxUint32* data = (wxUint32*)buffer;
-
-    // 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() || bmpSource.GetMask())
-    {
-        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; y<bh; y++)
-        {
-            wxAlphaPixelData::Iterator rowStart = p;
-            for (x=0; x<bw; x++)
-            {
-                // Each pixel in CAIRO_FORMAT_ARGB32 is a 32-bit quantity,
-                // with alpha in the upper 8 bits, then red, then green, then
-                // blue. The 32-bit quantities are stored native-endian.
-                // Pre-multiplied alpha is used.
-                unsigned char alpha = p.Alpha();

                 if (alpha == 0)
                     *data = 0;
                 else
                 if (alpha == 0)
                     *data = 0;
                 else


@@ -1703,7 +1716,7 @@ void wxGtkPrintDC::DoDrawScaledBitmap( const wxBitmap& bitmap, wxCoord x, wxCoor
     }
     else  // no alpha
     {
     }
     else  // no alpha
     {

-        surface = cairo_image_surface_create_for_data(
+        surface = gs_cairo->cairo_image_surface_create_for_data(

             buffer, CAIRO_FORMAT_RGB24, bw, bh, bw*4);
         wxNativePixelData pixData(bmpSource, wxPoint(0,0), wxSize(bw, bh));
         wxCHECK_RET( pixData, wxT("Failed to gain raw access to bitmap data."));
             buffer, CAIRO_FORMAT_RGB24, bw, bh, bw*4);
         wxNativePixelData pixData(bmpSource, wxPoint(0,0), wxSize(bw, bh));
         wxCHECK_RET( pixData, wxT("Failed to gain raw access to bitmap data."));


@@ -1729,60 +1742,51 @@ void wxGtkPrintDC::DoDrawScaledBitmap( const wxBitmap& bitmap, wxCoord x, wxCoor
     }
 
 
     }
 
 

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

 
     // Prepare to draw the image.
 
     // Prepare to draw the image.

-    cairo_translate(m_cairo, x, y);
-
-    // In case we're scaling the image by using a width and height different
-    // than the bitmap's size create a pattern transformation on the surface and
-    // draw the transformed pattern.
-    cairo_filter_t filter;
-    if (quality == wxIMAGE_QUALITY_HIGH) filter = CAIRO_FILTER_BILINEAR;
-    else filter = CAIRO_FILTER_GOOD;
+    gs_cairo->cairo_translate(m_cairo, x, y);
+
+    // Scale the image
+    cairo_filter_t filter = CAIRO_FILTER_BILINEAR;

     cairo_pattern_t* pattern = cairo_pattern_create_for_surface(surface);
     cairo_pattern_set_filter(pattern,filter);
     cairo_pattern_t* pattern = cairo_pattern_create_for_surface(surface);
     cairo_pattern_set_filter(pattern,filter);

-    wxDouble scaleX = (wxDouble) w / (wxDouble) bw;
-    wxDouble scaleY = (wxDouble) h / (wxDouble) bh;
+    wxDouble scaleX = (wxDouble) XLOG2DEVREL(bw) / (wxDouble) bw;
+    wxDouble scaleY = (wxDouble) YLOG2DEVREL(bh) / (wxDouble) bh;

     cairo_scale(m_cairo, scaleX, scaleY);
 
     cairo_scale(m_cairo, scaleX, scaleY);
 

-    cairo_set_source(m_cairo, pattern);
+    gs_cairo->cairo_set_source(m_cairo, pattern);

     // Use the original size here since the context is scaled already.
     // Use the original size here since the context is scaled already.

-    cairo_rectangle(m_cairo, 0, 0, bw, bh);
+    gs_cairo->cairo_rectangle(m_cairo, 0, 0, bw, bh);

     // Fill the rectangle using the pattern.
     // Fill the rectangle using the pattern.

-    cairo_fill(m_cairo);
+    gs_cairo->cairo_fill(m_cairo);

 
     // Clean up.
 
     // Clean up.

-    cairo_pattern_destroy(pattern);
-    cairo_surface_destroy(surface);
+    gs_cairo->cairo_pattern_destroy(pattern);
+    gs_cairo->cairo_surface_destroy(surface);

     delete [] buffer;
 
     CalcBoundingBox(0,0);
     CalcBoundingBox(bw,bh);
 
     delete [] buffer;
 
     CalcBoundingBox(0,0);
     CalcBoundingBox(bw,bh);
 

-    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)

 {
 {

-    x = LogicalToDeviceX(x);
-    y = LogicalToDeviceY(y);
+    double xx = XLOG2DEV(x);
+    double yy = YLOG2DEV(y);

 
     angle = -angle;
 
     bool underlined = m_font.Ok() && m_font.GetUnderlined();
 
 
     angle = -angle;
 
     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);


@@ -1812,7 +1816,7 @@ void wxGtkPrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
             double greenPS = (double)(green) / 255.0;
             double alphaPS = (double)(alpha) / 255.0;
 
             double greenPS = (double)(green) / 255.0;
             double alphaPS = (double)(alpha) / 255.0;
 

-            cairo_set_source_rgba( m_cairo, redPS, greenPS, bluePS, alphaPS );
+            gs_cairo->cairo_set_source_rgba( m_cairo, redPS, greenPS, bluePS, alphaPS );

 
             m_currentRed = red;
             m_currentBlue = blue;
 
             m_currentRed = red;
             m_currentBlue = blue;


@@ -1823,24 +1827,18 @@ void wxGtkPrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
 
     int w,h;
 
 
     int w,h;
 

-    if (fabs(m_scaleY - 1.0) > 0.00001)
-    {
-        // If there is a user or actually any scale applied to the device context, scale the font.
-
-        // Scale font description.
-        gint oldSize = pango_font_description_get_size( m_fontdesc );
-        double size = oldSize;
-        size = size * m_scaleY;
-        pango_font_description_set_size( m_fontdesc, (gint)size );
+    // Scale font description.
+    gint oldSize = pango_font_description_get_size( m_fontdesc );
+    double size = oldSize;
+    size = size * m_scaleX;
+    pango_font_description_set_size( m_fontdesc, (gint)size );

 
 

-        // Actually apply scaled font.
-        pango_layout_set_font_description( m_layout, m_fontdesc );
+    // Actually apply scaled font.
+    pango_layout_set_font_description( m_layout, m_fontdesc );

 
 

-        pango_layout_get_pixel_size( m_layout, &w, &h );
-        w = LogicalToDeviceXRel(w);
-        h = LogicalToDeviceYRel(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();


@@ -1852,78 +1850,27 @@ void wxGtkPrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
             double greenPS = (double)(green) / 255.0;
             double alphaPS = (double)(alpha) / 255.0;
 
             double greenPS = (double)(green) / 255.0;
             double alphaPS = (double)(alpha) / 255.0;
 

-            cairo_save(m_cairo);
-            cairo_translate(m_cairo, x, y);
-            cairo_set_source_rgba( m_cairo, redPS, greenPS, bluePS, alphaPS );
-            cairo_rotate(m_cairo,angle*DEG2RAD);
-            cairo_rectangle(m_cairo, 0, 0, w, h);
-            cairo_fill(m_cairo);
-            cairo_restore(m_cairo);
+            gs_cairo->cairo_save(m_cairo);
+            gs_cairo->cairo_translate(m_cairo, xx, yy);
+            gs_cairo->cairo_set_source_rgba( m_cairo, redPS, greenPS, bluePS, alphaPS );
+            gs_cairo->cairo_rotate(m_cairo,angle*DEG2RAD);
+            gs_cairo->cairo_rectangle(m_cairo, 0, 0, w, h);   // still in cairo units
+            gs_cairo->cairo_fill(m_cairo);
+            gs_cairo->cairo_restore(m_cairo);

         }
 
         }
 

-        // Draw layout.
-        cairo_move_to (m_cairo, x, y);
-        if (fabs(angle) > 0.00001)
-        {
-            cairo_save( m_cairo );
-            cairo_rotate( m_cairo, angle*DEG2RAD );
-            pango_cairo_update_layout (m_cairo, m_layout);
-            pango_cairo_show_layout (m_cairo, m_layout);
-            cairo_restore( m_cairo );
-        }
-        else
-        {
-            pango_cairo_update_layout (m_cairo, m_layout);
-            pango_cairo_show_layout (m_cairo, m_layout);
-        }
-
-        // Reset unscaled size.
-        pango_font_description_set_size( m_fontdesc, oldSize );
-
-        // Actually apply unscaled font.
-        pango_layout_set_font_description( m_layout, m_fontdesc );
-    }
-    else
-    {
-        pango_layout_get_pixel_size( m_layout, &w, &h );
+    // Draw layout.
+    gs_cairo->cairo_move_to (m_cairo, xx, yy);

 
 

-        if ( m_backgroundMode == wxSOLID )
-        {
-            unsigned char red = m_textBackgroundColour.Red();
-            unsigned char blue = m_textBackgroundColour.Blue();
-            unsigned char green = m_textBackgroundColour.Green();
-            unsigned char alpha = m_textBackgroundColour.Alpha();
+    gs_cairo->cairo_save( m_cairo );

 
 

-            double redPS = (double)(red) / 255.0;
-            double bluePS = (double)(blue) / 255.0;
-            double greenPS = (double)(green) / 255.0;
-            double alphaPS = (double)(alpha) / 255.0;
+    if (fabs(angle) > 0.00001)
+        gs_cairo->cairo_rotate( m_cairo, angle*DEG2RAD );

 
 

-            cairo_save(m_cairo);
-            cairo_translate(m_cairo, x, y);
-            cairo_set_source_rgba( m_cairo, redPS, greenPS, bluePS, alphaPS );
-            cairo_rotate(m_cairo,angle*DEG2RAD);
-            cairo_rectangle(m_cairo, 0, 0, w, h);
-            cairo_fill(m_cairo);
-            cairo_restore(m_cairo);
-        }
+    gs_cairo->pango_cairo_update_layout (m_cairo, m_layout);
+    gs_cairo->pango_cairo_show_layout (m_cairo, m_layout);

 
 

-        // Draw layout.
-        cairo_move_to (m_cairo, x, y);
-        if (fabs(angle) > 0.00001)
-        {
-            cairo_save( m_cairo );
-            cairo_rotate( m_cairo, angle*DEG2RAD );
-            pango_cairo_update_layout (m_cairo, m_layout);
-            pango_cairo_show_layout (m_cairo, m_layout);
-            cairo_restore( m_cairo );
-        }
-        else
-        {
-            pango_cairo_update_layout (m_cairo, m_layout);
-            pango_cairo_show_layout (m_cairo, m_layout);
-        }
-    }
+    gs_cairo->cairo_restore( m_cairo );

 
     if (underlined)
     {
 
     if (underlined)
     {


@@ -1931,20 +1878,31 @@ void wxGtkPrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
         pango_layout_set_attributes(m_layout, NULL);
     }
 
         pango_layout_set_attributes(m_layout, NULL);
     }
 

-    CalcBoundingBox (x,y);
+    // Reset unscaled size.
+    pango_font_description_set_size( m_fontdesc, oldSize );
+
+    // Actually apply unscaled font.
+    pango_layout_set_font_description( m_layout, m_fontdesc );
+
+    // Back to device units:
+    CalcBoundingBox (x, y);

     CalcBoundingBox (x + w, y + h);
 }
 
     CalcBoundingBox (x + w, y + h);
 }
 

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

 {
 {

-    cairo_save(m_cairo);
-    cairo_set_operator (m_cairo, CAIRO_OPERATOR_SOURCE);
+// Clear does nothing for printing, but keep the code
+// for later reuse 
+/*
+    gs_cairo->cairo_save(m_cairo);
+    gs_cairo->cairo_set_operator (m_cairo, CAIRO_OPERATOR_SOURCE);

     SetBrush(m_backgroundBrush);
     SetBrush(m_backgroundBrush);

-    cairo_paint(m_cairo);
-    cairo_restore(m_cairo);
+    gs_cairo->cairo_paint(m_cairo);
+    gs_cairo->cairo_restore(m_cairo);
+*/

 }
 
 }
 

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

 {
     m_font = font;
 
 {
     m_font = font;
 


@@ -1953,22 +1911,32 @@ void wxGtkPrintDC::SetFont( const wxFont& font )
         if (m_fontdesc)
             pango_font_description_free( m_fontdesc );
 
         if (m_fontdesc)
             pango_font_description_free( m_fontdesc );
 

-        m_fontdesc = pango_font_description_copy( m_font.GetNativeFontInfo()->description );
+        m_fontdesc = pango_font_description_copy( m_font.GetNativeFontInfo()->description ); // m_fontdesc is now set to device units

 
 

+        // Scale font description from device units to pango units
+        gint oldSize = pango_font_description_get_size( m_fontdesc );
+        double size = oldSize *m_DEV2PS;                          // scale to cairo units
+        pango_font_description_set_size( m_fontdesc, (gint)size );    // apply to description
+
+        // Actually apply scaled font.

         pango_layout_set_font_description( m_layout, m_fontdesc );
     }
 }
 
         pango_layout_set_font_description( m_layout, m_fontdesc );
     }
 }
 

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

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

-    double width = (double) m_pen.GetWidth();
-    if (width == 0) width = 0.1;
+    double width;
+    
+    if (m_pen.GetWidth() <= 0)
+        width = 0.1;
+    else
+        width = (double) m_pen.GetWidth();

 
 

-    cairo_set_line_width( m_cairo, LogicalToDeviceXRel( (wxCoord) (1000 * width )) / 1000.0f );
+    gs_cairo->cairo_set_line_width( m_cairo, width * m_DEV2PS * m_scaleX );

     static const double dotted[] = {2.0, 5.0};
     static const double short_dashed[] = {4.0, 4.0};
     static const double long_dashed[] = {4.0, 8.0};
     static const double dotted[] = {2.0, 5.0};
     static const double short_dashed[] = {4.0, 4.0};
     static const double long_dashed[] = {4.0, 8.0};


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

-        case wxDOT:           cairo_set_dash( m_cairo, dotted, 1, 0 ); break;
-        case wxSHORT_DASH:    cairo_set_dash( m_cairo, short_dashed, 1, 0 ); break;
-        case wxLONG_DASH:     cairo_set_dash( m_cairo, long_dashed, 1, 0 ); break;
-        case wxDOT_DASH:      cairo_set_dash( m_cairo, dotted_dashed, 3, 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;
         {
             wxDash *wx_dashes;

-            int num = m_pen.GetDashes (&wx_dashes) - 1;
+            int num = m_pen.GetDashes (&wx_dashes);

             gdouble *g_dashes = g_new( gdouble, num );
             int i;
             for (i = 0; i < num; ++i)
                 g_dashes[i] = (gdouble) wx_dashes[i];
             gdouble *g_dashes = g_new( gdouble, num );
             int i;
             for (i = 0; i < num; ++i)
                 g_dashes[i] = (gdouble) wx_dashes[i];

-            cairo_set_dash( m_cairo, g_dashes, num, 0);
+            gs_cairo->cairo_set_dash( m_cairo, g_dashes, num, 0);

             g_free( g_dashes );
         }
         break;
             g_free( g_dashes );
         }
         break;

-        case wxSOLID:
-        case wxTRANSPARENT:
-        default:              cairo_set_dash( m_cairo, NULL, 0, 0 );   break;
+        case wxPENSTYLE_SOLID:
+        case wxPENSTYLE_TRANSPARENT:
+        default:              gs_cairo->cairo_set_dash( m_cairo, NULL, 0, 0 );   break;

     }
 
     switch (m_pen.GetCap())
     {
     }
 
     switch (m_pen.GetCap())
     {

-        case wxCAP_PROJECTING:  cairo_set_line_cap (m_cairo, CAIRO_LINE_CAP_SQUARE); break;
-        case wxCAP_BUTT:        cairo_set_line_cap (m_cairo, CAIRO_LINE_CAP_BUTT); break;
+        case wxCAP_PROJECTING:  gs_cairo->cairo_set_line_cap (m_cairo, CAIRO_LINE_CAP_SQUARE); break;
+        case wxCAP_BUTT:        gs_cairo->cairo_set_line_cap (m_cairo, CAIRO_LINE_CAP_BUTT); break;

         case wxCAP_ROUND:
         case wxCAP_ROUND:

-        default:                cairo_set_line_cap (m_cairo, CAIRO_LINE_CAP_ROUND); break;
+        default:                gs_cairo->cairo_set_line_cap (m_cairo, CAIRO_LINE_CAP_ROUND); break;

     }
 
     switch (m_pen.GetJoin())
     {
     }
 
     switch (m_pen.GetJoin())
     {

-        case wxJOIN_BEVEL:  cairo_set_line_join (m_cairo, CAIRO_LINE_JOIN_BEVEL); break;
-        case wxJOIN_MITER:  cairo_set_line_join (m_cairo, CAIRO_LINE_JOIN_MITER); break;
+        case wxJOIN_BEVEL:  gs_cairo->cairo_set_line_join (m_cairo, CAIRO_LINE_JOIN_BEVEL); break;
+        case wxJOIN_MITER:  gs_cairo->cairo_set_line_join (m_cairo, CAIRO_LINE_JOIN_MITER); break;

         case wxJOIN_ROUND:
         case wxJOIN_ROUND:

-        default:            cairo_set_line_join (m_cairo, CAIRO_LINE_JOIN_ROUND); break;
+        default:            gs_cairo->cairo_set_line_join (m_cairo, CAIRO_LINE_JOIN_ROUND); break;

     }
 
     unsigned char red = m_pen.GetColour().Red();
     }
 
     unsigned char red = m_pen.GetColour().Red();


@@ -2025,7 +1993,7 @@ void wxGtkPrintDC::SetPen( const wxPen& pen )
         double greenPS = (double)(green) / 255.0;
         double alphaPS = (double)(alpha) / 255.0;
 
         double greenPS = (double)(green) / 255.0;
         double alphaPS = (double)(alpha) / 255.0;
 

-        cairo_set_source_rgba( m_cairo, redPS, greenPS, bluePS, alphaPS );
+        gs_cairo->cairo_set_source_rgba( m_cairo, redPS, greenPS, bluePS, alphaPS );

 
         m_currentRed = red;
         m_currentBlue = blue;
 
         m_currentRed = red;
         m_currentBlue = blue;


@@ -2034,12 +2002,22 @@ 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() == wxBRUSHSTYLE_TRANSPARENT)
+    {
+        gs_cairo->cairo_set_source_rgba( m_cairo, 0, 0, 0, 0 );
+        m_currentRed = 0;
+        m_currentBlue = 0;
+        m_currentGreen = 0;
+        m_currentAlpha = 0;
+        return;
+    }
+

     // Brush colour.
     unsigned char red = m_brush.GetColour().Red();
     unsigned char blue = m_brush.GetColour().Blue();
     // Brush colour.
     unsigned char red = m_brush.GetColour().Red();
     unsigned char blue = m_brush.GetColour().Blue();


@@ -2053,7 +2031,7 @@ void wxGtkPrintDC::SetBrush( const wxBrush& brush )
 
     if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue && alpha == m_currentAlpha))
     {
 
     if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue && alpha == m_currentAlpha))
     {

-        cairo_set_source_rgba( m_cairo, redPS, greenPS, bluePS, alphaPS );
+        gs_cairo->cairo_set_source_rgba( m_cairo, redPS, greenPS, bluePS, alphaPS );

 
         m_currentRed = red;
         m_currentBlue = blue;
 
         m_currentRed = red;
         m_currentBlue = blue;


@@ -2065,145 +2043,147 @@ void wxGtkPrintDC::SetBrush( const wxBrush& brush )
     {
         cairo_t * cr;
         cairo_surface_t *surface;
     {
         cairo_t * cr;
         cairo_surface_t *surface;

-        surface = cairo_surface_create_similar(cairo_get_target(m_cairo),CAIRO_CONTENT_COLOR_ALPHA,10,10);
-        cr = cairo_create(surface);
-        cairo_set_line_cap(cr, CAIRO_LINE_CAP_SQUARE);
-        cairo_set_line_width(cr, 1);
-        cairo_set_line_join(cr,CAIRO_LINE_JOIN_MITER);
+        surface = gs_cairo->cairo_surface_create_similar(gs_cairo->cairo_get_target(m_cairo),CAIRO_CONTENT_COLOR_ALPHA,10,10);
+        cr = gs_cairo->cairo_create(surface);
+        gs_cairo->cairo_set_line_cap(cr, CAIRO_LINE_CAP_SQUARE);
+        gs_cairo->cairo_set_line_width(cr, 1);
+        gs_cairo->cairo_set_line_join(cr,CAIRO_LINE_JOIN_MITER);

 
         switch (m_brush.GetStyle())
         {
 
         switch (m_brush.GetStyle())
         {

-            case wxCROSS_HATCH:
-                cairo_move_to(cr, 5, 0);
-                cairo_line_to(cr, 5, 10);
-                cairo_move_to(cr, 0, 5);
-                cairo_line_to(cr, 10, 5);
+            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;
                 break;

-            case wxBDIAGONAL_HATCH:
-                cairo_move_to(cr, 0, 10);
-                cairo_line_to(cr, 10, 0);
+            case wxBRUSHSTYLE_BDIAGONAL_HATCH:
+                gs_cairo->cairo_move_to(cr, 0, 10);
+                gs_cairo->cairo_line_to(cr, 10, 0);

                 break;
                 break;

-            case wxFDIAGONAL_HATCH:
-                cairo_move_to(cr, 0, 0);
-                cairo_line_to(cr, 10, 10);
+            case wxBRUSHSTYLE_FDIAGONAL_HATCH:
+                gs_cairo->cairo_move_to(cr, 0, 0);
+                gs_cairo->cairo_line_to(cr, 10, 10);

                 break;
                 break;

-            case wxCROSSDIAG_HATCH:
-                cairo_move_to(cr, 0, 0);
-                cairo_line_to(cr, 10, 10);
-                cairo_move_to(cr, 10, 0);
-                cairo_line_to(cr, 0, 10);
+            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;
                 break;

-            case wxHORIZONTAL_HATCH:
-                cairo_move_to(cr, 0, 5);
-                cairo_line_to(cr, 10, 5);
+            case wxBRUSHSTYLE_HORIZONTAL_HATCH:
+                gs_cairo->cairo_move_to(cr, 0, 5);
+                gs_cairo->cairo_line_to(cr, 10, 5);

                 break;
                 break;

-            case wxVERTICAL_HATCH:
-                cairo_move_to(cr, 5, 0);
-                cairo_line_to(cr, 5, 10);
+            case wxBRUSHSTYLE_VERTICAL_HATCH:
+                gs_cairo->cairo_move_to(cr, 5, 0);
+                gs_cairo->cairo_line_to(cr, 5, 10);

                 break;
             default:
                 wxFAIL_MSG(_("Couldn't get hatch style from wxBrush."));
         }
 
                 break;
             default:
                 wxFAIL_MSG(_("Couldn't get hatch style from wxBrush."));
         }
 

-        cairo_set_source_rgba(cr, redPS, greenPS, bluePS, alphaPS);
-        cairo_stroke (cr);
+        gs_cairo->cairo_set_source_rgba(cr, redPS, greenPS, bluePS, alphaPS);
+        gs_cairo->cairo_stroke (cr);

 
 

-        cairo_destroy(cr);
-        cairo_pattern_t * pattern = cairo_pattern_create_for_surface (surface);
-        cairo_surface_destroy(surface);
-        cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
-        cairo_set_source(m_cairo, pattern);
-        cairo_pattern_destroy(pattern);
+        gs_cairo->cairo_destroy(cr);
+        cairo_pattern_t * pattern = gs_cairo->cairo_pattern_create_for_surface (surface);
+        gs_cairo->cairo_surface_destroy(surface);
+        gs_cairo->cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+        gs_cairo->cairo_set_source(m_cairo, pattern);
+        gs_cairo->cairo_pattern_destroy(pattern);

     }
 }
 
     }
 }
 

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

 {
     if (function == wxCLEAR)
 {
     if (function == wxCLEAR)

-        cairo_set_operator (m_cairo, CAIRO_OPERATOR_CLEAR);
+        gs_cairo->cairo_set_operator (m_cairo, CAIRO_OPERATOR_CLEAR);

     else if (function == wxOR)
     else if (function == wxOR)

-        cairo_set_operator (m_cairo, CAIRO_OPERATOR_OUT);
+        gs_cairo->cairo_set_operator (m_cairo, CAIRO_OPERATOR_OUT);

     else if (function == wxNO_OP)
     else if (function == wxNO_OP)

-        cairo_set_operator (m_cairo, CAIRO_OPERATOR_DEST);
+        gs_cairo->cairo_set_operator (m_cairo, CAIRO_OPERATOR_DEST);

     else if (function == wxAND)
     else if (function == wxAND)

-        cairo_set_operator (m_cairo, CAIRO_OPERATOR_ADD);
+        gs_cairo->cairo_set_operator (m_cairo, CAIRO_OPERATOR_ADD);

     else if (function == wxSET)
     else if (function == wxSET)

-        cairo_set_operator (m_cairo, CAIRO_OPERATOR_SATURATE);
+        gs_cairo->cairo_set_operator (m_cairo, CAIRO_OPERATOR_SATURATE);

     else if (function == wxXOR)
     else if (function == wxXOR)

-        cairo_set_operator (m_cairo, CAIRO_OPERATOR_XOR);
+        gs_cairo->cairo_set_operator (m_cairo, CAIRO_OPERATOR_XOR);

     else // wxCOPY or anything else.
     else // wxCOPY or anything else.

-        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;
 {
     m_backgroundBrush = brush;

-    cairo_save(m_cairo);
-    cairo_set_operator (m_cairo, CAIRO_OPERATOR_DEST_OVER);
+    gs_cairo->cairo_save(m_cairo);
+    gs_cairo->cairo_set_operator (m_cairo, CAIRO_OPERATOR_DEST_OVER);

 
     SetBrush(m_backgroundBrush);
 
     SetBrush(m_backgroundBrush);

-    cairo_paint(m_cairo);
-    cairo_restore(m_cairo);
+    gs_cairo->cairo_paint(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)

 {
 {

-    cairo_rectangle ( m_cairo, LogicalToDeviceX(x), LogicalToDeviceY(y), LogicalToDeviceXRel(width), LogicalToDeviceYRel(height));
-    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()

 {
 {

-    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 );
 
     int w,h;
     pango_layout_get_pixel_size( m_layout, &w, &h );
 
 {
     pango_layout_set_text( m_layout, "H", 1 );
 
     int w,h;
     pango_layout_get_pixel_size( m_layout, &w, &h );
 

-    return DeviceToLogicalYRel(h);
+    return wxRound( h * m_PS2DEV );

 }
 
 }
 

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

 {
     pango_layout_set_text( m_layout, "H", 1 );
 
     int w,h;
     pango_layout_get_pixel_size( m_layout, &w, &h );
 
 {
     pango_layout_set_text( m_layout, "H", 1 );
 
     int w,h;
     pango_layout_get_pixel_size( m_layout, &w, &h );
 

-    return DeviceToLogicalXRel(w);
+    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


@@ -2223,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;


@@ -2247,15 +2222,16 @@ void wxGtkPrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoo
     pango_layout_get_pixel_size( m_layout, &w, &h );
 
     if (width)
     pango_layout_get_pixel_size( m_layout, &w, &h );
 
     if (width)

-        *width = (wxCoord)(w / m_scaleX);
+        *width = wxRound( (double)w / m_scaleX * m_PS2DEV );

     if (height)
     if (height)

-        *height = (wxCoord)(h / m_scaleY);
+        *height = wxRound( (double)h / m_scaleY * m_PS2DEV );
+

     if (descent)
     {
         PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
         int baseline = pango_layout_iter_get_baseline(iter);
         pango_layout_iter_free(iter);
     if (descent)
     {
         PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
         int baseline = pango_layout_iter_get_baseline(iter);
         pango_layout_iter_free(iter);

-        *descent = h - PANGO_PIXELS(baseline);
+        *descent = wxRound( (h - PANGO_PIXELS(baseline)) * m_PS2DEV );

     }
 
     // Reset unscaled size.
     }
 
     // Reset unscaled size.


@@ -2265,62 +2241,50 @@ 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)
     if (width)

-        *width = (int) (gtk_print_context_get_width( m_gpc ) + 0.5);
+        *width = wxRound( (double)gtk_page_setup_get_paper_width( setup, GTK_UNIT_POINTS ) * (double)m_resolution / 72.0 );

     if (height)
     if (height)

-        *height = (int) (gtk_print_context_get_height( m_gpc ) + 0.5);
+        *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

 {
 {

-    // This function takes margins into consideration.
-    gdouble w = gtk_page_setup_get_page_width( gtk_print_context_get_page_setup( m_gpc ), GTK_UNIT_MM);
-    gdouble h = gtk_page_setup_get_page_height( gtk_print_context_get_page_setup( m_gpc ), GTK_UNIT_MM);
+    GtkPageSetup *setup = gtk_print_context_get_page_setup( m_gpc );

 
     if (width)
 
     if (width)

-        *width = (int) (w + 0.5);
+        *width = wxRound( gtk_page_setup_get_paper_width( setup, GTK_UNIT_MM ) );

     if (height)
     if (height)

-        *height = (int) (h + 0.5);
-}
-
-wxSize wxGtkPrintDC::GetPPI() const
-{
-    gdouble xDpi = gtk_print_context_get_dpi_x( m_gpc );
-    gdouble yDpi = gtk_print_context_get_dpi_y( m_gpc );
-    return wxSize((int) xDpi,(int) yDpi);
-}
-
-void wxGtkPrintDC::SetLogicalOrigin( wxCoord x, wxCoord y )
-{
-    wxDC::SetLogicalOrigin( x, y );
+        *height = wxRound( gtk_page_setup_get_paper_height( setup, GTK_UNIT_MM ) );

 }
 
 }
 

-void wxGtkPrintDC::SetDeviceOrigin( wxCoord x, wxCoord y )
+wxSize wxGtkPrinterDCImpl::GetPPI() const

 {
 {

-    wxDC::SetDeviceOrigin( x, y );
+    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;

-
-    if (m_printData.GetOrientation() == wxPORTRAIT)
-        GetSize( &m_deviceOffsetX, &m_deviceOffsetY );
-    else
-        GetSize( &m_deviceOffsetY, &m_deviceOffsetX );

 }
 
 }
 

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

 {
 {

-    // We can't change ppi of the GtkPrintContext.
-    ms_resolution = ppi;
+    // 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 ms_resolution;
+    return m_resolution;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -2330,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()


@@ -2379,12 +2377,14 @@ 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()) );

-        m_previewPrintout->SetPPIPrinter(wxGtkPrintDC::GetResolution(), wxGtkPrintDC::GetResolution());
+
+        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 = (wxCoord)((float)sizeDevUnits.x * wxGtkPrintDC::GetResolution() / 72.0);
-        sizeDevUnits.y = (wxCoord)((float)sizeDevUnits.y * wxGtkPrintDC::GetResolution() / 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);
 


@@ -2405,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 = (float)0.8 * 72.0 / (float)wxGtkPrintDC::GetResolution();
+        m_previewScaleX = 0.8 * 72.0 / (double)m_resolution;

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