X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45b776d4529cd8055492a7b732a17ad5b87cdccd..772c017b2c30f5cb8072d7b22f39da175e101e9a:/src/generic/dcpsg.cpp diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp index 4fac5ff954..fd36a5b783 100644 --- a/src/generic/dcpsg.cpp +++ b/src/generic/dcpsg.cpp @@ -21,12 +21,13 @@ #endif #ifndef WX_PRECOMP - #include "wx/setup.h" - #include "wx/defs.h" #endif // WX_PRECOMP +#if wxUSE_PRINTING_ARCHITECTURE + #if wxUSE_POSTSCRIPT +#include "wx/window.h" #include "wx/dcmemory.h" #include "wx/utils.h" #include "wx/intl.h" @@ -36,11 +37,14 @@ #include "wx/image.h" #include "wx/log.h" #include "wx/generic/dcpsg.h" -#include "wx/generic/prntdlgg.h" +#include "wx/printdlg.h" #include "wx/button.h" #include "wx/stattext.h" #include "wx/radiobox.h" #include "wx/textctrl.h" +#include "wx/prntbase.h" +#include "wx/paper.h" +#include "wx/filefn.h" #include @@ -64,11 +68,6 @@ #endif -#ifdef __WXGTK__ -#include "gtk/gtk.h" -#include "gdk/gdk.h" -#endif - //----------------------------------------------------------------------------- // start and end of document/page //----------------------------------------------------------------------------- @@ -133,34 +132,34 @@ static const char *wxPostScriptHeaderSpline = "\ "; static const char *wxPostScriptHeaderColourImage = "\ -% define 'colorimage' if it isn't defined\n\ -% ('colortogray' and 'mergeprocs' come from xwd2ps\n\ -% via xgrab)\n\ -/colorimage where % do we know about 'colorimage'?\n\ - { pop } % yes: pop off the 'dict' returned\n\ - { % no: define one\n\ - /colortogray { % define an RGB->I function\n\ - /rgbdata exch store % call input 'rgbdata'\n\ +%% define 'colorimage' if it isn't defined\n\ +%% ('colortogray' and 'mergeprocs' come from xwd2ps\n\ +%% via xgrab)\n\ +/colorimage where %% do we know about 'colorimage'?\n\ + { pop } %% yes: pop off the 'dict' returned\n\ + { %% no: define one\n\ + /colortogray { %% define an RGB->I function\n\ + /rgbdata exch store %% call input 'rgbdata'\n\ rgbdata length 3 idiv\n\ /npixls exch store\n\ /rgbindx 0 store\n\ 0 1 npixls 1 sub {\n\ grays exch\n\ - rgbdata rgbindx get 20 mul % Red\n\ - rgbdata rgbindx 1 add get 32 mul % Green\n\ - rgbdata rgbindx 2 add get 12 mul % Blue\n\ - add add 64 idiv % I = .5G + .31R + .18B\n\ + rgbdata rgbindx get 20 mul %% Red\n\ + rgbdata rgbindx 1 add get 32 mul %% Green\n\ + rgbdata rgbindx 2 add get 12 mul %% Blue\n\ + add add 64 idiv %% I = .5G + .31R + .18B\n\ put\n\ /rgbindx rgbindx 3 add store\n\ } for\n\ grays 0 npixls getinterval\n\ } bind def\n\ \n\ - % Utility procedure for colorimage operator.\n\ - % This procedure takes two procedures off the\n\ - % stack and merges them into a single procedure.\n\ + %% Utility procedure for colorimage operator.\n\ + %% This procedure takes two procedures off the\n\ + %% stack and merges them into a single procedure.\n\ \n\ - /mergeprocs { % def\n\ + /mergeprocs { %% def\n\ dup length\n\ 3 -1 roll\n\ dup\n\ @@ -179,12 +178,12 @@ static const char *wxPostScriptHeaderColourImage = "\ putinterval\n\ } bind def\n\ \n\ - /colorimage { % def\n\ - pop pop % remove 'false 3' operands\n\ + /colorimage { %% def\n\ + pop pop %% remove 'false 3' operands\n\ {colortogray} mergeprocs\n\ image\n\ } bind def\n\ - } ifelse % end of 'false' case\n\ + } ifelse %% end of 'false' case\n\ "; static char wxPostScriptHeaderReencodeISO1[] = @@ -232,37 +231,57 @@ static char wxPostScriptHeaderReencodeISO2[] = // wxPostScriptDC //------------------------------------------------------------------------------- +float wxPostScriptDC::ms_PSScaleFactor = 10.0; + +void wxPostScriptDC::SetResolution(int ppi) +{ + ms_PSScaleFactor = (float)ppi / 72.0; +} + +int wxPostScriptDC::GetResolution() +{ + return (int)(ms_PSScaleFactor * 72.0); +} + + + wxPostScriptDC::wxPostScriptDC () { - m_pstream = (ofstream*) NULL; - + m_pstream = (FILE*) NULL; + m_currentRed = 0; m_currentGreen = 0; m_currentBlue = 0; - + m_pageNumber = 0; - + m_clipping = FALSE; - + m_underlinePosition = 0.0; m_underlineThickness = 0.0; m_signX = 1; // default x-axis left to right m_signY = -1; // default y-axis bottom up -> top down + + // Compatibility only + // HH: Doesn't seem to work for wxMSW... + #ifndef __WXMSW__ + m_printData = * wxThePrintSetupData; + #endif } wxPostScriptDC::wxPostScriptDC (const wxString& file, bool interactive, wxWindow *parent) { - m_pstream = (ofstream*) NULL; - + m_pstream = (FILE*) NULL; + m_currentRed = 0; m_currentGreen = 0; m_currentBlue = 0; - + m_pageNumber = 0; - + m_clipping = FALSE; - + m_underlinePosition = 0.0; m_underlineThickness = 0.0; @@ -277,11 +296,11 @@ bool wxPostScriptDC::Create(const wxString& file, bool interactive, wxWindow *pa m_isInteractive = interactive; m_title = ""; - m_filename = file; + m_printData.SetFilename(file); #ifdef __WXMSW__ // Can only send to file in Windows - wxThePrintSetupData->SetPrinterMode(PS_FILE); + m_printData.SetPrintMode(wxPRINT_MODE_FILE); #endif if (m_isInteractive) @@ -292,216 +311,250 @@ bool wxPostScriptDC::Create(const wxString& file, bool interactive, wxWindow *pa { m_ok = TRUE; } - + return m_ok; } +wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData) +{ + m_pstream = (FILE*) NULL; + + m_currentRed = 0; + m_currentGreen = 0; + m_currentBlue = 0; + + m_pageNumber = 0; + + m_clipping = FALSE; + + m_underlinePosition = 0.0; + m_underlineThickness = 0.0; + + m_signX = 1; // default x-axis left to right + m_signY = -1; // default y-axis bottom up -> top down + + m_printData = printData; + + m_ok = TRUE; +} + wxPostScriptDC::~wxPostScriptDC () { - if (m_pstream) delete m_pstream; + if (m_pstream) + { + fclose( m_pstream ); + m_pstream = (FILE*) NULL; + } } bool wxPostScriptDC::Ok() const { return m_ok; } - + +// This dialog is deprecated now: use wxGenericPrintDialog or the printing framework bool wxPostScriptDC::PrinterDialog(wxWindow *parent) { - wxPostScriptPrintDialog dialog( parent, _("Printer Settings"), wxPoint(150, 150), wxSize(400, 400), + wxPostScriptPrintDialog dialog( parent, _("Printer Settings"), wxPoint(150, 150), wxSize(400, 400), wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL ); m_ok = (dialog.ShowModal () == wxID_OK); if (!m_ok) return FALSE; - if ((m_filename == "") && - (wxThePrintSetupData->GetPrinterMode() == PS_PREVIEW || - wxThePrintSetupData->GetPrinterMode() == PS_PRINTER)) + if ((m_printData.GetFilename() == "") && + (m_printData.GetPrintMode() == wxPRINT_MODE_PREVIEW || + m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER)) { // steve, 05.09.94 #ifdef __VMS__ - wxThePrintSetupData->SetPrinterFile("preview"); + m_printData.SetFilename("preview"); #else // For PS_PRINTER action this depends on a Unix-style print spooler // since the wx_printer_file can be destroyed during a session // @@@ TODO: a Windows-style answer for non-Unix - char userId[256]; + wxChar userId[256]; wxGetUserId (userId, sizeof (userId) / sizeof (char)); - char tmp[256]; - strcpy (tmp, "/tmp/preview_"); - strcat (tmp, userId); - wxThePrintSetupData->SetPrinterFile(tmp); + wxChar tmp[256]; + wxStrcpy (tmp, wxT("/tmp/preview_")); + wxStrcat (tmp, userId); + m_printData.SetFilename(tmp); #endif - char tmp2[256]; - strcpy(tmp2, wxThePrintSetupData->GetPrinterFile()); - strcat (tmp2, ".ps"); - wxThePrintSetupData->SetPrinterFile(tmp2); - m_filename = tmp2; + wxChar tmp2[256]; + wxStrcpy(tmp2, m_printData.GetFilename()); + wxStrcat (tmp2, wxT(".ps")); + m_printData.SetFilename(tmp2); } - else if ((m_filename == "") && (wxThePrintSetupData->GetPrinterMode() == PS_FILE)) + else if ((m_printData.GetFilename() == wxT("")) && (m_printData.GetPrintMode() == wxPRINT_MODE_FILE)) { - wxString file = wxSaveFileSelector (_("PostScript"), "ps"); + wxString file = wxSaveFileSelector (_("PostScript"), wxT("ps")); if ( file.IsEmpty() ) { m_ok = FALSE; return FALSE; } - wxThePrintSetupData->SetPrinterFile(file); - m_filename = file; + m_printData.SetFilename(file); m_ok = TRUE; } return m_ok; } -void wxPostScriptDC::SetClippingRegion (long x, long y, long w, long h) +void wxPostScriptDC::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoord h) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); - - if (m_clipping) return; + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + + if (m_clipping) DestroyClippingRegion(); + + wxDC::DoSetClippingRegion(x, y, w, h); - wxDC::SetClippingRegion( x, y, w, h ); - m_clipping = TRUE; - *m_pstream << "gsave\n" - << "newpath\n" - << XLOG2DEV(x) << " " << YLOG2DEV(y) << " moveto\n" - << XLOG2DEV(x+w) << " " << YLOG2DEV(y) << " lineto\n" - << XLOG2DEV(x+w) << " " << YLOG2DEV(y+h) << " lineto\n" - << XLOG2DEV(x) << " " << YLOG2DEV(y+h) << " lineto\n" - << "closepath clip newpath\n"; + fprintf( m_pstream, + "gsave\n newpath\n" + "%d %d moveto\n" + "%d %d lineto\n" + "%d %d lineto\n" + "%d %d lineto\n" + "closepath clip newpath\n", + LogicalToDeviceX(x), LogicalToDeviceY(y), + LogicalToDeviceX(x+w), LogicalToDeviceY(y), + LogicalToDeviceX(x+w), LogicalToDeviceY(y+h), + LogicalToDeviceX(x), LogicalToDeviceY(y+h) ); } -void wxPostScriptDC::SetClippingRegion( const wxRegion &WXUNUSED(region) ) -{ -} void wxPostScriptDC::DestroyClippingRegion() { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); - - wxDC::DestroyClippingRegion(); - + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + if (m_clipping) { m_clipping = FALSE; - *m_pstream << "grestore\n"; + fprintf( m_pstream, "grestore\n" ); } + + wxDC::DestroyClippingRegion(); } void wxPostScriptDC::Clear() { - wxFAIL_MSG( "wxPostScriptDC::Clear not implemented." ); + wxFAIL_MSG( wxT("wxPostScriptDC::Clear not implemented.") ); } -void wxPostScriptDC::FloodFill (long WXUNUSED(x), long WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style)) +void wxPostScriptDC::DoFloodFill (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style)) { - wxFAIL_MSG( "wxPostScriptDC::FloodFill not implemented." ); + wxFAIL_MSG( wxT("wxPostScriptDC::FloodFill not implemented.") ); } -bool wxPostScriptDC::GetPixel (long WXUNUSED(x), long WXUNUSED(y), wxColour * WXUNUSED(col)) const +bool wxPostScriptDC::DoGetPixel (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxColour * WXUNUSED(col)) const { - wxFAIL_MSG( "wxPostScriptDC::GetPixel not implemented." ); + wxFAIL_MSG( wxT("wxPostScriptDC::GetPixel not implemented.") ); return FALSE; } -void wxPostScriptDC::CrossHair (long WXUNUSED(x), long WXUNUSED(y)) +void wxPostScriptDC::DoCrossHair (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) { - wxFAIL_MSG( "wxPostScriptDC::CrossHair not implemented." ); + wxFAIL_MSG( wxT("wxPostScriptDC::CrossHair not implemented.") ); } -void wxPostScriptDC::DrawLine (long x1, long y1, long x2, long y2) +void wxPostScriptDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); - + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + if (m_pen.GetStyle() == wxTRANSPARENT) return; - + SetPen( m_pen ); - - *m_pstream << "newpath\n" - << XLOG2DEV(x1) << " " << YLOG2DEV (y1) << " moveto\n" - << XLOG2DEV(x2) << " " << YLOG2DEV (y2) << " lineto\n" - << "stroke\n"; - + + fprintf( m_pstream, + "newpath\n" + "%d %d moveto\n" + "%d %d lineto\n" + "stroke\n", + LogicalToDeviceX(x1), LogicalToDeviceY(y1), + LogicalToDeviceX(x2), LogicalToDeviceY (y2) ); + CalcBoundingBox( x1, y1 ); CalcBoundingBox( x2, y2 ); } #define RAD2DEG 57.29577951308 -void wxPostScriptDC::DrawArc (long x1, long y1, long x2, long y2, long xc, long yc) +void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); - - long dx = x1 - xc; - long dy = y1 - yc; - long radius = (long) sqrt(dx*dx+dy*dy); + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + + wxCoord dx = x1 - xc; + wxCoord dy = y1 - yc; + wxCoord radius = (wxCoord) sqrt( (double)(dx*dx+dy*dy) ); double alpha1, alpha2; - if (x1 == x2 && y1 == y2) + if (x1 == x2 && y1 == y2) { - alpha1 = 0.0; - alpha2 = 360.0; - } else if (radius == 0.0) + alpha1 = 0.0; + alpha2 = 360.0; + } + else if (radius == 0.0) { - alpha1 = alpha2 = 0.0; - } else + alpha1 = alpha2 = 0.0; + } + else { - alpha1 = (x1 - xc == 0) ? - (y1 - yc < 0) ? 90.0 : -90.0 : - -atan2(double(y1-yc), double(x1-xc)) * RAD2DEG; - alpha2 = (x2 - xc == 0) ? - (y2 - yc < 0) ? 90.0 : -90.0 : - -atan2(double(y2-yc), double(x2-xc)) * RAD2DEG; + alpha1 = (x1 - xc == 0) ? + (y1 - yc < 0) ? 90.0 : -90.0 : + -atan2(double(y1-yc), double(x1-xc)) * RAD2DEG; + alpha2 = (x2 - xc == 0) ? + (y2 - yc < 0) ? 90.0 : -90.0 : + -atan2(double(y2-yc), double(x2-xc)) * RAD2DEG; } while (alpha1 <= 0) alpha1 += 360; while (alpha2 <= 0) alpha2 += 360; // adjust angles to be between while (alpha1 > 360) alpha1 -= 360; // 0 and 360 degree while (alpha2 > 360) alpha2 -= 360; - if (m_brush.GetStyle() != wxTRANSPARENT) + if (m_brush.GetStyle() != wxTRANSPARENT) { - SetBrush( m_brush ); - *m_pstream << "newpath\n" - << XLOG2DEV(xc) << " " - << YLOG2DEV(yc) << " " - << XLOG2DEVREL(radius) << " " - << YLOG2DEVREL(radius) << " " - << alpha1 << " " - << alpha2 << " ellipse\n" - << XLOG2DEV(xc) << " " - << YLOG2DEV(yc) << " lineto\n" - << "closepath\n" - << "fill\n"; + SetBrush( m_brush ); + + fprintf( m_pstream, + "newpath\n" + "%d %d %d %d %d %d ellipse\n" + "%d %d lineto\n" + "closepath\n" + "fill\n", + LogicalToDeviceX(xc), LogicalToDeviceY(yc), LogicalToDeviceXRel(radius), LogicalToDeviceYRel(radius), (wxCoord)alpha1, (wxCoord) alpha2, + LogicalToDeviceX(xc), LogicalToDeviceY(yc) ); + + CalcBoundingBox( xc-radius, yc-radius ); + CalcBoundingBox( xc+radius, yc+radius ); } - - if (m_pen.GetStyle() != wxTRANSPARENT) + + if (m_pen.GetStyle() != wxTRANSPARENT) { - SetPen( m_pen ); - *m_pstream << "newpath\n" - << XLOG2DEV(xc) << " " - << YLOG2DEV(yc) << " " - << XLOG2DEVREL(radius) << " " - << YLOG2DEVREL(radius) << " " - << alpha1 << " " - << alpha2 << " ellipse\n" - << "stroke\n"; + SetPen( m_pen ); + + fprintf( m_pstream, + "newpath\n" + "%d %d %d %d %d %d ellipse\n" + "%d %d lineto\n" + "stroke\n" + "fill\n", + LogicalToDeviceX(xc), LogicalToDeviceY(yc), LogicalToDeviceXRel(radius), LogicalToDeviceYRel(radius), (wxCoord)alpha1, (wxCoord) alpha2, + LogicalToDeviceX(xc), LogicalToDeviceY(yc) ); + + CalcBoundingBox( xc-radius, yc-radius ); + CalcBoundingBox( xc+radius, yc+radius ); } - - CalcBoundingBox( xc-radius, yc-radius ); - CalcBoundingBox( xc+radius, yc+radius ); } -void wxPostScriptDC::DrawEllipticArc(long x,long y,long w,long h,double sa,double ea) +void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); - + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + if (sa>=360 || sa<=-360) sa=sa-int(sa/360)*360; if (ea>=360 || ea<=-360) ea=ea-int(ea/360)*360; if (sa<0) sa+=360; if (ea<0) ea+=360; - + if (sa==ea) { DrawEllipse(x,y,w,h); @@ -512,166 +565,190 @@ void wxPostScriptDC::DrawEllipticArc(long x,long y,long w,long h,double sa,doubl { SetBrush( m_brush ); - *m_pstream << "newpath\n" - << XLOG2DEV(x+w/2) << " " << YLOG2DEV(y+h/2) << " " - << XLOG2DEVREL(w/2) << " " << YLOG2DEVREL(h/2) << " " - << int(sa) <<" "<< int(ea) << " true ellipticarc\n"; + fprintf( m_pstream, + "newpath\n" + "%d %d %d %d %d %d true ellipticarc\n", + LogicalToDeviceX(x+w/2), LogicalToDeviceY(y+h/2), LogicalToDeviceXRel(w/2), LogicalToDeviceYRel(h/2), (wxCoord)sa, (wxCoord)ea ); CalcBoundingBox( x ,y ); CalcBoundingBox( x+w, y+h ); } - + if (m_pen.GetStyle () != wxTRANSPARENT) { SetPen( m_pen ); - *m_pstream << "newpath\n" - << XLOG2DEV(x+w/2) << " " << YLOG2DEV(y+h/2) << " " - << XLOG2DEVREL(w/2) << " " << XLOG2DEVREL(h/2) << " " - << int(sa) <<" "<< int(ea) << " false ellipticarc\n"; + fprintf(m_pstream, + "newpath\n" + "%d %d %d %d %d %d false ellipticarc\n", + LogicalToDeviceX(x+w/2), LogicalToDeviceY(y+h/2), LogicalToDeviceXRel(w/2), LogicalToDeviceYRel(h/2), (wxCoord)sa, (wxCoord)ea ); - CalcBoundingBox( x, y ); + CalcBoundingBox( x ,y ); CalcBoundingBox( x+w, y+h ); } } -void wxPostScriptDC::DrawPoint (long x, long y) +void wxPostScriptDC::DoDrawPoint (wxCoord x, wxCoord y) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); - + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + if (m_pen.GetStyle() == wxTRANSPARENT) return; - + SetPen (m_pen); - - *m_pstream << "newpath\n" - << XLOG2DEV(x) << " " << YLOG2DEV (y) << " moveto\n" - << XLOG2DEV(x+1) << " " << YLOG2DEV (y) << " lineto\n" - << "stroke\n"; - + + fprintf( m_pstream, + "newpath\n" + "%d %d moveto\n" + "%d %d lineto\n" + "stroke\n", + LogicalToDeviceX(x), LogicalToDeviceY(y), + LogicalToDeviceX(x+1), LogicalToDeviceY(y) ); + CalcBoundingBox( x, y ); } -void wxPostScriptDC::DrawPolygon (int n, wxPoint points[], long xoffset, long yoffset, int WXUNUSED(fillStyle)) +void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int WXUNUSED(fillStyle)) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); - + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + if (n <= 0) return; - + if (m_brush.GetStyle () != wxTRANSPARENT) { - SetBrush( m_brush ); - - *m_pstream << "newpath\n"; + SetBrush( m_brush ); - long xx = XLOG2DEV(points[0].x + xoffset); - long yy = YLOG2DEV(points[0].y + yoffset); - *m_pstream << xx << " " << yy << " moveto\n"; - CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset ); + fprintf( m_pstream, "newpath\n" ); - for (int i = 1; i < n; i++) - { - xx = XLOG2DEV(points[i].x + xoffset); - yy = YLOG2DEV(points[i].y + yoffset); - *m_pstream << xx << " " << yy << " lineto\n"; - CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset); - } - *m_pstream << "fill\n"; + wxCoord xx = LogicalToDeviceX(points[0].x + xoffset); + wxCoord yy = LogicalToDeviceY(points[0].y + yoffset); + + fprintf( m_pstream, "%d %d moveto\n", xx, yy ); + + CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset ); + + for (int i = 1; i < n; i++) + { + xx = LogicalToDeviceX(points[i].x + xoffset); + yy = LogicalToDeviceY(points[i].y + yoffset); + + fprintf( m_pstream, "%d %d lineto\n", xx, yy ); + + CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset); + } + + fprintf( m_pstream, "fill\n" ); } if (m_pen.GetStyle () != wxTRANSPARENT) { - SetPen( m_pen ); - - *m_pstream << "newpath\n"; + SetPen( m_pen ); - long xx = XLOG2DEV(points[0].x + xoffset); - long yy = YLOG2DEV(points[0].y + yoffset); - *m_pstream << xx << " " << yy << " moveto\n"; - CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset ); + fprintf( m_pstream, "newpath\n" ); - for (int i = 1; i < n; i++) - { - xx = XLOG2DEV(points[i].x + xoffset); - yy = YLOG2DEV(points[i].y + yoffset); - *m_pstream << xx << " " << yy << " lineto\n"; - CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset); - } + wxCoord xx = LogicalToDeviceX(points[0].x + xoffset); + wxCoord yy = LogicalToDeviceY(points[0].y + yoffset); - *m_pstream << "stroke\n"; + fprintf( m_pstream, "%d %d moveto\n", xx, yy ); + + CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset ); + + for (int i = 1; i < n; i++) + { + xx = LogicalToDeviceX(points[i].x + xoffset); + yy = LogicalToDeviceY(points[i].y + yoffset); + + fprintf( m_pstream, "%d %d lineto\n", xx, yy ); + + CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset); + } + + fprintf( m_pstream, "closepath\n" ); + fprintf( m_pstream, "stroke\n" ); } } -void wxPostScriptDC::DrawLines (int n, wxPoint points[], long xoffset, long yoffset) +void wxPostScriptDC::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); - - if (m_pen.GetStyle() == wxTRANSPARENT) - return; - if (n <= 0) - return; - + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + + if (m_pen.GetStyle() == wxTRANSPARENT) return; + + if (n <= 0) return; + SetPen (m_pen); - + int i; for ( i =0; i= 128 ) + { + /* Cope with character codes > 127 */ + fprintf(m_pstream, "\\%o", c); + } + else { - red = (unsigned char) 0; - green = (unsigned char) 0; - blue = (unsigned char) 0; + fputc(c, m_pstream); } } - - // maybe setgray here ? - + + fprintf( m_pstream, ") show\n" ); + + if (m_font.GetUnderlined()) + { + wxCoord uy = (wxCoord)(y + size - m_underlinePosition); + char buffer[100]; + + sprintf( buffer, + "gsave\n" + "%d %d moveto\n" + "%f setlinewidth\n" + "%d %d lineto\n" + "stroke\n" + "grestore\n", + LogicalToDeviceX(x), LogicalToDeviceY(uy), + m_underlineThickness, + LogicalToDeviceX(x + text_w), LogicalToDeviceY(uy) ); + for (i = 0; i < 100; i++) + if (buffer[i] == ',') buffer[i] = '.'; + fprintf( m_pstream, buffer ); + } + + CalcBoundingBox( x, y ); + CalcBoundingBox( x + size * text.Length() * 2/3 , y ); +} + +void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord y, double angle ) +{ + if (angle == 0.0) + { + DoDrawText(text, x, y); + return; + } + + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + + SetFont( m_font ); + + if (m_textForegroundColour.Ok()) + { + unsigned char red = m_textForegroundColour.Red(); + unsigned char blue = m_textForegroundColour.Blue(); + unsigned char green = m_textForegroundColour.Green(); + + if (!m_colour) + { + // Anything not white is black + if (! (red == (unsigned char) 255 && + blue == (unsigned char) 255 && + green == (unsigned char) 255)) + { + red = (unsigned char) 0; + green = (unsigned char) 0; + blue = (unsigned char) 0; + } + } + + // maybe setgray here ? if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue)) { - long redPS = (long) (((int) red) / 255.0); - long bluePS = (long) (((int) blue) / 255.0); - long greenPS = (long) (((int) green) / 255.0); - *m_pstream << redPS << " " << greenPS << " " << bluePS << " setrgbcolor\n"; + double redPS = (double)(red) / 255.0; + double bluePS = (double)(blue) / 255.0; + double greenPS = (double)(green) / 255.0; + + char buffer[100]; + sprintf( buffer, + "%.8f %.8f %.8f setrgbcolor\n", + redPS, greenPS, bluePS ); + for (int i = 0; i < 100; i++) + if (buffer[i] == ',') buffer[i] = '.'; + fprintf( m_pstream, buffer ); m_currentRed = red; m_currentBlue = blue; @@ -1067,50 +1330,75 @@ void wxPostScriptDC::DrawText( const wxString& text, long x, long y, bool WXUNUS int size = m_font.GetPointSize(); - long by = y + (long)floor( float(size) * 2.0 / 3.0 ); // approximate baseline - *m_pstream << XLOG2DEV(x) << " " << YLOG2DEV(by) << " moveto\n"; - - *m_pstream << "("; - int len = strlen ((char *)(const char *)text); - int i; + long by = y + (long)floor( double(size) * 2.0 / 3.0 ); // approximate baseline + + // FIXME only correct for 90 degrees + fprintf(m_pstream, "%d %d moveto\n", + LogicalToDeviceX((wxCoord)(x + size)), LogicalToDeviceY((wxCoord)by) ); + + char buffer[100]; + sprintf(buffer, "%.8f rotate\n", angle); + size_t i; + for (i = 0; i < 100; i++) + if (buffer[i] == ',') buffer[i] = '.'; + fprintf(m_pstream, buffer); + + fprintf( m_pstream, "(" ); + const wxWX2MBbuf textbuf = text.mb_str(); + size_t len = strlen(textbuf); for (i = 0; i < len; i++) { - int c = (unsigned char) text[i]; - if ( c == ')' || c == '(' || c == '\\') + int c = (unsigned char) textbuf[i]; + if (c == ')' || c == '(' || c == '\\') { - *m_pstream << "\\" << (char) c; + /* Cope with special characters */ + fprintf( m_pstream, "\\" ); + fputc(c, m_pstream); } else if ( c >= 128 ) { - // Cope with character codes > 127 - char tmp[5]; - sprintf(tmp, "\\%o", c); - *m_pstream << tmp; + /* Cope with character codes > 127 */ + fprintf(m_pstream, "\\%o", c); } else - *m_pstream << (char) c; + { + fputc(c, m_pstream); + } } - *m_pstream << ")" << " show\n"; + fprintf( m_pstream, ") show\n" ); + + sprintf( buffer, "%.8f rotate\n", -angle ); + for (i = 0; i < 100; i++) + if (buffer[i] == ',') buffer[i] = '.'; + fprintf( m_pstream, buffer ); if (m_font.GetUnderlined()) { - long uy = (long)(y + size - m_underlinePosition); - long w, h; + wxCoord uy = (wxCoord)(y + size - m_underlinePosition); + wxCoord w, h; + char buffer[100]; GetTextExtent(text, &w, &h); - - *m_pstream << "gsave " << XLOG2DEV(x) << " " << YLOG2DEV(uy) - << " moveto\n" - << (long)m_underlineThickness << " setlinewidth " - << XLOG2DEV(x + w) << " " << YLOG2DEV(uy) - << " lineto stroke grestore\n"; + + sprintf( buffer, + "gsave\n" + "%d %d moveto\n" + "%f setlinewidth\n" + "%d %d lineto\n" + "stroke\n" + "grestore\n", + LogicalToDeviceX(x), LogicalToDeviceY(uy), + m_underlineThickness, + LogicalToDeviceX(x + w), LogicalToDeviceY(uy) ); + for (i = 0; i < 100; i++) + if (buffer[i] == ',') buffer[i] = '.'; + fprintf( m_pstream, buffer ); } - + CalcBoundingBox( x, y ); CalcBoundingBox( x + size * text.Length() * 2/3 , y ); } - void wxPostScriptDC::SetBackground (const wxBrush& brush) { m_backgroundBrush = brush; @@ -1118,13 +1406,13 @@ void wxPostScriptDC::SetBackground (const wxBrush& brush) void wxPostScriptDC::SetLogicalFunction (int WXUNUSED(function)) { - wxFAIL_MSG( "wxPostScriptDC::SetLogicalFunction not implemented." ); + wxFAIL_MSG( wxT("wxPostScriptDC::SetLogicalFunction not implemented.") ); } -void wxPostScriptDC::DrawSpline( wxList *points ) +void wxPostScriptDC::DoDrawSpline( wxList *points ) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); - + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + SetPen( m_pen ); double a, b, c, d, x1, y1, x2, y2, x3, y3; @@ -1132,130 +1420,184 @@ void wxPostScriptDC::DrawSpline( wxList *points ) wxNode *node = points->First(); p = (wxPoint *)node->Data(); - x1 = p->x; + x1 = p->x; y1 = p->y; node = node->Next(); p = (wxPoint *)node->Data(); - c = p->x; + c = p->x; d = p->y; x3 = a = (double)(x1 + c) / 2; y3 = b = (double)(y1 + d) / 2; - *m_pstream << "newpath " - << XLOG2DEV((long)x1) << " " << YLOG2DEV((long)y1) << " moveto " - << XLOG2DEV((long)x3) << " " << YLOG2DEV((long)y3) << " lineto\n"; - - CalcBoundingBox( (long)x1, (long)y1 ); - CalcBoundingBox( (long)x3, (long)y3 ); + fprintf( m_pstream, + "newpath\n" + "%d %d moveto\n" + "%d %d lineto\n", + LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1), + LogicalToDeviceX((wxCoord)x3), LogicalToDeviceY((wxCoord)y3) ); + + CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 ); + CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 ); while ((node = node->Next()) != NULL) { q = (wxPoint *)node->Data(); - x1 = x3; - y1 = y3; - x2 = c; - y2 = d; - c = q->x; - d = q->y; + x1 = x3; + y1 = y3; + x2 = c; + y2 = d; + c = q->x; + d = q->y; x3 = (double)(x2 + c) / 2; y3 = (double)(y2 + d) / 2; - *m_pstream << XLOG2DEV((long)x1) << " " << YLOG2DEV((long)y1) << " " - << XLOG2DEV((long)x2) << " " << YLOG2DEV((long)y2) << " " - << XLOG2DEV((long)x3) << " " << YLOG2DEV((long)y3) << " DrawSplineSection\n"; - CalcBoundingBox( (long)x1, (long)y1 ); - CalcBoundingBox( (long)x3, (long)y3 ); + fprintf( m_pstream, + "%d %d %d %d %d %d DrawSplineSection\n", + LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1), + LogicalToDeviceX((wxCoord)x2), LogicalToDeviceY((wxCoord)y2), + LogicalToDeviceX((wxCoord)x3), LogicalToDeviceY((wxCoord)y3) ); + + CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 ); + CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 ); } - -/* - At this point, (x2,y2) and (c,d) are the position of the - next-to-last and last point respectively, in the point list -*/ - *m_pstream << XLOG2DEV((long)c) << " " << YLOG2DEV((long)d) << " lineto stroke\n"; + /* + At this point, (x2,y2) and (c,d) are the position of the + next-to-last and last point respectively, in the point list + */ + + fprintf( m_pstream, + "%d %d lineto\n" + "stroke\n", + LogicalToDeviceX((wxCoord)c), LogicalToDeviceY((wxCoord)d) ); } -long wxPostScriptDC::GetCharWidth () +wxCoord wxPostScriptDC::GetCharWidth() const { // Chris Breeze: reasonable approximation using wxMODERN/Courier - return (long) (GetCharHeight() * 72.0 / 120.0); + return (wxCoord) (GetCharHeight() * 72.0 / 120.0); } void wxPostScriptDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); - + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + m_signX = (xLeftRight ? 1 : -1); m_signY = (yBottomUp ? 1 : -1); - - // FIXME there is no such function in MSW -#ifndef __WXMSW__ + + // FIXME there is no such function in MSW nor in OS2/PM +#if !defined(__WXMSW__) && !defined(__WXPM__) ComputeScaleAndOrigin(); #endif } -void wxPostScriptDC::SetDeviceOrigin( long x, long y ) +void wxPostScriptDC::SetDeviceOrigin( wxCoord x, wxCoord y ) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); - + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + int h = 0; int w = 0; GetSize( &w, &h ); - + wxDC::SetDeviceOrigin( x, h-y ); } -void wxPostScriptDC::GetSize(int* width, int* height) const +void wxPostScriptDC::DoGetSize(int* width, int* height) const { - const char *paperType = wxThePrintSetupData->GetPaperName(); - - if (!paperType) paperType = _("A4 210 x 297 mm"); + wxPaperSize id = m_printData.GetPaperId(); + + wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(id); - wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(paperType); - - if (!paper) paper = wxThePrintPaperDatabase->FindPaperType(_("A4 210 x 297 mm")); - + if (!paper) paper = wxThePrintPaperDatabase->FindPaperType(wxPAPER_A4); + + int w = 595; + int h = 842; if (paper) { - if (width) *width = paper->widthPixels; - if (height) *height = paper->heightPixels; + w = paper->GetSizeDeviceUnits().x; + h = paper->GetSizeDeviceUnits().y; } - else + + if (m_printData.GetOrientation() == wxLANDSCAPE) { - if (width) *width = 595; - if (height) *height = 842; + int tmp = w; + w = h; + h = tmp; } + + if (width) *width = (int)(w * ms_PSScaleFactor); + if (height) *height = (int)(h * ms_PSScaleFactor); } -bool wxPostScriptDC::StartDoc (const wxString& message) +void wxPostScriptDC::DoGetSizeMM(int *width, int *height) const { - wxCHECK_MSG( m_ok, FALSE, "invalid postscript dc" ); - - if (m_filename == "") + wxPaperSize id = m_printData.GetPaperId(); + + wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(id); + + if (!paper) paper = wxThePrintPaperDatabase->FindPaperType(wxPAPER_A4); + + int w = 210; + int h = 297; + if (paper) { - m_filename = wxGetTempFileName("ps"); - wxThePrintSetupData->SetPrinterFile((char *)(const char *)m_filename); - m_ok = TRUE; + w = paper->GetWidth() / 10; + h = paper->GetHeight() / 10; } - else + + if (m_printData.GetOrientation() == wxLANDSCAPE) { - wxThePrintSetupData->SetPrinterFile((char *)(const char *)m_filename); + int tmp = w; + w = h; + h = tmp; } - m_pstream = new ofstream (wxThePrintSetupData->GetPrinterFile()); - - if (!m_pstream || !m_pstream->good()) + if (width) *width = w; + if (height) *height = h; +} + +// Resolution in pixels per logical inch +wxSize wxPostScriptDC::GetPPI(void) const +{ + return wxSize((int)(72 * ms_PSScaleFactor), + (int)(72 * ms_PSScaleFactor)); +} + + +bool wxPostScriptDC::StartDoc( const wxString& message ) +{ + wxCHECK_MSG( m_ok, FALSE, wxT("invalid postscript dc") ); + + if (m_printData.GetFilename() == "") { - wxMessageBox (_("Cannot open file!"), _("Error"), wxOK); - m_ok = FALSE; - return FALSE; + wxString filename = wxGetTempFileName("ps"); + m_printData.SetFilename(filename); } - + + m_pstream = wxFopen( m_printData.GetFilename().fn_str(), wxT("w+") ); + + if (!m_pstream) + { + wxLogError( _("Cannot open file for PostScript printing!")); + m_ok = FALSE; + return FALSE; + } + m_ok = TRUE; + fprintf( m_pstream, "%%%%BeginProlog\n" ); + fprintf( m_pstream, wxPostScriptHeaderEllipse ); + fprintf( m_pstream, wxPostScriptHeaderEllipticArc ); + fprintf( m_pstream, wxPostScriptHeaderColourImage ); + fprintf( m_pstream, wxPostScriptHeaderReencodeISO1 ); + fprintf( m_pstream, wxPostScriptHeaderReencodeISO2 ); + if (wxPostScriptHeaderSpline) + fprintf( m_pstream, wxPostScriptHeaderSpline ); + fprintf( m_pstream, "%%%%EndProlog\n" ); + SetBrush( *wxBLACK_BRUSH ); SetPen( *wxBLACK_PEN ); SetBackground( *wxWHITE_BRUSH ); @@ -1263,7 +1605,7 @@ bool wxPostScriptDC::StartDoc (const wxString& message) // set origin according to paper size SetDeviceOrigin( 0,0 ); - + wxPageNumber = 1; m_pageNumber = 1; m_title = message; @@ -1272,86 +1614,100 @@ bool wxPostScriptDC::StartDoc (const wxString& message) void wxPostScriptDC::EndDoc () { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); - + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + if (m_clipping) { m_clipping = FALSE; - *m_pstream << "grestore\n"; + fprintf( m_pstream, "grestore\n" ); } - if (m_pstream) - { - delete m_pstream; - m_pstream = (ofstream *) NULL; - } + fclose( m_pstream ); + m_pstream = (FILE *) NULL; - char *header_file = wxGetTempFileName("ps"); - - m_pstream = new ofstream( header_file ); + wxChar *header_file = wxGetTempFileName("ps"); - *m_pstream << "%!PS-Adobe-2.0\n"; /* PostScript magic strings */ - *m_pstream << "%%Title: " << (const char *) m_title << "\n"; - *m_pstream << "%%Creator: " << wxTheApp->argv[0] << "\n"; - *m_pstream << "%%CreationDate: " << wxNow() << "\n"; + m_pstream = fopen( wxConvFile.cWX2MB(header_file) , "w+" ); - char userID[256]; + fprintf( m_pstream, "%%!PS-Adobe-2.0\n" ); // PostScript magic strings + fprintf( m_pstream, "%%%%Title: %s\n", (const char *)m_title.mb_str() ); + fprintf( m_pstream, "%%%%Creator: %s\n", (const char*)wxConvCurrent->cWX2MB(wxTheApp->argv[0]) ); + fprintf( m_pstream, "%%%%CreationDate: %s\n", (const char *)wxNow().mb_str() ); + + wxChar userID[256]; if ( wxGetEmailAddress(userID, sizeof(userID)) ) { - *m_pstream << "%%For: " << (char *)userID; - char userName[245]; + fprintf( m_pstream, "%%%%For: %s ", wxMBSTRINGCAST wxConvCurrent->cWX2MB(userID) ); + wxChar userName[245]; if (wxGetUserName(userName, sizeof(userName))) - *m_pstream << " (" << (char *)userName << ")"; - *m_pstream << "\n"; + fprintf( m_pstream, " (%s)", wxMBSTRINGCAST wxConvCurrent->cWX2MB(userName) ); + fprintf( m_pstream, "\n" ); } else if ( wxGetUserName(userID, sizeof(userID)) ) { - *m_pstream << "%%For: " << (char *)userID << "\n"; + fprintf( m_pstream, "%%%%For: %s\n", wxMBSTRINGCAST wxConvCurrent->cWX2MB(userID) );; } // THE FOLLOWING HAS BEEN CONTRIBUTED BY Andy Fyfe - long wx_printer_translate_x, wx_printer_translate_y; + wxCoord wx_printer_translate_x, wx_printer_translate_y; double wx_printer_scale_x, wx_printer_scale_y; - wxThePrintSetupData->GetPrinterTranslation(&wx_printer_translate_x, &wx_printer_translate_y); - wxThePrintSetupData->GetPrinterScaling(&wx_printer_scale_x, &wx_printer_scale_y); - if (wxThePrintSetupData->GetPrinterOrientation() == PS_LANDSCAPE) - { - *m_pstream << "%%Orientation: Landscape\n"; - } + wx_printer_translate_x = (wxCoord)m_printData.GetPrinterTranslateX(); + wx_printer_translate_y = (wxCoord)m_printData.GetPrinterTranslateY(); + + wx_printer_scale_x = m_printData.GetPrinterScaleX(); + wx_printer_scale_y = m_printData.GetPrinterScaleY(); + + if (m_printData.GetOrientation() == wxLANDSCAPE) + fprintf( m_pstream, "%%%%Orientation: Landscape\n" ); else - { - *m_pstream << "%%Orientation: Portrait\n"; - } + fprintf( m_pstream, "%%%%Orientation: Portrait\n" ); // Compute the bounding box. Note that it is in the default user // coordinate system, thus we have to convert the values. - long llx = (long) ((XLOG2DEV(m_minX)+wx_printer_translate_x)*wx_printer_scale_x); - long lly = (long) ((YLOG2DEV(m_minY)+wx_printer_translate_y)*wx_printer_scale_y); - long urx = (long) ((XLOG2DEV(m_maxX)+wx_printer_translate_x)*wx_printer_scale_x); - long ury = (long) ((YLOG2DEV(m_maxY)+wx_printer_translate_y)*wx_printer_scale_y); + wxCoord minX = (wxCoord) LogicalToDeviceX(m_minX); + wxCoord minY = (wxCoord) LogicalToDeviceY(m_minY); + wxCoord maxX = (wxCoord) LogicalToDeviceX(m_maxX); + wxCoord maxY = (wxCoord) LogicalToDeviceY(m_maxY); + + // LOG2DEV may have changed the minimum to maximum vice versa + if ( minX > maxX ) { wxCoord tmp = minX; minX = maxX; maxX = tmp; } + if ( minY > maxY ) { wxCoord tmp = minY; minY = maxY; maxY = tmp; } + + // account for used scaling (boundingbox is before scaling in ps-file) + double scale_x = m_printData.GetPrinterScaleX() / ms_PSScaleFactor; + double scale_y = m_printData.GetPrinterScaleY() / ms_PSScaleFactor; + + wxCoord llx, lly, urx, ury; + llx = (wxCoord) ((minX+wx_printer_translate_x)*scale_x); + lly = (wxCoord) ((minY+wx_printer_translate_y)*scale_y); + urx = (wxCoord) ((maxX+wx_printer_translate_x)*scale_x); + ury = (wxCoord) ((maxY+wx_printer_translate_y)*scale_y); + // (end of bounding box computation) + // If we're landscape, our sense of "x" and "y" is reversed. - if (wxThePrintSetupData->GetPrinterOrientation() == PS_LANDSCAPE) + if (m_printData.GetOrientation() == wxLANDSCAPE) { - long tmp; + wxCoord tmp; tmp = llx; llx = lly; lly = tmp; tmp = urx; urx = ury; ury = tmp; // We need either the two lines that follow, or we need to subtract // min_x from real_translate_y, which is commented out below. - llx = llx - (long)(m_minX*wx_printer_scale_y); - urx = urx - (long)(m_minX*wx_printer_scale_y); + llx = llx - (wxCoord)(m_minX*wx_printer_scale_y); + urx = urx - (wxCoord)(m_minX*wx_printer_scale_y); } // The Adobe specifications call for integers; we round as to make // the bounding larger. - *m_pstream << "%%BoundingBox: " - << floor((double)llx) << " " << floor((double)lly) << " " - << ceil((double)urx) << " " << ceil((double)ury) << "\n"; - *m_pstream << "%%Pages: " << (wxPageNumber - 1) << "\n"; - *m_pstream << "%%EndComments\n\n"; + fprintf( m_pstream, + "%%%%BoundingBox: %d %d %d %d\n", + (wxCoord)floor((double)llx), (wxCoord)floor((double)lly), + (wxCoord)ceil((double)urx), (wxCoord)ceil((double)ury) ); + fprintf( m_pstream, "%%%%Pages: %d\n", (wxPageNumber - 1) ); + fprintf( m_pstream, "%%%%EndComments\n\n" ); // To check the correctness of the bounding box, postscript commands // to draw a box corresponding to the bounding box are generated below. @@ -1359,81 +1715,76 @@ void wxPostScriptDC::EndDoc () // commands are generated within comments. These lines appear before any // adjustment of scale, rotation, or translation, and hence are in the // default user coordinates. - *m_pstream << "% newpath\n"; - *m_pstream << "% " << llx << " " << lly << " moveto\n"; - *m_pstream << "% " << urx << " " << lly << " lineto\n"; - *m_pstream << "% " << urx << " " << ury << " lineto\n"; - *m_pstream << "% " << llx << " " << ury << " lineto closepath stroke\n"; - - *m_pstream << "%%BeginProlog\n"; - *m_pstream << wxPostScriptHeaderEllipse; - *m_pstream << wxPostScriptHeaderEllipticArc; - *m_pstream << wxPostScriptHeaderColourImage; - *m_pstream << wxPostScriptHeaderReencodeISO1; - *m_pstream << wxPostScriptHeaderReencodeISO2; - - if (wxPostScriptHeaderSpline) - *m_pstream << wxPostScriptHeaderSpline; - *m_pstream << "%%EndProlog\n"; + fprintf( m_pstream, "%% newpath\n" ); + fprintf( m_pstream, "%% %d %d moveto\n", llx, lly ); + fprintf( m_pstream, "%% %d %d lineto\n", urx, lly ); + fprintf( m_pstream, "%% %d %d lineto\n", urx, ury ); + fprintf( m_pstream, "%% %d %d lineto closepath stroke\n", llx, ury ); - delete m_pstream; - m_pstream = (ofstream *) NULL; + fclose( m_pstream ); + m_pstream = (FILE*) NULL; - char *tmp_file = wxGetTempFileName("ps"); + wxChar *tmp_file = wxGetTempFileName("ps"); // Paste header Before wx_printer_file - wxConcatFiles (header_file, wxThePrintSetupData->GetPrinterFile(), tmp_file); - wxRemoveFile (header_file); - wxRemoveFile (wxThePrintSetupData->GetPrinterFile()); - wxRenameFile(tmp_file, wxThePrintSetupData->GetPrinterFile()); + wxConcatFiles (header_file, m_printData.GetFilename(), tmp_file ); + wxRemoveFile( header_file ); + wxRemoveFile( m_printData.GetFilename() ); + wxRenameFile( tmp_file, m_printData.GetFilename() ); #if defined(__X__) || defined(__WXGTK__) - if (m_ok) - { - switch (wxThePrintSetupData->GetPrinterMode()) { - case PS_PREVIEW: + if (m_ok) { - char *argv[3]; - argv[0] = wxThePrintSetupData->GetPrintPreviewCommand(); - argv[1] = wxThePrintSetupData->GetPrinterFile(); - argv[2] = (char *) NULL; - wxExecute (argv, TRUE); - wxRemoveFile(wxThePrintSetupData->GetPrinterFile()); - } - break; - - case PS_PRINTER: - { - char *argv[4]; - int argc = 0; - argv[argc++] = wxThePrintSetupData->GetPrinterCommand(); - - // !SM! If we simply assign to argv[1] here, if printer options - // are blank, we get an annoying and confusing message from lpr. - char * opts = wxThePrintSetupData->GetPrinterOptions(); - if (opts && *opts) - argv[argc++] = opts; - - argv[argc++] = wxThePrintSetupData->GetPrinterFile(); - argv[argc++] = (char *) NULL; - wxExecute (argv, TRUE); - wxRemoveFile(wxThePrintSetupData->GetPrinterFile()); - } - break; + wxString previewCommand(m_printData.GetPreviewCommand()); + wxString printerCommand(m_printData.GetPrinterCommand()); + wxString printerOptions(m_printData.GetPrinterOptions()); + wxString filename(m_printData.GetFilename()); - case PS_FILE: - break; - } + switch (m_printData.GetPrintMode()) + { + case wxPRINT_MODE_PREVIEW: + { + wxChar *argv[3]; + argv[0] = WXSTRINGCAST previewCommand; + argv[1] = WXSTRINGCAST filename; + argv[2] = (wxChar*) NULL; + wxExecute( argv, TRUE ); + wxRemoveFile( m_printData.GetFilename() ); + } + break; + case wxPRINT_MODE_PRINTER: + { + wxChar *argv[4]; + int argc = 0; + argv[argc++] = WXSTRINGCAST printerCommand; + + // !SM! If we simply assign to argv[1] here, if printer options + // are blank, we get an annoying and confusing message from lpr. + wxChar *opts = WXSTRINGCAST printerOptions; + if (opts && *opts) + argv[argc++] = opts; + + argv[argc++] = WXSTRINGCAST filename; + argv[argc++] = (wxChar *) NULL; + wxExecute( argv, TRUE ); + wxRemoveFile( filename ); + } + break; + case wxPRINT_MODE_FILE: + case wxPRINT_MODE_NONE: + break; + } } #endif } -void wxPostScriptDC::StartPage () +void wxPostScriptDC::StartPage() { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); - - *m_pstream << "%%Page: " << (wxPageNumber++) << "\n"; - + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + + fprintf( m_pstream, "%%%%Page: %d\n", wxPageNumber++ ); + + // What is this one supposed to do? RR. // *m_pstream << "matrix currentmatrix\n"; // Added by Chris Breeze @@ -1441,148 +1792,144 @@ void wxPostScriptDC::StartPage () // Each page starts with an "initgraphics" which resets the // transformation and so we need to reset the origin // (and rotate the page for landscape printing) - -/* - m_scaleFactor = 1.0; - m_logicalOriginX = 0; - m_logicalOriginY = 0; -*/ - // Output scaling - long translate_x, translate_y; - double scale_x, scale_y; - wxThePrintSetupData->GetPrinterTranslation(&translate_x, &translate_y); - wxThePrintSetupData->GetPrinterScaling(&scale_x, &scale_y); - if (wxThePrintSetupData->GetPrinterOrientation() == PS_LANDSCAPE) - { - translate_y -= m_maxY; - *m_pstream << "90 rotate\n"; - } + // Output scaling + wxCoord translate_x, translate_y; + double scale_x, scale_y; + + translate_x = (wxCoord)m_printData.GetPrinterTranslateX(); + translate_y = (wxCoord)m_printData.GetPrinterTranslateY(); - *m_pstream << scale_x << " " << scale_y << " scale\n"; - *m_pstream << translate_x << " " << translate_y << " translate\n"; + scale_x = m_printData.GetPrinterScaleX(); + scale_y = m_printData.GetPrinterScaleY(); + + if (m_printData.GetOrientation() == wxLANDSCAPE) + { + int h; + GetSize( (int*) NULL, &h ); + translate_y -= h; + fprintf( m_pstream, "90 rotate\n" ); + + // I copied this one from a PostScript tutorial, but to no avail. RR. + // fprintf( m_pstream, "90 rotate llx neg ury nef translate\n" ); + } + + char buffer[100]; + sprintf( buffer, "%.8f %.8f scale\n", scale_x / ms_PSScaleFactor, + scale_y / ms_PSScaleFactor); + for (int i = 0; i < 100; i++) + if (buffer[i] == ',') buffer[i] = '.'; + fprintf( m_pstream, buffer ); + + fprintf( m_pstream, "%d %d translate\n", translate_x, translate_y ); } void wxPostScriptDC::EndPage () { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); - - *m_pstream << "showpage\n"; + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + + fprintf( m_pstream, "showpage\n" ); } -bool wxPostScriptDC::Blit( long xdest, long ydest, - long fwidth, long fheight, - wxDC *source, - long xsrc, long ysrc, - int rop, bool WXUNUSED(useMask) ) +bool wxPostScriptDC::DoBlit( wxCoord xdest, wxCoord ydest, + wxCoord fwidth, wxCoord fheight, + wxDC *source, + wxCoord xsrc, wxCoord ysrc, + int rop, bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) ) { - wxCHECK_MSG( m_ok && m_pstream, FALSE, "invalid postscript dc" ); - - wxCHECK_MSG( source, FALSE, "invalid source dc" ); - - wxClientDC *srcDC = (wxClientDC*)source; - - wxBitmap bitmap( fwidth, fheight ); - -#ifdef __WXGTK__ - /* just take any GC so we don't have to create our own. */ + wxCHECK_MSG( m_ok && m_pstream, FALSE, wxT("invalid postscript dc") ); - GtkStyle *style = gtk_widget_get_default_style (); - GdkGC *gc = style->white_gc; + wxCHECK_MSG( source, FALSE, wxT("invalid source dc") ); - /* copy from either window or bitmap */ - - gdk_window_copy_area( bitmap.GetPixmap(), gc, 0, 0, - srcDC->GetWindow(), - xsrc, ysrc, fwidth, fheight ); -#else + /* blit into a bitmap */ + wxBitmap bitmap( (int)fwidth, (int)fheight ); wxMemoryDC memDC; memDC.SelectObject(bitmap); - // TODO: Do we want to blit transparently? - memDC.Blit(0, 0, fwidth, fheight, source, xsrc, ysrc, rop); + memDC.Blit(0, 0, fwidth, fheight, source, xsrc, ysrc, rop); /* TODO: Blit transparently? */ memDC.SelectObject(wxNullBitmap); -#endif /* draw bitmap. scaling and positioning is done there */ - DrawBitmap( bitmap, xdest, ydest ); - + return TRUE; } -long wxPostScriptDC::GetCharHeight() +wxCoord wxPostScriptDC::GetCharHeight() const { if (m_font.Ok()) - return m_font.GetPointSize(); + return m_font.GetPointSize(); else return 12; } -void wxPostScriptDC::GetTextExtent (const wxString& string, long *x, long *y, - long *descent, long *externalLeading, wxFont *theFont, - bool WXUNUSED(use16)) +void wxPostScriptDC::DoGetTextExtent(const wxString& string, + wxCoord *x, wxCoord *y, + wxCoord *descent, wxCoord *externalLeading, + wxFont *theFont ) const { wxFont *fontToUse = theFont; - + if (!fontToUse) fontToUse = (wxFont*) &m_font; - wxCHECK_RET( fontToUse, "GetTextExtent: no font defined" ); - wxCHECK_RET( x, "GetTextExtent: x == NULL" ); - wxCHECK_RET( y, "GetTextExtent: y == NULL" ); + wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") ); -#if !USE_AFM_FOR_POSTSCRIPT + const wxWX2MBbuf strbuf = string.mb_str(); + +#if !wxUSE_AFM_FOR_POSTSCRIPT /* Provide a VERY rough estimate (avoid using it). * Produces accurate results for mono-spaced font * such as Courier (aka wxMODERN) */ - + int height = 12; if (fontToUse) { - height = fontToUse->GetPointSize(); + height = fontToUse->GetPointSize(); } - *x = strlen (string) * height * 72 / 120; - *y = (long) (height * 1.32); /* allow for descender */ + if ( x ) + *x = strlen (strbuf) * height * 72 / 120; + if ( y ) + *y = (wxCoord) (height * 1.32); /* allow for descender */ if (descent) *descent = 0; if (externalLeading) *externalLeading = 0; #else - /* method for calculating string widths in postscript: - / read in the AFM (adobe font metrics) file for the - / actual font, parse it and extract the character widths - / and also the descender. this may be improved, but for now - / it works well. the AFM file is only read in if the - / font is changed. this may be chached in the future. - / calls to GetTextExtent with the font unchanged are rather - / efficient!!! - / - / for each font and style used there is an AFM file necessary. - / currently i have only files for the roman font family. - / I try to get files for the other ones! - / - / CAVE: the size of the string is currently always calculated - / in 'points' (1/72 of an inch). this should later on be - / changed to depend on the mapping mode. - / CAVE: the path to the AFM files must be set before calling this - / function. this is usually done by a call like the following: - / wxSetAFMPath("d:\\wxw161\\afm\\"); - / - / example: - / - / wxPostScriptDC dc(NULL, TRUE); - / if (dc.Ok()){ - / wxSetAFMPath("d:\\wxw161\\afm\\"); - / dc.StartDoc("Test"); - / dc.StartPage(); - / long w,h; - / dc.SetFont(new wxFont(10, wxROMAN, wxNORMAL, wxNORMAL)); - / dc.GetTextExtent("Hallo",&w,&h); - / dc.EndPage(); - / dc.EndDoc(); - / } - / - / by steve (stefan.hammes@urz.uni-heidelberg.de) - / created: 10.09.94 - / updated: 14.05.95 */ + /* method for calculating string widths in postscript: + / read in the AFM (adobe font metrics) file for the + / actual font, parse it and extract the character widths + / and also the descender. this may be improved, but for now + / it works well. the AFM file is only read in if the + / font is changed. this may be chached in the future. + / calls to GetTextExtent with the font unchanged are rather + / efficient!!! + / + / for each font and style used there is an AFM file necessary. + / currently i have only files for the roman font family. + / I try to get files for the other ones! + / + / CAVE: the size of the string is currently always calculated + / in 'points' (1/72 of an inch). this should later on be + / changed to depend on the mapping mode. + / CAVE: the path to the AFM files must be set before calling this + / function. this is usually done by a call like the following: + / wxSetAFMPath("d:\\wxw161\\afm\\"); + / + / example: + / + / wxPostScriptDC dc(NULL, TRUE); + / if (dc.Ok()){ + / wxSetAFMPath("d:\\wxw161\\afm\\"); + / dc.StartDoc("Test"); + / dc.StartPage(); + / wxCoord w,h; + / dc.SetFont(new wxFont(10, wxROMAN, wxNORMAL, wxNORMAL)); + / dc.GetTextExtent("Hallo",&w,&h); + / dc.EndPage(); + / dc.EndDoc(); + / } + / + / by steve (stefan.hammes@urz.uni-heidelberg.de) + / created: 10.09.94 + / updated: 14.05.95 */ /* these static vars are for storing the state between calls */ static int lastFamily= INT_MIN; @@ -1592,11 +1939,14 @@ void wxPostScriptDC::GetTextExtent (const wxString& string, long *x, long *y, static int lastDescender = INT_MIN; static int lastWidths[256]; /* widths of the characters */ + double UnderlinePosition = 0.0; + double UnderlineThickness = 0.0; + /* get actual parameters */ - const int Family = fontToUse->GetFamily(); - const int Size = fontToUse->GetPointSize(); - const int Style = fontToUse->GetStyle(); - const int Weight = fontToUse->GetWeight(); + int Family = fontToUse->GetFamily(); + int Size = fontToUse->GetPointSize(); + int Style = fontToUse->GetStyle(); + int Weight = fontToUse->GetWeight(); /* if we have another font, read the font-metrics */ if (Family!=lastFamily || Size!=lastSize || Style!=lastStyle || Weight!=lastWeight) @@ -1607,69 +1957,104 @@ void wxPostScriptDC::GetTextExtent (const wxString& string, long *x, long *y, lastStyle = Style; lastWeight = Weight; - char *name = (char*) NULL; + const char *name = NULL; switch (Family) - { - case wxMODERN: - { - if ((Style == wxITALIC) && (Weight == wxBOLD)) name = "CourBoO"; - else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "CourBo"; - else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "Cour0"; - else name = "Cour"; - } - break; - case wxROMAN: - { - if ((Style == wxITALIC) && (Weight == wxBOLD)) name = "TimesBoO"; - else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "TimesBo"; - else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "TimesO"; - else if name = "TimesRo"; /* no typo */ - } - break; - default: - { - if ((Style == wxITALIC) && (Weight == wxBOLD)) name = "HelvBoO"; - else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "HelvBo"; - else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "Helv0"; - else name = "Helv"; - } - break; - } + { + case wxMODERN: + case wxTELETYPE: + { + if ((Style == wxITALIC) && (Weight == wxBOLD)) name = "CourBoO.afm"; + else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "CourBo.afm"; + else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "CourO.afm"; + else name = "Cour.afm"; + break; + } + case wxROMAN: + { + if ((Style == wxITALIC) && (Weight == wxBOLD)) name = "TimesBoO.afm"; + else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "TimesBo.afm"; + else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "TimesO.afm"; + else name = "TimesRo.afm"; + break; + } + case wxSCRIPT: + { + name = "Zapf.afm"; + Style = wxNORMAL; + Weight = wxNORMAL; + } + case wxSWISS: + default: + { + if ((Style == wxITALIC) && (Weight == wxBOLD)) name = "HelvBoO.afm"; + else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "HelvBo.afm"; + else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "HelvO.afm"; + else name = "Helv.afm"; + break; + } + } /* get the directory of the AFM files */ - char afmName[256]; - afmName[0] = 0; - if (wxGetAFMPath()) strcpy( afmName, wxGetAFMPath() ); - - /* 2. open and process the file - / a short explanation of the AFM format: - / we have for each character a line, which gives its size - / e.g.: - / - / C 63 ; WX 444 ; N question ; B 49 -14 395 676 ; - / - / that means, we have a character with ascii code 63, and width - / (444/1000 * fontSize) points. - / the other data is ignored for now! - / - / when the font has changed, we read in the right AFM file and store the - / character widths in an array, which is processed below (see point 3.). */ + wxString afmName = wxEmptyString; + if (!m_printData.GetFontMetricPath().IsEmpty()) + { + afmName = m_printData.GetFontMetricPath(); + } + + /* 2. open and process the file + / a short explanation of the AFM format: + / we have for each character a line, which gives its size + / e.g.: + / + / C 63 ; WX 444 ; N question ; B 49 -14 395 676 ; + / + / that means, we have a character with ascii code 63, and width + / (444/1000 * fontSize) points. + / the other data is ignored for now! + / + / when the font has changed, we read in the right AFM file and store the + / character widths in an array, which is processed below (see point 3.). */ /* new elements JC Sun Aug 25 23:21:44 MET DST 1996 */ - strcat(afmName,name); - strcat(afmName,".afm"); - FILE *afmFile = fopen(afmName,"r"); - if ( afmFile==NULL ) + afmName << name; + FILE *afmFile = wxFopen(afmName,wxT("r")); + + if (afmFile==NULL) { - wxLogDebug( "GetTextExtent: can't open AFM file '%s'\n", afmName ); - wxLogDebug( " using approximate values\n"); + afmName = wxThePrintSetupData->GetAFMPath(); + afmName << wxFILE_SEP_PATH << name; + afmFile = wxFopen(afmName,wxT("r")); + } + +#if defined(__UNIX__) && !defined(__VMS__) + if (afmFile==NULL) + /* please do NOT change the line above to "else if (afmFile==NULL)" - + - afmFile = fopen() may fail and in that case the next if branch + MUST be executed - and it would not if there was "else" */ + { + afmName = wxGetDataDir(); + afmName << wxFILE_SEP_PATH +#if defined(__LINUX__) || defined(__FREEBSD__) + << wxT("gs_afm") << wxFILE_SEP_PATH +#else + << wxT("afm") << wxFILE_SEP_PATH +#endif + << name; + afmFile = wxFopen(afmName,wxT("r")); + } +#endif + + if (afmFile==NULL) + { + wxLogDebug( wxT("GetTextExtent: can't open AFM file '%hs'"), afmName.c_str() ); + wxLogDebug( wxT(" using approximate values")); for (int i=0; i<256; i++) lastWidths[i] = 500; /* an approximate value */ lastDescender = -150; /* dito. */ } - else - { + else + { /* init the widths array */ for(int i=0; i<256; i++) lastWidths[i] = INT_MIN; /* some variables for holding parts of a line */ @@ -1679,68 +2064,68 @@ void wxPostScriptDC::GetTextExtent (const wxString& string, long *x, long *y, int ascii,cWidth; /* read in the file and parse it */ while(fgets(line,sizeof(line),afmFile)!=NULL) - { + { /* A.) check for descender definition */ if (strncmp(line,"Descender",9)==0) - { + { if ((sscanf(line,"%s%d",descString,&lastDescender)!=2) || - (strcmp(descString,"Descender")!=0)) - { - wxLogDebug( "AFM-file '%s': line '%s' has error (bad descender)\n", afmName,line ); + (strcmp(descString,"Descender")!=0)) + { + wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad descender)"), afmName.c_str(),line ); } } /* JC 1.) check for UnderlinePosition */ else if(strncmp(line,"UnderlinePosition",17)==0) - { + { if ((sscanf(line,"%s%lf",upString,&UnderlinePosition)!=2) || - (strcmp(upString,"UnderlinePosition")!=0)) - { - wxLogDebug( "AFM-file '%s': line '%s' has error (bad UnderlinePosition)\n", afmName, line ); + (strcmp(upString,"UnderlinePosition")!=0)) + { + wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad UnderlinePosition)"), afmName.c_str(), line ); } } - /* JC 2.) check for UnderlineThickness */ + /* JC 2.) check for UnderlineThickness */ else if(strncmp(line,"UnderlineThickness",18)==0) - { + { if ((sscanf(line,"%s%lf",utString,&UnderlineThickness)!=2) || - (strcmp(utString,"UnderlineThickness")!=0)) - { - wxLogDebug( "AFM-file '%s': line '%s' has error (bad UnderlineThickness)\n", afmName, line ); + (strcmp(utString,"UnderlineThickness")!=0)) + { + wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad UnderlineThickness)"), afmName.c_str(), line ); } } - /* JC 3.) check for EncodingScheme */ + /* JC 3.) check for EncodingScheme */ else if(strncmp(line,"EncodingScheme",14)==0) - { + { if ((sscanf(line,"%s%s",utString,encString)!=2) || - (strcmp(utString,"EncodingScheme")!=0)) - { - wxLogDebug("AFM-file '%s': line '%s' has error (bad EncodingScheme)\n", afmName, line ); + (strcmp(utString,"EncodingScheme")!=0)) + { + wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad EncodingScheme)"), afmName.c_str(), line ); } else if (strncmp(encString, "AdobeStandardEncoding", 21)) { - wxLogDebug( "AFM-file '%s': line '%s' has error (unsupported EncodingScheme %s)\n", - afmName,line, encString); + wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (unsupported EncodingScheme %hs)"), + afmName.c_str(),line, encString); } } /* B.) check for char-width */ else if(strncmp(line,"C ",2)==0) - { + { if (sscanf(line,"%s%d%s%s%d",cString,&ascii,semiString,WXString,&cWidth)!=5) - { - wxLogDebug("AFM-file '%s': line '%s' has an error (bad character width)\n",afmName,line); + { + wxLogDebug(wxT("AFM-file '%hs': line '%hs' has an error (bad character width)"),afmName.c_str(),line); } if(strcmp(cString,"C")!=0 || strcmp(semiString,";")!=0 || strcmp(WXString,"WX")!=0) - { - wxLogDebug("AFM-file '%s': line '%s' has a format error\n",afmName,line); + { + wxLogDebug(wxT("AFM-file '%hs': line '%hs' has a format error"),afmName.c_str(),line); } /* printf(" char '%c'=%d has width '%d'\n",ascii,ascii,cWidth); */ if (ascii>=0 && ascii<256) - { + { lastWidths[ascii] = cWidth; /* store width */ } - else - { - /* MATTHEW: this happens a lot; don't print an error */ - /* wxLogDebug("AFM-file '%s': ASCII value %d out of range\n",afmName,ascii); */ + else + { + /* MATTHEW: this happens a lot; don't print an error */ + /* wxLogDebug("AFM-file '%s': ASCII value %d out of range",afmName.c_str(),ascii); */ } } /* C.) ignore other entries. */ @@ -1748,9 +2133,9 @@ void wxPostScriptDC::GetTextExtent (const wxString& string, long *x, long *y, fclose(afmFile); } /* hack to compute correct values for german 'Umlaute' - / the correct way would be to map the character names - / like 'adieresis' to corresp. positions of ISOEnc and read - / these values from AFM files, too. Maybe later ... */ + / the correct way would be to map the character names + / like 'adieresis' to corresp. positions of ISOEnc and read + / these values from AFM files, too. Maybe later ... */ lastWidths[196] = lastWidths['A']; // Ä lastWidths[228] = lastWidths['a']; // ä lastWidths[214] = lastWidths['O']; // Ö @@ -1758,52 +2143,67 @@ void wxPostScriptDC::GetTextExtent (const wxString& string, long *x, long *y, lastWidths[220] = lastWidths['U']; // Ü lastWidths[252] = lastWidths['u']; // ü lastWidths[223] = lastWidths[251]; // ß + + /* JC: calculate UnderlineThickness/UnderlinePosition */ + + // VS: dirty, but is there any better solution? + double *pt; + pt = (double*) &m_underlinePosition; + *pt = LogicalToDeviceYRel((wxCoord)(UnderlinePosition * fontToUse->GetPointSize())) / 1000.0f; + pt = (double*) &m_underlineThickness; + *pt = LogicalToDeviceYRel((wxCoord)(UnderlineThickness * fontToUse->GetPointSize())) / 1000.0f; + } - /* JC: calculate UnderlineThickness/UnderlinePosition */ - m_underlinePosition = m_underlinePosition * fontToUse->GetPointSize() / 1000.0f; - m_underlineThickness = m_underlineThickness * fontToUse->GetPointSize() / 1000.0f * m_scaleFactor; /* 3. now the font metrics are read in, calc size this - / is done by adding the widths of the characters in the - / string. they are given in 1/1000 of the size! */ + / is done by adding the widths of the characters in the + / string. they are given in 1/1000 of the size! */ - long widthSum=0; - long height=Size; /* by default */ + long sum=0; + wxCoord height=Size; /* by default */ unsigned char *p; - for(p=(unsigned char *)(const char *)string; *p; p++) + for(p=(unsigned char *)wxMBSTRINGCAST strbuf; *p; p++) { if(lastWidths[*p]== INT_MIN) - { - wxLogDebug("GetTextExtent: undefined width for character '%c' (%d)\n", *p,*p); - widthSum += (long)(lastWidths[' ']/1000.0F * Size); /* assume space */ + { + wxLogDebug(wxT("GetTextExtent: undefined width for character '%hc' (%d)"), *p,*p); + sum += lastWidths[' ']; /* assume space */ } - else - { - widthSum += (long)((lastWidths[*p]/1000.0F)*Size); + else + { + sum += lastWidths[*p]; } } - + + double widthSum = sum; + widthSum *= Size; + widthSum /= 1000.0F; + /* add descender to height (it is usually a negative value) */ - if (lastDescender!=INT_MIN) - { - height += (long)(((-lastDescender)/1000.0F) * Size); /* MATTHEW: forgot scale */ - } + //if (lastDescender != INT_MIN) + //{ + // height += (wxCoord)(((-lastDescender)/1000.0F) * Size); /* MATTHEW: forgot scale */ + //} + // - commented by V. Slavik - height already contains descender in it + // (judging from few experiments) /* return size values */ - *x = widthSum; - *y = height; + if ( x ) + *x = (wxCoord)widthSum; + if ( y ) + *y = height; /* return other parameters */ if (descent) { if(lastDescender!=INT_MIN) - { - *descent = (long)(((-lastDescender)/1000.0F) * Size); /* MATTHEW: forgot scale */ + { + *descent = (wxCoord)(((-lastDescender)/1000.0F) * Size); /* MATTHEW: forgot scale */ } - else - { - *descent = 0; + else + { + *descent = 0; } } @@ -1813,28 +2213,6 @@ void wxPostScriptDC::GetTextExtent (const wxString& string, long *x, long *y, #endif } -void wxPostScriptDC::GetSizeMM(long *width, long *height) const -{ - const char *paperType = wxThePrintSetupData->GetPaperName(); - - if (!paperType) paperType = _("A4 210 x 297 mm"); - - wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(paperType); - - if (!paper) paper = wxThePrintPaperDatabase->FindPaperType(_("A4 210 x 297 mm")); - - if (paper) - { - if (width) *width = paper->widthMM; - if (height) *height = paper->heightMM; - } - else - { - if (width) *width = 210; - if (height) *height = 297; - } -} - // Determine the Default Postscript Previewer // available on the platform #if defined(__SUN__) && defined(__XVIEW__) @@ -1851,24 +2229,20 @@ void wxPostScriptDC::GetSizeMM(long *width, long *height) const # define PS_VIEWER_PROG "ghostview" #else // Windows ghostscript/ghostview -# define PS_VIEWER_PROG NULL +# define PS_VIEWER_PROG "gsview" #endif wxPrintSetupData *wxThePrintSetupData = (wxPrintSetupData *) NULL; -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxPostScriptModule, wxModule) IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC) IMPLEMENT_DYNAMIC_CLASS(wxPrintSetupData, wxObject) -IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperType, wxObject) -#endif // Redundant now I think #if 1 IMPLEMENT_CLASS(wxPostScriptPrintDialog, wxDialog) wxPostScriptPrintDialog::wxPostScriptPrintDialog (wxWindow *parent, const wxString& title, - const wxPoint& pos, const wxSize& size, long style): + const wxPoint& pos, const wxSize& size, wxCoord style): wxDialog(parent, -1, title, pos, size, style) { wxBeginBusyCursor(); @@ -1879,7 +2253,7 @@ wxPostScriptPrintDialog::wxPostScriptPrintDialog (wxWindow *parent, const wxStri *orientation = new wxString[2], *print_modes = new wxString[3]; int features; - long wx_printer_translate_x, wx_printer_translate_y; + wxCoord wx_printer_translate_x, wx_printer_translate_y; double wx_printer_scale_x, wx_printer_scale_y; orientation[0] = _("Portrait"); @@ -1890,7 +2264,7 @@ wxPostScriptPrintDialog::wxPostScriptPrintDialog (wxWindow *parent, const wxStri print_modes[2] = _("Preview Only"); - + wxButton *okBut = new wxButton (this, wxID_OK, _("OK"), wxPoint(5, 5)); (void) new wxButton (this, wxID_CANCEL, _("Cancel"), wxPoint(40, 5)); okBut->SetDefault(); @@ -1916,18 +2290,18 @@ wxPostScriptPrintDialog::wxPostScriptPrintDialog (wxWindow *parent, const wxStri radio0->SetSelection((int)wxThePrintSetupData->GetPrinterOrientation() - 1); // @@@ Configuration hook - if (wxThePrintSetupData->GetPrintPreviewCommand() == NULL) + if ( !wxThePrintSetupData->GetPrintPreviewCommand() ) wxThePrintSetupData->SetPrintPreviewCommand(PS_VIEWER_PROG); - wxGetResource ("wxWindows", "PSView", &wxThePrintSetupData->previewCommand); + // wxGetResource ("wxWindows", "PSView", &wxThePrintSetupData->m_previewCommand); features = (wxThePrintSetupData->GetPrintPreviewCommand() && - *wxThePrintSetupData->GetPrintPreviewCommand()) ? 3 : 2; - + *wxThePrintSetupData->GetPrintPreviewCommand()) ? 3 : 2; + wxRadioBox *radio1 = new wxRadioBox(this, wxID_PRINTER_MODES, _("PostScript:"), wxPoint(150, yPos), wxSize(-1,-1), features, - print_modes, features, wxRA_SPECIFY_ROWS); + print_modes, features, wxRA_SPECIFY_ROWS); #ifdef __WXMSW__ radio1->Enable(0, FALSE); @@ -1952,13 +2326,13 @@ wxPostScriptPrintDialog::wxPostScriptPrintDialog (wxWindow *parent, const wxStri yPos += 25; (void) new wxStaticText(this, -1, _("X Translation"), wxPoint(5, yPos)); - sprintf (buf, "%.2ld", wx_printer_translate_x); + sprintf (buf, "%.2d", wx_printer_translate_x); /* wxTextCtrl *text3 = */ (void) new wxTextCtrl(this, wxID_PRINTER_X_TRANS, buf, wxPoint(100, yPos), wxSize(100, -1)); (void) new wxStaticText(this, -1, _("Y Translation"), wxPoint(220, yPos)); - sprintf (buf, "%.2ld", wx_printer_translate_y); + sprintf (buf, "%.2d", wx_printer_translate_y); /* wxTextCtrl *text4 = */ (void) new wxTextCtrl(this, wxID_PRINTER_Y_TRANS, buf, wxPoint(320, yPos), wxSize(100, -1)); - + Fit (); delete[] orientation; @@ -1980,17 +2354,21 @@ int wxPostScriptPrintDialog::ShowModal () wxRadioBox *radio0 = (wxRadioBox *)FindWindow(wxID_PRINTER_ORIENTATION); wxRadioBox *radio1 = (wxRadioBox *)FindWindow(wxID_PRINTER_MODES); - StringToDouble (WXSTRINGCAST text1->GetValue (), &wxThePrintSetupData->printerScaleX); - StringToDouble (WXSTRINGCAST text2->GetValue (), &wxThePrintSetupData->printerScaleY); - StringToLong (WXSTRINGCAST text3->GetValue (), &wxThePrintSetupData->printerTranslateX); - StringToLong (WXSTRINGCAST text4->GetValue (), &wxThePrintSetupData->printerTranslateY); + StringToDouble (WXSTRINGCAST text1->GetValue (), &wxThePrintSetupData->m_printerScaleX); + StringToDouble (WXSTRINGCAST text2->GetValue (), &wxThePrintSetupData->m_printerScaleY); + + long dummy; + StringToLong (WXSTRINGCAST text3->GetValue (), &dummy); + wxThePrintSetupData->m_printerTranslateX = (wxCoord)dummy; + StringToLong (WXSTRINGCAST text4->GetValue (), &dummy); + wxThePrintSetupData->m_printerTranslateY = (wxCoord)dummy; #ifdef __X__ // wxThePrintSetupData->SetPrinterOptions(WXSTRINGCAST text0->GetValue ()); // wxThePrintSetupData->SetPrinterCommand(WXSTRINGCAST text_prt->GetValue ()); #endif - wxThePrintSetupData->SetPrinterOrientation((radio0->GetSelection() == 1 ? PS_LANDSCAPE : PS_PORTRAIT)); + wxThePrintSetupData->SetPrinterOrientation((radio0->GetSelection() == 1 ? wxLANDSCAPE : wxPORTRAIT)); // C++ wants this switch ( radio1->GetSelection() ) { @@ -2007,22 +2385,22 @@ int wxPostScriptPrintDialog::ShowModal () // PostScript printer settings // RETAINED FOR BACKWARD COMPATIBILITY -void wxSetPrinterCommand(const char *cmd) +void wxSetPrinterCommand(const wxString& cmd) { wxThePrintSetupData->SetPrinterCommand(cmd); } -void wxSetPrintPreviewCommand(const char *cmd) +void wxSetPrintPreviewCommand(const wxString& cmd) { wxThePrintSetupData->SetPrintPreviewCommand(cmd); } -void wxSetPrinterOptions(const char *flags) +void wxSetPrinterOptions(const wxString& flags) { wxThePrintSetupData->SetPrinterOptions(flags); } -void wxSetPrinterFile(const char *f) +void wxSetPrinterFile(const wxString& f) { wxThePrintSetupData->SetPrinterFile(f); } @@ -2037,7 +2415,7 @@ void wxSetPrinterScaling(double x, double y) wxThePrintSetupData->SetPrinterScaling(x, y); } -void wxSetPrinterTranslation(long x, long y) +void wxSetPrinterTranslation(wxCoord x, wxCoord y) { wxThePrintSetupData->SetPrinterTranslation(x, y); } @@ -2048,28 +2426,28 @@ void wxSetPrinterMode(int mode) wxThePrintSetupData->SetPrinterMode(mode); } -void wxSetAFMPath(const char *f) +void wxSetAFMPath(const wxString& f) { wxThePrintSetupData->SetAFMPath(f); } // Get current values -char *wxGetPrinterCommand() +wxString wxGetPrinterCommand() { return wxThePrintSetupData->GetPrinterCommand(); } -char *wxGetPrintPreviewCommand() +wxString wxGetPrintPreviewCommand() { return wxThePrintSetupData->GetPrintPreviewCommand(); } -char *wxGetPrinterOptions() +wxString wxGetPrinterOptions() { return wxThePrintSetupData->GetPrinterOptions(); } -char *wxGetPrinterFile() +wxString wxGetPrinterFile() { return wxThePrintSetupData->GetPrinterFile(); } @@ -2084,7 +2462,7 @@ void wxGetPrinterScaling(double* x, double* y) wxThePrintSetupData->GetPrinterScaling(x, y); } -void wxGetPrinterTranslation(long *x, long *y) +void wxGetPrinterTranslation(wxCoord *x, wxCoord *y) { wxThePrintSetupData->GetPrinterTranslation(x, y); } @@ -2094,7 +2472,7 @@ int wxGetPrinterMode() return wxThePrintSetupData->GetPrinterMode(); } -char *wxGetAFMPath() +wxString wxGetAFMPath() { return wxThePrintSetupData->GetAFMPath(); } @@ -2105,200 +2483,17 @@ char *wxGetAFMPath() wxPrintSetupData::wxPrintSetupData() { - printerCommand = (char *) NULL; - previewCommand = (char *) NULL; - printerFlags = (char *) NULL; - printerOrient = PS_PORTRAIT; - printerScaleX = (double)1.0; - printerScaleY = (double)1.0; - printerTranslateX = 0; - printerTranslateY = 0; - // 1 = Preview, 2 = print to file, 3 = send to printer - printerMode = 3; - afmPath = (char *) NULL; - paperName = (char *) NULL; - printColour = TRUE; - printerFile = (char *) NULL; + m_printerOrient = wxPORTRAIT; + m_printerScaleX = (double)1.0; + m_printerScaleY = (double)1.0; + m_printerTranslateX = 0; + m_printerTranslateY = 0; + m_printerMode = wxPRINT_MODE_FILE; + m_printColour = TRUE; } wxPrintSetupData::~wxPrintSetupData() { - if (printerCommand) - delete[] printerCommand; - if (previewCommand) - delete[] previewCommand; - if (printerFlags) - delete[] printerFlags; - if (afmPath) - delete[] afmPath; - if (paperName) - delete[] paperName; - if (printerFile) - delete[] printerFile; -} - -void wxPrintSetupData::SetPrinterCommand(const char *cmd) -{ - if (cmd == printerCommand) - return; - - if (printerCommand) - delete[] printerCommand; - if (cmd) - printerCommand = copystring(cmd); - else - printerCommand = (char *) NULL; -} - -void wxPrintSetupData::SetPrintPreviewCommand(const char *cmd) -{ - if (cmd == previewCommand) - return; - - if (previewCommand) - delete[] previewCommand; - if (cmd) - previewCommand = copystring(cmd); - else - previewCommand = (char *) NULL; -} - -void wxPrintSetupData::SetPaperName(const char *name) -{ - if (name == paperName) - return; - - if (paperName) - delete[] paperName; - if (name) - paperName = copystring(name); - else - paperName = (char *) NULL; -} - -void wxPrintSetupData::SetPrinterOptions(const char *flags) -{ - if (printerFlags == flags) - return; - - if (printerFlags) - delete[] printerFlags; - if (flags) - printerFlags = copystring(flags); - else - printerFlags = (char *) NULL; -} - -void wxPrintSetupData::SetPrinterFile(const char *f) -{ - if (f == printerFile) - return; - - if (printerFile) - delete[] printerFile; - if (f) - printerFile = copystring(f); - else - printerFile = (char *) NULL; -} - -void wxPrintSetupData::SetPrinterOrientation(int orient) -{ - printerOrient = orient; -} - -void wxPrintSetupData::SetPrinterScaling(double x, double y) -{ - printerScaleX = x; - printerScaleY = y; -} - -void wxPrintSetupData::SetPrinterTranslation(long x, long y) -{ - printerTranslateX = x; - printerTranslateY = y; -} - -// 1 = Preview, 2 = print to file, 3 = send to printer -void wxPrintSetupData::SetPrinterMode(int mode) -{ - printerMode = mode; -} - -void wxPrintSetupData::SetAFMPath(const char *f) -{ - if (f == afmPath) - return; - - if (afmPath) - delete[] afmPath; - if (f) - afmPath = copystring(f); - else - afmPath = (char *) NULL; -} - -void wxPrintSetupData::SetColour(bool col) -{ - printColour = col; -} - -// Get current values -char *wxPrintSetupData::GetPrinterCommand() -{ - return printerCommand; -} - -char *wxPrintSetupData::GetPrintPreviewCommand() -{ - return previewCommand; -} - -char *wxPrintSetupData::GetPrinterOptions() -{ - return printerFlags; -} - -char *wxPrintSetupData::GetPrinterFile() -{ - return printerFile; -} - -char *wxPrintSetupData::GetPaperName() -{ - return paperName; -} - -int wxPrintSetupData::GetPrinterOrientation() -{ - return printerOrient; -} - -void wxPrintSetupData::GetPrinterScaling(double *x, double *y) -{ - *x = printerScaleX; - *y = printerScaleY; -} - -void wxPrintSetupData::GetPrinterTranslation(long *x, long *y) -{ - *x = printerTranslateX; - *y = printerTranslateY; -} - -int wxPrintSetupData::GetPrinterMode() -{ - return printerMode; -} - -char *wxPrintSetupData::GetAFMPath() -{ - return afmPath; -} - -bool wxPrintSetupData::GetColour() -{ - return printColour; } void wxPrintSetupData::operator=(wxPrintSetupData& data) @@ -2306,7 +2501,7 @@ void wxPrintSetupData::operator=(wxPrintSetupData& data) SetPrinterCommand(data.GetPrinterCommand()); SetPrintPreviewCommand(data.GetPrintPreviewCommand()); SetPrinterOptions(data.GetPrinterOptions()); - long x, y; + wxCoord x, y; data.GetPrinterTranslation(&x, &y); SetPrinterTranslation(x, y); @@ -2321,6 +2516,23 @@ void wxPrintSetupData::operator=(wxPrintSetupData& data) SetColour(data.GetColour()); } +// Initialize from a wxPrintData object (wxPrintData should now be used instead of wxPrintSetupData). +void wxPrintSetupData::operator=(const wxPrintData& data) +{ + SetPrinterCommand(data.GetPrinterCommand()); + SetPrintPreviewCommand(data.GetPreviewCommand()); + SetPrinterOptions(data.GetPrinterOptions()); + SetPrinterTranslation((wxCoord)data.GetPrinterTranslateX(), + (wxCoord)data.GetPrinterTranslateY()); + SetPrinterScaling(data.GetPrinterScaleX(), data.GetPrinterScaleY()); + SetPrinterOrientation(data.GetOrientation()); + SetPrinterMode((int) data.GetPrintMode()); + SetAFMPath(data.GetFontMetricPath()); + SetPaperName(wxThePrintPaperDatabase->ConvertIdToName(data.GetPaperId())); + SetColour(data.GetColour()); + SetPrinterFile(data.GetFilename()); +} + void wxInitializePrintSetupData(bool init) { if (init) @@ -2328,9 +2540,9 @@ void wxInitializePrintSetupData(bool init) wxThePrintSetupData = new wxPrintSetupData; wxThePrintSetupData->SetPrintPreviewCommand(PS_VIEWER_PROG); - wxThePrintSetupData->SetPrinterOrientation(PS_PORTRAIT); - wxThePrintSetupData->SetPrinterMode(PS_PREVIEW); - wxThePrintSetupData->SetPaperName(_("A4 210 x 297 mm")); + wxThePrintSetupData->SetPrinterOrientation(wxPORTRAIT); + wxThePrintSetupData->SetPrinterMode(wxPRINT_MODE_PREVIEW); + wxThePrintSetupData->SetPaperName(_("A4 sheet, 210 x 297 mm")); // Could have a .ini file to read in some defaults // - and/or use environment variables, e.g. WXWIN @@ -2342,12 +2554,12 @@ void wxInitializePrintSetupData(bool init) #ifdef __WXMSW__ wxThePrintSetupData->SetPrinterCommand("print"); wxThePrintSetupData->SetAFMPath("c:\\windows\\system\\"); - wxThePrintSetupData->SetPrinterOptions(NULL); + wxThePrintSetupData->SetPrinterOptions(""); #endif #if !defined(__VMS__) && !defined(__WXMSW__) wxThePrintSetupData->SetPrinterCommand("lpr"); - wxThePrintSetupData->SetPrinterOptions((char *) NULL); - wxThePrintSetupData->SetAFMPath((char *) NULL); + wxThePrintSetupData->SetPrinterOptions(""); + wxThePrintSetupData->SetAFMPath(""); #endif } else @@ -2358,86 +2570,19 @@ void wxInitializePrintSetupData(bool init) } } -/* - * Paper size database for PostScript - */ - -wxPrintPaperType::wxPrintPaperType(const char *name, int wmm, int hmm, int wp, int hp) -{ - widthMM = wmm; - heightMM = hmm; - widthPixels = wp; - heightPixels = hp; - pageName = copystring(name); -} - -wxPrintPaperType::~wxPrintPaperType() -{ - delete[] pageName; -} +// A module to allow initialization/cleanup of PostScript-related +// things without calling these functions from app.cpp. -/* - * Print paper database for PostScript - */ - -#if !USE_SHARED_LIBRARIES -IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperDatabase, wxList) -#endif - -wxPrintPaperDatabase::wxPrintPaperDatabase():wxList(wxKEY_STRING) -{ - DeleteContents(TRUE); -} - -wxPrintPaperDatabase::~wxPrintPaperDatabase() +class WXDLLEXPORT wxPostScriptModule: public wxModule { -} - -void wxPrintPaperDatabase::CreateDatabase() -{ - // Need correct values for page size in pixels. - // Each unit is one 'point' = 1/72 of an inch. - // NOTE: WE NEED ALSO TO MAKE ADJUSTMENTS WHEN TRANSLATING - // in wxPostScriptDC code, so we can start from top left. - // So access this database and translate by appropriate number - // of points for this paper size. OR IS IT OK ALREADY? - // Can't remember where the PostScript origin is by default. - // Heck, someone will know how to make it hunky-dory... - // JACS 25/5/95 +DECLARE_DYNAMIC_CLASS(wxPostScriptModule) +public: + wxPostScriptModule() {} + bool OnInit(); + void OnExit(); +}; - AddPaperType(_("A4 210 x 297 mm"), 210, 297, 595, 842); - AddPaperType(_("A3 297 x 420 mm"), 297, 420, 842, 1191); - AddPaperType(_("Letter 8 1/2 x 11 in"), 216, 279, 612, 791); - AddPaperType(_("Legal 8 1/2 x 14 in"), 216, 356, 612, 1009); - -/* - This is for 100 ppi - - AddPaperType(_("A4 210 x 297 mm"), 210, 297, 210*4, 297*4 ); - AddPaperType(_("A3 297 x 420 mm"), 297, 420, 297*4, 420*4 ); - AddPaperType(_("Letter 8 1/2 x 11 in"), 216, 279, 216*4, 279*4 ); - AddPaperType(_("Legal 8 1/2 x 14 in"), 216, 356, 216*4, 356*4 ); -*/ -} - -void wxPrintPaperDatabase::ClearDatabase() -{ - Clear(); -} - -void wxPrintPaperDatabase::AddPaperType(const char *name, int wmm, int hmm, int wp, int hp) -{ - Append(name, new wxPrintPaperType(name, wmm, hmm, wp, hp)); -} - -wxPrintPaperType *wxPrintPaperDatabase::FindPaperType(const char *name) -{ - wxNode *node = Find(name); - if (node) - return (wxPrintPaperType *)node->Data(); - else - return (wxPrintPaperType *) NULL; -} +IMPLEMENT_DYNAMIC_CLASS(wxPostScriptModule, wxModule) /* * Initialization/cleanup module @@ -2446,8 +2591,6 @@ wxPrintPaperType *wxPrintPaperDatabase::FindPaperType(const char *name) bool wxPostScriptModule::OnInit() { wxInitializePrintSetupData(); - wxThePrintPaperDatabase = new wxPrintPaperDatabase; - wxThePrintPaperDatabase->CreateDatabase(); return TRUE; } @@ -2455,9 +2598,10 @@ bool wxPostScriptModule::OnInit() void wxPostScriptModule::OnExit() { wxInitializePrintSetupData(FALSE); - delete wxThePrintPaperDatabase; - wxThePrintPaperDatabase = NULL; } #endif // wxUSE_POSTSCRIPT + +#endif + // wxUSE_PRINTING_ARCHITECTURE