X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41f4eb85344ba615255575363b45463cf73dc53d..3be926e348e2d0a3a2c278b9f2cff7843971e0c9:/src/generic/dcpsg.cpp diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp index ff50f09120..805fe0fd82 100644 --- a/src/generic/dcpsg.cpp +++ b/src/generic/dcpsg.cpp @@ -15,27 +15,28 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP -#endif // WX_PRECOMP +#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT -#if wxUSE_PRINTING_ARCHITECTURE +#include "wx/generic/dcpsg.h" -#if wxUSE_POSTSCRIPT +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/dcmemory.h" + #include "wx/math.h" + #include "wx/image.h" + #include "wx/icon.h" +#endif // WX_PRECOMP -#include "wx/dcmemory.h" -#include "wx/utils.h" -#include "wx/intl.h" -#include "wx/app.h" -#include "wx/image.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/math.h" #include "wx/stdpaths.h" +WXDLLIMPEXP_DATA_CORE(int) wxPageNumber; + #ifdef __WXMSW__ #ifdef DrawText @@ -303,7 +304,7 @@ wxPostScriptDC::~wxPostScriptDC () } } -bool wxPostScriptDC::Ok() const +bool wxPostScriptDC::IsOk() const { return m_ok; } @@ -1048,8 +1049,8 @@ void wxPostScriptDC::SetPen( const wxPen& pen ) PsPrint( buffer ); } PsPrint ("] 0 setdash\n"); - psdash = 0; - } + psdash = 0; + } break; case wxSOLID: case wxTRANSPARENT: @@ -1258,7 +1259,7 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) } CalcBoundingBox( x, y ); - CalcBoundingBox( x + size * text.Length() * 2/3 , y ); + CalcBoundingBox( x + size * text.length() * 2/3 , y ); } void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord y, double angle ) @@ -1383,7 +1384,7 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord } CalcBoundingBox( x, y ); - CalcBoundingBox( x + size * text.Length() * 2/3 , y ); + CalcBoundingBox( x + size * text.length() * 2/3 , y ); } void wxPostScriptDC::SetBackground (const wxBrush& brush) @@ -1602,20 +1603,20 @@ bool wxPostScriptDC::StartDoc( const wxString& message ) const wxChar *paper; switch (m_printData.GetPaperId()) { - case wxPAPER_LETTER: paper = wxT("Letter"); break; // Letter: paper ""; 8 1/2 by 11 inches - case wxPAPER_LEGAL: paper = wxT("Legal"); break; // Legal, 8 1/2 by 14 inches - case wxPAPER_A4: paper = wxT("A4"); break; // A4 Sheet, 210 by 297 millimeters + case wxPAPER_LETTER: paper = wxT("Letter"); break; // Letter: paper ""; 8 1/2 by 11 inches + case wxPAPER_LEGAL: paper = wxT("Legal"); break; // Legal, 8 1/2 by 14 inches + case wxPAPER_A4: paper = wxT("A4"); break; // A4 Sheet, 210 by 297 millimeters case wxPAPER_TABLOID: paper = wxT("Tabloid"); break; // Tabloid, 11 by 17 inches - case wxPAPER_LEDGER: paper = wxT("Ledger"); break; // Ledger, 17 by 11 inches - case wxPAPER_STATEMENT: paper = wxT("Statement"); break; // Statement, 5 1/2 by 8 1/2 inches - case wxPAPER_EXECUTIVE: paper = wxT("Executive"); break; // Executive, 7 1/4 by 10 1/2 inches - case wxPAPER_A3: paper = wxT("A3"); break; // A3 sheet, 297 by 420 millimeters - case wxPAPER_A5: paper = wxT("A5"); break; // A5 sheet, 148 by 210 millimeters - case wxPAPER_B4: paper = wxT("B4"); break; // B4 sheet, 250 by 354 millimeters - case wxPAPER_B5: paper = wxT("B5"); break; // B5 sheet, 182-by-257-millimeter paper - case wxPAPER_FOLIO: paper = wxT("Folio"); break; // Folio, 8-1/2-by-13-inch paper - case wxPAPER_QUARTO: paper = wxT("Quaro"); break; // Quarto, 215-by-275-millimeter paper - case wxPAPER_10X14: paper = wxT("10x14"); break; // 10-by-14-inch sheet + case wxPAPER_LEDGER: paper = wxT("Ledger"); break; // Ledger, 17 by 11 inches + case wxPAPER_STATEMENT: paper = wxT("Statement"); break; // Statement, 5 1/2 by 8 1/2 inches + case wxPAPER_EXECUTIVE: paper = wxT("Executive"); break; // Executive, 7 1/4 by 10 1/2 inches + case wxPAPER_A3: paper = wxT("A3"); break; // A3 sheet, 297 by 420 millimeters + case wxPAPER_A5: paper = wxT("A5"); break; // A5 sheet, 148 by 210 millimeters + case wxPAPER_B4: paper = wxT("B4"); break; // B4 sheet, 250 by 354 millimeters + case wxPAPER_B5: paper = wxT("B5"); break; // B5 sheet, 182-by-257-millimeter paper + case wxPAPER_FOLIO: paper = wxT("Folio"); break; // Folio, 8-1/2-by-13-inch paper + case wxPAPER_QUARTO: paper = wxT("Quaro"); break; // Quarto, 215-by-275-millimeter paper + case wxPAPER_10X14: paper = wxT("10x14"); break; // 10-by-14-inch sheet default: paper = wxT("A4"); } PsPrintf( wxT("%%%%DocumentPaperSizes: %s\n"), paper ); @@ -1834,11 +1835,11 @@ wxCoord wxPostScriptDC::GetCharHeight() const void wxPostScriptDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent, wxCoord *externalLeading, - wxFont *theFont ) const + const wxFont *theFont ) const { - wxFont *fontToUse = theFont; + const wxFont *fontToUse = theFont; - if (!fontToUse) fontToUse = (wxFont*) &m_font; + if (!fontToUse) fontToUse = &m_font; wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") ); @@ -2200,16 +2201,18 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, } // print postscript datas via required method (file, stream) -void wxPostScriptDC::PsPrintf( const wxChar* fmt, ... ) +void wxPostScriptDC::DoPsPrintfFormat(const wxString& fmt, ...) { va_list argptr; va_start(argptr, fmt); - PsPrint( wxString::FormatV( fmt, argptr ).c_str() ); + PsPrint( wxString::FormatV( fmt, argptr ) ); } -void wxPostScriptDC::PsPrint( const char* psdata ) +void wxPostScriptDC::PsPrint( const wxString& str ) { + const wxWX2MBbuf psdata(str.mb_str(wxConvUTF8)); + wxPostScriptPrintNativeData *data = (wxPostScriptPrintNativeData *) m_printData.GetNativeData(); @@ -2258,11 +2261,6 @@ void wxPostScriptDC::PsPrint( int ch ) } } -#endif - // wxUSE_POSTSCRIPT - -#endif - // wxUSE_PRINTING_ARCHITECTURE - +#endif // wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT // vi:sts=4:sw=4:et