mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Small patch to remove a compiler warning from gcc. 

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1128 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Bill Spitzak 2000-05-17 07:09:26 +00:00
parent 59afeb1f94
commit 9743763c7f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
documentation/functions.html
View File

@ -4,14 +4,18 @@
methods. For a description of the FLTK widgets, see <A href=widgets.html#widgets>
Appendix A</A>.
<H2>Functions</H2>
<H3><A name="fl_color_chooser_func">int fl_color_chooser(const char *title, double
&amp;r, double &amp;g, double &amp;b)
<BR> int fl_color_chooser(const char *title, uchar &amp;r, uchar &amp;g, uchar &amp;b)</A>
</H3>
The double version takes RGB values in the range 0.0 to 1.0. The
uchar version takes RGB values in the range 0 to 255. The <TT>title</TT>
argument specifies the label (title) for the window.
<P ALIGN=CENTER><IMG src="fl_color_chooser.jpg"></P>
<P><TT>fl_color_chooser()</TT> pops up a window to let the user pick an
arbitrary RGB color. They can pick the hue and saturation in the &quot;hue
box&quot; on the left (hold down CTRL to just change the saturation), and

6
src/Fl_Menu.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Menu.cxx,v 1.18.2.6 2000/05/16 18:27:10 carl Exp $"
// "$Id: Fl_Menu.cxx,v 1.18.2.7 2000/05/17 07:09:26 bill Exp $"
//
// Menu code for the Fast Light Tool Kit (FLTK).
//
@ -127,7 +127,7 @@ void Fl_Menu_Item::draw(int x, int y, int w, int h, const Fl_Menu_* m,
l.type = labeltype_;
l.font = labelsize_ ? labelfont_ : uchar(m ? m->textfont() : FL_HELVETICA);
l.size = labelsize_ ? labelsize_ : m ? m->textsize() : FL_NORMAL_SIZE;
l.color = labelsize_ ? labelcolor_ : m ? m->textcolor() : FL_BLACK;
l.color = labelcolor_ ? labelcolor_ : m ? m->labelcolor() : int(FL_BLACK);
if (!active()) l.color = inactive((Fl_Color)l.color);
Fl_Color color = m ? m->color() : FL_GRAY;
if (selected) {
@ -737,5 +737,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const {
}
//
// End of "$Id: Fl_Menu.cxx,v 1.18.2.6 2000/05/16 18:27:10 carl Exp $".
// End of "$Id: Fl_Menu.cxx,v 1.18.2.7 2000/05/17 07:09:26 bill Exp $".
//