removed src/gtk/eggtrayicon.h

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

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index 8286033876beb020de4b4e5fbac0372382d4c31f..2e423e5501557b4f70021b7828eb9b72b01325e3 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -36,6 +36,7 @@
 #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"
 #if WXWIN_COMPATIBILITY_2_2
 #include "wx/paper.h"
 #include "wx/filefn.h"
 #if WXWIN_COMPATIBILITY_2_2


@@ -274,7 +275,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 +294,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 +304,7 @@ wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData)
 
     m_printData = printData;
 
 
     m_printData = printData;
 

-    m_ok = TRUE;
+    m_ok = true;

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


@@ -326,16 +327,16 @@ bool wxPostScriptDC::Create( const wxString &output, bool interactive, wxWindow
     {
         wxPrintDialogData ddata( data );
         wxPrintDialog dialog( parent, &data );
     {
         wxPrintDialogData ddata( data );
         wxPrintDialog dialog( parent, &data );

-        dialog.GetPrintDialogData().SetSetupDialog(TRUE);
+        dialog.GetPrintDialogData().SetSetupDialog(true);

         if (dialog.ShowModal() != wxID_OK)
         {
         if (dialog.ShowModal() != wxID_OK)
         {

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

         }
         data = dialog.GetPrintDialogData().GetPrintData();
     }
 
         }
         data = dialog.GetPrintDialogData().GetPrintData();
     }
 

-    return TRUE;
+    return true;

 }
 #endif
 
 }
 #endif
 


@@ -353,7 +354,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 +375,7 @@ void wxPostScriptDC::DestroyClippingRegion()
 
     if (m_clipping)
     {
 
     if (m_clipping)
     {

-        m_clipping = FALSE;
+        m_clipping = false;

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


@@ -391,13 +392,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))


@@ -613,7 +614,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 +627,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 +636,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 +656,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 +665,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 +696,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" );
 }
 


@@ -863,7 +864,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 */


@@ -1011,11 +1012,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


@@ -1103,7 +1108,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",
         char buffer[100];
         sprintf( buffer,
             "%.8f %.8f %.8f setrgbcolor\n",


@@ -1112,7 +1117,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 +1163,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;


@@ -1178,6 +1183,9 @@ void wxPostScriptDC::SetBrush( const wxBrush& brush )
 #include "wx/x11/private.h"
 #endif
 
 #include "wx/x11/private.h"
 #endif
 

+#include <ft2build.h>
+#include FT_FREETYPE_H
+

 #include "wx/fontutil.h"
 #include <pango/pangoft2.h>
 #include <freetype/ftglyph.h>
 #include "wx/fontutil.h"
 #include <pango/pangoft2.h>
 #include <freetype/ftglyph.h>


@@ -1278,6 +1286,25 @@ void draw_bezier_outline(wxPostScriptDC* caller,
 
 #endif
 
 
 #endif
 

+
+#if wxUSE_PANGO
+static void InitializePangoContext(PangoContext *context)
+{
+#ifdef __WXGTK__
+    pango_context_set_base_dir(context,
+                               gtk_widget_get_default_direction() == GTK_TEXT_DIR_LTR ?
+                    PANGO_DIRECTION_LTR : PANGO_DIRECTION_RTL);
+    pango_context_set_language(context, gtk_get_default_language());
+#else
+    // FIXME: assuming LTR is incorrect!
+    pango_context_set_base_dir(context, PANGO_DIRECTION_LTR);
+    wxString lang = wxGetLocale()->GetCanonicalName();
+    pango_context_set_language(context,
+                               pango_language_from_string(lang.ToAscii()));
+#endif
+}
+#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") );


@@ -1326,13 +1353,12 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
     int ps_dpi = 72;
     int pango_dpi = 600;
     PangoContext *context = pango_ft2_get_context ( pango_dpi, pango_dpi );
     int ps_dpi = 72;
     int pango_dpi = 600;
     PangoContext *context = pango_ft2_get_context ( pango_dpi, pango_dpi );

+    
+    InitializePangoContext(context);

 
     double scale = (double)pango_dpi / (double)ps_dpi;
     scale /= m_userScaleY;
 
 
     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);
     pango_context_set_font_description (context, m_font.GetNativeFontInfo()->description );
 
     PangoLayout *layout = pango_layout_new (context);


@@ -1416,7 +1442,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 +1465,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);


@@ -1523,7 +1549,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 +1558,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,16 +1581,16 @@ 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);
     if (m_font.GetUnderlined())
     {
         wxCoord uy = (wxCoord)(y + size - m_underlinePosition);


@@ -1588,7 +1614,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 );
 }


@@ -1673,8 +1699,8 @@ 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) );
 }
 


@@ -1773,11 +1799,11 @@ 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") );
-
-    if ( m_printData.GetPrintMode() == wxPRINT_MODE_FILE )
+    wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") );
+    
+    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);


@@ -1789,17 +1815,17 @@ bool wxPostScriptDC::StartDoc( const wxString& message )
         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" );


@@ -1854,7 +1880,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 +1889,7 @@ void wxPostScriptDC::EndDoc ()
 
     if (m_clipping)
     {
 
     if (m_clipping)
     {

-        m_clipping = FALSE;
+        m_clipping = false;

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


@@ -1938,17 +1964,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 +2002,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();
+
+    translate_x = (wxCoord)data->GetPrinterTranslateX();
+    translate_y = (wxCoord)data->GetPrinterTranslateY();

 
 

-    scale_x = m_printData.GetPrinterScaleX();
-    scale_y = m_printData.GetPrinterScaleY();
+    scale_x = data->GetPrinterScaleX();
+    scale_y = data->GetPrinterScaleY();

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


@@ -2012,9 +2044,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 +2058,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


@@ -2062,12 +2094,11 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
     int pango_dpi = 600;
     PangoContext *context = pango_ft2_get_context ( pango_dpi, pango_dpi );
 
     int pango_dpi = 600;
     PangoContext *context = pango_ft2_get_context ( pango_dpi, pango_dpi );
 

+    InitializePangoContext(context);
+

     double scale = pango_dpi / wx_dpi;
     scale /= m_userScaleY;
 
     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;
     PangoLayout *layout = pango_layout_new (context);
 
     PangoFontDescription *desc = fontToUse->GetNativeFontInfo()->description;


@@ -2079,17 +2110,18 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
     const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
 #endif
     pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
     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;
 
     PangoRectangle rect;

-    pango_layout_line_get_extents(line, NULL, &rect);
+    pango_layout_get_extents(layout, NULL, &rect);

 
 

-    if (x) (*x) = (wxCoord) ( rect.width / PANGO_SCALE / scale );
-    if (y) (*y) = (wxCoord) ( rect.height / PANGO_SCALE / scale );
+    if (x) (*x) = (wxCoord) ( PANGO_PIXELS(rect.width) / scale );
+    if (y) (*y) = (wxCoord) ( PANGO_PIXELS(rect.height) / scale );

     if (descent)
     {
     if (descent)
     {

-        // Do something about metrics here
-        (*descent) = 0;
+        PangoLayoutIter *iter = pango_layout_get_iter(layout);
+        int baseline = pango_layout_iter_get_baseline(iter);
+        pango_layout_iter_free(iter);
+        *descent = wxCoord(*y - PANGO_PIXELS(baseline) / scale);

     }
     if (externalLeading) (*externalLeading) = 0;  // ??
 
     }
     if (externalLeading) (*externalLeading) = 0;  // ??
 


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


@@ -2220,11 +2252,14 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
 
         FILE *afmFile = NULL;
 
 
         FILE *afmFile = NULL;
 

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

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

-        if (!m_printData.GetFontMetricPath().IsEmpty())
+        if (!data->GetFontMetricPath().IsEmpty())

         {
         {

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

             afmName << wxFILE_SEP_PATH << name;
             afmFile = wxFopen(afmName,wxT("r"));
         }
             afmName << wxFILE_SEP_PATH << name;
             afmFile = wxFopen(afmName,wxT("r"));
         }


@@ -2440,13 +2475,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,13 +2500,16 @@ 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") );
                 outputstream->PutC( ch );
             }
                 wxCHECK_RET( outputstream, wxT("invalid outputstream") );
                 outputstream->PutC( ch );
             }


@@ -2518,12 +2559,12 @@ bool wxPostScriptModule::OnInit()
 {
     wxInitializePrintSetupData();
 
 {
     wxInitializePrintSetupData();
 

-    return TRUE;
+    return true;

 }
 
 void wxPostScriptModule::OnExit()
 {
 }
 
 void wxPostScriptModule::OnExit()
 {

-    wxInitializePrintSetupData(FALSE);
+    wxInitializePrintSetupData(false);

 }
 #endif
   // WXWIN_COMPATIBILITY_2_2
 }
 #endif
   // WXWIN_COMPATIBILITY_2_2