Fixed GetIcon to keep up with return type change on all other platforms.

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

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index 85774d8d320ef642b3e428a17608cccc64866e89..3f7057b564d04ca9a6763a33d5430ccf24d74490 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -28,26 +24,19 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

-#include "wx/window.h"

 #include "wx/dcmemory.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/dcmemory.h"
 #include "wx/utils.h"
 #include "wx/intl.h"

-#include "wx/filedlg.h"

 #include "wx/app.h"
 #include "wx/app.h"

-#include "wx/msgdlg.h"

 #include "wx/image.h"
 #include "wx/log.h"
 #include "wx/generic/dcpsg.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/math.h"
+#include "wx/stdpaths.h"

 
 #ifdef __WXMSW__
 
 
 #ifdef __WXMSW__
 


@@ -73,6 +62,23 @@
 // start and end of document/page
 //-----------------------------------------------------------------------------
 
 // start and end of document/page
 //-----------------------------------------------------------------------------
 

+static const char *wxPostScriptHeaderConicTo = "\
+/conicto {\n\
+    /to_y exch def\n\
+    /to_x exch def\n\
+    /conic_cntrl_y exch def\n\
+    /conic_cntrl_x exch def\n\
+    currentpoint\n\
+    /p0_y exch def\n\
+    /p0_x exch def\n\
+    /p1_x p0_x conic_cntrl_x p0_x sub 2 3 div mul add def\n\
+    /p1_y p0_y conic_cntrl_y p0_y sub 2 3 div mul add def\n\
+    /p2_x p1_x to_x p0_x sub 1 3 div mul add def\n\
+    /p2_y p1_y to_y p0_y sub 1 3 div mul add 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\


@@ -133,34 +139,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\


@@ -179,12 +185,12 @@ 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\

 ";
 
 static char wxPostScriptHeaderReencodeISO1[] =
 ";
 
 static char wxPostScriptHeaderReencodeISO1[] =


@@ -232,7 +238,9 @@ static char wxPostScriptHeaderReencodeISO2[] =
 // wxPostScriptDC
 //-------------------------------------------------------------------------------
 
 // wxPostScriptDC
 //-------------------------------------------------------------------------------
 

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

 
 void wxPostScriptDC::SetResolution(int ppi)
 {
 
 void wxPostScriptDC::SetResolution(int ppi)
 {


@@ -244,7 +252,7 @@ int wxPostScriptDC::GetResolution()
     return (int)(ms_PSScaleFactor * 72.0);
 }
 
     return (int)(ms_PSScaleFactor * 72.0);
 }
 

-
+//-------------------------------------------------------------------------------

 
 wxPostScriptDC::wxPostScriptDC ()
 {
 
 wxPostScriptDC::wxPostScriptDC ()
 {


@@ -256,64 +264,13 @@ wxPostScriptDC::wxPostScriptDC ()
 
     m_pageNumber = 0;
 
 
     m_pageNumber = 0;
 

-    m_clipping = FALSE;
-
-    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
-
-    // Compatibility only
-    // HH: Doesn't seem to work for wxMSW...
-    #if !defined(__WXMSW__)
-    m_printData = * wxThePrintSetupData;
-    #endif
-}
-
-wxPostScriptDC::wxPostScriptDC (const wxString& file, bool interactive, wxWindow *parent)
-{
-    m_pstream = (FILE*) NULL;
-
-    m_currentRed = 0;
-    m_currentGreen = 0;
-    m_currentBlue = 0;
-
-    m_pageNumber = 0;
-
-    m_clipping = FALSE;
+    m_clipping = false;

 
     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_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

-
-    Create(file, interactive, parent);
-}
-
-bool wxPostScriptDC::Create(const wxString& file, bool interactive, wxWindow *parent)
-{
-    m_isInteractive = interactive;
-
-    m_title = "";
-    m_printData.SetFilename(file);
-
-#ifdef __WXMSW__
-    // Can only send to file in Windows
-    m_printData.SetPrintMode(wxPRINT_MODE_FILE);
-#endif
-
-    if (m_isInteractive)
-    {
-        if ((m_ok = PrinterDialog (parent) ) == FALSE) return FALSE;
-    }
-    else
-    {
-        m_ok = TRUE;
-    }
-
-    return m_ok;

 }
 
 wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData)
 }
 
 wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData)


@@ -326,7 +283,7 @@ 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;


@@ -336,7 +293,7 @@ wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData)
 
     m_printData = printData;
 
 
     m_printData = printData;
 

-    m_ok = TRUE;
+    m_ok = true;

 }
 
 wxPostScriptDC::~wxPostScriptDC ()
 }
 
 wxPostScriptDC::~wxPostScriptDC ()


@@ -353,70 +310,22 @@ bool wxPostScriptDC::Ok() const
   return m_ok;
 }
 
   return m_ok;
 }
 

-// This dialog is deprecated now: use wxGenericPrintDialog or the printing framework
-bool wxPostScriptDC::PrinterDialog(wxWindow *parent)
-{
-    wxPostScriptPrintDialog dialog( parent, _("Printer Settings"), wxPoint(150, 150), wxSize(400, 400),
-                                    wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL );
-    m_ok = (dialog.ShowModal () == wxID_OK);
-
-    if (!m_ok) return FALSE;
-
-    if ((m_printData.GetFilename() == "") &&
-        (m_printData.GetPrintMode() == wxPRINT_MODE_PREVIEW  ||
-         m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER))
-    {
-// steve, 05.09.94
-#ifdef __VMS__
-      m_printData.SetFilename("preview");
-#else
-      // For PS_PRINTER action this depends on a Unix-style print spooler
-      // since the wx_printer_file can be destroyed during a session
-      // @@@ TODO: a Windows-style answer for non-Unix
-      wxChar userId[256];
-      wxGetUserId (userId, sizeof (userId) / sizeof (char));
-      wxChar tmp[256];
-      wxStrcpy (tmp, wxT("/tmp/preview_"));
-      wxStrcat (tmp, userId);
-      m_printData.SetFilename(tmp);
-#endif
-      wxChar tmp2[256];
-      wxStrcpy(tmp2, m_printData.GetFilename());
-      wxStrcat (tmp2, wxT(".ps"));
-      m_printData.SetFilename(tmp2);
-    }
-    else if ((m_printData.GetFilename() == wxT("")) && (m_printData.GetPrintMode() == wxPRINT_MODE_FILE))
-    {
-      wxString file = wxSaveFileSelector (_("PostScript"), wxT("ps"));
-      if ( file.IsEmpty() )
-      {
-        m_ok = FALSE;
-        return FALSE;
-      }
-
-      m_printData.SetFilename(file);
-      m_ok = TRUE;
-    }
-
-    return m_ok;
-}
-

 void wxPostScriptDC::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoord h)
 {
 void wxPostScriptDC::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoord h)
 {

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

 
     if (m_clipping) DestroyClippingRegion();
 
     wxDC::DoSetClippingRegion(x, y, w, h);
 
 
     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",
+    m_clipping = true;
+
+    PsPrintf( wxT("gsave\n newpath\n")
+              wxT("%d %d moveto\n")
+              wxT("%d %d lineto\n")
+              wxT("%d %d lineto\n")
+              wxT("%d %d lineto\n")
+              wxT("closepath clip newpath\n"),

             LogicalToDeviceX(x),   LogicalToDeviceY(y),
             LogicalToDeviceX(x+w), LogicalToDeviceY(y),
             LogicalToDeviceX(x+w), LogicalToDeviceY(y+h),
             LogicalToDeviceX(x),   LogicalToDeviceY(y),
             LogicalToDeviceX(x+w), LogicalToDeviceY(y),
             LogicalToDeviceX(x+w), LogicalToDeviceY(y+h),


@@ -426,12 +335,12 @@ void wxPostScriptDC::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoo
 
 void wxPostScriptDC::DestroyClippingRegion()
 {
 
 void wxPostScriptDC::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();
     }
 
     wxDC::DestroyClippingRegion();


@@ -439,19 +348,21 @@ void wxPostScriptDC::DestroyClippingRegion()
 
 void wxPostScriptDC::Clear()
 {
 
 void wxPostScriptDC::Clear()
 {

-    wxFAIL_MSG( wxT("wxPostScriptDC::Clear not implemented.") );
+    // This should fail silently to avoid unnecessary
+    // asserts
+    //    wxFAIL_MSG( wxT("wxPostScriptDC::Clear not implemented.") );

 }
 
 bool wxPostScriptDC::DoFloodFill (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style))
 {
     wxFAIL_MSG( wxT("wxPostScriptDC::FloodFill not implemented.") );
 }
 
 bool wxPostScriptDC::DoFloodFill (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style))
 {
     wxFAIL_MSG( wxT("wxPostScriptDC::FloodFill not implemented.") );

-    return FALSE;
+    return false;

 }
 
 bool wxPostScriptDC::DoGetPixel (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxColour * WXUNUSED(col)) const
 {
     wxFAIL_MSG( wxT("wxPostScriptDC::GetPixel not implemented.") );
 }
 
 bool wxPostScriptDC::DoGetPixel (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxColour * WXUNUSED(col)) const
 {
     wxFAIL_MSG( wxT("wxPostScriptDC::GetPixel not implemented.") );

-    return FALSE;
+    return false;

 }
 
 void wxPostScriptDC::DoCrossHair (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
 }
 
 void wxPostScriptDC::DoCrossHair (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))


@@ -461,17 +372,16 @@ void wxPostScriptDC::DoCrossHair (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
 
 void wxPostScriptDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {
 
 void wxPostScriptDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {

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

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

-    fprintf( m_pstream,
-            "newpath\n"
-            "%d %d moveto\n"
-            "%d %d lineto\n"
-            "stroke\n",
+    PsPrintf( wxT("newpath\n")
+              wxT("%d %d moveto\n")
+              wxT("%d %d lineto\n")
+              wxT("stroke\n"),

             LogicalToDeviceX(x1), LogicalToDeviceY(y1),
             LogicalToDeviceX(x2), LogicalToDeviceY (y2) );
 
             LogicalToDeviceX(x1), LogicalToDeviceY(y1),
             LogicalToDeviceX(x2), LogicalToDeviceY (y2) );
 


@@ -483,7 +393,7 @@ void wxPostScriptDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 
 void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc)
 {
 
 void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc)
 {

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

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


@@ -495,9 +405,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
     {


@@ -517,12 +428,11 @@ void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
     {
         SetBrush( m_brush );
 
     {
         SetBrush( m_brush );
 

-        fprintf( m_pstream,
-                "newpath\n"
-                "%d %d %d %d %d %d ellipse\n"
-                "%d %d lineto\n"
-                "closepath\n"
-                "fill\n",
+        PsPrintf( wxT("newpath\n")
+                  wxT("%d %d %d %d %d %d ellipse\n")
+                  wxT("%d %d lineto\n")
+                  wxT("closepath\n")
+                  wxT("fill\n"),

                 LogicalToDeviceX(xc), LogicalToDeviceY(yc), LogicalToDeviceXRel(radius), LogicalToDeviceYRel(radius), (wxCoord)alpha1, (wxCoord) alpha2,
                 LogicalToDeviceX(xc), LogicalToDeviceY(yc) );
 
                 LogicalToDeviceX(xc), LogicalToDeviceY(yc), LogicalToDeviceXRel(radius), LogicalToDeviceYRel(radius), (wxCoord)alpha1, (wxCoord) alpha2,
                 LogicalToDeviceX(xc), LogicalToDeviceY(yc) );
 


@@ -534,12 +444,11 @@ void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
     {
         SetPen( m_pen );
 
     {
         SetPen( m_pen );
 

-        fprintf( m_pstream,
-                "newpath\n"
-                "%d %d %d %d %d %d ellipse\n"
-                "%d %d lineto\n"
-                "stroke\n"
-                "fill\n",
+        PsPrintf( wxT("newpath\n")
+                  wxT("%d %d %d %d %d %d ellipse\n")
+                  wxT("%d %d lineto\n")
+                  wxT("stroke\n")
+                  wxT("fill\n"),

                 LogicalToDeviceX(xc), LogicalToDeviceY(yc), LogicalToDeviceXRel(radius), LogicalToDeviceYRel(radius), (wxCoord)alpha1, (wxCoord) alpha2,
                 LogicalToDeviceX(xc), LogicalToDeviceY(yc) );
 
                 LogicalToDeviceX(xc), LogicalToDeviceY(yc), LogicalToDeviceXRel(radius), LogicalToDeviceYRel(radius), (wxCoord)alpha1, (wxCoord) alpha2,
                 LogicalToDeviceX(xc), LogicalToDeviceY(yc) );
 


@@ -550,14 +459,18 @@ void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
 
 void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
 {
 
 void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
 {

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

 
 

-    if (sa>=360 || sa<=-360) sa=sa-int(sa/360)*360;
-    if (ea>=360 || ea<=-360) ea=ea-int(ea/360)*360;
-    if (sa<0) sa+=360;
-    if (ea<0) ea+=360;
+    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 (sa==ea)
+    if ( wxIsSameDouble(sa, ea) )

     {
         DrawEllipse(x,y,w,h);
         return;
     {
         DrawEllipse(x,y,w,h);
         return;


@@ -567,10 +480,11 @@ 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 );
+        PsPrintf( wxT("newpath\n")
+                  wxT("%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 );

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


@@ -580,10 +494,11 @@ 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 );
+        PsPrintf( wxT("newpath\n")
+                  wxT("%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 );

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


@@ -592,26 +507,25 @@ void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,d
 
 void wxPostScriptDC::DoDrawPoint (wxCoord x, wxCoord y)
 {
 
 void wxPostScriptDC::DoDrawPoint (wxCoord x, wxCoord y)
 {

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

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

-    fprintf( m_pstream,
-            "newpath\n"
-            "%d %d moveto\n"
-            "%d %d lineto\n"
-            "stroke\n",
+    PsPrintf( wxT("newpath\n")
+              wxT("%d %d moveto\n")
+              wxT("%d %d lineto\n")
+              wxT("stroke\n"),

             LogicalToDeviceX(x),   LogicalToDeviceY(y),
             LogicalToDeviceX(x+1), LogicalToDeviceY(y) );
 
     CalcBoundingBox( x, y );
 }
 
             LogicalToDeviceX(x),   LogicalToDeviceY(y),
             LogicalToDeviceX(x+1), LogicalToDeviceY(y) );
 
     CalcBoundingBox( x, y );
 }
 

-void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int WXUNUSED(fillStyle))
+void wxPostScriptDC::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;
 


@@ -619,12 +533,12 @@ 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);
 
 
         wxCoord xx = LogicalToDeviceX(points[0].x + xoffset);
         wxCoord yy = LogicalToDeviceY(points[0].y + yoffset);
 

-        fprintf( m_pstream, "%d %d moveto\n", xx, yy );
+        PsPrintf( wxT("%d %d moveto\n"), xx, yy );

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


@@ -633,24 +547,24 @@ void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wx
             xx = LogicalToDeviceX(points[i].x + xoffset);
             yy = LogicalToDeviceY(points[i].y + yoffset);
 
             xx = LogicalToDeviceX(points[i].x + xoffset);
             yy = LogicalToDeviceY(points[i].y + yoffset);
 

-            fprintf( m_pstream, "%d %d lineto\n", xx, yy );
+            PsPrintf( wxT("%d %d lineto\n"), xx, yy );

 
             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);
 
 
         wxCoord xx = LogicalToDeviceX(points[0].x + xoffset);
         wxCoord yy = LogicalToDeviceY(points[0].y + yoffset);
 

-        fprintf( m_pstream, "%d %d moveto\n", xx, yy );
+        PsPrintf( wxT("%d %d moveto\n"), xx, yy );

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


@@ -659,19 +573,85 @@ void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wx
             xx = LogicalToDeviceX(points[i].x + xoffset);
             yy = LogicalToDeviceY(points[i].y + yoffset);
 
             xx = LogicalToDeviceX(points[i].x + xoffset);
             yy = LogicalToDeviceY(points[i].y + yoffset);
 

-            fprintf( m_pstream, "%d %d lineto\n", xx, yy );
+            PsPrintf( wxT("%d %d lineto\n"), xx, yy );

 
             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 wxPostScriptDC::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++])
+        {
+            wxCoord xx = LogicalToDeviceX(points[ofs].x + xoffset);
+            wxCoord yy = LogicalToDeviceY(points[ofs].y + yoffset);
+
+            PsPrintf( wxT("%d %d moveto\n"), xx, yy );
+
+            CalcBoundingBox( points[ofs].x + xoffset, points[ofs].y + yoffset );
+
+            for (int j = 1; j < count[i]; j++)
+            {
+                xx = LogicalToDeviceX(points[ofs+j].x + xoffset);
+                yy = LogicalToDeviceY(points[ofs+j].y + yoffset);
+
+                PsPrintf( wxT("%d %d lineto\n"), xx, yy );
+
+                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++])
+        {
+            wxCoord xx = LogicalToDeviceX(points[ofs].x + xoffset);
+            wxCoord yy = LogicalToDeviceY(points[ofs].y + yoffset);
+
+            PsPrintf( wxT("%d %d moveto\n"), xx, yy );
+
+            CalcBoundingBox( points[ofs].x + xoffset, points[ofs].y + yoffset );
+
+            for (int j = 1; j < count[i]; j++)
+            {
+                xx = LogicalToDeviceX(points[ofs+j].x + xoffset);
+                yy = LogicalToDeviceY(points[ofs+j].y + yoffset);
+
+                PsPrintf( wxT("%d %d lineto\n"), xx, yy );
+
+                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 wxPostScriptDC::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
 {

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

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


@@ -685,37 +665,36 @@ void wxPostScriptDC::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCo
         CalcBoundingBox( LogicalToDeviceX(points[i].x+xoffset), LogicalToDeviceY(points[i].y+yoffset));
     }
 
         CalcBoundingBox( LogicalToDeviceX(points[i].x+xoffset), LogicalToDeviceY(points[i].y+yoffset));
     }
 

-    fprintf( m_pstream,
-            "newpath\n"
-            "%d %d moveto\n",
-            LogicalToDeviceX(points[0].x+xoffset), LogicalToDeviceY(points[0].y+yoffset) );
+    PsPrintf( wxT("newpath\n")
+              wxT("%d %d moveto\n"),
+              LogicalToDeviceX(points[0].x+xoffset),
+              LogicalToDeviceY(points[0].y+yoffset) );

 
     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) );
+        PsPrintf( wxT("%d %d lineto\n"),
+                  LogicalToDeviceX(points[i].x+xoffset),
+                  LogicalToDeviceY(points[i].y+yoffset) );

     }
 
     }
 

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

 }
 
 void wxPostScriptDC::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
 }
 
 void wxPostScriptDC::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {

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

 
     if (m_brush.GetStyle () != wxTRANSPARENT)
     {
         SetBrush( m_brush );
 
 
     if (m_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",
+        PsPrintf( wxT("newpath\n")
+                  wxT("%d %d moveto\n")
+                  wxT("%d %d lineto\n")
+                  wxT("%d %d lineto\n")
+                  wxT("%d %d lineto\n")
+                  wxT("closepath\n")
+                  wxT("fill\n"),

                 LogicalToDeviceX(x),         LogicalToDeviceY(y),
                 LogicalToDeviceX(x + width), LogicalToDeviceY(y),
                 LogicalToDeviceX(x + width), LogicalToDeviceY(y + height),
                 LogicalToDeviceX(x),         LogicalToDeviceY(y),
                 LogicalToDeviceX(x + width), LogicalToDeviceY(y),
                 LogicalToDeviceX(x + width), LogicalToDeviceY(y + height),


@@ -729,14 +708,13 @@ 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",
+        PsPrintf( wxT("newpath\n")
+                  wxT("%d %d moveto\n")
+                  wxT("%d %d lineto\n")
+                  wxT("%d %d lineto\n")
+                  wxT("%d %d lineto\n")
+                  wxT("closepath\n")
+                  wxT("stroke\n"),

                 LogicalToDeviceX(x),         LogicalToDeviceY(y),
                 LogicalToDeviceX(x + width), LogicalToDeviceY(y),
                 LogicalToDeviceX(x + width), LogicalToDeviceY(y + height),
                 LogicalToDeviceX(x),         LogicalToDeviceY(y),
                 LogicalToDeviceX(x + width), LogicalToDeviceY(y),
                 LogicalToDeviceX(x + width), LogicalToDeviceY(y + height),


@@ -749,17 +727,13 @@ void wxPostScriptDC::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoo
 
 void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
 {
 
 void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
 {

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

 
     if (radius < 0.0)
     {
         // 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);
     }
 


@@ -770,20 +744,19 @@ 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",
+        PsPrintf( wxT("newpath\n")
+                  wxT("%d %d %d 90 180 arc\n")
+                  wxT("%d %d lineto\n")
+                  wxT("%d %d %d 180 270 arc\n")
+                  wxT("%d %d lineto\n")
+                  wxT("%d %d %d 270 0 arc\n")
+                  wxT("%d %d lineto\n")
+                  wxT("%d %d %d 0 90 arc\n")
+                  wxT("%d %d lineto\n")
+                  wxT("closepath\n")
+                  wxT("fill\n"),

                 LogicalToDeviceX(x + rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad),
                 LogicalToDeviceX(x + rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad),

-                LogicalToDeviceX(x), LogicalToDeviceY(y + rad),
+                LogicalToDeviceX(x), LogicalToDeviceY(y + height - 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 + rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),
                 LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + height),
                 LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),


@@ -800,20 +773,19 @@ 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",
+        PsPrintf( wxT("newpath\n")
+                  wxT("%d %d %d 90 180 arc\n")
+                  wxT("%d %d lineto\n")
+                  wxT("%d %d %d 180 270 arc\n")
+                  wxT("%d %d lineto\n")
+                  wxT("%d %d %d 270 0 arc\n")
+                  wxT("%d %d lineto\n")
+                  wxT("%d %d %d 0 90 arc\n")
+                  wxT("%d %d lineto\n")
+                  wxT("closepath\n")
+                  wxT("stroke\n"),

                 LogicalToDeviceX(x + rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad),
                 LogicalToDeviceX(x + rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad),

-                LogicalToDeviceX(x), LogicalToDeviceY(y + rad),
+                LogicalToDeviceX(x), LogicalToDeviceY(y + height - 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 + rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),
                 LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + height),
                 LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),


@@ -828,16 +800,15 @@ void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width
 
 void wxPostScriptDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
 
 void wxPostScriptDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {

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

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

-        fprintf( m_pstream,
-                "newpath\n"
-                "%d %d %d %d 0 360 ellipse\n"
-                "fill\n",
+        PsPrintf( wxT("newpath\n")
+                  wxT("%d %d %d %d 0 360 ellipse\n")
+                  wxT("fill\n"),

                 LogicalToDeviceX(x + width / 2), LogicalToDeviceY(y + height / 2),
                 LogicalToDeviceXRel(width / 2), LogicalToDeviceYRel(height / 2) );
 
                 LogicalToDeviceX(x + width / 2), LogicalToDeviceY(y + height / 2),
                 LogicalToDeviceXRel(width / 2), LogicalToDeviceYRel(height / 2) );
 


@@ -849,10 +820,9 @@ 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",
+        PsPrintf( wxT("newpath\n")
+                  wxT("%d %d %d %d 0 360 ellipse\n")
+                  wxT("stroke\n"),

                 LogicalToDeviceX(x + width / 2), LogicalToDeviceY(y + height / 2),
                 LogicalToDeviceXRel(width / 2), LogicalToDeviceYRel(height / 2) );
 
                 LogicalToDeviceX(x + width / 2), LogicalToDeviceY(y + height / 2),
                 LogicalToDeviceXRel(width / 2), LogicalToDeviceYRel(height / 2) );
 


@@ -863,23 +833,15 @@ void wxPostScriptDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord
 
 void wxPostScriptDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
 {
 
 void wxPostScriptDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
 {

-    DrawBitmap( icon, x, y, TRUE );
+    DrawBitmap( 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 wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool WXUNUSED(useMask) )
 {

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

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


@@ -896,44 +858,53 @@ void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y,
     wxCoord xx = LogicalToDeviceX(x);
     wxCoord yy = LogicalToDeviceY(y + bitmap.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",
+    PsPrintf( wxT("/origstate save def\n")
+              wxT("20 dict begin\n")
+              wxT("/pix %d string def\n")
+              wxT("/grays %d string def\n")
+              wxT("/npixels 0 def\n")
+              wxT("/rgbindx 0 def\n")
+              wxT("%d %d translate\n")
+              wxT("%d %d scale\n")
+              wxT("%d %d 8\n")
+              wxT("[%d 0 0 %d 0 %d]\n")
+              wxT("{currentfile pix readhexstring pop}\n")
+              wxT("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 );
 

+    unsigned char* data = image.GetData();
+
+    /* buffer = line = width*rgb(3)*hexa(2)+'\n'(1)+null(1) */
+    char* buffer = new char[ w*6+2 ];
+    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 = buffer;
+
+        //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;
+        PsPrint( buffer );

     }
 
     }
 

-    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 wxPostScriptDC::SetFont( const wxFont& font )
 {

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

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


@@ -985,8 +956,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:


@@ -1010,24 +979,28 @@ 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" );
+    // We may legitimately call SetFont before BeginDoc
+    if (!m_pstream)
+        return;
+
+    PsPrint( name );
+    PsPrint( " reencodeISO def\n" );
+    PsPrint( name );
+    PsPrint( " findfont\n" );

 
     char buffer[100];
     sprintf( buffer, "%f scalefont setfont\n", LogicalToDeviceYRel(m_font.GetPointSize() * 1000) / 1000.0F);
 
     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.
+    // 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] = '.';
     for (int i = 0; i < 100; i++)
         if (buffer[i] == ',') buffer[i] = '.';

-    fprintf( m_pstream, buffer );
+    PsPrint( buffer );

 }
 
 void wxPostScriptDC::SetPen( const wxPen& pen )
 {
 }
 
 void wxPostScriptDC::SetPen( const wxPen& pen )
 {

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

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


@@ -1035,17 +1008,11 @@ 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 );
-    }
+    char buffer[100];
+    sprintf( buffer, "%f setlinewidth\n", LogicalToDeviceXRel(1000 * m_pen.GetWidth()) / 1000.0f );
+    for (int i = 0; i < 100; i++)
+        if (buffer[i] == ',') buffer[i] = '.';
+    PsPrint( buffer );

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


@@ -1064,22 +1031,23 @@ 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 wxSOLID:
         case wxTRANSPARENT:
         default:              psdash = "[] 0";         break;
     }
 
         case wxDOT_DASH:      psdash = dotted_dashed;  break;
         case wxSOLID:
         case wxTRANSPARENT:
         default:              psdash = "[] 0";         break;
     }
 

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

     {
     {

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

     }
 
     // Line colour
     }
 
     // Line colour


@@ -1107,13 +1075,13 @@ 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,
         sprintf( buffer,

-                "%.8f %.8f %.8f setrgbcolor\n",
-                redPS, greenPS, bluePS );
+            "%.8f %.8f %.8f setrgbcolor\n",
+            redPS, greenPS, bluePS );

         for (int i = 0; i < 100; i++)
             if (buffer[i] == ',') buffer[i] = '.';
         for (int i = 0; i < 100; i++)
             if (buffer[i] == ',') buffer[i] = '.';

-        fprintf( m_pstream, buffer );
+
+        PsPrint( buffer );

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


@@ -1123,7 +1091,7 @@ void wxPostScriptDC::SetPen( const wxPen& pen )
 
 void wxPostScriptDC::SetBrush( const wxBrush& brush )
 {
 
 void wxPostScriptDC::SetBrush( const wxBrush& brush )
 {

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

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


@@ -1160,7 +1128,8 @@ void wxPostScriptDC::SetBrush( const wxBrush& brush )
                 redPS, greenPS, bluePS );
         for (int i = 0; i < 100; i++)
             if (buffer[i] == ',') buffer[i] = '.';
                 redPS, greenPS, bluePS );
         for (int i = 0; i < 100; i++)
             if (buffer[i] == ',') buffer[i] = '.';

-        fprintf( m_pstream, buffer );
+
+        PsPrint( buffer );

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


@@ -1170,15 +1139,7 @@ void wxPostScriptDC::SetBrush( const wxBrush& brush )
 
 void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
 {
 
 void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
 {

-    wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
-
-    wxCoord text_w, text_h, text_descent;
-
-    GetTextExtent(text, &text_w, &text_h, &text_descent);
-
-    // 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 );
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );

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


@@ -1210,9 +1171,9 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
             sprintf( buffer,
                 "%.8f %.8f %.8f setrgbcolor\n",
                 redPS, greenPS, bluePS );
             sprintf( buffer,
                 "%.8f %.8f %.8f setrgbcolor\n",
                 redPS, greenPS, bluePS );

-            for (int i = 0; i < 100; i++)
+            for (size_t i = 0; i < strlen(buffer); i++)

                 if (buffer[i] == ',') buffer[i] = '.';
                 if (buffer[i] == ',') buffer[i] = '.';

-            fprintf( m_pstream, buffer );
+            PsPrint( buffer );

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


@@ -1220,15 +1181,25 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
         }
     }
 
         }
     }
 

+    wxCoord text_w, text_h, text_descent;
+
+    GetTextExtent(text, &text_w, &text_h, &text_descent);
+
+    // 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 );
+
+

     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, "(" );
+    PsPrintf( wxT("%d %d moveto\n"), LogicalToDeviceX(x), LogicalToDeviceY(by) );
+    PsPrint( "(" );
+

     const wxWX2MBbuf textbuf = text.mb_str();
     size_t len = strlen(textbuf);
     size_t i;
     const wxWX2MBbuf textbuf = text.mb_str();
     size_t len = strlen(textbuf);
     size_t i;


@@ -1238,21 +1209,21 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
         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(c);

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

-            fprintf(m_pstream, "\\%o", c);
+            PsPrintf( wxT("\\%o"), c);

         }
         else
         {
         }
         else
         {

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

         }
     }
 
         }
     }
 

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

 
     if (m_font.GetUnderlined())
     {
 
     if (m_font.GetUnderlined())
     {


@@ -1271,7 +1242,7 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
                 LogicalToDeviceX(x + text_w), LogicalToDeviceY(uy) );
         for (i = 0; i < 100; i++)
             if (buffer[i] == ',') buffer[i] = '.';
                 LogicalToDeviceX(x + text_w), LogicalToDeviceY(uy) );
         for (i = 0; i < 100; i++)
             if (buffer[i] == ',') buffer[i] = '.';

-        fprintf( m_pstream, buffer );
+        PsPrint( buffer );

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


@@ -1280,13 +1251,13 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
 
 void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord y, double angle )
 {
 
 void wxPostScriptDC::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 );
 


@@ -1322,7 +1293,7 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord
                 redPS, greenPS, bluePS );
             for (int i = 0; i < 100; i++)
                 if (buffer[i] == ',') buffer[i] = '.';
                 redPS, greenPS, bluePS );
             for (int i = 0; i < 100; i++)
                 if (buffer[i] == ',') buffer[i] = '.';

-            fprintf( m_pstream, buffer );
+            PsPrint( buffer );

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


@@ -1332,20 +1303,19 @@ 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
-
-    // FIXME only correct for 90 degrees
-    fprintf(m_pstream, "%d %d moveto\n",
-            LogicalToDeviceX((wxCoord)(x + size)), LogicalToDeviceY((wxCoord)by) );
+    PsPrintf( wxT("%d %d moveto\n"),
+            LogicalToDeviceX(x), LogicalToDeviceY(y));

 
     char buffer[100];
     sprintf(buffer, "%.8f rotate\n", angle);
     size_t i;
     for (i = 0; i < 100; i++)
 
     char buffer[100];
     sprintf(buffer, "%.8f rotate\n", angle);
     size_t i;
     for (i = 0; i < 100; i++)

+    {

         if (buffer[i] == ',') buffer[i] = '.';
         if (buffer[i] == ',') buffer[i] = '.';

-    fprintf(m_pstream, buffer);
+    }
+    PsPrint( buffer);

 
 

-    fprintf( m_pstream, "(" );
+    PsPrint( "(" );

     const wxWX2MBbuf textbuf = text.mb_str();
     size_t len = strlen(textbuf);
     for (i = 0; i < len; i++)
     const wxWX2MBbuf textbuf = text.mb_str();
     size_t len = strlen(textbuf);
     for (i = 0; i < len; i++)


@@ -1354,47 +1324,50 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord
         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(c);

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

-            fprintf(m_pstream, "\\%o", c);
+            PsPrintf( wxT("\\%o"), c);

         }
         else
         {
         }
         else
         {

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

         }
     }
 
         }
     }
 

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

 
     sprintf( buffer, "%.8f rotate\n", -angle );
     for (i = 0; i < 100; i++)
 
     sprintf( buffer, "%.8f rotate\n", -angle );
     for (i = 0; i < 100; i++)

+    {

         if (buffer[i] == ',') buffer[i] = '.';
         if (buffer[i] == ',') buffer[i] = '.';

-    fprintf( m_pstream, buffer );
+    }
+    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,
         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) );
+                "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++)
         for (i = 0; i < 100; i++)

+        {

             if (buffer[i] == ',') buffer[i] = '.';
             if (buffer[i] == ',') buffer[i] = '.';

-        fprintf( m_pstream, buffer );
+        }
+        PsPrint( buffer );

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


@@ -1411,40 +1384,51 @@ void wxPostScriptDC::SetLogicalFunction (int WXUNUSED(function))
     wxFAIL_MSG( wxT("wxPostScriptDC::SetLogicalFunction not implemented.") );
 }
 
     wxFAIL_MSG( wxT("wxPostScriptDC::SetLogicalFunction not implemented.") );
 }
 

+#if wxUSE_SPLINES

 void wxPostScriptDC::DoDrawSpline( wxList *points )
 {
 void wxPostScriptDC::DoDrawSpline( wxList *points )
 {

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

 
     SetPen( m_pen );
 
 
     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();
+    wxList::compatibility_iterator node = points->GetFirst();
+    p = (wxPoint *)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 = (wxPoint *)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",
+    x3 =
+         #if 0
+         a =
+         #endif
+         (double)(x1 + c) / 2;
+    y3 =
+         #if 0
+         b =
+         #endif
+         (double)(y1 + d) / 2;
+
+    PsPrintf( wxT("newpath\n")
+              wxT("%d %d moveto\n")
+              wxT("%d %d lineto\n"),

             LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1),
             LogicalToDeviceX((wxCoord)x3), LogicalToDeviceY((wxCoord)y3) );
 
     CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
     CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );
 
             LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1),
             LogicalToDeviceX((wxCoord)x3), LogicalToDeviceY((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 = (wxPoint *)node->GetData();

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


@@ -1455,14 +1439,15 @@ 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) );
+        PsPrintf( wxT("%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) );

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

+
+        node = node->GetNext();

     }
 
     /*
     }
 
     /*


@@ -1470,11 +1455,11 @@ 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",
+    PsPrintf( wxT("%d %d lineto\n")
+              wxT("stroke\n"),

             LogicalToDeviceX((wxCoord)c), LogicalToDeviceY((wxCoord)d) );
 }
             LogicalToDeviceX((wxCoord)c), LogicalToDeviceY((wxCoord)d) );
 }

+#endif // wxUSE_SPLINES

 
 wxCoord wxPostScriptDC::GetCharWidth() const
 {
 
 wxCoord wxPostScriptDC::GetCharWidth() const
 {


@@ -1485,20 +1470,17 @@ wxCoord wxPostScriptDC::GetCharWidth() const
 
 void wxPostScriptDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
 {
 
 void wxPostScriptDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
 {

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

 
     m_signX = (xLeftRight ? 1 : -1);
     m_signY = (yBottomUp  ? 1 : -1);
 
 
     m_signX = (xLeftRight ? 1 : -1);
     m_signY = (yBottomUp  ? 1 : -1);
 

-    // FIXME there is no such function in MSW nor in OS2/PM
-#if !defined(__WXMSW__) && !defined(__WXPM__)

     ComputeScaleAndOrigin();
     ComputeScaleAndOrigin();

-#endif

 }
 
 void wxPostScriptDC::SetDeviceOrigin( wxCoord x, wxCoord y )
 {
 }
 
 void wxPostScriptDC::SetDeviceOrigin( wxCoord x, wxCoord y )
 {

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

 
     int h = 0;
     int w = 0;
 
     int h = 0;
     int w = 0;


@@ -1571,34 +1553,72 @@ wxSize wxPostScriptDC::GetPPI(void) const
 
 bool wxPostScriptDC::StartDoc( const wxString& message )
 {
 
 bool wxPostScriptDC::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;

 
 

-    fprintf( m_pstream, "%%%%BeginProlog\n" );
-    fprintf( m_pstream, wxPostScriptHeaderEllipse );
-    fprintf( m_pstream, wxPostScriptHeaderEllipticArc );
-    fprintf( m_pstream, wxPostScriptHeaderColourImage );
-    fprintf( m_pstream, wxPostScriptHeaderReencodeISO1 );
-    fprintf( m_pstream, wxPostScriptHeaderReencodeISO2 );
+    PsPrint( "%!PS-Adobe-2.0\n" );
+    PsPrintf( wxT("%%%%Title: %s\n"), m_title.c_str() );
+    PsPrint( "%%Creator: wxWidgets PostScript renderer\n" );
+    PsPrintf( wxT("%%%%CreationDate: %s\n"), wxNow().c_str() );
+    if (m_printData.GetOrientation() == wxLANDSCAPE)
+        PsPrint( "%%Orientation: Landscape\n" );
+    else
+        PsPrint( "%%Orientation: Portrait\n" );
+
+    // PsPrintf( wxT("%%%%Pages: %d\n"), (wxPageNumber - 1) );
+
+    const wxChar *paper;
+    switch (m_printData.GetPaperId())
+    {
+       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");
+    }
+    PsPrintf( wxT("%%%%DocumentPaperSizes: %s\n"), paper );
+    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 );


@@ -1610,48 +1630,26 @@ bool wxPostScriptDC::StartDoc( const wxString& message )
 
     wxPageNumber = 1;
     m_pageNumber = 1;
 
     wxPageNumber = 1;
     m_pageNumber = 1;

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

 }
 
 void wxPostScriptDC::EndDoc ()
 {
 }
 
 void wxPostScriptDC::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;
-
-    wxChar *header_file = wxGetTempFileName("ps");
-
-    m_pstream = fopen( wxConvFile.cWX2MB(header_file) , "w+" );
-
-    fprintf( m_pstream, "%%!PS-Adobe-2.0\n" );                     // PostScript magic strings
-    fprintf( m_pstream, "%%%%Title: %s\n", (const char *)m_title.mb_str() );
-    fprintf( m_pstream, "%%%%Creator: %s\n", (const char*)wxConvCurrent->cWX2MB(wxTheApp->argv[0]) );
-    fprintf( m_pstream, "%%%%CreationDate: %s\n", (const char *)wxNow().mb_str() );
-
-    wxChar userID[256];
-    if ( wxGetEmailAddress(userID, sizeof(userID)) )
-    {
-        fprintf( m_pstream, "%%%%For: %s ", wxMBSTRINGCAST wxConvCurrent->cWX2MB(userID) );
-        wxChar userName[245];
-        if (wxGetUserName(userName, sizeof(userName)))
-            fprintf( m_pstream, " (%s)", wxMBSTRINGCAST wxConvCurrent->cWX2MB(userName) );
-        fprintf( m_pstream, "\n" );
-    }
-    else if ( wxGetUserName(userID, sizeof(userID)) )
-    {
-        fprintf( m_pstream, "%%%%For: %s\n", wxMBSTRINGCAST wxConvCurrent->cWX2MB(userID) );;
+    if ( m_pstream ) {
+        fclose( m_pstream );
+        m_pstream = (FILE *) NULL;

     }
 
     }
 

+#if 0

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


@@ -1661,11 +1659,6 @@ void wxPostScriptDC::EndDoc ()
     wx_printer_scale_x = m_printData.GetPrinterScaleX();
     wx_printer_scale_y = m_printData.GetPrinterScaleY();
 
     wx_printer_scale_x = m_printData.GetPrinterScaleX();
     wx_printer_scale_y = m_printData.GetPrinterScaleY();
 

-    if (m_printData.GetOrientation() == wxLANDSCAPE)
-        fprintf( m_pstream, "%%%%Orientation: Landscape\n" );
-    else
-        fprintf( m_pstream, "%%%%Orientation: Portrait\n" );
-

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


@@ -1704,12 +1697,9 @@ 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) );

-    fprintf( m_pstream, "%%%%Pages: %d\n", (wxPageNumber - 1) );
-    fprintf( m_pstream, "%%%%EndComments\n\n" );

 
     // To check the correctness of the bounding box, postscript commands
     // to draw a box corresponding to the bounding box are generated below.
 
     // To check the correctness of the bounding box, postscript commands
     // to draw a box corresponding to the bounding box are generated below.


@@ -1717,80 +1707,37 @@ 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 );
-
-    fclose( m_pstream );
-    m_pstream = (FILE*) NULL;
-
-    wxChar *tmp_file = wxGetTempFileName("ps");
+    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

 
 

-    // Paste header Before wx_printer_file
-    wxConcatFiles (header_file, m_printData.GetFilename(), tmp_file );
-    wxRemoveFile( header_file );
-    wxRemoveFile( m_printData.GetFilename() );
-    wxRenameFile( tmp_file, m_printData.GetFilename() );
+#ifndef __WXMSW__
+    wxPostScriptPrintNativeData *data =
+        (wxPostScriptPrintNativeData *) m_printData.GetNativeData();

 
 

-#if defined(__X__) || defined(__WXGTK__)
-    if (m_ok)
+    if (m_ok && (m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER))

     {
     {

-        wxString previewCommand(m_printData.GetPreviewCommand());
-        wxString printerCommand(m_printData.GetPrinterCommand());
-        wxString printerOptions(m_printData.GetPrinterOptions());
-        wxString filename(m_printData.GetFilename());
-
-        switch (m_printData.GetPrintMode())
-        {
-            case wxPRINT_MODE_PREVIEW:
-            {
-                wxChar *argv[3];
-                argv[0] = WXSTRINGCAST previewCommand;
-                argv[1] = WXSTRINGCAST filename;
-                argv[2] = (wxChar*) NULL;
-#if defined(__WXGTK20__) && wxUSE_UNICODE
-#else
-                wxExecute( argv, TRUE );
-#endif
-                wxRemoveFile( m_printData.GetFilename() );
-            }
-            break;
-            case wxPRINT_MODE_PRINTER:
-            {
-                wxChar *argv[4];
-                int argc = 0;
-                argv[argc++] = WXSTRINGCAST printerCommand;
-
-                // !SM! If we simply assign to argv[1] here, if printer options
-                // are blank, we get an annoying and confusing message from lpr.
-                wxChar *opts = WXSTRINGCAST printerOptions;
-                if (opts && *opts)
-                    argv[argc++] = opts;
-
-                argv[argc++] = WXSTRINGCAST filename;
-                argv[argc++] = (wxChar *) NULL;
-#if defined(__WXGTK20__) && wxUSE_UNICODE
-#else
-                wxExecute( argv, TRUE );
-#endif
-                wxRemoveFile( filename );
-            }
-            break;
-            case wxPRINT_MODE_FILE:
-            case wxPRINT_MODE_NONE:
-            break;
-        }
+        wxString command;
+        command += data->GetPrinterCommand();
+        command += wxT(" ");
+        command += data->GetPrinterOptions();
+        command += wxT(" ");
+        command += m_printData.GetFilename();
+
+        wxExecute( command, true );
+        wxRemoveFile( m_printData.GetFilename() );

     }
 #endif
 }
 
 void wxPostScriptDC::StartPage()
 {
     }
 #endif
 }
 
 void wxPostScriptDC::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++ );
+    PsPrintf( wxT("%%%%Page: %d\n"), wxPageNumber++ );

 
     //  What is this one supposed to do? RR.
 //  *m_pstream << "matrix currentmatrix\n";
 
     //  What is this one supposed to do? RR.
 //  *m_pstream << "matrix currentmatrix\n";


@@ -1805,38 +1752,40 @@ void wxPostScriptDC::StartPage()
     wxCoord translate_x, translate_y;
     double scale_x, scale_y;
 
     wxCoord translate_x, translate_y;
     double scale_x, scale_y;
 

-    translate_x = (wxCoord)m_printData.GetPrinterTranslateX();
-    translate_y = (wxCoord)m_printData.GetPrinterTranslateY();
+    wxPostScriptPrintNativeData *data =
+        (wxPostScriptPrintNativeData *) m_printData.GetNativeData();

 
 

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

 
     if (m_printData.GetOrientation() == wxLANDSCAPE)
     {
         int h;
         GetSize( (int*) NULL, &h );
         translate_y -= h;
 
     if (m_printData.GetOrientation() == wxLANDSCAPE)
     {
         int h;
         GetSize( (int*) NULL, &h );
         translate_y -= h;

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

         // I copied this one from a PostScript tutorial, but to no avail. RR.
         // I copied this one from a PostScript tutorial, but to no avail. RR.

-        // fprintf( m_pstream, "90 rotate llx neg ury nef translate\n" );
+        // PsPrint( "90 rotate llx neg ury nef translate\n" );

     }
 
     char buffer[100];
     sprintf( buffer, "%.8f %.8f scale\n", scale_x / ms_PSScaleFactor,
     }
 
     char buffer[100];
     sprintf( buffer, "%.8f %.8f scale\n", scale_x / ms_PSScaleFactor,

-                                          scale_y / ms_PSScaleFactor);
+            scale_y / ms_PSScaleFactor);

     for (int i = 0; i < 100; i++)
         if (buffer[i] == ',') buffer[i] = '.';
     for (int i = 0; i < 100; i++)
         if (buffer[i] == ',') buffer[i] = '.';

-    fprintf( m_pstream, buffer );
+    PsPrint( buffer );

 
 

-    fprintf( m_pstream, "%d %d translate\n", translate_x, translate_y );
+    PsPrintf( wxT("%d %d translate\n"), translate_x, translate_y );

 }
 
 void wxPostScriptDC::EndPage ()
 {
 }
 
 void wxPostScriptDC::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 wxPostScriptDC::DoBlit( wxCoord xdest, wxCoord ydest,


@@ -1845,9 +1794,9 @@ bool wxPostScriptDC::DoBlit( wxCoord xdest, wxCoord ydest,
                            wxCoord xsrc, wxCoord ysrc,
                            int rop, bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) )
 {
                            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 */
     wxBitmap bitmap( (int)fwidth, (int)fheight );
 
     /* blit into a bitmap */
     wxBitmap bitmap( (int)fwidth, (int)fheight );


@@ -1859,7 +1808,7 @@ bool wxPostScriptDC::DoBlit( wxCoord xdest, wxCoord ydest,
     /* draw bitmap. scaling and positioning is done there */
     DrawBitmap( bitmap, xdest, ydest );
 
     /* draw bitmap. scaling and positioning is done there */
     DrawBitmap( bitmap, xdest, ydest );
 

-    return TRUE;
+    return true;

 }
 
 wxCoord wxPostScriptDC::GetCharHeight() const
 }
 
 wxCoord wxPostScriptDC::GetCharHeight() const


@@ -1881,6 +1830,17 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
 
     wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") );
 
 
     wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") );
 

+    if (string.empty())
+    {
+        if (x) (*x) = 0;
+        if (y) (*y) = 0;
+        if (descent) (*descent) = 0;
+        if (externalLeading) (*externalLeading) = 0;
+        return;
+    }
+
+   // GTK 2.0
+

     const wxWX2MBbuf strbuf = string.mb_str();
 
 #if !wxUSE_AFM_FOR_POSTSCRIPT
     const wxWX2MBbuf strbuf = string.mb_str();
 
 #if !wxUSE_AFM_FOR_POSTSCRIPT


@@ -1923,7 +1883,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
     /
     /  example:
     /
     /
     /  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");


@@ -1950,99 +1910,89 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
     double UnderlinePosition = 0.0;
     double UnderlineThickness = 0.0;
 
     double UnderlinePosition = 0.0;
     double UnderlineThickness = 0.0;
 

-    /* get actual parameters */
+    // Get actual parameters

     int Family = fontToUse->GetFamily();
     int Size =   fontToUse->GetPointSize();
     int Style =  fontToUse->GetStyle();
     int Weight = fontToUse->GetWeight();
 
     int Family = fontToUse->GetFamily();
     int Size =   fontToUse->GetPointSize();
     int Style =  fontToUse->GetStyle();
     int Weight = fontToUse->GetWeight();
 

-    /* if we have another font, read the font-metrics */
+    // If we have another font, read the font-metrics

     if (Family!=lastFamily || Size!=lastSize || Style!=lastStyle || Weight!=lastWeight)
     {
     if (Family!=lastFamily || Size!=lastSize || Style!=lastStyle || Weight!=lastWeight)
     {

-        /* store actual values */
+        // Store actual values

         lastFamily = Family;
         lastSize =   Size;
         lastStyle =  Style;
         lastWeight = Weight;
 
         lastFamily = Family;
         lastSize =   Size;
         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;
             }
         }
 
                 break;
             }
         }
 

-        /* get the directory of the AFM files */
-        wxString afmName = wxEmptyString;
-        if (!m_printData.GetFontMetricPath().IsEmpty())
-        {
-            afmName = m_printData.GetFontMetricPath();
-        }
+        FILE *afmFile = NULL;

 
 

-        /* 2. open and process the file
-           /  a short explanation of the AFM format:
-           /  we have for each character a line, which gives its size
-           /  e.g.:
-           /
-           /    C 63 ; WX 444 ; N question ; B 49 -14 395 676 ;
-           /
-           /  that means, we have a character with ascii code 63, and width
-           /  (444/1000 * fontSize) points.
-           /  the other data is ignored for now!
-           /
-           /  when the font has changed, we read in the right AFM file and store the
-           /  character widths in an array, which is processed below (see point 3.). */
-
-        /* new elements JC Sun Aug 25 23:21:44 MET DST 1996 */
+        // Get the directory of the AFM files
+        wxString afmName;

 
 

-        afmName << name;
-        FILE *afmFile = wxFopen(afmName,wxT("r"));
+        // 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 (afmFile==NULL)
+        if (data && !data->GetFontMetricPath().empty())

         {
         {

-           afmName = wxThePrintSetupData->GetAFMPath();
-           afmName << wxFILE_SEP_PATH << name;
-           afmFile = wxFopen(afmName,wxT("r"));
+            afmName = data->GetFontMetricPath();
+            afmName << wxFILE_SEP_PATH << name;

         }
         }

+#endif // __WIN32__

 
 

-#if defined(__UNIX__) && !defined(__VMS__)
-       if (afmFile==NULL)
-        /* please do NOT change the line above to "else if (afmFile==NULL)" -
-           - afmFile = fopen() may fail and in that case the next if branch
-           MUST be executed - and it would not if there was "else" */
+        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


@@ -2052,8 +2002,20 @@ 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:
+           /  we have for each character a line, which gives its size
+           /  e.g.:
+           /
+           /    C 63 ; WX 444 ; N question ; B 49 -14 395 676 ;
+           /
+           /  that means, we have a character with ascii code 63, and width
+           /  (444/1000 * fontSize) points.
+           /  the other data is ignored for now!
+           /
+           /  when the font has changed, we read in the right AFM file and store the
+           /  character widths in an array, which is processed below (see point 3.). */

         if (afmFile==NULL)
         {
             wxLogDebug( wxT("GetTextExtent: can't open AFM file '%s'"), afmName.c_str() );
         if (afmFile==NULL)
         {
             wxLogDebug( wxT("GetTextExtent: can't open AFM file '%s'"), afmName.c_str() );


@@ -2066,8 +2028,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 */


@@ -2144,13 +2108,15 @@ 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'];  // Ä
+        lastWidths[228] = lastWidths[(int)'a'];  // ä
+        lastWidths[214] = lastWidths[(int)'O'];  // Ö
+        lastWidths[246] = lastWidths[(int)'o'];  // ö
+        lastWidths[220] = lastWidths[(int)'U'];  // Ü
+        lastWidths[252] = lastWidths[(int)'u'];  // ü
+        lastWidths[223] = lastWidths[(int)251];  // ß

 
         /* JC: calculate UnderlineThickness/UnderlinePosition */
 
 
         /* JC: calculate UnderlineThickness/UnderlinePosition */
 


@@ -2176,7 +2142,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
         {


@@ -2217,395 +2183,67 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
 
     /* currently no idea how to calculate this! */
     if (externalLeading) *externalLeading = 0;
 
     /* currently no idea how to calculate this! */
     if (externalLeading) *externalLeading = 0;

-

 #endif
 #endif

+    // Use AFM

 }
 
 }
 

-// Determine the Default Postscript Previewer
-// available on the platform
-#if defined(__SUN__) && defined(__XVIEW__)
-// OpenWindow/NeWS's Postscript Previewer
-# define PS_VIEWER_PROG "pageview"
-#elif defined(__VMS__)
-#define PS_VIEWER_PROG "view/format=ps/select=x_display"
-#elif defined(__SGI__)
-// SGI's Display Postscript Previewer
-//# define PS_VIEWER_PROG "dps"
-# define PS_VIEWER_PROG "xpsview"
-#elif defined(__X__) || defined(__WXGTK__)
-// Front-end to ghostscript
-# define PS_VIEWER_PROG "ghostview"
-#else
-// Windows ghostscript/ghostview
-# define PS_VIEWER_PROG "gsview"
-#endif
-
-wxPrintSetupData *wxThePrintSetupData = (wxPrintSetupData *) NULL;
-
-IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)
-IMPLEMENT_DYNAMIC_CLASS(wxPrintSetupData, wxObject)
-
-// Redundant now I think
-#if 1
-IMPLEMENT_CLASS(wxPostScriptPrintDialog, wxDialog)
-
-wxPostScriptPrintDialog::wxPostScriptPrintDialog (wxWindow *parent, const wxString& title,
-            const wxPoint& pos, const wxSize& size, wxCoord style):
-   wxDialog(parent, -1, title, pos, size, style)
+// print postscript datas via required method (file, stream)
+void wxPostScriptDC::PsPrintf( const wxChar* fmt, ... )

 {
 {

-   wxBeginBusyCursor();
-
-   char buf[100];
-   int yPos = 40;
-   wxString
-      *orientation = new wxString[2],
-      *print_modes = new wxString[3];
-   int features;
-   wxCoord wx_printer_translate_x, wx_printer_translate_y;
-   double wx_printer_scale_x, wx_printer_scale_y;
-
-   orientation[0] = _("Portrait");
-   orientation[1] = _("Landscape");
-
-   print_modes[0] = _("Send to Printer");
-   print_modes[1] = _("Print to File");
-   print_modes[2] = _("Preview Only");
-
-
-
-   wxButton *okBut = new wxButton (this, wxID_OK, _("OK"), wxPoint(5, 5));
-   (void) new wxButton (this, wxID_CANCEL, _("Cancel"), wxPoint(40, 5));
-   okBut->SetDefault();
-
-
-#if defined(__WXGTK__) || defined (__WXMOTIF__)
-   (void) new wxStaticText( this, -1, _("Printer Command: "),
-                            wxPoint(5, yPos) );
-   (void) new wxTextCtrl( this, wxID_PRINTER_COMMAND, wxThePrintSetupData->GetPrinterCommand(),
-                          wxPoint(100, yPos), wxSize(100, -1) );
-
-   (void) new wxStaticText( this, -1, _("Printer Options: "),
-                            wxPoint(210, yPos) );
-   (void) new wxTextCtrl( this, wxID_PRINTER_OPTIONS, wxThePrintSetupData->GetPrinterOptions(),
-                          wxPoint(305, yPos), wxSize(150, -1) );
-
-   yPos += 40;
-#endif
-
-
-   wxRadioBox *radio0 = new wxRadioBox(this, wxID_PRINTER_ORIENTATION, "Orientation: ", wxPoint(5, yPos), wxSize(-1,-1),
-                                       2,orientation,2,wxRA_SPECIFY_ROWS);
-   radio0->SetSelection((int)wxThePrintSetupData->GetPrinterOrientation() - 1);
-
-  // @@@ Configuration hook
-   if ( !wxThePrintSetupData->GetPrintPreviewCommand() )
-      wxThePrintSetupData->SetPrintPreviewCommand(PS_VIEWER_PROG);
-
-   //   wxGetResource ("wxWindows", "PSView", &wxThePrintSetupData->m_previewCommand);
-
-   features = (wxThePrintSetupData->GetPrintPreviewCommand() &&
-               *wxThePrintSetupData->GetPrintPreviewCommand()) ? 3 : 2;
-
-   wxRadioBox *radio1 = new wxRadioBox(this, wxID_PRINTER_MODES, _("PostScript:"),
-                                       wxPoint(150, yPos),
-                                       wxSize(-1,-1), features,
-                                       print_modes, features, wxRA_SPECIFY_ROWS);
-
-#ifdef __WXMSW__
-   radio1->Enable(0, FALSE);
-   if (wxThePrintSetupData->GetPrintPreviewCommand() && *wxThePrintSetupData->GetPrintPreviewCommand())
-      radio1->Enable(2, FALSE);
-#endif
-
-   radio1->SetSelection((int)wxThePrintSetupData->GetPrinterMode());
-   wxThePrintSetupData->GetPrinterTranslation(&wx_printer_translate_x, &wx_printer_translate_y);
-   wxThePrintSetupData->GetPrinterScaling(&wx_printer_scale_x, &wx_printer_scale_y);
-
-   sprintf (buf, "%.2f", wx_printer_scale_x);
-
-   yPos += 90;
-   (void) new wxStaticText(this, -1, _("X Scaling"), wxPoint(5, yPos));
-   /* wxTextCtrl *text1 = */ (void) new wxTextCtrl(this, wxID_PRINTER_X_SCALE, buf, wxPoint(100, yPos), wxSize(100, -1));
-
-   sprintf (buf, "%.2f", wx_printer_scale_y);
-   (void) new wxStaticText(this, -1, _("Y Scaling"), wxPoint(220, yPos));
-   /* wxTextCtrl *text2 = */ (void) new wxTextCtrl(this, wxID_PRINTER_Y_SCALE, buf, wxPoint(320, yPos), wxSize(100, -1));
-
-   yPos += 25;
-
-   (void) new wxStaticText(this, -1, _("X Translation"), wxPoint(5, yPos));
-   sprintf (buf, "%.2d", wx_printer_translate_x);
-   /* wxTextCtrl *text3 = */ (void) new wxTextCtrl(this, wxID_PRINTER_X_TRANS, buf, wxPoint(100, yPos), wxSize(100, -1));
-
-   (void) new wxStaticText(this, -1, _("Y Translation"), wxPoint(220, yPos));
-   sprintf (buf, "%.2d", wx_printer_translate_y);
-   /* wxTextCtrl *text4 = */ (void) new wxTextCtrl(this, wxID_PRINTER_Y_TRANS, buf, wxPoint(320, yPos), wxSize(100, -1));
-
-   Fit ();
+    va_list argptr;
+    va_start(argptr, fmt);

 
 

-   delete[] orientation;
-   delete[] print_modes;
-
-   wxEndBusyCursor();
-}
-
-int wxPostScriptPrintDialog::ShowModal ()
-{
-  if ( wxDialog::ShowModal() == wxID_OK )
-  {
-//    wxTextCtrl *text0 = (wxTextCtrl *)FindWindow(wxID_PRINTER_OPTIONS);
-      wxTextCtrl *text1 = (wxTextCtrl *)FindWindow(wxID_PRINTER_X_SCALE);
-      wxTextCtrl *text2 = (wxTextCtrl *)FindWindow(wxID_PRINTER_Y_SCALE);
-      wxTextCtrl *text3 = (wxTextCtrl *)FindWindow(wxID_PRINTER_X_TRANS);
-      wxTextCtrl *text4 = (wxTextCtrl *)FindWindow(wxID_PRINTER_Y_TRANS);
-//    wxTextCtrl *text_prt = (wxTextCtrl *)FindWindow(wxID_PRINTER_COMMAND);
-      wxRadioBox *radio0 = (wxRadioBox *)FindWindow(wxID_PRINTER_ORIENTATION);
-      wxRadioBox *radio1 = (wxRadioBox *)FindWindow(wxID_PRINTER_MODES);
-
-      StringToDouble (WXSTRINGCAST text1->GetValue (), &wxThePrintSetupData->m_printerScaleX);
-      StringToDouble (WXSTRINGCAST text2->GetValue (), &wxThePrintSetupData->m_printerScaleY);
-
-      long dummy;
-      StringToLong (WXSTRINGCAST text3->GetValue (), &dummy);
-      wxThePrintSetupData->m_printerTranslateX = (wxCoord)dummy;
-      StringToLong (WXSTRINGCAST text4->GetValue (), &dummy);
-      wxThePrintSetupData->m_printerTranslateY = (wxCoord)dummy;
-
-#ifdef __X__
-      //      wxThePrintSetupData->SetPrinterOptions(WXSTRINGCAST text0->GetValue ());
-      //      wxThePrintSetupData->SetPrinterCommand(WXSTRINGCAST text_prt->GetValue ());
-#endif
-
-      wxThePrintSetupData->SetPrinterOrientation((radio0->GetSelection() == 1 ? wxLANDSCAPE : wxPORTRAIT));
-
-      // C++ wants this
-      switch ( radio1->GetSelection() ) {
-        case 0: wxThePrintSetupData->SetPrinterMode(PS_PRINTER); break;
-        case 1:  wxThePrintSetupData->SetPrinterMode(PS_FILE); break;
-        case 2: wxThePrintSetupData->SetPrinterMode(PS_PREVIEW); break;
-      }
-      return wxID_OK;
-  }
-  return wxID_CANCEL;
-}
-#endif
- // 0 (redundant)
-
-// PostScript printer settings
-// RETAINED FOR BACKWARD COMPATIBILITY
-void wxSetPrinterCommand(const wxString& cmd)
-{
-  wxThePrintSetupData->SetPrinterCommand(cmd);
-}
-
-void wxSetPrintPreviewCommand(const wxString& cmd)
-{
-  wxThePrintSetupData->SetPrintPreviewCommand(cmd);
-}
-
-void wxSetPrinterOptions(const wxString& flags)
-{
-  wxThePrintSetupData->SetPrinterOptions(flags);
-}
-
-void wxSetPrinterFile(const wxString& f)
-{
-  wxThePrintSetupData->SetPrinterFile(f);
-}
-
-void wxSetPrinterOrientation(int orient)
-{
-  wxThePrintSetupData->SetPrinterOrientation(orient);
-}
-
-void wxSetPrinterScaling(double x, double y)
-{
-  wxThePrintSetupData->SetPrinterScaling(x, y);
+    PsPrint( wxString::FormatV( fmt, argptr ).c_str() );

 }
 
 }
 

-void wxSetPrinterTranslation(wxCoord x, wxCoord y)
+void wxPostScriptDC::PsPrint( const char* psdata )

 {
 {

-  wxThePrintSetupData->SetPrinterTranslation(x, y);
-}
-
-// 1 = Preview, 2 = print to file, 3 = send to printer
-void wxSetPrinterMode(int mode)
-{
-  wxThePrintSetupData->SetPrinterMode(mode);
-}
-
-void wxSetAFMPath(const wxString& f)
-{
-  wxThePrintSetupData->SetAFMPath(f);
-}
-
-// Get current values
-wxString wxGetPrinterCommand()
-{
-  return wxThePrintSetupData->GetPrinterCommand();
-}
-
-wxString wxGetPrintPreviewCommand()
-{
-  return wxThePrintSetupData->GetPrintPreviewCommand();
-}
-
-wxString wxGetPrinterOptions()
-{
-  return wxThePrintSetupData->GetPrinterOptions();
-}
-
-wxString wxGetPrinterFile()
-{
-  return wxThePrintSetupData->GetPrinterFile();
-}
-
-int wxGetPrinterOrientation()
-{
-  return wxThePrintSetupData->GetPrinterOrientation();
-}
-
-void wxGetPrinterScaling(double* x, double* y)
-{
-  wxThePrintSetupData->GetPrinterScaling(x, y);
-}
+    wxPostScriptPrintNativeData *data =
+        (wxPostScriptPrintNativeData *) m_printData.GetNativeData();

 
 

-void wxGetPrinterTranslation(wxCoord *x, wxCoord *y)
-{
-  wxThePrintSetupData->GetPrinterTranslation(x, y);
-}
-
-int wxGetPrinterMode()
-{
-  return wxThePrintSetupData->GetPrinterMode();
-}
-
-wxString wxGetAFMPath()
-{
-  return wxThePrintSetupData->GetAFMPath();
-}
-
-/*
- * Print setup data
- */
-
-wxPrintSetupData::wxPrintSetupData()
-{
-  m_printerOrient = wxPORTRAIT;
-  m_printerScaleX = (double)1.0;
-  m_printerScaleY = (double)1.0;
-  m_printerTranslateX = 0;
-  m_printerTranslateY = 0;
-  m_printerMode = wxPRINT_MODE_FILE;
-  m_printColour = TRUE;
-}
-
-wxPrintSetupData::~wxPrintSetupData()
-{
-}
-
-void wxPrintSetupData::operator=(wxPrintSetupData& data)
-{
-  SetPrinterCommand(data.GetPrinterCommand());
-  SetPrintPreviewCommand(data.GetPrintPreviewCommand());
-  SetPrinterOptions(data.GetPrinterOptions());
-  wxCoord x, y;
-  data.GetPrinterTranslation(&x, &y);
-  SetPrinterTranslation(x, y);
-
-  double x1, y1;
-  data.GetPrinterScaling(&x1, &y1);
-  SetPrinterScaling(x1, y1);
-
-  SetPrinterOrientation(data.GetPrinterOrientation());
-  SetPrinterMode(data.GetPrinterMode());
-  SetAFMPath(data.GetAFMPath());
-  SetPaperName(data.GetPaperName());
-  SetColour(data.GetColour());
-}
-
-// Initialize from a wxPrintData object (wxPrintData should now be used instead of wxPrintSetupData).
-void wxPrintSetupData::operator=(const wxPrintData& data)
-{
-    SetPrinterCommand(data.GetPrinterCommand());
-    SetPrintPreviewCommand(data.GetPreviewCommand());
-    SetPrinterOptions(data.GetPrinterOptions());
-    SetPrinterTranslation((wxCoord)data.GetPrinterTranslateX(),
-                          (wxCoord)data.GetPrinterTranslateY());
-    SetPrinterScaling(data.GetPrinterScaleX(), data.GetPrinterScaleY());
-    SetPrinterOrientation(data.GetOrientation());
-    SetPrinterMode((int) data.GetPrintMode());
-    SetAFMPath(data.GetFontMetricPath());
-    SetPaperName(wxThePrintPaperDatabase->ConvertIdToName(data.GetPaperId()));
-    SetColour(data.GetColour());
-    SetPrinterFile(data.GetFilename());
-}
+    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

 
 

-void wxInitializePrintSetupData(bool init)
-{
-  if (init)
-  {
-    wxThePrintSetupData = new wxPrintSetupData;
-
-    wxThePrintSetupData->SetPrintPreviewCommand(PS_VIEWER_PROG);
-    wxThePrintSetupData->SetPrinterOrientation(wxPORTRAIT);
-    wxThePrintSetupData->SetPrinterMode(wxPRINT_MODE_PREVIEW);
-    wxThePrintSetupData->SetPaperName(_("A4 sheet, 210 x 297 mm"));
-
-    // Could have a .ini file to read in some defaults
-    // - and/or use environment variables, e.g. WXWIN
-#ifdef __VMS__
-    wxThePrintSetupData->SetPrinterCommand("print");
-    wxThePrintSetupData->SetPrinterOptions("/nonotify/queue=psqueue");
-    wxThePrintSetupData->SetAFMPath("sys$ps_font_metrics:");
-#endif
-#ifdef __WXMSW__
-    wxThePrintSetupData->SetPrinterCommand("print");
-    wxThePrintSetupData->SetAFMPath("c:\\windows\\system\\");
-    wxThePrintSetupData->SetPrinterOptions("");
-#endif
-#if !defined(__VMS__) && !defined(__WXMSW__)
-    wxThePrintSetupData->SetPrinterCommand("lpr");
-    wxThePrintSetupData->SetPrinterOptions("");
-    wxThePrintSetupData->SetAFMPath("");
-#endif
-  }
-  else
-  {
-    if (wxThePrintSetupData)
-      delete wxThePrintSetupData;
-     wxThePrintSetupData = (wxPrintSetupData *) NULL;
-  }
+        // save data into file
+        default:
+            wxCHECK_RET( m_pstream, wxT("invalid postscript dc") );
+            fwrite( psdata, 1, strlen( psdata ), m_pstream );
+    }

 }
 
 }
 

-// A module to allow initialization/cleanup of PostScript-related
-// things without calling these functions from app.cpp.
-
-class WXDLLEXPORT wxPostScriptModule: public wxModule
-{
-DECLARE_DYNAMIC_CLASS(wxPostScriptModule)
-public:
-    wxPostScriptModule() {}
-    bool OnInit();
-    void OnExit();
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxPostScriptModule, wxModule)
-
-/*
- * Initialization/cleanup module
- */
-
-bool wxPostScriptModule::OnInit()
+void wxPostScriptDC::PsPrint( int ch )

 {
 {

-    wxInitializePrintSetupData();
+    wxPostScriptPrintNativeData *data =
+        (wxPostScriptPrintNativeData *) m_printData.GetNativeData();

 
 

-    return TRUE;
-}
+    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->PutC( (char)ch );
+            }
+            break;
+#endif // wxUSE_STREAMS

 
 

-void wxPostScriptModule::OnExit()
-{
-    wxInitializePrintSetupData(FALSE);
+        // save data into file
+        default:
+            wxCHECK_RET( m_pstream, wxT("invalid postscript dc") );
+            fputc( ch, m_pstream );
+    }

 }
 
 #endif
 }
 
 #endif


@@ -2613,3 +2251,6 @@ void wxPostScriptModule::OnExit()
 
 #endif
   // wxUSE_PRINTING_ARCHITECTURE
 
 #endif
   // wxUSE_PRINTING_ARCHITECTURE

+
+
+// vi:sts=4:sw=4:et