switching to safe yields, because we got into loops when handling print document...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/printmac.cpp b/src/mac/carbon/printmac.cpp
index 1240fd6622e3fb693bb9d06f44c205d0d6baf3cc..60d15137cff0c1269f91d9f91133a0d9174d1b0f 100644 (file)
--- a/src/mac/carbon/printmac.cpp
+++ b/src/mac/carbon/printmac.cpp
@@ -139,7 +139,7 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
   wxBeginBusyCursor();
 
   wxWindow *win = CreateAbortWindow(parent, printout);
-  wxYield();
+  wxSafeYield(win,true);
 
   if (!win)
   {
@@ -150,7 +150,7 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
   }
   sm_abortWindow = win;
   sm_abortWindow->Show(TRUE);
-  wxYield();
+  wxSafeYield(win,true);
 
   printout->OnBeginPrinting();
   
@@ -181,8 +181,8 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
       {
                GrafPtr thePort ;
                GetPort( &thePort ) ;
-               wxYield() ;
-               SetPort( thePort ) ;
+               wxSafeYield(win,true);
+        SetPort( thePort ) ;
 
         dc->StartPage();
         keepGoing = printout->OnPrintPage(pn);

diff --git a/src/mac/printmac.cpp b/src/mac/printmac.cpp
index 1240fd6622e3fb693bb9d06f44c205d0d6baf3cc..60d15137cff0c1269f91d9f91133a0d9174d1b0f 100644 (file)
--- a/src/mac/printmac.cpp
+++ b/src/mac/printmac.cpp
@@ -139,7 +139,7 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
   wxBeginBusyCursor();
 
   wxWindow *win = CreateAbortWindow(parent, printout);
-  wxYield();
+  wxSafeYield(win,true);
 
   if (!win)
   {
@@ -150,7 +150,7 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
   }
   sm_abortWindow = win;
   sm_abortWindow->Show(TRUE);
-  wxYield();
+  wxSafeYield(win,true);
 
   printout->OnBeginPrinting();
   
@@ -181,8 +181,8 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
       {
                GrafPtr thePort ;
                GetPort( &thePort ) ;
-               wxYield() ;
-               SetPort( thePort ) ;
+               wxSafeYield(win,true);
+        SetPort( thePort ) ;
 
         dc->StartPage();
         keepGoing = printout->OnPrintPage(pn);