Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fix for MSW

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-01-23 23:52:35 +00:00
parent 90186e524e
commit 9a6be59a80
1 changed files with 277 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

539
src/generic/dcpsg.cpp
View File

@@ -6,7 +6,7 @@
// Created: 04/01/98 // Created: 04/01/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem // Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@@ -14,7 +14,16 @@
#pragma interface #pragma interface
#endif #endif
#include "wx/defs.h" #include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/setup.h"
#include "wx/defs.h"
#endif // WX_PRECOMP
#if wxUSE_POSTSCRIPT #if wxUSE_POSTSCRIPT
@@ -68,20 +77,20 @@ static const char *wxPostScriptHeaderEllipse = "\
/ellipsedict 8 dict def\n\ /ellipsedict 8 dict def\n\
ellipsedict /mtrx matrix put\n\ ellipsedict /mtrx matrix put\n\
/ellipse {\n\ /ellipse {\n\
ellipsedict begin\n\ ellipsedict begin\n\
/endangle exch def\n\ /endangle exch def\n\
/startangle exch def\n\ /startangle exch def\n\
/yrad exch def\n\ /yrad exch def\n\
/xrad exch def\n\ /xrad exch def\n\
/y exch def\n\ /y exch def\n\
/x exch def\n\ /x exch def\n\
/savematrix mtrx currentmatrix def\n\ /savematrix mtrx currentmatrix def\n\
x y translate\n\ x y translate\n\
xrad yrad scale\n\ xrad yrad scale\n\
0 0 1 startangle endangle arc\n\ 0 0 1 startangle endangle arc\n\
savematrix setmatrix\n\ savematrix setmatrix\n\
end\n\ end\n\
} def\n\ } def\n\
"; ";
static const char *wxPostScriptHeaderEllipticArc= "\ static const char *wxPostScriptHeaderEllipticArc= "\
@@ -108,19 +117,19 @@ ellipticarcdict /mtrx matrix put\n\
static const char *wxPostScriptHeaderSpline = "\ static const char *wxPostScriptHeaderSpline = "\
/DrawSplineSection {\n\ /DrawSplineSection {\n\
/y3 exch def\n\ /y3 exch def\n\
/x3 exch def\n\ /x3 exch def\n\
/y2 exch def\n\ /y2 exch def\n\
/x2 exch def\n\ /x2 exch def\n\
/y1 exch def\n\ /y1 exch def\n\
/x1 exch def\n\ /x1 exch def\n\
/xa x1 x2 x1 sub 0.666667 mul add def\n\ /xa x1 x2 x1 sub 0.666667 mul add def\n\
/ya y1 y2 y1 sub 0.666667 mul add def\n\ /ya y1 y2 y1 sub 0.666667 mul add def\n\
/xb x3 x2 x3 sub 0.666667 mul add def\n\ /xb x3 x2 x3 sub 0.666667 mul add def\n\
/yb y3 y2 y3 sub 0.666667 mul add def\n\ /yb y3 y2 y3 sub 0.666667 mul add def\n\
x1 y1 lineto\n\ x1 y1 lineto\n\
xa ya xb yb x3 y3 curveto\n\ xa ya xb yb x3 y3 curveto\n\
} def\n\ } def\n\
"; ";
static const char *wxPostScriptHeaderColourImage = "\ static const char *wxPostScriptHeaderColourImage = "\
@@ -356,10 +365,10 @@ void wxPostScriptDC::SetClippingRegion (long x, long y, long w, long h)
m_clipping = TRUE; m_clipping = TRUE;
*m_pstream << "gsave\n" *m_pstream << "gsave\n"
<< "newpath\n" << "newpath\n"
<< XLOG2DEV(x) << " " << YLOG2DEV(y) << " moveto\n" << XLOG2DEV(x) << " " << YLOG2DEV(y) << " moveto\n"
<< XLOG2DEV(x+w) << " " << YLOG2DEV(y) << " lineto\n" << XLOG2DEV(x+w) << " " << YLOG2DEV(y) << " lineto\n"
<< XLOG2DEV(x+w) << " " << YLOG2DEV(y+h) << " lineto\n" << XLOG2DEV(x+w) << " " << YLOG2DEV(y+h) << " lineto\n"
<< XLOG2DEV(x) << " " << YLOG2DEV(y+h) << " lineto\n" << XLOG2DEV(x) << " " << YLOG2DEV(y+h) << " lineto\n"
<< "closepath clip newpath\n"; << "closepath clip newpath\n";
} }
@@ -410,10 +419,10 @@ void wxPostScriptDC::DrawLine (long x1, long y1, long x2, long y2)
SetPen( m_pen ); SetPen( m_pen );
*m_pstream << "newpath\n" *m_pstream << "newpath\n"
<< XLOG2DEV(x1) << " " << YLOG2DEV (y1) << " moveto\n" << XLOG2DEV(x1) << " " << YLOG2DEV (y1) << " moveto\n"
<< XLOG2DEV(x2) << " " << YLOG2DEV (y2) << " lineto\n" << XLOG2DEV(x2) << " " << YLOG2DEV (y2) << " lineto\n"
<< "stroke\n"; << "stroke\n";
CalcBoundingBox( x1, y1 ); CalcBoundingBox( x1, y1 );
CalcBoundingBox( x2, y2 ); CalcBoundingBox( x2, y2 );
} }
@@ -431,19 +440,19 @@ void wxPostScriptDC::DrawArc (long x1, long y1, long x2, long y2, long xc, long
if (x1 == x2 && y1 == y2) if (x1 == x2 && y1 == y2)
{ {
alpha1 = 0.0; alpha1 = 0.0;
alpha2 = 360.0; alpha2 = 360.0;
} else if (radius == 0.0) } else if (radius == 0.0)
{ {
alpha1 = alpha2 = 0.0; alpha1 = alpha2 = 0.0;
} else } else
{ {
alpha1 = (x1 - xc == 0) ? alpha1 = (x1 - xc == 0) ?
(y1 - yc < 0) ? 90.0 : -90.0 : (y1 - yc < 0) ? 90.0 : -90.0 :
-atan2(double(y1-yc), double(x1-xc)) * RAD2DEG; -atan2(double(y1-yc), double(x1-xc)) * RAD2DEG;
alpha2 = (x2 - xc == 0) ? alpha2 = (x2 - xc == 0) ?
(y2 - yc < 0) ? 90.0 : -90.0 : (y2 - yc < 0) ? 90.0 : -90.0 :
-atan2(double(y2-yc), double(x2-xc)) * RAD2DEG; -atan2(double(y2-yc), double(x2-xc)) * RAD2DEG;
} }
while (alpha1 <= 0) alpha1 += 360; while (alpha1 <= 0) alpha1 += 360;
while (alpha2 <= 0) alpha2 += 360; // adjust angles to be between while (alpha2 <= 0) alpha2 += 360; // adjust angles to be between
@@ -452,31 +461,31 @@ void wxPostScriptDC::DrawArc (long x1, long y1, long x2, long y2, long xc, long
if (m_brush.GetStyle() != wxTRANSPARENT) if (m_brush.GetStyle() != wxTRANSPARENT)
{ {
SetBrush( m_brush ); SetBrush( m_brush );
*m_pstream << "newpath\n" *m_pstream << "newpath\n"
<< XLOG2DEV(xc) << " " << XLOG2DEV(xc) << " "
<< YLOG2DEV(yc) << " " << YLOG2DEV(yc) << " "
<< XLOG2DEVREL(radius) << " " << XLOG2DEVREL(radius) << " "
<< YLOG2DEVREL(radius) << " " << YLOG2DEVREL(radius) << " "
<< alpha1 << " " << alpha1 << " "
<< alpha2 << " ellipse\n" << alpha2 << " ellipse\n"
<< XLOG2DEV(xc) << " " << XLOG2DEV(xc) << " "
<< YLOG2DEV(yc) << " lineto\n" << YLOG2DEV(yc) << " lineto\n"
<< "closepath\n" << "closepath\n"
<< "fill\n"; << "fill\n";
} }
if (m_pen.GetStyle() != wxTRANSPARENT) if (m_pen.GetStyle() != wxTRANSPARENT)
{ {
SetPen( m_pen ); SetPen( m_pen );
*m_pstream << "newpath\n" *m_pstream << "newpath\n"
<< XLOG2DEV(xc) << " " << XLOG2DEV(xc) << " "
<< YLOG2DEV(yc) << " " << YLOG2DEV(yc) << " "
<< XLOG2DEVREL(radius) << " " << XLOG2DEVREL(radius) << " "
<< YLOG2DEVREL(radius) << " " << YLOG2DEVREL(radius) << " "
<< alpha1 << " " << alpha1 << " "
<< alpha2 << " ellipse\n" << alpha2 << " ellipse\n"
<< "stroke\n"; << "stroke\n";
} }
CalcBoundingBox( xc-radius, yc-radius ); CalcBoundingBox( xc-radius, yc-radius );
@@ -503,9 +512,9 @@ void wxPostScriptDC::DrawEllipticArc(long x,long y,long w,long h,double sa,doubl
SetBrush( m_brush ); SetBrush( m_brush );
*m_pstream << "newpath\n" *m_pstream << "newpath\n"
<< XLOG2DEV(x+w/2) << " " << YLOG2DEV(y+h/2) << " " << XLOG2DEV(x+w/2) << " " << YLOG2DEV(y+h/2) << " "
<< XLOG2DEVREL(w/2) << " " << YLOG2DEVREL(h/2) << " " << XLOG2DEVREL(w/2) << " " << YLOG2DEVREL(h/2) << " "
<< int(sa) <<" "<< int(ea) << " true ellipticarc\n"; << int(sa) <<" "<< int(ea) << " true ellipticarc\n";
CalcBoundingBox( x ,y ); CalcBoundingBox( x ,y );
CalcBoundingBox( x+w, y+h ); CalcBoundingBox( x+w, y+h );
@@ -516,9 +525,9 @@ void wxPostScriptDC::DrawEllipticArc(long x,long y,long w,long h,double sa,doubl
SetPen( m_pen ); SetPen( m_pen );
*m_pstream << "newpath\n" *m_pstream << "newpath\n"
<< XLOG2DEV(x+w/2) << " " << YLOG2DEV(y+h/2) << " " << XLOG2DEV(x+w/2) << " " << YLOG2DEV(y+h/2) << " "
<< XLOG2DEVREL(w/2) << " " << XLOG2DEVREL(h/2) << " " << XLOG2DEVREL(w/2) << " " << XLOG2DEVREL(h/2) << " "
<< int(sa) <<" "<< int(ea) << " false ellipticarc\n"; << int(sa) <<" "<< int(ea) << " false ellipticarc\n";
CalcBoundingBox( x, y ); CalcBoundingBox( x, y );
CalcBoundingBox( x+w, y+h ); CalcBoundingBox( x+w, y+h );
@@ -534,9 +543,9 @@ void wxPostScriptDC::DrawPoint (long x, long y)
SetPen (m_pen); SetPen (m_pen);
*m_pstream << "newpath\n" *m_pstream << "newpath\n"
<< XLOG2DEV(x) << " " << YLOG2DEV (y) << " moveto\n" << XLOG2DEV(x) << " " << YLOG2DEV (y) << " moveto\n"
<< XLOG2DEV(x+1) << " " << YLOG2DEV (y) << " lineto\n" << XLOG2DEV(x+1) << " " << YLOG2DEV (y) << " lineto\n"
<< "stroke\n"; << "stroke\n";
CalcBoundingBox( x, y ); CalcBoundingBox( x, y );
} }
@@ -549,45 +558,45 @@ void wxPostScriptDC::DrawPolygon (int n, wxPoint points[], long xoffset, long yo
if (m_brush.GetStyle () != wxTRANSPARENT) if (m_brush.GetStyle () != wxTRANSPARENT)
{ {
SetBrush( m_brush ); SetBrush( m_brush );
*m_pstream << "newpath\n"; *m_pstream << "newpath\n";
long xx = XLOG2DEV(points[0].x + xoffset); long xx = XLOG2DEV(points[0].x + xoffset);
long yy = YLOG2DEV(points[0].y + yoffset); long yy = YLOG2DEV(points[0].y + yoffset);
*m_pstream << xx << " " << yy << " moveto\n"; *m_pstream << xx << " " << yy << " moveto\n";
CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset ); CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset );
for (int i = 1; i < n; i++) for (int i = 1; i < n; i++)
{ {
xx = XLOG2DEV(points[i].x + xoffset); xx = XLOG2DEV(points[i].x + xoffset);
yy = YLOG2DEV(points[i].y + yoffset); yy = YLOG2DEV(points[i].y + yoffset);
*m_pstream << xx << " " << yy << " lineto\n"; *m_pstream << xx << " " << yy << " lineto\n";
CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset); CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset);
} }
*m_pstream << "fill\n"; *m_pstream << "fill\n";
} }
if (m_pen.GetStyle () != wxTRANSPARENT) if (m_pen.GetStyle () != wxTRANSPARENT)
{ {
SetPen( m_pen ); SetPen( m_pen );
*m_pstream << "newpath\n"; *m_pstream << "newpath\n";
long xx = XLOG2DEV(points[0].x + xoffset); long xx = XLOG2DEV(points[0].x + xoffset);
long yy = YLOG2DEV(points[0].y + yoffset); long yy = YLOG2DEV(points[0].y + yoffset);
*m_pstream << xx << " " << yy << " moveto\n"; *m_pstream << xx << " " << yy << " moveto\n";
CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset ); CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset );
for (int i = 1; i < n; i++) for (int i = 1; i < n; i++)
{ {
xx = XLOG2DEV(points[i].x + xoffset); xx = XLOG2DEV(points[i].x + xoffset);
yy = YLOG2DEV(points[i].y + yoffset); yy = YLOG2DEV(points[i].y + yoffset);
*m_pstream << xx << " " << yy << " lineto\n"; *m_pstream << xx << " " << yy << " lineto\n";
CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset); CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset);
} }
*m_pstream << "stroke\n"; *m_pstream << "stroke\n";
} }
} }
@@ -595,24 +604,27 @@ void wxPostScriptDC::DrawLines (int n, wxPoint points[], long xoffset, long yoff
{ {
wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" );
if (m_pen.GetStyle() == wxTRANSPARENT) return; if (m_pen.GetStyle() == wxTRANSPARENT)
if (n <= 0) return; return;
if (n <= 0)
return;
SetPen (m_pen); SetPen (m_pen);
for (int i=0; i<n ; ++i) int i;
for ( i =0; i<n ; i++ )
{ {
CalcBoundingBox( XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset)); CalcBoundingBox( XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset));
} }
*m_pstream << "newpath\n" *m_pstream << "newpath\n"
<< XLOG2DEV(points[0].x+xoffset) << " " << XLOG2DEV(points[0].x+xoffset) << " "
<< YLOG2DEV(points[0].y+yoffset) << " moveto\n"; << YLOG2DEV(points[0].y+yoffset) << " moveto\n";
for (int i = 1; i < n; i++) for (i = 1; i < n; i++)
{ {
*m_pstream << XLOG2DEV(points[i].x+xoffset) << " " *m_pstream << XLOG2DEV(points[i].x+xoffset) << " "
<< YLOG2DEV(points[i].y+yoffset) << " lineto\n"; << YLOG2DEV(points[i].y+yoffset) << " lineto\n";
} }
*m_pstream << "stroke\n"; *m_pstream << "stroke\n";
@@ -665,9 +677,9 @@ void wxPostScriptDC::DrawRoundedRectangle (long x, long y, long width, long heig
// 'the proportion of the smallest X or Y dimension' // 'the proportion of the smallest X or Y dimension'
double smallest = 0.0; double smallest = 0.0;
if (width < height) if (width < height)
smallest = width; smallest = width;
else else
smallest = height; smallest = height;
radius = (-radius * smallest); radius = (-radius * smallest);
} }
@@ -676,7 +688,7 @@ void wxPostScriptDC::DrawRoundedRectangle (long x, long y, long width, long heig
if (m_brush.GetStyle () != wxTRANSPARENT) if (m_brush.GetStyle () != wxTRANSPARENT)
{ {
SetBrush( m_brush ); SetBrush( m_brush );
// Draw rectangle anticlockwise // Draw rectangle anticlockwise
*m_pstream << "newpath\n" *m_pstream << "newpath\n"
<< XLOG2DEV(x + rad) << " " << YLOG2DEV(y + rad) << " " << XLOG2DEVREL(rad) << " 90 180 arc\n" << XLOG2DEV(x + rad) << " " << YLOG2DEV(y + rad) << " " << XLOG2DEVREL(rad) << " 90 180 arc\n"
@@ -697,7 +709,7 @@ void wxPostScriptDC::DrawRoundedRectangle (long x, long y, long width, long heig
if (m_pen.GetStyle () != wxTRANSPARENT) if (m_pen.GetStyle () != wxTRANSPARENT)
{ {
SetPen (m_pen); SetPen (m_pen);
// Draw rectangle anticlockwise // Draw rectangle anticlockwise
*m_pstream << "newpath\n" *m_pstream << "newpath\n"
<< XLOG2DEV(x + rad) << " " << YLOG2DEV(y + rad) << " " << XLOG2DEVREL(rad) << " 90 180 arc\n" << XLOG2DEV(x + rad) << " " << YLOG2DEV(y + rad) << " " << XLOG2DEVREL(rad) << " 90 180 arc\n"
@@ -789,16 +801,16 @@ void wxPostScriptDC::DrawBitmap( const wxBitmap& bitmap, long x, long y, bool WX
{ {
for (int i = 0; i < ww; i++) for (int i = 0; i < ww; i++)
{ {
char buffer[5]; char buffer[5];
buffer[2] = 0; buffer[2] = 0;
wxDecToHex( image.GetRed(i,j), buffer ); wxDecToHex( image.GetRed(i,j), buffer );
*m_pstream << buffer; *m_pstream << buffer;
wxDecToHex( image.GetGreen(i,j), buffer ); wxDecToHex( image.GetGreen(i,j), buffer );
*m_pstream << buffer; *m_pstream << buffer;
wxDecToHex( image.GetBlue(i,j), buffer ); wxDecToHex( image.GetBlue(i,j), buffer );
*m_pstream << buffer; *m_pstream << buffer;
} }
*m_pstream << "\n"; *m_pstream << "\n";
} }
*m_pstream << "end\n"; *m_pstream << "end\n";
@@ -816,14 +828,14 @@ void wxPostScriptDC::SetFont (const wxFont& font)
#ifdef __WXGTK__ #ifdef __WXGTK__
char *name = wxTheFontNameDirectory->GetPostScriptName( m_font.GetFamily(), char *name = wxTheFontNameDirectory->GetPostScriptName( m_font.GetFamily(),
m_font.GetWeight(), m_font.GetWeight(),
m_font.GetStyle() ); m_font.GetStyle() );
if (!name) name = "Times-Roman"; if (!name) name = "Times-Roman";
*m_pstream << "/" << name << " reencodeISO def\n" *m_pstream << "/" << name << " reencodeISO def\n"
<< "/" << name << " findfont\n" << "/" << name << " findfont\n"
<< YLOG2DEVREL(font.GetPointSize()) << YLOG2DEVREL(font.GetPointSize())
<< " scalefont setfont\n"; << " scalefont setfont\n";
#else #else
char buf[100]; char buf[100];
const char *name; const char *name;
@@ -857,9 +869,9 @@ void wxPostScriptDC::SetFont (const wxFont& font)
if (Style == wxNORMAL && (Weight == wxNORMAL || Weight == wxLIGHT)) if (Style == wxNORMAL && (Weight == wxNORMAL || Weight == wxLIGHT))
{ {
if (m_font.GetFamily () == wxROMAN) if (m_font.GetFamily () == wxROMAN)
style = "-Roman"; style = "-Roman";
else else
style = ""; style = "";
} }
else if (Style == wxNORMAL && Weight == wxBOLD) else if (Style == wxNORMAL && Weight == wxBOLD)
style = "-Bold"; style = "-Bold";
@@ -867,30 +879,30 @@ void wxPostScriptDC::SetFont (const wxFont& font)
else if (Style == wxITALIC && (Weight == wxNORMAL || Weight == wxLIGHT)) else if (Style == wxITALIC && (Weight == wxNORMAL || Weight == wxLIGHT))
{ {
if (m_font.GetFamily () == wxROMAN) if (m_font.GetFamily () == wxROMAN)
style = "-Italic"; style = "-Italic";
else else
style = "-Oblique"; style = "-Oblique";
} }
else if (Style == wxITALIC && Weight == wxBOLD) else if (Style == wxITALIC && Weight == wxBOLD)
{ {
if (m_font.GetFamily () == wxROMAN) if (m_font.GetFamily () == wxROMAN)
style = "-BoldItalic"; style = "-BoldItalic";
else else
style = "-BoldOblique"; style = "-BoldOblique";
} }
else if (Style == wxSLANT && (Weight == wxNORMAL || Weight == wxLIGHT)) else if (Style == wxSLANT && (Weight == wxNORMAL || Weight == wxLIGHT))
{ {
if (m_font.GetFamily () == wxROMAN) if (m_font.GetFamily () == wxROMAN)
style = "-Italic"; style = "-Italic";
else else
style = "-Oblique"; style = "-Oblique";
} }
else if (Style == wxSLANT && Weight == wxBOLD) else if (Style == wxSLANT && Weight == wxBOLD)
{ {
if (m_font.GetFamily () == wxROMAN) if (m_font.GetFamily () == wxROMAN)
style = "-BoldItalic"; style = "-BoldItalic";
else else
style = "-BoldOblique"; style = "-BoldOblique";
} }
else else
style = ""; style = "";
@@ -959,14 +971,14 @@ void wxPostScriptDC::SetPen( const wxPen& pen )
{ {
// Anything not white is black // 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)) && green == (unsigned char) 255))
{ {
red = (unsigned char) 0; red = (unsigned char) 0;
green = (unsigned char) 0; green = (unsigned char) 0;
blue = (unsigned char) 0; blue = (unsigned char) 0;
} }
// setgray here ? // setgray here ?
} }
if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue)) if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue))
@@ -1000,14 +1012,14 @@ void wxPostScriptDC::SetBrush( const wxBrush& brush )
{ {
// Anything not black is white // Anything not black is white
if (!(red == (unsigned char) 0 && blue == (unsigned char) 0 if (!(red == (unsigned char) 0 && blue == (unsigned char) 0
&& green == (unsigned char) 0)) && green == (unsigned char) 0))
{ {
red = (unsigned char) 255; red = (unsigned char) 255;
green = (unsigned char) 255; green = (unsigned char) 255;
blue = (unsigned char) 255; blue = (unsigned char) 255;
} }
// setgray here ? // setgray here ?
} }
if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue)) if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue))
@@ -1035,19 +1047,19 @@ void wxPostScriptDC::DrawText( const wxString& text, long x, long y, bool WXUNUS
unsigned char green = m_textForegroundColour.Green (); unsigned char green = m_textForegroundColour.Green ();
if (!m_colour) if (!m_colour)
{ {
// Anything not white is black // 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)) && green == (unsigned char) 255))
{ {
red = (unsigned char) 0; red = (unsigned char) 0;
green = (unsigned char) 0; green = (unsigned char) 0;
blue = (unsigned char) 0; blue = (unsigned char) 0;
} }
} }
// maybe setgray here ? // maybe setgray here ?
if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue)) if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue))
{ {
long redPS = (long) (((int) red) / 255.0); long redPS = (long) (((int) red) / 255.0);
@@ -1140,8 +1152,8 @@ void wxPostScriptDC::DrawSpline( wxList *points )
*m_pstream << "newpath " *m_pstream << "newpath "
<< XLOG2DEV((long)x1) << " " << YLOG2DEV((long)y1) << " moveto " << XLOG2DEV((long)x1) << " " << YLOG2DEV((long)y1) << " moveto "
<< XLOG2DEV((long)x3) << " " << YLOG2DEV((long)y3) << " lineto\n"; << XLOG2DEV((long)x3) << " " << YLOG2DEV((long)y3) << " lineto\n";
CalcBoundingBox( (long)x1, (long)y1 ); CalcBoundingBox( (long)x1, (long)y1 );
CalcBoundingBox( (long)x3, (long)y3 ); CalcBoundingBox( (long)x3, (long)y3 );
@@ -1149,16 +1161,16 @@ void wxPostScriptDC::DrawSpline( wxList *points )
{ {
q = (wxPoint *)node->Data(); q = (wxPoint *)node->Data();
x1 = x3; x1 = x3;
y1 = y3; y1 = y3;
x2 = c; x2 = c;
y2 = d; y2 = d;
c = q->x; c = q->x;
d = q->y; d = q->y;
x3 = (double)(x2 + c) / 2; x3 = (double)(x2 + c) / 2;
y3 = (double)(y2 + d) / 2; y3 = (double)(y2 + d) / 2;
*m_pstream << XLOG2DEV((long)x1) << " " << YLOG2DEV((long)y1) << " " *m_pstream << XLOG2DEV((long)x1) << " " << YLOG2DEV((long)y1) << " "
<< XLOG2DEV((long)x2) << " " << YLOG2DEV((long)y2) << " " << XLOG2DEV((long)x2) << " " << YLOG2DEV((long)y2) << " "
<< XLOG2DEV((long)x3) << " " << YLOG2DEV((long)y3) << " DrawSplineSection\n"; << XLOG2DEV((long)x3) << " " << YLOG2DEV((long)y3) << " DrawSplineSection\n";
CalcBoundingBox( (long)x1, (long)y1 ); CalcBoundingBox( (long)x1, (long)y1 );
@@ -1187,7 +1199,10 @@ void wxPostScriptDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
m_signX = (xLeftRight ? 1 : -1); m_signX = (xLeftRight ? 1 : -1);
m_signY = (yBottomUp ? 1 : -1); m_signY = (yBottomUp ? 1 : -1);
// FIXME there is no such function in MSW
#ifndef __WXMSW__
ComputeScaleAndOrigin(); ComputeScaleAndOrigin();
#endif
} }
void wxPostScriptDC::SetDeviceOrigin( long x, long y ) void wxPostScriptDC::SetDeviceOrigin( long x, long y )
@@ -1235,16 +1250,16 @@ bool wxPostScriptDC::StartDoc (const wxString& message)
} }
else else
{ {
wxThePrintSetupData->SetPrinterFile((char *)(const char *)m_filename); wxThePrintSetupData->SetPrinterFile((char *)(const char *)m_filename);
} }
m_pstream = new ofstream (wxThePrintSetupData->GetPrinterFile()); m_pstream = new ofstream (wxThePrintSetupData->GetPrinterFile());
if (!m_pstream || !m_pstream->good()) if (!m_pstream || !m_pstream->good())
{ {
wxMessageBox (_("Cannot open file!"), _("Error"), wxOK); wxMessageBox (_("Cannot open file!"), _("Error"), wxOK);
m_ok = FALSE; m_ok = FALSE;
return FALSE; return FALSE;
} }
m_ok = TRUE; m_ok = TRUE;
@@ -1283,7 +1298,7 @@ void wxPostScriptDC::EndDoc ()
m_pstream = new ofstream( header_file ); m_pstream = new ofstream( header_file );
*m_pstream << "%!PS-Adobe-2.0\n"; /* PostScript magic strings */ *m_pstream << "%!PS-Adobe-2.0\n"; /* PostScript magic strings */
*m_pstream << "%%Title: " << (const char *) m_title << "\n"; *m_pstream << "%%Title: " << (const char *) m_title << "\n";
*m_pstream << "%%Creator: " << wxTheApp->argv[0] << "\n"; *m_pstream << "%%Creator: " << wxTheApp->argv[0] << "\n";
*m_pstream << "%%CreationDate: " << wxNow() << "\n"; *m_pstream << "%%CreationDate: " << wxNow() << "\n";
@@ -1311,7 +1326,7 @@ void wxPostScriptDC::EndDoc ()
if (wxThePrintSetupData->GetPrinterOrientation() == PS_LANDSCAPE) if (wxThePrintSetupData->GetPrinterOrientation() == PS_LANDSCAPE)
{ {
*m_pstream << "%%Orientation: Landscape\n"; *m_pstream << "%%Orientation: Landscape\n";
} }
else else
{ {
@@ -1384,19 +1399,19 @@ void wxPostScriptDC::EndDoc ()
if (m_ok) if (m_ok)
{ {
switch (wxThePrintSetupData->GetPrinterMode()) { switch (wxThePrintSetupData->GetPrinterMode()) {
case PS_PREVIEW: case PS_PREVIEW:
{ {
char *argv[3]; char *argv[3];
argv[0] = wxThePrintSetupData->GetPrintPreviewCommand(); argv[0] = wxThePrintSetupData->GetPrintPreviewCommand();
argv[1] = wxThePrintSetupData->GetPrinterFile(); argv[1] = wxThePrintSetupData->GetPrinterFile();
argv[2] = (char *) NULL; argv[2] = (char *) NULL;
wxExecute (argv, TRUE); wxExecute (argv, TRUE);
wxRemoveFile(wxThePrintSetupData->GetPrinterFile()); wxRemoveFile(wxThePrintSetupData->GetPrinterFile());
} }
break; break;
case PS_PRINTER: case PS_PRINTER:
{ {
char *argv[4]; char *argv[4];
int argc = 0; int argc = 0;
argv[argc++] = wxThePrintSetupData->GetPrinterCommand(); argv[argc++] = wxThePrintSetupData->GetPrinterCommand();
@@ -1409,14 +1424,14 @@ void wxPostScriptDC::EndDoc ()
argv[argc++] = wxThePrintSetupData->GetPrinterFile(); argv[argc++] = wxThePrintSetupData->GetPrinterFile();
argv[argc++] = (char *) NULL; argv[argc++] = (char *) NULL;
wxExecute (argv, TRUE); wxExecute (argv, TRUE);
wxRemoveFile(wxThePrintSetupData->GetPrinterFile()); wxRemoveFile(wxThePrintSetupData->GetPrinterFile());
} }
break; break;
case PS_FILE: case PS_FILE:
break; break;
} }
} }
#endif #endif
} }
@@ -1431,30 +1446,30 @@ void wxPostScriptDC::StartPage ()
// Added by Chris Breeze // Added by Chris Breeze
// Each page starts with an "initgraphics" which resets the // Each page starts with an "initgraphics" which resets the
// transformation and so we need to reset the origin // transformation and so we need to reset the origin
// (and rotate the page for landscape printing) // (and rotate the page for landscape printing)
/* /*
m_scaleFactor = 1.0; m_scaleFactor = 1.0;
m_logicalOriginX = 0; m_logicalOriginX = 0;
m_logicalOriginY = 0; m_logicalOriginY = 0;
*/ */
// Output scaling // Output scaling
long translate_x, translate_y; long translate_x, translate_y;
double scale_x, scale_y; double scale_x, scale_y;
wxThePrintSetupData->GetPrinterTranslation(&translate_x, &translate_y); wxThePrintSetupData->GetPrinterTranslation(&translate_x, &translate_y);
wxThePrintSetupData->GetPrinterScaling(&scale_x, &scale_y); wxThePrintSetupData->GetPrinterScaling(&scale_x, &scale_y);
if (wxThePrintSetupData->GetPrinterOrientation() == PS_LANDSCAPE) if (wxThePrintSetupData->GetPrinterOrientation() == PS_LANDSCAPE)
{ {
translate_y -= m_maxY; translate_y -= m_maxY;
*m_pstream << "90 rotate\n"; *m_pstream << "90 rotate\n";
} }
*m_pstream << scale_x << " " << scale_y << " scale\n"; *m_pstream << scale_x << " " << scale_y << " scale\n";
*m_pstream << translate_x << " " << translate_y << " translate\n"; *m_pstream << translate_x << " " << translate_y << " translate\n";
} }
void wxPostScriptDC::EndPage () void wxPostScriptDC::EndPage ()
@@ -1467,8 +1482,8 @@ void wxPostScriptDC::EndPage ()
bool wxPostScriptDC::Blit( long WXUNUSED(xdest), long WXUNUSED(ydest), bool wxPostScriptDC::Blit( long WXUNUSED(xdest), long WXUNUSED(ydest),
long WXUNUSED(fwidth), long WXUNUSED(fheight), long WXUNUSED(fwidth), long WXUNUSED(fheight),
wxDC *WXUNUSED(source), wxDC *WXUNUSED(source),
long WXUNUSED(xsrc), long WXUNUSED(ysrc), long WXUNUSED(xsrc), long WXUNUSED(ysrc),
int WXUNUSED(rop), bool WXUNUSED(useMask) ) int WXUNUSED(rop), bool WXUNUSED(useMask) )
{ {
wxCHECK_MSG( m_ok && m_pstream, FALSE, "invalid postscript dc" ); wxCHECK_MSG( m_ok && m_pstream, FALSE, "invalid postscript dc" );
@@ -1486,8 +1501,8 @@ long wxPostScriptDC::GetCharHeight ()
} }
void wxPostScriptDC::GetTextExtent (const wxString& string, long *x, long *y, void wxPostScriptDC::GetTextExtent (const wxString& string, long *x, long *y,
long *descent, long *externalLeading, wxFont *theFont, long *descent, long *externalLeading, wxFont *theFont,
bool WXUNUSED(use16)) bool WXUNUSED(use16))
{ {
// if (!m_pstream) return; // if (!m_pstream) return;
@@ -1497,15 +1512,15 @@ void wxPostScriptDC::GetTextExtent (const wxString& string, long *x, long *y,
#if !USE_AFM_FOR_POSTSCRIPT #if !USE_AFM_FOR_POSTSCRIPT
// Provide a VERY rough estimate (avoid using it) // Provide a VERY rough estimate (avoid using it)
// Chris Breeze 5/11/97: produces accurate results for mono-spaced // Chris Breeze 5/11/97: produces accurate results for mono-spaced
// font such as Courier (aka wxMODERN) // font such as Courier (aka wxMODERN)
int height = 12; int height = 12;
if (fontToUse) if (fontToUse)
{ {
height = fontToUse->GetPointSize(); height = fontToUse->GetPointSize();
} }
*x = strlen (string) * height * 72 / 120; *x = strlen (string) * height * 72 / 120;
*y = (long) (height * 1.32); // allow for descender *y = (long) (height * 1.32); // allow for descender
if (descent) if (descent)
*descent = 0; *descent = 0;
@@ -1585,8 +1600,8 @@ void wxPostScriptDC::GetTextExtent (const wxString& string, long *x, long *y,
/* MATTHEW: [2] Use wxTheFontNameDirectory */ /* MATTHEW: [2] Use wxTheFontNameDirectory */
const char *name; const char *name;
// Julian - we'll need to do this a different way now we've removed the // Julian - we'll need to do this a different way now we've removed the
// font directory system. Must find Stefan's original code. // font directory system. Must find Stefan's original code.
name = wxTheFontNameDirectory->GetAFMName(Family, Weight, Style); name = wxTheFontNameDirectory->GetAFMName(Family, Weight, Style);
if (!name) if (!name)
@@ -1639,38 +1654,38 @@ void wxPostScriptDC::GetTextExtent (const wxString& string, long *x, long *y,
// A.) check for descender definition // A.) check for descender definition
if(strncmp(line,"Descender",9)==0){ if(strncmp(line,"Descender",9)==0){
if((sscanf(line,"%s%d",descString,&lastDescender)!=2) if((sscanf(line,"%s%d",descString,&lastDescender)!=2)
|| (strcmp(descString,"Descender")!=0)) { || (strcmp(descString,"Descender")!=0)) {
wxLogDebug("AFM-file '%s': line '%s' has error (bad descender)\n", wxLogDebug("AFM-file '%s': line '%s' has error (bad descender)\n",
afmName,line); afmName,line);
} }
} }
// JC 1.) check for UnderlinePosition // JC 1.) check for UnderlinePosition
else if(strncmp(line,"UnderlinePosition",17)==0){ else if(strncmp(line,"UnderlinePosition",17)==0){
if((sscanf(line,"%s%lf",upString,&UnderlinePosition)!=2) if((sscanf(line,"%s%lf",upString,&UnderlinePosition)!=2)
|| (strcmp(upString,"UnderlinePosition")!=0)) { || (strcmp(upString,"UnderlinePosition")!=0)) {
wxLogDebug("AFM-file '%s': line '%s' has error (bad UnderlinePosition)\n", wxLogDebug("AFM-file '%s': line '%s' has error (bad UnderlinePosition)\n",
afmName,line); afmName,line);
} }
} }
// JC 2.) check for UnderlineThickness // JC 2.) check for UnderlineThickness
else if(strncmp(line,"UnderlineThickness",18)==0){ else if(strncmp(line,"UnderlineThickness",18)==0){
if((sscanf(line,"%s%lf",utString,&UnderlineThickness)!=2) if((sscanf(line,"%s%lf",utString,&UnderlineThickness)!=2)
|| (strcmp(utString,"UnderlineThickness")!=0)) { || (strcmp(utString,"UnderlineThickness")!=0)) {
wxLogDebug("AFM-file '%s': line '%s' has error (bad UnderlineThickness)\n", wxLogDebug("AFM-file '%s': line '%s' has error (bad UnderlineThickness)\n",
afmName,line); afmName,line);
} }
} }
// JC 3.) check for EncodingScheme // JC 3.) check for EncodingScheme
else if(strncmp(line,"EncodingScheme",14)==0){ else if(strncmp(line,"EncodingScheme",14)==0){
if((sscanf(line,"%s%s",utString,encString)!=2) if((sscanf(line,"%s%s",utString,encString)!=2)
|| (strcmp(utString,"EncodingScheme")!=0)) { || (strcmp(utString,"EncodingScheme")!=0)) {
wxLogDebug("AFM-file '%s': line '%s' has error (bad EncodingScheme)\n", wxLogDebug("AFM-file '%s': line '%s' has error (bad EncodingScheme)\n",
afmName,line); afmName,line);
} }
else if (strncmp(encString, "AdobeStandardEncoding", 21)) else if (strncmp(encString, "AdobeStandardEncoding", 21))
{ {
wxLogDebug("AFM-file '%s': line '%s' has error (unsupported EncodingScheme %s)\n", wxLogDebug("AFM-file '%s': line '%s' has error (unsupported EncodingScheme %s)\n",
afmName,line, encString); afmName,line, encString);
} }
} }
// B.) check for char-width // B.) check for char-width
@@ -1687,7 +1702,7 @@ void wxPostScriptDC::GetTextExtent (const wxString& string, long *x, long *y,
if(ascii>=0 && ascii<256){ if(ascii>=0 && ascii<256){
lastWidths[ascii] = cWidth; // store width lastWidths[ascii] = cWidth; // store width
}else{ }else{
/* MATTHEW: this happens a lot; don't print an error */ /* 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\n",afmName,ascii);
} }
} }
@@ -1810,7 +1825,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperType, wxObject)
IMPLEMENT_CLASS(wxPostScriptPrintDialog, wxDialog) IMPLEMENT_CLASS(wxPostScriptPrintDialog, wxDialog)
wxPostScriptPrintDialog::wxPostScriptPrintDialog (wxWindow *parent, const wxString& title, wxPostScriptPrintDialog::wxPostScriptPrintDialog (wxWindow *parent, const wxString& title,
const wxPoint& pos, const wxSize& size, long style): const wxPoint& pos, const wxSize& size, long style):
wxDialog(parent, -1, title, pos, size, style) wxDialog(parent, -1, title, pos, size, style)
{ {
wxBeginBusyCursor(); wxBeginBusyCursor();
@@ -1913,14 +1928,14 @@ int wxPostScriptPrintDialog::ShowModal ()
{ {
if ( wxDialog::ShowModal() == wxID_OK ) if ( wxDialog::ShowModal() == wxID_OK )
{ {
// wxTextCtrl *text0 = (wxTextCtrl *)FindWindow(wxID_PRINTER_OPTIONS); // wxTextCtrl *text0 = (wxTextCtrl *)FindWindow(wxID_PRINTER_OPTIONS);
wxTextCtrl *text1 = (wxTextCtrl *)FindWindow(wxID_PRINTER_X_SCALE); wxTextCtrl *text1 = (wxTextCtrl *)FindWindow(wxID_PRINTER_X_SCALE);
wxTextCtrl *text2 = (wxTextCtrl *)FindWindow(wxID_PRINTER_Y_SCALE); wxTextCtrl *text2 = (wxTextCtrl *)FindWindow(wxID_PRINTER_Y_SCALE);
wxTextCtrl *text3 = (wxTextCtrl *)FindWindow(wxID_PRINTER_X_TRANS); wxTextCtrl *text3 = (wxTextCtrl *)FindWindow(wxID_PRINTER_X_TRANS);
wxTextCtrl *text4 = (wxTextCtrl *)FindWindow(wxID_PRINTER_Y_TRANS); wxTextCtrl *text4 = (wxTextCtrl *)FindWindow(wxID_PRINTER_Y_TRANS);
// wxTextCtrl *text_prt = (wxTextCtrl *)FindWindow(wxID_PRINTER_COMMAND); // wxTextCtrl *text_prt = (wxTextCtrl *)FindWindow(wxID_PRINTER_COMMAND);
wxRadioBox *radio0 = (wxRadioBox *)FindWindow(wxID_PRINTER_ORIENTATION); wxRadioBox *radio0 = (wxRadioBox *)FindWindow(wxID_PRINTER_ORIENTATION);
wxRadioBox *radio1 = (wxRadioBox *)FindWindow(wxID_PRINTER_MODES); wxRadioBox *radio1 = (wxRadioBox *)FindWindow(wxID_PRINTER_MODES);
StringToDouble (WXSTRINGCAST text1->GetValue (), &wxThePrintSetupData->printerScaleX); StringToDouble (WXSTRINGCAST text1->GetValue (), &wxThePrintSetupData->printerScaleX);
StringToDouble (WXSTRINGCAST text2->GetValue (), &wxThePrintSetupData->printerScaleY); StringToDouble (WXSTRINGCAST text2->GetValue (), &wxThePrintSetupData->printerScaleY);
@@ -1936,11 +1951,11 @@ int wxPostScriptPrintDialog::ShowModal ()
// C++ wants this // C++ wants this
switch ( radio1->GetSelection() ) { switch ( radio1->GetSelection() ) {
case 0: wxThePrintSetupData->SetPrinterMode(PS_PRINTER); break; case 0: wxThePrintSetupData->SetPrinterMode(PS_PRINTER); break;
case 1: wxThePrintSetupData->SetPrinterMode(PS_FILE); break; case 1: wxThePrintSetupData->SetPrinterMode(PS_FILE); break;
case 2: wxThePrintSetupData->SetPrinterMode(PS_PREVIEW); break; case 2: wxThePrintSetupData->SetPrinterMode(PS_PREVIEW); break;
} }
return wxID_OK; return wxID_OK;
} }
return wxID_CANCEL; return wxID_CANCEL;
} }