diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-01-10 19:29:09 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-01-10 19:29:09 +0000 |
| commit | 4bf5385fb14c5d4e0d4fb061b5ef1a79cb45389d (patch) | |
| tree | 3900fd96ea1e3c1b343a00fbc04f1bb321c5f54f /FL/Fl_Image.H | |
| parent | 24f57a7aea2d98a47684103459170b2389f8ad5f (diff) | |
Update Fl_Image and friends so that we don't need to include the
system headers (which unfortunately are not too friendly with other
code...)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2893 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL/Fl_Image.H')
| -rw-r--r-- | FL/Fl_Image.H | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/FL/Fl_Image.H b/FL/Fl_Image.H index cbae6c89c..d51cfadb0 100644 --- a/FL/Fl_Image.H +++ b/FL/Fl_Image.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Image.H,v 1.5.2.3.2.16 2002/10/11 14:17:20 easysw Exp $" +// "$Id: Fl_Image.H,v 1.5.2.3.2.17 2003/01/10 19:29:07 easysw Exp $" // // Image header file for the Fast Light Tool Kit (FLTK). // @@ -26,10 +26,9 @@ #ifndef Fl_Image_H # define Fl_Image_H -# include "x.H" - class Fl_Widget; struct Fl_Menu_Item; +struct Fl_Label; class FL_EXPORT Fl_Image { int w_, h_, d_, ld_, count_; @@ -80,8 +79,13 @@ class FL_EXPORT Fl_RGB_Image : public Fl_Image { const uchar *array; int alloc_array; // Non-zero if array was allocated - Fl_Offscreen id; // for internal use - Fl_Bitmask mask; // for internal use (mask bitmap) +#ifdef __APPLE__ + void *id; // for internal use + void *mask; // for internal use (mask bitmap) +#else + unsigned id; // for internal use + unsigned mask; // for internal use (mask bitmap) +#endif // Fl_RGB_Image(const uchar *bits, int W, int H, int D=3, int LD=0) : Fl_Image(W,H,D), array(bits), alloc_array(0), id(0), mask(0) {data((const char **)&array, 1); ld(LD);} @@ -100,5 +104,5 @@ class FL_EXPORT Fl_RGB_Image : public Fl_Image { #endif // !Fl_Image_H // -// End of "$Id: Fl_Image.H,v 1.5.2.3.2.16 2002/10/11 14:17:20 easysw Exp $". +// End of "$Id: Fl_Image.H,v 1.5.2.3.2.17 2003/01/10 19:29:07 easysw Exp $". // |