Added #include wx/dcclient.h and wx/settings.h for Vadims new code under

[wxWidgets.git] / src / generic / printps.cpp

diff --git a/src/generic/printps.cpp b/src/generic/printps.cpp
index e9b819b6fc44b49b62529c94a9b226f72e9b5a22..3317b1df0abc71ae91550e5b5a66c15f430c0a33 100644 (file)
--- a/src/generic/printps.cpp
+++ b/src/generic/printps.cpp
@@ -30,6 +30,8 @@
 
 #include "wx/defs.h"
 
+#if wxUSE_PRINTING_ARCHITECTURE
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dc.h"
@@ -176,7 +178,8 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
        printout->GetTitle(),
        _("Printing..."),
        totalPages,
-       parent );
+       parent,
+       wxPD_CAN_ABORT|wxPD_AUTO_HIDE|wxPD_APP_MODAL);
     
     printout->OnBeginPrinting();
 
@@ -215,10 +218,11 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
                }
                else
                {
-                  sm_abortIt = true;
-                  keepGoing = false;
+                  sm_abortIt = TRUE;
+                  keepGoing = FALSE;
                }
             }
+           wxYield();
         }
         printout->OnEndDocument();
     }
@@ -345,3 +349,4 @@ void wxPostScriptPrintPreview::DetermineScaling()
     }
 }
 
+#endif