diff options
| author | Manolo Gouy <Manolo> | 2016-02-25 17:56:48 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-02-25 17:56:48 +0000 |
| commit | 7f17b915db467ed1b49ce1b4a0bb7f36dc5cba85 (patch) | |
| tree | 667444a3146af11c9ef253f906ec5b39f8342bbc /src/drivers | |
| parent | 31793cbdba8e318350c5ed11b06d5a678eb15608 (diff) | |
Remove the useless pseudo run-time type information supported by the Fl_Device class.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11217 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx | 5 | ||||
| -rw-r--r-- | src/drivers/GDI/Fl_GDI_Graphics_Driver.h | 6 | ||||
| -rw-r--r-- | src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx | 3 | ||||
| -rw-r--r-- | src/drivers/OpenGL/Fl_OpenGL_Display_Device.h | 2 | ||||
| -rw-r--r-- | src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.cxx | 5 | ||||
| -rw-r--r-- | src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.h | 2 | ||||
| -rw-r--r-- | src/drivers/Quartz/Fl_Quartz_Display_Device.cxx | 4 | ||||
| -rw-r--r-- | src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx | 3 | ||||
| -rw-r--r-- | src/drivers/Quartz/Fl_Quartz_Graphics_Driver.h | 2 | ||||
| -rw-r--r-- | src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx | 3 | ||||
| -rw-r--r-- | src/drivers/Xlib/Fl_Xlib_Graphics_Driver.h | 4 |
11 files changed, 3 insertions, 36 deletions
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx index 74ca1345c..175a48e7e 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx @@ -22,11 +22,6 @@ #include "Fl_GDI_Graphics_Driver.h" -const char *Fl_GDI_Graphics_Driver::class_id = "Fl_GDI_Graphics_Driver"; - -// FIXME: move to printer graphics driver -const char *Fl_GDI_Printer_Graphics_Driver::class_id = "Fl_GDI_Printer_Graphics_Driver"; - /* Reference to the current device context For back-compatibility only. The preferred procedure to get this reference is Fl_Surface_Device::surface()->driver()->gc(). diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.h b/src/drivers/GDI/Fl_GDI_Graphics_Driver.h index 32c17d1b9..6852b4beb 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.h +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.h @@ -1,7 +1,7 @@ // // "$Id$" // -// Definition of classes Fl_Device, Fl_Graphics_Driver, Fl_Surface_Device, Fl_Display_Device +// Definition of classes Fl_Graphics_Driver, Fl_Surface_Device, Fl_Display_Device // for the Fast Light Tool Kit (FLTK). // // Copyright 2010-2016 by Bill Spitzak and others. @@ -43,8 +43,6 @@ protected: void mask_bitmap(uchar **value) { mask_bitmap_ = value; } public: Fl_GDI_Graphics_Driver() {mask_bitmap_ = NULL;} - static const char *class_id; - const char *class_name() {return class_id;}; virtual int has_feature(driver_feature mask) { return mask & NATIVE; } char can_do_alpha_blending(); virtual void gc(void *ctxt) {if (ctxt != gc_) global_gc(); gc_ = (HDC)ctxt;} @@ -132,9 +130,7 @@ protected: */ class FL_EXPORT Fl_GDI_Printer_Graphics_Driver : public Fl_GDI_Graphics_Driver { public: - static const char *class_id; virtual int has_feature(driver_feature mask) { return mask & (NATIVE | PRINTER); } - const char *class_name() {return class_id;}; void draw(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy); void draw(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int cx, int cy); int draw_scaled(Fl_Image *img, int XP, int YP, int WP, int HP); diff --git a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx index b81e481c8..bd2ab3b58 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx @@ -37,9 +37,6 @@ Fl_OpenGL_Display_Device::Fl_OpenGL_Display_Device(Fl_OpenGL_Graphics_Driver *gr { } -const char *Fl_OpenGL_Display_Device::class_id = "Fl_OpenGL_Display_Device"; - - // // End of "$Id$". // diff --git a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.h b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.h index ef78bbad8..9730fc9c4 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.h +++ b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.h @@ -27,8 +27,6 @@ class Fl_OpenGL_Graphics_Driver; */ class FL_EXPORT Fl_OpenGL_Display_Device : public Fl_Surface_Device { public: - static const char *class_id; - const char *class_name() {return class_id;}; Fl_OpenGL_Display_Device(Fl_OpenGL_Graphics_Driver *graphics_driver); static Fl_OpenGL_Display_Device *display_device(); }; diff --git a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.cxx b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.cxx index ff59992d8..af0d3935c 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.cxx @@ -19,14 +19,9 @@ #ifndef FL_CFG_GFX_OPENGL_CXX #define FL_CFG_GFX_OPENGL_CXX - #include <FL/gl.h> #include "Fl_OpenGL_Graphics_Driver.h" - -const char *Fl_OpenGL_Graphics_Driver::class_id = "Fl_OpenGL_Graphics_Driver"; - - #endif // FL_CFG_GFX_OPENGL_RECT_CXX // diff --git a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.h b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.h index d4e7074fe..b12e661f9 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.h +++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.h @@ -33,8 +33,6 @@ */ class FL_EXPORT Fl_OpenGL_Graphics_Driver : public Fl_Graphics_Driver { public: - static const char *class_id; - const char *class_name() {return class_id;}; // --- line and polygon drawing with integer coordinates void point(int x, int y); void rect(int x, int y, int w, int h); diff --git a/src/drivers/Quartz/Fl_Quartz_Display_Device.cxx b/src/drivers/Quartz/Fl_Quartz_Display_Device.cxx index 36a54dc57..0983738d9 100644 --- a/src/drivers/Quartz/Fl_Quartz_Display_Device.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Display_Device.cxx @@ -1,7 +1,7 @@ // // "$Id$" // -// implementation of Fl_Device class for the Fast Light Tool Kit (FLTK). +// implementation of Fl_Display_Device class for the Fast Light Tool Kit (FLTK). // // Copyright 2010-2016 by Bill Spitzak and others. // @@ -19,8 +19,6 @@ // FIXME: implement this #if 0 -const char *Fl_Display_Device::class_id = "Fl_Display_Device"; - /** A constructor that sets the graphics driver used by the display */ Fl_Display_Device::Fl_Display_Device(Fl_Graphics_Driver *graphics_driver) : Fl_Surface_Device(graphics_driver) { this->set_current(); diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx index 8f14af883..32e67a7b2 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx @@ -20,9 +20,6 @@ #include "../../config_lib.h" #include "Fl_Quartz_Graphics_Driver.h" - -const char *Fl_Quartz_Graphics_Driver::class_id = "Fl_Quartz_Graphics_Driver"; - /* Reference to the current CGContext For back-compatibility only. The preferred procedure to get this reference is Fl_Surface_Device::surface()->driver()->gc(). diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.h b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.h index 22b2eaef4..de34ea36a 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.h +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.h @@ -42,8 +42,6 @@ class Fl_Quartz_Graphics_Driver : public Fl_Graphics_Driver { protected: CGContextRef gc_; public: - static const char *class_id; - const char *class_name() {return class_id;}; virtual int has_feature(driver_feature mask) { return mask & NATIVE; } virtual void gc(void *ctxt) {if (ctxt != gc_) global_gc(); gc_ = (CGContextRef)ctxt; } virtual void *gc() {return gc_;} diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx index ebaf0792b..76060a62c 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx @@ -27,9 +27,6 @@ #include <X11/extensions/Xrender.h> #endif - -const char *Fl_Xlib_Graphics_Driver::class_id = "Fl_Xlib_Graphics_Driver"; - /* Reference to the current graphics context For back-compatibility only. The preferred procedure to get this pointer is Fl_Surface_Device::surface()->driver()->gc(). diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.h b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.h index 7c1f4799a..6c7c402c3 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.h +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.h @@ -1,7 +1,7 @@ // // "$Id$" // -// Definition of classes Fl_Device, Fl_Graphics_Driver, Fl_Surface_Device, Fl_Display_Device +// Definition of classes Fl_Graphics_Driver, Fl_Surface_Device, Fl_Display_Device // for the Fast Light Tool Kit (FLTK). // // Copyright 2010-2016 by Bill Spitzak and others. @@ -39,9 +39,7 @@ protected: uchar **mask_bitmap() {return mask_bitmap_;} void mask_bitmap(uchar **value) { mask_bitmap_ = value; } public: - static const char *class_id; Fl_Xlib_Graphics_Driver(void); - const char *class_name() {return class_id;}; virtual int has_feature(driver_feature mask) { return mask & NATIVE; } virtual void *gc() { return gc_; } char can_do_alpha_blending(); |
