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_labeltype.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_labeltype.cxx')
| -rw-r--r-- | src/fl_labeltype.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fl_labeltype.cxx b/src/fl_labeltype.cxx index 3783c97d6..657bf40b3 100644 --- a/src/fl_labeltype.cxx +++ b/src/fl_labeltype.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_labeltype.cxx,v 1.6.2.3.2.3 2001/09/02 11:23:27 easysw Exp $" +// "$Id: fl_labeltype.cxx,v 1.6.2.3.2.4 2001/10/29 03:44:33 easysw Exp $" // // Label drawing routines for the Fast Light Tool Kit (FLTK). // @@ -124,7 +124,7 @@ 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 = inactive((Fl_Color)l1.color); + l1.color = fl_inactive((Fl_Color)l1.color); if (l1.deimage) l1.image = l1.deimage; } l1.draw(X,Y,W,H,a); @@ -136,5 +136,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.6.2.3.2.3 2001/09/02 11:23:27 easysw Exp $". +// End of "$Id: fl_labeltype.cxx,v 1.6.2.3.2.4 2001/10/29 03:44:33 easysw Exp $". // |