diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2020-04-22 15:59:22 +0200 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2020-04-22 16:01:33 +0200 |
| commit | 2878fa95ab4e30046472a8c1f7576aa6a39f8ba5 (patch) | |
| tree | b37fec88aee27a8e1095b649f10017d44ef69d60 /FL | |
| parent | b38317b8a5c5aa6b37d4eb559b094da4e31d9a44 (diff) | |
Add optional argument to Fl_Printer::begin_job() to inform caller when an error occurs.
This solves an issue raised in fltk.general : Fl_Printer errors - how can I interpret them?
https://www.fltk.org/newsgroups.php?s38419+gfltk.general+v38427
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Paged_Device.H | 8 | ||||
| -rw-r--r-- | FL/Fl_PostScript.H | 2 | ||||
| -rw-r--r-- | FL/Fl_Printer.H | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/FL/Fl_Paged_Device.H b/FL/Fl_Paged_Device.H index db6fab3ce..154fb5d7a 100644 --- a/FL/Fl_Paged_Device.H +++ b/FL/Fl_Paged_Device.H @@ -103,10 +103,12 @@ public: static const page_format page_formats[NO_PAGE_FORMATS]; /** \brief The destructor */ virtual ~Fl_Paged_Device() {}; - virtual int begin_job(int pagecount = 0, int *frompage = NULL, int *topage = NULL); - /** Synonym of begin_job(int pagecount, int *frompage, int *topage). + virtual int begin_job(int pagecount = 0, int *frompage = NULL, int *topage = NULL, char **perr_message = NULL); + /** Synonym of begin_job(int pagecount, int *frompage, int *topage, char **perr_message). For API compatibility with FLTK 1.3.x */ - int start_job(int pagecount = 0, int *frompage = NULL, int *topage = NULL) {return begin_job(pagecount, frompage, topage);} + int start_job(int pagecount = 0, int *frompage = NULL, int *topage = NULL, char **perr_message = NULL) { + return begin_job(pagecount, frompage, topage, perr_message); + } virtual int begin_page(void); /** Synonym of begin_page(). For API compatibility with FLTK 1.3.x */ diff --git a/FL/Fl_PostScript.H b/FL/Fl_PostScript.H index 470943268..6d26490dc 100644 --- a/FL/Fl_PostScript.H +++ b/FL/Fl_PostScript.H @@ -258,7 +258,7 @@ public: */ ~Fl_PostScript_File_Device(); /** Don't use with this class. */ - int begin_job(int pagecount, int* from, int* to); + int begin_job(int pagecount, int* from, int* to, char **perr_message); /** @brief Begins the session where all graphics requests will go to a local PostScript file. * diff --git a/FL/Fl_Printer.H b/FL/Fl_Printer.H index 977f75762..43b05c1be 100644 --- a/FL/Fl_Printer.H +++ b/FL/Fl_Printer.H @@ -93,7 +93,7 @@ private: public: /** The constructor */ Fl_Printer(void); - int begin_job(int pagecount = 0, int *frompage = NULL, int *topage = NULL); + int begin_job(int pagecount = 0, int *frompage = NULL, int *topage = NULL, char **perr_message = NULL); int begin_page(void); int printable_rect(int *w, int *h); void margins(int *left, int *top, int *right, int *bottom); |
