Handle Shift-TAB correctly in wxOSX/Carbon wxComboBox.

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

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index d35e0ab584ec5200f5453b23bb38489e115bf1d6..a490757cb05f6601211c314843ff72b60992868c 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -32,7 +32,7 @@
 #include "wx/prntbase.h"
 #include "wx/generic/prntdlgg.h"
 #include "wx/paper.h"
 #include "wx/prntbase.h"
 #include "wx/generic/prntdlgg.h"
 #include "wx/paper.h"

-#include "wx/filefn.h"
+#include "wx/filename.h"

 #include "wx/stdpaths.h"
 
 #ifdef __WXMSW__
 #include "wx/stdpaths.h"
 
 #ifdef __WXMSW__


@@ -190,7 +190,7 @@ static const char *wxPostScriptHeaderColourImage = "\
   } ifelse          % end of 'false' case\n\
 ";
 
   } ifelse          % end of 'false' case\n\
 ";
 

-static char wxPostScriptHeaderReencodeISO1[] =
+static const char wxPostScriptHeaderReencodeISO1[] =

     "\n/reencodeISO {\n"
 "dup dup findfont dup length dict begin\n"
 "{ 1 index /FID ne { def }{ pop pop } ifelse } forall\n"
     "\n/reencodeISO {\n"
 "dup dup findfont dup length dict begin\n"
 "{ 1 index /FID ne { def }{ pop pop } ifelse } forall\n"


@@ -214,7 +214,7 @@ static char wxPostScriptHeaderReencodeISO1[] =
 "/.notdef/dotlessi/grave/acute/circumflex/tilde/macron/breve\n"
 "/dotaccent/dieresis/.notdef/ring/cedilla/.notdef/hungarumlaut\n";
 
 "/.notdef/dotlessi/grave/acute/circumflex/tilde/macron/breve\n"
 "/dotaccent/dieresis/.notdef/ring/cedilla/.notdef/hungarumlaut\n";
 

-static char wxPostScriptHeaderReencodeISO2[] =
+static const char wxPostScriptHeaderReencodeISO2[] =

 "/ogonek/caron/space/exclamdown/cent/sterling/currency/yen/brokenbar\n"
 "/section/dieresis/copyright/ordfeminine/guillemotleft/logicalnot\n"
 "/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior\n"
 "/ogonek/caron/space/exclamdown/cent/sterling/currency/yen/brokenbar\n"
 "/section/dieresis/copyright/ordfeminine/guillemotleft/logicalnot\n"
 "/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior\n"


@@ -313,7 +313,7 @@ wxPostScriptDCImpl::wxPostScriptDCImpl( wxPrinterDC *owner, const wxPrintData& d
 
 void wxPostScriptDCImpl::Init()
 {
 
 void wxPostScriptDCImpl::Init()
 {

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

 
     m_currentRed = 0;
     m_currentGreen = 0;
 
     m_currentRed = 0;
     m_currentGreen = 0;


@@ -333,7 +333,7 @@ wxPostScriptDCImpl::~wxPostScriptDCImpl ()
     if (m_pstream)
     {
         fclose( m_pstream );
     if (m_pstream)
     {
         fclose( m_pstream );

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

     }
 }
 
     }
 }
 


@@ -342,7 +342,7 @@ bool wxPostScriptDCImpl::IsOk() const
   return m_ok;
 }
 
   return m_ok;
 }
 

-wxRect wxPostScriptDCImpl::GetPaperRect()
+wxRect wxPostScriptDCImpl::GetPaperRect() const

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


@@ -350,7 +350,7 @@ wxRect wxPostScriptDCImpl::GetPaperRect()
     return wxRect(0,0,w,h);
 }
 
     return wxRect(0,0,w,h);
 }
 

-int wxPostScriptDCImpl::GetResolution()
+int wxPostScriptDCImpl::GetResolution() const

 {
     return DPI;
 }
 {
     return DPI;
 }


@@ -406,7 +406,7 @@ void wxPostScriptDCImpl::Clear()
     //    wxFAIL_MSG( wxT("wxPostScriptDCImpl::Clear not implemented.") );
 }
 
     //    wxFAIL_MSG( wxT("wxPostScriptDCImpl::Clear not implemented.") );
 }
 

-bool wxPostScriptDCImpl::DoFloodFill (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style))
+bool wxPostScriptDCImpl::DoFloodFill (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour &WXUNUSED(col), wxFloodFillStyle WXUNUSED(style))

 {
     wxFAIL_MSG( wxT("wxPostScriptDCImpl::FloodFill not implemented.") );
     return false;
 {
     wxFAIL_MSG( wxT("wxPostScriptDCImpl::FloodFill not implemented.") );
     return false;


@@ -427,7 +427,8 @@ void wxPostScriptDCImpl::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 

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

 
     SetPen( m_pen );
 
 
     SetPen( m_pen );
 


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

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

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


@@ -501,20 +502,17 @@ void wxPostScriptDCImpl::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord
         CalcBoundingBox( xc+i_radius, yc+i_radius );
     }
 
         CalcBoundingBox( xc+i_radius, yc+i_radius );
     }
 

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

     {
         SetPen( m_pen );
 
         wxString buffer;
         buffer.Printf( "newpath\n"
                        "%f %f %f %f %f %f ellipse\n"
     {
         SetPen( m_pen );
 
         wxString buffer;
         buffer.Printf( "newpath\n"
                        "%f %f %f %f %f %f ellipse\n"

-                       "%f %f lineto\n"
-                       "closepath\n"

                        "stroke\n",
                 XLOG2DEV(xc), YLOG2DEV(yc),
                 XLOG2DEVREL(i_radius), YLOG2DEVREL(i_radius),
                        "stroke\n",
                 XLOG2DEV(xc), YLOG2DEV(yc),
                 XLOG2DEVREL(i_radius), YLOG2DEVREL(i_radius),

-                alpha1, alpha2,
-                XLOG2DEV(xc), YLOG2DEV(yc) );
+                alpha1, alpha2 );

         buffer.Replace( ",", "." );
         PsPrint( buffer );
 
         buffer.Replace( ",", "." );
         PsPrint( buffer );
 


@@ -542,7 +540,7 @@ void wxPostScriptDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord
         return;
     }
 
         return;
     }
 

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

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


@@ -559,7 +557,7 @@ void wxPostScriptDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord
         CalcBoundingBox( x+w, y+h );
     }
 
         CalcBoundingBox( x+w, y+h );
     }
 

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

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


@@ -581,7 +579,8 @@ void wxPostScriptDCImpl::DoDrawPoint (wxCoord x, wxCoord y)
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 

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

 
     SetPen (m_pen);
 
 
     SetPen (m_pen);
 


@@ -598,13 +597,13 @@ void wxPostScriptDCImpl::DoDrawPoint (wxCoord x, wxCoord y)
     CalcBoundingBox( x, y );
 }
 
     CalcBoundingBox( x, y );
 }
 

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

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

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

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


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

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

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


@@ -668,13 +667,13 @@ void wxPostScriptDCImpl::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset
     }
 }
 
     }
 }
 

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

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

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

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


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

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

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


@@ -748,7 +747,8 @@ void wxPostScriptDCImpl::DoDrawLines (int n, wxPoint points[], wxCoord xoffset,
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 

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

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


@@ -785,7 +785,7 @@ void wxPostScriptDCImpl::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, w
     width--;
     height--;
 
     width--;
     height--;
 

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

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


@@ -808,7 +808,7 @@ void wxPostScriptDCImpl::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, w
         CalcBoundingBox( x + width, y + height );
     }
 
         CalcBoundingBox( x + width, y + height );
     }
 

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

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


@@ -849,7 +849,7 @@ void wxPostScriptDCImpl::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord w
 
     wxCoord rad = (wxCoord) radius;
 
 
     wxCoord rad = (wxCoord) radius;
 

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

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


@@ -881,7 +881,7 @@ void wxPostScriptDCImpl::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord w
         CalcBoundingBox( x + width, y + height );
     }
 
         CalcBoundingBox( x + width, y + height );
     }
 

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

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


@@ -921,7 +921,7 @@ void wxPostScriptDCImpl::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxC
     width--;
     height--;
 
     width--;
     height--;
 

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

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


@@ -938,7 +938,7 @@ void wxPostScriptDCImpl::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxC
         CalcBoundingBox( x + width, y + height );
     }
 
         CalcBoundingBox( x + width, y + height );
     }
 

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

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


@@ -962,17 +962,17 @@ void wxPostScriptDCImpl::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
 }
 
 /* this has to be char, not wxChar */
 }
 
 /* this has to be char, not wxChar */

-static char hexArray[] = "0123456789ABCDEF";
+static const char hexArray[] = "0123456789ABCDEF";

 
 void wxPostScriptDCImpl::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool WXUNUSED(useMask) )
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
 
 void wxPostScriptDCImpl::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool WXUNUSED(useMask) )
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 

-    if (!bitmap.Ok()) return;
+    if (!bitmap.IsOk()) return;

 
     wxImage image = bitmap.ConvertToImage();
 
 
     wxImage image = bitmap.ConvertToImage();
 

-    if (!image.Ok()) return;
+    if (!image.IsOk()) return;

 
     wxCoord w = image.GetWidth();
     wxCoord h = image.GetHeight();
 
     wxCoord w = image.GetWidth();
     wxCoord h = image.GetHeight();


@@ -1038,7 +1038,7 @@ void wxPostScriptDCImpl::SetFont( const wxFont& font )
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 

-    if (!font.Ok())  return;
+    if (!font.IsOk())  return;

 
     m_font = font;
 
 
     m_font = font;
 


@@ -1121,9 +1121,10 @@ void wxPostScriptDCImpl::SetFont( const wxFont& font )
     PsPrint( " findfont\n" );
 
 
     PsPrint( " findfont\n" );
 
 

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

     wxString buffer;
     wxString buffer;

-    buffer.Printf( "%f scalefont setfont\n", size * DEV2PS * m_scaleX );
+    buffer.Printf( "%f scalefont setfont\n", size * m_scaleX );

     buffer.Replace( ",", "." );
     PsPrint( buffer );
 }
     buffer.Replace( ",", "." );
     PsPrint( buffer );
 }


@@ -1132,9 +1133,9 @@ void wxPostScriptDCImpl::SetPen( const wxPen& pen )
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 

-    if (!pen.Ok()) return;
+    if (!pen.IsOk()) return;

 
 

-    int oldStyle = m_pen.GetStyle();
+    int oldStyle = m_pen.IsOk() ? m_pen.GetStyle() : wxPENSTYLE_INVALID;

 
     m_pen = pen;
 
 
     m_pen = pen;
 


@@ -1225,7 +1226,6 @@ void wxPostScriptDCImpl::SetPen( const wxPen& pen )
         double bluePS = (double)(blue) / 255.0;
         double greenPS = (double)(green) / 255.0;
 
         double bluePS = (double)(blue) / 255.0;
         double greenPS = (double)(green) / 255.0;
 

-        wxString buffer;

         buffer.Printf( "%f %f %f setrgbcolor\n", redPS, greenPS, bluePS );
         buffer.Replace( ",", "." );
         PsPrint( buffer );
         buffer.Printf( "%f %f %f setrgbcolor\n", redPS, greenPS, bluePS );
         buffer.Replace( ",", "." );
         PsPrint( buffer );


@@ -1240,7 +1240,7 @@ void wxPostScriptDCImpl::SetBrush( const wxBrush& brush )
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 

-    if (!brush.Ok()) return;
+    if (!brush.IsOk()) return;

 
     m_brush = brush;
 
 
     m_brush = brush;
 


@@ -1288,7 +1288,7 @@ void wxPostScriptDCImpl::DoDrawText( const wxString& text, wxCoord x, wxCoord y
     if ( !textbuf )
         return;
 
     if ( !textbuf )
         return;
 

-    if (m_textForegroundColour.Ok())
+    if (m_textForegroundColour.IsOk())

     {
         unsigned char red = m_textForegroundColour.Red();
         unsigned char blue = m_textForegroundColour.Blue();
     {
         unsigned char red = m_textForegroundColour.Red();
         unsigned char blue = m_textForegroundColour.Blue();


@@ -1398,7 +1398,7 @@ void wxPostScriptDCImpl::DoDrawRotatedText( const wxString& text, wxCoord x, wxC
 
     SetFont( m_font );
 
 
     SetFont( m_font );
 

-    if (m_textForegroundColour.Ok())
+    if (m_textForegroundColour.IsOk())

     {
         unsigned char red = m_textForegroundColour.Red();
         unsigned char blue = m_textForegroundColour.Blue();
     {
         unsigned char red = m_textForegroundColour.Red();
         unsigned char blue = m_textForegroundColour.Blue();


@@ -1507,7 +1507,7 @@ void wxPostScriptDCImpl::SetBackground (const wxBrush& brush)
     m_backgroundBrush = brush;
 }
 
     m_backgroundBrush = brush;
 }
 

-void wxPostScriptDCImpl::SetLogicalFunction (int WXUNUSED(function))
+void wxPostScriptDCImpl::SetLogicalFunction(wxRasterOperationMode WXUNUSED(function))

 {
     wxFAIL_MSG( wxT("wxPostScriptDCImpl::SetLogicalFunction not implemented.") );
 }
 {
     wxFAIL_MSG( wxT("wxPostScriptDCImpl::SetLogicalFunction not implemented.") );
 }


@@ -1700,7 +1700,7 @@ wxSize wxPostScriptDCImpl::GetPPI(void) const
 }
 
 
 }
 
 

-bool wxPostScriptDCImpl::StartDoc( const wxString& message )
+bool wxPostScriptDCImpl::StartDoc( const wxString& WXUNUSED(message) )

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


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

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

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


@@ -1723,14 +1723,11 @@ bool wxPostScriptDCImpl::StartDoc( const wxString& message )
     }
 
     m_ok = true;
     }
 
     m_ok = true;

-    m_title = message;

 
     wxString buffer;
 
     PsPrint( "%!PS-Adobe-2.0\n" );
 
 
     wxString buffer;
 
     PsPrint( "%!PS-Adobe-2.0\n" );
 

-    buffer.Printf( "%%%%Title: %s\n", m_title );
-    PsPrint( buffer );

     PsPrint( "%%Creator: wxWidgets PostScript renderer\n" );
 
     buffer.Printf( "%%%%CreationDate: %s\n", wxNow() );
     PsPrint( "%%Creator: wxWidgets PostScript renderer\n" );
 
     buffer.Printf( "%%%%CreationDate: %s\n", wxNow() );


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

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

     }
 
 #if 0
     }
 
 #if 0


@@ -1938,7 +1935,8 @@ bool wxPostScriptDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
                            wxCoord fwidth, wxCoord fheight,
                            wxDC *source,
                            wxCoord xsrc, wxCoord ysrc,
                            wxCoord fwidth, wxCoord fheight,
                            wxDC *source,
                            wxCoord xsrc, wxCoord ysrc,

-                           int rop, bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) )
+                           wxRasterOperationMode rop,
+                           bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) )

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


@@ -1959,7 +1957,7 @@ bool wxPostScriptDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
 
 wxCoord wxPostScriptDCImpl::GetCharHeight() const
 {
 
 wxCoord wxPostScriptDCImpl::GetCharHeight() const
 {

-    if (m_font.Ok())
+    if (m_font.IsOk())

         return m_font.GetPointSize();
     else
         return 12;
         return m_font.GetPointSize();
     else
         return 12;


@@ -2001,7 +1999,8 @@ void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string,
 
     if (!fontToUse) fontToUse = &m_font;
 
 
     if (!fontToUse) fontToUse = &m_font;
 

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

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


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

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

     if ( x )
     if ( x )

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

     if ( y )
     if ( y )

-        *y = (wxCoord) (height * 1.32);    /* allow for descender */
+        *y = (wxCoord) (fontSize * 1.32);    /* allow for descender */

     if (descent) *descent = 0;
     if (externalLeading) *externalLeading = 0;
 #else
     if (descent) *descent = 0;
     if (externalLeading) *externalLeading = 0;
 #else


@@ -2061,7 +2055,7 @@ void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string,
     /  example:
     /
     /    wxPostScriptDC dc(NULL, true);
     /  example:
     /
     /    wxPostScriptDC dc(NULL, true);

-    /    if (dc.Ok()){
+    /    if (dc.IsOk()){

     /      wxSetAFMPath("d:\\wxw161\\afm\\");
     /      dc.StartDoc("Test");
     /      dc.StartPage();
     /      wxSetAFMPath("d:\\wxw161\\afm\\");
     /      dc.StartDoc("Test");
     /      dc.StartPage();


@@ -2300,9 +2294,9 @@ void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string,
         // VS: dirty, but is there any better solution?
         double *pt;
         pt = (double*) &m_underlinePosition;
         // VS: dirty, but is there any better solution?
         double *pt;
         pt = (double*) &m_underlinePosition;

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

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

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

 
     }
 
 
     }
 


@@ -2312,7 +2306,7 @@ void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string,
        /  string. they are given in 1/1000 of the size! */
 
     long sum=0;
        /  string. they are given in 1/1000 of the size! */
 
     long sum=0;

-    wxCoord height=Size; /* by default */
+    float height=fontSize; /* by default */

     unsigned char *p;
     for(p=(unsigned char *)wxMBSTRINGCAST strbuf; *p; p++)
     {
     unsigned char *p;
     for(p=(unsigned char *)wxMBSTRINGCAST strbuf; *p; p++)
     {


@@ -2328,7 +2322,7 @@ void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string,
     }
 
     double widthSum = sum;
     }
 
     double widthSum = sum;

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

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


@@ -2343,14 +2337,14 @@ void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string,
     if ( x )
         *x = (wxCoord)widthSum;
     if ( y )
     if ( x )
         *x = (wxCoord)widthSum;
     if ( y )

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

 
     /* return other parameters */
     if (descent)
     {
         if(lastDescender!=INT_MIN)
         {
 
     /* return other parameters */
     if (descent)
     {
         if(lastDescender!=INT_MIN)
         {

-            *descent = (wxCoord)(((-lastDescender)/1000.0F) * Size); /* MATTHEW: forgot scale */
+            *descent = (wxCoord)(((-lastDescender)/1000.0F) * fontSize); /* MATTHEW: forgot scale */

         }
         else
         {
         }
         else
         {