Author: manolo
Date: 2010-03-18 11:02:50 -0700 (Thu, 18 Mar 2010)
New Revision: 7301
Log:
Renamed class Fl_Virtual_Printer into Fl_Abstract_Printer
Modified:
branches/branch-1.3/FL/Fl_Device.H
branches/branch-1.3/FL/Fl_Printer.H
branches/branch-1.3/src/Fl_Bitmap.cxx
branches/branch-1.3/src/Fl_Device.cxx
branches/branch-1.3/src/Fl_GDI_Printer.cxx
branches/branch-1.3/src/Fl_Gl_Device_Plugin.cxx
branches/branch-1.3/src/Fl_Image.cxx
branches/branch-1.3/src/Fl_Pixmap.cxx
Modified: branches/branch-1.3/FL/Fl_Device.H
===================================================================
--- branches/branch-1.3/FL/Fl_Device.H 2010-03-18 17:56:06 UTC (rev 7300)
+++ branches/branch-1.3/FL/Fl_Device.H 2010-03-18 18:02:50 UTC (rev 7301)
@@ -44,7 +44,7 @@
class Fl_Pixmap;
class Fl_Bitmap;
class Fl_Display;
-class Fl_Virtual_Printer;
+class Fl_Abstract_Printer;
extern Fl_Display *fl_display_device;
typedef void (*Fl_Draw_Image_Cb)(void* ,int,int,int,uchar*);
@@ -237,7 +237,7 @@
: Fl_Plugin(klass(), name) { }
virtual const char *klass() { return "fltk:device"; }
virtual const char *name() = 0;
- virtual int print(Fl_Virtual_Printer*, Fl_Widget*, int x, int y) { return 0;
}
+ virtual int print(Fl_Abstract_Printer*, Fl_Widget*, int x, int y) { return
0; }
};
#endif // Fl_Device_H
Modified: branches/branch-1.3/FL/Fl_Printer.H
===================================================================
--- branches/branch-1.3/FL/Fl_Printer.H 2010-03-18 17:56:06 UTC (rev 7300)
+++ branches/branch-1.3/FL/Fl_Printer.H 2010-03-18 18:02:50 UTC (rev 7301)
@@ -51,7 +51,7 @@
*/
class
#ifndef FL_DOXYGEN
- Fl_Virtual_Printer
+ Fl_Abstract_Printer
#else
Fl_Printer
#endif
@@ -74,7 +74,7 @@
void *gc; // the printer's graphics context, if there's one, NULL otherwise
void delete_image_list(); // deletes the page image list
#ifndef FL_DOXYGEN
- Fl_Virtual_Printer(void) { gc = NULL; bg_r_ = bg_g_ = bg_b_ = 0; };
+ Fl_Abstract_Printer(void) { gc = NULL; bg_r_ = bg_g_ = bg_b_ = 0; };
#endif
public:
#ifdef FL_DOXYGEN
@@ -234,7 +234,7 @@
};
#ifdef __APPLE__
-class Fl_Quartz_Printer : public Fl_Virtual_Printer {
+class Fl_Quartz_Printer : public Fl_Abstract_Printer {
private:
float scale_x;
float scale_y;
@@ -259,7 +259,7 @@
#endif
#ifdef WIN32
-class Fl_GDI_Printer : public Fl_Virtual_Printer {
+class Fl_GDI_Printer : public Fl_Abstract_Printer {
private:
int abortPrint;
PRINTDLG pd;
@@ -293,7 +293,7 @@
*/
class Fl_PSfile_Device : public
#ifndef FL_DOXYGEN
- Fl_Virtual_Printer
+ Fl_Abstract_Printer
#else
Fl_Device
#endif
Modified: branches/branch-1.3/src/Fl_Bitmap.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Bitmap.cxx 2010-03-18 17:56:06 UTC (rev
7300)
+++ branches/branch-1.3/src/Fl_Bitmap.cxx 2010-03-18 18:02:50 UTC (rev
7301)
@@ -266,7 +266,7 @@
void Fl_Bitmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
if(fl_device->type() == Fl_Device::postscript_device) {
- ((Fl_Virtual_Printer*)fl_device)->draw(this, XP, YP, WP, HP, cx, cy);
+ ((Fl_Abstract_Printer*)fl_device)->draw(this, XP, YP, WP, HP, cx, cy);
return;
}
if (!array) {
Modified: branches/branch-1.3/src/Fl_Device.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Device.cxx 2010-03-18 17:56:06 UTC (rev
7300)
+++ branches/branch-1.3/src/Fl_Device.cxx 2010-03-18 18:02:50 UTC (rev
7301)
@@ -1,7 +1,7 @@
//
// "$Id$"
//
-// implementation of Fl_Device and Fl_Virtual_Printer classes for the Fast
Light Tool Kit (FLTK).
+// implementation of Fl_Device and Fl_Abstract_Printer classes for the Fast
Light Tool Kit (FLTK).
//
// Copyright 2010 by Bill Spitzak and others.
//
@@ -48,7 +48,7 @@
// presently, never gets called
}
-void Fl_Virtual_Printer::print_widget(Fl_Widget* widget, int delta_x, int
delta_y)
+void Fl_Abstract_Printer::print_widget(Fl_Widget* widget, int delta_x, int
delta_y)
{
int old_x, old_y, new_x, new_y, is_window;
if ( ! widget->visible() ) return;
@@ -87,7 +87,7 @@
}
-void Fl_Virtual_Printer::traverse(Fl_Widget *widget)
+void Fl_Abstract_Printer::traverse(Fl_Widget *widget)
{
Fl_Group *g = widget->as_group();
if (!g) return;
@@ -102,13 +102,13 @@
}
}
-void Fl_Virtual_Printer::origin(int *x, int *y)
+void Fl_Abstract_Printer::origin(int *x, int *y)
{
if (x) *x = x_offset;
if (y) *y = y_offset;
}
-void Fl_Virtual_Printer::print_window_part(Fl_Window *win, int x, int y, int
w, int h, int delta_x, int delta_y)
+void Fl_Abstract_Printer::print_window_part(Fl_Window *win, int x, int y, int
w, int h, int delta_x, int delta_y)
{
Fl_Device::display_device()->set_current();
Fl_Window *save_front = Fl::first_window();
@@ -128,7 +128,7 @@
#endif
}
-void Fl_Virtual_Printer::add_image(Fl_Image *image, const uchar *data)
+void Fl_Abstract_Printer::add_image(Fl_Image *image, const uchar *data)
{
struct chain_elt *elt = (struct chain_elt *)calloc(sizeof(struct
chain_elt), 1);
elt->image = image;
@@ -137,7 +137,7 @@
image_list_ = elt;
}
-void Fl_Virtual_Printer::delete_image_list()
+void Fl_Abstract_Printer::delete_image_list()
{
while(image_list_) {
struct chain_elt *next = image_list_->next;
@@ -148,7 +148,7 @@
}
}
-Fl_Device *Fl_Virtual_Printer::set_current(void)
+Fl_Device *Fl_Abstract_Printer::set_current(void)
{
#ifdef __APPLE__
fl_gc = (CGContextRef)gc;
@@ -161,17 +161,17 @@
}
-int Fl_Virtual_Printer::start_job(int pagecount, int *frompage, int *topage)
{return 1;}
-int Fl_Virtual_Printer::start_page (void) {return 1;}
-int Fl_Virtual_Printer::printable_rect(int *w, int *h) {return 1;}
-void Fl_Virtual_Printer::margins(int *left, int *top, int *right, int *bottom)
{}
-void Fl_Virtual_Printer::origin(int x, int y) {}
-void Fl_Virtual_Printer::scale (float scale_x, float scale_y) {}
-void Fl_Virtual_Printer::rotate(float angle) {}
-int Fl_Virtual_Printer::end_page (void) {return 1;}
-void Fl_Virtual_Printer::end_job (void) {}
-void Fl_Virtual_Printer::translate(int x, int y) {}
-void Fl_Virtual_Printer::untranslate(void) {}
+int Fl_Abstract_Printer::start_job(int pagecount, int *frompage, int *topage)
{return 1;}
+int Fl_Abstract_Printer::start_page (void) {return 1;}
+int Fl_Abstract_Printer::printable_rect(int *w, int *h) {return 1;}
+void Fl_Abstract_Printer::margins(int *left, int *top, int *right, int
*bottom) {}
+void Fl_Abstract_Printer::origin(int x, int y) {}
+void Fl_Abstract_Printer::scale (float scale_x, float scale_y) {}
+void Fl_Abstract_Printer::rotate(float angle) {}
+int Fl_Abstract_Printer::end_page (void) {return 1;}
+void Fl_Abstract_Printer::end_job (void) {}
+void Fl_Abstract_Printer::translate(int x, int y) {}
+void Fl_Abstract_Printer::untranslate(void) {}
extern Fl_Device *fl_device;
Modified: branches/branch-1.3/src/Fl_GDI_Printer.cxx
===================================================================
--- branches/branch-1.3/src/Fl_GDI_Printer.cxx 2010-03-18 17:56:06 UTC (rev
7300)
+++ branches/branch-1.3/src/Fl_GDI_Printer.cxx 2010-03-18 18:02:50 UTC (rev
7301)
@@ -34,7 +34,7 @@
extern HWND fl_window;
-Fl_GDI_Printer::Fl_GDI_Printer(void) : Fl_Virtual_Printer() {
+Fl_GDI_Printer::Fl_GDI_Printer(void) : Fl_Abstract_Printer() {
hPr = NULL;
type_ = gdi_printer;
}
Modified: branches/branch-1.3/src/Fl_Gl_Device_Plugin.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Gl_Device_Plugin.cxx 2010-03-18 17:56:06 UTC
(rev 7300)
+++ branches/branch-1.3/src/Fl_Gl_Device_Plugin.cxx 2010-03-18 18:02:50 UTC
(rev 7301)
@@ -40,7 +40,7 @@
}
#endif
-static void print_gl_window(Fl_Virtual_Printer *printer, Fl_Gl_Window *glw,
int x, int y)
+static void print_gl_window(Fl_Abstract_Printer *printer, Fl_Gl_Window *glw,
int x, int y)
{
#ifdef WIN32
HDC save_gc = fl_gc;
@@ -129,7 +129,7 @@
public:
Fl_Gl_Device_Plugin() : Fl_Device_Plugin(name()) { }
virtual const char *name() { return "opengl.device.fltk.org"; }
- virtual int print(Fl_Virtual_Printer *p, Fl_Widget *w, int x, int y) {
+ virtual int print(Fl_Abstract_Printer *p, Fl_Widget *w, int x, int y) {
Fl_Gl_Window *glw = w->as_gl_window();
if (!glw) return 0;
print_gl_window(p, glw, x, y);
Modified: branches/branch-1.3/src/Fl_Image.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Image.cxx 2010-03-18 17:56:06 UTC (rev
7300)
+++ branches/branch-1.3/src/Fl_Image.cxx 2010-03-18 18:02:50 UTC (rev
7301)
@@ -436,7 +436,7 @@
void Fl_RGB_Image::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
if(fl_device->type() == Fl_Device::postscript_device) {
- ((Fl_Virtual_Printer*)fl_device)->draw(this, XP, YP, WP, HP, cx, cy);
+ ((Fl_Abstract_Printer*)fl_device)->draw(this, XP, YP, WP, HP, cx, cy);
return;
}
// Don't draw an empty image...
Modified: branches/branch-1.3/src/Fl_Pixmap.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Pixmap.cxx 2010-03-18 17:56:06 UTC (rev
7300)
+++ branches/branch-1.3/src/Fl_Pixmap.cxx 2010-03-18 18:02:50 UTC (rev
7301)
@@ -76,7 +76,7 @@
void Fl_Pixmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
if(fl_device->type() == Fl_Device::postscript_device) {
- ((Fl_Virtual_Printer*)fl_device)->draw(this, XP, YP, WP, HP, cx, cy);
+ ((Fl_Abstract_Printer*)fl_device)->draw(this, XP, YP, WP, HP, cx, cy);
return;
}
// ignore empty or bad pixmap data:
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
