return if abort dialog couldn't be created (part of patch 1160117)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -210,6 +210,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
|
|||||||
sm_lastError = wxPRINTER_ERROR;
|
sm_lastError = wxPRINTER_ERROR;
|
||||||
|
|
||||||
delete dc;
|
delete dc;
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
sm_abortWindow = win;
|
sm_abortWindow = win;
|
||||||
sm_abortWindow->Show();
|
sm_abortWindow->Show();
|
||||||
@@ -281,7 +282,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
|
|||||||
|
|
||||||
delete dc;
|
delete dc;
|
||||||
|
|
||||||
return (sm_lastError == wxPRINTER_NO_ERROR);
|
return sm_lastError == wxPRINTER_NO_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent)
|
wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent)
|
||||||
@@ -430,7 +431,7 @@ LONG APIENTRY _EXPORT wxAbortProc(HDC WXUNUSED(hPr), int WXUNUSED(Code))
|
|||||||
|
|
||||||
/* bAbort is TRUE (return is FALSE) if the user has aborted */
|
/* bAbort is TRUE (return is FALSE) if the user has aborted */
|
||||||
|
|
||||||
return (!wxPrinterBase::sm_abortIt);
|
return !wxPrinterBase::sm_abortIt;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user