X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7bcb11d30764df47144189e164f53d8171ed4a63..57c0af52bffc66b12b7e7b49b3a2dfdcf2d2e352:/src/generic/dcpsg.cpp diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp index 725f9565be..880a6a10aa 100644 --- a/src/generic/dcpsg.cpp +++ b/src/generic/dcpsg.cpp @@ -25,6 +25,8 @@ #include "wx/defs.h" #endif // WX_PRECOMP +#if wxUSE_PRINTING_ARCHITECTURE + #if wxUSE_POSTSCRIPT #include "wx/dcmemory.h" @@ -315,6 +317,8 @@ wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData) m_signY = -1; // default y-axis bottom up -> top down m_printData = printData; + + m_ok = TRUE; } wxPostScriptDC::~wxPostScriptDC () @@ -347,21 +351,21 @@ bool wxPostScriptDC::PrinterDialog(wxWindow *parent) // For PS_PRINTER action this depends on a Unix-style print spooler // since the wx_printer_file can be destroyed during a session // @@@ TODO: a Windows-style answer for non-Unix - char userId[256]; + wxChar userId[256]; wxGetUserId (userId, sizeof (userId) / sizeof (char)); - char tmp[256]; - strcpy (tmp, "/tmp/preview_"); - strcat (tmp, userId); + wxChar tmp[256]; + wxStrcpy (tmp, _T("/tmp/preview_")); + wxStrcat (tmp, userId); m_printData.SetFilename(tmp); #endif - char tmp2[256]; - strcpy(tmp2, m_printData.GetFilename()); - strcat (tmp2, ".ps"); + wxChar tmp2[256]; + wxStrcpy(tmp2, m_printData.GetFilename()); + wxStrcat (tmp2, _T(".ps")); m_printData.SetFilename(tmp2); } - else if ((m_printData.GetFilename() == "") && (m_printData.GetPrintMode() == wxPRINT_MODE_FILE)) + else if ((m_printData.GetFilename() == _T("")) && (m_printData.GetPrintMode() == wxPRINT_MODE_FILE)) { - wxString file = wxSaveFileSelector (_("PostScript"), "ps"); + wxString file = wxSaveFileSelector (_("PostScript"), _T("ps")); if ( file.IsEmpty() ) { m_ok = FALSE; @@ -377,7 +381,7 @@ bool wxPostScriptDC::PrinterDialog(wxWindow *parent) void wxPostScriptDC::SetClippingRegion (long x, long y, long w, long h) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (m_clipping) return; @@ -399,7 +403,7 @@ void wxPostScriptDC::SetClippingRegion( const wxRegion &WXUNUSED(region) ) void wxPostScriptDC::DestroyClippingRegion() { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); wxDC::DestroyClippingRegion(); @@ -412,28 +416,28 @@ void wxPostScriptDC::DestroyClippingRegion() void wxPostScriptDC::Clear() { - wxFAIL_MSG( "wxPostScriptDC::Clear not implemented." ); + wxFAIL_MSG( _T("wxPostScriptDC::Clear not implemented.") ); } -void wxPostScriptDC::FloodFill (long WXUNUSED(x), long WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style)) +void wxPostScriptDC::DoFloodFill (long WXUNUSED(x), long WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style)) { - wxFAIL_MSG( "wxPostScriptDC::FloodFill not implemented." ); + wxFAIL_MSG( _T("wxPostScriptDC::FloodFill not implemented.") ); } -bool wxPostScriptDC::GetPixel (long WXUNUSED(x), long WXUNUSED(y), wxColour * WXUNUSED(col)) const +bool wxPostScriptDC::DoGetPixel (long WXUNUSED(x), long WXUNUSED(y), wxColour * WXUNUSED(col)) const { - wxFAIL_MSG( "wxPostScriptDC::GetPixel not implemented." ); + wxFAIL_MSG( _T("wxPostScriptDC::GetPixel not implemented.") ); return FALSE; } -void wxPostScriptDC::CrossHair (long WXUNUSED(x), long WXUNUSED(y)) +void wxPostScriptDC::DoCrossHair (long WXUNUSED(x), long WXUNUSED(y)) { - wxFAIL_MSG( "wxPostScriptDC::CrossHair not implemented." ); + wxFAIL_MSG( _T("wxPostScriptDC::CrossHair not implemented.") ); } -void wxPostScriptDC::DrawLine (long x1, long y1, long x2, long y2) +void wxPostScriptDC::DoDrawLine (long x1, long y1, long x2, long y2) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (m_pen.GetStyle() == wxTRANSPARENT) return; @@ -450,9 +454,9 @@ void wxPostScriptDC::DrawLine (long x1, long y1, long x2, long y2) #define RAD2DEG 57.29577951308 -void wxPostScriptDC::DrawArc (long x1, long y1, long x2, long y2, long xc, long yc) +void wxPostScriptDC::DoDrawArc (long x1, long y1, long x2, long y2, long xc, long yc) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); long dx = x1 - xc; long dy = y1 - yc; @@ -513,9 +517,9 @@ void wxPostScriptDC::DrawArc (long x1, long y1, long x2, long y2, long xc, long CalcBoundingBox( xc+radius, yc+radius ); } -void wxPostScriptDC::DrawEllipticArc(long x,long y,long w,long h,double sa,double ea) +void wxPostScriptDC::DoDrawEllipticArc(long x,long y,long w,long h,double sa,double ea) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("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; @@ -555,9 +559,9 @@ void wxPostScriptDC::DrawEllipticArc(long x,long y,long w,long h,double sa,doubl } } -void wxPostScriptDC::DrawPoint (long x, long y) +void wxPostScriptDC::DoDrawPoint (long x, long y) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (m_pen.GetStyle() == wxTRANSPARENT) return; @@ -571,9 +575,9 @@ void wxPostScriptDC::DrawPoint (long x, long y) CalcBoundingBox( x, y ); } -void wxPostScriptDC::DrawPolygon (int n, wxPoint points[], long xoffset, long yoffset, int WXUNUSED(fillStyle)) +void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], long xoffset, long yoffset, int WXUNUSED(fillStyle)) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (n <= 0) return; @@ -621,9 +625,9 @@ void wxPostScriptDC::DrawPolygon (int n, wxPoint points[], long xoffset, long yo } } -void wxPostScriptDC::DrawLines (int n, wxPoint points[], long xoffset, long yoffset) +void wxPostScriptDC::DoDrawLines (int n, wxPoint points[], long xoffset, long yoffset) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (m_pen.GetStyle() == wxTRANSPARENT) return; @@ -651,9 +655,9 @@ void wxPostScriptDC::DrawLines (int n, wxPoint points[], long xoffset, long yoff *m_pstream << "stroke\n"; } -void wxPostScriptDC::DrawRectangle (long x, long y, long width, long height) +void wxPostScriptDC::DoDrawRectangle (long x, long y, long width, long height) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (m_brush.GetStyle () != wxTRANSPARENT) { @@ -688,9 +692,9 @@ void wxPostScriptDC::DrawRectangle (long x, long y, long width, long height) } } -void wxPostScriptDC::DrawRoundedRectangle (long x, long y, long width, long height, double radius) +void wxPostScriptDC::DoDrawRoundedRectangle (long x, long y, long width, long height, double radius) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (radius < 0.0) { @@ -749,9 +753,9 @@ void wxPostScriptDC::DrawRoundedRectangle (long x, long y, long width, long heig } } -void wxPostScriptDC::DrawEllipse (long x, long y, long width, long height) +void wxPostScriptDC::DoDrawEllipse (long x, long y, long width, long height) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (m_brush.GetStyle () != wxTRANSPARENT) { @@ -780,14 +784,14 @@ void wxPostScriptDC::DrawEllipse (long x, long y, long width, long height) } } -void wxPostScriptDC::DrawIcon( const wxIcon& icon, long x, long y ) +void wxPostScriptDC::DoDrawIcon( const wxIcon& icon, long x, long y ) { DrawBitmap( icon, x, y, TRUE ); } -void wxPostScriptDC::DrawBitmap( const wxBitmap& bitmap, long x, long y, bool WXUNUSED(useMask) ) +void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, long x, long y, bool WXUNUSED(useMask) ) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (!bitmap.Ok()) return; @@ -822,7 +826,7 @@ void wxPostScriptDC::DrawBitmap( const wxBitmap& bitmap, long x, long y, bool WX { for (int i = 0; i < ww; i++) { - char buffer[5]; + wxChar buffer[5]; buffer[2] = 0; wxDecToHex( image.GetRed(i,j), buffer ); *m_pstream << buffer; @@ -841,7 +845,7 @@ void wxPostScriptDC::DrawBitmap( const wxBitmap& bitmap, long x, long y, bool WX void wxPostScriptDC::SetFont( const wxFont& font ) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (!font.Ok()) return; @@ -930,7 +934,7 @@ void wxPostScriptDC::SetFont( const wxFont& font ) void wxPostScriptDC::SetPen( const wxPen& pen ) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (!pen.Ok()) return; @@ -995,10 +999,9 @@ void wxPostScriptDC::SetPen( const wxPen& pen ) if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue)) { - long redPS = (long) (((int) red) / 255.0); - long bluePS = (long) (((int) blue) / 255.0); - long greenPS = (long) (((int) green) / 255.0); - + float redPS = (float)(red) / 255.0; + float bluePS = (float)(blue) / 255.0; + float greenPS = (float)(green) / 255.0; *m_pstream << redPS << " " << greenPS << " " << bluePS << " setrgbcolor\n"; m_currentRed = red; @@ -1009,16 +1012,16 @@ void wxPostScriptDC::SetPen( const wxPen& pen ) void wxPostScriptDC::SetBrush( const wxBrush& brush ) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (!brush.Ok()) return; m_brush = brush; // Brush colour - unsigned char red = m_brush.GetColour ().Red (); - unsigned char blue = m_brush.GetColour ().Blue (); - unsigned char green = m_brush.GetColour ().Green (); + unsigned char red = m_brush.GetColour().Red(); + unsigned char blue = m_brush.GetColour().Blue(); + unsigned char green = m_brush.GetColour().Green(); if (!m_colour) { @@ -1036,9 +1039,9 @@ void wxPostScriptDC::SetBrush( const wxBrush& brush ) if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue)) { - long redPS = (long) (((int) red) / 255.0); - long bluePS = (long) (((int) blue) / 255.0); - long greenPS = (long) (((int) green) / 255.0); + float redPS = (float)(red) / 255.0; + float bluePS = (float)(blue) / 255.0; + float greenPS = (float)(green) / 255.0; *m_pstream << redPS << " " << greenPS << " " << bluePS << " setrgbcolor\n"; m_currentRed = red; m_currentBlue = blue; @@ -1046,9 +1049,9 @@ void wxPostScriptDC::SetBrush( const wxBrush& brush ) } } -void wxPostScriptDC::DrawText( const wxString& text, long x, long y, bool WXUNUSED(use16bit) ) +void wxPostScriptDC::DoDrawText( const wxString& text, long x, long y ) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); SetFont( m_font ); @@ -1074,9 +1077,9 @@ void wxPostScriptDC::DrawText( const wxString& text, long x, long y, bool WXUNUS if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue)) { - long redPS = (long) (((int) red) / 255.0); - long bluePS = (long) (((int) blue) / 255.0); - long greenPS = (long) (((int) green) / 255.0); + float redPS = (float)(red) / 255.0; + float bluePS = (float)(blue) / 255.0; + float greenPS = (float)(green) / 255.0; *m_pstream << redPS << " " << greenPS << " " << bluePS << " setrgbcolor\n"; m_currentRed = red; @@ -1091,11 +1094,12 @@ void wxPostScriptDC::DrawText( const wxString& text, long x, long y, bool WXUNUS *m_pstream << XLOG2DEV(x) << " " << YLOG2DEV(by) << " moveto\n"; *m_pstream << "("; - int len = strlen ((char *)(const char *)text); + const wxWX2MBbuf textbuf = text.mb_str(); + int len = strlen (textbuf); int i; for (i = 0; i < len; i++) { - int c = (unsigned char) text[i]; + int c = (unsigned char) textbuf[i]; if ( c == ')' || c == '(' || c == '\\') { *m_pstream << "\\" << (char) c; @@ -1138,12 +1142,12 @@ void wxPostScriptDC::SetBackground (const wxBrush& brush) void wxPostScriptDC::SetLogicalFunction (int WXUNUSED(function)) { - wxFAIL_MSG( "wxPostScriptDC::SetLogicalFunction not implemented." ); + wxFAIL_MSG( _T("wxPostScriptDC::SetLogicalFunction not implemented.") ); } -void wxPostScriptDC::DrawSpline( wxList *points ) +void wxPostScriptDC::DoDrawSpline( wxList *points ) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); SetPen( m_pen ); @@ -1197,7 +1201,7 @@ void wxPostScriptDC::DrawSpline( wxList *points ) *m_pstream << XLOG2DEV((long)c) << " " << YLOG2DEV((long)d) << " lineto stroke\n"; } -long wxPostScriptDC::GetCharWidth () +long wxPostScriptDC::GetCharWidth() const { // Chris Breeze: reasonable approximation using wxMODERN/Courier return (long) (GetCharHeight() * 72.0 / 120.0); @@ -1206,7 +1210,7 @@ long wxPostScriptDC::GetCharWidth () void wxPostScriptDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); m_signX = (xLeftRight ? 1 : -1); m_signY = (yBottomUp ? 1 : -1); @@ -1219,7 +1223,7 @@ void wxPostScriptDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) void wxPostScriptDC::SetDeviceOrigin( long x, long y ) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); int h = 0; int w = 0; @@ -1228,7 +1232,7 @@ void wxPostScriptDC::SetDeviceOrigin( long x, long y ) wxDC::SetDeviceOrigin( x, h-y ); } -void wxPostScriptDC::GetSize(int* width, int* height) const +void wxPostScriptDC::DoGetSize(int* width, int* height) const { wxPaperSize id = m_printData.GetPaperId(); @@ -1248,7 +1252,7 @@ void wxPostScriptDC::GetSize(int* width, int* height) const } } -void wxPostScriptDC::GetSizeMM(int *width, int *height) const +void wxPostScriptDC::DoGetSizeMM(int *width, int *height) const { wxPaperSize id = m_printData.GetPaperId(); @@ -1277,7 +1281,7 @@ wxSize wxPostScriptDC::GetPPI(void) const bool wxPostScriptDC::StartDoc (const wxString& message) { - wxCHECK_MSG( m_ok, FALSE, "invalid postscript dc" ); + wxCHECK_MSG( m_ok, FALSE, _T("invalid postscript dc") ); if (m_printData.GetFilename() == "") { @@ -1287,7 +1291,7 @@ bool wxPostScriptDC::StartDoc (const wxString& message) m_ok = TRUE; } - m_pstream = new ofstream (m_printData.GetFilename()); + m_pstream = new ofstream (m_printData.GetFilename().fn_str()); if (!m_pstream || !m_pstream->good()) { @@ -1314,7 +1318,7 @@ bool wxPostScriptDC::StartDoc (const wxString& message) void wxPostScriptDC::EndDoc () { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (m_clipping) { @@ -1328,27 +1332,27 @@ void wxPostScriptDC::EndDoc () m_pstream = (ofstream *) NULL; } - char *header_file = wxGetTempFileName("ps"); + wxChar *header_file = wxGetTempFileName("ps"); - m_pstream = new ofstream( header_file ); + m_pstream = new ofstream( wxConvCurrent->cWX2MB(header_file) ); *m_pstream << "%!PS-Adobe-2.0\n"; /* PostScript magic strings */ - *m_pstream << "%%Title: " << (const char *) m_title << "\n"; + *m_pstream << "%%Title: " << m_title.mb_str() << "\n"; *m_pstream << "%%Creator: " << wxTheApp->argv[0] << "\n"; - *m_pstream << "%%CreationDate: " << wxNow() << "\n"; + *m_pstream << "%%CreationDate: " << wxNow().mb_str() << "\n"; - char userID[256]; + wxChar userID[256]; if ( wxGetEmailAddress(userID, sizeof(userID)) ) { - *m_pstream << "%%For: " << (char *)userID; - char userName[245]; + *m_pstream << "%%For: " << MBSTRINGCAST wxConvCurrent->cWX2MB(userID); + wxChar userName[245]; if (wxGetUserName(userName, sizeof(userName))) - *m_pstream << " (" << (char *)userName << ")"; + *m_pstream << " (" << MBSTRINGCAST wxConvCurrent->cWX2MB(userName) << ")"; *m_pstream << "\n"; } else if ( wxGetUserName(userID, sizeof(userID)) ) { - *m_pstream << "%%For: " << (char *)userID << "\n"; + *m_pstream << "%%For: " << MBSTRINGCAST wxConvCurrent->cWX2MB(userID) << "\n"; } // THE FOLLOWING HAS BEEN CONTRIBUTED BY Andy Fyfe @@ -1425,7 +1429,7 @@ void wxPostScriptDC::EndDoc () delete m_pstream; m_pstream = (ofstream *) NULL; - char *tmp_file = wxGetTempFileName("ps"); + wxChar *tmp_file = wxGetTempFileName("ps"); // Paste header Before wx_printer_file wxConcatFiles (header_file, m_printData.GetFilename(), tmp_file); @@ -1445,10 +1449,10 @@ void wxPostScriptDC::EndDoc () case wxPRINT_MODE_PREVIEW: { - char *argv[3]; - argv[0] = (char*) (const char*) previewCommand; - argv[1] = (char*) (const char*) filename; - argv[2] = (char*) (char *) NULL; + wxChar *argv[3]; + argv[0] = WXSTRINGCAST previewCommand; + argv[1] = WXSTRINGCAST filename; + argv[2] = (wxChar*) NULL; wxExecute (argv, TRUE); wxRemoveFile(m_printData.GetFilename()); } @@ -1456,18 +1460,18 @@ void wxPostScriptDC::EndDoc () case wxPRINT_MODE_PRINTER: { - char *argv[4]; + wxChar *argv[4]; int argc = 0; - argv[argc++] = (char*) (const char*) printerCommand; + argv[argc++] = WXSTRINGCAST printerCommand; // !SM! If we simply assign to argv[1] here, if printer options // are blank, we get an annoying and confusing message from lpr. - char * opts = (char*) (const char*) printerOptions; + wxChar * opts = WXSTRINGCAST printerOptions; if (opts && *opts) argv[argc++] = opts; - argv[argc++] = (char*) (const char*) filename; - argv[argc++] = (char *) NULL; + argv[argc++] = WXSTRINGCAST filename; + argv[argc++] = (wxChar *) NULL; wxExecute (argv, TRUE); wxRemoveFile(filename); } @@ -1483,7 +1487,7 @@ void wxPostScriptDC::EndDoc () void wxPostScriptDC::StartPage () { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); *m_pstream << "%%Page: " << (wxPageNumber++) << "\n"; @@ -1522,20 +1526,20 @@ void wxPostScriptDC::StartPage () void wxPostScriptDC::EndPage () { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); *m_pstream << "showpage\n"; } -bool wxPostScriptDC::Blit( long xdest, long ydest, +bool wxPostScriptDC::DoBlit( long xdest, long ydest, long fwidth, long fheight, wxDC *source, long xsrc, long ysrc, int rop, bool WXUNUSED(useMask) ) { - wxCHECK_MSG( m_ok && m_pstream, FALSE, "invalid postscript dc" ); + wxCHECK_MSG( m_ok && m_pstream, FALSE, _T("invalid postscript dc") ); - wxCHECK_MSG( source, FALSE, "invalid source dc" ); + wxCHECK_MSG( source, FALSE, _T("invalid source dc") ); /* blit into a bitmap */ @@ -1552,7 +1556,7 @@ bool wxPostScriptDC::Blit( long xdest, long ydest, return TRUE; } -long wxPostScriptDC::GetCharHeight() +long wxPostScriptDC::GetCharHeight() const { if (m_font.Ok()) return m_font.GetPointSize(); @@ -1561,16 +1565,17 @@ long wxPostScriptDC::GetCharHeight() } void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, - long *descent, long *externalLeading, wxFont *theFont, - bool WXUNUSED(use16) ) + long *descent, long *externalLeading, wxFont *theFont ) const { wxFont *fontToUse = theFont; if (!fontToUse) fontToUse = (wxFont*) &m_font; - wxCHECK_RET( fontToUse, "GetTextExtent: no font defined" ); - wxCHECK_RET( x, "GetTextExtent: x == NULL" ); - wxCHECK_RET( y, "GetTextExtent: y == NULL" ); + wxCHECK_RET( fontToUse, _T("GetTextExtent: no font defined") ); + wxCHECK_RET( x, _T("GetTextExtent: x == NULL") ); + wxCHECK_RET( y, _T("GetTextExtent: y == NULL") ); + + const wxWX2MBbuf strbuf = string.mb_str(); #if !USE_AFM_FOR_POSTSCRIPT /* Provide a VERY rough estimate (avoid using it). @@ -1582,7 +1587,7 @@ void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, { height = fontToUse->GetPointSize(); } - *x = strlen (string) * height * 72 / 120; + *x = strlen (strbuf) * height * 72 / 120; *y = (long) (height * 1.32); /* allow for descender */ if (descent) *descent = 0; if (externalLeading) *externalLeading = 0; @@ -1682,8 +1687,11 @@ void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, /* get the directory of the AFM files */ char afmName[256]; afmName[0] = 0; - wxString fmPath(m_printData.GetFontMetricPath()); - if (fmPath != "") strcpy( afmName, (const char*) fmPath ); + + if (!m_printData.GetFontMetricPath().IsEmpty()) + { + strcpy( afmName, m_printData.GetFontMetricPath().mb_str() ) + } /* 2. open and process the file / a short explanation of the AFM format: @@ -1704,7 +1712,26 @@ void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, strcat(afmName,name); strcat(afmName,".afm"); FILE *afmFile = fopen(afmName,"r"); - if ( afmFile==NULL ) + +#ifdef __UNIX__ + if (afmFile==NULL) + { + strcpy( afmName, "/usr/local/share/wx/gs_afm/" ); + strcat(afmName,name); + strcat(afmName,".afm"); + FILE *afmFile = fopen(afmName,"r"); + } + + if (afmFile==NULL) + { + strcpy( afmName, "/usr/share/wx/gs_afm/" ); + strcat(afmName,name); + strcat(afmName,".afm"); + FILE *afmFile = fopen(afmName,"r"); + } +#endif + + if (afmFile==NULL) { wxLogDebug( "GetTextExtent: can't open AFM file '%s'\n", afmName ); wxLogDebug( " using approximate values\n"); @@ -1814,7 +1841,7 @@ void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, long widthSum=0; long height=Size; /* by default */ unsigned char *p; - for(p=(unsigned char *)(const char *)string; *p; p++) + for(p=(unsigned char *)strbuf; *p; p++) { if(lastWidths[*p]== INT_MIN) { @@ -1935,7 +1962,7 @@ wxPostScriptPrintDialog::wxPostScriptPrintDialog (wxWindow *parent, const wxStri radio0->SetSelection((int)wxThePrintSetupData->GetPrinterOrientation() - 1); // @@@ Configuration hook - if (wxThePrintSetupData->GetPrintPreviewCommand() == NULL) + if ( !wxThePrintSetupData->GetPrintPreviewCommand() ) wxThePrintSetupData->SetPrintPreviewCommand(PS_VIEWER_PROG); // wxGetResource ("wxWindows", "PSView", &wxThePrintSetupData->m_previewCommand); @@ -2242,3 +2269,6 @@ void wxPostScriptModule::OnExit() #endif // wxUSE_POSTSCRIPT + +#endif + // wxUSE_PRINTING_ARCHITECTURE \ No newline at end of file