diff options
| author | Manolo Gouy <Manolo> | 2010-04-14 13:07:34 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2010-04-14 13:07:34 +0000 |
| commit | be9127c61aa32f95eb47bc7b1d586623914ee036 (patch) | |
| tree | 6e845e7662fd77fae2fb114adb68bc030b78e980 /FL | |
| parent | 97c893ab5eb1a1f4954b8dbe5a7e421bd9c54089 (diff) | |
More logical use of Fl_Device::draw(<image class> *,...) functions
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7501 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Bitmap.H | 2 | ||||
| -rw-r--r-- | FL/Fl_Image.H | 2 | ||||
| -rw-r--r-- | FL/Fl_Pixmap.H | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/FL/Fl_Bitmap.H b/FL/Fl_Bitmap.H index 84ce3281b..d47a82acf 100644 --- a/FL/Fl_Bitmap.H +++ b/FL/Fl_Bitmap.H @@ -40,6 +40,7 @@ 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: /** pointer to raw bitmap data */ @@ -57,6 +58,7 @@ 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 */ diff --git a/FL/Fl_Image.H b/FL/Fl_Image.H index 72ee4477c..ff10b1ef6 100644 --- a/FL/Fl_Image.H +++ b/FL/Fl_Image.H @@ -188,6 +188,8 @@ class FL_EXPORT Fl_Image { <FL/Fl_RGB_Image.H> should be included. */ class FL_EXPORT Fl_RGB_Image : public Fl_Image { + 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; diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H index 616add0f4..8cab445a5 100644 --- a/FL/Fl_Pixmap.H +++ b/FL/Fl_Pixmap.H @@ -45,6 +45,7 @@ struct Fl_Menu_Item; (pixmap) images, including transparency. */ class FL_EXPORT Fl_Pixmap : public Fl_Image { + friend class Fl_Device; void copy_data(); void delete_data(); void set_data(const char * const *p); @@ -66,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: |