summaryrefslogtreecommitdiff
path: root/FL/Fl_Pixmap.H
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2001-11-24 18:07:58 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2001-11-24 18:07:58 +0000
commitb650366d80e58cf3154c5bdf8ceb6a242c1a0251 (patch)
treec71ef9770b24f56c44495006426739adfa89c99e /FL/Fl_Pixmap.H
parente016a249b25c77b38d77d3a26d563cdec7a2592b (diff)
Added XBM, XPM, and PNM image file classes.
The pixmap_browser demo now supports all image formats via Fl_Shared_Image. Dropped image file stuff from image demo. Added Fl_Tiled_Image class, which tiles an Fl_Image, useful for tiling a background image in groups. Added tiled_image demo. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1725 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL/Fl_Pixmap.H')
-rw-r--r--FL/Fl_Pixmap.H7
1 files changed, 5 insertions, 2 deletions
diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H
index 60bf77b53..64086fde8 100644
--- a/FL/Fl_Pixmap.H
+++ b/FL/Fl_Pixmap.H
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Pixmap.H,v 1.6.2.8.2.5 2001/11/22 15:35:01 easysw Exp $"
+// "$Id: Fl_Pixmap.H,v 1.6.2.8.2.6 2001/11/24 18:07:57 easysw Exp $"
//
// Pixmap header file for the Fast Light Tool Kit (FLTK).
//
@@ -39,6 +39,9 @@ class FL_EXPORT Fl_Pixmap : public Fl_Image {
void copy_data();
void delete_data();
void set_data(const char * const *p);
+
+ protected:
+
void measure();
public:
@@ -65,5 +68,5 @@ class FL_EXPORT Fl_Pixmap : public Fl_Image {
#endif
//
-// End of "$Id: Fl_Pixmap.H,v 1.6.2.8.2.5 2001/11/22 15:35:01 easysw Exp $".
+// End of "$Id: Fl_Pixmap.H,v 1.6.2.8.2.6 2001/11/24 18:07:57 easysw Exp $".
//