summaryrefslogtreecommitdiff
path: root/FL/Fl_Image.H
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2010-04-18 06:57:37 +0000
committerManolo Gouy <Manolo>2010-04-18 06:57:37 +0000
commitd0b1cc30f7eac228caddadb2bc675865a4124b1b (patch)
tree210bf48b7ca03062c9a02c9b057539263f3d7ae1 /FL/Fl_Image.H
parent828568a33610d7696f4764ce2ad0f4014f4a6e26 (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_Image.H')
-rw-r--r--FL/Fl_Image.H3
1 files changed, 2 insertions, 1 deletions
diff --git a/FL/Fl_Image.H b/FL/Fl_Image.H
index 2cb77978c..ff10b1ef6 100644
--- a/FL/Fl_Image.H
+++ b/FL/Fl_Image.H
@@ -188,7 +188,8 @@ class FL_EXPORT Fl_Image {
&lt;FL/Fl_RGB_Image.H&gt; should be included.
*/
class FL_EXPORT Fl_RGB_Image : public Fl_Image {
- friend class Fl_Graphics_Device;
+ friend class Fl_Device;
+ void generic_device_draw(int X, int Y, int W, int H, int cx=0, int cy=0);
public:
const uchar *array;