/////////////////////////////////////////////////////////////////////////////
-// Name: printwin.cpp
+// Name: src/msw/printwin.cpp
// Purpose: wxWindowsPrinter framework
// Author: Julian Smart
// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "printwin.h"
-#endif
+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
-#include "wx/defs.h"
-
-#define WINDOWS_PRINTING (wxTheApp->GetPrintMode() == wxPRINT_WINDOWS)
+// Don't use the Windows printer if we're in wxUniv mode and using
+// the PostScript architecture
+#if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXUNIVERSAL__) || !wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
#ifndef WX_PRECOMP
-#include "wx/utils.h"
-#include "wx/dc.h"
-#include "wx/app.h"
-#include "wx/msgdlg.h"
+ #include "wx/msw/wrapcdlg.h"
+ #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"
+ #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/dcprint.h"
-#include "wx/printdlg.h"
+#include "wx/msw/printdlg.h"
#include "wx/msw/private.h"
-
+#include "wx/msw/dcprint.h"
+#if wxUSE_ENH_METAFILE
+ #include "wx/msw/enhmeta.h"
+#endif
#include <stdlib.h>
-#include <windows.h>
-#include <commdlg.h>
-// Clash with Windows header files
-#ifdef StartDoc
-#undef StartDoc
-#endif
+// ---------------------------------------------------------------------------
+// private functions
+// ---------------------------------------------------------------------------
-#ifndef __WIN32__
-#include <print.h>
-#endif
+BOOL CALLBACK wxAbortProc(HDC hdc, int error);
-LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code);
+// ---------------------------------------------------------------------------
+// wxWin macros
+// ---------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxWindowsPrinter, wxPrinterBase)
-IMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase)
-#endif
+ IMPLEMENT_DYNAMIC_CLASS(wxWindowsPrinter, wxPrinterBase)
+ IMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase)
-/*
- * Printer
- */
-
-wxWindowsPrinter::wxWindowsPrinter(wxPrintData *data):
- wxPrinterBase(data)
-{
- lpAbortProc = (WXFARPROC) MakeProcInstance((FARPROC) wxAbortProc, wxGetInstance());
-}
+// ===========================================================================
+// implementation
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// Printer
+// ---------------------------------------------------------------------------
-wxWindowsPrinter::~wxWindowsPrinter(void)
+wxWindowsPrinter::wxWindowsPrinter(wxPrintDialogData *data)
+ : wxPrinterBase(data)
{
- FreeProcInstance((FARPROC) lpAbortProc);
}
bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
{
- abortIt = FALSE;
- abortWindow = NULL;
-
- if (!printout)
- return FALSE;
-
- printout->SetIsPreview(FALSE);
- 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)
- return FALSE;
-
- printData.SetMinPage(minPage);
- printData.SetMaxPage(maxPage);
- if (fromPage != 0)
- printData.SetFromPage(fromPage);
- if (toPage != 0)
- printData.SetToPage(toPage);
-
- if (minPage != 0)
- {
- printData.EnablePageNumbers(TRUE);
- if (printData.GetFromPage() < printData.GetMinPage())
- printData.SetFromPage(printData.GetMinPage());
- else if (printData.GetFromPage() > printData.GetMaxPage())
- printData.SetFromPage(printData.GetMaxPage());
- if (printData.GetToPage() > printData.GetMaxPage())
- printData.SetToPage(printData.GetMaxPage());
- else if (printData.GetToPage() < printData.GetMinPage())
- printData.SetToPage(printData.GetMinPage());
- }
- else
- printData.EnablePageNumbers(FALSE);
-
- // Create a suitable device context
- wxDC *dc = NULL;
- if (prompt)
- {
- wxPrintDialog dialog(parent, & printData);
- if (dialog.ShowModal() == wxID_OK)
- {
- dc = dialog.GetPrintDC();
- printData = dialog.GetPrintData();
- }
- }
- else
- {
- dc = new wxPrinterDC("", "", "", FALSE, printData.GetOrientation());
- }
-
- // May have pressed cancel.
- if (!dc || !dc->Ok())
- {
- if (dc) delete dc;
- return FALSE;
- }
-
- int logPPIScreenX = 0;
- int logPPIScreenY = 0;
- int logPPIPrinterX = 0;
- int logPPIPrinterY = 0;
-
- HDC hdc = ::GetDC(NULL);
- logPPIScreenX = ::GetDeviceCaps(hdc, LOGPIXELSX);
- logPPIScreenY = ::GetDeviceCaps(hdc, LOGPIXELSY);
- ::ReleaseDC(NULL, hdc);
-
- logPPIPrinterX = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSX);
- logPPIPrinterY = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSY);
- if (logPPIPrinterX == 0 || logPPIPrinterY == 0)
- {
- delete dc;
- return FALSE;
- }
+ sm_abortIt = false;
+ sm_abortWindow = NULL;
+
+ if (!printout)
+ {
+ sm_lastError = wxPRINTER_ERROR;
+ return false;
+ }
+
+ if (m_printDialogData.GetMinPage() < 1)
+ m_printDialogData.SetMinPage(1);
+ if (m_printDialogData.GetMaxPage() < 1)
+ m_printDialogData.SetMaxPage(9999);
+
+ // Create a suitable device context
+ wxPrinterDC *dc wxDUMMY_INITIALIZE(NULL);
+ if (prompt)
+ {
+ dc = wxDynamicCast(PrintDialog(parent), wxPrinterDC);
+ if (!dc)
+ return false;
+ }
+ else
+ {
+ dc = new wxPrinterDC(m_printDialogData.GetPrintData());
+ }
- printout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
- printout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
+ // May have pressed cancel.
+ if (!dc || !dc->IsOk())
+ {
+ if (dc) delete dc;
+ return false;
+ }
- // Set printout parameters
- printout->SetDC(dc);
+ wxPrinterDCImpl *impl = (wxPrinterDCImpl*) dc->GetImpl();
- int w, h;
- long ww, hh;
- dc->GetSize(&w, &h);
- printout->SetPageSizePixels((int)w, (int)h);
- dc->GetSizeMM(&ww, &hh);
- printout->SetPageSizeMM((int)ww, (int)hh);
+ HDC hdc = ::GetDC(NULL);
+ int logPPIScreenX = ::GetDeviceCaps(hdc, LOGPIXELSX);
+ int logPPIScreenY = ::GetDeviceCaps(hdc, LOGPIXELSY);
+ ::ReleaseDC(NULL, hdc);
- // Create an abort window
- wxBeginBusyCursor();
+ int logPPIPrinterX = ::GetDeviceCaps((HDC) impl->GetHDC(), LOGPIXELSX);
+ int logPPIPrinterY = ::GetDeviceCaps((HDC) impl->GetHDC(), LOGPIXELSY);
+ if (logPPIPrinterX == 0 || logPPIPrinterY == 0)
+ {
+ delete dc;
+ sm_lastError = wxPRINTER_ERROR;
+ return false;
+ }
- wxWindow *win = CreateAbortWindow(parent, printout);
- wxYield();
+ printout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
+ printout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
-#if defined(__BORLANDC__) || defined(__GNUWIN32__) || !defined(__WIN32__)
- ::SetAbortProc((HDC) dc->GetHDC(), (FARPROC) lpAbortProc);
-#else
- ::SetAbortProc((HDC) dc->GetHDC(), (int (_stdcall *)
- // cast it to right type only if required
- // @@@ 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
- )lpAbortProc);
-#endif
+ // Set printout parameters
+ printout->SetDC(dc);
- if (!win)
- {
- wxEndBusyCursor();
- wxMessageBox("Sorry, could not create an abort dialog.", "Print Error", wxOK, parent);
- delete dc;
- }
- abortWindow = win;
- abortWindow->Show(TRUE);
- wxYield();
-
- printout->OnBeginPrinting();
-
- bool keepGoing = TRUE;
-
- int copyCount;
- for (copyCount = 1; copyCount <= printData.GetNoCopies(); copyCount ++)
- {
- if (!printout->OnBeginDocument(printData.GetFromPage(), printData.GetToPage()))
+ int w, h;
+ dc->GetSize(&w, &h);
+ printout->SetPageSizePixels((int)w, (int)h);
+ printout->SetPaperRectPixels(dc->GetPaperRect());
+
+ dc->GetSizeMM(&w, &h);
+ printout->SetPageSizeMM((int)w, (int)h);
+
+ // Create an abort window
+ wxBusyCursor busyCursor;
+
+ 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)
{
- wxEndBusyCursor();
- wxMessageBox("Could not start printing.", "Print Error", wxOK, parent);
- break;
+ sm_lastError = wxPRINTER_ERROR;
+ return false;
}
- if (abortIt)
- break;
- int pn;
- for (pn = printData.GetFromPage(); keepGoing && (pn <= printData.GetToPage()) && printout->HasPage(pn);
- pn++)
+ // Only set min and max, because from and to have been
+ // set by the user
+ m_printDialogData.SetMinPage(minPage);
+ m_printDialogData.SetMaxPage(maxPage);
+
+ wxPrintAbortDialog *win = CreateAbortWindow(parent, printout);
+ wxYield();
+
+ ::SetAbortProc(GetHdcOf(*impl), wxAbortProc);
+
+ if (!win)
{
- if (abortIt)
- {
- keepGoing = FALSE;
- break;
- }
- else
- {
-// int dcID = ::SaveDC(dc->GetHDC());
- dc->StartPage();
- printout->OnPrintPage(pn);
- dc->EndPage();
-// ::RestoreDC(dc->GetHDC(), dcID);
- }
+ wxLogDebug(wxT("Could not create an abort dialog."));
+ sm_lastError = wxPRINTER_ERROR;
+
+ delete dc;
+ return false;
}
- printout->OnEndDocument();
- }
+ sm_abortWindow = win;
+ sm_abortWindow->Show();
+ wxSafeYield();
+
+ printout->OnBeginPrinting();
- printout->OnEndPrinting();
+ sm_lastError = wxPRINTER_NO_ERROR;
- if (abortWindow)
- {
- abortWindow->Show(FALSE);
- delete abortWindow;
- abortWindow = NULL;
- }
+ int minPageNum = minPage, maxPageNum = maxPage;
- wxEndBusyCursor();
+ if ( !m_printDialogData.GetAllPages() )
+ {
+ minPageNum = m_printDialogData.GetFromPage();
+ maxPageNum = m_printDialogData.GetToPage();
+ }
- delete dc;
-
- return TRUE;
+ const int maxCopyCount = m_printDialogData.GetNoCopies();
+ for ( int copyCount = 1; copyCount <= maxCopyCount; copyCount++ )
+ {
+ if ( !printout->OnBeginDocument(minPageNum, maxPageNum) )
+ {
+ wxLogError(_("Could not start printing."));
+ sm_lastError = wxPRINTER_ERROR;
+ break;
+ }
+ if (sm_abortIt)
+ {
+ sm_lastError = wxPRINTER_CANCELLED;
+ break;
+ }
+
+ int pn;
+
+ for ( pn = minPageNum;
+ pn <= maxPageNum && printout->HasPage(pn);
+ pn++ )
+ {
+ win->SetProgress(pn - minPageNum + 1,
+ maxPageNum - minPageNum + 1,
+ copyCount, maxCopyCount);
+
+ if ( sm_abortIt )
+ {
+ sm_lastError = wxPRINTER_CANCELLED;
+ break;
+ }
+
+ dc->StartPage();
+ bool cont = printout->OnPrintPage(pn);
+ dc->EndPage();
+
+ if ( !cont )
+ {
+ sm_lastError = wxPRINTER_CANCELLED;
+ break;
+ }
+ }
+
+ printout->OnEndDocument();
+ }
+
+ printout->OnEndPrinting();
+
+ if (sm_abortWindow)
+ {
+ sm_abortWindow->Show(false);
+ wxDELETE(sm_abortWindow);
+ }
+
+ delete dc;
+
+ return sm_lastError == wxPRINTER_NO_ERROR;
}
-bool wxWindowsPrinter::PrintDialog(wxWindow *parent)
+wxDC *wxWindowsPrinter::PrintDialog(wxWindow *parent)
{
- wxPrintDialog dialog(parent, & printData);
- return (dialog.ShowModal() == wxID_OK);
+ wxDC *dc = NULL;
+
+ wxWindowsPrintDialog dialog(parent, & m_printDialogData);
+ int ret = dialog.ShowModal();
+
+ if (ret == wxID_OK)
+ {
+ 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;
}
-bool wxWindowsPrinter::Setup(wxWindow *parent)
+bool wxWindowsPrinter::Setup(wxWindow *WXUNUSED(parent))
{
- wxPrintDialog dialog(parent, & printData);
- dialog.GetPrintData().SetSetupDialog(TRUE);
- return (dialog.ShowModal() == wxID_OK);
+#if 0
+ // We no longer expose that dialog
+ wxPrintDialog dialog(parent, & m_printDialogData);
+ dialog.GetPrintDialogData().SetSetupDialog(true);
+
+ int ret = dialog.ShowModal();
+
+ if (ret == wxID_OK)
+ {
+ m_printDialogData = dialog.GetPrintDialogData();
+ }
+
+ return (ret == wxID_OK);
+#else
+ return false;
+#endif
}
/*
- * Print preview
- */
+* Print preview
+*/
+
+wxWindowsPrintPreview::wxWindowsPrintPreview(wxPrintout *printout,
+ wxPrintout *printoutForPrinting,
+ wxPrintDialogData *data)
+ : wxPrintPreviewBase(printout, printoutForPrinting, data)
+{
+ DetermineScaling();
+}
-wxWindowsPrintPreview::wxWindowsPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data):
- wxPrintPreviewBase(printout, printoutForPrinting, data)
+wxWindowsPrintPreview::wxWindowsPrintPreview(wxPrintout *printout,
+ wxPrintout *printoutForPrinting,
+ wxPrintData *data)
+ : wxPrintPreviewBase(printout, printoutForPrinting, data)
{
- DetermineScaling();
+ DetermineScaling();
}
-wxWindowsPrintPreview::~wxWindowsPrintPreview(void)
+wxWindowsPrintPreview::~wxWindowsPrintPreview()
{
}
bool wxWindowsPrintPreview::Print(bool interactive)
{
- if (!printPrintout)
- return FALSE;
- wxWindowsPrinter printer(&printData);
- return printer.Print(previewFrame, printPrintout, interactive);
+ if (!m_printPrintout)
+ return false;
+ wxWindowsPrinter printer(&m_printDialogData);
+ return printer.Print(m_previewFrame, m_printPrintout, interactive);
}
-void wxWindowsPrintPreview::DetermineScaling(void)
+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);
+ ScreenHDC dc;
int logPPIScreenX = ::GetDeviceCaps(dc, LOGPIXELSX);
int logPPIScreenY = ::GetDeviceCaps(dc, LOGPIXELSY);
- previewPrintout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
-
- ::ReleaseDC(NULL, dc);
+ m_previewPrintout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
// Get a device context for the currently selected printer
- wxPrinterDC printerDC("", "", "", FALSE, printData.GetOrientation());
+ wxPrinterDC printerDC(m_printDialogData.GetPrintData());
+
+ int printerWidthMM;
+ int printerHeightMM;
+ int printerXRes;
+ int printerYRes;
+ int logPPIPrinterX;
+ int logPPIPrinterY;
- int printerWidth = 150;
- int printerHeight = 250;
- int printerXRes = 1500;
- int printerYRes = 2500;
+ wxRect paperRect;
- if (printerDC.GetHDC())
+ if ( printerDC.IsOk() )
{
- printerWidth = ::GetDeviceCaps((HDC) printerDC.GetHDC(), HORZSIZE);
- printerHeight = ::GetDeviceCaps((HDC) printerDC.GetHDC(), VERTSIZE);
- printerXRes = ::GetDeviceCaps((HDC) printerDC.GetHDC(), HORZRES);
- printerYRes = ::GetDeviceCaps((HDC) printerDC.GetHDC(), VERTRES);
-
- int logPPIPrinterX = ::GetDeviceCaps((HDC) printerDC.GetHDC(), LOGPIXELSX);
- int logPPIPrinterY = ::GetDeviceCaps((HDC) printerDC.GetHDC(), LOGPIXELSY);
-
- previewPrintout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
- previewPrintout->SetPageSizeMM(printerWidth, printerHeight);
-
- if (logPPIPrinterX == 0 || logPPIPrinterY == 0 || printerWidth == 0 || printerHeight == 0)
- isOk = FALSE;
+ wxPrinterDCImpl *impl = (wxPrinterDCImpl*) printerDC.GetImpl();
+ HDC dc = GetHdcOf(*impl);
+ printerWidthMM = ::GetDeviceCaps(dc, HORZSIZE);
+ printerHeightMM = ::GetDeviceCaps(dc, VERTSIZE);
+ printerXRes = ::GetDeviceCaps(dc, HORZRES);
+ printerYRes = ::GetDeviceCaps(dc, VERTRES);
+ logPPIPrinterX = ::GetDeviceCaps(dc, LOGPIXELSX);
+ logPPIPrinterY = ::GetDeviceCaps(dc, LOGPIXELSY);
+
+ paperRect = printerDC.GetPaperRect();
+
+ if ( logPPIPrinterX == 0 ||
+ logPPIPrinterY == 0 ||
+ printerWidthMM == 0 ||
+ printerHeightMM == 0 )
+ {
+ m_isOk = false;
+ }
}
else
- isOk = FALSE;
-
- pageWidth = printerXRes;
- pageHeight = printerYRes;
+ {
+ // use some defaults
+ printerWidthMM = 150;
+ printerHeightMM = 250;
+ printerXRes = 1500;
+ printerYRes = 2500;
+ logPPIPrinterX = 600;
+ logPPIPrinterY = 600;
+
+ paperRect = wxRect(0, 0, printerXRes, printerYRes);
+ m_isOk = false;
+ }
+ m_pageWidth = printerXRes;
+ m_pageHeight = printerYRes;
+ m_previewPrintout->SetPageSizePixels(printerXRes, printerYRes);
+ m_previewPrintout->SetPageSizeMM(printerWidthMM, printerHeightMM);
+ m_previewPrintout->SetPaperRectPixels(paperRect);
+ m_previewPrintout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
// At 100%, the page should look about page-size on the screen.
- previewScale = (float)((float)screenWidth/(float)printerWidth);
- previewScale = previewScale * (float)((float)screenXRes/(float)printerYRes);
+ m_previewScaleX = float(logPPIScreenX) / logPPIPrinterX;
+ 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);
+
+ if ( !RenderPageIntoDC(metaDC, pageNum) )
+ return false;
+
+ wxEnhMetaFile *metafile = metaDC.Close();
+ if ( !metafile )
+ return false;
- FUNCTION: wxAbortProc()
+ // now render the metafile:
+ wxMemoryDC bmpDC;
+ bmpDC.SelectObject(bmp);
+ bmpDC.Clear();
- PURPOSE: Processes messages for the Abort Dialog box
+ wxRect outRect(0, 0, bmp.GetWidth(), bmp.GetHeight());
+ metafile->Play(&bmpDC, &outRect);
-****************************************************************************/
-LONG APIENTRY _EXPORT wxAbortProc(HDC WXUNUSED(hPr), int WXUNUSED(Code))
+ delete metafile;
+
+ // TODO: we should keep the metafile and reuse it when changing zoom level
+
+ return true;
+}
+#endif // wxUSE_ENH_METAFILE
+
+BOOL CALLBACK wxAbortProc(HDC WXUNUSED(hdc), int WXUNUSED(error))
{
MSG msg;
- if (!wxPrinterBase::abortWindow) /* If the abort dialog isn't up yet */
+ if (!wxPrinterBase::sm_abortWindow) /* If the abort dialog isn't up yet */
return(TRUE);
/* Process messages intended for the abort dialog box */
- while (!wxPrinterBase::abortIt && PeekMessage(&msg, 0, 0, 0, TRUE))
- if (!IsDialogMessage((HWND) wxPrinterBase::abortWindow->GetHWND(), &msg)) {
+ while (!wxPrinterBase::sm_abortIt && ::PeekMessage(&msg, 0, 0, 0, TRUE))
+ if (!IsDialogMessage((HWND) wxPrinterBase::sm_abortWindow->GetHWND(), &msg)) {
TranslateMessage(&msg);
DispatchMessage(&msg);
}
/* bAbort is TRUE (return is FALSE) if the user has aborted */
- return (!wxPrinterBase::abortIt);
+ return !wxPrinterBase::sm_abortIt;
}
+#endif
+ // wxUSE_PRINTING_ARCHITECTURE
projects / wxWidgets.git / blobdiff