converted most of X11 DC code

[wxWidgets.git] / src / generic / dcpsg.cpp

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index f8e57a0836fd16ea707b6b14d626d0b615eeaefc..aa8def57a1476aacd73f01024e6342f4d1395b4b 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -235,6 +235,24 @@ static char wxPostScriptHeaderReencodeISO2[] =
 // wxPostScriptDC
 //-------------------------------------------------------------------------------
 
 // wxPostScriptDC
 //-------------------------------------------------------------------------------
 

+
+#if wxUSE_NEW_DC
+
+IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)
+
+wxPostScriptDC::wxPostScriptDC()
+{
+    m_pimpl = new wxPostScriptDCImpl( this );
+}
+
+wxPostScriptDC::wxPostScriptDC(const wxPrintData& printData)
+{
+    m_pimpl = new wxPostScriptDCImpl( this, printData );
+}
+
+#endif
+
+

 // conversion
 static const double RAD2DEG  = 180.0 / M_PI;
 
 // conversion
 static const double RAD2DEG  = 180.0 / M_PI;
 


@@ -248,38 +266,71 @@ static const double DEV2PS = 72.0 / 600.0;
 #define YLOG2DEV(x)     ((m_pageHeight - (double)LogicalToDeviceY(x)) * DEV2PS)
 #define YLOG2DEVREL(x)  ((double)(LogicalToDeviceYRel(x)) * DEV2PS)
 
 #define YLOG2DEV(x)     ((m_pageHeight - (double)LogicalToDeviceY(x)) * DEV2PS)
 #define YLOG2DEVREL(x)  ((double)(LogicalToDeviceYRel(x)) * DEV2PS)
 

-IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)
+
+#if wxUSE_NEW_DC
+IMPLEMENT_ABSTRACT_CLASS(wxPostScriptDCImpl, wxDCImpl)
+#else
+IMPLEMENT_ABSTRACT_CLASS(wxPostScriptDC, wxDC)
+#endif

 
 //-------------------------------------------------------------------------------
 
 
 //-------------------------------------------------------------------------------
 

-void wxPostScriptDC::SetResolution(int ppi)
+#if wxUSE_NEW_DC
+wxPostScriptDCImpl::wxPostScriptDCImpl( wxPostScriptDC *owner ) :
+   wxDCImpl( owner )

 {
 {

-}
+    Init();

 
 

-int wxPostScriptDC::GetResolution()
-{
-    return DPI;
+    m_pageHeight = 842 * PS2DEV;
+    
+    m_ok = true;

 }
 
 }
 

-wxPostScriptDC::wxPostScriptDC ()
+wxPostScriptDCImpl::wxPostScriptDCImpl( wxPostScriptDC *owner, const wxPrintData& data ) :
+   wxDCImpl( owner )

 {
 {

-    m_pstream = (FILE*) NULL;
-
-    m_currentRed = 0;
-    m_currentGreen = 0;
-    m_currentBlue = 0;
+    Init();
+    
+    // this calculates m_pageHeight required for
+    // taking the inverted Y axis into account
+    SetPrintData( data );

 
 

-    m_pageNumber = 0;
+    m_ok = true;
+}
+#endif

 
 

-    m_clipping = false;

 
 

-    m_underlinePosition = 0.0;
-    m_underlineThickness = 0.0;
+#if wxUSE_NEW_DC
+wxPostScriptDCImpl::wxPostScriptDCImpl( wxPrinterDC *owner ) :
+   wxDCImpl( owner )
+#else
+wxPostScriptDC::wxPostScriptDC()
+#endif
+{
+    Init();

 
     m_pageHeight = 842 * PS2DEV;
 
     m_pageHeight = 842 * PS2DEV;

+    
+    m_ok = true;

 }
 
 }
 

-wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData)
+#if wxUSE_NEW_DC
+wxPostScriptDCImpl::wxPostScriptDCImpl( wxPrinterDC *owner, const wxPrintData& data ) :
+   wxDCImpl( owner )
+#else
+wxPostScriptDC::wxPostScriptDC( const wxPrintData& data )
+#endif
+{
+    Init();
+    
+    // this calculates m_pageHeight required for
+    // taking the inverted Y axis into account
+    SetPrintData( data );
+
+    m_ok = true;
+}
+
+void wxPostScriptDCImpl::Init()

 {
     m_pstream = (FILE*) NULL;
 
 {
     m_pstream = (FILE*) NULL;
 


@@ -294,14 +345,9 @@ wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData)
     m_underlinePosition = 0.0;
     m_underlineThickness = 0.0;
 
     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)
     {
 {
     if (m_pstream)
     {


@@ -310,18 +356,39 @@ wxPostScriptDC::~wxPostScriptDC ()
     }
 }
 
     }
 }
 

-bool wxPostScriptDC::IsOk() const
+bool wxPostScriptDCImpl::IsOk() const

 {
   return m_ok;
 }
 
 {
   return m_ok;
 }
 

-void wxPostScriptDC::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoord h)
+wxRect wxPostScriptDCImpl::GetPaperRect()
+{
+    int w = 0;
+    int h = 0;
+    DoGetSize( &w, &h );
+    return wxRect(0,0,w,h);
+}
+
+int wxPostScriptDCImpl::GetResolution()
+{
+    return DPI;
+}
+
+void wxPostScriptDCImpl::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoord h)

 {
     wxCHECK_RET( m_ok , wxT("invalid postscript dc") );
 
 {
     wxCHECK_RET( m_ok , wxT("invalid postscript dc") );
 

-    if (m_clipping) DestroyClippingRegion();
+    if (m_clipping)
+        DestroyClippingRegion();

 
 

+#if wxUSE_NEW_DC
+    m_clipX1 = x;
+    m_clipY1 = y;
+    m_clipX2 = x + w;
+    m_clipY2 = y + h;
+#else

     wxDC::DoSetClippingRegion(x, y, w, h);
     wxDC::DoSetClippingRegion(x, y, w, h);

+#endif

 
     m_clipping = true;
 
 
     m_clipping = true;
 


@@ -342,7 +409,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") );
 
 {
     wxCHECK_RET( m_ok , wxT("invalid postscript dc") );
 


@@ -352,34 +419,38 @@ void wxPostScriptDC::DestroyClippingRegion()
         PsPrint( "grestore\n" );
     }
 
         PsPrint( "grestore\n" );
     }
 

+#if wxUSE_NEW_DC
+    wxDCImpl::DestroyClippingRegion();
+#else

     wxDC::DestroyClippingRegion();
     wxDC::DestroyClippingRegion();

+#endif

 }
 
 }
 

-void wxPostScriptDC::Clear()
+void wxPostScriptDCImpl::Clear()

 {
     // This should fail silently to avoid unnecessary
     // asserts
 {
     // 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), int WXUNUSED(style))

 {
 {

-    wxFAIL_MSG( wxT("wxPostScriptDC::FloodFill not implemented.") );
+    wxFAIL_MSG( wxT("wxPostScriptDCImpl::FloodFill not implemented.") );

     return false;
 }
 
     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;
 }
 
     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") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 


@@ -401,7 +472,7 @@ void wxPostScriptDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
     CalcBoundingBox( x2, 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") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 


@@ -446,8 +517,8 @@ void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
                        "%f %f lineto\n"
                        "closepath\n"
                        "fill\n",
                        "%f %f lineto\n"
                        "closepath\n"
                        "fill\n",

-                XLOG2DEV(xc), YLOG2DEV(yc), 
-                XLOG2DEVREL(i_radius), YLOG2DEVREL(i_radius), 
+                XLOG2DEV(xc), YLOG2DEV(yc),
+                XLOG2DEVREL(i_radius), YLOG2DEVREL(i_radius),

                 alpha1, alpha2,
                 XLOG2DEV(xc), YLOG2DEV(yc) );
         buffer.Replace( ",", "." );
                 alpha1, alpha2,
                 XLOG2DEV(xc), YLOG2DEV(yc) );
         buffer.Replace( ",", "." );


@@ -460,15 +531,15 @@ void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
     if (m_pen.GetStyle() != wxTRANSPARENT)
     {
         SetPen( m_pen );
     if (m_pen.GetStyle() != wxTRANSPARENT)
     {
         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",
         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), 
+                XLOG2DEV(xc), YLOG2DEV(yc),
+                XLOG2DEVREL(i_radius), YLOG2DEVREL(i_radius),

                 alpha1, alpha2,
                 XLOG2DEV(xc), YLOG2DEV(yc) );
         buffer.Replace( ",", "." );
                 alpha1, alpha2,
                 XLOG2DEV(xc), YLOG2DEV(yc) );
         buffer.Replace( ",", "." );


@@ -479,7 +550,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") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 


@@ -494,7 +565,7 @@ void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,d
 
     if ( wxIsSameDouble(sa, ea) )
     {
 
     if ( wxIsSameDouble(sa, ea) )
     {

-        DrawEllipse(x,y,w,h);
+        DoDrawEllipse(x,y,w,h);

         return;
     }
 
         return;
     }
 


@@ -533,7 +604,7 @@ 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") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 


@@ -554,7 +625,7 @@ void wxPostScriptDC::DoDrawPoint (wxCoord x, wxCoord y)
     CalcBoundingBox( x, y );
 }
 
     CalcBoundingBox( x, y );
 }
 

-void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
+void wxPostScriptDCImpl::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)

 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 


@@ -624,7 +695,7 @@ 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, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)

 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 


@@ -700,7 +771,7 @@ 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, wxPoint points[], wxCoord xoffset, wxCoord yoffset)

 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 


@@ -721,7 +792,7 @@ void wxPostScriptDC::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCo
               YLOG2DEV(points[0].y+yoffset) );
     buffer.Replace( ",", "." );
     PsPrint( buffer );
               YLOG2DEV(points[0].y+yoffset) );
     buffer.Replace( ",", "." );
     PsPrint( buffer );

-    
+

     for (i = 1; i < n; i++)
     {
         buffer.Printf( "%f %f lineto\n",
     for (i = 1; i < n; i++)
     {
         buffer.Printf( "%f %f lineto\n",


@@ -734,10 +805,10 @@ void wxPostScriptDC::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCo
     PsPrint( "stroke\n" );
 }
 
     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") );
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );

-    
+

     width--;
     height--;
 
     width--;
     height--;
 


@@ -788,7 +859,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") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 


@@ -870,7 +941,7 @@ 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") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 


@@ -912,15 +983,15 @@ 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";
 
 }
 
 /* this has to be char, not wxChar */
 static 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") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 


@@ -979,7 +1050,7 @@ void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y,
         }
         *(bufferindex++) = '\n';
         *bufferindex = 0;
         }
         *(bufferindex++) = '\n';
         *bufferindex = 0;

-        
+

         if (m_pstream)
             fwrite( charbuffer, 1, strlen( charbuffer ), m_pstream );
         else
         if (m_pstream)
             fwrite( charbuffer, 1, strlen( charbuffer ), m_pstream );
         else


@@ -990,7 +1061,7 @@ void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y,
     PsPrint( "origstate restore\n" );
 }
 
     PsPrint( "origstate restore\n" );
 }
 

-void wxPostScriptDC::SetFont( const wxFont& font )
+void wxPostScriptDCImpl::SetFont( const wxFont& font )

 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 


@@ -1076,7 +1147,7 @@ void wxPostScriptDC::SetFont( const wxFont& font )
     PsPrint( name );
     PsPrint( " findfont\n" );
 
     PsPrint( name );
     PsPrint( " findfont\n" );
 

-    
+

     double size = (double) m_font.GetPointSize();
     wxString buffer;
     buffer.Printf( "%f scalefont setfont\n", size * DEV2PS * m_scaleX );
     double size = (double) m_font.GetPointSize();
     wxString buffer;
     buffer.Printf( "%f scalefont setfont\n", size * DEV2PS * m_scaleX );


@@ -1084,7 +1155,7 @@ void wxPostScriptDC::SetFont( const wxFont& font )
     PsPrint( buffer );
 }
 
     PsPrint( buffer );
 }
 

-void wxPostScriptDC::SetPen( const wxPen& pen )
+void wxPostScriptDCImpl::SetPen( const wxPen& pen )

 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 


@@ -1095,7 +1166,7 @@ void wxPostScriptDC::SetPen( const wxPen& pen )
     m_pen = pen;
 
     double width;
     m_pen = pen;
 
     double width;

-    
+

     if (m_pen.GetWidth() <= 0)
         width = 0.1;
     else
     if (m_pen.GetWidth() <= 0)
         width = 0.1;
     else


@@ -1192,7 +1263,7 @@ 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") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 


@@ -1236,14 +1307,14 @@ 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") );
 
     const wxWX2MBbuf textbuf = text.mb_str();
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     const wxWX2MBbuf textbuf = text.mb_str();

-    if (textbuf.data() == NULL)
+    if ( !textbuf )

         return;
         return;

-    
+

     if (m_textForegroundColour.Ok())
     {
         unsigned char red = m_textForegroundColour.Red();
     if (m_textForegroundColour.Ok())
     {
         unsigned char red = m_textForegroundColour.Red();


@@ -1283,7 +1354,7 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
 
     wxCoord text_w, text_h, text_descent;
 
 
     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();
 
 
     int size = m_font.GetPointSize();
 


@@ -1326,7 +1397,7 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
     if (m_font.GetUnderlined())
     {
         wxCoord uy = (wxCoord)(y + size - m_underlinePosition);
     if (m_font.GetUnderlined())
     {
         wxCoord uy = (wxCoord)(y + size - m_underlinePosition);

-        
+

         buffer.Printf( "gsave\n"
                        "%f %f moveto\n"
                        "%f setlinewidth\n"
         buffer.Printf( "gsave\n"
                        "%f %f moveto\n"
                        "%f setlinewidth\n"


@@ -1344,7 +1415,7 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
     CalcBoundingBox( x + size * text.length() * 2/3 , 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) )
     {
 {
     if ( wxIsNullDouble(angle) )
     {


@@ -1386,7 +1457,7 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord
             buffer.Printf( "%f %f %f setrgbcolor\n", redPS, greenPS, bluePS );
             buffer.Replace( ",", "." );
             PsPrint( buffer );
             buffer.Printf( "%f %f %f setrgbcolor\n", redPS, greenPS, bluePS );
             buffer.Replace( ",", "." );
             PsPrint( buffer );

-            
+

             m_currentRed = red;
             m_currentBlue = blue;
             m_currentGreen = green;
             m_currentRed = red;
             m_currentBlue = blue;
             m_currentGreen = green;


@@ -1439,9 +1510,9 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord
     {
         wxCoord uy = (wxCoord)(y + size - m_underlinePosition);
         wxCoord w, h;
     {
         wxCoord uy = (wxCoord)(y + size - m_underlinePosition);
         wxCoord w, h;

-        GetTextExtent(text, &w, &h);
+        GetOwner()->GetTextExtent(text, &w, &h);

 
 

-        buffer.Printf( 
+        buffer.Printf(

                 "gsave\n"
                 "%f %f moveto\n"
                 "%f setlinewidth\n"
                 "gsave\n"
                 "%f %f moveto\n"
                 "%f setlinewidth\n"


@@ -1459,18 +1530,18 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord
     CalcBoundingBox( x + size * text.length() * 2/3 , y );
 }
 
     CalcBoundingBox( x + size * text.length() * 2/3 , y );
 }
 

-void wxPostScriptDC::SetBackground (const wxBrush& brush)
+void wxPostScriptDCImpl::SetBackground (const wxBrush& brush)

 {
     m_backgroundBrush = brush;
 }
 
 {
     m_backgroundBrush = brush;
 }
 

-void wxPostScriptDC::SetLogicalFunction (int WXUNUSED(function))
+void wxPostScriptDCImpl::SetLogicalFunction (int WXUNUSED(function))

 {
 {

-    wxFAIL_MSG( wxT("wxPostScriptDC::SetLogicalFunction not implemented.") );
+    wxFAIL_MSG( wxT("wxPostScriptDCImpl::SetLogicalFunction not implemented.") );

 }
 
 #if wxUSE_SPLINES
 }
 
 #if wxUSE_SPLINES

-void wxPostScriptDC::DoDrawSpline( wxList *points )
+void wxPostScriptDCImpl::DoDrawSpline( const wxPointList *points )

 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 


@@ -1481,13 +1552,13 @@ void wxPostScriptDC::DoDrawSpline( wxList *points )
     double c, d, x1, y1, x2, y2, x3, y3;
     wxPoint *p, *q;
 
     double c, d, x1, y1, x2, y2, x3, y3;
     wxPoint *p, *q;
 

-    wxList::compatibility_iterator node = points->GetFirst();
-    p = (wxPoint *)node->GetData();
+    wxPointList::compatibility_iterator node = points->GetFirst();
+    p = node->GetData();

     x1 = p->x;
     y1 = p->y;
 
     node = node->GetNext();
     x1 = p->x;
     y1 = p->y;
 
     node = node->GetNext();

-    p = (wxPoint *)node->GetData();
+    p = node->GetData();

     c = p->x;
     d = p->y;
     x3 =
     c = p->x;
     d = p->y;
     x3 =


@@ -1516,7 +1587,7 @@ void wxPostScriptDC::DoDrawSpline( wxList *points )
     node = node->GetNext();
     while (node)
     {
     node = node->GetNext();
     while (node)
     {

-        q = (wxPoint *)node->GetData();
+        q = node->GetData();

 
         x1 = x3;
         y1 = y3;
 
         x1 = x3;
         y1 = y3;


@@ -1551,15 +1622,15 @@ void wxPostScriptDC::DoDrawSpline( wxList *points )
 }
 #endif // wxUSE_SPLINES
 
 }
 #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);
 }
 
 {
     // 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;    
+    m_printData = data;

 
     wxPaperSize id = m_printData.GetPaperId();
     wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(id);
 
     wxPaperSize id = m_printData.GetPaperId();
     wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(id);


@@ -1580,43 +1651,43 @@ void wxPostScriptDC::SetPrintData(const wxPrintData& data)
 
 #if wxUSE_NEW_DC
 #else
 
 #if wxUSE_NEW_DC
 #else

-void wxPostScriptDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
+void wxPostScriptDCImpl::SetAxisOrientation( bool xLeftRight, bool yBottomUp )

 {
     wxDCBase::SetAxisOrientation(xLeftRight,yBottomUp);
 }
 
 {
     wxDCBase::SetAxisOrientation(xLeftRight,yBottomUp);
 }
 

-void wxPostScriptDC::SetMapMode(int mode)
+void wxPostScriptDCImpl::SetMapMode(int mode)

 {
     wxDCBase::SetMapMode(mode);
 }
 
 {
     wxDCBase::SetMapMode(mode);
 }
 

-void wxPostScriptDC::SetUserScale(double x, double y)
+void wxPostScriptDCImpl::SetUserScale(double x, double y)

 {
     wxDCBase::SetUserScale(x,y);
 }
 
 {
     wxDCBase::SetUserScale(x,y);
 }
 

-void wxPostScriptDC::SetLogicalScale(double x, double y)
+void wxPostScriptDCImpl::SetLogicalScale(double x, double y)

 {
     wxDCBase::SetLogicalScale(x,y);
 }
 
 {
     wxDCBase::SetLogicalScale(x,y);
 }
 

-void wxPostScriptDC::SetLogicalOrigin(wxCoord x, wxCoord y)
+void wxPostScriptDCImpl::SetLogicalOrigin(wxCoord x, wxCoord y)

 {
     wxDCBase::SetLogicalOrigin(x,y);
 }
 
 {
     wxDCBase::SetLogicalOrigin(x,y);
 }
 

-void wxPostScriptDC::SetDeviceOrigin(wxCoord x, wxCoord y)
+void wxPostScriptDCImpl::SetDeviceOrigin(wxCoord x, wxCoord y)

 {
     wxDCBase::SetDeviceOrigin(x,y);
 }
 #endif
 
 {
     wxDCBase::SetDeviceOrigin(x,y);
 }
 #endif
 

-void wxPostScriptDC::ComputeScaleAndOrigin()
+void wxPostScriptDCImpl::ComputeScaleAndOrigin()

 {
     const wxRealPoint origScale(m_scaleX, m_scaleY);
 
 #if wxUSE_NEW_DC
 {
     const wxRealPoint origScale(m_scaleX, m_scaleY);
 
 #if wxUSE_NEW_DC

-    wxImplDC::ComputeScaleAndOrigin();
+    wxDCImpl::ComputeScaleAndOrigin();

 #else
     wxDC::ComputeScaleAndOrigin();
 #endif
 #else
     wxDC::ComputeScaleAndOrigin();
 #endif


@@ -1630,7 +1701,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();
 
 {
     wxPaperSize id = m_printData.GetPaperId();
 


@@ -1653,14 +1724,14 @@ void wxPostScriptDC::DoGetSize(int* width, int* height) const
         h = tmp;
     }
 
         h = tmp;
     }
 

-    if (width) 
+    if (width)

         *width = wxRound( w * PS2DEV );
         *width = wxRound( w * PS2DEV );

-        
-    if (height) 
+
+    if (height)

         *height = wxRound( h * PS2DEV );
 }
 
         *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();
 
 {
     wxPaperSize id = m_printData.GetPaperId();
 


@@ -1688,13 +1759,13 @@ void wxPostScriptDC::DoGetSizeMM(int *width, int *height) const
 }
 
 // Resolution in pixels per logical inch
 }
 
 // Resolution in pixels per logical inch

-wxSize wxPostScriptDC::GetPPI(void) const
+wxSize wxPostScriptDCImpl::GetPPI(void) const

 {
     return wxSize( DPI, DPI );
 }
 
 
 {
     return wxSize( DPI, DPI );
 }
 
 

-bool wxPostScriptDC::StartDoc( const wxString& message )
+bool wxPostScriptDCImpl::StartDoc( const wxString& message )

 {
     wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") );
 
 {
     wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") );
 


@@ -1722,14 +1793,14 @@ bool wxPostScriptDC::StartDoc( const wxString& message )
     wxString buffer;
 
     PsPrint( "%!PS-Adobe-2.0\n" );
     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( "%%%%Title: %s\n", m_title );
     PsPrint( buffer );
     PsPrint( "%%Creator: wxWidgets PostScript renderer\n" );

-    
+

     buffer.Printf( "%%%%CreationDate: %s\n", wxNow() );
     PsPrint( buffer );
     buffer.Printf( "%%%%CreationDate: %s\n", wxNow() );
     PsPrint( buffer );

-    
+

     if (m_printData.GetOrientation() == wxLANDSCAPE)
         PsPrint( "%%Orientation: Landscape\n" );
     else
     if (m_printData.GetOrientation() == wxLANDSCAPE)
         PsPrint( "%%Orientation: Landscape\n" );
     else


@@ -1754,10 +1825,10 @@ bool wxPostScriptDC::StartDoc( const wxString& message )
        case wxPAPER_10X14: paper = wxT("10x14"); break;         // 10-by-14-inch sheet
        default: paper = wxT("A4");
     }
        case wxPAPER_10X14: paper = wxT("10x14"); break;         // 10-by-14-inch sheet
        default: paper = wxT("A4");
     }

-    
+

     buffer.Printf( "%%%%DocumentPaperSizes: %s\n", paper );
     PsPrint( buffer );
     buffer.Printf( "%%%%DocumentPaperSizes: %s\n", paper );
     PsPrint( buffer );

-    
+

     PsPrint( "%%EndComments\n\n" );
 
     PsPrint( "%%BeginProlog\n" );
     PsPrint( "%%EndComments\n\n" );
 
     PsPrint( "%%BeginProlog\n" );


@@ -1783,7 +1854,7 @@ bool wxPostScriptDC::StartDoc( const wxString& message )
     return true;
 }
 
     return true;
 }
 

-void wxPostScriptDC::EndDoc ()
+void wxPostScriptDCImpl::EndDoc ()

 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 


@@ -1883,7 +1954,7 @@ void wxPostScriptDC::EndDoc ()
 #endif
 }
 
 #endif
 }
 

-void wxPostScriptDC::StartPage()
+void wxPostScriptDCImpl::StartPage()

 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 


@@ -1900,35 +1971,35 @@ void wxPostScriptDC::StartPage()
 
     buffer.Printf( "%d %d translate\n", translate_x, translate_y );
     PsPrint( buffer );
 
     buffer.Printf( "%d %d translate\n", translate_x, translate_y );
     PsPrint( buffer );

-    
+

     double scale_x = data->GetPrinterScaleX();
     double scale_y = data->GetPrinterScaleY();
     double scale_x = data->GetPrinterScaleX();
     double scale_y = data->GetPrinterScaleY();

-    
+

     buffer.Printf( "%f %f scale\n", scale_x, scale_y );
     buffer.Replace( ",", "." );
     PsPrint( buffer );
     buffer.Printf( "%f %f scale\n", scale_x, scale_y );
     buffer.Replace( ",", "." );
     PsPrint( buffer );

-    
+

 #endif
 
     // Each page starts with an "initgraphics" which resets the
 #endif
 
     // Each page starts with an "initgraphics" which resets the

-    // transformation and so we need to rotate the page for 
+    // transformation and so we need to rotate the page for

     // landscape printing)
 
     // I copied this one from a PostScript tutorial, but to no avail. RR.
     // PsPrint( "90 rotate llx neg ury nef translate\n" );
     // landscape printing)
 
     // I copied this one from a PostScript tutorial, but to no avail. RR.
     // PsPrint( "90 rotate llx neg ury nef translate\n" );

-    
+

     if (m_printData.GetOrientation() == wxLANDSCAPE)
         PsPrint( "90 rotate\n" );
 }
 
     if (m_printData.GetOrientation() == wxLANDSCAPE)
         PsPrint( "90 rotate\n" );
 }
 

-void wxPostScriptDC::EndPage ()
+void wxPostScriptDCImpl::EndPage ()

 {
     wxCHECK_RET( m_ok , wxT("invalid postscript dc") );
 
     PsPrint( "showpage\n" );
 }
 
 {
     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,
                            wxCoord fwidth, wxCoord fheight,
                            wxDC *source,
                            wxCoord xsrc, wxCoord ysrc,


@@ -1938,20 +2009,20 @@ bool wxPostScriptDC::DoBlit( wxCoord xdest, wxCoord ydest,
 
     wxCHECK_MSG( source, false, wxT("invalid source 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);
 
     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;
 }
 
 
     return true;
 }
 

-wxCoord wxPostScriptDC::GetCharHeight() const
+wxCoord wxPostScriptDCImpl::GetCharHeight() const

 {
     if (m_font.Ok())
         return m_font.GetPointSize();
 {
     if (m_font.Ok())
         return m_font.GetPointSize();


@@ -1959,7 +2030,7 @@ wxCoord wxPostScriptDC::GetCharHeight() const
         return 12;
 }
 
         return 12;
 }
 

-void wxPostScriptDC::PsPrint( const wxString& str )
+void wxPostScriptDCImpl::PsPrint( const wxString& str )

 {
     const wxCharBuffer psdata(str.utf8_str());
 
 {
     const wxCharBuffer psdata(str.utf8_str());
 


@@ -1986,7 +2057,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
                                      wxCoord *x, wxCoord *y,
                                      wxCoord *descent, wxCoord *externalLeading,
                                      const wxFont *theFont ) const


@@ -2009,9 +2080,9 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
    // GTK 2.0
 
     const wxWX2MBbuf strbuf = string.mb_str();
    // GTK 2.0
 
     const wxWX2MBbuf strbuf = string.mb_str();

-    
+

     // conversion failed (non e.g. ISO characters)
     // conversion failed (non e.g. ISO characters)

-    if (strbuf.data() == NULL)
+    if ( !strbuf )

         return;
 
 #if !wxUSE_AFM_FOR_POSTSCRIPT
         return;
 
 #if !wxUSE_AFM_FOR_POSTSCRIPT