]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/gnome/gprint.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add wxSize overloads to wxBitmap ctors and to wxBitmap::Create
[wxWidgets.git] / src / gtk / gnome / gprint.cpp
diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp
index 80827bd60dfd15e72796bc335501e0e5221b114d..923cb6c28e4c46e0d51d8cafeaf0d59b7becebb2 100644 (file)
--- a/src/gtk/gnome/gprint.cpp
+++ b/src/gtk/gnome/gprint.cpp
@@ -26,12 +26,14 @@
     #include "wx/math.h"
     #include "wx/image.h"
     #include "wx/module.h"
     #include "wx/math.h"
     #include "wx/image.h"
     #include "wx/module.h"
+    #include "wx/crt.h"
 #endif
 
 #include "wx/fontutil.h"
 #include "wx/gtk/private.h"
 #include "wx/dynlib.h"
 #include "wx/paper.h"
 #endif
 
 #include "wx/fontutil.h"
 #include "wx/gtk/private.h"
 #include "wx/dynlib.h"
 #include "wx/paper.h"
+#include "wx/dcprint.h"
 
 #include <libgnomeprint/gnome-print.h>
 #include <libgnomeprint/gnome-print-pango.h>
 
 #include <libgnomeprint/gnome-print.h>
 #include <libgnomeprint/gnome-print-pango.h>
@@ -40,8 +42,6 @@
 #include <libgnomeprintui/gnome-print-job-preview.h>
 #include <libgnomeprintui/gnome-print-paper-selector.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)
 
 #include "wx/link.h"
 wxFORCE_LINK_THIS_MODULE(gnome_print)
 
@@ -49,16 +49,6 @@ wxFORCE_LINK_THIS_MODULE(gnome_print)
 // wxGnomePrintLibrary
 //----------------------------------------------------------------------------
 
 // 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:
 class wxGnomePrintLibrary
 {
 public:
@@ -66,12 +56,16 @@ public:
     ~wxGnomePrintLibrary();
 
     bool IsOk();
     ~wxGnomePrintLibrary();
 
     bool IsOk();
-    void InitializeMethods();
-
 private:
 private:
-    bool              m_ok;
-    wxDynamicLibrary *m_gnome_print_lib;
-    wxDynamicLibrary *m_gnome_printui_lib;
+    bool InitializeMethods();
+
+    wxDynamicLibrary m_libGnomePrint;
+    wxDynamicLibrary m_libGnomePrintUI;
+
+    // only true if we successfully loaded both libraries
+    //
+    // don't rename this field, it's used by wxDL_XXX macros internally
+    bool m_ok;
 
 public:
     wxDL_METHOD_DEFINE( gint, gnome_print_newpath,
 
 public:
     wxDL_METHOD_DEFINE( gint, gnome_print_newpath,
@@ -130,8 +124,8 @@ public:
 
     wxDL_METHOD_DEFINE( PangoLayout*, gnome_print_pango_create_layout,
         (GnomePrintContext *gpc), (gpc), NULL )
 
     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_VOIDMETHOD_DEFINE( gnome_print_pango_layout,
+        (GnomePrintContext *gpc, PangoLayout *layout), (gpc, layout)  )
 
     wxDL_METHOD_DEFINE( GnomePrintJob*, gnome_print_job_new,
         (GnomePrintConfig *config), (config), NULL )
 
     wxDL_METHOD_DEFINE( GnomePrintJob*, gnome_print_job_new,
         (GnomePrintConfig *config), (config), NULL )
@@ -161,22 +155,24 @@ public:
         (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 )
         (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( guchar*, gnome_print_config_get,
         (GnomePrintConfig *config, const guchar *key), (config, key), NULL )
     wxDL_METHOD_DEFINE( gboolean, gnome_print_config_get_length,
         (GnomePrintConfig *config, const guchar *key, gdouble *val, const GnomePrintUnit **unit), (config, key, val, unit), false )
+    wxDL_METHOD_DEFINE( gboolean, gnome_print_config_get_boolean,
+        (GnomePrintConfig *config, const guchar *key, gboolean *val), (config, key, val), false )
 
     wxDL_METHOD_DEFINE( GtkWidget*, gnome_print_dialog_new,
         (GnomePrintJob *gpj, const guchar *title, gint flags), (gpj, title, flags), NULL )
 
     wxDL_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,
+    wxDL_VOIDMETHOD_DEFINE( gnome_print_dialog_construct_range_page,
         (GnomePrintDialog *gpd, gint flags, gint start, gint end,
         const guchar *currentlabel, const guchar *rangelabel),
         (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), /**/ )
+        (gpd, flags, start, end, currentlabel, rangelabel) )
+    wxDL_VOIDMETHOD_DEFINE( gnome_print_dialog_get_copies,
+        (GnomePrintDialog *gpd, gint *copies, gboolean *collate), (gpd, copies, collate)  )
+    wxDL_VOIDMETHOD_DEFINE( gnome_print_dialog_set_copies,
+        (GnomePrintDialog *gpd, gint copies, gint collate), (gpd, copies, collate)  )
     wxDL_METHOD_DEFINE( GnomePrintRangeType, gnome_print_dialog_get_range,
         (GnomePrintDialog *gpd), (gpd), GNOME_PRINT_RANGETYPE_NONE )
     wxDL_METHOD_DEFINE( int, gnome_print_dialog_get_range_page,
     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,
@@ -188,33 +184,31 @@ public:
     wxDL_METHOD_DEFINE( GtkWidget*, gnome_print_job_preview_new,
         (GnomePrintJob *gpm, const guchar *title), (gpm, title), NULL )
 
     wxDL_METHOD_DEFINE( GtkWidget*, gnome_print_job_preview_new,
         (GnomePrintJob *gpm, const guchar *title), (gpm, title), NULL )
 
-    DECLARE_NO_COPY_CLASS(wxGnomePrintLibrary)
+    wxDECLARE_NO_COPY_CLASS(wxGnomePrintLibrary);
 };
 
 wxGnomePrintLibrary::wxGnomePrintLibrary()
 {
 };
 
 wxGnomePrintLibrary::wxGnomePrintLibrary()
 {
-    m_gnome_print_lib = NULL;
-    m_gnome_printui_lib = NULL;
-
     wxLogNull log;
 
     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_libGnomePrint.Load("libgnomeprint-2-2.so.0");
+    m_ok = m_libGnomePrint.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;
+    m_libGnomePrintUI.Load("libgnomeprintui-2-2.so.0");
+    m_ok = m_libGnomePrintUI.IsLoaded();
+    if ( !m_ok )
+    {
+        m_libGnomePrint.Unload();
+        return;
+    }
 
 
-    InitializeMethods();
+    m_ok = InitializeMethods();
 }
 
 wxGnomePrintLibrary::~wxGnomePrintLibrary()
 {
 }
 
 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()
 }
 
 bool wxGnomePrintLibrary::IsOk()
@@ -222,78 +216,76 @@ bool wxGnomePrintLibrary::IsOk()
     return m_ok;
 }
 
     return m_ok;
 }
 
-void wxGnomePrintLibrary::InitializeMethods()
+bool wxGnomePrintLibrary::InitializeMethods()
 {
 {
-    m_ok = false;
-    bool success;
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_newpath );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_moveto );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_lineto );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_curveto );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_arcto );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_closepath );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_stroke );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_fill );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_setrgbcolor );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_setlinewidth );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_setdash );
 
 
-    wxDL_METHOD_LOAD( m_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_libGnomePrint, gnome_print_rgbimage );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_rgbaimage );
 
 
-    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_libGnomePrint, gnome_print_concat );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_scale );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_rotate );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_translate );
 
 
-    wxDL_METHOD_LOAD( m_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_libGnomePrint, gnome_print_gsave );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_grestore );
 
 
-    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_libGnomePrint, gnome_print_clip );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_eoclip );
 
 
-    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_libGnomePrint, gnome_print_beginpage );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_showpage );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_end_doc );
 
 
-    wxDL_METHOD_LOAD( m_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_libGnomePrint, gnome_print_pango_create_layout );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_pango_layout );
 
 
-    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_libGnomePrint, gnome_print_job_new );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_get_context );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_close );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_print );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_get_page_size );
 
 
-    wxDL_METHOD_LOAD( m_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_libGnomePrint, gnome_print_unit_get_by_abbreviation );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_convert_distance );
 
 
-    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_libGnomePrint, gnome_print_config_default );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_boolean );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_double );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_int );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_length );
 
 
-    wxDL_METHOD_LOAD( m_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_libGnomePrint, gnome_print_config_get );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get_length );
+    wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get_boolean );
 
 
-    wxDL_METHOD_LOAD( m_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_libGnomePrintUI, gnome_print_dialog_new );
+    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_construct_range_page );
+    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_get_copies );
+    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_set_copies );
+    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_get_range );
+    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_get_range_page );
 
 
-    wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_paper_selector_new_with_flags, success )
+    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_paper_selector_new_with_flags );
 
 
-    wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_job_preview_new, success )
+    wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_job_preview_new );
 
 
-    m_ok = true;
+    return true;
 }
 
 }
 
-static wxGnomePrintLibrary* gs_lgp = NULL;
+static wxGnomePrintLibrary* gs_libGnomePrint = NULL;
 
 //----------------------------------------------------------------------------
 // wxGnomePrintNativeData
 
 //----------------------------------------------------------------------------
 // wxGnomePrintNativeData
@@ -303,8 +295,8 @@ IMPLEMENT_CLASS(wxGnomePrintNativeData, wxPrintNativeDataBase)
 
 wxGnomePrintNativeData::wxGnomePrintNativeData()
 {
 
 wxGnomePrintNativeData::wxGnomePrintNativeData()
 {
-    m_config = gs_lgp->gnome_print_config_default();
-    m_job = gs_lgp->gnome_print_job_new( m_config );
+    m_config = gs_libGnomePrint->gnome_print_config_default();
+    m_job = gs_libGnomePrint->gnome_print_job_new( m_config );
 }
 
 wxGnomePrintNativeData::~wxGnomePrintNativeData()
 }
 
 wxGnomePrintNativeData::~wxGnomePrintNativeData()
@@ -314,14 +306,36 @@ wxGnomePrintNativeData::~wxGnomePrintNativeData()
 
 bool wxGnomePrintNativeData::TransferTo( wxPrintData &data )
 {
 
 bool wxGnomePrintNativeData::TransferTo( wxPrintData &data )
 {
-    guchar *res = gs_lgp->gnome_print_config_get( m_config,
+    guchar *res = gs_libGnomePrint->gnome_print_config_get( m_config,
             (guchar*)(char*)GNOME_PRINT_KEY_PAGE_ORIENTATION );
     if (g_ascii_strcasecmp((const gchar *)res,"R90") == 0)
         data.SetOrientation( wxLANDSCAPE );
     else
         data.SetOrientation( wxPORTRAIT );
     g_free( res );
             (guchar*)(char*)GNOME_PRINT_KEY_PAGE_ORIENTATION );
     if (g_ascii_strcasecmp((const gchar *)res,"R90") == 0)
         data.SetOrientation( wxLANDSCAPE );
     else
         data.SetOrientation( wxPORTRAIT );
     g_free( res );
-    
+
+    res = gs_libGnomePrint->gnome_print_config_get( m_config,
+            (guchar*)(char*)GNOME_PRINT_KEY_OUTPUT_FILENAME );
+    if (res)
+    {
+        data.SetFilename( wxConvFile.cMB2WX( (const char*) res ) );
+        wxPrintf( "filename %s\n", data.GetFilename() );
+        g_free( res );
+    }
+    else
+    {
+        data.SetFilename( wxEmptyString );
+    }
+
+    gboolean ret;
+    if (gs_libGnomePrint->gnome_print_config_get_boolean( m_config,
+            (guchar*)(char*)GNOME_PRINT_KEY_COLLATE, &ret))
+    {
+        data.SetCollate( ret );
+    }
+
+    // gnome_print_v
+
     return true;
 }
 
     return true;
 }
 
@@ -329,72 +343,72 @@ bool wxGnomePrintNativeData::TransferFrom( const wxPrintData &data )
 {
     if (data.GetOrientation() == wxLANDSCAPE)
     {
 {
     if (data.GetOrientation() == wxLANDSCAPE)
     {
-        gs_lgp->gnome_print_config_set( m_config,
+        gs_libGnomePrint->gnome_print_config_set( m_config,
             (guchar*)(char*)GNOME_PRINT_KEY_PAGE_ORIENTATION,
             (guchar*)(char*)"R90" );
     }
     else
     {
             (guchar*)(char*)GNOME_PRINT_KEY_PAGE_ORIENTATION,
             (guchar*)(char*)"R90" );
     }
     else
     {
-        gs_lgp->gnome_print_config_set( m_config,
+        gs_libGnomePrint->gnome_print_config_set( m_config,
             (guchar*)(char*)GNOME_PRINT_KEY_PAGE_ORIENTATION,
             (guchar*)(char*)"R0" );
     }
 
     if (data.GetCollate())
     {
             (guchar*)(char*)GNOME_PRINT_KEY_PAGE_ORIENTATION,
             (guchar*)(char*)"R0" );
     }
 
     if (data.GetCollate())
     {
-        gs_lgp->gnome_print_config_set_boolean( m_config,
+        gs_libGnomePrint->gnome_print_config_set_boolean( m_config,
             (guchar*)(char*)GNOME_PRINT_KEY_COLLATE,
             TRUE );
     }
     else
     {
             (guchar*)(char*)GNOME_PRINT_KEY_COLLATE,
             TRUE );
     }
     else
     {
-        gs_lgp->gnome_print_config_set_boolean( m_config,
+        gs_libGnomePrint->gnome_print_config_set_boolean( m_config,
             (guchar*)(char*)GNOME_PRINT_KEY_COLLATE,
             FALSE );
     }
 
     switch (data.GetPaperId())
     {
             (guchar*)(char*)GNOME_PRINT_KEY_COLLATE,
             FALSE );
     }
 
     switch (data.GetPaperId())
     {
-        case wxPAPER_A3:        gs_lgp->gnome_print_config_set( m_config,
+        case wxPAPER_A3:        gs_libGnomePrint->gnome_print_config_set( m_config,
                                     (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
                                     (guchar*)(char*)"A3" );
                                 break;
                                     (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
                                     (guchar*)(char*)"A3" );
                                 break;
-        case wxPAPER_A5:        gs_lgp->gnome_print_config_set( m_config,
+        case wxPAPER_A5:        gs_libGnomePrint->gnome_print_config_set( m_config,
                                     (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
                                     (guchar*)(char*)"A5" );
                                 break;
                                     (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
                                     (guchar*)(char*)"A5" );
                                 break;
-        case wxPAPER_B4:        gs_lgp->gnome_print_config_set( m_config,
+        case wxPAPER_B4:        gs_libGnomePrint->gnome_print_config_set( m_config,
                                     (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
                                     (guchar*)(char*)"B4" );
                                 break;
                                     (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
                                     (guchar*)(char*)"B4" );
                                 break;
-        case wxPAPER_B5:        gs_lgp->gnome_print_config_set( m_config,
+        case wxPAPER_B5:        gs_libGnomePrint->gnome_print_config_set( m_config,
                                     (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
                                     (guchar*)(char*)"B5" );
                                 break;
                                     (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
                                     (guchar*)(char*)"B5" );
                                 break;
-        case wxPAPER_LETTER:        gs_lgp->gnome_print_config_set( m_config,
+        case wxPAPER_LETTER:        gs_libGnomePrint->gnome_print_config_set( m_config,
                                     (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
                                     (guchar*)(char*)"USLetter" );
                                 break;
                                     (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
                                     (guchar*)(char*)"USLetter" );
                                 break;
-        case wxPAPER_LEGAL:     gs_lgp->gnome_print_config_set( m_config,
+        case wxPAPER_LEGAL:     gs_libGnomePrint->gnome_print_config_set( m_config,
                                     (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
                                     (guchar*)(char*)"USLegal" );
                                 break;
                                     (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
                                     (guchar*)(char*)"USLegal" );
                                 break;
-        case wxPAPER_EXECUTIVE: gs_lgp->gnome_print_config_set( m_config,
+        case wxPAPER_EXECUTIVE: gs_libGnomePrint->gnome_print_config_set( m_config,
                                     (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
                                     (guchar*)(char*)"Executive" );
                                 break;
                                     (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
                                     (guchar*)(char*)"Executive" );
                                 break;
-        case wxPAPER_ENV_C5:    gs_lgp->gnome_print_config_set( m_config,
+        case wxPAPER_ENV_C5:    gs_libGnomePrint->gnome_print_config_set( m_config,
                                     (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
                                     (guchar*)(char*)"C5" );
                                 break;
                                     (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
                                     (guchar*)(char*)"C5" );
                                 break;
-        case wxPAPER_ENV_C6:    gs_lgp->gnome_print_config_set( m_config,
+        case wxPAPER_ENV_C6:    gs_libGnomePrint->gnome_print_config_set( m_config,
                                     (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
                                     (guchar*)(char*)"C6" );
                                 break;
         case wxPAPER_NONE:      break;
                                     (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
                                     (guchar*)(char*)"C6" );
                                 break;
         case wxPAPER_NONE:      break;
-        
+
         default:
         default:
-        case wxPAPER_A4:        gs_lgp->gnome_print_config_set( m_config,
+        case wxPAPER_A4:        gs_libGnomePrint->gnome_print_config_set( m_config,
                                     (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
                                     (guchar*)(char*)"A4" );
                                 break;
                                     (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
                                     (guchar*)(char*)"A4" );
                                 break;
@@ -456,16 +470,30 @@ bool wxGnomePrintFactory::HasPrintSetupDialog()
     return false;
 }
 
     return false;
 }
 
-wxDialog *wxGnomePrintFactory::CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data )
+wxDialog *
+wxGnomePrintFactory::CreatePrintSetupDialog(wxWindow * WXUNUSED(parent),
+                                            wxPrintData * WXUNUSED(data))
 {
     return NULL;
 }
 
 {
     return NULL;
 }
 
+
+#if wxUSE_NEW_DC
+
+wxDCImpl* wxGnomePrintFactory::CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data )
+{
+    return new wxGnomePrinterDCImpl( owner, data );
+}
+
+#else
+
 wxDC* wxGnomePrintFactory::CreatePrinterDC( const wxPrintData& data )
 {
 wxDC* wxGnomePrintFactory::CreatePrinterDC( const wxPrintData& data )
 {
-    return new wxGnomePrintDC(data);
+    return new wxGnomePrinterDC(data);
 }
 
 }
 
+#endif
+
 bool wxGnomePrintFactory::HasOwnPrintToFile()
 {
     return true;
 bool wxGnomePrintFactory::HasOwnPrintToFile()
 {
     return true;
@@ -532,13 +560,13 @@ 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();
 
     data.ConvertToNative();
 
     wxGnomePrintNativeData *native =
       (wxGnomePrintNativeData*) data.GetNativeData();
 
-    m_widget = gs_lgp->gnome_print_dialog_new( native->GetPrintJob(),
+    m_widget = gs_libGnomePrint->gnome_print_dialog_new( native->GetPrintJob(),
                                        (guchar*)"Print",
                                        GNOME_PRINT_DIALOG_RANGE|GNOME_PRINT_DIALOG_COPIES );
 
                                        (guchar*)"Print",
                                        GNOME_PRINT_DIALOG_RANGE|GNOME_PRINT_DIALOG_COPIES );
 
@@ -548,7 +576,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;
 
-    gs_lgp->gnome_print_dialog_construct_range_page( (GnomePrintDialog*) m_widget,
+    gs_libGnomePrint->gnome_print_dialog_construct_range_page( (GnomePrintDialog*) m_widget,
                                              flag,
                                              m_printDialogData.GetMinPage(),
                                              m_printDialogData.GetMaxPage(),
                                              flag,
                                              m_printDialogData.GetMinPage(),
                                              m_printDialogData.GetMaxPage(),
@@ -577,11 +605,11 @@ int wxGnomePrintDialog::ShowModal()
 
     gint copies = 1;
     gboolean collate = false;
 
     gint copies = 1;
     gboolean collate = false;
-    gs_lgp->gnome_print_dialog_get_copies( (GnomePrintDialog*) m_widget, &copies, &collate );
+    gs_libGnomePrint->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 (gs_lgp->gnome_print_dialog_get_range( (GnomePrintDialog*) m_widget ))
+    switch (gs_libGnomePrint->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 );
@@ -594,7 +622,7 @@ int wxGnomePrintDialog::ShowModal()
         case GNOME_PRINT_RANGE_RANGE:
         default:
             gint start,end;
         case GNOME_PRINT_RANGE_RANGE:
         default:
             gint start,end;
-            gs_lgp->gnome_print_dialog_get_range_page( (GnomePrintDialog*) m_widget, &start, &end );
+            gs_libGnomePrint->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;
@@ -636,8 +664,8 @@ bool wxGnomePrintDialog::TransferDataFromWindow()
 
 IMPLEMENT_CLASS(wxGnomePageSetupDialog, wxPageSetupDialogBase)
 
 
 IMPLEMENT_CLASS(wxGnomePageSetupDialog, wxPageSetupDialogBase)
 
-wxGnomePageSetupDialog::wxGnomePageSetupDialog( wxWindow *parent,
-                            wxPageSetupDialogData* data )
+wxGnomePageSetupDialog::wxGnomePageSetupDialog(wxWindow * WXUNUSED(parent),
+                                               wxPageSetupDialogData *data)
 {
     if (data)
         m_pageDialogData = *data;
 {
     if (data)
         m_pageDialogData = *data;
@@ -650,34 +678,34 @@ wxGnomePageSetupDialog::wxGnomePageSetupDialog( wxWindow *parent,
     // This *was* required as the page setup dialog
     // calculates wrong values otherwise.
 #if 0
     // This *was* required as the page setup dialog
     // calculates wrong values otherwise.
 #if 0
-    gs_lgp->gnome_print_config_set( native->GetPrintConfig(),
+    gs_libGnomePrint->gnome_print_config_set( native->GetPrintConfig(),
                             (const guchar*) GNOME_PRINT_KEY_PREFERED_UNIT,
                             (const guchar*) "Pts" );
 #endif
 
     GnomePrintConfig *config = 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" );
+    const GnomePrintUnit *mm_unit = gs_libGnomePrint->gnome_print_unit_get_by_abbreviation( (const guchar*) "mm" );
 
     double ml = (double) m_pageDialogData.GetMarginTopLeft().x;
     double mt = (double) m_pageDialogData.GetMarginTopLeft().y;
     double mr = (double) m_pageDialogData.GetMarginBottomRight().x;
     double mb = (double) m_pageDialogData.GetMarginBottomRight().y;
 
     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,
+
+    gs_libGnomePrint->gnome_print_config_set_length (config,
             (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_LEFT, ml, mm_unit );
             (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_LEFT, ml, mm_unit );
-    gs_lgp->gnome_print_config_set_length (config,
+    gs_libGnomePrint->gnome_print_config_set_length (config,
             (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_RIGHT, mr, mm_unit );
             (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_RIGHT, mr, mm_unit );
-    gs_lgp->gnome_print_config_set_length (config,
+    gs_libGnomePrint->gnome_print_config_set_length (config,
             (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_TOP, mt, mm_unit );
             (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_TOP, mt, mm_unit );
-    gs_lgp->gnome_print_config_set_length (config,
+    gs_libGnomePrint->gnome_print_config_set_length (config,
             (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_BOTTOM, mb, mm_unit );
 
     m_widget = gtk_dialog_new();
 
     gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( _("Page setup") ) );
 
             (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_BOTTOM, mb, mm_unit );
 
     m_widget = gtk_dialog_new();
 
     gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( _("Page setup") ) );
 
-    GtkWidget *main = gs_lgp->gnome_paper_selector_new_with_flags( native->GetPrintConfig(),
+    GtkWidget *main = gs_libGnomePrint->gnome_paper_selector_new_with_flags( native->GetPrintConfig(),
         GNOME_PAPER_SELECTOR_MARGINS|GNOME_PAPER_SELECTOR_FEED_ORIENTATION );
     gtk_container_set_border_width (GTK_CONTAINER (main), 8);
     gtk_widget_show (main);
         GNOME_PAPER_SELECTOR_MARGINS|GNOME_PAPER_SELECTOR_FEED_ORIENTATION );
     gtk_container_set_border_width (GTK_CONTAINER (main), 8);
     gtk_widget_show (main);
@@ -708,7 +736,7 @@ int wxGnomePageSetupDialog::ShowModal()
 {
     wxGnomePrintNativeData *native =
       (wxGnomePrintNativeData*) m_pageDialogData.GetPrintData().GetNativeData();
 {
     wxGnomePrintNativeData *native =
       (wxGnomePrintNativeData*) m_pageDialogData.GetPrintData().GetNativeData();
-      
+
     GnomePrintConfig *config = native->GetPrintConfig();
 
 
     GnomePrintConfig *config = native->GetPrintConfig();
 
 
@@ -721,29 +749,29 @@ int wxGnomePageSetupDialog::ShowModal()
 
         // I don't know how querying the last parameter works
         double ml,mr,mt,mb,pw,ph;
 
         // 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,
+        gs_libGnomePrint->gnome_print_config_get_length (config,
             (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_LEFT, &ml, NULL);
             (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_LEFT, &ml, NULL);
-        gs_lgp->gnome_print_config_get_length (config,
+        gs_libGnomePrint->gnome_print_config_get_length (config,
             (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_RIGHT, &mr, NULL);
             (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_RIGHT, &mr, NULL);
-        gs_lgp->gnome_print_config_get_length (config,
+        gs_libGnomePrint->gnome_print_config_get_length (config,
             (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_TOP, &mt, NULL);
             (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_TOP, &mt, NULL);
-        gs_lgp->gnome_print_config_get_length (config,
+        gs_libGnomePrint->gnome_print_config_get_length (config,
             (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_BOTTOM, &mb, NULL);
             (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_BOTTOM, &mb, NULL);
-        gs_lgp->gnome_print_config_get_length (config,
+        gs_libGnomePrint->gnome_print_config_get_length (config,
             (const guchar*) GNOME_PRINT_KEY_PAPER_WIDTH, &pw, NULL);
             (const guchar*) GNOME_PRINT_KEY_PAPER_WIDTH, &pw, NULL);
-        gs_lgp->gnome_print_config_get_length (config,
+        gs_libGnomePrint->gnome_print_config_get_length (config,
             (const guchar*) GNOME_PRINT_KEY_PAPER_HEIGHT, &ph, NULL);
 
         // This code converts correctly from what the user chose
         // as the unit although I query Pts here
             (const 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 );
+        const GnomePrintUnit *mm_unit = gs_libGnomePrint->gnome_print_unit_get_by_abbreviation( (const guchar*) "mm" );
+        const GnomePrintUnit *pts_unit = gs_libGnomePrint->gnome_print_unit_get_by_abbreviation( (const guchar*) "Pts" );
+        gs_libGnomePrint->gnome_print_convert_distance( &ml, pts_unit, mm_unit );
+        gs_libGnomePrint->gnome_print_convert_distance( &mr, pts_unit, mm_unit );
+        gs_libGnomePrint->gnome_print_convert_distance( &mt, pts_unit, mm_unit );
+        gs_libGnomePrint->gnome_print_convert_distance( &mb, pts_unit, mm_unit );
+        gs_libGnomePrint->gnome_print_convert_distance( &pw, pts_unit, mm_unit );
+        gs_libGnomePrint->gnome_print_convert_distance( &ph, pts_unit, mm_unit );
 
         m_pageDialogData.SetMarginTopLeft( wxPoint( (int)(ml+0.5), (int)(mt+0.5)) );
         m_pageDialogData.SetMarginBottomRight( wxPoint( (int)(mr+0.5), (int)(mb+0.5)) );
 
         m_pageDialogData.SetMarginTopLeft( wxPoint( (int)(ml+0.5), (int)(mt+0.5)) );
         m_pageDialogData.SetMarginBottomRight( wxPoint( (int)(mr+0.5), (int)(mb+0.5)) );
@@ -803,11 +831,11 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
     }
 
     wxPrintData printdata = GetPrintDialogData().GetPrintData();
     }
 
     wxPrintData printdata = GetPrintDialogData().GetPrintData();
-    
+
     wxGnomePrintNativeData *native =
         (wxGnomePrintNativeData*) printdata.GetNativeData();
 
     wxGnomePrintNativeData *native =
         (wxGnomePrintNativeData*) printdata.GetNativeData();
 
-    GnomePrintJob *job = gs_lgp->gnome_print_job_new( native->GetPrintConfig() );
+    GnomePrintJob *job = gs_libGnomePrint->gnome_print_job_new( native->GetPrintConfig() );
 
     // The GnomePrintJob is temporarily stored in the
     // native print data as the native print dialog
 
     // The GnomePrintJob is temporarily stored in the
     // native print data as the native print dialog
@@ -826,27 +854,27 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
     if (prompt)
         dc = PrintDialog( parent );
     else
     if (prompt)
         dc = PrintDialog( parent );
     else
-        dc = new wxGnomePrintDC( printdata );
+#if wxUSE_NEW_DC
+        dc = new wxPrinterDC( printdata );  // TODO: check that this works
+#else
+        dc = new wxGnomePrinterDC( printdata );  // TODO: check that this works
+#endif
 
     if (m_native_preview)
         printout->SetIsPreview(true);
 
     if (!dc)
     {
 
     if (m_native_preview)
         printout->SetIsPreview(true);
 
     if (!dc)
     {
-        gs_lgp->gnome_print_job_close( job );
+        gs_libGnomePrint->gnome_print_job_close( job );
         g_object_unref (job);
         if (sm_lastError != wxPRINTER_CANCELLED)
             sm_lastError = wxPRINTER_ERROR;
         return false;
     }
 
         g_object_unref (job);
         if (sm_lastError != wxPRINTER_CANCELLED)
             sm_lastError = wxPRINTER_ERROR;
         return false;
     }
 
-    wxSize ScreenPixels = wxGetDisplaySize();
-    wxSize ScreenMM = wxGetDisplaySizeMM();
-
-    printout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
-                            (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
-    printout->SetPPIPrinter( wxGnomePrintDC::GetResolution(),
-                             wxGnomePrintDC::GetResolution() );
+    printout->SetPPIScreen(wxGetDisplayPPI());
+    printout->SetPPIPrinter( dc->GetResolution(),
+                             dc->GetResolution() );
 
     printout->SetDC(dc);
 
 
     printout->SetDC(dc);
 
@@ -866,7 +894,7 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
 
     if (maxPage == 0)
     {
 
     if (maxPage == 0)
     {
-        gs_lgp->gnome_print_job_close( job );
+        gs_libGnomePrint->gnome_print_job_close( job );
         g_object_unref (job);
         sm_lastError = wxPRINTER_ERROR;
         return false;
         g_object_unref (job);
         sm_lastError = wxPRINTER_ERROR;
         return false;
@@ -909,11 +937,11 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
         printout->OnEndPrinting();
     }
 
         printout->OnEndPrinting();
     }
 
-    gs_lgp->gnome_print_job_close( job );
+    gs_libGnomePrint->gnome_print_job_close( job );
     if (m_native_preview)
     {
         const wxCharBuffer title(wxGTK_CONV_SYS(_("Print preview")));
     if (m_native_preview)
     {
         const wxCharBuffer title(wxGTK_CONV_SYS(_("Print preview")));
-        GtkWidget *preview = gs_lgp->gnome_print_job_preview_new
+        GtkWidget *preview = gs_libGnomePrint->gnome_print_job_preview_new
                                      (
                                         job,
                                         (const guchar *)title.data()
                                      (
                                         job,
                                         (const guchar *)title.data()
@@ -922,7 +950,7 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
     }
     else
     {
     }
     else
     {
-        gs_lgp->gnome_print_job_print( job );
+        gs_libGnomePrint->gnome_print_job_print( job );
     }
 
     g_object_unref (job);
     }
 
     g_object_unref (job);
@@ -944,21 +972,47 @@ wxDC* wxGnomePrinter::PrintDialog( wxWindow *parent )
     m_native_preview = ret == wxID_PREVIEW;
 
     m_printDialogData = dialog.GetPrintDialogData();
     m_native_preview = ret == wxID_PREVIEW;
 
     m_printDialogData = dialog.GetPrintDialogData();
-    return new wxGnomePrintDC( m_printDialogData.GetPrintData() );
+#if wxUSE_NEW_DC
+    return new wxPrinterDC( m_printDialogData.GetPrintData() );
+#else
+    return new wxGnomePrinterDC( m_printDialogData.GetPrintData() );
+#endif
 }
 
 }
 
-bool wxGnomePrinter::Setup( wxWindow *parent )
+bool wxGnomePrinter::Setup(wxWindow * WXUNUSED(parent))
 {
     return false;
 }
 
 //-----------------------------------------------------------------------------
 {
     return false;
 }
 
 //-----------------------------------------------------------------------------
-// wxGnomePrintDC
+// wxGnomePrinterDC
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxGnomePrintDC, wxDC)
+// conversion
+static const double RAD2DEG  = 180.0 / M_PI;
+
+// we don't want to use only 72 dpi from GNOME print
+static const int DPI = 600;
+static const double PS2DEV = 600.0 / 72.0;
+static const double DEV2PS = 72.0 / 600.0;
 
 
-wxGnomePrintDC::wxGnomePrintDC( const wxPrintData& data )
+#define XLOG2DEV(x)     ((double)(LogicalToDeviceX(x)) * DEV2PS)
+#define XLOG2DEVREL(x)  ((double)(LogicalToDeviceXRel(x)) * DEV2PS)
+#define YLOG2DEV(x)     ((m_pageHeight - (double)LogicalToDeviceY(x)) * DEV2PS)
+#define YLOG2DEVREL(x)  ((double)(LogicalToDeviceYRel(x)) * DEV2PS)
+
+#if wxUSE_NEW_DC
+IMPLEMENT_ABSTRACT_CLASS(wxGnomePrinterDCImpl, wxDCImpl)
+#else
+IMPLEMENT_ABSTRACT_CLASS(wxGnomePrinterDC, wxDC)
+#endif
+
+#if wxUSE_NEW_DC
+wxGnomePrinterDCImpl::wxGnomePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) :
+   wxDCImpl( owner )
+#else
+wxGnomePrinterDC::wxGnomePrinterDC( const wxPrintData& data )
+#endif
 {
     m_printData = data;
 
 {
     m_printData = data;
 
@@ -966,9 +1020,9 @@ wxGnomePrintDC::wxGnomePrintDC( const wxPrintData& data )
         (wxGnomePrintNativeData*) m_printData.GetNativeData();
 
     m_job = native->GetPrintJob();
         (wxGnomePrintNativeData*) m_printData.GetNativeData();
 
     m_job = native->GetPrintJob();
-    m_gpc = gs_lgp->gnome_print_job_get_context (m_job);
+    m_gpc = gs_libGnomePrint->gnome_print_job_get_context (m_job);
 
 
-    m_layout = gs_lgp->gnome_print_pango_create_layout( m_gpc );
+    m_layout = gs_libGnomePrint->gnome_print_pango_create_layout( m_gpc );
     m_fontdesc = pango_font_description_from_string( "Sans 12" );
     m_context = NULL;
 
     m_fontdesc = pango_font_description_from_string( "Sans 12" );
     m_context = NULL;
 
@@ -976,50 +1030,58 @@ wxGnomePrintDC::wxGnomePrintDC( const wxPrintData& data )
     m_currentBlue = 0;
     m_currentGreen = 0;
 
     m_currentBlue = 0;
     m_currentGreen = 0;
 
-    m_signX =  1;  // default x-axis left to right
-    m_signY = -1;  // default y-axis bottom up -> top down
+    // Query page size. This seems to omit the margins
+    double pw,ph;
+    gs_libGnomePrint->gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph );
 
 
-    GetSize( NULL, &m_deviceOffsetY );
+    m_pageHeight = ph * PS2DEV;
 }
 
 }
 
-wxGnomePrintDC::~wxGnomePrintDC()
+wxGnomePrinterDCImpl::~wxGnomePrinterDCImpl()
 {
 }
 
 {
 }
 
-bool wxGnomePrintDC::IsOk() const
+bool wxGnomePrinterDCImpl::IsOk() const
 {
     return true;
 }
 
 {
     return true;
 }
 
-bool wxGnomePrintDC::DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style )
+bool
+wxGnomePrinterDCImpl::DoFloodFill(wxCoord WXUNUSED(x1),
+                            wxCoord WXUNUSED(y1),
+                            const wxColour& WXUNUSED(col),
+                            wxFloodFillStyle WXUNUSED(style))
 {
     return false;
 }
 
 {
     return false;
 }
 
-bool wxGnomePrintDC::DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const
+bool
+wxGnomePrinterDCImpl::DoGetPixel(wxCoord WXUNUSED(x1),
+                           wxCoord WXUNUSED(y1),
+                           wxColour * WXUNUSED(col)) const
 {
     return false;
 }
 
 {
     return false;
 }
 
-void wxGnomePrintDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
+void wxGnomePrinterDCImpl::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {
 {
-    if  (m_pen.GetStyle() == wxTRANSPARENT) return;
+    if  (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return;
 
     SetPen( m_pen );
 
 
     SetPen( m_pen );
 
-    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);
+    gs_libGnomePrint->gnome_print_moveto ( m_gpc, XLOG2DEV(x1), YLOG2DEV(y1) );
+    gs_libGnomePrint->gnome_print_lineto ( m_gpc, XLOG2DEV(x2), YLOG2DEV(y2) );
+    gs_libGnomePrint->gnome_print_stroke ( m_gpc);
 
     CalcBoundingBox( x1, y1 );
     CalcBoundingBox( x2, y2 );
 }
 
 
     CalcBoundingBox( x1, y1 );
     CalcBoundingBox( x2, y2 );
 }
 
-void wxGnomePrintDC::DoCrossHair(wxCoord x, wxCoord y)
+void wxGnomePrinterDCImpl::DoCrossHair(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
 {
 }
 
 {
 }
 
-void wxGnomePrintDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc)
+void wxGnomePrinterDCImpl::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc)
 {
     double dx = x1 - xc;
     double dy = y1 - yc;
 {
     double dx = x1 - xc;
     double dy = y1 - yc;
@@ -1030,10 +1092,10 @@ void wxGnomePrintDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoo
         alpha1 = 0.0;
         alpha2 = 360.0;
     }
         alpha1 = 0.0;
         alpha2 = 360.0;
     }
-    else
-    if (radius == 0.0)
+    else if ( wxIsNullDouble(radius) )
     {
     {
-        alpha1 = alpha2 = 0.0;
+        alpha1 =
+        alpha2 = 0.0;
     }
     else
     {
     }
     else
     {
@@ -1050,24 +1112,24 @@ void wxGnomePrintDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoo
         while (alpha2 > 360)  alpha2 -= 360;
     }
 
         while (alpha2 > 360)  alpha2 -= 360;
     }
 
-    if (m_brush.GetStyle() != wxTRANSPARENT)
+    if (m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT)
     {
         SetBrush( m_brush );
     {
         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_libGnomePrint->gnome_print_moveto ( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc) );
+        gs_libGnomePrint->gnome_print_arcto( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL((int)radius), alpha1, alpha2, 0 );
 
 
-        gs_lgp->gnome_print_fill( m_gpc );
+        gs_libGnomePrint->gnome_print_fill( m_gpc );
     }
 
     }
 
-    if (m_pen.GetStyle() != wxTRANSPARENT)
+    if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT)
     {
         SetPen (m_pen);
     {
         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_libGnomePrint->gnome_print_newpath( m_gpc );
+        gs_libGnomePrint->gnome_print_moveto ( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc) );
+        gs_libGnomePrint->gnome_print_arcto( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL((int)radius), alpha1, alpha2, 0 );
+        gs_libGnomePrint->gnome_print_closepath( m_gpc );
 
 
-        gs_lgp->gnome_print_stroke( m_gpc );
+        gs_libGnomePrint->gnome_print_stroke( m_gpc );
     }
 
     CalcBoundingBox (x1, y1);
     }
 
     CalcBoundingBox (x1, y1);
@@ -1075,58 +1137,58 @@ void wxGnomePrintDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoo
     CalcBoundingBox (xc, yc);
 }
 
     CalcBoundingBox (xc, yc);
 }
 
-void wxGnomePrintDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
+void wxGnomePrinterDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
 {
     x += w/2;
     y += h/2;
 
 {
     x += w/2;
     y += h/2;
 
-    int xx = XLOG2DEV(x);
-    int yy = YLOG2DEV(y);
+    double xx = XLOG2DEV(x);
+    double yy = YLOG2DEV(y);
 
 
-    gs_lgp->gnome_print_gsave( m_gpc );
+    gs_libGnomePrint->gnome_print_gsave( m_gpc );
 
 
-    gs_lgp->gnome_print_translate( m_gpc, xx, yy );
+    gs_libGnomePrint->gnome_print_translate( m_gpc, xx, yy );
     double scale = (double)YLOG2DEVREL(h) / (double) XLOG2DEVREL(w);
     double scale = (double)YLOG2DEVREL(h) / (double) XLOG2DEVREL(w);
-    gs_lgp->gnome_print_scale( m_gpc, 1.0, scale );
+    gs_libGnomePrint->gnome_print_scale( m_gpc, 1.0, scale );
 
 
-    xx = 0;
-    yy = 0;
+    xx = 0.0;
+    yy = 0.0;
 
 
-    if (m_brush.GetStyle () != wxTRANSPARENT)
+    if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)
     {
         SetBrush( m_brush );
 
     {
         SetBrush( m_brush );
 
-        gs_lgp->gnome_print_moveto ( m_gpc, xx, yy );
-        gs_lgp->gnome_print_arcto( m_gpc, xx, yy,
+        gs_libGnomePrint->gnome_print_moveto ( m_gpc, xx, yy );
+        gs_libGnomePrint->gnome_print_arcto( m_gpc, xx, yy,
             XLOG2DEVREL(w)/2, sa, ea, 0 );
             XLOG2DEVREL(w)/2, sa, ea, 0 );
-        gs_lgp->gnome_print_moveto ( m_gpc, xx, yy );
+        gs_libGnomePrint->gnome_print_moveto ( m_gpc, xx, yy );
 
 
-        gs_lgp->gnome_print_fill( m_gpc );
+        gs_libGnomePrint->gnome_print_fill( m_gpc );
     }
 
     }
 
-    if (m_pen.GetStyle () != wxTRANSPARENT)
+    if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)
     {
         SetPen (m_pen);
 
     {
         SetPen (m_pen);
 
-        gs_lgp->gnome_print_arcto( m_gpc, xx, yy,
+        gs_libGnomePrint->gnome_print_arcto( m_gpc, xx, yy,
             XLOG2DEVREL(w)/2, sa, ea, 0 );
 
             XLOG2DEVREL(w)/2, sa, ea, 0 );
 
-        gs_lgp->gnome_print_stroke( m_gpc );
+        gs_libGnomePrint->gnome_print_stroke( m_gpc );
     }
 
     }
 
-    gs_lgp->gnome_print_grestore( m_gpc );
+    gs_libGnomePrint->gnome_print_grestore( m_gpc );
 
     CalcBoundingBox( x, y );
     CalcBoundingBox( x+w, y+h );
 }
 
 
     CalcBoundingBox( x, y );
     CalcBoundingBox( x+w, y+h );
 }
 
-void wxGnomePrintDC::DoDrawPoint(wxCoord x, wxCoord y)
+void wxGnomePrinterDCImpl::DoDrawPoint(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
 {
 }
 
 {
 }
 
-void wxGnomePrintDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
+void wxGnomePrinterDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
 {
 {
-    if (m_pen.GetStyle() == wxTRANSPARENT) return;
+    if (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return;
 
     if (n <= 0) return;
 
 
     if (n <= 0) return;
 
@@ -1136,173 +1198,185 @@ void wxGnomePrintDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoo
     for ( i =0; i<n ; i++ )
         CalcBoundingBox( points[i].x+xoffset, points[i].y+yoffset);
 
     for ( i =0; i<n ; i++ )
         CalcBoundingBox( points[i].x+xoffset, points[i].y+yoffset);
 
-    gs_lgp->gnome_print_moveto ( m_gpc, XLOG2DEV(points[0].x+xoffset), YLOG2DEV(points[0].y+yoffset) );
+    gs_libGnomePrint->gnome_print_moveto ( m_gpc, XLOG2DEV(points[0].x+xoffset), YLOG2DEV(points[0].y+yoffset) );
 
     for (i = 1; i < n; i++)
 
     for (i = 1; i < n; i++)
-        gs_lgp->gnome_print_lineto ( m_gpc, XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset) );
+        gs_libGnomePrint->gnome_print_lineto ( m_gpc, XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset) );
 
 
-    gs_lgp->gnome_print_stroke ( m_gpc);
+    gs_libGnomePrint->gnome_print_stroke ( m_gpc);
 }
 
 }
 
-void wxGnomePrintDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
+void wxGnomePrinterDCImpl::DoDrawPolygon(int n, wxPoint points[],
+                                   wxCoord xoffset, wxCoord yoffset,
+                                   wxPolygonFillMode WXUNUSED(fillStyle))
 {
     if (n==0) return;
 
 {
     if (n==0) return;
 
-    if (m_brush.GetStyle () != wxTRANSPARENT)
+    if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)
     {
         SetBrush( m_brush );
 
         int x = points[0].x + xoffset;
         int y = points[0].y + yoffset;
         CalcBoundingBox( x, y );
     {
         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) );
+        gs_libGnomePrint->gnome_print_newpath( m_gpc );
+        gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
         int i;
         for (i = 1; i < n; i++)
         {
         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) );
+            x = points[i].x + xoffset;
+            y = points[i].y + yoffset;
+            gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
             CalcBoundingBox( x, y );
         }
             CalcBoundingBox( x, y );
         }
-        gs_lgp->gnome_print_closepath( m_gpc );
-        gs_lgp->gnome_print_fill( m_gpc );
+        gs_libGnomePrint->gnome_print_closepath( m_gpc );
+        gs_libGnomePrint->gnome_print_fill( m_gpc );
     }
 
     }
 
-    if (m_pen.GetStyle () != wxTRANSPARENT)
+    if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)
     {
         SetPen (m_pen);
 
         int x = points[0].x + xoffset;
         int y = points[0].y + yoffset;
     {
         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) );
+        gs_libGnomePrint->gnome_print_newpath( m_gpc );
+        gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
         int i;
         for (i = 1; i < n; i++)
         {
         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) );
+            x = points[i].x + xoffset;
+            y = points[i].y + yoffset;
+            gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
             CalcBoundingBox( x, y );
         }
             CalcBoundingBox( x, y );
         }
-        gs_lgp->gnome_print_closepath( m_gpc );
-        gs_lgp->gnome_print_stroke( m_gpc );
+        gs_libGnomePrint->gnome_print_closepath( m_gpc );
+        gs_libGnomePrint->gnome_print_stroke( m_gpc );
     }
 }
 
     }
 }
 
-void wxGnomePrintDC::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
+void wxGnomePrinterDCImpl::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle)
 {
 {
+#if wxUSE_NEW_DC
+    wxDCImpl::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );
+#else
     wxDC::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );
     wxDC::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );
+#endif
 }
 
 }
 
-void wxGnomePrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxGnomePrinterDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
 {
-    if (m_brush.GetStyle () != wxTRANSPARENT)
+    width--;
+    height--;
+
+    if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)
     {
         SetBrush( m_brush );
 
     {
         SetBrush( m_brush );
 
-        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 );
+        gs_libGnomePrint->gnome_print_newpath( m_gpc );
+        gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+        gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) );
+        gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) );
+        gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) );
+        gs_libGnomePrint->gnome_print_closepath( m_gpc );
+        gs_libGnomePrint->gnome_print_fill( m_gpc );
 
         CalcBoundingBox( x, y );
         CalcBoundingBox( x + width, y + height );
     }
 
 
         CalcBoundingBox( x, y );
         CalcBoundingBox( x + width, y + height );
     }
 
-    if (m_pen.GetStyle () != wxTRANSPARENT)
+    if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)
     {
         SetPen (m_pen);
 
     {
         SetPen (m_pen);
 
-        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 );
+        gs_libGnomePrint->gnome_print_newpath( m_gpc );
+        gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+        gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) );
+        gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) );
+        gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) );
+        gs_libGnomePrint->gnome_print_closepath( m_gpc );
+        gs_libGnomePrint->gnome_print_stroke( m_gpc );
 
         CalcBoundingBox( x, y );
         CalcBoundingBox( x + width, y + height );
     }
 }
 
 
         CalcBoundingBox( x, y );
         CalcBoundingBox( x + width, y + height );
     }
 }
 
-void wxGnomePrintDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
+void wxGnomePrinterDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
 {
 {
-    wxCoord rad = (wxCoord) radius;
+    width--;
+    height--;
 
 
-    if (m_brush.GetStyle() != wxTRANSPARENT)
+    wxCoord rad = wxRound( radius );
+
+    if (m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT)
     {
         SetBrush(m_brush);
     {
         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,
+        gs_libGnomePrint->gnome_print_newpath(m_gpc);
+        gs_libGnomePrint->gnome_print_moveto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
+        gs_libGnomePrint->gnome_print_curveto(m_gpc,
                                     XLOG2DEV(x + rad),YLOG2DEV(y),
                                     XLOG2DEV(x),YLOG2DEV(y),
                                     XLOG2DEV(x),YLOG2DEV(y + rad));
                                     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,
+        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x),YLOG2DEV(y + height - rad));
+        gs_libGnomePrint->gnome_print_curveto(m_gpc,
                                     XLOG2DEV(x),YLOG2DEV(y + height - rad),
                                     XLOG2DEV(x),YLOG2DEV(y + height),
                                     XLOG2DEV(x + rad),YLOG2DEV(y + height));
                                     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,
+        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + width - rad),YLOG2DEV(y + height));
+        gs_libGnomePrint->gnome_print_curveto(m_gpc,
                                     XLOG2DEV(x + width - rad),YLOG2DEV(y + height),
                                     XLOG2DEV(x + width),YLOG2DEV(y + height),
                                     XLOG2DEV(x + width),YLOG2DEV(y + height - rad));
                                     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,
+        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + width),YLOG2DEV(y + rad));
+        gs_libGnomePrint->gnome_print_curveto(m_gpc,
                                     XLOG2DEV(x + width),YLOG2DEV(y + rad),
                                     XLOG2DEV(x + width),YLOG2DEV(y),
                                     XLOG2DEV(x + width - rad),YLOG2DEV(y));
                                     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);
+        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
+        gs_libGnomePrint->gnome_print_closepath(m_gpc);
+        gs_libGnomePrint->gnome_print_fill(m_gpc);
 
         CalcBoundingBox(x,y);
         CalcBoundingBox(x+width,y+height);
     }
 
 
         CalcBoundingBox(x,y);
         CalcBoundingBox(x+width,y+height);
     }
 
-    if (m_pen.GetStyle() != wxTRANSPARENT)
+    if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT)
     {
         SetPen(m_pen);
     {
         SetPen(m_pen);
-        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,
+        gs_libGnomePrint->gnome_print_newpath(m_gpc);
+        gs_libGnomePrint->gnome_print_moveto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
+        gs_libGnomePrint->gnome_print_curveto(m_gpc,
                                     XLOG2DEV(x + rad),YLOG2DEV(y),
                                     XLOG2DEV(x),YLOG2DEV(y),
                                     XLOG2DEV(x),YLOG2DEV(y + rad));
                                     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,
+        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x),YLOG2DEV(y + height - rad));
+        gs_libGnomePrint->gnome_print_curveto(m_gpc,
                                     XLOG2DEV(x),YLOG2DEV(y + height - rad),
                                     XLOG2DEV(x),YLOG2DEV(y + height),
                                     XLOG2DEV(x + rad),YLOG2DEV(y + height));
                                     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,
+        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + width - rad),YLOG2DEV(y + height));
+        gs_libGnomePrint->gnome_print_curveto(m_gpc,
                                     XLOG2DEV(x + width - rad),YLOG2DEV(y + height),
                                     XLOG2DEV(x + width),YLOG2DEV(y + height),
                                     XLOG2DEV(x + width),YLOG2DEV(y + height - rad));
                                     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,
+        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + width),YLOG2DEV(y + rad));
+        gs_libGnomePrint->gnome_print_curveto(m_gpc,
                                     XLOG2DEV(x + width),YLOG2DEV(y + rad),
                                     XLOG2DEV(x + width),YLOG2DEV(y),
                                     XLOG2DEV(x + width - rad),YLOG2DEV(y));
                                     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);
+        gs_libGnomePrint->gnome_print_lineto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y));
+        gs_libGnomePrint->gnome_print_closepath(m_gpc);
+        gs_libGnomePrint->gnome_print_stroke(m_gpc);
 
         CalcBoundingBox(x,y);
         CalcBoundingBox(x+width,y+height);
     }
 }
 
 
         CalcBoundingBox(x,y);
         CalcBoundingBox(x+width,y+height);
     }
 }
 
-void wxGnomePrintDC::makeEllipticalPath(wxCoord x, wxCoord y,
+void wxGnomePrinterDCImpl::makeEllipticalPath(wxCoord x, wxCoord y,
                                         wxCoord width, wxCoord height)
 {
                                         wxCoord width, wxCoord height)
 {
-    double r = 4 * (sqrt (2) - 1) / 3;
+    double r = 4 * (sqrt(2.) - 1) / 3;
     double  halfW = 0.5 * width,
             halfH = 0.5 * height,
             halfWR = r * halfW,
     double  halfW = 0.5 * width,
             halfH = 0.5 * height,
             halfWR = r * halfW,
@@ -1310,77 +1384,80 @@ void wxGnomePrintDC::makeEllipticalPath(wxCoord x, wxCoord y,
     wxCoord halfWI = (wxCoord) halfW,
             halfHI = (wxCoord) halfH;
 
     wxCoord halfWI = (wxCoord) halfW,
             halfHI = (wxCoord) halfH;
 
-    gs_lgp->gnome_print_newpath( m_gpc );
+    gs_libGnomePrint->gnome_print_newpath( m_gpc );
 
     // Approximate an ellipse using four cubic splines, clockwise from 0 deg */
 
     // Approximate an ellipse using four cubic splines, clockwise from 0 deg */
-    gs_lgp->gnome_print_moveto( m_gpc,
+    gs_libGnomePrint->gnome_print_moveto( m_gpc,
                 XLOG2DEV(x + width),
                 YLOG2DEV(y + halfHI) );
                 XLOG2DEV(x + width),
                 YLOG2DEV(y + halfHI) );
-    gs_lgp->gnome_print_curveto( m_gpc,
+    gs_libGnomePrint->gnome_print_curveto( m_gpc,
                 XLOG2DEV(x + width),
                 YLOG2DEV(y + (wxCoord) rint (halfH + halfHR)),
                 XLOG2DEV(x + (wxCoord) rint(halfW + halfWR)),
                 YLOG2DEV(y + height),
                 XLOG2DEV(x + halfWI),
                 YLOG2DEV(y + height) );
                 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,
+    gs_libGnomePrint->gnome_print_curveto( m_gpc,
                 XLOG2DEV(x + (wxCoord) rint(halfW - halfWR)),
                 YLOG2DEV(y + height),
                 XLOG2DEV(x),
                 YLOG2DEV(y + (wxCoord) rint (halfH + halfHR)),
                 XLOG2DEV(x), YLOG2DEV(y+halfHI) );
                 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,
+    gs_libGnomePrint->gnome_print_curveto( m_gpc,
                 XLOG2DEV(x),
                 YLOG2DEV(y + (wxCoord) rint (halfH - halfHR)),
                 XLOG2DEV(x + (wxCoord) rint (halfW - halfWR)),
                 YLOG2DEV(y),
                 XLOG2DEV(x+halfWI), YLOG2DEV(y) );
                 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,
+    gs_libGnomePrint->gnome_print_curveto( m_gpc,
                 XLOG2DEV(x + (wxCoord) rint(halfW + halfWR)),
                 YLOG2DEV(y),
                 XLOG2DEV(x + width),
                 YLOG2DEV(y + (wxCoord) rint(halfH - halfHR)),
                 XLOG2DEV(x + width), YLOG2DEV(y + halfHI) );
 
                 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);
+    gs_libGnomePrint->gnome_print_closepath(m_gpc);
 }
 
 }
 
-void wxGnomePrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxGnomePrinterDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
 {
-    if (m_brush.GetStyle () != wxTRANSPARENT)
+    width--;
+    height--;
+
+    if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)
     {
         SetBrush( m_brush );
         makeEllipticalPath( x, y, width, height );
     {
         SetBrush( m_brush );
         makeEllipticalPath( x, y, width, height );
-        gs_lgp->gnome_print_fill( m_gpc );
+        gs_libGnomePrint->gnome_print_fill( m_gpc );
         CalcBoundingBox( x, y );
         CalcBoundingBox( x + width, y + height );
     }
 
         CalcBoundingBox( x, y );
         CalcBoundingBox( x + width, y + height );
     }
 
-    if (m_pen.GetStyle () != wxTRANSPARENT)
+    if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)
     {
         SetPen (m_pen);
         makeEllipticalPath( x, y, width, height );
     {
         SetPen (m_pen);
         makeEllipticalPath( x, y, width, height );
-        gs_lgp->gnome_print_stroke( m_gpc );
+        gs_libGnomePrint->gnome_print_stroke( m_gpc );
         CalcBoundingBox( x, y );
         CalcBoundingBox( x + width, y + height );
     }
 }
 
 #if wxUSE_SPLINES
         CalcBoundingBox( x, y );
         CalcBoundingBox( x + width, y + height );
     }
 }
 
 #if wxUSE_SPLINES
-void wxGnomePrintDC::DoDrawSpline(wxList *points)
+void wxGnomePrinterDCImpl::DoDrawSpline(const wxPointList *points)
 {
     SetPen (m_pen);
 
     double c, d, x1, y1, x2, y2, x3, y3;
     wxPoint *p, *q;
 
 {
     SetPen (m_pen);
 
     double c, d, x1, y1, x2, y2, x3, y3;
     wxPoint *p, *q;
 
-    wxList::compatibility_iterator node = points->GetFirst();
-    p = (wxPoint *)node->GetData();
+    wxPointList::compatibility_iterator node = points->GetFirst();
+    p = node->GetData();
     x1 = p->x;
     y1 = p->y;
 
     node = node->GetNext();
     x1 = p->x;
     y1 = p->y;
 
     node = node->GetNext();
-    p = (wxPoint *)node->GetData();
+    p = node->GetData();
     c = p->x;
     d = p->y;
     x3 =
     c = p->x;
     d = p->y;
     x3 =
@@ -1388,9 +1465,9 @@ void wxGnomePrintDC::DoDrawSpline(wxList *points)
     y3 =
          (double)(y1 + d) / 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) );
+    gs_libGnomePrint->gnome_print_newpath( m_gpc );
+    gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV((wxCoord)x1), YLOG2DEV((wxCoord)y1) );
+    gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV((wxCoord)x3), YLOG2DEV((wxCoord)y3) );
 
     CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
     CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );
 
     CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
     CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );
@@ -1398,7 +1475,7 @@ void wxGnomePrintDC::DoDrawSpline(wxList *points)
     node = node->GetNext();
     while (node)
     {
     node = node->GetNext();
     while (node)
     {
-        q = (wxPoint *)node->GetData();
+        q = node->GetData();
 
         x1 = x3;
         y1 = y3;
 
         x1 = x3;
         y1 = y3;
@@ -1409,7 +1486,7 @@ void wxGnomePrintDC::DoDrawSpline(wxList *points)
         x3 = (double)(x2 + c) / 2;
         y3 = (double)(y2 + d) / 2;
 
         x3 = (double)(x2 + c) / 2;
         y3 = (double)(y2 + d) / 2;
 
-        gs_lgp->gnome_print_curveto(m_gpc,
+        gs_libGnomePrint->gnome_print_curveto(m_gpc,
             XLOG2DEV((wxCoord)x1), YLOG2DEV((wxCoord)y1),
             XLOG2DEV((wxCoord)x2), YLOG2DEV((wxCoord)y2),
             XLOG2DEV((wxCoord)x3), YLOG2DEV((wxCoord)y3) );
             XLOG2DEV((wxCoord)x1), YLOG2DEV((wxCoord)y1),
             XLOG2DEV((wxCoord)x2), YLOG2DEV((wxCoord)y2),
             XLOG2DEV((wxCoord)x3), YLOG2DEV((wxCoord)y3) );
@@ -1420,15 +1497,20 @@ void wxGnomePrintDC::DoDrawSpline(wxList *points)
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 
-    gs_lgp->gnome_print_lineto ( m_gpc, XLOG2DEV((wxCoord)c), YLOG2DEV((wxCoord)d) );
+    gs_libGnomePrint->gnome_print_lineto ( m_gpc, XLOG2DEV((wxCoord)c), YLOG2DEV((wxCoord)d) );
 
 
-    gs_lgp->gnome_print_stroke( m_gpc );
+    gs_libGnomePrint->gnome_print_stroke( m_gpc );
 }
 #endif // wxUSE_SPLINES
 
 }
 #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
+wxGnomePrinterDCImpl::DoBlit(wxCoord xdest, wxCoord ydest,
+                      wxCoord width, wxCoord height,
+                      wxDC *source,
+                      wxCoord xsrc, wxCoord ysrc,
+                      wxRasterOperationMode rop,
+                      bool WXUNUSED(useMask),
+                      wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask))
 {
     wxCHECK_MSG( source, false, wxT("invalid source dc") );
 
 {
     wxCHECK_MSG( source, false, wxT("invalid source dc") );
 
@@ -1440,17 +1522,20 @@ bool wxGnomePrintDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord
     memDC.SelectObject(wxNullBitmap);
 
     // draw bitmap. scaling and positioning is done there
     memDC.SelectObject(wxNullBitmap);
 
     // draw bitmap. scaling and positioning is done there
-    DrawBitmap( bitmap, xdest, ydest );
+    GetOwner()->DrawBitmap( bitmap, xdest, ydest );
 
     return true;
 }
 
 
     return true;
 }
 
-void wxGnomePrintDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
+void wxGnomePrinterDCImpl::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
 {
     DoDrawBitmap( icon, x, y, true );
 }
 
 {
     DoDrawBitmap( icon, x, y, true );
 }
 
-void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask )
+void
+wxGnomePrinterDCImpl::DoDrawBitmap(const wxBitmap& bitmap,
+                             wxCoord x, wxCoord y,
+                             bool WXUNUSED(useMask))
 {
     if (!bitmap.Ok()) return;
 
 {
     if (!bitmap.Ok()) return;
 
@@ -1463,7 +1548,7 @@ void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y,
         int height = gdk_pixbuf_get_height( pixbuf );
         int width = gdk_pixbuf_get_width( pixbuf );
 
         int height = gdk_pixbuf_get_height( pixbuf );
         int width = gdk_pixbuf_get_width( pixbuf );
 
-        gs_lgp->gnome_print_gsave( m_gpc );
+        gs_libGnomePrint->gnome_print_gsave( m_gpc );
         double matrix[6];
         matrix[0] = XLOG2DEVREL(width);
         matrix[1] = 0;
         double matrix[6];
         matrix[0] = XLOG2DEVREL(width);
         matrix[1] = 0;
@@ -1471,13 +1556,13 @@ void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y,
         matrix[3] = YLOG2DEVREL(height);
         matrix[4] = XLOG2DEV(x);
         matrix[5] = YLOG2DEV(y+height);
         matrix[3] = YLOG2DEVREL(height);
         matrix[4] = XLOG2DEV(x);
         matrix[5] = YLOG2DEV(y+height);
-        gs_lgp->gnome_print_concat( m_gpc, matrix );
-        gs_lgp->gnome_print_moveto(  m_gpc, 0, 0 );
+        gs_libGnomePrint->gnome_print_concat( m_gpc, matrix );
+        gs_libGnomePrint->gnome_print_moveto(  m_gpc, 0, 0 );
         if (has_alpha)
         if (has_alpha)
-            gs_lgp->gnome_print_rgbaimage( m_gpc, (guchar *)raw_image, width, height, rowstride );
+            gs_libGnomePrint->gnome_print_rgbaimage( m_gpc, (guchar *)raw_image, width, height, rowstride );
         else
         else
-            gs_lgp->gnome_print_rgbimage( m_gpc, (guchar *)raw_image, width, height, rowstride );
-        gs_lgp->gnome_print_grestore( m_gpc );
+            gs_libGnomePrint->gnome_print_rgbimage( m_gpc, (guchar *)raw_image, width, height, rowstride );
+        gs_libGnomePrint->gnome_print_grestore( m_gpc );
     }
     else
     {
     }
     else
     {
@@ -1485,7 +1570,7 @@ void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y,
 
         if (!image.Ok()) return;
 
 
         if (!image.Ok()) return;
 
-        gs_lgp->gnome_print_gsave( m_gpc );
+        gs_libGnomePrint->gnome_print_gsave( m_gpc );
         double matrix[6];
         matrix[0] = XLOG2DEVREL(image.GetWidth());
         matrix[1] = 0;
         double matrix[6];
         matrix[0] = XLOG2DEVREL(image.GetWidth());
         matrix[1] = 0;
@@ -1493,22 +1578,22 @@ void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y,
         matrix[3] = YLOG2DEVREL(image.GetHeight());
         matrix[4] = XLOG2DEV(x);
         matrix[5] = YLOG2DEV(y+image.GetHeight());
         matrix[3] = YLOG2DEVREL(image.GetHeight());
         matrix[4] = XLOG2DEV(x);
         matrix[5] = YLOG2DEV(y+image.GetHeight());
-        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 );
+        gs_libGnomePrint->gnome_print_concat( m_gpc, matrix );
+        gs_libGnomePrint->gnome_print_moveto(  m_gpc, 0, 0 );
+        gs_libGnomePrint->gnome_print_rgbimage( m_gpc, (guchar*) image.GetData(), image.GetWidth(), image.GetHeight(), image.GetWidth()*3 );
+        gs_libGnomePrint->gnome_print_grestore( m_gpc );
     }
 }
 
     }
 }
 
-void wxGnomePrintDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y )
+void wxGnomePrinterDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y )
 {
     DoDrawRotatedText( text, x, y, 0.0 );
 }
 
 {
     DoDrawRotatedText( text, x, y, 0.0 );
 }
 
-void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)
+void wxGnomePrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)
 {
 {
-    x = XLOG2DEV(x);
-    y = YLOG2DEV(y);
+    double xx = XLOG2DEV(x);
+    double yy = YLOG2DEV(y);
 
     bool underlined = m_font.Ok() && m_font.GetUnderlined();
 
 
     bool underlined = m_font.Ok() && m_font.GetUnderlined();
 
@@ -1545,7 +1630,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;
 
-            gs_lgp->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );
+            gs_libGnomePrint->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );
 
             m_currentRed = red;
             m_currentBlue = blue;
 
             m_currentRed = red;
             m_currentBlue = blue;
@@ -1553,76 +1638,31 @@ void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord
         }
     }
 
         }
     }
 
-    int w,h;
-
-    if (fabs(m_scaleY - 1.0) > 0.00001)
-    {
-        // If there is a user or actually any scale applied to
-        // the device context, scale the font.
-
-        // scale font description
-        gint oldSize = pango_font_description_get_size( m_fontdesc );
-        double size = oldSize;
-        size = size * m_scaleY;
-        pango_font_description_set_size( m_fontdesc, (gint)size );
-
-        // 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 )
         {
             gdk_gc_set_foreground(m_textGC, m_textBackgroundColour.GetColor());
 #if 0
         if ( m_backgroundMode == wxSOLID )
         {
             gdk_gc_set_foreground(m_textGC, m_textBackgroundColour.GetColor());
-            gdk_draw_rectangle(m_window, m_textGC, TRUE, x, y, w, h);
+            gdk_draw_rectangle(m_window, m_textGC, TRUE, xx, yy, w, h);
             gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
         }
 #endif
             gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
         }
 #endif
-        // Draw layout.
-        gs_lgp->gnome_print_moveto (m_gpc, x, y);
-        if (fabs(angle) > 0.00001)
-        {
-            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
-        {
-            gs_lgp->gnome_print_pango_layout( m_gpc, m_layout );
-        }
 
 
-        // reset unscaled size
-        pango_font_description_set_size( m_fontdesc, oldSize );
+    // Draw layout.
+    gs_libGnomePrint->gnome_print_moveto (m_gpc, xx, yy);
 
 
-        // actually apply unscaled font
-        pango_layout_set_font_description( m_layout, m_fontdesc );
-    }
-    else
-    {
-        pango_layout_get_pixel_size( m_layout, &w, &h );
-#if 0
-        if ( m_backgroundMode == wxSOLID )
-        {
-            gdk_gc_set_foreground(m_textGC, m_textBackgroundColour.GetColor());
-            gdk_draw_rectangle(m_window, m_textGC, TRUE, x, y, w, h);
-            gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
-        }
-#endif
-        // Draw layout.
-        gs_lgp->gnome_print_moveto (m_gpc, x, y);
-        if (fabs(angle) > 0.00001)
-        {
-            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
-        {
-            gs_lgp->gnome_print_pango_layout( m_gpc, m_layout );
-        }
-    }
+    gs_libGnomePrint->gnome_print_gsave( m_gpc );
+
+    gs_libGnomePrint->gnome_print_scale( m_gpc, m_scaleX * DEV2PS, m_scaleY * DEV2PS );
+
+    if (fabs(angle) > 0.00001)
+        gs_libGnomePrint->gnome_print_rotate( m_gpc, angle );
+
+    gs_libGnomePrint->gnome_print_pango_layout( m_gpc, m_layout );
+
+    int w,h;
+    pango_layout_get_pixel_size( m_layout, &w, &h );
+
+    gs_libGnomePrint->gnome_print_grestore( m_gpc );
 
     if (underlined)
     {
 
     if (underlined)
     {
@@ -1630,14 +1670,15 @@ void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord
         pango_layout_set_attributes(m_layout, NULL);
     }
 
         pango_layout_set_attributes(m_layout, NULL);
     }
 
-    CalcBoundingBox (x + w, y + h);
+    CalcBoundingBox(x, y);
+    CalcBoundingBox(x + w, y + h);
 }
 
 }
 
-void wxGnomePrintDC::Clear()
+void wxGnomePrinterDCImpl::Clear()
 {
 }
 
 {
 }
 
-void wxGnomePrintDC::SetFont( const wxFont& font )
+void wxGnomePrinterDCImpl::SetFont( const wxFont& font )
 {
     m_font = font;
 
 {
     m_font = font;
 
@@ -1648,17 +1689,28 @@ void wxGnomePrintDC::SetFont( const wxFont& font )
 
         m_fontdesc = pango_font_description_copy( m_font.GetNativeFontInfo()->description );
 
 
         m_fontdesc = pango_font_description_copy( m_font.GetNativeFontInfo()->description );
 
+        float size = pango_font_description_get_size( m_fontdesc );
+        size = size * GetFontPointSizeAdjustment(72.0);
+        pango_font_description_set_size( m_fontdesc, (gint)size );
+
         pango_layout_set_font_description( m_layout, m_fontdesc );
     }
 }
 
         pango_layout_set_font_description( m_layout, m_fontdesc );
     }
 }
 
-void wxGnomePrintDC::SetPen( const wxPen& pen )
+void wxGnomePrinterDCImpl::SetPen( const wxPen& pen )
 {
     if (!pen.Ok()) return;
 
     m_pen = pen;
 
 {
     if (!pen.Ok()) return;
 
     m_pen = pen;
 
-    gs_lgp->gnome_print_setlinewidth( m_gpc, XLOG2DEVREL( 1000 * m_pen.GetWidth() ) / 1000.0f );
+    double width;
+
+    if (m_pen.GetWidth() <= 0)
+        width = 0.1;
+    else
+        width = (double) m_pen.GetWidth();
+
+    gs_libGnomePrint->gnome_print_setlinewidth( m_gpc, width * DEV2PS * m_scaleX );
 
     static const double dotted[] =  {2.0, 5.0};
     static const double short_dashed[] = {4.0, 4.0};
 
     static const double dotted[] =  {2.0, 5.0};
     static const double short_dashed[] = {4.0, 4.0};
@@ -1667,11 +1719,11 @@ void wxGnomePrintDC::SetPen( const wxPen& pen )
 
     switch (m_pen.GetStyle())
     {
 
     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:
+        case wxPENSTYLE_DOT:        gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, dotted, 0 ); break;
+        case wxPENSTYLE_SHORT_DASH: gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, short_dashed, 0 ); break;
+        case wxPENSTYLE_LONG_DASH:  gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, wxCoord_dashed, 0 ); break;
+        case wxPENSTYLE_DOT_DASH:   gs_libGnomePrint->gnome_print_setdash( m_gpc, 4, dotted_dashed, 0 );  break;
+        case wxPENSTYLE_USER_DASH:
         {
             // It may be noted that libgnomeprint between at least
             // versions 2.8.0 and 2.12.1 makes a copy of the dashes
         {
             // It may be noted that libgnomeprint between at least
             // versions 2.8.0 and 2.12.1 makes a copy of the dashes
@@ -1683,13 +1735,13 @@ void wxGnomePrintDC::SetPen( const wxPen& pen )
             int i;
             for (i = 0; i < num; ++i)
                 g_dashes[i] = (gdouble) wx_dashes[i];
             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);
+            gs_libGnomePrint -> gnome_print_setdash( m_gpc, num, g_dashes, 0);
             g_free( g_dashes );
         }
         break;
             g_free( g_dashes );
         }
         break;
-        case wxSOLID:
-        case wxTRANSPARENT:
-        default:              gs_lgp->gnome_print_setdash( m_gpc, 0, NULL, 0 );   break;
+        case wxPENSTYLE_SOLID:
+        case wxPENSTYLE_TRANSPARENT:
+        default:              gs_libGnomePrint->gnome_print_setdash( m_gpc, 0, NULL, 0 );   break;
     }
 
 
     }
 
 
@@ -1703,7 +1755,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;
 
-        gs_lgp->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );
+        gs_libGnomePrint->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );
 
         m_currentRed = red;
         m_currentBlue = blue;
 
         m_currentRed = red;
         m_currentBlue = blue;
@@ -1711,7 +1763,7 @@ void wxGnomePrintDC::SetPen( const wxPen& pen )
     }
 }
 
     }
 }
 
-void wxGnomePrintDC::SetBrush( const wxBrush& brush )
+void wxGnomePrinterDCImpl::SetBrush( const wxBrush& brush )
 {
     if (!brush.Ok()) return;
 
 {
     if (!brush.Ok()) return;
 
@@ -1742,7 +1794,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;
 
-        gs_lgp->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );
+        gs_libGnomePrint->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );
 
         m_currentRed = red;
         m_currentBlue = blue;
 
         m_currentRed = red;
         m_currentBlue = blue;
@@ -1750,31 +1802,47 @@ void wxGnomePrintDC::SetBrush( const wxBrush& brush )
     }
 }
 
     }
 }
 
-void wxGnomePrintDC::SetLogicalFunction( int function )
+void wxGnomePrinterDCImpl::SetLogicalFunction(wxRasterOperationMode WXUNUSED(function))
 {
 }
 
 {
 }
 
-void wxGnomePrintDC::SetBackground( const wxBrush& brush )
+void wxGnomePrinterDCImpl::SetBackground(const wxBrush& WXUNUSED(brush))
 {
 }
 
 {
 }
 
-void wxGnomePrintDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxGnomePrinterDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
 {
-    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 );
+#if wxUSE_NEW_DC
+    m_clipping = TRUE;    // TODO move somewhere else
+    m_clipX1 = x;
+    m_clipY1 = y;
+    m_clipX2 = x + width;
+    m_clipY2 = y + height;
+#else
+    wxDC::DoSetClippingRegion( x, y, width, height );
+#endif
+
+    gs_libGnomePrint->gnome_print_gsave( m_gpc );
+
+    gs_libGnomePrint->gnome_print_newpath( m_gpc );
+    gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+    gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) );
+    gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) );
+    gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) );
+    gs_libGnomePrint->gnome_print_closepath( m_gpc );
+    gs_libGnomePrint->gnome_print_clip( m_gpc );
 }
 
 }
 
-void wxGnomePrintDC::DestroyClippingRegion()
+void wxGnomePrinterDCImpl::DestroyClippingRegion()
 {
 {
-    gs_lgp->gnome_print_grestore( m_gpc );
-    
+#if wxUSE_NEW_DC
+    wxDCImpl::DestroyClippingRegion();
+#else
+    wxDC::DestroyClippingRegion();
+#endif
+
+    gs_libGnomePrint->gnome_print_grestore( m_gpc );
+
 #if 0
     // not needed, we set the values in each
     // drawing method anyways
 #if 0
     // not needed, we set the values in each
     // drawing method anyways
@@ -1784,27 +1852,27 @@ void wxGnomePrintDC::DestroyClippingRegion()
 #endif
 }
 
 #endif
 }
 
-bool wxGnomePrintDC::StartDoc(const wxString& message)
+bool wxGnomePrinterDCImpl::StartDoc(const wxString& WXUNUSED(message))
 {
     return true;
 }
 
 {
     return true;
 }
 
-void wxGnomePrintDC::EndDoc()
+void wxGnomePrinterDCImpl::EndDoc()
 {
 {
-    gs_lgp->gnome_print_end_doc( m_gpc );
+    gs_libGnomePrint->gnome_print_end_doc( m_gpc );
 }
 
 }
 
-void wxGnomePrintDC::StartPage()
+void wxGnomePrinterDCImpl::StartPage()
 {
 {
-    gs_lgp->gnome_print_beginpage( m_gpc, (const guchar*) "page" );
+    gs_libGnomePrint->gnome_print_beginpage( m_gpc, (const guchar*) "page" );
 }
 
 }
 
-void wxGnomePrintDC::EndPage()
+void wxGnomePrinterDCImpl::EndPage()
 {
 {
-    gs_lgp->gnome_print_showpage( m_gpc );
+    gs_libGnomePrint->gnome_print_showpage( m_gpc );
 }
 
 }
 
-wxCoord wxGnomePrintDC::GetCharHeight() const
+wxCoord wxGnomePrinterDCImpl::GetCharHeight() const
 {
     pango_layout_set_text( m_layout, "H", 1 );
 
 {
     pango_layout_set_text( m_layout, "H", 1 );
 
@@ -1814,7 +1882,7 @@ wxCoord wxGnomePrintDC::GetCharHeight() const
     return h;
 }
 
     return h;
 }
 
-wxCoord wxGnomePrintDC::GetCharWidth() const
+wxCoord wxGnomePrinterDCImpl::GetCharWidth() const
 {
     pango_layout_set_text( m_layout, "H", 1 );
 
 {
     pango_layout_set_text( m_layout, "H", 1 );
 
@@ -1824,7 +1892,7 @@ wxCoord wxGnomePrintDC::GetCharWidth() const
     return w;
 }
 
     return w;
 }
 
-void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height,
+void wxGnomePrinterDCImpl::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height,
                      wxCoord *descent,
                      wxCoord *externalLeading,
                      const wxFont *theFont ) const
                      wxCoord *descent,
                      wxCoord *externalLeading,
                      const wxFont *theFont ) const
@@ -1843,10 +1911,6 @@ void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxC
         return;
     }
 
         return;
     }
 
-    // Set new font description
-    if (theFont)
-        pango_layout_set_font_description( m_layout, theFont->GetNativeFontInfo()->description );
-
     // Set layout's text
 
     // FIXME-UTF8: wouldn't be needed if utf8_str() always returned a buffer
     // Set layout's text
 
     // FIXME-UTF8: wouldn't be needed if utf8_str() always returned a buffer
@@ -1856,15 +1920,25 @@ void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxC
     const wxCharBuffer dataUTF8 = string.utf8_str();
 #endif
 
     const wxCharBuffer dataUTF8 = string.utf8_str();
 #endif
 
+    gint oldSize = 0;
+    if ( theFont )
+    {
+        // scale the font and apply it
+        PangoFontDescription *desc = theFont->GetNativeFontInfo()->description;
+        oldSize = pango_font_description_get_size(desc);
+        float size = oldSize * GetFontPointSizeAdjustment(72.0);
+        pango_font_description_set_size(desc, (gint)size);
+
+        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;
-    pango_layout_get_pixel_size( m_layout, &w, &h );
+    int h;
+    pango_layout_get_pixel_size( m_layout, width, &h );
+    if ( height )
+        *height = h;
 
 
-    if (width)
-        *width = (wxCoord)(w / m_scaleX);
-    if (height)
-        *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);
@@ -1873,27 +1947,33 @@ void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxC
         *descent = h - PANGO_PIXELS(baseline);
     }
 
         *descent = h - PANGO_PIXELS(baseline);
     }
 
-    // Reset old font description
-    if (theFont)
-        pango_layout_set_font_description( m_layout, m_fontdesc );
+    if ( theFont )
+    {
+        // restore font and reset font's size back
+        pango_layout_set_font_description(m_layout, m_fontdesc);
+
+        PangoFontDescription *desc = theFont->GetNativeFontInfo()->description;
+        pango_font_description_set_size(desc, oldSize);
+    }
 }
 
 }
 
-void wxGnomePrintDC::DoGetSize(int* width, int* height) const
+void wxGnomePrinterDCImpl::DoGetSize(int* width, int* height) const
 {
     wxGnomePrintNativeData *native =
       (wxGnomePrintNativeData*) m_printData.GetNativeData();
 
     // Query page size. This seems to omit the margins
     double pw,ph;
 {
     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 );
+    gs_libGnomePrint->gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph );
 
     if (width)
 
     if (width)
-        *width = (int) (pw + 0.5);
+        *width = wxRound( pw * PS2DEV );
+
     if (height)
     if (height)
-        *height = (int) (ph + 0.5);
+        *height = wxRound( ph * PS2DEV );
 }
 
 }
 
-void wxGnomePrintDC::DoGetSizeMM(int *width, int *height) const
+void wxGnomePrinterDCImpl::DoGetSizeMM(int *width, int *height) const
 {
     wxGnomePrintNativeData *native =
       (wxGnomePrintNativeData*) m_printData.GetNativeData();
 {
     wxGnomePrintNativeData *native =
       (wxGnomePrintNativeData*) m_printData.GetNativeData();
@@ -1901,14 +1981,14 @@ void wxGnomePrintDC::DoGetSizeMM(int *width, int *height) const
     // This code assumes values in Pts.
 
     double pw,ph;
     // This code assumes values in Pts.
 
     double pw,ph;
-    gs_lgp->gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph );
+    gs_libGnomePrint->gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph );
 
     // Convert to mm.
 
 
     // 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 );
+    const GnomePrintUnit *mm_unit = gs_libGnomePrint->gnome_print_unit_get_by_abbreviation( (const guchar*) "mm" );
+    const GnomePrintUnit *pts_unit = gs_libGnomePrint->gnome_print_unit_get_by_abbreviation( (const guchar*) "Pts" );
+    gs_libGnomePrint->gnome_print_convert_distance( &pw, pts_unit, mm_unit );
+    gs_libGnomePrint->gnome_print_convert_distance( &ph, pts_unit, mm_unit );
 
     if (width)
         *width = (int) (pw + 0.5);
 
     if (width)
         *width = (int) (pw + 0.5);
@@ -1916,71 +1996,55 @@ void wxGnomePrintDC::DoGetSizeMM(int *width, int *height) const
         *height = (int) (ph + 0.5);
 }
 
         *height = (int) (ph + 0.5);
 }
 
-wxSize wxGnomePrintDC::GetPPI() const
-{
-    return wxSize(72,72);
-}
-
-void wxGnomePrintDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
+wxSize wxGnomePrinterDCImpl::GetPPI() const
 {
 {
-    m_signX = (xLeftRight ? 1 : -1);
-    m_signY = (yBottomUp  ? 1 : -1);
-
-    ComputeScaleAndOrigin();
+    return wxSize(DPI,DPI);
 }
 
 }
 
-void wxGnomePrintDC::SetLogicalOrigin( wxCoord x, wxCoord y )
+void wxGnomePrinterDCImpl::SetPrintData(const wxPrintData& data)
 {
 {
-    wxDC::SetLogicalOrigin( x, y );
-}
-
-void wxGnomePrintDC::SetDeviceOrigin( wxCoord x, wxCoord y )
-{
-    wxDC::SetDeviceOrigin( x, y );
-}
-
-void wxGnomePrintDC::SetPrintData(const wxPrintData& data)
-{ 
     m_printData = data;
     m_printData = data;
-    
+
+    int height;
     if (m_printData.GetOrientation() == wxPORTRAIT)
     if (m_printData.GetOrientation() == wxPORTRAIT)
-        GetSize( NULL, &m_deviceOffsetY );
+        GetOwner()->GetSize( NULL, &height );
     else
     else
-        GetSize( &m_deviceOffsetY, NULL );
+        GetOwner()->GetSize( &height, NULL );
+    m_deviceLocalOriginY = height;
 }
 
 }
 
-void wxGnomePrintDC::SetResolution(int ppi)
-{
-}
+// overridden for wxPrinterDC Impl
 
 
-int wxGnomePrintDC::GetResolution()
+int wxGnomePrinterDCImpl::GetResolution() const
 {
 {
-    return 72;
+    return DPI;
 }
 
 }
 
-
-class wxGnomePrintModule: public wxModule
+wxRect wxGnomePrinterDCImpl::GetPaperRect() const
 {
 {
-public:
-    wxGnomePrintModule() {}
-    bool OnInit();
-    void OnExit();
+    // GNOME print doesn't support printer margins
+    int w = 0;
+    int h = 0;
+    DoGetSize( &w, &h );
+    return wxRect( 0, 0, w, h );
+}
 
 
-private:
-    DECLARE_DYNAMIC_CLASS(wxGnomePrintModule)
-};
+// ----------------------------------------------------------------------------
+// wxGnomePrintModule
+// ----------------------------------------------------------------------------
 
 bool wxGnomePrintModule::OnInit()
 {
 
 bool wxGnomePrintModule::OnInit()
 {
-    gs_lgp = new wxGnomePrintLibrary;
-    if (gs_lgp->IsOk())
+    gs_libGnomePrint = new wxGnomePrintLibrary;
+    if (gs_libGnomePrint->IsOk())
         wxPrintFactory::SetPrintFactory( new wxGnomePrintFactory );
     return true;
 }
 
 void wxGnomePrintModule::OnExit()
 {
         wxPrintFactory::SetPrintFactory( new wxGnomePrintFactory );
     return true;
 }
 
 void wxGnomePrintModule::OnExit()
 {
-    delete gs_lgp;
+    delete gs_libGnomePrint;
+    gs_libGnomePrint = NULL;
 }
 
 IMPLEMENT_DYNAMIC_CLASS(wxGnomePrintModule, wxModule)
 }
 
 IMPLEMENT_DYNAMIC_CLASS(wxGnomePrintModule, wxModule)
@@ -2038,19 +2102,17 @@ void wxGnomePrintPreview::DetermineScaling()
 
     if (paper)
     {
 
     if (paper)
     {
-        wxSize ScreenPixels = wxGetDisplaySize();
-        wxSize ScreenMM = wxGetDisplaySizeMM();
+        m_previewPrintout->SetPPIScreen(wxGetDisplayPPI());
 
 
-        m_previewPrintout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
-                                         (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
-        m_previewPrintout->SetPPIPrinter(wxGnomePrintDC::GetResolution(), wxGnomePrintDC::GetResolution());
+        int resolution = DPI;
+        m_previewPrintout->SetPPIPrinter( resolution, resolution );
 
         wxSize sizeDevUnits(paper->GetSizeDeviceUnits());
 
 
         wxSize sizeDevUnits(paper->GetSizeDeviceUnits());
 
-        // TODO: get better resolution information from wxGnomePrintDC, if possible.
+        // TODO: get better resolution information from wxGnomePrinterDCImpl, if possible.
 
 
-        sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x * wxGnomePrintDC::GetResolution() / 72.0);
-        sizeDevUnits.y = (wxCoord)((float)sizeDevUnits.y * wxGnomePrintDC::GetResolution() / 72.0);
+        sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x * resolution / 72.0);
+        sizeDevUnits.y = (wxCoord)((float)sizeDevUnits.y * resolution / 72.0);
         wxSize sizeTenthsMM(paper->GetSize());
         wxSize sizeMM(sizeTenthsMM.x / 10, sizeTenthsMM.y / 10);
 
         wxSize sizeTenthsMM(paper->GetSize());
         wxSize sizeMM(sizeTenthsMM.x / 10, sizeTenthsMM.y / 10);
 
@@ -2071,7 +2133,7 @@ void wxGnomePrintPreview::DetermineScaling()
         m_previewPrintout->SetPaperRectPixels(wxRect(0, 0, m_pageWidth, m_pageHeight));
 
         // At 100%, the page should look about page-size on the screen.
         m_previewPrintout->SetPaperRectPixels(wxRect(0, 0, m_pageWidth, m_pageHeight));
 
         // At 100%, the page should look about page-size on the screen.
-        m_previewScaleX = (float)0.8 * 72.0 / (float)wxGnomePrintDC::GetResolution();
+        m_previewScaleX = (double)0.8 * 72.0 / (double)resolution;
         m_previewScaleY = m_previewScaleX;
     }
 }
         m_previewScaleY = m_previewScaleX;
     }
 }
wxWidgets (Impactor)