diff --git a/configure.in b/configure.in
index 35294a8d9..a4ad734f9 100644
--- a/configure.in
+++ b/configure.in
@@ -1,29 +1,29 @@
-dnl# -*- sh -*-
-dnl# the "configure" script is made from this by running GNU "autoconf"
-dnl#
-dnl# "$Id: configure.in,v 1.33.2.11 2000/04/26 14:14:41 mike Exp $"
-dnl#
-dnl# Configuration script for the Fast Light Tool Kit (FLTK).
-dnl#
-dnl# Copyright 1998-2000 by Bill Spitzak and others.
-dnl#
-dnl# This library is free software; you can redistribute it and/or
-dnl# modify it under the terms of the GNU Library General Public
-dnl# License as published by the Free Software Foundation; either
-dnl# version 2 of the License, or (at your option) any later version.
-dnl#
-dnl# This library is distributed in the hope that it will be useful,
-dnl# but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl# Library General Public License for more details.
-dnl#
-dnl# You should have received a copy of the GNU Library General Public
-dnl# License along with this library; if not, write to the Free Software
-dnl# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-dnl# USA.
-dnl#
-dnl# Please report all bugs and problems to "fltk-bugs@easysw.com".
-dnl#
+dnl -*- sh -*-
+dnl the "configure" script is made from this by running GNU "autoconf"
+dnl
+dnl "$Id: configure.in,v 1.33.2.12 2000/04/27 00:17:51 mike Exp $"
+dnl
+dnl Configuration script for the Fast Light Tool Kit (FLTK).
+dnl
+dnl Copyright 1998-2000 by Bill Spitzak and others.
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Library General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2 of the License, or (at your option) any later version.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Library General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Library General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+dnl USA.
+dnl
+dnl Please report all bugs and problems to "fltk-bugs@easysw.com".
+dnl
AC_INIT(src/Fl.cxx)
@@ -38,7 +38,7 @@ fi
DSOCOMMAND="echo"
DSONAME=""
-dnl# Get the operating system and version number...
+dnl Get the operating system and version number...
uname=`uname`
uversion=`uname -r | sed -e 's/-.*$//g;s/[\.]//g'`
@@ -46,8 +46,8 @@ if test "$uname" = "IRIX64"; then
uname="IRIX"
fi
-dnl# Clear debugging flags and only enable debugging if the user asks for
-dnl# it.
+dnl Clear debugging flags and only enable debugging if the user asks for
+dnl it.
DEBUGFLAG=""
PICFLAG=0
@@ -92,7 +92,7 @@ fi])
AC_PROG_CC
AC_PROG_CXX
-dnl# AC_PROG_INSTALL
+dnl AC_PROG_INSTALL
AC_C_BIGENDIAN
@@ -141,12 +141,12 @@ AC_CHECK_FUNCS(vsprintf)
AC_PATH_XTRA
echo "Ignoring libraries \"$X_PRE_LIBS\" requested by configure."
-dnl# LIBS="$LIBS$X_LIBS$X_PRE_LIBS"
+dnl LIBS="$LIBS$X_LIBS$X_PRE_LIBS"
LIBS="$LIBS$X_LIBS"
CFLAGS="$CFLAGS $X_CFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-dnl# My test to see if OpenGL is on this machine:
+dnl My test to see if OpenGL is on this machine:
GLLIB=
AC_CHECK_LIB(GL, glXMakeCurrent, AC_DEFINE(HAVE_GL) GLLIB=" -lGLU -lGL", \
AC_CHECK_LIB(MesaGL,glXMakeCurrent, AC_DEFINE(HAVE_GL) GLLIB=" -lMesaGLU -lMesaGL",,\
@@ -166,30 +166,30 @@ AC_CACHE_CHECK("for X overlay visuals", ac_cv_have_overlay,
ac_cv_have_overlay=no
fi)
-dnl# Note: Overlay support seems to be broken for menus; disable...
-dnl#
-dnl# if test "$ac_cv_have_overlay" = yes; then
-dnl# AC_DEFINE(HAVE_OVERLAY)
-dnl# fi
+dnl Note: Overlay support seems to be broken for menus; disable...
+dnl
+dnl if test "$ac_cv_have_overlay" = yes; then
+dnl AC_DEFINE(HAVE_OVERLAY)
+dnl fi
MAKEDEPEND="\$(CXX) -M"
-dnl# add warnings to compiler switches:
-dnl# do this last so messing with switches does not break tests
+dnl add warnings to compiler switches:
+dnl do this last so messing with switches does not break tests
if test -n "$GXX"; then
CFLAGS="-Wall $CFLAGS"
CXXFLAGS="-Wall -Wno-return-type $CXXFLAGS"
if test -z "$DEBUGFLAG"; then
- CFLAGS="-O2 $CFLAGS"
- CXXFLAGS="-O2 $CXXFLAGS"
+ CFLAGS="-O2 -fforce-mem -fforce-addr -fcaller-saves $CFLAGS"
+ CXXFLAGS="-O2 -fforce-mem -fforce-addr -fcaller-saves $CXXFLAGS"
fi
if test $PICFLAG = 1; then
CFLAGS="-fPIC $CFLAGS"
CXXFLAGS="-fPIC $CXXFLAGS"
fi
- CFLAGS="-fno-rtti -fomit-frame-pointer $CFLAGS"
- CXXFLAGS="-fno-rtti -fomit-frame-pointer $CXXFLAGS"
+ CFLAGS="-fno-rtti $CFLAGS"
+ CXXFLAGS="-fno-rtti $CXXFLAGS"
# See if GCC supports -fno-exceptions...
echo "Testing if GCC supports -fno-exceptions..."
@@ -197,7 +197,7 @@ if test -n "$GXX"; then
CFLAGS="$CFLAGS -fno-exceptions"
AC_TRY_COMPILE(,,
CXXFLAGS="$CXXFLAGS -fno-exceptions"
- echo "Congratulations - your GCC supports exceptions; disabling them...",
+ echo "Congratulations - your GCC supports exceptions; disabling them for FLTK...",
CFLAGS="$OLDCFLAGS"
echo "GCC does not support exceptions...")
@@ -279,6 +279,6 @@ AC_SUBST(MAKEDEPEND)
AC_CONFIG_HEADER(config.h:configh.in)
AC_OUTPUT(makeinclude)
-dnl#
-dnl# End of "$Id: configure.in,v 1.33.2.11 2000/04/26 14:14:41 mike Exp $".
-dnl#
+dnl
+dnl End of "$Id: configure.in,v 1.33.2.12 2000/04/27 00:17:51 mike Exp $".
+dnl
diff --git a/documentation/fluid-catgets.gif b/documentation/fluid-catgets.gif
new file mode 100644
index 000000000..048f6ed20
Binary files /dev/null and b/documentation/fluid-catgets.gif differ
diff --git a/documentation/fluid-gettext.gif b/documentation/fluid-gettext.gif
new file mode 100644
index 000000000..b4f3f9391
Binary files /dev/null and b/documentation/fluid-gettext.gif differ
diff --git a/documentation/fluid.html b/documentation/fluid.html
index d336309d3..ebd60af3f 100644
--- a/documentation/fluid.html
+++ b/documentation/fluid.html
@@ -473,6 +473,12 @@ FLUID with the -c switch.
The output file names are the same as the .fl file, with
the leading directory and trailing ".fl" stripped, and
".h" or ".cxx" appended.
+File/Write Messages (Alt+Shift+W)
+Writes a message file for all of the text labels defined in the current file.
+The output file name is the same as the .fl file, with
+the leading directory and trailing ".fl" stripped, and
+".txt", ".po", or ".msg" appended depending
+on the Internationalization Mode.
File/Quit (Alt+q)
Exits FLUID. You are asked for confirmation if you have changed the
current data.
@@ -546,6 +552,9 @@ to actually change.
generated by FLUID. If you check the "Include .h from .cxx" button the code
file will include the header file automatically.
+The internationalization options are described later in
+this chapter.
+
New/Code/Function
Creates a new C function. You will be asked for a name for the
function. This name should be a legal C++ function template, without
@@ -871,4 +880,54 @@ as for xpm files. Notice that the conversion removes the compression,
so the code may be much bigger than the .gif file. Only the first
image of an animated gif file is used.
Behavior and performance with large .gif files is not guaranteed!
+
+FLUID supports internationalization (I18N for short) of label strings
+used by widgets. The preferences window (Alt+p) provides access
+to the I18N options.
+
I18N Methods
+FLUID supports three methods of I18N: use none, use GNU gettext, and
+use POSIX catgets. The "use none" method is the default and just passes the
+label strings as-is to the widget constructors.
+
The "GNU gettext" method uses GNU gettext (or a similar text-based I18N
+library) to retrieve a localized string before calling the widget
+constructor.
+
The "POSIX catgets" method uses the POSIX catgets function to retrieve a
+numbered message from a message catalog before calling the widget
+constructor.
+
Using GNU gettext for I18N
+FLUID's code support for GNU gettext is limited to calling a function or
+macro to retrieve the localized label; you still need to call
+setlocale() and textdomain() or bindtextdomain()
+to select the appropriate language and message file.
+
To use GNU gettext for I18N, open the preferences window and choose
+"GNU gettext" from the "Use" chooser. Two new input fields will then
+appear to control the include file and function/macro name to use when
+retrieving the localized label strings.
+
+The "#include" field controls the header file to include for I18N; by
+default this is <libintl.h>, the standard I18N file for
+GNU gettext.
+
The "Function" field controls the function (or macro) that will
+retrieve the localized message; by default the gettext
+function will be called.
+
+
Using POSIX catgets for I18N
+FLUID's code support for POSIX catgets allows you to use a global message
+file for all interfaces or a file specific to each .fl file; you still
+need to call setlocale() to select the appropriate language.
+
To use POSIX catgets for I18N, open the preferences window and choose
+"POSIX catgets" from the "Use" chooser. Three new input fields will then
+appear to control the include file, catalog file, and set number for
+retrieving the localized label strings.
+
+The "#include" field controls the header file to include for I18N; by
+default this is <nl_types.h>, the standard I18N file for
+POSIX catgets.
+
The "File" field controls the name of the catalog file variable to
+use when retrieving localized messages; by default the file field is
+empty which forces a local (static) catalog file to be used for all
+of the windows defined in your .fl file.
+
The "Set" field controls the set number in the catalog file. The default
+set is 1 and rarely needs to be changed.
+