X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..9e9574fe45b176ee74bba8fad7574cf9906145d1:/src/generic/dcpsg.cpp diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp index 7148eef2d1..d14255fd08 100644 --- a/src/generic/dcpsg.cpp +++ b/src/generic/dcpsg.cpp @@ -4,7 +4,6 @@ // Author: Julian Smart, Robert Roebling, Markus Holzhem // Modified by: // Created: 04/01/98 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -190,7 +189,7 @@ static const char *wxPostScriptHeaderColourImage = "\ } ifelse % end of 'false' case\n\ "; -static char wxPostScriptHeaderReencodeISO1[] = +static const char wxPostScriptHeaderReencodeISO1[] = "\n/reencodeISO {\n" "dup dup findfont dup length dict begin\n" "{ 1 index /FID ne { def }{ pop pop } ifelse } forall\n" @@ -214,7 +213,7 @@ static char wxPostScriptHeaderReencodeISO1[] = "/.notdef/dotlessi/grave/acute/circumflex/tilde/macron/breve\n" "/dotaccent/dieresis/.notdef/ring/cedilla/.notdef/hungarumlaut\n"; -static char wxPostScriptHeaderReencodeISO2[] = +static const char wxPostScriptHeaderReencodeISO2[] = "/ogonek/caron/space/exclamdown/cent/sterling/currency/yen/brokenbar\n" "/section/dieresis/copyright/ordfeminine/guillemotleft/logicalnot\n" "/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior\n" @@ -427,7 +426,8 @@ void wxPostScriptDCImpl::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return; + if ( m_pen.IsTransparent() ) + return; SetPen( m_pen ); @@ -480,7 +480,7 @@ void wxPostScriptDCImpl::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord int i_radius = wxRound( radius ); - if (m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT) + if ( m_brush.IsNonTransparent() ) { SetBrush( m_brush ); @@ -501,20 +501,17 @@ void wxPostScriptDCImpl::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord CalcBoundingBox( xc+i_radius, yc+i_radius ); } - if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen( m_pen ); wxString buffer; buffer.Printf( "newpath\n" "%f %f %f %f %f %f ellipse\n" - "%f %f lineto\n" - "closepath\n" "stroke\n", XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL(i_radius), YLOG2DEVREL(i_radius), - alpha1, alpha2, - XLOG2DEV(xc), YLOG2DEV(yc) ); + alpha1, alpha2 ); buffer.Replace( ",", "." ); PsPrint( buffer ); @@ -542,7 +539,7 @@ void wxPostScriptDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord return; } - if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT) + if ( m_brush.IsNonTransparent() ) { SetBrush( m_brush ); @@ -559,7 +556,7 @@ void wxPostScriptDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord CalcBoundingBox( x+w, y+h ); } - if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen( m_pen ); @@ -581,7 +578,8 @@ void wxPostScriptDCImpl::DoDrawPoint (wxCoord x, wxCoord y) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return; + if ( m_pen.IsTransparent() ) + return; SetPen (m_pen); @@ -598,13 +596,13 @@ void wxPostScriptDCImpl::DoDrawPoint (wxCoord x, wxCoord y) CalcBoundingBox( x, y ); } -void wxPostScriptDCImpl::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle) +void wxPostScriptDCImpl::DoDrawPolygon (int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); if (n <= 0) return; - if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT) + if ( m_brush.IsNonTransparent() ) { SetBrush( m_brush ); @@ -635,7 +633,7 @@ void wxPostScriptDCImpl::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") ); } - if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen( m_pen ); @@ -668,13 +666,13 @@ void wxPostScriptDCImpl::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset } } -void wxPostScriptDCImpl::DoDrawPolyPolygon (int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle) +void wxPostScriptDCImpl::DoDrawPolyPolygon (int n, const int count[], const wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); if (n <= 0) return; - if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT) + if ( m_brush.IsNonTransparent() ) { SetBrush( m_brush ); @@ -708,7 +706,7 @@ void wxPostScriptDCImpl::DoDrawPolyPolygon (int n, int count[], wxPoint points[] PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") ); } - if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen( m_pen ); @@ -744,11 +742,12 @@ void wxPostScriptDCImpl::DoDrawPolyPolygon (int n, int count[], wxPoint points[] } } -void wxPostScriptDCImpl::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) +void wxPostScriptDCImpl::DoDrawLines (int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return; + if ( m_pen.IsTransparent() ) + return; if (n <= 0) return; @@ -785,7 +784,7 @@ void wxPostScriptDCImpl::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, w width--; height--; - if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT) + if ( m_brush.IsNonTransparent() ) { SetBrush( m_brush ); @@ -808,7 +807,7 @@ void wxPostScriptDCImpl::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, w CalcBoundingBox( x + width, y + height ); } - if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen (m_pen); @@ -849,7 +848,7 @@ void wxPostScriptDCImpl::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord w wxCoord rad = (wxCoord) radius; - if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT) + if ( m_brush.IsNonTransparent() ) { SetBrush( m_brush ); @@ -881,7 +880,7 @@ void wxPostScriptDCImpl::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord w CalcBoundingBox( x + width, y + height ); } - if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen (m_pen); @@ -921,7 +920,7 @@ void wxPostScriptDCImpl::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxC width--; height--; - if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT) + if ( m_brush.IsNonTransparent() ) { SetBrush (m_brush); @@ -938,7 +937,7 @@ void wxPostScriptDCImpl::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxC CalcBoundingBox( x + width, y + height ); } - if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen (m_pen); @@ -962,17 +961,17 @@ void wxPostScriptDCImpl::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y ) } /* this has to be char, not wxChar */ -static char hexArray[] = "0123456789ABCDEF"; +static const char hexArray[] = "0123456789ABCDEF"; void wxPostScriptDCImpl::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool WXUNUSED(useMask) ) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (!bitmap.Ok()) return; + if (!bitmap.IsOk()) return; wxImage image = bitmap.ConvertToImage(); - if (!image.Ok()) return; + if (!image.IsOk()) return; wxCoord w = image.GetWidth(); wxCoord h = image.GetHeight(); @@ -1038,7 +1037,7 @@ void wxPostScriptDCImpl::SetFont( const wxFont& font ) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (!font.Ok()) return; + if (!font.IsOk()) return; m_font = font; @@ -1133,11 +1132,15 @@ void wxPostScriptDCImpl::SetPen( const wxPen& pen ) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (!pen.Ok()) return; + if (!pen.IsOk()) return; - int oldStyle = m_pen.GetStyle(); + int oldStyle = m_pen.IsOk() ? m_pen.GetStyle() : wxPENSTYLE_INVALID; + wxPenCap oldCap = m_pen.IsOk() ? m_pen.GetCap() : wxCAP_INVALID; + wxPenJoin oldJoin = m_pen.IsOk() ? m_pen.GetJoin() : wxJOIN_INVALID; m_pen = pen; + wxPenCap cap = m_pen.IsOk() ? m_pen.GetCap() : wxCAP_INVALID; + wxPenJoin join = m_pen.IsOk() ? m_pen.GetJoin() : wxJOIN_INVALID; double width; @@ -1201,6 +1204,35 @@ void wxPostScriptDCImpl::SetPen( const wxPen& pen ) PsPrint( " setdash\n" ); } + if ( cap != wxCAP_INVALID && cap != oldCap ) + { + switch ( cap ) + { + case wxCAP_ROUND: buffer = "1"; break; + case wxCAP_PROJECTING: buffer = "2"; break; + case wxCAP_BUTT: buffer = "0"; break; + + // This case is just to fix compiler warning, this is impossible + // due to the test above. + case wxCAP_INVALID: break; + } + buffer << " setlinecap\n"; + PsPrint( buffer ); + } + + if ( join != wxJOIN_INVALID && join != oldJoin ) + { + switch ( join ) + { + case wxJOIN_BEVEL: buffer = "2"; break; + case wxJOIN_ROUND: buffer = "1"; break; + case wxJOIN_MITER: buffer = "0"; break; + case wxJOIN_INVALID: break; + } + buffer << " setlinejoin\n"; + PsPrint( buffer ); + } + // Line colour unsigned char red = m_pen.GetColour().Red(); unsigned char blue = m_pen.GetColour().Blue(); @@ -1240,7 +1272,7 @@ void wxPostScriptDCImpl::SetBrush( const wxBrush& brush ) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (!brush.Ok()) return; + if (!brush.IsOk()) return; m_brush = brush; @@ -1288,7 +1320,7 @@ void wxPostScriptDCImpl::DoDrawText( const wxString& text, wxCoord x, wxCoord y if ( !textbuf ) return; - if (m_textForegroundColour.Ok()) + if (m_textForegroundColour.IsOk()) { unsigned char red = m_textForegroundColour.Red(); unsigned char blue = m_textForegroundColour.Blue(); @@ -1398,7 +1430,7 @@ void wxPostScriptDCImpl::DoDrawRotatedText( const wxString& text, wxCoord x, wxC SetFont( m_font ); - if (m_textForegroundColour.Ok()) + if (m_textForegroundColour.IsOk()) { unsigned char red = m_textForegroundColour.Red(); unsigned char blue = m_textForegroundColour.Blue(); @@ -1935,7 +1967,7 @@ bool wxPostScriptDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord fwidth, wxCoord fheight, wxDC *source, wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode rop, + wxRasterOperationMode rop, bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) ) { wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") ); @@ -1957,7 +1989,7 @@ bool wxPostScriptDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord wxPostScriptDCImpl::GetCharHeight() const { - if (m_font.Ok()) + if (m_font.IsOk()) return m_font.GetPointSize(); else return 12; @@ -2055,7 +2087,7 @@ void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string, / example: / / wxPostScriptDC dc(NULL, true); - / if (dc.Ok()){ + / if (dc.IsOk()){ / wxSetAFMPath("d:\\wxw161\\afm\\"); / dc.StartDoc("Test"); / dc.StartPage();