X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/06cfd325c309c6778c20bd1143d52c4bbb328796..c2740a5aab5ab5ea5305f272465e137f9ad02c3c:/src/gtk1/gnome/gprint.cpp diff --git a/src/gtk1/gnome/gprint.cpp b/src/gtk1/gnome/gprint.cpp index 338ecd3a17..f48c41035b 100644 --- a/src/gtk1/gnome/gprint.cpp +++ b/src/gtk1/gnome/gprint.cpp @@ -29,6 +29,7 @@ #include "wx/gtk/private.h" #include "wx/module.h" #include "wx/generic/prntdlgg.h" +#include "wx/dynlib.h" #include #include @@ -37,6 +38,94 @@ #include #include +//---------------------------------------------------------------------------- +// wxGnomePrintLibrary +//---------------------------------------------------------------------------- + +#define wxDL_METHOD_DEFINE( rettype, name, args, shortargs, defret ) \ + typedef rettype (* name ## Type) args ; \ + name ## Type pfn_ ## name; \ + rettype name args \ + { if (m_ok) return pfn_ ## name shortargs ; return defret; } + +#define wxDL_METHOD_LOAD( lib, name, success ) \ + pfn_ ## name = (name ## Type) lib->GetSymbol( wxT(#name), &success ); \ + if (!success) return; + +class wxGnomePrintLibrary +{ +public: + wxGnomePrintLibrary(); + ~wxGnomePrintLibrary(); + + bool IsOk(); + void InitializeMethods(); + +private: + bool m_ok; + wxDynamicLibrary *m_gnome_print_lib; + +public: + wxDL_METHOD_DEFINE( gint, gnome_print_newpath, + (GnomePrintContext *pc), (pc), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_moveto, + (GnomePrintContext *pc, gdouble x, gdouble y), (pc, x, y), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_lineto, + (GnomePrintContext *pc, gdouble x, gdouble y), (pc, x, y), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_curveto, + (GnomePrintContext *pc, gdouble x1, gdouble y1, gdouble x2, gdouble y2, gdouble x3, gdouble y3), (pc, x1, y1, x2, y2, x3, y3), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_closepath, + (GnomePrintContext *pc), (pc), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_stroke, + (GnomePrintContext *pc), (pc), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_fill, + (GnomePrintContext *pc), (pc), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_setrgbcolor, + (GnomePrintContext *pc, gdouble r, gdouble g, gdouble b), (pc, r, g, b), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_setlinewidth, + (GnomePrintContext *pc, gdouble width), (pc, width), 0 ) +}; + +wxGnomePrintLibrary::wxGnomePrintLibrary() +{ + wxLogNull log; + m_gnome_print_lib = new wxDynamicLibrary( wxT("libgnomeprint-2-2.so") ); + m_ok = m_gnome_print_lib->IsLoaded(); + + if (m_ok) + InitializeMethods(); +} + +wxGnomePrintLibrary::~wxGnomePrintLibrary() +{ + delete m_gnome_print_lib; +} + +bool wxGnomePrintLibrary::IsOk() +{ + return m_ok; +} + +void wxGnomePrintLibrary::InitializeMethods() +{ + m_ok = false; + bool success; + + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_newpath, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_moveto, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_lineto, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_curveto, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_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 ) + + m_ok = true; +} + +static wxGnomePrintLibrary* gs_lgp = NULL; + //---------------------------------------------------------------------------- // wxGnomePrintNativeData //---------------------------------------------------------------------------- @@ -52,7 +141,6 @@ wxGnomePrintNativeData::wxGnomePrintNativeData() wxGnomePrintNativeData::~wxGnomePrintNativeData() { g_object_unref (G_OBJECT (m_config)); - g_object_unref (G_OBJECT (m_job)); } bool wxGnomePrintNativeData::TransferTo( wxPrintData &data ) @@ -108,11 +196,11 @@ wxPageSetupDialogBase *wxGnomePrintFactory::CreatePageSetupDialog( wxWindow *par // 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 -// -// return new wxGnomePageSetupDialog( parent, data ); +// e.g. centimerters. +// This has been fixed in GNOME CVS (maybe +// fixed in libgnomeprintui 2.8.1) - return new wxGenericPageSetupDialog( parent, data ); + return new wxGnomePageSetupDialog( parent, data ); } bool wxGnomePrintFactory::HasPrintSetupDialog() @@ -301,11 +389,17 @@ wxGnomePageSetupDialog::wxGnomePageSetupDialog( wxWindow *parent, 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); @@ -346,11 +440,10 @@ int wxGnomePageSetupDialog::ShowModal() if (ret == GTK_RESPONSE_OK) { // Transfer data back to m_pageDialogData -#if 0 - const GnomePrintUnit *margin_unit; - const GnomePrintUnit *paper_unit; - const GnomePrintUnit *mm_unit = gnome_print_unit_get_by_abbreviation( (const guchar*) "mm" ); - + + // 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); @@ -364,19 +457,25 @@ int wxGnomePageSetupDialog::ShowModal() (const guchar*) GNOME_PRINT_KEY_PAPER_WIDTH, &pw, NULL); gnome_print_config_get_length (config, (const guchar*) GNOME_PRINT_KEY_PAPER_HEIGHT, &ph, NULL); - - gnome_print_convert_distance( &ml, margin_unit, mm_unit ); - gnome_print_convert_distance( &mr, margin_unit, mm_unit ); - gnome_print_convert_distance( &mt, margin_unit, mm_unit ); - gnome_print_convert_distance( &mb, margin_unit, mm_unit ); - gnome_print_convert_distance( &pw, paper_unit, mm_unit ); - gnome_print_convert_distance( &ph, paper_unit, mm_unit ); - - m_pageDialogData.SetMarginTopLeft( wxPoint( (int)(ml*72.0/25.4+0.5), (int)(mt+0.5)) ); + + // 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, @@ -437,14 +536,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 dialog // needs to access it. - GnomePrintJob *job = data->GetPrintJob(); - m_gpc = gnome_print_job_get_context (job); + native->SetPrintJob( job ); + printout->SetIsPreview(false); @@ -465,6 +567,7 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) if (!dc) { gnome_print_job_close( job ); + g_object_unref (G_OBJECT (job)); sm_lastError = wxPRINTER_ERROR; return false; } @@ -494,6 +597,8 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) if (maxPage == 0) { + gnome_print_job_close( job ); + g_object_unref (G_OBJECT (job)); sm_lastError = wxPRINTER_ERROR; return false; } @@ -546,6 +651,7 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) gnome_print_job_print( job ); } + g_object_unref (G_OBJECT (job)); delete dc; return (sm_lastError == wxPRINTER_NO_ERROR); @@ -620,10 +726,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); - + gs_lgp->gnome_print_moveto ( m_gpc, XLOG2DEV(x1), YLOG2DEV(y1) ); + gs_lgp->gnome_print_lineto ( m_gpc, XLOG2DEV(x2), YLOG2DEV(y2) ); + gs_lgp->gnome_print_stroke ( m_gpc); + CalcBoundingBox( x1, y1 ); CalcBoundingBox( x2, y2 ); } @@ -646,6 +752,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; ignome_print_moveto ( m_gpc, XLOG2DEV(points[0].x+xoffset), YLOG2DEV(points[0].y+yoffset) ); + + for (i = 1; i < n; i++) + gs_lgp->gnome_print_lineto ( m_gpc, XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset) ); + + gs_lgp->gnome_print_stroke ( m_gpc); } void wxGnomePrintDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle) @@ -662,13 +784,13 @@ void wxGnomePrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoor { SetBrush( m_brush ); - gnome_print_newpath( m_gpc ); - gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) ); - gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) ); - gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) ); - gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) ); - gnome_print_closepath( m_gpc ); - gnome_print_fill( m_gpc ); + gs_lgp->gnome_print_newpath( m_gpc ); + gs_lgp->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) ); + gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) ); + gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) ); + gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) ); + gs_lgp->gnome_print_closepath( m_gpc ); + gs_lgp->gnome_print_fill( m_gpc ); CalcBoundingBox( x, y ); CalcBoundingBox( x + width, y + height ); @@ -678,13 +800,13 @@ void wxGnomePrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoor { SetPen (m_pen); - gnome_print_newpath( m_gpc ); - gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) ); - gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) ); - gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) ); - gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) ); - gnome_print_closepath( m_gpc ); - gnome_print_stroke( m_gpc ); + gs_lgp->gnome_print_newpath( m_gpc ); + gs_lgp->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) ); + gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) ); + gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y + height) ); + gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y + height) ); + gs_lgp->gnome_print_closepath( m_gpc ); + gs_lgp->gnome_print_stroke( m_gpc ); CalcBoundingBox( x, y ); CalcBoundingBox( x + width, y + height ); @@ -697,6 +819,57 @@ void wxGnomePrintDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, void wxGnomePrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { + if (m_brush.GetStyle () != wxTRANSPARENT) + { + SetBrush( m_brush ); + + gs_lgp->gnome_print_newpath( m_gpc ); + gs_lgp->gnome_print_moveto( m_gpc, + XLOG2DEV(x), YLOG2DEV(y+height/2) ); + + // start with top half + gs_lgp->gnome_print_curveto( m_gpc, + XLOG2DEV(x), YLOG2DEV(y), + XLOG2DEV(x+width), YLOG2DEV(y), + XLOG2DEV(x+width), YLOG2DEV(y+height/2) ); + // lower half + gs_lgp->gnome_print_curveto( m_gpc, + XLOG2DEV(x+width), YLOG2DEV(y+height), + XLOG2DEV(x), YLOG2DEV(y+height), + XLOG2DEV(x), YLOG2DEV(y+height/2) ); + + gs_lgp->gnome_print_closepath( m_gpc ); + gs_lgp->gnome_print_fill( m_gpc ); + + CalcBoundingBox( x, y ); + CalcBoundingBox( x + width, y + height ); + } + + if (m_pen.GetStyle () != wxTRANSPARENT) + { + SetPen (m_pen); + + gs_lgp->gnome_print_newpath( m_gpc ); + gs_lgp->gnome_print_moveto( m_gpc, + XLOG2DEV(x), YLOG2DEV(y+height/2) ); + + // start with top half + gs_lgp->gnome_print_curveto( m_gpc, + XLOG2DEV(x), YLOG2DEV(y), + XLOG2DEV(x+width), YLOG2DEV(y), + XLOG2DEV(x+width), YLOG2DEV(y+height/2) ); + // lower half + gs_lgp->gnome_print_curveto( m_gpc, + XLOG2DEV(x+width), YLOG2DEV(y+height), + XLOG2DEV(x), YLOG2DEV(y+height), + XLOG2DEV(x), YLOG2DEV(y+height/2) ); + + gs_lgp->gnome_print_closepath( m_gpc ); + gs_lgp->gnome_print_stroke( m_gpc ); + + CalcBoundingBox( x, y ); + CalcBoundingBox( x + width, y + height ); + } } void wxGnomePrintDC::DoDrawSpline(wxList *points) @@ -737,7 +910,7 @@ void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, matrix[4] = XLOG2DEV(x); matrix[5] = YLOG2DEV(y+height); gnome_print_concat( m_gpc, matrix ); - gnome_print_moveto( m_gpc, 0, 0 ); + gs_lgp->gnome_print_moveto( m_gpc, 0, 0 ); if (has_alpha) gnome_print_rgbaimage( m_gpc, (guchar *)raw_image, width, height, rowstride ); else @@ -759,7 +932,7 @@ void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, matrix[4] = XLOG2DEV(x); matrix[5] = YLOG2DEV(y+image.GetHeight()); gnome_print_concat( m_gpc, matrix ); - gnome_print_moveto( m_gpc, 0, 0 ); + gs_lgp->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 ); } @@ -812,7 +985,7 @@ void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord double bluePS = (double)(blue) / 255.0; double greenPS = (double)(green) / 255.0; - gnome_print_setrgbcolor( m_gpc, redPS, bluePS, greenPS ); + gs_lgp->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS ); m_currentRed = red; m_currentBlue = blue; @@ -846,7 +1019,7 @@ void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord } #endif // Draw layout. - gnome_print_moveto (m_gpc, x, y); + gs_lgp->gnome_print_moveto (m_gpc, x, y); if (fabs(angle) > 0.00001) { gnome_print_gsave( m_gpc ); @@ -877,7 +1050,7 @@ void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord } #endif // Draw layout. - gnome_print_moveto (m_gpc, x, y); + gs_lgp->gnome_print_moveto (m_gpc, x, y); if (fabs(angle) > 0.00001) { gnome_print_gsave( m_gpc ); @@ -927,8 +1100,25 @@ void wxGnomePrintDC::SetPen( const wxPen& pen ) m_pen = pen; - gnome_print_setlinewidth( m_gpc, XLOG2DEVREL( 1000 * m_pen.GetWidth() ) / 1000.0f ); + gs_lgp->gnome_print_setlinewidth( m_gpc, XLOG2DEVREL( 1000 * m_pen.GetWidth() ) / 1000.0f ); + + static const double dotted[] = {2.0, 5.0}; + static const double short_dashed[] = {4.0, 4.0}; + static const double wxCoord_dashed[] = {4.0, 8.0}; + static const double dotted_dashed[] = {6.0, 6.0, 2.0, 6.0}; + + switch (m_pen.GetStyle()) + { + case wxDOT: 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(); @@ -939,7 +1129,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 ); + gs_lgp->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS ); m_currentRed = red; m_currentBlue = blue; @@ -978,7 +1168,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 ); + gs_lgp->gnome_print_setrgbcolor( m_gpc, redPS, greenPS, bluePS ); m_currentRed = red; m_currentBlue = blue; @@ -1011,6 +1201,7 @@ bool wxGnomePrintDC::StartDoc(const wxString& message) void wxGnomePrintDC::EndDoc() { + gnome_print_end_doc( m_gpc ); } void wxGnomePrintDC::StartPage() @@ -1112,37 +1303,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 @@ -1181,13 +1376,26 @@ class wxGnomePrintModule: public wxModule { public: wxGnomePrintModule() {} - bool OnInit() { wxPrintFactory::SetPrintFactory( new wxGnomePrintFactory ); return true; } - void OnExit() { } + bool OnInit(); + void OnExit(); private: DECLARE_DYNAMIC_CLASS(wxGnomePrintModule) }; +bool wxGnomePrintModule::OnInit() +{ + gs_lgp = new wxGnomePrintLibrary; + if (gs_lgp->IsOk()) + wxPrintFactory::SetPrintFactory( new wxGnomePrintFactory ); + return true; +} + +void wxGnomePrintModule::OnExit() +{ + delete gs_lgp; +} + IMPLEMENT_DYNAMIC_CLASS(wxGnomePrintModule, wxModule) #endif