mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix return values of Fl_Printer::begin_job() with GTK dialogs

Browse Source
This commit is contained in:
ManoloFLTK 2024-08-28 17:56:54 +02:00
parent 86241ea9b5
commit b124ac9066
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/drivers/Posix/Fl_Posix_Printer_Driver.cxx
View File

@ -43,8 +43,11 @@ class Fl_Posix_Printer_Driver : public Fl_PostScript_File_Device {
#define GTK_PAPER_NAME_JB5 "jis_b5" #define GTK_PAPER_NAME_JB5 "jis_b5"
#define GTK_PAPER_NAME_TABLOID "na_ledger" #define GTK_PAPER_NAME_TABLOID "na_ledger"
#define GTK_PAPER_NAME_DLE "iso_dl" #define GTK_PAPER_NAME_DLE "iso_dl"
#define GTK_RESPONSE_NONE 0 #define GTK_RESPONSE_NONE -1
#define GTK_RESPONSE_REJECT -2
#define GTK_RESPONSE_OK -5 #define GTK_RESPONSE_OK -5
#define GTK_RESPONSE_CANCEL -6
#define GTK_RESPONSE_DELETE_EVENT -4
#define GTK_PRINT_PAGES_RANGES 2 #define GTK_PRINT_PAGES_RANGES 2
class Fl_GTK_Printer_Driver : public Fl_PostScript_File_Device { class Fl_GTK_Printer_Driver : public Fl_PostScript_File_Device {
public: public:
@ -195,7 +198,7 @@ int Fl_GTK_Printer_Driver::begin_job(int pagecount, int *firstpage, int *lastpag
Fl_PostScript_File_Device::begin_job(output, 0, format, layout); Fl_PostScript_File_Device::begin_job(output, 0, format, layout);
response_id = GTK_RESPONSE_OK; response_id = GTK_RESPONSE_OK;
} else { } else {
response_id = GTK_RESPONSE_NONE + GTK_RESPONSE_OK + 1; response_id = GTK_RESPONSE_REJECT;
if (perr_message) { if (perr_message) {
*perr_message = new char[strlen(line)+50]; *perr_message = new char[strlen(line)+50];
snprintf(*perr_message, strlen(line)+50, "Can't open output file %s", line); snprintf(*perr_message, strlen(line)+50, "Can't open output file %s", line);
@ -211,7 +214,7 @@ int Fl_GTK_Printer_Driver::begin_job(int pagecount, int *firstpage, int *lastpag
pjob = CALL_GTK(gtk_print_job_new)("FLTK print job", gprinter, psettings, psetup); //2.10 pjob = CALL_GTK(gtk_print_job_new)("FLTK print job", gprinter, psettings, psetup); //2.10
response_id = GTK_RESPONSE_OK; response_id = GTK_RESPONSE_OK;
} else { } else {
response_id = GTK_RESPONSE_NONE + GTK_RESPONSE_OK + 1; response_id = GTK_RESPONSE_REJECT;
if (perr_message) { if (perr_message) {
*perr_message = new char[strlen(tmpfilename)+50]; *perr_message = new char[strlen(tmpfilename)+50];
snprintf(*perr_message, strlen(tmpfilename)+50, "Can't create temporary file %s", tmpfilename); snprintf(*perr_message, strlen(tmpfilename)+50, "Can't create temporary file %s", tmpfilename);
@ -231,7 +234,9 @@ int Fl_GTK_Printer_Driver::begin_job(int pagecount, int *firstpage, int *lastpag
while (Fl::ready()) Fl::check(); while (Fl::ready()) Fl::check();
Fl_Surface_Device::pop_current(); Fl_Surface_Device::pop_current();
} }
return (response_id == GTK_RESPONSE_OK ? 0 : (response_id == GTK_RESPONSE_NONE ? 1 : 2)); if (response_id == GTK_RESPONSE_OK) return 0;
if (response_id == GTK_RESPONSE_CANCEL || response_id == GTK_RESPONSE_DELETE_EVENT) return 1;
return 2;
} }
static void pJobCompleteFunc(Fl_GTK_Printer_Driver::GtkPrintJob *print_job, Fl_GTK_Printer_Driver::gboolean *user_data, const Fl_GTK_Printer_Driver::GError *error) { static void pJobCompleteFunc(Fl_GTK_Printer_Driver::GtkPrintJob *print_job, Fl_GTK_Printer_Driver::gboolean *user_data, const Fl_GTK_Printer_Driver::GError *error) {