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_Bitmap.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_Bitmap.H')
| -rw-r--r-- | FL/Fl_Bitmap.H | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/FL/Fl_Bitmap.H b/FL/Fl_Bitmap.H index 870e176bd..854edf375 100644 --- a/FL/Fl_Bitmap.H +++ b/FL/Fl_Bitmap.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Bitmap.H,v 1.5.2.3.2.8 2002/08/05 17:50:22 easysw Exp $" +// "$Id: Fl_Bitmap.H,v 1.5.2.3.2.9 2003/01/10 19:29:07 easysw Exp $" // // Bitmap header file for the Fast Light Tool Kit (FLTK). // @@ -35,8 +35,12 @@ class FL_EXPORT Fl_Bitmap : public Fl_Image { const uchar *array; int alloc_array; // Non-zero if data was allocated - Fl_Bitmask id; // for internal use - +#ifdef __APPLE__ + void *id; // for internal use +#else + unsigned id; // for internal use +#endif // __APPLE__ + Fl_Bitmap(const uchar *bits, int W, int H) : Fl_Image(W,H,0), array(bits), alloc_array(0), id(0) {data((const char **)&array, 1);} Fl_Bitmap(const char *bits, int W, int H) : @@ -54,5 +58,5 @@ class FL_EXPORT Fl_Bitmap : public Fl_Image { #endif // -// End of "$Id: Fl_Bitmap.H,v 1.5.2.3.2.8 2002/08/05 17:50:22 easysw Exp $". +// End of "$Id: Fl_Bitmap.H,v 1.5.2.3.2.9 2003/01/10 19:29:07 easysw Exp $". // |