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_Counter.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_Counter.cxx')
| -rw-r--r-- | src/Fl_Counter.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Fl_Counter.cxx b/src/Fl_Counter.cxx index 7be74038b..08a40cf24 100644 --- a/src/Fl_Counter.cxx +++ b/src/Fl_Counter.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Counter.cxx,v 1.8.2.3.2.2 2001/10/18 23:41:04 easysw Exp $" +// "$Id: Fl_Counter.cxx,v 1.8.2.3.2.3 2001/10/29 03:44:32 easysw Exp $" // // Counter widget for the Fast Light Tool Kit (FLTK). // @@ -56,7 +56,7 @@ void Fl_Counter::draw() { draw_box(boxtype[0], xx[0], y(), ww[0], h(), FL_WHITE); fl_font(textfont(), textsize()); - fl_color(active_r() ? textcolor() : inactive(textcolor())); + fl_color(active_r() ? textcolor() : fl_inactive(textcolor())); char str[128]; format(str); fl_draw(str, xx[0], y(), ww[0], h(), FL_ALIGN_CENTER); if (Fl::focus() == this) draw_focus(boxtype[0], xx[0], y(), ww[0], h()); @@ -65,7 +65,7 @@ void Fl_Counter::draw() { if (active_r()) selcolor = labelcolor(); else - selcolor = inactive(labelcolor()); + selcolor = fl_inactive(labelcolor()); if (type() == FL_NORMAL_COUNTER) { draw_box(boxtype[1], xx[1], y(), ww[1], h(), color()); @@ -186,5 +186,5 @@ Fl_Counter::Fl_Counter(int x, int y, int w, int h, const char* l) } // -// End of "$Id: Fl_Counter.cxx,v 1.8.2.3.2.2 2001/10/18 23:41:04 easysw Exp $". +// End of "$Id: Fl_Counter.cxx,v 1.8.2.3.2.3 2001/10/29 03:44:32 easysw Exp $". // |