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_Pixmap.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_Pixmap.H')
| -rw-r--r-- | FL/Fl_Pixmap.H | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H index 446af15f6..8cab445a5 100644 --- a/FL/Fl_Pixmap.H +++ b/FL/Fl_Pixmap.H @@ -45,7 +45,7 @@ struct Fl_Menu_Item; (pixmap) images, including transparency. */ class FL_EXPORT Fl_Pixmap : public Fl_Image { - friend class Fl_Graphics_Device; + friend class Fl_Device; void copy_data(); void delete_data(); void set_data(const char * const *p); @@ -67,6 +67,7 @@ class FL_EXPORT Fl_Pixmap : public Fl_Image { unsigned id_; // for internal use unsigned mask_; // for internal use (mask bitmap) #endif // __APPLE__ || WIN32 + void generic_device_draw(int XP, int YP, int WP, int HP, int cx, int cy); public: |