X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa499247cf52c183e38210c7e8ce5234c1126a32..a733492856e139253ef8e912b6a5c23d1a12cf57:/src/gtk/gnome/gprint.cpp diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp index 9f0903dc80..4421ce7185 100644 --- a/src/gtk/gnome/gprint.cpp +++ b/src/gtk/gnome/gprint.cpp @@ -27,10 +27,15 @@ #include "wx/fontutil.h" #include "wx/printdlg.h" #include "wx/gtk/private.h" +#include "wx/module.h" +#include "wx/generic/prntdlgg.h" #include #include +#include #include +#include +#include //---------------------------------------------------------------------------- // wxGnomePrintNativeData @@ -47,7 +52,6 @@ wxGnomePrintNativeData::wxGnomePrintNativeData() wxGnomePrintNativeData::~wxGnomePrintNativeData() { g_object_unref (G_OBJECT (m_config)); - g_object_unref (G_OBJECT (m_job)); } bool wxGnomePrintNativeData::TransferTo( wxPrintData &data ) @@ -88,23 +92,36 @@ wxPrintPreviewBase *wxGnomePrintFactory::CreatePrintPreview( wxPrintout *preview wxPrintDialogBase *wxGnomePrintFactory::CreatePrintDialog( wxWindow *parent, wxPrintDialogData *data ) { - return new wxGenericPrintDialog( parent, data ); + return new wxGnomePrintDialog( parent, 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() { - return true; + return false; } wxDialog *wxGnomePrintFactory::CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data ) { - return new wxGnomePrintSetupDialog( parent, data ); + return NULL; } bool wxGnomePrintFactory::HasOwnPrintToFile() @@ -119,19 +136,20 @@ bool wxGnomePrintFactory::HasPrinterLine() wxString wxGnomePrintFactory::CreatePrinterLine() { - // We should query "gnome_config_default" here - return _("GNOME print"); + // redundant now + return wxEmptyString; } bool wxGnomePrintFactory::HasStatusLine() { + // redundant now return true; } wxString wxGnomePrintFactory::CreateStatusLine() { - // We should query "gnome_config_default" here - return _("Ready"); + // redundant now + return wxEmptyString; } wxPrintNativeDataBase *wxGnomePrintFactory::CreatePrintNativeData() @@ -143,48 +161,265 @@ wxPrintNativeDataBase *wxGnomePrintFactory::CreatePrintNativeData() // 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*) 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; } -int wxGnomePrintSetupDialog::ShowModal() +int wxGnomePrintDialog::ShowModal() { + // Transfer data from m_printDalogData to dialog here + int response = gtk_dialog_run (GTK_DIALOG (m_widget)); - gtk_widget_destroy(m_widget); - m_widget = NULL; if (response == GNOME_PRINT_DIALOG_RESPONSE_CANCEL) + { + gtk_widget_destroy(m_widget); + m_widget = NULL; + 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; } -bool wxGnomePrintSetupDialog::Validate() +wxDC *wxGnomePrintDialog::GetPrintDC() +{ + // Later + return NULL; +} + +bool wxGnomePrintDialog::Validate() +{ + return true; +} + +bool wxGnomePrintDialog::TransferDataToWindow() { return true; } -bool wxGnomePrintSetupDialog::TransferDataToWindow() +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; } -bool wxGnomePrintSetupDialog::TransferDataFromWindow() +bool wxGnomePageSetupDialog::TransferDataToWindow() { return true; } +bool wxGnomePageSetupDialog::TransferDataFromWindow() +{ + return true; +} //---------------------------------------------------------------------------- // wxGnomePrinter @@ -196,6 +431,7 @@ wxGnomePrinter::wxGnomePrinter( wxPrintDialogData *data ) : wxPrinterBase( data ) { m_gpc = NULL; + m_native_preview = false; } wxGnomePrinter::~wxGnomePrinter() @@ -211,14 +447,17 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) } wxPrintData printdata = GetPrintDialogData().GetPrintData(); - wxGnomePrintNativeData *data = + wxGnomePrintNativeData *native = (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 - // native print data as the native print setup dialog + // native print data as the native print dialog // needs to access it. - GnomePrintJob *job = data->GetPrintJob(); - m_gpc = gnome_print_job_get_context (job); + native->SetPrintJob( job ); + printout->SetIsPreview(false); @@ -233,9 +472,13 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) else dc = new wxGnomePrintDC( this ); + if (m_native_preview) + printout->SetIsPreview(true); + if (!dc) { gnome_print_job_close( job ); + g_object_unref (G_OBJECT (job)); sm_lastError = wxPRINTER_ERROR; return false; } @@ -245,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->SetPPIPrinter( wxPostScriptDC::GetResolution(), - wxPostScriptDC::GetResolution() ); + printout->SetPPIPrinter( wxGnomePrintDC::GetResolution(), + wxGnomePrintDC::GetResolution() ); printout->SetDC(dc); @@ -257,29 +500,69 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) 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; + 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(); } - + 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); @@ -287,13 +570,17 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) 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; } + m_native_preview = ret == wxID_PREVIEW; + + m_printDialogData = dialog.GetPrintDialogData(); return new wxGnomePrintDC( this ); } @@ -350,10 +637,10 @@ void wxGnomePrintDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) SetPen( m_pen ); - gnome_print_moveto ( m_gpc, XLOG2DEV(x1), YLOG2DEV(y1) ); - gnome_print_lineto ( m_gpc, XLOG2DEV(x2), YLOG2DEV(y2) ); - gnome_print_stroke ( m_gpc); - + 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 ); } @@ -376,6 +663,22 @@ void wxGnomePrintDC::DoDrawPoint(wxCoord x, wxCoord y) 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 0.00001) @@ -525,7 +931,17 @@ void wxGnomePrintDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y ) #endif // Draw layout. gnome_print_moveto (m_gpc, x, y); - gnome_print_pango_layout( m_gpc, m_layout ); + 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 ); @@ -546,23 +962,26 @@ void wxGnomePrintDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y ) #endif // Draw layout. gnome_print_moveto (m_gpc, x, y); - gnome_print_pango_layout( m_gpc, m_layout ); + 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) { // undo underline attributes setting: pango_layout_set_attributes(m_layout, NULL); } -// CalcBoundingBox (x + width, y + height); - CalcBoundingBox (x, y); -} - -void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle) -{ + CalcBoundingBox (x + w, y + h); } void wxGnomePrintDC::Clear() @@ -588,12 +1007,30 @@ void wxGnomePrintDC::SetPen( const wxPen& pen ) { 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 ); + + 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(); @@ -604,7 +1041,7 @@ void wxGnomePrintDC::SetPen( const wxPen& pen ) 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; @@ -643,7 +1080,7 @@ void wxGnomePrintDC::SetBrush( const wxBrush& brush ) 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; @@ -676,6 +1113,7 @@ bool wxGnomePrintDC::StartDoc(const wxString& message) void wxGnomePrintDC::EndDoc() { + gnome_print_end_doc( m_gpc ); } void wxGnomePrintDC::StartPage() @@ -690,12 +1128,22 @@ void wxGnomePrintDC::EndPage() 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 { - 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, @@ -767,37 +1215,41 @@ void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxC 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) - *width = (int) w; + *width = (int) (pw + 0.5); if (height) - *height = (int) h; + *height = (int) (ph + 0.5); } 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) - *width = (int) w; + *width = (int) (pw + 0.5); if (height) - *height = (int) h; + *height = (int) (ph + 0.5); } wxSize wxGnomePrintDC::GetPPI() const @@ -844,6 +1296,6 @@ private: }; IMPLEMENT_DYNAMIC_CLASS(wxGnomePrintModule, wxModule) - + #endif // wxUSE_LIBGNOMEPRINT