gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New CMake option OPTION_PRINT_SUPPORT - continued

Browse Source 
The previous version (r11127) had FL/Fl_Printer.H include config.h
That is not allowed. This commit repairs that.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11130 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2016-02-06 05:56:38 +00:00
parent d8cebd1fdf
commit a278a478fd
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
FL/Fl_Printer.H
View File

@ -23,7 +23,6 @@
#ifndef Fl_Printer_H
#define Fl_Printer_H
#include "config.h"
#include <FL/x.H>
#include <FL/Fl_Paged_Device.H>
#include <FL/fl_draw.H>
@ -192,7 +191,6 @@ public:
const char *class_name() {return class_id;};
/** \brief The constructor */
Fl_Printer(void);
#ifndef NO_PRINT_SUPPORT
int start_job(int pagecount, int *frompage = NULL, int *topage = NULL);
int start_page(void);
int printable_rect(int *w, int *h);
@ -245,7 +243,6 @@ private:
#else
Fl_PostScript_Printer *printer;
#endif
#endif // NO_PRINT_SUPPORT
};
#endif // Fl_Printer_H

38
src/Fl_Printer.cxx
View File

@ -24,7 +24,45 @@ const char *Fl_Printer::class_id = "Fl_Printer";
#ifdef NO_PRINT_SUPPORT
Fl_Printer::Fl_Printer(void) {
printer = NULL;
}
int Fl_Printer::start_job(int pagecount, int *frompage, int *topage) {return 1;}
int Fl_Printer::start_page(void) {return 1;}
int Fl_Printer::printable_rect(int *w, int *h) {return 1;}
void Fl_Printer::margins(int *left, int *top, int *right, int *bottom) {}
void Fl_Printer::origin(int *x, int *y) {}
void Fl_Printer::origin(int x, int y) {}
void Fl_Printer::scale(float scale_x, float scale_y) {}
void Fl_Printer::rotate(float angle) {}
void Fl_Printer::translate(int x, int y) {}
void Fl_Printer::untranslate(void) {}
int Fl_Printer::end_page (void) {return 1;}
void Fl_Printer::end_job (void) {}
void Fl_Printer::print_widget(Fl_Widget* widget, int delta_x, int delta_y) {}
void Fl_Printer::print_window_part(Fl_Window *win, int x, int y, int w, int h, int delta_x, int delta_y) {}
void Fl_Printer::set_current(void) {}
Fl_Graphics_Driver* driver(void) {return NULL;}
Fl_Printer::~Fl_Printer(void) {}
const char *Fl_Printer::dialog_title = NULL;
const char *Fl_Printer::dialog_printer = NULL;
const char *Fl_Printer::dialog_range = NULL;
const char *Fl_Printer::dialog_copies = NULL;
const char *Fl_Printer::dialog_all = NULL;
const char *Fl_Printer::dialog_pages = NULL;
const char *Fl_Printer::dialog_from = NULL;
const char *Fl_Printer::dialog_to = NULL;
const char *Fl_Printer::dialog_properties = NULL;
const char *Fl_Printer::dialog_copyNo = NULL;
const char *Fl_Printer::dialog_print_button = NULL;
const char *Fl_Printer::dialog_cancel_button = NULL;
const char *Fl_Printer::dialog_print_to_file = NULL;
const char *Fl_Printer::property_title = NULL;
const char *Fl_Printer::property_pagesize = NULL;
const char *Fl_Printer::property_mode = NULL;
const char *Fl_Printer::property_use = NULL;
const char *Fl_Printer::property_save = NULL;
const char *Fl_Printer::property_cancel = NULL;
#else