diff options
| author | Manolo Gouy <Manolo> | 2011-01-31 15:53:23 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2011-01-31 15:53:23 +0000 |
| commit | 535f0c2d3b17b20723bd5520d91531eda62e5ffe (patch) | |
| tree | adf79fd9692054f4c1bc66fcac7d2f82d19b0814 /FL | |
| parent | 1993f08a33c95167b7a90579ffb178c6af625086 (diff) | |
Introduction of the Fl_Printer class requires all member functions of class
Fl_Paged_Device to be virtual. That is done here.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8342 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Paged_Device.H | 8 | ||||
| -rw-r--r-- | FL/Fl_PostScript.H | 1 | ||||
| -rw-r--r-- | FL/Fl_Printer.H | 7 |
3 files changed, 9 insertions, 7 deletions
diff --git a/FL/Fl_Paged_Device.H b/FL/Fl_Paged_Device.H index 05db7fda5..592ef82be 100644 --- a/FL/Fl_Paged_Device.H +++ b/FL/Fl_Paged_Device.H @@ -123,7 +123,7 @@ protected: int y_offset; #ifdef __APPLE__ struct chain_elt *image_list_; // chained list of images used in this page - virtual void add_image(const uchar *data); // adds an image to the page image list + void add_image(const uchar *data); // adds an image to the page image list void delete_image_list(); // deletes the page image list #endif /** \brief The constructor */ @@ -137,13 +137,13 @@ public: virtual int printable_rect(int *w, int *h); virtual void margins(int *left, int *top, int *right, int *bottom); virtual void origin(int x, int y); - void origin(int *x, int *y); + virtual void origin(int *x, int *y); virtual void scale(float scale_x, float scale_y); virtual void rotate(float angle); virtual void translate(int x, int y); virtual void untranslate(void); - void print_widget(Fl_Widget* widget, int delta_x = 0, int delta_y = 0); - void print_window_part(Fl_Window *win, int x, int y, int w, int h, int delta_x = 0, int delta_y = 0); + virtual void print_widget(Fl_Widget* widget, int delta_x = 0, int delta_y = 0); + virtual void print_window_part(Fl_Window *win, int x, int y, int w, int h, int delta_x = 0, int delta_y = 0); virtual int end_page (void); virtual void end_job (void); }; diff --git a/FL/Fl_PostScript.H b/FL/Fl_PostScript.H index 43c08b7eb..2a734480a 100644 --- a/FL/Fl_PostScript.H +++ b/FL/Fl_PostScript.H @@ -232,6 +232,7 @@ public: int start_page (void); int printable_rect(int *w, int *h); void margins(int *left, int *top, int *right, int *bottom); + void origin(int *x, int *y); void origin(int x, int y); void scale (float scale_x, float scale_y); void rotate(float angle); diff --git a/FL/Fl_Printer.H b/FL/Fl_Printer.H index 092bec18f..cc6e4cedc 100644 --- a/FL/Fl_Printer.H +++ b/FL/Fl_Printer.H @@ -83,6 +83,7 @@ public: int start_page (void); int printable_rect(int *w, int *h); void margins(int *left, int *top, int *right, int *bottom); + void origin(int *x, int *y); void origin(int x, int y); void scale (float scale_x, float scale_y); void rotate(float angle); @@ -157,6 +158,7 @@ public: int start_page(void); int printable_rect(int *w, int *h); void margins(int *left, int *top, int *right, int *bottom); + void origin(int *x, int *y); void origin(int x, int y); void scale(float scale_x, float scale_y); void rotate(float angle); @@ -164,9 +166,8 @@ public: void untranslate(void); int end_page (void); void end_job (void); -#ifdef __APPLE__ - void add_image(const uchar *data); -#endif + void print_widget(Fl_Widget* widget, int delta_x=0, int delta_y=0); + void print_window_part(Fl_Window *win, int x, int y, int w, int h, int delta_x=0, int delta_y=0); /** \brief The destructor */ ~Fl_Printer(void); |