From 41d027ebfb33de38c8761defe926f5f681489143 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Tue, 5 Jan 1999 17:57:49 +0000 Subject: 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 --- src/fl_labeltype.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/fl_labeltype.cxx') 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 // -// 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 $". // -- cgit v1.2.3