Removed multiple inheritance: back to r. 7519 exactly.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7522 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 25 insertions, 3 deletions

diff --git a/src/Fl_Device.cxx b/src/Fl_Device.cxx
index ceead089f..9c76d3f6f 100644
--- a/src/Fl_Device.cxx
+++ b/src/Fl_Device.cxx
@@ -29,10 +29,32 @@
 #include <FL/Fl_Device.H>
 #include <FL/Fl_Image.H>
 
-const char *Fl_Device::device_type = "Fl_Device";
-const char *Fl_Display_Device::device_type = "Fl_Display_Device";
-const char *Fl_Graphics_Device::device_type = "Fl_Graphics_Device";
+/** \brief Draws an Fl_Pixmap object to the device. 
+ *
+ Specifies a bounding box for the image, with the origin (upper left-hand corner) of 
+ the image offset by the cx and cy arguments.
+ */
+void Fl_Device::draw(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy) {
+  pxm->generic_device_draw(XP, YP, WP, HP, cx, cy);
+}
+
+/** \brief Draws an Fl_Bitmap object to the device. 
+ *
+ Specifies a bounding box for the image, with the origin (upper left-hand corner) of 
+ the image offset by the cx and cy arguments.
+ */
+void Fl_Device::draw(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int cx, int cy) {
+  bm->generic_device_draw(XP, YP, WP, HP, cx, cy);
+}
 
+/** \brief Draws an Fl_RGB_Image object to the device. 
+ *
+ Specifies a bounding box for the image, with the origin (upper left-hand corner) of 
+ the image offset by the cx and cy arguments.
+ */
+void Fl_Device::draw(Fl_RGB_Image *rgb, int XP, int YP, int WP, int HP, int cx, int cy) {
+  rgb->generic_device_draw(XP, YP, WP, HP, cx, cy);
+}
 
 /**
  @brief Sets this device (display, printer, local file) as the target of future graphics calls.