X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cac7ac30cb21a3108a3c1de58e7de15ad01ed1cf..9c707f80c026273d65c0cc435144061b7678f0e3:/src/gtk1/gnome/gprint.cpp diff --git a/src/gtk1/gnome/gprint.cpp b/src/gtk1/gnome/gprint.cpp index f176b7b27a..3b9abeaa32 100644 --- a/src/gtk1/gnome/gprint.cpp +++ b/src/gtk1/gnome/gprint.cpp @@ -22,13 +22,13 @@ #if wxUSE_LIBGNOMEPRINT -#include "math.h" - +#include "wx/math.h" #include "wx/fontutil.h" #include "wx/printdlg.h" #include "wx/gtk/private.h" #include "wx/module.h" #include "wx/generic/prntdlgg.h" +#include "wx/dynlib.h" #include #include @@ -37,6 +37,233 @@ #include #include + +#include "wx/html/forcelnk.h" +FORCE_LINK_ME(gnome_print) + +//---------------------------------------------------------------------------- +// wxGnomePrintLibrary +//---------------------------------------------------------------------------- + +#define wxDL_METHOD_DEFINE( rettype, name, args, shortargs, defret ) \ + typedef rettype (* name ## Type) args ; \ + name ## Type pfn_ ## name; \ + rettype name args \ + { if (m_ok) return pfn_ ## name shortargs ; return defret; } + +#define wxDL_METHOD_LOAD( lib, name, success ) \ + pfn_ ## name = (name ## Type) lib->GetSymbol( wxT(#name), &success ); \ + if (!success) return; + +class wxGnomePrintLibrary +{ +public: + wxGnomePrintLibrary(); + ~wxGnomePrintLibrary(); + + bool IsOk(); + void InitializeMethods(); + +private: + bool m_ok; + wxDynamicLibrary *m_gnome_print_lib; + wxDynamicLibrary *m_gnome_printui_lib; + +public: + wxDL_METHOD_DEFINE( gint, gnome_print_newpath, + (GnomePrintContext *pc), (pc), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_moveto, + (GnomePrintContext *pc, gdouble x, gdouble y), (pc, x, y), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_lineto, + (GnomePrintContext *pc, gdouble x, gdouble y), (pc, x, y), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_arcto, + (GnomePrintContext *pc, gdouble x, gdouble y, gdouble radius, gdouble angle1, gdouble angle2, gint direction ), (pc, x, y, radius, angle1, angle2, direction), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_curveto, + (GnomePrintContext *pc, gdouble x1, gdouble y1, gdouble x2, gdouble y2, gdouble x3, gdouble y3), (pc, x1, y1, x2, y2, x3, y3), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_closepath, + (GnomePrintContext *pc), (pc), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_stroke, + (GnomePrintContext *pc), (pc), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_fill, + (GnomePrintContext *pc), (pc), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_setrgbcolor, + (GnomePrintContext *pc, gdouble r, gdouble g, gdouble b), (pc, r, g, b), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_setlinewidth, + (GnomePrintContext *pc, gdouble width), (pc, width), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_setdash, + (GnomePrintContext *pc, gint n_values, const gdouble *values, gdouble offset), (pc, n_values, values, offset), 0 ) + + wxDL_METHOD_DEFINE( gint, gnome_print_rgbimage, + (GnomePrintContext *pc, const guchar *data, gint width, gint height, gint rowstride), (pc, data, width, height, rowstride ), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_rgbaimage, + (GnomePrintContext *pc, const guchar *data, gint width, gint height, gint rowstride), (pc, data, width, height, rowstride ), 0 ) + + wxDL_METHOD_DEFINE( gint, gnome_print_concat, + (GnomePrintContext *pc, const gdouble *matrix), (pc, matrix), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_scale, + (GnomePrintContext *pc, gdouble sx, gdouble sy), (pc, sx, sy), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_rotate, + (GnomePrintContext *pc, gdouble theta), (pc, theta), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_translate, + (GnomePrintContext *pc, gdouble x, gdouble y), (pc, x, y), 0 ) + + wxDL_METHOD_DEFINE( gint, gnome_print_gsave, + (GnomePrintContext *pc), (pc), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_grestore, + (GnomePrintContext *pc), (pc), 0 ) + + wxDL_METHOD_DEFINE( gint, gnome_print_beginpage, + (GnomePrintContext *pc, const guchar* name), (pc, name), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_showpage, + (GnomePrintContext *pc), (pc), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_end_doc, + (GnomePrintContext *pc), (pc), 0 ) + + wxDL_METHOD_DEFINE( PangoLayout*, gnome_print_pango_create_layout, + (GnomePrintContext *gpc), (gpc), NULL ) + wxDL_METHOD_DEFINE( void, gnome_print_pango_layout, + (GnomePrintContext *gpc, PangoLayout *layout), (gpc, layout), /**/ ) + + wxDL_METHOD_DEFINE( GnomePrintJob*, gnome_print_job_new, + (GnomePrintConfig *config), (config), NULL ) + wxDL_METHOD_DEFINE( GnomePrintContext*, gnome_print_job_get_context, + (GnomePrintJob *job), (job), NULL ) + wxDL_METHOD_DEFINE( gint, gnome_print_job_close, + (GnomePrintJob *job), (job), 0 ) + wxDL_METHOD_DEFINE( gint, gnome_print_job_print, + (GnomePrintJob *job), (job), 0 ) + wxDL_METHOD_DEFINE( gboolean, gnome_print_job_get_page_size, + (GnomePrintJob *job, gdouble *width, gdouble *height), (job, width, height), 0 ) + + wxDL_METHOD_DEFINE( GnomePrintUnit*, gnome_print_unit_get_by_abbreviation, + (const guchar *abbreviation), (abbreviation), NULL ) + wxDL_METHOD_DEFINE( gboolean, gnome_print_convert_distance, + (gdouble *distance, const GnomePrintUnit *from, const GnomePrintUnit *to), (distance, from, to), false ) + + wxDL_METHOD_DEFINE( GnomePrintConfig*, gnome_print_config_default, + (void), (), NULL ) + wxDL_METHOD_DEFINE( gboolean, gnome_print_config_set, + (GnomePrintConfig *config, const guchar *key, const guchar *value), (config, key, value), false ) + wxDL_METHOD_DEFINE( gboolean, gnome_print_config_get_length, + (GnomePrintConfig *config, const guchar *key, gdouble *val, const GnomePrintUnit **unit), (config, key, val, unit), false ) + + wxDL_METHOD_DEFINE( GtkWidget*, gnome_print_dialog_new, + (GnomePrintJob *gpj, const guchar *title, gint flags), (gpj, title, flags), NULL ) + wxDL_METHOD_DEFINE( void, gnome_print_dialog_construct_range_page, + (GnomePrintDialog *gpd, gint flags, gint start, gint end, + const guchar *currentlabel, const guchar *rangelabel), + (gpd, flags, start, end, currentlabel, rangelabel), /**/ ) + wxDL_METHOD_DEFINE( void, gnome_print_dialog_get_copies, + (GnomePrintDialog *gpd, gint *copies, gboolean *collate), (gpd, copies, collate), /**/ ) + wxDL_METHOD_DEFINE( void, gnome_print_dialog_set_copies, + (GnomePrintDialog *gpd, gint copies, gint collate), (gpd, copies, collate), /**/ ) + wxDL_METHOD_DEFINE( GnomePrintRangeType, gnome_print_dialog_get_range, + (GnomePrintDialog *gpd), (gpd), GNOME_PRINT_RANGETYPE_NONE ) + wxDL_METHOD_DEFINE( int, gnome_print_dialog_get_range_page, + (GnomePrintDialog *gpd, gint *start, gint *end), (gpd, start, end), 0 ) + + wxDL_METHOD_DEFINE( GtkWidget*, gnome_paper_selector_new_with_flags, + (GnomePrintConfig *config, gint flags), (config, flags), NULL ) + + wxDL_METHOD_DEFINE( GtkWidget*, gnome_print_job_preview_new, + (GnomePrintJob *gpm, const guchar *title), (gpm, title), NULL ) +}; + +wxGnomePrintLibrary::wxGnomePrintLibrary() +{ + m_gnome_print_lib = NULL; + m_gnome_printui_lib = NULL; + + wxLogNull log; + + m_gnome_print_lib = new wxDynamicLibrary( wxT("libgnomeprint-2-2.so.0") ); + m_ok = m_gnome_print_lib->IsLoaded(); + if (!m_ok) return; + + m_gnome_printui_lib = new wxDynamicLibrary( wxT("libgnomeprintui-2-2.so.0") ); + m_ok = m_gnome_printui_lib->IsLoaded(); + if (!m_ok) return; + + InitializeMethods(); +} + +wxGnomePrintLibrary::~wxGnomePrintLibrary() +{ + if (m_gnome_print_lib) + delete m_gnome_print_lib; + if (m_gnome_printui_lib) + delete m_gnome_printui_lib; +} + +bool wxGnomePrintLibrary::IsOk() +{ + return m_ok; +} + +void wxGnomePrintLibrary::InitializeMethods() +{ + m_ok = false; + bool success; + + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_newpath, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_moveto, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_lineto, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_curveto, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_arcto, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_closepath, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_stroke, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_fill, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_setrgbcolor, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_setlinewidth, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_setdash, success ) + + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_rgbimage, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_rgbaimage, success ) + + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_concat, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_scale, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_rotate, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_translate, success ) + + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_gsave, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_grestore, success ) + + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_beginpage, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_showpage, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_end_doc, success ) + + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_pango_create_layout, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_pango_layout, success ) + + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_job_new, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_job_get_context, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_job_close, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_job_print, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_job_get_page_size, success ) + + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_unit_get_by_abbreviation, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_convert_distance, success ) + + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_config_default, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_config_set, success ) + wxDL_METHOD_LOAD( m_gnome_print_lib, gnome_print_config_get_length, success ) + + wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_dialog_new, success ) + wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_dialog_construct_range_page, success ) + wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_dialog_get_copies, success ) + wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_dialog_set_copies, success ) + wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_dialog_get_range, success ) + wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_dialog_get_range_page, success ) + + wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_paper_selector_new_with_flags, success ) + + wxDL_METHOD_LOAD( m_gnome_printui_lib, gnome_print_job_preview_new, success ) + + m_ok = true; +} + +static wxGnomePrintLibrary* gs_lgp = NULL; + //---------------------------------------------------------------------------- // wxGnomePrintNativeData //---------------------------------------------------------------------------- @@ -45,8 +272,8 @@ IMPLEMENT_CLASS(wxGnomePrintNativeData, wxPrintNativeDataBase) wxGnomePrintNativeData::wxGnomePrintNativeData() { - m_config = gnome_print_config_default(); - m_job = gnome_print_job_new( m_config ); + m_config = gs_lgp->gnome_print_config_default(); + m_job = gs_lgp->gnome_print_job_new( m_config ); } wxGnomePrintNativeData::~wxGnomePrintNativeData() @@ -194,7 +421,7 @@ void wxGnomePrintDialog::Init() wxGnomePrintNativeData *native = (wxGnomePrintNativeData*) data.GetNativeData(); - m_widget = gnome_print_dialog_new( native->GetPrintJob(), + m_widget = gs_lgp->gnome_print_dialog_new( native->GetPrintJob(), (guchar*)"Print", GNOME_PRINT_DIALOG_RANGE|GNOME_PRINT_DIALOG_COPIES ); @@ -204,7 +431,7 @@ void wxGnomePrintDialog::Init() if (m_printDialogData.GetEnablePageNumbers()) flag |= GNOME_PRINT_RANGE_ALL|GNOME_PRINT_RANGE_RANGE; - gnome_print_dialog_construct_range_page( GNOME_PRINT_DIALOG( m_widget ), + gs_lgp->gnome_print_dialog_construct_range_page( (GnomePrintDialog*) m_widget, flag, m_printDialogData.GetMinPage(), m_printDialogData.GetMaxPage(), @@ -233,11 +460,11 @@ int wxGnomePrintDialog::ShowModal() gint copies = 1; gboolean collate = false; - gnome_print_dialog_get_copies( GNOME_PRINT_DIALOG(m_widget), &copies, &collate ); + gs_lgp->gnome_print_dialog_get_copies( (GnomePrintDialog*) m_widget, &copies, &collate ); m_printDialogData.SetNoCopies( copies ); m_printDialogData.SetCollate( collate ); - switch (gnome_print_dialog_get_range( GNOME_PRINT_DIALOG(m_widget) )) + switch (gs_lgp->gnome_print_dialog_get_range( (GnomePrintDialog*) m_widget )) { case GNOME_PRINT_RANGE_SELECTION: m_printDialogData.SetSelection( true ); @@ -250,7 +477,7 @@ int wxGnomePrintDialog::ShowModal() case GNOME_PRINT_RANGE_RANGE: default: gint start,end; - gnome_print_dialog_get_range_page( GNOME_PRINT_DIALOG(m_widget), &start, &end ); + gs_lgp->gnome_print_dialog_get_range_page( (GnomePrintDialog*) m_widget, &start, &end ); m_printDialogData.SetFromPage( start ); m_printDialogData.SetToPage( end ); break; @@ -303,7 +530,7 @@ wxGnomePageSetupDialog::wxGnomePageSetupDialog( wxWindow *parent, // This is required as the page setup dialog // calculates wrong values otherwise. - gnome_print_config_set( native->GetPrintConfig(), + gs_lgp->gnome_print_config_set( native->GetPrintConfig(), (const guchar*) GNOME_PRINT_KEY_PREFERED_UNIT, (const guchar*) "Pts" ); @@ -311,7 +538,7 @@ wxGnomePageSetupDialog::wxGnomePageSetupDialog( wxWindow *parent, gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( _("Page setup") ) ); - GtkWidget *main = gnome_paper_selector_new_with_flags( native->GetPrintConfig(), + GtkWidget *main = gs_lgp->gnome_paper_selector_new_with_flags( native->GetPrintConfig(), GNOME_PAPER_SELECTOR_MARGINS|GNOME_PAPER_SELECTOR_FEED_ORIENTATION ); gtk_container_set_border_width (GTK_CONTAINER (main), 8); gtk_widget_show (main); @@ -356,30 +583,30 @@ int wxGnomePageSetupDialog::ShowModal() // 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, + gs_lgp->gnome_print_config_get_length (config, (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_LEFT, &ml, NULL); - gnome_print_config_get_length (config, + gs_lgp->gnome_print_config_get_length (config, (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_RIGHT, &mr, NULL); - gnome_print_config_get_length (config, + gs_lgp->gnome_print_config_get_length (config, (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_TOP, &mt, NULL); - gnome_print_config_get_length (config, + gs_lgp->gnome_print_config_get_length (config, (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_BOTTOM, &mb, NULL); - gnome_print_config_get_length (config, + gs_lgp->gnome_print_config_get_length (config, (const guchar*) GNOME_PRINT_KEY_PAPER_WIDTH, &pw, NULL); - gnome_print_config_get_length (config, + gs_lgp->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 ); + const GnomePrintUnit *mm_unit = gs_lgp->gnome_print_unit_get_by_abbreviation( (const guchar*) "mm" ); + const GnomePrintUnit *pts_unit = gs_lgp->gnome_print_unit_get_by_abbreviation( (const guchar*) "Pts" ); + gs_lgp->gnome_print_convert_distance( &ml, pts_unit, mm_unit ); + gs_lgp->gnome_print_convert_distance( &mr, pts_unit, mm_unit ); + gs_lgp->gnome_print_convert_distance( &mt, pts_unit, mm_unit ); + gs_lgp->gnome_print_convert_distance( &mb, pts_unit, mm_unit ); + gs_lgp->gnome_print_convert_distance( &pw, pts_unit, mm_unit ); + gs_lgp->gnome_print_convert_distance( &ph, pts_unit, mm_unit ); m_pageDialogData.SetMarginTopLeft( wxPoint( (int)(ml+0.5), (int)(mt+0.5)) ); m_pageDialogData.SetMarginBottomRight( wxPoint( (int)(mr+0.5), (int)(mb+0.5)) ); @@ -450,8 +677,8 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) wxGnomePrintNativeData *native = (wxGnomePrintNativeData*) printdata.GetNativeData(); - GnomePrintJob *job = gnome_print_job_new( native->GetPrintConfig() ); - m_gpc = gnome_print_job_get_context (job); + GnomePrintJob *job = gs_lgp->gnome_print_job_new( native->GetPrintConfig() ); + m_gpc = gs_lgp->gnome_print_job_get_context (job); // The GnomePrintJob is temporarily stored in the // native print data as the native print dialog @@ -477,7 +704,7 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) if (!dc) { - gnome_print_job_close( job ); + gs_lgp->gnome_print_job_close( job ); g_object_unref (G_OBJECT (job)); sm_lastError = wxPRINTER_ERROR; return false; @@ -508,7 +735,7 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) if (maxPage == 0) { - gnome_print_job_close( job ); + gs_lgp->gnome_print_job_close( job ); g_object_unref (G_OBJECT (job)); sm_lastError = wxPRINTER_ERROR; return false; @@ -551,15 +778,15 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) printout->OnEndPrinting(); } - gnome_print_job_close( job ); + gs_lgp->gnome_print_job_close( 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) )); + gtk_widget_show( gs_lgp->gnome_print_job_preview_new( job, (const guchar*)(const char*)wxGTK_CONV(title) )); } else { - gnome_print_job_print( job ); + gs_lgp->gnome_print_job_print( job ); } g_object_unref (G_OBJECT (job)); @@ -574,7 +801,7 @@ wxDC* wxGnomePrinter::PrintDialog( wxWindow *parent ) int ret = dialog.ShowModal(); if (ret == wxID_CANCEL) { - sm_lastError = wxPRINTER_ERROR; + sm_lastError = wxPRINTER_CANCELLED; return NULL; } @@ -593,7 +820,7 @@ bool wxGnomePrinter::Setup( wxWindow *parent ) // wxGnomePrintDC //----------------------------------------------------------------------------- -IMPLEMENT_CLASS(wxGnomePrintDC, wxDCBase) +IMPLEMENT_CLASS(wxGnomePrintDC, wxDC) wxGnomePrintDC::wxGnomePrintDC( wxGnomePrinter *printer ) { @@ -601,7 +828,7 @@ wxGnomePrintDC::wxGnomePrintDC( wxGnomePrinter *printer ) m_gpc = printer->GetPrintContext(); - m_layout = gnome_print_pango_create_layout( m_gpc ); + m_layout = gs_lgp->gnome_print_pango_create_layout( m_gpc ); m_fontdesc = pango_font_description_from_string( "Sans 12" ); m_currentRed = 0; @@ -637,9 +864,9 @@ 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 ); @@ -655,6 +882,47 @@ void wxGnomePrintDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoo void wxGnomePrintDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) { + x += w/2; + y += h/2; + + int xx = XLOG2DEV(x); + int yy = YLOG2DEV(y); + + gs_lgp->gnome_print_gsave( m_gpc ); + + gs_lgp->gnome_print_translate( m_gpc, xx, yy ); + double scale = (double)YLOG2DEVREL(h) / (double) XLOG2DEVREL(w); + gs_lgp->gnome_print_scale( m_gpc, 1.0, scale ); + + xx = 0; + yy = 0; + + if (m_brush.GetStyle () != wxTRANSPARENT) + { + SetBrush( m_brush ); + + gs_lgp->gnome_print_moveto ( m_gpc, xx, yy ); + gs_lgp->gnome_print_arcto( m_gpc, xx, yy, + XLOG2DEVREL(w)/2, sa, ea, 0 ); + gs_lgp->gnome_print_moveto ( m_gpc, xx, yy ); + + gs_lgp->gnome_print_fill( m_gpc ); + } + + if (m_pen.GetStyle () != wxTRANSPARENT) + { + SetPen (m_pen); + + gs_lgp->gnome_print_arcto( m_gpc, xx, yy, + XLOG2DEVREL(w)/2, sa, ea, 0 ); + + gs_lgp->gnome_print_stroke( m_gpc ); + } + + gs_lgp->gnome_print_grestore( m_gpc ); + + CalcBoundingBox( x, y ); + CalcBoundingBox( x+w, y+h ); } void wxGnomePrintDC::DoDrawPoint(wxCoord x, wxCoord y) @@ -671,22 +939,65 @@ void wxGnomePrintDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoo 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++) - gnome_print_lineto ( m_gpc, XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset) ); + gs_lgp->gnome_print_lineto ( m_gpc, XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset) ); - gnome_print_stroke ( m_gpc); + gs_lgp->gnome_print_stroke ( m_gpc); } void wxGnomePrintDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle) { + if (n==0) return; + + if (m_brush.GetStyle () != wxTRANSPARENT) + { + SetBrush( m_brush ); + + int x = points[0].x + xoffset; + int y = points[0].y + yoffset; + CalcBoundingBox( x, y ); + gs_lgp->gnome_print_newpath( m_gpc ); + gs_lgp->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) ); + int i; + for (i = 1; i < n; i++) + { + int x = points[i].x + xoffset; + int y = points[i].y + yoffset; + gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) ); + CalcBoundingBox( x, y ); + } + gs_lgp->gnome_print_closepath( m_gpc ); + gs_lgp->gnome_print_fill( m_gpc ); + } + + if (m_pen.GetStyle () != wxTRANSPARENT) + { + SetPen (m_pen); + + int x = points[0].x + xoffset; + int y = points[0].y + yoffset; + gs_lgp->gnome_print_newpath( m_gpc ); + gs_lgp->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) ); + int i; + for (i = 1; i < n; i++) + { + int x = points[i].x + xoffset; + int y = points[i].y + yoffset; + gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) ); + CalcBoundingBox( x, y ); + } + gs_lgp->gnome_print_closepath( m_gpc ); + gs_lgp->gnome_print_stroke( m_gpc ); + } } void wxGnomePrintDC::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle) { + wxDC::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle ); } void wxGnomePrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) @@ -695,13 +1006,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 ); @@ -711,13 +1022,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 ); @@ -726,6 +1037,71 @@ void wxGnomePrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoor void wxGnomePrintDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius) { + wxCoord rad = (wxCoord) radius; + + if (m_brush.GetStyle() != wxTRANSPARENT) + { + SetBrush(m_brush); + gs_lgp->gnome_print_newpath(m_gpc); + gs_lgp->gnome_print_moveto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y)); + gs_lgp->gnome_print_curveto(m_gpc, + XLOG2DEV(x + rad),YLOG2DEV(y), + XLOG2DEV(x),YLOG2DEV(y), + XLOG2DEV(x),YLOG2DEV(y + rad)); + gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x),YLOG2DEV(y + height - rad)); + gs_lgp->gnome_print_curveto(m_gpc, + XLOG2DEV(x),YLOG2DEV(y + height - rad), + XLOG2DEV(x),YLOG2DEV(y + height), + XLOG2DEV(x + rad),YLOG2DEV(y + height)); + gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x + width - rad),YLOG2DEV(y + height)); + gs_lgp->gnome_print_curveto(m_gpc, + XLOG2DEV(x + width - rad),YLOG2DEV(y + height), + XLOG2DEV(x + width),YLOG2DEV(y + height), + XLOG2DEV(x + width),YLOG2DEV(y + height - rad)); + gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x + width),YLOG2DEV(y + rad)); + gs_lgp->gnome_print_curveto(m_gpc, + XLOG2DEV(x + width),YLOG2DEV(y + rad), + XLOG2DEV(x + width),YLOG2DEV(y), + XLOG2DEV(x + width - rad),YLOG2DEV(y)); + gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y)); + gs_lgp->gnome_print_closepath(m_gpc); + gs_lgp->gnome_print_fill(m_gpc); + + CalcBoundingBox(x,y); + CalcBoundingBox(x+width,y+height); + } + + if (m_pen.GetStyle() != wxTRANSPARENT) + { + SetPen(m_pen); + gs_lgp->gnome_print_newpath(m_gpc); + gs_lgp->gnome_print_moveto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y)); + gs_lgp->gnome_print_curveto(m_gpc, + XLOG2DEV(x + rad),YLOG2DEV(y), + XLOG2DEV(x),YLOG2DEV(y), + XLOG2DEV(x),YLOG2DEV(y + rad)); + gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x),YLOG2DEV(y + height - rad)); + gs_lgp->gnome_print_curveto(m_gpc, + XLOG2DEV(x),YLOG2DEV(y + height - rad), + XLOG2DEV(x),YLOG2DEV(y + height), + XLOG2DEV(x + rad),YLOG2DEV(y + height)); + gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x + width - rad),YLOG2DEV(y + height)); + gs_lgp->gnome_print_curveto(m_gpc, + XLOG2DEV(x + width - rad),YLOG2DEV(y + height), + XLOG2DEV(x + width),YLOG2DEV(y + height), + XLOG2DEV(x + width),YLOG2DEV(y + height - rad)); + gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x + width),YLOG2DEV(y + rad)); + gs_lgp->gnome_print_curveto(m_gpc, + XLOG2DEV(x + width),YLOG2DEV(y + rad), + XLOG2DEV(x + width),YLOG2DEV(y), + XLOG2DEV(x + width - rad),YLOG2DEV(y)); + gs_lgp->gnome_print_lineto(m_gpc,XLOG2DEV(x + rad),YLOG2DEV(y)); + gs_lgp->gnome_print_closepath(m_gpc); + gs_lgp->gnome_print_stroke(m_gpc); + + CalcBoundingBox(x,y); + CalcBoundingBox(x+width,y+height); + } } void wxGnomePrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) @@ -734,23 +1110,23 @@ void wxGnomePrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord { SetBrush( m_brush ); - gnome_print_newpath( m_gpc ); - gnome_print_moveto( m_gpc, + gs_lgp->gnome_print_newpath( m_gpc ); + gs_lgp->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y+height/2) ); // start with top half - gnome_print_curveto( m_gpc, + 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 - gnome_print_curveto( m_gpc, + gs_lgp->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 ); + gs_lgp->gnome_print_closepath( m_gpc ); + gs_lgp->gnome_print_fill( m_gpc ); CalcBoundingBox( x, y ); CalcBoundingBox( x + width, y + height ); @@ -760,23 +1136,23 @@ void wxGnomePrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord { SetPen (m_pen); - gnome_print_newpath( m_gpc ); - gnome_print_moveto( m_gpc, + gs_lgp->gnome_print_newpath( m_gpc ); + gs_lgp->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y+height/2) ); // start with top half - gnome_print_curveto( m_gpc, + 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 - gnome_print_curveto( m_gpc, + gs_lgp->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 ); + gs_lgp->gnome_print_closepath( m_gpc ); + gs_lgp->gnome_print_stroke( m_gpc ); CalcBoundingBox( x, y ); CalcBoundingBox( x + width, y + height ); @@ -785,6 +1161,60 @@ void wxGnomePrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord void wxGnomePrintDC::DoDrawSpline(wxList *points) { + SetPen (m_pen); + + double c, d, x1, y1, x2, y2, x3, y3; + wxPoint *p, *q; + + wxList::compatibility_iterator node = points->GetFirst(); + p = (wxPoint *)node->GetData(); + x1 = p->x; + y1 = p->y; + + node = node->GetNext(); + p = (wxPoint *)node->GetData(); + c = p->x; + d = p->y; + x3 = + (double)(x1 + c) / 2; + y3 = + (double)(y1 + d) / 2; + + gs_lgp->gnome_print_newpath( m_gpc ); + gs_lgp->gnome_print_moveto( m_gpc, XLOG2DEV((wxCoord)x1), YLOG2DEV((wxCoord)y1) ); + gs_lgp->gnome_print_lineto( m_gpc, XLOG2DEV((wxCoord)x3), YLOG2DEV((wxCoord)y3) ); + + CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 ); + CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 ); + + node = node->GetNext(); + while (node) + { + q = (wxPoint *)node->GetData(); + + x1 = x3; + y1 = y3; + x2 = c; + y2 = d; + c = q->x; + d = q->y; + x3 = (double)(x2 + c) / 2; + y3 = (double)(y2 + d) / 2; + + gs_lgp->gnome_print_curveto(m_gpc, + XLOG2DEV((wxCoord)x1), YLOG2DEV((wxCoord)y1), + XLOG2DEV((wxCoord)x2), YLOG2DEV((wxCoord)y2), + XLOG2DEV((wxCoord)x3), YLOG2DEV((wxCoord)y3) ); + + CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 ); + CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 ); + + node = node->GetNext(); + } + + gs_lgp->gnome_print_lineto ( m_gpc, XLOG2DEV((wxCoord)c), YLOG2DEV((wxCoord)d) ); + + gs_lgp->gnome_print_stroke( m_gpc ); } bool wxGnomePrintDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, @@ -812,7 +1242,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 ); - gnome_print_gsave( m_gpc ); + gs_lgp->gnome_print_gsave( m_gpc ); double matrix[6]; matrix[0] = XLOG2DEVREL(width); matrix[1] = 0; @@ -820,13 +1250,13 @@ void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, 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 ); + gs_lgp->gnome_print_concat( m_gpc, matrix ); + gs_lgp->gnome_print_moveto( m_gpc, 0, 0 ); if (has_alpha) - gnome_print_rgbaimage( m_gpc, (guchar *)raw_image, width, height, rowstride ); + gs_lgp->gnome_print_rgbaimage( m_gpc, (guchar *)raw_image, width, height, rowstride ); else - gnome_print_rgbimage( m_gpc, (guchar *)raw_image, width, height, rowstride ); - gnome_print_grestore( m_gpc ); + gs_lgp->gnome_print_rgbimage( m_gpc, (guchar *)raw_image, width, height, rowstride ); + gs_lgp->gnome_print_grestore( m_gpc ); } else { @@ -834,7 +1264,7 @@ void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, if (!image.Ok()) return; - gnome_print_gsave( m_gpc ); + gs_lgp->gnome_print_gsave( m_gpc ); double matrix[6]; matrix[0] = XLOG2DEVREL(image.GetWidth()); matrix[1] = 0; @@ -842,10 +1272,10 @@ 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()); - gnome_print_concat( m_gpc, matrix ); - gnome_print_moveto( m_gpc, 0, 0 ); - gnome_print_rgbimage( m_gpc, (guchar*) image.GetData(), image.GetWidth(), image.GetHeight(), image.GetWidth()*3 ); - gnome_print_grestore( m_gpc ); + gs_lgp->gnome_print_concat( m_gpc, matrix ); + gs_lgp->gnome_print_moveto( m_gpc, 0, 0 ); + gs_lgp->gnome_print_rgbimage( m_gpc, (guchar*) image.GetData(), image.GetWidth(), image.GetHeight(), image.GetWidth()*3 ); + gs_lgp->gnome_print_grestore( m_gpc ); } } @@ -896,7 +1326,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; @@ -930,17 +1360,17 @@ 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 ); - gnome_print_rotate( m_gpc, angle ); - gnome_print_pango_layout( m_gpc, m_layout ); - gnome_print_grestore( m_gpc ); + gs_lgp->gnome_print_gsave( m_gpc ); + gs_lgp->gnome_print_rotate( m_gpc, angle ); + gs_lgp->gnome_print_pango_layout( m_gpc, m_layout ); + gs_lgp->gnome_print_grestore( m_gpc ); } else { - gnome_print_pango_layout( m_gpc, m_layout ); + gs_lgp->gnome_print_pango_layout( m_gpc, m_layout ); } // reset unscaled size @@ -961,17 +1391,17 @@ 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 ); - gnome_print_rotate( m_gpc, angle ); - gnome_print_pango_layout( m_gpc, m_layout ); - gnome_print_grestore( m_gpc ); + gs_lgp->gnome_print_gsave( m_gpc ); + gs_lgp->gnome_print_rotate( m_gpc, angle ); + gs_lgp->gnome_print_pango_layout( m_gpc, m_layout ); + gs_lgp->gnome_print_grestore( m_gpc ); } else { - gnome_print_pango_layout( m_gpc, m_layout ); + gs_lgp->gnome_print_pango_layout( m_gpc, m_layout ); } } @@ -1007,12 +1437,9 @@ void wxGnomePrintDC::SetPen( const wxPen& pen ) { if (!pen.Ok()) return; - // 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 ); - + 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}; @@ -1021,13 +1448,13 @@ void wxGnomePrintDC::SetPen( const wxPen& pen ) 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 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 wxSOLID: case wxTRANSPARENT: - default: gnome_print_setdash( m_gpc, 0, NULL, 0 ); break; + default: gs_lgp->gnome_print_setdash( m_gpc, 0, NULL, 0 ); break; } @@ -1041,7 +1468,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; @@ -1080,7 +1507,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; @@ -1113,17 +1540,17 @@ bool wxGnomePrintDC::StartDoc(const wxString& message) void wxGnomePrintDC::EndDoc() { - gnome_print_end_doc( m_gpc ); + gs_lgp->gnome_print_end_doc( m_gpc ); } void wxGnomePrintDC::StartPage() { - gnome_print_beginpage( m_gpc, (const guchar*) "1" ); + gs_lgp->gnome_print_beginpage( m_gpc, (const guchar*) "page" ); } void wxGnomePrintDC::EndPage() { - gnome_print_showpage( m_gpc ); + gs_lgp->gnome_print_showpage( m_gpc ); } wxCoord wxGnomePrintDC::GetCharHeight() const @@ -1197,9 +1624,9 @@ void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxC pango_layout_get_pixel_size( m_layout, &w, &h ); if (width) - *width = (wxCoord) w; + *width = (wxCoord)(w / m_scaleX); if (height) - *height = (wxCoord) h; + *height = (wxCoord)(h / m_scaleY); if (descent) { PangoLayoutIter *iter = pango_layout_get_iter(m_layout); @@ -1221,7 +1648,7 @@ void wxGnomePrintDC::DoGetSize(int* width, int* height) const // 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 ); + gs_lgp->gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph ); if (width) *width = (int) (pw + 0.5); @@ -1237,14 +1664,14 @@ void wxGnomePrintDC::DoGetSizeMM(int *width, int *height) const // This code assumes values in Pts. double pw,ph; - gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph ); + gs_lgp->gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph ); // Convert to mm. - 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 ); + const GnomePrintUnit *mm_unit = gs_lgp->gnome_print_unit_get_by_abbreviation( (const guchar*) "mm" ); + const GnomePrintUnit *pts_unit = gs_lgp->gnome_print_unit_get_by_abbreviation( (const guchar*) "Pts" ); + gs_lgp->gnome_print_convert_distance( &pw, pts_unit, mm_unit ); + gs_lgp->gnome_print_convert_distance( &ph, pts_unit, mm_unit ); if (width) *width = (int) (pw + 0.5); @@ -1288,13 +1715,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