X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/103aec296a2c017f915b4b2b2584191fdb716a75..df4ac4c7e93cfc6a6253331285c0f8a50b0e22b2:/src/msw/printwin.cpp diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp index cfd271d228..ea9b16ab5a 100644 --- a/src/msw/printwin.cpp +++ b/src/msw/printwin.cpp @@ -30,26 +30,29 @@ #include "wx/defs.h" +#if wxUSE_PRINTING_ARCHITECTURE + #ifndef WX_PRECOMP + #include "wx/window.h" + #include "wx/msw/private.h" #include "wx/utils.h" #include "wx/dc.h" #include "wx/app.h" #include "wx/msgdlg.h" + #include "wx/intl.h" #endif #include "wx/msw/printwin.h" #include "wx/dcprint.h" #include "wx/printdlg.h" +#include "wx/log.h" #include "wx/msw/private.h" #include -#include -#include -// Clash with Windows header files -#ifdef StartDoc - #undef StartDoc -#endif +#include "wx/msw/private.h" + +#include #ifndef __WIN32__ #include @@ -65,10 +68,8 @@ LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code); // wxWin macros // --------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWindowsPrinter, wxPrinterBase) IMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase) -#endif // =========================================================================== // implementation @@ -86,7 +87,11 @@ wxWindowsPrinter::wxWindowsPrinter(wxPrintDialogData *data) wxWindowsPrinter::~wxWindowsPrinter() { + // avoids warning about statement with no effect (FreeProcInstance + // doesn't do anything under Win32) +#if !defined(WIN32) && !defined(_WIN32) && !defined(__WIN32__) && !defined(__NT__) && !defined(__GNUWIN32__) FreeProcInstance((FARPROC) m_lpAbortProc); +#endif } bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt) @@ -95,10 +100,17 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt sm_abortWindow = NULL; if (!printout) + { + sm_lastError = wxPRINTER_ERROR; return FALSE; + } printout->SetIsPreview(FALSE); - printout->OnPreparePrinting(); + + // 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; @@ -106,7 +118,10 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage); if (maxPage == 0) + { + sm_lastError = wxPRINTER_ERROR; return FALSE; + } m_printDialogData.SetMinPage(minPage); m_printDialogData.SetMaxPage(maxPage); @@ -166,6 +181,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt if (logPPIPrinterX == 0 || logPPIPrinterY == 0) { delete dc; + sm_lastError = wxPRINTER_ERROR; return FALSE; } @@ -185,11 +201,17 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt // Create an abort window wxBeginBusyCursor(); + printout->OnPreparePrinting(); + wxWindow *win = CreateAbortWindow(parent, printout); wxYield(); #if defined(__BORLANDC__) || defined(__GNUWIN32__) || defined(__SALFORDC__) || !defined(__WIN32__) +#ifdef STRICT + ::SetAbortProc((HDC) dc->GetHDC(), (ABORTPROC) m_lpAbortProc); +#else ::SetAbortProc((HDC) dc->GetHDC(), (FARPROC) m_lpAbortProc); +#endif #else ::SetAbortProc((HDC) dc->GetHDC(), (int (_stdcall *) // cast it to right type only if required @@ -206,7 +228,8 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt if (!win) { wxEndBusyCursor(); - wxLogDebug("Could not create an abort dialog."); + wxLogDebug(wxT("Could not create an abort dialog.")); + sm_lastError = wxPRINTER_ERROR; delete dc; } @@ -216,36 +239,48 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt printout->OnBeginPrinting(); - bool keepGoing = TRUE; + sm_lastError = wxPRINTER_NO_ERROR; int copyCount; - for (copyCount = 1; copyCount <= m_printDialogData.GetNoCopies(); copyCount ++) + for ( copyCount = 1; + copyCount <= m_printDialogData.GetNoCopies(); + copyCount++ ) { if (!printout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage())) { wxEndBusyCursor(); wxLogError(_("Could not start printing.")); + sm_lastError = wxPRINTER_ERROR; break; } if (sm_abortIt) + { + sm_lastError = wxPRINTER_CANCELLED; break; + } int pn; - for (pn = m_printDialogData.GetFromPage(); keepGoing && (pn <= m_printDialogData.GetToPage()) && printout->HasPage(pn); - pn++) + for ( pn = m_printDialogData.GetFromPage(); + pn <= m_printDialogData.GetToPage() && printout->HasPage(pn); + pn++ ) { - if (sm_abortIt) + if ( sm_abortIt ) { - keepGoing = FALSE; + sm_lastError = wxPRINTER_CANCELLED; break; } - else + + dc->StartPage(); + bool cont = printout->OnPrintPage(pn); + dc->EndPage(); + + if ( !cont ) { - dc->StartPage(); - printout->OnPrintPage(pn); - dc->EndPage(); + sm_lastError = wxPRINTER_CANCELLED; + break; } } + printout->OnEndDocument(); } @@ -262,7 +297,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt delete dc; - return TRUE; + return (sm_lastError == wxPRINTER_NO_ERROR); } wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent) @@ -276,7 +311,13 @@ wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent) { dc = dialog.GetPrintDC(); m_printDialogData = dialog.GetPrintDialogData(); + if (dc == NULL) + sm_lastError = wxPRINTER_ERROR; + else + sm_lastError = wxPRINTER_NO_ERROR; } + else + sm_lastError = wxPRINTER_CANCELLED; return dc; } @@ -332,9 +373,7 @@ void wxWindowsPrintPreview::DetermineScaling() { HDC dc = ::GetDC(NULL); int screenWidth = ::GetDeviceCaps(dc, HORZSIZE); - // int screenHeight = ::GetDeviceCaps(dc, VERTSIZE); - int screenXRes = ::GetDeviceCaps(dc, HORZRES); - // int screenYRes = ::GetDeviceCaps(dc, VERTRES); + int screenYRes = ::GetDeviceCaps(dc, VERTRES); int logPPIScreenX = ::GetDeviceCaps(dc, LOGPIXELSX); int logPPIScreenY = ::GetDeviceCaps(dc, LOGPIXELSY); m_previewPrintout->SetPPIScreen(logPPIScreenX, logPPIScreenY); @@ -349,15 +388,16 @@ void wxWindowsPrintPreview::DetermineScaling() int printerXRes = 1500; int printerYRes = 2500; - if (printerDC.GetHDC()) + dc = GetHdcOf(printerDC); + if ( dc ) { - printerWidth = ::GetDeviceCaps((HDC) printerDC.GetHDC(), HORZSIZE); - printerHeight = ::GetDeviceCaps((HDC) printerDC.GetHDC(), VERTSIZE); - printerXRes = ::GetDeviceCaps((HDC) printerDC.GetHDC(), HORZRES); - printerYRes = ::GetDeviceCaps((HDC) printerDC.GetHDC(), VERTRES); + printerWidth = ::GetDeviceCaps(dc, HORZSIZE); + printerHeight = ::GetDeviceCaps(dc, VERTSIZE); + printerXRes = ::GetDeviceCaps(dc, HORZRES); + printerYRes = ::GetDeviceCaps(dc, VERTRES); - int logPPIPrinterX = ::GetDeviceCaps((HDC) printerDC.GetHDC(), LOGPIXELSX); - int logPPIPrinterY = ::GetDeviceCaps((HDC) printerDC.GetHDC(), LOGPIXELSY); + int logPPIPrinterX = ::GetDeviceCaps(dc, LOGPIXELSX); + int logPPIPrinterY = ::GetDeviceCaps(dc, LOGPIXELSY); m_previewPrintout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY); m_previewPrintout->SetPageSizeMM(printerWidth, printerHeight); @@ -373,7 +413,7 @@ void wxWindowsPrintPreview::DetermineScaling() // At 100%, the page should look about page-size on the screen. m_previewScale = (float)((float)screenWidth/(float)printerWidth); - m_previewScale = m_previewScale * (float)((float)screenXRes/(float)printerYRes); + m_previewScale = m_previewScale * (float)((float)screenYRes/(float)printerYRes); } /**************************************************************************** @@ -404,3 +444,5 @@ LONG APIENTRY _EXPORT wxAbortProc(HDC WXUNUSED(hPr), int WXUNUSED(Code)) return (!wxPrinterBase::sm_abortIt); } +#endif + // wxUSE_PRINTING_ARCHITECTURE