diff options
| author | Bill Spitzak <spitzak@gmail.com> | 2000-05-17 07:09:26 +0000 |
|---|---|---|
| committer | Bill Spitzak <spitzak@gmail.com> | 2000-05-17 07:09:26 +0000 |
| commit | 9743763c7f724957c2632023b477af5b6a690039 (patch) | |
| tree | 375f0e9ad6dce8eaf5b92b1992045776dd102dfd | |
| parent | 59afeb1f94d23b4dd3bf436ffeb36f975eca8061 (diff) | |
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
| -rw-r--r-- | documentation/functions.html | 4 | ||||
| -rw-r--r-- | src/Fl_Menu.cxx | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/documentation/functions.html b/documentation/functions.html index 638a3853b..4923f3d44 100644 --- a/documentation/functions.html +++ b/documentation/functions.html @@ -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 &r, double &g, double &b) <BR> int fl_color_chooser(const char *title, uchar &r, uchar &g, uchar &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 "hue box" on the left (hold down CTRL to just change the saturation), and diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx index 1dac3b1b1..c94d1965b 100644 --- a/src/Fl_Menu.cxx +++ b/src/Fl_Menu.cxx @@ -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 $". // |