Author: manolo
Date: 2012-02-20 02:23:09 -0800 (Mon, 20 Feb 2012)
New Revision: 9246
Log:
Removed useless virtual qualifier of functions
fltk3::PagedDevice::print_widget() and print_window_part()
Modified:
branches/branch-3.0/include/fltk3/PagedDevice.h
branches/branch-3.0/include/fltk3/Printer.h
branches/branch-3.0/src/fltk3/PagedDevice.cxx
branches/branch-3.0/src/fltk3/Printer.cxx
Modified: branches/branch-3.0/include/fltk3/PagedDevice.h
===================================================================
--- branches/branch-3.0/include/fltk3/PagedDevice.h 2012-02-19 16:15:12 UTC
(rev 9245)
+++ branches/branch-3.0/include/fltk3/PagedDevice.h 2012-02-20 10:23:09 UTC
(rev 9246)
@@ -133,7 +133,7 @@
virtual void rotate(float angle);
virtual void translate(int x, int y);
virtual void untranslate(void);
- virtual void print_widget(fltk3::Widget* widget, int delta_x = 0, int
delta_y = 0);
+ void print_widget(fltk3::Widget* widget, int delta_x = 0, int delta_y = 0);
/** Prints a window with its title bar and frame if any.
\p x_offset and \p y_offset are optional coordinates of where to position
the window top left.
@@ -142,7 +142,7 @@
printed window.
*/
void print_window(fltk3::Window *win, int x_offset = 0, int y_offset = 0);
- virtual void print_window_part(fltk3::Window *win, int x, int y, int w,
int h, int delta_x = 0, int delta_y = 0);
+ void print_window_part(fltk3::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-3.0/include/fltk3/Printer.h
===================================================================
--- branches/branch-3.0/include/fltk3/Printer.h 2012-02-19 16:15:12 UTC (rev
9245)
+++ branches/branch-3.0/include/fltk3/Printer.h 2012-02-20 10:23:09 UTC (rev
9246)
@@ -173,8 +173,6 @@
void untranslate(void);
int end_page (void);
void end_job (void);
- void print_widget(fltk3::Widget* widget, int delta_x=0, int delta_y=0);
- void print_window_part(fltk3::Window *win, int x, int y, int w, int h, int
delta_x=0, int delta_y=0);
void set_current(void);
fltk3::GraphicsDriver* driver(void);
/** \brief The destructor */
Modified: branches/branch-3.0/src/fltk3/PagedDevice.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/PagedDevice.cxx 2012-02-19 16:15:12 UTC
(rev 9245)
+++ branches/branch-3.0/src/fltk3/PagedDevice.cxx 2012-02-20 10:23:09 UTC
(rev 9246)
@@ -140,7 +140,7 @@
image_data = fltk3::read_image(NULL, x, y, w, h);
if (save_front != win) save_front->show();
current->set_current();
- fltk3::draw_image(image_data, delta_x, delta_y, w, h, 3);
+ current->driver()->draw_image(image_data, delta_x, delta_y, w, h, 3);
delete[] image_data;
#ifdef WIN32
fl_gc = GetDC(fl_xid(win));
Modified: branches/branch-3.0/src/fltk3/Printer.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Printer.cxx 2012-02-19 16:15:12 UTC (rev
9245)
+++ branches/branch-3.0/src/fltk3/Printer.cxx 2012-02-20 10:23:09 UTC (rev
9246)
@@ -171,16 +171,6 @@
printer->end_job();
}
-void fltk3::Printer::print_widget(fltk3::Widget* widget, int delta_x, int
delta_y)
-{
- printer->print_widget(widget, delta_x, delta_y);
-}
-
-void fltk3::Printer::print_window_part(fltk3::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);
-}
-
void fltk3::Printer::set_current(void)
{
printer->set_current();
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
