X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce4169a4d129fc6cd165b2e9ccc5cf5d48356020..ebb987b77baefa9e7e74fad6f434fa89ca28ff71:/src/generic/dcpsg.cpp diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp index 880a6a10aa..73ee7231f0 100644 --- a/src/generic/dcpsg.cpp +++ b/src/generic/dcpsg.cpp @@ -21,14 +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" @@ -45,6 +44,7 @@ #include "wx/textctrl.h" #include "wx/prntbase.h" #include "wx/paper.h" +#include "wx/filefn.h" #include @@ -132,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\ @@ -178,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[] = @@ -231,9 +231,23 @@ 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; @@ -250,12 +264,15 @@ wxPostScriptDC::wxPostScriptDC () 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; @@ -300,7 +317,7 @@ bool wxPostScriptDC::Create(const wxString& file, bool interactive, wxWindow *pa wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData) { - m_pstream = (ofstream*) NULL; + m_pstream = (FILE*) NULL; m_currentRed = 0; m_currentGreen = 0; @@ -323,7 +340,11 @@ wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData) wxPostScriptDC::~wxPostScriptDC () { - if (m_pstream) delete m_pstream; + if (m_pstream) + { + fclose( m_pstream ); + m_pstream = (FILE*) NULL; + } } bool wxPostScriptDC::Ok() const @@ -354,18 +375,18 @@ bool wxPostScriptDC::PrinterDialog(wxWindow *parent) wxChar userId[256]; wxGetUserId (userId, sizeof (userId) / sizeof (char)); wxChar tmp[256]; - wxStrcpy (tmp, _T("/tmp/preview_")); + wxStrcpy (tmp, wxT("/tmp/preview_")); wxStrcat (tmp, userId); m_printData.SetFilename(tmp); #endif wxChar tmp2[256]; wxStrcpy(tmp2, m_printData.GetFilename()); - wxStrcat (tmp2, _T(".ps")); + wxStrcat (tmp2, wxT(".ps")); m_printData.SetFilename(tmp2); } - else if ((m_printData.GetFilename() == _T("")) && (m_printData.GetPrintMode() == wxPRINT_MODE_FILE)) + else if ((m_printData.GetFilename() == wxT("")) && (m_printData.GetPrintMode() == wxPRINT_MODE_FILE)) { - wxString file = wxSaveFileSelector (_("PostScript"), _T("ps")); + wxString file = wxSaveFileSelector (_("PostScript"), wxT("ps")); if ( file.IsEmpty() ) { m_ok = FALSE; @@ -379,74 +400,78 @@ bool wxPostScriptDC::PrinterDialog(wxWindow *parent) 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, _T("invalid postscript dc") ); + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); - if (m_clipping) return; + if (m_clipping) DestroyClippingRegion(); - wxDC::SetClippingRegion( x, y, w, h ); + wxDC::DoSetClippingRegion(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", + XLOG2DEV(x), YLOG2DEV(y), + XLOG2DEV(x+w), YLOG2DEV(y), + XLOG2DEV(x+w), YLOG2DEV(y+h), + XLOG2DEV(x), YLOG2DEV(y+h) ); } -void wxPostScriptDC::SetClippingRegion( const wxRegion &WXUNUSED(region) ) -{ -} void wxPostScriptDC::DestroyClippingRegion() { - wxCHECK_RET( m_ok && m_pstream, _T("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( _T("wxPostScriptDC::Clear not implemented.") ); + wxFAIL_MSG( wxT("wxPostScriptDC::Clear not implemented.") ); } -void wxPostScriptDC::DoFloodFill (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( _T("wxPostScriptDC::FloodFill not implemented.") ); + wxFAIL_MSG( wxT("wxPostScriptDC::FloodFill not implemented.") ); } -bool wxPostScriptDC::DoGetPixel (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( _T("wxPostScriptDC::GetPixel not implemented.") ); + wxFAIL_MSG( wxT("wxPostScriptDC::GetPixel not implemented.") ); return FALSE; } -void wxPostScriptDC::DoCrossHair (long WXUNUSED(x), long WXUNUSED(y)) +void wxPostScriptDC::DoCrossHair (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) { - wxFAIL_MSG( _T("wxPostScriptDC::CrossHair not implemented.") ); + wxFAIL_MSG( wxT("wxPostScriptDC::CrossHair not implemented.") ); } -void wxPostScriptDC::DoDrawLine (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, _T("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", + XLOG2DEV(x1), YLOG2DEV(y1), + XLOG2DEV(x2), YLOG2DEV (y2) ); CalcBoundingBox( x1, y1 ); CalcBoundingBox( x2, y2 ); @@ -454,30 +479,32 @@ void wxPostScriptDC::DoDrawLine (long x1, long y1, long x2, long y2) #define RAD2DEG 57.29577951308 -void wxPostScriptDC::DoDrawArc (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, _T("invalid postscript dc") ); + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); - long dx = x1 - xc; - long dy = y1 - yc; - long radius = (long) sqrt(dx*dx+dy*dy); + 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) { - 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 @@ -486,40 +513,42 @@ void wxPostScriptDC::DoDrawArc (long x1, long y1, long x2, long y2, long xc, lon 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", + XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL(radius), YLOG2DEVREL(radius), (wxCoord)alpha1, (wxCoord) alpha2, + XLOG2DEV(xc), YLOG2DEV(yc) ); + + CalcBoundingBox( xc-radius, yc-radius ); + CalcBoundingBox( xc+radius, yc+radius ); } 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 ); - CalcBoundingBox( xc-radius, yc-radius ); - CalcBoundingBox( xc+radius, yc+radius ); + fprintf( m_pstream, + "newpath\n" + "%d %d %d %d %d %d ellipse\n" + "%d %d lineto\n" + "stroke\n" + "fill\n", + XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL(radius), YLOG2DEVREL(radius), (wxCoord)alpha1, (wxCoord) alpha2, + XLOG2DEV(xc), YLOG2DEV(yc) ); + + CalcBoundingBox( xc-radius, yc-radius ); + CalcBoundingBox( xc+radius, yc+radius ); + } } -void wxPostScriptDC::DoDrawEllipticArc(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, _T("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; @@ -536,10 +565,10 @@ void wxPostScriptDC::DoDrawEllipticArc(long x,long y,long w,long h,double sa,dou { 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", + XLOG2DEV(x+w/2), YLOG2DEV(y+h/2), XLOG2DEVREL(w/2), YLOG2DEVREL(h/2), (wxCoord)sa, (wxCoord)ea ); CalcBoundingBox( x ,y ); CalcBoundingBox( x+w, y+h ); @@ -549,90 +578,102 @@ void wxPostScriptDC::DoDrawEllipticArc(long x,long y,long w,long h,double sa,dou { 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", + XLOG2DEV(x+w/2), YLOG2DEV(y+h/2), XLOG2DEVREL(w/2), YLOG2DEVREL(h/2), (wxCoord)sa, (wxCoord)ea ); - CalcBoundingBox( x, y ); + CalcBoundingBox( x ,y ); CalcBoundingBox( x+w, y+h ); } } -void wxPostScriptDC::DoDrawPoint (long x, long y) +void wxPostScriptDC::DoDrawPoint (wxCoord x, wxCoord y) { - wxCHECK_RET( m_ok && m_pstream, _T("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", + XLOG2DEV(x), YLOG2DEV(y), + XLOG2DEV(x+1), YLOG2DEV(y) ); CalcBoundingBox( x, y ); } -void wxPostScriptDC::DoDrawPolygon (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, _T("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 ); + SetBrush( m_brush ); - *m_pstream << "newpath\n"; + fprintf( m_pstream, "newpath\n" ); - 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 ); + wxCoord xx = XLOG2DEV(points[0].x + xoffset); + wxCoord yy = YLOG2DEV(points[0].y + yoffset); - 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"; + 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 = XLOG2DEV(points[i].x + xoffset); + yy = YLOG2DEV(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 ); + SetPen( m_pen ); - *m_pstream << "newpath\n"; + fprintf( m_pstream, "newpath\n" ); - 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 ); + wxCoord xx = XLOG2DEV(points[0].x + xoffset); + wxCoord yy = YLOG2DEV(points[0].y + yoffset); - 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); - } + 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 = XLOG2DEV(points[i].x + xoffset); + yy = YLOG2DEV(points[i].y + yoffset); - *m_pstream << "stroke\n"; + 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::DoDrawLines (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, _T("invalid postscript dc") ); + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); - if (m_pen.GetStyle() == wxTRANSPARENT) - return; - if (n <= 0) - return; + if (m_pen.GetStyle() == wxTRANSPARENT) return; + + if (n <= 0) return; SetPen (m_pen); @@ -642,34 +683,41 @@ void wxPostScriptDC::DoDrawLines (int n, wxPoint points[], long xoffset, long yo CalcBoundingBox( XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset)); } - *m_pstream << "newpath\n" - << XLOG2DEV(points[0].x+xoffset) << " " - << YLOG2DEV(points[0].y+yoffset) << " moveto\n"; + fprintf( m_pstream, + "newpath\n" + "%d %d moveto\n", + XLOG2DEV(points[0].x+xoffset), YLOG2DEV(points[0].y+yoffset) ); for (i = 1; i < n; i++) { - *m_pstream << XLOG2DEV(points[i].x+xoffset) << " " - << YLOG2DEV(points[i].y+yoffset) << " lineto\n"; + fprintf( m_pstream, + "%d %d lineto\n", + XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset) ); } - *m_pstream << "stroke\n"; + fprintf( m_pstream, "stroke\n" ); } -void wxPostScriptDC::DoDrawRectangle (long x, long y, long width, long height) +void wxPostScriptDC::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoord height) { - wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); if (m_brush.GetStyle () != wxTRANSPARENT) { SetBrush( m_brush ); - *m_pstream << "newpath\n" - << XLOG2DEV(x) << " " << YLOG2DEV(y) << " moveto\n" - << XLOG2DEV(x + width) << " " << YLOG2DEV(y) << " lineto\n" - << XLOG2DEV(x + width) << " " << YLOG2DEV(y + height) << " lineto\n" - << XLOG2DEV(x) << " " << YLOG2DEV(y + height) << " lineto\n" - << "closepath\n" - << "fill\n"; + fprintf( m_pstream, + "newpath\n" + "%d %d moveto\n" + "%d %d lineto\n" + "%d %d lineto\n" + "%d %d lineto\n" + "closepath\n" + "fill\n", + XLOG2DEV(x), YLOG2DEV(y), + XLOG2DEV(x + width), YLOG2DEV(y), + XLOG2DEV(x + width), YLOG2DEV(y + height), + XLOG2DEV(x), YLOG2DEV(y + height) ); CalcBoundingBox( x, y ); CalcBoundingBox( x + width, y + height ); @@ -679,22 +727,27 @@ void wxPostScriptDC::DoDrawRectangle (long x, long y, long width, long height) { SetPen (m_pen); - *m_pstream << "newpath\n" - << XLOG2DEV(x) << " " << YLOG2DEV(y) << " moveto\n" - << XLOG2DEV(x + width) << " " << YLOG2DEV(y) << " lineto\n" - << XLOG2DEV(x + width) << " " << YLOG2DEV(y + height) << " lineto\n" - << XLOG2DEV(x) << " " << YLOG2DEV(y + height) << " lineto\n" - << "closepath\n" - << "stroke\n"; + fprintf( m_pstream, + "newpath\n" + "%d %d moveto\n" + "%d %d lineto\n" + "%d %d lineto\n" + "%d %d lineto\n" + "closepath\n" + "stroke\n", + XLOG2DEV(x), YLOG2DEV(y), + XLOG2DEV(x + width), YLOG2DEV(y), + XLOG2DEV(x + width), YLOG2DEV(y + height), + XLOG2DEV(x), YLOG2DEV(y + height) ); CalcBoundingBox( x, y ); CalcBoundingBox( x + width, y + height ); } } -void wxPostScriptDC::DoDrawRoundedRectangle (long x, long y, long width, long height, double radius) +void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius) { - wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); if (radius < 0.0) { @@ -708,24 +761,33 @@ void wxPostScriptDC::DoDrawRoundedRectangle (long x, long y, long width, long he radius = (-radius * smallest); } - long rad = (long) radius; + wxCoord rad = (wxCoord) radius; if (m_brush.GetStyle () != wxTRANSPARENT) { SetBrush( m_brush ); - // Draw rectangle anticlockwise - *m_pstream << "newpath\n" - << XLOG2DEV(x + rad) << " " << YLOG2DEV(y + rad) << " " << XLOG2DEVREL(rad) << " 90 180 arc\n" - << XLOG2DEV(x) << " " << YLOG2DEV(y + rad) << " moveto\n" - << XLOG2DEV(x + rad) << " " << YLOG2DEV(y + height - rad) << " " << XLOG2DEVREL(rad) << " 180 270 arc\n" - << XLOG2DEV(x + width - rad) << " " << YLOG2DEV(y + height) << " lineto\n" - << XLOG2DEV(x + width - rad) << " " << YLOG2DEV(y + height - rad) << " " << XLOG2DEVREL(rad) << " 270 0 arc\n" - << XLOG2DEV(x + width) << " " << YLOG2DEV(y + rad) << " lineto\n" - << XLOG2DEV(x + width - rad) << " " << YLOG2DEV(y + rad) << " " << XLOG2DEVREL(rad) << " 0 90 arc\n" - << XLOG2DEV(x + rad) << " " << YLOG2DEV(y) << " lineto\n" - << "closepath\n" - << "fill\n"; + /* Draw rectangle anticlockwise */ + fprintf( m_pstream, + "newpath\n" + "%d %d %d 90 180 arc\n" + "%d %d moveto\n" + "%d %d %d 180 270 arc\n" + "%d %d lineto\n" + "%d %d %d 270 0 arc\n" + "%d %d lineto\n" + "%d %d %d 0 90 arc\n" + "%d %d lineto\n" + "closepath\n" + "fill\n", + XLOG2DEV(x + rad), YLOG2DEV(y + rad), XLOG2DEVREL(rad), + XLOG2DEV(x), YLOG2DEV(y + rad), + XLOG2DEV(x + rad), YLOG2DEV(y + height - rad), XLOG2DEVREL(rad), + XLOG2DEV(x + width - rad), YLOG2DEV(y + height), + XLOG2DEV(x + width - rad), YLOG2DEV(y + height - rad), XLOG2DEVREL(rad), + XLOG2DEV(x + width), YLOG2DEV(y + rad), + XLOG2DEV(x + width - rad), YLOG2DEV(y + rad), XLOG2DEVREL(rad), + XLOG2DEV(x + rad), YLOG2DEV(y) ); CalcBoundingBox( x, y ); CalcBoundingBox( x + width, y + height ); @@ -735,63 +797,87 @@ void wxPostScriptDC::DoDrawRoundedRectangle (long x, long y, long width, long he { SetPen (m_pen); - // Draw rectangle anticlockwise - *m_pstream << "newpath\n" - << XLOG2DEV(x + rad) << " " << YLOG2DEV(y + rad) << " " << XLOG2DEVREL(rad) << " 90 180 arc\n" - << XLOG2DEV(x) << " " << YLOG2DEV(y + rad) << " moveto\n" - << XLOG2DEV(x + rad) << " " << YLOG2DEV(y + height - rad) << " " << XLOG2DEVREL(rad) << " 180 270 arc\n" - << XLOG2DEV(x + width - rad) << " " << YLOG2DEV(y + height) << " lineto\n" - << XLOG2DEV(x + width - rad) << " " << YLOG2DEV(y + height - rad) << " " << XLOG2DEVREL(rad) << " 270 0 arc\n" - << XLOG2DEV(x + width) << " " << YLOG2DEV(y + rad) << " lineto\n" - << XLOG2DEV(x + width - rad) << " " << YLOG2DEV(y + rad) << " " << XLOG2DEVREL(rad) << " 0 90 arc\n" - << XLOG2DEV(x + rad) << " " << YLOG2DEV(y) << " lineto\n" - << "closepath\n" - << "stroke\n"; + /* Draw rectangle anticlockwise */ + fprintf( m_pstream, + "newpath\n" + "%d %d %d 90 180 arc\n" + "%d %d moveto\n" + "%d %d %d 180 270 arc\n" + "%d %d lineto\n" + "%d %d %d 270 0 arc\n" + "%d %d lineto\n" + "%d %d %d 0 90 arc\n" + "%d %d lineto\n" + "closepath\n" + "stroke\n", + XLOG2DEV(x + rad), YLOG2DEV(y + rad), XLOG2DEVREL(rad), + XLOG2DEV(x), YLOG2DEV(y + rad), + XLOG2DEV(x + rad), YLOG2DEV(y + height - rad), XLOG2DEVREL(rad), + XLOG2DEV(x + width - rad), YLOG2DEV(y + height), + XLOG2DEV(x + width - rad), YLOG2DEV(y + height - rad), XLOG2DEVREL(rad), + XLOG2DEV(x + width), YLOG2DEV(y + rad), + XLOG2DEV(x + width - rad), YLOG2DEV(y + rad), XLOG2DEVREL(rad), + XLOG2DEV(x + rad), YLOG2DEV(y) ); CalcBoundingBox( x, y ); CalcBoundingBox( x + width, y + height ); } } -void wxPostScriptDC::DoDrawEllipse (long x, long y, long width, long height) +void wxPostScriptDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord height) { - wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); if (m_brush.GetStyle () != wxTRANSPARENT) { SetBrush (m_brush); - *m_pstream << "newpath\n" - << XLOG2DEV(x + width / 2) << " " << YLOG2DEV(y + height / 2) << " " - << XLOG2DEV(width / 2) << " " << YLOG2DEVREL(height / 2) << " 0 360 ellipse\n" - << "fill\n"; + fprintf( m_pstream, + "newpath\n" + "%d %d %d %d 0 360 ellipse\n" + "fill\n", + XLOG2DEV(x + width / 2), YLOG2DEV(y + height / 2), + XLOG2DEVREL(width / 2), YLOG2DEVREL(height / 2) ); CalcBoundingBox( x - width, y - height ); CalcBoundingBox( x + width, y + height ); } - if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT) + if (m_pen.GetStyle () != wxTRANSPARENT) { SetPen (m_pen); - *m_pstream << "newpath\n" - << XLOG2DEV(x + width / 2) << " " << YLOG2DEV(y + height / 2) << " " - << XLOG2DEV(width / 2) << " " << YLOG2DEVREL(height / 2) << " 0 360 ellipse\n" - << "stroke\n"; + fprintf( m_pstream, + "newpath\n" + "%d %d %d %d 0 360 ellipse\n" + "stroke\n", + XLOG2DEV(x + width / 2), YLOG2DEV(y + height / 2), + XLOG2DEVREL(width / 2), YLOG2DEVREL(height / 2) ); CalcBoundingBox( x - width, y - height ); CalcBoundingBox( x + width, y + height ); } } -void wxPostScriptDC::DoDrawIcon( const wxIcon& icon, long x, long y ) +void wxPostScriptDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y ) { DrawBitmap( icon, x, y, TRUE ); } -void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, long x, long y, bool WXUNUSED(useMask) ) +/* this has to be char, not wxChar */ +static char hexArray[] = "0123456789ABCDEF"; +static void LocalDecToHex( int dec, char *buf ) { - wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); + int firstDigit = (int)(dec/16.0); + int secondDigit = (int)(dec - (firstDigit*16.0)); + buf[0] = hexArray[firstDigit]; + buf[1] = hexArray[secondDigit]; + buf[2] = 0; +} + +void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool WXUNUSED(useMask) ) +{ + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); if (!bitmap.Ok()) return; @@ -799,142 +885,147 @@ void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, long x, long y, bool if (!image.Ok()) return; - int ww = XLOG2DEVREL(image.GetWidth()); - int hh = YLOG2DEVREL(image.GetHeight()); + wxCoord w = image.GetWidth(); + wxCoord h = image.GetHeight(); - image = image.Scale( ww, hh ); + wxCoord ww = XLOG2DEVREL(image.GetWidth()); + wxCoord hh = YLOG2DEVREL(image.GetHeight()); - if (!image.Ok()) return; + wxCoord xx = XLOG2DEV(x); + wxCoord yy = YLOG2DEV(y + bitmap.GetHeight()); - int xx = XLOG2DEV(x); - int yy = YLOG2DEV(y + bitmap.GetHeight()); - - *m_pstream << "/origstate save def\n" - << "20 dict begin\n" - << "/pix " << ww << " string def\n" - << "/grays " << ww << " string def\n" - << "/npixels 0 def\n" - << "/rgbindx 0 def\n" - << xx << " " << yy << " translate\n" - << ww << " " << hh << " scale\n" - << ww << " " << hh << " 8\n" - << "[" << ww << " 0 0 " << (-hh) << " 0 " << hh << "]\n" - << "{currentfile pix readhexstring pop}\n" - << "false 3 colorimage\n"; - - for (int j = 0; j < hh; j++) + fprintf( m_pstream, + "/origstate save def\n" + "20 dict begin\n" + "/pix %d string def\n" + "/grays %d string def\n" + "/npixels 0 def\n" + "/rgbindx 0 def\n" + "%d %d translate\n" + "%d %d scale\n" + "%d %d 8\n" + "[%d 0 0 %d 0 %d]\n" + "{currentfile pix readhexstring pop}\n" + "false 3 colorimage\n", + w, w, xx, yy, ww, hh, w, h, w, -h, h ); + + + for (int j = 0; j < h; j++) { - for (int i = 0; i < ww; i++) + for (int i = 0; i < w; i++) { - wxChar buffer[5]; - buffer[2] = 0; - wxDecToHex( image.GetRed(i,j), buffer ); - *m_pstream << buffer; - wxDecToHex( image.GetGreen(i,j), buffer ); - *m_pstream << buffer; - wxDecToHex( image.GetBlue(i,j), buffer ); - *m_pstream << buffer; - } - *m_pstream << "\n"; + char buffer[5]; + LocalDecToHex( image.GetRed(i,j), buffer ); + fprintf( m_pstream, buffer ); + LocalDecToHex( image.GetGreen(i,j), buffer ); + fprintf( m_pstream, buffer ); + LocalDecToHex( image.GetBlue(i,j), buffer ); + fprintf( m_pstream, buffer ); + } + fprintf( m_pstream, "\n" ); } - *m_pstream << "end\n"; - *m_pstream << "origstate restore\n"; - + fprintf( m_pstream, "end\n" ); + fprintf( m_pstream, "origstate restore\n" ); } void wxPostScriptDC::SetFont( const wxFont& font ) { - wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); if (!font.Ok()) return; m_font = font; - const char *name; - const char *style = ""; int Style = m_font.GetStyle(); int Weight = m_font.GetWeight(); - switch (m_font.GetFamily ()) + const char *name; + switch (m_font.GetFamily()) { case wxTELETYPE: case wxMODERN: - name = "/Courier"; - break; - case wxSWISS: - name = "/Helvetica"; + { + if (Style == wxITALIC) + { + if (Weight == wxBOLD) + name = "/Courier-BoldOblique"; + else + name = "/Courier-Oblique"; + } + else + { + if (Weight == wxBOLD) + name = "/Courier-Bold"; + else + name = "/Courier"; + } break; + } case wxROMAN: -// name = "/Times-Roman"; - name = "/Times"; // Altered by EDZ + { + if (Style == wxITALIC) + { + if (Weight == wxBOLD) + name = "/Times-BoldItalic"; + else + name = "/Times-Italic"; + } + else + { + if (Weight == wxBOLD) + name = "/Times-Bold"; + else + name = "/Times-Roman"; + } break; + } case wxSCRIPT: - name = "/Zapf-Chancery-MediumItalic"; + { + name = "/ZapfChancery-MediumItalic"; Style = wxNORMAL; Weight = wxNORMAL; break; + } + case wxSWISS: default: - case wxDEFAULT: // Sans Serif Font - name = "/LucidaSans"; - } - - if (Style == wxNORMAL && (Weight == wxNORMAL || Weight == wxLIGHT)) - { - if (m_font.GetFamily () == wxROMAN) - style = "-Roman"; - else - style = ""; - } - else if (Style == wxNORMAL && Weight == wxBOLD) - { - style = "-Bold"; - } - else if (Style == wxITALIC && (Weight == wxNORMAL || Weight == wxLIGHT)) - { - if (m_font.GetFamily () == wxROMAN) - style = "-Italic"; - else - style = "-Oblique"; - } - else if (Style == wxITALIC && Weight == wxBOLD) - { - if (m_font.GetFamily () == wxROMAN) - style = "-BoldItalic"; - else - style = "-BoldOblique"; - } - else if (Style == wxSLANT && (Weight == wxNORMAL || Weight == wxLIGHT)) - { - if (m_font.GetFamily () == wxROMAN) - style = "-Italic"; - else - style = "-Oblique"; - } - else if (Style == wxSLANT && Weight == wxBOLD) - { - if (m_font.GetFamily () == wxROMAN) - style = "-BoldItalic"; - else - style = "-BoldOblique"; - } - else - { - style = ""; + { + if (Style == wxITALIC) + { + if (Weight == wxBOLD) + name = "/Helvetica-BoldOblique"; + else + name = "/Helvetica-Oblique"; + } + else + { + if (Weight == wxBOLD) + name = "/Helvetica-Bold"; + else + name = "/Helvetica"; + } + break; + } } - char buf[100]; - strcpy (buf, name); - strcat (buf, style); + fprintf( m_pstream, name ); + fprintf( m_pstream, " reencodeISO def\n" ); + fprintf( m_pstream, name ); + fprintf( m_pstream, " findfont\n" ); - *m_pstream << buf << " reencodeISO def\n"; - *m_pstream << buf << " findfont\n"; - *m_pstream << YLOG2DEVREL(m_font.GetPointSize()) << " scalefont setfont\n"; + char buffer[100]; + sprintf( buffer, "%f scalefont setfont\n", YLOG2DEVREL(m_font.GetPointSize() * 1000) / 1000.0F); + // this is a hack - we must scale font size (in pts) according to m_scaleY but + // YLOG2DEVREL works with wxCoord type (int or longint). Se we first convert font size + // to 1/1000th of pt and then back. + for (int i = 0; i < 100; i++) + if (buffer[i] == ',') buffer[i] = '.'; + fprintf( m_pstream, buffer ); } void wxPostScriptDC::SetPen( const wxPen& pen ) { - wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); if (!pen.Ok()) return; @@ -942,7 +1033,17 @@ void wxPostScriptDC::SetPen( const wxPen& pen ) m_pen = pen; - *m_pstream << XLOG2DEVREL(m_pen.GetWidth()) << " setlinewidth\n"; + { + char buffer[100]; + #ifdef __WXMSW__ + sprintf( buffer, "%f setlinewidth\n", XLOG2DEVREL(1000 * m_pen.GetWidth()) / 1000.0f ); + #else + sprintf( buffer, "%f setlinewidth\n", XLOG2DEVREL(1000 * m_pen.GetWidth()) / 1000.0f ); + #endif + for (int i = 0; i < 100; i++) + if (buffer[i] == ',') buffer[i] = '.'; + fprintf( m_pstream, buffer ); + } /* Line style - WRONG: 2nd arg is OFFSET @@ -952,21 +1053,21 @@ void wxPostScriptDC::SetPen( const wxPen& pen ) ter is not number of values in the array of the first one, but an offset into this description of the pattern. I mean a real *offset* not index into array. I.e. If the command is [3 4] 1 setdash is used, then there - will be first black line *2* units long, then space 4 units, then the + will be first black line *2* units wxCoord, then space 4 units, then the pattern of *3* units black, 4 units space will be repeated. */ static const char *dotted = "[2 5] 2"; static const char *short_dashed = "[4 4] 2"; - static const char *long_dashed = "[4 8] 2"; + static const char *wxCoord_dashed = "[4 8] 2"; static const char *dotted_dashed = "[6 6 2 6] 4"; const char *psdash = (char *) NULL; - switch (m_pen.GetStyle ()) + switch (m_pen.GetStyle()) { case wxDOT: psdash = dotted; break; case wxSHORT_DASH: psdash = short_dashed; break; - case wxLONG_DASH: psdash = long_dashed; break; + case wxLONG_DASH: psdash = wxCoord_dashed; break; case wxDOT_DASH: psdash = dotted_dashed; break; case wxSOLID: case wxTRANSPARENT: @@ -975,7 +1076,8 @@ void wxPostScriptDC::SetPen( const wxPen& pen ) if (oldStyle != m_pen.GetStyle()) { - *m_pstream << psdash << " setdash\n"; + fprintf( m_pstream, psdash ); + fprintf( m_pstream," setdash\n" ); } // Line colour @@ -986,33 +1088,40 @@ void wxPostScriptDC::SetPen( const wxPen& pen ) 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; - } - - // setgray here ? + 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; + } + // setgray here ? } if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue)) { - float redPS = (float)(red) / 255.0; - float bluePS = (float)(blue) / 255.0; - float greenPS = (float)(green) / 255.0; - *m_pstream << redPS << " " << greenPS << " " << bluePS << " setrgbcolor\n"; - - m_currentRed = red; - m_currentBlue = blue; - m_currentGreen = green; + 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; + m_currentGreen = green; } } void wxPostScriptDC::SetBrush( const wxBrush& brush ) { - wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); if (!brush.Ok()) return; @@ -1025,62 +1134,193 @@ void wxPostScriptDC::SetBrush( const wxBrush& brush ) if (!m_colour) { - // Anything not black is white - if (!(red == (unsigned char) 0 && blue == (unsigned char) 0 - && green == (unsigned char) 0)) - { - red = (unsigned char) 255; - green = (unsigned char) 255; - blue = (unsigned char) 255; - } - - // setgray here ? + // 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; + } + // setgray here ? } if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue)) { - float redPS = (float)(red) / 255.0; - float bluePS = (float)(blue) / 255.0; - float greenPS = (float)(green) / 255.0; - *m_pstream << redPS << " " << greenPS << " " << bluePS << " setrgbcolor\n"; - m_currentRed = red; - m_currentBlue = blue; - m_currentGreen = green; + 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; + m_currentGreen = green; } } -void wxPostScriptDC::DoDrawText( const wxString& text, long x, long y ) +void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) { - wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); - SetFont( m_font ); + wxCoord text_w, text_h, text_descent; - if (m_textForegroundColour.Ok ()) + GetTextExtent(text, &text_w, &text_h, &text_descent); + + // VZ: this seems to be unnecessary, so taking it out for now, if it + // doesn't create any problems, remove this comment entirely + //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 (); + 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)) + { + 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; + m_currentGreen = green; + } + } + + int size = m_font.GetPointSize(); + +// wxCoord by = y + (wxCoord)floor( double(size) * 2.0 / 3.0 ); // approximate baseline +// commented by V. Slavik and replaced by accurate version +// - note that there is still rounding error in text_descent! + wxCoord by = y + size - text_descent; // baseline + fprintf( m_pstream, "%d %d moveto\n", XLOG2DEV(x), YLOG2DEV(by) ); + + fprintf( m_pstream, "(" ); + const wxWX2MBbuf textbuf = text.mb_str(); + int len = strlen(textbuf); + int i; + for (i = 0; i < len; i++) { - // Anything not white is black - if (!(red == (unsigned char) 255 && blue == (unsigned char) 255 - && green == (unsigned char) 255)) + int c = (unsigned char) textbuf[i]; + if (c == ')' || c == '(' || c == '\\') + { + /* Cope with special characters */ + fprintf( m_pstream, "\\" ); + fputc(c, m_pstream); + } + else if ( c >= 128 ) { - red = (unsigned char) 0; - green = (unsigned char) 0; - blue = (unsigned char) 0; + /* Cope with character codes > 127 */ + fprintf(m_pstream, "\\%o", c); + } + else + { + 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", + XLOG2DEV(x), YLOG2DEV(uy), + m_underlineThickness, + XLOG2DEV(x + text_w), YLOG2DEV(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)) { - float redPS = (float)(red) / 255.0; - float bluePS = (float)(blue) / 255.0; - float greenPS = (float)(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; @@ -1090,51 +1330,75 @@ void wxPostScriptDC::DoDrawText( const wxString& text, long x, long y ) 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"; + long by = y + (long)floor( double(size) * 2.0 / 3.0 ); // approximate baseline - *m_pstream << "("; - const wxWX2MBbuf textbuf = text.mb_str(); - int len = strlen (textbuf); + // FIXME only correct for 90 degrees + fprintf(m_pstream, "%d %d moveto\n", + XLOG2DEV((wxCoord)(x + size)), YLOG2DEV((wxCoord)by) ); + + char buffer[100]; + sprintf(buffer, "%.8f rotate\n", angle); int 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(); + int len = strlen(textbuf); for (i = 0; i < len; i++) { int c = (unsigned char) textbuf[i]; - if ( c == ')' || c == '(' || c == '\\') + 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", + XLOG2DEV(x), YLOG2DEV(uy), + m_underlineThickness, + XLOG2DEV(x + w), YLOG2DEV(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; @@ -1142,12 +1406,12 @@ void wxPostScriptDC::SetBackground (const wxBrush& brush) void wxPostScriptDC::SetLogicalFunction (int WXUNUSED(function)) { - wxFAIL_MSG( _T("wxPostScriptDC::SetLogicalFunction not implemented.") ); + wxFAIL_MSG( wxT("wxPostScriptDC::SetLogicalFunction not implemented.") ); } void wxPostScriptDC::DoDrawSpline( wxList *points ) { - wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); SetPen( m_pen ); @@ -1166,64 +1430,73 @@ void wxPostScriptDC::DoDrawSpline( wxList *points ) 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"; + fprintf( m_pstream, + "newpath\n" + "%d %d moveto\n" + "%d %d lineto\n", + XLOG2DEV((wxCoord)x1), YLOG2DEV((wxCoord)y1), + XLOG2DEV((wxCoord)x3), YLOG2DEV((wxCoord)y3) ); - CalcBoundingBox( (long)x1, (long)y1 ); - CalcBoundingBox( (long)x3, (long)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", + XLOG2DEV((wxCoord)x1), YLOG2DEV((wxCoord)y1), + XLOG2DEV((wxCoord)x2), YLOG2DEV((wxCoord)y2), + XLOG2DEV((wxCoord)x3), YLOG2DEV((wxCoord)y3) ); + + CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 ); + CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 ); } -/* - At this point, (x2,y2) and (c,d) are the position of the - next-to-last and last point respectively, in the point list -*/ + /* + 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"; + fprintf( m_pstream, + "%d %d lineto\n" + "stroke\n", + XLOG2DEV((wxCoord)c), YLOG2DEV((wxCoord)d) ); } -long wxPostScriptDC::GetCharWidth() const +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, _T("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, _T("invalid postscript dc") ); + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); int h = 0; int w = 0; @@ -1240,16 +1513,23 @@ void wxPostScriptDC::DoGetSize(int* width, int* height) const if (!paper) paper = wxThePrintPaperDatabase->FindPaperType(wxPAPER_A4); + int w = 595; + int h = 842; if (paper) { - if (width) *width = paper->GetSizeDeviceUnits().x; - if (height) *height = paper->GetSizeDeviceUnits().y; + 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); } void wxPostScriptDC::DoGetSizeMM(int *width, int *height) const @@ -1260,48 +1540,64 @@ void wxPostScriptDC::DoGetSizeMM(int *width, int *height) const if (!paper) paper = wxThePrintPaperDatabase->FindPaperType(wxPAPER_A4); + int w = 210; + int h = 297; if (paper) { - if (width) *width = paper->GetWidth() / 10; - if (height) *height = paper->GetHeight() / 10; + w = paper->GetWidth() / 10; + h = paper->GetHeight() / 10; } - else + + if (m_printData.GetOrientation() == wxLANDSCAPE) { - if (width) *width = 210; - if (height) *height = 297; + int tmp = w; + w = h; + h = tmp; } + + if (width) *width = w; + if (height) *height = h; } // Resolution in pixels per logical inch wxSize wxPostScriptDC::GetPPI(void) const { - return wxSize(72, 72); + return wxSize((int)(72 * ms_PSScaleFactor), + (int)(72 * ms_PSScaleFactor)); } -bool wxPostScriptDC::StartDoc (const wxString& message) +bool wxPostScriptDC::StartDoc( const wxString& message ) { - wxCHECK_MSG( m_ok, FALSE, _T("invalid postscript dc") ); + wxCHECK_MSG( m_ok, FALSE, wxT("invalid postscript dc") ); if (m_printData.GetFilename() == "") { wxString filename = wxGetTempFileName("ps"); m_printData.SetFilename(filename); - - m_ok = TRUE; } - m_pstream = new ofstream (m_printData.GetFilename().fn_str()); + m_pstream = fopen( m_printData.GetFilename().fn_str(), "w+" ); - if (!m_pstream || !m_pstream->good()) + if (!m_pstream) { - wxMessageBox (_("Cannot open file!"), _("Error"), wxOK); + 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 ); @@ -1318,90 +1614,100 @@ bool wxPostScriptDC::StartDoc (const wxString& message) void wxPostScriptDC::EndDoc () { - wxCHECK_RET( m_ok && m_pstream, _T("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; wxChar *header_file = wxGetTempFileName("ps"); - m_pstream = new ofstream( wxConvCurrent->cWX2MB(header_file) ); + m_pstream = fopen( wxConvFile.cWX2MB(header_file) , "w+" ); - *m_pstream << "%!PS-Adobe-2.0\n"; /* PostScript magic strings */ - *m_pstream << "%%Title: " << m_title.mb_str() << "\n"; - *m_pstream << "%%Creator: " << wxTheApp->argv[0] << "\n"; - *m_pstream << "%%CreationDate: " << wxNow().mb_str() << "\n"; + 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: " << MBSTRINGCAST wxConvCurrent->cWX2MB(userID); + fprintf( m_pstream, "%%%%For: %s ", wxMBSTRINGCAST wxConvCurrent->cWX2MB(userID) ); wxChar userName[245]; if (wxGetUserName(userName, sizeof(userName))) - *m_pstream << " (" << MBSTRINGCAST wxConvCurrent->cWX2MB(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: " << MBSTRINGCAST wxConvCurrent->cWX2MB(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; - wx_printer_translate_x = m_printData.GetPrinterTranslateX(); - wx_printer_translate_y = m_printData.GetPrinterTranslateY(); + 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) - { - *m_pstream << "%%Orientation: Landscape\n"; - } + 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) XLOG2DEV(m_minX); + wxCoord minY = (wxCoord) YLOG2DEV(m_minY); + wxCoord maxX = (wxCoord) XLOG2DEV(m_maxX); + wxCoord maxY = (wxCoord) YLOG2DEV(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 (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. @@ -1409,88 +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; wxChar *tmp_file = wxGetTempFileName("ps"); // Paste header Before wx_printer_file - wxConcatFiles (header_file, m_printData.GetFilename(), tmp_file); - wxRemoveFile (header_file); - wxRemoveFile (m_printData.GetFilename()); - wxRenameFile(tmp_file, m_printData.GetFilename()); + 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) + if (m_ok) { - wxString previewCommand(m_printData.GetPreviewCommand()); - wxString printerCommand(m_printData.GetPrinterCommand()); - wxString printerOptions(m_printData.GetPrinterOptions()); - wxString filename(m_printData.GetFilename()); + wxString previewCommand(m_printData.GetPreviewCommand()); + wxString printerCommand(m_printData.GetPrinterCommand()); + wxString printerOptions(m_printData.GetPrinterOptions()); + wxString filename(m_printData.GetFilename()); - 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; - } + 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, _T("invalid postscript dc") ); + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); - *m_pstream << "%%Page: " << (wxPageNumber++) << "\n"; + fprintf( m_pstream, "%%%%Page: %d\n", wxPageNumber++ ); + // What is this one supposed to do? RR. // *m_pstream << "matrix currentmatrix\n"; // Added by Chris Breeze @@ -1499,50 +1793,55 @@ void wxPostScriptDC::StartPage () // 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; + wxCoord translate_x, translate_y; double scale_x, scale_y; - translate_x = m_printData.GetPrinterTranslateX(); - translate_y = m_printData.GetPrinterTranslateY(); + translate_x = (wxCoord)m_printData.GetPrinterTranslateX(); + translate_y = (wxCoord)m_printData.GetPrinterTranslateY(); scale_x = m_printData.GetPrinterScaleX(); scale_y = m_printData.GetPrinterScaleY(); if (m_printData.GetOrientation() == wxLANDSCAPE) { - translate_y -= m_maxY; - *m_pstream << "90 rotate\n"; + 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" ); } - *m_pstream << scale_x << " " << scale_y << " scale\n"; - *m_pstream << translate_x << " " << translate_y << " 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, _T("invalid postscript dc") ); + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); - *m_pstream << "showpage\n"; + fprintf( m_pstream, "showpage\n" ); } -bool wxPostScriptDC::DoBlit( long xdest, long ydest, - long fwidth, long fheight, +bool wxPostScriptDC::DoBlit( wxCoord xdest, wxCoord ydest, + wxCoord fwidth, wxCoord fheight, wxDC *source, - long xsrc, long ysrc, - int rop, bool WXUNUSED(useMask) ) + wxCoord xsrc, wxCoord ysrc, + int rop, bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) ) { - wxCHECK_MSG( m_ok && m_pstream, FALSE, _T("invalid postscript dc") ); + wxCHECK_MSG( m_ok && m_pstream, FALSE, wxT("invalid postscript dc") ); - wxCHECK_MSG( source, FALSE, _T("invalid source dc") ); + wxCHECK_MSG( source, FALSE, wxT("invalid source dc") ); /* blit into a bitmap */ - wxBitmap bitmap( (int)fwidth, (int)fheight ); wxMemoryDC memDC; memDC.SelectObject(bitmap); @@ -1550,34 +1849,33 @@ bool wxPostScriptDC::DoBlit( long xdest, long ydest, memDC.SelectObject(wxNullBitmap); /* draw bitmap. scaling and positioning is done there */ - DrawBitmap( bitmap, xdest, ydest ); return TRUE; } -long wxPostScriptDC::GetCharHeight() const +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 ) const +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, _T("GetTextExtent: no font defined") ); - wxCHECK_RET( x, _T("GetTextExtent: x == NULL") ); - wxCHECK_RET( y, _T("GetTextExtent: y == NULL") ); + wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") ); const wxWX2MBbuf strbuf = string.mb_str(); -#if !USE_AFM_FOR_POSTSCRIPT +#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) */ @@ -1587,8 +1885,10 @@ void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, { height = fontToUse->GetPointSize(); } - *x = strlen (strbuf) * 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 @@ -1620,7 +1920,7 @@ void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, / wxSetAFMPath("d:\\wxw161\\afm\\"); / dc.StartDoc("Test"); / dc.StartPage(); - / long w,h; + / wxCoord w,h; / dc.SetFont(new wxFont(10, wxROMAN, wxNORMAL, wxNORMAL)); / dc.GetTextExtent("Hallo",&w,&h); / dc.EndPage(); @@ -1639,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) @@ -1659,39 +1962,45 @@ void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, 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"; - } + 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"; - else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "TimesBo"; - else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "TimesO"; - else if name = "TimesRo"; /* no typo */ - } + { + 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"; - else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "HelvBo"; - else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "Helv0"; - else name = "Helv"; - } + { + 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 (!m_printData.GetFontMetricPath().IsEmpty()) - { - strcpy( afmName, m_printData.GetFontMetricPath().mb_str() ) - } + 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: @@ -1709,32 +2018,40 @@ void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, /* new elements JC Sun Aug 25 23:21:44 MET DST 1996 */ - strcat(afmName,name); - strcat(afmName,".afm"); - FILE *afmFile = fopen(afmName,"r"); - -#ifdef __UNIX__ - if (afmFile==NULL) - { - strcpy( afmName, "/usr/local/share/wx/gs_afm/" ); - strcat(afmName,name); - strcat(afmName,".afm"); - FILE *afmFile = fopen(afmName,"r"); - } - - if (afmFile==NULL) - { - strcpy( afmName, "/usr/share/wx/gs_afm/" ); - strcat(afmName,name); - strcat(afmName,".afm"); - FILE *afmFile = fopen(afmName,"r"); - } + afmName << name; + FILE *afmFile = wxFopen(afmName,wxT("r")); + + if (afmFile==NULL) + { + 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 = wxINSTALL_PREFIX; + afmName << wxFILE_SEP_PATH + << wxT("share") << wxFILE_SEP_PATH + << wxT("wx") << 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( "GetTextExtent: can't open AFM file '%s'\n", afmName ); - wxLogDebug( " using approximate values\n"); + 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. */ } @@ -1756,7 +2073,7 @@ void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, 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 ); + wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad descender)"), afmName.c_str(),line ); } } /* JC 1.) check for UnderlinePosition */ @@ -1765,7 +2082,7 @@ void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, 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 ); + wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad UnderlinePosition)"), afmName.c_str(), line ); } } /* JC 2.) check for UnderlineThickness */ @@ -1774,7 +2091,7 @@ void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, 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 ); + wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad UnderlineThickness)"), afmName.c_str(), line ); } } /* JC 3.) check for EncodingScheme */ @@ -1783,12 +2100,12 @@ void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, 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 ); + 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 */ @@ -1796,11 +2113,11 @@ void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, { 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) @@ -1810,7 +2127,7 @@ void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, else { /* MATTHEW: this happens a lot; don't print an error */ - /* wxLogDebug("AFM-file '%s': ASCII value %d out of range\n",afmName,ascii); */ + /* wxLogDebug("AFM-file '%s': ASCII value %d out of range",afmName.c_str(),ascii); */ } } /* C.) ignore other entries. */ @@ -1828,48 +2145,63 @@ 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 = YLOG2DEVREL((wxCoord)(UnderlinePosition * fontToUse->GetPointSize())) / 1000.0f; + pt = (double*) &m_underlineThickness; + *pt = YLOG2DEVREL((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! */ - long widthSum=0; - long height=Size; /* by default */ + long sum=0; + wxCoord height=Size; /* by default */ unsigned char *p; - for(p=(unsigned char *)strbuf; *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); + 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 { @@ -1899,22 +2231,20 @@ void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, # 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(wxPostScriptDC, wxDC) IMPLEMENT_DYNAMIC_CLASS(wxPrintSetupData, 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(); @@ -1925,7 +2255,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"); @@ -1998,11 +2328,11 @@ 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 (); @@ -2028,8 +2358,12 @@ int wxPostScriptPrintDialog::ShowModal () StringToDouble (WXSTRINGCAST text1->GetValue (), &wxThePrintSetupData->m_printerScaleX); StringToDouble (WXSTRINGCAST text2->GetValue (), &wxThePrintSetupData->m_printerScaleY); - StringToLong (WXSTRINGCAST text3->GetValue (), &wxThePrintSetupData->m_printerTranslateX); - StringToLong (WXSTRINGCAST text4->GetValue (), &wxThePrintSetupData->m_printerTranslateY); + + 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 ()); @@ -2083,7 +2417,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); } @@ -2130,7 +2464,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); } @@ -2169,7 +2503,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); @@ -2190,7 +2524,8 @@ void wxPrintSetupData::operator=(const wxPrintData& data) SetPrinterCommand(data.GetPrinterCommand()); SetPrintPreviewCommand(data.GetPreviewCommand()); SetPrinterOptions(data.GetPrinterOptions()); - SetPrinterTranslation(data.GetPrinterTranslateX(), data.GetPrinterTranslateY()); + SetPrinterTranslation((wxCoord)data.GetPrinterTranslateX(), + (wxCoord)data.GetPrinterTranslateY()); SetPrinterScaling(data.GetPrinterScaleX(), data.GetPrinterScaleY()); SetPrinterOrientation(data.GetOrientation()); SetPrinterMode((int) data.GetPrintMode()); @@ -2270,5 +2605,5 @@ void wxPostScriptModule::OnExit() #endif // wxUSE_POSTSCRIPT -#endif - // wxUSE_PRINTING_ARCHITECTURE \ No newline at end of file +#endif + // wxUSE_PRINTING_ARCHITECTURE