X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/389076f14811ac2c7ad5e3ffb3685b54e8f1944b..56b6cf265c5930dee9505aa5f2ed5c233f91bd23:/src/gtk/gnome/gprint.cpp?ds=sidebyside diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp index 4147a0ad04..2f93b67ba7 100644 --- a/src/gtk/gnome/gprint.cpp +++ b/src/gtk/gnome/gprint.cpp @@ -8,10 +8,6 @@ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "gprint.h" -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -25,11 +21,12 @@ #include "wx/math.h" #include "wx/fontutil.h" -#include "wx/printdlg.h" #include "wx/gtk/private.h" #include "wx/module.h" -#include "wx/generic/prntdlgg.h" #include "wx/dynlib.h" +#include "wx/dcmemory.h" +#include "wx/log.h" +#include "wx/icon.h" #include #include @@ -783,8 +780,13 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) gs_lgp->gnome_print_job_close( job ); if (m_native_preview) { - wxString title( _("Print preview") ); - gtk_widget_show( gs_lgp->gnome_print_job_preview_new( job, (const guchar*)(const char*)wxGTK_CONV(title) )); + const wxCharBuffer title(wxGTK_CONV_SYS(_("Print preview"))); + GtkWidget *preview = gs_lgp->gnome_print_job_preview_new + ( + job, + (const guchar *)title.data() + ); + gtk_widget_show(preview); } else { @@ -1158,30 +1160,59 @@ void wxGnomePrintDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, } } +void wxGnomePrintDC::makeEllipticalPath(wxCoord x, wxCoord y, + wxCoord width, wxCoord height) +{ + double r = 4 * (sqrt (2) - 1) / 3; + double halfW = 0.5 * width, + halfH = 0.5 * height, + halfWR = r * halfW, + halfHR = r * halfH; + wxCoord halfWI = (wxCoord) halfW, + halfHI = (wxCoord) halfH; + + gs_lgp->gnome_print_newpath( m_gpc ); + + // Approximate an ellipse using four cubic splines, clockwise from 0 deg */ + gs_lgp->gnome_print_moveto( m_gpc, + XLOG2DEV(x + width), + YLOG2DEV(y + halfHI) ); + gs_lgp->gnome_print_curveto( m_gpc, + XLOG2DEV(x + width), + YLOG2DEV(y + (wxCoord) rint (halfH + halfHR)), + XLOG2DEV(x + (wxCoord) rint(halfW + halfWR)), + YLOG2DEV(y + height), + XLOG2DEV(x + halfWI), + YLOG2DEV(y + height) ); + gs_lgp->gnome_print_curveto( m_gpc, + XLOG2DEV(x + (wxCoord) rint(halfW - halfWR)), + YLOG2DEV(y + height), + XLOG2DEV(x), + YLOG2DEV(y + (wxCoord) rint (halfH + halfHR)), + XLOG2DEV(x), YLOG2DEV(y+halfHI) ); + gs_lgp->gnome_print_curveto( m_gpc, + XLOG2DEV(x), + YLOG2DEV(y + (wxCoord) rint (halfH - halfHR)), + XLOG2DEV(x + (wxCoord) rint (halfW - halfWR)), + YLOG2DEV(y), + XLOG2DEV(x+halfWI), YLOG2DEV(y) ); + gs_lgp->gnome_print_curveto( m_gpc, + XLOG2DEV(x + (wxCoord) rint(halfW + halfWR)), + YLOG2DEV(y), + XLOG2DEV(x + width), + YLOG2DEV(y + (wxCoord) rint(halfH - halfHR)), + XLOG2DEV(x + width), YLOG2DEV(y + halfHI) ); + + gs_lgp->gnome_print_closepath(m_gpc); +} + void wxGnomePrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { if (m_brush.GetStyle () != wxTRANSPARENT) { SetBrush( m_brush ); - - gs_lgp->gnome_print_newpath( m_gpc ); - gs_lgp->gnome_print_moveto( m_gpc, - XLOG2DEV(x), YLOG2DEV(y+height/2) ); - - // start with top half - gs_lgp->gnome_print_curveto( m_gpc, - XLOG2DEV(x), YLOG2DEV(y), - XLOG2DEV(x+width), YLOG2DEV(y), - XLOG2DEV(x+width), YLOG2DEV(y+height/2) ); - // lower half - gs_lgp->gnome_print_curveto( m_gpc, - XLOG2DEV(x+width), YLOG2DEV(y+height), - XLOG2DEV(x), YLOG2DEV(y+height), - XLOG2DEV(x), YLOG2DEV(y+height/2) ); - - gs_lgp->gnome_print_closepath( m_gpc ); + makeEllipticalPath( x, y, width, height ); gs_lgp->gnome_print_fill( m_gpc ); - CalcBoundingBox( x, y ); CalcBoundingBox( x + width, y + height ); } @@ -1189,25 +1220,8 @@ void wxGnomePrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord if (m_pen.GetStyle () != wxTRANSPARENT) { SetPen (m_pen); - - gs_lgp->gnome_print_newpath( m_gpc ); - gs_lgp->gnome_print_moveto( m_gpc, - XLOG2DEV(x), YLOG2DEV(y+height/2) ); - - // start with top half - gs_lgp->gnome_print_curveto( m_gpc, - XLOG2DEV(x), YLOG2DEV(y), - XLOG2DEV(x+width), YLOG2DEV(y), - XLOG2DEV(x+width), YLOG2DEV(y+height/2) ); - // lower half - gs_lgp->gnome_print_curveto( m_gpc, - XLOG2DEV(x+width), YLOG2DEV(y+height), - XLOG2DEV(x), YLOG2DEV(y+height), - XLOG2DEV(x), YLOG2DEV(y+height/2) ); - - gs_lgp->gnome_print_closepath( m_gpc ); + makeEllipticalPath( x, y, width, height ); gs_lgp->gnome_print_stroke( m_gpc ); - CalcBoundingBox( x, y ); CalcBoundingBox( x + width, y + height ); } @@ -1520,6 +1534,22 @@ void wxGnomePrintDC::SetPen( const wxPen& pen ) case wxSHORT_DASH: gs_lgp->gnome_print_setdash( m_gpc, 2, short_dashed, 0 ); break; case wxLONG_DASH: gs_lgp->gnome_print_setdash( m_gpc, 2, wxCoord_dashed, 0 ); break; case wxDOT_DASH: gs_lgp->gnome_print_setdash( m_gpc, 4, dotted_dashed, 0 ); break; + case wxUSER_DASH: + { + // It may be noted that libgnomeprint between at least + // versions 2.8.0 and 2.12.1 makes a copy of the dashes + // and then leak the memory since it doesn't set the + // internal flag "privatedash" to 0. + wxDash *wx_dashes; + int num = m_pen.GetDashes (&wx_dashes); + gdouble *g_dashes = g_new( gdouble, num ); + int i; + for (i = 0; i < num; ++i) + g_dashes[i] = (gdouble) wx_dashes[i]; + gs_lgp -> gnome_print_setdash( m_gpc, num, g_dashes, 0); + g_free( g_dashes ); + } + break; case wxSOLID: case wxTRANSPARENT: default: gs_lgp->gnome_print_setdash( m_gpc, 0, NULL, 0 ); break;