diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-01-15 19:41:58 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-01-15 19:41:58 +0000 |
| commit | 4fb89e2571c12273e68b1624e2b110049dcaab12 (patch) | |
| tree | 4d6d1bc5002a48070f5e2371fbd70e8da4b5420f /FL | |
| parent | e695187237e0ce9f2ec366599764819b8ae61315 (diff) | |
Fix build problems on Windows.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2913 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Bitmap.H | 8 | ||||
| -rw-r--r-- | FL/Fl_Image.H | 8 | ||||
| -rw-r--r-- | FL/Fl_Pixmap.H | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/FL/Fl_Bitmap.H b/FL/Fl_Bitmap.H index 854edf375..30413d61f 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.9 2003/01/10 19:29:07 easysw Exp $" +// "$Id: Fl_Bitmap.H,v 1.5.2.3.2.10 2003/01/15 19:41:58 easysw Exp $" // // Bitmap header file for the Fast Light Tool Kit (FLTK). // @@ -35,11 +35,11 @@ class FL_EXPORT Fl_Bitmap : public Fl_Image { const uchar *array; int alloc_array; // Non-zero if data was allocated -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(WIN32) void *id; // for internal use #else unsigned id; // for internal use -#endif // __APPLE__ +#endif // __APPLE__ || WIN32 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);} @@ -58,5 +58,5 @@ class FL_EXPORT Fl_Bitmap : public Fl_Image { #endif // -// End of "$Id: Fl_Bitmap.H,v 1.5.2.3.2.9 2003/01/10 19:29:07 easysw Exp $". +// End of "$Id: Fl_Bitmap.H,v 1.5.2.3.2.10 2003/01/15 19:41:58 easysw Exp $". // diff --git a/FL/Fl_Image.H b/FL/Fl_Image.H index 13e48499d..ecfef9cec 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.19 2003/01/12 01:22:21 easysw Exp $" +// "$Id: Fl_Image.H,v 1.5.2.3.2.20 2003/01/15 19:41:58 easysw Exp $" // // Image header file for the Fast Light Tool Kit (FLTK). // @@ -81,13 +81,13 @@ class FL_EXPORT Fl_RGB_Image : public Fl_Image { const uchar *array; int alloc_array; // Non-zero if array was allocated -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(WIN32) 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 // +#endif // __APPLE__ || WIN32 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);} @@ -106,5 +106,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.19 2003/01/12 01:22:21 easysw Exp $". +// End of "$Id: Fl_Image.H,v 1.5.2.3.2.20 2003/01/15 19:41:58 easysw Exp $". // diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H index 52925ce2b..40096f12d 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.10 2003/01/10 19:29:08 easysw Exp $" +// "$Id: Fl_Pixmap.H,v 1.6.2.8.2.11 2003/01/15 19:41:58 easysw Exp $" // // Pixmap header file for the Fast Light Tool Kit (FLTK). // @@ -47,13 +47,13 @@ class FL_EXPORT Fl_Pixmap : public Fl_Image { public: int alloc_data; // Non-zero if data was allocated -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(WIN32) 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__ +#endif // __APPLE__ || WIN32 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();} @@ -74,5 +74,5 @@ class FL_EXPORT Fl_Pixmap : public Fl_Image { #endif // -// End of "$Id: Fl_Pixmap.H,v 1.6.2.8.2.10 2003/01/10 19:29:08 easysw Exp $". +// End of "$Id: Fl_Pixmap.H,v 1.6.2.8.2.11 2003/01/15 19:41:58 easysw Exp $". // |