Ensure there is valid context for DrawRectangle

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

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index 37e9018b5d4d786f16accd4b9f513902e42e8b93..0c8a2ed6521397984245a0c38f0d57a7317d5c5f 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>
 
 // ---------------------------------------------------------------------------


@@ -166,7 +167,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     m_printDialogData.SetMinPage(minPage);
     m_printDialogData.SetMaxPage(maxPage);
 
     m_printDialogData.SetMinPage(minPage);
     m_printDialogData.SetMaxPage(maxPage);
 

-    wxWindow *win = CreateAbortWindow(parent, printout);
+    wxPrintAbortDialog *win = CreateAbortWindow(parent, printout);

     wxYield();
 
     ::SetAbortProc(GetHdcOf(*impl), wxAbortProc);
     wxYield();
 
     ::SetAbortProc(GetHdcOf(*impl), wxAbortProc);


@@ -195,10 +196,8 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
         maxPageNum = m_printDialogData.GetToPage();
     }
 
         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) )
         {
     {
         if ( !printout->OnBeginDocument(minPageNum, maxPageNum) )
         {


@@ -218,6 +217,10 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
               pn <= maxPageNum && printout->HasPage(pn);
               pn++ )
         {
               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_abortIt )
             {
                 sm_lastError = wxPRINTER_CANCELLED;


@@ -243,8 +246,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;


@@ -391,6 +393,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


@@ -436,7 +439,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))
 {