Fix tracking rectangles in 64-bit build by remembering the tag as the 64-bit integer...

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

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index 5e61da75f681a5e5df1377bc3cd3f9c4c2d405fe..c7a349ce7692762625b6240b817a3c69c72b757d 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -1,53 +1,39 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcpsg.cpp
+// Name:        src/generic/dcpsg.cpp

 // Purpose:     Generic wxPostScriptDC implementation
 // Author:      Julian Smart, Robert Roebling, Markus Holzhem
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     Generic wxPostScriptDC implementation
 // Author:      Julian Smart, Robert Roebling, Markus Holzhem
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dcpsg.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-#endif // WX_PRECOMP
-
-#if wxUSE_PRINTING_ARCHITECTURE
+#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT

 
 

-#if wxUSE_POSTSCRIPT
+#include "wx/generic/dcpsg.h"

 
 

-#include "wx/setup.h"
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/dcmemory.h"
+    #include "wx/math.h"
+    #include "wx/image.h"
+    #include "wx/icon.h"
+#endif // WX_PRECOMP

 
 

-#include "wx/window.h"
-#include "wx/dcmemory.h"
-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/filedlg.h"
-#include "wx/app.h"
-#include "wx/msgdlg.h"
-#include "wx/image.h"
-#include "wx/log.h"
-#include "wx/generic/dcpsg.h"
-#include "wx/printdlg.h"
-#include "wx/button.h"
-#include "wx/stattext.h"
-#include "wx/radiobox.h"
-#include "wx/textctrl.h"

 #include "wx/prntbase.h"
 #include "wx/prntbase.h"

+#include "wx/generic/prntdlgg.h"

 #include "wx/paper.h"
 #include "wx/filefn.h"
 #include "wx/paper.h"
 #include "wx/filefn.h"

-
-#include <math.h>
+#include "wx/stdpaths.h"

 
 #ifdef __WXMSW__
 
 
 #ifdef __WXMSW__
 


@@ -89,7 +75,7 @@ static const char *wxPostScriptHeaderConicTo = "\
     p1_x p1_y p2_x p2_y to_x to_y curveto\n\
 }  bind def\n\
 ";
     p1_x p1_y p2_x p2_y to_x to_y curveto\n\
 }  bind def\n\
 ";

-      
+

 static const char *wxPostScriptHeaderEllipse = "\
 /ellipsedict 8 dict def\n\
 ellipsedict /mtrx matrix put\n\
 static const char *wxPostScriptHeaderEllipse = "\
 /ellipsedict 8 dict def\n\
 ellipsedict /mtrx matrix put\n\


@@ -150,34 +136,34 @@ static const char *wxPostScriptHeaderSpline = "\
 ";
 
 static const char *wxPostScriptHeaderColourImage = "\
 ";
 
 static const char *wxPostScriptHeaderColourImage = "\

-%% define 'colorimage' if it isn't defined\n\
-%%   ('colortogray' and 'mergeprocs' come from xwd2ps\n\
-%%     via xgrab)\n\
-/colorimage where   %% do we know about 'colorimage'?\n\
-  { pop }           %% yes: pop off the 'dict' returned\n\
-  {                 %% no:  define one\n\
-    /colortogray {  %% define an RGB->I function\n\
-      /rgbdata exch store    %% call input 'rgbdata'\n\
+% define 'colorimage' if it isn't defined\n\
+%   ('colortogray' and 'mergeprocs' come from xwd2ps\n\
+%     via xgrab)\n\
+/colorimage where   % do we know about 'colorimage'?\n\
+  { pop }           % yes: pop off the 'dict' returned\n\
+  {                 % no:  define one\n\
+    /colortogray {  % define an RGB->I function\n\
+      /rgbdata exch store    % call input 'rgbdata'\n\

       rgbdata length 3 idiv\n\
       /npixls exch store\n\
       /rgbindx 0 store\n\
       0 1 npixls 1 sub {\n\
         grays exch\n\
       rgbdata length 3 idiv\n\
       /npixls exch store\n\
       /rgbindx 0 store\n\
       0 1 npixls 1 sub {\n\
         grays exch\n\

-        rgbdata rgbindx       get 20 mul    %% Red\n\
-        rgbdata rgbindx 1 add get 32 mul    %% Green\n\
-        rgbdata rgbindx 2 add get 12 mul    %% Blue\n\
-        add add 64 idiv      %% I = .5G + .31R + .18B\n\
+        rgbdata rgbindx       get 20 mul    % Red\n\
+        rgbdata rgbindx 1 add get 32 mul    % Green\n\
+        rgbdata rgbindx 2 add get 12 mul    % Blue\n\
+        add add 64 idiv      % I = .5G + .31R + .18B\n\

         put\n\
         /rgbindx rgbindx 3 add store\n\
       } for\n\
       grays 0 npixls getinterval\n\
     } bind def\n\
 \n\
         put\n\
         /rgbindx rgbindx 3 add store\n\
       } for\n\
       grays 0 npixls getinterval\n\
     } bind def\n\
 \n\

-    %% Utility procedure for colorimage operator.\n\
-    %% This procedure takes two procedures off the\n\
-    %% stack and merges them into a single procedure.\n\
+    % Utility procedure for colorimage operator.\n\
+    % This procedure takes two procedures off the\n\
+    % stack and merges them into a single procedure.\n\

 \n\
 \n\

-    /mergeprocs { %% def\n\
+    /mergeprocs { % def\n\

       dup length\n\
       3 -1 roll\n\
       dup\n\
       dup length\n\
       3 -1 roll\n\
       dup\n\


@@ -196,15 +182,14 @@ static const char *wxPostScriptHeaderColourImage = "\
       putinterval\n\
     } bind def\n\
 \n\
       putinterval\n\
     } bind def\n\
 \n\

-    /colorimage { %% def\n\
-      pop pop     %% remove 'false 3' operands\n\
+    /colorimage { % def\n\
+      pop pop     % remove 'false 3' operands\n\

       {colortogray} mergeprocs\n\
       image\n\
     } bind def\n\
       {colortogray} mergeprocs\n\
       image\n\
     } bind def\n\

-  } ifelse          %% end of 'false' case\n\
+  } ifelse          % end of 'false' case\n\

 ";
 
 ";
 

-#ifndef __WXGTK20__

 static char wxPostScriptHeaderReencodeISO1[] =
     "\n/reencodeISO {\n"
 "dup dup findfont dup length dict begin\n"
 static char wxPostScriptHeaderReencodeISO1[] =
     "\n/reencodeISO {\n"
 "dup dup findfont dup length dict begin\n"


@@ -245,48 +230,88 @@ static char wxPostScriptHeaderReencodeISO2[] =
 "/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis\n"
 "/yacute/thorn/ydieresis\n"
         "] def\n\n";
 "/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis\n"
 "/yacute/thorn/ydieresis\n"
         "] def\n\n";

-#endif

 
 //-------------------------------------------------------------------------------
 // wxPostScriptDC
 //-------------------------------------------------------------------------------
 
 
 //-------------------------------------------------------------------------------
 // wxPostScriptDC
 //-------------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)

 
 

-float wxPostScriptDC::ms_PSScaleFactor = 10.0;
+IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)

 
 

-void wxPostScriptDC::SetResolution(int ppi)
+wxPostScriptDC::wxPostScriptDC()
+              : wxDC(new wxPostScriptDCImpl(this))

 {
 {

-    ms_PSScaleFactor = (float)ppi / 72.0;

 }
 
 }
 

-int wxPostScriptDC::GetResolution()
+wxPostScriptDC::wxPostScriptDC(const wxPrintData& printData)
+              : wxDC(new wxPostScriptDCImpl(this, printData))

 {
 {

-    return (int)(ms_PSScaleFactor * 72.0);

 }
 
 }
 

+// conversion
+static const double RAD2DEG  = 180.0 / M_PI;
+
+// we don't want to use only 72 dpi from PS print
+static const int DPI = 600;
+static const double PS2DEV = 600.0 / 72.0;
+static const double DEV2PS = 72.0 / 600.0;
+
+#define XLOG2DEV(x)     ((double)(LogicalToDeviceX(x)) * DEV2PS)
+#define XLOG2DEVREL(x)  ((double)(LogicalToDeviceXRel(x)) * DEV2PS)
+#define YLOG2DEV(x)     ((m_pageHeight - (double)LogicalToDeviceY(x)) * DEV2PS)
+#define YLOG2DEVREL(x)  ((double)(LogicalToDeviceYRel(x)) * DEV2PS)
+
+
+IMPLEMENT_ABSTRACT_CLASS(wxPostScriptDCImpl, wxDCImpl)
+

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

-wxPostScriptDC::wxPostScriptDC ()
+wxPostScriptDCImpl::wxPostScriptDCImpl( wxPostScriptDC *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( wxPostScriptDC *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_ok = true;
+}
+
+
+wxPostScriptDCImpl::wxPostScriptDCImpl( wxPrinterDC *owner ) :
+   wxDCImpl( owner )
+{
+    Init();
+
+    m_pageHeight = 842 * PS2DEV;
+
+    m_ok = true;
+}

 
 

-    m_signX =  1;  // default x-axis left to right
-    m_signY = -1;  // default y-axis bottom up -> top down
+wxPostScriptDCImpl::wxPostScriptDCImpl( wxPrinterDC *owner, const wxPrintData& data ) :
+   wxDCImpl( owner )
+{
+    Init();
+
+    // this calculates m_pageHeight required for
+    // taking the inverted Y axis into account
+    SetPrintData( data );
+
+    m_ok = true;

 }
 
 }
 

-wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData)
+void wxPostScriptDCImpl::Init()

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


@@ -296,20 +321,14 @@ wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData)
 
     m_pageNumber = 0;
 
 
     m_pageNumber = 0;
 

-    m_clipping = FALSE;
+    m_clipping = false;

 
     m_underlinePosition = 0.0;
     m_underlineThickness = 0.0;
 
 
     m_underlinePosition = 0.0;
     m_underlineThickness = 0.0;
 

-    m_signX =  1;  // default x-axis left to right
-    m_signY = -1;  // default y-axis bottom up -> top down
-
-    m_printData = printData;
-
-    m_ok = TRUE;

 }
 
 }
 

-wxPostScriptDC::~wxPostScriptDC ()
+wxPostScriptDCImpl::~wxPostScriptDCImpl ()

 {
     if (m_pstream)
     {
 {
     if (m_pstream)
     {


@@ -318,123 +337,121 @@ wxPostScriptDC::~wxPostScriptDC ()
     }
 }
 
     }
 }
 

-#if WXWIN_COMPATIBILITY_2_2
-bool wxPostScriptDC::Create( const wxString &output, bool interactive, wxWindow *parent )
+bool wxPostScriptDCImpl::IsOk() const

 {
 {

-    wxPrintData data;
-    data.SetFilename( output );
-    data.SetPrintMode( wxPRINT_MODE_FILE );
-    
-    if (interactive)
-    {
-        wxPrintDialogData ddata( data );
-        wxPrintDialog dialog( parent, &data );
-        dialog.GetPrintDialogData().SetSetupDialog(TRUE);
-        if (dialog.ShowModal() != wxID_OK)
-        {
-            m_ok = FALSE;
-            return FALSE;
-        }
-        data = dialog.GetPrintDialogData().GetPrintData();
-    }
-    
-    return TRUE;
+  return m_ok;

 }
 }

-#endif

 
 

+wxRect wxPostScriptDCImpl::GetPaperRect()
+{
+    int w = 0;
+    int h = 0;
+    DoGetSize( &w, &h );
+    return wxRect(0,0,w,h);
+}

 
 

-bool wxPostScriptDC::Ok() const
+int wxPostScriptDCImpl::GetResolution()

 {
 {

-  return m_ok;
+    return DPI;

 }
 
 }
 

-void wxPostScriptDC::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoord h)
+void wxPostScriptDCImpl::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoord h)

 {
 {

-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
-
-    if (m_clipping) DestroyClippingRegion();
-
-    wxDC::DoSetClippingRegion(x, y, w, h);
-
-    m_clipping = TRUE;
-    fprintf( m_pstream,
-            "gsave\n newpath\n"
-            "%d %d moveto\n"
-            "%d %d lineto\n"
-            "%d %d lineto\n"
-            "%d %d lineto\n"
-            "closepath clip newpath\n",
-            LogicalToDeviceX(x),   LogicalToDeviceY(y),
-            LogicalToDeviceX(x+w), LogicalToDeviceY(y),
-            LogicalToDeviceX(x+w), LogicalToDeviceY(y+h),
-            LogicalToDeviceX(x),   LogicalToDeviceY(y+h) );
+    wxCHECK_RET( m_ok , wxT("invalid postscript dc") );
+
+    if (m_clipping)
+        DestroyClippingRegion();
+
+    m_clipX1 = x;
+    m_clipY1 = y;
+    m_clipX2 = x + w;
+    m_clipY2 = y + h;
+
+    m_clipping = true;
+
+    wxString buffer;
+    buffer.Printf( "gsave\n"
+                   "newpath\n"
+                   "%f %f moveto\n"
+                   "%f %f lineto\n"
+                   "%f %f lineto\n"
+                   "%f %f lineto\n"
+                   "closepath clip newpath\n",
+            XLOG2DEV(x),   YLOG2DEV(y),
+            XLOG2DEV(x+w), YLOG2DEV(y),
+            XLOG2DEV(x+w), YLOG2DEV(y+h),
+            XLOG2DEV(x),   YLOG2DEV(y+h) );
+    buffer.Replace( ",", "." );
+    PsPrint( buffer );

 }
 
 
 }
 
 

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

 {
 {

-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok , wxT("invalid postscript dc") );

 
     if (m_clipping)
     {
 
     if (m_clipping)
     {

-        m_clipping = FALSE;
-        fprintf( m_pstream, "grestore\n" );
+        m_clipping = false;
+        PsPrint( "grestore\n" );

     }
 
     }
 

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

 }
 
 }
 

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

 {
 {

-    wxFAIL_MSG( wxT("wxPostScriptDC::Clear not implemented.") );
+    // This should fail silently to avoid unnecessary
+    // asserts
+    //    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.") );
-    return FALSE;
+    wxFAIL_MSG( wxT("wxPostScriptDCImpl::FloodFill not implemented.") );
+    return false;

 }
 
 }
 

-bool wxPostScriptDC::DoGetPixel (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxColour * WXUNUSED(col)) const
+bool wxPostScriptDCImpl::DoGetPixel (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxColour * WXUNUSED(col)) const

 {
 {

-    wxFAIL_MSG( wxT("wxPostScriptDC::GetPixel not implemented.") );
-    return FALSE;
+    wxFAIL_MSG( wxT("wxPostScriptDCImpl::GetPixel not implemented.") );
+    return false;

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

-void wxPostScriptDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
+void wxPostScriptDCImpl::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)

 {
 {

-    wxCHECK_RET( m_ok && 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_pen.GetStyle() == wxTRANSPARENT) return;
 
     SetPen( m_pen );
 

-    fprintf( m_pstream,
-            "newpath\n"
-            "%d %d moveto\n"
-            "%d %d lineto\n"
-            "stroke\n",
-            LogicalToDeviceX(x1), LogicalToDeviceY(y1),
-            LogicalToDeviceX(x2), LogicalToDeviceY (y2) );
+    wxString buffer;
+    buffer.Printf( "newpath\n"
+                   "%f %f moveto\n"
+                   "%f %f lineto\n"
+                   "stroke\n",
+            XLOG2DEV(x1), YLOG2DEV(y1),
+            XLOG2DEV(x2), YLOG2DEV(y2) );
+    buffer.Replace( ",", "." );
+    PsPrint( buffer );

 
     CalcBoundingBox( x1, y1 );
     CalcBoundingBox( x2, y2 );
 }
 
 
     CalcBoundingBox( x1, y1 );
     CalcBoundingBox( x2, y2 );
 }
 

-#define RAD2DEG 57.29577951308
-
-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 && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );

 
     wxCoord dx = x1 - xc;
     wxCoord dy = y1 - yc;
 
     wxCoord dx = x1 - xc;
     wxCoord dy = y1 - yc;

-    wxCoord radius = (wxCoord) sqrt( (double)(dx*dx+dy*dy) );
+    double radius = sqrt( (double)(dx*dx+dy*dy) );

     double alpha1, alpha2;
 
     if (x1 == x2 && y1 == y2)
     double alpha1, alpha2;
 
     if (x1 == x2 && y1 == y2)


@@ -442,9 +459,10 @@ void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
         alpha1 = 0.0;
         alpha2 = 360.0;
     }
         alpha1 = 0.0;
         alpha2 = 360.0;
     }

-    else if (radius == 0.0)
+    else if ( wxIsNullDouble(radius) )

     {
     {

-        alpha1 = alpha2 = 0.0;
+        alpha1 =
+        alpha2 = 0.0;

     }
     else
     {
     }
     else
     {


@@ -460,53 +478,67 @@ void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
     while (alpha1 > 360)  alpha1 -= 360; // 0 and 360 degree
     while (alpha2 > 360)  alpha2 -= 360;
 
     while (alpha1 > 360)  alpha1 -= 360; // 0 and 360 degree
     while (alpha2 > 360)  alpha2 -= 360;
 

+    int i_radius = wxRound( radius );
+

     if (m_brush.GetStyle() != wxTRANSPARENT)
     {
         SetBrush( m_brush );
 
     if (m_brush.GetStyle() != wxTRANSPARENT)
     {
         SetBrush( m_brush );
 

-        fprintf( m_pstream,
-                "newpath\n"
-                "%d %d %d %d %d %d ellipse\n"
-                "%d %d lineto\n"
-                "closepath\n"
-                "fill\n",
-                LogicalToDeviceX(xc), LogicalToDeviceY(yc), LogicalToDeviceXRel(radius), LogicalToDeviceYRel(radius), (wxCoord)alpha1, (wxCoord) alpha2,
-                LogicalToDeviceX(xc), LogicalToDeviceY(yc) );
-
-        CalcBoundingBox( xc-radius, yc-radius );
-        CalcBoundingBox( xc+radius, yc+radius );
+        wxString buffer;
+        buffer.Printf( "newpath\n"
+                       "%f %f %f %f %f %f ellipse\n"
+                       "%f %f lineto\n"
+                       "closepath\n"
+                       "fill\n",
+                XLOG2DEV(xc), YLOG2DEV(yc),
+                XLOG2DEVREL(i_radius), YLOG2DEVREL(i_radius),
+                alpha1, alpha2,
+                XLOG2DEV(xc), YLOG2DEV(yc) );
+        buffer.Replace( ",", "." );
+        PsPrint( buffer );
+
+        CalcBoundingBox( xc-i_radius, yc-i_radius );
+        CalcBoundingBox( xc+i_radius, yc+i_radius );

     }
 
     if (m_pen.GetStyle() != wxTRANSPARENT)
     {
         SetPen( m_pen );
 
     }
 
     if (m_pen.GetStyle() != wxTRANSPARENT)
     {
         SetPen( m_pen );
 

-        fprintf( m_pstream,
-                "newpath\n"
-                "%d %d %d %d %d %d ellipse\n"
-                "%d %d lineto\n"
-                "stroke\n"
-                "fill\n",
-                LogicalToDeviceX(xc), LogicalToDeviceY(yc), LogicalToDeviceXRel(radius), LogicalToDeviceYRel(radius), (wxCoord)alpha1, (wxCoord) alpha2,
-                LogicalToDeviceX(xc), LogicalToDeviceY(yc) );
-
-        CalcBoundingBox( xc-radius, yc-radius );
-        CalcBoundingBox( xc+radius, yc+radius );
+        wxString buffer;
+        buffer.Printf( "newpath\n"
+                       "%f %f %f %f %f %f ellipse\n"
+                       "%f %f lineto\n"
+                       "closepath\n"
+                       "stroke\n",
+                XLOG2DEV(xc), YLOG2DEV(yc),
+                XLOG2DEVREL(i_radius), YLOG2DEVREL(i_radius),
+                alpha1, alpha2,
+                XLOG2DEV(xc), YLOG2DEV(yc) );
+        buffer.Replace( ",", "." );
+        PsPrint( buffer );
+
+        CalcBoundingBox( xc-i_radius, yc-i_radius );
+        CalcBoundingBox( xc+i_radius, yc+i_radius );

     }
 }
 
     }
 }
 

-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 && m_pstream, 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;
-    if (sa<0) sa+=360;
-    if (ea<0) ea+=360;
-
-    if (sa==ea)
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
+
+    if ( sa >= 360 || sa <= -360 )
+        sa -= int(sa/360)*360;
+    if ( ea >= 360 || ea <=- 360 )
+        ea -= int(ea/360)*360;
+    if ( sa < 0 )
+        sa += 360;
+    if ( ea < 0 )
+        ea += 360;
+
+    if ( wxIsSameDouble(sa, ea) )

     {
     {

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

         return;
     }
 
         return;
     }
 


@@ -514,10 +546,14 @@ void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,d
     {
         SetBrush( m_brush );
 
     {
         SetBrush( m_brush );
 

-        fprintf( m_pstream,
-                "newpath\n"
-                "%d %d %d %d %d %d true ellipticarc\n",
-                LogicalToDeviceX(x+w/2), LogicalToDeviceY(y+h/2), LogicalToDeviceXRel(w/2), LogicalToDeviceYRel(h/2), (wxCoord)sa, (wxCoord)ea );
+        wxString buffer;
+        buffer.Printf( "newpath\n"
+                       "%f %f %f %f %f %f true ellipticarc\n",
+                  XLOG2DEV(x+w/2), YLOG2DEV(y+h/2),
+                  XLOG2DEVREL(w/2), YLOG2DEVREL(h/2),
+                  sa, ea );
+        buffer.Replace( ",", "." );
+        PsPrint( buffer );

 
         CalcBoundingBox( x ,y );
         CalcBoundingBox( x+w, y+h );
 
         CalcBoundingBox( x ,y );
         CalcBoundingBox( x+w, y+h );


@@ -527,38 +563,44 @@ void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,d
     {
         SetPen( m_pen );
 
     {
         SetPen( m_pen );
 

-        fprintf(m_pstream,
-                "newpath\n"
-                "%d %d %d %d %d %d false ellipticarc\n",
-                LogicalToDeviceX(x+w/2), LogicalToDeviceY(y+h/2), LogicalToDeviceXRel(w/2), LogicalToDeviceYRel(h/2), (wxCoord)sa, (wxCoord)ea );
+        wxString buffer;
+        buffer.Printf( "newpath\n"
+                       "%f %f %f %f %f %f false ellipticarc\n",
+                  XLOG2DEV(x+w/2), YLOG2DEV(y+h/2),
+                  XLOG2DEVREL(w/2), YLOG2DEVREL(h/2),
+                  sa, ea );
+        buffer.Replace( ",", "." );
+        PsPrint( buffer );

 
         CalcBoundingBox( x ,y );
         CalcBoundingBox( x+w, y+h );
     }
 }
 
 
         CalcBoundingBox( x ,y );
         CalcBoundingBox( x+w, y+h );
     }
 }
 

-void wxPostScriptDC::DoDrawPoint (wxCoord x, wxCoord y)
+void wxPostScriptDCImpl::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_pen.GetStyle() == wxTRANSPARENT) return;
 
     SetPen (m_pen);
 

-    fprintf( m_pstream,
-            "newpath\n"
-            "%d %d moveto\n"
-            "%d %d lineto\n"
-            "stroke\n",
-            LogicalToDeviceX(x),   LogicalToDeviceY(y),
-            LogicalToDeviceX(x+1), LogicalToDeviceY(y) );
+    wxString buffer;
+    buffer.Printf( "newpath\n"
+                   "%f %f moveto\n"
+                   "%f %f lineto\n"
+                   "stroke\n",
+            XLOG2DEV(x),   YLOG2DEV(y),
+            XLOG2DEV(x+1), YLOG2DEV(y) );
+    buffer.Replace( ",", "." );
+    PsPrint( buffer );

 
     CalcBoundingBox( x, y );
 }
 
 
     CalcBoundingBox( x, y );
 }
 

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

 {
 {

-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );

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


@@ -566,59 +608,145 @@ void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wx
     {
         SetBrush( m_brush );
 
     {
         SetBrush( m_brush );
 

-        fprintf( m_pstream, "newpath\n" );
+        PsPrint( "newpath\n" );

 
 

-        wxCoord xx = LogicalToDeviceX(points[0].x + xoffset);
-        wxCoord yy = LogicalToDeviceY(points[0].y + yoffset);
+        double xx = XLOG2DEV(points[0].x + xoffset);
+        double yy = YLOG2DEV(points[0].y + yoffset);

 
 

-        fprintf( m_pstream, "%d %d moveto\n", xx, yy );
+        wxString buffer;
+        buffer.Printf( "%f %f moveto\n", xx, yy );
+        buffer.Replace( ",", "." );
+        PsPrint( buffer );

 
         CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset );
 
         for (int i = 1; i < n; i++)
         {
 
         CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset );
 
         for (int i = 1; i < n; i++)
         {

-            xx = LogicalToDeviceX(points[i].x + xoffset);
-            yy = LogicalToDeviceY(points[i].y + yoffset);
+            xx = XLOG2DEV(points[i].x + xoffset);
+            yy = YLOG2DEV(points[i].y + yoffset);

 
 

-            fprintf( m_pstream, "%d %d lineto\n", xx, yy );
+            buffer.Printf( "%f %f lineto\n", xx, yy );
+            buffer.Replace( ",", "." );
+            PsPrint( buffer );

 
             CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset);
         }
 
 
             CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset);
         }
 

-        fprintf( m_pstream, "fill\n" );
+        PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") );

     }
 
     if (m_pen.GetStyle () != wxTRANSPARENT)
     {
         SetPen( m_pen );
 
     }
 
     if (m_pen.GetStyle () != wxTRANSPARENT)
     {
         SetPen( m_pen );
 

-        fprintf( m_pstream, "newpath\n" );
+        PsPrint( "newpath\n" );

 
 

-        wxCoord xx = LogicalToDeviceX(points[0].x + xoffset);
-        wxCoord yy = LogicalToDeviceY(points[0].y + yoffset);
+        double xx = XLOG2DEV(points[0].x + xoffset);
+        double yy = YLOG2DEV(points[0].y + yoffset);

 
 

-        fprintf( m_pstream, "%d %d moveto\n", xx, yy );
+        wxString buffer;
+        buffer.Printf( "%f %f moveto\n", xx, yy );
+        buffer.Replace( ",", "." );
+        PsPrint( buffer );

 
         CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset );
 
         for (int i = 1; i < n; i++)
         {
 
         CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset );
 
         for (int i = 1; i < n; i++)
         {

-            xx = LogicalToDeviceX(points[i].x + xoffset);
-            yy = LogicalToDeviceY(points[i].y + yoffset);
+            xx = XLOG2DEV(points[i].x + xoffset);
+            yy = YLOG2DEV(points[i].y + yoffset);

 
 

-            fprintf( m_pstream, "%d %d lineto\n", xx, yy );
+            buffer.Printf( "%f %f lineto\n", xx, yy );
+            buffer.Replace( ",", "." );
+            PsPrint( buffer );

 
             CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset);
         }
 
 
             CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset);
         }
 

-        fprintf( m_pstream, "closepath\n" );
-        fprintf( m_pstream, "stroke\n" );
+        PsPrint( "closepath\n" );
+        PsPrint( "stroke\n" );
+    }
+}
+
+void wxPostScriptDCImpl::DoDrawPolyPolygon (int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
+{
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
+
+    if (n <= 0) return;
+
+    if (m_brush.GetStyle () != wxTRANSPARENT)
+    {
+        SetBrush( m_brush );
+
+        PsPrint( "newpath\n" );
+
+        int ofs = 0;
+        for (int i = 0; i < n; ofs += count[i++])
+        {
+            double xx = XLOG2DEV(points[ofs].x + xoffset);
+            double yy = YLOG2DEV(points[ofs].y + yoffset);
+
+            wxString buffer;
+            buffer.Printf( "%f %f moveto\n", xx, yy );
+            buffer.Replace( ",", "." );
+            PsPrint( buffer );
+
+            CalcBoundingBox( points[ofs].x + xoffset, points[ofs].y + yoffset );
+
+            for (int j = 1; j < count[i]; j++)
+            {
+                xx = XLOG2DEV(points[ofs+j].x + xoffset);
+                yy = YLOG2DEV(points[ofs+j].y + yoffset);
+
+                buffer.Printf( "%f %f lineto\n", xx, yy );
+                buffer.Replace( ",", "." );
+                PsPrint( buffer );
+
+                CalcBoundingBox( points[ofs+j].x + xoffset, points[ofs+j].y + yoffset);
+            }
+        }
+        PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") );
+    }
+
+    if (m_pen.GetStyle () != wxTRANSPARENT)
+    {
+        SetPen( m_pen );
+
+        PsPrint( "newpath\n" );
+
+        int ofs = 0;
+        for (int i = 0; i < n; ofs += count[i++])
+        {
+            double xx = XLOG2DEV(points[ofs].x + xoffset);
+            double yy = YLOG2DEV(points[ofs].y + yoffset);
+
+            wxString buffer;
+            buffer.Printf( "%f %f moveto\n", xx, yy );
+            buffer.Replace( ",", "." );
+            PsPrint( buffer );
+
+            CalcBoundingBox( points[ofs].x + xoffset, points[ofs].y + yoffset );
+
+            for (int j = 1; j < count[i]; j++)
+            {
+                xx = XLOG2DEV(points[ofs+j].x + xoffset);
+                yy = YLOG2DEV(points[ofs+j].y + yoffset);
+
+                buffer.Printf( "%f %f lineto\n", xx, yy );
+                buffer.Replace( ",", "." );
+                PsPrint( buffer );
+
+                CalcBoundingBox( points[ofs+j].x + xoffset, points[ofs+j].y + yoffset);
+            }
+        }
+        PsPrint( "closepath\n" );
+        PsPrint( "stroke\n" );

     }
 }
 
     }
 }
 

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

 
     if (m_pen.GetStyle() == wxTRANSPARENT) return;
 
 
     if (m_pen.GetStyle() == wxTRANSPARENT) return;
 


@@ -628,45 +756,53 @@ void wxPostScriptDC::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCo
 
     int i;
     for ( i =0; i<n ; i++ )
 
     int i;
     for ( i =0; i<n ; i++ )

-    {
-        CalcBoundingBox( LogicalToDeviceX(points[i].x+xoffset), LogicalToDeviceY(points[i].y+yoffset));
-    }
+        CalcBoundingBox( points[i].x+xoffset, points[i].y+yoffset );

 
 

-    fprintf( m_pstream,
-            "newpath\n"
-            "%d %d moveto\n",
-            LogicalToDeviceX(points[0].x+xoffset), LogicalToDeviceY(points[0].y+yoffset) );
+    wxString buffer;
+    buffer.Printf( "newpath\n"
+                   "%f %f moveto\n",
+              XLOG2DEV(points[0].x+xoffset),
+              YLOG2DEV(points[0].y+yoffset) );
+    buffer.Replace( ",", "." );
+    PsPrint( buffer );

 
     for (i = 1; i < n; i++)
     {
 
     for (i = 1; i < n; i++)
     {

-        fprintf( m_pstream,
-                "%d %d lineto\n",
-                LogicalToDeviceX(points[i].x+xoffset), LogicalToDeviceY(points[i].y+yoffset) );
+        buffer.Printf( "%f %f lineto\n",
+                  XLOG2DEV(points[i].x+xoffset),
+                  YLOG2DEV(points[i].y+yoffset) );
+        buffer.Replace( ",", "." );
+        PsPrint( buffer );

     }
 
     }
 

-    fprintf( m_pstream, "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 && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
+
+    width--;
+    height--;

 
     if (m_brush.GetStyle () != wxTRANSPARENT)
     {
         SetBrush( m_brush );
 
 
     if (m_brush.GetStyle () != wxTRANSPARENT)
     {
         SetBrush( m_brush );
 

-        fprintf( m_pstream,
-                "newpath\n"
-                "%d %d moveto\n"
-                "%d %d lineto\n"
-                "%d %d lineto\n"
-                "%d %d lineto\n"
-                "closepath\n"
-                "fill\n",
-                LogicalToDeviceX(x),         LogicalToDeviceY(y),
-                LogicalToDeviceX(x + width), LogicalToDeviceY(y),
-                LogicalToDeviceX(x + width), LogicalToDeviceY(y + height),
-                LogicalToDeviceX(x),         LogicalToDeviceY(y + height) );
+        wxString buffer;
+        buffer.Printf( "newpath\n"
+                       "%f %f moveto\n"
+                       "%f %f lineto\n"
+                       "%f %f lineto\n"
+                       "%f %f lineto\n"
+                       "closepath\n"
+                       "fill\n",
+                XLOG2DEV(x),         YLOG2DEV(y),
+                XLOG2DEV(x + width), YLOG2DEV(y),
+                XLOG2DEV(x + width), YLOG2DEV(y + height),
+                XLOG2DEV(x),         YLOG2DEV(y + height) );
+        buffer.Replace( ",", "." );
+        PsPrint( buffer );

 
         CalcBoundingBox( x, y );
         CalcBoundingBox( x + width, y + height );
 
         CalcBoundingBox( x, y );
         CalcBoundingBox( x + width, y + height );


@@ -676,37 +812,38 @@ void wxPostScriptDC::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoo
     {
         SetPen (m_pen);
 
     {
         SetPen (m_pen);
 

-        fprintf( m_pstream,
-                "newpath\n"
-                "%d %d moveto\n"
-                "%d %d lineto\n"
-                "%d %d lineto\n"
-                "%d %d lineto\n"
-                "closepath\n"
-                "stroke\n",
-                LogicalToDeviceX(x),         LogicalToDeviceY(y),
-                LogicalToDeviceX(x + width), LogicalToDeviceY(y),
-                LogicalToDeviceX(x + width), LogicalToDeviceY(y + height),
-                LogicalToDeviceX(x),         LogicalToDeviceY(y + height) );
+        wxString buffer;
+        buffer.Printf( "newpath\n"
+                       "%f %f moveto\n"
+                       "%f %f lineto\n"
+                       "%f %f lineto\n"
+                       "%f %f lineto\n"
+                       "closepath\n"
+                       "stroke\n",
+                XLOG2DEV(x),         YLOG2DEV(y),
+                XLOG2DEV(x + width), YLOG2DEV(y),
+                XLOG2DEV(x + width), YLOG2DEV(y + height),
+                XLOG2DEV(x),         YLOG2DEV(y + height) );
+        buffer.Replace( ",", "." );
+        PsPrint( buffer );

 
         CalcBoundingBox( x, y );
         CalcBoundingBox( x + width, y + height );
     }
 }
 
 
         CalcBoundingBox( x, y );
         CalcBoundingBox( x + width, y + height );
     }
 }
 

-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 && m_pstream, 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
         // 'the proportion of the smallest X or Y dimension'
 
     if (radius < 0.0)
     {
         // Now, a negative radius is interpreted to mean
         // 'the proportion of the smallest X or Y dimension'

-        double smallest = 0.0;
-        if (width < height)
-        smallest = width;
-        else
-        smallest = height;
+        double smallest = width < height ? width : height;

         radius =  (-radius * smallest);
     }
 
         radius =  (-radius * smallest);
     }
 


@@ -717,26 +854,28 @@ void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width
         SetBrush( m_brush );
 
         /* Draw rectangle anticlockwise */
         SetBrush( m_brush );
 
         /* Draw rectangle anticlockwise */

-        fprintf( m_pstream,
-                "newpath\n"
-                "%d %d %d 90 180 arc\n"
-                "%d %d moveto\n"
-                "%d %d %d 180 270 arc\n"
-                "%d %d lineto\n"
-                "%d %d %d 270 0 arc\n"
-                "%d %d lineto\n"
-                "%d %d %d 0 90 arc\n"
-                "%d %d lineto\n"
-                "closepath\n"
-                "fill\n",
-                LogicalToDeviceX(x + rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad),
-                LogicalToDeviceX(x), LogicalToDeviceY(y + rad),
-                LogicalToDeviceX(x + rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),
-                LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + height),
-                LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),
-                LogicalToDeviceX(x + width), LogicalToDeviceY(y + rad),
-                LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad),
-                LogicalToDeviceX(x + rad), LogicalToDeviceY(y) );
+        wxString buffer;
+        buffer.Printf( "newpath\n"
+                       "%f %f %f 90 180 arc\n"
+                       "%f %f lineto\n"
+                       "%f %f %f 180 270 arc\n"
+                       "%f %f lineto\n"
+                       "%f %f %f 270 0 arc\n"
+                       "%f %f lineto\n"
+                       "%f %f %f 0 90 arc\n"
+                       "%f %f lineto\n"
+                       "closepath\n"
+                       "fill\n",
+                XLOG2DEV(x + rad), YLOG2DEV(y + rad), XLOG2DEVREL(rad),
+                XLOG2DEV(x), YLOG2DEV(y + height - rad),
+                XLOG2DEV(x + rad), YLOG2DEV(y + height - rad), XLOG2DEVREL(rad),
+                XLOG2DEV(x + width - rad), YLOG2DEV(y + height),
+                XLOG2DEV(x + width - rad), YLOG2DEV(y + height - rad), XLOG2DEVREL(rad),
+                XLOG2DEV(x + width), YLOG2DEV(y + rad),
+                XLOG2DEV(x + width - rad), YLOG2DEV(y + rad), XLOG2DEVREL(rad),
+                XLOG2DEV(x + rad), YLOG2DEV(y) );
+        buffer.Replace( ",", "." );
+        PsPrint( buffer );

 
         CalcBoundingBox( x, y );
         CalcBoundingBox( x + width, y + height );
 
         CalcBoundingBox( x, y );
         CalcBoundingBox( x + width, y + height );


@@ -747,46 +886,53 @@ void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width
         SetPen (m_pen);
 
         /* Draw rectangle anticlockwise */
         SetPen (m_pen);
 
         /* Draw rectangle anticlockwise */

-        fprintf( m_pstream,
-                "newpath\n"
-                "%d %d %d 90 180 arc\n"
-                "%d %d moveto\n"
-                "%d %d %d 180 270 arc\n"
-                "%d %d lineto\n"
-                "%d %d %d 270 0 arc\n"
-                "%d %d lineto\n"
-                "%d %d %d 0 90 arc\n"
-                "%d %d lineto\n"
-                "closepath\n"
-                "stroke\n",
-                LogicalToDeviceX(x + rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad),
-                LogicalToDeviceX(x), LogicalToDeviceY(y + rad),
-                LogicalToDeviceX(x + rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),
-                LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + height),
-                LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),
-                LogicalToDeviceX(x + width), LogicalToDeviceY(y + rad),
-                LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad),
-                LogicalToDeviceX(x + rad), LogicalToDeviceY(y) );
+        wxString buffer;
+        buffer.Printf( "newpath\n"
+                       "%f %f %f 90 180 arc\n"
+                       "%f %f lineto\n"
+                       "%f %f %f 180 270 arc\n"
+                       "%f %f lineto\n"
+                       "%f %f %f 270 0 arc\n"
+                       "%f %f lineto\n"
+                       "%f %f %f 0 90 arc\n"
+                       "%f %f lineto\n"
+                       "closepath\n"
+                       "stroke\n",
+                XLOG2DEV(x + rad), YLOG2DEV(y + rad), XLOG2DEVREL(rad),
+                XLOG2DEV(x), YLOG2DEV(y + height - rad),
+                XLOG2DEV(x + rad), YLOG2DEV(y + height - rad), XLOG2DEVREL(rad),
+                XLOG2DEV(x + width - rad), YLOG2DEV(y + height),
+                XLOG2DEV(x + width - rad), YLOG2DEV(y + height - rad), XLOG2DEVREL(rad),
+                XLOG2DEV(x + width), YLOG2DEV(y + rad),
+                XLOG2DEV(x + width - rad), YLOG2DEV(y + rad), XLOG2DEVREL(rad),
+                XLOG2DEV(x + rad), YLOG2DEV(y) );
+        buffer.Replace( ",", "." );
+        PsPrint( buffer );

 
         CalcBoundingBox( x, y );
         CalcBoundingBox( x + width, y + height );
     }
 }
 
 
         CalcBoundingBox( x, y );
         CalcBoundingBox( x + width, y + height );
     }
 }
 

-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 && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
+
+    width--;
+    height--;

 
     if (m_brush.GetStyle () != wxTRANSPARENT)
     {
         SetBrush (m_brush);
 
 
     if (m_brush.GetStyle () != wxTRANSPARENT)
     {
         SetBrush (m_brush);
 

-        fprintf( m_pstream,
-                "newpath\n"
-                "%d %d %d %d 0 360 ellipse\n"
-                "fill\n",
-                LogicalToDeviceX(x + width / 2), LogicalToDeviceY(y + height / 2),
-                LogicalToDeviceXRel(width / 2), LogicalToDeviceYRel(height / 2) );
+        wxString buffer;
+        buffer.Printf( "newpath\n"
+                       "%f %f %f %f 0 360 ellipse\n"
+                       "fill\n",
+                XLOG2DEV(x + width / 2), YLOG2DEV(y + height / 2),
+                XLOG2DEVREL(width / 2), YLOG2DEVREL(height / 2) );
+        buffer.Replace( ",", "." );
+        PsPrint( buffer );

 
         CalcBoundingBox( x - width, y - height );
         CalcBoundingBox( x + width, y + height );
 
         CalcBoundingBox( x - width, y - height );
         CalcBoundingBox( x + width, y + height );


@@ -796,37 +942,31 @@ void wxPostScriptDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord
     {
         SetPen (m_pen);
 
     {
         SetPen (m_pen);
 

-        fprintf( m_pstream,
-                "newpath\n"
-                "%d %d %d %d 0 360 ellipse\n"
-                "stroke\n",
-                LogicalToDeviceX(x + width / 2), LogicalToDeviceY(y + height / 2),
-                LogicalToDeviceXRel(width / 2), LogicalToDeviceYRel(height / 2) );
+        wxString buffer;
+        buffer.Printf( "newpath\n"
+                       "%f %f %f %f 0 360 ellipse\n"
+                       "stroke\n",
+                XLOG2DEV(x + width / 2), YLOG2DEV(y + height / 2),
+                XLOG2DEVREL(width / 2), YLOG2DEVREL(height / 2) );
+        buffer.Replace( ",", "." );
+        PsPrint( buffer );

 
         CalcBoundingBox( x - width, y - height );
         CalcBoundingBox( x + width, y + height );
     }
 }
 
 
         CalcBoundingBox( x - width, y - height );
         CalcBoundingBox( x + width, y + height );
     }
 }
 

-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";

-static void LocalDecToHex( int dec, char *buf )
-{
-    int firstDigit = (int)(dec/16.0);
-    int secondDigit = (int)(dec - (firstDigit*16.0));
-    buf[0] = hexArray[firstDigit];
-    buf[1] = hexArray[secondDigit];
-    buf[2] = 0;
-}

 
 

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

 
     if (!bitmap.Ok()) return;
 
 
     if (!bitmap.Ok()) return;
 


@@ -837,56 +977,71 @@ void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y,
     wxCoord w = image.GetWidth();
     wxCoord h = image.GetHeight();
 
     wxCoord w = image.GetWidth();
     wxCoord h = image.GetHeight();
 

-    wxCoord ww = LogicalToDeviceXRel(image.GetWidth());
-    wxCoord hh = LogicalToDeviceYRel(image.GetHeight());
-
-    wxCoord xx = LogicalToDeviceX(x);
-    wxCoord yy = LogicalToDeviceY(y + bitmap.GetHeight());
-
-    fprintf( m_pstream,
-            "/origstate save def\n"
-            "20 dict begin\n"
-            "/pix %d string def\n"
-            "/grays %d string def\n"
-            "/npixels 0 def\n"
-            "/rgbindx 0 def\n"
-            "%d %d translate\n"
-            "%d %d scale\n"
-            "%d %d 8\n"
-            "[%d 0 0 %d 0 %d]\n"
-            "{currentfile pix readhexstring pop}\n"
-            "false 3 colorimage\n",
+    double ww = XLOG2DEVREL(image.GetWidth());
+    double hh = YLOG2DEVREL(image.GetHeight());
+
+    double xx = XLOG2DEV(x);
+    double yy = YLOG2DEV(y + bitmap.GetHeight());
+
+    wxString buffer;
+    buffer.Printf( "/origstate save def\n"
+                   "20 dict begin\n"
+                   "/pix %d string def\n"
+                   "/grays %d string def\n"
+                   "/npixels 0 def\n"
+                   "/rgbindx 0 def\n"
+                   "%f %f translate\n"
+                   "%f %f scale\n"
+                   "%d %d 8\n"
+                   "[%d 0 0 %d 0 %d]\n"
+                   "{currentfile pix readhexstring pop}\n"
+                   "false 3 colorimage\n",

             w, w, xx, yy, ww, hh, w, h, w, -h, h );
             w, w, xx, yy, ww, hh, w, h, w, -h, h );

+    buffer.Replace( ",", "." );
+    PsPrint( buffer );
+
+    unsigned char* data = image.GetData();

 
 

+    // size of the buffer = width*rgb(3)*hexa(2)+'\n'
+    wxCharBuffer charbuffer(w*6 + 1);
+    int firstDigit, secondDigit;

 
 

+    //rows

     for (int j = 0; j < h; j++)
     {
     for (int j = 0; j < h; j++)
     {

-        for (int i = 0; i < w; i++)
+        char* bufferindex = charbuffer.data();
+
+        //cols
+        for (int i = 0; i < w*3; i++)

         {
         {

-            char buffer[5];
-            LocalDecToHex( image.GetRed(i,j), buffer );
-            fprintf( m_pstream, buffer );
-            LocalDecToHex( image.GetGreen(i,j), buffer );
-            fprintf( m_pstream, buffer );
-            LocalDecToHex( image.GetBlue(i,j), buffer );
-            fprintf( m_pstream, buffer );
+            firstDigit = (int)(*data/16.0);
+            secondDigit = (int)(*data - (firstDigit*16.0));
+            *(bufferindex++) = hexArray[firstDigit];
+            *(bufferindex++) = hexArray[secondDigit];
+
+            data++;

         }
         }

-        fprintf( m_pstream, "\n" );
+        *(bufferindex++) = '\n';
+        *bufferindex = 0;
+
+        if (m_pstream)
+            fwrite( charbuffer, 1, strlen( charbuffer ), m_pstream );
+        else
+            PsPrint( charbuffer );

     }
 
     }
 

-    fprintf( m_pstream, "end\n" );
-    fprintf( m_pstream, "origstate restore\n" );
+    PsPrint( "end\n" );
+    PsPrint( "origstate restore\n" );

 }
 
 }
 

-void wxPostScriptDC::SetFont( const wxFont& font )
+void wxPostScriptDCImpl::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;
 
     m_font = font;
 
 
     if (!font.Ok())  return;
 
     m_font = font;
 

-#ifndef __WXGTK20__

     int Style = m_font.GetStyle();
     int Weight = m_font.GetWeight();
 
     int Style = m_font.GetStyle();
     int Weight = m_font.GetWeight();
 


@@ -933,8 +1088,6 @@ void wxPostScriptDC::SetFont( const wxFont& font )
         case wxSCRIPT:
         {
             name = "/ZapfChancery-MediumItalic";
         case wxSCRIPT:
         {
             name = "/ZapfChancery-MediumItalic";

-            Style  = wxNORMAL;
-            Weight = wxNORMAL;

             break;
         }
         case wxSWISS:
             break;
         }
         case wxSWISS:


@@ -958,25 +1111,26 @@ void wxPostScriptDC::SetFont( const wxFont& font )
         }
     }
 
         }
     }
 

-    fprintf( m_pstream, name );
-    fprintf( m_pstream, " reencodeISO def\n" );
-    fprintf( m_pstream, name );
-    fprintf( m_pstream, " findfont\n" );
-
-    char buffer[100];
-    sprintf( buffer, "%f scalefont setfont\n", LogicalToDeviceYRel(m_font.GetPointSize() * 1000) / 1000.0F);
-                // this is a hack - we must scale font size (in pts) according to m_scaleY but
-                // LogicalToDeviceYRel works with wxCoord type (int or longint). Se we first convert font size
-                // to 1/1000th of pt and then back.
-    for (int i = 0; i < 100; i++)
-        if (buffer[i] == ',') buffer[i] = '.';
-    fprintf( m_pstream, buffer );
-#endif
+    // We may legitimately call SetFont before BeginDoc
+    if (!m_pstream)
+        return;
+
+    PsPrint( name );
+    PsPrint( " reencodeISO def\n" );
+    PsPrint( name );
+    PsPrint( " findfont\n" );
+
+
+    double size = (double) m_font.GetPointSize();
+    wxString buffer;
+    buffer.Printf( "%f scalefont setfont\n", size * DEV2PS * m_scaleX );
+    buffer.Replace( ",", "." );
+    PsPrint( buffer );

 }
 
 }
 

-void wxPostScriptDC::SetPen( const wxPen& pen )
+void wxPostScriptDCImpl::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;
 
 
     if (!pen.Ok()) return;
 


@@ -984,17 +1138,17 @@ void wxPostScriptDC::SetPen( const wxPen& pen )
 
     m_pen = pen;
 
 
     m_pen = pen;
 

-    {
-        char buffer[100];
-        #ifdef __WXMSW__
-        sprintf( buffer, "%f setlinewidth\n", LogicalToDeviceXRel(1000 * m_pen.GetWidth()) / 1000.0f );
-        #else
-        sprintf( buffer, "%f setlinewidth\n", LogicalToDeviceXRel(1000 * m_pen.GetWidth()) / 1000.0f );
-        #endif
-        for (int i = 0; i < 100; i++)
-            if (buffer[i] == ',') buffer[i] = '.';
-        fprintf( m_pstream, buffer );
-    }
+    double width;
+
+    if (m_pen.GetWidth() <= 0)
+        width = 0.1;
+    else
+        width = (double) m_pen.GetWidth();
+
+    wxString buffer;
+    buffer.Printf( "%f setlinewidth\n", width * DEV2PS * m_scaleX );
+    buffer.Replace( ",", "." );
+    PsPrint( buffer );

 
 /*
      Line style - WRONG: 2nd arg is OFFSET
 
 /*
      Line style - WRONG: 2nd arg is OFFSET


@@ -1013,22 +1167,37 @@ void wxPostScriptDC::SetPen( const wxPen& pen )
     static const char *wxCoord_dashed = "[4 8] 2";
     static const char *dotted_dashed = "[6 6 2 6] 4";
 
     static const char *wxCoord_dashed = "[4 8] 2";
     static const char *dotted_dashed = "[6 6 2 6] 4";
 

-    const char *psdash = (char *) NULL;
+    const char *psdash;
+

     switch (m_pen.GetStyle())
     {
         case wxDOT:           psdash = dotted;         break;
         case wxSHORT_DASH:    psdash = short_dashed;   break;
     switch (m_pen.GetStyle())
     {
         case wxDOT:           psdash = dotted;         break;
         case wxSHORT_DASH:    psdash = short_dashed;   break;

-        case wxLONG_DASH:     psdash = wxCoord_dashed;    break;
+        case wxLONG_DASH:     psdash = wxCoord_dashed; break;

         case wxDOT_DASH:      psdash = dotted_dashed;  break;
         case wxDOT_DASH:      psdash = dotted_dashed;  break;

+        case wxUSER_DASH:
+        {
+            wxDash *dashes;
+            int nDashes = m_pen.GetDashes (&dashes);
+            PsPrint ("[");
+            for (int i = 0; i < nDashes; ++i)
+            {
+                buffer.Printf( "%d ", dashes [i] );
+                PsPrint( buffer );
+            }
+            PsPrint ("] 0 setdash\n");
+            psdash = 0;
+        }
+        break;

         case wxSOLID:
         case wxTRANSPARENT:
         default:              psdash = "[] 0";         break;
     }
 
         case wxSOLID:
         case wxTRANSPARENT:
         default:              psdash = "[] 0";         break;
     }
 

-    if (oldStyle != m_pen.GetStyle())
+    if ( psdash && (oldStyle != m_pen.GetStyle()) )

     {
     {

-        fprintf( m_pstream, psdash );
-        fprintf( m_pstream," setdash\n" );
+        PsPrint( psdash );
+        PsPrint( " setdash\n" );

     }
 
     // Line colour
     }
 
     // Line colour


@@ -1056,13 +1225,10 @@ 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;
 

-        char buffer[100];
-        sprintf( buffer,
-                "%.8f %.8f %.8f setrgbcolor\n",
-                redPS, greenPS, bluePS );
-        for (int i = 0; i < 100; i++)
-            if (buffer[i] == ',') buffer[i] = '.';
-        fprintf( m_pstream, buffer );
+        wxString buffer;
+        buffer.Printf( "%f %f %f setrgbcolor\n", redPS, greenPS, bluePS );
+        buffer.Replace( ",", "." );
+        PsPrint( buffer );

 
         m_currentRed = red;
         m_currentBlue = blue;
 
         m_currentRed = red;
         m_currentBlue = blue;


@@ -1070,9 +1236,9 @@ void wxPostScriptDC::SetPen( const wxPen& pen )
     }
 }
 
     }
 }
 

-void wxPostScriptDC::SetBrush( const wxBrush& brush )
+void wxPostScriptDCImpl::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;
 
 
     if (!brush.Ok()) return;
 


@@ -1103,13 +1269,10 @@ void wxPostScriptDC::SetBrush( const wxBrush& brush )
         double bluePS = (double)(blue) / 255.0;
         double greenPS = (double)(green) / 255.0;
 
         double bluePS = (double)(blue) / 255.0;
         double greenPS = (double)(green) / 255.0;
 

-        char buffer[100];
-        sprintf( buffer,
-                "%.8f %.8f %.8f setrgbcolor\n",
-                redPS, greenPS, bluePS );
-        for (int i = 0; i < 100; i++)
-            if (buffer[i] == ',') buffer[i] = '.';
-        fprintf( m_pstream, buffer );
+        wxString buffer;
+        buffer.Printf( "%f %f %f setrgbcolor\n", redPS, greenPS, bluePS );
+        buffer.Replace( ",", "." );
+        PsPrint( buffer );

 
         m_currentRed = red;
         m_currentBlue = blue;
 
         m_currentRed = red;
         m_currentBlue = blue;


@@ -1117,193 +1280,13 @@ void wxPostScriptDC::SetBrush( const wxBrush& brush )
     }
 }
 
     }
 }
 

-#ifdef __WXGTK20__
-
-#define PANGO_ENABLE_ENGINE
-
-#include "wx/gtk/private.h"
-#include "wx/fontutil.h"
-#include "gtk/gtk.h"
-#include <pango/pangoft2.h>
-#include <freetype/ftglyph.h>
-
-#ifndef FT_Outline_Decompose
-  FT_EXPORT( FT_Error )  FT_Outline_Decompose(
-                           FT_Outline*              outline,
-                           const FT_Outline_Funcs*  interface,
-                           void*                    user );
-#endif
-
-typedef struct _OutlineInfo OutlineInfo;
-struct _OutlineInfo {
-  FILE *file;
-};
-
-static int paps_move_to( FT_Vector* to,
-                        void *user_data)
-{
-  OutlineInfo *outline_info = (OutlineInfo*)user_data;
-  fprintf(outline_info->file, "%d %d moveto\n",
-         (int)to->x ,
-         (int)to->y );
-  return 0;
-}
-
-static int paps_line_to( FT_Vector*  to,
-                        void *user_data)
-{
-  OutlineInfo *outline_info = (OutlineInfo*)user_data;
-  fprintf(outline_info->file, "%d %d lineto\n",
-         (int)to->x ,
-         (int)to->y );
-  return 0;
-}
-
-static int paps_conic_to( FT_Vector*  control,
-                         FT_Vector*  to,
-                         void *user_data)
-{
-  OutlineInfo *outline_info = (OutlineInfo*)user_data;
-  fprintf(outline_info->file, "%d %d %d %d conicto\n",
-         (int)control->x  ,
-         (int)control->y  ,
-         (int)to->x   ,
-         (int)to->y  );
-  return 0;
-}
-
-static int paps_cubic_to( FT_Vector*  control1,
-                         FT_Vector*  control2,
-                         FT_Vector*  to,
-                         void *user_data)
-{
-  OutlineInfo *outline_info = (OutlineInfo*)user_data;
-  fprintf(outline_info->file,
-         "%d %d %d %d %d %d curveto\n",
-         (int)control1->x , 
-         (int)control1->y ,
-         (int)control2->x ,
-         (int)control2->y ,
-         (int)to->x ,
-         (int)to->y );
-  return 0;
-}
-
-void draw_bezier_outline(FILE *file,
-                        FT_Face face,
-                        FT_UInt glyph_index,
-                        int pos_x,
-                        int pos_y,
-             int scale_x,
-             int scale_y )
+void wxPostScriptDCImpl::DoDrawText( const wxString& text, wxCoord x, wxCoord y )

 {
 {

-  FT_Int load_flags = FT_LOAD_NO_BITMAP;
-  FT_Glyph glyph;
-
-  FT_Outline_Funcs outlinefunc = 
-  {
-    paps_move_to,
-    paps_line_to,
-    paps_conic_to,
-    paps_cubic_to
-  };
-  
-  OutlineInfo outline_info;
-  outline_info.file = file;
-
-  fprintf(file, "gsave\n");
-  fprintf(file, "%d %d translate\n", pos_x, pos_y );
-  // FT2 scales outlines to 26.6 pixels so the code below
-  // should read 26600 instead of the 60000.
-  fprintf(file, "%d 60000 div %d 60000 div scale\n", scale_x, scale_y );
-  fprintf(file, "0 0 0 setrgbcolor\n");
-
-  FT_Load_Glyph(face, glyph_index, load_flags);
-  FT_Get_Glyph (face->glyph, &glyph);
-  FT_Outline_Decompose (&(((FT_OutlineGlyph)glyph)->outline),
-                        &outlinefunc, &outline_info);
-  fprintf(file, "closepath fill grestore \n");
-  
-  FT_Done_Glyph (glyph);
-}
-
-#endif
-
-void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
-{
-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
-
-#ifdef __WXGTK20__
-    int dpi = GetResolution();
-    dpi = 300;
-    PangoContext *context = pango_ft2_get_context ( dpi, dpi );
-
-    pango_context_set_language (context, pango_language_from_string ("en_US"));
-    pango_context_set_base_dir (context, PANGO_DIRECTION_LTR );
-
-    pango_context_set_font_description (context, m_font.GetNativeFontInfo()->description );
-
-    PangoLayout *layout = pango_layout_new (context);
-#if wxUSE_UNICODE
-    wxCharBuffer buffer = wxConvUTF8.cWC2MB( text );
-#else
-    wxCharBuffer buffer = wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) );
-#endif
-       pango_layout_set_text( layout, (const char*) buffer, strlen(buffer) );
-
-    PangoRectangle rect;
-    pango_layout_get_extents(layout, NULL, &rect);
-    
-    int xx = x * PANGO_SCALE;
-    int yy = y * PANGO_SCALE + (rect.height*2/3);
-    
-    int scale_x = LogicalToDeviceXRel( 1000 );
-    int scale_y = LogicalToDeviceYRel( 1000 );
-    
-    // Loop over lines in layout
-    int num_lines = pango_layout_get_line_count( layout );
-    for (int i = 0; i < num_lines; i++)
-    {
-        PangoLayoutLine *line = pango_layout_get_line( layout, i );
-        
-        // Loop over runs in line
-        GSList *runs_list = line->runs;
-        while (runs_list)
-        {
-            PangoLayoutRun *run = (PangoLayoutRun*) runs_list->data;
-            PangoItem *item = run->item;
-            PangoGlyphString *glyphs = run->glyphs;
-            PangoAnalysis *analysis = &item->analysis;
-            PangoFont *font = analysis->font;
-            FT_Face ft_face = pango_ft2_font_get_face(font);
-            
-            int num_glyphs = glyphs->num_glyphs;
-            for (int glyph_idx = 0; glyph_idx < num_glyphs; glyph_idx++)
-            {
-                PangoGlyphGeometry geometry = glyphs->glyphs[glyph_idx].geometry;
-                int pos_x = xx + geometry.x_offset;
-                int pos_y = yy - geometry.y_offset;
-                xx += geometry.width;
-                
-                draw_bezier_outline( m_pstream, ft_face,
-                             (FT_UInt)(glyphs->glyphs[glyph_idx].glyph),
-                             LogicalToDeviceX( pos_x / PANGO_SCALE ), 
-                  LogicalToDeviceY( pos_y / PANGO_SCALE ),
-                  scale_x, scale_y );
-            }
-            runs_list = runs_list->next;
-        }
-       }
-
-    g_object_unref( G_OBJECT( layout ) );
-#else
-    wxCoord text_w, text_h, text_descent;
-
-    GetTextExtent(text, &text_w, &text_h, &text_descent);
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );

 
 

-    // VZ: this seems to be unnecessary, so taking it out for now, if it
-    //     doesn't create any problems, remove this comment entirely
-    //SetFont( m_font );
+    const wxWX2MBbuf textbuf = text.mb_str();
+    if ( !textbuf )
+        return;

 
     if (m_textForegroundColour.Ok())
     {
 
     if (m_textForegroundColour.Ok())
     {


@@ -1331,13 +1314,10 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
             double bluePS = (double)(blue) / 255.0;
             double greenPS = (double)(green) / 255.0;
 
             double bluePS = (double)(blue) / 255.0;
             double greenPS = (double)(green) / 255.0;
 

-            char buffer[100];
-            sprintf( buffer,
-                "%.8f %.8f %.8f setrgbcolor\n",
-                redPS, greenPS, bluePS );
-            for (int i = 0; i < 100; i++)
-                if (buffer[i] == ',') buffer[i] = '.';
-            fprintf( m_pstream, buffer );
+            wxString buffer;
+            buffer.Printf( "%f %f %f setrgbcolor\n", redPS, greenPS, bluePS );
+            buffer.Replace( ",", "." );
+            PsPrint( buffer );

 
             m_currentRed = red;
             m_currentBlue = blue;
 
             m_currentRed = red;
             m_currentBlue = blue;


@@ -1345,74 +1325,76 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
         }
     }
 
         }
     }
 

+    wxCoord text_w, text_h, text_descent;
+
+    GetOwner()->GetTextExtent(text, &text_w, &text_h, &text_descent);
+

     int size = m_font.GetPointSize();
 
 //    wxCoord by = y + (wxCoord)floor( double(size) * 2.0 / 3.0 ); // approximate baseline
 //    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
     int size = m_font.GetPointSize();
 
 //    wxCoord by = y + (wxCoord)floor( double(size) * 2.0 / 3.0 ); // approximate baseline
 //    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

-    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;
-    for (i = 0; i < len; i++)
+    wxString buffer;
+    buffer.Printf( "%f %f moveto\n", XLOG2DEV(x), YLOG2DEV(by) );
+    buffer.Replace( ",", "." );
+    PsPrint( buffer );
+    PsPrint( "(" );
+
+    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 */

-            fprintf( m_pstream, "\\" );
-            fputc(c, m_pstream);
+            PsPrint( "\\" );
+            PsPrint( (char) c );

         }
         else if ( c >= 128 )
         {
             /* Cope with character codes > 127 */
         }
         else if ( c >= 128 )
         {
             /* Cope with character codes > 127 */

-            fprintf(m_pstream, "\\%o", c);
+            buffer.Printf( "\\%o", c );
+            PsPrint( buffer );

         }
         else
         {
         }
         else
         {

-            fputc(c, m_pstream);
+            PsPrint( (char) c );

         }
     }
 
         }
     }
 

-    fprintf( m_pstream, ") show\n" );
+    PsPrint( ") show\n" );

 
     if (m_font.GetUnderlined())
     {
         wxCoord uy = (wxCoord)(y + size - m_underlinePosition);
 
     if (m_font.GetUnderlined())
     {
         wxCoord uy = (wxCoord)(y + size - m_underlinePosition);

-        char buffer[100];

 
 

-        sprintf( buffer,
-                "gsave\n"
-                "%d %d moveto\n"
-                "%f setlinewidth\n"
-                "%d %d lineto\n"
-                "stroke\n"
-                "grestore\n",
-                LogicalToDeviceX(x), LogicalToDeviceY(uy),
+        buffer.Printf( "gsave\n"
+                       "%f %f moveto\n"
+                       "%f setlinewidth\n"
+                       "%f %f lineto\n"
+                       "stroke\n"
+                       "grestore\n",
+                XLOG2DEV(x), YLOG2DEV(uy),

                 m_underlineThickness,
                 m_underlineThickness,

-                LogicalToDeviceX(x + text_w), LogicalToDeviceY(uy) );
-        for (i = 0; i < 100; i++)
-            if (buffer[i] == ',') buffer[i] = '.';
-        fprintf( m_pstream, buffer );
+                XLOG2DEV(x + text_w), YLOG2DEV(uy) );
+        buffer.Replace( ",", "." );
+        PsPrint( buffer );

     }
 
     CalcBoundingBox( x, y );
     }
 
     CalcBoundingBox( x, y );

-    CalcBoundingBox( x + size * text.Length() * 2/3 , y );
-#endif
+    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 (angle == 0.0)
+    if ( wxIsNullDouble(angle) )

     {
         DoDrawText(text, x, y);
         return;
     }
 
     {
         DoDrawText(text, x, y);
         return;
     }
 

-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );

 
     SetFont( m_font );
 
 
     SetFont( m_font );
 


@@ -1442,13 +1424,10 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord
             double bluePS = (double)(blue) / 255.0;
             double greenPS = (double)(green) / 255.0;
 
             double bluePS = (double)(blue) / 255.0;
             double greenPS = (double)(green) / 255.0;
 

-            char buffer[100];
-            sprintf( buffer,
-                "%.8f %.8f %.8f setrgbcolor\n",
-                redPS, greenPS, bluePS );
-            for (int i = 0; i < 100; i++)
-                if (buffer[i] == ',') buffer[i] = '.';
-            fprintf( m_pstream, buffer );
+            wxString buffer;
+            buffer.Printf( "%f %f %f setrgbcolor\n", redPS, greenPS, bluePS );
+            buffer.Replace( ",", "." );
+            PsPrint( buffer );

 
             m_currentRed = red;
             m_currentBlue = blue;
 
             m_currentRed = red;
             m_currentBlue = blue;


@@ -1458,119 +1437,129 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord
 
     int size = m_font.GetPointSize();
 
 
     int size = m_font.GetPointSize();
 

-    long by = y + (long)floor( double(size) * 2.0 / 3.0 ); // approximate baseline
+    wxString buffer;
+    buffer.Printf( "%f %f moveto\n", XLOG2DEV(x), YLOG2DEV(y));
+    buffer.Replace( ",", "." );
+    PsPrint( buffer );

 
 

-    // FIXME only correct for 90 degrees
-    fprintf(m_pstream, "%d %d moveto\n",
-            LogicalToDeviceX((wxCoord)(x + size)), LogicalToDeviceY((wxCoord)by) );
+    buffer.Printf( "%f rotate\n", angle );
+    buffer.Replace( ",", "." );
+    PsPrint( buffer );

 
 

-    char buffer[100];
-    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, "(" );
+    PsPrint( "(" );

     const wxWX2MBbuf textbuf = text.mb_str();
     const wxWX2MBbuf textbuf = text.mb_str();

-    size_t len = strlen(textbuf);
-    for (i = 0; i < len; i++)
+    if ( textbuf )

     {
     {

-        int c = (unsigned char) textbuf[i];
-        if (c == ')' || c == '(' || c == '\\')
-        {
-            /* Cope with special characters */
-            fprintf( m_pstream, "\\" );
-            fputc(c, m_pstream);
-        }
-        else if ( c >= 128 )
+        for ( const char *p = textbuf; *p != '\0'; p++ )

         {
         {

-            /* Cope with character codes > 127 */
-            fprintf(m_pstream, "\\%o", c);
-        }
-        else
-        {
-            fputc(c, m_pstream);
+            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 );
+            }

         }
     }
 
         }
     }
 

-    fprintf( m_pstream, ") show\n" );
+    PsPrint( ") show\n" );

 
 

-    sprintf( buffer, "%.8f rotate\n", -angle );
-    for (i = 0; i < 100; i++)
-        if (buffer[i] == ',') buffer[i] = '.';
-    fprintf( m_pstream, buffer );
+    buffer.Printf( "%f rotate\n", -angle );
+    buffer.Replace( ",", "." );
+    PsPrint( buffer );

 
     if (m_font.GetUnderlined())
     {
         wxCoord uy = (wxCoord)(y + size - m_underlinePosition);
         wxCoord w, h;
 
     if (m_font.GetUnderlined())
     {
         wxCoord uy = (wxCoord)(y + size - m_underlinePosition);
         wxCoord w, h;

-        char buffer[100];
-        GetTextExtent(text, &w, &h);
-
-        sprintf( buffer,
-                 "gsave\n"
-                 "%d %d moveto\n"
-                 "%f setlinewidth\n"
-                 "%d %d lineto\n"
-                 "stroke\n"
-                 "grestore\n",
-                 LogicalToDeviceX(x), LogicalToDeviceY(uy),
-                 m_underlineThickness,
-                 LogicalToDeviceX(x + w), LogicalToDeviceY(uy) );
-        for (i = 0; i < 100; i++)
-            if (buffer[i] == ',') buffer[i] = '.';
-        fprintf( m_pstream, buffer );
+        GetOwner()->GetTextExtent(text, &w, &h);
+
+        buffer.Printf(
+                "gsave\n"
+                "%f %f moveto\n"
+                "%f setlinewidth\n"
+                "%f %f lineto\n"
+                "stroke\n"
+                "grestore\n",
+                XLOG2DEV(x), YLOG2DEV(uy),
+                m_underlineThickness,
+                XLOG2DEV(x + w), YLOG2DEV(uy) );
+        buffer.Replace( ",", "." );
+        PsPrint( buffer );

     }
 
     CalcBoundingBox( x, y );
     }
 
     CalcBoundingBox( x, y );

-    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.") );

 }
 
 }
 

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

 {
 {

-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );

 
     SetPen( m_pen );
 
 
     SetPen( m_pen );
 

-    double a, b, c, d, x1, y1, x2, y2, x3, y3;
+    // a and b are not used
+    //double a, b;
+    double c, d, x1, y1, x2, y2, x3, y3;

     wxPoint *p, *q;
 
     wxPoint *p, *q;
 

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

     x1 = p->x;
     y1 = p->y;
 
     x1 = p->x;
     y1 = p->y;
 

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

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

-    x3 = a = (double)(x1 + c) / 2;
-    y3 = b = (double)(y1 + d) / 2;
-
-    fprintf( m_pstream,
-            "newpath\n"
-            "%d %d moveto\n"
-            "%d %d lineto\n",
-            LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1),
-            LogicalToDeviceX((wxCoord)x3), LogicalToDeviceY((wxCoord)y3) );
+    x3 =
+         #if 0
+         a =
+         #endif
+         (double)(x1 + c) / 2;
+    y3 =
+         #if 0
+         b =
+         #endif
+         (double)(y1 + d) / 2;
+
+    wxString buffer;
+    buffer.Printf( "newpath\n"
+                   "%f %f moveto\n"
+                   "%f %f lineto\n",
+            XLOG2DEV(wxRound(x1)), YLOG2DEV(wxRound(y1)),
+            XLOG2DEV(wxRound(x3)), YLOG2DEV(wxRound(y3)) );
+    buffer.Replace( ",", "." );
+    PsPrint( buffer );

 
     CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
     CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );
 
 
     CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
     CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );
 

-    while ((node = node->Next()) != NULL)
+    node = node->GetNext();
+    while (node)

     {
     {

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

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


@@ -1581,14 +1570,17 @@ void wxPostScriptDC::DoDrawSpline( wxList *points )
         x3 = (double)(x2 + c) / 2;
         y3 = (double)(y2 + d) / 2;
 
         x3 = (double)(x2 + c) / 2;
         y3 = (double)(y2 + d) / 2;
 

-        fprintf( m_pstream,
-                "%d %d %d %d %d %d DrawSplineSection\n",
-                LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1),
-                LogicalToDeviceX((wxCoord)x2), LogicalToDeviceY((wxCoord)y2),
-                LogicalToDeviceX((wxCoord)x3), LogicalToDeviceY((wxCoord)y3) );
+        buffer.Printf( "%f %f %f %f %f %f DrawSplineSection\n",
+            XLOG2DEV(wxRound(x1)), YLOG2DEV(wxRound(y1)),
+            XLOG2DEV(wxRound(x2)), YLOG2DEV(wxRound(y2)),
+            XLOG2DEV(wxRound(x3)), YLOG2DEV(wxRound(y3)) );
+        buffer.Replace( ",", "." );
+        PsPrint( buffer );

 
         CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
         CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );
 
         CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
         CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );

+
+        node = node->GetNext();

     }
 
     /*
     }
 
     /*


@@ -1596,44 +1588,55 @@ void wxPostScriptDC::DoDrawSpline( wxList *points )
        next-to-last and last point respectively, in the point list
      */
 
        next-to-last and last point respectively, in the point list
      */
 

-    fprintf( m_pstream,
-            "%d %d lineto\n"
-            "stroke\n",
-            LogicalToDeviceX((wxCoord)c), LogicalToDeviceY((wxCoord)d) );
+    buffer.Printf( "%f %f lineto\nstroke\n", XLOG2DEV(wxRound(c)), YLOG2DEV(wxRound(d)) );
+    buffer.Replace( ",", "." );
+    PsPrint( buffer );

 }
 }

+#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::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
+void wxPostScriptDCImpl::SetPrintData(const wxPrintData& data)

 {
 {

-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    m_printData = data;

 
 

-    m_signX = (xLeftRight ? 1 : -1);
-    m_signY = (yBottomUp  ? 1 : -1);
+    wxPaperSize id = m_printData.GetPaperId();
+    wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(id);
+    if (!paper) paper = wxThePrintPaperDatabase->FindPaperType(wxPAPER_A4);
+    int w = 595;
+    int h = 842;
+    if (paper)
+    {
+        w = paper->GetSizeDeviceUnits().x;
+        h = paper->GetSizeDeviceUnits().y;
+    }

 
 

-    // FIXME there is no such function in MSW nor in OS2/PM
-#if !defined(__WXMSW__) && !defined(__WXPM__)
-    ComputeScaleAndOrigin();
-#endif
+    if (m_printData.GetOrientation() == wxLANDSCAPE)
+        m_pageHeight = w * PS2DEV;
+    else
+        m_pageHeight = h * PS2DEV;

 }
 
 }
 

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

 {
 {

-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    const wxRealPoint origScale(m_scaleX, m_scaleY);

 
 

-    int h = 0;
-    int w = 0;
-    GetSize( &w, &h );
+    wxDCImpl::ComputeScaleAndOrigin();

 
 

-    wxDC::SetDeviceOrigin( x, h-y );
+    // If scale has changed call SetPen to recalulate the line width
+    // and SetFont to recalculate font size
+    if ( wxRealPoint(m_scaleX, m_scaleY) != origScale && m_pen.IsOk() )
+    {
+        SetPen( m_pen );
+        SetFont( m_font  );
+    }

 }
 
 }
 

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


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

-    if (width) *width = (int)(w * ms_PSScaleFactor);
-    if (height) *height = (int)(h * ms_PSScaleFactor);
+    if (width)
+        *width = wxRound( w * PS2DEV );
+
+    if (height)
+        *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,79 +1694,88 @@ 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((int)(72 * ms_PSScaleFactor),
-                  (int)(72 * ms_PSScaleFactor));
+    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") );

 
 

-    if (m_printData.GetFilename() == "")
+    if (m_printData.GetPrintMode() != wxPRINT_MODE_STREAM )

     {
     {

-        wxString filename = wxGetTempFileName("ps");
-        m_printData.SetFilename(filename);
-    }
+        if (m_printData.GetFilename() == wxEmptyString)
+        {
+            wxString filename = wxGetTempFileName( wxT("ps") );
+            m_printData.SetFilename(filename);
+        }

 
 

-    m_pstream = wxFopen( m_printData.GetFilename().c_str(), wxT("w+") );  // FIXME: use fn_str() here under Unicode?
+        m_pstream = wxFopen( m_printData.GetFilename(), wxT("w+") );

 
 

-    if (!m_pstream)
-    {
-        wxLogError( _("Cannot open file for PostScript printing!"));
-        m_ok = FALSE;
-        return FALSE;
+        if (!m_pstream)
+        {
+            wxLogError( _("Cannot open file for PostScript printing!"));
+            m_ok = false;
+            return false;
+        }

     }
 
     }
 

-    m_ok = TRUE;
+    m_ok = true;
+    m_title = message;
+
+    wxString buffer;
+
+    PsPrint( "%!PS-Adobe-2.0\n" );
+
+    buffer.Printf( "%%%%Title: %s\n", m_title );
+    PsPrint( buffer );
+    PsPrint( "%%Creator: wxWidgets PostScript renderer\n" );
+
+    buffer.Printf( "%%%%CreationDate: %s\n", wxNow() );
+    PsPrint( buffer );

 
 

-    fprintf( m_pstream, "%%!PS-Adobe-2.0\n" );
-    fprintf( m_pstream, "%%%%Title: %s\n", (const char *) m_title.ToAscii() );
-    fprintf( m_pstream, "%%%%Creator: wxWindows PostScript renderer\n" );
-    fprintf( m_pstream, "%%%%CreationDate: %s\n", (const char *) wxNow().ToAscii() );

     if (m_printData.GetOrientation() == wxLANDSCAPE)
     if (m_printData.GetOrientation() == wxLANDSCAPE)

-        fprintf( m_pstream, "%%%%Orientation: Landscape\n" );
+        PsPrint( "%%Orientation: Landscape\n" );

     else
     else

-        fprintf( m_pstream, "%%%%Orientation: Portrait\n" );
-    
-    // fprintf( m_pstream, "%%%%Pages: %d\n", (wxPageNumber - 1) );
-    
-    char *paper = "A4";
+        PsPrint( "%%Orientation: Portrait\n" );
+
+    const wxChar *paper;

     switch (m_printData.GetPaperId())
     {
     switch (m_printData.GetPaperId())
     {

-       case wxPAPER_LETTER: paper = "Letter"; break;             // Letter: paper ""; 8 1/2 by 11 inches
-       case wxPAPER_LEGAL: paper = "Legal"; break;              // Legal, 8 1/2 by 14 inches
-       case wxPAPER_A4: paper = "A4"; break;          // A4 Sheet, 210 by 297 millimeters
-       case wxPAPER_TABLOID: paper = "Tabloid"; break;     // Tabloid, 11 by 17 inches
-       case wxPAPER_LEDGER: paper = "Ledger"; break;      // Ledger, 17 by 11 inches
-       case wxPAPER_STATEMENT: paper = "Statement"; break;   // Statement, 5 1/2 by 8 1/2 inches
-       case wxPAPER_EXECUTIVE: paper = "Executive"; break;   // Executive, 7 1/4 by 10 1/2 inches
-       case wxPAPER_A3: paper = "A3"; break;          // A3 sheet, 297 by 420 millimeters
-       case wxPAPER_A5: paper = "A5"; break;          // A5 sheet, 148 by 210 millimeters
-       case wxPAPER_B4: paper = "B4"; break;          // B4 sheet, 250 by 354 millimeters
-       case wxPAPER_B5: paper = "B5"; break;          // B5 sheet, 182-by-257-millimeter paper
-       case wxPAPER_FOLIO: paper = "Folio"; break;       // Folio, 8-1/2-by-13-inch paper
-       case wxPAPER_QUARTO: paper = "Quaro"; break;      // Quarto, 215-by-275-millimeter paper
-       case wxPAPER_10X14: paper = "10x14"; break;       // 10-by-14-inch sheet
-       default: paper = "A4";
+       case wxPAPER_LETTER: paper = wxT("Letter"); break;       // Letter: paper ""; 8 1/2 by 11 inches
+       case wxPAPER_LEGAL: paper = wxT("Legal"); break;         // Legal, 8 1/2 by 14 inches
+       case wxPAPER_A4: paper = wxT("A4"); break;               // A4 Sheet, 210 by 297 millimeters
+       case wxPAPER_TABLOID: paper = wxT("Tabloid"); break;     // Tabloid, 11 by 17 inches
+       case wxPAPER_LEDGER: paper = wxT("Ledger"); break;       // Ledger, 17 by 11 inches
+       case wxPAPER_STATEMENT: paper = wxT("Statement"); break; // Statement, 5 1/2 by 8 1/2 inches
+       case wxPAPER_EXECUTIVE: paper = wxT("Executive"); break; // Executive, 7 1/4 by 10 1/2 inches
+       case wxPAPER_A3: paper = wxT("A3"); break;               // A3 sheet, 297 by 420 millimeters
+       case wxPAPER_A5: paper = wxT("A5"); break;               // A5 sheet, 148 by 210 millimeters
+       case wxPAPER_B4: paper = wxT("B4"); break;               // B4 sheet, 250 by 354 millimeters
+       case wxPAPER_B5: paper = wxT("B5"); break;               // B5 sheet, 182-by-257-millimeter paper
+       case wxPAPER_FOLIO: paper = wxT("Folio"); break;         // Folio, 8-1/2-by-13-inch paper
+       case wxPAPER_QUARTO: paper = wxT("Quaro"); break;        // Quarto, 215-by-275-millimeter paper
+       case wxPAPER_10X14: paper = wxT("10x14"); break;         // 10-by-14-inch sheet
+       default: paper = wxT("A4");

     }
     }

-    fprintf( m_pstream, "%%%%DocumentPaperSizes: %s\n", paper );
-    fprintf( m_pstream, "%%%%EndComments\n\n" );
-
-    fprintf( m_pstream, "%%%%BeginProlog\n" );
-    fprintf( m_pstream, wxPostScriptHeaderConicTo );
-    fprintf( m_pstream, wxPostScriptHeaderEllipse );
-    fprintf( m_pstream, wxPostScriptHeaderEllipticArc );
-    fprintf( m_pstream, wxPostScriptHeaderColourImage );
-#ifndef __WXGTK20__
-    fprintf( m_pstream, wxPostScriptHeaderReencodeISO1 );
-    fprintf( m_pstream, wxPostScriptHeaderReencodeISO2 );
-#endif
+
+    buffer.Printf( "%%%%DocumentPaperSizes: %s\n", paper );
+    PsPrint( buffer );
+
+    PsPrint( "%%EndComments\n\n" );
+
+    PsPrint( "%%BeginProlog\n" );
+    PsPrint( wxPostScriptHeaderConicTo );
+    PsPrint( wxPostScriptHeaderEllipse );
+    PsPrint( wxPostScriptHeaderEllipticArc );
+    PsPrint( wxPostScriptHeaderColourImage );
+    PsPrint( wxPostScriptHeaderReencodeISO1 );
+    PsPrint( wxPostScriptHeaderReencodeISO2 );

     if (wxPostScriptHeaderSpline)
     if (wxPostScriptHeaderSpline)

-        fprintf( m_pstream, wxPostScriptHeaderSpline );
-    fprintf( m_pstream, "%%%%EndProlog\n" );
+        PsPrint( wxPostScriptHeaderSpline );
+    PsPrint( "%%EndProlog\n" );

 
     SetBrush( *wxBLACK_BRUSH );
     SetPen( *wxBLACK_PEN );
 
     SetBrush( *wxBLACK_BRUSH );
     SetPen( *wxBLACK_PEN );


@@ -1770,26 +1785,26 @@ bool wxPostScriptDC::StartDoc( const wxString& message )
     // set origin according to paper size
     SetDeviceOrigin( 0,0 );
 
     // set origin according to paper size
     SetDeviceOrigin( 0,0 );
 

-    wxPageNumber = 1;

     m_pageNumber = 1;
     m_pageNumber = 1;

-    m_title = message;
-    return TRUE;
+    return true;

 }
 
 }
 

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

 {
 {

-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );

 
     if (m_clipping)
     {
 
     if (m_clipping)
     {

-        m_clipping = FALSE;
-        fprintf( m_pstream, "grestore\n" );
+        m_clipping = false;
+        PsPrint( "grestore\n" );

     }
 
     }
 

-    fclose( m_pstream );
-    m_pstream = (FILE *) NULL;
+    if ( m_pstream ) {
+        fclose( m_pstream );
+        m_pstream = (FILE *) NULL;
+    }

 
 

-#if 0    
+#if 0

     // THE FOLLOWING HAS BEEN CONTRIBUTED BY Andy Fyfe <andy@hyperparallel.com>
     wxCoord wx_printer_translate_x, wx_printer_translate_y;
     double wx_printer_scale_x, wx_printer_scale_y;
     // THE FOLLOWING HAS BEEN CONTRIBUTED BY Andy Fyfe <andy@hyperparallel.com>
     wxCoord wx_printer_translate_x, wx_printer_translate_y;
     double wx_printer_scale_x, wx_printer_scale_y;


@@ -1802,10 +1817,10 @@ void wxPostScriptDC::EndDoc ()
 
     // Compute the bounding box.  Note that it is in the default user
     // coordinate system, thus we have to convert the values.
 
     // Compute the bounding box.  Note that it is in the default user
     // coordinate system, thus we have to convert the values.

-    wxCoord minX = (wxCoord) LogicalToDeviceX(m_minX);
-    wxCoord minY = (wxCoord) LogicalToDeviceY(m_minY);
-    wxCoord maxX = (wxCoord) LogicalToDeviceX(m_maxX);
-    wxCoord maxY = (wxCoord) LogicalToDeviceY(m_maxY);
+    wxCoord minX = (wxCoord) XLOG2DEV(m_minX);
+    wxCoord minY = (wxCoord) YLOG2DEV(m_minY);
+    wxCoord maxX = (wxCoord) XLOG2DEV(m_maxX);
+    wxCoord maxY = (wxCoord) YLOG2DEV(m_maxY);

 
     // LOG2DEV may have changed the minimum to maximum vice versa
     if ( minX > maxX ) { wxCoord tmp = minX; minX = maxX; maxX = tmp; }
 
     // LOG2DEV may have changed the minimum to maximum vice versa
     if ( minX > maxX ) { wxCoord tmp = minX; minX = maxX; maxX = tmp; }


@@ -1838,8 +1853,7 @@ void wxPostScriptDC::EndDoc ()
 
     // The Adobe specifications call for integers; we round as to make
     // the bounding larger.
 
     // The Adobe specifications call for integers; we round as to make
     // the bounding larger.

-    fprintf( m_pstream,
-            "%%%%BoundingBox: %d %d %d %d\n",
+    PsPrintf( wxT("%%%%BoundingBox: %d %d %d %d\n"),

             (wxCoord)floor((double)llx), (wxCoord)floor((double)lly),
             (wxCoord)ceil((double)urx), (wxCoord)ceil((double)ury) );
 
             (wxCoord)floor((double)llx), (wxCoord)floor((double)lly),
             (wxCoord)ceil((double)urx), (wxCoord)ceil((double)ury) );
 


@@ -1849,104 +1863,101 @@ void wxPostScriptDC::EndDoc ()
     // commands are generated within comments.  These lines appear before any
     // adjustment of scale, rotation, or translation, and hence are in the
     // default user coordinates.
     // commands are generated within comments.  These lines appear before any
     // adjustment of scale, rotation, or translation, and hence are in the
     // default user coordinates.

-    fprintf( m_pstream, "%% newpath\n" );
-    fprintf( m_pstream, "%% %d %d moveto\n", llx, lly );
-    fprintf( m_pstream, "%% %d %d lineto\n", urx, lly );
-    fprintf( m_pstream, "%% %d %d lineto\n", urx, ury );
-    fprintf( m_pstream, "%% %d %d lineto closepath stroke\n", llx, ury );
+    PsPrint( "% newpath\n" );
+    PsPrintf( wxT("%% %d %d moveto\n"), llx, lly );
+    PsPrintf( wxT("%% %d %d lineto\n"), urx, lly );
+    PsPrintf( wxT("%% %d %d lineto\n"), urx, ury );
+    PsPrintf( wxT("%% %d %d lineto closepath stroke\n"), llx, ury );

 #endif
 
 #endif
 

-#if defined(__X__) || defined(__WXGTK__)
-    if (m_ok && (m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER))    
+#ifndef __WXMSW__
+    wxPostScriptPrintNativeData *data =
+        (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
+
+    if (m_ok && (m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER))

     {
         wxString command;
     {
         wxString command;

-        command += m_printData.GetPrinterCommand();
+        command += data->GetPrinterCommand();
+        command += wxT(" ");
+        command += data->GetPrinterOptions();

         command += wxT(" ");
         command += m_printData.GetFilename();
 
         command += wxT(" ");
         command += m_printData.GetFilename();
 

-        wxExecute( command, TRUE );
+        wxExecute( command, true );

         wxRemoveFile( m_printData.GetFilename() );
     }
 #endif
 }
 
         wxRemoveFile( m_printData.GetFilename() );
     }
 #endif
 }
 

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

 {
 {

-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );

 
 

-    fprintf( m_pstream, "%%%%Page: %d\n", wxPageNumber++ );
+    wxString buffer;
+    buffer.Printf( wxT("%%%%Page: %d\n"), m_pageNumber++ );
+    PsPrint( buffer );

 
 

-    //  What is this one supposed to do? RR.
-//  *m_pstream << "matrix currentmatrix\n";
+#if 0
+    wxPostScriptPrintNativeData *data =
+        (wxPostScriptPrintNativeData *) m_printData.GetNativeData();

 
 

-    // Added by Chris Breeze
+    wxCoord translate_x = (wxCoord)data->GetPrinterTranslateX();
+    wxCoord translate_y = (wxCoord)data->GetPrinterTranslateY();

 
 

-    // Each page starts with an "initgraphics" which resets the
-    // transformation and so we need to reset the origin
-    // (and rotate the page for landscape printing)
-
-    // Output scaling
-    wxCoord translate_x, translate_y;
-    double scale_x, scale_y;
+    buffer.Printf( "%d %d translate\n", translate_x, translate_y );
+    PsPrint( buffer );

 
 

-    translate_x = (wxCoord)m_printData.GetPrinterTranslateX();
-    translate_y = (wxCoord)m_printData.GetPrinterTranslateY();
+    double scale_x = data->GetPrinterScaleX();
+    double scale_y = data->GetPrinterScaleY();

 
 

-    scale_x = m_printData.GetPrinterScaleX();
-    scale_y = m_printData.GetPrinterScaleY();
+    buffer.Printf( "%f %f scale\n", scale_x, scale_y );
+    buffer.Replace( ",", "." );
+    PsPrint( buffer );

 
 

-    if (m_printData.GetOrientation() == wxLANDSCAPE)
-    {
-        int h;
-        GetSize( (int*) NULL, &h );
-        translate_y -= h;
-        fprintf( m_pstream, "90 rotate\n" );
+#endif

 
 

-        // I copied this one from a PostScript tutorial, but to no avail. RR.
-        // fprintf( m_pstream, "90 rotate llx neg ury nef translate\n" );
-    }
+    // Each page starts with an "initgraphics" which resets the
+    // transformation and so we need to rotate the page for
+    // landscape printing)

 
 

-    char buffer[100];
-    sprintf( buffer, "%.8f %.8f scale\n", scale_x / ms_PSScaleFactor,
-                                          scale_y / ms_PSScaleFactor);
-    for (int i = 0; i < 100; i++)
-        if (buffer[i] == ',') buffer[i] = '.';
-    fprintf( m_pstream, buffer );
+    // I copied this one from a PostScript tutorial, but to no avail. RR.
+    // PsPrint( "90 rotate llx neg ury nef translate\n" );

 
 

-    fprintf( m_pstream, "%d %d translate\n", translate_x, translate_y );
+    if (m_printData.GetOrientation() == wxLANDSCAPE)
+        PsPrint( "90 rotate\n" );

 }
 
 }
 

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

 {
 {

-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+    wxCHECK_RET( m_ok , wxT("invalid postscript dc") );

 
 

-    fprintf( m_pstream, "showpage\n" );
+    PsPrint( "showpage\n" );

 }
 
 }
 

-bool wxPostScriptDC::DoBlit( wxCoord xdest, wxCoord ydest,
+bool wxPostScriptDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,

                            wxCoord fwidth, wxCoord fheight,
                            wxDC *source,
                            wxCoord xsrc, wxCoord ysrc,
                            int rop, bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) )
 {
                            wxCoord fwidth, wxCoord fheight,
                            wxDC *source,
                            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") );
+    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();


@@ -1954,63 +1965,61 @@ wxCoord wxPostScriptDC::GetCharHeight() const
         return 12;
 }
 
         return 12;
 }
 

-void wxPostScriptDC::DoGetTextExtent(const wxString& string,
+void wxPostScriptDCImpl::PsPrint( const wxString& str )
+{
+    const wxCharBuffer psdata(str.utf8_str());
+
+    wxPostScriptPrintNativeData *data =
+        (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
+
+    switch (m_printData.GetPrintMode())
+    {
+#if wxUSE_STREAMS
+        // append to output stream
+        case wxPRINT_MODE_STREAM:
+            {
+                wxOutputStream* outputstream = data->GetOutputStream();
+                wxCHECK_RET( outputstream, wxT("invalid outputstream") );
+                outputstream->Write( psdata, strlen( psdata ) );
+            }
+            break;
+#endif // wxUSE_STREAMS
+
+        // save data into file
+        default:
+            wxCHECK_RET( m_pstream, wxT("invalid postscript dc") );
+            fwrite( psdata, 1, strlen( psdata ), m_pstream );
+    }
+}
+
+void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string,

                                      wxCoord *x, wxCoord *y,
                                      wxCoord *descent, wxCoord *externalLeading,
                                      wxCoord *x, wxCoord *y,
                                      wxCoord *descent, wxCoord *externalLeading,

-                                     wxFont *theFont ) const
+                                     const wxFont *theFont ) const

 {
 {

-    wxFont *fontToUse = theFont;
+    const wxFont *fontToUse = theFont;

 
 

-    if (!fontToUse) fontToUse = (wxFont*) &m_font;
+    if (!fontToUse) fontToUse = &m_font;

 
     wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") );
 
 
     wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") );
 

-    if (string.IsEmpty())
+    if (string.empty())

     {
         if (x) (*x) = 0;
         if (y) (*y) = 0;
     {
         if (x) (*x) = 0;
         if (y) (*y) = 0;

+        if (descent) (*descent) = 0;
+        if (externalLeading) (*externalLeading) = 0;

         return;
     }
         return;
     }

-    
-#ifdef __WXGTK20__
-    int dpi = GetResolution();
-    PangoContext *context = pango_ft2_get_context ( dpi, dpi );
-    
-    pango_context_set_language (context, pango_language_from_string ("en_US"));
-    pango_context_set_base_dir (context, PANGO_DIRECTION_LTR );
-
-    PangoLayout *layout = pango_layout_new (context);
-    
-    PangoFontDescription *desc = fontToUse->GetNativeFontInfo()->description;
-    pango_layout_set_font_description(layout, desc);
-#if wxUSE_UNICODE
-        const wxCharBuffer data = wxConvUTF8.cWC2MB( string );
-        pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
-#else
-        const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string );
-        const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
-        pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
-#endif
-    PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
- 
-    PangoRectangle rect;
-    pango_layout_line_get_extents(line, NULL, &rect);
-    
-    if (x) (*x) = (wxCoord) ( m_scaleX * rect.width / PANGO_SCALE );
-    if (y) (*y) = (wxCoord) ( m_scaleY * rect.height / PANGO_SCALE );
-    if (descent)
-    {
-        // Do something about metrics here
-        (*descent) = 0;
-    }
-    if (externalLeading) (*externalLeading) = 0;  // ??
-    
-    g_object_unref( G_OBJECT( layout ) );
-#else
+

    // 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)
+    if ( !strbuf )
+        return;
+

 #if !wxUSE_AFM_FOR_POSTSCRIPT
     /* Provide a VERY rough estimate (avoid using it).
      * Produces accurate results for mono-spaced font
 #if !wxUSE_AFM_FOR_POSTSCRIPT
     /* Provide a VERY rough estimate (avoid using it).
      * Produces accurate results for mono-spaced font


@@ -2046,12 +2055,12 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
     /        in 'points' (1/72 of an inch). this should later on be
     /        changed to depend on the mapping mode.
     /  CAVE: the path to the AFM files must be set before calling this
     /        in 'points' (1/72 of an inch). this should later on be
     /        changed to depend on the mapping mode.
     /  CAVE: the path to the AFM files must be set before calling this

-    /        function. this is usually done by a call like the following:
+    /        fun3B3Bction. this is usually done by a call like the following:

     /        wxSetAFMPath("d:\\wxw161\\afm\\");
     /
     /  example:
     /
     /        wxSetAFMPath("d:\\wxw161\\afm\\");
     /
     /  example:
     /

-    /    wxPostScriptDC dc(NULL, TRUE);
+    /    wxPostScriptDC dc(NULL, true);

     /    if (dc.Ok()){
     /      wxSetAFMPath("d:\\wxw161\\afm\\");
     /      dc.StartDoc("Test");
     /    if (dc.Ok()){
     /      wxSetAFMPath("d:\\wxw161\\afm\\");
     /      dc.StartDoc("Test");


@@ -2093,59 +2102,74 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
         lastStyle =  Style;
         lastWeight = Weight;
 
         lastStyle =  Style;
         lastWeight = Weight;
 

-        const char *name = NULL;
+        const wxChar *name;

 
         switch (Family)
         {
             case wxMODERN:
             case wxTELETYPE:
             {
 
         switch (Family)
         {
             case wxMODERN:
             case wxTELETYPE:
             {

-                if ((Style == wxITALIC) && (Weight == wxBOLD)) name = "CourBoO.afm";
-                else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "CourBo.afm";
-                else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "CourO.afm";
-                else name = "Cour.afm";
+                if ((Style == wxITALIC) && (Weight == wxBOLD)) name = wxT("CourBoO.afm");
+                else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = wxT("CourBo.afm");
+                else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = wxT("CourO.afm");
+                else name = wxT("Cour.afm");

                 break;
             }
             case wxROMAN:
             {
                 break;
             }
             case wxROMAN:
             {

-                if ((Style == wxITALIC) && (Weight == wxBOLD)) name = "TimesBoO.afm";
-                else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "TimesBo.afm";
-                else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "TimesO.afm";
-                else name = "TimesRo.afm";
+                if ((Style == wxITALIC) && (Weight == wxBOLD)) name = wxT("TimesBoO.afm");
+                else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = wxT("TimesBo.afm");
+                else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = wxT("TimesO.afm");
+                else name = wxT("TimesRo.afm");

                 break;
             }
             case wxSCRIPT:
             {
                 break;
             }
             case wxSCRIPT:
             {

-                name = "Zapf.afm";
-                Style = wxNORMAL;
-                Weight = wxNORMAL;
+                name = wxT("Zapf.afm");
+                break;

             }
             case wxSWISS:
             default:
             {
             }
             case wxSWISS:
             default:
             {

-                if ((Style == wxITALIC) && (Weight == wxBOLD)) name = "HelvBoO.afm";
-                else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "HelvBo.afm";
-                else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "HelvO.afm";
-                else name = "Helv.afm";
+                if ((Style == wxITALIC) && (Weight == wxBOLD)) name = wxT("HelvBoO.afm");
+                else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = wxT("HelvBo.afm");
+                else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = wxT("HelvO.afm");
+                else name = wxT("Helv.afm");

                 break;
             }
         }
 
         FILE *afmFile = NULL;
                 break;
             }
         }
 
         FILE *afmFile = NULL;

-        
+

         // Get the directory of the AFM files
         wxString afmName;
         // Get the directory of the AFM files
         wxString afmName;

-        if (!m_printData.GetFontMetricPath().IsEmpty())
+
+        // VZ: I don't know if the cast always works under Unix but it clearly
+        //     never does under Windows where the pointer is
+        //     wxWindowsPrintNativeData and so calling GetFontMetricPath() on
+        //     it just crashes
+#ifndef __WIN32__
+        wxPostScriptPrintNativeData *data =
+            wxDynamicCast(m_printData.GetNativeData(), wxPostScriptPrintNativeData);
+
+        if (data && !data->GetFontMetricPath().empty())

         {
         {

-            afmName = m_printData.GetFontMetricPath();
+            afmName = data->GetFontMetricPath();

             afmName << wxFILE_SEP_PATH << name;
             afmName << wxFILE_SEP_PATH << name;

-            afmFile = wxFopen(afmName,wxT("r"));

         }
         }

+#endif // __WIN32__

 
 

-#if defined(__UNIX__) && !defined(__VMS__)
-        if (afmFile==NULL)
+        if ( !afmName.empty() )
+            afmFile = wxFopen(afmName, wxT("r"));
+
+        if ( !afmFile )

         {
         {

+#if defined(__UNIX__) && !defined(__VMS__)

            afmName = wxGetDataDir();
            afmName = wxGetDataDir();

+#else // !__UNIX__
+           afmName = wxStandardPaths::Get().GetDataDir();
+#endif // __UNIX__/!__UNIX__
+

            afmName <<  wxFILE_SEP_PATH
 #if defined(__LINUX__) || defined(__FREEBSD__)
                    << wxT("gs_afm") << wxFILE_SEP_PATH
            afmName <<  wxFILE_SEP_PATH
 #if defined(__LINUX__) || defined(__FREEBSD__)
                    << wxT("gs_afm") << wxFILE_SEP_PATH


@@ -2155,7 +2179,6 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
                    << name;
            afmFile = wxFopen(afmName,wxT("r"));
         }
                    << name;
            afmFile = wxFopen(afmName,wxT("r"));
         }

-#endif

 
         /* 2. open and process the file
            /  a short explanation of the AFM format:
 
         /* 2. open and process the file
            /  a short explanation of the AFM format:


@@ -2182,8 +2205,10 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
             /* init the widths array */
             for(int i=0; i<256; i++) lastWidths[i] = INT_MIN;
             /* some variables for holding parts of a line */
             /* init the widths array */
             for(int i=0; i<256; i++) lastWidths[i] = INT_MIN;
             /* some variables for holding parts of a line */

-            char cString[10],semiString[10],WXString[10],descString[20];
-            char upString[30], utString[30], encString[50];
+            char cString[10], semiString[10], WXString[10];
+            char descString[20];
+            char upString[30], utString[30];
+            char encString[50];

             char line[256];
             int ascii,cWidth;
             /* read in the file and parse it */
             char line[256];
             int ascii,cWidth;
             /* read in the file and parse it */


@@ -2260,22 +2285,24 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
            /  the correct way would be to map the character names
            /  like 'adieresis' to corresp. positions of ISOEnc and read
            /  these values from AFM files, too. Maybe later ... */
            /  the correct way would be to map the character names
            /  like 'adieresis' to corresp. positions of ISOEnc and read
            /  these values from AFM files, too. Maybe later ... */

-        lastWidths[196] = lastWidths['A'];  // Ä
-        lastWidths[228] = lastWidths['a'];  // ä
-        lastWidths[214] = lastWidths['O'];  // Ö
-        lastWidths[246] = lastWidths['o'];  // ö
-        lastWidths[220] = lastWidths['U'];  // Ü
-        lastWidths[252] = lastWidths['u'];  // ü
-        lastWidths[223] = lastWidths[251];  // ß
+
+        // NB: casts to int are needed to suppress gcc 3.3 warnings
+        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 = LogicalToDeviceYRel((wxCoord)(UnderlinePosition * fontToUse->GetPointSize())) / 1000.0f;
+        *pt = YLOG2DEVREL((wxCoord)(UnderlinePosition * fontToUse->GetPointSize())) / 1000.0f;

         pt = (double*) &m_underlineThickness;
         pt = (double*) &m_underlineThickness;

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

 
     }
 
 
     }
 


@@ -2292,7 +2319,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
         if(lastWidths[*p]== INT_MIN)
         {
             wxLogDebug(wxT("GetTextExtent: undefined width for character '%c' (%d)"), *p,*p);
         if(lastWidths[*p]== INT_MIN)
         {
             wxLogDebug(wxT("GetTextExtent: undefined width for character '%c' (%d)"), *p,*p);

-            sum += lastWidths[' ']; /* assume space */
+            sum += lastWidths[(unsigned char)' ']; /* assume space */

         }
         else
         {
         }
         else
         {


@@ -2335,13 +2362,9 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
     if (externalLeading) *externalLeading = 0;
 #endif
     // Use AFM
     if (externalLeading) *externalLeading = 0;
 #endif
     // Use AFM

-
-#endif
-    // GTK 2.0

 }
 
 }
 

-#endif
-  // wxUSE_POSTSCRIPT

 
 

-#endif
-  // wxUSE_PRINTING_ARCHITECTURE
+#endif // wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT
+
+// vi:sts=4:sw=4:et