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_Pixmap.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_Pixmap.H')
| -rw-r--r-- | FL/Fl_Pixmap.H | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H index baef7a52b..52925ce2b 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.9 2002/08/09 01:09:48 easysw Exp $" +// "$Id: Fl_Pixmap.H,v 1.6.2.8.2.10 2003/01/10 19:29:08 easysw Exp $" // // Pixmap header file for the Fast Light Tool Kit (FLTK). // @@ -47,9 +47,14 @@ class FL_EXPORT Fl_Pixmap : public Fl_Image { public: int alloc_data; // Non-zero if data 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 // __APPLE__ + explicit Fl_Pixmap(char * const * D) : Fl_Image(-1,0,1), alloc_data(0), id(0), mask(0) {set_data((const char*const*)D); measure();} explicit Fl_Pixmap(uchar* const * D) : Fl_Image(-1,0,1), alloc_data(0), id(0), mask(0) {set_data((const char*const*)D); measure();} explicit Fl_Pixmap(const char * const * D) : Fl_Image(-1,0,1), alloc_data(0), id(0), mask(0) {set_data((const char*const*)D); measure();} @@ -69,5 +74,5 @@ class FL_EXPORT Fl_Pixmap : public Fl_Image { #endif // -// End of "$Id: Fl_Pixmap.H,v 1.6.2.8.2.9 2002/08/09 01:09:48 easysw Exp $". +// End of "$Id: Fl_Pixmap.H,v 1.6.2.8.2.10 2003/01/10 19:29:08 easysw Exp $". // |