added new project file having the new files

[wxWidgets.git] / src / mac / printmac.cpp

diff --git a/src/mac/printmac.cpp b/src/mac/printmac.cpp
index 08a6bf77adc5cff8fed862dd499249361a3e0c25..426bd42de32f1ef498dc99f58deb2da4b8b2cd40 100644 (file)
--- a/src/mac/printmac.cpp
+++ b/src/mac/printmac.cpp
@@ -136,7 +136,6 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
   // Create an abort window
   wxBeginBusyCursor();
 
   // Create an abort window
   wxBeginBusyCursor();
 

-/*

   wxWindow *win = CreateAbortWindow(parent, printout);
   wxYield();
 
   wxWindow *win = CreateAbortWindow(parent, printout);
   wxYield();
 


@@ -145,11 +144,11 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
     wxEndBusyCursor();
     wxMessageBox("Sorry, could not create an abort dialog.", "Print Error", wxOK, parent);
     delete dc;
     wxEndBusyCursor();
     wxMessageBox("Sorry, could not create an abort dialog.", "Print Error", wxOK, parent);
     delete dc;

+    return FALSE;

   }
   sm_abortWindow = win;
   sm_abortWindow->Show(TRUE);
   wxYield();
   }
   sm_abortWindow = win;
   sm_abortWindow->Show(TRUE);
   wxYield();

-*/

 
   printout->OnBeginPrinting();
   
 
   printout->OnBeginPrinting();
   


@@ -178,6 +177,11 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
       }
       else
       {
       }
       else
       {

+               GrafPtr thePort ;
+               GetPort( &thePort ) ;
+               wxYield() ;
+               SetPort( thePort ) ;
+

         dc->StartPage();
         keepGoing = printout->OnPrintPage(pn);
         dc->EndPage();
         dc->StartPage();
         keepGoing = printout->OnPrintPage(pn);
         dc->EndPage();