diff options
| author | Manolo Gouy <Manolo> | 2010-04-16 20:19:09 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2010-04-16 20:19:09 +0000 |
| commit | 913530758af63f00676c6746988aef8b35b02531 (patch) | |
| tree | d6b59be15047e3c2742158eb5063aca55ea94eba /FL/Fl_Bitmap.H | |
| parent | 0f180e130639f1017e7ca6b668357304632c1a62 (diff) | |
Improved the hierarchy of Fl_Device subclasses to allow separation of platform-specific devices.
This introduces multiple inheritance.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7520 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL/Fl_Bitmap.H')
| -rw-r--r-- | FL/Fl_Bitmap.H | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/FL/Fl_Bitmap.H b/FL/Fl_Bitmap.H index d47a82acf..92fe91eee 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_Device; - public: + friend class Fl_Graphics_Device; +public: /** pointer to raw bitmap data */ const uchar *array; @@ -58,7 +58,6 @@ class FL_EXPORT Fl_Bitmap : public Fl_Image { 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 */ |