Doco and makefile updates from SGI.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1934 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

22 files changed, 68 insertions, 43 deletions

diff --git a/documentation/Fl.html b/documentation/Fl.html
index 438acbf43..692181511 100644
--- a/documentation/Fl.html
+++ b/documentation/Fl.html
@@ -36,8 +36,8 @@ state information and global methods for the current application.</P>
 	<LI><A HREF="#Fl.args">args</A></LI>
 	<LI><A HREF="#Fl.atclose">atclose</A></LI>
 	<LI><A HREF="#Fl.awake">awake</A></LI>
-	<LI><A HREF="#Fl.background2">background2</A></LI>
 	<LI><A HREF="#Fl.background">background</A></LI>
+	<LI><A HREF="#Fl.background2">background2</A></LI>
 	<LI><A HREF="#Fl.belowmouse">belowmouse</A></LI>
 	<LI><A HREF="#Fl.box_dh">box_dh</A></LI>
 	<LI><A HREF="#Fl.box_dw">box_dw</A></LI>
@@ -50,6 +50,7 @@ state information and global methods for the current application.</P>
 	<LI><A HREF="#Fl.default_atclose">default_atclose</A></LI>
 	<LI><A HREF="#Fl.display">display</A></LI>
 	<LI><A HREF="#Fl.error">error</A></LI>
+	<LI><A HREF="#Fl.event">event</A></LI>
 	<LI><A HREF="#Fl.event_alt">event_alt</A></LI>
 	<LI><A HREF="#Fl.event_button1">event_button1</A></LI>
 	<LI><A HREF="#Fl.event_button2">event_button2</A></LI>
@@ -58,13 +59,15 @@ state information and global methods for the current application.</P>
 	<LI><A HREF="#Fl.event_buttons">event_buttons</A></LI>
 	<LI><A HREF="#Fl.event_clicks">event_clicks</A></LI>
 	<LI><A HREF="#Fl.event_ctrl">event_ctrl</A></LI>
-	<LI><A HREF="#Fl.event">event</A></LI>
+	<LI><A HREF="#Fl.event_dx">event_dx</A></LI>
+	<LI><A HREF="#Fl.event_dy">event_dx</A></LI>
 	<LI><A HREF="#Fl.event_inside">event_inside</A></LI>
 	<LI><A HREF="#Fl.event_is_click">event_is_click</A></LI>
 	<LI><A HREF="#Fl.event_key">event_key</A></LI>
 	<LI><A HREF="#Fl.event_length">event_length</A></LI>
 	<LI><A HREF="#Fl.event_shift">event_shift</A></LI>
 	<LI><A HREF="#Fl.event_state">event_state</A></LI>
+	<LI><A HREF="#Fl.event_text">event_text</A></LI>
 	<LI><A HREF="#Fl.event_x">event_x</A></LI>
 	<LI><A HREF="#Fl.event_x_root">event_x_root</A></LI>
 	<LI><A HREF="#Fl.event_y">event_y</A></LI>
@@ -1103,5 +1106,11 @@ the left side of the screen.
 <P>Returns the origin of the current screen, where 0 indicates
 the top edge of the screen.
 
+<H4><A NAME="Fl.event_dx">int event_dx();</A></H4>
+
+<H4><A NAME="Fl.event_dy">int event_dy();</A></H4>
+
+<H4><A NAME="Fl.event_text">const char* event_text();</A></H4>
+
 </BODY>
 </HTML>
diff --git a/documentation/Fl_Button.html b/documentation/Fl_Button.html
index 921c86391..e6ee1e733 100644
--- a/documentation/Fl_Button.html
+++ b/documentation/Fl_Button.html
@@ -90,10 +90,10 @@ overrides the use of '&amp;' in the <TT>label()</TT>.  The value is a bitwise
 OR of a key and a set of shift flags, for example <CODE>FL_ALT | 'a'</CODE>
 , <CODE>FL_ALT | (FL_F + 10)</CODE>, or just <CODE>'a'</CODE>.  A value
 of 0 disables the shortcut. </P>
-<P>The key can be any value returned by <A href=functions.html#event_key>
+<P>The key can be any value returned by <A href="Fl.html#Fl.event_key">
 <TT>Fl::event_key()</TT></A>, but will usually be an ASCII letter.  Use
 a lower-case letter unless you require the shift key to be held down. </P>
-<P>The shift flags can be any set of values accepted by <A href=events.html#event_state>
+<P>The shift flags can be any set of values accepted by <A href="Fl.html#Fl.event_state">
 <TT>Fl::event_state()</TT></A>.  If the bit is on that shift key must
 be pushed.  Meta, Alt, Ctrl, and Shift must be off if they are not in
 the shift flags (zero for the other bits indicates a &quot;don't care&quot;
diff --git a/documentation/Fl_Clock.html b/documentation/Fl_Clock.html
index 682b06414..fa5284faa 100644
--- a/documentation/Fl_Clock.html
+++ b/documentation/Fl_Clock.html
@@ -18,7 +18,7 @@
 </UL>
 <H3>Description</H3>
  This widget provides a round analog clock display and is provided for
-Forms compatibility.  It installs a 1-second timeout callback using <A href=functions.html#add_timeout>
+Forms compatibility.  It installs a 1-second timeout callback using <A href="Fl.html#Fl.add_timeout">
 <TT>Fl::add_timeout()</TT></A>.
 <P ALIGN=CENTER><IMG src="clock.gif" ALT="Fl_Clock widget."> <IMG src="round_clock.gif" ALT="Fl_Clock widget."></P>
 <H3>Methods</H3>
diff --git a/documentation/Fl_File_Chooser.html b/documentation/Fl_File_Chooser.html
index 10b4c92c3..c781513d8 100644
--- a/documentation/Fl_File_Chooser.html
+++ b/documentation/Fl_File_Chooser.html
@@ -2,7 +2,7 @@
 <BODY>
 
 <!-- NEW PAGE -->
-<H2><A NAME="FL_FileChooser">class Fl_File_Chooser</A></H2>
+<H2><A NAME="FL_File_Chooser">class Fl_File_Chooser</A></H2>
 
 <HR>
 
diff --git a/documentation/Fl_Help_Dialog.html b/documentation/Fl_Help_Dialog.html
index d344cc0fc..e414019ab 100644
--- a/documentation/Fl_Help_Dialog.html
+++ b/documentation/Fl_Help_Dialog.html
@@ -2,7 +2,7 @@
 <BODY>
 
 <!-- NEW PAGE -->
-<H2>class Fl_Help_Dialog</H2>
+<H2><A NAME="Fl_Help_Dialog">class Fl_Help_Dialog</A></H2>
 
 <HR>
 
@@ -45,7 +45,7 @@ using the <CODE>Fl_Help_View</CODE> widget.
 
 <P>The constructor creates the dialog pictured above.
 
-<H4><A NAME="Fl_Help_View.~Fl_Help_View">~Fl_Help_View()</A></H4>
+<H4><A NAME="Fl_Help_Dialog.~Fl_Help_Dialog">~Fl_Help_View()</A></H4>
 
 <P>The destructor destroys the widget and frees all memory that has been
 allocated for the current file.
diff --git a/documentation/Fl_Help_View.html b/documentation/Fl_Help_View.html
index 47e5aca2e..3eee0eac3 100644
--- a/documentation/Fl_Help_View.html
+++ b/documentation/Fl_Help_View.html
@@ -1,6 +1,6 @@
 <HTML>
 <!-- NEW PAGE -->
-<H2>class Fl_Help_View</H2>
+<H2><A name="Fl_Help_View">class Fl_Help_View</A></H2>
 
 <HR>
 
@@ -84,7 +84,7 @@ the <TT>Fl_Help_View</TT> widget will remain unchanged.</P>
 
 <P>If the link callback cannot handle the URI scheme, it should
 return the <TT>uri</TT> value unchanged or set the <A
-HREF="Fl_Help_View.value"><TT>value()</TT></A> of the widget
+HREF="#Fl_Help_View.value"><TT>value()</TT></A> of the widget
 before returning <TT>NULL</TT>.</P>
 
 <H4><A NAME="Fl_Help_View.load">int load(const char *f)</A></H4>
diff --git a/documentation/Fl_Menu_Item.html b/documentation/Fl_Menu_Item.html
index 582088f2e..87aa515fe 100644
--- a/documentation/Fl_Menu_Item.html
+++ b/documentation/Fl_Menu_Item.html
@@ -157,7 +157,7 @@ const
 <BR> void Fl_Menu_Item::labelfont(Fl_Font)</A></H4>
  Fonts are identified by small 8-bit indexes into a table.  See the <A href=enumerations.html#Enumerations>
 enumeration list</A> for predefined fonts. The default value is a
-Helvetica font.  The function <A href=functions.html#set_font><TT>
+Helvetica font.  The function <A href="Fl.html#Fl.set_font"><TT>
 Fl::set_font()</TT></A> can define new fonts.
 <H4><A name=Fl_Menu_Item.labelsize>uchar Fl_Menu_Item::labelsize() const
 <BR> void Fl_Menu_Item::labelsize(uchar)</A></H4>
@@ -197,10 +197,10 @@ before calling this.
 value is a logical 'or' of a key and a set of shift flags, for instance <TT>
 FL_ALT+'a'</TT> or <TT>FL_ALT+FL_F+10</TT> or just 'a'.  A value of
 zero disables the shortcut.
-<P>The key can be any value returned by <A href=functions.html#event_key>
+<P>The key can be any value returned by <A href="Fl.html#Fl.event_key">
 <TT>Fl::event_key()</TT></A>, but will usually be an ASCII letter.  Use
 a lower-case letter unless you require the shift key to be held down. </P>
-<P>The shift flags can be any set of values accepted by <A href=functions.html#event_state>
+<P>The shift flags can be any set of values accepted by <A href="Fl.html#Fl.event_state">
 <TT>Fl::event_state()</TT></A>.  If the bit is on that shift key must
 be pushed.  Meta, Alt, Ctrl, and Shift must be off if they are not in
 the shift flags (zero for the other bits indicates a &quot;don't care&quot;
diff --git a/documentation/Fl_Timer.html b/documentation/Fl_Timer.html
index 489f73d38..725036634 100644
--- a/documentation/Fl_Timer.html
+++ b/documentation/Fl_Timer.html
@@ -20,7 +20,7 @@
  This is provided only to emulate the Forms Timer widget.  It works by
 making a timeout callback every 1/5 second.  This is wasteful and
 inaccurate if you just want something to happen a fixed time in the
-future.  You should directly call <A href=functions.html#add_timeout><TT>
+future.  You should directly call <A href="Fl.html#Fl.add_timeout"><TT>
 Fl::add_timeout()</TT></A> instead.
 <H3>Methods</H3>
 <UL>
diff --git a/documentation/Fl_Widget.html b/documentation/Fl_Widget.html
index 99c20db3c..b29e11f41 100644
--- a/documentation/Fl_Widget.html
+++ b/documentation/Fl_Widget.html
@@ -53,12 +53,15 @@ to call <TT>redraw()</TT> after these. </P>
 <LI><A href=#Fl_Widget.damage>damage</A></LI>
 <LI><A href=#Fl_Widget.deactivate>deactivate</A></LI>
 <LI><A href=#Fl_Widget.default_callback>default_callback</A></LI>
+<LI><A href=#Fl_Widget.deimage>deimage</A></LI>
 <LI><A href=#Fl_Widget.do_callback>do_callback</A></LI>
 <LI><A href=#Fl_Widget.h>h</A></LI>
 </UL>
 </TD><TD align=left valign=top>
 <UL>
+<LI><A href=#Fl_Widget.handle>handle</A></LI>
 <LI><A href=#Fl_Widget.hide>hide</A></LI>
+<LI><A href=#Fl_Widget.image>image</A></LI>
 <LI><A href=#Fl_Widget.inside>inside</A></LI>
 <LI><A href=#Fl_Widget.label>label</A></LI>
 <LI><A href=#Fl_Widget.labelcolor>labelcolor</A></LI>
@@ -142,7 +145,7 @@ FL_NO_BOX</TT> or <TT>FL_UP_BOX</TT>.
  This color is passed to the box routine.  Color is an index into an
 internal table of rgb colors.  For most widgets this defaults to <TT>
 FL_GRAY</TT>.  See the <A href=enumerations.html#Enumerations>
-enumeration list</A> for predefined colors.  Use <A href=functions.html#set_color>
+enumeration list</A> for predefined colors.  Use <A href="Fl.html#Fl.set_color">
 <TT>Fl::set_color()</TT></A> to redefine colors.
 <H4><A name=Fl_Widget.selection_color>Fl_Color
 Fl_Widget::selection_color() const
@@ -189,7 +192,7 @@ color of the label text.  This defaults to <TT>FL_BLACK</TT>.
 <BR> void Fl_Widget::labelfont(Fl_Font)</A></H4>
  Fonts are identified by small 8-bit indexes into a table.  See the <A href=enumerations.html#Enumerations>
 enumeration list</A> for predefined typefaces. The default value uses a
-Helvetica typeface (Arial for Microsoft&reg; Windows&reg;).  The function <A href=functions.html#set_font>
+Helvetica typeface (Arial for Microsoft&reg; Windows&reg;).  The function <A href="Fl.html#Fl.set_font">
 <TT>Fl::set_font() </TT></A> can define new typefaces.
 <H4><A name=Fl_Widget.labelsize>uchar Fl_Widget::labelsize() const
 <BR> void Fl_Widget::labelsize(uchar)</A></H4>
@@ -242,7 +245,7 @@ their own callbacks in response to an &quot;OK&quot; button.
 <H4><A name=Fl_Widget.default_callback>static void
 Fl_Widget::default_callback(Fl_Widget*, void*)</A></H4>
  The default callback, which puts a pointer to the widget on the queue
-returned by <A href=functions.html#readqueue><TT>Fl::readqueue()</TT></A>
+returned by <A href="Fl.html#Fl.readqueue"><TT>Fl::readqueue()</TT></A>
 .  You may want to call this from your own callback.
 <H4><A name=Fl_Widget.visible>int Fl_Widget::visible() const</A><BR>
 <A name=Fl_Widget.visible_r>int Fl_Widget::visible_r() const</A><BR>
@@ -307,4 +310,16 @@ const</A></H4>
 sending it an <TT>FL_FOCUS</TT> event, and if it returns non-zero,
 setting <TT>Fl::focus()</TT> to this widget.  You should use this
 method to assign the focus to an widget.  Returns true if the widget
-accepted the focus. </BODY></HTML>
+accepted the focus.
+
+<H4><A name="Fl_Widget.deimage">Fl_Image* Fl_Widget::deimage()</A><BR>
+void Fl_Widget::deimage(Fl_Image* a)<BR>
+void Fl_Widget::deimage(Fl_Image& a)</H4>
+
+<H4><A name="Fl_Widget.image">Fl_Image* Fl_Widget::image()</A><BR>
+void Fl_Widget::image(Fl_Image* a)<BR>
+void Fl_Widget::image(Fl_Image& a)</H4>
+
+<H4><A name="Fl_Widget.handle">int Fl_Widget::handle(int)</A></H4>
+
+</BODY></HTML>
diff --git a/documentation/Fl_Window.html b/documentation/Fl_Window.html
index a245e2d52..bd5770465 100644
--- a/documentation/Fl_Window.html
+++ b/documentation/Fl_Window.html
@@ -31,7 +31,7 @@ on how to add and remove children. </P>
 <P>There are several subclasses of <TT>Fl_Window</TT> that provide
 double-buffering, overlay, menu, and OpenGL support. </P>
 <P>The window's callback is done if the user tries to close a window
-using the window manager and <A href=functions.html#modal><TT>
+using the window manager and <A href="Fl.html#Fl.modal"><TT>
 Fl::modal()</TT></A> is zero or equal to the window. <TT>Fl_Window</TT>
  has a default callback that calls <TT>Fl_Window::hide()</TT>. </P>
 <H3>Methods</H3>
@@ -216,7 +216,7 @@ being delivered to other windows in the same program, and will also
 remain on top of the other windows (if the X window manager supports
 the &quot;transient for&quot; property).  Several modal windows may be shown at
 once, in which case only the last one shown gets events.  You can see
-which window (if any) is modal by calling <A href=functions.html#modal><TT>
+which window (if any) is modal by calling <A href="Fl.html#Fl.modal"><TT>
 Fl::modal()</TT></A>.
 <H4><A name=Fl_Window.modal>uchar Fl_Window::modal() const</A></H4>
  Returns true if this window is modal.
diff --git a/documentation/Fl_Wizard.html b/documentation/Fl_Wizard.html
index 9143eef7d..d0b4b8b05 100644
--- a/documentation/Fl_Wizard.html
+++ b/documentation/Fl_Wizard.html
@@ -2,7 +2,7 @@
 <BODY>
 
 <!-- NEW PAGE -->
-<H2>class Fl_Wizard</H2>
+<H2><A name="Fl_Wizard">class Fl_Wizard</A></H2>
 
 <HR>
 
diff --git a/documentation/Makefile b/documentation/Makefile
index 5b6008ea3..592a340ec 100644
--- a/documentation/Makefile
+++ b/documentation/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.9.2.10.2.9 2002/01/07 18:05:32 easysw Exp $"
+# "$Id: Makefile,v 1.9.2.10.2.10 2002/01/15 02:17:18 easysw Exp $"
 #
 # Documentation makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -75,7 +75,6 @@ HTMLFILES	= \
 			Fl_Help_Dialog.html \
 			Fl_Help_View.html \
 			Fl_Hold_Browser.html \
-			Fl.html \
 			Fl_Image.html \
 			Fl_Input_.html \
 			Fl_Input.html \
@@ -207,5 +206,5 @@ fltk.pdf: $(HTMLFILES)
 	$(HTMLDOC) --verbose --batch fltk.book -f fltk.pdf
 
 #
-# End of "$Id: Makefile,v 1.9.2.10.2.9 2002/01/07 18:05:32 easysw Exp $".
+# End of "$Id: Makefile,v 1.9.2.10.2.10 2002/01/15 02:17:18 easysw Exp $".
 #
diff --git a/documentation/basics.html b/documentation/basics.html
index 983f1a6cb..bf6e57da4 100644
--- a/documentation/basics.html
+++ b/documentation/basics.html
@@ -60,7 +60,7 @@ box-&gt;<A href=Fl_Widget.html#Fl_Widget.labeltype>labeltype</A>(FL_SHADOW_LABEL
 <UL><PRE>
 window-&gt;<A href=Fl_Group.html#Fl_Group.end>end</A>();
 window-&gt;<A href=Fl_Window.html#Fl_Window.show>show</A>(argc, argv);
-return <A href=functions.html#run>Fl::run</A>();
+return <A href="Fl.html#Fl.run">Fl::run</A>();
 </PRE></UL>
 
 <P>The resulting program will display the window in Figure 2-1.
@@ -103,7 +103,7 @@ Fl_Box draws, changing it from the default of
 &quot;Hello, World!&quot; example we use <TT>FL_UP_BOX</TT>,
 which means that a raised button border will be drawn around
 the widget. You can learn more about boxtypes in
-<A href="common.html#boytypes">Chapter 3</A>.</P>
+<A href="common.html#boxtypes">Chapter 3</A>.</P>
 
 <P>You could examine the boxtype in by doing
 <tt>box->box()</tt>. FLTK uses method name overloading to make
@@ -179,7 +179,7 @@ data-driven displays.</P>
 
 <P>FLTK applications must periodically check
 (<TT>Fl::check()</TT>) or wait (<TT>Fl::wait()</TT>) for events
-or use the <A href="functions.html#run"><TT>Fl:run()</TT></A>
+or use the <A href="Fl.html#Fl.run"><TT>Fl::run()</TT></A>
 method to enter a standard event processing loop. Calling
 <TT>Fl::run()</TT> is equivalent to the following code:</P>
 
diff --git a/documentation/common.html b/documentation/common.html
index 61628b403..bad086ebe 100644
--- a/documentation/common.html
+++ b/documentation/common.html
@@ -167,7 +167,7 @@ with FLTK:</P>
 	<LI><A HREF="Fl_Group.html"><TT>Fl_Group</TT></A> - The base container class; can be used to group
 	any widgets together. </LI>
 
-	<LI><A HREF="Fl_Packed.html"><TT>Fl_Pack</TT></A> - A collection of widgets that are packed into the group area.</LI>
+	<LI><A HREF="Fl_Pack.html"><TT>Fl_Pack</TT></A> - A collection of widgets that are packed into the group area.</LI>
 
 	<LI><A HREF="Fl_Scroll.html"><TT>Fl_Scroll</TT></A> - A scrolled window area. </LI>
 
@@ -229,7 +229,7 @@ fixed contents.</P>
 	<LI><TT>FL_GRAY</TT> (this is the default background color of most widgets)</LI>
 </UL>
 
-<P>RGB colors can be set using the <A HREF="drawing.html#fl_rgb_color"><TT>fl_rgb_color()</TT></A>
+<P>RGB colors can be set using the <A HREF="enumerations.html#fl_rgb_color"><TT>fl_rgb_color()</TT></A>
 function:</P>
 
 <UL><PRE>
@@ -328,8 +328,8 @@ for the label. Symbols can be included with the label string by
 escaping them using the "@" symbol - "@@" displays a single at
 sign. Figure 3-4 shows the available symbols.</P>
 
-<P ALIGN="CENTER"><IMG src="symbols.gif" ALT="FLTK Symbols"><BR>
-<I>Figure 3-4: FLTK label symbols</I></P>
+<P ALIGN="CENTER"><A name="symbols"><IMG src="symbols.gif" ALT="FLTK Symbols"><BR>
+<I>Figure 3-4: FLTK label symbols</I></A></P>
 
 <P>The @ sign may also be followed by the following optional
 &quot;formatting&quot;  characters, in this order:</P>
diff --git a/documentation/drawing.html b/documentation/drawing.html
index dee747871..5b40b9d83 100644
--- a/documentation/drawing.html
+++ b/documentation/drawing.html
@@ -74,7 +74,8 @@ transformation matrix.
 <P>In addition, the system may provide clipping when updating windows
 which may be more complex than a simple rectangle.</P>
 
-<H4>void fl_push_clip(int x, int y, int w, int h)</H4>
+<H4><A name="fl_clip">void fl_push_clip(int x, int y, int w, int h)</A><BR>
+void fl_clip(int x, int y, int w, int h)</H4>
 
 <P>Intersect the current clip region with a rectangle and push this new
 region onto the stack.
@@ -141,10 +142,10 @@ values. These are mapped to the closest color supported by the
 screen, either from one of the 256 colors in the FLTK 1.0.x
 colormap or a direct RGB value on TrueColor screens. You can
 generate 24-bit RGB color values using the <A
-HREF="functions.html#fl_rgb_color"><TT>fl_rgb_color()</TT></A>
+HREF="enumerations.html#fl_rgb_color"><TT>fl_rgb_color()</TT></A>
 function.
 
-<H4>void fl_color(Fl_Color)</H4>
+<H4><A name="fl_color">void fl_color(Fl_Color)</A></H4>
 
 <P>Sets the color for all subsequent drawing operations.
 
@@ -685,7 +686,7 @@ fl_draw_pixmap(foo, X, Y);
 
 <P>Transparent colors are replaced by the optional
 <TT>Fl_Color</TT> argument. To draw with true transparency you must
-use the <A HREF="#Fl_Pixmap"><TT>Fl_Pixmap</TT></A> class.
+use the <A HREF="Fl_Pixmap.html"><TT>Fl_Pixmap</TT></A> class.
 
 <H4>int fl_measure_pixmap(char **data, int &amp;w, int &amp;h)</H4>
 
diff --git a/documentation/enumerations.html b/documentation/enumerations.html
index e9e67e002..24b90f94e 100644
--- a/documentation/enumerations.html
+++ b/documentation/enumerations.html
@@ -207,6 +207,8 @@ To get the closest color to a 8-bit set of R,G,B values use
 <tt>fl_color_cube(R*FL_NUM_RED/256, G*FL_NUM_GREEN/256,
 B*FL_NUM_BLUE/256);</tt>
 
+<p><a name="fl_rgb_color"><b>Fl_Color fl_rgb_color(uchar r, uchar g, uchar b)</b></a>
+
 <H2><a name=cursor>Cursors</A></H2>
 
 <P>The following constants define the mouse cursors that are available in
diff --git a/documentation/forms.html b/documentation/forms.html
index 9d0d7cb88..ae885b9dd 100644
--- a/documentation/forms.html
+++ b/documentation/forms.html
@@ -42,7 +42,7 @@ programs that change the <TT>handle()</TT> function on widgets, but you
 will still need to rewrite things. </P>
 <P><A href=Fl_Timer.html#Fl_Timer><TT>Fl_Timer</TT></A> widgets are
 provided to emulate the XForms timer.  These work, but are quite
-inefficient and inaccurate compared to using <A href=functions.html#add_timeout>
+inefficient and inaccurate compared to using <A href="Fl.html#Fl.add_timeout">
 <TT>Fl::add_timeout()</TT></A>. </P>
 <P><I>All instance variables are hidden.</I> If you directly refer to
 the x, y, w, h, label, or other fields of your Forms widgets you will
diff --git a/documentation/glut.html b/documentation/glut.html
index 93d7b30e8..1d5b4149d 100644
--- a/documentation/glut.html
+++ b/documentation/glut.html
@@ -68,7 +68,7 @@ small crosshair. </P>
 <P>The fonts used by <TT>glutBitmapCharacter() and glutBitmapWidth()</TT>
  may be different. </P>
 <P><TT>glutInit(argc,argv)</TT> will consume different switches than
-GLUT does.  It accepts the switches recognized by <A href=functions.html#args>
+GLUT does.  It accepts the switches recognized by <A href="Fl.html#Fl.args">
 <TT>Fl::args()</TT></A>, and will accept any abbreviation of these
 switches (such as &quot;-di&quot; for &quot;-display&quot;). </P>
 <H2>Mixing GLUT and FLTK Code</H2>
diff --git a/documentation/index.html b/documentation/index.html
index 57b0b13be..fd1e3a3a2 100644
--- a/documentation/index.html
+++ b/documentation/index.html
@@ -41,7 +41,7 @@
 	<LI><A HREF="common.html#boxtypes">Box Types</A></LI>
 	<LI><A HREF="common.html#labels">Labels and Label Types</A></LI>
 	<LI><A HREF="drawing.html#images">Images</A></LI>
-	<LI><A HREF="drawing.html#Fl_Pixmap">class Fl_Pixmap</A></LI>
+	<LI><A HREF="Fl_Pixmap.html#Fl_Pixmap">class Fl_Pixmap</A></LI>
 	</UL>
 	<B><A HREF="editor.html#editor">4 - Designing a Simple Text Editor</A></B>
 	<BR>
diff --git a/documentation/opengl.html b/documentation/opengl.html
index ee2a2e08f..0b0e8a9fe 100644
--- a/documentation/opengl.html
+++ b/documentation/opengl.html
@@ -241,7 +241,7 @@ adhere to for maximum portability: </P>
 <UL>
 
 	<LI>You must choose a default visual with <A
-	href="functions.html#gl_visual"><TT>Fl::gl_visual()</TT></A>.</LI>
+	href="Fl.html#Fl.gl_visual"><TT>Fl::gl_visual()</TT></A>.</LI>
 
 	<LI>You cannot pass <TT>FL_DOUBLE</TT> to
 	<TT>Fl::gl_visual()</TT>.</LI>
diff --git a/documentation/osissues.html b/documentation/osissues.html
index e454bb5a3..99af09039 100644
--- a/documentation/osissues.html
+++ b/documentation/osissues.html
@@ -88,7 +88,7 @@ window does not belong to FLTK and the <TT>add_handler()</TT>
 functions all return 0, this function will return false.
 
 <P>Besides feeding events your code should call <A
-href="functions.html#flush"><TT>Fl::flush()</TT></A>
+href="Fl.html#Fl.flush"><TT>Fl::flush()</TT></A>
 periodically so that FLTK redraws its windows.</P>
 
 <P>This function will call the callback functions. It will not
@@ -148,7 +148,7 @@ colormap. This greatly simplifies its internal structure and
 makes it much smaller and faster. You can change which it uses
 by setting global variables <I>before the first
 <TT>Fl_Window::show()</TT> is called</I>. You may also want to
-call <A href="functions.html#visual">Fl::visual()</A>, which is
+call <A href="Fl.html#Fl.visual">Fl::visual()</A>, which is
 a portable interface to get a full color and/or double buffered
 visual.
 
@@ -392,7 +392,7 @@ functions are called.</P>
 
 <P>This variable contains the most recent message read by
 <TT>GetMessage</TT>, which is called by <A
-href="Fl.html#wait"><TT>Fl::wait()</TT></A>. This may not be the
+href="Fl.html#Fl.wait"><TT>Fl::wait()</TT></A>. This may not be the
 most recent message sent to an FLTK window, because silly WIN32
 calls the handle procedures directly for some events (sigh).
 
diff --git a/documentation/subclassing.html b/documentation/subclassing.html
index 9da68b134..069bb26b2 100644
--- a/documentation/subclassing.html
+++ b/documentation/subclassing.html
@@ -368,7 +368,6 @@ may be UTF-8) between applications:
 <UL>
 <LI><A href="Fl.html#Fl.paste"><TT>Fl::paste</TT></A></LI>
 <LI><A href="Fl.html#Fl.selection"><TT>Fl::selection</TT></A></LI>
-<LI><A href="Fl.html#Fl.selection_length"><TT>Fl::selection_length</TT></A></LI>
 <LI><A href="Fl.html#Fl.selection_owner"><TT>Fl::selection_owner</TT></A></LI>
 </UL>
 It may be possible to cut/paste non-text data by using <A href=osissues.html#add_handler>