X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/02255e07d75191d1146e21d4218835a79214a970..ea2807a4c4a0949ff78503ec86ec20a2d238a1f3:/src/gtk/gnome/gprint.cpp diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp index 41a53a64f3..abe6b7ba62 100644 --- a/src/gtk/gnome/gprint.cpp +++ b/src/gtk/gnome/gprint.cpp @@ -26,12 +26,14 @@ #include "wx/math.h" #include "wx/image.h" #include "wx/module.h" + #include "wx/crt.h" #endif #include "wx/fontutil.h" #include "wx/gtk/private.h" #include "wx/dynlib.h" #include "wx/paper.h" +#include "wx/dcprint.h" #include #include @@ -53,8 +55,8 @@ public: wxGnomePrintLibrary(); ~wxGnomePrintLibrary(); -private: bool IsOk(); +private: bool InitializeMethods(); wxDynamicLibrary m_libGnomePrint; @@ -122,8 +124,8 @@ public: wxDL_METHOD_DEFINE( PangoLayout*, gnome_print_pango_create_layout, (GnomePrintContext *gpc), (gpc), NULL ) - wxDL_METHOD_DEFINE( void, gnome_print_pango_layout, - (GnomePrintContext *gpc, PangoLayout *layout), (gpc, layout), /**/ ) + wxDL_VOIDMETHOD_DEFINE( gnome_print_pango_layout, + (GnomePrintContext *gpc, PangoLayout *layout), (gpc, layout) ) wxDL_METHOD_DEFINE( GnomePrintJob*, gnome_print_job_new, (GnomePrintConfig *config), (config), NULL ) @@ -153,22 +155,24 @@ public: (GnomePrintConfig *config, const guchar *key, gboolean value), (config, key, value), false ) wxDL_METHOD_DEFINE( gboolean, gnome_print_config_set_length, (GnomePrintConfig *config, const guchar *key, gdouble value, const GnomePrintUnit *unit), (config, key, value, unit), false ) - + wxDL_METHOD_DEFINE( guchar*, gnome_print_config_get, (GnomePrintConfig *config, const guchar *key), (config, key), NULL ) wxDL_METHOD_DEFINE( gboolean, gnome_print_config_get_length, (GnomePrintConfig *config, const guchar *key, gdouble *val, const GnomePrintUnit **unit), (config, key, val, unit), false ) + wxDL_METHOD_DEFINE( gboolean, gnome_print_config_get_boolean, + (GnomePrintConfig *config, const guchar *key, gboolean *val), (config, key, val), false ) wxDL_METHOD_DEFINE( GtkWidget*, gnome_print_dialog_new, (GnomePrintJob *gpj, const guchar *title, gint flags), (gpj, title, flags), NULL ) - wxDL_METHOD_DEFINE( void, gnome_print_dialog_construct_range_page, + wxDL_VOIDMETHOD_DEFINE( gnome_print_dialog_construct_range_page, (GnomePrintDialog *gpd, gint flags, gint start, gint end, const guchar *currentlabel, const guchar *rangelabel), - (gpd, flags, start, end, currentlabel, rangelabel), /**/ ) - wxDL_METHOD_DEFINE( void, gnome_print_dialog_get_copies, - (GnomePrintDialog *gpd, gint *copies, gboolean *collate), (gpd, copies, collate), /**/ ) - wxDL_METHOD_DEFINE( void, gnome_print_dialog_set_copies, - (GnomePrintDialog *gpd, gint copies, gint collate), (gpd, copies, collate), /**/ ) + (gpd, flags, start, end, currentlabel, rangelabel) ) + wxDL_VOIDMETHOD_DEFINE( gnome_print_dialog_get_copies, + (GnomePrintDialog *gpd, gint *copies, gboolean *collate), (gpd, copies, collate) ) + wxDL_VOIDMETHOD_DEFINE( gnome_print_dialog_set_copies, + (GnomePrintDialog *gpd, gint copies, gint collate), (gpd, copies, collate) ) wxDL_METHOD_DEFINE( GnomePrintRangeType, gnome_print_dialog_get_range, (GnomePrintDialog *gpd), (gpd), GNOME_PRINT_RANGETYPE_NONE ) wxDL_METHOD_DEFINE( int, gnome_print_dialog_get_range_page, @@ -180,7 +184,7 @@ public: wxDL_METHOD_DEFINE( GtkWidget*, gnome_print_job_preview_new, (GnomePrintJob *gpm, const guchar *title), (gpm, title), NULL ) - DECLARE_NO_COPY_CLASS(wxGnomePrintLibrary) + wxDECLARE_NO_COPY_CLASS(wxGnomePrintLibrary); }; wxGnomePrintLibrary::wxGnomePrintLibrary() @@ -193,7 +197,7 @@ wxGnomePrintLibrary::wxGnomePrintLibrary() return; m_libGnomePrintUI.Load("libgnomeprintui-2-2.so.0"); - m_ok = m_libGnomePrintUI->IsLoaded(); + m_ok = m_libGnomePrintUI.IsLoaded(); if ( !m_ok ) { m_libGnomePrint.Unload(); @@ -214,68 +218,69 @@ bool wxGnomePrintLibrary::IsOk() bool wxGnomePrintLibrary::InitializeMethods() { - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_newpath ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_moveto ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_lineto ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_curveto ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_arcto ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_closepath ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_stroke ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_fill ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_setrgbcolor ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_setlinewidth ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_setdash ) - - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_rgbimage ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_rgbaimage ) - - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_concat ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_scale ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_rotate ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_translate ) - - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_gsave ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_grestore ) - - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_clip ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_eoclip ) - - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_beginpage ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_showpage ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_end_doc ) - - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_pango_create_layout ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_pango_layout ) - - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_new ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_get_context ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_close ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_print ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_get_page_size ) - - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_unit_get_by_abbreviation ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_convert_distance ) - - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_default ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_boolean ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_double ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_int ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_length ) - - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get ) - wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get_length ) - - wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_new ) - wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_construct_range_page ) - wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_get_copies ) - wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_set_copies ) - wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_get_range ) - wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_get_range_page ) - - wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_paper_selector_new_with_flags ) - - wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_job_preview_new ) + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_newpath ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_moveto ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_lineto ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_curveto ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_arcto ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_closepath ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_stroke ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_fill ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_setrgbcolor ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_setlinewidth ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_setdash ); + + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_rgbimage ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_rgbaimage ); + + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_concat ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_scale ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_rotate ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_translate ); + + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_gsave ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_grestore ); + + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_clip ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_eoclip ); + + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_beginpage ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_showpage ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_end_doc ); + + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_pango_create_layout ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_pango_layout ); + + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_new ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_get_context ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_close ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_print ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_job_get_page_size ); + + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_unit_get_by_abbreviation ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_convert_distance ); + + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_default ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_boolean ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_double ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_int ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_length ); + + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get_length ); + wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get_boolean ); + + wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_new ); + wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_construct_range_page ); + wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_get_copies ); + wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_set_copies ); + wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_get_range ); + wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_dialog_get_range_page ); + + wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_paper_selector_new_with_flags ); + + wxDL_METHOD_LOAD( m_libGnomePrintUI, gnome_print_job_preview_new ); return true; } @@ -308,7 +313,29 @@ bool wxGnomePrintNativeData::TransferTo( wxPrintData &data ) else data.SetOrientation( wxPORTRAIT ); g_free( res ); - + + res = gs_libGnomePrint->gnome_print_config_get( m_config, + (guchar*)(char*)GNOME_PRINT_KEY_OUTPUT_FILENAME ); + if (res) + { + data.SetFilename( wxConvFile.cMB2WX( (const char*) res ) ); + wxPrintf( "filename %s\n", data.GetFilename() ); + g_free( res ); + } + else + { + data.SetFilename( wxEmptyString ); + } + + gboolean ret; + if (gs_libGnomePrint->gnome_print_config_get_boolean( m_config, + (guchar*)(char*)GNOME_PRINT_KEY_COLLATE, &ret)) + { + data.SetCollate( ret ); + } + + // gnome_print_v + return true; } @@ -379,7 +406,7 @@ bool wxGnomePrintNativeData::TransferFrom( const wxPrintData &data ) (guchar*)(char*)"C6" ); break; case wxPAPER_NONE: break; - + default: case wxPAPER_A4: gs_libGnomePrint->gnome_print_config_set( m_config, (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE, @@ -443,16 +470,30 @@ bool wxGnomePrintFactory::HasPrintSetupDialog() return false; } -wxDialog *wxGnomePrintFactory::CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data ) +wxDialog * +wxGnomePrintFactory::CreatePrintSetupDialog(wxWindow * WXUNUSED(parent), + wxPrintData * WXUNUSED(data)) { return NULL; } + +#if wxUSE_NEW_DC + +wxDCImpl* wxGnomePrintFactory::CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) +{ + return new wxGnomePrinterDCImpl( owner, data ); +} + +#else + wxDC* wxGnomePrintFactory::CreatePrinterDC( const wxPrintData& data ) { - return new wxGnomePrintDC(data); + return new wxGnomePrinterDC(data); } +#endif + bool wxGnomePrintFactory::HasOwnPrintToFile() { return true; @@ -519,7 +560,7 @@ wxGnomePrintDialog::wxGnomePrintDialog( wxWindow *parent, wxPrintData *data ) void wxGnomePrintDialog::Init() { wxPrintData data = m_printDialogData.GetPrintData(); - + data.ConvertToNative(); wxGnomePrintNativeData *native = @@ -623,8 +664,8 @@ bool wxGnomePrintDialog::TransferDataFromWindow() IMPLEMENT_CLASS(wxGnomePageSetupDialog, wxPageSetupDialogBase) -wxGnomePageSetupDialog::wxGnomePageSetupDialog( wxWindow *parent, - wxPageSetupDialogData* data ) +wxGnomePageSetupDialog::wxGnomePageSetupDialog(wxWindow * WXUNUSED(parent), + wxPageSetupDialogData *data) { if (data) m_pageDialogData = *data; @@ -650,7 +691,7 @@ wxGnomePageSetupDialog::wxGnomePageSetupDialog( wxWindow *parent, double mt = (double) m_pageDialogData.GetMarginTopLeft().y; double mr = (double) m_pageDialogData.GetMarginBottomRight().x; double mb = (double) m_pageDialogData.GetMarginBottomRight().y; - + gs_libGnomePrint->gnome_print_config_set_length (config, (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_LEFT, ml, mm_unit ); gs_libGnomePrint->gnome_print_config_set_length (config, @@ -695,7 +736,7 @@ int wxGnomePageSetupDialog::ShowModal() { wxGnomePrintNativeData *native = (wxGnomePrintNativeData*) m_pageDialogData.GetPrintData().GetNativeData(); - + GnomePrintConfig *config = native->GetPrintConfig(); @@ -790,7 +831,7 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) } wxPrintData printdata = GetPrintDialogData().GetPrintData(); - + wxGnomePrintNativeData *native = (wxGnomePrintNativeData*) printdata.GetNativeData(); @@ -802,8 +843,6 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) native->SetPrintJob( job ); - printout->SetIsPreview(false); - if (m_printDialogData.GetMinPage() < 1) m_printDialogData.SetMinPage(1); if (m_printDialogData.GetMaxPage() < 1) @@ -813,10 +852,11 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) if (prompt) dc = PrintDialog( parent ); else - dc = new wxGnomePrintDC( printdata ); - - if (m_native_preview) - printout->SetIsPreview(true); +#if wxUSE_NEW_DC + dc = new wxPrinterDC( printdata ); // TODO: check that this works +#else + dc = new wxGnomePrinterDC( printdata ); // TODO: check that this works +#endif if (!dc) { @@ -827,13 +867,9 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) return false; } - wxSize ScreenPixels = wxGetDisplaySize(); - wxSize ScreenMM = wxGetDisplaySizeMM(); - - printout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()), - (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) ); - printout->SetPPIPrinter( wxGnomePrintDC::GetResolution(), - wxGnomePrintDC::GetResolution() ); + printout->SetPPIScreen(wxGetDisplayPPI()); + printout->SetPPIPrinter( dc->GetResolution(), + dc->GetResolution() ); printout->SetDC(dc); @@ -931,16 +967,20 @@ wxDC* wxGnomePrinter::PrintDialog( wxWindow *parent ) m_native_preview = ret == wxID_PREVIEW; m_printDialogData = dialog.GetPrintDialogData(); - return new wxGnomePrintDC( m_printDialogData.GetPrintData() ); +#if wxUSE_NEW_DC + return new wxPrinterDC( m_printDialogData.GetPrintData() ); +#else + return new wxGnomePrinterDC( m_printDialogData.GetPrintData() ); +#endif } -bool wxGnomePrinter::Setup( wxWindow *parent ) +bool wxGnomePrinter::Setup(wxWindow * WXUNUSED(parent)) { return false; } //----------------------------------------------------------------------------- -// wxGnomePrintDC +// wxGnomePrinterDC //----------------------------------------------------------------------------- // conversion @@ -956,9 +996,18 @@ static const double DEV2PS = 72.0 / 600.0; #define YLOG2DEV(x) ((m_pageHeight - (double)LogicalToDeviceY(x)) * DEV2PS) #define YLOG2DEVREL(x) ((double)(LogicalToDeviceYRel(x)) * DEV2PS) -IMPLEMENT_CLASS(wxGnomePrintDC, wxDC) +#if wxUSE_NEW_DC +IMPLEMENT_ABSTRACT_CLASS(wxGnomePrinterDCImpl, wxDCImpl) +#else +IMPLEMENT_ABSTRACT_CLASS(wxGnomePrinterDC, wxDC) +#endif -wxGnomePrintDC::wxGnomePrintDC( const wxPrintData& data ) +#if wxUSE_NEW_DC +wxGnomePrinterDCImpl::wxGnomePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) : + wxDCImpl( owner ) +#else +wxGnomePrinterDC::wxGnomePrinterDC( const wxPrintData& data ) +#endif { m_printData = data; @@ -978,33 +1027,41 @@ wxGnomePrintDC::wxGnomePrintDC( const wxPrintData& data ) // Query page size. This seems to omit the margins double pw,ph; - gs_lgp->gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph ); + gs_libGnomePrint->gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph ); m_pageHeight = ph * PS2DEV; } -wxGnomePrintDC::~wxGnomePrintDC() +wxGnomePrinterDCImpl::~wxGnomePrinterDCImpl() { } -bool wxGnomePrintDC::IsOk() const +bool wxGnomePrinterDCImpl::IsOk() const { return true; } -bool wxGnomePrintDC::DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style ) +bool +wxGnomePrinterDCImpl::DoFloodFill(wxCoord WXUNUSED(x1), + wxCoord WXUNUSED(y1), + const wxColour& WXUNUSED(col), + wxFloodFillStyle WXUNUSED(style)) { return false; } -bool wxGnomePrintDC::DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const +bool +wxGnomePrinterDCImpl::DoGetPixel(wxCoord WXUNUSED(x1), + wxCoord WXUNUSED(y1), + wxColour * WXUNUSED(col)) const { return false; } -void wxGnomePrintDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) +void wxGnomePrinterDCImpl::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) { - if (m_pen.GetStyle() == wxTRANSPARENT) return; + if ( m_pen.IsTransparent() ) + return; SetPen( m_pen ); @@ -1016,11 +1073,11 @@ void wxGnomePrintDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) CalcBoundingBox( x2, y2 ); } -void wxGnomePrintDC::DoCrossHair(wxCoord x, wxCoord y) +void wxGnomePrinterDCImpl::DoCrossHair(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) { } -void wxGnomePrintDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc) +void wxGnomePrinterDCImpl::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc) { double dx = x1 - xc; double dy = y1 - yc; @@ -1031,10 +1088,10 @@ void wxGnomePrintDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoo alpha1 = 0.0; alpha2 = 360.0; } - else - if (radius == 0.0) + else if ( wxIsNullDouble(radius) ) { - alpha1 = alpha2 = 0.0; + alpha1 = + alpha2 = 0.0; } else { @@ -1051,7 +1108,7 @@ void wxGnomePrintDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoo while (alpha2 > 360) alpha2 -= 360; } - if (m_brush.GetStyle() != wxTRANSPARENT) + if ( m_brush.IsNonTransparent() ) { SetBrush( m_brush ); gs_libGnomePrint->gnome_print_moveto ( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc) ); @@ -1060,7 +1117,7 @@ void wxGnomePrintDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoo gs_libGnomePrint->gnome_print_fill( m_gpc ); } - if (m_pen.GetStyle() != wxTRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen (m_pen); gs_libGnomePrint->gnome_print_newpath( m_gpc ); @@ -1076,7 +1133,7 @@ void wxGnomePrintDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoo CalcBoundingBox (xc, yc); } -void wxGnomePrintDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) +void wxGnomePrinterDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) { x += w/2; y += h/2; @@ -1093,7 +1150,7 @@ void wxGnomePrintDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,d xx = 0.0; yy = 0.0; - if (m_brush.GetStyle () != wxTRANSPARENT) + if ( m_brush.IsNonTransparent() ) { SetBrush( m_brush ); @@ -1105,7 +1162,7 @@ void wxGnomePrintDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,d gs_libGnomePrint->gnome_print_fill( m_gpc ); } - if (m_pen.GetStyle () != wxTRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen (m_pen); @@ -1121,16 +1178,17 @@ void wxGnomePrintDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,d CalcBoundingBox( x+w, y+h ); } -void wxGnomePrintDC::DoDrawPoint(wxCoord x, wxCoord y) +void wxGnomePrinterDCImpl::DoDrawPoint(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) { } -void wxGnomePrintDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) +void wxGnomePrinterDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) { - if (m_pen.GetStyle() == wxTRANSPARENT) return; - if (n <= 0) return; + if ( m_pen.IsTransparent() ) + return; + SetPen (m_pen); int i; @@ -1145,11 +1203,13 @@ void wxGnomePrintDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoo gs_libGnomePrint->gnome_print_stroke ( m_gpc); } -void wxGnomePrintDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle) +void wxGnomePrinterDCImpl::DoDrawPolygon(int n, wxPoint points[], + wxCoord xoffset, wxCoord yoffset, + wxPolygonFillMode WXUNUSED(fillStyle)) { if (n==0) return; - if (m_brush.GetStyle () != wxTRANSPARENT) + if ( m_brush.IsNonTransparent() ) { SetBrush( m_brush ); @@ -1161,8 +1221,8 @@ void wxGnomePrintDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxC int i; for (i = 1; i < n; i++) { - int x = points[i].x + xoffset; - int y = points[i].y + yoffset; + x = points[i].x + xoffset; + y = points[i].y + yoffset; gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) ); CalcBoundingBox( x, y ); } @@ -1170,7 +1230,7 @@ void wxGnomePrintDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxC gs_libGnomePrint->gnome_print_fill( m_gpc ); } - if (m_pen.GetStyle () != wxTRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen (m_pen); @@ -1181,8 +1241,8 @@ void wxGnomePrintDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxC int i; for (i = 1; i < n; i++) { - int x = points[i].x + xoffset; - int y = points[i].y + yoffset; + x = points[i].x + xoffset; + y = points[i].y + yoffset; gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) ); CalcBoundingBox( x, y ); } @@ -1191,14 +1251,21 @@ void wxGnomePrintDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxC } } -void wxGnomePrintDC::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle) +void wxGnomePrinterDCImpl::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle) { +#if wxUSE_NEW_DC + wxDCImpl::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle ); +#else wxDC::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle ); +#endif } -void wxGnomePrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) +void wxGnomePrinterDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { - if (m_brush.GetStyle () != wxTRANSPARENT) + width--; + height--; + + if ( m_brush.IsNonTransparent() ) { SetBrush( m_brush ); @@ -1214,7 +1281,7 @@ void wxGnomePrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoor CalcBoundingBox( x + width, y + height ); } - if (m_pen.GetStyle () != wxTRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen (m_pen); @@ -1231,11 +1298,14 @@ void wxGnomePrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoor } } -void wxGnomePrintDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius) +void wxGnomePrinterDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius) { - wxCoord rad = (wxCoord) radius; + width--; + height--; + + wxCoord rad = wxRound( radius ); - if (m_brush.GetStyle() != wxTRANSPARENT) + if ( m_brush.IsNonTransparent() ) { SetBrush(m_brush); gs_libGnomePrint->gnome_print_newpath(m_gpc); @@ -1267,7 +1337,7 @@ void wxGnomePrintDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, CalcBoundingBox(x+width,y+height); } - if (m_pen.GetStyle() != wxTRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen(m_pen); gs_libGnomePrint->gnome_print_newpath(m_gpc); @@ -1300,7 +1370,7 @@ void wxGnomePrintDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, } } -void wxGnomePrintDC::makeEllipticalPath(wxCoord x, wxCoord y, +void wxGnomePrinterDCImpl::makeEllipticalPath(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { double r = 4 * (sqrt(2.) - 1) / 3; @@ -1346,9 +1416,12 @@ void wxGnomePrintDC::makeEllipticalPath(wxCoord x, wxCoord y, gs_libGnomePrint->gnome_print_closepath(m_gpc); } -void wxGnomePrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) +void wxGnomePrinterDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { - if (m_brush.GetStyle () != wxTRANSPARENT) + width--; + height--; + + if ( m_brush.IsNonTransparent() ) { SetBrush( m_brush ); makeEllipticalPath( x, y, width, height ); @@ -1357,7 +1430,7 @@ void wxGnomePrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord CalcBoundingBox( x + width, y + height ); } - if (m_pen.GetStyle () != wxTRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen (m_pen); makeEllipticalPath( x, y, width, height ); @@ -1368,20 +1441,20 @@ void wxGnomePrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord } #if wxUSE_SPLINES -void wxGnomePrintDC::DoDrawSpline(wxList *points) +void wxGnomePrinterDCImpl::DoDrawSpline(const wxPointList *points) { SetPen (m_pen); double c, d, x1, y1, x2, y2, x3, y3; wxPoint *p, *q; - wxList::compatibility_iterator node = points->GetFirst(); - p = (wxPoint *)node->GetData(); + wxPointList::compatibility_iterator node = points->GetFirst(); + p = node->GetData(); x1 = p->x; y1 = p->y; node = node->GetNext(); - p = (wxPoint *)node->GetData(); + p = node->GetData(); c = p->x; d = p->y; x3 = @@ -1399,7 +1472,7 @@ void wxGnomePrintDC::DoDrawSpline(wxList *points) node = node->GetNext(); while (node) { - q = (wxPoint *)node->GetData(); + q = node->GetData(); x1 = x3; y1 = y3; @@ -1427,9 +1500,14 @@ void wxGnomePrintDC::DoDrawSpline(wxList *points) } #endif // wxUSE_SPLINES -bool wxGnomePrintDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop, bool useMask, - wxCoord xsrcMask, wxCoord ysrcMask) +bool +wxGnomePrinterDCImpl::DoBlit(wxCoord xdest, wxCoord ydest, + wxCoord width, wxCoord height, + wxDC *source, + wxCoord xsrc, wxCoord ysrc, + wxRasterOperationMode rop, + bool WXUNUSED(useMask), + wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask)) { wxCHECK_MSG( source, false, wxT("invalid source dc") ); @@ -1441,17 +1519,20 @@ bool wxGnomePrintDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord memDC.SelectObject(wxNullBitmap); // draw bitmap. scaling and positioning is done there - DrawBitmap( bitmap, xdest, ydest ); + GetOwner()->DrawBitmap( bitmap, xdest, ydest ); return true; } -void wxGnomePrintDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y ) +void wxGnomePrinterDCImpl::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y ) { DoDrawBitmap( icon, x, y, true ); } -void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask ) +void +wxGnomePrinterDCImpl::DoDrawBitmap(const wxBitmap& bitmap, + wxCoord x, wxCoord y, + bool WXUNUSED(useMask)) { if (!bitmap.Ok()) return; @@ -1501,24 +1582,19 @@ void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, } } -void wxGnomePrintDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y ) +void wxGnomePrinterDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y ) { DoDrawRotatedText( text, x, y, 0.0 ); } -void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle) +void wxGnomePrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle) { double xx = XLOG2DEV(x); double yy = YLOG2DEV(y); bool underlined = m_font.Ok() && m_font.GetUnderlined(); - // FIXME-UTF8: wouldn't be needed if utf8_str() always returned a buffer -#if wxUSE_UNICODE_UTF8 - const char *data = text.utf8_str(); -#else - const wxCharBuffer data = text.utf8_str(); -#endif + const wxScopedCharBuffer data(text.utf8_str()); size_t datalen = strlen(data); pango_layout_set_text( m_layout, data, datalen); @@ -1554,8 +1630,6 @@ void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord } } - int w,h; - pango_layout_get_pixel_size( m_layout, &w, &h ); #if 0 if ( m_backgroundMode == wxSOLID ) { @@ -1567,32 +1641,36 @@ void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord // Draw layout. gs_libGnomePrint->gnome_print_moveto (m_gpc, xx, yy); - + gs_libGnomePrint->gnome_print_gsave( m_gpc ); - + gs_libGnomePrint->gnome_print_scale( m_gpc, m_scaleX * DEV2PS, m_scaleY * DEV2PS ); - + if (fabs(angle) > 0.00001) gs_libGnomePrint->gnome_print_rotate( m_gpc, angle ); - + gs_libGnomePrint->gnome_print_pango_layout( m_gpc, m_layout ); - + + int w,h; + pango_layout_get_pixel_size( m_layout, &w, &h ); + gs_libGnomePrint->gnome_print_grestore( m_gpc ); - + if (underlined) { // undo underline attributes setting: pango_layout_set_attributes(m_layout, NULL); } - CalcBoundingBox (x + w, y + h); + CalcBoundingBox(x, y); + CalcBoundingBox(x + w, y + h); } -void wxGnomePrintDC::Clear() +void wxGnomePrinterDCImpl::Clear() { } -void wxGnomePrintDC::SetFont( const wxFont& font ) +void wxGnomePrinterDCImpl::SetFont( const wxFont& font ) { m_font = font; @@ -1603,17 +1681,28 @@ void wxGnomePrintDC::SetFont( const wxFont& font ) m_fontdesc = pango_font_description_copy( m_font.GetNativeFontInfo()->description ); + float size = pango_font_description_get_size( m_fontdesc ); + size = size * GetFontPointSizeAdjustment(72.0); + pango_font_description_set_size( m_fontdesc, (gint)size ); + pango_layout_set_font_description( m_layout, m_fontdesc ); } } -void wxGnomePrintDC::SetPen( const wxPen& pen ) +void wxGnomePrinterDCImpl::SetPen( const wxPen& pen ) { if (!pen.Ok()) return; m_pen = pen; - gs_libGnomePrint->gnome_print_setlinewidth( m_gpc, XLOG2DEVREL( 1000 * m_pen.GetWidth() ) / 1000.0f ); + double width; + + if (m_pen.GetWidth() <= 0) + width = 0.1; + else + width = (double) m_pen.GetWidth(); + + gs_libGnomePrint->gnome_print_setlinewidth( m_gpc, width * DEV2PS * m_scaleX ); static const double dotted[] = {2.0, 5.0}; static const double short_dashed[] = {4.0, 4.0}; @@ -1622,11 +1711,11 @@ void wxGnomePrintDC::SetPen( const wxPen& pen ) switch (m_pen.GetStyle()) { - case wxDOT: gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, dotted, 0 ); break; - case wxSHORT_DASH: gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, short_dashed, 0 ); break; - case wxLONG_DASH: gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, wxCoord_dashed, 0 ); break; - case wxDOT_DASH: gs_libGnomePrint->gnome_print_setdash( m_gpc, 4, dotted_dashed, 0 ); break; - case wxUSER_DASH: + case wxPENSTYLE_DOT: gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, dotted, 0 ); break; + case wxPENSTYLE_SHORT_DASH: gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, short_dashed, 0 ); break; + case wxPENSTYLE_LONG_DASH: gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, wxCoord_dashed, 0 ); break; + case wxPENSTYLE_DOT_DASH: gs_libGnomePrint->gnome_print_setdash( m_gpc, 4, dotted_dashed, 0 ); break; + case wxPENSTYLE_USER_DASH: { // It may be noted that libgnomeprint between at least // versions 2.8.0 and 2.12.1 makes a copy of the dashes @@ -1642,8 +1731,8 @@ void wxGnomePrintDC::SetPen( const wxPen& pen ) g_free( g_dashes ); } break; - case wxSOLID: - case wxTRANSPARENT: + case wxPENSTYLE_SOLID: + case wxPENSTYLE_TRANSPARENT: default: gs_libGnomePrint->gnome_print_setdash( m_gpc, 0, NULL, 0 ); break; } @@ -1666,7 +1755,7 @@ void wxGnomePrintDC::SetPen( const wxPen& pen ) } } -void wxGnomePrintDC::SetBrush( const wxBrush& brush ) +void wxGnomePrinterDCImpl::SetBrush( const wxBrush& brush ) { if (!brush.Ok()) return; @@ -1705,20 +1794,28 @@ void wxGnomePrintDC::SetBrush( const wxBrush& brush ) } } -void wxGnomePrintDC::SetLogicalFunction( int function ) +void wxGnomePrinterDCImpl::SetLogicalFunction(wxRasterOperationMode WXUNUSED(function)) { } -void wxGnomePrintDC::SetBackground( const wxBrush& brush ) +void wxGnomePrinterDCImpl::SetBackground(const wxBrush& WXUNUSED(brush)) { } -void wxGnomePrintDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) +void wxGnomePrinterDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { +#if wxUSE_NEW_DC + m_clipping = TRUE; // TODO move somewhere else + m_clipX1 = x; + m_clipY1 = y; + m_clipX2 = x + width; + m_clipY2 = y + height; +#else wxDC::DoSetClippingRegion( x, y, width, height ); - +#endif + gs_libGnomePrint->gnome_print_gsave( m_gpc ); - + gs_libGnomePrint->gnome_print_newpath( m_gpc ); gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) ); gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) ); @@ -1728,12 +1825,16 @@ void wxGnomePrintDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wx gs_libGnomePrint->gnome_print_clip( m_gpc ); } -void wxGnomePrintDC::DestroyClippingRegion() +void wxGnomePrinterDCImpl::DestroyClippingRegion() { +#if wxUSE_NEW_DC + wxDCImpl::DestroyClippingRegion(); +#else wxDC::DestroyClippingRegion(); +#endif gs_libGnomePrint->gnome_print_grestore( m_gpc ); - + #if 0 // not needed, we set the values in each // drawing method anyways @@ -1743,27 +1844,27 @@ void wxGnomePrintDC::DestroyClippingRegion() #endif } -bool wxGnomePrintDC::StartDoc(const wxString& message) +bool wxGnomePrinterDCImpl::StartDoc(const wxString& WXUNUSED(message)) { return true; } -void wxGnomePrintDC::EndDoc() +void wxGnomePrinterDCImpl::EndDoc() { gs_libGnomePrint->gnome_print_end_doc( m_gpc ); } -void wxGnomePrintDC::StartPage() +void wxGnomePrinterDCImpl::StartPage() { gs_libGnomePrint->gnome_print_beginpage( m_gpc, (const guchar*) "page" ); } -void wxGnomePrintDC::EndPage() +void wxGnomePrinterDCImpl::EndPage() { gs_libGnomePrint->gnome_print_showpage( m_gpc ); } -wxCoord wxGnomePrintDC::GetCharHeight() const +wxCoord wxGnomePrinterDCImpl::GetCharHeight() const { pango_layout_set_text( m_layout, "H", 1 ); @@ -1773,7 +1874,7 @@ wxCoord wxGnomePrintDC::GetCharHeight() const return h; } -wxCoord wxGnomePrintDC::GetCharWidth() const +wxCoord wxGnomePrinterDCImpl::GetCharWidth() const { pango_layout_set_text( m_layout, "H", 1 ); @@ -1783,7 +1884,7 @@ wxCoord wxGnomePrintDC::GetCharWidth() const return w; } -void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height, +void wxGnomePrinterDCImpl::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height, wxCoord *descent, wxCoord *externalLeading, const wxFont *theFont ) const @@ -1804,33 +1905,26 @@ void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxC // Set layout's text - // FIXME-UTF8: wouldn't be needed if utf8_str() always returned a buffer -#if wxUSE_UNICODE_UTF8 - const char *dataUTF8 = string.utf8_str(); -#else - const wxCharBuffer dataUTF8 = string.utf8_str(); -#endif - - PangoFontDescription *desc = (theFont) ? theFont->GetNativeFontInfo()->description : m_fontdesc; + const wxScopedCharBuffer dataUTF8(string.utf8_str()); - gint oldSize = pango_font_description_get_size( desc ); - double size = oldSize; - size = size * m_scaleY; - pango_font_description_set_size( desc, (gint)size ); + gint oldSize = 0; + if ( theFont ) + { + // scale the font and apply it + PangoFontDescription *desc = theFont->GetNativeFontInfo()->description; + oldSize = pango_font_description_get_size(desc); + float size = oldSize * GetFontPointSizeAdjustment(72.0); + pango_font_description_set_size(desc, (gint)size); - // apply scaled font - pango_layout_set_font_description( m_layout, desc ); + pango_layout_set_font_description(m_layout, desc); + } pango_layout_set_text( m_layout, dataUTF8, strlen(dataUTF8) ); - int w, h; - pango_layout_get_pixel_size( m_layout, &w, &h ); - - - if (width) - *width = (wxCoord)(w / m_scaleX); - if (height) - *height = (wxCoord)(h / m_scaleY); + int h; + pango_layout_get_pixel_size( m_layout, width, &h ); + if ( height ) + *height = h; if (descent) { @@ -1840,14 +1934,17 @@ void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxC *descent = h - PANGO_PIXELS(baseline); } - // reset unscaled size - pango_font_description_set_size( desc, oldSize ); + if ( theFont ) + { + // restore font and reset font's size back + pango_layout_set_font_description(m_layout, m_fontdesc); - // reset unscaled font - pango_layout_set_font_description( m_layout, m_fontdesc ); + PangoFontDescription *desc = theFont->GetNativeFontInfo()->description; + pango_font_description_set_size(desc, oldSize); + } } -void wxGnomePrintDC::DoGetSize(int* width, int* height) const +void wxGnomePrinterDCImpl::DoGetSize(int* width, int* height) const { wxGnomePrintNativeData *native = (wxGnomePrintNativeData*) m_printData.GetNativeData(); @@ -1858,11 +1955,12 @@ void wxGnomePrintDC::DoGetSize(int* width, int* height) const if (width) *width = wxRound( pw * PS2DEV ); + if (height) *height = wxRound( ph * PS2DEV ); } -void wxGnomePrintDC::DoGetSizeMM(int *width, int *height) const +void wxGnomePrinterDCImpl::DoGetSizeMM(int *width, int *height) const { wxGnomePrintNativeData *native = (wxGnomePrintNativeData*) m_printData.GetNativeData(); @@ -1885,30 +1983,37 @@ void wxGnomePrintDC::DoGetSizeMM(int *width, int *height) const *height = (int) (ph + 0.5); } -wxSize wxGnomePrintDC::GetPPI() const +wxSize wxGnomePrinterDCImpl::GetPPI() const { return wxSize(DPI,DPI); } -void wxGnomePrintDC::SetPrintData(const wxPrintData& data) -{ +void wxGnomePrinterDCImpl::SetPrintData(const wxPrintData& data) +{ m_printData = data; - + int height; if (m_printData.GetOrientation() == wxPORTRAIT) - GetSize( NULL, &height ); + GetOwner()->GetSize( NULL, &height ); else - GetSize( &height, NULL ); + GetOwner()->GetSize( &height, NULL ); m_deviceLocalOriginY = height; } -void wxGnomePrintDC::SetResolution(int ppi) +// overridden for wxPrinterDC Impl + +int wxGnomePrinterDCImpl::GetResolution() const { + return DPI; } -int wxGnomePrintDC::GetResolution() +wxRect wxGnomePrinterDCImpl::GetPaperRect() const { - return DPI; + // GNOME print doesn't support printer margins + int w = 0; + int h = 0; + DoGetSize( &w, &h ); + return wxRect( 0, 0, w, h ); } // ---------------------------------------------------------------------------- @@ -1925,8 +2030,7 @@ bool wxGnomePrintModule::OnInit() void wxGnomePrintModule::OnExit() { - delete gs_libGnomePrint; - gs_libGnomePrint = NULL; + wxDELETE(gs_libGnomePrint); } IMPLEMENT_DYNAMIC_CLASS(wxGnomePrintModule, wxModule) @@ -1984,19 +2088,17 @@ void wxGnomePrintPreview::DetermineScaling() if (paper) { - wxSize ScreenPixels = wxGetDisplaySize(); - wxSize ScreenMM = wxGetDisplaySizeMM(); + m_previewPrintout->SetPPIScreen(wxGetDisplayPPI()); - m_previewPrintout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()), - (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) ); - m_previewPrintout->SetPPIPrinter(wxGnomePrintDC::GetResolution(), wxGnomePrintDC::GetResolution()); + int resolution = DPI; + m_previewPrintout->SetPPIPrinter( resolution, resolution ); wxSize sizeDevUnits(paper->GetSizeDeviceUnits()); - // TODO: get better resolution information from wxGnomePrintDC, if possible. + // TODO: get better resolution information from wxGnomePrinterDCImpl, if possible. - sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x * wxGnomePrintDC::GetResolution() / 72.0); - sizeDevUnits.y = (wxCoord)((float)sizeDevUnits.y * wxGnomePrintDC::GetResolution() / 72.0); + sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x * resolution / 72.0); + sizeDevUnits.y = (wxCoord)((float)sizeDevUnits.y * resolution / 72.0); wxSize sizeTenthsMM(paper->GetSize()); wxSize sizeMM(sizeTenthsMM.x / 10, sizeTenthsMM.y / 10); @@ -2017,9 +2119,10 @@ void wxGnomePrintPreview::DetermineScaling() m_previewPrintout->SetPaperRectPixels(wxRect(0, 0, m_pageWidth, m_pageHeight)); // At 100%, the page should look about page-size on the screen. - m_previewScaleX = (float)0.8 * 72.0 / (float)wxGnomePrintDC::GetResolution(); + m_previewScaleX = (double)0.8 * 72.0 / (double)resolution; m_previewScaleY = m_previewScaleX; } } -#endif // wxUSE_LIBGNOMEPRINT +#endif + // wxUSE_LIBGNOMEPRINT