#include "wx/intl.h"
#include "wx/log.h"
#include "wx/dcprint.h"
+ #include "wx/dcmemory.h"
+ #include "wx/image.h"
#endif
+#include "wx/msw/dib.h"
+#include "wx/msw/dcmemory.h"
#include "wx/msw/printwin.h"
-#include "wx/msw/printdlg.h" // RJL used Windows dialog?s
+#include "wx/msw/printdlg.h"
#include "wx/msw/private.h"
-
-#include <stdlib.h>
-
-#ifndef __WIN32__
- #include <print.h>
+#include "wx/msw/dcprint.h"
+#if wxUSE_ENH_METAFILE
+ #include "wx/msw/enhmeta.h"
#endif
+#include <stdlib.h>
// ---------------------------------------------------------------------------
// private functions
// ---------------------------------------------------------------------------
-LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code);
+BOOL CALLBACK wxAbortProc(HDC hdc, int error);
// ---------------------------------------------------------------------------
// wxWin macros
wxWindowsPrinter::wxWindowsPrinter(wxPrintDialogData *data)
: wxPrinterBase(data)
{
- m_lpAbortProc = (WXFARPROC) MakeProcInstance((FARPROC) wxAbortProc, wxGetInstance());
-}
-
-wxWindowsPrinter::~wxWindowsPrinter()
-{
- // avoids warning about statement with no effect (FreeProcInstance
- // doesn't do anything under Win32)
-#if !defined(__WIN32__) && !defined(__NT__)
- FreeProcInstance((FARPROC) m_lpAbortProc);
-#endif
}
bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
return false;
}
- printout->SetIsPreview(false);
-
if (m_printDialogData.GetMinPage() < 1)
m_printDialogData.SetMinPage(1);
if (m_printDialogData.GetMaxPage() < 1)
}
// May have pressed cancel.
- if (!dc || !dc->Ok())
+ if (!dc || !dc->IsOk())
{
if (dc) delete dc;
return false;
}
+ wxPrinterDCImpl *impl = (wxPrinterDCImpl*) dc->GetImpl();
+
HDC hdc = ::GetDC(NULL);
int logPPIScreenX = ::GetDeviceCaps(hdc, LOGPIXELSX);
int logPPIScreenY = ::GetDeviceCaps(hdc, LOGPIXELSY);
::ReleaseDC(NULL, hdc);
- int logPPIPrinterX = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSX);
- int logPPIPrinterY = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSY);
+ int logPPIPrinterX = ::GetDeviceCaps((HDC) impl->GetHDC(), LOGPIXELSX);
+ int logPPIPrinterY = ::GetDeviceCaps((HDC) impl->GetHDC(), LOGPIXELSY);
if (logPPIPrinterX == 0 || logPPIPrinterY == 0)
{
delete dc;
m_printDialogData.SetMinPage(minPage);
m_printDialogData.SetMaxPage(maxPage);
- wxWindow *win = CreateAbortWindow(parent, printout);
+ wxPrintAbortDialog *win = CreateAbortWindow(parent, printout);
wxYield();
-#if defined(__WATCOMC__) || 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
- // FIXME it's really cdecl and we're casting it to stdcall - either there is
- // something I don't understand or it will crash at first usage
-#ifdef STRICT
- (HDC, int)
-#else
- ()
-#endif
- )m_lpAbortProc);
-#endif
+ ::SetAbortProc(GetHdcOf(*impl), wxAbortProc);
if (!win)
{
maxPageNum = m_printDialogData.GetToPage();
}
- int copyCount;
- for ( copyCount = 1;
- copyCount <= m_printDialogData.GetNoCopies();
- copyCount++ )
+ const int maxCopyCount = m_printDialogData.GetNoCopies();
+ for ( int copyCount = 1; copyCount <= maxCopyCount; copyCount++ )
{
if ( !printout->OnBeginDocument(minPageNum, maxPageNum) )
{
pn <= maxPageNum && printout->HasPage(pn);
pn++ )
{
+ win->SetProgress(pn - minPageNum + 1,
+ maxPageNum - minPageNum + 1,
+ copyCount, maxCopyCount);
+
if ( sm_abortIt )
{
sm_lastError = wxPRINTER_CANCELLED;
if (sm_abortWindow)
{
sm_abortWindow->Show(false);
- delete sm_abortWindow;
- sm_abortWindow = NULL;
+ wxDELETE(sm_abortWindow);
}
delete dc;
wxDC *wxWindowsPrinter::PrintDialog(wxWindow *parent)
{
- wxDC *dc = (wxPrinterDC*) NULL;
+ wxDC *dc = NULL;
wxWindowsPrintDialog dialog(parent, & m_printDialogData);
int ret = dialog.ShowModal();
int logPPIPrinterX;
int logPPIPrinterY;
- wxRect paperRect;
+ wxRect paperRect;
- if ( printerDC.Ok() )
+ if ( printerDC.IsOk() )
{
- HDC dc = GetHdcOf(printerDC);
+ wxPrinterDCImpl *impl = (wxPrinterDCImpl*) printerDC.GetImpl();
+ HDC dc = GetHdcOf(*impl);
printerWidthMM = ::GetDeviceCaps(dc, HORZSIZE);
printerHeightMM = ::GetDeviceCaps(dc, VERTSIZE);
printerXRes = ::GetDeviceCaps(dc, HORZRES);
logPPIPrinterX = ::GetDeviceCaps(dc, LOGPIXELSX);
logPPIPrinterY = ::GetDeviceCaps(dc, LOGPIXELSY);
- paperRect = printerDC.GetPaperRect();
+ paperRect = printerDC.GetPaperRect();
if ( logPPIPrinterX == 0 ||
logPPIPrinterY == 0 ||
logPPIPrinterX = 600;
logPPIPrinterY = 600;
- paperRect = wxRect(0, 0, printerXRes, printerYRes);
+ paperRect = wxRect(0, 0, printerXRes, printerYRes);
m_isOk = false;
}
m_pageWidth = printerXRes;
m_previewScaleY = float(logPPIScreenY) / logPPIPrinterY;
}
-/****************************************************************************
+#if wxUSE_ENH_METAFILE
+bool wxWindowsPrintPreview::RenderPageIntoBitmap(wxBitmap& bmp, int pageNum)
+{
+ // The preview, as implemented in wxPrintPreviewBase (and as used prior to
+ // wx3) is inexact: it uses screen DC, which has much lower resolution and
+ // has other properties different from printer DC, so the preview is not
+ // quite right.
+ //
+ // To make matters worse, if the application depends heavily on
+ // GetTextExtent() or does text layout itself, the output in preview and on
+ // paper can be very different. In particular, wxHtmlEasyPrinting is
+ // affected and the preview can be easily off by several pages.
+ //
+ // To fix this, we render the preview into high-resolution enhanced
+ // metafile with properties identical to the printer DC. This guarantees
+ // metrics correctness while still being fast.
+
+
+ // print the preview into a metafile:
+ wxPrinterDC printerDC(m_printDialogData.GetPrintData());
+ wxEnhMetaFileDC metaDC(printerDC,
+ wxEmptyString,
+ printerDC.GetSize().x, printerDC.GetSize().y);
- FUNCTION: wxAbortProc()
+ if ( !RenderPageIntoDC(metaDC, pageNum) )
+ return false;
- PURPOSE: Processes messages for the Abort Dialog box
+ wxEnhMetaFile *metafile = metaDC.Close();
+ if ( !metafile )
+ return false;
-****************************************************************************/
+ // now render the metafile:
+ wxMemoryDC bmpDC;
+ bmpDC.SelectObject(bmp);
+ bmpDC.Clear();
+
+ wxRect outRect(0, 0, bmp.GetWidth(), bmp.GetHeight());
+ metafile->Play(&bmpDC, &outRect);
+
+
+ delete metafile;
+
+ // TODO: we should keep the metafile and reuse it when changing zoom level
+
+ return true;
+}
+#endif // wxUSE_ENH_METAFILE
-LONG APIENTRY _EXPORT wxAbortProc(HDC WXUNUSED(hPr), int WXUNUSED(Code))
+BOOL CALLBACK wxAbortProc(HDC WXUNUSED(hdc), int WXUNUSED(error))
{
MSG msg;
projects / wxWidgets.git / blobdiff