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

10 files changed, 11 insertions, 70 deletions

diff --git a/FL/Fl_Copy_Surface.H b/FL/Fl_Copy_Surface.H
index d85c32ead..7bd26ee01 100644
--- a/FL/Fl_Copy_Surface.H
+++ b/FL/Fl_Copy_Surface.H
@@ -73,8 +73,6 @@ private:
   Fl_Surface_Device *_ss;
 #endif
 public:
-  static const char *class_id;
-  const char *class_name() {return class_id;};
   Fl_Copy_Surface(int w, int h);
   ~Fl_Copy_Surface();
   void set_current();
@@ -94,8 +92,6 @@ protected:
   int width;
   int height;
 public:
-  static const char *class_id;
-  const char *class_name() {return class_id;};
   Fl_Quartz_Surface_(int w, int h);
   virtual int printable_rect(int *w, int *h);
   virtual ~Fl_Quartz_Surface_() {};
@@ -110,8 +106,6 @@ class FL_EXPORT Fl_GDI_Surface_ : public Fl_Paged_Device {
   unsigned depth;
   POINT origins[10];
 public:
-  static const char *class_id;
-  const char *class_name() {return class_id;};
   Fl_GDI_Surface_();
   virtual void translate(int x, int y);
   virtual void untranslate();
@@ -127,8 +121,6 @@ public:
 /* Xlib class to implement translate()/untranslate() */
 class FL_EXPORT Fl_Xlib_Surface_ : public Fl_Paged_Device {
 public:
-  static const char *class_id;
-  const char *class_name() {return class_id;};
   Fl_Xlib_Surface_();
   virtual void translate(int x, int y);
   virtual void untranslate();
diff --git a/FL/Fl_Device.H b/FL/Fl_Device.H
index 0cf436f20..3a5e56699 100644
--- a/FL/Fl_Device.H
+++ b/FL/Fl_Device.H
@@ -1,7 +1,7 @@
 //
 // "$Id$"
 //
-// Definition of classes Fl_Device, Fl_Surface_Device, Fl_Display_Device
+// Definition of classes Fl_Surface_Device, Fl_Display_Device
 // for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 2010-2016 by Bill Spitzak and others.
@@ -18,8 +18,7 @@
 //
 
 /** \file Fl_Device.H 
- \brief declaration of classes Fl_Device, Fl_Surface_Device,
- Fl_Display_Device, Fl_Device_Plugin.
+ \brief declaration of classes Fl_Surface_Device, Fl_Display_Device, Fl_Device_Plugin.
 */
 
 #ifndef Fl_Device_H
@@ -34,37 +33,6 @@ class Fl_RGB_Image;
 class Fl_Widget;
 
 /**
- All graphical output devices and all graphics systems.
- This class supports a rudimentary system of run-time type information.
- */
-class FL_EXPORT Fl_Device {
-public:
-  /** A string that identifies each subclass of Fl_Device.
-     Function class_name() applied to a device of this class returns this string.
-   */
-  static const char *class_id;
-  /** 
-   Returns the name of the class of this object. 
-   The class_name() function is deprecated.   
-   The preferred procedure is to use the Fl_Graphics_Driver::has_feature() member function.
-   
-   The class of an instance of an Fl_Device subclass can be checked with code such as:
-   \code
-   if ( instance->class_name() == Fl_Printer::class_id ) { ... }
-   \endcode
-   */
-  virtual const char *class_name() {return class_id;};
-  /** 
-   Virtual destructor.
-   
-   The destructor of Fl_Device must be virtual to make the destructors of
-   derived classes being called correctly on destruction.
-   */
-  virtual ~Fl_Device() {};
-};
-
-
-/**
  A drawing surface that's susceptible to receive graphical output.
  Any FLTK application has at any time a current drawing surface to which all drawing requests are directed.
  The current surface is given by Fl_Surface_Device::surface().
@@ -84,7 +52,7 @@ public:
  <li> Delete \c surface.
  </ol>
  */
-class FL_EXPORT Fl_Surface_Device : public Fl_Device {
+class FL_EXPORT Fl_Surface_Device {
   /** \brief The graphics driver in use by this surface. */
   Fl_Graphics_Driver *_driver;
   static Fl_Surface_Device *_surface; // the surface that currently receives graphics output
@@ -93,8 +61,6 @@ protected:
   /** \brief Constructor that sets the graphics driver to use for the created surface. */
   Fl_Surface_Device(Fl_Graphics_Driver *graphics_driver) {_driver = graphics_driver; };
 public:
-  static const char *class_id;
-  const char *class_name() {return class_id;};
   virtual void set_current(void);
   /** \brief Sets the graphics driver of this drawing surface. */
   inline void driver(Fl_Graphics_Driver *graphics_driver) {_driver = graphics_driver;};
@@ -120,8 +86,6 @@ class FL_EXPORT Fl_Display_Device : public Fl_Surface_Device {
   static Fl_Display_Device *_display; // the platform display device
   static bool high_res_window_; //< true when drawing to a window of a retina display (Mac OS X only)
 public:
-  static const char *class_id;
-  const char *class_name() {return class_id;};
   Fl_Display_Device(Fl_Graphics_Driver *graphics_driver);
   static Fl_Display_Device *display_device();
   static bool high_resolution() {return high_res_window_;}
diff --git a/FL/Fl_Graphics_Driver.H b/FL/Fl_Graphics_Driver.H
index da12bf8a4..4f42af878 100644
--- a/FL/Fl_Graphics_Driver.H
+++ b/FL/Fl_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.
@@ -83,7 +83,7 @@ typedef short COORD_T;
  class. This new class should implement all virtual methods of the Fl_Graphics_Driver class
  to support all FLTK drawing functions.
   */
-class FL_EXPORT Fl_Graphics_Driver : public Fl_Device {
+class FL_EXPORT Fl_Graphics_Driver {
   friend class Fl_Surface_Device;
   friend class Fl_Pixmap;
   friend class Fl_Bitmap;
@@ -133,8 +133,6 @@ protected:
 
   // === all code below in this class has been to the reorganisation FL_PORTING process
 public:
-  static const char *class_id;
-  virtual const char *class_name() {return class_id;};
   Fl_Graphics_Driver();
   virtual ~Fl_Graphics_Driver() { if (p) free(p); }
   virtual char can_do_alpha_blending() { return 0; }
diff --git a/FL/Fl_Image_Surface.H b/FL/Fl_Image_Surface.H
index 4b05db72e..878dffe22 100644
--- a/FL/Fl_Image_Surface.H
+++ b/FL/Fl_Image_Surface.H
@@ -63,8 +63,6 @@ private:
   Window pre_window;
 #endif
 public:
-  static const char *class_id;
-  const char *class_name() {return class_id;};
   Fl_Image_Surface(int w, int h, int highres = 0);
   ~Fl_Image_Surface();
   void set_current();
@@ -78,8 +76,6 @@ public:
 /* Mac class to implement translate()/untranslate() for a flipped bitmap graphics context */
 class FL_EXPORT Fl_Quartz_Flipped_Surface_ : public Fl_Quartz_Surface_ {
 public:
-  static const char *class_id;
-  const char *class_name() {return class_id;};
   Fl_Quartz_Flipped_Surface_(int w, int h);
   void translate(int x, int y);
   void untranslate();
diff --git a/FL/Fl_Paged_Device.H b/FL/Fl_Paged_Device.H
index 1c33c4e04..8d55558a6 100644
--- a/FL/Fl_Paged_Device.H
+++ b/FL/Fl_Paged_Device.H
@@ -113,8 +113,6 @@ protected:
 public:
   /** \brief The destructor */
   virtual ~Fl_Paged_Device() {};
-  static const char *class_id;
-  const char *class_name() {return class_id;};
   virtual int start_job(int pagecount, int *frompage = NULL, int *topage = NULL);
   virtual int start_page(void);
   virtual int printable_rect(int *w, int *h);
diff --git a/FL/Fl_PostScript.H b/FL/Fl_PostScript.H
index 0c52be73b..fbb2b78c4 100644
--- a/FL/Fl_PostScript.H
+++ b/FL/Fl_PostScript.H
@@ -71,8 +71,6 @@ protected:
   uchar **mask_bitmap() {return &mask;}
   void mask_bitmap(uchar **value) { }
 public:
-  static const char *class_id;
-  const char *class_name() {return class_id;};
   Fl_PostScript_Graphics_Driver();
 #ifndef FL_DOXYGEN
   enum SHAPE{NONE=0, LINE, LOOP, POLYGON, POINTS};
@@ -239,8 +237,6 @@ class FL_EXPORT Fl_PostScript_File_Device : public Fl_Paged_Device {
 protected:
   Fl_PostScript_Graphics_Driver *driver();
 public:
-  static const char *class_id;
-  const char *class_name() {return class_id;};
   Fl_PostScript_File_Device();
   ~Fl_PostScript_File_Device();
   int start_job(int pagecount, int* from, int* to);
diff --git a/FL/Fl_Printer.H b/FL/Fl_Printer.H
index a1f99bc48..918f20ed0 100644
--- a/FL/Fl_Printer.H
+++ b/FL/Fl_Printer.H
@@ -71,8 +71,6 @@ protected:
   /** \brief The constructor */
   Fl_System_Printer(void);
 public:
-  static const char *class_id;
-  const char *class_name() {return class_id;};
   int start_job(int pagecount, int *frompage = NULL, int *topage = NULL);
   int start_page (void);
   int printable_rect(int *w, int *h);
@@ -116,8 +114,6 @@ protected:
   /** The constructor */
   Fl_PostScript_Printer(void) {};
 public:
-  static const char *class_id;
-  const char *class_name() {return class_id;};
   int start_job(int pages, int *firstpage = NULL, int *lastpage = NULL);
 };
 
@@ -184,8 +180,6 @@ public:
  */
 class FL_EXPORT Fl_Printer : public Fl_Paged_Device {
 public:
-  static const char *class_id;
-  const char *class_name() {return class_id;};
   /** \brief The constructor */
   Fl_Printer(void);
   int start_job(int pagecount, int *frompage = NULL, int *topage = NULL);
diff --git a/FL/mac.H b/FL/mac.H
index 8da33239d..7de2b2008 100644
--- a/FL/mac.H
+++ b/FL/mac.H
@@ -139,8 +139,9 @@ extern NSCursor *fl_default_cursor;
 
 // This object contains all mac-specific stuff about a window:
 // WARNING: this object is highly subject to change!
-class Fl_X : public Fl_Device {
+class Fl_X {
 public:
+  virtual ~Fl_X() {}       // very important
   Window xid;              // pointer to the Cocoa window object (FLWindow*)
   Fl_Offscreen other_xid;  // pointer for offscreen bitmaps (overlay window)
   Fl_Window *w;            // FLTK window for 
diff --git a/FL/win32.H b/FL/win32.H
index 2e18a2803..a7b4ce430 100644
--- a/FL/win32.H
+++ b/FL/win32.H
@@ -63,8 +63,9 @@ inline void XClipBox(Fl_Region r,XRectangle* rect) {
 
 // this object contains all win32-specific stuff about a window:
 // Warning: this object is highly subject to change!
-class FL_EXPORT Fl_X : public Fl_Device {
+class FL_EXPORT Fl_X {
 public:
+  virtual ~Fl_X() {}       // very important
   // member variables - add new variables only at the end of this block
   Window xid;
   HBITMAP other_xid; // for double-buffered windows
diff --git a/FL/x.H b/FL/x.H
index da5b3cb91..cbab3dc4d 100644
--- a/FL/x.H
+++ b/FL/x.H
@@ -133,8 +133,9 @@ extern FL_EXPORT XFontStruct* fl_X_core_font();
 // this object contains all X-specific stuff about a window:
 // Warning: this object is highly subject to change!  
 // FL_LIBRARY or FL_INTERNALS must be defined to access this class.
-class FL_EXPORT Fl_X : public Fl_Device {
+class FL_EXPORT Fl_X {
 public:
+  virtual ~Fl_X() {}       // very important
   Window xid;
   Window other_xid;
   Fl_Window *w;