X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/459dbfc0f1393b98cab2daca278b27b7f9a37849..2229243bdf17485b33c15786124ab99366b83975:/src/gtk/gnome/gprint.cpp diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp index 0e14a5ca39..672823aac5 100644 --- a/src/gtk/gnome/gprint.cpp +++ b/src/gtk/gnome/gprint.cpp @@ -15,10 +15,10 @@ #pragma hdrstop #endif -#include "wx/gtk/gnome/gprint.h" - #if wxUSE_LIBGNOMEPRINT +#include "wx/gtk/gnome/gprint.h" + #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/dcmemory.h" @@ -42,8 +42,8 @@ static const double RAD2DEG = 180.0 / M_PI; -#include "wx/html/forcelnk.h" -FORCE_LINK_ME(gnome_print) +#include "wx/link.h" +wxFORCE_LINK_THIS_MODULE(gnome_print) //---------------------------------------------------------------------------- // wxGnomePrintLibrary @@ -171,6 +171,8 @@ public: wxDL_METHOD_DEFINE( GtkWidget*, gnome_print_job_preview_new, (GnomePrintJob *gpm, const guchar *title), (gpm, title), NULL ) + + DECLARE_NO_COPY_CLASS(wxGnomePrintLibrary) }; wxGnomePrintLibrary::wxGnomePrintLibrary() @@ -715,7 +717,8 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) { gs_lgp->gnome_print_job_close( job ); g_object_unref (job); - sm_lastError = wxPRINTER_ERROR; + if (sm_lastError != wxPRINTER_CANCELLED) + sm_lastError = wxPRINTER_ERROR; return false; } @@ -732,9 +735,10 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) int w, h; dc->GetSize(&w, &h); printout->SetPageSizePixels((int)w, (int)h); - dc->GetSizeMM(&w, &h); - printout->SetPageSizeMM((int)w, (int)h); - + printout->SetPaperRectPixels(wxRect(0, 0, w, h)); + int mw, mh; + dc->GetSizeMM(&mw, &mh); + printout->SetPageSizeMM((int)mw, (int)mh); printout->OnPreparePrinting(); // Get some parameters from the printout, if defined @@ -845,6 +849,7 @@ wxGnomePrintDC::wxGnomePrintDC( wxGnomePrinter *printer ) m_layout = gs_lgp->gnome_print_pango_create_layout( m_gpc ); m_fontdesc = pango_font_description_from_string( "Sans 12" ); + m_context = NULL; m_currentRed = 0; m_currentBlue = 0; @@ -852,6 +857,8 @@ wxGnomePrintDC::wxGnomePrintDC( wxGnomePrinter *printer ) m_signX = 1; // default x-axis left to right m_signY = -1; // default y-axis bottom up -> top down + + GetSize( NULL, &m_deviceOffsetY ); } wxGnomePrintDC::wxGnomePrintDC( const wxPrintData& data ) @@ -868,13 +875,16 @@ wxGnomePrintDC::wxGnomePrintDC( const wxPrintData& data ) m_layout = gs_lgp->gnome_print_pango_create_layout( m_gpc ); m_fontdesc = pango_font_description_from_string( "Sans 12" ); + m_context = NULL; m_currentRed = 0; m_currentBlue = 0; m_currentGreen = 0; m_signX = 1; // default x-axis left to right - m_signY = -1; // default y-axis bottom up -> top down + m_signY = -1; // default y-axis bottom up -> top down + + GetSize( NULL, &m_deviceOffsetY ); } wxGnomePrintDC::~wxGnomePrintDC() @@ -947,25 +957,25 @@ void wxGnomePrintDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoo while (alpha2 > 360) alpha2 -= 360; } - if (m_brush.GetStyle() != wxTRANSPARENT) - { - SetBrush( m_brush ); - gs_lgp->gnome_print_moveto ( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc) ); - gs_lgp->gnome_print_arcto( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL((int)radius), alpha1, alpha2, 0 ); + if (m_brush.GetStyle() != wxTRANSPARENT) + { + SetBrush( m_brush ); + gs_lgp->gnome_print_moveto ( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc) ); + gs_lgp->gnome_print_arcto( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL((int)radius), alpha1, alpha2, 0 ); - gs_lgp->gnome_print_fill( m_gpc ); - } + gs_lgp->gnome_print_fill( m_gpc ); + } - if (m_pen.GetStyle() != wxTRANSPARENT) - { - SetPen (m_pen); - gs_lgp->gnome_print_newpath( m_gpc ); - gs_lgp->gnome_print_moveto ( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc) ); - gs_lgp->gnome_print_arcto( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL((int)radius), alpha1, alpha2, 0 ); - gs_lgp->gnome_print_closepath( m_gpc ); + if (m_pen.GetStyle() != wxTRANSPARENT) + { + SetPen (m_pen); + gs_lgp->gnome_print_newpath( m_gpc ); + gs_lgp->gnome_print_moveto ( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc) ); + gs_lgp->gnome_print_arcto( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL((int)radius), alpha1, alpha2, 0 ); + gs_lgp->gnome_print_closepath( m_gpc ); - gs_lgp->gnome_print_stroke( m_gpc ); - } + gs_lgp->gnome_print_stroke( m_gpc ); + } CalcBoundingBox (x1, y1); CalcBoundingBox (x2, y2); @@ -1667,8 +1677,6 @@ void wxGnomePrintDC::DestroyClippingRegion() bool wxGnomePrintDC::StartDoc(const wxString& message) { - SetDeviceOrigin( 0,0 ); - return true; } @@ -1780,7 +1788,6 @@ void wxGnomePrintDC::DoGetSize(int* width, int* height) const (wxGnomePrintNativeData*) m_printData.GetNativeData(); // Query page size. This seems to omit the margins - // right now, although it shouldn't double pw,ph; gs_lgp->gnome_print_job_get_page_size( native->GetPrintJob(), &pw, &ph ); @@ -1826,13 +1833,14 @@ void wxGnomePrintDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) ComputeScaleAndOrigin(); } -void wxGnomePrintDC::SetDeviceOrigin( wxCoord x, wxCoord y ) +void wxGnomePrintDC::SetLogicalOrigin( wxCoord x, wxCoord y ) { - int h = 0; - int w = 0; - GetSize( &w, &h ); + wxDC::SetLogicalOrigin( x, y ); +} - wxDC::SetDeviceOrigin( x, h-y ); +void wxGnomePrintDC::SetDeviceOrigin( wxCoord x, wxCoord y ) +{ + wxDC::SetDeviceOrigin( x, y ); } void wxGnomePrintDC::SetResolution(int ppi) @@ -1932,7 +1940,7 @@ void wxGnomePrintPreview::DetermineScaling() m_previewPrintout->SetPPIPrinter(wxGnomePrintDC::GetResolution(), wxGnomePrintDC::GetResolution()); wxSize sizeDevUnits(paper->GetSizeDeviceUnits()); - + // TODO: get better resolution information from wxGnomePrintDC, if possible. sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x * wxGnomePrintDC::GetResolution() / 72.0); @@ -1946,18 +1954,19 @@ void wxGnomePrintPreview::DetermineScaling() m_pageWidth = sizeDevUnits.y; m_pageHeight = sizeDevUnits.x; m_previewPrintout->SetPageSizeMM(sizeMM.y, sizeMM.x); - m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight); } else { m_pageWidth = sizeDevUnits.x; m_pageHeight = sizeDevUnits.y; m_previewPrintout->SetPageSizeMM(sizeMM.x, sizeMM.y); - m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight); } + m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight); + m_previewPrintout->SetPaperRectPixels(wxRect(0, 0, m_pageWidth, m_pageHeight)); // At 100%, the page should look about page-size on the screen. - m_previewScale = (float)0.8 * 72.0 / (float)wxGnomePrintDC::GetResolution(); + m_previewScaleX = (float)0.8 * 72.0 / (float)wxGnomePrintDC::GetResolution(); + m_previewScaleY = m_previewScaleX; } }