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 8286033876beb020de4b4e5fbac0372382d4c31f..3f7057b564d04ca9a6763a33d5430ccf24d74490 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     Generic wxPostScriptDC implementation
 // Author:      Julian Smart, Robert Roebling, Markus Holzhem
 // Modified by:
 // Purpose:     Generic wxPostScriptDC implementation
 // Author:      Julian Smart, Robert Roebling, Markus Holzhem
 // Modified by:


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dcpsg.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -36,14 +32,11 @@
 #include "wx/log.h"
 #include "wx/generic/dcpsg.h"
 #include "wx/prntbase.h"
 #include "wx/log.h"
 #include "wx/generic/dcpsg.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"

-#if WXWIN_COMPATIBILITY_2_2
-    #include "wx/window.h"
-    #include "wx/printdlg.h"
-#endif
-
-#include <math.h>
+#include "wx/math.h"
+#include "wx/stdpaths.h"

 
 #ifdef __WXMSW__
 
 
 #ifdef __WXMSW__
 


@@ -200,8 +193,6 @@ static const char *wxPostScriptHeaderColourImage = "\
   } ifelse          % end of 'false' case\n\
 ";
 
   } ifelse          % end of 'false' case\n\
 ";
 

-#if wxUSE_PANGO
-#else

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


@@ -242,7 +233,6 @@ static char wxPostScriptHeaderReencodeISO2[] =
 "/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis\n"
 "/yacute/thorn/ydieresis\n"
         "] def\n\n";
 "/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis\n"
 "/yacute/thorn/ydieresis\n"
         "] def\n\n";

-#endif

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


@@ -274,7 +264,7 @@ wxPostScriptDC::wxPostScriptDC ()
 
     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;


@@ -293,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;


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

-    m_ok = TRUE;
+    m_ok = true;

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


@@ -315,31 +305,6 @@ wxPostScriptDC::~wxPostScriptDC ()
     }
 }
 
     }
 }
 

-#if WXWIN_COMPATIBILITY_2_2
-bool wxPostScriptDC::Create( const wxString &output, bool interactive, wxWindow *parent )
-{
-    wxPrintData data;
-    data.SetFilename( output );
-    data.SetPrintMode( wxPRINT_MODE_FILE );
-
-    if (interactive)
-    {
-        wxPrintDialogData ddata( data );
-        wxPrintDialog dialog( parent, &data );
-        dialog.GetPrintDialogData().SetSetupDialog(TRUE);
-        if (dialog.ShowModal() != wxID_OK)
-        {
-            m_ok = FALSE;
-            return FALSE;
-        }
-        data = dialog.GetPrintDialogData().GetPrintData();
-    }
-
-    return TRUE;
-}
-#endif
-
-

 bool wxPostScriptDC::Ok() const
 {
   return m_ok;
 bool wxPostScriptDC::Ok() const
 {
   return m_ok;


@@ -353,7 +318,7 @@ void wxPostScriptDC::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoo
 
     wxDC::DoSetClippingRegion(x, y, w, h);
 
 
     wxDC::DoSetClippingRegion(x, y, w, h);
 

-    m_clipping = TRUE;
+    m_clipping = true;

 
     PsPrintf( wxT("gsave\n newpath\n")
               wxT("%d %d moveto\n")
 
     PsPrintf( wxT("gsave\n newpath\n")
               wxT("%d %d moveto\n")


@@ -374,7 +339,7 @@ void wxPostScriptDC::DestroyClippingRegion()
 
     if (m_clipping)
     {
 
     if (m_clipping)
     {

-        m_clipping = FALSE;
+        m_clipping = false;

         PsPrint( "grestore\n" );
     }
 
         PsPrint( "grestore\n" );
     }
 


@@ -391,13 +356,13 @@ void wxPostScriptDC::Clear()
 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))


@@ -440,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
     {


@@ -495,12 +461,16 @@ void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,d
 {
     wxCHECK_RET( m_ok, 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;


@@ -613,7 +583,7 @@ void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wx
     }
 }
 
     }
 }
 

-void wxPostScriptDC::DoDrawPolyPolygon (int n, int start[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
+void wxPostScriptDC::DoDrawPolyPolygon (int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)

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


@@ -626,7 +596,7 @@ void wxPostScriptDC::DoDrawPolyPolygon (int n, int start[], wxPoint points[], wx
         PsPrint( "newpath\n" );
 
         int ofs = 0;
         PsPrint( "newpath\n" );
 
         int ofs = 0;

-        for (int i = 0; i < n; ofs += start[i++])
+        for (int i = 0; i < n; ofs += count[i++])

         {
             wxCoord xx = LogicalToDeviceX(points[ofs].x + xoffset);
             wxCoord yy = LogicalToDeviceY(points[ofs].y + yoffset);
         {
             wxCoord xx = LogicalToDeviceX(points[ofs].x + xoffset);
             wxCoord yy = LogicalToDeviceY(points[ofs].y + yoffset);


@@ -635,7 +605,7 @@ void wxPostScriptDC::DoDrawPolyPolygon (int n, int start[], wxPoint points[], wx
 
             CalcBoundingBox( points[ofs].x + xoffset, points[ofs].y + yoffset );
 
 
             CalcBoundingBox( points[ofs].x + xoffset, points[ofs].y + yoffset );
 

-            for (int j = 1; j < start[i]; j++)
+            for (int j = 1; j < count[i]; j++)

             {
                 xx = LogicalToDeviceX(points[ofs+j].x + xoffset);
                 yy = LogicalToDeviceY(points[ofs+j].y + yoffset);
             {
                 xx = LogicalToDeviceX(points[ofs+j].x + xoffset);
                 yy = LogicalToDeviceY(points[ofs+j].y + yoffset);


@@ -655,7 +625,7 @@ void wxPostScriptDC::DoDrawPolyPolygon (int n, int start[], wxPoint points[], wx
         PsPrint( "newpath\n" );
 
         int ofs = 0;
         PsPrint( "newpath\n" );
 
         int ofs = 0;

-        for (int i = 0; i < n; ofs += start[i++])
+        for (int i = 0; i < n; ofs += count[i++])

         {
             wxCoord xx = LogicalToDeviceX(points[ofs].x + xoffset);
             wxCoord yy = LogicalToDeviceY(points[ofs].y + yoffset);
         {
             wxCoord xx = LogicalToDeviceX(points[ofs].x + xoffset);
             wxCoord yy = LogicalToDeviceY(points[ofs].y + yoffset);


@@ -664,7 +634,7 @@ void wxPostScriptDC::DoDrawPolyPolygon (int n, int start[], wxPoint points[], wx
 
             CalcBoundingBox( points[ofs].x + xoffset, points[ofs].y + yoffset );
 
 
             CalcBoundingBox( points[ofs].x + xoffset, points[ofs].y + yoffset );
 

-            for (int j = 1; j < start[i]; j++)
+            for (int j = 1; j < count[i]; j++)

             {
                 xx = LogicalToDeviceX(points[ofs+j].x + xoffset);
                 yy = LogicalToDeviceY(points[ofs+j].y + yoffset);
             {
                 xx = LogicalToDeviceX(points[ofs+j].x + xoffset);
                 yy = LogicalToDeviceY(points[ofs+j].y + yoffset);


@@ -695,18 +665,18 @@ 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));
     }
 

-    PsPrintf( wxT("newpath\n"
-                  "%d %d moveto\n"),
+    PsPrintf( wxT("newpath\n")
+              wxT("%d %d moveto\n"),

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

-    
+

     for (i = 1; i < n; i++)
     {
         PsPrintf( wxT("%d %d lineto\n"),
                   LogicalToDeviceX(points[i].x+xoffset),
                   LogicalToDeviceY(points[i].y+yoffset) );
     }
     for (i = 1; i < n; i++)
     {
         PsPrintf( wxT("%d %d lineto\n"),
                   LogicalToDeviceX(points[i].x+xoffset),
                   LogicalToDeviceY(points[i].y+yoffset) );
     }

-    
+

     PsPrint( "stroke\n" );
 }
 
     PsPrint( "stroke\n" );
 }
 


@@ -776,7 +746,7 @@ void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width
         /* Draw rectangle anticlockwise */
         PsPrintf( wxT("newpath\n")
                   wxT("%d %d %d 90 180 arc\n")
         /* Draw rectangle anticlockwise */
         PsPrintf( wxT("newpath\n")
                   wxT("%d %d %d 90 180 arc\n")

-                  wxT("%d %d moveto\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 %d 180 270 arc\n")
                   wxT("%d %d lineto\n")
                   wxT("%d %d %d 270 0 arc\n")


@@ -786,7 +756,7 @@ void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width
                   wxT("closepath\n")
                   wxT("fill\n"),
                 LogicalToDeviceX(x + rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad),
                   wxT("closepath\n")
                   wxT("fill\n"),
                 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),


@@ -805,7 +775,7 @@ void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width
         /* Draw rectangle anticlockwise */
         PsPrintf( wxT("newpath\n")
                   wxT("%d %d %d 90 180 arc\n")
         /* Draw rectangle anticlockwise */
         PsPrintf( wxT("newpath\n")
                   wxT("%d %d %d 90 180 arc\n")

-                  wxT("%d %d moveto\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 %d 180 270 arc\n")
                   wxT("%d %d lineto\n")
                   wxT("%d %d %d 270 0 arc\n")


@@ -815,7 +785,7 @@ void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width
                   wxT("closepath\n")
                   wxT("stroke\n"),
                 LogicalToDeviceX(x + rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad),
                   wxT("closepath\n")
                   wxT("stroke\n"),
                 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),


@@ -863,7 +833,7 @@ 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 */
 }
 
 /* this has to be char, not wxChar */


@@ -940,8 +910,6 @@ void wxPostScriptDC::SetFont( const wxFont& font )
 
     m_font = font;
 
 
     m_font = font;
 

-#if wxUSE_PANGO
-#else

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


@@ -1011,11 +979,15 @@ void wxPostScriptDC::SetFont( const wxFont& font )
         }
     }
 
         }
     }
 

+    // We may legitimately call SetFont before BeginDoc
+    if (!m_pstream)
+        return;
+

     PsPrint( name );
     PsPrint( " reencodeISO def\n" );
     PsPrint( name );
     PsPrint( " findfont\n" );
     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);
     // this is a hack - we must scale font size (in pts) according to m_scaleY but
     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


@@ -1024,7 +996,6 @@ void wxPostScriptDC::SetFont( const wxFont& font )
     for (int i = 0; i < 100; i++)
         if (buffer[i] == ',') buffer[i] = '.';
     PsPrint( buffer );
     for (int i = 0; i < 100; i++)
         if (buffer[i] == ',') buffer[i] = '.';
     PsPrint( buffer );

-#endif // !wxUSE_PANGO

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


@@ -1103,8 +1074,7 @@ void wxPostScriptDC::SetPen( const wxPen& pen )
         double redPS = (double)(red) / 255.0;
         double bluePS = (double)(blue) / 255.0;
         double greenPS = (double)(green) / 255.0;
         double redPS = (double)(red) / 255.0;
         double bluePS = (double)(blue) / 255.0;
         double greenPS = (double)(green) / 255.0;

-        
-        char buffer[100];
+

         sprintf( buffer,
             "%.8f %.8f %.8f setrgbcolor\n",
             redPS, greenPS, bluePS );
         sprintf( buffer,
             "%.8f %.8f %.8f setrgbcolor\n",
             redPS, greenPS, bluePS );


@@ -1112,7 +1082,7 @@ void wxPostScriptDC::SetPen( const wxPen& pen )
             if (buffer[i] == ',') buffer[i] = '.';
 
         PsPrint( buffer );
             if (buffer[i] == ',') buffer[i] = '.';
 
         PsPrint( buffer );

-            
+

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


@@ -1158,7 +1128,7 @@ 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] = '.';

-        
+

         PsPrint( buffer );
 
         m_currentRed = red;
         PsPrint( buffer );
 
         m_currentRed = red;


@@ -1167,117 +1137,6 @@ void wxPostScriptDC::SetBrush( const wxBrush& brush )
     }
 }
 
     }
 }
 

-#if wxUSE_PANGO
-
-#define PANGO_ENABLE_ENGINE
-
-#ifdef __WXGTK20__
-#include "wx/gtk/private.h"
-#include "gtk/gtk.h"
-#else
-#include "wx/x11/private.h"
-#endif
-
-#include "wx/fontutil.h"
-#include <pango/pangoft2.h>
-#include <freetype/ftglyph.h>
-
-#ifndef FT_Outline_Decompose
-  FT_EXPORT( FT_Error )  FT_Outline_Decompose(
-                           FT_Outline*              outline,
-                           const FT_Outline_Funcs*  interface,
-                           void*                    user );
-#endif
-
-typedef struct _OutlineInfo OutlineInfo;
-struct _OutlineInfo {
-  wxPostScriptDC* caller;
-};
-
-static int paps_move_to( FT_Vector* to, void *user_data)
-{
-  OutlineInfo *outline_info = (OutlineInfo*)user_data;
-  outline_info->caller->PsPrintf( wxT("%d %d moveto\n"), (int)to->x, (int)to->y );
-  return 0;
-}
-
-static int paps_line_to( FT_Vector*  to, void *user_data)
-{
-  OutlineInfo *outline_info = (OutlineInfo*)user_data;
-  outline_info->caller->PsPrintf( wxT("%d %d lineto\n"), (int)to->x , (int)to->y );
-  return 0;
-}
-
-static int paps_conic_to( FT_Vector*  control, FT_Vector*  to, void *user_data)
-{
-  OutlineInfo *outline_info = (OutlineInfo*)user_data;
-  outline_info->caller->PsPrintf( wxT("%d %d %d %d conicto\n"),
-                                  (int)control->x ,
-                                  (int)control->y ,
-                                  (int)to->x ,
-                                  (int)to->y );
-  return 0;
-}
-
-static int
-paps_cubic_to( FT_Vector*  control1, FT_Vector*  control2,
-               FT_Vector*  to, void *user_data)
-{
-  OutlineInfo *outline_info = (OutlineInfo*)user_data;
-  outline_info->caller->PsPrintf(wxT("%d %d %d %d %d %d curveto\n"),
-          (int)control1->x ,
-          (int)control1->y ,
-          (int)control2->x ,
-          (int)control2->y ,
-          (int)to->x ,
-          (int)to->y );
-  return 0;
-}
-
-void draw_bezier_outline(wxPostScriptDC* caller,
-                         FT_Face face,
-                         FT_UInt glyph_index,
-                         int pos_x,
-                         int pos_y,
-                         double scale_x,
-                         double scale_y )
-{
-  FT_Int load_flags = FT_LOAD_NO_BITMAP;
-  FT_Glyph glyph;
-
-  FT_Outline_Funcs outlinefunc =
-  {
-    paps_move_to,
-    paps_line_to,
-    paps_conic_to,
-    paps_cubic_to
-  };
-
-  OutlineInfo outline_info;
-  outline_info.caller = caller;
-
-  caller->PsPrint("gsave\n");
-  caller->PsPrintf( wxT("%d %d translate\n"), pos_x, pos_y );
-
-  // We have to replace the "," from the German
-  // locale with the Englich "." for PostScript
-  char buf[100];
-  sprintf(buf, "%.8f %.8f scale\n", scale_x, scale_y );
-  for (size_t i = 0; i < strlen(buf); i++)
-     if (buf[i] == ',') buf[i] = '.';
-  caller->PsPrint(buf);
-
-  FT_Load_Glyph(face, glyph_index, load_flags);
-  FT_Get_Glyph (face->glyph, &glyph);
-  FT_Outline_Decompose (&(((FT_OutlineGlyph)glyph)->outline),
-                        &outlinefunc, &outline_info);
-  caller->PsPrint("closepath fill grestore\n");
-
-  FT_Done_Glyph (glyph);
-}
-
-#endif
-

 void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );


@@ -1322,82 +1181,6 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
         }
     }
 
         }
     }
 

-#if wxUSE_PANGO
-    int ps_dpi = 72;
-    int pango_dpi = 600;
-    PangoContext *context = pango_ft2_get_context ( pango_dpi, pango_dpi );
-
-    double scale = (double)pango_dpi / (double)ps_dpi;
-    scale /= m_userScaleY;
-
-    pango_context_set_language (context, pango_language_from_string ("en_US"));
-    pango_context_set_base_dir (context, PANGO_DIRECTION_LTR );
-
-    pango_context_set_font_description (context, m_font.GetNativeFontInfo()->description );
-
-    PangoLayout *layout = pango_layout_new (context);
-#if wxUSE_UNICODE
-    wxCharBuffer buffer = wxConvUTF8.cWC2MB( text );
-#else
-    wxCharBuffer buffer = wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) );
-#endif
-    pango_layout_set_text( layout, (const char*) buffer, strlen(buffer) );
-
-    PsPrintf( wxT("%%%% %s\n"), text.c_str() );
-
-    PangoRectangle rect;
-    pango_layout_get_extents(layout, NULL, &rect);
-
-    int xx = LogicalToDeviceX( x );
-    int yy = LogicalToDeviceY( y );
-
-    int xxx = xx * PANGO_SCALE;
-    int yyy = yy * PANGO_SCALE - (int)(rect.height * 0.66 / scale);  // Move down by estimated baseline. HACK.
-
-#define ps_kludge_factor 2.8
-
-    // Loop over lines in layout
-    int num_lines = pango_layout_get_line_count( layout );
-    for (int i = 0; i < num_lines; i++)
-    {
-        PangoLayoutLine *line = pango_layout_get_line( layout, i );
-
-        // width of glyphs already printed
-        int all_width = 0;
-
-        // Loop over runs in line
-        GSList *runs_list = line->runs;
-        while (runs_list)
-        {
-            PangoLayoutRun *run = (PangoLayoutRun*) runs_list->data;
-            PangoItem *item = run->item;
-            PangoGlyphString *glyphs = run->glyphs;
-            PangoAnalysis *analysis = &item->analysis;
-            PangoFont *font = analysis->font;
-            FT_Face ft_face = pango_ft2_font_get_face(font);
-
-            int num_glyphs = glyphs->num_glyphs;
-            for (int glyph_idx = 0; glyph_idx < num_glyphs; glyph_idx++)
-            {
-                PangoGlyphGeometry geometry = glyphs->glyphs[glyph_idx].geometry;
-                int pos_x = xxx + (int)((double)(all_width+geometry.x_offset) / scale);
-                int pos_y = yyy + (int)((double)geometry.y_offset / scale );
-                all_width += geometry.width;
-
-                draw_bezier_outline( this, ft_face,
-                        (FT_UInt)(glyphs->glyphs[glyph_idx].glyph),
-                        pos_x / PANGO_SCALE,
-                        pos_y / PANGO_SCALE,
-                        1.0/(ps_kludge_factor * scale * 26.6),
-                        1.0/(ps_kludge_factor * scale * 26.6) );
-            }
-            runs_list = runs_list->next;
-        }
-    }
-
-    g_object_unref( G_OBJECT( layout ) );
-    g_object_unref( G_OBJECT( context ) );
-#else // !wxUSE_PANGO

     wxCoord text_w, text_h, text_descent;
 
     GetTextExtent(text, &text_w, &text_h, &text_descent);
     wxCoord text_w, text_h, text_descent;
 
     GetTextExtent(text, &text_w, &text_h, &text_descent);


@@ -1416,7 +1199,7 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
 
     PsPrintf( wxT("%d %d moveto\n"), LogicalToDeviceX(x), LogicalToDeviceY(by) );
     PsPrint( "(" );
 
     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;


@@ -1439,9 +1222,9 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
             PsPrint(c);
         }
     }
             PsPrint(c);
         }
     }

-    
+

     PsPrint( ") show\n" );
     PsPrint( ") show\n" );

-    
+

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


@@ -1464,12 +1247,11 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
 
     CalcBoundingBox( x, y );
     CalcBoundingBox( x + size * text.Length() * 2/3 , y );
 
     CalcBoundingBox( x, y );
     CalcBoundingBox( x + size * text.Length() * 2/3 , y );

-#endif // wxUSE_PANGO/!wxUSE_PANGO

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


@@ -1523,7 +1305,7 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord
 
     PsPrintf( wxT("%d %d moveto\n"),
             LogicalToDeviceX(x), LogicalToDeviceY(y));
 
     PsPrintf( wxT("%d %d moveto\n"),
             LogicalToDeviceX(x), LogicalToDeviceY(y));

-    
+

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


@@ -1532,7 +1314,7 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord
         if (buffer[i] == ',') buffer[i] = '.';
     }
     PsPrint( buffer);
         if (buffer[i] == ',') buffer[i] = '.';
     }
     PsPrint( buffer);

-    
+

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


@@ -1555,21 +1337,20 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord
             PsPrint(c);
         }
     }
             PsPrint(c);
         }
     }

-    
+

     PsPrint( ") show\n" );
     PsPrint( ") show\n" );

-    
+

     sprintf( buffer, "%.8f rotate\n", -angle );
     for (i = 0; i < 100; i++)
     {
         if (buffer[i] == ',') buffer[i] = '.';
     }
     PsPrint( buffer );
     sprintf( buffer, "%.8f rotate\n", -angle );
     for (i = 0; i < 100; i++)
     {
         if (buffer[i] == ',') buffer[i] = '.';
     }
     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,


@@ -1588,7 +1369,7 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord
         }
         PsPrint( buffer );
     }
         }
         PsPrint( buffer );
     }

-    
+

     CalcBoundingBox( x, y );
     CalcBoundingBox( x + size * text.Length() * 2/3 , y );
 }
     CalcBoundingBox( x, y );
     CalcBoundingBox( x + size * text.Length() * 2/3 , y );
 }


@@ -1603,6 +1384,7 @@ 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 )
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 void wxPostScriptDC::DoDrawSpline( wxList *points )
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );


@@ -1673,10 +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
      */
 

-    PsPrintf( wxT("%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
 {


@@ -1692,10 +1475,7 @@ void wxPostScriptDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
     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 )


@@ -1773,33 +1553,32 @@ 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.GetPrintMode() == wxPRINT_MODE_FILE )
+    if (m_printData.GetPrintMode() != wxPRINT_MODE_STREAM )

     {
     {

-        if (m_printData.GetFilename() == wxT(""))
+        if (m_printData.GetFilename() == wxEmptyString)

         {
             wxString filename = wxGetTempFileName( wxT("ps") );
             m_printData.SetFilename(filename);
         }
 
         {
             wxString filename = wxGetTempFileName( wxT("ps") );
             m_printData.SetFilename(filename);
         }
 

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

 
         if (!m_pstream)
         {
             wxLogError( _("Cannot open file for PostScript printing!"));
 
         if (!m_pstream)
         {
             wxLogError( _("Cannot open file for PostScript printing!"));

-            m_ok = FALSE;
-            return FALSE;
+            m_ok = false;
+            return false;

         }
     }
 
         }
     }
 

-    m_ok = TRUE;
+    m_ok = true;

     m_title = message;
 
     PsPrint( "%!PS-Adobe-2.0\n" );
     PsPrintf( wxT("%%%%Title: %s\n"), m_title.c_str() );
     m_title = message;
 
     PsPrint( "%!PS-Adobe-2.0\n" );
     PsPrintf( wxT("%%%%Title: %s\n"), m_title.c_str() );

-    PsPrint( "%%Creator: wxWindows PostScript renderer\n" );
+    PsPrint( "%%Creator: wxWidgets PostScript renderer\n" );

     PsPrintf( wxT("%%%%CreationDate: %s\n"), wxNow().c_str() );
     if (m_printData.GetOrientation() == wxLANDSCAPE)
         PsPrint( "%%Orientation: Landscape\n" );
     PsPrintf( wxT("%%%%CreationDate: %s\n"), wxNow().c_str() );
     if (m_printData.GetOrientation() == wxLANDSCAPE)
         PsPrint( "%%Orientation: Landscape\n" );


@@ -1835,11 +1614,8 @@ bool wxPostScriptDC::StartDoc( const wxString& message )
     PsPrint( wxPostScriptHeaderEllipse );
     PsPrint( wxPostScriptHeaderEllipticArc );
     PsPrint( wxPostScriptHeaderColourImage );
     PsPrint( wxPostScriptHeaderEllipse );
     PsPrint( wxPostScriptHeaderEllipticArc );
     PsPrint( wxPostScriptHeaderColourImage );

-#if wxUSE_PANGO
-#else

     PsPrint( wxPostScriptHeaderReencodeISO1 );
     PsPrint( wxPostScriptHeaderReencodeISO2 );
     PsPrint( wxPostScriptHeaderReencodeISO1 );
     PsPrint( wxPostScriptHeaderReencodeISO2 );

-#endif

     if (wxPostScriptHeaderSpline)
         PsPrint( wxPostScriptHeaderSpline );
     PsPrint( "%%EndProlog\n" );
     if (wxPostScriptHeaderSpline)
         PsPrint( wxPostScriptHeaderSpline );
     PsPrint( "%%EndProlog\n" );


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

-    return TRUE;
+    return true;

 }
 
 void wxPostScriptDC::EndDoc ()
 }
 
 void wxPostScriptDC::EndDoc ()


@@ -1863,7 +1639,7 @@ void wxPostScriptDC::EndDoc ()
 
     if (m_clipping)
     {
 
     if (m_clipping)
     {

-        m_clipping = FALSE;
+        m_clipping = false;

         PsPrint( "grestore\n" );
     }
 
         PsPrint( "grestore\n" );
     }
 


@@ -1938,17 +1714,20 @@ void wxPostScriptDC::EndDoc ()
     PsPrintf( wxT("%% %d %d lineto closepath stroke\n"), llx, ury );
 #endif
 
     PsPrintf( wxT("%% %d %d lineto closepath stroke\n"), llx, ury );
 #endif
 

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

     if (m_ok && (m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER))
     {
         wxString command;
     if (m_ok && (m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER))
     {
         wxString command;

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

         command += wxT(" ");
         command += wxT(" ");

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

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

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

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


@@ -1973,11 +1752,14 @@ 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)
     {
 
     if (m_printData.GetOrientation() == wxLANDSCAPE)
     {


@@ -2012,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, 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 );


@@ -2026,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


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

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

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


@@ -2057,44 +1839,6 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
         return;
     }
 
         return;
     }
 

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

    // GTK 2.0
 
     const wxWX2MBbuf strbuf = string.mb_str();
    // GTK 2.0
 
     const wxWX2MBbuf strbuf = string.mb_str();


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


@@ -2222,17 +1966,33 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
 
         // Get the directory of the AFM files
         wxString afmName;
 
         // Get the directory of the AFM files
         wxString afmName;

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

         {
         {

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

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

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

         }
         }

+#endif // __WIN32__

 
 

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

         {
         {

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

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

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

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


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

-#endif

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


@@ -2269,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 */


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

-
-#endif
-    // GTK 2.0

 }
 
 // print postscript datas via required method (file, stream)
 }
 
 // print postscript datas via required method (file, stream)


@@ -2440,13 +2198,16 @@ void wxPostScriptDC::PsPrintf( const wxChar* fmt, ... )
 
 void wxPostScriptDC::PsPrint( const char* psdata )
 {
 
 void wxPostScriptDC::PsPrint( const char* psdata )
 {

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

     {
 #if wxUSE_STREAMS
         // append to output stream
         case wxPRINT_MODE_STREAM:
             {
     {
 #if wxUSE_STREAMS
         // append to output stream
         case wxPRINT_MODE_STREAM:
             {

-                wxOutputStream* outputstream = m_printData.GetOutputStream();
+                wxOutputStream* outputstream = data->GetOutputStream();

                 wxCHECK_RET( outputstream, wxT("invalid outputstream") );
                 outputstream->Write( psdata, strlen( psdata ) );
             }
                 wxCHECK_RET( outputstream, wxT("invalid outputstream") );
                 outputstream->Write( psdata, strlen( psdata ) );
             }


@@ -2462,15 +2223,18 @@ void wxPostScriptDC::PsPrint( const char* psdata )
 
 void wxPostScriptDC::PsPrint( int ch )
 {
 
 void wxPostScriptDC::PsPrint( int ch )
 {

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

     {
 #if wxUSE_STREAMS
         // append to output stream
         case wxPRINT_MODE_STREAM:
             {
     {
 #if wxUSE_STREAMS
         // append to output stream
         case wxPRINT_MODE_STREAM:
             {

-                wxOutputStream* outputstream = m_printData.GetOutputStream();
+                wxOutputStream* outputstream = data->GetOutputStream();

                 wxCHECK_RET( outputstream, wxT("invalid outputstream") );
                 wxCHECK_RET( outputstream, wxT("invalid outputstream") );

-                outputstream->PutC( ch );
+                outputstream->PutC( (char)ch );

             }
             break;
 #endif // wxUSE_STREAMS
             }
             break;
 #endif // wxUSE_STREAMS


@@ -2482,52 +2246,6 @@ void wxPostScriptDC::PsPrint( int ch )
     }
 }
 
     }
 }
 

-#if WXWIN_COMPATIBILITY_2_2
-WXDLLEXPORT wxPrintSetupData *wxThePrintSetupData = 0;
-
-void wxInitializePrintSetupData(bool init)
-{
-    if (init)
-    {
-        // gets initialized in the constructor
-        wxThePrintSetupData = new wxPrintSetupData;
-    }
-    else
-    {
-        delete wxThePrintSetupData;
-
-        wxThePrintSetupData = (wxPrintSetupData *) NULL;
-    }
-}
-
-// 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)
-
-bool wxPostScriptModule::OnInit()
-{
-    wxInitializePrintSetupData();
-
-    return TRUE;
-}
-
-void wxPostScriptModule::OnExit()
-{
-    wxInitializePrintSetupData(FALSE);
-}
-#endif
-  // WXWIN_COMPATIBILITY_2_2
-

 #endif
   // wxUSE_POSTSCRIPT
 
 #endif
   // wxUSE_POSTSCRIPT