added missing headers (patch 1774617)

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

diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp
index 152ff9c32a5e2e98e4cc3d17916ae59eb7c8d979..2f7425c839a67bfe75fe81a2cab78c73d19e7cad 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,23 +15,286 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

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

 #if wxUSE_LIBGNOMEPRINT
 
 #if wxUSE_LIBGNOMEPRINT
 

-#include "math.h"
+#include "wx/gtk/gnome/gprint.h"
+
+#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"
+#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/module.h"
+#include "wx/dynlib.h"
+#include "wx/paper.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-job-preview.h>
 #include <libgnomeprintui/gnome-print-paper-selector.h>
 
 #include <libgnomeprintui/gnome-print-dialog.h>
 #include <libgnomeprintui/gnome-print-job-preview.h>
 #include <libgnomeprintui/gnome-print-paper-selector.h>
 

+static const double RAD2DEG  = 180.0 / M_PI;
+
+#include "wx/link.h"
+wxFORCE_LINK_THIS_MODULE(gnome_print)
+
+//----------------------------------------------------------------------------
+// wxGnomePrintLibrary
+//----------------------------------------------------------------------------
+
+#define wxDL_METHOD_DEFINE( rettype, name, args, shortargs, defret ) \
+    typedef rettype (* name ## Type) args ; \
+    name ## Type pfn_ ## name; \
+    rettype name args \
+    { if (m_ok) return pfn_ ## name shortargs ; return defret; }
+
+#define wxDL_METHOD_LOAD( lib, name, success ) \
+    pfn_ ## name = (name ## Type) lib->GetSymbol( wxT(#name), &success ); \
+    if (!success) return;
+
+class wxGnomePrintLibrary
+{
+public:
+    wxGnomePrintLibrary();
+    ~wxGnomePrintLibrary();
+
+    bool IsOk();
+    void InitializeMethods();
+
+private:
+    bool              m_ok;
+    wxDynamicLibrary *m_gnome_print_lib;
+    wxDynamicLibrary *m_gnome_printui_lib;
+
+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_METHOD_DEFINE( void, 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( GtkWidget*, gnome_print_dialog_new,
+        (GnomePrintJob *gpj, const guchar *title, gint flags), (gpj, title, flags), NULL )
+    wxDL_METHOD_DEFINE( void, 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_METHOD_DEFINE( void, gnome_print_dialog_get_copies,
+        (GnomePrintDialog *gpd, gint *copies, gboolean *collate), (gpd, copies, collate), /**/ )
+    wxDL_METHOD_DEFINE( void, 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()
+{
+    m_gnome_print_lib = NULL;
+    m_gnome_printui_lib = NULL;
+
+    wxLogNull log;
+
+    m_gnome_print_lib = new wxDynamicLibrary( wxT("libgnomeprint-2-2.so.0") );
+    m_ok = m_gnome_print_lib->IsLoaded();
+    if (!m_ok) return;
+
+    m_gnome_printui_lib = new wxDynamicLibrary( wxT("libgnomeprintui-2-2.so.0") );
+    m_ok = m_gnome_printui_lib->IsLoaded();
+    if (!m_ok) return;
+
+    InitializeMethods();
+}
+
+wxGnomePrintLibrary::~wxGnomePrintLibrary()
+{
+    if (m_gnome_print_lib)
+        delete m_gnome_print_lib;
+    if (m_gnome_printui_lib)
+        delete m_gnome_printui_lib;
+}
+
+bool wxGnomePrintLibrary::IsOk()
+{
+    return m_ok;
+}
+
+void wxGnomePrintLibrary::InitializeMethods()
+{
+    m_ok = false;
+    bool success;
+
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_newpath, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_moveto, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_lineto, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_curveto, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_arcto, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_closepath, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_stroke, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_fill, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_setrgbcolor, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_setlinewidth, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_setdash, success )
+
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_rgbimage, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_rgbaimage, success )
+
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_concat, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_scale, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_rotate, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_translate, success )
+
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_gsave, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_grestore, success )
+
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_clip, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_eoclip, success )
+
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_beginpage, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_showpage, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_end_doc, success )
+
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_pango_create_layout, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_pango_layout, success )
+
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_job_new, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_job_get_context, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_job_close, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_job_print, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_job_get_page_size, success )
+
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_unit_get_by_abbreviation, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_convert_distance, success )
+
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_config_default, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_config_set, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_config_set_boolean, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_config_set_double, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_config_set_int, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_config_set_length, success )
+    
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_config_get, success )
+    wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_config_get_length, success )
+
+    wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_dialog_new, success )
+    wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_dialog_construct_range_page, success )
+    wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_dialog_get_copies, success )
+    wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_dialog_set_copies, success )
+    wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_dialog_get_range, success )
+    wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_dialog_get_range_page, success )
+
+    wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_paper_selector_new_with_flags, success )
+
+    wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_job_preview_new, success )
+
+    m_ok = true;
+}
+
+static wxGnomePrintLibrary* gs_lgp = NULL;
+

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


@@ -43,28 +303,106 @@ 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_lgp->gnome_print_config_default();
+    m_job = gs_lgp->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_lgp->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 );
+    

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

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

     return true;
 }
     return true;
 }

-    
+

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


@@ -73,39 +411,46 @@ 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 )
 {
     return new wxGnomePrintDialog( parent, data );
 }
 
                                                   wxPrintDialogData *data )
 {
     return new wxGnomePrintDialog( parent, data );
 }
 

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

                                                   wxPrintData *data )
 {
     return new wxGnomePrintDialog( parent, data );
 }
                                                   wxPrintData *data )
 {
     return new wxGnomePrintDialog( parent, data );
 }

-                                                  
+

 wxPageSetupDialogBase *wxGnomePrintFactory::CreatePageSetupDialog( wxWindow *parent,
                                                           wxPageSetupDialogData * 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 );
 }
     return new wxGnomePageSetupDialog( parent, data );
 }

-                                                  
+

 bool wxGnomePrintFactory::HasPrintSetupDialog()
 {
     return false;
 bool wxGnomePrintFactory::HasPrintSetupDialog()
 {
     return false;


@@ -116,6 +461,11 @@ wxDialog *wxGnomePrintFactory::CreatePrintSetupDialog( wxWindow *parent, wxPrint
     return NULL;
 }
 
     return NULL;
 }
 

+wxDC* wxGnomePrintFactory::CreatePrinterDC( const wxPrintData& data )
+{
+    return new wxGnomePrintDC(data);
+}
+

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


@@ -135,7 +485,7 @@ wxString wxGnomePrintFactory::CreatePrinterLine()
 bool wxGnomePrintFactory::HasStatusLine()
 {
     // redundant now
 bool wxGnomePrintFactory::HasStatusLine()
 {
     // redundant now

-    return true;    
+    return true;

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


@@ -163,7 +513,7 @@ wxGnomePrintDialog::wxGnomePrintDialog( wxWindow *parent, wxPrintDialogData *dat
 {
     if (data)
         m_printDialogData = *data;
 {
     if (data)
         m_printDialogData = *data;

-    
+

     Init();
 }
 
     Init();
 }
 


@@ -182,12 +532,14 @@ wxGnomePrintDialog::wxGnomePrintDialog( wxWindow *parent, wxPrintData *data )
 void wxGnomePrintDialog::Init()
 {
     wxPrintData data = m_printDialogData.GetPrintData();
 void wxGnomePrintDialog::Init()
 {
     wxPrintData data = m_printDialogData.GetPrintData();

+    
+    data.ConvertToNative();

 
     wxGnomePrintNativeData *native =
       (wxGnomePrintNativeData*) data.GetNativeData();
 
     wxGnomePrintNativeData *native =
       (wxGnomePrintNativeData*) data.GetNativeData();

-      
-    m_widget = gnome_print_dialog_new( native->GetPrintJob(), 
-                                       (guchar*)"Print",  
+
+    m_widget = gs_lgp->gnome_print_dialog_new( native->GetPrintJob(),
+                                       (guchar*)"Print",

                                        GNOME_PRINT_DIALOG_RANGE|GNOME_PRINT_DIALOG_COPIES );
 
     int flag = 0;
                                        GNOME_PRINT_DIALOG_RANGE|GNOME_PRINT_DIALOG_COPIES );
 
     int flag = 0;


@@ -196,7 +548,7 @@ void wxGnomePrintDialog::Init()
     if (m_printDialogData.GetEnablePageNumbers())
         flag |= GNOME_PRINT_RANGE_ALL|GNOME_PRINT_RANGE_RANGE;
 
     if (m_printDialogData.GetEnablePageNumbers())
         flag |= GNOME_PRINT_RANGE_ALL|GNOME_PRINT_RANGE_RANGE;
 

-    gnome_print_dialog_construct_range_page( GNOME_PRINT_DIALOG( m_widget ),
+    gs_lgp->gnome_print_dialog_construct_range_page( (GnomePrintDialog*) m_widget,

                                              flag,
                                              m_printDialogData.GetMinPage(),
                                              m_printDialogData.GetMaxPage(),
                                              flag,
                                              m_printDialogData.GetMinPage(),
                                              m_printDialogData.GetMaxPage(),


@@ -211,25 +563,25 @@ wxGnomePrintDialog::~wxGnomePrintDialog()
 
 int wxGnomePrintDialog::ShowModal()
 {
 
 int wxGnomePrintDialog::ShowModal()
 {

-    // Transfer data from m_printDalogData to dialog here
-

     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)
+
+    if (response == GNOME_PRINT_DIALOG_RESPONSE_CANCEL)

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

-        
+

         return wxID_CANCEL;
     }
 
         return wxID_CANCEL;
     }
 

+    m_printDialogData.GetPrintData().ConvertFromNative();
+

     gint copies = 1;
     gboolean collate = false;
     gint copies = 1;
     gboolean collate = false;

-    gnome_print_dialog_get_copies( GNOME_PRINT_DIALOG(m_widget), &copies, &collate );
+    gs_lgp->gnome_print_dialog_get_copies( (GnomePrintDialog*) m_widget, &copies, &collate );

     m_printDialogData.SetNoCopies( copies );
     m_printDialogData.SetCollate( collate );
 
     m_printDialogData.SetNoCopies( copies );
     m_printDialogData.SetCollate( collate );
 

-    switch (gnome_print_dialog_get_range( GNOME_PRINT_DIALOG(m_widget) ))
+    switch (gs_lgp->gnome_print_dialog_get_range( (GnomePrintDialog*) m_widget ))

     {
         case GNOME_PRINT_RANGE_SELECTION:
             m_printDialogData.SetSelection( true );
     {
         case GNOME_PRINT_RANGE_SELECTION:
             m_printDialogData.SetSelection( true );


@@ -242,7 +594,7 @@ int wxGnomePrintDialog::ShowModal()
         case GNOME_PRINT_RANGE_RANGE:
         default:
             gint start,end;
         case GNOME_PRINT_RANGE_RANGE:
         default:
             gint start,end;

-            gnome_print_dialog_get_range_page( GNOME_PRINT_DIALOG(m_widget), &start, &end );
+            gs_lgp->gnome_print_dialog_get_range_page( (GnomePrintDialog*) m_widget, &start, &end );

             m_printDialogData.SetFromPage( start );
             m_printDialogData.SetToPage( end );
             break;
             m_printDialogData.SetFromPage( start );
             m_printDialogData.SetToPage( end );
             break;


@@ -250,10 +602,10 @@ int wxGnomePrintDialog::ShowModal()
 
     gtk_widget_destroy(m_widget);
     m_widget = NULL;
 
     gtk_widget_destroy(m_widget);
     m_widget = NULL;

-    
+

     if (response == GNOME_PRINT_DIALOG_RESPONSE_PREVIEW)
         return wxID_PREVIEW;
     if (response == GNOME_PRINT_DIALOG_RESPONSE_PREVIEW)
         return wxID_PREVIEW;

-    
+

     return wxID_OK;
 }
 
     return wxID_OK;
 }
 


@@ -289,30 +641,58 @@ wxGnomePageSetupDialog::wxGnomePageSetupDialog( wxWindow *parent,
 {
     if (data)
         m_pageDialogData = *data;
 {
     if (data)
         m_pageDialogData = *data;

-        
+
+    m_pageDialogData.GetPrintData().ConvertToNative();
+

     wxGnomePrintNativeData *native =
       (wxGnomePrintNativeData*) m_pageDialogData.GetPrintData().GetNativeData();
     wxGnomePrintNativeData *native =
       (wxGnomePrintNativeData*) m_pageDialogData.GetPrintData().GetNativeData();

-        
-    m_widget = gtk_dialog_new();
+
+    // This *was* required as the page setup dialog
+    // calculates wrong values otherwise.
+#if 0
+    gs_lgp->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_lgp->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_lgp->gnome_print_config_set_length (config,
+            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_LEFT, ml, mm_unit );
+    gs_lgp->gnome_print_config_set_length (config,
+            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_RIGHT, mr, mm_unit );
+    gs_lgp->gnome_print_config_set_length (config,
+            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_TOP, mt, mm_unit );
+    gs_lgp->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") ) );
     gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( _("Page setup") ) );

-    
-    GtkWidget *main = gnome_paper_selector_new_with_flags( native->GetPrintConfig(), 
+
+    GtkWidget *main = gs_lgp->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);
         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_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_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);
+    gtk_dialog_set_default_response (GTK_DIALOG (m_widget),
+                            GTK_RESPONSE_OK);

 }
 
 wxGnomePageSetupDialog::~wxGnomePageSetupDialog()
 }
 
 wxGnomePageSetupDialog::~wxGnomePageSetupDialog()


@@ -326,21 +706,57 @@ wxPageSetupDialogData& wxGnomePageSetupDialog::GetPageSetupDialogData()
 
 int wxGnomePageSetupDialog::ShowModal()
 {
 
 int wxGnomePageSetupDialog::ShowModal()
 {

-    // Transfer data from m_pageDialogData to native dialog
+    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
 
     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_lgp->gnome_print_config_get_length (config,
+            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_LEFT, &ml, NULL);
+        gs_lgp->gnome_print_config_get_length (config,
+            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_RIGHT, &mr, NULL);
+        gs_lgp->gnome_print_config_get_length (config,
+            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_TOP, &mt, NULL);
+        gs_lgp->gnome_print_config_get_length (config,
+            (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_BOTTOM, &mb, NULL);
+        gs_lgp->gnome_print_config_get_length (config,
+            (const guchar*) GNOME_PRINT_KEY_PAPER_WIDTH, &pw, NULL);
+        gs_lgp->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_lgp->gnome_print_unit_get_by_abbreviation( (const guchar*) "mm" );
+        const GnomePrintUnit *pts_unit = gs_lgp->gnome_print_unit_get_by_abbreviation( (const guchar*) "Pts" );
+        gs_lgp->gnome_print_convert_distance( &ml, pts_unit, mm_unit );
+        gs_lgp->gnome_print_convert_distance( &mr, pts_unit, mm_unit );
+        gs_lgp->gnome_print_convert_distance( &mt, pts_unit, mm_unit );
+        gs_lgp->gnome_print_convert_distance( &mb, pts_unit, mm_unit );
+        gs_lgp->gnome_print_convert_distance( &pw, pts_unit, mm_unit );
+        gs_lgp->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;
     }
         ret = wxID_OK;
     }
     else
     {
         ret = wxID_CANCEL;
     }

-    
+

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


@@ -371,7 +787,6 @@ IMPLEMENT_CLASS(wxGnomePrinter, wxPrinterBase)
 wxGnomePrinter::wxGnomePrinter( wxPrintDialogData *data ) :
     wxPrinterBase( data )
 {
 wxGnomePrinter::wxGnomePrinter( wxPrintDialogData *data ) :
     wxPrinterBase( data )
 {

-    m_gpc = NULL;

     m_native_preview = false;
 }
 
     m_native_preview = false;
 }
 


@@ -388,14 +803,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 
+    GnomePrintJob *job = gs_lgp->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.
     // native print data as the native print dialog
     // 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);
 


@@ -403,20 +821,22 @@ 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 );
-    
+        dc = new wxGnomePrintDC( printdata );
+

     if (m_native_preview)
         printout->SetIsPreview(true);
     if (m_native_preview)
         printout->SetIsPreview(true);

-    
+

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

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

         return false;
     }
 
         return false;
     }
 


@@ -427,17 +847,18 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
                             (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
     printout->SetPPIPrinter( wxGnomePrintDC::GetResolution(),
                              wxGnomePrintDC::GetResolution() );
                             (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
     printout->SetPPIPrinter( wxGnomePrintDC::GetResolution(),
                              wxGnomePrintDC::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();

-    
+

     // Get some parameters from the printout, if defined
     int fromPage, toPage;
     int minPage, maxPage;
     // Get some parameters from the printout, if defined
     int fromPage, toPage;
     int minPage, maxPage;


@@ -445,10 +866,12 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
 
     if (maxPage == 0)
     {
 
     if (maxPage == 0)
     {

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

         sm_lastError = wxPRINTER_ERROR;
         return false;
     }
         sm_lastError = wxPRINTER_ERROR;
         return false;
     }

-    
+

     printout->OnBeginPrinting();
 
     int minPageNum = minPage, maxPageNum = maxPage;
     printout->OnBeginPrinting();
 
     int minPageNum = minPage, maxPageNum = maxPage;


@@ -459,7 +882,7 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
         maxPageNum = m_printDialogData.GetToPage();
     }
 
         maxPageNum = m_printDialogData.GetToPage();
     }
 

-    
+

     int copyCount;
     for ( copyCount = 1;
           copyCount <= m_printDialogData.GetNoCopies();
     int copyCount;
     for ( copyCount = 1;
           copyCount <= m_printDialogData.GetNoCopies();


@@ -471,34 +894,40 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
             sm_lastError = wxPRINTER_ERROR;
             break;
         }
             sm_lastError = wxPRINTER_ERROR;
             break;
         }

-        
+

         int pn;
         for ( pn = minPageNum;
               pn <= maxPageNum && printout->HasPage(pn);
               pn++ )
         int 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 );
+
+    gs_lgp->gnome_print_job_close( job );

     if (m_native_preview)
     {
     if (m_native_preview)
     {

-        wxString title( _("Print preview") );
-        gtk_widget_show( gnome_print_job_preview_new( job, (const guchar*)(const char*)wxGTK_CONV(title) ));
+        const wxCharBuffer title(wxGTK_CONV_SYS(_("Print preview")));
+        GtkWidget *preview = gs_lgp->gnome_print_job_preview_new
+                                     (
+                                        job,
+                                        (const guchar *)title.data()
+                                     );
+        gtk_widget_show(preview);

     }
     else
     {
     }
     else
     {

-        gnome_print_job_print( job );
+        gs_lgp->gnome_print_job_print( job );

     }
     }

-    
+
+    g_object_unref (job);

     delete dc;
     delete dc;

-    
+

     return (sm_lastError == wxPRINTER_NO_ERROR);
 }
 
     return (sm_lastError == wxPRINTER_NO_ERROR);
 }
 


@@ -508,14 +937,14 @@ wxDC* wxGnomePrinter::PrintDialog( wxWindow *parent )
     int ret = dialog.ShowModal();
     if (ret == wxID_CANCEL)
     {
     int ret = dialog.ShowModal();
     if (ret == wxID_CANCEL)
     {

-        sm_lastError = wxPRINTER_ERROR;
+        sm_lastError = wxPRINTER_CANCELLED;

         return NULL;
     }
         return NULL;
     }

-    
+

     m_native_preview = ret == wxID_PREVIEW;
     m_native_preview = ret == wxID_PREVIEW;

-    
+

     m_printDialogData = dialog.GetPrintDialogData();
     m_printDialogData = dialog.GetPrintDialogData();

-    return new wxGnomePrintDC( this );
+    return new wxGnomePrintDC( m_printDialogData.GetPrintData() );

 }
 
 bool wxGnomePrinter::Setup( wxWindow *parent )
 }
 
 bool wxGnomePrinter::Setup( wxWindow *parent )


@@ -527,30 +956,37 @@ bool wxGnomePrinter::Setup( wxWindow *parent )
 // wxGnomePrintDC
 //-----------------------------------------------------------------------------
 
 // wxGnomePrintDC
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_CLASS(wxGnomePrintDC, wxDCBase)
+IMPLEMENT_CLASS(wxGnomePrintDC, wxDC)

 
 

-wxGnomePrintDC::wxGnomePrintDC( wxGnomePrinter *printer )
+wxGnomePrintDC::wxGnomePrintDC( const wxPrintData& data )

 {
 {

-    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_lgp->gnome_print_job_get_context (m_job);
+
+    m_layout = gs_lgp->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
     m_signX =  1;  // default x-axis left to right
     m_signY = -1;  // default y-axis bottom up -> top down

+
+    GetSize( NULL, &m_deviceOffsetY );

 }
 
 wxGnomePrintDC::~wxGnomePrintDC()
 {
 }
 
 }
 
 wxGnomePrintDC::~wxGnomePrintDC()
 {
 }
 

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

 {
     return true;
 }
 {
     return true;
 }


@@ -568,13 +1004,13 @@ bool wxGnomePrintDC::DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const
 void wxGnomePrintDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {
     if  (m_pen.GetStyle() == wxTRANSPARENT) return;
 void wxGnomePrintDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {
     if  (m_pen.GetStyle() == wxTRANSPARENT) return;

-    
+

     SetPen( m_pen );
 
     SetPen( m_pen );
 

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

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


@@ -585,10 +1021,103 @@ void wxGnomePrintDC::DoCrossHair(wxCoord x, wxCoord y)
 
 void wxGnomePrintDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc)
 {
 
 void wxGnomePrintDC::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 (radius == 0.0)
+    {
+        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;
+    }
+
+    if (m_brush.GetStyle() != wxTRANSPARENT)
+    {
+        SetBrush( m_brush );
+        gs_lgp->gnome_print_moveto ( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc) );
+        gs_lgp->gnome_print_arcto( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL((int)radius), alpha1, alpha2, 0 );
+
+        gs_lgp->gnome_print_fill( m_gpc );
+    }
+
+    if (m_pen.GetStyle() != wxTRANSPARENT)
+    {
+        SetPen (m_pen);
+        gs_lgp->gnome_print_newpath( m_gpc );
+        gs_lgp->gnome_print_moveto ( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc) );
+        gs_lgp->gnome_print_arcto( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL((int)radius), alpha1, alpha2, 0 );
+        gs_lgp->gnome_print_closepath( m_gpc );
+
+        gs_lgp->gnome_print_stroke( m_gpc );
+    }
+
+    CalcBoundingBox (x1, y1);
+    CalcBoundingBox (x2, y2);
+    CalcBoundingBox (xc, yc);

 }
 
 void wxGnomePrintDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
 {
 }
 
 void wxGnomePrintDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
 {

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

 }
 
 void wxGnomePrintDC::DoDrawPoint(wxCoord x, wxCoord y)
 }
 
 void wxGnomePrintDC::DoDrawPoint(wxCoord x, wxCoord y)


@@ -597,14 +1126,73 @@ void wxGnomePrintDC::DoDrawPoint(wxCoord x, wxCoord y)
 
 void wxGnomePrintDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
 {
 
 void wxGnomePrintDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
 {

+    if (m_pen.GetStyle() == wxTRANSPARENT) 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_lgp->gnome_print_moveto ( m_gpc, XLOG2DEV(points[0].x+xoffset), YLOG2DEV(points[0].y+yoffset) );
+
+    for (i = 1; i < n; i++)
+        gs_lgp->gnome_print_lineto ( m_gpc, XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset) );
+
+    gs_lgp->gnome_print_stroke ( m_gpc);

 }
 
 void wxGnomePrintDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
 {
 }
 
 void wxGnomePrintDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
 {

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

 }
 
 void wxGnomePrintDC::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
 {
 }
 
 void wxGnomePrintDC::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
 {

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

 }
 
 void wxGnomePrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 }
 
 void wxGnomePrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)


@@ -612,14 +1200,14 @@ void wxGnomePrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoor
     if (m_brush.GetStyle () != wxTRANSPARENT)
     {
         SetBrush( m_brush );
     if (m_brush.GetStyle () != wxTRANSPARENT)
     {
         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_lgp->gnome_print_newpath( m_gpc );
+        gs_lgp->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+        gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) );
+        gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) );
+        gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) );
+        gs_lgp->gnome_print_closepath( m_gpc );
+        gs_lgp->gnome_print_fill( m_gpc );

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


@@ -629,14 +1217,14 @@ void wxGnomePrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoor
     {
         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_lgp->gnome_print_newpath( m_gpc );
+        gs_lgp->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+        gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) );
+        gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) );
+        gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) );
+        gs_lgp->gnome_print_closepath( m_gpc );
+        gs_lgp->gnome_print_stroke( m_gpc );
+

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


@@ -644,21 +1232,217 @@ void wxGnomePrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoor
 
 void wxGnomePrintDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
 {
 
 void wxGnomePrintDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
 {

+    wxCoord rad = (wxCoord) radius;
+
+    if (m_brush.GetStyle() != wxTRANSPARENT)
+    {
+        SetBrush(m_brush);
+        gs_lgp->gnome_print_newpath(m_gpc);
+        gs_lgp->gnome_print_moveto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
+        gs_lgp->gnome_print_curveto(m_gpc,
+                                    XLOG2DEV(x + rad),YLOG2DEV(y),
+                                    XLOG2DEV(x),YLOG2DEV(y),
+                                    XLOG2DEV(x),YLOG2DEV(y + rad));
+        gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x),YLOG2DEV(y + height - rad));
+        gs_lgp->gnome_print_curveto(m_gpc,
+                                    XLOG2DEV(x),YLOG2DEV(y + height - rad),
+                                    XLOG2DEV(x),YLOG2DEV(y + height),
+                                    XLOG2DEV(x + rad),YLOG2DEV(y + height));
+        gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x + width - rad),YLOG2DEV(y + height));
+        gs_lgp->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_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x + width),YLOG2DEV(y + rad));
+        gs_lgp->gnome_print_curveto(m_gpc,
+                                    XLOG2DEV(x + width),YLOG2DEV(y + rad),
+                                    XLOG2DEV(x + width),YLOG2DEV(y),
+                                    XLOG2DEV(x + width - rad),YLOG2DEV(y));
+        gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
+        gs_lgp->gnome_print_closepath(m_gpc);
+        gs_lgp->gnome_print_fill(m_gpc);
+
+        CalcBoundingBox(x,y);
+        CalcBoundingBox(x+width,y+height);
+    }
+
+    if (m_pen.GetStyle() != wxTRANSPARENT)
+    {
+        SetPen(m_pen);
+        gs_lgp->gnome_print_newpath(m_gpc);
+        gs_lgp->gnome_print_moveto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
+        gs_lgp->gnome_print_curveto(m_gpc,
+                                    XLOG2DEV(x + rad),YLOG2DEV(y),
+                                    XLOG2DEV(x),YLOG2DEV(y),
+                                    XLOG2DEV(x),YLOG2DEV(y + rad));
+        gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x),YLOG2DEV(y + height - rad));
+        gs_lgp->gnome_print_curveto(m_gpc,
+                                    XLOG2DEV(x),YLOG2DEV(y + height - rad),
+                                    XLOG2DEV(x),YLOG2DEV(y + height),
+                                    XLOG2DEV(x + rad),YLOG2DEV(y + height));
+        gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x + width - rad),YLOG2DEV(y + height));
+        gs_lgp->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_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x + width),YLOG2DEV(y + rad));
+        gs_lgp->gnome_print_curveto(m_gpc,
+                                    XLOG2DEV(x + width),YLOG2DEV(y + rad),
+                                    XLOG2DEV(x + width),YLOG2DEV(y),
+                                    XLOG2DEV(x + width - rad),YLOG2DEV(y));
+        gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
+        gs_lgp->gnome_print_closepath(m_gpc);
+        gs_lgp->gnome_print_stroke(m_gpc);
+
+        CalcBoundingBox(x,y);
+        CalcBoundingBox(x+width,y+height);
+    }
+}
+
+void wxGnomePrintDC::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_lgp->gnome_print_newpath( m_gpc );
+
+    // Approximate an ellipse using four cubic splines, clockwise from 0 deg */
+    gs_lgp->gnome_print_moveto( m_gpc,
+                XLOG2DEV(x + width),
+                YLOG2DEV(y + halfHI) );
+    gs_lgp->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_lgp->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_lgp->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_lgp->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_lgp->gnome_print_closepath(m_gpc);

 }
 
 void wxGnomePrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
 }
 
 void wxGnomePrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {

+    if (m_brush.GetStyle () != wxTRANSPARENT)
+    {
+        SetBrush( m_brush );
+        makeEllipticalPath( x, y, width, height );
+        gs_lgp->gnome_print_fill( m_gpc );
+        CalcBoundingBox( x, y );
+        CalcBoundingBox( x + width, y + height );
+    }
+
+    if (m_pen.GetStyle () != wxTRANSPARENT)
+    {
+        SetPen (m_pen);
+        makeEllipticalPath( x, y, width, height );
+        gs_lgp->gnome_print_stroke( m_gpc );
+        CalcBoundingBox( x, y );
+        CalcBoundingBox( x + width, y + height );
+    }

 }
 
 }
 

+#if wxUSE_SPLINES

 void wxGnomePrintDC::DoDrawSpline(wxList *points)
 {
 void wxGnomePrintDC::DoDrawSpline(wxList *points)
 {

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

 }
 }

+#endif // wxUSE_SPLINES

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

-    return false;
+    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
+    DrawBitmap( bitmap, xdest, ydest );
+
+    return true;

 }
 
 void wxGnomePrintDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
 }
 
 void wxGnomePrintDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )


@@ -669,31 +1453,31 @@ void wxGnomePrintDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
 void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask )
 {
     if (!bitmap.Ok()) return;
 void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask )
 {
     if (!bitmap.Ok()) return;

-    
+

     if (bitmap.HasPixbuf())
     {
         GdkPixbuf *pixbuf = bitmap.GetPixbuf();
     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 );
-        
-        gnome_print_gsave( m_gpc );        
+        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_lgp->gnome_print_gsave( m_gpc );

         double matrix[6];
         double matrix[6];

-       matrix[0] = XLOG2DEVREL(width);
-       matrix[1] = 0;
-       matrix[2] = 0;
-       matrix[3] = YLOG2DEVREL(height);
-       matrix[4] = XLOG2DEV(x);
+        matrix[0] = XLOG2DEVREL(width);
+        matrix[1] = 0;
+        matrix[2] = 0;
+        matrix[3] = YLOG2DEVREL(height);
+        matrix[4] = XLOG2DEV(x);

         matrix[5] = YLOG2DEV(y+height);
         matrix[5] = YLOG2DEV(y+height);

-       gnome_print_concat( m_gpc, matrix );
-           gnome_print_moveto(  m_gpc, 0, 0 );
+        gs_lgp->gnome_print_concat( m_gpc, matrix );
+        gs_lgp->gnome_print_moveto(  m_gpc, 0, 0 );

         if (has_alpha)
         if (has_alpha)

-            gnome_print_rgbaimage( m_gpc, (guchar *)raw_image, width, height, rowstride );
+            gs_lgp->gnome_print_rgbaimage( m_gpc, (guchar *)raw_image, width, height, rowstride );

         else
         else

-            gnome_print_rgbimage( m_gpc, (guchar *)raw_image, width, height, rowstride );
-        gnome_print_grestore( m_gpc );
+            gs_lgp->gnome_print_rgbimage( m_gpc, (guchar *)raw_image, width, height, rowstride );
+        gs_lgp->gnome_print_grestore( m_gpc );

     }
     else
     {
     }
     else
     {


@@ -701,18 +1485,18 @@ void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y,
 
         if (!image.Ok()) return;
 
 
         if (!image.Ok()) return;
 

-        gnome_print_gsave( m_gpc );        
+        gs_lgp->gnome_print_gsave( m_gpc );

         double matrix[6];
         double matrix[6];

-       matrix[0] = XLOG2DEVREL(image.GetWidth());
-       matrix[1] = 0;
-       matrix[2] = 0;
-       matrix[3] = YLOG2DEVREL(image.GetHeight());
-       matrix[4] = XLOG2DEV(x);
+        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());
         matrix[5] = YLOG2DEV(y+image.GetHeight());

-       gnome_print_concat( m_gpc, matrix );
-           gnome_print_moveto(  m_gpc, 0, 0 );
-        gnome_print_rgbimage( m_gpc, (guchar*) image.GetData(), image.GetWidth(), image.GetHeight(), image.GetWidth()*3 );
-        gnome_print_grestore( m_gpc );
+        gs_lgp->gnome_print_concat( m_gpc, matrix );
+        gs_lgp->gnome_print_moveto(  m_gpc, 0, 0 );
+        gs_lgp->gnome_print_rgbimage( m_gpc, (guchar*) image.GetData(), image.GetWidth(), image.GetHeight(), image.GetWidth()*3 );
+        gs_lgp->gnome_print_grestore( m_gpc );

     }
 }
 
     }
 }
 


@@ -725,21 +1509,19 @@ void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord
 {
     x = XLOG2DEV(x);
     y = YLOG2DEV(y);
 {
     x = XLOG2DEV(x);
     y = YLOG2DEV(y);

-    
+

     bool underlined = m_font.Ok() && m_font.GetUnderlined();
 
     bool underlined = m_font.Ok() && m_font.GetUnderlined();
 

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

 #else
 #else

-    const wxWCharBuffer wdata = wxConvLocal.cMB2WC( text );
-    if ( !wdata )
-        return;
-    const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
+    const wxCharBuffer data = text.utf8_str();

 #endif
 
 #endif
 

-    size_t datalen = strlen((const char*)data);
-    pango_layout_set_text( m_layout, (const char*) data, datalen);
-    
+    size_t datalen = strlen(data);
+    pango_layout_set_text( m_layout, data, datalen);
+

     if (underlined)
     {
         PangoAttrList *attrs = pango_attr_list_new();
     if (underlined)
     {
         PangoAttrList *attrs = pango_attr_list_new();


@@ -763,7 +1545,7 @@ void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord
             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_lgp->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );

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


@@ -777,16 +1559,16 @@ void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord
     {
         // If there is a user or actually any scale applied to
         // the device context, scale the font.
     {
         // If there is a user or actually any scale applied to
         // the device context, scale the font.

-         
+

         // scale font description
         gint oldSize = pango_font_description_get_size( m_fontdesc );
         double size = oldSize;
         size = size * m_scaleY;
         pango_font_description_set_size( m_fontdesc, (gint)size );
         // scale font description
         gint oldSize = pango_font_description_get_size( m_fontdesc );
         double size = oldSize;
         size = size * m_scaleY;
         pango_font_description_set_size( m_fontdesc, (gint)size );

-         
+

         // actually apply scaled font
         pango_layout_set_font_description( m_layout, m_fontdesc );
         // actually apply scaled font
         pango_layout_set_font_description( m_layout, m_fontdesc );

-        
+

         pango_layout_get_pixel_size( m_layout, &w, &h );
 #if 0
         if ( m_backgroundMode == wxSOLID )
         pango_layout_get_pixel_size( m_layout, &w, &h );
 #if 0
         if ( m_backgroundMode == wxSOLID )


@@ -795,24 +1577,24 @@ void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord
             gdk_draw_rectangle(m_window, m_textGC, TRUE, x, y, w, h);
             gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
         }
             gdk_draw_rectangle(m_window, m_textGC, TRUE, x, y, w, h);
             gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
         }

-#endif         
+#endif

         // Draw layout.
         // Draw layout.

-       gnome_print_moveto (m_gpc, x, y);
+        gs_lgp->gnome_print_moveto (m_gpc, x, y);

         if (fabs(angle) > 0.00001)
         if (fabs(angle) > 0.00001)

-        {        
-            gnome_print_gsave( m_gpc );
-            gnome_print_rotate( m_gpc, angle );
-           gnome_print_pango_layout( m_gpc, m_layout );
-            gnome_print_grestore( m_gpc );
+        {
+            gs_lgp->gnome_print_gsave( m_gpc );
+            gs_lgp->gnome_print_rotate( m_gpc, angle );
+            gs_lgp->gnome_print_pango_layout( m_gpc, m_layout );
+            gs_lgp->gnome_print_grestore( m_gpc );

         }
         else
         {
         }
         else
         {

-           gnome_print_pango_layout( m_gpc, m_layout );
+            gs_lgp->gnome_print_pango_layout( m_gpc, m_layout );

         }
         }

-         
+

         // reset unscaled size
         pango_font_description_set_size( m_fontdesc, oldSize );
         // reset unscaled size
         pango_font_description_set_size( m_fontdesc, oldSize );

-         
+

         // actually apply unscaled font
         pango_layout_set_font_description( m_layout, m_fontdesc );
     }
         // actually apply unscaled font
         pango_layout_set_font_description( m_layout, m_fontdesc );
     }


@@ -826,19 +1608,19 @@ void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord
             gdk_draw_rectangle(m_window, m_textGC, TRUE, x, y, w, h);
             gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
         }
             gdk_draw_rectangle(m_window, m_textGC, TRUE, x, y, w, h);
             gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
         }

-#endif        
+#endif

         // Draw layout.
         // Draw layout.

-       gnome_print_moveto (m_gpc, x, y);
+        gs_lgp->gnome_print_moveto (m_gpc, x, y);

         if (fabs(angle) > 0.00001)
         if (fabs(angle) > 0.00001)

-        {        
-            gnome_print_gsave( m_gpc );
-            gnome_print_rotate( m_gpc, angle );
-           gnome_print_pango_layout( m_gpc, m_layout );
-            gnome_print_grestore( m_gpc );
+        {
+            gs_lgp->gnome_print_gsave( m_gpc );
+            gs_lgp->gnome_print_rotate( m_gpc, angle );
+            gs_lgp->gnome_print_pango_layout( m_gpc, m_layout );
+            gs_lgp->gnome_print_grestore( m_gpc );

         }
         else
         {
         }
         else
         {

-           gnome_print_pango_layout( m_gpc, m_layout );
+            gs_lgp->gnome_print_pango_layout( m_gpc, m_layout );

         }
     }
 
         }
     }
 


@@ -847,7 +1629,7 @@ void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord
         // undo underline attributes setting:
         pango_layout_set_attributes(m_layout, NULL);
     }
         // undo underline attributes setting:
         pango_layout_set_attributes(m_layout, NULL);
     }

-    
+

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


@@ -858,14 +1640,14 @@ void wxGnomePrintDC::Clear()
 void wxGnomePrintDC::SetFont( const wxFont& font )
 {
     m_font = font;
 void wxGnomePrintDC::SetFont( const wxFont& 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 );
     }
 }


@@ -874,11 +1656,42 @@ void wxGnomePrintDC::SetPen( const wxPen& pen )
 {
     if (!pen.Ok()) return;
 
 {
     if (!pen.Ok()) return;
 

-    // TODO: support for pen styles other than solid (use gnome_print_setdash)
-

     m_pen = pen;
 
     m_pen = pen;
 

-    gnome_print_setlinewidth( m_gpc, XLOG2DEVREL( 1000 * m_pen.GetWidth() ) / 1000.0f );
+    gs_lgp->gnome_print_setlinewidth( m_gpc, XLOG2DEVREL( 1000 * m_pen.GetWidth() ) / 1000.0f );
+
+    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 wxDOT:           gs_lgp->gnome_print_setdash( m_gpc, 2, dotted, 0 ); break;
+        case wxSHORT_DASH:    gs_lgp->gnome_print_setdash( m_gpc, 2, short_dashed, 0 ); break;
+        case wxLONG_DASH:     gs_lgp->gnome_print_setdash( m_gpc, 2, wxCoord_dashed, 0 ); break;
+        case wxDOT_DASH:      gs_lgp->gnome_print_setdash( m_gpc, 4, dotted_dashed, 0 );  break;
+        case wxUSER_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_lgp -> gnome_print_setdash( m_gpc, num, g_dashes, 0);
+            g_free( g_dashes );
+        }
+        break;
+        case wxSOLID:
+        case wxTRANSPARENT:
+        default:              gs_lgp->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();


@@ -890,7 +1703,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_lgp->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );

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


@@ -929,7 +1742,7 @@ void wxGnomePrintDC::SetBrush( const wxBrush& brush )
         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_lgp->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );

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


@@ -947,57 +1760,78 @@ void wxGnomePrintDC::SetBackground( const wxBrush& brush )
 
 void wxGnomePrintDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
 
 void wxGnomePrintDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {

+    wxDC::DoSetClippingRegion( x, y, width, height );
+    
+    gs_lgp->gnome_print_gsave( m_gpc );
+    
+    gs_lgp->gnome_print_newpath( m_gpc );
+    gs_lgp->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+    gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) );
+    gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) );
+    gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) );
+    gs_lgp->gnome_print_closepath( m_gpc );
+    gs_lgp->gnome_print_clip( m_gpc );

 }
 
 void wxGnomePrintDC::DestroyClippingRegion()
 {
 }
 
 void wxGnomePrintDC::DestroyClippingRegion()
 {

+    wxDC::DestroyClippingRegion();
+
+    gs_lgp->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 wxGnomePrintDC::StartDoc(const wxString& message)
 {

-    SetDeviceOrigin( 0,0 );
-    

     return true;
 }
 
 void wxGnomePrintDC::EndDoc()
 {
     return true;
 }
 
 void wxGnomePrintDC::EndDoc()
 {

+    gs_lgp->gnome_print_end_doc( m_gpc );

 }
 
 void wxGnomePrintDC::StartPage()
 {
 }
 
 void wxGnomePrintDC::StartPage()
 {

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

 }
 
 void wxGnomePrintDC::EndPage()
 {
 }
 
 void wxGnomePrintDC::EndPage()
 {

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

 }
 
 wxCoord wxGnomePrintDC::GetCharHeight() const
 {
     pango_layout_set_text( m_layout, "H", 1 );
 }
 
 wxCoord wxGnomePrintDC::GetCharHeight() const
 {
     pango_layout_set_text( m_layout, "H", 1 );

- 
+

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

-    
+

     return h;
 }
 
 wxCoord wxGnomePrintDC::GetCharWidth() const
 {
     pango_layout_set_text( m_layout, "H", 1 );
     return h;
 }
 
 wxCoord wxGnomePrintDC::GetCharWidth() const
 {
     pango_layout_set_text( m_layout, "H", 1 );

- 
+

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

-    
+

     return w;
 }
 
 void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height,
                      wxCoord *descent,
                      wxCoord *externalLeading,
     return w;
 }
 
 void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height,
                      wxCoord *descent,
                      wxCoord *externalLeading,

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

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


@@ -1008,46 +1842,45 @@ 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 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);


@@ -1055,45 +1888,50 @@ 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 wxGnomePrintDC::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_lgp->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 = (int) (pw + 0.5);

     if (height)
     if (height)

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

 }
 
 void wxGnomePrintDC::DoGetSizeMM(int *width, int *height) const
 {
 }
 
 void wxGnomePrintDC::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_lgp->gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph );
+
+    // Convert to mm.
+
+    const GnomePrintUnit *mm_unit = gs_lgp->gnome_print_unit_get_by_abbreviation( (const guchar*) "mm" );
+    const GnomePrintUnit *pts_unit = gs_lgp->gnome_print_unit_get_by_abbreviation( (const guchar*) "Pts" );
+    gs_lgp->gnome_print_convert_distance( &pw, pts_unit, mm_unit );
+    gs_lgp->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 wxGnomePrintDC::GetPPI() const


@@ -1109,13 +1947,24 @@ void wxGnomePrintDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
     ComputeScaleAndOrigin();
 }
 
     ComputeScaleAndOrigin();
 }
 

+void wxGnomePrintDC::SetLogicalOrigin( wxCoord x, wxCoord y )
+{
+    wxDC::SetLogicalOrigin( x, y );
+}
+

 void wxGnomePrintDC::SetDeviceOrigin( wxCoord x, wxCoord y )
 {
 void wxGnomePrintDC::SetDeviceOrigin( wxCoord x, wxCoord y )
 {

-    int h = 0;
-    int w = 0;
-    GetSize( &w, &h );
+    wxDC::SetDeviceOrigin( x, y );
+}

 
 

-    wxDC::SetDeviceOrigin( x, h-y );
+void wxGnomePrintDC::SetPrintData(const wxPrintData& data)
+{ 
+    m_printData = data;
+    
+    if (m_printData.GetOrientation() == wxPORTRAIT)
+        GetSize( NULL, &m_deviceOffsetY );
+    else
+        GetSize( &m_deviceOffsetY, NULL );

 }
 
 void wxGnomePrintDC::SetResolution(int ppi)
 }
 
 void wxGnomePrintDC::SetResolution(int ppi)


@@ -1132,14 +1981,118 @@ class wxGnomePrintModule: public wxModule
 {
 public:
     wxGnomePrintModule() {}
 {
 public:
     wxGnomePrintModule() {}

-    bool OnInit() { wxPrintFactory::SetPrintFactory( new wxGnomePrintFactory ); return true; }
-    void OnExit() { }
-    
+    bool OnInit();
+    void OnExit();
+

 private:
     DECLARE_DYNAMIC_CLASS(wxGnomePrintModule)
 };
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGnomePrintModule)
 };
 

+bool wxGnomePrintModule::OnInit()
+{
+    gs_lgp = new wxGnomePrintLibrary;
+    if (gs_lgp->IsOk())
+        wxPrintFactory::SetPrintFactory( new wxGnomePrintFactory );
+    return true;
+}
+
+void wxGnomePrintModule::OnExit()
+{
+    delete gs_lgp;
+}
+

 IMPLEMENT_DYNAMIC_CLASS(wxGnomePrintModule, wxModule)
 IMPLEMENT_DYNAMIC_CLASS(wxGnomePrintModule, wxModule)

-   
+
+// ----------------------------------------------------------------------------
+// Print preview
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxGnomePrintPreview, wxPrintPreviewBase)
+
+void wxGnomePrintPreview::Init(wxPrintout * WXUNUSED(printout),
+                                    wxPrintout * WXUNUSED(printoutForPrinting))
+{
+    DetermineScaling();
+}
+
+wxGnomePrintPreview::wxGnomePrintPreview(wxPrintout *printout,
+                                                   wxPrintout *printoutForPrinting,
+                                                   wxPrintDialogData *data)
+                        : wxPrintPreviewBase(printout, printoutForPrinting, data)
+{
+    Init(printout, printoutForPrinting);
+}
+
+wxGnomePrintPreview::wxGnomePrintPreview(wxPrintout *printout,
+                                                   wxPrintout *printoutForPrinting,
+                                                   wxPrintData *data)
+                        : wxPrintPreviewBase(printout, printoutForPrinting, data)
+{
+    Init(printout, printoutForPrinting);
+}
+
+wxGnomePrintPreview::~wxGnomePrintPreview()
+{
+}
+
+bool wxGnomePrintPreview::Print(bool interactive)
+{
+    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()) );
+        m_previewPrintout->SetPPIPrinter(wxGnomePrintDC::GetResolution(), wxGnomePrintDC::GetResolution());
+
+        wxSize sizeDevUnits(paper->GetSizeDeviceUnits());
+
+        // TODO: get better resolution information from wxGnomePrintDC, if possible.
+
+        sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x * wxGnomePrintDC::GetResolution() / 72.0);
+        sizeDevUnits.y = (wxCoord)((float)sizeDevUnits.y * wxGnomePrintDC::GetResolution() / 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 = (float)0.8 * 72.0 / (float)wxGnomePrintDC::GetResolution();
+        m_previewScaleY = m_previewScaleX;
+    }
+}
+

 #endif
     // wxUSE_LIBGNOMEPRINT
 #endif
     // wxUSE_LIBGNOMEPRINT