From: Stefan Csomor Date: Fri, 10 Jan 2003 17:52:54 +0000 (+0000) Subject: switching to safe yields, because we got into loops when handling print document... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/72625f830b9469204f9ee13cf712df562cf28a4c switching to safe yields, because we got into loops when handling print document apple events 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 1240fd6622..60d15137cf 100644 --- 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 1240fd6622..60d15137cf 100644 --- 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);