X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1bd122ddfa1d4d3e5f87ecb1e7dd317439fb6593..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/msw/printwin.cpp diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp index 37e9018b5d..9018f7de70 100644 --- a/src/msw/printwin.cpp +++ b/src/msw/printwin.cpp @@ -49,8 +49,9 @@ #include "wx/msw/printdlg.h" #include "wx/msw/private.h" #include "wx/msw/dcprint.h" -#include "wx/msw/enhmeta.h" - +#if wxUSE_ENH_METAFILE + #include "wx/msw/enhmeta.h" +#endif #include // --------------------------------------------------------------------------- @@ -243,8 +244,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt if (sm_abortWindow) { sm_abortWindow->Show(false); - delete sm_abortWindow; - sm_abortWindow = NULL; + wxDELETE(sm_abortWindow); } delete dc; @@ -391,6 +391,7 @@ void wxWindowsPrintPreview::DetermineScaling() 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 @@ -436,7 +437,7 @@ bool wxWindowsPrintPreview::RenderPageIntoBitmap(wxBitmap& bmp, int pageNum) return true; } - +#endif // wxUSE_ENH_METAFILE BOOL CALLBACK wxAbortProc(HDC WXUNUSED(hdc), int WXUNUSED(error)) {