Disable some wxWebView tests that fail on the buildbot but not locally.

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

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index 26aa924725b18a5272e0a21b74d530a9439517bd..9018f7de7031374093ceeb7ce31959bd100d4023 100644 (file)
--- 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/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 <stdlib.h>
 
 // ---------------------------------------------------------------------------
 #include <stdlib.h>
 
 // ---------------------------------------------------------------------------


@@ -90,8 +91,6 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
         return false;
     }
 
         return false;
     }
 

-    printout->SetIsPreview(false);
-

     if (m_printDialogData.GetMinPage() < 1)
         m_printDialogData.SetMinPage(1);
     if (m_printDialogData.GetMaxPage() < 1)
     if (m_printDialogData.GetMinPage() < 1)
         m_printDialogData.SetMinPage(1);
     if (m_printDialogData.GetMaxPage() < 1)


@@ -245,8 +244,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     if (sm_abortWindow)
     {
         sm_abortWindow->Show(false);
     if (sm_abortWindow)
     {
         sm_abortWindow->Show(false);

-        delete sm_abortWindow;
-        sm_abortWindow = NULL;
+        wxDELETE(sm_abortWindow);

     }
 
     delete dc;
     }
 
     delete dc;


@@ -393,6 +391,7 @@ void wxWindowsPrintPreview::DetermineScaling()
     m_previewScaleY = float(logPPIScreenY) / logPPIPrinterY;
 }
 
     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
 bool wxWindowsPrintPreview::RenderPageIntoBitmap(wxBitmap& bmp, int pageNum)
 {
     // The preview, as implemented in wxPrintPreviewBase (and as used prior to


@@ -438,7 +437,7 @@ bool wxWindowsPrintPreview::RenderPageIntoBitmap(wxBitmap& bmp, int pageNum)
 
     return true;
 }
 
     return true;
 }

-
+#endif // wxUSE_ENH_METAFILE

 
 BOOL CALLBACK wxAbortProc(HDC WXUNUSED(hdc), int WXUNUSED(error))
 {
 
 BOOL CALLBACK wxAbortProc(HDC WXUNUSED(hdc), int WXUNUSED(error))
 {