summaryrefslogtreecommitdiff
path: root/src/fl_labeltype.cxx
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>1999-01-05 17:57:49 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>1999-01-05 17:57:49 +0000
commit41d027ebfb33de38c8761defe926f5f681489143 (patch)
treeddb2db2f8d26d03314ae0e49ec521dafb11edd4c /src/fl_labeltype.cxx
parent131b567003e4f19b27b2dcc0797dec2ddb64ce16 (diff)
Fix from Carl - the inactive() function now works with all colors, and
all widgets now use it. git-svn-id: file:///fltk/svn/fltk/trunk@185 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/fl_labeltype.cxx')
-rw-r--r--src/fl_labeltype.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fl_labeltype.cxx b/src/fl_labeltype.cxx
index b9f8ace53..5fa8550cf 100644
--- a/src/fl_labeltype.cxx
+++ b/src/fl_labeltype.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: fl_labeltype.cxx,v 1.4 1998/12/02 15:39:37 mike Exp $"
+// "$Id: fl_labeltype.cxx,v 1.5 1999/01/05 17:57:49 mike Exp $"
//
// Label drawing routines for the Fast Light Tool Kit (FLTK).
//
@@ -107,7 +107,7 @@ extern char fl_draw_shortcut;
void Fl_Widget::draw_label(int X, int Y, int W, int H, Fl_Align a) const {
if (flags()&SHORTCUT_LABEL) fl_draw_shortcut = 1;
Fl_Label l1 = label_;
- if (!active_r()) l1.color |= 8;
+ if (!active_r()) l1.color = inactive((Fl_Color)l1.color);
l1.draw(X,Y,W,H,a);
fl_draw_shortcut = 0;
}
@@ -117,5 +117,5 @@ void Fl_Widget::draw_label(int X, int Y, int W, int H, Fl_Align a) const {
#include <FL/Fl_Input_.H>
//
-// End of "$Id: fl_labeltype.cxx,v 1.4 1998/12/02 15:39:37 mike Exp $".
+// End of "$Id: fl_labeltype.cxx,v 1.5 1999/01/05 17:57:49 mike Exp $".
//