summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.in2
-rw-r--r--documentation/advanced.dox9
-rw-r--r--documentation/basics.dox9
-rw-r--r--documentation/common.dox8
-rw-r--r--documentation/development.dox2
-rw-r--r--documentation/drawing.dox9
-rw-r--r--documentation/editor.dox9
-rw-r--r--documentation/enumerations.dox2
-rw-r--r--documentation/events.dox9
-rw-r--r--documentation/examples.dox2
-rw-r--r--documentation/fluid.dox9
-rw-r--r--documentation/forms.dox2
-rw-r--r--documentation/glut.dox2
-rw-r--r--documentation/intro.dox9
-rw-r--r--documentation/license.dox2
-rw-r--r--documentation/migration_1_1.dox2
-rw-r--r--documentation/migration_1_3.dox2
-rw-r--r--documentation/opengl.dox9
-rw-r--r--documentation/osissues.dox2
-rw-r--r--documentation/preface.dox2
-rw-r--r--documentation/subclassing.dox9
-rw-r--r--documentation/unicode.dox7
22 files changed, 64 insertions, 54 deletions
diff --git a/configure.in b/configure.in
index 8a947eb65..01c0a738a 100644
--- a/configure.in
+++ b/configure.in
@@ -288,7 +288,7 @@ if test "x$NROFF" = "x:"; then
NROFF="$GROFF -T ascii"
fi
fi
-AC_PATH_PROG(HTMLDOC,htmldoc)
+AC_PATH_PROG(HTMLDOC,doxygen)
dnl How do we make libraries?
AC_PROG_RANLIB
diff --git a/documentation/advanced.dox b/documentation/advanced.dox
index fbc9d5f0c..17afa9147 100644
--- a/documentation/advanced.dox
+++ b/documentation/advanced.dox
@@ -104,11 +104,10 @@ See also:
<a href="Fl.html#Fl.thread_message">void *thread_message()</A>,
<a href="Fl.html#Fl.unlock">void unlock()</A>.
+\htmlonly
<hr>
<a class="el" href="index.html">[Index]</a> &nbsp;&nbsp;
-<a class="el" href="fluid.html">[Previous]</a>&nbsp;
- \ref fluid &nbsp;&nbsp;
-<a class="el" href="unicode.html">[Next]</a>&nbsp;
- \ref unicode
-
+<a class="el" href="fluid.html">[Previous]&nbsp; 9 - Programming with FLUID</a>&nbsp;
+<a class="el" href="unicode.html">[Next]&nbsp; 11 - Unicode and utf-8 Support</a>&nbsp;
+\endhtmlonly
*/
diff --git a/documentation/basics.dox b/documentation/basics.dox
index d9bfc4aad..1c2a615c8 100644
--- a/documentation/basics.dox
+++ b/documentation/basics.dox
@@ -343,11 +343,10 @@ include lines:</i>
#include <Fl/fl_xyz.h>
\endcode
+\htmlonly
<hr>
<a class="el" href="index.html">[Index]</a> &nbsp;&nbsp;
-<a class="el" href="intro.html">[Previous]</a>&nbsp;
- \ref intro &nbsp;&nbsp;
-<a class="el" href="common.html">[Next]</a>&nbsp;
- \ref common
-
+<a class="el" href="intro.html">[Previous]&nbsp; 1 - Introduction to FLTK</a>&nbsp;
+<a class="el" href="common.html">[Next]&nbsp; 3 - Common Widgets and Attributes</a>&nbsp;
+\endhtmlonly
*/
diff --git a/documentation/common.dox b/documentation/common.dox
index eeceae4cf..8374fe6ed 100644
--- a/documentation/common.dox
+++ b/documentation/common.dox
@@ -608,11 +608,11 @@ or one of the special keys like
combined with any modifiers like <KBD>Shift</KBD>,
<KBD>Alt</KBD>, and <KBD>Control</KBD>.
+\htmlonly
<hr>
<a class="el" href="index.html">[Index]</a> &nbsp;&nbsp;
-<a class="el" href="basics.html">[Previous]</a>&nbsp;
- \ref basics &nbsp;&nbsp;
-<a class="el" href="editor.html">[Next]</a>&nbsp;
- \ref editor
+<a class="el" href="basics.html">[Previous]&nbsp; 2 - FLTK Basics</a>&nbsp;
+<a class="el" href="editor.html">[Next]&nbsp; 4 - Designing a Simple Text Editor</a>&nbsp;
+\endhtmlonly
*/
diff --git a/documentation/development.dox b/documentation/development.dox
index f733438ae..bbb5ba791 100644
--- a/documentation/development.dox
+++ b/documentation/development.dox
@@ -416,6 +416,7 @@ The above code produces the following paragraphs:
\section development_navigation_test 5 Navigation Proposals
+\htmlonly
<hr>
\link migration_1_3 [ Previous ] \endlink
<b> [ <a href="index.html">Index</a> ] </b>
@@ -456,4 +457,5 @@ See below.
<a class="el" href="license.html">[Next]</a>&nbsp;
\ref license
+\endhtmlonly
*/
diff --git a/documentation/drawing.dox b/documentation/drawing.dox
index 5a16ef898..ea47d8fe2 100644
--- a/documentation/drawing.dox
+++ b/documentation/drawing.dox
@@ -1004,11 +1004,10 @@ Fl_Offscreen osrc, int srcx, int srcy)
Copy a rectangular area of the size <tt>w*h</tt> from <tt>srcx, srcy</tt>
in the offscreen buffer into the current buffer at <tt>x, y</tt>.
+\htmlonly
<hr>
<a class="el" href="index.html">[Index]</a> &nbsp;&nbsp;
-<a class="el" href="editor.html">[Previous]</a>&nbsp;
- \ref editor &nbsp;&nbsp;
-<a class="el" href="events.html">[Next]</a>&nbsp;
- \ref events
-
+<a class="el" href="editor.html">[Previous]&nbsp; 4 - Designing a Simple Text Editor</a>&nbsp;
+<a class="el" href="events.html">[Next]&nbsp; 6 - Handling Events</a>&nbsp;
+\endhtmlonly
*/
diff --git a/documentation/editor.dox b/documentation/editor.dox
index 158514f8b..768a3afb7 100644
--- a/documentation/editor.dox
+++ b/documentation/editor.dox
@@ -901,11 +901,10 @@ style_parse(const char *text,
}
\endcode
+\htmlonly
<hr>
<a class="el" href="index.html">[Index]</a> &nbsp;&nbsp;
-<a class="el" href="common.html">[Previous]</a>&nbsp;
- \ref common &nbsp;&nbsp;
-<a class="el" href="drawing.html">[Next]</a>&nbsp;
- \ref drawing
-
+<a class="el" href="common.html">[Previous]&nbsp; 3 - Common Widgets and Attributes</a>&nbsp;
+<a class="el" href="drawing.html">[Next]&nbsp; 5 - Drawing Things in FLTK</a>&nbsp;
+\endhtmlonly
*/
diff --git a/documentation/enumerations.dox b/documentation/enumerations.dox
index 090497d4f..fa2045860 100644
--- a/documentation/enumerations.dox
+++ b/documentation/enumerations.dox
@@ -290,10 +290,12 @@ The following damage mask bits are used by the standard FLTK widgets:
\li <tt>FL_DAMAGE_USER2</tt> - Second user-defined damage bit.
\li <tt>FL_DAMAGE_ALL</tt> - Everything needs to be redrawn.
+\htmlonly
<hr>
<a class="el" href="index.html">[Index]</a> &nbsp;&nbsp;
<a class="el" href="globals_func.html">[Previous] B - Function Reference</a>&nbsp;
<a class="el" href="glut.html">[Next]</a>&nbsp;
\ref glut
+\endhtmlonly
*/
diff --git a/documentation/events.dox b/documentation/events.dox
index f41628bdf..9682cf3ce 100644
--- a/documentation/events.dox
+++ b/documentation/events.dox
@@ -380,11 +380,10 @@ The following methods are provided for character composition:
\li <A HREF="Fl.html#Fl.compose_reset"><tt>Fl::compose_reset()</tt></A>
+\htmlonly
<hr>
<a class="el" href="index.html">[Index]</a> &nbsp;&nbsp;
-<a class="el" href="drawing.html">[Previous]</a>&nbsp;
- \ref drawing &nbsp;&nbsp;
-<a class="el" href="subclassing.html">[Next]</a>&nbsp;
- \ref subclassing
-
+<a class="el" href="drawing.html">[Previous]&nbsp; 5 - Drawing Things in FLTK</a>&nbsp;
+<a class="el" href="subclassing.html">[Next]&nbsp; 7 - Adding and Extending Widgets</a>&nbsp;
+\endhtmlonly
*/
diff --git a/documentation/examples.dox b/documentation/examples.dox
index 7a204a9bb..3f84c4b95 100644
--- a/documentation/examples.dox
+++ b/documentation/examples.dox
@@ -641,9 +641,11 @@ useful visual UI designer. Many parts of \c fluid were
created using \c fluid. See the \link fluid Fluid Tutorial \endlink
for more details.
+\htmlonly
<hr>
<a class="el" href="index.html">[Index]</a> &nbsp;&nbsp;
<a class="el" href="license.html">[Previous]</a>&nbsp;
\ref license &nbsp;&nbsp;
+\endhtmlonly
*/
diff --git a/documentation/fluid.dox b/documentation/fluid.dox
index 7876efbbd..49591a5f1 100644
--- a/documentation/fluid.dox
+++ b/documentation/fluid.dox
@@ -1364,11 +1364,10 @@ blocks of code. However, static code and data generated by this
segment (menu items, images, include statements, etc.) will still
be generated and likely cause compile-time warnings.
+\htmlonly
<hr>
<a class="el" href="index.html">[Index]</a> &nbsp;&nbsp;
-<a class="el" href="opengl.html">[Previous]</a>&nbsp;
- \ref opengl &nbsp;&nbsp;
-<a class="el" href="advanced.html">[Next]</a>&nbsp;
- \ref advanced
-
+<a class="el" href="opengl.html">[Previous]&nbsp; 8 - Using OpenGL</a>&nbsp;
+<a class="el" href="advanced.html">[Next]&nbsp; 10 - Advanced FLTK</a>&nbsp;
+\endhtmlonly
*/
diff --git a/documentation/forms.dox b/documentation/forms.dox
index 2c442f212..d48457e60 100644
--- a/documentation/forms.dox
+++ b/documentation/forms.dox
@@ -235,6 +235,7 @@ fl_font_name(10,"*bookman-demi-r-no*");
fl_font_name(11,"*bookman-light-i-no*");
\endcode
+\htmlonly
<hr>
<a class="el" href="index.html">[Index]</a> &nbsp;&nbsp;
<a class="el" href="glut.html">[Previous]</a>&nbsp;
@@ -242,4 +243,5 @@ fl_font_name(11,"*bookman-light-i-no*");
<a class="el" href="osissues.html">[Next]</a>&nbsp;
\ref osissues
+\endhtmlonly
*/
diff --git a/documentation/glut.dox b/documentation/glut.dox
index 9d1e32898..18d4f25bd 100644
--- a/documentation/glut.dox
+++ b/documentation/glut.dox
@@ -108,6 +108,7 @@ following scheme. The biggest trick is that GLUT insists on
<HR break>
<A NAME="Fl_Glut_Window"></A> <!-- For old HTML links only ! -->
\section glut_Fl_Glut_Window class Fl_Glut_Window
+\htmlonly
<HR>
\subsection glut_class_hierarchy Class Hierarchy
@@ -243,4 +244,5 @@ Switches all drawing functions to the GLUT window.
<a class="el" href="forms.html">[Next]</a>&nbsp;
\ref forms
+\endhtmlonly
*/
diff --git a/documentation/intro.dox b/documentation/intro.dox
index b6a7ad091..2965883c1 100644
--- a/documentation/intro.dox
+++ b/documentation/intro.dox
@@ -344,11 +344,10 @@ SourceForge bug tracker pages.
For general support and questions, please use the FLTK mailing list
at "fltk@fltk.org" or one of the newsgroups.
+\htmlonly
<hr>
<a class="el" href="index.html">[Index]</a> &nbsp;&nbsp;
-<a class="el" href="preface.html">[Previous]</a>&nbsp;
- \ref preface &nbsp;&nbsp;
-<a class="el" href="basics.html">[Next]</a>&nbsp;
- \ref basics
-
+<a class="el" href="preface.html">[Previous]&nbsp; Preface</a>&nbsp;
+<a class="el" href="basics.html">[Next]&nbsp; 2 - FLTK Basics</a>&nbsp;
+\endhtmlonly
*/
diff --git a/documentation/license.dox b/documentation/license.dox
index a9d84afaf..d90bc8bab 100644
--- a/documentation/license.dox
+++ b/documentation/license.dox
@@ -45,6 +45,7 @@ exceptions:
<I>[program/widget] is based in part on the work of
the FLTK project (http://www.fltk.org).</I>
+\htmlonly
<HR>
\par GNU LIBRARY GENERAL PUBLIC LICENSE
@@ -497,4 +498,5 @@ DAMAGES.
<a class="el" href="examples.html">[Next]</a>&nbsp;
\ref examples
+\endhtmlonly
*/
diff --git a/documentation/migration_1_1.dox b/documentation/migration_1_1.dox
index 544532108..17a498cc0 100644
--- a/documentation/migration_1_1.dox
+++ b/documentation/migration_1_1.dox
@@ -160,6 +160,7 @@ method to disable it:
Fl::visible_focus(0);
\endcode
+\htmlonly
<hr>
<a class="el" href="index.html">[Index]</a> &nbsp;&nbsp;
<a class="el" href="osissues.html">[Previous]</a>&nbsp;
@@ -167,4 +168,5 @@ Fl::visible_focus(0);
<a class="el" href="migration_1_3.html">[Next]</a>&nbsp;
\ref migration_1_3
+\endhtmlonly
*/
diff --git a/documentation/migration_1_3.dox b/documentation/migration_1_3.dox
index b86c335c6..70023b38c 100644
--- a/documentation/migration_1_3.dox
+++ b/documentation/migration_1_3.dox
@@ -8,6 +8,7 @@ This appendix describes the differences between the FLTK
If you want to migrate your code from FLTK 1.0 to FLTK 1.3,
then you should also consult Appendix \ref migration_1_1.
+\htmlonly
<hr>
<a class="el" href="index.html">[Index]</a> &nbsp;&nbsp;
<a class="el" href="migration_1_1.html">[Previous]</a>&nbsp;
@@ -15,4 +16,5 @@ then you should also consult Appendix \ref migration_1_1.
<a class="el" href="development.html">[Next]</a>&nbsp;
\ref development
+\endhtmlonly
*/
diff --git a/documentation/opengl.dox b/documentation/opengl.dox
index 4fd6d6ec0..bed6b5d5c 100644
--- a/documentation/opengl.dox
+++ b/documentation/opengl.dox
@@ -450,11 +450,10 @@ The <tt>scene()</tt> method sets the scene to be drawn. The scene is
a collection of 3D objects in a <tt>csGroup</tt>. The scene is redrawn
after this call.
+\htmlonly
<hr>
<a class="el" href="index.html">[Index]</a> &nbsp;&nbsp;
-<a class="el" href="subclassing.html">[Previous]</a>&nbsp;
- \ref subclassing &nbsp;&nbsp;
-<a class="el" href="fluid.html">[Next]</a>&nbsp;
- \ref fluid
-
+<a class="el" href="subclassing.html">[Previous]&nbsp; 7 - Adding and Extending Widgets</a>&nbsp;
+<a class="el" href="fluid.html">[Next]&nbsp; 9 - Programming with FLUID</a>&nbsp;
+\endhtmlonly
*/
diff --git a/documentation/osissues.dox b/documentation/osissues.dox
index 5bba13f81..b878d79d3 100644
--- a/documentation/osissues.dox
+++ b/documentation/osissues.dox
@@ -753,6 +753,7 @@ MacOS version of FLTK:
<tt>Fl_Window</tt>, but not a <tt>Fl_Window</tt> inside a
<tt>Fl_Window</tt> inside a <tt>Fl_Window</tt>.
+\htmlonly
<hr>
<a class="el" href="index.html">[Index]</a> &nbsp;&nbsp;
<a class="el" href="forms.html">[Previous]</a>&nbsp;
@@ -760,4 +761,5 @@ MacOS version of FLTK:
<a class="el" href="migration_1_1.html">[Next]</a>&nbsp;
\ref migration_1_1
+\endhtmlonly
*/
diff --git a/documentation/preface.dox b/documentation/preface.dox
index d7fc7b94f..ee1e9b6aa 100644
--- a/documentation/preface.dox
+++ b/documentation/preface.dox
@@ -75,9 +75,11 @@ Corporation. OpenGL is a registered trademark of Silicon
Graphics, Inc. Apple, Macintosh, MacOS, and Mac OS X are
registered trademarks of Apple Computer, Inc.
+\htmlonly
<hr>
<a class="el" href="index.html">[Index]</a> &nbsp;&nbsp;
<a class="el" href="intro.html">[Next]</a>&nbsp;
\ref intro
+\endhtmlonly
*/
diff --git a/documentation/subclassing.dox b/documentation/subclassing.dox
index 4b9cf82d0..a13e0a011 100644
--- a/documentation/subclassing.dox
+++ b/documentation/subclassing.dox
@@ -522,11 +522,10 @@ the windows. See
<A href="osissues.html">"Appendix F - Operating System Issues"</A>
for more information.
+\htmlonly
<hr>
<a class="el" href="index.html">[Index]</a> &nbsp;&nbsp;
-<a class="el" href="events.html">[Previous]</a>&nbsp;
- \ref events &nbsp;&nbsp;
-<a class="el" href="opengl.html">[Next]</a>&nbsp;
- \ref opengl
-
+<a class="el" href="events.html">[Previous]&nbsp; 6 - Handling Events</a>&nbsp;
+<a class="el" href="opengl.html">[Next]&nbsp; 8 - Using OpenGL</a>&nbsp;
+\endhtmlonly
*/
diff --git a/documentation/unicode.dox b/documentation/unicode.dox
index 03937464c..9ce998bbb 100644
--- a/documentation/unicode.dox
+++ b/documentation/unicode.dox
@@ -73,11 +73,10 @@ system, FLTK will convert string as needed.
Fl_Help_View. Keycodes from the keyboard conflict with Unicode
characters. Right-to-left rendered text can not be marked or edited,
and probably much more.
-
+\htmlonly
<hr>
<a class="el" href="index.html">[Index]</a> &nbsp;&nbsp;
-<a class="el" href="advanced.html">[Previous]</a>&nbsp;
- \ref advanced &nbsp;&nbsp;
+<a class="el" href="advanced.html">[Previous]&nbsp; 10 - Advanced FLTK </a>&nbsp;
<a class="el" href="classes.html">[Next]&nbsp; A - Class Reference</a>
-
+\endhtmlonly
*/