diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-01-05 17:57:49 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-01-05 17:57:49 +0000 |
| commit | 41d027ebfb33de38c8761defe926f5f681489143 (patch) | |
| tree | ddb2db2f8d26d03314ae0e49ec521dafb11edd4c /src/Fl_Menu.cxx | |
| parent | 131b567003e4f19b27b2dcc0797dec2ddb64ce16 (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_Menu.cxx')
| -rw-r--r-- | src/Fl_Menu.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx index 3fba0070c..0beb9323b 100644 --- a/src/Fl_Menu.cxx +++ b/src/Fl_Menu.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu.cxx,v 1.9 1999/01/05 17:52:59 mike Exp $" +// "$Id: Fl_Menu.cxx,v 1.10 1999/01/05 17:57:48 mike Exp $" // // Menu code for the Fast Light Tool Kit (FLTK). // @@ -127,7 +127,7 @@ void Fl_Menu_Item::draw(int x, int y, int w, int h, const Fl_Menu_* m, l.type = labeltype_; l.font = labelsize_ ? labelfont_ : uchar(m ? m->textfont() : FL_HELVETICA); l.size = labelsize_ ? labelsize_ : m ? m->textsize() : FL_NORMAL_SIZE; - l.color = !active() ? (labelcolor_|8) : labelcolor_; + l.color = !active() ? inactive((Fl_Color)labelcolor_) : labelcolor_; Fl_Color color = m ? m->color() : FL_GRAY; if (selected) { Fl_Color r = m ? m->selection_color() : FL_SELECTION_COLOR; @@ -703,5 +703,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const { } // -// End of "$Id: Fl_Menu.cxx,v 1.9 1999/01/05 17:52:59 mike Exp $". +// End of "$Id: Fl_Menu.cxx,v 1.10 1999/01/05 17:57:48 mike Exp $". // |