/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/print.cpp
+// Name: src/gtk/print.cpp
// Author: Anthony Bretaudeau
// Purpose: GTK printing support
// Created: 2007-08-25
#endif
#include "wx/fontutil.h"
-#include "wx/gtk/private.h"
#include "wx/dynlib.h"
#include "wx/paper.h"
#include <gtk/gtk.h>
+
+#if GTK_CHECK_VERSION(2,14,0)
+#include <gtk/gtkunixprint.h>
+#else
#include <gtk/gtkpagesetupunixdialog.h>
+#endif
+
#if wxUSE_GRAPHICS_CONTEXT
#include "wx/graphics.h"
#include "wx/gtk/private/object.h"
-// Usefull to convert angles from/to Rad to/from Deg.
+// Useful to convert angles from/to Rad to/from Deg.
static const double RAD2DEG = 180.0 / M_PI;
static const double DEG2RAD = M_PI / 180.0;
{
#if wxUSE_LIBGNOMEPRINT
// This module must be initialized AFTER gnomeprint's one
- AddDependency(CLASSINFO(wxGnomePrintModule));
+ AddDependency(wxCLASSINFO(wxGnomePrintModule));
#endif
}
bool OnInit();
bool wxGtkPrintModule::OnInit()
{
+#ifndef __WXGTK3__
if (gtk_check_version(2,10,0) == NULL)
+#endif
+ {
wxPrintFactory::SetPrintFactory( new wxGtkPrintFactory );
+ }
return true;
}
// This is called even if we actually don't want the dialog to appear.
int wxGtkPrintDialog::ShowModal()
{
- GtkPrintOperationResult response;
-
// We need to restore the settings given in the constructor.
wxPrintData data = m_printDialogData.GetPrintData();
wxGtkPrintNativeData *native =
// Show the dialog if needed.
GError* gError = NULL;
- if (GetShowDialog())
- response = gtk_print_operation_run (printOp, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, GTK_WINDOW(gtk_widget_get_toplevel(m_parent->m_widget) ), &gError);
- else
- response = gtk_print_operation_run (printOp, GTK_PRINT_OPERATION_ACTION_PRINT, GTK_WINDOW(gtk_widget_get_toplevel(m_parent->m_widget)), &gError);
+ GtkPrintOperationResult response = gtk_print_operation_run
+ (
+ printOp,
+ GetShowDialog()
+ ? GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG
+ : GTK_PRINT_OPERATION_ACTION_PRINT,
+ m_parent
+ ? GTK_WINDOW(gtk_widget_get_toplevel(m_parent->m_widget))
+ : NULL,
+ &gError
+ );
// Does everything went well?
if (response == GTK_PRINT_OPERATION_RESULT_CANCEL)
}
else if (response == GTK_PRINT_OPERATION_RESULT_ERROR)
{
+ wxLogError(_("Error while printing: ") + wxString(gError ? gError->message : "???"));
g_error_free (gError);
- wxLogError(_("Error while printing: ") + wxString::Format(_("%s"), gError->message));
return wxID_NO; // We use wxID_NO because there is no wxID_ERROR available
}
title = _("Page Setup");
GtkWidget *
dlg = gtk_page_setup_unix_dialog_new(title.utf8_str(),
- GTK_WINDOW(m_parent->m_widget));
+ m_parent
+ ? GTK_WINDOW(m_parent->m_widget)
+ : NULL);
gtk_page_setup_unix_dialog_set_print_settings(
GTK_PAGE_SETUP_UNIX_DIALOG(dlg), nativeData);
y = wxCoord(YLOG2DEV(y));
int bw = bitmap.GetWidth();
int bh = bitmap.GetHeight();
+#ifndef __WXGTK3__
wxBitmap bmpSource = bitmap; // we need a non-const instance.
if (!useMask && !bitmap.HasPixbuf() && bitmap.GetMask())
bmpSource.SetMask(NULL);
+#endif
cairo_save(m_cairo);
wxDouble scaleY = (wxDouble) YLOG2DEVREL(bh) / (wxDouble) bh;
cairo_scale(m_cairo, scaleX, scaleY);
+#ifdef __WXGTK3__
+ bitmap.Draw(m_cairo, 0, 0, useMask, &m_textForegroundColour, &m_textBackgroundColour);
+#else
gdk_cairo_set_source_pixbuf(m_cairo, bmpSource.GetPixbuf(), 0, 0);
cairo_pattern_set_filter(cairo_get_source(m_cairo), CAIRO_FILTER_NEAREST);
// Use the original size here since the context is scaled already.
cairo_rectangle(m_cairo, 0, 0, bw, bh);
// Fill the rectangle using the pattern.
cairo_fill(m_cairo);
+#endif
CalcBoundingBox(0,0);
CalcBoundingBox(bw,bh);
angle = -angle;
- bool underlined = m_font.Ok() && m_font.GetUnderlined();
-
const wxScopedCharBuffer data = text.utf8_str();
- size_t datalen = strlen(data);
- pango_layout_set_text( m_layout, data, datalen);
+ pango_layout_set_text(m_layout, data, data.length());
- 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);
- }
-
- if (m_textForegroundColour.Ok())
+ const bool setAttrs = m_font.GTKSetPangoAttrs(m_layout);
+ if (m_textForegroundColour.IsOk())
{
unsigned char red = m_textForegroundColour.Red();
unsigned char blue = m_textForegroundColour.Blue();
cairo_restore( m_cairo );
- if (underlined)
+ if (setAttrs)
{
// Undo underline attributes setting
pango_layout_set_attributes(m_layout, NULL);
{
m_font = font;
- if (m_font.Ok())
+ if (m_font.IsOk())
{
if (m_fontdesc)
pango_font_description_free( m_fontdesc );
void wxGtkPrinterDCImpl::SetPen( const wxPen& pen )
{
- if (!pen.Ok()) return;
+ if (!pen.IsOk()) return;
m_pen = pen;
void wxGtkPrinterDCImpl::SetBrush( const wxBrush& brush )
{
- if (!brush.Ok()) return;
+ if (!brush.IsOk()) return;
m_brush = brush;
{
// scale the font and apply it
PangoFontDescription *desc = theFont->GetNativeFontInfo()->description;
- float size = pango_font_description_get_size(desc);
- size = size * GetFontPointSizeAdjustment(72.0);
+ oldSize = pango_font_description_get_size(desc);
+ const float size = oldSize * GetFontPointSizeAdjustment(72.0);
pango_font_description_set_size(desc, (gint)size);
pango_layout_set_font_description(m_layout, desc);
m_printData = data;
}
-// overriden for wxPrinterDC Impl
+// overridden for wxPrinterDC Impl
wxRect wxGtkPrinterDCImpl::GetPaperRect() const
{
projects / wxWidgets.git / blobdiff