diff options
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 $". // |