]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/gnome/gprint.cpp
Reverted changes that set m_widget to NULL in native
[wxWidgets.git] / src / gtk / gnome / gprint.cpp
index 2c3ab8c3e3c2d264e281c5965e92f12d6aa24e0c..4421ce7185aea8a2a504a88f18d41377b23d03b6 100644 (file)
 
 #if wxUSE_LIBGNOMEPRINT
 
 
 #if wxUSE_LIBGNOMEPRINT
 
+#include "math.h"
+
 #include "wx/fontutil.h"
 #include "wx/printdlg.h"
 #include "wx/gtk/private.h"
 #include "wx/fontutil.h"
 #include "wx/printdlg.h"
 #include "wx/gtk/private.h"
+#include "wx/module.h"
+#include "wx/generic/prntdlgg.h"
 
 #include <libgnomeprint/gnome-print.h>
 #include <libgnomeprint/gnome-print-pango.h>
 
 #include <libgnomeprint/gnome-print.h>
 #include <libgnomeprint/gnome-print-pango.h>
+#include <libgnomeprint/gnome-print-config.h>
 #include <libgnomeprintui/gnome-print-dialog.h>
 #include <libgnomeprintui/gnome-print-dialog.h>
+#include <libgnomeprintui/gnome-print-job-preview.h>
+#include <libgnomeprintui/gnome-print-paper-selector.h>
 
 //----------------------------------------------------------------------------
 // wxGnomePrintNativeData
 
 //----------------------------------------------------------------------------
 // wxGnomePrintNativeData
@@ -45,7 +52,6 @@ wxGnomePrintNativeData::wxGnomePrintNativeData()
 wxGnomePrintNativeData::~wxGnomePrintNativeData()
 {
     g_object_unref (G_OBJECT (m_config));
 wxGnomePrintNativeData::~wxGnomePrintNativeData()
 {
     g_object_unref (G_OBJECT (m_config));
-    g_object_unref (G_OBJECT (m_job));
 }
 
 bool wxGnomePrintNativeData::TransferTo( wxPrintData &data )
 }
 
 bool wxGnomePrintNativeData::TransferTo( wxPrintData &data )
@@ -86,23 +92,36 @@ wxPrintPreviewBase *wxGnomePrintFactory::CreatePrintPreview( wxPrintout *preview
 wxPrintDialogBase *wxGnomePrintFactory::CreatePrintDialog( wxWindow *parent, 
                                                   wxPrintDialogData *data )
 {
 wxPrintDialogBase *wxGnomePrintFactory::CreatePrintDialog( wxWindow *parent, 
                                                   wxPrintDialogData *data )
 {
-    return new wxGenericPrintDialog( parent, data );
+    return new wxGnomePrintDialog( parent, data );
 }
 
 wxPrintDialogBase *wxGnomePrintFactory::CreatePrintDialog( wxWindow *parent, 
                                                   wxPrintData *data )
 {
 }
 
 wxPrintDialogBase *wxGnomePrintFactory::CreatePrintDialog( wxWindow *parent, 
                                                   wxPrintData *data )
 {
-    return new wxGenericPrintDialog( parent, data );
+    return new wxGnomePrintDialog( parent, data );
+}
+                                                  
+wxPageSetupDialogBase *wxGnomePrintFactory::CreatePageSetupDialog( wxWindow *parent,
+                                                          wxPageSetupDialogData * data )
+{ 
+//  The native page setup dialog is broken. It
+//  miscalculates newly entered values for the
+//  margins if you have not chose "points" but
+//  e.g. centimerters. 
+//  This has been fixed in GNOME CVS (maybe
+//  fixed in libgnomeprintui 2.8.1)
+
+    return new wxGnomePageSetupDialog( parent, data );
 }
                                                   
 bool wxGnomePrintFactory::HasPrintSetupDialog()
 {
 }
                                                   
 bool wxGnomePrintFactory::HasPrintSetupDialog()
 {
-    return true;
+    return false;
 }
 
 wxDialog *wxGnomePrintFactory::CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data )
 {
 }
 
 wxDialog *wxGnomePrintFactory::CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data )
 {
-    return new wxGnomePrintSetupDialog( parent, data );
+    return NULL;
 }
 
 bool wxGnomePrintFactory::HasOwnPrintToFile()
 }
 
 bool wxGnomePrintFactory::HasOwnPrintToFile()
@@ -117,19 +136,20 @@ bool wxGnomePrintFactory::HasPrinterLine()
 
 wxString wxGnomePrintFactory::CreatePrinterLine()
 {
 
 wxString wxGnomePrintFactory::CreatePrinterLine()
 {
-    // We should query "gnome_config_default" here
-    return _("GNOME print");
+    // redundant now
+    return wxEmptyString;
 }
 
 bool wxGnomePrintFactory::HasStatusLine()
 {
 }
 
 bool wxGnomePrintFactory::HasStatusLine()
 {
+    // redundant now
     return true;    
 }
 
 wxString wxGnomePrintFactory::CreateStatusLine()
 {
     return true;    
 }
 
 wxString wxGnomePrintFactory::CreateStatusLine()
 {
-    // We should query "gnome_config_default" here
-    return _("Ready");
+    // redundant now
+    return wxEmptyString;
 }
 
 wxPrintNativeDataBase *wxGnomePrintFactory::CreatePrintNativeData()
 }
 
 wxPrintNativeDataBase *wxGnomePrintFactory::CreatePrintNativeData()
@@ -141,48 +161,265 @@ wxPrintNativeDataBase *wxGnomePrintFactory::CreatePrintNativeData()
 // wxGnomePrintSetupDialog
 //----------------------------------------------------------------------------
 
 // wxGnomePrintSetupDialog
 //----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxGnomePrintSetupDialog, wxDialog)
+IMPLEMENT_CLASS(wxGnomePrintDialog, wxPrintDialogBase)
+
+wxGnomePrintDialog::wxGnomePrintDialog( wxWindow *parent, wxPrintDialogData *data )
+                    : wxPrintDialogBase(parent, wxID_ANY, _("Print"),
+                               wxPoint(0, 0), wxSize(600, 600),
+                               wxDEFAULT_DIALOG_STYLE |
+                               wxTAB_TRAVERSAL)
+{
+    if (data)
+        m_printDialogData = *data;
+    
+    Init();
+}
 
 
-wxGnomePrintSetupDialog::wxGnomePrintSetupDialog( wxWindow *parent, wxPrintData *data )
+wxGnomePrintDialog::wxGnomePrintDialog( wxWindow *parent, wxPrintData *data )
+                    : wxPrintDialogBase(parent, wxID_ANY, _("Print"),
+                               wxPoint(0, 0), wxSize(600, 600),
+                               wxDEFAULT_DIALOG_STYLE |
+                               wxTAB_TRAVERSAL)
 {
 {
+    if (data)
+        m_printDialogData = *data;
+
+    Init();
+}
+
+void wxGnomePrintDialog::Init()
+{
+    wxPrintData data = m_printDialogData.GetPrintData();
+
     wxGnomePrintNativeData *native =
     wxGnomePrintNativeData *native =
-      (wxGnomePrintNativeData*) data->GetNativeData();
+      (wxGnomePrintNativeData*) data.GetNativeData();
       
       
-    m_widget = gnome_print_dialog_new (native->GetPrintJob(), (guchar*)"Print setup", 0);
+    m_widget = gnome_print_dialog_new( native->GetPrintJob(), 
+                                       (guchar*)"Print",  
+                                       GNOME_PRINT_DIALOG_RANGE|GNOME_PRINT_DIALOG_COPIES );
+
+    int flag = 0;
+    if (m_printDialogData.GetEnableSelection())
+        flag |= GNOME_PRINT_RANGE_SELECTION;
+    if (m_printDialogData.GetEnablePageNumbers())
+        flag |= GNOME_PRINT_RANGE_ALL|GNOME_PRINT_RANGE_RANGE;
+
+    gnome_print_dialog_construct_range_page( GNOME_PRINT_DIALOG( m_widget ),
+                                             flag,
+                                             m_printDialogData.GetMinPage(),
+                                             m_printDialogData.GetMaxPage(),
+                                             NULL,
+                                             NULL );
 }
 
 }
 
-wxGnomePrintSetupDialog::~wxGnomePrintSetupDialog()
+wxGnomePrintDialog::~wxGnomePrintDialog()
 {
     m_widget = NULL;
 }
 
 {
     m_widget = NULL;
 }
 
-int wxGnomePrintSetupDialog::ShowModal()
+int wxGnomePrintDialog::ShowModal()
 {
 {
+    // Transfer data from m_printDalogData to dialog here
+
     int response = gtk_dialog_run (GTK_DIALOG (m_widget));
     int response = gtk_dialog_run (GTK_DIALOG (m_widget));
-    gtk_widget_destroy(m_widget);
-    m_widget = NULL;
     
        if (response == GNOME_PRINT_DIALOG_RESPONSE_CANCEL)
     
        if (response == GNOME_PRINT_DIALOG_RESPONSE_CANCEL)
+    {
+        gtk_widget_destroy(m_widget);
+        m_widget = NULL;
+        
         return wxID_CANCEL;
         return wxID_CANCEL;
+    }
+
+    gint copies = 1;
+    gboolean collate = false;
+    gnome_print_dialog_get_copies( GNOME_PRINT_DIALOG(m_widget), &copies, &collate );
+    m_printDialogData.SetNoCopies( copies );
+    m_printDialogData.SetCollate( collate );
+
+    switch (gnome_print_dialog_get_range( GNOME_PRINT_DIALOG(m_widget) ))
+    {
+        case GNOME_PRINT_RANGE_SELECTION:
+            m_printDialogData.SetSelection( true );
+            break;
+        case GNOME_PRINT_RANGE_ALL:
+            m_printDialogData.SetAllPages( true );
+            m_printDialogData.SetFromPage( 0 );
+            m_printDialogData.SetToPage( 9999 );
+            break;
+        case GNOME_PRINT_RANGE_RANGE:
+        default:
+            gint start,end;
+            gnome_print_dialog_get_range_page( GNOME_PRINT_DIALOG(m_widget), &start, &end );
+            m_printDialogData.SetFromPage( start );
+            m_printDialogData.SetToPage( end );
+            break;
+    }
 
 
+    gtk_widget_destroy(m_widget);
+    m_widget = NULL;
+    
+    if (response == GNOME_PRINT_DIALOG_RESPONSE_PREVIEW)
+        return wxID_PREVIEW;
+    
     return wxID_OK;
 }
 
     return wxID_OK;
 }
 
-bool wxGnomePrintSetupDialog::Validate()
+wxDC *wxGnomePrintDialog::GetPrintDC()
+{
+    // Later
+    return NULL;
+}
+
+bool wxGnomePrintDialog::Validate()
 {
     return true;
 }
 
 {
     return true;
 }
 
-bool wxGnomePrintSetupDialog::TransferDataToWindow()
+bool wxGnomePrintDialog::TransferDataToWindow()
+{
+    return true;
+}
+
+bool wxGnomePrintDialog::TransferDataFromWindow()
+{
+    return true;
+}
+
+//----------------------------------------------------------------------------
+// wxGnomePageSetupDialog
+//----------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxGnomePageSetupDialog, wxPageSetupDialogBase)
+
+wxGnomePageSetupDialog::wxGnomePageSetupDialog( wxWindow *parent,
+                            wxPageSetupDialogData* data )
+{
+    if (data)
+        m_pageDialogData = *data;
+        
+    wxGnomePrintNativeData *native =
+      (wxGnomePrintNativeData*) m_pageDialogData.GetPrintData().GetNativeData();
+
+    // This is required as the page setup dialog
+    // calculates wrong values otherwise.
+    gnome_print_config_set( native->GetPrintConfig(),
+                            (const guchar*) GNOME_PRINT_KEY_PREFERED_UNIT,
+                            (const guchar*) "Pts" );
+        
+    m_widget = gtk_dialog_new();
+    
+    gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( _("Page setup") ) );
+
+    GtkWidget *main = gnome_paper_selector_new_with_flags( native->GetPrintConfig(), 
+        GNOME_PAPER_SELECTOR_MARGINS|GNOME_PAPER_SELECTOR_FEED_ORIENTATION );
+    gtk_container_set_border_width (GTK_CONTAINER (main), 8);
+    gtk_widget_show (main);
+    
+    gtk_container_add( GTK_CONTAINER (GTK_DIALOG (m_widget)->vbox), main );
+    
+       gtk_dialog_set_has_separator (GTK_DIALOG (m_widget), TRUE);
+
+       gtk_dialog_add_buttons (GTK_DIALOG (m_widget),
+                               GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                               GTK_STOCK_OK, GTK_RESPONSE_OK,
+                               NULL);
+
+       gtk_dialog_set_default_response (GTK_DIALOG (m_widget),
+                                        GTK_RESPONSE_OK);
+}
+
+wxGnomePageSetupDialog::~wxGnomePageSetupDialog()
+{
+}
+
+wxPageSetupDialogData& wxGnomePageSetupDialog::GetPageSetupDialogData()
+{
+    return m_pageDialogData;
+}
+
+int wxGnomePageSetupDialog::ShowModal()
+{
+    wxGnomePrintNativeData *native =
+      (wxGnomePrintNativeData*) m_pageDialogData.GetPrintData().GetNativeData();
+    GnomePrintConfig *config = native->GetPrintConfig();
+      
+    // Transfer data from m_pageDialogData to native dialog
+
+    int ret = gtk_dialog_run( GTK_DIALOG(m_widget) );
+
+    if (ret == GTK_RESPONSE_OK)
+    {
+        // Transfer data back to m_pageDialogData
+
+        // I don't know how querying the last parameter works
+        // I cannot test it as the dialog is currently broken
+        // anyways (it only works for points).        
+        double ml,mr,mt,mb,pw,ph;
+           gnome_print_config_get_length (config,
+                               (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_LEFT, &ml, NULL);
+           gnome_print_config_get_length (config,
+                               (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_RIGHT, &mr, NULL);
+           gnome_print_config_get_length (config,
+                               (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_TOP, &mt, NULL);
+           gnome_print_config_get_length (config,
+                               (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_BOTTOM, &mb, NULL);
+       gnome_print_config_get_length (config,
+                           (const guchar*) GNOME_PRINT_KEY_PAPER_WIDTH, &pw, NULL);
+           gnome_print_config_get_length (config,
+                           (const guchar*) GNOME_PRINT_KEY_PAPER_HEIGHT, &ph, NULL);
+
+        // This probably assumes that the user entered the 
+        // values in Pts. Since that is the only the dialog
+        // works right now, we need to fix this later.
+        const GnomePrintUnit *mm_unit = gnome_print_unit_get_by_abbreviation( (const guchar*) "mm" );
+        const GnomePrintUnit *pts_unit = gnome_print_unit_get_by_abbreviation( (const guchar*) "Pts" );
+        gnome_print_convert_distance( &ml, pts_unit, mm_unit );
+        gnome_print_convert_distance( &mr, pts_unit, mm_unit );
+        gnome_print_convert_distance( &mt, pts_unit, mm_unit );
+        gnome_print_convert_distance( &mb, pts_unit, mm_unit );
+        gnome_print_convert_distance( &pw, pts_unit, mm_unit );
+        gnome_print_convert_distance( &ph, pts_unit, mm_unit );
+
+        m_pageDialogData.SetMarginTopLeft( wxPoint( (int)(ml+0.5), (int)(mt+0.5)) );
+        m_pageDialogData.SetMarginBottomRight( wxPoint( (int)(mr+0.5), (int)(mb+0.5)) );
+        
+        m_pageDialogData.SetPaperSize( wxSize( (int)(pw+0.5), (int)(ph+0.5) ) );
+
+#if 0
+        wxPrintf( wxT("paper %d %d, top margin %d\n"), 
+            m_pageDialogData.GetPaperSize().x,
+            m_pageDialogData.GetPaperSize().y,
+            m_pageDialogData.GetMarginTopLeft().x );
+#endif
+                
+        ret = wxID_OK;
+    }
+    else
+    {
+        ret = wxID_CANCEL;
+    }
+    
+    gtk_widget_destroy( m_widget );
+    m_widget = NULL;
+
+    return ret;
+}
+
+bool wxGnomePageSetupDialog::Validate()
 {
     return true;
 }
 
 {
     return true;
 }
 
-bool wxGnomePrintSetupDialog::TransferDataFromWindow()
+bool wxGnomePageSetupDialog::TransferDataToWindow()
 {
     return true;
 }
 
 {
     return true;
 }
 
+bool wxGnomePageSetupDialog::TransferDataFromWindow()
+{
+    return true;
+}
 
 //----------------------------------------------------------------------------
 // wxGnomePrinter
 
 //----------------------------------------------------------------------------
 // wxGnomePrinter
@@ -194,6 +431,7 @@ wxGnomePrinter::wxGnomePrinter( wxPrintDialogData *data ) :
     wxPrinterBase( data )
 {
     m_gpc = NULL;
     wxPrinterBase( data )
 {
     m_gpc = NULL;
+    m_native_preview = false;
 }
 
 wxGnomePrinter::~wxGnomePrinter()
 }
 
 wxGnomePrinter::~wxGnomePrinter()
@@ -209,14 +447,17 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
     }
 
     wxPrintData printdata = GetPrintDialogData().GetPrintData();
     }
 
     wxPrintData printdata = GetPrintDialogData().GetPrintData();
-    wxGnomePrintNativeData *data = 
+    wxGnomePrintNativeData *native = 
         (wxGnomePrintNativeData*) printdata.GetNativeData();
 
         (wxGnomePrintNativeData*) printdata.GetNativeData();
 
+    GnomePrintJob *job = gnome_print_job_new( native->GetPrintConfig() );
+    m_gpc = gnome_print_job_get_context (job);
+
     // The GnomePrintJob is temporarily stored in the 
     // The GnomePrintJob is temporarily stored in the 
-    // native print data as the native print setup dialog
+    // native print data as the native print dialog
     // needs to access it.
     // needs to access it.
-    GnomePrintJob *job = data->GetPrintJob();
-    m_gpc = gnome_print_job_get_context (job);
+    native->SetPrintJob( job );
+
 
     printout->SetIsPreview(false);
 
 
     printout->SetIsPreview(false);
 
@@ -231,9 +472,13 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
     else
         dc = new wxGnomePrintDC( this );
     
     else
         dc = new wxGnomePrintDC( this );
     
+    if (m_native_preview)
+        printout->SetIsPreview(true);
+    
     if (!dc)
     {
         gnome_print_job_close( job );
     if (!dc)
     {
         gnome_print_job_close( job );
+        g_object_unref (G_OBJECT (job));
         sm_lastError = wxPRINTER_ERROR;
         return false;
     }
         sm_lastError = wxPRINTER_ERROR;
         return false;
     }
@@ -243,8 +488,8 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
 
     printout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
                             (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
 
     printout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
                             (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
-    printout->SetPPIPrinter( wxPostScriptDC::GetResolution(),
-                             wxPostScriptDC::GetResolution() );
+    printout->SetPPIPrinter( wxGnomePrintDC::GetResolution(),
+                             wxGnomePrintDC::GetResolution() );
                              
     printout->SetDC(dc);
 
                              
     printout->SetDC(dc);
 
@@ -255,29 +500,69 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
     printout->SetPageSizeMM((int)w, (int)h);
     
     printout->OnPreparePrinting();
     printout->SetPageSizeMM((int)w, (int)h);
     
     printout->OnPreparePrinting();
-    printout->OnBeginPrinting();
+    
+    // Get some parameters from the printout, if defined
+    int fromPage, toPage;
+    int minPage, maxPage;
+    printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
 
 
-    if (!printout->OnBeginDocument(0, 0))
+    if (maxPage == 0)
     {
     {
+        gnome_print_job_close( job );
+        g_object_unref (G_OBJECT (job));
         sm_lastError = wxPRINTER_ERROR;
         sm_lastError = wxPRINTER_ERROR;
+        return false;
     }
     }
-    else
+    
+    printout->OnBeginPrinting();
+
+    int minPageNum = minPage, maxPageNum = maxPage;
+
+    if ( !m_printDialogData.GetAllPages() )
     {
     {
-        int pn;
-        for (pn = 1; pn <= 2; pn++)
+        minPageNum = m_printDialogData.GetFromPage();
+        maxPageNum = m_printDialogData.GetToPage();
+    }
+
+    
+    int copyCount;
+    for ( copyCount = 1;
+          copyCount <= m_printDialogData.GetNoCopies();
+          copyCount++ )
+    {
+        if (!printout->OnBeginDocument(minPageNum, maxPageNum))
         {
         {
+            wxLogError(_("Could not start printing."));
+            sm_lastError = wxPRINTER_ERROR;
+            break;
+        }
+        
+        int pn;
+        for ( pn = minPageNum;
+              pn <= maxPageNum && printout->HasPage(pn);
+              pn++ )
+        {    
             dc->StartPage();
             printout->OnPrintPage(pn);
             dc->EndPage();
         }
             dc->StartPage();
             printout->OnPrintPage(pn);
             dc->EndPage();
         }
-    
+        
         printout->OnEndDocument();
         printout->OnEndPrinting();
     }
     
     gnome_print_job_close( job );
         printout->OnEndDocument();
         printout->OnEndPrinting();
     }
     
     gnome_print_job_close( job );
-    gnome_print_job_print( job );
+    if (m_native_preview)
+    {
+        wxString title( _("Print preview") );
+        gtk_widget_show( gnome_print_job_preview_new( job, (const guchar*)(const char*)wxGTK_CONV(title) ));
+    }
+    else
+    {
+        gnome_print_job_print( job );
+    }
     
     
+    g_object_unref (G_OBJECT (job));
     delete dc;
     
     return (sm_lastError == wxPRINTER_NO_ERROR);
     delete dc;
     
     return (sm_lastError == wxPRINTER_NO_ERROR);
@@ -285,13 +570,17 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
 
 wxDC* wxGnomePrinter::PrintDialog( wxWindow *parent )
 {
 
 wxDC* wxGnomePrinter::PrintDialog( wxWindow *parent )
 {
-    wxPrintDialog dialog( parent, &m_printDialogData );
-    if (dialog.ShowModal() == wxID_CANCEL)
+    wxGnomePrintDialog dialog( parent, &m_printDialogData );
+    int ret = dialog.ShowModal();
+    if (ret == wxID_CANCEL)
     {
         sm_lastError = wxPRINTER_ERROR;
         return NULL;
     }
     
     {
         sm_lastError = wxPRINTER_ERROR;
         return NULL;
     }
     
+    m_native_preview = ret == wxID_PREVIEW;
+    
+    m_printDialogData = dialog.GetPrintDialogData();
     return new wxGnomePrintDC( this );
 }
 
     return new wxGnomePrintDC( this );
 }
 
@@ -348,10 +637,10 @@ void wxGnomePrintDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
     
     SetPen( m_pen );
 
     
     SetPen( m_pen );
 
-       gnome_print_moveto ( m_gpc, XDEV2LOG(x1), YDEV2LOG(y1) );
-       gnome_print_lineto ( m_gpc, XDEV2LOG(x2), YDEV2LOG(y2) );
-       gnome_print_stroke ( m_gpc);
-       
+    gnome_print_moveto ( m_gpc, XLOG2DEV(x1), YLOG2DEV(y1) );
+    gnome_print_lineto ( m_gpc, XLOG2DEV(x2), YLOG2DEV(y2) );
+    gnome_print_stroke ( m_gpc);
+
     CalcBoundingBox( x1, y1 );
     CalcBoundingBox( x2, y2 );
 }
     CalcBoundingBox( x1, y1 );
     CalcBoundingBox( x2, y2 );
 }
@@ -374,6 +663,22 @@ void wxGnomePrintDC::DoDrawPoint(wxCoord x, wxCoord y)
 
 void wxGnomePrintDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
 {
 
 void wxGnomePrintDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
 {
+    if (m_pen.GetStyle() == wxTRANSPARENT) return;
+
+    if (n <= 0) return;
+
+    SetPen (m_pen);
+
+    int i;
+    for ( i =0; i<n ; i++ )
+        CalcBoundingBox( XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset));
+
+    gnome_print_moveto ( m_gpc, XLOG2DEV(points[0].x+xoffset), YLOG2DEV(points[0].y+yoffset) );
+    
+    for (i = 1; i < n; i++)
+        gnome_print_lineto ( m_gpc, XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset) );
+
+    gnome_print_stroke ( m_gpc);
 }
 
 void wxGnomePrintDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
 }
 
 void wxGnomePrintDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
@@ -425,6 +730,57 @@ void wxGnomePrintDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width,
 
 void wxGnomePrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
 
 void wxGnomePrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
+    if (m_brush.GetStyle () != wxTRANSPARENT)
+    {
+        SetBrush( m_brush );
+        
+        gnome_print_newpath( m_gpc );
+        gnome_print_moveto( m_gpc, 
+                            XLOG2DEV(x), YLOG2DEV(y+height/2) );
+                           
+        // start with top half
+        gnome_print_curveto( m_gpc, 
+                            XLOG2DEV(x), YLOG2DEV(y),
+                            XLOG2DEV(x+width), YLOG2DEV(y),
+                            XLOG2DEV(x+width), YLOG2DEV(y+height/2) );
+        // lower half        
+        gnome_print_curveto( m_gpc, 
+                            XLOG2DEV(x+width), YLOG2DEV(y+height),
+                            XLOG2DEV(x), YLOG2DEV(y+height),
+                            XLOG2DEV(x), YLOG2DEV(y+height/2) );
+                            
+        gnome_print_closepath( m_gpc );
+        gnome_print_fill( m_gpc );
+        
+        CalcBoundingBox( x, y );
+        CalcBoundingBox( x + width, y + height );
+    }
+
+    if (m_pen.GetStyle () != wxTRANSPARENT)
+    {
+        SetPen (m_pen);
+
+        gnome_print_newpath( m_gpc );
+        gnome_print_moveto( m_gpc, 
+                            XLOG2DEV(x), YLOG2DEV(y+height/2) );
+                           
+        // start with top half
+        gnome_print_curveto( m_gpc, 
+                            XLOG2DEV(x), YLOG2DEV(y),
+                            XLOG2DEV(x+width), YLOG2DEV(y),
+                            XLOG2DEV(x+width), YLOG2DEV(y+height/2) );
+        // lower half        
+        gnome_print_curveto( m_gpc, 
+                            XLOG2DEV(x+width), YLOG2DEV(y+height),
+                            XLOG2DEV(x), YLOG2DEV(y+height),
+                            XLOG2DEV(x), YLOG2DEV(y+height/2) );
+                            
+        gnome_print_closepath( m_gpc );
+        gnome_print_stroke( m_gpc );
+        
+        CalcBoundingBox( x, y );
+        CalcBoundingBox( x + width, y + height );
+    }
 }
 
 void wxGnomePrintDC::DoDrawSpline(wxList *points)
 }
 
 void wxGnomePrintDC::DoDrawSpline(wxList *points)
@@ -440,34 +796,66 @@ bool wxGnomePrintDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord
 
 void wxGnomePrintDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
 {
 
 void wxGnomePrintDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
 {
+    DoDrawBitmap( icon, x, y, true );
 }
 
 void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask )
 {
 }
 
 void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask )
 {
+    if (!bitmap.Ok()) return;
+    
+    if (bitmap.HasPixbuf())
+    {
+        GdkPixbuf *pixbuf = bitmap.GetPixbuf();
+           guchar *raw_image = gdk_pixbuf_get_pixels( pixbuf );
+           bool has_alpha = gdk_pixbuf_get_has_alpha( pixbuf );
+           int rowstride = gdk_pixbuf_get_rowstride( pixbuf );
+           int height = gdk_pixbuf_get_height( pixbuf );
+           int width = gdk_pixbuf_get_width( pixbuf );
+        
+        gnome_print_gsave( m_gpc );        
+        double matrix[6];
+       matrix[0] = XLOG2DEVREL(width);
+       matrix[1] = 0;
+       matrix[2] = 0;
+       matrix[3] = YLOG2DEVREL(height);
+       matrix[4] = XLOG2DEV(x);
+        matrix[5] = YLOG2DEV(y+height);
+       gnome_print_concat( m_gpc, matrix );
+           gnome_print_moveto(  m_gpc, 0, 0 );
+        if (has_alpha)
+            gnome_print_rgbaimage( m_gpc, (guchar *)raw_image, width, height, rowstride );
+        else
+            gnome_print_rgbimage( m_gpc, (guchar *)raw_image, width, height, rowstride );
+        gnome_print_grestore( m_gpc );
+    }
+    else
+    {
+        wxImage image = bitmap.ConvertToImage();
+
+        if (!image.Ok()) return;
+
+        gnome_print_gsave( m_gpc );        
+        double matrix[6];
+       matrix[0] = XLOG2DEVREL(image.GetWidth());
+       matrix[1] = 0;
+       matrix[2] = 0;
+       matrix[3] = YLOG2DEVREL(image.GetHeight());
+       matrix[4] = XLOG2DEV(x);
+        matrix[5] = YLOG2DEV(y+image.GetHeight());
+       gnome_print_concat( m_gpc, matrix );
+           gnome_print_moveto(  m_gpc, 0, 0 );
+        gnome_print_rgbimage( m_gpc, (guchar*) image.GetData(), image.GetWidth(), image.GetHeight(), image.GetWidth()*3 );
+        gnome_print_grestore( m_gpc );
+    }
 }
 
 void wxGnomePrintDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y )
 {
 }
 
 void wxGnomePrintDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y )
 {
-    if (m_textForegroundColour.Ok())
-    {
-        unsigned char red = m_textForegroundColour.Red();
-        unsigned char blue = m_textForegroundColour.Blue();
-        unsigned char green = m_textForegroundColour.Green();
-
-        if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue))
-        {
-            double redPS = (double)(red) / 255.0;
-            double bluePS = (double)(blue) / 255.0;
-            double greenPS = (double)(green) / 255.0;
-
-            gnome_print_setrgbcolor( m_gpc, redPS, bluePS, greenPS );
-
-            m_currentRed = red;
-            m_currentBlue = blue;
-            m_currentGreen = green;
-        }
-    }
+    DoDrawRotatedText( text, x, y, 0.0 );
+}
 
 
+void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)
+{
     x = XLOG2DEV(x);
     y = YLOG2DEV(y);
     
     x = XLOG2DEV(x);
     y = YLOG2DEV(y);
     
@@ -496,8 +884,96 @@ void wxGnomePrintDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y )
         pango_attr_list_unref(attrs);
     }
 
         pango_attr_list_unref(attrs);
     }
 
-       gnome_print_moveto (m_gpc, x, y);
-       gnome_print_pango_layout( m_gpc, m_layout );
+    if (m_textForegroundColour.Ok())
+    {
+        unsigned char red = m_textForegroundColour.Red();
+        unsigned char blue = m_textForegroundColour.Blue();
+        unsigned char green = m_textForegroundColour.Green();
+
+        if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue))
+        {
+            double redPS = (double)(red) / 255.0;
+            double bluePS = (double)(blue) / 255.0;
+            double greenPS = (double)(green) / 255.0;
+
+            gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );
+
+            m_currentRed = red;
+            m_currentBlue = blue;
+            m_currentGreen = green;
+        }
+    }
+
+    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());
+            gdk_draw_rectangle(m_window, m_textGC, TRUE, x, y, w, h);
+            gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
+        }
+#endif         
+        // Draw layout.
+       gnome_print_moveto (m_gpc, x, y);
+        if (fabs(angle) > 0.00001)
+        {        
+            gnome_print_gsave( m_gpc );
+            gnome_print_rotate( m_gpc, angle );
+           gnome_print_pango_layout( m_gpc, m_layout );
+            gnome_print_grestore( m_gpc );
+        }
+        else
+        {
+           gnome_print_pango_layout( m_gpc, m_layout );
+        }
+         
+        // reset unscaled size
+        pango_font_description_set_size( m_fontdesc, oldSize );
+         
+        // actually apply unscaled font
+        pango_layout_set_font_description( m_layout, m_fontdesc );
+    }
+    else
+    {
+        pango_layout_get_pixel_size( m_layout, &w, &h );
+#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.
+       gnome_print_moveto (m_gpc, x, y);
+        if (fabs(angle) > 0.00001)
+        {        
+            gnome_print_gsave( m_gpc );
+            gnome_print_rotate( m_gpc, angle );
+           gnome_print_pango_layout( m_gpc, m_layout );
+            gnome_print_grestore( m_gpc );
+        }
+        else
+        {
+           gnome_print_pango_layout( m_gpc, m_layout );
+        }
+    }
 
     if (underlined)
     {
 
     if (underlined)
     {
@@ -505,12 +981,7 @@ void wxGnomePrintDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y )
         pango_layout_set_attributes(m_layout, NULL);
     }
     
         pango_layout_set_attributes(m_layout, NULL);
     }
     
-//    CalcBoundingBox (x + width, y + height);
-    CalcBoundingBox (x, y);
-}
-
-void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)
-{
+    CalcBoundingBox (x + w, y + h);
 }
 
 void wxGnomePrintDC::Clear()
 }
 
 void wxGnomePrintDC::Clear()
@@ -536,12 +1007,30 @@ void wxGnomePrintDC::SetPen( const wxPen& pen )
 {
     if (!pen.Ok()) return;
 
 {
     if (!pen.Ok()) return;
 
-    int oldStyle = m_pen.GetStyle();
+    // TODO: support for pen styles other than solid (use gnome_print_setdash)
 
     m_pen = pen;
 
     gnome_print_setlinewidth( m_gpc, XLOG2DEVREL( 1000 * m_pen.GetWidth() ) / 1000.0f );
 
 
     m_pen = pen;
 
     gnome_print_setlinewidth( m_gpc, XLOG2DEVREL( 1000 * m_pen.GetWidth() ) / 1000.0f );
 
+
+    static const double dotted[] =  {2.0, 5.0};
+    static const double short_dashed[] = {4.0, 4.0};
+    static const double wxCoord_dashed[] = {4.0, 8.0};
+    static const double dotted_dashed[] = {6.0, 6.0, 2.0, 6.0};
+
+    switch (m_pen.GetStyle())
+    {
+        case wxDOT:           gnome_print_setdash( m_gpc, 2, dotted, 0 ); break;
+        case wxSHORT_DASH:    gnome_print_setdash( m_gpc, 2, short_dashed, 0 ); break;
+        case wxLONG_DASH:     gnome_print_setdash( m_gpc, 2, wxCoord_dashed, 0 ); break;
+        case wxDOT_DASH:      gnome_print_setdash( m_gpc, 4, dotted_dashed, 0 );  break;
+        case wxSOLID:
+        case wxTRANSPARENT:
+        default:              gnome_print_setdash( m_gpc, 0, NULL, 0 );   break;
+    }
+
+    
     unsigned char red = m_pen.GetColour().Red();
     unsigned char blue = m_pen.GetColour().Blue();
     unsigned char green = m_pen.GetColour().Green();
     unsigned char red = m_pen.GetColour().Red();
     unsigned char blue = m_pen.GetColour().Blue();
     unsigned char green = m_pen.GetColour().Green();
@@ -552,7 +1041,7 @@ void wxGnomePrintDC::SetPen( const wxPen& pen )
         double bluePS = (double)(blue) / 255.0;
         double greenPS = (double)(green) / 255.0;
 
         double bluePS = (double)(blue) / 255.0;
         double greenPS = (double)(green) / 255.0;
 
-        gnome_print_setrgbcolor( m_gpc, redPS, bluePS, greenPS );
+        gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );
 
         m_currentRed = red;
         m_currentBlue = blue;
 
         m_currentRed = red;
         m_currentBlue = blue;
@@ -562,6 +1051,41 @@ void wxGnomePrintDC::SetPen( const wxPen& pen )
 
 void wxGnomePrintDC::SetBrush( const wxBrush& brush )
 {
 
 void wxGnomePrintDC::SetBrush( const wxBrush& brush )
 {
+    if (!brush.Ok()) return;
+
+    m_brush = brush;
+
+    // Brush colour
+    unsigned char red = m_brush.GetColour().Red();
+    unsigned char blue = m_brush.GetColour().Blue();
+    unsigned char green = m_brush.GetColour().Green();
+
+    if (!m_colour)
+    {
+        // Anything not white is black
+        if (! (red == (unsigned char) 255 &&
+               blue == (unsigned char) 255 &&
+               green == (unsigned char) 255) )
+        {
+            red = (unsigned char) 0;
+            green = (unsigned char) 0;
+            blue = (unsigned char) 0;
+        }
+        // setgray here ?
+    }
+
+    if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue))
+    {
+        double redPS = (double)(red) / 255.0;
+        double bluePS = (double)(blue) / 255.0;
+        double greenPS = (double)(green) / 255.0;
+
+        gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS );
+
+        m_currentRed = red;
+        m_currentBlue = blue;
+        m_currentGreen = green;
+    }
 }
 
 void wxGnomePrintDC::SetLogicalFunction( int function )
 }
 
 void wxGnomePrintDC::SetLogicalFunction( int function )
@@ -589,6 +1113,7 @@ bool wxGnomePrintDC::StartDoc(const wxString& message)
 
 void wxGnomePrintDC::EndDoc()
 {
 
 void wxGnomePrintDC::EndDoc()
 {
+    gnome_print_end_doc( m_gpc );
 }
 
 void wxGnomePrintDC::StartPage()
 }
 
 void wxGnomePrintDC::StartPage()
@@ -603,12 +1128,22 @@ void wxGnomePrintDC::EndPage()
 
 wxCoord wxGnomePrintDC::GetCharHeight() const
 {
 
 wxCoord wxGnomePrintDC::GetCharHeight() const
 {
-    return 0;
+    pango_layout_set_text( m_layout, "H", 1 );
+    int w,h;
+    pango_layout_get_pixel_size( m_layout, &w, &h );
+    
+    return h;
 }
 
 wxCoord wxGnomePrintDC::GetCharWidth() const
 {
 }
 
 wxCoord wxGnomePrintDC::GetCharWidth() const
 {
-    return 0;
+    pango_layout_set_text( m_layout, "H", 1 );
+    int w,h;
+    pango_layout_get_pixel_size( m_layout, &w, &h );
+    
+    return w;
 }
 
 void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height,
 }
 
 void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height,
@@ -680,37 +1215,41 @@ void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxC
 
 void wxGnomePrintDC::DoGetSize(int* width, int* height) const
 {
 
 void wxGnomePrintDC::DoGetSize(int* width, int* height) const
 {
-    // No idea if that is efficient
-    GnomePrintConfig *config = gnome_print_config_default();
+    wxGnomePrintNativeData *native =
+      (wxGnomePrintNativeData*) m_printData.GetNativeData();
+
+    // Query page size. This seems to omit the margins
+    // right now, although it shouldn't
+    double pw,ph;
+    gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph );
 
 
-    double w,h;
-    bool result = gnome_print_config_get_page_size( config, &w, &h );
-    
-    if (!result)
-    {
-        // Standard PS resolution DIN A4 size.
-        w = 595.0;
-        h = 842.0;
-    }
-    
     if (width)
     if (width)
-        *width = (int) w;
+        *width = (int) (pw + 0.5);
     if (height)
     if (height)
-        *height = (int) h;
+        *height = (int) (ph + 0.5);
 }
 
 void wxGnomePrintDC::DoGetSizeMM(int *width, int *height) const
 {
 }
 
 void wxGnomePrintDC::DoGetSizeMM(int *width, int *height) const
 {
-    double w,h;
+    wxGnomePrintNativeData *native =
+      (wxGnomePrintNativeData*) m_printData.GetNativeData();
+
+    // This code assumes values in Pts. 
+    
+    double pw,ph;
+    gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph );
+
+    // Convert to mm.
     
     
-    /// Later, for now DIN A4
-    w = 210.0;
-    h = 297.0;
+    const GnomePrintUnit *mm_unit = gnome_print_unit_get_by_abbreviation( (const guchar*) "mm" );
+    const GnomePrintUnit *pts_unit = gnome_print_unit_get_by_abbreviation( (const guchar*) "Pts" );
+    gnome_print_convert_distance( &pw, pts_unit, mm_unit );
+    gnome_print_convert_distance( &ph, pts_unit, mm_unit );
     
     if (width)
     
     if (width)
-        *width = (int) w;
+        *width = (int) (pw + 0.5);
     if (height)
     if (height)
-        *height = (int) h;
+        *height = (int) (ph + 0.5);
 }
 
 wxSize wxGnomePrintDC::GetPPI() const
 }
 
 wxSize wxGnomePrintDC::GetPPI() const
@@ -757,6 +1296,6 @@ private:
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxGnomePrintModule, wxModule)
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxGnomePrintModule, wxModule)
-   
+  
 #endif
     // wxUSE_LIBGNOMEPRINT
 #endif
     // wxUSE_LIBGNOMEPRINT