remove needless casting (no real change)

[wxWidgets.git] / src / gtk / gnome / gprint.cpp

diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp
index 2c3ab8c3e3c2d264e281c5965e92f12d6aa24e0c..aa93c96e64d29bd6b82c55f36172f40d1213da6a 100644 (file)
--- a/src/gtk/gnome/gprint.cpp
+++ b/src/gtk/gnome/gprint.cpp
@@ -1,16 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gprint.cpp
+// Name:        src/gtk/gnome/gprint.cpp

 // Author:      Robert Roebling
 // Purpose:     Implement GNOME printing support
 // Created:     09/20/04
 // Author:      Robert Roebling
 // Purpose:     Implement GNOME printing support
 // Created:     09/20/04

+// RCS-ID:      $Id$

 // Copyright:   Robert Roebling
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   Robert Roebling
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "gprint.h"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -18,17 +15,277 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_LIBGNOMEPRINT
+

 #include "wx/gtk/gnome/gprint.h"
 
 #include "wx/gtk/gnome/gprint.h"
 

-#if wxUSE_LIBGNOMEPRINT
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/dcmemory.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"
 
 #include "wx/fontutil.h"

-#include "wx/printdlg.h"

 #include "wx/gtk/private.h"
 #include "wx/gtk/private.h"

+#include "wx/dynlib.h"
+#include "wx/paper.h"
+#include "wx/dcprint.h"

 
 #include <libgnomeprint/gnome-print.h>
 #include <libgnomeprint/gnome-print-pango.h>
 
 #include <libgnomeprint/gnome-print.h>
 #include <libgnomeprint/gnome-print-pango.h>

+#include <libgnomeprint/gnome-print-config.h>

 #include <libgnomeprintui/gnome-print-dialog.h>
 #include <libgnomeprintui/gnome-print-dialog.h>

+#include <libgnomeprintui/gnome-print-job-preview.h>
+#include <libgnomeprintui/gnome-print-paper-selector.h>
+
+#include "wx/link.h"
+wxFORCE_LINK_THIS_MODULE(gnome_print)
+
+//----------------------------------------------------------------------------
+// wxGnomePrintLibrary
+//----------------------------------------------------------------------------
+
+class wxGnomePrintLibrary
+{
+public:
+    wxGnomePrintLibrary();
+    ~wxGnomePrintLibrary();
+
+    bool IsOk();
+private:
+    bool InitializeMethods();
+
+    wxDynamicLibrary m_libGnomePrint;
+    wxDynamicLibrary m_libGnomePrintUI;
+
+    // only true if we successfully loaded both libraries
+    //
+    // don't rename this field, it's used by wxDL_XXX macros internally
+    bool m_ok;
+
+public:
+    wxDL_METHOD_DEFINE( gint, gnome_print_newpath,
+        (GnomePrintContext *pc), (pc), 0 )
+    wxDL_METHOD_DEFINE( gint, gnome_print_moveto,
+        (GnomePrintContext *pc, gdouble x, gdouble y), (pc, x, y), 0 )
+    wxDL_METHOD_DEFINE( gint, gnome_print_lineto,
+        (GnomePrintContext *pc, gdouble x, gdouble y), (pc, x, y), 0 )
+    wxDL_METHOD_DEFINE( gint, gnome_print_arcto,
+        (GnomePrintContext *pc, gdouble x, gdouble y, gdouble radius, gdouble angle1, gdouble angle2, gint direction ), (pc, x, y, radius, angle1, angle2, direction), 0 )
+    wxDL_METHOD_DEFINE( gint, gnome_print_curveto,
+        (GnomePrintContext *pc, gdouble x1, gdouble y1, gdouble x2, gdouble y2, gdouble x3, gdouble y3), (pc, x1, y1, x2, y2, x3, y3), 0 )
+    wxDL_METHOD_DEFINE( gint, gnome_print_closepath,
+        (GnomePrintContext *pc), (pc), 0 )
+    wxDL_METHOD_DEFINE( gint, gnome_print_stroke,
+        (GnomePrintContext *pc), (pc), 0 )
+    wxDL_METHOD_DEFINE( gint, gnome_print_fill,
+        (GnomePrintContext *pc), (pc), 0 )
+    wxDL_METHOD_DEFINE( gint, gnome_print_setrgbcolor,
+        (GnomePrintContext *pc, gdouble r, gdouble g, gdouble b), (pc, r, g, b), 0 )
+    wxDL_METHOD_DEFINE( gint, gnome_print_setlinewidth,
+        (GnomePrintContext *pc, gdouble width), (pc, width), 0 )
+    wxDL_METHOD_DEFINE( gint, gnome_print_setdash,
+        (GnomePrintContext *pc, gint n_values, const gdouble *values, gdouble offset), (pc, n_values, values, offset), 0 )
+
+    wxDL_METHOD_DEFINE( gint, gnome_print_rgbimage,
+        (GnomePrintContext *pc, const guchar *data, gint width, gint height, gint rowstride), (pc, data, width, height, rowstride ), 0 )
+    wxDL_METHOD_DEFINE( gint, gnome_print_rgbaimage,
+        (GnomePrintContext *pc, const guchar *data, gint width, gint height, gint rowstride), (pc, data, width, height, rowstride ), 0 )
+
+    wxDL_METHOD_DEFINE( gint, gnome_print_concat,
+        (GnomePrintContext *pc, const gdouble *matrix), (pc, matrix), 0 )
+    wxDL_METHOD_DEFINE( gint, gnome_print_scale,
+        (GnomePrintContext *pc, gdouble sx, gdouble sy), (pc, sx, sy), 0 )
+    wxDL_METHOD_DEFINE( gint, gnome_print_rotate,
+        (GnomePrintContext *pc, gdouble theta), (pc, theta), 0 )
+    wxDL_METHOD_DEFINE( gint, gnome_print_translate,
+        (GnomePrintContext *pc, gdouble x, gdouble y), (pc, x, y), 0 )
+
+    wxDL_METHOD_DEFINE( gint, gnome_print_gsave,
+        (GnomePrintContext *pc), (pc), 0 )
+    wxDL_METHOD_DEFINE( gint, gnome_print_grestore,
+        (GnomePrintContext *pc), (pc), 0 )
+
+    wxDL_METHOD_DEFINE( gint, gnome_print_clip,
+        (GnomePrintContext *pc), (pc), 0 )
+    wxDL_METHOD_DEFINE( gint, gnome_print_eoclip,
+        (GnomePrintContext *pc), (pc), 0 )
+
+    wxDL_METHOD_DEFINE( gint, gnome_print_beginpage,
+        (GnomePrintContext *pc, const guchar* name), (pc, name), 0 )
+    wxDL_METHOD_DEFINE( gint, gnome_print_showpage,
+        (GnomePrintContext *pc), (pc), 0 )
+    wxDL_METHOD_DEFINE( gint, gnome_print_end_doc,
+        (GnomePrintContext *pc), (pc), 0 )
+
+    wxDL_METHOD_DEFINE( PangoLayout*, gnome_print_pango_create_layout,
+        (GnomePrintContext *gpc), (gpc), NULL )
+    wxDL_VOIDMETHOD_DEFINE( gnome_print_pango_layout,
+        (GnomePrintContext *gpc, PangoLayout *layout), (gpc, layout)  )
+
+    wxDL_METHOD_DEFINE( GnomePrintJob*, gnome_print_job_new,
+        (GnomePrintConfig *config), (config), NULL )
+    wxDL_METHOD_DEFINE( GnomePrintContext*, gnome_print_job_get_context,
+        (GnomePrintJob *job), (job), NULL )
+    wxDL_METHOD_DEFINE( gint, gnome_print_job_close,
+        (GnomePrintJob *job), (job), 0 )
+    wxDL_METHOD_DEFINE( gint, gnome_print_job_print,
+        (GnomePrintJob *job), (job), 0 )
+    wxDL_METHOD_DEFINE( gboolean, gnome_print_job_get_page_size,
+        (GnomePrintJob *job, gdouble *width, gdouble *height), (job, width, height), 0 )
+
+    wxDL_METHOD_DEFINE( GnomePrintUnit*, gnome_print_unit_get_by_abbreviation,
+        (const guchar *abbreviation), (abbreviation), NULL )
+    wxDL_METHOD_DEFINE( gboolean, gnome_print_convert_distance,
+        (gdouble *distance, const GnomePrintUnit *from, const GnomePrintUnit *to), (distance, from, to), false )
+
+    wxDL_METHOD_DEFINE( GnomePrintConfig*, gnome_print_config_default,
+        (void), (), NULL )
+    wxDL_METHOD_DEFINE( gboolean, gnome_print_config_set,
+        (GnomePrintConfig *config, const guchar *key, const guchar *value), (config, key, value), false )
+    wxDL_METHOD_DEFINE( gboolean, gnome_print_config_set_double,
+        (GnomePrintConfig *config, const guchar *key, gdouble value), (config, key, value), false )
+    wxDL_METHOD_DEFINE( gboolean, gnome_print_config_set_int,
+        (GnomePrintConfig *config, const guchar *key, gint value), (config, key, value), false )
+    wxDL_METHOD_DEFINE( gboolean, gnome_print_config_set_boolean,
+        (GnomePrintConfig *config, const guchar *key, gboolean value), (config, key, value), false )
+    wxDL_METHOD_DEFINE( gboolean, gnome_print_config_set_length,
+        (GnomePrintConfig *config, const guchar *key, gdouble value, const GnomePrintUnit *unit), (config, key, value, unit), false )
+
+    wxDL_METHOD_DEFINE( guchar*, gnome_print_config_get,
+        (GnomePrintConfig *config, const guchar *key), (config, key), NULL )
+    wxDL_METHOD_DEFINE( gboolean, gnome_print_config_get_length,
+        (GnomePrintConfig *config, const guchar *key, gdouble *val, const GnomePrintUnit **unit), (config, key, val, unit), false )
+    wxDL_METHOD_DEFINE( gboolean, gnome_print_config_get_boolean,
+        (GnomePrintConfig *config, const guchar *key, gboolean *val), (config, key, val), false )
+
+    wxDL_METHOD_DEFINE( GtkWidget*, gnome_print_dialog_new,
+        (GnomePrintJob *gpj, const guchar *title, gint flags), (gpj, title, flags), NULL )
+    wxDL_VOIDMETHOD_DEFINE( gnome_print_dialog_construct_range_page,
+        (GnomePrintDialog *gpd, gint flags, gint start, gint end,
+        const guchar *currentlabel, const guchar *rangelabel),
+        (gpd, flags, start, end, currentlabel, rangelabel) )
+    wxDL_VOIDMETHOD_DEFINE( gnome_print_dialog_get_copies,
+        (GnomePrintDialog *gpd, gint *copies, gboolean *collate), (gpd, copies, collate)  )
+    wxDL_VOIDMETHOD_DEFINE( gnome_print_dialog_set_copies,
+        (GnomePrintDialog *gpd, gint copies, gint collate), (gpd, copies, collate)  )
+    wxDL_METHOD_DEFINE( GnomePrintRangeType, gnome_print_dialog_get_range,
+        (GnomePrintDialog *gpd), (gpd), GNOME_PRINT_RANGETYPE_NONE )
+    wxDL_METHOD_DEFINE( int, gnome_print_dialog_get_range_page,
+        (GnomePrintDialog *gpd, gint *start, gint *end), (gpd, start, end), 0 )
+
+    wxDL_METHOD_DEFINE( GtkWidget*, gnome_paper_selector_new_with_flags,
+        (GnomePrintConfig *config, gint flags), (config, flags), NULL )
+
+    wxDL_METHOD_DEFINE( GtkWidget*, gnome_print_job_preview_new,
+        (GnomePrintJob *gpm, const guchar *title), (gpm, title), NULL )
+
+    DECLARE_NO_COPY_CLASS(wxGnomePrintLibrary)
+};
+
+wxGnomePrintLibrary::wxGnomePrintLibrary()
+{
+    wxLogNull log;
+
+    m_libGnomePrint.Load("libgnomeprint-2-2.so.0");
+    m_ok = m_libGnomePrint.IsLoaded();
+    if ( !m_ok )
+        return;
+
+    m_libGnomePrintUI.Load("libgnomeprintui-2-2.so.0");
+    m_ok = m_libGnomePrintUI.IsLoaded();
+    if ( !m_ok )
+    {
+        m_libGnomePrint.Unload();
+        return;
+    }
+
+    m_ok = InitializeMethods();
+}
+
+wxGnomePrintLibrary::~wxGnomePrintLibrary()
+{
+}
+
+bool wxGnomePrintLibrary::IsOk()
+{
+    return m_ok;
+}
+
+bool wxGnomePrintLibrary::InitializeMethods()
+{
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_newpath );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_moveto );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_lineto );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_curveto );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_arcto );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_closepath );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_stroke );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_fill );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_setrgbcolor );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_setlinewidth );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_setdash );
+
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_rgbimage );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_rgbaimage );
+
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_concat );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_scale );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_rotate );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_translate );
+
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_gsave );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_grestore );
+
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_clip );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_eoclip );
+
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_beginpage );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_showpage );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_end_doc );
+
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_pango_create_layout );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_pango_layout );
+
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_new );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_get_context );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_close );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_print );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_get_page_size );
+
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_unit_get_by_abbreviation );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_convert_distance );
+
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_default );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_boolean );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_double );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_int );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_length );
+
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get_length );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get_boolean );
+
+    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_new );
+    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_construct_range_page );
+    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_get_copies );
+    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_set_copies );
+    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_get_range );
+    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_get_range_page );
+
+    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_paper_selector_new_with_flags );
+
+    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_job_preview_new );
+
+    return true;
+}
+
+static wxGnomePrintLibrary* gs_libGnomePrint = NULL;

 
 //----------------------------------------------------------------------------
 // wxGnomePrintNativeData
 
 //----------------------------------------------------------------------------
 // wxGnomePrintNativeData


@@ -38,28 +295,128 @@ IMPLEMENT_CLASS(wxGnomePrintNativeData, wxPrintNativeDataBase)
 
 wxGnomePrintNativeData::wxGnomePrintNativeData()
 {
 
 wxGnomePrintNativeData::wxGnomePrintNativeData()
 {

-    m_config = gnome_print_config_default();
-    m_job = gnome_print_job_new( m_config );
+    m_config = gs_libGnomePrint->gnome_print_config_default();
+    m_job = gs_libGnomePrint->gnome_print_job_new( m_config );

 }
 
 wxGnomePrintNativeData::~wxGnomePrintNativeData()
 {
 }
 
 wxGnomePrintNativeData::~wxGnomePrintNativeData()
 {

-    g_object_unref (G_OBJECT (m_config));
-    g_object_unref (G_OBJECT (m_job));
+    g_object_unref (m_config);

 }
 
 bool wxGnomePrintNativeData::TransferTo( wxPrintData &data )
 {
 }
 
 bool wxGnomePrintNativeData::TransferTo( wxPrintData &data )
 {

-    // TODO
+    guchar *res = gs_libGnomePrint->gnome_print_config_get( m_config,
+            (guchar*)(char*)GNOME_PRINT_KEY_PAGE_ORIENTATION );
+    if (g_ascii_strcasecmp((const gchar *)res,"R90") == 0)
+        data.SetOrientation( wxLANDSCAPE );
+    else
+        data.SetOrientation( wxPORTRAIT );
+    g_free( res );
+
+    res = gs_libGnomePrint->gnome_print_config_get( m_config,
+            (guchar*)(char*)GNOME_PRINT_KEY_OUTPUT_FILENAME );
+    if (res)
+    {
+        data.SetFilename( wxConvFile.cMB2WX( (const char*) res ) );
+        wxPrintf( "filename %s\n", data.GetFilename() );
+        g_free( res );
+    }
+    else
+    {
+        data.SetFilename( wxEmptyString );
+    }
+
+    gboolean ret;
+    if (gs_libGnomePrint->gnome_print_config_get_boolean( m_config,
+            (guchar*)(char*)GNOME_PRINT_KEY_COLLATE, &ret))
+    {
+        data.SetCollate( ret );
+    }
+
+    // gnome_print_v
+

     return true;
 }
 
 bool wxGnomePrintNativeData::TransferFrom( const wxPrintData &data )
 {
     return true;
 }
 
 bool wxGnomePrintNativeData::TransferFrom( const wxPrintData &data )
 {

-    // TODO
+    if (data.GetOrientation() == wxLANDSCAPE)
+    {
+        gs_libGnomePrint->gnome_print_config_set( m_config,
+            (guchar*)(char*)GNOME_PRINT_KEY_PAGE_ORIENTATION,
+            (guchar*)(char*)"R90" );
+    }
+    else
+    {
+        gs_libGnomePrint->gnome_print_config_set( m_config,
+            (guchar*)(char*)GNOME_PRINT_KEY_PAGE_ORIENTATION,
+            (guchar*)(char*)"R0" );
+    }
+
+    if (data.GetCollate())
+    {
+        gs_libGnomePrint->gnome_print_config_set_boolean( m_config,
+            (guchar*)(char*)GNOME_PRINT_KEY_COLLATE,
+            TRUE );
+    }
+    else
+    {
+        gs_libGnomePrint->gnome_print_config_set_boolean( m_config,
+            (guchar*)(char*)GNOME_PRINT_KEY_COLLATE,
+            FALSE );
+    }
+
+    switch (data.GetPaperId())
+    {
+        case wxPAPER_A3:        gs_libGnomePrint->gnome_print_config_set( m_config,
+                                    (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
+                                    (guchar*)(char*)"A3" );
+                                break;
+        case wxPAPER_A5:        gs_libGnomePrint->gnome_print_config_set( m_config,
+                                    (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
+                                    (guchar*)(char*)"A5" );
+                                break;
+        case wxPAPER_B4:        gs_libGnomePrint->gnome_print_config_set( m_config,
+                                    (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
+                                    (guchar*)(char*)"B4" );
+                                break;
+        case wxPAPER_B5:        gs_libGnomePrint->gnome_print_config_set( m_config,
+                                    (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
+                                    (guchar*)(char*)"B5" );
+                                break;
+        case wxPAPER_LETTER:        gs_libGnomePrint->gnome_print_config_set( m_config,
+                                    (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
+                                    (guchar*)(char*)"USLetter" );
+                                break;
+        case wxPAPER_LEGAL:     gs_libGnomePrint->gnome_print_config_set( m_config,
+                                    (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
+                                    (guchar*)(char*)"USLegal" );
+                                break;
+        case wxPAPER_EXECUTIVE: gs_libGnomePrint->gnome_print_config_set( m_config,
+                                    (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
+                                    (guchar*)(char*)"Executive" );
+                                break;
+        case wxPAPER_ENV_C5:    gs_libGnomePrint->gnome_print_config_set( m_config,
+                                    (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
+                                    (guchar*)(char*)"C5" );
+                                break;
+        case wxPAPER_ENV_C6:    gs_libGnomePrint->gnome_print_config_set( m_config,
+                                    (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
+                                    (guchar*)(char*)"C6" );
+                                break;
+        case wxPAPER_NONE:      break;
+
+        default:
+        case wxPAPER_A4:        gs_libGnomePrint->gnome_print_config_set( m_config,
+                                    (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
+                                    (guchar*)(char*)"A4" );
+                                break;
+    }
+

     return true;
 }
     return true;
 }

-    
+

 //----------------------------------------------------------------------------
 // wxGnomePrintFactory
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // wxGnomePrintFactory
 //----------------------------------------------------------------------------


@@ -68,43 +425,75 @@ wxPrinterBase* wxGnomePrintFactory::CreatePrinter( wxPrintDialogData *data )
 {
     return new wxGnomePrinter( data );
 }
 {
     return new wxGnomePrinter( data );
 }

-        
-wxPrintPreviewBase *wxGnomePrintFactory::CreatePrintPreview( wxPrintout *preview, 
-                                                    wxPrintout *printout, 
+
+wxPrintPreviewBase *wxGnomePrintFactory::CreatePrintPreview( wxPrintout *preview,
+                                                    wxPrintout *printout,

                                                     wxPrintDialogData *data )
 {
                                                     wxPrintDialogData *data )
 {

-    return new wxPostScriptPrintPreview( preview, printout, data );
+    return new wxGnomePrintPreview( preview, printout, data );

 }
 
 }
 

-wxPrintPreviewBase *wxGnomePrintFactory::CreatePrintPreview( wxPrintout *preview, 
-                                                    wxPrintout *printout, 
+wxPrintPreviewBase *wxGnomePrintFactory::CreatePrintPreview( wxPrintout *preview,
+                                                    wxPrintout *printout,

                                                     wxPrintData *data )
 {
                                                     wxPrintData *data )
 {

-    return new wxPostScriptPrintPreview( preview, printout, data );
+    return new wxGnomePrintPreview( preview, printout, data );

 }
 
 }
 

-wxPrintDialogBase *wxGnomePrintFactory::CreatePrintDialog( wxWindow *parent, 
+wxPrintDialogBase *wxGnomePrintFactory::CreatePrintDialog( wxWindow *parent,

                                                   wxPrintDialogData *data )
 {
                                                   wxPrintDialogData *data )
 {

-    return new wxGenericPrintDialog( parent, data );
+    return new wxGnomePrintDialog( parent, data );

 }
 
 }
 

-wxPrintDialogBase *wxGnomePrintFactory::CreatePrintDialog( wxWindow *parent, 
+wxPrintDialogBase *wxGnomePrintFactory::CreatePrintDialog( wxWindow *parent,

                                                   wxPrintData *data )
 {
                                                   wxPrintData *data )
 {

-    return new wxGenericPrintDialog( parent, data );
+    return new wxGnomePrintDialog( parent, data );
+}
+
+wxPageSetupDialogBase *wxGnomePrintFactory::CreatePageSetupDialog( wxWindow *parent,
+                                                          wxPageSetupDialogData * data )
+{
+//  The native page setup dialog is broken. It
+//  miscalculates newly entered values for the
+//  margins if you have not chose "points" but
+//  e.g. centimerters.
+//  This has been fixed in GNOME CVS (maybe
+//  fixed in libgnomeprintui 2.8.1)
+
+    return new wxGnomePageSetupDialog( parent, data );

 }
 }

-                                                  
+

 bool wxGnomePrintFactory::HasPrintSetupDialog()
 {
 bool wxGnomePrintFactory::HasPrintSetupDialog()
 {

-    return true;
+    return false;
+}
+
+wxDialog *
+wxGnomePrintFactory::CreatePrintSetupDialog(wxWindow * WXUNUSED(parent),
+                                            wxPrintData * WXUNUSED(data))
+{
+    return NULL;
+}
+
+
+#if wxUSE_NEW_DC
+
+wxDCImpl* wxGnomePrintFactory::CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data )
+{
+    return new wxGnomePrinterDCImpl( owner, data );

 }
 
 }
 

-wxDialog *wxGnomePrintFactory::CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data )
+#else
+
+wxDC* wxGnomePrintFactory::CreatePrinterDC( const wxPrintData& data )

 {
 {

-    return new wxGnomePrintSetupDialog( parent, data );
+    return new wxGnomePrinterDC(data);

 }
 
 }
 

+#endif
+

 bool wxGnomePrintFactory::HasOwnPrintToFile()
 {
     return true;
 bool wxGnomePrintFactory::HasOwnPrintToFile()
 {
     return true;


@@ -117,19 +506,20 @@ bool wxGnomePrintFactory::HasPrinterLine()
 
 wxString wxGnomePrintFactory::CreatePrinterLine()
 {
 
 wxString wxGnomePrintFactory::CreatePrinterLine()
 {

-    // We should query "gnome_config_default" here
-    return _("GNOME print");
+    // redundant now
+    return wxEmptyString;

 }
 
 bool wxGnomePrintFactory::HasStatusLine()
 {
 }
 
 bool wxGnomePrintFactory::HasStatusLine()
 {

-    return true;    
+    // redundant now
+    return true;

 }
 
 wxString wxGnomePrintFactory::CreateStatusLine()
 {
 }
 
 wxString wxGnomePrintFactory::CreateStatusLine()
 {

-    // We should query "gnome_config_default" here
-    return _("Ready");
+    // redundant now
+    return wxEmptyString;

 }
 
 wxPrintNativeDataBase *wxGnomePrintFactory::CreatePrintNativeData()
 }
 
 wxPrintNativeDataBase *wxGnomePrintFactory::CreatePrintNativeData()


@@ -141,48 +531,280 @@ wxPrintNativeDataBase *wxGnomePrintFactory::CreatePrintNativeData()
 // wxGnomePrintSetupDialog
 //----------------------------------------------------------------------------
 
 // wxGnomePrintSetupDialog
 //----------------------------------------------------------------------------
 

-IMPLEMENT_CLASS(wxGnomePrintSetupDialog, wxDialog)
+IMPLEMENT_CLASS(wxGnomePrintDialog, wxPrintDialogBase)
+
+wxGnomePrintDialog::wxGnomePrintDialog( wxWindow *parent, wxPrintDialogData *data )
+                    : wxPrintDialogBase(parent, wxID_ANY, _("Print"),
+                               wxPoint(0, 0), wxSize(600, 600),
+                               wxDEFAULT_DIALOG_STYLE |
+                               wxTAB_TRAVERSAL)
+{
+    if (data)
+        m_printDialogData = *data;
+
+    Init();
+}
+
+wxGnomePrintDialog::wxGnomePrintDialog( wxWindow *parent, wxPrintData *data )
+                    : wxPrintDialogBase(parent, wxID_ANY, _("Print"),
+                               wxPoint(0, 0), wxSize(600, 600),
+                               wxDEFAULT_DIALOG_STYLE |
+                               wxTAB_TRAVERSAL)
+{
+    if (data)
+        m_printDialogData = *data;
+
+    Init();
+}

 
 

-wxGnomePrintSetupDialog::wxGnomePrintSetupDialog( wxWindow *parent, wxPrintData *data )
+void wxGnomePrintDialog::Init()

 {
 {

+    wxPrintData data = m_printDialogData.GetPrintData();
+
+    data.ConvertToNative();
+

     wxGnomePrintNativeData *native =
     wxGnomePrintNativeData *native =

-      (wxGnomePrintNativeData*) data->GetNativeData();
-      
-    m_widget = gnome_print_dialog_new (native->GetPrintJob(), (guchar*)"Print setup", 0);
+      (wxGnomePrintNativeData*) data.GetNativeData();
+
+    m_widget = gs_libGnomePrint->gnome_print_dialog_new( native->GetPrintJob(),
+                                       (guchar*)"Print",
+                                       GNOME_PRINT_DIALOG_RANGE|GNOME_PRINT_DIALOG_COPIES );
+
+    int flag = 0;
+    if (m_printDialogData.GetEnableSelection())
+        flag |= GNOME_PRINT_RANGE_SELECTION;
+    if (m_printDialogData.GetEnablePageNumbers())
+        flag |= GNOME_PRINT_RANGE_ALL|GNOME_PRINT_RANGE_RANGE;
+
+    gs_libGnomePrint->gnome_print_dialog_construct_range_page( (GnomePrintDialog*) m_widget,
+                                             flag,
+                                             m_printDialogData.GetMinPage(),
+                                             m_printDialogData.GetMaxPage(),
+                                             NULL,
+                                             NULL );

 }
 
 }
 

-wxGnomePrintSetupDialog::~wxGnomePrintSetupDialog()
+wxGnomePrintDialog::~wxGnomePrintDialog()

 {
     m_widget = NULL;
 }
 
 {
     m_widget = NULL;
 }
 

-int wxGnomePrintSetupDialog::ShowModal()
+int wxGnomePrintDialog::ShowModal()

 {
     int response = gtk_dialog_run (GTK_DIALOG (m_widget));
 {
     int response = gtk_dialog_run (GTK_DIALOG (m_widget));

+
+    if (response == GNOME_PRINT_DIALOG_RESPONSE_CANCEL)
+    {
+        gtk_widget_destroy(m_widget);
+        m_widget = NULL;
+
+        return wxID_CANCEL;
+    }
+
+    m_printDialogData.GetPrintData().ConvertFromNative();
+
+    gint copies = 1;
+    gboolean collate = false;
+    gs_libGnomePrint->gnome_print_dialog_get_copies( (GnomePrintDialog*) m_widget, &copies, &collate );
+    m_printDialogData.SetNoCopies( copies );
+    m_printDialogData.SetCollate( collate );
+
+    switch (gs_libGnomePrint->gnome_print_dialog_get_range( (GnomePrintDialog*) m_widget ))
+    {
+        case GNOME_PRINT_RANGE_SELECTION:
+            m_printDialogData.SetSelection( true );
+            break;
+        case GNOME_PRINT_RANGE_ALL:
+            m_printDialogData.SetAllPages( true );
+            m_printDialogData.SetFromPage( 0 );
+            m_printDialogData.SetToPage( 9999 );
+            break;
+        case GNOME_PRINT_RANGE_RANGE:
+        default:
+            gint start,end;
+            gs_libGnomePrint->gnome_print_dialog_get_range_page( (GnomePrintDialog*) m_widget, &start, &end );
+            m_printDialogData.SetFromPage( start );
+            m_printDialogData.SetToPage( end );
+            break;
+    }
+

     gtk_widget_destroy(m_widget);
     m_widget = NULL;
     gtk_widget_destroy(m_widget);
     m_widget = NULL;

-    
-       if (response == GNOME_PRINT_DIALOG_RESPONSE_CANCEL)
-        return wxID_CANCEL;
+
+    if (response == GNOME_PRINT_DIALOG_RESPONSE_PREVIEW)
+        return wxID_PREVIEW;

 
     return wxID_OK;
 }
 
 
     return wxID_OK;
 }
 

-bool wxGnomePrintSetupDialog::Validate()
+wxDC *wxGnomePrintDialog::GetPrintDC()
+{
+    // Later
+    return NULL;
+}
+
+bool wxGnomePrintDialog::Validate()
+{
+    return true;
+}
+
+bool wxGnomePrintDialog::TransferDataToWindow()
+{
+    return true;
+}
+
+bool wxGnomePrintDialog::TransferDataFromWindow()

 {
     return true;
 }
 
 {
     return true;
 }
 

-bool wxGnomePrintSetupDialog::TransferDataToWindow()
+//----------------------------------------------------------------------------
+// wxGnomePageSetupDialog
+//----------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxGnomePageSetupDialog, wxPageSetupDialogBase)
+
+wxGnomePageSetupDialog::wxGnomePageSetupDialog(wxWindow * WXUNUSED(parent),
+                                               wxPageSetupDialogData *data)
+{
+    if (data)
+        m_pageDialogData = *data;
+
+    m_pageDialogData.GetPrintData().ConvertToNative();
+
+    wxGnomePrintNativeData *native =
+      (wxGnomePrintNativeData*) m_pageDialogData.GetPrintData().GetNativeData();
+
+    // This *was* required as the page setup dialog
+    // calculates wrong values otherwise.
+#if 0
+    gs_libGnomePrint->gnome_print_config_set( native->GetPrintConfig(),
+                            (const guchar*) GNOME_PRINT_KEY_PREFERED_UNIT,
+                            (const guchar*) "Pts" );
+#endif
+
+    GnomePrintConfig *config = native->GetPrintConfig();
+
+    const GnomePrintUnit *mm_unit = gs_libGnomePrint->gnome_print_unit_get_by_abbreviation( (const guchar*) "mm" );
+
+    double ml = (double) m_pageDialogData.GetMarginTopLeft().x;
+    double mt = (double) m_pageDialogData.GetMarginTopLeft().y;
+    double mr = (double) m_pageDialogData.GetMarginBottomRight().x;
+    double mb = (double) m_pageDialogData.GetMarginBottomRight().y;
+
+    gs_libGnomePrint->gnome_print_config_set_length (config,
+            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_LEFT, ml, mm_unit );
+    gs_libGnomePrint->gnome_print_config_set_length (config,
+            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_RIGHT, mr, mm_unit );
+    gs_libGnomePrint->gnome_print_config_set_length (config,
+            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_TOP, mt, mm_unit );
+    gs_libGnomePrint->gnome_print_config_set_length (config,
+            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_BOTTOM, mb, mm_unit );
+
+    m_widget = gtk_dialog_new();
+
+    gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( _("Page setup") ) );
+
+    GtkWidget *main = gs_libGnomePrint->gnome_paper_selector_new_with_flags( native->GetPrintConfig(),
+        GNOME_PAPER_SELECTOR_MARGINS|GNOME_PAPER_SELECTOR_FEED_ORIENTATION );
+    gtk_container_set_border_width (GTK_CONTAINER (main), 8);
+    gtk_widget_show (main);
+
+    gtk_container_add( GTK_CONTAINER (GTK_DIALOG (m_widget)->vbox), main );
+
+    gtk_dialog_set_has_separator (GTK_DIALOG (m_widget), TRUE);
+
+    gtk_dialog_add_buttons (GTK_DIALOG (m_widget),
+                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                            GTK_STOCK_OK, GTK_RESPONSE_OK,
+                            NULL);
+
+    gtk_dialog_set_default_response (GTK_DIALOG (m_widget),
+                            GTK_RESPONSE_OK);
+}
+
+wxGnomePageSetupDialog::~wxGnomePageSetupDialog()
+{
+}
+
+wxPageSetupDialogData& wxGnomePageSetupDialog::GetPageSetupDialogData()
+{
+    return m_pageDialogData;
+}
+
+int wxGnomePageSetupDialog::ShowModal()
+{
+    wxGnomePrintNativeData *native =
+      (wxGnomePrintNativeData*) m_pageDialogData.GetPrintData().GetNativeData();
+
+    GnomePrintConfig *config = native->GetPrintConfig();
+
+
+    int ret = gtk_dialog_run( GTK_DIALOG(m_widget) );
+
+    if (ret == GTK_RESPONSE_OK)
+    {
+        // Transfer data back to m_pageDialogData
+        m_pageDialogData.GetPrintData().ConvertFromNative();
+
+        // I don't know how querying the last parameter works
+        double ml,mr,mt,mb,pw,ph;
+        gs_libGnomePrint->gnome_print_config_get_length (config,
+            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_LEFT, &ml, NULL);
+        gs_libGnomePrint->gnome_print_config_get_length (config,
+            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_RIGHT, &mr, NULL);
+        gs_libGnomePrint->gnome_print_config_get_length (config,
+            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_TOP, &mt, NULL);
+        gs_libGnomePrint->gnome_print_config_get_length (config,
+            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_BOTTOM, &mb, NULL);
+        gs_libGnomePrint->gnome_print_config_get_length (config,
+            (const guchar*) GNOME_PRINT_KEY_PAPER_WIDTH, &pw, NULL);
+        gs_libGnomePrint->gnome_print_config_get_length (config,
+            (const guchar*) GNOME_PRINT_KEY_PAPER_HEIGHT, &ph, NULL);
+
+        // This code converts correctly from what the user chose
+        // as the unit although I query Pts here
+        const GnomePrintUnit *mm_unit = gs_libGnomePrint->gnome_print_unit_get_by_abbreviation( (const guchar*) "mm" );
+        const GnomePrintUnit *pts_unit = gs_libGnomePrint->gnome_print_unit_get_by_abbreviation( (const guchar*) "Pts" );
+        gs_libGnomePrint->gnome_print_convert_distance( &ml, pts_unit, mm_unit );
+        gs_libGnomePrint->gnome_print_convert_distance( &mr, pts_unit, mm_unit );
+        gs_libGnomePrint->gnome_print_convert_distance( &mt, pts_unit, mm_unit );
+        gs_libGnomePrint->gnome_print_convert_distance( &mb, pts_unit, mm_unit );
+        gs_libGnomePrint->gnome_print_convert_distance( &pw, pts_unit, mm_unit );
+        gs_libGnomePrint->gnome_print_convert_distance( &ph, pts_unit, mm_unit );
+
+        m_pageDialogData.SetMarginTopLeft( wxPoint( (int)(ml+0.5), (int)(mt+0.5)) );
+        m_pageDialogData.SetMarginBottomRight( wxPoint( (int)(mr+0.5), (int)(mb+0.5)) );
+
+        m_pageDialogData.SetPaperSize( wxSize( (int)(pw+0.5), (int)(ph+0.5) ) );
+
+        ret = wxID_OK;
+    }
+    else
+    {
+        ret = wxID_CANCEL;
+    }
+
+    gtk_widget_destroy( m_widget );
+    m_widget = NULL;
+
+    return ret;
+}
+
+bool wxGnomePageSetupDialog::Validate()

 {
     return true;
 }
 
 {
     return true;
 }
 

-bool wxGnomePrintSetupDialog::TransferDataFromWindow()
+bool wxGnomePageSetupDialog::TransferDataToWindow()

 {
     return true;
 }
 
 {
     return true;
 }
 

+bool wxGnomePageSetupDialog::TransferDataFromWindow()
+{
+    return true;
+}

 
 //----------------------------------------------------------------------------
 // wxGnomePrinter
 
 //----------------------------------------------------------------------------
 // wxGnomePrinter


@@ -193,7 +815,7 @@ IMPLEMENT_CLASS(wxGnomePrinter, wxPrinterBase)
 wxGnomePrinter::wxGnomePrinter( wxPrintDialogData *data ) :
     wxPrinterBase( data )
 {
 wxGnomePrinter::wxGnomePrinter( wxPrintDialogData *data ) :
     wxPrinterBase( data )
 {

-    m_gpc = NULL;
+    m_native_preview = false;

 }
 
 wxGnomePrinter::~wxGnomePrinter()
 }
 
 wxGnomePrinter::~wxGnomePrinter()


@@ -209,14 +831,17 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
     }
 
     wxPrintData printdata = GetPrintDialogData().GetPrintData();
     }
 
     wxPrintData printdata = GetPrintDialogData().GetPrintData();

-    wxGnomePrintNativeData *data = 
+
+    wxGnomePrintNativeData *native =

         (wxGnomePrintNativeData*) printdata.GetNativeData();
 
         (wxGnomePrintNativeData*) printdata.GetNativeData();
 

-    // The GnomePrintJob is temporarily stored in the 
-    // native print data as the native print setup dialog
+    GnomePrintJob *job = gs_libGnomePrint->gnome_print_job_new( native->GetPrintConfig() );
+
+    // The GnomePrintJob is temporarily stored in the
+    // native print data as the native print dialog

     // needs to access it.
     // needs to access it.

-    GnomePrintJob *job = data->GetPrintJob();
-    m_gpc = gnome_print_job_get_context (job);
+    native->SetPrintJob( job );
+

 
     printout->SetIsPreview(false);
 
 
     printout->SetIsPreview(false);
 


@@ -224,17 +849,26 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
         m_printDialogData.SetMinPage(1);
     if (m_printDialogData.GetMaxPage() < 1)
         m_printDialogData.SetMaxPage(9999);
         m_printDialogData.SetMinPage(1);
     if (m_printDialogData.GetMaxPage() < 1)
         m_printDialogData.SetMaxPage(9999);

-    
+

     wxDC *dc;
     if (prompt)
         dc = PrintDialog( parent );
     else
     wxDC *dc;
     if (prompt)
         dc = PrintDialog( parent );
     else

-        dc = new wxGnomePrintDC( this );
-    
+#if wxUSE_NEW_DC
+        dc = new wxPrinterDC( printdata );  // TODO: check that this works
+#else
+        dc = new wxGnomePrinterDC( printdata );  // TODO: check that this works
+#endif
+
+    if (m_native_preview)
+        printout->SetIsPreview(true);
+

     if (!dc)
     {
     if (!dc)
     {

-        gnome_print_job_close( job );
-        sm_lastError = wxPRINTER_ERROR;
+        gs_libGnomePrint->gnome_print_job_close( job );
+        g_object_unref (job);
+        if (sm_lastError != wxPRINTER_CANCELLED)
+            sm_lastError = wxPRINTER_ERROR;

         return false;
     }
 
         return false;
     }
 


@@ -243,211 +877,751 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
 
     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( wxPostScriptDC::GetResolution(),
-                             wxPostScriptDC::GetResolution() );
-                             
+    printout->SetPPIPrinter( dc->GetResolution(),
+                             dc->GetResolution() );
+

     printout->SetDC(dc);
 
     int w, h;
     dc->GetSize(&w, &h);
     printout->SetPageSizePixels((int)w, (int)h);
     printout->SetDC(dc);
 
     int w, h;
     dc->GetSize(&w, &h);
     printout->SetPageSizePixels((int)w, (int)h);

-    dc->GetSizeMM(&w, &h);
-    printout->SetPageSizeMM((int)w, (int)h);
-    
+    printout->SetPaperRectPixels(wxRect(0, 0, w, h));
+    int mw, mh;
+    dc->GetSizeMM(&mw, &mh);
+    printout->SetPageSizeMM((int)mw, (int)mh);

     printout->OnPreparePrinting();
     printout->OnPreparePrinting();

-    printout->OnBeginPrinting();

 
 

-    if (!printout->OnBeginDocument(0, 0))
+    // Get some parameters from the printout, if defined
+    int fromPage, toPage;
+    int minPage, maxPage;
+    printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
+
+    if (maxPage == 0)

     {
     {

+        gs_libGnomePrint->gnome_print_job_close( job );
+        g_object_unref (job);

         sm_lastError = wxPRINTER_ERROR;
         sm_lastError = wxPRINTER_ERROR;

+        return false;

     }
     }

-    else
+
+    printout->OnBeginPrinting();
+
+    int minPageNum = minPage, maxPageNum = maxPage;
+
+    if ( !m_printDialogData.GetAllPages() )
+    {
+        minPageNum = m_printDialogData.GetFromPage();
+        maxPageNum = m_printDialogData.GetToPage();
+    }
+
+
+    int copyCount;
+    for ( copyCount = 1;
+          copyCount <= m_printDialogData.GetNoCopies();
+          copyCount++ )

     {
     {

+        if (!printout->OnBeginDocument(minPageNum, maxPageNum))
+        {
+            wxLogError(_("Could not start printing."));
+            sm_lastError = wxPRINTER_ERROR;
+            break;
+        }
+

         int pn;
         int pn;

-        for (pn = 1; pn <= 2; pn++)
+        for ( pn = minPageNum;
+              pn <= maxPageNum && printout->HasPage(pn);
+              pn++ )

         {
             dc->StartPage();
             printout->OnPrintPage(pn);
             dc->EndPage();
         }
         {
             dc->StartPage();
             printout->OnPrintPage(pn);
             dc->EndPage();
         }

-    
+

         printout->OnEndDocument();
         printout->OnEndPrinting();
     }
         printout->OnEndDocument();
         printout->OnEndPrinting();
     }

-    
-    gnome_print_job_close( job );
-    gnome_print_job_print( job );
-    
+
+    gs_libGnomePrint->gnome_print_job_close( job );
+    if (m_native_preview)
+    {
+        const wxCharBuffer title(wxGTK_CONV_SYS(_("Print preview")));
+        GtkWidget *preview = gs_libGnomePrint->gnome_print_job_preview_new
+                                     (
+                                        job,
+                                        (const guchar *)title.data()
+                                     );
+        gtk_widget_show(preview);
+    }
+    else
+    {
+        gs_libGnomePrint->gnome_print_job_print( job );
+    }
+
+    g_object_unref (job);

     delete dc;
     delete dc;

-    
+

     return (sm_lastError == wxPRINTER_NO_ERROR);
 }
 
 wxDC* wxGnomePrinter::PrintDialog( wxWindow *parent )
 {
     return (sm_lastError == wxPRINTER_NO_ERROR);
 }
 
 wxDC* wxGnomePrinter::PrintDialog( wxWindow *parent )
 {

-    wxPrintDialog dialog( parent, &m_printDialogData );
-    if (dialog.ShowModal() == wxID_CANCEL)
+    wxGnomePrintDialog dialog( parent, &m_printDialogData );
+    int ret = dialog.ShowModal();
+    if (ret == wxID_CANCEL)

     {
     {

-        sm_lastError = wxPRINTER_ERROR;
+        sm_lastError = wxPRINTER_CANCELLED;

         return NULL;
     }
         return NULL;
     }

-    
-    return new wxGnomePrintDC( this );
+
+    m_native_preview = ret == wxID_PREVIEW;
+
+    m_printDialogData = dialog.GetPrintDialogData();
+#if wxUSE_NEW_DC
+    return new wxPrinterDC( m_printDialogData.GetPrintData() );
+#else
+    return new wxGnomePrinterDC( m_printDialogData.GetPrintData() );
+#endif

 }
 
 }
 

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

 {
     return false;
 }
 
 //-----------------------------------------------------------------------------
 {
     return false;
 }
 
 //-----------------------------------------------------------------------------

-// wxGnomePrintDC
+// wxGnomePrinterDC

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

-IMPLEMENT_CLASS(wxGnomePrintDC, wxDCBase)
+// conversion
+static const double RAD2DEG  = 180.0 / M_PI;
+
+// we don't want to use only 72 dpi from GNOME print
+static const int DPI = 600;
+static const double PS2DEV = 600.0 / 72.0;
+static const double DEV2PS = 72.0 / 600.0;
+
+#define XLOG2DEV(x)     ((double)(LogicalToDeviceX(x)) * DEV2PS)
+#define XLOG2DEVREL(x)  ((double)(LogicalToDeviceXRel(x)) * DEV2PS)
+#define YLOG2DEV(x)     ((m_pageHeight - (double)LogicalToDeviceY(x)) * DEV2PS)
+#define YLOG2DEVREL(x)  ((double)(LogicalToDeviceYRel(x)) * DEV2PS)
+
+#if wxUSE_NEW_DC
+IMPLEMENT_ABSTRACT_CLASS(wxGnomePrinterDCImpl, wxDCImpl)
+#else
+IMPLEMENT_ABSTRACT_CLASS(wxGnomePrinterDC, wxDC)
+#endif

 
 

-wxGnomePrintDC::wxGnomePrintDC( wxGnomePrinter *printer )
+#if wxUSE_NEW_DC
+wxGnomePrinterDCImpl::wxGnomePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) :
+   wxDCImpl( owner )
+#else
+wxGnomePrinterDC::wxGnomePrinterDC( const wxPrintData& data )
+#endif

 {
 {

-    m_printer = printer;
-    
-    m_gpc = printer->GetPrintContext();
-    
-    m_layout = gnome_print_pango_create_layout( m_gpc );
+    m_printData = data;
+
+    wxGnomePrintNativeData *native =
+        (wxGnomePrintNativeData*) m_printData.GetNativeData();
+
+    m_job = native->GetPrintJob();
+    m_gpc = gs_libGnomePrint->gnome_print_job_get_context (m_job);
+
+    m_layout = gs_libGnomePrint->gnome_print_pango_create_layout( m_gpc );

     m_fontdesc = pango_font_description_from_string( "Sans 12" );
     m_fontdesc = pango_font_description_from_string( "Sans 12" );

-    
+    m_context = NULL;
+

     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_signY = -1;  // default y-axis bottom up -> top down
+
+    // Query page size. This seems to omit the margins
+    double pw,ph;
+    gs_libGnomePrint->gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph );
+
+    m_pageHeight = ph * PS2DEV;

 }
 
 }
 

-wxGnomePrintDC::~wxGnomePrintDC()
+wxGnomePrinterDCImpl::~wxGnomePrinterDCImpl()

 {
 }
 
 {
 }
 

-bool wxGnomePrintDC::Ok() const
+bool wxGnomePrinterDCImpl::IsOk() const

 {
     return true;
 }
 
 {
     return true;
 }
 

-bool wxGnomePrintDC::DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style )
+bool
+wxGnomePrinterDCImpl::DoFloodFill(wxCoord WXUNUSED(x1),
+                            wxCoord WXUNUSED(y1),
+                            const wxColour& WXUNUSED(col),
+                            int WXUNUSED(style))

 {
     return false;
 }
 
 {
     return false;
 }
 

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

 {
     return false;
 }
 
 {
     return false;
 }
 

-void wxGnomePrintDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
+void wxGnomePrinterDCImpl::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 );
 

-       gnome_print_moveto ( m_gpc, XDEV2LOG(x1), YDEV2LOG(y1) );
-       gnome_print_lineto ( m_gpc, XDEV2LOG(x2), YDEV2LOG(y2) );
-       gnome_print_stroke ( m_gpc);
-       
+    gs_libGnomePrint->gnome_print_moveto ( m_gpc, XLOG2DEV(x1), YLOG2DEV(y1) );
+    gs_libGnomePrint->gnome_print_lineto ( m_gpc, XLOG2DEV(x2), YLOG2DEV(y2) );
+    gs_libGnomePrint->gnome_print_stroke ( m_gpc);
+

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

-void wxGnomePrintDC::DoCrossHair(wxCoord x, wxCoord y)
+void wxGnomePrinterDCImpl::DoCrossHair(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))

 {
 }
 
 {
 }
 

-void wxGnomePrintDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc)
+void wxGnomePrinterDCImpl::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc)

 {
 {

-}
+    double dx = x1 - xc;
+    double dy = y1 - yc;
+    double radius = sqrt((double)(dx*dx+dy*dy));
+    double alpha1, alpha2;
+    if (x1 == x2 && y1 == y2)
+    {
+        alpha1 = 0.0;
+        alpha2 = 360.0;
+    }
+    else if ( wxIsNullDouble(radius) )
+    {
+        alpha1 =
+        alpha2 = 0.0;
+    }
+    else
+    {
+        alpha1 = (x1 - xc == 0) ?
+            (y1 - yc < 0) ? 90.0 : -90.0 :
+            -atan2(double(y1-yc), double(x1-xc)) * RAD2DEG;
+        alpha2 = (x2 - xc == 0) ?
+            (y2 - yc < 0) ? 90.0 : -90.0 :
+            -atan2(double(y2-yc), double(x2-xc)) * RAD2DEG;
+
+        while (alpha1 <= 0)   alpha1 += 360;
+        while (alpha2 <= 0)   alpha2 += 360; // adjust angles to be between
+        while (alpha1 > 360)  alpha1 -= 360; // 0 and 360 degree
+        while (alpha2 > 360)  alpha2 -= 360;
+    }

 
 

-void wxGnomePrintDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
-{
-}
+    if (m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT)
+    {
+        SetBrush( m_brush );
+        gs_libGnomePrint->gnome_print_moveto ( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc) );
+        gs_libGnomePrint->gnome_print_arcto( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL((int)radius), alpha1, alpha2, 0 );

 
 

-void wxGnomePrintDC::DoDrawPoint(wxCoord x, wxCoord y)
+        gs_libGnomePrint->gnome_print_fill( m_gpc );
+    }
+
+    if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT)
+    {
+        SetPen (m_pen);
+        gs_libGnomePrint->gnome_print_newpath( m_gpc );
+        gs_libGnomePrint->gnome_print_moveto ( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc) );
+        gs_libGnomePrint->gnome_print_arcto( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL((int)radius), alpha1, alpha2, 0 );
+        gs_libGnomePrint->gnome_print_closepath( m_gpc );
+
+        gs_libGnomePrint->gnome_print_stroke( m_gpc );
+    }
+
+    CalcBoundingBox (x1, y1);
+    CalcBoundingBox (x2, y2);
+    CalcBoundingBox (xc, yc);
+}
+
+void wxGnomePrinterDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)

 {
 {

+    x += w/2;
+    y += h/2;
+
+    double xx = XLOG2DEV(x);
+    double yy = YLOG2DEV(y);
+
+    gs_libGnomePrint->gnome_print_gsave( m_gpc );
+
+    gs_libGnomePrint->gnome_print_translate( m_gpc, xx, yy );
+    double scale = (double)YLOG2DEVREL(h) / (double) XLOG2DEVREL(w);
+    gs_libGnomePrint->gnome_print_scale( m_gpc, 1.0, scale );
+
+    xx = 0.0;
+    yy = 0.0;
+
+    if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)
+    {
+        SetBrush( m_brush );
+
+        gs_libGnomePrint->gnome_print_moveto ( m_gpc, xx, yy );
+        gs_libGnomePrint->gnome_print_arcto( m_gpc, xx, yy,
+            XLOG2DEVREL(w)/2, sa, ea, 0 );
+        gs_libGnomePrint->gnome_print_moveto ( m_gpc, xx, yy );
+
+        gs_libGnomePrint->gnome_print_fill( m_gpc );
+    }
+
+    if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)
+    {
+        SetPen (m_pen);
+
+        gs_libGnomePrint->gnome_print_arcto( m_gpc, xx, yy,
+            XLOG2DEVREL(w)/2, sa, ea, 0 );
+
+        gs_libGnomePrint->gnome_print_stroke( m_gpc );
+    }
+
+    gs_libGnomePrint->gnome_print_grestore( m_gpc );
+
+    CalcBoundingBox( x, y );
+    CalcBoundingBox( x+w, y+h );

 }
 
 }
 

-void wxGnomePrintDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
+void wxGnomePrinterDCImpl::DoDrawPoint(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))

 {
 }
 
 {
 }
 

-void wxGnomePrintDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
+void wxGnomePrinterDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)

 {
 {

+    if (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return;
+
+    if (n <= 0) return;
+
+    SetPen (m_pen);
+
+    int i;
+    for ( i =0; i<n ; i++ )
+        CalcBoundingBox( points[i].x+xoffset, points[i].y+yoffset);
+
+    gs_libGnomePrint->gnome_print_moveto ( m_gpc, XLOG2DEV(points[0].x+xoffset), YLOG2DEV(points[0].y+yoffset) );
+
+    for (i = 1; i < n; i++)
+        gs_libGnomePrint->gnome_print_lineto ( m_gpc, XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset) );
+
+    gs_libGnomePrint->gnome_print_stroke ( m_gpc);

 }
 
 }
 

-void wxGnomePrintDC::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
+void wxGnomePrinterDCImpl::DoDrawPolygon(int n, wxPoint points[],
+                                   wxCoord xoffset, wxCoord yoffset,
+                                   int WXUNUSED(fillStyle))

 {
 {

+    if (n==0) return;
+
+    if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)
+    {
+        SetBrush( m_brush );
+
+        int x = points[0].x + xoffset;
+        int y = points[0].y + yoffset;
+        CalcBoundingBox( x, y );
+        gs_libGnomePrint->gnome_print_newpath( m_gpc );
+        gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+        int i;
+        for (i = 1; i < n; i++)
+        {
+            x = points[i].x + xoffset;
+            y = points[i].y + yoffset;
+            gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+            CalcBoundingBox( x, y );
+        }
+        gs_libGnomePrint->gnome_print_closepath( m_gpc );
+        gs_libGnomePrint->gnome_print_fill( m_gpc );
+    }
+
+    if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)
+    {
+        SetPen (m_pen);
+
+        int x = points[0].x + xoffset;
+        int y = points[0].y + yoffset;
+        gs_libGnomePrint->gnome_print_newpath( m_gpc );
+        gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+        int i;
+        for (i = 1; i < n; i++)
+        {
+            x = points[i].x + xoffset;
+            y = points[i].y + yoffset;
+            gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+            CalcBoundingBox( x, y );
+        }
+        gs_libGnomePrint->gnome_print_closepath( m_gpc );
+        gs_libGnomePrint->gnome_print_stroke( m_gpc );
+    }

 }
 
 }
 

-void wxGnomePrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxGnomePrinterDCImpl::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)

 {
 {

-    if (m_brush.GetStyle () != wxTRANSPARENT)
+#if wxUSE_NEW_DC
+    wxDCImpl::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );
+#else
+    wxDC::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );
+#endif
+}
+
+void wxGnomePrinterDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+{
+    width--;
+    height--;
+
+    if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)

     {
         SetBrush( m_brush );
     {
         SetBrush( m_brush );

-        
-        gnome_print_newpath( m_gpc );
-        gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
-        gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) );
-        gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) );
-        gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) );
-        gnome_print_closepath( m_gpc );
-        gnome_print_fill( m_gpc );
+
+        gs_libGnomePrint->gnome_print_newpath( m_gpc );
+        gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+        gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) );
+        gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) );
+        gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) );
+        gs_libGnomePrint->gnome_print_closepath( m_gpc );
+        gs_libGnomePrint->gnome_print_fill( m_gpc );

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

-    if (m_pen.GetStyle () != wxTRANSPARENT)
+    if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)

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

-        gnome_print_newpath( m_gpc );
-        gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
-        gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) );
-        gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) );
-        gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) );
-        gnome_print_closepath( m_gpc );
-        gnome_print_stroke( m_gpc );
-        
+        gs_libGnomePrint->gnome_print_newpath( m_gpc );
+        gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+        gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) );
+        gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) );
+        gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) );
+        gs_libGnomePrint->gnome_print_closepath( m_gpc );
+        gs_libGnomePrint->gnome_print_stroke( m_gpc );
+

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

-void wxGnomePrintDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
+void wxGnomePrinterDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)

 {
 {

+    width--;
+    height--;
+
+    wxCoord rad = wxRound( radius );
+
+    if (m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT)
+    {
+        SetBrush(m_brush);
+        gs_libGnomePrint->gnome_print_newpath(m_gpc);
+        gs_libGnomePrint->gnome_print_moveto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
+        gs_libGnomePrint->gnome_print_curveto(m_gpc,
+                                    XLOG2DEV(x + rad),YLOG2DEV(y),
+                                    XLOG2DEV(x),YLOG2DEV(y),
+                                    XLOG2DEV(x),YLOG2DEV(y + rad));
+        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x),YLOG2DEV(y + height - rad));
+        gs_libGnomePrint->gnome_print_curveto(m_gpc,
+                                    XLOG2DEV(x),YLOG2DEV(y + height - rad),
+                                    XLOG2DEV(x),YLOG2DEV(y + height),
+                                    XLOG2DEV(x + rad),YLOG2DEV(y + height));
+        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + width - rad),YLOG2DEV(y + height));
+        gs_libGnomePrint->gnome_print_curveto(m_gpc,
+                                    XLOG2DEV(x + width - rad),YLOG2DEV(y + height),
+                                    XLOG2DEV(x + width),YLOG2DEV(y + height),
+                                    XLOG2DEV(x + width),YLOG2DEV(y + height - rad));
+        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + width),YLOG2DEV(y + rad));
+        gs_libGnomePrint->gnome_print_curveto(m_gpc,
+                                    XLOG2DEV(x + width),YLOG2DEV(y + rad),
+                                    XLOG2DEV(x + width),YLOG2DEV(y),
+                                    XLOG2DEV(x + width - rad),YLOG2DEV(y));
+        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
+        gs_libGnomePrint->gnome_print_closepath(m_gpc);
+        gs_libGnomePrint->gnome_print_fill(m_gpc);
+
+        CalcBoundingBox(x,y);
+        CalcBoundingBox(x+width,y+height);
+    }
+
+    if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT)
+    {
+        SetPen(m_pen);
+        gs_libGnomePrint->gnome_print_newpath(m_gpc);
+        gs_libGnomePrint->gnome_print_moveto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
+        gs_libGnomePrint->gnome_print_curveto(m_gpc,
+                                    XLOG2DEV(x + rad),YLOG2DEV(y),
+                                    XLOG2DEV(x),YLOG2DEV(y),
+                                    XLOG2DEV(x),YLOG2DEV(y + rad));
+        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x),YLOG2DEV(y + height - rad));
+        gs_libGnomePrint->gnome_print_curveto(m_gpc,
+                                    XLOG2DEV(x),YLOG2DEV(y + height - rad),
+                                    XLOG2DEV(x),YLOG2DEV(y + height),
+                                    XLOG2DEV(x + rad),YLOG2DEV(y + height));
+        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + width - rad),YLOG2DEV(y + height));
+        gs_libGnomePrint->gnome_print_curveto(m_gpc,
+                                    XLOG2DEV(x + width - rad),YLOG2DEV(y + height),
+                                    XLOG2DEV(x + width),YLOG2DEV(y + height),
+                                    XLOG2DEV(x + width),YLOG2DEV(y + height - rad));
+        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + width),YLOG2DEV(y + rad));
+        gs_libGnomePrint->gnome_print_curveto(m_gpc,
+                                    XLOG2DEV(x + width),YLOG2DEV(y + rad),
+                                    XLOG2DEV(x + width),YLOG2DEV(y),
+                                    XLOG2DEV(x + width - rad),YLOG2DEV(y));
+        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
+        gs_libGnomePrint->gnome_print_closepath(m_gpc);
+        gs_libGnomePrint->gnome_print_stroke(m_gpc);
+
+        CalcBoundingBox(x,y);
+        CalcBoundingBox(x+width,y+height);
+    }
+}
+
+void wxGnomePrinterDCImpl::makeEllipticalPath(wxCoord x, wxCoord y,
+                                        wxCoord width, wxCoord height)
+{
+    double r = 4 * (sqrt(2.) - 1) / 3;
+    double  halfW = 0.5 * width,
+            halfH = 0.5 * height,
+            halfWR = r * halfW,
+            halfHR = r * halfH;
+    wxCoord halfWI = (wxCoord) halfW,
+            halfHI = (wxCoord) halfH;
+
+    gs_libGnomePrint->gnome_print_newpath( m_gpc );
+
+    // Approximate an ellipse using four cubic splines, clockwise from 0 deg */
+    gs_libGnomePrint->gnome_print_moveto( m_gpc,
+                XLOG2DEV(x + width),
+                YLOG2DEV(y + halfHI) );
+    gs_libGnomePrint->gnome_print_curveto( m_gpc,
+                XLOG2DEV(x + width),
+                YLOG2DEV(y + (wxCoord) rint (halfH + halfHR)),
+                XLOG2DEV(x + (wxCoord) rint(halfW + halfWR)),
+                YLOG2DEV(y + height),
+                XLOG2DEV(x + halfWI),
+                YLOG2DEV(y + height) );
+    gs_libGnomePrint->gnome_print_curveto( m_gpc,
+                XLOG2DEV(x + (wxCoord) rint(halfW - halfWR)),
+                YLOG2DEV(y + height),
+                XLOG2DEV(x),
+                YLOG2DEV(y + (wxCoord) rint (halfH + halfHR)),
+                XLOG2DEV(x), YLOG2DEV(y+halfHI) );
+    gs_libGnomePrint->gnome_print_curveto( m_gpc,
+                XLOG2DEV(x),
+                YLOG2DEV(y + (wxCoord) rint (halfH - halfHR)),
+                XLOG2DEV(x + (wxCoord) rint (halfW - halfWR)),
+                YLOG2DEV(y),
+                XLOG2DEV(x+halfWI), YLOG2DEV(y) );
+    gs_libGnomePrint->gnome_print_curveto( m_gpc,
+                XLOG2DEV(x + (wxCoord) rint(halfW + halfWR)),
+                YLOG2DEV(y),
+                XLOG2DEV(x + width),
+                YLOG2DEV(y + (wxCoord) rint(halfH - halfHR)),
+                XLOG2DEV(x + width), YLOG2DEV(y + halfHI) );
+
+    gs_libGnomePrint->gnome_print_closepath(m_gpc);
+}
+
+void wxGnomePrinterDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+{
+    width--;
+    height--;
+
+    if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)
+    {
+        SetBrush( m_brush );
+        makeEllipticalPath( x, y, width, height );
+        gs_libGnomePrint->gnome_print_fill( m_gpc );
+        CalcBoundingBox( x, y );
+        CalcBoundingBox( x + width, y + height );
+    }
+
+    if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)
+    {
+        SetPen (m_pen);
+        makeEllipticalPath( x, y, width, height );
+        gs_libGnomePrint->gnome_print_stroke( m_gpc );
+        CalcBoundingBox( x, y );
+        CalcBoundingBox( x + width, y + height );
+    }

 }
 
 }
 

-void wxGnomePrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+#if wxUSE_SPLINES
+void wxGnomePrinterDCImpl::DoDrawSpline(const wxPointList *points)

 {
 {

+    SetPen (m_pen);
+
+    double c, d, x1, y1, x2, y2, x3, y3;
+    wxPoint *p, *q;
+
+    wxPointList::compatibility_iterator node = points->GetFirst();
+    p = node->GetData();
+    x1 = p->x;
+    y1 = p->y;
+
+    node = node->GetNext();
+    p = node->GetData();
+    c = p->x;
+    d = p->y;
+    x3 =
+         (double)(x1 + c) / 2;
+    y3 =
+         (double)(y1 + d) / 2;
+
+    gs_libGnomePrint->gnome_print_newpath( m_gpc );
+    gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV((wxCoord)x1), YLOG2DEV((wxCoord)y1) );
+    gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV((wxCoord)x3), YLOG2DEV((wxCoord)y3) );
+
+    CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
+    CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );
+
+    node = node->GetNext();
+    while (node)
+    {
+        q = node->GetData();
+
+        x1 = x3;
+        y1 = y3;
+        x2 = c;
+        y2 = d;
+        c = q->x;
+        d = q->y;
+        x3 = (double)(x2 + c) / 2;
+        y3 = (double)(y2 + d) / 2;
+
+        gs_libGnomePrint->gnome_print_curveto(m_gpc,
+            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 );
+
+        node = node->GetNext();
+    }
+
+    gs_libGnomePrint->gnome_print_lineto ( m_gpc, XLOG2DEV((wxCoord)c), YLOG2DEV((wxCoord)d) );
+
+    gs_libGnomePrint->gnome_print_stroke( m_gpc );

 }
 }

+#endif // wxUSE_SPLINES

 
 

-void wxGnomePrintDC::DoDrawSpline(wxList *points)
+bool
+wxGnomePrinterDCImpl::DoBlit(wxCoord xdest, wxCoord ydest,
+                      wxCoord width, wxCoord height,
+                      wxDC *source,
+                      wxCoord xsrc, wxCoord ysrc,
+                      int rop,
+                      bool WXUNUSED(useMask),
+                      wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask))

 {
 {

+    wxCHECK_MSG( source, false, wxT("invalid source dc") );
+
+    // blit into a bitmap
+    wxBitmap bitmap( width, height );
+    wxMemoryDC memDC;
+    memDC.SelectObject(bitmap);
+    memDC.Blit(0, 0, width, height, source, xsrc, ysrc, rop); /* TODO: Blit transparently? */
+    memDC.SelectObject(wxNullBitmap);
+
+    // draw bitmap. scaling and positioning is done there
+    GetOwner()->DrawBitmap( bitmap, xdest, ydest );
+
+    return true;

 }
 
 }
 

-bool wxGnomePrintDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
-            wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop, bool useMask,
-            wxCoord xsrcMask, wxCoord ysrcMask)
+void wxGnomePrinterDCImpl::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )

 {
 {

-    return false;
+    DoDrawBitmap( icon, x, y, true );

 }
 
 }
 

-void wxGnomePrintDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
+void
+wxGnomePrinterDCImpl::DoDrawBitmap(const wxBitmap& bitmap,
+                             wxCoord x, wxCoord y,
+                             bool WXUNUSED(useMask))

 {
 {

+    if (!bitmap.Ok()) return;
+
+    if (bitmap.HasPixbuf())
+    {
+        GdkPixbuf *pixbuf = bitmap.GetPixbuf();
+        guchar *raw_image = gdk_pixbuf_get_pixels( pixbuf );
+        bool has_alpha = gdk_pixbuf_get_has_alpha( pixbuf );
+        int rowstride = gdk_pixbuf_get_rowstride( pixbuf );
+        int height = gdk_pixbuf_get_height( pixbuf );
+        int width = gdk_pixbuf_get_width( pixbuf );
+
+        gs_libGnomePrint->gnome_print_gsave( m_gpc );
+        double matrix[6];
+        matrix[0] = XLOG2DEVREL(width);
+        matrix[1] = 0;
+        matrix[2] = 0;
+        matrix[3] = YLOG2DEVREL(height);
+        matrix[4] = XLOG2DEV(x);
+        matrix[5] = YLOG2DEV(y+height);
+        gs_libGnomePrint->gnome_print_concat( m_gpc, matrix );
+        gs_libGnomePrint->gnome_print_moveto(  m_gpc, 0, 0 );
+        if (has_alpha)
+            gs_libGnomePrint->gnome_print_rgbaimage( m_gpc, (guchar *)raw_image, width, height, rowstride );
+        else
+            gs_libGnomePrint->gnome_print_rgbimage( m_gpc, (guchar *)raw_image, width, height, rowstride );
+        gs_libGnomePrint->gnome_print_grestore( m_gpc );
+    }
+    else
+    {
+        wxImage image = bitmap.ConvertToImage();
+
+        if (!image.Ok()) return;
+
+        gs_libGnomePrint->gnome_print_gsave( m_gpc );
+        double matrix[6];
+        matrix[0] = XLOG2DEVREL(image.GetWidth());
+        matrix[1] = 0;
+        matrix[2] = 0;
+        matrix[3] = YLOG2DEVREL(image.GetHeight());
+        matrix[4] = XLOG2DEV(x);
+        matrix[5] = YLOG2DEV(y+image.GetHeight());
+        gs_libGnomePrint->gnome_print_concat( m_gpc, matrix );
+        gs_libGnomePrint->gnome_print_moveto(  m_gpc, 0, 0 );
+        gs_libGnomePrint->gnome_print_rgbimage( m_gpc, (guchar*) image.GetData(), image.GetWidth(), image.GetHeight(), image.GetWidth()*3 );
+        gs_libGnomePrint->gnome_print_grestore( m_gpc );
+    }

 }
 
 }
 

-void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask )
+void wxGnomePrinterDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y )

 {
 {

+    DoDrawRotatedText( text, x, y, 0.0 );

 }
 
 }
 

-void wxGnomePrintDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y )
+void wxGnomePrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)

 {
 {

+    double xx = XLOG2DEV(x);
+    double yy = YLOG2DEV(y);
+
+    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
+
+    size_t datalen = strlen(data);
+    pango_layout_set_text( m_layout, data, datalen);
+
+    if (underlined)
+    {
+        PangoAttrList *attrs = pango_attr_list_new();
+        PangoAttribute *a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
+        a->start_index = 0;
+        a->end_index = datalen;
+        pango_attr_list_insert(attrs, a);
+        pango_layout_set_attributes(m_layout, attrs);
+        pango_attr_list_unref(attrs);
+    }
+

     if (m_textForegroundColour.Ok())
     {
         unsigned char red = m_textForegroundColour.Red();
     if (m_textForegroundColour.Ok())
     {
         unsigned char red = m_textForegroundColour.Red();


@@ -460,7 +1634,7 @@ void wxGnomePrintDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y )
             double bluePS = (double)(blue) / 255.0;
             double greenPS = (double)(green) / 255.0;
 
             double bluePS = (double)(blue) / 255.0;
             double greenPS = (double)(green) / 255.0;
 

-            gnome_print_setrgbcolor( m_gpc, redPS, bluePS, greenPS );
+            gs_libGnomePrint->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );

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


@@ -468,79 +1642,106 @@ void wxGnomePrintDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y )
         }
     }
 
         }
     }
 

-    x = XLOG2DEV(x);
-    y = YLOG2DEV(y);
-    
-    bool underlined = m_font.Ok() && m_font.GetUnderlined();
-
-#if wxUSE_UNICODE
-    const wxCharBuffer data = wxConvUTF8.cWC2MB( text );
-#else
-    const wxWCharBuffer wdata = wxConvLocal.cMB2WC( text );
-    if ( !wdata )
-        return;
-    const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
+    int w,h;
+    pango_layout_get_pixel_size( m_layout, &w, &h );
+#if 0
+        if ( m_backgroundMode == wxSOLID )
+        {
+            gdk_gc_set_foreground(m_textGC, m_textBackgroundColour.GetColor());
+            gdk_draw_rectangle(m_window, m_textGC, TRUE, xx, yy, w, h);
+            gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
+        }

 #endif
 
 #endif
 

-    size_t datalen = strlen((const char*)data);
-    pango_layout_set_text( m_layout, (const char*) data, datalen);
-    
-    if (underlined)
-    {
-        PangoAttrList *attrs = pango_attr_list_new();
-        PangoAttribute *a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
-        a->start_index = 0;
-        a->end_index = datalen;
-        pango_attr_list_insert(attrs, a);
-        pango_layout_set_attributes(m_layout, attrs);
-        pango_attr_list_unref(attrs);
-    }
+    // Draw layout.
+    gs_libGnomePrint->gnome_print_moveto (m_gpc, xx, yy);
+
+    gs_libGnomePrint->gnome_print_gsave( m_gpc );

 
 

-       gnome_print_moveto (m_gpc, x, y);
-       gnome_print_pango_layout( m_gpc, m_layout );
+    gs_libGnomePrint->gnome_print_scale( m_gpc, m_scaleX * DEV2PS, m_scaleY * DEV2PS );
+
+    if (fabs(angle) > 0.00001)
+        gs_libGnomePrint->gnome_print_rotate( m_gpc, angle );
+
+    gs_libGnomePrint->gnome_print_pango_layout( m_gpc, m_layout );
+
+    gs_libGnomePrint->gnome_print_grestore( m_gpc );

 
     if (underlined)
     {
         // undo underline attributes setting:
         pango_layout_set_attributes(m_layout, NULL);
     }
 
     if (underlined)
     {
         // undo underline attributes setting:
         pango_layout_set_attributes(m_layout, NULL);
     }

-    
-//    CalcBoundingBox (x + width, y + height);
-    CalcBoundingBox (x, y);
-}

 
 

-void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)
-{
+    CalcBoundingBox (x + w, y + h);

 }
 
 }
 

-void wxGnomePrintDC::Clear()
+void wxGnomePrinterDCImpl::Clear()

 {
 }
 
 {
 }
 

-void wxGnomePrintDC::SetFont( const wxFont& font )
+void wxGnomePrinterDCImpl::SetFont( const wxFont& font )

 {
     m_font = font;
 {
     m_font = font;

-    
+

     if (m_font.Ok())
     {
         if (m_fontdesc)
             pango_font_description_free( m_fontdesc );
     if (m_font.Ok())
     {
         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 );

-        
+

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

-void wxGnomePrintDC::SetPen( const wxPen& pen )
+void wxGnomePrinterDCImpl::SetPen( const wxPen& pen )

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

-    int oldStyle = m_pen.GetStyle();
-

     m_pen = pen;
 
     m_pen = pen;
 

-    gnome_print_setlinewidth( m_gpc, XLOG2DEVREL( 1000 * m_pen.GetWidth() ) / 1000.0f );
+    double width;
+
+    if (m_pen.GetWidth() <= 0)
+        width = 0.1;
+    else
+        width = (double) m_pen.GetWidth();
+
+    gs_libGnomePrint->gnome_print_setlinewidth( m_gpc, width * DEV2PS * m_scaleX );
+
+    static const double dotted[] =  {2.0, 5.0};
+    static const double short_dashed[] = {4.0, 4.0};
+    static const double wxCoord_dashed[] = {4.0, 8.0};
+    static const double dotted_dashed[] = {6.0, 6.0, 2.0, 6.0};
+
+    switch (m_pen.GetStyle())
+    {
+        case wxPENSTYLE_DOT:        gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, dotted, 0 ); break;
+        case wxPENSTYLE_SHORT_DASH: gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, short_dashed, 0 ); break;
+        case wxPENSTYLE_LONG_DASH:  gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, wxCoord_dashed, 0 ); break;
+        case wxPENSTYLE_DOT_DASH:   gs_libGnomePrint->gnome_print_setdash( m_gpc, 4, dotted_dashed, 0 );  break;
+        case wxPENSTYLE_USER_DASH:
+        {
+            // It may be noted that libgnomeprint between at least
+            // versions 2.8.0 and 2.12.1 makes a copy of the dashes
+            // and then leak the memory since it doesn't set the
+            // internal flag "privatedash" to 0.
+            wxDash *wx_dashes;
+            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];
+            gs_libGnomePrint -> gnome_print_setdash( m_gpc, num, g_dashes, 0);
+            g_free( g_dashes );
+        }
+        break;
+        case wxPENSTYLE_SOLID:
+        case wxPENSTYLE_TRANSPARENT:
+        default:              gs_libGnomePrint->gnome_print_setdash( m_gpc, 0, NULL, 0 );   break;
+    }
+

 
     unsigned char red = m_pen.GetColour().Red();
     unsigned char blue = m_pen.GetColour().Blue();
 
     unsigned char red = m_pen.GetColour().Red();
     unsigned char blue = m_pen.GetColour().Blue();


@@ -552,7 +1753,7 @@ void wxGnomePrintDC::SetPen( const wxPen& pen )
         double bluePS = (double)(blue) / 255.0;
         double greenPS = (double)(green) / 255.0;
 
         double bluePS = (double)(blue) / 255.0;
         double greenPS = (double)(green) / 255.0;
 

-        gnome_print_setrgbcolor( m_gpc, redPS, bluePS, greenPS );
+        gs_libGnomePrint->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );

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


@@ -560,61 +1761,139 @@ void wxGnomePrintDC::SetPen( const wxPen& pen )
     }
 }
 
     }
 }
 

-void wxGnomePrintDC::SetBrush( const wxBrush& brush )
+void wxGnomePrinterDCImpl::SetBrush( const wxBrush& brush )

 {
 {

+    if (!brush.Ok()) return;
+
+    m_brush = brush;
+
+    // Brush colour
+    unsigned char red = m_brush.GetColour().Red();
+    unsigned char blue = m_brush.GetColour().Blue();
+    unsigned char green = m_brush.GetColour().Green();
+
+    if (!m_colour)
+    {
+        // Anything not white is black
+        if (! (red == (unsigned char) 255 &&
+               blue == (unsigned char) 255 &&
+               green == (unsigned char) 255) )
+        {
+            red = (unsigned char) 0;
+            green = (unsigned char) 0;
+            blue = (unsigned char) 0;
+        }
+        // setgray here ?
+    }
+
+    if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue))
+    {
+        double redPS = (double)(red) / 255.0;
+        double bluePS = (double)(blue) / 255.0;
+        double greenPS = (double)(green) / 255.0;
+
+        gs_libGnomePrint->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );
+
+        m_currentRed = red;
+        m_currentBlue = blue;
+        m_currentGreen = green;
+    }

 }
 
 }
 

-void wxGnomePrintDC::SetLogicalFunction( int function )
+void wxGnomePrinterDCImpl::SetLogicalFunction(int WXUNUSED(function))

 {
 }
 
 {
 }
 

-void wxGnomePrintDC::SetBackground( const wxBrush& brush )
+void wxGnomePrinterDCImpl::SetBackground(const wxBrush& WXUNUSED(brush))

 {
 }
 
 {
 }
 

-void wxGnomePrintDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxGnomePrinterDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)

 {
 {

+#if wxUSE_NEW_DC
+    m_clipping = TRUE;    // TODO move somewhere else
+    m_clipX1 = x;
+    m_clipY1 = y;
+    m_clipX2 = x + width;
+    m_clipY2 = y + height;
+#else
+    wxDC::DoSetClippingRegion( x, y, width, height );
+#endif
+
+    gs_libGnomePrint->gnome_print_gsave( m_gpc );
+
+    gs_libGnomePrint->gnome_print_newpath( m_gpc );
+    gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+    gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) );
+    gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) );
+    gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) );
+    gs_libGnomePrint->gnome_print_closepath( m_gpc );
+    gs_libGnomePrint->gnome_print_clip( m_gpc );

 }
 
 }
 

-void wxGnomePrintDC::DestroyClippingRegion()
+void wxGnomePrinterDCImpl::DestroyClippingRegion()

 {
 {

+#if wxUSE_NEW_DC
+    wxDCImpl::DestroyClippingRegion();
+#else
+    wxDC::DestroyClippingRegion();
+#endif
+
+    gs_libGnomePrint->gnome_print_grestore( m_gpc );
+
+#if 0
+    // not needed, we set the values in each
+    // drawing method anyways
+    SetPen( m_pen );
+    SetBrush( m_brush );
+    SetFont( m_font );
+#endif

 }
 
 }
 

-bool wxGnomePrintDC::StartDoc(const wxString& message)
+bool wxGnomePrinterDCImpl::StartDoc(const wxString& WXUNUSED(message))

 {
 {

-    SetDeviceOrigin( 0,0 );
-    

     return true;
 }
 
     return true;
 }
 

-void wxGnomePrintDC::EndDoc()
+void wxGnomePrinterDCImpl::EndDoc()

 {
 {

+    gs_libGnomePrint->gnome_print_end_doc( m_gpc );

 }
 
 }
 

-void wxGnomePrintDC::StartPage()
+void wxGnomePrinterDCImpl::StartPage()

 {
 {

-       gnome_print_beginpage( m_gpc, (const guchar*) "1" );
+    gs_libGnomePrint->gnome_print_beginpage( m_gpc, (const guchar*) "page" );

 }
 
 }
 

-void wxGnomePrintDC::EndPage()
+void wxGnomePrinterDCImpl::EndPage()

 {
 {

-       gnome_print_showpage( m_gpc );
+    gs_libGnomePrint->gnome_print_showpage( m_gpc );

 }
 
 }
 

-wxCoord wxGnomePrintDC::GetCharHeight() const
+wxCoord wxGnomePrinterDCImpl::GetCharHeight() const

 {
 {

-    return 0;
+    pango_layout_set_text( m_layout, "H", 1 );
+
+    int w,h;
+    pango_layout_get_pixel_size( m_layout, &w, &h );
+
+    return h;

 }
 
 }
 

-wxCoord wxGnomePrintDC::GetCharWidth() const
+wxCoord wxGnomePrinterDCImpl::GetCharWidth() const

 {
 {

-    return 0;
+    pango_layout_set_text( m_layout, "H", 1 );
+
+    int w,h;
+    pango_layout_get_pixel_size( m_layout, &w, &h );
+
+    return w;

 }
 
 }
 

-void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height,
+void wxGnomePrinterDCImpl::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height,

                      wxCoord *descent,
                      wxCoord *externalLeading,
                      wxCoord *descent,
                      wxCoord *externalLeading,

-                     wxFont *theFont ) const
+                     const wxFont *theFont ) const

 {
     if ( width )
         *width = 0;
 {
     if ( width )
         *width = 0;


@@ -625,46 +1904,41 @@ void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxC
     if ( externalLeading )
         *externalLeading = 0;
 
     if ( externalLeading )
         *externalLeading = 0;
 

-    if (string.IsEmpty())
+    if (string.empty())

     {
         return;
     }
     {
         return;
     }

-    
-    // Set new font description
-    if (theFont)
-        pango_layout_set_font_description( m_layout, theFont->GetNativeFontInfo()->description );
-        
+

     // Set layout's text
     // Set layout's text

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

 #else
 #else

-    const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string );
-    if ( !wdata )
-    {
-        if (width) (*width) = 0;
-        if (height) (*height) = 0;
-        return;
-    }
-    const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
-    const char *dataUTF8 = (const char *)data;
+    const wxCharBuffer dataUTF8 = string.utf8_str();

 #endif
 
 #endif
 

-    if ( !dataUTF8 )
-    {
-        // hardly ideal, but what else can we do if conversion failed?
-        return;
-    }
+    PangoFontDescription *desc = (theFont) ? theFont->GetNativeFontInfo()->description : m_fontdesc;
+
+    gint oldSize = pango_font_description_get_size( desc );
+    double size = oldSize;
+    size = size * m_scaleY;
+    pango_font_description_set_size( desc, (gint)size );
+
+    // apply scaled font
+    pango_layout_set_font_description( m_layout, desc );

 
     pango_layout_set_text( m_layout, dataUTF8, strlen(dataUTF8) );
 
     pango_layout_set_text( m_layout, dataUTF8, strlen(dataUTF8) );

- 
-    int w,h;
+
+    int w, h;

     pango_layout_get_pixel_size( m_layout, &w, &h );
     pango_layout_get_pixel_size( m_layout, &w, &h );

-    
+
+

     if (width)
     if (width)

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

     if (height)
     if (height)

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

     if (descent)
     {
         PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
     if (descent)
     {
         PangoLayoutIter *iter = pango_layout_get_iter(m_layout);


@@ -672,91 +1946,198 @@ void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxC
         pango_layout_iter_free(iter);
         *descent = h - PANGO_PIXELS(baseline);
     }
         pango_layout_iter_free(iter);
         *descent = h - PANGO_PIXELS(baseline);
     }

-    
-    // Reset old font description
-    if (theFont)
-        pango_layout_set_font_description( m_layout, m_fontdesc );
+
+    // reset unscaled size
+    pango_font_description_set_size( desc, oldSize );
+
+    // reset unscaled font
+    pango_layout_set_font_description( m_layout, m_fontdesc );

 }
 
 }
 

-void wxGnomePrintDC::DoGetSize(int* width, int* height) const
+void wxGnomePrinterDCImpl::DoGetSize(int* width, int* height) const

 {
 {

-    // No idea if that is efficient
-    GnomePrintConfig *config = gnome_print_config_default();
+    wxGnomePrintNativeData *native =
+      (wxGnomePrintNativeData*) m_printData.GetNativeData();
+
+    // Query page size. This seems to omit the margins
+    double pw,ph;
+    gs_libGnomePrint->gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph );

 
 

-    double w,h;
-    bool result = gnome_print_config_get_page_size( config, &w, &h );
-    
-    if (!result)
-    {
-        // Standard PS resolution DIN A4 size.
-        w = 595.0;
-        h = 842.0;
-    }
-    

     if (width)
     if (width)

-        *width = (int) w;
+        *width = wxRound( pw * PS2DEV );
+

     if (height)
     if (height)

-        *height = (int) h;
+        *height = wxRound( ph * PS2DEV );

 }
 
 }
 

-void wxGnomePrintDC::DoGetSizeMM(int *width, int *height) const
+void wxGnomePrinterDCImpl::DoGetSizeMM(int *width, int *height) const

 {
 {

-    double w,h;
-    
-    /// Later, for now DIN A4
-    w = 210.0;
-    h = 297.0;
-    
+    wxGnomePrintNativeData *native =
+      (wxGnomePrintNativeData*) m_printData.GetNativeData();
+
+    // This code assumes values in Pts.
+
+    double pw,ph;
+    gs_libGnomePrint->gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph );
+
+    // Convert to mm.
+
+    const GnomePrintUnit *mm_unit = gs_libGnomePrint->gnome_print_unit_get_by_abbreviation( (const guchar*) "mm" );
+    const GnomePrintUnit *pts_unit = gs_libGnomePrint->gnome_print_unit_get_by_abbreviation( (const guchar*) "Pts" );
+    gs_libGnomePrint->gnome_print_convert_distance( &pw, pts_unit, mm_unit );
+    gs_libGnomePrint->gnome_print_convert_distance( &ph, pts_unit, mm_unit );
+

     if (width)
     if (width)

-        *width = (int) w;
+        *width = (int) (pw + 0.5);

     if (height)
     if (height)

-        *height = (int) h;
+        *height = (int) (ph + 0.5);

 }
 
 }
 

-wxSize wxGnomePrintDC::GetPPI() const
+wxSize wxGnomePrinterDCImpl::GetPPI() const

 {
 {

-    return wxSize(72,72);
+    return wxSize(DPI,DPI);

 }
 
 }
 

-void wxGnomePrintDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
+void wxGnomePrinterDCImpl::SetPrintData(const wxPrintData& data)

 {
 {

-    m_signX = (xLeftRight ? 1 : -1);
-    m_signY = (yBottomUp  ? 1 : -1);
+    m_printData = data;
+
+    int height;
+    if (m_printData.GetOrientation() == wxPORTRAIT)
+        GetOwner()->GetSize( NULL, &height );
+    else
+        GetOwner()->GetSize( &height, NULL );
+    m_deviceLocalOriginY = height;
+}
+
+// overridden for wxPrinterDC Impl

 
 

-    ComputeScaleAndOrigin();
+int wxGnomePrinterDCImpl::GetResolution()
+{
+    return DPI;

 }
 
 }
 

-void wxGnomePrintDC::SetDeviceOrigin( wxCoord x, wxCoord y )
+wxRect wxGnomePrinterDCImpl::GetPaperRect()

 {
 {

-    int h = 0;
+    // GNOME print doesn't support printer margins

     int w = 0;
     int w = 0;

-    GetSize( &w, &h );
+    int h = 0;
+    DoGetSize( &w, &h );
+    return wxRect( 0, 0, w, h );
+}
+
+// ----------------------------------------------------------------------------
+// wxGnomePrintModule
+// ----------------------------------------------------------------------------
+
+bool wxGnomePrintModule::OnInit()
+{
+    gs_libGnomePrint = new wxGnomePrintLibrary;
+    if (gs_libGnomePrint->IsOk())
+        wxPrintFactory::SetPrintFactory( new wxGnomePrintFactory );
+    return true;
+}
+
+void wxGnomePrintModule::OnExit()
+{
+    delete gs_libGnomePrint;
+    gs_libGnomePrint = NULL;
+}
+
+IMPLEMENT_DYNAMIC_CLASS(wxGnomePrintModule, wxModule)
+
+// ----------------------------------------------------------------------------
+// Print preview
+// ----------------------------------------------------------------------------

 
 

-    wxDC::SetDeviceOrigin( x, h-y );
+IMPLEMENT_CLASS(wxGnomePrintPreview, wxPrintPreviewBase)
+
+void wxGnomePrintPreview::Init(wxPrintout * WXUNUSED(printout),
+                                    wxPrintout * WXUNUSED(printoutForPrinting))
+{
+    DetermineScaling();

 }
 
 }
 

-void wxGnomePrintDC::SetResolution(int ppi)
+wxGnomePrintPreview::wxGnomePrintPreview(wxPrintout *printout,
+                                                   wxPrintout *printoutForPrinting,
+                                                   wxPrintDialogData *data)
+                        : wxPrintPreviewBase(printout, printoutForPrinting, data)

 {
 {

+    Init(printout, printoutForPrinting);

 }
 
 }
 

-int wxGnomePrintDC::GetResolution()
+wxGnomePrintPreview::wxGnomePrintPreview(wxPrintout *printout,
+                                                   wxPrintout *printoutForPrinting,
+                                                   wxPrintData *data)
+                        : wxPrintPreviewBase(printout, printoutForPrinting, data)

 {
 {

-    return 72;
+    Init(printout, printoutForPrinting);

 }
 
 }
 

+wxGnomePrintPreview::~wxGnomePrintPreview()
+{
+}

 
 

-class wxGnomePrintModule: public wxModule
+bool wxGnomePrintPreview::Print(bool interactive)

 {
 {

-public:
-    wxGnomePrintModule() {}
-    bool OnInit() { wxPrintFactory::SetPrintFactory( new wxGnomePrintFactory ); return true; }
-    void OnExit() { }
-    
-private:
-    DECLARE_DYNAMIC_CLASS(wxGnomePrintModule)
-};
+    if (!m_printPrintout)
+        return false;
+
+    wxPrinter printer(& m_printDialogData);
+    return printer.Print(m_previewFrame, m_printPrintout, interactive);
+}
+
+void wxGnomePrintPreview::DetermineScaling()
+{
+    wxPaperSize paperType = m_printDialogData.GetPrintData().GetPaperId();
+    if (paperType == wxPAPER_NONE)
+        paperType = wxPAPER_NONE;
+
+    wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(paperType);
+    if (!paper)
+        paper = wxThePrintPaperDatabase->FindPaperType(wxPAPER_A4);
+
+    if (paper)
+    {
+        wxSize ScreenPixels = wxGetDisplaySize();
+        wxSize ScreenMM = wxGetDisplaySizeMM();
+
+        m_previewPrintout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
+                                         (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
+                                         
+        int resolution = DPI;
+        m_previewPrintout->SetPPIPrinter( resolution, resolution );
+
+        wxSize sizeDevUnits(paper->GetSizeDeviceUnits());
+
+        // TODO: get better resolution information from wxGnomePrinterDCImpl, if possible.
+
+        sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x * resolution / 72.0);
+        sizeDevUnits.y = (wxCoord)((float)sizeDevUnits.y * resolution / 72.0);
+        wxSize sizeTenthsMM(paper->GetSize());
+        wxSize sizeMM(sizeTenthsMM.x / 10, sizeTenthsMM.y / 10);
+
+        // If in landscape mode, we need to swap the width and height.
+        if ( m_printDialogData.GetPrintData().GetOrientation() == wxLANDSCAPE )
+        {
+            m_pageWidth = sizeDevUnits.y;
+            m_pageHeight = sizeDevUnits.x;
+            m_previewPrintout->SetPageSizeMM(sizeMM.y, sizeMM.x);
+        }
+        else
+        {
+            m_pageWidth = sizeDevUnits.x;
+            m_pageHeight = sizeDevUnits.y;
+            m_previewPrintout->SetPageSizeMM(sizeMM.x, sizeMM.y);
+        }
+        m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight);
+        m_previewPrintout->SetPaperRectPixels(wxRect(0, 0, m_pageWidth, m_pageHeight));
+
+        // At 100%, the page should look about page-size on the screen.
+        m_previewScaleX = (double)0.8 * 72.0 / (double)resolution;
+        m_previewScaleY = m_previewScaleX;
+    }
+}

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxGnomePrintModule, wxModule)
-   

 #endif
     // wxUSE_LIBGNOMEPRINT
 #endif
     // wxUSE_LIBGNOMEPRINT