Should be able to use the DC in OnPrepare without generating

a file


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/generic/dcpsg.cpp

@@ -347,13 +347,15 @@ bool wxPostScriptDC::Ok() const
 
 void wxPostScriptDC::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoord h)
 {
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok , wxT("invalid postscript dc") );
 
     if (m_clipping) DestroyClippingRegion();
 
     wxDC::DoSetClippingRegion(x, y, w, h);
 
     m_clipping = TRUE;
+
+    if (m_pstream)
         fprintf( m_pstream,
             "gsave\n newpath\n"
             "%d %d moveto\n"
@@ -370,11 +372,12 @@ void wxPostScriptDC::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoo
 
 void wxPostScriptDC::DestroyClippingRegion()
 {
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok , wxT("invalid postscript dc") );
 
     if (m_clipping)
     {
         m_clipping = FALSE;
+        if ( m_pstream )
             fprintf( m_pstream, "grestore\n" );
     }
 
@@ -405,12 +408,13 @@ void wxPostScriptDC::DoCrossHair (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
 
 void wxPostScriptDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     if  (m_pen.GetStyle() == wxTRANSPARENT) return;
 
     SetPen( m_pen );
 
+    if ( m_pstream )
         fprintf( m_pstream,
             "newpath\n"
             "%d %d moveto\n"
@@ -427,7 +431,7 @@ void wxPostScriptDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 
 void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc)
 {
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     wxCoord dx = x1 - xc;
     wxCoord dy = y1 - yc;
@@ -461,6 +465,7 @@ void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
     {
         SetBrush( m_brush );
 
+        if ( m_pstream )
             fprintf( m_pstream,
                 "newpath\n"
                 "%d %d %d %d %d %d ellipse\n"
@@ -478,6 +483,7 @@ void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
     {
         SetPen( m_pen );
 
+        if ( m_pstream )
             fprintf( m_pstream,
                 "newpath\n"
                 "%d %d %d %d %d %d ellipse\n"
@@ -494,7 +500,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)
 {
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, 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;
@@ -511,6 +517,7 @@ void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,d
     {
         SetBrush( m_brush );
 
+        if ( m_pstream )
             fprintf( m_pstream,
                 "newpath\n"
                 "%d %d %d %d %d %d true ellipticarc\n",
@@ -524,6 +531,7 @@ void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,d
     {
         SetPen( m_pen );
 
+        if ( m_pstream )
             fprintf(m_pstream,
                 "newpath\n"
                 "%d %d %d %d %d %d false ellipticarc\n",
@@ -536,12 +544,13 @@ void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,d
 
 void wxPostScriptDC::DoDrawPoint (wxCoord x, wxCoord y)
 {
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     if (m_pen.GetStyle() == wxTRANSPARENT) return;
 
     SetPen (m_pen);
 
+    if ( m_pstream )
         fprintf( m_pstream,
             "newpath\n"
             "%d %d moveto\n"
@@ -555,7 +564,7 @@ void wxPostScriptDC::DoDrawPoint (wxCoord x, wxCoord y)
 
 void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int WXUNUSED(fillStyle))
 {
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     if (n <= 0) return;
 
@@ -563,11 +572,13 @@ void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wx
     {
         SetBrush( m_brush );
 
+        if ( m_pstream )
             fprintf( m_pstream, "newpath\n" );
 
         wxCoord xx = LogicalToDeviceX(points[0].x + xoffset);
         wxCoord yy = LogicalToDeviceY(points[0].y + yoffset);
 
+        if ( m_pstream )
             fprintf( m_pstream, "%d %d moveto\n", xx, yy );
 
         CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset );
@@ -577,11 +588,13 @@ void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wx
             xx = LogicalToDeviceX(points[i].x + xoffset);
             yy = LogicalToDeviceY(points[i].y + yoffset);
 
+            if ( m_pstream )
                 fprintf( m_pstream, "%d %d lineto\n", xx, yy );
 
             CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset);
         }
 
+        if ( m_pstream )
             fprintf( m_pstream, "fill\n" );
     }
 
@@ -589,11 +602,13 @@ void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wx
     {
         SetPen( m_pen );
 
+        if ( m_pstream )
             fprintf( m_pstream, "newpath\n" );
 
         wxCoord xx = LogicalToDeviceX(points[0].x + xoffset);
         wxCoord yy = LogicalToDeviceY(points[0].y + yoffset);
 
+        if ( m_pstream )
             fprintf( m_pstream, "%d %d moveto\n", xx, yy );
 
         CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset );
@@ -603,19 +618,23 @@ void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wx
             xx = LogicalToDeviceX(points[i].x + xoffset);
             yy = LogicalToDeviceY(points[i].y + yoffset);
 
+            if ( m_pstream )
                 fprintf( m_pstream, "%d %d lineto\n", xx, yy );
 
             CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset);
         }
 
+        if ( m_pstream )
+        {
             fprintf( m_pstream, "closepath\n" );
             fprintf( m_pstream, "stroke\n" );
         }
+    }
 }
 
 void wxPostScriptDC::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
 {
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     if (m_pen.GetStyle() == wxTRANSPARENT) return;
 
@@ -629,6 +648,8 @@ void wxPostScriptDC::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCo
         CalcBoundingBox( LogicalToDeviceX(points[i].x+xoffset), LogicalToDeviceY(points[i].y+yoffset));
     }
 
+    if ( m_pstream )
+    {
         fprintf( m_pstream,
             "newpath\n"
             "%d %d moveto\n",
@@ -642,16 +663,18 @@ void wxPostScriptDC::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCo
         }
         
         fprintf( m_pstream, "stroke\n" );
+    }
 }
 
 void wxPostScriptDC::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     if (m_brush.GetStyle () != wxTRANSPARENT)
     {
         SetBrush( m_brush );
 
+        if ( m_pstream )
             fprintf( m_pstream,
                 "newpath\n"
                 "%d %d moveto\n"
@@ -673,6 +696,7 @@ void wxPostScriptDC::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoo
     {
         SetPen (m_pen);
 
+        if ( m_pstream )
             fprintf( m_pstream,
                 "newpath\n"
                 "%d %d moveto\n"
@@ -693,7 +717,7 @@ void wxPostScriptDC::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoo
 
 void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
 {
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     if (radius < 0.0)
     {
@@ -714,6 +738,7 @@ void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width
         SetBrush( m_brush );
 
         /* Draw rectangle anticlockwise */
+        if ( m_pstream )
             fprintf( m_pstream,
                 "newpath\n"
                 "%d %d %d 90 180 arc\n"
@@ -744,6 +769,7 @@ void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width
         SetPen (m_pen);
 
         /* Draw rectangle anticlockwise */
+        if ( m_pstream )
             fprintf( m_pstream,
                 "newpath\n"
                 "%d %d %d 90 180 arc\n"
@@ -772,12 +798,13 @@ void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width
 
 void wxPostScriptDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     if (m_brush.GetStyle () != wxTRANSPARENT)
     {
         SetBrush (m_brush);
 
+        if ( m_pstream )
             fprintf( m_pstream,
                 "newpath\n"
                 "%d %d %d %d 0 360 ellipse\n"
@@ -793,6 +820,7 @@ void wxPostScriptDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord
     {
         SetPen (m_pen);
 
+        if ( m_pstream )
             fprintf( m_pstream,
                 "newpath\n"
                 "%d %d %d %d 0 360 ellipse\n"
@@ -823,7 +851,7 @@ static void LocalDecToHex( int dec, char *buf )
 
 void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool WXUNUSED(useMask) )
 {
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     if (!bitmap.Ok()) return;
 
@@ -840,6 +868,8 @@ void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y,
     wxCoord xx = LogicalToDeviceX(x);
     wxCoord yy = LogicalToDeviceY(y + bitmap.GetHeight());
 
+    if ( m_pstream )
+    {
         fprintf( m_pstream,
             "/origstate save def\n"
             "20 dict begin\n"
@@ -855,7 +885,6 @@ void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y,
             "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 < w; i++)
@@ -870,14 +899,14 @@ void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y,
             }
             fprintf( m_pstream, "\n" );
         }
-
         fprintf( m_pstream, "end\n" );
         fprintf( m_pstream, "origstate restore\n" );
+    }
 }
 
 void wxPostScriptDC::SetFont( const wxFont& font )
 {
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     if (!font.Ok())  return;
 
@@ -956,6 +985,8 @@ void wxPostScriptDC::SetFont( const wxFont& font )
         }
     }
 
+    if ( m_pstream )
+    {
         fprintf( m_pstream, name );
         fprintf( m_pstream, " reencodeISO def\n" );
         fprintf( m_pstream, name );
@@ -969,13 +1000,13 @@ void wxPostScriptDC::SetFont( const wxFont& font )
         for (int i = 0; i < 100; i++)
             if (buffer[i] == ',') buffer[i] = '.';
             fprintf( m_pstream, buffer );
-
+    }
 #endif
 }
 
 void wxPostScriptDC::SetPen( const wxPen& pen )
 {
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     if (!pen.Ok()) return;
 
@@ -983,6 +1014,7 @@ void wxPostScriptDC::SetPen( const wxPen& pen )
 
     m_pen = pen;
 
+    if ( m_pstream )
     {
         char buffer[100];
         #ifdef __WXMSW__
@@ -1024,7 +1056,7 @@ void wxPostScriptDC::SetPen( const wxPen& pen )
         default:              psdash = "[] 0";         break;
     }
 
-    if (oldStyle != m_pen.GetStyle())
+    if ((oldStyle != m_pen.GetStyle()) && m_pstream )
     {
         fprintf( m_pstream, psdash );
         fprintf( m_pstream," setdash\n" );
@@ -1061,6 +1093,8 @@ void wxPostScriptDC::SetPen( const wxPen& pen )
             redPS, greenPS, bluePS );
         for (int i = 0; i < 100; i++)
             if (buffer[i] == ',') buffer[i] = '.';
+
+        if ( m_pstream )
             fprintf( m_pstream, buffer );
             
         m_currentRed = red;
@@ -1071,7 +1105,7 @@ void wxPostScriptDC::SetPen( const wxPen& pen )
 
 void wxPostScriptDC::SetBrush( const wxBrush& brush )
 {
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     if (!brush.Ok()) return;
 
@@ -1108,6 +1142,8 @@ void wxPostScriptDC::SetBrush( const wxBrush& brush )
                 redPS, greenPS, bluePS );
         for (int i = 0; i < 100; i++)
             if (buffer[i] == ',') buffer[i] = '.';
+        
+        if ( m_pstream )
             fprintf( m_pstream, buffer );
 
         m_currentRed = red;
@@ -1239,7 +1275,7 @@ void draw_bezier_outline(FILE *file,
 
 void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
 {
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     if (m_textForegroundColour.Ok())
     {
@@ -1273,6 +1309,7 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
                 redPS, greenPS, bluePS );
             for (size_t i = 0; i < strlen(buffer); i++)
                 if (buffer[i] == ',') buffer[i] = '.';
+            if ( m_pstream )
                 fprintf( m_pstream, buffer );
 
             m_currentRed = red;
@@ -1302,6 +1339,7 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
 #endif
 	pango_layout_set_text( layout, (const char*) buffer, strlen(buffer) );
 
+    if ( m_pstream )
         fprintf( m_pstream, "%%%% %s\n", (const char*)buffer );
 
     PangoRectangle rect;
@@ -1343,6 +1381,7 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
                 int pos_y = yyy + (int)((double)geometry.y_offset / scale );
                 all_width += geometry.width;
 
+                if ( m_pstream )
                     draw_bezier_outline( m_pstream, ft_face,
                     (FT_UInt)(glyphs->glyphs[glyph_idx].glyph),
                     pos_x / PANGO_SCALE,
@@ -1372,9 +1411,11 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
 //    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
+    if ( m_pstream )
+    {
         fprintf( m_pstream, "%d %d moveto\n", LogicalToDeviceX(x), LogicalToDeviceY(by) );
-
         fprintf( m_pstream, "(" );
+        
         const wxWX2MBbuf textbuf = text.mb_str();
         size_t len = strlen(textbuf);
         size_t i;
@@ -1419,6 +1460,7 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
                 if (buffer[i] == ',') buffer[i] = '.';
             fprintf( m_pstream, buffer );
         }
+    }
 
     CalcBoundingBox( x, y );
     CalcBoundingBox( x + size * text.Length() * 2/3 , y );
@@ -1433,7 +1475,7 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord
         return;
     }
 
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     SetFont( m_font );
 
@@ -1469,6 +1511,7 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord
                 redPS, greenPS, bluePS );
             for (int i = 0; i < 100; i++)
                 if (buffer[i] == ',') buffer[i] = '.';
+            if ( m_pstream )
                 fprintf( m_pstream, buffer );
 
             m_currentRed = red;
@@ -1479,6 +1522,8 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord
 
     int size = m_font.GetPointSize();
 
+    if ( m_pstream )
+    {
         fprintf(m_pstream, "%d %d moveto\n",
             LogicalToDeviceX(x), LogicalToDeviceY(y));
         
@@ -1486,7 +1531,9 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord
         sprintf(buffer, "%.8f rotate\n", angle);
         size_t i;
         for (i = 0; i < 100; i++)
+        {
             if (buffer[i] == ',') buffer[i] = '.';
+        }
         fprintf(m_pstream, buffer);
         
         fprintf( m_pstream, "(" );
@@ -1516,7 +1563,9 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord
         
         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())
@@ -1537,9 +1586,12 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord
                 m_underlineThickness,
                 LogicalToDeviceX(x + w), LogicalToDeviceY(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 );
@@ -1557,14 +1609,12 @@ void wxPostScriptDC::SetLogicalFunction (int WXUNUSED(function))
 
 void wxPostScriptDC::DoDrawSpline( wxList *points )
 {
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     SetPen( m_pen );
 
-    #if 0
     // a and b are not used
-    double a, b;
+    //double a, b;
-    #endif
     double c, d, x1, y1, x2, y2, x3, y3;
     wxPoint *p, *q;
 
@@ -1588,6 +1638,7 @@ void wxPostScriptDC::DoDrawSpline( wxList *points )
          #endif
          (double)(y1 + d) / 2;
 
+    if ( m_pstream )
         fprintf( m_pstream,
             "newpath\n"
             "%d %d moveto\n"
@@ -1611,6 +1662,7 @@ void wxPostScriptDC::DoDrawSpline( wxList *points )
         x3 = (double)(x2 + c) / 2;
         y3 = (double)(y2 + d) / 2;
 
+        if ( m_pstream )
             fprintf( m_pstream,
                 "%d %d %d %d %d %d DrawSplineSection\n",
                 LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1),
@@ -1626,6 +1678,7 @@ void wxPostScriptDC::DoDrawSpline( wxList *points )
        next-to-last and last point respectively, in the point list
      */
 
+    if ( m_pstream )
         fprintf( m_pstream,
             "%d %d lineto\n"
             "stroke\n",
@@ -1641,7 +1694,7 @@ wxCoord wxPostScriptDC::GetCharWidth() const
 
 void wxPostScriptDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
 {
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     m_signX = (xLeftRight ? 1 : -1);
     m_signY = (yBottomUp  ? 1 : -1);
@@ -1654,7 +1707,7 @@ void wxPostScriptDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
 
 void wxPostScriptDC::SetDeviceOrigin( wxCoord x, wxCoord y )
 {
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     int h = 0;
     int w = 0;
@@ -1905,8 +1958,9 @@ void wxPostScriptDC::EndDoc ()
 
 void wxPostScriptDC::StartPage()
 {
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
+    if ( m_pstream )
         fprintf( m_pstream, "%%%%Page: %d\n", wxPageNumber++ );
 
     //  What is this one supposed to do? RR.
@@ -1933,12 +1987,17 @@ void wxPostScriptDC::StartPage()
         int h;
         GetSize( (int*) NULL, &h );
         translate_y -= h;
+        if ( m_pstream )
+        {
             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" );
         }
+    }
 
+    if ( m_pstream )
+    {
         char buffer[100];
         sprintf( buffer, "%.8f %.8f scale\n", scale_x / ms_PSScaleFactor,
             scale_y / ms_PSScaleFactor);
@@ -1947,12 +2006,14 @@ void wxPostScriptDC::StartPage()
             fprintf( m_pstream, buffer );
             
             fprintf( m_pstream, "%d %d translate\n", translate_x, translate_y );
+    }
 }
 
 void wxPostScriptDC::EndPage ()
 {
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok , wxT("invalid postscript dc") );
 
+    if ( m_pstream )
         fprintf( m_pstream, "showpage\n" );
 }
 
@@ -1962,7 +2023,7 @@ bool wxPostScriptDC::DoBlit( wxCoord xdest, wxCoord ydest,
                            wxCoord xsrc, wxCoord ysrc,
                            int rop, bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) )
 {
-    wxCHECK_MSG( m_ok && m_pstream, FALSE, wxT("invalid postscript dc") );
+    wxCHECK_MSG( m_ok, FALSE, wxT("invalid postscript dc") );
 
     wxCHECK_MSG( source, FALSE, wxT("invalid source dc") );