diff options
| author | Manolo Gouy <Manolo> | 2010-04-18 06:57:37 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2010-04-18 06:57:37 +0000 |
| commit | d0b1cc30f7eac228caddadb2bc675865a4124b1b (patch) | |
| tree | 210bf48b7ca03062c9a02c9b057539263f3d7ae1 /FL/Fl_Bitmap.H | |
| parent | 828568a33610d7696f4764ce2ad0f4014f4a6e26 (diff) | |
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
Diffstat (limited to 'FL/Fl_Bitmap.H')
| -rw-r--r-- | FL/Fl_Bitmap.H | 5 |
1 files changed, 3 insertions, 2 deletions
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 */ |