diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-08-04 12:21:34 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-08-04 12:21:34 +0000 |
| commit | e4727142d4c48198e708ba2bd4068daf8062abaf (patch) | |
| tree | b2394dd6b76d749af4deea2ebaf88e840adfad11 /src/fl_color.cxx | |
| parent | 00f126367d73a2e860ca22a093a66fd1703f412a (diff) | |
Fl_Text* widgets backported to 1.1 (Carl, please confirm that I haven't
goofed with the layout->resize conversion. Also check fix for mMaxSize
being 0 so I set it to textsize())
contrast,inactive -> fl_contrast, fl_inactive, with defines for old names.
fl_rect() and fl_rectf() with color args.
fl_height, etc. with font,size args.
Send FL_RELEASE and FL_DRAG events to the pushed() widget by default.
Fix file chooser so it doesn't automatically change dirs if the only
matching name is a dir.
Updated Fl_Browser_ and Fl_Scrollbar for better mouse wheel support.
Moved DLL definitions to new Fl_Export.H.
Restore callback functionality in file chooser.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1550 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/fl_color.cxx')
| -rw-r--r-- | src/fl_color.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fl_color.cxx b/src/fl_color.cxx index 8f9fddba4..8aefae0f9 100644 --- a/src/fl_color.cxx +++ b/src/fl_color.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_color.cxx,v 1.12.2.5 2001/01/22 15:13:40 easysw Exp $" +// "$Id: fl_color.cxx,v 1.12.2.5.2.1 2001/08/04 12:21:33 easysw Exp $" // // Color functions for the Fast Light Tool Kit (FLTK). // @@ -339,11 +339,11 @@ Fl_Color fl_color_average(Fl_Color color1, Fl_Color color2, float weight) { return avg; } -Fl_Color inactive(Fl_Color c) { +Fl_Color fl_inactive(Fl_Color c) { return fl_color_average(c, FL_GRAY, .33f); } -Fl_Color contrast(Fl_Color fg, Fl_Color bg) { +Fl_Color fl_contrast(Fl_Color fg, Fl_Color bg) { int c1 = int(fl_cmap[fg]); int c2 = int(fl_cmap[bg]); if ((c1^c2)&0x80800000) @@ -355,5 +355,5 @@ Fl_Color contrast(Fl_Color fg, Fl_Color bg) { } // -// End of "$Id: fl_color.cxx,v 1.12.2.5 2001/01/22 15:13:40 easysw Exp $". +// End of "$Id: fl_color.cxx,v 1.12.2.5.2.1 2001/08/04 12:21:33 easysw Exp $". // |