Don't use wxCHECK_W32API_VERSION() in #if when it can be undefined.

[wxWidgets.git] / src / msw / printwin.cpp

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index 0acf3ddba455b49f9fcd090d5c351105489f41c4..9018f7de7031374093ceeb7ce31959bd100d4023 100644 (file)
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        printwin.cpp
+// Name:        src/msw/printwin.cpp

 // Purpose:     wxWindowsPrinter framework
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // 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

 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================


@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "printwin.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,11 +24,12 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/defs.h"
-
-#if wxUSE_PRINTING_ARCHITECTURE
+// 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
 
 #ifndef WX_PRECOMP

+    #include "wx/msw/wrapcdlg.h"

     #include "wx/window.h"
     #include "wx/msw/private.h"
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/msw/private.h"
     #include "wx/utils.h"


@@ -40,29 +37,28 @@
     #include "wx/app.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.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
 
 #endif
 

+#include "wx/msw/dib.h"
+#include "wx/msw/dcmemory.h"

 #include "wx/msw/printwin.h"
 #include "wx/msw/printwin.h"

-#include "wx/dcprint.h"
-#include "wx/printdlg.h"
-#include "wx/log.h"
-#include "wx/msw/private.h"
-
-#include <stdlib.h>
-
+#include "wx/msw/printdlg.h"

 #include "wx/msw/private.h"
 #include "wx/msw/private.h"

-
-#include <commdlg.h>
-
-#ifndef __WIN32__
-    #include <print.h>
+#include "wx/msw/dcprint.h"
+#if wxUSE_ENH_METAFILE
+    #include "wx/msw/enhmeta.h"

 #endif
 #endif

+#include <stdlib.h>

 
 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------
 

-LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code);
+BOOL CALLBACK wxAbortProc(HDC hdc, int error);

 
 // ---------------------------------------------------------------------------
 // wxWin macros
 
 // ---------------------------------------------------------------------------
 // wxWin macros


@@ -82,107 +78,58 @@ LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code);
 wxWindowsPrinter::wxWindowsPrinter(wxPrintDialogData *data)
                 : wxPrinterBase(data)
 {
 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)
 {
 }
 
 bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
 {

-    sm_abortIt = FALSE;
+    sm_abortIt = false;

     sm_abortWindow = NULL;
 
     if (!printout)
     {
         sm_lastError = wxPRINTER_ERROR;
     sm_abortWindow = NULL;
 
     if (!printout)
     {
         sm_lastError = wxPRINTER_ERROR;

-        return FALSE;
+        return false;

     }
 
     }
 

-    printout->SetIsPreview(FALSE);
-
-    // 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;
-    }
-
-    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);
+    if (m_printDialogData.GetMinPage() < 1)
+        m_printDialogData.SetMinPage(1);
+    if (m_printDialogData.GetMaxPage() < 1)
+        m_printDialogData.SetMaxPage(9999);

 
     // Create a suitable device context
 
     // Create a suitable device context

-    wxDC *dc = NULL;
+    wxPrinterDC *dc wxDUMMY_INITIALIZE(NULL);

     if (prompt)
     {
     if (prompt)
     {

-        dc = PrintDialog(parent);
+        dc = wxDynamicCast(PrintDialog(parent), wxPrinterDC);

         if (!dc)
         if (!dc)

-            return FALSE;
+            return false;

     }
     else
     {
     }
     else
     {

-        //      dc = new wxPrinterDC("", "", "", FALSE, m_printData.GetOrientation());

         dc = new wxPrinterDC(m_printDialogData.GetPrintData());
     }
 
     // May have pressed cancel.
         dc = new wxPrinterDC(m_printDialogData.GetPrintData());
     }
 
     // May have pressed cancel.

-    if (!dc || !dc->Ok())
+    if (!dc || !dc->IsOk())

     {
         if (dc) delete dc;
     {
         if (dc) delete dc;

-        return FALSE;
+        return false;

     }
 
     }
 

-    int logPPIScreenX = 0;
-    int logPPIScreenY = 0;
-    int logPPIPrinterX = 0;
-    int logPPIPrinterY = 0;
+    wxPrinterDCImpl *impl = (wxPrinterDCImpl*) dc->GetImpl();

 
     HDC hdc = ::GetDC(NULL);
 
     HDC hdc = ::GetDC(NULL);

-    logPPIScreenX = ::GetDeviceCaps(hdc, LOGPIXELSX);
-    logPPIScreenY = ::GetDeviceCaps(hdc, LOGPIXELSY);
+    int logPPIScreenX = ::GetDeviceCaps(hdc, LOGPIXELSX);
+    int logPPIScreenY = ::GetDeviceCaps(hdc, LOGPIXELSY);

     ::ReleaseDC(NULL, hdc);
 
     ::ReleaseDC(NULL, hdc);
 

-    logPPIPrinterX = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSX);
-    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;
         sm_lastError = wxPRINTER_ERROR;
     if (logPPIPrinterX == 0 || logPPIPrinterY == 0)
     {
         delete dc;
         sm_lastError = wxPRINTER_ERROR;

-        return FALSE;
+        return false;

     }
 
     printout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
     }
 
     printout->SetPPIScreen(logPPIScreenX, logPPIScreenY);


@@ -194,61 +141,68 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     int w, h;
     dc->GetSize(&w, &h);
     printout->SetPageSizePixels((int)w, (int)h);
     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
 
     dc->GetSizeMM(&w, &h);
     printout->SetPageSizeMM((int)w, (int)h);
 
     // Create an abort window

-    wxBeginBusyCursor();
+    wxBusyCursor busyCursor;

 
     printout->OnPreparePrinting();
 
 
     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;
+    }
+
+    // Only set min and max, because from and to have been
+    // set by the user
+    m_printDialogData.SetMinPage(minPage);
+    m_printDialogData.SetMaxPage(maxPage);
+

     wxWindow *win = CreateAbortWindow(parent, printout);
     wxYield();
 
     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
-        // 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)
     {
 
     if (!win)
     {

-        wxEndBusyCursor();

         wxLogDebug(wxT("Could not create an abort dialog."));
         sm_lastError = wxPRINTER_ERROR;
 
         delete dc;
         wxLogDebug(wxT("Could not create an abort dialog."));
         sm_lastError = wxPRINTER_ERROR;
 
         delete dc;

+        return false;

     }
     sm_abortWindow = win;
     }
     sm_abortWindow = win;

-    sm_abortWindow->Show(TRUE);
+    sm_abortWindow->Show();

     wxSafeYield();
 
     printout->OnBeginPrinting();
 
     sm_lastError = wxPRINTER_NO_ERROR;
 
     wxSafeYield();
 
     printout->OnBeginPrinting();
 
     sm_lastError = wxPRINTER_NO_ERROR;
 

+    int minPageNum = minPage, maxPageNum = maxPage;
+
+    if ( !m_printDialogData.GetAllPages() )
+    {
+        minPageNum = m_printDialogData.GetFromPage();
+        maxPageNum = m_printDialogData.GetToPage();
+    }
+

     int copyCount;
     for ( copyCount = 1;
           copyCount <= m_printDialogData.GetNoCopies();
           copyCount++ )
     {
     int copyCount;
     for ( copyCount = 1;
           copyCount <= m_printDialogData.GetNoCopies();
           copyCount++ )
     {

-        if (!printout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
+        if ( !printout->OnBeginDocument(minPageNum, maxPageNum) )

         {
         {

-            wxEndBusyCursor();

             wxLogError(_("Could not start printing."));
             sm_lastError = wxPRINTER_ERROR;
             break;
             wxLogError(_("Could not start printing."));
             sm_lastError = wxPRINTER_ERROR;
             break;


@@ -260,8 +214,9 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
         }
 
         int pn;
         }
 
         int pn;

-        for ( pn = m_printDialogData.GetFromPage();
-              pn <= m_printDialogData.GetToPage() && printout->HasPage(pn);
+
+        for ( pn = minPageNum;
+              pn <= maxPageNum && printout->HasPage(pn);

               pn++ )
         {
             if ( sm_abortIt )
               pn++ )
         {
             if ( sm_abortIt )


@@ -288,23 +243,20 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
 
     if (sm_abortWindow)
     {
 
     if (sm_abortWindow)
     {

-        sm_abortWindow->Show(FALSE);
-        delete sm_abortWindow;
-        sm_abortWindow = NULL;
+        sm_abortWindow->Show(false);
+        wxDELETE(sm_abortWindow);

     }
 
     }
 

-    wxEndBusyCursor();
-

     delete dc;
 
     delete dc;
 

-    return (sm_lastError == wxPRINTER_NO_ERROR);
+    return sm_lastError == wxPRINTER_NO_ERROR;

 }
 
 }
 

-wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent)
+wxDC *wxWindowsPrinter::PrintDialog(wxWindow *parent)

 {
 {

-    wxDC* dc = (wxDC*) NULL;
+    wxDC *dc = NULL;

 
 

-    wxPrintDialog dialog(parent, & m_printDialogData);
+    wxWindowsPrintDialog dialog(parent, & m_printDialogData);

     int ret = dialog.ShowModal();
 
     if (ret == wxID_OK)
     int ret = dialog.ShowModal();
 
     if (ret == wxID_OK)


@@ -322,10 +274,12 @@ wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent)
     return dc;
 }
 
     return dc;
 }
 

-bool wxWindowsPrinter::Setup(wxWindow *parent)
+bool wxWindowsPrinter::Setup(wxWindow *WXUNUSED(parent))

 {
 {

+#if 0
+    // We no longer expose that dialog

     wxPrintDialog dialog(parent, & m_printDialogData);
     wxPrintDialog dialog(parent, & m_printDialogData);

-    dialog.GetPrintDialogData().SetSetupDialog(TRUE);
+    dialog.GetPrintDialogData().SetSetupDialog(true);

 
     int ret = dialog.ShowModal();
 
 
     int ret = dialog.ShowModal();
 


@@ -335,6 +289,9 @@ bool wxWindowsPrinter::Setup(wxWindow *parent)
     }
 
     return (ret == wxID_OK);
     }
 
     return (ret == wxID_OK);

+#else
+    return false;
+#endif

 }
 
 /*
 }
 
 /*


@@ -364,67 +321,125 @@ wxWindowsPrintPreview::~wxWindowsPrintPreview()
 bool wxWindowsPrintPreview::Print(bool interactive)
 {
     if (!m_printPrintout)
 bool wxWindowsPrintPreview::Print(bool interactive)
 {
     if (!m_printPrintout)

-        return FALSE;
+        return false;

     wxWindowsPrinter printer(&m_printDialogData);
     return printer.Print(m_previewFrame, m_printPrintout, interactive);
 }
 
 void wxWindowsPrintPreview::DetermineScaling()
 {
     wxWindowsPrinter printer(&m_printDialogData);
     return printer.Print(m_previewFrame, m_printPrintout, interactive);
 }
 
 void wxWindowsPrintPreview::DetermineScaling()
 {

-    HDC dc = ::GetDC(NULL);
-    int screenWidth = ::GetDeviceCaps(dc, HORZSIZE);
-    int screenYRes = ::GetDeviceCaps(dc, VERTRES);
+    ScreenHDC dc;

     int logPPIScreenX = ::GetDeviceCaps(dc, LOGPIXELSX);
     int logPPIScreenY = ::GetDeviceCaps(dc, LOGPIXELSY);
     m_previewPrintout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
 
     int logPPIScreenX = ::GetDeviceCaps(dc, LOGPIXELSX);
     int logPPIScreenY = ::GetDeviceCaps(dc, LOGPIXELSY);
     m_previewPrintout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
 

-    ::ReleaseDC(NULL, dc);
-

     // Get a device context for the currently selected printer
     wxPrinterDC printerDC(m_printDialogData.GetPrintData());
 
     // Get a device context for the currently selected printer
     wxPrinterDC printerDC(m_printDialogData.GetPrintData());
 

-    int printerWidth = 150;
-    int printerHeight = 250;
-    int printerXRes = 1500;
-    int printerYRes = 2500;
+    int printerWidthMM;
+    int printerHeightMM;
+    int printerXRes;
+    int printerYRes;
+    int logPPIPrinterX;
+    int logPPIPrinterY;
+
+    wxRect paperRect;

 
 

-    dc = GetHdcOf(printerDC);
-    if ( dc )
+    if ( printerDC.IsOk() )

     {
     {

-        printerWidth = ::GetDeviceCaps(dc, HORZSIZE);
-        printerHeight = ::GetDeviceCaps(dc, VERTSIZE);
+        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);
         printerXRes = ::GetDeviceCaps(dc, HORZRES);
         printerYRes = ::GetDeviceCaps(dc, VERTRES);

+        logPPIPrinterX = ::GetDeviceCaps(dc, LOGPIXELSX);
+        logPPIPrinterY = ::GetDeviceCaps(dc, LOGPIXELSY);

 
 

-        int logPPIPrinterX = ::GetDeviceCaps(dc, LOGPIXELSX);
-        int logPPIPrinterY = ::GetDeviceCaps(dc, LOGPIXELSY);
+        paperRect = printerDC.GetPaperRect();

 
 

-        m_previewPrintout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
-        m_previewPrintout->SetPageSizeMM(printerWidth, printerHeight);
-
-        if (logPPIPrinterX == 0 || logPPIPrinterY == 0 || printerWidth == 0 || printerHeight == 0)
-            m_isOk = FALSE;
+        if ( logPPIPrinterX == 0 ||
+                logPPIPrinterY == 0 ||
+                    printerWidthMM == 0 ||
+                        printerHeightMM == 0 )
+        {
+            m_isOk = false;
+        }

     }
     else
     }
     else

-        m_isOk = FALSE;
-
+    {
+        // 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_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.
 
     // 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)screenYRes/(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;
 
 {
     MSG msg;
 


@@ -433,15 +448,15 @@ LONG APIENTRY _EXPORT wxAbortProc(HDC WXUNUSED(hPr), int WXUNUSED(Code))
 
     /* Process messages intended for the abort dialog box */
 
 
     /* Process messages intended for the abort dialog box */
 

-    while (!wxPrinterBase::sm_abortIt && PeekMessage(&msg, 0, 0, 0, TRUE))
+    while (!wxPrinterBase::sm_abortIt && ::PeekMessage(&msg, 0, 0, 0, TRUE))

         if (!IsDialogMessage((HWND) wxPrinterBase::sm_abortWindow->GetHWND(), &msg)) {
             TranslateMessage(&msg);
             DispatchMessage(&msg);
         }
 
         if (!IsDialogMessage((HWND) wxPrinterBase::sm_abortWindow->GetHWND(), &msg)) {
             TranslateMessage(&msg);
             DispatchMessage(&msg);
         }
 

-        /* bAbort is TRUE (return is FALSE) if the user has aborted */
+    /* bAbort is TRUE (return is FALSE) if the user has aborted */

 
 

-        return (!wxPrinterBase::sm_abortIt);
+    return !wxPrinterBase::sm_abortIt;

 }
 
 #endif
 }
 
 #endif