diff options
| -rw-r--r-- | CodeWarrior/OS_X.sit | bin | 36857 -> 80 bytes | |||
| -rw-r--r-- | CodeWarrior/Win32/FLTK_Data/CWSettingsWindows.stg | bin | 8095 -> 13 bytes | |||
| -rw-r--r-- | FL/Fl_Bitmap.H | 8 | ||||
| -rw-r--r-- | FL/Fl_Image.H | 8 | ||||
| -rw-r--r-- | FL/Fl_Pixmap.H | 8 | ||||
| -rw-r--r-- | src/Fl_Image.cxx | 6 | ||||
| -rw-r--r-- | src/Fl_Pixmap.cxx | 6 | ||||
| -rw-r--r-- | src/fl_line_style.cxx | 5 |
8 files changed, 21 insertions, 20 deletions
diff --git a/CodeWarrior/OS_X.sit b/CodeWarrior/OS_X.sit Binary files differindex 7f3eb491a..735533d55 100644 --- a/CodeWarrior/OS_X.sit +++ b/CodeWarrior/OS_X.sit diff --git a/CodeWarrior/Win32/FLTK_Data/CWSettingsWindows.stg b/CodeWarrior/Win32/FLTK_Data/CWSettingsWindows.stg Binary files differindex fff71fa19..bd8a463d8 100644 --- a/CodeWarrior/Win32/FLTK_Data/CWSettingsWindows.stg +++ b/CodeWarrior/Win32/FLTK_Data/CWSettingsWindows.stg 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 $". // diff --git a/src/Fl_Image.cxx b/src/Fl_Image.cxx index 4912eaf32..32a48ae34 100644 --- a/src/Fl_Image.cxx +++ b/src/Fl_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Image.cxx,v 1.5.2.3.2.27 2003/01/10 19:29:09 easysw Exp $" +// "$Id: Fl_Image.cxx,v 1.5.2.3.2.28 2003/01/15 19:41:58 easysw Exp $" // // Image drawing code for the Fast Light Tool Kit (FLTK). // @@ -327,7 +327,7 @@ void Fl_RGB_Image::draw(int XP, int YP, int WP, int HP, int cx, int cy) { BitBlt(fl_gc, X, Y, W, H, new_gc, cx, cy, SRCPAINT); DeleteDC(new_gc); } else { - fl_copy_offscreen(X, Y, W, H, id, cx, cy); + fl_copy_offscreen(X, Y, W, H, (Fl_Offscreen)id, cx, cy); } #elif defined(__APPLE__) if (mask) { @@ -392,5 +392,5 @@ void Fl_RGB_Image::label(Fl_Menu_Item* m) { // -// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.27 2003/01/10 19:29:09 easysw Exp $". +// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.28 2003/01/15 19:41:58 easysw Exp $". // diff --git a/src/Fl_Pixmap.cxx b/src/Fl_Pixmap.cxx index 37e04d4e1..81de9f210 100644 --- a/src/Fl_Pixmap.cxx +++ b/src/Fl_Pixmap.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.25 2003/01/10 19:29:09 easysw Exp $" +// "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.26 2003/01/15 19:41:58 easysw Exp $" // // Pixmap drawing code for the Fast Light Tool Kit (FLTK). // @@ -102,7 +102,7 @@ void Fl_Pixmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) { BitBlt(fl_gc, X, Y, W, H, new_gc, cx, cy, SRCPAINT); DeleteDC(new_gc); } else { - fl_copy_offscreen(X, Y, W, H, id, cx, cy); + fl_copy_offscreen(X, Y, W, H, (Fl_Offscreen)id, cx, cy); } #elif defined(__APPLE__) if (mask) { @@ -461,5 +461,5 @@ void Fl_Pixmap::desaturate() { } // -// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.25 2003/01/10 19:29:09 easysw Exp $". +// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.26 2003/01/15 19:41:58 easysw Exp $". // diff --git a/src/fl_line_style.cxx b/src/fl_line_style.cxx index 135bfe625..9da2c5d18 100644 --- a/src/fl_line_style.cxx +++ b/src/fl_line_style.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_line_style.cxx,v 1.3.2.3.2.11 2003/01/12 14:49:33 easysw Exp $" +// "$Id: fl_line_style.cxx,v 1.3.2.3.2.12 2003/01/15 19:41:58 easysw Exp $" // // Line style code for the Fast Light Tool Kit (FLTK). // @@ -23,6 +23,7 @@ // Please report all bugs and problems to "fltk-bugs@fltk.org". // +#include <FL/Fl.H> #include <FL/fl_draw.H> #include <FL/x.H> #include "flstring.h" @@ -103,5 +104,5 @@ void fl_line_style(int style, int width, char* dashes) { // -// End of "$Id: fl_line_style.cxx,v 1.3.2.3.2.11 2003/01/12 14:49:33 easysw Exp $". +// End of "$Id: fl_line_style.cxx,v 1.3.2.3.2.12 2003/01/15 19:41:58 easysw Exp $". // |