Author: manolo
Date: 2012-02-20 04:03:14 -0800 (Mon, 20 Feb 2012)
New Revision: 9247
Log:
Removed useless virtual qualifier of functions
fltk3::PagedDevice::print_widget() and print_window_part() - cont'd
Modified:
branches/branch-3.0/include/FL/Fl_Paged_Device.H
branches/branch-3.0/include/FL/Fl_Printer.H
Modified: branches/branch-3.0/include/FL/Fl_Paged_Device.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Paged_Device.H 2012-02-20 10:23:09 UTC
(rev 9246)
+++ branches/branch-3.0/include/FL/Fl_Paged_Device.H 2012-02-20 12:03:14 UTC
(rev 9247)
@@ -137,7 +137,7 @@
((fltk3::PagedDevice*)_p)->untranslate();
}
- virtual void print_widget(Fl_Widget* widget, int delta_x = 0, int delta_y =
0) {
+ void print_widget(Fl_Widget* widget, int delta_x = 0, int delta_y = 0) {
((fltk3::PagedDevice*)_p)->print_widget(fltk3::_1to3_widget(widget),
delta_x, delta_y);
}
@@ -145,7 +145,7 @@
((fltk3::PagedDevice*)_p)->print_window(fltk3::_1to3_window(win),
x_offset, y_offset);
}
- virtual void print_window_part(Fl_Window *win, int x, int y, int w, int h,
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) {
((fltk3::PagedDevice*)_p)->print_window_part(fltk3::_1to3_window(win), x,
y, w, h, delta_x, delta_y);
}
Modified: branches/branch-3.0/include/FL/Fl_Printer.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Printer.H 2012-02-20 10:23:09 UTC (rev
9246)
+++ branches/branch-3.0/include/FL/Fl_Printer.H 2012-02-20 12:03:14 UTC (rev
9247)
@@ -35,7 +35,7 @@
#include <FL/fl_draw.H>
#include <FL/Fl_Pixmap.H>
#include <FL/Fl_RGB_Image.H>
-#include <FL/Fl_Bitmap.H>
+//#include <FL/Fl_Bitmap.H>
#include <stdio.h>
#if !(defined(__APPLE__) || defined(WIN32))
#include <FL/Fl_PostScript.H>
@@ -102,17 +102,9 @@
}
void end_job (void) {
- end_job();
+ ((fltk3::Printer*)_p)->end_job();
}
- void print_widget(Fl_Widget* widget, int delta_x=0, int delta_y=0) {
- ((fltk3::Printer*)_p)->print_widget(fltk3::_1to3_widget(widget), delta_x,
delta_y);
- }
-
- void print_window_part(Fl_Window *win, int x, int y, int w, int h, int
delta_x=0, int delta_y=0) {
- ((fltk3::Printer*)_p)->print_window_part(fltk3::_1to3_window(win), x, y,
w, h, delta_x, delta_y);
- }
-
void set_current(void) {
((fltk3::Printer*)_p)->set_current();
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
