From d0b1cc30f7eac228caddadb2bc675865a4124b1b Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Sun, 18 Apr 2010 06:57:37 +0000
Subject: 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
---
 FL/Fl_Abstract_Printer.H | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'FL/Fl_Abstract_Printer.H')

diff --git a/FL/Fl_Abstract_Printer.H b/FL/Fl_Abstract_Printer.H
index 97f4092dc..919126fac 100644
--- a/FL/Fl_Abstract_Printer.H
+++ b/FL/Fl_Abstract_Printer.H
@@ -39,7 +39,10 @@
  *
  This class has no public constructor: don't instantiate it; use Fl_Printer or Fl_PSfile_Device instead.
  */
-class Fl_Abstract_Printer {
+class Fl_Abstract_Printer : public Fl_Device {
+  friend class Fl_Pixmap;
+  friend class Fl_RGB_Image;
+  friend class Fl_Bitmap;
 private:
 #ifdef __APPLE__
   struct chain_elt {
@@ -59,11 +62,14 @@ protected:
   struct chain_elt *image_list_; 
   /** \brief the printer's graphics context, if there's one, NULL otherwise */
   void *gc; 
+  /** \brief the constructor */
+  Fl_Abstract_Printer(void) { gc = NULL; bg_r_ = bg_g_ = bg_b_ = 0; };
 #ifdef __APPLE__
   /** \brief deletes the page image list */
   void delete_image_list(); 
 #endif
 public:
+  Fl_Device *set_current(void);
   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);
@@ -85,4 +91,3 @@ public:
 //
 // End of "$Id$"
 //
-
-- 
cgit v1.2.3