#include "wx/math.h"
#include "wx/image.h"
#include "wx/module.h"
+#include "wx/crt.h"
#endif
#include "wx/fontutil.h"
class wxGtkPrintModule: public wxModule
{
public:
- wxGtkPrintModule()
+ wxGtkPrintModule()
{
#if wxUSE_LIBGNOMEPRINT
// This module must be initialized AFTER gnomeprint's one
gs_cairo = wxCairoLibrary::Get();
if (gs_cairo && gtk_check_version(2,10,0) == NULL)
wxPrintFactory::SetPrintFactory( new wxGtkPrintFactory );
-
return true;
}
//----------------------------------------------------------------------------
// We use it to pass useful objets to gtk printing callback functions.
-typedef struct
+struct wxPrinterToGtkData
{
wxGtkPrinter * printer;
wxPrintout * printout;
-}
-wxPrinterToGtkData;
+};
extern "C"
{
GtkPageSetup* wxGtkPrintNativeData::GetPageSetupFromSettings(GtkPrintSettings* settings)
{
GtkPageSetup* page_setup = gtk_page_setup_new();
- gtk_page_setup_set_orientation (page_setup, gtk_print_settings_get_orientation (settings));
+ gtk_page_setup_set_orientation (page_setup, gtk_print_settings_get_orientation (settings));
- GtkPaperSize *paper_size = gtk_print_settings_get_paper_size (settings);
- if (paper_size != NULL)
- gtk_page_setup_set_paper_size_and_default_margins (page_setup, paper_size);
+ GtkPaperSize *paper_size = gtk_print_settings_get_paper_size (settings);
+ if (paper_size != NULL)
+ gtk_page_setup_set_paper_size_and_default_margins (page_setup, paper_size);
return page_setup;
}
void wxGtkPrintNativeData::SetPageSetupToSettings(GtkPrintSettings* settings, GtkPageSetup* page_setup)
{
gtk_print_settings_set_orientation ( settings, gtk_page_setup_get_orientation (page_setup));
- gtk_print_settings_set_paper_size ( settings, gtk_page_setup_get_paper_size (page_setup));
+ gtk_print_settings_set_paper_size ( settings, gtk_page_setup_get_paper_size (page_setup));
}
//----------------------------------------------------------------------------
// If the settings are OK, we restore it.
if (settings != NULL)
gtk_print_operation_set_print_settings (native->GetPrintJob(), settings);
- gtk_print_operation_set_default_page_setup (native->GetPrintJob(), native->GetPageSetupFromSettings(settings));
+ gtk_print_operation_set_default_page_setup (native->GetPrintJob(), native->GetPageSetupFromSettings(settings));
// Show the dialog if needed.
GError* gError = NULL;
case GTK_PRINT_PAGES_CURRENT:
m_printDialogData.SetSelection( true );
break;
- case GTK_PRINT_PAGES_ALL:
- m_printDialogData.SetAllPages( true );
- m_printDialogData.SetFromPage( 0 );
- m_printDialogData.SetToPage( 9999 );
- break;
case GTK_PRINT_PAGES_RANGES:
- default:
- // wxWidgets doesn't support multiple ranges, so we can only save the first one even if the user wants to print others.
+ {// wxWidgets doesn't support multiple ranges, so we can only save the first one even if the user wants to print others.
// For example, the user enters "1-3;5-7" in the dialog: pages 1-3 and 5-7 will be correctly printed when the user
// will hit "OK" button. However we can only save 1-3 in the print data.
gint num_ranges = 0;
GtkPageRange* range;
range = gtk_print_settings_get_page_ranges (newSettings, &num_ranges);
- m_printDialogData.SetFromPage( range[0].start );
- m_printDialogData.SetToPage( range[0].end );
+ if (num_ranges >= 1)
+ {
+ m_printDialogData.SetFromPage( range[0].start );
+ m_printDialogData.SetToPage( range[0].end );
+ }
+ else {
+ m_printDialogData.SetAllPages( true );
+ m_printDialogData.SetFromPage( 0 );
+ m_printDialogData.SetToPage( 9999 );
+ }
+ break;}
+ case GTK_PRINT_PAGES_ALL:
+ default:
+ m_printDialogData.SetAllPages( true );
+ m_printDialogData.SetFromPage( 0 );
+ m_printDialogData.SetToPage( 9999 );
break;
}
GtkPageRange* range;
range = gtk_print_settings_get_page_ranges (settings, &num_ranges);
// We don't need to verify these values as it has already been done in wxGtkPrinter::BeginPrint.
- startPage = range[0].start + 1;
- endPage = range[0].end + 1;
+ if (num_ranges >= 1)
+ {
+ startPage = range[0].start + 1;
+ endPage = range[0].end + 1;
+ }
+ else {
+ startPage = minPage;
+ endPage = maxPage;
+ }
break;}
case GTK_PRINT_PAGES_ALL:
default:
// RR: what does this do?
m_resolution = m_printData.GetQuality(); // (int) gtk_print_context_get_dpi_x( m_gpc );
- if (m_resolution < 0)
+ if (m_resolution < 0)
m_resolution = (1 << (m_resolution+4)) *150;
wxPrintf( "resolution %d\n", m_resolution );
-
+
m_PS2DEV = (double)m_resolution / 72.0;
m_DEV2PS = 72.0 / (double)m_resolution;
-
+
m_context = gtk_print_context_create_pango_context( m_gpc );
m_layout = gtk_print_context_create_pango_layout ( m_gpc );
m_fontdesc = pango_font_description_from_string( "Sans 12" );
m_signX = 1; // default x-axis left to right.
m_signY = 1; // default y-axis bottom up -> top down.
+
+ // By default the origine of cairo contexte is in the upper left corner of the printable area.
+ // We need to translate it so that it is in the upper left corner of the paper (i.e. doesn't care about margins)
+ GtkPageSetup *setup = gtk_print_context_get_page_setup( m_gpc );
+ gdouble ml, mt;
+ ml = gtk_page_setup_get_left_margin (setup, GTK_UNIT_POINTS);
+ mt = gtk_page_setup_get_top_margin (setup, GTK_UNIT_POINTS);
+ gs_cairo->cairo_translate(m_cairo, -ml, -mt);
}
wxGtkPrintDC::~wxGtkPrintDC()
// Create a pattern with the gradient.
cairo_pattern_t* gradient;
- gradient = gs_cairo->cairo_pattern_create_radial (XLOG2DEV(xC+xR), YLOG2DEVREL(yC+yR), 0, XLOG2DEV(xC+xR), YLOG2DEVREL(yC+yR), radius * m_DEV2PS );
+ gradient = gs_cairo->cairo_pattern_create_radial (XLOG2DEV(xC+xR), YLOG2DEV(yC+yR), 0, XLOG2DEV(xC+xR), YLOG2DEV(yC+yR), radius * m_DEV2PS );
gs_cairo->cairo_pattern_add_color_stop_rgba (gradient, 0.0, redIPS, greenIPS, blueIPS, alphaIPS);
gs_cairo->cairo_pattern_add_color_stop_rgba (gradient, 1.0, redDPS, greenDPS, blueDPS, alphaDPS);
// Fill the rectangle with this pattern.
gs_cairo->cairo_set_source(m_cairo, gradient);
- gs_cairo->cairo_rectangle (m_cairo, XLOG2DEV(xR), YLOG2DEVREL(yR), XLOG2DEVREL(w), YLOG2DEVREL(h) );
+ gs_cairo->cairo_rectangle (m_cairo, XLOG2DEV(xR), YLOG2DEV(yR), XLOG2DEVREL(w), YLOG2DEVREL(h) );
gs_cairo->cairo_fill(m_cairo);
gs_cairo->cairo_pattern_destroy(gradient);
// Create a pattern with the gradient.
cairo_pattern_t* gradient;
- gradient = gs_cairo->cairo_pattern_create_linear (XLOG2DEVREL(x), YLOG2DEVREL(y), XLOG2DEVREL(x+w), YLOG2DEVREL(y));
+ gradient = gs_cairo->cairo_pattern_create_linear (XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x+w), YLOG2DEV(y));
if (nDirection == wxWEST)
{
// Fill the rectangle with this pattern.
gs_cairo->cairo_set_source(m_cairo, gradient);
- gs_cairo->cairo_rectangle (m_cairo, XLOG2DEVREL(x), YLOG2DEVREL(y), XLOG2DEVREL(w), YLOG2DEVREL(h) );
+ gs_cairo->cairo_rectangle (m_cairo, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEVREL(w), YLOG2DEVREL(h) );
gs_cairo->cairo_fill(m_cairo);
gs_cairo->cairo_pattern_destroy(gradient);
if (m_pen.GetStyle() == wxTRANSPARENT) return;
SetPen( m_pen );
- gs_cairo->cairo_move_to ( m_cairo, XLOG2DEVREL(x1), YLOG2DEVREL(y1) );
- gs_cairo->cairo_line_to ( m_cairo, XLOG2DEVREL(x2), YLOG2DEVREL(y2) );
+ gs_cairo->cairo_move_to ( m_cairo, XLOG2DEV(x1), YLOG2DEV(y1) );
+ gs_cairo->cairo_line_to ( m_cairo, XLOG2DEV(x2), YLOG2DEV(y2) );
gs_cairo->cairo_stroke ( m_cairo );
CalcBoundingBox( x1, y1 );
SetPen(m_pen);
- gs_cairo->cairo_move_to (m_cairo, XLOG2DEVREL(x), 0);
- gs_cairo->cairo_line_to (m_cairo, XLOG2DEVREL(x), h * m_DEV2PS);
- gs_cairo->cairo_move_to (m_cairo, 0, YLOG2DEVREL(y));
- gs_cairo->cairo_line_to (m_cairo, w * m_DEV2PS, YLOG2DEVREL(y));
+ gs_cairo->cairo_move_to (m_cairo, XLOG2DEV(x), 0);
+ gs_cairo->cairo_line_to (m_cairo, XLOG2DEV(x), YLOG2DEVREL(h));
+ gs_cairo->cairo_move_to (m_cairo, 0, YLOG2DEV(y));
+ gs_cairo->cairo_line_to (m_cairo, XLOG2DEVREL(w), YLOG2DEV(y));
gs_cairo->cairo_stroke (m_cairo);
CalcBoundingBox( 0, 0 );
alpha1 *= DEG2RAD;
alpha2 *= DEG2RAD;
- gs_cairo->cairo_arc_negative ( m_cairo, XLOG2DEVREL(xc), YLOG2DEVREL(yc), XLOG2DEVREL((int)radius), alpha1, alpha2);
- gs_cairo->cairo_line_to(m_cairo, XLOG2DEVREL(xc), YLOG2DEVREL(yc));
+ gs_cairo->cairo_new_path(m_cairo);
+
+ gs_cairo->cairo_arc_negative ( m_cairo, XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL((int)radius), alpha1, alpha2);
+ gs_cairo->cairo_line_to(m_cairo, XLOG2DEV(xc), YLOG2DEV(yc));
gs_cairo->cairo_close_path (m_cairo);
SetBrush( m_brush );
{
gs_cairo->cairo_save( m_cairo );
- gs_cairo->cairo_translate( m_cairo, XLOG2DEVREL((wxCoord) (x + w / 2.)), XLOG2DEVREL((wxCoord) (y + h / 2.)) );
+ gs_cairo->cairo_new_path(m_cairo);
+
+ gs_cairo->cairo_translate( m_cairo, XLOG2DEV((wxCoord) (x + w / 2.)), XLOG2DEV((wxCoord) (y + h / 2.)) );
double scale = (double)YLOG2DEVREL(h) / (double) XLOG2DEVREL(w);
gs_cairo->cairo_scale( m_cairo, 1.0, scale );
SetPen( m_pen );
- gs_cairo->cairo_move_to ( m_cairo, XLOG2DEVREL(x), YLOG2DEVREL(y) );
- gs_cairo->cairo_line_to ( m_cairo, XLOG2DEVREL(x), YLOG2DEVREL(y) );
+ gs_cairo->cairo_move_to ( m_cairo, XLOG2DEV(x), YLOG2DEV(y) );
+ gs_cairo->cairo_line_to ( m_cairo, XLOG2DEV(x), YLOG2DEV(y) );
gs_cairo->cairo_stroke ( m_cairo );
CalcBoundingBox( x, y );
for ( i =0; i<n ; i++ )
CalcBoundingBox( points[i].x+xoffset, points[i].y+yoffset);
- gs_cairo->cairo_move_to ( m_cairo, XLOG2DEVREL(points[0].x+xoffset), YLOG2DEVREL(points[0].y+yoffset) );
+ gs_cairo->cairo_move_to ( m_cairo, XLOG2DEV(points[0].x+xoffset), YLOG2DEV(points[0].y+yoffset) );
for (i = 1; i < n; i++)
- gs_cairo->cairo_line_to ( m_cairo, XLOG2DEVREL(points[i].x+xoffset), YLOG2DEVREL(points[i].y+yoffset) );
+ gs_cairo->cairo_line_to ( m_cairo, XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset) );
gs_cairo->cairo_stroke ( m_cairo);
}
int x = points[0].x + xoffset;
int y = points[0].y + yoffset;
gs_cairo->cairo_new_path(m_cairo);
- gs_cairo->cairo_move_to( m_cairo, XLOG2DEVREL(x), YLOG2DEVREL(y) );
+ gs_cairo->cairo_move_to( m_cairo, 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_cairo->cairo_line_to( m_cairo, XLOG2DEVREL(x), YLOG2DEVREL(y) );
+ gs_cairo->cairo_line_to( m_cairo, XLOG2DEV(x), YLOG2DEV(y) );
}
gs_cairo->cairo_close_path(m_cairo);
void wxGtkPrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
- gs_cairo->cairo_rectangle ( m_cairo, XLOG2DEVREL(x), YLOG2DEVREL(y), XLOG2DEVREL(width), YLOG2DEVREL(height));
+ gs_cairo->cairo_new_path(m_cairo);
+ gs_cairo->cairo_rectangle ( m_cairo, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEVREL(width), YLOG2DEVREL(height));
SetBrush( m_brush );
gs_cairo->cairo_fill_preserve( m_cairo );
wxCoord rad = (wxCoord) radius;
gs_cairo->cairo_new_path(m_cairo);
- gs_cairo->cairo_move_to(m_cairo,XLOG2DEVREL(x + rad),YLOG2DEVREL(y));
+ gs_cairo->cairo_move_to(m_cairo,XLOG2DEV(x + rad),YLOG2DEV(y));
gs_cairo->cairo_curve_to(m_cairo,
- XLOG2DEVREL(x + rad),YLOG2DEVREL(y),
- XLOG2DEVREL(x),YLOG2DEVREL(y),
- XLOG2DEVREL(x),YLOG2DEVREL(y + rad));
- gs_cairo->cairo_line_to(m_cairo,XLOG2DEVREL(x),YLOG2DEVREL(y + height - rad));
+ XLOG2DEV(x + rad),YLOG2DEV(y),
+ XLOG2DEV(x),YLOG2DEV(y),
+ XLOG2DEV(x),YLOG2DEV(y + rad));
+ gs_cairo->cairo_line_to(m_cairo,XLOG2DEV(x),YLOG2DEV(y + height - rad));
gs_cairo->cairo_curve_to(m_cairo,
- XLOG2DEVREL(x),YLOG2DEVREL(y + height - rad),
- XLOG2DEVREL(x),YLOG2DEVREL(y + height),
- XLOG2DEVREL(x + rad),YLOG2DEVREL(y + height));
- gs_cairo->cairo_line_to(m_cairo,XLOG2DEVREL(x + width - rad),YLOG2DEVREL(y + height));
+ XLOG2DEV(x),YLOG2DEV(y + height - rad),
+ XLOG2DEV(x),YLOG2DEV(y + height),
+ XLOG2DEV(x + rad),YLOG2DEV(y + height));
+ gs_cairo->cairo_line_to(m_cairo,XLOG2DEV(x + width - rad),YLOG2DEV(y + height));
gs_cairo->cairo_curve_to(m_cairo,
- XLOG2DEVREL(x + width - rad),YLOG2DEVREL(y + height),
- XLOG2DEVREL(x + width),YLOG2DEVREL(y + height),
- XLOG2DEVREL(x + width),YLOG2DEVREL(y + height - rad));
- gs_cairo->cairo_line_to(m_cairo,XLOG2DEVREL(x + width),YLOG2DEVREL(y + rad));
+ XLOG2DEV(x + width - rad),YLOG2DEV(y + height),
+ XLOG2DEV(x + width),YLOG2DEV(y + height),
+ XLOG2DEV(x + width),YLOG2DEV(y + height - rad));
+ gs_cairo->cairo_line_to(m_cairo,XLOG2DEV(x + width),YLOG2DEV(y + rad));
gs_cairo->cairo_curve_to(m_cairo,
- XLOG2DEVREL(x + width),YLOG2DEVREL(y + rad),
- XLOG2DEVREL(x + width),YLOG2DEVREL(y),
- XLOG2DEVREL(x + width - rad),YLOG2DEVREL(y));
- gs_cairo->cairo_line_to(m_cairo,XLOG2DEVREL(x + rad),YLOG2DEVREL(y));
+ XLOG2DEV(x + width),YLOG2DEV(y + rad),
+ XLOG2DEV(x + width),YLOG2DEV(y),
+ XLOG2DEV(x + width - rad),YLOG2DEV(y));
+ gs_cairo->cairo_line_to(m_cairo,XLOG2DEV(x + rad),YLOG2DEV(y));
gs_cairo->cairo_close_path(m_cairo);
SetBrush(m_brush);
{
gs_cairo->cairo_save (m_cairo);
- gs_cairo->cairo_translate (m_cairo, XLOG2DEVREL((wxCoord) (x + width / 2.)), YLOG2DEVREL((wxCoord) (y + height / 2.)));
+ gs_cairo->cairo_new_path(m_cairo);
+
+ gs_cairo->cairo_translate (m_cairo, XLOG2DEV((wxCoord) (x + width / 2.)), YLOG2DEV((wxCoord) (y + height / 2.)));
gs_cairo->cairo_scale(m_cairo, 1, (double)YLOG2DEVREL(height)/(double)XLOG2DEVREL(width));
gs_cairo->cairo_arc ( m_cairo, 0, 0, XLOG2DEVREL(width/2), 0, 2 * M_PI);
(double)(y1 + d) / 2;
gs_cairo->cairo_new_path( m_cairo );
- gs_cairo->cairo_move_to( m_cairo, XLOG2DEVREL((wxCoord)x1), YLOG2DEVREL((wxCoord)y1) );
- gs_cairo->cairo_line_to( m_cairo, XLOG2DEVREL((wxCoord)x3), YLOG2DEVREL((wxCoord)y3) );
+ gs_cairo->cairo_move_to( m_cairo, XLOG2DEV((wxCoord)x1), YLOG2DEV((wxCoord)y1) );
+ gs_cairo->cairo_line_to( m_cairo, XLOG2DEV((wxCoord)x3), YLOG2DEV((wxCoord)y3) );
CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );
y3 = (double)(y2 + d) / 2;
gs_cairo->cairo_curve_to(m_cairo,
- XLOG2DEVREL((wxCoord)x1), YLOG2DEVREL((wxCoord)y1),
- XLOG2DEVREL((wxCoord)x2), YLOG2DEVREL((wxCoord)y2),
- XLOG2DEVREL((wxCoord)x3), YLOG2DEVREL((wxCoord)y3) );
+ 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_cairo->cairo_line_to ( m_cairo, XLOG2DEVREL((wxCoord)c), YLOG2DEVREL((wxCoord)d) );
+ gs_cairo->cairo_line_to ( m_cairo, XLOG2DEV((wxCoord)c), YLOG2DEV((wxCoord)d) );
gs_cairo->cairo_stroke( m_cairo );
}
wxCHECK_RET( bitmap.IsOk(), wxT("Invalid bitmap in wxGtkPrintDC::DoDrawBitmap"));
cairo_surface_t* surface;
- x = wxCoord(XLOG2DEVREL(x));
- y = wxCoord(YLOG2DEVREL(y));
+ x = wxCoord(XLOG2DEV(x));
+ y = wxCoord(YLOG2DEV(y));
int bw = bitmap.GetWidth();
int bh = bitmap.GetHeight();
wxBitmap bmpSource = bitmap; // we need a non-const instance.
// blue. The 32-bit quantities are stored native-endian.
// Pre-multiplied alpha is used.
unsigned char alpha = p.Alpha();
+
+ if (!bmpSource.HasAlpha() && mask)
+ alpha = 255;
+
if (alpha == 0)
*data = 0;
else
- *data = ( alpha/255 << 24
+ *data = ( alpha << 24
| (p.Red() * alpha/255) << 16
| (p.Green() * alpha/255) << 8
| (p.Blue() * alpha/255) );
gs_cairo->cairo_save(m_cairo);
- // In case we're scaling the image by using a width and height different
- // than the bitmap's size create a pattern transformation on the surface and
- // draw the transformed pattern.
- cairo_pattern_t* pattern = gs_cairo->cairo_pattern_create_for_surface(surface);
// Prepare to draw the image.
gs_cairo->cairo_translate(m_cairo, x, y);
+
+ // Scale the image
+ cairo_filter_t filter = CAIRO_FILTER_BILINEAR;
+ cairo_pattern_t* pattern = cairo_pattern_create_for_surface(surface);
+ cairo_pattern_set_filter(pattern,filter);
+ wxDouble scaleX = (wxDouble) XLOG2DEVREL(bw) / (wxDouble) bw;
+ wxDouble scaleY = (wxDouble) YLOG2DEVREL(bh) / (wxDouble) bh;
+ cairo_scale(m_cairo, scaleX, scaleY);
+
gs_cairo->cairo_set_source(m_cairo, pattern);
// Use the original size here since the context is scaled already.
gs_cairo->cairo_rectangle(m_cairo, 0, 0, bw, bh);
}
}
-
- // TODO: steal scale implementation from GNOME print
+ int w,h;
+
+ // Scale font description.
+ gint oldSize = pango_font_description_get_size( m_fontdesc );
+ double size = oldSize;
+ size = size * m_scaleX;
+ pango_font_description_set_size( m_fontdesc, (gint)size );
+
+ // Actually apply scaled font.
+ pango_layout_set_font_description( m_layout, m_fontdesc );
- int w,h;
- pango_layout_get_pixel_size( m_layout, &w, &h ); // cairo units
+ pango_layout_get_pixel_size( m_layout, &w, &h );
if ( m_backgroundMode == wxSOLID )
{
// Draw layout.
gs_cairo->cairo_move_to (m_cairo, xx, yy);
-
+
gs_cairo->cairo_save( m_cairo );
-
- gs_cairo->cairo_scale( m_cairo, m_scaleX, m_scaleY );
-
+
if (fabs(angle) > 0.00001)
gs_cairo->cairo_rotate( m_cairo, angle*DEG2RAD );
-
+
gs_cairo->pango_cairo_update_layout (m_cairo, m_layout);
gs_cairo->pango_cairo_show_layout (m_cairo, m_layout);
-
+
gs_cairo->cairo_restore( m_cairo );
if (underlined)
// Undo underline attributes setting
pango_layout_set_attributes(m_layout, NULL);
}
-
+
+ // Reset unscaled size.
+ pango_font_description_set_size( m_fontdesc, oldSize );
+
+ // Actually apply unscaled font.
+ pango_layout_set_font_description( m_layout, m_fontdesc );
+
// Back to device units:
CalcBoundingBox (x, y);
CalcBoundingBox (x + w, y + h);
m_fontdesc = pango_font_description_copy( m_font.GetNativeFontInfo()->description ); // m_fontdesc is now set to device units
// Scale font description from device units to pango units
- gint oldSize = pango_font_description_get_size( m_fontdesc );
+ gint oldSize = pango_font_description_get_size( m_fontdesc );
double size = oldSize *m_DEV2PS; // scale to cairo units
pango_font_description_set_size( m_fontdesc, (gint)size ); // apply to description
double width = (double) m_pen.GetWidth();
if (width == 0) width = 0.1;
- gs_cairo->cairo_set_line_width( m_cairo, XLOG2DEVREL( (wxCoord)((1000.0 * (double)width ) / 1000.0)) );
+ gs_cairo->cairo_set_line_width( m_cairo, (width * m_PS2DEV) / m_scaleX );
static const double dotted[] = {2.0, 5.0};
static const double short_dashed[] = {4.0, 4.0};
static const double long_dashed[] = {4.0, 8.0};
switch (m_pen.GetStyle())
{
- case wxDOT: gs_cairo->cairo_set_dash( m_cairo, dotted, 1, 0 ); break;
- case wxSHORT_DASH: gs_cairo->cairo_set_dash( m_cairo, short_dashed, 1, 0 ); break;
- case wxLONG_DASH: gs_cairo->cairo_set_dash( m_cairo, long_dashed, 1, 0 ); break;
- case wxDOT_DASH: gs_cairo->cairo_set_dash( m_cairo, dotted_dashed, 3, 0 ); break;
+ case wxDOT: gs_cairo->cairo_set_dash( m_cairo, dotted, 2, 0 ); break;
+ case wxSHORT_DASH: gs_cairo->cairo_set_dash( m_cairo, short_dashed, 2, 0 ); break;
+ case wxLONG_DASH: gs_cairo->cairo_set_dash( m_cairo, long_dashed, 2, 0 ); break;
+ case wxDOT_DASH: gs_cairo->cairo_set_dash( m_cairo, dotted_dashed, 4, 0 ); break;
case wxUSER_DASH:
{
wxDash *wx_dashes;
- int num = m_pen.GetDashes (&wx_dashes) - 1;
+ int num = m_pen.GetDashes (&wx_dashes);
gdouble *g_dashes = g_new( gdouble, num );
int i;
for (i = 0; i < num; ++i)
void wxGtkPrintDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
- gs_cairo->cairo_rectangle ( m_cairo, XLOG2DEVREL(x), YLOG2DEVREL(y), XLOG2DEVREL(width), YLOG2DEVREL(height));
+ gs_cairo->cairo_rectangle ( m_cairo, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEVREL(width), YLOG2DEVREL(height));
gs_cairo->cairo_clip(m_cairo);
}
*width = wxRound( (double)w / m_scaleX * m_PS2DEV );
if (height)
*height = wxRound( (double)h / m_scaleY * m_PS2DEV );
-
+
if (descent)
{
PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
m_previewPrintout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
(int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
-
+
// TODO !!!!!!!!!!!!!!!
int resolution = 600;
m_previewPrintout->SetPPIPrinter( resolution, resolution );
-
+
// Get width and height in points (1/72th of an inch)
wxSize sizeDevUnits(paper->GetSizeDeviceUnits());
projects / wxWidgets.git / blobdiff