X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..07aaf32633ecf18ec3edfbb41793a112914792d0:/src/generic/printps.cpp?ds=sidebyside diff --git a/src/generic/printps.cpp b/src/generic/printps.cpp index 628b97a4b8..a264bdabc5 100644 --- a/src/generic/printps.cpp +++ b/src/generic/printps.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: printps.cpp +// Name: src/generic/printps.cpp // Purpose: Postscript print/preview framework // Author: Julian Smart // Modified by: @@ -9,18 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "printps.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,9 +16,15 @@ #pragma hdrstop #endif -#include "wx/defs.h" +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- -#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT +#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW) #ifndef WX_PRECOMP #include "wx/utils.h" @@ -39,14 +33,14 @@ #include "wx/msgdlg.h" #include "wx/intl.h" #include "wx/progdlg.h" - #include "wx/log.h" + #include "wx/log.h" + #include "wx/dcprint.h" #endif #include "wx/generic/printps.h" -#include "wx/dcprint.h" #include "wx/printdlg.h" #include "wx/generic/prntdlgg.h" -#include "wx/generic/progdlgg.h" +#include "wx/progdlg.h" #include "wx/paper.h" #include @@ -57,7 +51,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPostScriptPrinter, wxPrinterBase) IMPLEMENT_CLASS(wxPostScriptPrintPreview, wxPrintPreviewBase) - + // ============================================================================ // implementation // ============================================================================ @@ -77,70 +71,27 @@ wxPostScriptPrinter::~wxPostScriptPrinter() bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt) { - sm_abortIt = FALSE; - sm_abortWindow = (wxWindow *) NULL; + sm_abortIt = false; + sm_abortWindow = NULL; if (!printout) { sm_lastError = wxPRINTER_ERROR; - return FALSE; - } - - printout->SetIsPreview(FALSE); - -#if 0 - // 4/9/99, JACS: this is a silly place to allow preparation, considering - // the DC and no parameters have been set in the printout object. - // Moved further down. - - // printout->OnPreparePrinting(); - - // Get some parameters from the printout, if defined - int fromPage, toPage; - int minPage, maxPage; - printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage); - - if (maxPage == 0) - { - sm_lastError = wxPRINTER_ERROR; - return FALSE; + return false; } - m_printDialogData.SetMinPage(minPage); - m_printDialogData.SetMaxPage(maxPage); - if (fromPage != 0) - m_printDialogData.SetFromPage(fromPage); - if (toPage != 0) - m_printDialogData.SetToPage(toPage); - - if (minPage != 0) - { - m_printDialogData.EnablePageNumbers(TRUE); - if (m_printDialogData.GetFromPage() < m_printDialogData.GetMinPage()) - m_printDialogData.SetFromPage(m_printDialogData.GetMinPage()); - else if (m_printDialogData.GetFromPage() > m_printDialogData.GetMaxPage()) - m_printDialogData.SetFromPage(m_printDialogData.GetMaxPage()); - if (m_printDialogData.GetToPage() > m_printDialogData.GetMaxPage()) - m_printDialogData.SetToPage(m_printDialogData.GetMaxPage()); - else if (m_printDialogData.GetToPage() < m_printDialogData.GetMinPage()) - m_printDialogData.SetToPage(m_printDialogData.GetMinPage()); - } - else - m_printDialogData.EnablePageNumbers(FALSE); -#endif - if (m_printDialogData.GetMinPage() < 1) m_printDialogData.SetMinPage(1); if (m_printDialogData.GetMaxPage() < 1) m_printDialogData.SetMaxPage(9999); // Create a suitable device context - wxDC *dc = (wxDC *) NULL; + wxDC *dc; if (prompt) { dc = PrintDialog(parent); if (!dc) - return FALSE; + return false; } else { @@ -148,11 +99,11 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro } // May have pressed cancel. - if (!dc || !dc->Ok()) + if (!dc || !dc->IsOk()) { if (dc) delete dc; sm_lastError = wxPRINTER_ERROR; - return FALSE; + return false; } wxSize ScreenPixels = wxGetDisplaySize(); @@ -160,8 +111,8 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro printout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()), (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) ); - printout->SetPPIPrinter( wxPostScriptDC::GetResolution(), - wxPostScriptDC::GetResolution() ); + printout->SetPPIPrinter( dc->GetResolution(), + dc->GetResolution() ); // Set printout parameters printout->SetDC(dc); @@ -169,8 +120,10 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro int w, h; dc->GetSize(&w, &h); printout->SetPageSizePixels((int)w, (int)h); - dc->GetSizeMM(&w, &h); - printout->SetPageSizeMM((int)w, (int)h); + printout->SetPaperRectPixels(wxRect(0, 0, w, h)); + int mw, mh; + dc->GetSizeMM(&mw, &mh); + printout->SetPageSizeMM((int)mw, (int)mh); // Create an abort window wxBeginBusyCursor(); @@ -186,14 +139,19 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro { sm_lastError = wxPRINTER_ERROR; wxEndBusyCursor(); - return FALSE; + return false; } // Only set min and max, because from and to have been // set by the user m_printDialogData.SetMinPage(minPage); m_printDialogData.SetMaxPage(maxPage); - + + if (m_printDialogData.GetFromPage() < minPage) + m_printDialogData.SetFromPage( minPage ); + if (m_printDialogData.GetToPage() > maxPage) + m_printDialogData.SetToPage( maxPage ); + int pagesPerCopy = m_printDialogData.GetToPage()-m_printDialogData.GetFromPage()+1, totalPages = pagesPerCopy * m_printDialogData.GetNoCopies(), @@ -210,7 +168,7 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro sm_lastError = wxPRINTER_NO_ERROR; - bool keepGoing = TRUE; + bool keepGoing = true; int copyCount; for (copyCount = 1; copyCount <= m_printDialogData.GetNoCopies(); copyCount ++) @@ -234,7 +192,7 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro { if (sm_abortIt) { - keepGoing = FALSE; + keepGoing = false; sm_lastError = wxPRINTER_CANCELLED; break; } @@ -250,12 +208,12 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro } else { - sm_abortIt = TRUE; + sm_abortIt = true; sm_lastError = wxPRINTER_CANCELLED; - keepGoing = FALSE; + keepGoing = false; } } - wxYield(); + wxYield(); } printout->OnEndDocument(); } @@ -272,13 +230,14 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro wxDC* wxPostScriptPrinter::PrintDialog(wxWindow *parent) { - wxDC* dc = (wxDC*) NULL; - wxGenericPrintDialog* dialog = new wxGenericPrintDialog(parent, & m_printDialogData); - int ret = dialog->ShowModal() ; - if (ret == wxID_OK) + wxDC* dc = NULL; + + wxGenericPrintDialog dialog( parent, &m_printDialogData ); + if (dialog.ShowModal() == wxID_OK) { - dc = dialog->GetPrintDC(); - m_printDialogData = dialog->GetPrintDialogData(); + dc = dialog.GetPrintDC(); + m_printDialogData = dialog.GetPrintDialogData(); + if (dc == NULL) sm_lastError = wxPRINTER_ERROR; else @@ -287,15 +246,14 @@ wxDC* wxPostScriptPrinter::PrintDialog(wxWindow *parent) else sm_lastError = wxPRINTER_CANCELLED; - dialog->Destroy(); - return dc; } -bool wxPostScriptPrinter::Setup(wxWindow *parent) +bool wxPostScriptPrinter::Setup(wxWindow *WXUNUSED(parent)) { +#if 0 wxGenericPrintDialog* dialog = new wxGenericPrintDialog(parent, & m_printDialogData); - dialog->GetPrintDialogData().SetSetupDialog(TRUE); + dialog->GetPrintDialogData().SetSetupDialog(true); int ret = dialog->ShowModal(); @@ -307,6 +265,9 @@ bool wxPostScriptPrinter::Setup(wxWindow *parent) dialog->Destroy(); return (ret == wxID_OK); +#endif + + return false; } // ---------------------------------------------------------------------------- @@ -343,8 +304,17 @@ wxPostScriptPrintPreview::~wxPostScriptPrintPreview() bool wxPostScriptPrintPreview::Print(bool interactive) { if (!m_printPrintout) - return FALSE; + return false; + + // Assume that on Unix, the preview may use the PostScript + // (generic) version, but printing using the native system is required. + // TODO: make a generic print preview class from which wxPostScriptPrintPreview + // is derived. +#ifdef __UNIX__ + wxPrinter printer(& m_printDialogData); +#else wxPostScriptPrinter printer(& m_printDialogData); +#endif return printer.Print(m_previewFrame, m_printPrintout, interactive); } @@ -360,16 +330,20 @@ void wxPostScriptPrintPreview::DetermineScaling() if (paper) { - wxSize ScreenPixels = wxGetDisplaySize(); - wxSize ScreenMM = wxGetDisplaySizeMM(); + int resolution = 600; // TODO, this is correct, but get this from wxPSDC somehow + + const wxSize screenPPI = wxGetDisplayPPI(); + int logPPIScreenX = screenPPI.GetWidth(); + int logPPIScreenY = screenPPI.GetHeight(); + int logPPIPrinterX = resolution; + int logPPIPrinterY = resolution; - m_previewPrintout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()), - (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) ); - m_previewPrintout->SetPPIPrinter(wxPostScriptDC::GetResolution(), wxPostScriptDC::GetResolution()); + m_previewPrintout->SetPPIScreen( logPPIScreenX, logPPIScreenY ); + m_previewPrintout->SetPPIPrinter( logPPIPrinterX, logPPIPrinterY ); wxSize sizeDevUnits(paper->GetSizeDeviceUnits()); - sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x * wxPostScriptDC::GetResolution() / 72.0); - sizeDevUnits.y = (wxCoord)((float)sizeDevUnits.y * wxPostScriptDC::GetResolution() / 72.0); + sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x * resolution / 72.0); + sizeDevUnits.y = (wxCoord)((float)sizeDevUnits.y * resolution / 72.0); wxSize sizeTenthsMM(paper->GetSize()); wxSize sizeMM(sizeTenthsMM.x / 10, sizeTenthsMM.y / 10); @@ -379,18 +353,19 @@ void wxPostScriptPrintPreview::DetermineScaling() m_pageWidth = sizeDevUnits.y; m_pageHeight = sizeDevUnits.x; m_previewPrintout->SetPageSizeMM(sizeMM.y, sizeMM.x); - m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight); } else { m_pageWidth = sizeDevUnits.x; m_pageHeight = sizeDevUnits.y; m_previewPrintout->SetPageSizeMM(sizeMM.x, sizeMM.y); - m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight); } + m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight); + m_previewPrintout->SetPaperRectPixels(wxRect(0, 0, m_pageWidth, m_pageHeight)); // At 100%, the page should look about page-size on the screen. - m_previewScale = (float)0.8 * 72.0 / (float)wxPostScriptDC::GetResolution(); + m_previewScaleX = float(logPPIScreenX) / logPPIPrinterX; + m_previewScaleY = float(logPPIScreenY) / logPPIPrinterY; } }