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 /fluid/Fl_Widget_Type.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 'fluid/Fl_Widget_Type.cxx')
| -rw-r--r-- | fluid/Fl_Widget_Type.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx index aff78506e..5e9caa775 100644 --- a/fluid/Fl_Widget_Type.cxx +++ b/fluid/Fl_Widget_Type.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.5 2001/10/01 19:38:28 easysw Exp $" +// "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.6 2001/10/29 03:44:32 easysw Exp $" // // Widget type code for the Fast Light Tool Kit (FLTK). // @@ -846,7 +846,7 @@ void color_cb(Fl_Button* i, void *v) { q->o->color(c); q->o->redraw(); } } - i->color(c); i->labelcolor(contrast(FL_BLACK,c)); i->redraw(); + i->color(c); i->labelcolor(fl_contrast(FL_BLACK,c)); i->redraw(); } void color2_cb(Fl_Button* i, void *v) { @@ -863,7 +863,7 @@ void color2_cb(Fl_Button* i, void *v) { q->o->selection_color(c); q->o->redraw(); } } - i->color(c); i->labelcolor(contrast(FL_BLACK,c)); i->redraw(); + i->color(c); i->labelcolor(fl_contrast(FL_BLACK,c)); i->redraw(); } void labelcolor_cb(Fl_Button* i, void *v) { @@ -878,7 +878,7 @@ void labelcolor_cb(Fl_Button* i, void *v) { q->o->labelcolor(c); q->redraw(); } } - i->color(c); i->labelcolor(contrast(FL_BLACK,c)); i->redraw(); + i->color(c); i->labelcolor(fl_contrast(FL_BLACK,c)); i->redraw(); } static Fl_Button* relative(Fl_Widget* o, int i) { @@ -1078,7 +1078,7 @@ void textcolor_cb(Fl_Button* i, void* v) { q->textstuff(3,n,s,c); q->o->redraw(); } } - i->color(c); i->labelcolor(contrast(FL_BLACK,c)); i->redraw(); + i->color(c); i->labelcolor(fl_contrast(FL_BLACK,c)); i->redraw(); } //////////////////////////////////////////////////////////////// @@ -1957,5 +1957,5 @@ int Fl_Widget_Type::read_fdesign(const char* name, const char* value) { } // -// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.5 2001/10/01 19:38:28 easysw Exp $". +// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.6 2001/10/29 03:44:32 easysw Exp $". // |