Author: manolo
Date: 2011-01-31 07:53:23 -0800 (Mon, 31 Jan 2011)
New Revision: 8342
Log:
Introduction of the Fl_Printer class requires all member functions of class
Fl_Paged_Device to be virtual. That is done here.
Modified:
branches/branch-1.3/FL/Fl_Paged_Device.H
branches/branch-1.3/FL/Fl_PostScript.H
branches/branch-1.3/FL/Fl_Printer.H
branches/branch-1.3/src/Fl_PostScript.cxx
branches/branch-1.3/src/Fl_Printer.cxx
Modified: branches/branch-1.3/FL/Fl_Paged_Device.H
===================================================================
--- branches/branch-1.3/FL/Fl_Paged_Device.H 2011-01-31 13:02:55 UTC (rev
8341)
+++ branches/branch-1.3/FL/Fl_Paged_Device.H 2011-01-31 15:53:23 UTC (rev
8342)
@@ -123,7 +123,7 @@
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 @@
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);
};
Modified: branches/branch-1.3/FL/Fl_PostScript.H
===================================================================
--- branches/branch-1.3/FL/Fl_PostScript.H 2011-01-31 13:02:55 UTC (rev
8341)
+++ branches/branch-1.3/FL/Fl_PostScript.H 2011-01-31 15:53:23 UTC (rev
8342)
@@ -232,6 +232,7 @@
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);
Modified: branches/branch-1.3/FL/Fl_Printer.H
===================================================================
--- branches/branch-1.3/FL/Fl_Printer.H 2011-01-31 13:02:55 UTC (rev 8341)
+++ branches/branch-1.3/FL/Fl_Printer.H 2011-01-31 15:53:23 UTC (rev 8342)
@@ -83,6 +83,7 @@
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 @@
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 @@
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);
Modified: branches/branch-1.3/src/Fl_PostScript.cxx
===================================================================
--- branches/branch-1.3/src/Fl_PostScript.cxx 2011-01-31 13:02:55 UTC (rev
8341)
+++ branches/branch-1.3/src/Fl_PostScript.cxx 2011-01-31 15:53:23 UTC (rev
8342)
@@ -1386,6 +1386,11 @@
return 0;
}
+void Fl_PostScript_File_Device::origin(int *x, int *y)
+{
+ Fl_Paged_Device::origin(x, y);
+}
+
void Fl_PostScript_File_Device::origin(int x, int y)
{
x_offset = x;
Modified: branches/branch-1.3/src/Fl_Printer.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Printer.cxx 2011-01-31 13:02:55 UTC (rev
8341)
+++ branches/branch-1.3/src/Fl_Printer.cxx 2011-01-31 15:53:23 UTC (rev
8342)
@@ -94,6 +94,12 @@
#endif
this->Fl_Surface_Device::set_current();
}
+
+void Fl_System_Printer::origin(int *x, int *y)
+{
+ Fl_Paged_Device::origin(x, y);
+}
+
#endif
Fl_Printer::Fl_Printer(void) {
@@ -125,6 +131,11 @@
printer->margins(left, top, right, bottom);
}
+void Fl_Printer::origin(int *x, int *y)
+{
+ printer->origin(x, y);
+}
+
void Fl_Printer::origin(int x, int y)
{
printer->origin(x, y);
@@ -160,13 +171,16 @@
printer->end_job();
}
-#ifdef __APPLE__
-void Fl_Printer::add_image(const uchar *data)
+void Fl_Printer::print_widget(Fl_Widget* widget, int delta_x, int delta_y)
{
- printer->add_image(data);
+ printer->print_widget(widget, delta_x, delta_y);
}
-#endif
+void Fl_Printer::print_window_part(Fl_Window *win, int x, int y, int w, int h,
int delta_x, int delta_y)
+{
+ printer->print_window_part(win, x, y, w, h, delta_x, delta_y);
+}
+
Fl_Printer::~Fl_Printer(void)
{
delete printer;
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
