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_Bitmap.H | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'FL/Fl_Bitmap.H')

diff --git a/FL/Fl_Bitmap.H b/FL/Fl_Bitmap.H
index 92fe91eee..d47a82acf 100644
--- a/FL/Fl_Bitmap.H
+++ b/FL/Fl_Bitmap.H
@@ -40,8 +40,8 @@ struct Fl_Menu_Item;
   (bitmap) images. Images are drawn using the current color.
 */
 class FL_EXPORT Fl_Bitmap : public Fl_Image {
-  friend class Fl_Graphics_Device;
-public:
+  friend class Fl_Device;
+  public:
 
   /** pointer to raw bitmap data */
   const uchar *array;
@@ -58,6 +58,7 @@ public:
   unsigned id_;
 #endif // __APPLE__ || WIN32
 
+  void generic_device_draw(int XP, int YP, int WP, int HP, int cx, int cy);
   public:
 
   /** The constructors create a new bitmap from the specified bitmap data */
-- 
cgit v1.2.3