diff options
| author | corvid <corvid@lavabit.com> | 2011-09-11 04:03:19 +0000 |
|---|---|---|
| committer | corvid <corvid@lavabit.com> | 2011-09-11 04:03:19 +0000 |
| commit | 91102adc9cd8707fc99a14515673e48e8f431734 (patch) | |
| tree | d36aa90605e1ae5830ff5dcfdfdda308a78ca1ca | |
| parent | 385da8286ca8f001a6f734dd322e5957ba50b63b (diff) | |
reintroduce fltk2-era special handling for the color black
I was mistakenly under the impression that it wasn't necessary for 1.3,
but if you use 0 for a color, that means FL_FOREGROUND_COLOR.
| -rw-r--r-- | dw/fltkplatform.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/dw/fltkplatform.cc b/dw/fltkplatform.cc index f84ddadf..54d9cbce 100644 --- a/dw/fltkplatform.cc +++ b/dw/fltkplatform.cc @@ -232,10 +232,14 @@ FltkColor::FltkColor (int color): Color (color) { this->color = color; - colors[SHADING_NORMAL] = shadeColor (color, SHADING_NORMAL) << 8; - colors[SHADING_INVERSE] = shadeColor (color, SHADING_INVERSE) << 8; - colors[SHADING_DARK] = shadeColor (color, SHADING_DARK) << 8; - colors[SHADING_LIGHT] = shadeColor (color, SHADING_LIGHT) << 8; + if (!(colors[SHADING_NORMAL] = shadeColor (color, SHADING_NORMAL) << 8)) + colors[SHADING_NORMAL] = FL_BLACK; + if (!(colors[SHADING_INVERSE] = shadeColor (color, SHADING_INVERSE) << 8)) + colors[SHADING_INVERSE] = FL_BLACK; + if (!(colors[SHADING_DARK] = shadeColor (color, SHADING_DARK) << 8)) + colors[SHADING_DARK] = FL_BLACK; + if (!(colors[SHADING_LIGHT] = shadeColor (color, SHADING_LIGHT) << 8)) + colors[SHADING_LIGHT] = FL_BLACK; } FltkColor::~FltkColor () |