remove always-true tests of unsigned >= 0

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

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index e978a7dba0d76ccdb62976b6329b11f274915dfe..c18a7dd39174487fa12f4d2b7f2a23a4626aee51 100644 (file)
--- 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/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__
 #include "wx/stdpaths.h"
 
 #ifdef __WXMSW__


@@ -190,7 +190,7 @@ static const char *wxPostScriptHeaderColourImage = "\
   } ifelse          % end of 'false' case\n\
 ";
 
   } 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"
     "\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";
 
 "/.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"
 "/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
 //-------------------------------------------------------------------------------
 
 // 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;
 
 // 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)
 
 #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;
 
     m_currentRed = 0;
     m_currentGreen = 0;


@@ -294,34 +326,46 @@ 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)
     {
         fclose( m_pstream );
 {
     if (m_pstream)
     {
         fclose( m_pstream );

-        m_pstream = (FILE*) NULL;
+        m_pstream = NULL;

     }
 }
 
     }
 }
 

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


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

-    wxDC::DestroyClippingRegion();
+    wxDCImpl::DestroyClippingRegion();

 }
 
 }
 

-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), wxFloodFillStyle 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") );
 

-    if  (m_pen.GetStyle() == wxTRANSPARENT) return;
+    if ( m_pen.IsTransparent() )
+        return;

 
     SetPen( m_pen );
 
 
     SetPen( m_pen );
 


@@ -401,7 +446,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") );
 


@@ -436,7 +481,7 @@ void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
 
     int i_radius = wxRound( radius );
 
 
     int i_radius = wxRound( radius );
 

-    if (m_brush.GetStyle() != wxTRANSPARENT)
+    if ( m_brush.IsNonTransparent() )

     {
         SetBrush( m_brush );
 
     {
         SetBrush( m_brush );
 


@@ -446,8 +491,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( ",", "." );


@@ -457,18 +502,18 @@ void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
         CalcBoundingBox( xc+i_radius, yc+i_radius );
     }
 
         CalcBoundingBox( xc+i_radius, yc+i_radius );
     }
 

-    if (m_pen.GetStyle() != wxTRANSPARENT)
+    if ( m_pen.IsNonTransparent() )

     {
         SetPen( m_pen );
     {
         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 +524,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,11 +539,11 @@ 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;
     }
 

-    if (m_brush.GetStyle () != wxTRANSPARENT)
+    if ( m_brush.IsNonTransparent() )

     {
         SetBrush( m_brush );
 
     {
         SetBrush( m_brush );
 


@@ -515,7 +560,7 @@ void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,d
         CalcBoundingBox( x+w, y+h );
     }
 
         CalcBoundingBox( x+w, y+h );
     }
 

-    if (m_pen.GetStyle () != wxTRANSPARENT)
+    if ( m_pen.IsNonTransparent() )

     {
         SetPen( m_pen );
 
     {
         SetPen( m_pen );
 


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

-    if (m_pen.GetStyle() == wxTRANSPARENT) return;
+    if ( m_pen.IsTransparent() )
+        return;

 
     SetPen (m_pen);
 
 
     SetPen (m_pen);
 


@@ -554,13 +600,13 @@ 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, wxPolygonFillMode fillStyle)

 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     if (n <= 0) return;
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     if (n <= 0) return;
 

-    if (m_brush.GetStyle () != wxTRANSPARENT)
+    if ( m_brush.IsNonTransparent() )

     {
         SetBrush( m_brush );
 
     {
         SetBrush( m_brush );
 


@@ -591,7 +637,7 @@ void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wx
         PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") );
     }
 
         PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") );
     }
 

-    if (m_pen.GetStyle () != wxTRANSPARENT)
+    if ( m_pen.IsNonTransparent() )

     {
         SetPen( m_pen );
 
     {
         SetPen( m_pen );
 


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

 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     if (n <= 0) return;
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     if (n <= 0) return;
 

-    if (m_brush.GetStyle () != wxTRANSPARENT)
+    if ( m_brush.IsNonTransparent() )

     {
         SetBrush( m_brush );
 
     {
         SetBrush( m_brush );
 


@@ -664,7 +710,7 @@ void wxPostScriptDC::DoDrawPolyPolygon (int n, int count[], wxPoint points[], wx
         PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") );
     }
 
         PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") );
     }
 

-    if (m_pen.GetStyle () != wxTRANSPARENT)
+    if ( m_pen.IsNonTransparent() )

     {
         SetPen( m_pen );
 
     {
         SetPen( m_pen );
 


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

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

-    if (m_pen.GetStyle() == wxTRANSPARENT) return;
+    if ( m_pen.IsTransparent() )
+        return;

 
     if (n <= 0) return;
 
 
     if (n <= 0) return;
 


@@ -721,7 +768,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,11 +781,14 @@ 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") );
 

-    if (m_brush.GetStyle () != wxTRANSPARENT)
+    width--;
+    height--;
+
+    if ( m_brush.IsNonTransparent() )

     {
         SetBrush( m_brush );
 
     {
         SetBrush( m_brush );
 


@@ -761,7 +811,7 @@ void wxPostScriptDC::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoo
         CalcBoundingBox( x + width, y + height );
     }
 
         CalcBoundingBox( x + width, y + height );
     }
 

-    if (m_pen.GetStyle () != wxTRANSPARENT)
+    if ( m_pen.IsNonTransparent() )

     {
         SetPen (m_pen);
 
     {
         SetPen (m_pen);
 


@@ -785,10 +835,13 @@ 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") );
 

+    width--;
+    height--;
+

     if (radius < 0.0)
     {
         // Now, a negative radius is interpreted to mean
     if (radius < 0.0)
     {
         // Now, a negative radius is interpreted to mean


@@ -799,7 +852,7 @@ void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width
 
     wxCoord rad = (wxCoord) radius;
 
 
     wxCoord rad = (wxCoord) radius;
 

-    if (m_brush.GetStyle () != wxTRANSPARENT)
+    if ( m_brush.IsNonTransparent() )

     {
         SetBrush( m_brush );
 
     {
         SetBrush( m_brush );
 


@@ -831,7 +884,7 @@ void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width
         CalcBoundingBox( x + width, y + height );
     }
 
         CalcBoundingBox( x + width, y + height );
     }
 

-    if (m_pen.GetStyle () != wxTRANSPARENT)
+    if ( m_pen.IsNonTransparent() )

     {
         SetPen (m_pen);
 
     {
         SetPen (m_pen);
 


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

-    if (m_brush.GetStyle () != wxTRANSPARENT)
+    width--;
+    height--;
+
+    if ( m_brush.IsNonTransparent() )

     {
         SetBrush (m_brush);
 
     {
         SetBrush (m_brush);
 


@@ -885,7 +941,7 @@ void wxPostScriptDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord
         CalcBoundingBox( x + width, y + height );
     }
 
         CalcBoundingBox( x + width, y + height );
     }
 

-    if (m_pen.GetStyle () != wxTRANSPARENT)
+    if ( m_pen.IsNonTransparent() )

     {
         SetPen (m_pen);
 
     {
         SetPen (m_pen);
 


@@ -903,15 +959,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 */
 }
 
 /* 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") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 


@@ -970,7 +1026,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


@@ -981,7 +1037,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") );
 


@@ -1067,15 +1123,16 @@ void wxPostScriptDC::SetFont( const wxFont& font )
     PsPrint( name );
     PsPrint( " findfont\n" );
 
     PsPrint( name );
     PsPrint( " findfont\n" );
 

-    
-    double size = (double) m_font.GetPointSize();
+
+    float size = float(m_font.GetPointSize());
+    size = size * GetFontPointSizeAdjustment(DPI);

     wxString buffer;
     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 );
 }
 
     buffer.Replace( ",", "." );
     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") );
 


@@ -1086,7 +1143,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


@@ -1118,11 +1175,11 @@ void wxPostScriptDC::SetPen( const wxPen& pen )
 
     switch (m_pen.GetStyle())
     {
 
     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);
         {
             wxDash *dashes;
             int nDashes = m_pen.GetDashes (&dashes);


@@ -1136,8 +1193,8 @@ void wxPostScriptDC::SetPen( const wxPen& pen )
             psdash = 0;
         }
         break;
             psdash = 0;
         }
         break;

-        case wxSOLID:
-        case wxTRANSPARENT:
+        case wxPENSTYLE_SOLID:
+        case wxPENSTYLE_TRANSPARENT:

         default:              psdash = "[] 0";         break;
     }
 
         default:              psdash = "[] 0";         break;
     }
 


@@ -1172,7 +1229,6 @@ void wxPostScriptDC::SetPen( const wxPen& pen )
         double bluePS = (double)(blue) / 255.0;
         double greenPS = (double)(green) / 255.0;
 
         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 );
         buffer.Printf( "%f %f %f setrgbcolor\n", redPS, greenPS, bluePS );
         buffer.Replace( ",", "." );
         PsPrint( buffer );


@@ -1183,7 +1239,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") );
 


@@ -1227,14 +1283,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();


@@ -1274,7 +1330,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();
 


@@ -1289,11 +1345,9 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
     PsPrint( buffer );
     PsPrint( "(" );
 
     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 */
         if (c == ')' || c == '(' || c == '\\')
         {
             /* Cope with special characters */


@@ -1317,7 +1371,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"


@@ -1335,7 +1389,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) )
     {


@@ -1377,7 +1431,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;


@@ -1397,26 +1451,27 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord
 
     PsPrint( "(" );
     const wxWX2MBbuf textbuf = text.mb_str();
 
     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 == '\\')
-        {
-            /* Cope with special characters */
-            PsPrint( "\\" );
-            PsPrint( (char) c );
-        }
-        else if ( c >= 128 )
-        {
-            /* Cope with character codes > 127 */
-            buffer.Printf( "\\%o", c);
-            PsPrint( buffer );
-        }
-        else
+        for ( const char *p = textbuf; *p != '\0'; p++ )

         {
         {

-            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 );
+            }

         }
     }
 
         }
     }
 


@@ -1430,9 +1485,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"


@@ -1450,18 +1505,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(wxRasterOperationMode 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") );
 


@@ -1472,13 +1527,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 =


@@ -1507,7 +1562,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;


@@ -1542,15 +1597,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);


@@ -1569,48 +1624,11 @@ void wxPostScriptDC::SetPrintData(const wxPrintData& data)
         m_pageHeight = h * PS2DEV;
 }
 
         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);
 
 {
     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
 
     // If scale has changed call SetPen to recalulate the line width
     // and SetFont to recalculate font size


@@ -1621,7 +1639,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();
 


@@ -1644,14 +1662,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();
 


@@ -1679,13 +1697,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& WXUNUSED(message) )

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


@@ -1693,7 +1711,7 @@ bool wxPostScriptDC::StartDoc( const wxString& message )
     {
         if (m_printData.GetFilename() == wxEmptyString)
         {
     {
         if (m_printData.GetFilename() == wxEmptyString)
         {

-            wxString filename = wxGetTempFileName( wxT("ps") );
+            wxString filename = wxFileName::CreateTempFileName( wxT("ps") );

             m_printData.SetFilename(filename);
         }
 
             m_printData.SetFilename(filename);
         }
 


@@ -1708,19 +1726,16 @@ bool wxPostScriptDC::StartDoc( const wxString& message )
     }
 
     m_ok = true;
     }
 
     m_ok = true;

-    m_title = 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" );
     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


@@ -1745,10 +1760,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" );


@@ -1774,7 +1789,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") );
 


@@ -1786,7 +1801,7 @@ void wxPostScriptDC::EndDoc ()
 
     if ( m_pstream ) {
         fclose( m_pstream );
 
     if ( m_pstream ) {
         fclose( m_pstream );

-        m_pstream = (FILE *) NULL;
+        m_pstream = NULL;

     }
 
 #if 0
     }
 
 #if 0


@@ -1874,7 +1889,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") );
 


@@ -1891,58 +1906,59 @@ 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,

-                           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") );
 
 {
     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);
 
     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();


@@ -1950,7 +1966,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());
 


@@ -1977,7 +1993,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


@@ -1986,7 +2002,8 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
 
     if (!fontToUse) fontToUse = &m_font;
 
 
     if (!fontToUse) fontToUse = &m_font;
 

-    wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") );
+    const float fontSize =
+        fontToUse->GetPointSize() * GetFontPointSizeAdjustment(72.0);

 
     if (string.empty())
     {
 
     if (string.empty())
     {


@@ -2000,9 +2017,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


@@ -2010,15 +2027,10 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
      * Produces accurate results for mono-spaced font
      * such as Courier (aka wxMODERN) */
 
      * Produces accurate results for mono-spaced font
      * such as Courier (aka wxMODERN) */
 

-    int height = 12;
-    if (fontToUse)
-    {
-        height = fontToUse->GetPointSize();
-    }

     if ( x )
     if ( x )

-        *x = strlen (strbuf) * height * 72 / 120;
+        *x = strlen (strbuf) * fontSize * 72.0 / 120.0;

     if ( y )
     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
     if (descent) *descent = 0;
     if (externalLeading) *externalLeading = 0;
 #else


@@ -2272,22 +2284,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
            /  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;
 
         /* 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 = (double*) &m_underlineThickness;

-        *pt = YLOG2DEVREL((wxCoord)(UnderlineThickness * fontToUse->GetPointSize())) / 1000.0f;
+        *pt = YLOG2DEVREL((wxCoord)(UnderlineThickness * fontSize)) / 1000.0f;

 
     }
 
 
     }
 


@@ -2297,7 +2309,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
        /  string. they are given in 1/1000 of the size! */
 
     long sum=0;
        /  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++)
     {
     unsigned char *p;
     for(p=(unsigned char *)wxMBSTRINGCAST strbuf; *p; p++)
     {


@@ -2313,7 +2325,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
     }
 
     double widthSum = sum;
     }
 
     double widthSum = sum;

-    widthSum *= Size;
+    widthSum *= fontSize;

     widthSum /= 1000.0F;
 
     /* add descender to height (it is usually a negative value) */
     widthSum /= 1000.0F;
 
     /* add descender to height (it is usually a negative value) */


@@ -2328,14 +2340,14 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
     if ( x )
         *x = (wxCoord)widthSum;
     if ( y )
     if ( x )
         *x = (wxCoord)widthSum;
     if ( y )

-        *y = height;
+        *y = (wxCoord)height;

 
     /* return other parameters */
     if (descent)
     {
         if(lastDescender!=INT_MIN)
         {
 
     /* 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
         {
         }
         else
         {