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()
m_printDialogData.SetNoCopies( copies );
m_printDialogData.SetCollate( collate );
- switch (gs_libGnomePrint->gnome_print_dialog_get_range( (GnomePrintDialog*) m_widget ))
+ // Cast needed to avoid warnings because the gnome_print_dialog_get_range()
+ // is declared as returning a wrong enum type.
+ switch ( static_cast<int>( gs_libGnomePrint->gnome_print_dialog_get_range( (GnomePrintDialog*) m_widget )))
{
case GNOME_PRINT_RANGE_SELECTION:
m_printDialogData.SetSelection( true );
native->SetPrintJob( job );
- printout->SetIsPreview(false);
-
if (m_printDialogData.GetMinPage() < 1)
m_printDialogData.SetMinPage(1);
if (m_printDialogData.GetMaxPage() < 1)
dc = new wxGnomePrinterDC( printdata ); // TODO: check that this works
#endif
- if (m_native_preview)
- printout->SetIsPreview(true);
-
if (!dc)
{
gs_libGnomePrint->gnome_print_job_close( job );
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->SetPPIScreen(wxGetDisplayPPI());
printout->SetPPIPrinter( dc->GetResolution(),
dc->GetResolution() );
wxGnomePrinterDCImpl::DoFloodFill(wxCoord WXUNUSED(x1),
wxCoord WXUNUSED(y1),
const wxColour& WXUNUSED(col),
- int WXUNUSED(style))
+ wxFloodFillStyle WXUNUSED(style))
{
return false;
}
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 );
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) );
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 );
xx = 0.0;
yy = 0.0;
- if (m_brush.GetStyle () != wxTRANSPARENT)
+ if ( m_brush.IsNonTransparent() )
{
SetBrush( m_brush );
gs_libGnomePrint->gnome_print_fill( m_gpc );
}
- if (m_pen.GetStyle () != wxTRANSPARENT)
+ if ( m_pen.IsNonTransparent() )
{
SetPen (m_pen);
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;
void wxGnomePrinterDCImpl::DoDrawPolygon(int n, wxPoint points[],
wxCoord xoffset, wxCoord yoffset,
- int WXUNUSED(fillStyle))
+ wxPolygonFillMode WXUNUSED(fillStyle))
{
if (n==0) return;
- if (m_brush.GetStyle () != wxTRANSPARENT)
+ if ( m_brush.IsNonTransparent() )
{
SetBrush( m_brush );
gs_libGnomePrint->gnome_print_fill( m_gpc );
}
- if (m_pen.GetStyle () != wxTRANSPARENT)
+ if ( m_pen.IsNonTransparent() )
{
SetPen (m_pen);
}
}
-void wxGnomePrinterDCImpl::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 );
width--;
height--;
- if (m_brush.GetStyle () != wxTRANSPARENT)
+ if ( m_brush.IsNonTransparent() )
{
SetBrush( m_brush );
CalcBoundingBox( x + width, y + height );
}
- if (m_pen.GetStyle () != wxTRANSPARENT)
+ if ( m_pen.IsNonTransparent() )
{
SetPen (m_pen);
wxCoord rad = wxRound( radius );
- if (m_brush.GetStyle() != wxTRANSPARENT)
+ if ( m_brush.IsNonTransparent() )
{
SetBrush(m_brush);
gs_libGnomePrint->gnome_print_newpath(m_gpc);
CalcBoundingBox(x+width,y+height);
}
- if (m_pen.GetStyle() != wxTRANSPARENT)
+ if ( m_pen.IsNonTransparent() )
{
SetPen(m_pen);
gs_libGnomePrint->gnome_print_newpath(m_gpc);
width--;
height--;
- if (m_brush.GetStyle () != wxTRANSPARENT)
+ if ( m_brush.IsNonTransparent() )
{
SetBrush( m_brush );
makeEllipticalPath( x, y, width, height );
CalcBoundingBox( x + width, y + height );
}
- if (m_pen.GetStyle () != wxTRANSPARENT)
+ if ( m_pen.IsNonTransparent() )
{
SetPen (m_pen);
makeEllipticalPath( x, y, width, height );
wxCoord width, wxCoord height,
wxDC *source,
wxCoord xsrc, wxCoord ysrc,
- int rop,
+ wxRasterOperationMode rop,
bool WXUNUSED(useMask),
wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask))
{
wxCoord x, wxCoord y,
bool WXUNUSED(useMask))
{
- if (!bitmap.Ok()) return;
+ if (!bitmap.IsOk()) return;
if (bitmap.HasPixbuf())
{
{
wxImage image = bitmap.ConvertToImage();
- if (!image.Ok()) return;
+ if (!image.IsOk()) return;
gs_libGnomePrint->gnome_print_gsave( m_gpc );
double matrix[6];
double xx = XLOG2DEV(x);
double yy = YLOG2DEV(y);
- bool underlined = m_font.Ok() && m_font.GetUnderlined();
+ const wxScopedCharBuffer data(text.utf8_str());
- // 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
-
- size_t datalen = strlen(data);
- pango_layout_set_text( m_layout, data, datalen);
-
- if (underlined)
- {
- PangoAttrList *attrs = pango_attr_list_new();
- PangoAttribute *a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
- a->start_index = 0;
- a->end_index = datalen;
- pango_attr_list_insert(attrs, a);
- pango_layout_set_attributes(m_layout, attrs);
- pango_attr_list_unref(attrs);
- }
+ pango_layout_set_text(m_layout, data, data.length());
+ const bool setAttrs = m_font.GTKSetPangoAttrs(m_layout);
- if (m_textForegroundColour.Ok())
+ if (m_textForegroundColour.IsOk())
{
unsigned char red = m_textForegroundColour.Red();
unsigned char blue = m_textForegroundColour.Blue();
}
}
- int w,h;
- pango_layout_get_pixel_size( m_layout, &w, &h );
#if 0
if ( m_backgroundMode == wxSOLID )
{
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)
+ if (setAttrs)
{
// 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 wxGnomePrinterDCImpl::Clear()
{
m_font = font;
- if (m_font.Ok())
+ if (m_font.IsOk())
{
if (m_fontdesc)
pango_font_description_free( m_fontdesc );
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 wxGnomePrinterDCImpl::SetPen( const wxPen& pen )
{
- if (!pen.Ok()) return;
+ if (!pen.IsOk()) return;
m_pen = 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
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;
}
void wxGnomePrinterDCImpl::SetBrush( const wxBrush& brush )
{
- if (!brush.Ok()) return;
+ if (!brush.IsOk()) return;
m_brush = brush;
}
}
-void wxGnomePrinterDCImpl::SetLogicalFunction(int WXUNUSED(function))
+void wxGnomePrinterDCImpl::SetLogicalFunction(wxRasterOperationMode WXUNUSED(function))
{
}
// 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
+ const wxScopedCharBuffer dataUTF8(string.utf8_str());
- PangoFontDescription *desc = (theFont) ? theFont->GetNativeFontInfo()->description : m_fontdesc;
-
- 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)
{
*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 wxGnomePrinterDCImpl::DoGetSize(int* width, int* height) const
// overridden for wxPrinterDC Impl
-int wxGnomePrinterDCImpl::GetResolution()
+int wxGnomePrinterDCImpl::GetResolution() const
{
return DPI;
}
-wxRect wxGnomePrinterDCImpl::GetPaperRect()
+wxRect wxGnomePrinterDCImpl::GetPaperRect() const
{
// GNOME print doesn't support printer margins
int w = 0;
void wxGnomePrintModule::OnExit()
{
- delete gs_libGnomePrint;
- gs_libGnomePrint = NULL;
+ wxDELETE(gs_libGnomePrint);
}
IMPLEMENT_DYNAMIC_CLASS(wxGnomePrintModule, wxModule)
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()) );
-
int resolution = DPI;
m_previewPrintout->SetPPIPrinter( resolution, resolution );
projects / wxWidgets.git / blobdiff