diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Image.cxx | 23 | ||||
| -rw-r--r-- | src/Fl_get_system_colors.cxx | 6 |
2 files changed, 16 insertions, 13 deletions
diff --git a/src/Fl_Image.cxx b/src/Fl_Image.cxx index b67bd9c5b..b9e3f7c16 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.29 2003/01/30 21:41:55 easysw Exp $" +// "$Id: Fl_Image.cxx,v 1.5.2.3.2.30 2003/07/29 02:12:36 easysw Exp $" // // Image drawing code for the Fast Light Tool Kit (FLTK). // @@ -332,17 +332,22 @@ void Fl_RGB_Image::draw(int XP, int YP, int WP, int HP, int cx, int cy) { #elif defined(__APPLE__) if (mask) { Rect src, dst; - src.left = 0; src.right = w(); - src.top = 0; src.bottom = h(); - dst.left = X; dst.right = X+w(); - dst.top = Y; dst.bottom = Y+h(); + // MRS: STR #114 says we should be using cx, cy, W, and H... +// src.left = 0; src.right = w(); +// src.top = 0; src.bottom = h(); +// dst.left = X; dst.right = X+w(); +// dst.top = Y; dst.bottom = Y+h(); + src.left = cx; src.right = cx+W; + src.top = cx; src.bottom = cy+H; + dst.left = X; dst.right = X+W; + dst.top = Y; dst.bottom = Y+H; RGBColor rgb; rgb.red = 0xffff; rgb.green = 0xffff; rgb.blue = 0xffff; RGBBackColor(&rgb); rgb.red = 0x0000; rgb.green = 0x0000; rgb.blue = 0x0000; RGBForeColor(&rgb); -#if 0 +# if 0 // MRS: This *should* work, but doesn't on my system (iBook); change to // "#if 1" and restore the corresponding code in Fl_Bitmap.cxx // to test the real alpha channel support. @@ -350,12 +355,12 @@ void Fl_RGB_Image::draw(int XP, int YP, int WP, int HP, int cx, int cy) { GetPortBitMapForCopyBits((GrafPtr)mask), GetPortBitMapForCopyBits(GetWindowPort(fl_window)), &src, &src, &dst, blend, NULL); -#else // Fallback to screen-door transparency... +# else // Fallback to screen-door transparency... CopyMask(GetPortBitMapForCopyBits((GrafPtr)id), GetPortBitMapForCopyBits((GrafPtr)mask), GetPortBitMapForCopyBits(GetWindowPort(fl_window)), &src, &src, &dst); -#endif // 0 +# endif // 0 } else { fl_copy_offscreen(X, Y, W, H, (Fl_Offscreen)id, cx, cy); } @@ -392,5 +397,5 @@ void Fl_RGB_Image::label(Fl_Menu_Item* m) { // -// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.29 2003/01/30 21:41:55 easysw Exp $". +// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.30 2003/07/29 02:12:36 easysw Exp $". // diff --git a/src/Fl_get_system_colors.cxx b/src/Fl_get_system_colors.cxx index 69fea0086..ebc7d6dec 100644 --- a/src/Fl_get_system_colors.cxx +++ b/src/Fl_get_system_colors.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.21 2003/07/12 04:20:48 easysw Exp $" +// "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.22 2003/07/29 02:12:36 easysw Exp $" // // System color support for the Fast Light Tool Kit (FLTK). // @@ -247,8 +247,6 @@ int Fl::scheme(const char *s) { int Fl::reload_scheme() { Fl_Window *win; - get_system_colors(); - if (scheme_ && !strcasecmp(scheme_, "plastic")) { // Update the tile image to match the background color... uchar r, g, b; @@ -323,5 +321,5 @@ int Fl::reload_scheme() { // -// End of "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.21 2003/07/12 04:20:48 easysw Exp $". +// End of "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.22 2003/07/29 02:12:36 easysw Exp $". // |