#include "wx/textctrl.h"
#include "wx/prntbase.h"
#include "wx/paper.h"
+#include "wx/filefn.h"
#include <math.h>
// 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 = (FILE*) NULL;
if (m_pstream)
{
fclose( m_pstream );
- m_pstream = (FILE*) NULL;
+ m_pstream = (FILE*) NULL;
}
}
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;
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;
- fprintf( m_pstream,
+ fprintf( m_pstream,
"gsave\n newpath\n"
- "%ld %ld moveto\n"
- "%ld %ld lineto\n"
- "%ld %ld lineto\n"
- "%ld %ld 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) );
+ "%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) )
-{
- wxFAIL_MSG( T("wxPostScriptDC::SetClippingRegion not implemented.") );
-}
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;
- fprintf( 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;
fprintf( m_pstream,
"newpath\n"
- "%ld %ld moveto\n"
- "%ld %ld lineto\n"
- "stroke\n",
- XLOG2DEV(x1), YLOG2DEV(y1),
- XLOG2DEV(x2), YLOG2DEV (y2) );
+ "%d %d moveto\n"
+ "%d %d lineto\n"
+ "stroke\n",
+ XLOG2DEV(x1), YLOG2DEV(y1),
+ XLOG2DEV(x2), YLOG2DEV (y2) );
CalcBoundingBox( x1, y1 );
CalcBoundingBox( x2, 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 = alpha2 = 0.0;
- }
+ }
else
{
alpha1 = (x1 - xc == 0) ?
if (m_brush.GetStyle() != wxTRANSPARENT)
{
SetBrush( m_brush );
-
- fprintf( m_pstream,
- "newpath\n"
- "%ld %ld %ld %ld %ld %ld ellipse\n"
- "%ld %ld lineto\n"
- "closepath\n"
- "fill\n",
- XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL(radius), YLOG2DEVREL(radius), (long)alpha1, (long) alpha2,
- XLOG2DEV(xc), YLOG2DEV(yc) );
+
+ 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 );
-
- fprintf( m_pstream,
- "newpath\n"
- "%ld %ld %ld %ld %ld %ld ellipse\n"
- "%ld %ld lineto\n"
- "stroke\n"
- "fill\n",
- XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL(radius), YLOG2DEVREL(radius), (long)alpha1, (long) alpha2,
- XLOG2DEV(xc), YLOG2DEV(yc) );
+
+ 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;
if (m_brush.GetStyle () != wxTRANSPARENT)
{
SetBrush( m_brush );
-
- fprintf( m_pstream,
- "newpath\n"
- "%ld %ld %ld %ld %ld %ld true ellipticarc\n",
- XLOG2DEV(x+w/2), YLOG2DEV(y+h/2), XLOG2DEVREL(w/2), YLOG2DEVREL(h/2), (long)sa, (long)ea );
-
+
+ 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 );
- }
-
+ }
+
if (m_pen.GetStyle () != wxTRANSPARENT)
{
SetPen( m_pen );
- fprintf( m_pstream,
- "newpath\n"
- "%ld %ld %ld %ld %ld %ld false ellipticarc\n",
- XLOG2DEV(x+w/2), YLOG2DEV(y+h/2), XLOG2DEVREL(w/2), YLOG2DEVREL(h/2), (long)sa, (long)ea );
-
+ 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+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;
fprintf( m_pstream,
"newpath\n"
- "%ld %ld moveto\n"
- "%ld %ld lineto\n"
- "stroke\n",
- XLOG2DEV(x), YLOG2DEV(y),
- XLOG2DEV(x+1), YLOG2DEV(y) );
+ "%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;
fprintf( m_pstream, "newpath\n" );
- long xx = XLOG2DEV(points[0].x + xoffset);
- long yy = YLOG2DEV(points[0].y + yoffset);
-
- fprintf( m_pstream, "%ld %ld moveto\n", xx, yy );
-
+ wxCoord xx = XLOG2DEV(points[0].x + xoffset);
+ wxCoord yy = YLOG2DEV(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 = XLOG2DEV(points[i].x + xoffset);
yy = YLOG2DEV(points[i].y + yoffset);
-
- fprintf( m_pstream, "%ld %ld lineto\n", xx, yy );
+
+ fprintf( m_pstream, "%d %d lineto\n", xx, yy );
CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset);
}
-
- fprintf( m_pstream, "fill\n" );
+
+ fprintf( m_pstream, "fill\n" );
}
if (m_pen.GetStyle () != wxTRANSPARENT)
{
SetPen( m_pen );
-
+
fprintf( m_pstream, "newpath\n" );
- long xx = XLOG2DEV(points[0].x + xoffset);
- long yy = YLOG2DEV(points[0].y + yoffset);
-
- fprintf( m_pstream, "%ld %ld moveto\n", xx, yy );
-
+ wxCoord xx = XLOG2DEV(points[0].x + xoffset);
+ wxCoord yy = YLOG2DEV(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 = XLOG2DEV(points[i].x + xoffset);
yy = YLOG2DEV(points[i].y + yoffset);
-
- fprintf( m_pstream, "%ld %ld lineto\n", xx, yy );
-
+
+ fprintf( m_pstream, "%d %d lineto\n", xx, yy );
+
CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset);
}
- fprintf( m_pstream, "fill\n" );
+ 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;
SetPen (m_pen);
fprintf( m_pstream,
"newpath\n"
- "%ld %ld moveto\n",
- XLOG2DEV(points[0].x+xoffset), YLOG2DEV(points[0].y+yoffset) );
+ "%d %d moveto\n",
+ XLOG2DEV(points[0].x+xoffset), YLOG2DEV(points[0].y+yoffset) );
for (i = 1; i < n; i++)
{
fprintf( m_pstream,
- "%ld %ld lineto\n",
- XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset) );
+ "%d %d lineto\n",
+ XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset) );
}
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 );
-
- fprintf( m_pstream,
- "newpath\n"
- "%ld %ld moveto\n"
- "%ld %ld lineto\n"
- "%ld %ld lineto\n"
- "%ld %ld lineto\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) );
+ 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 );
{
SetPen (m_pen);
- fprintf( m_pstream,
- "newpath\n"
- "%ld %ld moveto\n"
- "%ld %ld lineto\n"
- "%ld %ld lineto\n"
- "%ld %ld lineto\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) );
-
+ 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)
{
radius = (-radius * smallest);
}
- long rad = (long) radius;
+ wxCoord rad = (wxCoord) radius;
if (m_brush.GetStyle () != wxTRANSPARENT)
{
SetBrush( m_brush );
/* Draw rectangle anticlockwise */
- fprintf( m_pstream,
- "newpath\n"
- "%ld %ld %ld 90 180 arc\n"
- "%ld %ld moveto\n"
- "%ld %ld %ld 180 270 arc\n"
- "%ld %ld lineto\n"
- "%ld %ld %ld 270 0 arc\n"
- "%ld %ld lineto\n"
- "%ld %ld %ld 0 90 arc\n"
- "%ld %ld lineto\n"
+ 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 + 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) );
+ 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 );
SetPen (m_pen);
/* Draw rectangle anticlockwise */
- fprintf( m_pstream,
- "newpath\n"
- "%ld %ld %ld 90 180 arc\n"
- "%ld %ld moveto\n"
- "%ld %ld %ld 180 270 arc\n"
- "%ld %ld lineto\n"
- "%ld %ld %ld 270 0 arc\n"
- "%ld %ld lineto\n"
- "%ld %ld %ld 0 90 arc\n"
- "%ld %ld lineto\n"
+ 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 + 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) );
+ 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);
- fprintf( m_pstream,
- "newpath\n"
- "%ld %ld %ld %ld 0 360 ellipse\n"
- "fill\n",
- XLOG2DEV(x + width / 2), YLOG2DEV(y + height / 2),
- XLOG2DEV(width / 2), YLOG2DEVREL(height / 2) );
+ 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 );
{
SetPen (m_pen);
- fprintf( m_pstream,
- "newpath\n"
- "%ld %ld %ld %ld 0 360 ellipse\n"
- "stroke\n",
- XLOG2DEV(x + width / 2), YLOG2DEV(y + height / 2),
- XLOG2DEV(width / 2), YLOG2DEVREL(height / 2) );
+ 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 );
}
buf[2] = 0;
}
-void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, long x, long y, bool WXUNUSED(useMask) )
+void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool WXUNUSED(useMask) )
{
- wxCHECK_RET( m_ok && m_pstream, T("invalid postscript dc") );
+ wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
if (!bitmap.Ok()) return;
if (!image.Ok()) return;
- long ww = XLOG2DEVREL(image.GetWidth());
- long 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;
-
- long xx = XLOG2DEV(x);
- long yy = YLOG2DEV(y + bitmap.GetHeight());
+ wxCoord xx = XLOG2DEV(x);
+ wxCoord yy = YLOG2DEV(y + bitmap.GetHeight());
fprintf( m_pstream,
"/origstate save def\n"
- "20 dict begin\n"
- "/pix %ld string def\n"
- "/grays %ld string def\n"
+ "20 dict begin\n"
+ "/pix %d string def\n"
+ "/grays %d string def\n"
"/npixels 0 def\n"
"/rgbindx 0 def\n"
- "%ld %ld translate\n"
- "%ld %ld scale\n"
- "%ld %ld 8\n"
- "[%ld 0 0 %ld 0 %ld]\n"
- "{currentfile pix readhexstring pop}\n"
- "false 3 colorimage\n",
- ww, ww, xx, yy, ww, hh, ww, hh, ww, -hh, hh );
-
- for (int j = 0; j < hh; j++)
+ "%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++)
{
char buffer[5];
LocalDecToHex( image.GetRed(i,j), buffer );
- fprintf( m_pstream, 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, buffer );
+ LocalDecToHex( image.GetBlue(i,j), buffer );
+ fprintf( m_pstream, buffer );
}
fprintf( m_pstream, "\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();
+ 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 == wxITALIC)
+ {
+ if (Weight == wxBOLD)
+ name = "/Helvetica-BoldOblique";
+ else
+ name = "/Helvetica-Oblique";
+ }
+ else
+ {
+ if (Weight == wxBOLD)
+ name = "/Helvetica-Bold";
+ else
+ name = "/Helvetica";
+ }
+ break;
+ }
}
- 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 = "";
- }
+ fprintf( m_pstream, name );
+ fprintf( m_pstream, " reencodeISO def\n" );
+ fprintf( m_pstream, name );
+ fprintf( m_pstream, " findfont\n" );
char buffer[100];
- strcpy( buffer, name );
- strcat( buffer, style );
-
- fprintf( m_pstream, buffer );
- fprintf( m_pstream, " reencodeISO def\n" );
+ 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 );
- fprintf( m_pstream, " findfont\n" );
- #ifdef __WXMSW__
- fprintf( m_pstream, "%d scalefont setfont\n", YLOG2DEVREL(m_font.GetPointSize()) );
- #else
- fprintf( m_pstream, "%ld scalefont setfont\n", YLOG2DEVREL(m_font.GetPointSize()) );
- #endif
}
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;
m_pen = pen;
- #ifdef __WXMSW__
- fprintf( m_pstream, "%d setlinewidth\n", XLOG2DEVREL(m_pen.GetWidth()) );
- #else
- fprintf( m_pstream, "%ld setlinewidth\n", XLOG2DEVREL(m_pen.GetWidth()) );
- #endif
+ {
+ 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
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;
{
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:
if (oldStyle != m_pen.GetStyle())
{
fprintf( m_pstream, psdash );
- fprintf( m_pstream," setdash\n" );
+ fprintf( m_pstream," setdash\n" );
}
// Line colour
if (!m_colour)
{
// Anything not white is black
- if (! (red == (unsigned char) 255 &&
- blue == (unsigned char) 255 &&
+ 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 ?
}
double redPS = (double)(red) / 255.0;
double bluePS = (double)(blue) / 255.0;
double greenPS = (double)(green) / 255.0;
-
- fprintf( m_pstream,
- "%.8f %.8f %.8f setrgbcolor\n",
- redPS, greenPS, bluePS );
-
+
+ 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;
if (!m_colour)
{
// Anything not white is black
- if (! (red == (unsigned char) 255 &&
- blue == (unsigned char) 255 &&
+ 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))
{
double redPS = (double)(red) / 255.0;
double bluePS = (double)(blue) / 255.0;
double greenPS = (double)(green) / 255.0;
-
- fprintf( m_pstream,
- "%.8f %.8f %.8f setrgbcolor\n",
- redPS, greenPS, bluePS );
-
+
+ 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, wxT("invalid postscript dc") );
+
+ wxCoord text_w, text_h, text_descent;
+
+ 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();
+
+ 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++)
+ {
+ 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 )
+ {
+ /* Cope with character codes > 127 */
+ fprintf(m_pstream, "\\%o", c);
+ }
+ else
+ {
+ fputc(c, m_pstream);
+ }
+ }
+
+ 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 )
{
- wxCHECK_RET( m_ok && m_pstream, T("invalid postscript dc") );
+ if (angle == 0.0)
+ {
+ DoDrawText(text, x, y);
+ return;
+ }
+
+ wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
SetFont( m_font );
if (!m_colour)
{
// Anything not white is black
- if (! (red == (unsigned char) 255 &&
- blue == (unsigned char) 255 &&
- green == (unsigned char) 255))
+ if (! (red == (unsigned char) 255 &&
+ blue == (unsigned char) 255 &&
+ green == (unsigned char) 255))
{
red = (unsigned char) 0;
green = (unsigned char) 0;
double redPS = (double)(red) / 255.0;
double bluePS = (double)(blue) / 255.0;
double greenPS = (double)(green) / 255.0;
-
- fprintf( m_pstream,
- "%.8f %.8f %.8f setrgbcolor\n",
- redPS, greenPS, bluePS );
-
+
+ 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();
long by = y + (long)floor( double(size) * 2.0 / 3.0 ); // approximate baseline
- fprintf( m_pstream, "%ld %ld moveto\n", XLOG2DEV(x), YLOG2DEV(by) );
- /* I don't know how to write char to a stream, so I use a mini string */
- char tmpbuf[2];
- tmpbuf[1] = 0;
-
+ // 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);
- int i;
for (i = 0; i < len; i++)
{
int c = (unsigned char) textbuf[i];
if (c == ')' || c == '(' || c == '\\')
{
/* Cope with special characters */
- fprintf( m_pstream, "\\" );
- tmpbuf[0] = (char) c;
- fprintf( m_pstream, tmpbuf );
+ fprintf( m_pstream, "\\" );
+ fputc(c, m_pstream);
}
else if ( c >= 128 )
{
/* Cope with character codes > 127 */
- fprintf(m_pstream, "\\%o", c);
+ fprintf(m_pstream, "\\%o", c);
}
else
- {
- tmpbuf[0] = (char) c;
- fprintf( m_pstream, tmpbuf );
- }
+ {
+ fputc(c, m_pstream);
+ }
}
-
+
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);
- fprintf( m_pstream,
- "gsave\n"
- "%ld %ld moveto\n"
- "%ld setlinewidth\n"
- "%ld %ld lineto\n"
- "stroke\n"
- "grestore\n",
- XLOG2DEV(x), YLOG2DEV(uy),
- (long)m_underlineThickness,
- XLOG2DEV(x + w), YLOG2DEV(uy) );
+ 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;
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 );
x3 = a = (double)(x1 + c) / 2;
y3 = b = (double)(y1 + d) / 2;
- fprintf( m_pstream,
+ fprintf( m_pstream,
"newpath\n"
- "%ld %ld moveto\n"
- "%ld %ld lineto\n",
- XLOG2DEV((long)x1), YLOG2DEV((long)y1),
- XLOG2DEV((long)x3), YLOG2DEV((long)y3) );
+ "%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)
{
d = q->y;
x3 = (double)(x2 + c) / 2;
y3 = (double)(y2 + d) / 2;
-
- fprintf( m_pstream,
- "%ld %ld %ld %ld %ld %ld DrawSplineSection\n",
- XLOG2DEV((long)x1), YLOG2DEV((long)y1),
- XLOG2DEV((long)x2), YLOG2DEV((long)y2),
- XLOG2DEV((long)x3), YLOG2DEV((long)y3) );
-
- 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
+ */
fprintf( m_pstream,
- "%ld %ld lineto\n"
- "stroke\n",
- XLOG2DEV((long)c), YLOG2DEV((long)d) );
+ "%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;
w = paper->GetSizeDeviceUnits().x;
h = paper->GetSizeDeviceUnits().y;
}
-
+
if (m_printData.GetOrientation() == wxLANDSCAPE)
{
int tmp = w;
- w = h;
- h = tmp;
+ w = h;
+ h = tmp;
}
-
- if (width) *width = w;
- if (height) *height = h;
+
+ if (width) *width = (int)(w * ms_PSScaleFactor);
+ if (height) *height = (int)(h * ms_PSScaleFactor);
}
void wxPostScriptDC::DoGetSizeMM(int *width, int *height) const
w = paper->GetWidth() / 10;
h = paper->GetHeight() / 10;
}
-
+
if (m_printData.GetOrientation() == wxLANDSCAPE)
{
int tmp = w;
- w = h;
- h = tmp;
+ 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 )
{
- 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_pstream = fopen( m_printData.GetFilename().fn_str(), "w+" );
if (!m_pstream)
{
- wxMessageBox( _("Cannot open file for PostScript printing!"), _("Error"), wxOK );
+ wxLogError( _("Cannot open file for PostScript printing!"));
m_ok = FALSE;
return FALSE;
}
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;
- fprintf( m_pstream, "grestore\n" );
+ fprintf( m_pstream, "grestore\n" );
}
fclose( m_pstream );
wxChar userName[245];
if (wxGetUserName(userName, sizeof(userName)))
fprintf( m_pstream, " (%s)", wxMBSTRINGCAST wxConvCurrent->cWX2MB(userName) );
- fprintf( m_pstream, "\n" );
+ fprintf( m_pstream, "\n" );
}
else if ( wxGetUserName(userID, sizeof(userID)) )
{
// THE FOLLOWING HAS BEEN CONTRIBUTED BY Andy Fyfe <andy@hyperparallel.com>
- 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();
// 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.
- fprintf( m_pstream,
- "%%%%BoundingBox: %ld %ld %ld %ld\n",
- (long)floor((double)llx), (long)floor((double)lly),
- (long)ceil((double)urx), (long)ceil((double)ury) );
+ 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" );
// adjustment of scale, rotation, or translation, and hence are in the
// default user coordinates.
fprintf( m_pstream, "%% newpath\n" );
- fprintf( m_pstream, "%% %ld %ld moveto\n", llx, lly );
- fprintf( m_pstream, "%% %ld %ld lineto\n", urx, lly );
- fprintf( m_pstream, "%% %ld %ld lineto\n", urx, ury );
- fprintf( m_pstream, "%% %ld %ld lineto closepath stroke\n", llx, ury );
+ 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 );
fclose( m_pstream );
m_pstream = (FILE*) NULL;
wxString printerOptions(m_printData.GetPrinterOptions());
wxString filename(m_printData.GetFilename());
- switch (m_printData.GetPrintMode())
- {
+ switch (m_printData.GetPrintMode())
+ {
case wxPRINT_MODE_PREVIEW:
{
wxChar *argv[3];
void wxPostScriptDC::StartPage()
{
- wxCHECK_RET( m_ok && m_pstream, T("invalid postscript dc") );
+ wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
fprintf( m_pstream, "%%%%Page: %d\n", wxPageNumber++ );
// (and rotate the page for landscape printing)
// 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();
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" );
+ // fprintf( m_pstream, "90 rotate llx neg ury nef translate\n" );
}
- fprintf( m_pstream, "%.8f %.8f scale\n", scale_x, scale_y );
- fprintf( m_pstream, "%ld %ld translate\n", translate_x, translate_y );
+ 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") );
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,
+ wxCoord xsrc, wxCoord ysrc,
int rop, bool WXUNUSED(useMask) )
{
- 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 );
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();
{
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
/ 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();
static int lastWeight= INT_MIN;
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)
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 name = "TimesRo";
- }
+ {
+ 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().fn_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:
/* 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");
- afmFile = fopen(afmName,"r");
- }
-
- if (afmFile==NULL)
- {
- strcpy( afmName, "/usr/share/wx/gs_afm/" );
- strcat(afmName,name);
- strcat(afmName,".afm");
- 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. */
}
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 */
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 */
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 */
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 */
{
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)
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. */
lastWidths[220] = lastWidths['U']; // Ü
lastWidths[252] = lastWidths['u']; // ü
lastWidths[223] = lastWidths[251]; // ß
- }
- /* JC: calculate UnderlineThickness/UnderlinePosition */
- {
+ /* JC: calculate UnderlineThickness/UnderlinePosition */
+
// VS: dirty, but is there any better solution?
double *pt;
pt = (double*) &m_underlinePosition;
- *pt = UnderlinePosition * fontToUse->GetPointSize() / 1000.0f;
+ *pt = YLOG2DEVREL((wxCoord)(UnderlinePosition * fontToUse->GetPointSize())) / 1000.0f;
pt = (double*) &m_underlineThickness;
- *pt = UnderlineThickness * fontToUse->GetPointSize() / 1000.0f * m_scaleFactor;
+ *pt = YLOG2DEVREL((wxCoord)(UnderlineThickness * fontToUse->GetPointSize())) / 1000.0f;
+
}
+
/* 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! */
- double 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 = (long)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
{
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();
*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");
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 ();
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 ());
wxThePrintSetupData->SetPrinterScaling(x, y);
}
-void wxSetPrinterTranslation(long x, long y)
+void wxSetPrinterTranslation(wxCoord x, wxCoord y)
{
wxThePrintSetupData->SetPrinterTranslation(x, y);
}
wxThePrintSetupData->GetPrinterScaling(x, y);
}
-void wxGetPrinterTranslation(long *x, long *y)
+void wxGetPrinterTranslation(wxCoord *x, wxCoord *y)
{
wxThePrintSetupData->GetPrinterTranslation(x, y);
}
SetPrinterCommand(data.GetPrinterCommand());
SetPrintPreviewCommand(data.GetPrintPreviewCommand());
SetPrinterOptions(data.GetPrinterOptions());
- long x, y;
+ wxCoord x, y;
data.GetPrinterTranslation(&x, &y);
SetPrinterTranslation(x, y);
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());
#endif
// wxUSE_POSTSCRIPT
-#endif
+#endif
// wxUSE_PRINTING_ARCHITECTURE
projects / wxWidgets.git / blobdiff