From a04d891607ceb56393cf6f4b332cc9e41012dbaf Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Thu, 3 Oct 2002 14:53:26 +0000
Subject: fl_color_average, not fl_average_color... :)

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2645 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 documentation/functions.html | 66 ++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/documentation/functions.html b/documentation/functions.html
index 1af6abc93..140467da8 100644
--- a/documentation/functions.html
+++ b/documentation/functions.html
@@ -13,9 +13,9 @@ A</A>.
 
 	<LI><A HREF="#fl_alert"><TT>fl_alert</TT></A></LI>
 	<LI><A HREF="#fl_ask"><TT>fl_ask</TT></A></LI>
-	<LI><A HREF="#fl_average_color"><TT>fl_average_color</TT></A></LI>
 	<LI><A HREF="#fl_beep"><TT>fl_beep</TT></A></LI>
 	<LI><A HREF="#fl_choice2"><TT>fl_choice</TT></A></LI>
+	<LI><A HREF="#fl_color_average"><TT>fl_color_average</TT></A></LI>
 	<LI><A HREF="#fl_color_chooser_func"><TT>fl_color_chooser</TT></A></LI>
 	<LI><A HREF="#fl_color_cube"><TT>fl_color_cube</TT></A></LI>
 	<LI><A HREF="#fl_contrast"><TT>fl_contrast</TT></A></LI>
@@ -72,7 +72,7 @@ A</A>.
 	<LI>Drawing Functions
 	<UL>
 
-		<LI><A HREF="#fl_average_color"><TT>fl_average_color</TT></A></LI>
+		<LI><A HREF="#fl_color_average"><TT>fl_color_average</TT></A></LI>
 		<LI><A HREF="#fl_color_cube"><TT>fl_color_cube</TT></A></LI>
 		<LI><A HREF="#fl_contrast"><TT>fl_contrast</TT></A></LI>
 		<LI><A HREF="#fl_cursor"><TT>fl_cursor</TT></A></LI>
@@ -158,37 +158,6 @@ a shortcut for No.
 <P ALIGN="CENTER"><IMG SRC="fl_ask.gif" ALT="The fl_ask window.">
 
 
-<!-- NEED 4in -->
-<H2><A NAME="fl_average_color">fl_average_color</A></H2>
-
-<HR>
-
-<H3>Include Files</H3>
-
-<UL><PRE>
-#include &lt;FL/Enumerations.H&gt;
-</PRE></UL>
-
-<H3>Prototype</H3>
-
-<UL><PRE>
-Fl_Color fl_average_color(Fl_Color c1, Fl_Color c2, float weight);
-</PRE></UL>
-
-<H3>Description</H3>
-
-<P>Returns the weighted average color between the two colors.
-The red, green, and blue values are averaged using the following
-formula:
-
-<UL><PRE>
-color = c1 * weight + c2 * (1 - weight)
-</PRE></UL>
-
-<P>Thus, a <CODE>weight</CODE> value of 1.0 will return the
-first color, while a value of 0.0 will return the second color.
-
-
 <!-- NEED 4in -->
 <H2><A name="fl_beep">fl_beep</A></H2>
 
@@ -263,6 +232,37 @@ buttons by passing <tt>NULL</tt> as their labels.
 <P ALIGN="CENTER"><IMG SRC="fl_choice.gif" ALT="The fl_choice window.">
 
 
+<!-- NEED 4in -->
+<H2><A NAME="fl_color_average">fl_color_average</A></H2>
+
+<HR>
+
+<H3>Include Files</H3>
+
+<UL><PRE>
+#include &lt;FL/Enumerations.H&gt;
+</PRE></UL>
+
+<H3>Prototype</H3>
+
+<UL><PRE>
+Fl_Color fl_color_average(Fl_Color c1, Fl_Color c2, float weight);
+</PRE></UL>
+
+<H3>Description</H3>
+
+<P>Returns the weighted average color between the two colors.
+The red, green, and blue values are averaged using the following
+formula:
+
+<UL><PRE>
+color = c1 * weight + c2 * (1 - weight)
+</PRE></UL>
+
+<P>Thus, a <CODE>weight</CODE> value of 1.0 will return the
+first color, while a value of 0.0 will return the second color.
+
+
 <!-- NEED 4in -->
 <H2><A name="fl_color_chooser_func">fl_color_chooser</A></H2>
 
-- 
cgit v1.2.3