diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-10-29 03:44:33 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-10-29 03:44:33 +0000 |
| commit | 079082ef7c67377f8e24fcec6cadaa4c49e3af2b (patch) | |
| tree | 6967ed6788ff20429fd5fd9c132517c676cb942f /src/Fl_Menu.cxx | |
| parent | a00b52a6760c83414a518a69d91761389d9db322 (diff) | |
32-bit color (RGB0 or 000I), a la FLTK 2.0, including fl_rgb_color()
function to generate an RGB Fl_Color value.
Sort button names in FLUID.
Fix focus and scroll problems in Fl_Text_Display/Editor.
Fix radio/button demo.
Removed D2 menubar.H header...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1663 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Menu.cxx')
| -rw-r--r-- | src/Fl_Menu.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx index 000e7d706..511c13bda 100644 --- a/src/Fl_Menu.cxx +++ b/src/Fl_Menu.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.3 2001/09/04 13:13:29 easysw Exp $" +// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.4 2001/10/29 03:44:32 easysw Exp $" // // Menu code for the Fast Light Tool Kit (FLTK). // @@ -132,21 +132,21 @@ void Fl_Menu_Item::draw(int x, int y, int w, int h, const Fl_Menu_* m, l.font = labelsize_ ? labelfont_ : uchar(m ? m->textfont() : FL_HELVETICA); l.size = labelsize_ ? labelsize_ : m ? m->textsize() : FL_NORMAL_SIZE; l.color = labelcolor_ ? labelcolor_ : m ? m->textcolor() : int(FL_BLACK); - if (!active()) l.color = inactive((Fl_Color)l.color); + if (!active()) l.color = fl_inactive((Fl_Color)l.color); Fl_Color color = m ? m->color() : FL_GRAY; if (selected) { Fl_Color r = m ? m->selection_color() : FL_SELECTION_COLOR; Fl_Boxtype b = m && m->down_box() ? m->down_box() : FL_FLAT_BOX; - if (contrast(r,color)!=r) { // back compatability boxtypes + if (fl_contrast(r,color)!=r) { // back compatability boxtypes if (selected == 2) { // menu title r = color; b = m ? m->box() : FL_UP_BOX; } else { r = (Fl_Color)(FL_COLOR_CUBE-1); // white - l.color = contrast((Fl_Color)labelcolor_, r); + l.color = fl_contrast((Fl_Color)labelcolor_, r); } } else { - l.color = contrast((Fl_Color)labelcolor_, r); + l.color = fl_contrast((Fl_Color)labelcolor_, r); } if (selected == 2) { // menu title fl_draw_box(b, x, y, w, h, r); @@ -752,5 +752,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const { } // -// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.3 2001/09/04 13:13:29 easysw Exp $". +// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.4 2001/10/29 03:44:32 easysw Exp $". // |