X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b0d7707bc4abc8f26f5ad0c4be8baa897658c330..07aaf32633ecf18ec3edfbb41793a112914792d0:/src/generic/dcpsg.cpp diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp index d0b8b3fa36..2c8e9c3339 100644 --- a/src/generic/dcpsg.cpp +++ b/src/generic/dcpsg.cpp @@ -32,7 +32,7 @@ #include "wx/prntbase.h" #include "wx/generic/prntdlgg.h" #include "wx/paper.h" -#include "wx/filefn.h" +#include "wx/filename.h" #include "wx/stdpaths.h" #ifdef __WXMSW__ @@ -190,7 +190,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 +214,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" @@ -235,6 +235,19 @@ static char wxPostScriptHeaderReencodeISO2[] = // wxPostScriptDC //------------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC) + +wxPostScriptDC::wxPostScriptDC() + : wxDC(new wxPostScriptDCImpl(this)) +{ +} + +wxPostScriptDC::wxPostScriptDC(const wxPrintData& printData) + : wxDC(new wxPostScriptDCImpl(this, printData)) +{ +} + // conversion static const double RAD2DEG = 180.0 / M_PI; @@ -248,40 +261,59 @@ static const double DEV2PS = 72.0 / 600.0; #define YLOG2DEV(x) ((m_pageHeight - (double)LogicalToDeviceY(x)) * DEV2PS) #define YLOG2DEVREL(x) ((double)(LogicalToDeviceYRel(x)) * DEV2PS) -IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC) + +IMPLEMENT_ABSTRACT_CLASS(wxPostScriptDCImpl, wxDCImpl) //------------------------------------------------------------------------------- -void wxPostScriptDC::SetResolution(int ppi) +wxPostScriptDCImpl::wxPostScriptDCImpl( wxPostScriptDC *owner ) : + wxDCImpl( owner ) { + Init(); + + m_pageHeight = 842 * PS2DEV; + + m_ok = true; } -int wxPostScriptDC::GetResolution() +wxPostScriptDCImpl::wxPostScriptDCImpl( wxPostScriptDC *owner, const wxPrintData& data ) : + wxDCImpl( owner ) { - return DPI; + Init(); + + // this calculates m_pageHeight required for + // taking the inverted Y axis into account + SetPrintData( data ); + + m_ok = true; } -wxPostScriptDC::wxPostScriptDC () + +wxPostScriptDCImpl::wxPostScriptDCImpl( wxPrinterDC *owner ) : + wxDCImpl( owner ) { - m_pstream = (FILE*) NULL; + Init(); - m_currentRed = 0; - m_currentGreen = 0; - m_currentBlue = 0; + m_pageHeight = 842 * PS2DEV; - m_pageNumber = 0; + m_ok = true; +} - m_clipping = false; +wxPostScriptDCImpl::wxPostScriptDCImpl( wxPrinterDC *owner, const wxPrintData& data ) : + wxDCImpl( owner ) +{ + Init(); - m_underlinePosition = 0.0; - m_underlineThickness = 0.0; + // this calculates m_pageHeight required for + // taking the inverted Y axis into account + SetPrintData( data ); - m_pageHeight = 842 * PS2DEV; + m_ok = true; } -wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData) +void wxPostScriptDCImpl::Init() { - m_pstream = (FILE*) NULL; + m_pstream = NULL; m_currentRed = 0; m_currentGreen = 0; @@ -294,34 +326,46 @@ wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData) m_underlinePosition = 0.0; m_underlineThickness = 0.0; - // this calculates m_pageHeight required for - // taking the inverted Y axis into account - SetPrintData( printData ); - - m_ok = true; } -wxPostScriptDC::~wxPostScriptDC () +wxPostScriptDCImpl::~wxPostScriptDCImpl () { if (m_pstream) { fclose( m_pstream ); - m_pstream = (FILE*) NULL; + m_pstream = NULL; } } -bool wxPostScriptDC::IsOk() const +bool wxPostScriptDCImpl::IsOk() const { return m_ok; } -void wxPostScriptDC::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoord h) +wxRect wxPostScriptDCImpl::GetPaperRect() const +{ + int w = 0; + int h = 0; + DoGetSize( &w, &h ); + return wxRect(0,0,w,h); +} + +int wxPostScriptDCImpl::GetResolution() const +{ + return DPI; +} + +void wxPostScriptDCImpl::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoord h) { wxCHECK_RET( m_ok , wxT("invalid postscript dc") ); - if (m_clipping) DestroyClippingRegion(); + if (m_clipping) + DestroyClippingRegion(); - wxDC::DoSetClippingRegion(x, y, w, h); + m_clipX1 = x; + m_clipY1 = y; + m_clipX2 = x + w; + m_clipY2 = y + h; m_clipping = true; @@ -342,7 +386,7 @@ void wxPostScriptDC::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoo } -void wxPostScriptDC::DestroyClippingRegion() +void wxPostScriptDCImpl::DestroyClippingRegion() { wxCHECK_RET( m_ok , wxT("invalid postscript dc") ); @@ -352,38 +396,39 @@ void wxPostScriptDC::DestroyClippingRegion() PsPrint( "grestore\n" ); } - wxDC::DestroyClippingRegion(); + wxDCImpl::DestroyClippingRegion(); } -void wxPostScriptDC::Clear() +void wxPostScriptDCImpl::Clear() { // This should fail silently to avoid unnecessary // asserts - // wxFAIL_MSG( wxT("wxPostScriptDC::Clear not implemented.") ); + // wxFAIL_MSG( wxT("wxPostScriptDCImpl::Clear not implemented.") ); } -bool wxPostScriptDC::DoFloodFill (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style)) +bool wxPostScriptDCImpl::DoFloodFill (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour &WXUNUSED(col), wxFloodFillStyle WXUNUSED(style)) { - wxFAIL_MSG( wxT("wxPostScriptDC::FloodFill not implemented.") ); + wxFAIL_MSG( wxT("wxPostScriptDCImpl::FloodFill not implemented.") ); return false; } -bool wxPostScriptDC::DoGetPixel (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxColour * WXUNUSED(col)) const +bool wxPostScriptDCImpl::DoGetPixel (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxColour * WXUNUSED(col)) const { - wxFAIL_MSG( wxT("wxPostScriptDC::GetPixel not implemented.") ); + wxFAIL_MSG( wxT("wxPostScriptDCImpl::GetPixel not implemented.") ); return false; } -void wxPostScriptDC::DoCrossHair (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) +void wxPostScriptDCImpl::DoCrossHair (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) { - wxFAIL_MSG( wxT("wxPostScriptDC::CrossHair not implemented.") ); + wxFAIL_MSG( wxT("wxPostScriptDCImpl::CrossHair not implemented.") ); } -void wxPostScriptDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) +void wxPostScriptDCImpl::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (m_pen.GetStyle() == wxTRANSPARENT) return; + if ( m_pen.IsTransparent() ) + return; SetPen( m_pen ); @@ -401,7 +446,7 @@ void wxPostScriptDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) CalcBoundingBox( x2, y2 ); } -void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc) +void wxPostScriptDCImpl::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); @@ -436,7 +481,7 @@ void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, int i_radius = wxRound( radius ); - if (m_brush.GetStyle() != wxTRANSPARENT) + if ( m_brush.IsNonTransparent() ) { SetBrush( m_brush ); @@ -457,20 +502,17 @@ void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, CalcBoundingBox( xc+i_radius, yc+i_radius ); } - if (m_pen.GetStyle() != wxTRANSPARENT) + 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 ); @@ -479,7 +521,7 @@ void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, } } -void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) +void wxPostScriptDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); @@ -494,11 +536,11 @@ void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,d if ( wxIsSameDouble(sa, ea) ) { - DrawEllipse(x,y,w,h); + DoDrawEllipse(x,y,w,h); return; } - if (m_brush.GetStyle () != wxTRANSPARENT) + if ( m_brush.IsNonTransparent() ) { SetBrush( m_brush ); @@ -515,7 +557,7 @@ void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,d CalcBoundingBox( x+w, y+h ); } - if (m_pen.GetStyle () != wxTRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen( m_pen ); @@ -533,11 +575,12 @@ void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,d } } -void wxPostScriptDC::DoDrawPoint (wxCoord x, wxCoord y) +void wxPostScriptDCImpl::DoDrawPoint (wxCoord x, wxCoord y) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (m_pen.GetStyle() == wxTRANSPARENT) return; + if ( m_pen.IsTransparent() ) + return; SetPen (m_pen); @@ -554,13 +597,13 @@ void wxPostScriptDC::DoDrawPoint (wxCoord x, wxCoord y) CalcBoundingBox( x, y ); } -void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int 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 () != wxTRANSPARENT) + if ( m_brush.IsNonTransparent() ) { SetBrush( m_brush ); @@ -591,7 +634,7 @@ void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wx PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") ); } - if (m_pen.GetStyle () != wxTRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen( m_pen ); @@ -624,13 +667,13 @@ void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wx } } -void wxPostScriptDC::DoDrawPolyPolygon (int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int 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 () != wxTRANSPARENT) + if ( m_brush.IsNonTransparent() ) { SetBrush( m_brush ); @@ -664,7 +707,7 @@ void wxPostScriptDC::DoDrawPolyPolygon (int n, int count[], wxPoint points[], wx PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") ); } - if (m_pen.GetStyle () != wxTRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen( m_pen ); @@ -700,11 +743,12 @@ void wxPostScriptDC::DoDrawPolyPolygon (int n, int count[], wxPoint points[], wx } } -void wxPostScriptDC::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() == wxTRANSPARENT) return; + if ( m_pen.IsTransparent() ) + return; if (n <= 0) return; @@ -734,14 +778,14 @@ void wxPostScriptDC::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCo PsPrint( "stroke\n" ); } -void wxPostScriptDC::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoord height) +void wxPostScriptDCImpl::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoord height) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); width--; height--; - if (m_brush.GetStyle () != wxTRANSPARENT) + if ( m_brush.IsNonTransparent() ) { SetBrush( m_brush ); @@ -764,7 +808,7 @@ void wxPostScriptDC::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoo CalcBoundingBox( x + width, y + height ); } - if (m_pen.GetStyle () != wxTRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen (m_pen); @@ -788,7 +832,7 @@ void wxPostScriptDC::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoo } } -void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius) +void wxPostScriptDCImpl::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); @@ -805,7 +849,7 @@ void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width wxCoord rad = (wxCoord) radius; - if (m_brush.GetStyle () != wxTRANSPARENT) + if ( m_brush.IsNonTransparent() ) { SetBrush( m_brush ); @@ -837,7 +881,7 @@ void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width CalcBoundingBox( x + width, y + height ); } - if (m_pen.GetStyle () != wxTRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen (m_pen); @@ -870,14 +914,14 @@ void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width } } -void wxPostScriptDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord height) +void wxPostScriptDCImpl::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord height) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); width--; height--; - if (m_brush.GetStyle () != wxTRANSPARENT) + if ( m_brush.IsNonTransparent() ) { SetBrush (m_brush); @@ -894,7 +938,7 @@ void wxPostScriptDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord CalcBoundingBox( x + width, y + height ); } - if (m_pen.GetStyle () != wxTRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen (m_pen); @@ -912,23 +956,23 @@ void wxPostScriptDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord } } -void wxPostScriptDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y ) +void wxPostScriptDCImpl::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y ) { - DrawBitmap( icon, x, y, true ); + DoDrawBitmap( icon, x, y, true ); } /* this has to be char, not wxChar */ -static char hexArray[] = "0123456789ABCDEF"; +static const char hexArray[] = "0123456789ABCDEF"; -void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool WXUNUSED(useMask) ) +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(); @@ -990,11 +1034,11 @@ void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, PsPrint( "origstate restore\n" ); } -void wxPostScriptDC::SetFont( const wxFont& font ) +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; @@ -1077,22 +1121,27 @@ void wxPostScriptDC::SetFont( const wxFont& font ) PsPrint( " findfont\n" ); - double size = (double) m_font.GetPointSize(); + float size = float(m_font.GetPointSize()); + size = size * GetFontPointSizeAdjustment(DPI); wxString buffer; - buffer.Printf( "%f scalefont setfont\n", size * DEV2PS * m_scaleX ); + buffer.Printf( "%f scalefont setfont\n", size * m_scaleX ); buffer.Replace( ",", "." ); PsPrint( buffer ); } -void wxPostScriptDC::SetPen( const wxPen& pen ) +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; @@ -1127,11 +1176,11 @@ void wxPostScriptDC::SetPen( const wxPen& pen ) switch (m_pen.GetStyle()) { - case wxDOT: psdash = dotted; break; - case wxSHORT_DASH: psdash = short_dashed; break; - case wxLONG_DASH: psdash = wxCoord_dashed; break; - case wxDOT_DASH: psdash = dotted_dashed; break; - case wxUSER_DASH: + case wxPENSTYLE_DOT: psdash = dotted; break; + case wxPENSTYLE_SHORT_DASH: psdash = short_dashed; break; + case wxPENSTYLE_LONG_DASH: psdash = wxCoord_dashed; break; + case wxPENSTYLE_DOT_DASH: psdash = dotted_dashed; break; + case wxPENSTYLE_USER_DASH: { wxDash *dashes; int nDashes = m_pen.GetDashes (&dashes); @@ -1145,8 +1194,8 @@ void wxPostScriptDC::SetPen( const wxPen& pen ) psdash = 0; } break; - case wxSOLID: - case wxTRANSPARENT: + case wxPENSTYLE_SOLID: + case wxPENSTYLE_TRANSPARENT: default: psdash = "[] 0"; break; } @@ -1156,6 +1205,35 @@ void wxPostScriptDC::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(); @@ -1181,7 +1259,6 @@ void wxPostScriptDC::SetPen( const wxPen& pen ) double bluePS = (double)(blue) / 255.0; double greenPS = (double)(green) / 255.0; - wxString buffer; buffer.Printf( "%f %f %f setrgbcolor\n", redPS, greenPS, bluePS ); buffer.Replace( ",", "." ); PsPrint( buffer ); @@ -1192,11 +1269,11 @@ void wxPostScriptDC::SetPen( const wxPen& pen ) } } -void wxPostScriptDC::SetBrush( const wxBrush& brush ) +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; @@ -1236,7 +1313,7 @@ void wxPostScriptDC::SetBrush( const wxBrush& brush ) } } -void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) +void wxPostScriptDCImpl::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); @@ -1244,7 +1321,7 @@ void wxPostScriptDC::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(); @@ -1283,7 +1360,7 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) wxCoord text_w, text_h, text_descent; - GetTextExtent(text, &text_w, &text_h, &text_descent); + GetOwner()->GetTextExtent(text, &text_w, &text_h, &text_descent); int size = m_font.GetPointSize(); @@ -1298,11 +1375,9 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) PsPrint( buffer ); PsPrint( "(" ); - size_t len = strlen(textbuf); - size_t i; - for (i = 0; i < len; i++) + for ( const char *p = textbuf; *p != '\0'; p++ ) { - int c = (unsigned char) textbuf[i]; + int c = (unsigned char)*p; if (c == ')' || c == '(' || c == '\\') { /* Cope with special characters */ @@ -1344,7 +1419,7 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) CalcBoundingBox( x + size * text.length() * 2/3 , y ); } -void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord y, double angle ) +void wxPostScriptDCImpl::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord y, double angle ) { if ( wxIsNullDouble(angle) ) { @@ -1356,7 +1431,7 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord SetFont( m_font ); - if (m_textForegroundColour.Ok()) + if (m_textForegroundColour.IsOk()) { unsigned char red = m_textForegroundColour.Red(); unsigned char blue = m_textForegroundColour.Blue(); @@ -1406,26 +1481,27 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord PsPrint( "(" ); const wxWX2MBbuf textbuf = text.mb_str(); - size_t len = strlen(textbuf); - size_t i; - for (i = 0; i < len; i++) + if ( textbuf ) { - int c = (unsigned char) textbuf[i]; - if (c == ')' || c == '(' || c == '\\') + for ( const char *p = textbuf; *p != '\0'; p++ ) { - /* Cope with special characters */ - PsPrint( "\\" ); - PsPrint( (char) c ); - } - else if ( c >= 128 ) - { - /* Cope with character codes > 127 */ - buffer.Printf( "\\%o", c); - PsPrint( buffer ); - } - else - { - PsPrint( (char) c ); + int c = (unsigned char)*p; + if (c == ')' || c == '(' || c == '\\') + { + /* Cope with special characters */ + PsPrint( "\\" ); + PsPrint( (char) c ); + } + else if ( c >= 128 ) + { + /* Cope with character codes > 127 */ + buffer.Printf( "\\%o", c); + PsPrint( buffer ); + } + else + { + PsPrint( (char) c ); + } } } @@ -1439,7 +1515,7 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord { wxCoord uy = (wxCoord)(y + size - m_underlinePosition); wxCoord w, h; - GetTextExtent(text, &w, &h); + GetOwner()->GetTextExtent(text, &w, &h); buffer.Printf( "gsave\n" @@ -1459,18 +1535,18 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord CalcBoundingBox( x + size * text.length() * 2/3 , y ); } -void wxPostScriptDC::SetBackground (const wxBrush& brush) +void wxPostScriptDCImpl::SetBackground (const wxBrush& brush) { m_backgroundBrush = brush; } -void wxPostScriptDC::SetLogicalFunction (int WXUNUSED(function)) +void wxPostScriptDCImpl::SetLogicalFunction(wxRasterOperationMode WXUNUSED(function)) { - wxFAIL_MSG( wxT("wxPostScriptDC::SetLogicalFunction not implemented.") ); + wxFAIL_MSG( wxT("wxPostScriptDCImpl::SetLogicalFunction not implemented.") ); } #if wxUSE_SPLINES -void wxPostScriptDC::DoDrawSpline( const wxPointList *points ) +void wxPostScriptDCImpl::DoDrawSpline( const wxPointList *points ) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); @@ -1551,13 +1627,13 @@ void wxPostScriptDC::DoDrawSpline( const wxPointList *points ) } #endif // wxUSE_SPLINES -wxCoord wxPostScriptDC::GetCharWidth() const +wxCoord wxPostScriptDCImpl::GetCharWidth() const { // Chris Breeze: reasonable approximation using wxMODERN/Courier return (wxCoord) (GetCharHeight() * 72.0 / 120.0); } -void wxPostScriptDC::SetPrintData(const wxPrintData& data) +void wxPostScriptDCImpl::SetPrintData(const wxPrintData& data) { m_printData = data; @@ -1578,48 +1654,11 @@ void wxPostScriptDC::SetPrintData(const wxPrintData& data) m_pageHeight = h * PS2DEV; } -#if wxUSE_NEW_DC -#else -void wxPostScriptDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) -{ - wxDCBase::SetAxisOrientation(xLeftRight,yBottomUp); -} - -void wxPostScriptDC::SetMapMode(int mode) -{ - wxDCBase::SetMapMode(mode); -} - -void wxPostScriptDC::SetUserScale(double x, double y) -{ - wxDCBase::SetUserScale(x,y); -} - -void wxPostScriptDC::SetLogicalScale(double x, double y) -{ - wxDCBase::SetLogicalScale(x,y); -} - -void wxPostScriptDC::SetLogicalOrigin(wxCoord x, wxCoord y) -{ - wxDCBase::SetLogicalOrigin(x,y); -} - -void wxPostScriptDC::SetDeviceOrigin(wxCoord x, wxCoord y) -{ - wxDCBase::SetDeviceOrigin(x,y); -} -#endif - -void wxPostScriptDC::ComputeScaleAndOrigin() +void wxPostScriptDCImpl::ComputeScaleAndOrigin() { const wxRealPoint origScale(m_scaleX, m_scaleY); -#if wxUSE_NEW_DC - wxImplDC::ComputeScaleAndOrigin(); -#else - wxDC::ComputeScaleAndOrigin(); -#endif + wxDCImpl::ComputeScaleAndOrigin(); // If scale has changed call SetPen to recalulate the line width // and SetFont to recalculate font size @@ -1630,7 +1669,7 @@ void wxPostScriptDC::ComputeScaleAndOrigin() } } -void wxPostScriptDC::DoGetSize(int* width, int* height) const +void wxPostScriptDCImpl::DoGetSize(int* width, int* height) const { wxPaperSize id = m_printData.GetPaperId(); @@ -1660,7 +1699,7 @@ void wxPostScriptDC::DoGetSize(int* width, int* height) const *height = wxRound( h * PS2DEV ); } -void wxPostScriptDC::DoGetSizeMM(int *width, int *height) const +void wxPostScriptDCImpl::DoGetSizeMM(int *width, int *height) const { wxPaperSize id = m_printData.GetPaperId(); @@ -1688,13 +1727,13 @@ void wxPostScriptDC::DoGetSizeMM(int *width, int *height) const } // Resolution in pixels per logical inch -wxSize wxPostScriptDC::GetPPI(void) const +wxSize wxPostScriptDCImpl::GetPPI(void) const { return wxSize( DPI, DPI ); } -bool wxPostScriptDC::StartDoc( const wxString& message ) +bool wxPostScriptDCImpl::StartDoc( const wxString& WXUNUSED(message) ) { wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") ); @@ -1702,7 +1741,7 @@ bool wxPostScriptDC::StartDoc( const wxString& message ) { if (m_printData.GetFilename() == wxEmptyString) { - wxString filename = wxGetTempFileName( wxT("ps") ); + wxString filename = wxFileName::CreateTempFileName( wxT("ps") ); m_printData.SetFilename(filename); } @@ -1717,14 +1756,11 @@ bool wxPostScriptDC::StartDoc( const wxString& message ) } m_ok = true; - m_title = message; wxString buffer; PsPrint( "%!PS-Adobe-2.0\n" ); - buffer.Printf( "%%%%Title: %s\n", m_title ); - PsPrint( buffer ); PsPrint( "%%Creator: wxWidgets PostScript renderer\n" ); buffer.Printf( "%%%%CreationDate: %s\n", wxNow() ); @@ -1783,7 +1819,7 @@ bool wxPostScriptDC::StartDoc( const wxString& message ) return true; } -void wxPostScriptDC::EndDoc () +void wxPostScriptDCImpl::EndDoc () { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); @@ -1795,7 +1831,7 @@ void wxPostScriptDC::EndDoc () if ( m_pstream ) { fclose( m_pstream ); - m_pstream = (FILE *) NULL; + m_pstream = NULL; } #if 0 @@ -1883,7 +1919,7 @@ void wxPostScriptDC::EndDoc () #endif } -void wxPostScriptDC::StartPage() +void wxPostScriptDCImpl::StartPage() { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); @@ -1921,45 +1957,46 @@ void wxPostScriptDC::StartPage() PsPrint( "90 rotate\n" ); } -void wxPostScriptDC::EndPage () +void wxPostScriptDCImpl::EndPage () { wxCHECK_RET( m_ok , wxT("invalid postscript dc") ); PsPrint( "showpage\n" ); } -bool wxPostScriptDC::DoBlit( wxCoord xdest, wxCoord ydest, +bool wxPostScriptDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord fwidth, wxCoord fheight, wxDC *source, wxCoord xsrc, wxCoord ysrc, - int rop, bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) ) + wxRasterOperationMode rop, + bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) ) { wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") ); wxCHECK_MSG( source, false, wxT("invalid source dc") ); - /* blit into a bitmap */ + // blit into a bitmap wxBitmap bitmap( (int)fwidth, (int)fheight ); wxMemoryDC memDC; memDC.SelectObject(bitmap); memDC.Blit(0, 0, fwidth, fheight, source, xsrc, ysrc, rop); /* TODO: Blit transparently? */ memDC.SelectObject(wxNullBitmap); - /* draw bitmap. scaling and positioning is done there */ - DrawBitmap( bitmap, xdest, ydest ); + //draw bitmap. scaling and positioning is done there + GetOwner()->DrawBitmap( bitmap, xdest, ydest ); return true; } -wxCoord wxPostScriptDC::GetCharHeight() const +wxCoord wxPostScriptDCImpl::GetCharHeight() const { - if (m_font.Ok()) + if (m_font.IsOk()) return m_font.GetPointSize(); else return 12; } -void wxPostScriptDC::PsPrint( const wxString& str ) +void wxPostScriptDCImpl::PsPrint( const wxString& str ) { const wxCharBuffer psdata(str.utf8_str()); @@ -1986,7 +2023,7 @@ void wxPostScriptDC::PsPrint( const wxString& str ) } } -void wxPostScriptDC::DoGetTextExtent(const wxString& string, +void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent, wxCoord *externalLeading, const wxFont *theFont ) const @@ -1995,7 +2032,8 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, if (!fontToUse) fontToUse = &m_font; - wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") ); + const float fontSize = + fontToUse->GetPointSize() * GetFontPointSizeAdjustment(72.0); if (string.empty()) { @@ -2019,15 +2057,10 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, * Produces accurate results for mono-spaced font * such as Courier (aka wxMODERN) */ - int height = 12; - if (fontToUse) - { - height = fontToUse->GetPointSize(); - } if ( x ) - *x = strlen (strbuf) * height * 72 / 120; + *x = strlen (strbuf) * fontSize * 72.0 / 120.0; if ( y ) - *y = (wxCoord) (height * 1.32); /* allow for descender */ + *y = (wxCoord) (fontSize * 1.32); /* allow for descender */ if (descent) *descent = 0; if (externalLeading) *externalLeading = 0; #else @@ -2055,7 +2088,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, / example: / / wxPostScriptDC dc(NULL, true); - / if (dc.Ok()){ + / if (dc.IsOk()){ / wxSetAFMPath("d:\\wxw161\\afm\\"); / dc.StartDoc("Test"); / dc.StartPage(); @@ -2281,22 +2314,22 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, / these values from AFM files, too. Maybe later ... */ // NB: casts to int are needed to suppress gcc 3.3 warnings - lastWidths[196] = lastWidths[(int)'A']; // Ä - lastWidths[228] = lastWidths[(int)'a']; // ä - lastWidths[214] = lastWidths[(int)'O']; // Ö - lastWidths[246] = lastWidths[(int)'o']; // ö - lastWidths[220] = lastWidths[(int)'U']; // Ü - lastWidths[252] = lastWidths[(int)'u']; // ü - lastWidths[223] = lastWidths[(int)251]; // ß + lastWidths[196] = lastWidths[(int)'A']; // U+00C4 A Umlaute + lastWidths[228] = lastWidths[(int)'a']; // U+00E4 a Umlaute + lastWidths[214] = lastWidths[(int)'O']; // U+00D6 O Umlaute + lastWidths[246] = lastWidths[(int)'o']; // U+00F6 o Umlaute + lastWidths[220] = lastWidths[(int)'U']; // U+00DC U Umlaute + lastWidths[252] = lastWidths[(int)'u']; // U+00FC u Umlaute + lastWidths[223] = lastWidths[(int)251]; // U+00DF eszett (scharfes s) /* JC: calculate UnderlineThickness/UnderlinePosition */ // VS: dirty, but is there any better solution? double *pt; pt = (double*) &m_underlinePosition; - *pt = YLOG2DEVREL((wxCoord)(UnderlinePosition * fontToUse->GetPointSize())) / 1000.0f; + *pt = YLOG2DEVREL((wxCoord)(UnderlinePosition * fontSize)) / 1000.0f; pt = (double*) &m_underlineThickness; - *pt = YLOG2DEVREL((wxCoord)(UnderlineThickness * fontToUse->GetPointSize())) / 1000.0f; + *pt = YLOG2DEVREL((wxCoord)(UnderlineThickness * fontSize)) / 1000.0f; } @@ -2306,7 +2339,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, / string. they are given in 1/1000 of the size! */ long sum=0; - wxCoord height=Size; /* by default */ + float height=fontSize; /* by default */ unsigned char *p; for(p=(unsigned char *)wxMBSTRINGCAST strbuf; *p; p++) { @@ -2322,7 +2355,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, } double widthSum = sum; - widthSum *= Size; + widthSum *= fontSize; widthSum /= 1000.0F; /* add descender to height (it is usually a negative value) */ @@ -2337,14 +2370,14 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, if ( x ) *x = (wxCoord)widthSum; if ( y ) - *y = height; + *y = (wxCoord)height; /* return other parameters */ if (descent) { if(lastDescender!=INT_MIN) { - *descent = (wxCoord)(((-lastDescender)/1000.0F) * Size); /* MATTHEW: forgot scale */ + *descent = (wxCoord)(((-lastDescender)/1000.0F) * fontSize); /* MATTHEW: forgot scale */ } else {