Released 1.2.10.

Sun Apr 1 23:01:31 2001 Owen Taylor <otaylor@redhat.com> * Released 1.2.10. Sun Apr 1 22:22:47 2001 Owen Taylor <otaylor@redhat.com> [ Addition of safety checks to try to avoid segfaulting on broken setups always. ] * gdk/gdkfont.c (_gdk_font_wc_to_glyphs): Add a boolean return value to deal with failure of conversion of wide characters to glyphs. * gtk/gtkentry.c gtk/gtklabel.c: Handle failure of mbstowcs/wcstombs a bit better. * gdk/gdkfont.c gdk/gdkdraw.c: Deal with failure of _gdk_font_wc_to_glyphs() gracefully * gdk/gdkim.c (_gdk_wcstombs_len): quietly return NULL on failure instead of g_return_if_fail(). Wed Mar 28 16:05:29 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkfontsel.c (gtk_font_selection_select_size): Fix problem where fractional sizes caused infinite loop. (bugzilla.redhat.com #33081) Wed Mar 28 14:52:08 2001 Owen Taylor <otaylor@redhat.com> * docs/Makefile.am: Remove excess rules breaking distcheck.
Fix problem where dropping into internal child widgets (such as GtkCList
2001-04-02 03:51:01 +00:00 · 2001-03-28 17:43:08 +00:00 · 2001-03-27 20:12:43 +00:00 · 2001-03-25 13:04:59 +00:00 · 2001-03-23 02:44:31 +00:00 · 2001-03-19 13:41:21 +00:00
488 changed files with 100494 additions and 49613 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,6 +1,7 @@
 *.lo
 config.log
 config.h
+config.h.in
 libtool
 config.status
 stamp-h
@@ -11,4 +12,8 @@ configure
 gtk-config
 config.cache
 ABOUT-NLS
-intl
+intl
+stamp-h.in
+gtk+.spec
+gdk.pc
+gtk+.pc
--- a/10
+++ b/10
@@ -4,20 +4,26 @@ Peter Mattis      <petm@xcf.berkeley.edu>
 Spencer Kimball   <spencer@xcf.berkeley.edu>
 Josh MacDonald    <jmacd@xcf.berkeley.edu>

+Please do not mail the original authors asking questions about this 
+version of GTK+.

 The GTK+ Team (in alphabetical order)
 -------------------------------------
 Shawn T. Amundson <amundson@gtk.org>
-Jerome Bolliet    <bolliet@in2p3.fr>
+Jerome Bolliet    <bolliet@gtk.org>
+Damon Chaplin     <damon@gtk.org>
 Tony Gale         <gale@gtk.org>
+Jeff Garzik       <jgarzik@gtk.org>
 Lars Hamann       <lars@gtk.org>
+Raja R Harinath   <harinath@gtk.org>
+Carsten Haitzler  <raster@gtk.org>
 Tim Janik         <timj@gtk.org>
 Stefan Jeske      <stefan@gtk.org>
 Elliot Lee        <sopwith@gtk.org>
 Raph Levien       <raph@gtk.org>
 Ian Main          <imain@gtk.org>
 Federico Mena     <quartic@gtk.org>
-Paolo Molaro      <lupus@lettere.unipd.it>
+Paolo Molaro      <lupus@gtk.org>
 Jay Painter       <jpaint@gtk.org>
 Manish Singh      <manish@gtk.org>
 Owen Taylor       <otaylor@gtk.org>
--- a/5384
+++ b/5384
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
--- a/23
+++ b/23
@@ -1,10 +1,10 @@
 If you want to hack on the Gtk+ project, it will make you life easier
 to have the following packages installed:

-	- GNU autoconf 2.12
-	- GNU automake 1.3
+	- GNU autoconf 2.13
+	- GNU automake 1.4
 	        (Beta releases are at ftp://ftp.cygnus.com/pub/tromey)
-	- GNU libtool 1.2b
+	- GNU libtool 1.2d
 	- indent (GNU indent 1.9.1 is known good)
 	- GNU gettext 10.35
 		Available in ftp://alpha.gnu.org/gnu
@@ -41,16 +41,15 @@ to autogen.sh and they will be passed on to configure.
 If at all possible, please use CVS to get the latest development version of
 gtk+ and glib.  You can do the following to get glib and gtk+ from cvs:

-   $ export CVSROOT=':pserver:anonymous@cvs.gimp.org:/debian/home/gnomecvs'
+   $ export CVSROOT=':pserver:anonymous@cvs.gnome.org:/cvs/gnome'
   $ cvs login
     (there is no password, just hit return)
-   $ cvs -z9 checkout glib
-   $ cvs -z9 checkout gtk+
+   $ cvs -z3 checkout glib
+   $ cvs -z3 checkout gtk+
+
+For information about submitting patches and commiting changes
+to CVS, see the README and README.cvs-commits files. In particular, 
+don't, under any circumstances, commit anything to CVS before
+reading and understanding README.cvs-commmits.

-Please submit patches to the gtk-list@redhat.com mailing list (you must
-subscribe before you post, e-mail gtk-list-request@redhat.com with a
-subject of "subscribe"). All kinds of contributions are accepted.
-Patches that you wish to go into the distribution should also be uploaded 
-to ftp://ftp.gimp.org/incoming.  Follow the rules there for naming your
-patches. 

--- a/88
+++ b/88
@@ -7,12 +7,27 @@ you got this package.
 Simple install procedure
 ========================

-  % gzip -cd gtk+-1.1.12.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-1.1.12                          # change to the toplevel directory
-  % ./configure                             # run the `configure' script
-  % make                                    # build GTK
+  % gzip -cd gtk+-1.2.10.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-1.2.10			   # change to the toplevel directory
+  % ./configure				   # run the `configure' script
+  % make				   # build GTK
+
  [ Become root if necessary ]
-  % make install                            # install GTK
+  % rm -rf /install-prefix/include/gtk /install-prefix/include/gdk
+  % make install			   # install GTK
+
+Special note for GTK+-1.2.9
+===========================
+
+Between GTK+-1.2.8 and GTK+-1.2.9, the include files for GTK+
+have been moved to $(includedir)/gtk-1-2/ to allow parallel installations
+of GTK+-1.2 and GTK+-2.0 to work correctly. If you are installing
+on top of an old installation of GTK+, you should remove the directories:
+
+ $(includedir)/gtk/
+ $(includedir)/gdk/
+
+Before running 'make install'

 The Nitty-Gritty
 ================
@@ -37,11 +52,22 @@ for the XInput extension (mainly used for graphics tablets), and
 which form of support to use:

  no    : no support 
-  gxi   : Use generic XInput support
  xfree : Use special features in the Wacom drivers in XFree86 3.3.1
          and later.
+  gxi   : Use generic XInput support (not recommended)

-For more information, follow the link from http://www.gtk.org
+The XInput support is not known to work with any other XServer than
+XFree86. For more information about XInput, see:
+
+ http://www.gtk.org/~otaylor/xinput/howto/index.html
+ http://www.lepied.com/xfree86/
+
+*  --disable-nls           do not use Native Language Support
+
+If this flag is not specified, GTK+ will try to find
+and use the gettext() set of functions to provide translations
+of the strings in the standard dialogs into the
+user's native language.

 *  --enable-xim            support XIM [default=yes]

@@ -50,7 +76,7 @@ internationalized text using X Input Methods. This will give some
 slight savings in speed and memory use and might be necessary
 with older versions of X.

-*  --with-locale=LOCALE   locale name you want to use
+*  --with-locale=LOCALE    locale name you want to use

 The --with-locale options is used to determine if your operating
 system has support for the locale you will be using. If not, X's
@@ -65,6 +91,18 @@ variables.  If you will be using multiple locales with GTK,
 specify the one for which your operating system has the worst
 support for the --with-locale option.

+*  --with-native-locale=[yes/no]  Use native locale support
+
+If set, GTK+ will use your C library's native locale support,
+instead of making conversions between wide characters and
+multibyte-strings by going through Xlib's property-conversion
+functions. Specifying this flag can speed up some operations
+involving text by between 5 and 20 times.
+
+This defaults to no, because it has not extensively been
+tested for portability, but should be safe on most modern
+systems.
+

 Options can be given to the compiler and linker by setting
 environment variables before running configure. A few of the more
@@ -84,19 +122,43 @@ or,

 setenv CFLAGS -O2 ; ./configure  # csh and variants

+Native-Language Support and gettext()
+=====================================

-Using an uninstalled copy of GLIB
-=================================
+To provide native-language support (NLS) GTK+ uses the
+gettext() set of functions. These functions are found
+in the C library on many systems, such as the Solaris
+C library and the GNU C Library, version 2.
+
+If your C library does not provide the necessary functionality,
+you may wish to install the GNU gettext package. You'll
+need version 0.10.35 or better. Version 0.10.35 is
+available from ftp://alpha.gnu.org/pub/gnu
+
+Generally, GTK+ will properly detect what is installed
+on your system and enable or disable NLS as appropriate.
+However, in rare cases, it may be necessary to disable
+NLS manually to get GTK+ to compile. You can do this
+by specifying the --disable-nls flag when configuring
+GTK+.
+
+Using an uninstalled copy of GLIB [ Unsupported ]
+=================================================

 You can compile GTK+ against a copy of GLIB that you have not
 yet installed. To do this, give the --with-glib=DIR options
 to ./configure. For instance:

- ./configure --with-glib=../glib-1.1.12
+ ./configure --with-glib=../glib-1.2.10

 This, however, will not work if you built GLIB with different
 source and build directories.

+It is recommended that you install GLIB before compiling
+GTK+. The --with-glib option is not regularly tested
+and may not function correctly. In addition, 
+inter-library dependencies won't be generated when
+using --with-glib=.

 Installation directories
 ========================
@@ -126,7 +188,7 @@ For complete details, see the file docs/gtk-config.txt
 Notes for using XIM support for Japanese input
 ==============================================

-* There is a bug in older versions of kinput2 that will cause GTK
+* There is a bug in older versions of kinput2 that will cause GTK+
 to hang when destroying a text entry. The latest versions of
 kinput is available from:

@@ -138,7 +200,7 @@ C library multibyte functions. Unless your C library has support
 for Japanese locales, this is incorrect, and will cause problems
 for GTK's internationalization.

-(In particular, this occurs with GNU libc 2.0 and 2.1, in which
+(In particular, this occurs with GNU libc 2.0 in which
 the multibyte functions always translate to and from UTF-8; but
 the problem may occur for other C libraries, and other operating
 systems as well.)
--- a/INSTALL.in
+++ b/INSTALL.in
@@ -0,0 +1,218 @@
+Prerequisites
+=============
+
+GTK+ requires the GLIB library, available at the same location as
+you got this package.
+
+Simple install procedure
+========================
+
+  % gzip -cd gtk+-@GTK_VERSION@.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-@GTK_VERSION@			   # change to the toplevel directory
+  % ./configure				   # run the `configure' script
+  % make				   # build GTK
+
+  [ Become root if necessary ]
+  % rm -rf /install-prefix/include/gtk /install-prefix/include/gdk
+  % make install			   # install GTK
+
+Special note for GTK+-1.2.9
+===========================
+
+Between GTK+-1.2.8 and GTK+-1.2.9, the include files for GTK+
+have been moved to $(includedir)/gtk-1-2/ to allow parallel installations
+of GTK+-1.2 and GTK+-2.0 to work correctly. If you are installing
+on top of an old installation of GTK+, you should remove the directories:
+
+ $(includedir)/gtk/
+ $(includedir)/gdk/
+
+Before running 'make install'
+
+The Nitty-Gritty
+================
+
+The 'configure' script can be given a number of options to enable
+and disable various features. For a complete list, type:
+
+  ./configure --help
+
+A few of the more important ones:
+
+*  --prefix=PREFIX         install architecture-independent files in PREFIX
+                           [ Defaults to /usr/local ]
+
+*  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                           [ Defaults to the value given to --prefix ]
+
+*  --with-xinput=[no/gxi/xfree] support XInput [default=no]
+
+The --with-xinput flag specifies whether to compile with support
+for the XInput extension (mainly used for graphics tablets), and
+which form of support to use:
+
+  no    : no support 
+  xfree : Use special features in the Wacom drivers in XFree86 3.3.1
+          and later.
+  gxi   : Use generic XInput support (not recommended)
+
+The XInput support is not known to work with any other XServer than
+XFree86. For more information about XInput, see:
+
+ http://www.gtk.org/~otaylor/xinput/howto/index.html
+ http://www.lepied.com/xfree86/
+
+*  --disable-nls           do not use Native Language Support
+
+If this flag is not specified, GTK+ will try to find
+and use the gettext() set of functions to provide translations
+of the strings in the standard dialogs into the
+user's native language.
+
+*  --enable-xim            support XIM [default=yes]
+
+Specifying --disable-xim will disable support for entering
+internationalized text using X Input Methods. This will give some
+slight savings in speed and memory use and might be necessary
+with older versions of X.
+
+*  --with-locale=LOCALE    locale name you want to use
+
+The --with-locale options is used to determine if your operating
+system has support for the locale you will be using. If not, X's
+built in locale support will be used.
+
+Because of bugs in autoconf, it is necessary to specify this
+option even if your LANG environment variable is correctly set.
+
+This option does not determine which locale GTK will use at
+runtime. That will be determined from the usual environment
+variables.  If you will be using multiple locales with GTK,
+specify the one for which your operating system has the worst
+support for the --with-locale option.
+
+*  --with-native-locale=[yes/no]  Use native locale support
+
+If set, GTK+ will use your C library's native locale support,
+instead of making conversions between wide characters and
+multibyte-strings by going through Xlib's property-conversion
+functions. Specifying this flag can speed up some operations
+involving text by between 5 and 20 times.
+
+This defaults to no, because it has not extensively been
+tested for portability, but should be safe on most modern
+systems.
+
+
+Options can be given to the compiler and linker by setting
+environment variables before running configure. A few of the more
+important ones:
+
+ CC       : The C compiler to use
+ CPPFLAGS : Flags for the C preprocesser such as -I and -D
+ CFLAGS   : C compiler flags
+
+The most important use of this is to set the
+optimization/debugging flags. For instance, to compile with no
+debugging information at all, run configure as:
+
+ CFLAGS=-O2 ./configure           # Bourne compatible shells (sh/bash/zsh)
+
+or,
+
+ setenv CFLAGS -O2 ; ./configure  # csh and variants
+
+Native-Language Support and gettext()
+=====================================
+
+To provide native-language support (NLS) GTK+ uses the
+gettext() set of functions. These functions are found
+in the C library on many systems, such as the Solaris
+C library and the GNU C Library, version 2.
+
+If your C library does not provide the necessary functionality,
+you may wish to install the GNU gettext package. You'll
+need version 0.10.35 or better. Version 0.10.35 is
+available from ftp://alpha.gnu.org/pub/gnu
+
+Generally, GTK+ will properly detect what is installed
+on your system and enable or disable NLS as appropriate.
+However, in rare cases, it may be necessary to disable
+NLS manually to get GTK+ to compile. You can do this
+by specifying the --disable-nls flag when configuring
+GTK+.
+
+Using an uninstalled copy of GLIB [ Unsupported ]
+=================================================
+
+You can compile GTK+ against a copy of GLIB that you have not
+yet installed. To do this, give the --with-glib=DIR options
+to ./configure. For instance:
+
+ ./configure --with-glib=../glib-@GTK_VERSION@
+
+This, however, will not work if you built GLIB with different
+source and build directories.
+
+It is recommended that you install GLIB before compiling
+GTK+. The --with-glib option is not regularly tested
+and may not function correctly. In addition, 
+inter-library dependencies won't be generated when
+using --with-glib=.
+
+Installation directories
+========================
+
+The location of the installed files is determined by the --prefix
+and --exec-prefix options given to configure. There are also more
+detailed flags to control individual directories. However, the
+use of these flags is not tested.
+
+One particular detail to note, is that the architecture-dependent
+include file glibconfig.h is installed in:
+
+  $exec_pref/lib/glib/include/
+
+if you have a version in $prefix/include, this is out of date
+and should be deleted.
+
+A shell script gtk-config is created during the configure
+process, and installed in the bin/ directory
+($exec_prefix/bin). This is used to determine the location of GTK
+when building applications.  If you move GTK after installation,
+it will be necessary to edit this file.
+
+For complete details, see the file docs/gtk-config.txt
+
+
+Notes for using XIM support for Japanese input
+==============================================
+
+* There is a bug in older versions of kinput2 that will cause GTK+
+to hang when destroying a text entry. The latest versions of
+kinput is available from:
+
+  ftp://ftp.sra.co.jp/pub/x11/kinput2
+
+* The locale information file for the ja_JP EUC locale
+distributed with some recent versions of X11 specifies to use the
+C library multibyte functions. Unless your C library has support
+for Japanese locales, this is incorrect, and will cause problems
+for GTK's internationalization.
+
+(In particular, this occurs with GNU libc 2.0 in which
+the multibyte functions always translate to and from UTF-8; but
+the problem may occur for other C libraries, and other operating
+systems as well.)
+
+To fix this, change the line:
+
+use_stdc_env		True
+
+to 
+
+use_stdc_env		False
+
+in the file /usr/X11R6/lib/X11/locale/ja_JP/XLC_LOCALE.
+
+
--- a/1
+++ b/1
@@ -0,0 +1 @@
+Email: gtk-bugs@gimp.org
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,16 @@
-## Process this file with automake to produce Makefile.in
+## Makefile.am for GTK+

 SRC_SUBDIRS = gdk gtk
 SUBDIRS = po $(SRC_SUBDIRS) docs

 bin_SCRIPTS = gtk-config

+# require automake 1.4
+AUTOMAKE_OPTIONS = 1.4
+
 EXTRA_DIST =	\
 	HACKING		\
-	gtk+.spec	\
+	gtk+.spec.in	\
        gtk.m4          \
 	makecopyright	\
 	TODO		\
@@ -16,18 +19,21 @@ EXTRA_DIST =	\
 	README.cvs-commits	\
 	intl/libgettext.h	\
 	intl/po2tbl.sed.in	\
-	examples/Makefile	\
-	examples/README.1ST	\
-	examples/extract.awk	\
-	examples/extract.sh	\
 	examples/aspectframe/Makefile  \
 	examples/aspectframe/aspectframe.c  \
-	examples/base/Makefile	\
-	examples/base/base.c \
+	examples/Makefile  \
+	examples/README.1ST  \
+	examples/extract.awk  \
+	examples/extract.sh  \
+	examples/base/Makefile  \
+	examples/base/base.c  \
 	examples/buttons/Makefile  \
 	examples/buttons/buttons.c  \
 	examples/buttons/info.xpm  \
-	examples/clist/clist.c \
+	examples/calendar/Makefile  \
+	examples/calendar/calendar.c  \
+	examples/clist/Makefile  \
+	examples/clist/clist.c  \
 	examples/entry/Makefile  \
 	examples/entry/entry.c  \
 	examples/eventbox/Makefile  \
@@ -46,16 +52,13 @@ EXTRA_DIST =	\
 	examples/list/list.c  \
 	examples/menu/Makefile  \
 	examples/menu/menu.c  \
-	examples/menu/menufactory.c  \
-	examples/menu/menufactory.h  \
-	examples/menu/mfmain.c  \
-	examples/menu/mfmain.h  \
+	examples/menu/itemfactory.c  \
 	examples/notebook/Makefile  \
 	examples/notebook/notebook.c  \
-	examples/packer/Makefile  \
-	examples/packer/pack.c \
 	examples/packbox/Makefile  \
 	examples/packbox/packbox.c  \
+	examples/packer/Makefile  \
+	examples/packer/pack.c  \
 	examples/paned/Makefile  \
 	examples/paned/paned.c  \
 	examples/pixmap/Makefile  \
@@ -64,6 +67,8 @@ EXTRA_DIST =	\
 	examples/progressbar/progressbar.c  \
 	examples/radiobuttons/Makefile  \
 	examples/radiobuttons/radiobuttons.c  \
+	examples/rangewidgets/Makefile  \
+	examples/rangewidgets/rangewidgets.c  \
 	examples/rulers/Makefile  \
 	examples/rulers/rulers.c  \
 	examples/scribble-simple/Makefile  \
@@ -77,14 +82,36 @@ EXTRA_DIST =	\
 	examples/statusbar/statusbar.c  \
 	examples/table/Makefile  \
 	examples/table/table.c  \
+	examples/text/Makefile  \
+	examples/text/text.c  \
 	examples/tictactoe/Makefile  \
 	examples/tictactoe/tictactoe.c  \
 	examples/tictactoe/tictactoe.h  \
 	examples/tictactoe/ttt_test.c  \
+	examples/tree/Makefile  \
+	examples/tree/tree.c  \
 	examples/wheelbarrow/Makefile  \
 	examples/wheelbarrow/wheelbarrow.c  \
-	examples/find-examples.sh
+	examples/fixed/fixed.c  \
+	examples/fixed/Makefile  \
+	examples/frame/frame.c  \
+	examples/frame/Makefile  \
+	examples/spinbutton/spinbutton.c  \
+	examples/spinbutton/Makefile  \
+	examples/find-examples.sh \
+	gdk.pc.in gtk+.pc.in

+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA= gdk.pc gtk+.pc
+
+dist-hook: gtk+.spec
+	if test -e $(srcdir)/INSTALL.in && test -e $(srcdir)/README.in ; then \
+	     CONFIG_FILES="INSTALL:$(srcdir)/INSTALL.in README:$(srcdir)/README.in" \
+	     CONFIG_HEADERS= \
+	     $(SHELL) config.status \
+	     && cp INSTALL README $(distdir) ; \
+	fi \
+	&& cp gtk+.spec $(distdir)

 m4datadir = $(datadir)/aclocal
 m4data_DATA = gtk.m4
--- a/240
+++ b/240
@@ -1,3 +1,243 @@
+Overview of Changes in GTK+ 1.2.10:
+
+* Fix focus drawing with no window manager
+* Fix cut-and-paste with no current event
+* Fix compilation using --with-xinput=gxi  
+* Fix problem with cut-and-paste and KOI8-R
+* Fix rare problem with enter events and menus
+* Fix problem with --with-native-locale and GNU libc-2.1
+* Further fixes for using fonts, not fontsets, with non iso-8859-1.
+* Fix problem with dropping onto internal children, such as CList buttons 
+* Translation updates
+
+Overview of Changes in GTK+ 1.2.9:
+
+* Move include files into a gtk-1-2/ subdir to support parallel
+  installation with GTK+-2.0. If you are installing from source
+  on top of a previous version, you should to remove $(includedir)/gdk/
+  and $(includedir)/gtk/ manually before installing the new version.
+* Improved submenu navigation.
+* Other small useability improvements for menus, scrollbars, etc.
+* Patch enabling themes with better appearance by making some 
+  geometry parameters settable.
+* Changes so that using fonts (as well as fontsets) for 
+  non-iso-8859-1 locales will work.
+* New --with-native-locale configure option for faster string
+  handling on systems with non-broken locale support.
+* Refuse to initialize GTK+ when setuid (http://www.gtk.org/setuid.html)
+* Change to make GdkRGB use less SHM segments.
+* Addition of .pc files
+* Many bug fixes 
+  (#50834, #50892, #13447, #50857, #1923, #50934, #3123, #51163,
+   #50492, #51026, #1704, #51039, #2682, #50964, #50926, #50686, 
+   #50678, #50511, #8170, #567, #424, #1290, #4524, #8041, #8002,
+   #7302, #11008, #34218, #12074, #12072, #9656, #10316, #14082, 
+   #13941, #13432, #7841, #6739, #8079, #28842, #50290, #50337, 
+   #6510, #15282, #11887, #18648, #26545, and others)
+
+Overview of Changes in GTK+ 1.2.8:
+
+* GNU Make 3.79 bug workaround
+* FAQ and tutorial updates and improvements
+* Miscellaneous bug fixes: CList, Calendar, rc-files, FontSelection
+
+Overview of Changes in GTK+ 1.2.7:
+
+* More header cleanups.
+* Fixed activation bug for insensitive widgets.
+* Locale fixes to RC file parsing code.
+* Miscellaneous bugfixes for Item Factory, CList, CTree, X Selections,
+  HScale, VScale, Pixmap, Viewport, OptionMenu, Entry and Notebook.
+* Upgrade to libtool 1.3.4.
+
+Overview of Changes in GTK+ 1.2.6:
+
+* container queue_resize fixes
+* gtk[vh]scale: minor fixups
+* rename idle to idle_id in testgtk to avoid conflicts with 
+  broken libs
+* More consistant naming of gtkrc files
+* Added language support: ro, uk
+
+Overview of Changes in GTK+ 1.2.5:
+
+* more GtkCTree and GtkWindow bug fixes.
+* more redraw/resize queue fixes, better expose event
+  discarding code.
+* more miscellaneous bugs fixed
+* new configure.in option --disable-rebuilds to completely disable
+  rebuilds of autogenerated sources.
+* check for 5.002 now, to avoid failing autogeneration build rules due
+  to old perl versions.
+* fonts (and fontsets) are cached now.
+* more autogeneration make rules and dependancy fixups, we should be
+  save with autogeneration up to make -j12 now ;)
+* new window position GTK_WIN_POS_CENTER_ALWAYS, which will recenter the
+  GtkWindow on every size change.
+* major rework of window manager hints handling code, fixed a bunch of
+  races with the new resizing code.
+* the new wm hints and resizing code is absolutely perfect and bug free now,
+  it only lacks testing ;)
+* fixed up various rc style memory prolems.
+* gtk_widget_modify_style() now properly changes the style of realized widgets
+  and references the style passed into it. if people worked around this bug,
+  this will introduce a slight memory leak in their code.
+  The code should typically look like:
+            GtkRcStyle *rc_style = gtk_rc_style_new ();
+            [...]
+            gtk_widget_modify_style (widget, rc_style);
+            gtk_rc_style_unref (rc_style);
+* fix problems with positioning menus offscreen.
+* GtkText fixes for some crashes and drawing errors.
+* Better handling for unexpected window destroys in GDK and GTK+.
+  This should make it possible to use a GtkPlug and catch the
+  case where its parent socket is randomly killed.
+* FAQ updates.
+* FileSelection i18n patches, RadioButton fixups.
+* many translation improvements.
+* miscellaneous other bugs fixed.
+
+Overview of Changes in GTK+ 1.2.4:
+
+* DnD improvements (drags can be canceled with Esc now).
+* suppressed configure event reordering in Gdk.
+* rewrite of Gtk's configure event handling.
+* major improvements for the object argument system (Elena Devdariani).
+* major bugfixes for threading, GtkNotebook, GtkItemFactory, GtkCList and
+  GtkCTree.
+* tutorial/FAQ updates, new file generation.txt on autogenerated sources.
+* configure's --with-glib= is "officially" unsupported.
+* upgrade to libtool 1.3.3.
+* various buglets fixed.
+
+Overview of Changes in GTK+ 1.2.3:
+
+* Upgrade to libtool 1.3
+* Check for dgettext (for systems with old versions of GNU Gettext)
+* Many bug fixes (see ChangeLog for details)
+
+Overview of Changes in GTK+ 1.2.2:
+
+* Improved Dnd behaviour with Motif applications.
+* Bug fixes for the Gtk selection code.
+* Minor bug fixes to the Gdk Atom cache and Dnd code (with --display option).
+* Bug fixes and leak plugs for the Gdk IM code.
+* Added gtk_object_get() facility to retrive object arguments easily.
+  The var args list expects ("arg-name", &value) pairs.
+* Fixed mapping for GdkInputCondition<->GIOCondition, this should fix
+  problems where closed pipes were no longer signalling GDK_INPUT_READ on
+  systems with a native poll().
+* Some cleanups to GtkLabel's memory allocation code (shouldn't leak memory
+  anymore).
+* We don't attempt to lookup xpm color "None" anymore, this should prevent
+  eXodus (commercial X windows server) from popping up a color dialog every
+  time a transparent pixmap is created.
+* Fixed bug where Gtk timout/idle handlers would execute without the global
+  Gdk lock being held.
+* Other minor bug fixes.
+
+Overview of Changes in GTK+ 1.2.1:
+
+* Many Bug fixes have been applied to the menu and accelerator code.
+* GtkItemFactory can "adopt" foreign menu items now and manage their
+  accelerator installation. This is often required to get GtkItemFactory
+  like accelerator propagation between different windows with the same
+  menu heirarchy and for centralized parsing and saving of accelerators.
+* GtkCList/GtkCTree buttons should always display correctly now.
+* Miscellaneous other bug fixes.
+
+What's New in GTK+ 1.2.0 (since 1.0.x):
+
+* New widgets: GtkFontSelector, GtkPacker, GtkItemFactory, GtkCTree,
+  GtkInvisible, GtkCalendar, GtkLayout, GtkPlug, GtkSocket
+* Many new features and robustness for existing widgets
+* Theme support
+* New DND implementation
+* Internationalization of standard dialogs
+* New key binding system
+* Tearoff menus and menu accelerators
+* Wide character support for entry and text
+* Resizing code has been overhauled
+* Queued redraws of partial areas
+* Far better support for object arguments
+* Speed optimizations
+* Runtime loading of dynamic modules
+* Support for GLib log domains
+* Tutorial improvements
+* A bug fix or two
+
+Overview of Changes in GTK+ 1.1.16:
+
+* Major fixes and improvements for handlebox
+* A change to the way widget->requisition works. Now,
+  widget->requisition is always what the widget requested,
+  unmodified by the usize. See Changes-1.2.txt for details.
+  This correct various bugs with gtk_widget_set_usize().
+* Fixes for XIM on X11R5 systems
+* Don't allow cut-and-paste of text in password-style entries
+* --enable-debug is now on by default for the development releaes.
+  (When compiling for "production", use --enable-debug=minimum)
+* Handle systems where Helvetica is not present more gracefully
+* Fixes for memory leaks
+* CList and CTree fixes
+* Bug fixes for drawing problems. 
+* Miscellaneous bug fixes to GtkLabel, GtkCList, GtkCTree,
+  GtkColorsel, Focusing, DND
+* Tutorial improvements
+
+Overview of Changes in GTK+ 1.1.15:
+
+* Tutorial Updates
+* Added --libs gthread to gtk-config 
+* Bug fixes
+
+What is new in GTK+ 1.1.14:
+
+* Additions to docs/Changes-1.2.txt
+* Just warn when loading theme engine fails
+* CLAMP GtkScale digits to a meaningful range
+* GTK_LOCALDIR is now defined in a better fashion
+* New functions (feature freeze, we know...):
+    gtk_menu_set_title()
+    gtk_toggle_button_get_active()
+* Some locale fixups in gtkrc code
+* Fixes to make gtk_radio_button_set_group() keep only
+  one radio button in the group active
+* Foreign windows are now always treated as viewable; this fixes
+  a problem where updating didn't occure properly in GtkPlug
+* DND fixes for 64 bit architectures, and for specifying operations 
+  with modifier keys.
+* Major revisions to GtkLayout: avoid having to create window
+  for NO_WINDOW children, adjust allocations of children as 
+  scrolled so queued draws work, and a resize is queued instead
+  of allocating directly in a put() or move()
+
+What is new in GTK+ 1.1.13:
+
+* Dnd and selection bug fixes and memory purification.
+* Widget sensitivity fixups.
+* Tooltips windows are now named "gtk-tooltips" so rc file rules
+  can match tooltips windows. Fixed interaction of tooltips and NO_WINDOW
+  widgets.
+* Spin buttons now update their values upon value retrival.
+* Overhaul of the resizing vs. redrawing logic to reduce redrawing needs
+  a lot. Gtk makes full use of the draw_area coalescing code now, which
+  got minorly improved as well.
+* Containers map their Gdk windows after their children now to reduce
+  expose event generation.
+* Gdk event queue fixups, this solves the double-click problems people were
+  recently having.
+* Account for the fact that GSource's are only properly reentrant from
+  within dispatch(), thus we don't do Gdk event processing from within
+  check() or prepare() anymore.
+* Rc files feature a bg_pixmap value of "<none>" now.
+* Improved session management support in Gdk.  
+* Automatic disabling of NLS if no gettext is found should work now.
+* Removed deprecated functions, docs/Changes-1.2.txt gives an overview.
+* Gtk+ development now requires GNU autoconf 2.13, GNU automake 1.4
+  and GNU libtool 1.2d.
+* More bug fixes all over the place.
+
 What is new in GTK+ 1.1.12:

 * Korean translation added
--- a/45
+++ b/45
@@ -1,7 +1,7 @@
 General Information
 ===================

-This is GTK+ version 1.1.12.   GTK+, which stands for the Gimp ToolKit, 
+This is GTK+ version 1.2.10. GTK+, which stands for the Gimp ToolKit, 
 is a library for creating graphical user interfaces for the X Window 
 System. It is designed to be small, efficient, and flexible. GTK+ is 
 written in C with a very object-oriented approach.
@@ -12,11 +12,8 @@ The official ftp site is:
 The official web site is:
  http://www.gtk.org/

-A mailing list is located at:
-  gtk-list@redhat.com
-
-To subscribe: mail -s subscribe gtk-list-request@redhat.com < /dev/null
-(Send mail to gtk-list-request@redhat.com with the subject "subscribe")
+Information about mailing lists can be found at
+  http://www.gtk.org/mailinglists.html

 Installation
 ============
@@ -26,14 +23,12 @@ See the file 'INSTALL'
 How to report bugs
 ==================

-To report a bug, send mail either to gtk-list, as mentioned
-above, or to gtk-bugs@gtk.org. If you send mail to gtk-list, you
-must be subscribed yourself.
-
-In the mail include:
-
-* The version of GTK
-
+Bugs should be reported to the GNOME bug tracking system. 
+(http://bugzilla.gnome.org, product gtk+.) You will need
+to create an account for yourself.
+  
+In the bug report please include:
+  
 * Information about your system. For instance:

   - What operating system and version
@@ -50,11 +45,6 @@ In the mail include:
  As a last resort, you can also provide a pointer to a larger piece 
  of software that can be downloaded.

-  (Bugs that can be reproduced within the  GIMP are almost as good 
-  as bugs that can be reproduced in testgtk. If you are reporting a 
-  bug found with the GIMP, please include the version number of the GIMP 
-  you are using)
-
 * If the bug was a crash, the exact text that was printed out
  when the crash occured.

@@ -67,9 +57,16 @@ In the mail include:
 Patches
 =======

-Patches can be uploaded to the incoming/ directory on
-ftp.gtk.org.  Please follow the instructions there, and include
-your name and email address in the README file.
+Patches should also be submitted to bugzilla.gnome.org. If the
+patch fixes an existing bug, add the patch as an attachment
+to that bug report.

-If the patch fixes a bug, it is usually a good idea to include
-all the information described in "How to Report Bugs".
+Otherwise, enter a new bug report that describes the patch,
+and attach the patch to that bug report.
+
+Bug reports containing patches should include the PATCH keyword
+in their keyword fields. If the patch adds to or changes the GTK
+programming interface, the API keyword should also be included.
+  
+Patches should be in unified diff form. (The -u option to GNU
+diff.)
--- a/README.in
+++ b/README.in
@@ -0,0 +1,72 @@
+General Information
+===================
+
+This is GTK+ version @GTK_VERSION@. GTK+, which stands for the Gimp ToolKit, 
+is a library for creating graphical user interfaces for the X Window 
+System. It is designed to be small, efficient, and flexible. GTK+ is 
+written in C with a very object-oriented approach.
+
+The official ftp site is:
+  ftp://ftp.gtk.org/pub/gtk
+
+The official web site is:
+  http://www.gtk.org/
+
+Information about mailing lists can be found at
+  http://www.gtk.org/mailinglists.html
+
+Installation
+============
+
+See the file 'INSTALL'
+
+How to report bugs
+==================
+
+Bugs should be reported to the GNOME bug tracking system. 
+(http://bugzilla.gnome.org, product gtk+.) You will need
+to create an account for yourself.
+  
+In the bug report please include:
+  
+* Information about your system. For instance:
+
+   - What operating system and version
+   - What version of X
+   - For Linux, what version of the C library
+
+  And anything else you think is relevant.
+
+* How to reproduce the bug. 
+
+  If you can reproduce it with the testgtk program that is built 
+  in the gtk/ subdirectory, that will be most convenient.  Otherwise, 
+  please include a short test program that exhibits the behavior. 
+  As a last resort, you can also provide a pointer to a larger piece 
+  of software that can be downloaded.
+
+* If the bug was a crash, the exact text that was printed out
+  when the crash occured.
+
+* Further information such as stack traces may be useful, but
+  is not necessary. If you do send a stack trace, and the error
+  is an X error, it will be more useful if the stacktrace
+  is produced running the test program with the --sync command
+  line option.
+
+Patches
+=======
+
+Patches should also be submitted to bugzilla.gnome.org. If the
+patch fixes an existing bug, add the patch as an attachment
+to that bug report.
+
+Otherwise, enter a new bug report that describes the patch,
+and attach the patch to that bug report.
+
+Bug reports containing patches should include the PATCH keyword
+in their keyword fields. If the patch adds to or changes the GTK
+programming interface, the API keyword should also be included.
+  
+Patches should be in unified diff form. (The -u option to GNU
+diff.)
--- a/96
+++ b/96
@@ -1,68 +1,25 @@
-For 1.2.0 release:
-	remove deprecated functions from *.[hc] files.
-	finish composite child stuff.
-	implement constructor functionality for all widgets.
-	
-Bugs:
- * Change bitfields to guints from enums, or vice versa?

- * MappingNotify events produce warnings.
+Outstanding items:

- * the type system (gtktypeutils.c) has to handle creations of fundamental
-   types seperatedly from derived types, so we don't screw foreign
-   fundamental types with an already extensively increased seqno.
- 
- * A filter function which destroys the GDK window it is filtering
-   events on is bad news.
-
-Additions:
 * focus handling for GtkOptionMenu (needs the previous)

 * implement gtk_default_draw_oval and other missing things in gtkstyle.c.
 
- * Lists should scroll to center the recently selected item if it isn't
-   visible.
-
 * enforce invariants on *_RESIZE* and *_REDRAW* flags.

- * GtkToolTips:
-   allocate GtkTooltipsData from memchunks
-   look into incorporation of outdated/gtk-dairiki-971208-[01].patch.gz
+ * GtkToolTips: allocate GtkTooltipsData from memchunks
                          
 * Make all widget attributes configurable after the widget is created (timj).
 
- * Widgets dervied from GtkButton need to be able to override
-   GtkButtonClass.paint. e.g. redrawing of GtkToggleButton with CAN_DEFAULT
-   is messed up otheriwse. This does in fact not only apply to (toggle)buttons,
-   we should introduce a common paint member for the GtkWidgetClass.
- 
- * Radio buttons need to display CAN/HAS_DEFAULT correctly.
+ * Radio buttons need to display CAN/HAS_DEFAULT correctly, if draw_inidicator
+   is TRUE. (Radio buttons do not need to CAN_DEFAULT! OWT)

- * Seperate GtkObject, type and signaling system from Gdk dependancies,
-   by moving them into a seperate libgtkobj.
- * move *_input_add (wrappers for select(2)) mechanism into glib.
-
- * gdk_expose_compress: ala-Xt, this would really help for opaque moves and
-   such
-
- * Entry should have a password mode (and it should show stars
-   for user feedback).
-
- * Entry should allow set_usize to work better, and should compute
-   a different width when a maximum length is used.
-
- * More dialogs: Print, GtkFontSelector, maybe others...
+ * More dialogs: Print, maybe others...

 * make the gtk_main callbacks consistent in their add/remove behaviour.
 
- * More work on Documentation
-
 * Check return values on all calls to XIC[Get/Set]Values

- * Rewrite the interface to the i18n stuff so GTK widgets don't need to
-   retrieve X values, and so they don't have to know the value of the
-   XNxxx character constants.
-
 * The "--geometry" option should be supported

  - Having gdk_init() parse the geometry option. (putting it into
@@ -85,58 +42,32 @@ Additions:
    ( You'd have to extend gdk_window_set_hints to accept the
      window gravity option to get it right. )

- ? Allow moving the separator for paned widgets by dragging 
+ * Allow moving the separator for paned widgets by dragging 
   it directly instead of using the handle. 

- ? Mark public use of gtk_tree_remove_item as deprecated - it should be used
-   as:
-         gtk_container_remove (GTK_CONTAINER(tree), widget);
-
- * Standardize that all strings should be passed as gchar *, not 
-   guchar *. But what about non-string data? (gdk_property_change,
-   gtk_selection_data_set) X makes these sort of things guchar...
-
 * Check into XAddConnectionWatch - is this needed for XIM?

 * Places where a _full variant is needed:

-    gtk_clist_set_row_data
    gtk_init_add
    gtk_menu_popup
    gtk_toolbar_prepend_element
    gtk_toolbar_insert_element
-    gtk_widget_dnd_data_set (should be guchar * with a copy?
-                             shouldn't be there at all...)
 
 * Try to rationally deal with someone else deleting one of our
   windows??? This would mean keeping track of our window heirarchy
   ourselves, for one thing, and will never be safe, because of
   race conditions.

- * If a window spontaneously resizes itself N times before any
-   ConfigureNotify events are received, then due to the interaction
-   of the ConfigureNotify compression code in GDK and the resize
-   count used for the window, the window will be size_allocated
-   the next N-1 times it is moved.
-
-   Fix: Only send GDK_EVENT_CONFIGURE when the window is resized,
-   create a new event type for toplevel motion. (GDK_EVENT_REPOSITION?)
-   and eliminate the resize count in GtkWindow.
-
- * Generic ScrolledWindow interface, which provide automatic scrollbar
-   capability to Viewport, Text, and CList widgets.
-
- * GTK_POLICY_NEVER for scrolled windows.
-
- * Consider caching more state in GdkWindowPrivate. Currently, 
-   every widget realization involves a XGetGeometry and a
-   XGetWindowAttributes. And every GdkWindow destruction
-   involves a XQueryTree.
-
 * Should all the default handlers really return FALSE? This can
   cause confusing presses to be sent to containers that actually
   want to get events on themselves.

+ * The menu code should skip separators during keyboard navigation,
+   whether they are sensitive or insensitive.
+
+ * OwnerButtonPressGrab needs to go!
+
 Text/Edit widget:

  Bugs:
@@ -146,7 +77,7 @@ Text/Edit widget:
  Improvements:

  - Unify the key binding support in some fashion between the
-    Entry and Text widget widgets (???)
+    Entry and Text widget widgets, use GtkBindings for this.

  - Figure out a way not to recompute the geometry on insertions/deletions
    which are large, but not a significant fraction of the
@@ -254,7 +185,7 @@ DND

 - Use a cursor instead of an ICON when over Motif windows,
   to get rid of the current junk that Motif leaves because
-   of it's XCopyArea stupidity for doing highlighting.
+   of its XCopyArea stupidity for doing highlighting.

 - Add a GTK_DRAG_VERIFY target flag and a "drag_data_verify"   
   signal so that apps can easily check if a, say, 
@@ -267,4 +198,3 @@ DND
 - Send synthetic motion events on structure changes so 
   drag_enter/leave get sent properly. (See the popup
   in testdnd)
-
--- a/acconfig.h
+++ b/acconfig.h
@@ -33,8 +33,12 @@

 #undef RESOURCE_BASE

-/* Define to enable POSIX threading awareness */
-#undef USE_PTHREADS
+/* Define to use X11R6 additions to XIM */
+#undef USE_X11R6_XIM
+
+/* Define if we should use mbstowcs and friends directly
+ */
+#undef USE_NATIVE_LOCALE

 #undef XINPUT_NONE
 #undef XINPUT_GXI
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,6 +1,6 @@
 ## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
-## Copyright (C) 1996-1998 Free Software Foundation, Inc.
-## Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+## Copyright (C) 1996-1999 Free Software Foundation, Inc.
+## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -21,32 +21,75 @@
 ## configuration script generated by Autoconf, you may include it under
 ## the same distribution terms that you use for the rest of that program.

-# serial 24 AM_PROG_LIBTOOL
-AC_DEFUN(AM_PROG_LIBTOOL,
-[AC_REQUIRE([AM_ENABLE_SHARED])dnl
-AC_REQUIRE([AM_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_RANLIB])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AM_PROG_LD])dnl
-AC_REQUIRE([AM_PROG_NM])dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-dnl
+# serial 40 AC_PROG_LIBTOOL
+AC_DEFUN(AC_PROG_LIBTOOL,
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+
+# Save cache, so that ltconfig can load it
+AC_CACHE_SAVE
+
+# Actually configure libtool.  ac_aux_dir is where install-sh is found.
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
+|| AC_MSG_ERROR([libtool configure failed])
+
+# Reload cache, that may have been modified by ltconfig
+AC_CACHE_LOAD
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 AC_SUBST(LIBTOOL)dnl

+# Redirect the config.log output again, so that the ltconfig log is not
+# clobbered by the next message.
+exec 5>>./config.log
+])
+
+AC_DEFUN(AC_LIBTOOL_SETUP,
+[AC_PREREQ(2.13)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_RANLIB])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+dnl
+
+case "$target" in
+NONE) lt_target="$host" ;;
+*) lt_target="$target" ;;
+esac
+
 # Check for any special flags to pass to ltconfig.
-libtool_flags=
+libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$silent" = yes && libtool_flags="$libtool_flags --silent"
+test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
 test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
 test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
+[libtool_flags="$libtool_flags --enable-dlopen"])
+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+[libtool_flags="$libtool_flags --enable-win32-dll"])
+AC_ARG_ENABLE(libtool-lock,
+  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
+test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"

 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case "$host" in
+case "$lt_target" in
 *-*-irix6*)
  # Find out which ABI we are using.
  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
@@ -68,30 +111,42 @@ case "$host" in

 *-*-sco3.2v5*)
  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
  ;;
-esac

-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+[*-*-cygwin* | *-*-mingw*)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+])
+esac
 ])

-# AM_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AM_ENABLE_SHARED[(DEFAULT)]
+# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
+AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+
+# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
+AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+
+# AC_ENABLE_SHARED - implement the --enable-shared flag
+# Usage: AC_ENABLE_SHARED[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN(AM_ENABLE_SHARED,
-[define([AM_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_SHARED, [dnl
+define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(shared,
 changequote(<<, >>)dnl
-<<  --enable-shared         build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT]
+<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
 changequote([, ])dnl
-[  --enable-shared=PKGS    only build shared libraries if the current package
-                          appears as an element in the PKGS list],
 [p=${PACKAGE-default}
 case "$enableval" in
 yes) enable_shared=yes ;;
@@ -108,29 +163,23 @@ no) enable_shared=no ;;
  IFS="$ac_save_ifs"
  ;;
 esac],
-enable_shared=AM_ENABLE_SHARED_DEFAULT)dnl
+enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
 ])

-# AM_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN(AM_DISABLE_SHARED,
-[AM_ENABLE_SHARED(no)])
+# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
+AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_SHARED(no)])

-# AM_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN(AM_DISABLE_STATIC,
-[AM_ENABLE_STATIC(no)])
-
-# AM_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AM_ENABLE_STATIC[(DEFAULT)]
+# AC_ENABLE_STATIC - implement the --enable-static flag
+# Usage: AC_ENABLE_STATIC[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN(AM_ENABLE_STATIC,
-[define([AM_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_STATIC, [dnl
+define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(static,
 changequote(<<, >>)dnl
-<<  --enable-static         build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT]
+<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
 changequote([, ])dnl
-[  --enable-static=PKGS    only build shared libraries if the current package
-                          appears as an element in the PKGS list],
 [p=${PACKAGE-default}
 case "$enableval" in
 yes) enable_static=yes ;;
@@ -147,26 +196,73 @@ no) enable_static=no ;;
  IFS="$ac_save_ifs"
  ;;
 esac],
-enable_static=AM_ENABLE_STATIC_DEFAULT)dnl
+enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
 ])

+# AC_DISABLE_STATIC - set the default static flag to --disable-static
+AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_STATIC(no)])

-# AM_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN(AM_PROG_LD,
+
+# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
+# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
+#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+#   `yes'.
+AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
+define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(fast-install,
+changequote(<<, >>)dnl
+<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_fast_install=yes ;;
+no) enable_fast_install=no ;;
+*)
+  enable_fast_install=no
+  # Look at the argument we got.  We use all the common list separators.
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+  for pkg in $enableval; do
+    if test "X$pkg" = "X$p"; then
+      enable_fast_install=yes
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac],
+enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
+])
+
+# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_FAST_INSTALL(no)])
+
+# AC_PROG_LD - find the path to the GNU or non-GNU linker
+AC_DEFUN(AC_PROG_LD,
 [AC_ARG_WITH(gnu-ld,
 [  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
 test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 ac_prog=ld
 if test "$ac_cv_prog_gcc" = yes; then
  # Check if gcc -print-prog-name=ld gives a path.
  AC_MSG_CHECKING([for ld used by GCC])
  ac_prog=`($CC -print-prog-name=ld) 2>&5`
  case "$ac_prog" in
-  # Accept absolute paths.
-  /* | [A-Za-z]:\\*)
-    test -z "$LD" && LD="$ac_prog"
-    ;;
+    # Accept absolute paths.
+changequote(,)dnl
+    [\\/]* | [A-Za-z]:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+changequote([,])dnl
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
  "")
    # If it fails, then pretend we aren't using GCC.
    ac_prog=ld
@@ -183,10 +279,10 @@ else
 fi
 AC_CACHE_VAL(ac_cv_path_LD,
 [if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
  for ac_dir in $PATH; do
    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog"; then
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
      ac_cv_path_LD="$ac_dir/$ac_prog"
      # Check to see if the program is GNU ld.  I'd rather use --version,
      # but apparently some GNU ld's only accept -v.
@@ -194,7 +290,7 @@ AC_CACHE_VAL(ac_cv_path_LD,
      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
      else
-        test "$with_gnu_ld" != yes && break
+	test "$with_gnu_ld" != yes && break
      fi
    fi
  done
@@ -209,11 +305,10 @@ else
  AC_MSG_RESULT(no)
 fi
 test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_SUBST(LD)
-AM_PROG_LD_GNU
+AC_PROG_LD_GNU
 ])

-AC_DEFUN(AM_PROG_LD_GNU,
+AC_DEFUN(AC_PROG_LD_GNU,
 [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
 [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
@@ -223,41 +318,117 @@ else
 fi])
 ])

-# AM_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN(AM_PROG_NM,
+# AC_PROG_NM - find the path to a BSD-compatible name lister
+AC_DEFUN(AC_PROG_NM,
 [AC_MSG_CHECKING([for BSD-compatible nm])
 AC_CACHE_VAL(ac_cv_path_NM,
-[case "$NM" in
-/* | [A-Za-z]:\\*)
-  ac_cv_path_NM="$NM" # Let the user override the test with a path.
-  ;;
-*)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
+[if test -n "$NM"; then
+  # Let the user override the test.
+  ac_cv_path_NM="$NM"
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/nm; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
      # Check to see if the nm accepts a BSD-compat flag.
      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
      #   nm: unknown option "B" ignored
      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -B"
+	ac_cv_path_NM="$ac_dir/nm -B"
+	break
      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -p"
+	ac_cv_path_NM="$ac_dir/nm -p"
+	break
      else
-        ac_cv_path_NM="$ac_dir/nm"
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
+	continue # so that we can try to find one that supports BSD flags
      fi
-      break
    fi
  done
  IFS="$ac_save_ifs"
  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
-  ;;
-esac])
+fi])
 NM="$ac_cv_path_NM"
 AC_MSG_RESULT([$NM])
-AC_SUBST(NM)
 ])

+# AC_CHECK_LIBM - check for math library
+AC_DEFUN(AC_CHECK_LIBM,
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case "$lt_target" in
+*-*-beos* | *-*-cygwin*)
+  # These system don't have libm
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, main, LIBM="-lm")
+  ;;
+esac
+])
+
+# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
+# the libltdl convenience library, adds --enable-ltdl-convenience to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  case "$enable_ltdl_convenience" in
+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+  "") enable_ltdl_convenience=yes
+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+  esac
+  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+  INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
+])
+
+# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
+# the libltdl installable library, and adds --enable-ltdl-install to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  AC_CHECK_LIB(ltdl, main,
+  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+  [if test x"$enable_ltdl_install" = xno; then
+     AC_MSG_WARN([libltdl not installed, but installation disabled])
+   else
+     enable_ltdl_install=yes
+   fi
+  ])
+  if test x"$enable_ltdl_install" = x"yes"; then
+    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
+  else
+    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+    LIBLTDL="-lltdl"
+    INCLTDL=
+  fi
+])
+
+dnl old names
+AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
+AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
+AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
+
+dnl This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])dnl
+
 # Macro to add for using GNU gettext.
 # Ulrich Drepper <drepper@cygnus.com>, 1995.
 #
@@ -285,7 +456,7 @@ AC_DEFUN(AM_GTK_WITH_NLS,

    dnl If we use NLS figure out what method
    if test "$USE_NLS" = "yes"; then
-      AC_DEFINE(ENABLE_NLS)
+#      AC_DEFINE(ENABLE_NLS)
 #      AC_MSG_CHECKING([whether included gettext is requested])
 #      AC_ARG_WITH(included-gettext,
 #        [  --with-included-gettext use the GNU gettext library included here],
@@ -305,22 +476,26 @@ AC_DEFUN(AM_GTK_WITH_NLS,
 	CATOBJEXT=NONE

 	AC_CHECK_HEADER(libintl.h,
-	  [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
-	    [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
-	       gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
+	  [AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
+	    [AC_TRY_LINK([#include <libintl.h>], [return (int) dgettext ("","")],
+	       gt_cv_func_dgettext_libc=yes, gt_cv_func_dgettext_libc=no)])

-	   if test "$gt_cv_func_gettext_libc" != "yes"; then
+	   if test "$gt_cv_func_dgettext_libc" != "yes"; then
 	     AC_CHECK_LIB(intl, bindtextdomain,
-	       [AC_CACHE_CHECK([for gettext in libintl],
-		 gt_cv_func_gettext_libintl,
-		 [AC_CHECK_LIB(intl, gettext,
-		  gt_cv_func_gettext_libintl=yes,
-		  gt_cv_func_gettext_libintl=no)],
-		 gt_cv_func_gettext_libintl=no)])
+	       [AC_CACHE_CHECK([for dgettext in libintl],
+		 gt_cv_func_dgettext_libintl,
+		 [AC_CHECK_LIB(intl, dgettext,
+		  gt_cv_func_dgettext_libintl=yes,
+		  gt_cv_func_dgettext_libintl=no)],
+		 gt_cv_func_dgettext_libintl=no)])
 	   fi

-	   if test "$gt_cv_func_gettext_libc" = "yes" \
-	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
+           if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+	     LIBS="$LIBS -lintl";
+           fi
+
+	   if test "$gt_cv_func_dgettext_libc" = "yes" \
+	      || test "$gt_cv_func_dgettext_libintl" = "yes"; then
 	      AC_DEFINE(HAVE_GETTEXT)
 	      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
 		[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
@@ -340,8 +515,8 @@ AC_DEFUN(AM_GTK_WITH_NLS,
 	    fi

 	    # Added by Martin Baulig 12/15/98 for libc5 systems
-	    if test "$gt_cv_func_gettext_libc" != "yes" \
-	       && test "$gt_cv_func_gettext_libintl" = "yes"; then
+	    if test "$gt_cv_func_dgettext_libc" != "yes" \
+	       && test "$gt_cv_func_dgettext_libintl" = "yes"; then
 	       INTLLIBS=-lintl
 	       LIBS=`echo $LIBS | sed -e 's/-lintl//'`
 	    fi
@@ -392,7 +567,9 @@ AC_DEFUN(AM_GTK_WITH_NLS,

      if test "$nls_cv_use_gnu_gettext" != "yes"; then
        AC_DEFINE(ENABLE_NLS)
-#      else
+      else
+         # Unset this variable since we use the non-zero value as a flag.
+         CATOBJEXT=
 #        dnl Mark actions used to generate GNU NLS library.
 #        INTLOBJS="\$(GETTOBJS)"
 #        AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,14 +20,6 @@ DIE=0
 	DIE=1
 }

-(libtool --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have libtool installed to compile $PROJECT."
-	echo "Get ftp://alpha.gnu.org/gnu/libtool-1.2b.tar.gz"
-	echo "(or a newer version if it is available)"
-	DIE=1
-}
-
 (automake --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have automake installed to compile $PROJECT."
@@ -84,11 +76,11 @@ aclocal $ACLOCAL_FLAGS
 # optionally feature autoheader
 (autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader

-automake $am_opt
+automake -a $am_opt
 autoconf
 cd $ORIGDIR

-$srcdir/configure "$@"
+$srcdir/configure --enable-maintainer-mode "$@"

 echo 
 echo "Now type 'make' to compile $PROJECT."
--- a/config.guess
+++ b/config.guess
@@ -1,6 +1,7 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
+#   Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -23,6 +24,7 @@

 # Written by Per Bothner <bothner@cygnus.com>.
 # The master version of this file is at the FSF in /home/gd/gnu/lib.
+# Please send patches to <autoconf-patches@gnu.org>.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -35,6 +37,20 @@
 # (but try to keep the structure clean).
 #

+# Use $HOST_CC if defined. $CC may point to a cross-compiler
+if test x"$CC_FOR_BUILD" = x; then
+  if test x"$HOST_CC" != x; then
+    CC_FOR_BUILD="$HOST_CC"
+  else
+    if test x"$CC" != x; then
+      CC_FOR_BUILD="$CC"
+    else
+      CC_FOR_BUILD=cc
+    fi
+  fi
+fi
+
+
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 8/24/94.)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
@@ -46,7 +62,8 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown

-trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15

 # Note: order is significant - the case branches are not exclusive.

@@ -59,7 +76,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	cat <<EOF >dummy.s
+	cat <<EOF >$dummy.s
 	.globl main
 	.ent main
 main:
@@ -76,9 +93,9 @@ main:
 	ret \$31,(\$26),1
 	.end main
 EOF
-	${CC-cc} dummy.s -o dummy 2>/dev/null
+	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 	if test "$?" = 0 ; then
-		./dummy
+		./$dummy
 		case "$?" in
 			7)
 				UNAME_MACHINE="alpha"
@@ -97,8 +114,14 @@ EOF
 				;;
 		esac
 	fi
-	rm -f dummy.s dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
+	rm -f $dummy.s $dummy
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit 0 ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
 	exit 0 ;;
    21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
@@ -112,6 +135,9 @@ EOF
    amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit 0 ;;
    arc64:OpenBSD:*:*)
 	echo mips64el-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -130,6 +156,9 @@ EOF
    wgrisc:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit 0 ;;
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
@@ -139,7 +168,7 @@ EOF
    SR2?01:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
 	exit 0;;
-    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
 		echo pyramid-pyramid-sysv3
@@ -147,9 +176,12 @@ EOF
 		echo pyramid-pyramid-bsd
 	fi
 	exit 0 ;;
-    NILE:*:*:dcosx)
+    NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
@@ -195,6 +227,32 @@ EOF
    atari*:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor 
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit 0 ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit 0 ;;
    sun3*:NetBSD:*:*)
 	echo m68k-sun-netbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -216,6 +274,9 @@ EOF
    powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
+    macppc:NetBSD:*:*)
+        echo powerpc-apple-netbsd${UNAME_RELEASE}
+        exit 0 ;;
    RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
 	exit 0 ;;
@@ -225,12 +286,16 @@ EOF
    VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
 	exit 0 ;;
-    2020:CLIX:*:*)
+    2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
 	exit 0 ;;
    mips:*:*:UMIPS | mips:*:*:RISCos)
-	sed 's/^	//' << EOF >dummy.c
-	int main (argc, argv) int argc; char **argv; {
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
 	#if defined (host_mips) && defined (MIPSEB)
 	#if defined (SYSTYPE_SYSV)
 	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
@@ -245,10 +310,10 @@ EOF
 	  exit (-1);
 	}
 EOF
-	${CC-cc} dummy.c -o dummy \
-	  && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm dummy.c dummy && exit 0
-	rm -f dummy.c dummy
+	$CC_FOR_BUILD $dummy.c -o $dummy \
+	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
    Night_Hawk:Power_UNIX:*:*)
@@ -266,15 +331,18 @@ EOF
    AViiON:dgux:*:*)
        # DG/UX returns AViiON for all architectures
        UNAME_PROCESSOR=`/usr/bin/uname -p`
-        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
-	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
-	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
 		echo m88k-dg-dgux${UNAME_RELEASE}
-	else
+	    else
 		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
-        else echo i586-dg-dgux${UNAME_RELEASE}
-        fi
 	exit 0 ;;
    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
@@ -300,7 +368,7 @@ EOF
 	exit 0 ;;
    *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		sed 's/^		//' << EOF >dummy.c
+		sed 's/^		//' << EOF >$dummy.c
 		#include <sys/systemcfg.h>

 		main()
@@ -311,8 +379,8 @@ EOF
 			exit(0);
 			}
 EOF
-		${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-		rm -f dummy.c dummy
+		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+		rm -f $dummy.c $dummy
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
@@ -321,7 +389,8 @@ EOF
 	fi
 	exit 0 ;;
    *:AIX:*:4)
-	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
@@ -354,18 +423,50 @@ EOF
    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
 	exit 0 ;;
-    9000/[3478]??:HP-UX:*:*)
+    9000/[34678]??:HP-UX:*:*)
 	case "${UNAME_MACHINE}" in
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
-	    9000/8?? )            HP_ARCH=hppa1.0 ;;
+	    9000/[678][0-9][0-9])
+              sed 's/^              //' << EOF >$dummy.c
+              #include <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
+EOF
+	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+	rm -f $dummy.c $dummy
 	esac
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
    3050*:HI-UX:*:*)
-	sed 's/^	//' << EOF >dummy.c
+	sed 's/^	//' << EOF >$dummy.c
 	#include <unistd.h>
 	int
 	main ()
@@ -390,8 +491,8 @@ EOF
 	  exit (0);
 	}
 EOF
-	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-	rm -f dummy.c dummy
+	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -400,6 +501,9 @@ EOF
    9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
 	exit 0 ;;
+    *9??*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit 0 ;;
    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
 	exit 0 ;;
@@ -416,6 +520,9 @@ EOF
    parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
 	exit 0 ;;
+    hppa*:OpenBSD:*:*)
+	echo hppa-unknown-openbsd
+	exit 0 ;;
    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
        exit 0 ;;
@@ -448,11 +555,14 @@ EOF
    CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE}
 	exit 0 ;;
+    CRAY*T3E:*:*:*)
+	echo alpha-cray-unicosmk${UNAME_RELEASE}
+	exit 0 ;;
    CRAY-2:*:*:*)
 	echo cray2-cray-unicos
        exit 0 ;;
    F300:UNIX_System_V:*:*)
-        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
        exit 0 ;;
@@ -465,26 +575,47 @@ EOF
    hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    i?86:BSD/386:*:* | *:BSD/OS:*:*)
+    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
    *:FreeBSD:*:*)
+	if test -x /usr/bin/objformat; then
+	    if test "elf" = "`/usr/bin/objformat`"; then
+		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+		exit 0
+	    fi
+	fi
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
    *:NetBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
 	exit 0 ;;
    *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	exit 0 ;;
    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin32
+	echo ${UNAME_MACHINE}-pc-cygwin
 	exit 0 ;;
    i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit 0 ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i386-pc-interix
+	exit 0 ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit 0 ;;
    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin32
+	echo powerpcle-unknown-cygwin
 	exit 0 ;;
    prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -493,15 +624,11 @@ EOF
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
    *:Linux:*:*)
-	# uname on the ARM produces all sorts of strangeness, and we need to
-	# filter it out.
-	case "$UNAME_MACHINE" in
-	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
-	esac

 	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us.
-	ld_help_string=`ld --help 2>&1`
+	# first see if it will tell us. cd to the root directory to prevent
+	# problems with other programs or directories called `ld' in the path.
+	ld_help_string=`cd /; ld --help 2>&1`
 	ld_supported_emulations=`echo $ld_help_string \
 			 | sed -ne '/supported emulations:/!d
 				    s/[ 	][ 	]*/ /g
@@ -509,16 +636,74 @@ EOF
 				    s/ .*//
 				    p'`
        case "$ld_supported_emulations" in
-	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
-	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
-	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-	  elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
+	  *ia64)
+		echo "${UNAME_MACHINE}-unknown-linux"
+		exit 0
+		;;
+	  i?86linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit 0
+		;;
+	  i?86coff)
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		exit 0
+		;;
+	  sparclinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
+	  armlinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
+	  elf32arm*)
+		echo "${UNAME_MACHINE}-unknown-linux-gnu"
+		exit 0
+		;;
+	  armelf_linux*)
+		echo "${UNAME_MACHINE}-unknown-linux-gnu"
+		exit 0
+		;;
+	  m68klinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
+	  elf32ppc)
+		# Determine Lib Version
+		cat >$dummy.c <<EOF
+#include <features.h>
+#if defined(__GLIBC__)
+extern char __libc_version[];
+extern char __libc_release[];
+#endif
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
+#if defined(__GLIBC__)
+  printf("%s %s\n", __libc_version, __libc_release);
+#else
+  printf("unkown\n");
+#endif
+  return 0;
+}
+EOF
+		LIBC=""
+		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
+		if test "$?" = 0 ; then
+			./$dummy | grep 1\.99 > /dev/null
+			if test "$?" = 0 ; then
+				LIBC="libc1"
+			fi
+		fi	
+		rm -f $dummy.c $dummy
+		echo powerpc-unknown-linux-gnu${LIBC}
+		exit 0
+		;;
 	esac

 	if test "${UNAME_MACHINE}" = "alpha" ; then
-		sed 's/^	//'  <<EOF >dummy.s
+		sed 's/^	//'  <<EOF >$dummy.s
 		.globl main
 		.ent main
 	main:
@@ -536,9 +721,9 @@ EOF
 		.end main
 EOF
 		LIBC=""
-		${CC-cc} dummy.s -o dummy 2>/dev/null
+		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 		if test "$?" = 0 ; then
-			./dummy
+			./$dummy
 			case "$?" in
 			7)
 				UNAME_MACHINE="alpha"
@@ -555,22 +740,23 @@ EOF
 			16)
 				UNAME_MACHINE="alphaev6"
 				;;
-			esac	
+			esac

-			objdump --private-headers dummy | \
+			objdump --private-headers $dummy | \
 			  grep ld.so.1 > /dev/null
 			if test "$?" = 0 ; then
 				LIBC="libc1"
 			fi
-		fi	
-		rm -f dummy.s dummy
+		fi
+		rm -f $dummy.s $dummy
 		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
 	elif test "${UNAME_MACHINE}" = "mips" ; then
-	  cat >dummy.c <<EOF
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
+	  cat >$dummy.c <<EOF
+#ifdef __cplusplus
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
 #ifdef __MIPSEB__
  printf ("%s-unknown-linux-gnu\n", argv[1]);
 #endif
@@ -580,8 +766,8 @@ main(argc, argv)
  return 0;
 }
 EOF
-	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-	  rm -f dummy.c dummy
+	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	  rm -f $dummy.c $dummy
 	else
 	  # Either a pre-BFD a.out linker (linux-gnuoldld)
 	  # or one that does not give us useful --help.
@@ -600,12 +786,13 @@ EOF
 	    ;;
 	  esac
 	  # Determine whether the default compiler is a.out or elf
-	  cat >dummy.c <<EOF
+	  cat >$dummy.c <<EOF
 #include <features.h>
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
+#ifdef __cplusplus
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
 #ifdef __ELF__
 # ifdef __GLIBC__
 #  if __GLIBC__ >= 2
@@ -622,8 +809,8 @@ main(argc, argv)
  return 0;
 }
 EOF
-	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-	  rm -f dummy.c dummy
+	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	  rm -f $dummy.c $dummy
 	fi ;;
 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
 # are messed up and put the nodename in both sysname and nodename.
@@ -639,10 +826,20 @@ EOF
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit 0 ;;
    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
 	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit 0 ;;
+    i?86:*:5:7*)
+        # Fixed at (any) Pentium or better
+        UNAME_MACHINE=i586
+        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
+	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
+	else
+	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
 	fi
 	exit 0 ;;
    i?86:*:3.2:*)
@@ -654,6 +851,10 @@ EOF
 		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
 		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
 			&& UNAME_MACHINE=i586
+		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
@@ -700,7 +901,7 @@ EOF
    mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit 0 ;;
-    i?86:LynxOS:2.*:*)
+    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
    TSUNAMI:LynxOS:2.*:*)
@@ -712,6 +913,9 @@ EOF
    SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
 	exit 0 ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
    RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
 	exit 0 ;;
@@ -742,19 +946,43 @@ EOF
    news*:NEWS-OS:*:6*)
 	echo mips-sony-newsos6
 	exit 0 ;;
-    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
        exit 0 ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit 0 ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit 0 ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit 0 ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:QNX:*:4*)
+	echo i386-qnx-qnx${UNAME_VERSION}
+	exit 0 ;;
 esac

 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2

-cat >dummy.c <<EOF
+cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
 # include <sys/types.h>
 # include <sys/utsname.h>
@@ -792,7 +1020,10 @@ main ()
 #endif
  int version;
  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
  exit (0);
 #endif

@@ -852,8 +1083,8 @@ main ()
 }
 EOF

-${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
-rm -f dummy.c dummy
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy

 # Apollos put the system type in the environment.

--- a/config.h.in
+++ b/config.h.in
@@ -1,155 +0,0 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if using alloca.c.  */
-#undef C_ALLOCA
-
-/* Define to empty if the keyword does not work.  */
-#undef const
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-#undef CRAY_STACKSEG_END
-
-/* Define if you have alloca, as a function or macro.  */
-#undef HAVE_ALLOCA
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-#undef HAVE_ALLOCA_H
-
-/* Define if you have a working `mmap' system call.  */
-#undef HAVE_MMAP
-
-/* Define as __inline if that's what the C compiler calls it.  */
-#undef inline
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-#undef off_t
-
-/* Define if you need to in order for stat and other things to work.  */
-#undef _POSIX_SOURCE
-
-/* Define as the return type of signal handlers (int or void).  */
-#undef RETSIGTYPE
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-#undef size_t
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-#undef STACK_DIRECTION
-
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
-
-/* Define if the X Window System is missing or not being used.  */
-#undef X_DISPLAY_MISSING
-
-/* Other stuff */
-#undef ENABLE_NLS
-#undef GTK_COMPILED_WITH_DEBUGGING
-
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef HAVE_IPC_H
-#undef HAVE_LC_MESSAGES
-#undef HAVE_SHM_H
-#undef HAVE_STPCPY
-#undef HAVE_XSHM_H
-#undef HAVE_SHAPE_EXT
-#undef HAVE_SYS_SELECT_H
-#undef HAVE_XCONVERTCASE
-
-#undef NO_FD_SET
-
-#undef XINPUT_NONE
-#undef XINPUT_GXI
-#undef XINPUT_XFREE
-
-/* Define as the return type of signal handlers (int or void).  */
-#undef RETSIGTYPE
-
-/* Define if you have the __argz_count function.  */
-#undef HAVE___ARGZ_COUNT
-
-/* Define if you have the __argz_next function.  */
-#undef HAVE___ARGZ_NEXT
-
-/* Define if you have the __argz_stringify function.  */
-#undef HAVE___ARGZ_STRINGIFY
-
-/* Define if you have the broken_wctype function.  */
-#undef HAVE_BROKEN_WCTYPE
-
-/* Define if you have the dcgettext function.  */
-#undef HAVE_DCGETTEXT
-
-/* Define if you have the getcwd function.  */
-#undef HAVE_GETCWD
-
-/* Define if you have the getpagesize function.  */
-#undef HAVE_GETPAGESIZE
-
-/* Define if you have the munmap function.  */
-#undef HAVE_MUNMAP
-
-/* Define if you have the putenv function.  */
-#undef HAVE_PUTENV
-
-/* Define if you have the setenv function.  */
-#undef HAVE_SETENV
-
-/* Define if you have the setlocale function.  */
-#undef HAVE_SETLOCALE
-
-/* Define if you have the stpcpy function.  */
-#undef HAVE_STPCPY
-
-/* Define if you have the strcasecmp function.  */
-#undef HAVE_STRCASECMP
-
-/* Define if you have the strchr function.  */
-#undef HAVE_STRCHR
-
-/* Define if you have the strdup function.  */
-#undef HAVE_STRDUP
-
-/* Define if you have the <argz.h> header file.  */
-#undef HAVE_ARGZ_H
-
-/* Define if you have the <limits.h> header file.  */
-#undef HAVE_LIMITS_H
-
-/* Define if you have the <locale.h> header file.  */
-#undef HAVE_LOCALE_H
-
-/* Define if you have the <malloc.h> header file.  */
-#undef HAVE_MALLOC_H
-
-/* Define if you have the <nl_types.h> header file.  */
-#undef HAVE_NL_TYPES_H
-
-/* Define if you have the <string.h> header file.  */
-#undef HAVE_STRING_H
-
-/* Define if you have the <sys/param.h> header file.  */
-#undef HAVE_SYS_PARAM_H
-
-/* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
-
-/* Define if you have the <wchar.h> header file.  */
-#undef HAVE_WCHAR_H
-
-/* Define if you have the <wctype.h> header file.  */
-#undef HAVE_WCTYPE_H
-
-/* Define if you have the i library (-li).  */
-#undef HAVE_LIBI
-
-/* Define if you have the intl library (-lintl).  */
-#undef HAVE_LIBINTL
--- a/config.sub
+++ b/config.sub
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
+#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -98,11 +98,21 @@ case $os in
 		os=
 		basic_machine=$1
 		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
 	-sco5)
-		os=sco3.2v5
+		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco4)
@@ -121,6 +131,9 @@ case $os in
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-isc)
 		os=-isc2.2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -143,22 +156,33 @@ case $os in
 	-psos*)
 		os=-psos
 		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
 esac

 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
-		| arme[lb] | pyramid | mn10200 | mn10300 \
-		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
-		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
-		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
-		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
-		| mipstx39 | mipstx39el \
-		| sparc | sparclet | sparclite | sparc64 | v850)
+	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+		| 580 | i960 | h8300 \
+		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
+		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
+		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+		| mips64vr5000 | miprs64vr5000el | mcore \
+		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+		| thumb | d10v | fr30)
 		basic_machine=$basic_machine-unknown
 		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -171,27 +195,45 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+	# FIXME: clean up the formatting here.
+	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
 	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
-	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \
-	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
-	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+	      | xmp-* | ymp-* \
+	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
+	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
+	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+	      | clipper-* | orion-* \
 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-*  \
-	      | mipstx39-* | mipstx39el-* \
-	      | f301-*)
+	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+	      | mips64el-* | mips64orion-* | mips64orionel-* \
+	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+	      | mipstx39-* | mipstx39el-* | mcore-* \
+	      | f301-* | armv*-* | t3e-* \
+	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
 		basic_machine=m68000-att
 		;;
 	3b*)
 		basic_machine=we32k-att
 		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
 	alliant | fx80)
 		basic_machine=fx80-alliant
 		;;
@@ -221,6 +263,10 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-sysv
 		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -297,6 +343,10 @@ case $basic_machine in
 	encore | umax | mmax)
 		basic_machine=ns32k-encore
 		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
 	fx2800)
 		basic_machine=i860-alliant
 		;;
@@ -315,6 +365,14 @@ case $basic_machine in
 		basic_machine=h8300-hitachi
 		os=-hms
 		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
 	harris)
 		basic_machine=m88k-harris
 		os=-sysv3
@@ -330,13 +388,30 @@ case $basic_machine in
 		basic_machine=m68k-hp
 		os=-hpux
 		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
 	hp9k2[0-9][0-9] | hp9k31[0-9])
 		basic_machine=m68000-hp
 		;;
 	hp9k3[2-9][0-9])
 		basic_machine=m68k-hp
 		;;
-	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
 		basic_machine=hppa1.1-hp
 		;;
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
@@ -345,9 +420,16 @@ case $basic_machine in
 	hppa-next)
 		os=-nextstep3
 		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
-		os=-mvs
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i[34567]86v32)
@@ -366,6 +448,25 @@ case $basic_machine in
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	i386-go32 | go32)
+		basic_machine=i386-unknown
+		os=-go32
+		;;
+	i386-mingw32 | mingw32)
+		basic_machine=i386-unknown
+		os=-mingw32
+		;;
+	i386-qnx | qnx)
+		basic_machine=i386-qnx
+		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -394,6 +495,10 @@ case $basic_machine in
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
 	mipsel*-linux*)
 		basic_machine=mipsel-unknown
 		os=-linux-gnu
@@ -408,10 +513,30 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	msdos)
+		basic_machine=i386-unknown
+		os=-msdos
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
 		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
 	news | news700 | news800 | news900)
 		basic_machine=m68k-sony
 		os=-newsos
@@ -424,6 +549,10 @@ case $basic_machine in
 		basic_machine=mips-sony
 		os=-newsos
 		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
 	next | m*-next )
 		basic_machine=m68k-next
 		case $os in
@@ -449,9 +578,25 @@ case $basic_machine in
 		basic_machine=i960-intel
 		os=-nindy
 		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
 	np1)
 		basic_machine=np1-gould
 		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
 	pa-hitachi)
 		basic_machine=hppa1.1-hitachi
 		os=-hiuxwe2
@@ -469,19 +614,19 @@ case $basic_machine in
        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | nexen)
+	pentium | p5 | k5 | k6 | nexen)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | k6 | 6x86)
+	pentiumpro | p6 | 6x86)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
 		basic_machine=i786-pc
 		;;
-	pentium-* | p5-* | k5-* | nexen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-* | k6-* | 6x86-*)
+	pentiumpro-* | p6-* | 6x86-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-*)
@@ -505,12 +650,20 @@ case $basic_machine in
 	ps2)
 		basic_machine=i386-ibm
 		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
 	rm[46]00)
 		basic_machine=mips-siemens
 		;;
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -518,6 +671,10 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sparclite-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
 	sps7)
 		basic_machine=m68k-bull
 		os=-sysv2
@@ -525,6 +682,13 @@ case $basic_machine in
 	spur)
 		basic_machine=spur-unknown
 		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -569,6 +733,10 @@ case $basic_machine in
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
+	t3e)
+		basic_machine=t3e-cray
+		os=-unicos
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -586,6 +754,10 @@ case $basic_machine in
 		basic_machine=a29k-nyu
 		os=-sym1
 		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
 	vaxv)
 		basic_machine=vax-dec
 		os=-sysv
@@ -609,6 +781,14 @@ case $basic_machine in
 		basic_machine=a29k-wrs
 		os=-vxworks
 		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
 	xmp)
 		basic_machine=xmp-cray
 		os=-unicos
@@ -616,6 +796,10 @@ case $basic_machine in
        xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -623,6 +807,15 @@ case $basic_machine in

 # Here we handle the default manufacturer of certain CPU types.  It is in
 # some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
 	mips)
 		if [ x$os = x-linux-gnu ]; then
 			basic_machine=mips-unknown
@@ -645,7 +838,7 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sparc)
+	sparc | sparcv9)
 		basic_machine=sparc-sun
 		;;
        cydra)
@@ -657,6 +850,16 @@ case $basic_machine in
 	orion105)
 		basic_machine=clipper-highlevel
 		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	c4x*)
+		basic_machine=c4x-none
+		os=-coff
+		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
@@ -710,13 +913,21 @@ case $os in
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv*)
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -726,6 +937,9 @@ case $os in
 	-sunos6*)
 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
 		;;
+	-opened*)
+		os=-openedition
+		;;
 	-osfrose*)
 		os=-osfrose
 		;;
@@ -741,6 +955,9 @@ case $os in
 	-acis*)
 		os=-aos
 		;;
+	-386bsd)
+		os=-bsd
+		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
@@ -760,6 +977,9 @@ case $os in
 	-oss*)
 		os=-sysv3
 		;;
+        -qnx)
+		os=-qnx4
+		;;
 	-svr4)
 		os=-sysv4
 		;;
@@ -772,9 +992,18 @@ case $os in
 	# This must come after -sysvr4.
 	-sysv*)
 		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
 	-xenix)
 		os=-xenix
 		;;
+        -*mint | -*MiNT)
+	        os=-mint
+		;;
 	-none)
 		;;
 	*)
@@ -800,6 +1029,9 @@ case $basic_machine in
 	*-acorn)
 		os=-riscix1.2
 		;;
+	arm*-rebel)
+		os=-linux
+		;;
 	arm*-semi)
 		os=-aout
 		;;
@@ -821,15 +1053,36 @@ case $basic_machine in
 		# default.
 		# os=-sunos4
 		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
 	sparc-* | *-sun)
 		os=-sunos4.1.1
 		;;
+	*-be)
+		os=-beos
+		;;
 	*-ibm)
 		os=-aix
 		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
 	*-hp)
 		os=-hpux
 		;;
@@ -893,6 +1146,18 @@ case $basic_machine in
 	f301-fujitsu)
 		os=-uxpv
 		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
 	*)
 		os=-none
 		;;
@@ -914,9 +1179,15 @@ case $basic_machine in
 			-aix*)
 				vendor=ibm
 				;;
+			-beos*)
+				vendor=be
+				;;
 			-hpux*)
 				vendor=hp
 				;;
+			-mpeix*)
+				vendor=hp
+				;;
 			-hiux*)
 				vendor=hitachi
 				;;
@@ -932,7 +1203,7 @@ case $basic_machine in
 			-genix*)
 				vendor=ns
 				;;
-			-mvs*)
+			-mvs* | -opened*)
 				vendor=ibm
 				;;
 			-ptx*)
@@ -944,6 +1215,15 @@ case $basic_machine in
 			-aux*)
 				vendor=apple
 				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -*MiNT)
+				vendor=atari
+				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,24 @@
 # Process this file with autoconf to produce a configure script.
 AC_INIT(gdk/gdktypes.h)

+# In the following, there are a the following variants
+# of GLib cflags and libs variables
+#
+# GLIB_CFLAGS:  cflags for compiling libraries and example progs
+# GLIB_LIBS:    libraries for linking example programs
+# GLIB_DEPLIBS: libraries for linking libraries against
+# glib_cflags:  cflags to store in gtk-config
+# glib_libs:    libs to store in gtk-config
+# glib_thread_cflags: cflags to store in gtk-config for gtk-config gthread
+# glib_thread_libs:   libs to store in gtk-config for gtk-config gthread
+
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}

+dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
+dnl are available for $ac_help expansion (don't we all *love* autoconf?)
+AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+#
 # Making releases:
 #   GTK_MICRO_VERSION += 1;
 #   GTK_INTERFACE_AGE += 1;
@@ -13,11 +28,14 @@ cflags_set=${CFLAGS+set}
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 #
 GTK_MAJOR_VERSION=1
-GTK_MINOR_VERSION=1
-GTK_MICRO_VERSION=12
+GTK_MINOR_VERSION=2
+GTK_MICRO_VERSION=10
 GTK_INTERFACE_AGE=1
-GTK_BINARY_AGE=1
+GTK_BINARY_AGE=10
 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
+dnl
+AC_DIVERT_POP()dnl
+
 AC_SUBST(GTK_MAJOR_VERSION)
 AC_SUBST(GTK_MINOR_VERSION)
 AC_SUBST(GTK_MICRO_VERSION)
@@ -56,17 +74,32 @@ AM_MAINTAINER_MODE

 AC_CANONICAL_HOST

+dnl figure debugging default, prior to $ac_help setup
+dnl
+AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+if test `expr $GTK_MINOR_VERSION \% 2` = 1 ; then
+        debug_default=yes
+else
+        debug_default=minimum
+fi
+AC_DIVERT_POP()dnl
+
+dnl declare --enable-* args and collect ac_help strings
+AC_ARG_ENABLE(debug, [  --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default)
 AC_ARG_ENABLE(shm, [  --enable-shm            support shared memory if available [default=yes]],
 		   echo $enable_shm, enable_shm="yes")
-AC_ARG_ENABLE(debug, [  --enable-debug=[no/minimum/yes] turn on debugging [default=minimum]],,enable_debug=minimum)
 AC_ARG_ENABLE(ansi, [  --enable-ansi           turn on strict ansi [default=no]],
 		    , enable_ansi=no)
 AC_ARG_WITH(glib, [  --with-glib=DIR         Use uninstalled copy of glib])
 AC_ARG_ENABLE(xim, [  --enable-xim            support XIM [default=yes]],
 			, enable_xim="yes")
+AC_ARG_ENABLE(xim_inst, [  --disable-xim-inst      does not use xim instantiate callback],
+			, enable_xim_inst="maybe")
+AC_ARG_ENABLE(rebuilds, [  --disable-rebuilds      disable all source autogeneration rules],,enable_rebuilds=yes)
 AC_ARG_WITH(locale, [  --with-locale=LOCALE    locale name you want to use ])

 AC_ARG_WITH(xinput, [  --with-xinput=[no/gxi/xfree] support XInput ])
+AC_ARG_WITH(native_locale, [  --with-native-locale=[yes/no] Use native locale support [default=no]],,with_native_locale=no)

 if test "x$enable_debug" = "xyes"; then
  test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
@@ -112,6 +145,9 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl

+# Honor aclocal flags
+ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+
 # define a MAINT-like variable REBUILD which is set if Perl
 # and awk are found, so autogenerated sources can be rebuilt

@@ -122,20 +158,39 @@ AC_CHECK_PROGS(PERL, perl5 perl)
 AC_CHECK_PROG(INDENT, indent, indent)

 REBUILD=\#
-if test -n "$PERL" && perl -v | grep 'version 5.' > /dev/null ; then
-  if test -n "$AWK" ; then 
-    REBUILD=
-  fi
+if test "x$enable_rebuilds" = "xyes" && \
+     test -n "$PERL" && \
+     $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 && \
+     test -n "$AWK" ; then
+  REBUILD=
 fi
 AC_SUBST(REBUILD)

+AC_MSG_CHECKING(whether make is GNU Make)
+STRIP_BEGIN=
+STRIP_END=
+if $ac_make --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
+	STRIP_BEGIN='$(strip $(STRIP_DUMMY)'
+	STRIP_END=')'
+	AC_MSG_RESULT(yes)
+else
+	AC_MSG_RESULT(no)
+fi
+dnl some Make 3.79 $(strip ) versions are broken and require an empty arg
+STRIP_DUMMY=
+AC_SUBST(STRIP_DUMMY)
+AC_SUBST(STRIP_BEGIN)
+AC_SUBST(STRIP_END)
+
 # i18n stuff
-ALL_LINGUAS="de fr nl pt ja sv pl no ko"
+ALL_LINGUAS="az ca cs da de el es et eu fi fr ga gl hr hu it ja ko lt nl no nn pl pt pt_BR ro ru sk sl sp sr sv tr uk vi wa zh_CN.GB2312 zh_TW.Big5"
 AM_GTK_GNU_GETTEXT
-AC_CHECK_FUNC(gettext,
-	,
-	AC_CHECK_LIB(intl, gettext)
-)
+LIBS="$LIBS $INTLLIBS"
+
+# AM_GTK_GNU_GETTEXT above substs $DATADIRNAME
+# this is the directory where the *.{mo,gmo} files are installed
+gtklocaledir='${prefix}/${DATADIRNAME}/locale'
+AC_SUBST(gtklocaledir)

 dnl The DU4 header files don't provide library prototypes unless 
 dnl -std1 is given to the native cc.
@@ -154,8 +209,10 @@ AC_TRY_RUN([#include <math.h>
         AC_MSG_RESULT()
         CFLAGS=$gtk_save_CFLAGS
         AC_MSG_WARN(
-                [No ANSI prototypes found in library. (-std1 didn't work.)])
-     )
+                [No ANSI prototypes found in library. (-std1 didn't work.)]),
+	 true
+     ),
+     AC_MSG_RESULT(none needed)
 )
 LIBS=$gtk_save_LIBS

@@ -179,16 +236,19 @@ fi
 if test x$with_glib = x ; then 
  # Look for separately installed glib

-  AM_PATH_GLIB(1.1.12,,
+  AM_PATH_GLIB(1.2.8,,
    AC_MSG_ERROR([
-*** GLIB 1.1.12 or better is required. The latest version of GLIB
-*** is always available from ftp://ftp.gtk.org.]),
+*** GLIB 1.2.8 or better is required. The latest version of GLIB
+*** is always available from ftp://ftp.gtk.org/.]),
    gmodule gthread)

  # we do not want to make all gtk progs to link to thread libraries.
  glib_cflags=`$GLIB_CONFIG glib gmodule --cflags`
+  glib_thread_cflags="$GLIB_CFLAGS"
  glib_libs=`$GLIB_CONFIG glib gmodule --libs`
+  glib_thread_libs="$GLIB_LIBS"
  GLIB_LIBS="$glib_libs"
+  GLIB_DEPLIBS="$glib_libs"
 else
  # Use uninstalled glib (assume they got the version right)

@@ -201,7 +261,9 @@ else

  # For use in gtk-config
  glib_cflags=`$GLIB_CONFIG --cflags gmodule`
+  glib_thread_cflags=`$GLIB_CONFIG --cflags gmodule gthread`
  glib_libs=`$GLIB_CONFIG --libs gmodule`
+  glib_thread_libs=`$GLIB_CONFIG --libs gmodule gthread`

  glib_release=`$GLIB_CONFIG --version | sed 's%\\.[[0-9]]*$%%'`

@@ -215,8 +277,9 @@ else
      ;;
  esac

-  GLIB_CFLAGS="-I$glib_dir"
-  GLIB_LIBS=$glib_dir/libglib-$glib_release.la
+  GLIB_CFLAGS="-I$glib_dir -I$glib_dir/gmodule"
+  GLIB_LIBS="$glib_dir/libglib.la $glib_dir/gmodule/libgmodule.la"
+  GLIB_DEPLIBS=

  AC_SUBST(GLIB_CFLAGS)
  AC_SUBST(GLIB_LIBS)
@@ -224,6 +287,9 @@ fi

 AC_SUBST(glib_cflags)
 AC_SUBST(glib_libs)
+AC_SUBST(glib_thread_cflags)
+AC_SUBST(glib_thread_libs)
+AC_SUBST(GLIB_DEPLIBS)

 # Find the X11 include and library directories
 AC_PATH_X
@@ -283,11 +349,29 @@ AC_CHECK_LIB(X11, XConvertCase,

 AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,
 	    : ,
-	    enable_xim=no,
+	    enable_xim_inst="no",
 	    $x_libs)

+# On Solaris, calling XRegisterIMInstantiateCallback seems to
+# cause an immediate segfault, so we disable it, unless
+# the user specifically forces it to be on.
+
+if test x$enable_xim_inst = xmaybe ; then
+  case host in
+	*-*-solaris*)
+            enable_xim_inst="no"
+            ;;
+	*)
+	    enable_xim_inst="yes"
+	    ;;
+  esac
+fi
+
 if test "x$enable_xim" = "xyes"; then
  GTK_XIM_FLAGS="-DUSE_XIM"
+  if test "x$enable_xim_inst" = "xyes"; then
+    AC_DEFINE(USE_X11R6_XIM)
+  fi
 fi

 x_cflags="$X_CFLAGS"
@@ -295,11 +379,14 @@ x_ldflags="$X_LDFLAGS $X_LIBS"

 # set up things for XInput

-if test "x$with_xinput" = "xgxi" || test "x$with_xinput" = "xyes"; then
+if test "x$with_xinput" = "xgxi"; then
+  AC_MSG_WARN([
+*** The generic XInput support has not been tested for several years
+*** and is not known to work with any currently available X servers])
  AC_DEFINE(XINPUT_GXI)
  xinput_progs=gxid
  x_libs="-lXi $x_libs"
-elif test "x$with_xinput" = "xxfree"; then
+elif test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then
  AC_DEFINE(XINPUT_XFREE)
  x_libs="-lXi $x_libs"
 else
@@ -350,11 +437,45 @@ main ()
  return setlocale (LC_ALL, "${with_locale}") == NULL;
 }],
 need_x_locale=no,
-need_x_locale=yes)
+need_x_locale=yes,
+need_x_locale=no)
 AC_MSG_RESULT($need_x_locale)

+use_native_locale=no
 if test $need_x_locale = yes; then
-  GTK_LOCALE_CFLAGS="-DX_LOCALE"
+  GTK_LOCALE_FLAGS="-DX_LOCALE"
+else
+  if test x$with_native_locale = xyes ; then
+    AC_MSG_CHECKING(functioning locale support)
+  
+    AC_TRY_COMPILE([#include <stdlib.h>],[
+          char c;
+          if (MB_CUR_MAX == 1) {
+              wctomb(&c, 42);
+          }
+    ],use_native_locale=yes,)
+
+    AC_MSG_RESULT($use_native_locale)
+  fi
+fi
+
+if test x$use_native_locale = xyes ; then
+  AC_MSG_CHECKING(if sizeof(wchar_t) == 4)
+
+  AC_TRY_RUN([
+  #include <stdlib.h>
+
+  int
+  main ()
+  {
+    return (sizeof(wchar_t) == 4) ? 0 : 1;
+  }],
+  ,use_native_locale=no,:)
+  AC_MSG_RESULT($use_native_locale)
+fi
+
+if test $use_native_locale = yes ; then 
+  AC_DEFINE(USE_NATIVE_LOCALE)
 fi

 # Checks for header files.
@@ -367,6 +488,9 @@ AC_C_CONST
 AC_TYPE_SIGNAL
 AC_FUNC_MMAP

+AC_CHECK_FUNCS(getresuid)
+AC_TYPE_UID_T
+
 # Check if <sys/select.h> needs to be included for fd_set
 AC_MSG_CHECKING([for fd_set])
 AC_TRY_COMPILE([#include <sys/types.h>],
@@ -386,28 +510,18 @@ fi

 # Duplicate `widechar' tests from `glib'.
 # Check for wchar.h
-if test x = y; then
-  # will not be executed
-  # hack so as not to update `acconfig.h'
-  AC_CHECK_HEADERS(wchar.h wctype.h)
-  AC_CHECK_FUNCS(broken_wctype)
-fi
-
 AC_MSG_CHECKING(for wchar.h)
 AC_TRY_CPP([#include <wchar.h>], gtk_ok=yes, gtk_ok=no)
 if test $gtk_ok = yes; then
-   ac_kludge=HAVE_WCHAR_H
-   AC_DEFINE($ac_kludge)
+   AC_DEFINE(HAVE_WCHAR_H,1,[Define if wchar.h exists])
 fi
 AC_MSG_RESULT($gtk_ok)

 # Check for wctype.h (for iswalnum)
-
 AC_MSG_CHECKING(for wctype.h)
 AC_TRY_CPP([#include <wctype.h>], gtk_ok=yes, gtk_ok=no)
 if test $gtk_ok = yes; then
-   ac_kludge=HAVE_WCTYPE_H
-   AC_DEFINE($ac_kludge)
+   AC_DEFINE(HAVE_WCTYPE_H,1,[Define if wctype.h exists])
 fi
 AC_MSG_RESULT($gtk_ok)

@@ -436,8 +550,7 @@ iswalnum((wchar_t) 0);
 LIBS="$oLIBS"

 if test $gtk_ok = no; then
-   ac_kludge=HAVE_BROKEN_WCTYPE
-   AC_DEFINE($ac_kludge)
+   AC_DEFINE(HAVE_BROKEN_WCTYPE,1,[Define if the wctype function is broken])
   GDK_WLIBS=
 fi
 AC_MSG_RESULT($gtk_ok)
@@ -448,6 +561,8 @@ AC_SUBST(GTK_XIM_FLAGS)
 AC_SUBST(GTK_LOCALE_FLAGS)

 AC_OUTPUT([
+gtk+.spec
+docs/gtk-config.1
 Makefile
 gtk-config
 po/Makefile.in
@@ -455,4 +570,6 @@ docs/Makefile
 gdk/Makefile
 gtk/Makefile
 gtk/gtkfeatures.h
+gdk.pc
+gtk+.pc
 ], [chmod +x gtk-config])
--- a/docs/.cvsignore
+++ b/docs/.cvsignore
@@ -18,3 +18,4 @@ Makefile.in
 *.vrs
 html
 text
+gtk-config.1
--- a/docs/Changes-1.2.txt
+++ b/docs/Changes-1.2.txt
@@ -3,12 +3,99 @@ Incompatible Changes from GTK+-1.0 to GTK+-1.2:
 * GtkAcceleratorTable has been replaced with GtkAccelGroup

 * GtkMenuFactory has been replaced with GtkItemFactory, although
-  a version of GtkMenuFactory is provided to ease compatibility.
+  a version of GtkMenuFactory is currently still provided to ease
+  the migration phase.

-* GtkButton has been changed to derive from GtkBin. 
+* The GtkTypeInfo structures used in the gtk_*_type_init() functions have
+  changed a bit, the old format:  
+      GtkTypeInfo bin_info =
+      {
+        "GtkBin",
+        sizeof (GtkBin),
+        sizeof (GtkBinClass),
+        (GtkClassInitFunc) gtk_bin_class_init,
+        (GtkObjectInitFunc) gtk_bin_init,
+        (GtkArgSetFunc) NULL,
+        (GtkArgGetFunc) NULL,
+      };
+
+  needs to be converted to:
+
+      static const GtkTypeInfo bin_info =
+      {
+        "GtkBin",
+        sizeof (GtkBin),
+        sizeof (GtkBinClass),
+        (GtkClassInitFunc) gtk_bin_class_init,
+        (GtkObjectInitFunc) gtk_bin_init,
+        /* reserved_1 */ NULL,
+        /* reserved_2 */ NULL,
+        (GtkClassInitFunc) NULL,
+      };
+
+  the GtkArgSetFunc and GtkArgGetFunc functions are not supported from the
+  type system anymore, and you should make sure that your code only fills
+  in these fields with NULL and doesn't use the deprecated function typedefs
+  (GtkArgSetFunc) and (GtkArgGetFunc) anymore.
+
+* A number of Gtk functions were renamed. For compatibility, gtkcompat.h
+  #define's the old 1.0.x function names in terms of the new names.
+  To assure your Gtk program doesn't rely on outdated function
+  variants, compile your program with -DGTK_DISABLE_COMPAT_H to disable
+  the compatibility aliases.
+
+  Here is the list of the old names and replacements:
+
+  Old:				      Replacement:
+
+  gtk_accel_label_accelerator_width   gtk_accel_label_get_accel_width
+  gtk_check_menu_item_set_state	      gtk_check_menu_item_set_active
+  gtk_container_border_width	      gtk_container_set_border_width
+  gtk_label_set  	              gtk_label_set_text
+  gtk_notebook_current_page           gtk_notebook_get_current_page
+  gtk_packer_configure                gtk_packer_set_child_packing
+  gtk_paned_gutter_size	              gtk_paned_set_gutter_size
+  gtk_paned_handle_size		      gtk_paned_set_handle_size
+  gtk_scale_value_width               gtk_scale_get_value_width
+  gtk_style_apply_default_pixmap      gtk_style_apply_default_background (1)
+  gtk_toggle_button_set_state         gtk_toggle_button_set_active
+  gtk_window_position		      gtk_window_set_position
 
- To access a button's child, use GTK_BIN (button)->child, instead
- of the old GTK_BUTTON (button)->child.
+  (1) gtk_style_apply_default_background() has an additional
+      argument, gboolean set_bg. This parameter should be FALSE if
+      the background is being set for a NO_WINDOW widget, otherwise
+      true.
+
+* During the development phase of the 1.1.x line of Gtk certain functions
+  were deprecated and later removed. Functions affected are:
+
+  Removed:                          Replacement:
+  gtk_clist_set_border		    gtk_clist_set_shadow_type
+  gtk_container_block_resize	    gtk_container_set_resize_mode
+  gtk_container_unblock_resize	    gtk_container_set_resize_mode
+  gtk_container_need_resize	    gtk_container_check_resize
+  gtk_ctree_show_stub		    gtk_ctree_set_show_stub
+  gtk_ctree_set_reorderable	    gtk_clist_set_reorderable
+  gtk_ctree_set_use_drag_icons	    gtk_clist_set_use_drag_icons
+  gtk_entry_adjust_scroll	    (1)
+  gtk_object_class_add_user_signal  gtk_object_class_user_signal_new
+  gtk_preview_put_row		    gtk_preview_put
+  gtk_progress_bar_construct	    gtk_progress_set_adjustment
+  gtk_scrolled_window_construct	    gtk_scrolled_window_set_{h|v}adjustment
+  gtk_spin_button_construct	    gtk_spin_button_configure
+  gtk_widget_thaw_accelerators	    gtk_widget_unlock_accelerators
+  gtk_widget_freeze_accelerators    gtk_widget_lock_accelerators
+
+(1) This function is no longer needed as GtkEntry should automatically
+    keep the scroll adjusted properly.
+
+* Additionally, all gtk_*_interp functions were removed.
+  gtk_*_full versions were provided as of GTK+-1.0 and should
+  be used instead.
+
+* GtkButton has been changed to derive from GtkBin.
+  To access a button's child, use GTK_BIN (button)->child, instead
+  of the old GTK_BUTTON (button)->child.

 * The selection API has been slightly modified:

@@ -90,13 +177,6 @@ Incompatible Changes from GTK+-1.0 to GTK+-1.2:
  been provided. However, you may want to consider migrating
  your code to use the GLib main loop directly.

-  Minor known incompatibilities:
-
-  - gtk_idle_remove_by_data() and gtk_timeout_remove_by_data() now
-    work from a common pool of "input sources", so 
-    gtk_idle_remove_by_data() will remove timeouts and 
-    vice-versa.
-
 * the GTK_BASIC flag was removed, and with it the corresponding
  macro and function GTK_WIDGET_BASIC() and gtk_widget_basic().
  
@@ -126,13 +206,13 @@ Incompatible Changes from GTK+-1.0 to GTK+-1.2:

  This means:

-   - You must call g_thread_init(), then gtk_thread_init()
-     in a threaded GTK+ program.
+   - You must call g_thread_init() before executing any
+     other GTK+ or GDK functions in a threaded GTK+ program.

   - Idles, timeouts, and input functions are executed outside 
     of the main GTK+ lock. So, if you need to call GTK+ 
     inside of such a callback, you must surround the callback
-     with a gtk_thread_enter()/gtk_thread_leave() pair.
+     with a gdk_threads_enter()/gdk_threads_leave() pair.

     [ However, signals are still executed within the main
       GTK+ lock ]
@@ -141,6 +221,10 @@ Incompatible Changes from GTK+-1.0 to GTK+-1.2:
     that might be used in threaded programs, you _must_
     surround timeouts and idle functions in this matter.

+     As always, you must also surround any calls to GTK+
+     not made within a signal handler with a 
+     gdk_threads_enter()/gdk_threads_leave() pair.
+    
   - There is no longer a special --with-threads configure
     option for GTK+. To use threads in a GTK+ program, you
     must:
@@ -154,8 +238,37 @@ Incompatible Changes from GTK+-1.0 to GTK+-1.2:
 
           gtk-config --libs gthread

-* All functions matching g_message* are deprecated
+         and use the cflags from:

-* Functions *_interp are deprecated, *_full variants are available
-  instead
+            gtk-config --cflags gthread
+
+     You can get these CFLAGS and LIBS by passing gthread
+     as the fourth parameter to the AM_PATH_GTK automake
+     macro.
+
+* Prior to GTK+-1.2, there were two conflicting interpretations
+  of widget->requistion. It was either taken to be
+  the size that the widget requested, or that size
+  modified by calls to gtk_widget_set_usize(). In GTK+-1.2,
+  it is always interpreted the first way.
+
+  Container widgets are affected in two ways by this:
+
+   1) Container widgets should not pass widget->requisition
+      as the second parameter to gtk_widget_size_request().
+      Instead they should call it like:
+   
+      GtkRequisition child_requisition;
+      gtk_widget_size_request (widget, &child_requisition);
+
+   2) Container widgets should not access child->requisition
+      directly. Either they should use the values returned
+      by gtk_widget_size_request(), or they should call
+      the new function:
+
+    void gtk_widget_get_child_requisition (GtkWidget      *widget,
+					   GtkRequisition *requisition);
+
+      which returns the requisition of the given widget, modified
+      by calls to gtk_widget_set_usize().

--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -101,58 +101,28 @@ FAQ_FILES=html/gtkfaq.html		\
 	html/gtkfaq-7.html		\
 	text/gtkfaq.txt

-EXTRA_DIST =	\
-	gtk-config.1		\
-	texinfo.tex 		\
-	macros.texi		\
-	gtkdocs_fix		\
-	gtkfaq.sgml		\
-        gtk-config.txt          \
-	gtk_tut.sgml		\
-	gtk_tut_it.sgml		\
-	gtk_tut_fr.sgml		\
-	debugging.txt		\
-	developers.txt		\
-	refcounting.txt		\
-	styles.txt		\
-	text_widget.txt 	\
-	widget_system.txt 	\
-	gtk_tut_packbox1.gif 	\
-	gtk_tut_packbox2.gif 	\
-	html/gtk_tut_table.gif	\
-	html/gtk_tut_packbox1.gif 	\
-	html/gtk_tut_packbox2.gif 	\
-	gtk_tut_table.gif	\
-	html/gdk.html            	\
-	html/gdk_toc.html        	\
-	html/gtk.html            	\
-	html/gtk_toc.html        	\
-	$(TUTORIAL_FILES)		\
-	$(TUTORIAL_FR_FILES)		\
-	$(TUTORIAL_IT_FILES)		\
-	$(FAQ_FILES)
-
 .PHONY: html htmldir faq tutorial tutorial_it tutorial_fr files

-distdocs: gdk.html gtk.html faq tutorial tutorial_it tutorial_fr
-
 htmldir:
 	(cd $(srcdir); mkdir -p html; cp gtk_tut*gif html)

 textdir:
 	mkdir -p $(srcdir)/text

-gdk.html gdk_toc.html: gdk.texi
-	(cd $(srcdir); texi2html gdk.texi)
-
-gtk.html gtk_toc.html: gtk.texi
-	(cd $(srcdir); texi2html gtk.texi)
-
-html/gdk.html html/gdk_toc.html: htmldir gdk.html gdk_toc.html
-	(cd $(srcdir); cp gdk.html gdk_toc.html html/)
-
-html/gtk.html html/gtk_toc.html: htmldir gtk.html gtk_toc.html
-	(cd $(srcdir); cp gtk.html gtk_toc.html html/)
+#
+# The content is useless and the texi makes texi2html unhappy 
+#
+#gdk.html gdk_toc.html: gdk.texi
+#	(cd $(srcdir); texi2html gdk.texi)
+#
+#gtk.html gtk_toc.html: gtk.texi
+#	(cd $(srcdir); texi2html gtk.texi)
+#
+#html/gdk.html html/gdk_toc.html: htmldir gdk.html gdk_toc.html
+#	(cd $(srcdir); cp gdk.html gdk_toc.html html/)
+#
+#html/gtk.html html/gtk_toc.html: htmldir gtk.html gtk_toc.html
+#	(cd $(srcdir); cp gtk.html gtk_toc.html html/)

 $(FAQ_FILES): faq

@@ -195,3 +165,32 @@ files:
 	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
 	  echo $$p; \
 	done
+
+EXTRA_DIST += \
+	Changes-1.2.txt			\
+	debugging.txt			\
+	developers.txt			\
+	refcounting.txt			\
+	styles.txt			\
+	text_widget.txt 		\
+	widget_system.txt 		\
+	generation.txt			\
+        gtk-config.txt  	        \
+	gtk-config.1.in			\
+	texinfo.tex 			\
+	macros.texi			\
+	gtkdocs_fix			\
+	gtkfaq.sgml			\
+	gtk_tut.sgml			\
+	gtk_tut_it.sgml			\
+	gtk_tut_fr.sgml			\
+	gtk_tut_packbox1.gif 		\
+	gtk_tut_packbox2.gif 		\
+	html/gtk_tut_table.gif		\
+	html/gtk_tut_packbox1.gif 	\
+	html/gtk_tut_packbox2.gif 	\
+	gtk_tut_table.gif		\
+	$(TUTORIAL_FILES)		\
+	$(TUTORIAL_FR_FILES)		\
+	$(TUTORIAL_IT_FILES)		\
+	$(FAQ_FILES)
--- a/docs/faq/gtkfaq.sgml
+++ b/docs/faq/gtkfaq.sgml
--- a/docs/generation.txt
+++ b/docs/generation.txt
@@ -0,0 +1,177 @@
+Overview:
+========
+
+This file describes the way that autogeneration
+works within the GTK+ source code.
+
+The following files in the gdk/ subdirectory
+are autogenerated:
+
+  gdkkeysyms.h
+  gdkcursors.h 
+
+The following files in the gtk/ subdirectory 
+are autogenerated:
+
+ gtk.defs
+   Description of GTK+ types (and some functions) in a lisp-style
+   format.
+ gtktypebuiltins.h
+   Header file including declarations for internal types  
+ gtktypebuiltins_vars.c
+   Variables for type values for internal types.
+ gtktypebuiltins_ids.c
+   Arrays holding information about each internal type.
+ gtktypebuiltins_evals.c
+   Arrays holding mapping between enumeration values
+   and strings.
+
+ gtkmarshal.c
+ gtkmarshal.h
+   Autogenerated signal marshallers
+
+GDK
+===
+
+gdkkeysyms.h and gdkcursors.h are generated from
+the corresponding header files
+
+  X11/cursorfont.h
+  X11/keysymdef.h
+
+by some simple sed scripts. These are not actually
+run automatically because we want all the keysyms
+even on systems with a limited set.
+So the Gdk rule to generate both files (X-derived-headers)
+only needs to be rerun for every new release of the X Window
+System.
+
+GTK+ - type definitions
+=======================
+
+The type definitions are generated from several sources:
+
+ gtk-boxed.defs - definitions for boxed types
+ GTK+ header files
+ GDK header files
+
+The makeenums.pl script does a heuristic parse of 
+the header files and extracts all enumerations declarations.
+It also recognizes a number of pseudo-comments in the
+header files:
+
+Two of these apply to individual enumeration values:
+
+  /*< skip >*/
+
+ This enumeration value should be skipped.
+  
+  /*< nick=NICK >*/
+
+ The nickname for this value should NICK instead of the
+ normally guessed value. For instance:
+
+  typedef enum {
+    GTK_TARGET_SAME_APP = 1 << 0,    /*< nick=same-app >*/
+    GTK_TARGET_SAME_WIDGET = 1 << 1  /*< nick=same-widget >*/
+  } GtkTargetFlags;
+
+ makes the nicks "same-app" and "same-widget", instead of
+ "app" and "widget" that would normally be used.
+
+The other two apply to entire enumeration declarations.
+ 
+  /*< prefix=PREFIX >*/
+
+  Specifies the prefix to be removed from the enumeration
+  values to generate nicknames.
+
+  /*< flags >*/
+
+ Specifies that this enumeration is used as a bitfield.
+ (makenums.pl normally guesses this from the presence of values
+  with << operators). For instance:
+
+  typedef enum                    /*< flags >*/
+  {
+    GDK_IM_PREEDIT_AREA      = 0x0001, 
+    GDK_IM_PREEDIT_CALLBACKS = 0x0002, 
+    [ ... ]
+ } GdkIMStyle;
+
+makeenums.pl can be run into two modes:
+
+ 1) Generate the gtktypebuiltins_eval.c file (this
+    contains arrays holding the mapping of 
+    string <=> enumeration value)
+
+ 2) Generate the enumeration portion of gtk.defs.
+
+The enumearation portion is added to the boxed type 
+declarations in gtk-boxed.defs to create gtk.defs.
+
+The makeetypes.awk program takes the gtk.defs file, and
+from that generates various files depending on the
+third parameter passed to it:
+
+ macros: gtktypebuiltins.h
+ variables: gtktypebuiltins_vars.c
+ entries: gtktypebuiltins_ids.c
+
+GTK+ - marshallers
+==================
+
+The files gtkmarshal.c and gtkmarshal.h include declarations
+and definitions for the marshallers needed inside of
+GTK+. The marshallers to be generated are listed in
+the file gtkmashal.list, which is processed
+by genmarshal.pl.
+
+The format of this file is a list of lines:
+
+  <retval-type>:<arg1-type>,<arg2-type>,<arg3-type>
+ 
+e.g.:
+
+  BOOL:POINTER,STRING,STRING,POINTER
+
+A marshaller is generated for each line in the file.
+The possible types are:
+
+ NONE
+ BOOL
+ CHAR
+ INT
+ UINT
+ LONG
+ ULONG
+ FLOAT
+ DOUBLE
+ STRING
+ ENUM
+ FLAGS
+ BOXED
+ POINTER
+ OBJECT
+ FOREIGN    (gpointer data, GtkDestroyNotify notify)
+ C_CALLBACK (GtkFunction func, gpointer func_data)
+ SIGNAL     (GtkSignalFunc f, gpointer data)
+ ARGS       (gint n_args, GtkArg *args)
+ CALLBACK   (GtkCallBackMarshal marshall,
+             gpointer data,
+	     GtkDestroyNotify Notify)
+
+Some of these types map to multiple return values - these
+are marked above with the return types in parantheses.
+
+NOTES
+=====
+
+When autogenerating GTK+ files, the autogenerated
+files are often rebuild resulting in the same result.
+
+To prevent unecessary rebuilds of the entire directory, some files
+that multiple other source files depend on are not actually written
+to directly.  Instead, an intermediate file is written, which
+is then compared to the old file, and only if it is different
+is it copied into the final location.
--- a/docs/gtk-config.1.in
+++ b/docs/gtk-config.1.in
@@ -1,4 +1,4 @@
-.TH GTK+ 1 "25 October 1998" Version 1.1.12
+.TH GTK+ 1 "25 October 1998" Version @VERSION@
 .SH NAME
 gtk-config - script to get information about the installed version of GTK+
 .SH SYNOPSIS
--- a/docs/gtk-config.txt
+++ b/docs/gtk-config.txt
@@ -36,6 +36,14 @@ gtk-config takes the following flags:
     If PREFIX is specified, overrides the configured value of $exec_prefix.
     Otherwise, prints out the configured value of $exec_prefix
 
+You may also add to the command line a list of additional
+libraries that gtk-config should supply the CFLAGS and LIBS
+for. The only currently supported library is 'gthread'.
+
+As an example of this latter usage, you can get the
+appropriate cflags for a threaded program with:
+
+ gtk-config --cflags gthread


 Example of using gtk-config
--- a/docs/gtk.texi
+++ b/docs/gtk.texi
@@ -79,7 +79,7 @@ approved by Peter Mattis.
 This is edition @value{edition} of the GTK documentation,
@w{@value{update-date}}.
@end ifinfo
-@c FIXME: Do a introduction to the GTK?
+@c FIXME: Do an introduction to the GTK?

@menu
 * Copying::                     Your rights.
@@ -288,7 +288,7 @@ form that is easier to parse.  Tools for generating bindings of Gtk to
 other languages can read these declarations and---because all the
 important details are defined---automatically generate the bulk of the
 needed glue code.  It is also possible to feed these declarations into a
-running application (a interface builder, say) and thus make it aware of
+running application (an interface builder, say) and thus make it aware of
 new widgets and functions without recompiling anything.

 The run-time side of the type system is also somewhat introspective.
@@ -320,7 +320,7 @@ inherit these rules from their fundamental type.  For example,
 derive from @samp{GtkObject} and so the rules for @samp{GtkObject} apply
 to all widgets as well.

-This derivation defines a type hierachy, but this hierachy is not
+This derivation defines a type hierarchy, but this hierarchy is not
 completely general.  You can't derive from @samp{int} for example, and
 you can only have one level of derivation from @samp{enum}.  The
 fundamental type @samp{GtkObject}, however, is the basis for the large
@@ -382,7 +382,7 @@ to a fundamental type and thus there is no name for it.

@deftp {Data type} GtkType
 The type @code{GtkType} holds the run-time representation of a type.  It
-is a integer of a certain size.  The follwing macros are defined to
+is an integer of a certain size.  The follwing macros are defined to
 access the basic properties of a @code{GtkType}:

@deftypefn {Macro} {unsigned int} GTK_TYPE_SEQNO (GtkType type)
@@ -461,7 +461,7 @@ always return @code{NULL}.
@item
 The @code{class_init_func} and @code{base_class_init_func} fields are
 callbacks which are used by the type mechanism to initialize class
-specific fields. The single argument these function taks is a pointer to
+specific fields. The single argument these functions take is a pointer to
 a class structure.  When you do not need one or both of them, set the
 corresponding field to @code{NULL}.  The @code{class_init_func} will be
 called at most once, right after the class structure of size
@@ -1109,7 +1109,7 @@ opaque.
 All widget creation routines in GTK return pointers to GtkWidget
 structures. In reality, all widget creation routines create structures
 that can be viewed as equivalent to the GtkWidget structure, but often
-have contain additional information. @xref{Object Implementation}
+have contain additional information. @xref{Object Implementation}.

 The widgets available for use are implemented in a hierarchy. Several
 widgets exist solely as common bases for more specific widgets. For
--- a/docs/gtk_tut.sgml
+++ b/docs/gtk_tut.sgml
--- a/docs/gtk_tut_fr.sgml
+++ b/docs/gtk_tut_fr.sgml
@@ -8556,8 +8556,8 @@ name="mvboom42@calvin.edu"></tt> pour son merveilleux travail sur les widgets
 Notebook, Progress Bar, Dialog et File selection. Merci beaucoup, Mark ! Ton
 aide a été très précieuse.

-<item>Tim Janik <tt><htmlurl url="mailto:timj@psynet.net"
-name="timj@psynet.net"></tt> pour son beau travail sur le widget Lists.
+<item>Tim Janik <tt><htmlurl url="mailto:timj@gtk.org"
+name="timj@gtk.org"></tt> pour son beau travail sur le widget Lists.
 Merci Tim :)

 <item>Rajat Datta <tt><htmlurl url="mailto:rajat@ix.netcom.com"
--- a/docs/gtk_tut_it.sgml
+++ b/docs/gtk_tut_it.sgml
@@ -10013,8 +10013,8 @@ name="mailto:mailto:mvboom42@calvin.edu"></tt> per il suo meraviglioso lavoro
 sul Notebook, Progres Bar, Dialogs e File selection. Grazie molto Mark. Sei
 stato di grande aiuto.

-<item>Tim Janik <tt><htmlurl url="mailto:timj@psynet.net"
-name="mailto:timj@psynet.net"></tt> per il suo grande lavoro sul widget List.
+<item>Tim Janik <tt><htmlurl url="mailto:timj@gtk.org"
+name="mailto:timj@gtk.org"></tt> per il suo grande lavoro sul widget List.
 Grazie Tim :)

 <item> Michael K. Johnson <tt><htmlurl url="mailto:johnsonm@redhat.com"
--- a/docs/gtkfaq.sgml
+++ b/docs/gtkfaq.sgml
--- a/docs/package_tutorial.sh
+++ b/docs/package_tutorial.sh
@@ -0,0 +1,99 @@
+#! /bin/sh
+# package_tutorial.sh - Package up the tutorial into various formats
+# Copyright (C) Tony Gale 1999
+# Contact: gale@gtk.org
+#
+# NOTE: This script requires the following to be installed:
+#            o SGML Tools
+#            o Latex
+#            o DVI tools
+
+TARGET=`pwd`/gtk_tut.sgml
+GIFS="`pwd`/*.gif"
+EXAMPLES=`pwd`/../examples
+
+PATH=`pwd`:$PATH
+
+DATE=`date '+%y%m%d'`
+
+# Check top level directory
+if [ ! -d gtk_tutorial ]; then
+  if [ -e gtk_tutorial ]; then
+    echo "ERROR: gtk_tutorial is not a directory"
+    exit
+  fi
+  mkdir gtk_tutorial.$DATE
+fi 
+
+cd gtk_tutorial.$DATE
+
+# SGML Format
+echo -n "Copy SGML and GIF's.... "
+if [ ! -d sgml ]; then
+  if [ -e sgml ]; then
+    echo "ERROR: html is not a directory"
+    exit
+  fi
+  mkdir sgml
+fi
+
+(cd sgml ; cp $TARGET . ; cp $GIFS .)
+echo "done"
+
+# HTML Format
+echo -n "Formatting into HTML.... " 
+if [ ! -d html ]; then
+  if [ -e html ]; then
+    echo "ERROR: html is not a directory"
+    exit
+  fi
+  mkdir html
+fi
+
+(cd html ; sgml2html $TARGET ; cp $GIFS .)
+echo "done"
+
+# Text Format
+echo -n "Formatting into Text.... "
+if [ ! -d txt ]; then
+  if [ -e txt ]; then
+    echo "ERROR: txt is not a directory"
+    exit
+  fi
+  mkdir txt
+fi
+
+(cd txt ; sgml2txt -f $TARGET 2>&1 > /dev/null )
+echo "done"
+
+# PS and DVI Format
+echo -n "Formatting into PS and DVI.... "
+if [ ! -d ps ]; then
+  if [ -e ps ]; then
+    echo "ERROR: ps is not a directory"
+    exit
+  fi
+  mkdir ps
+fi
+
+(cd ps ; sgml2latex --output=ps $TARGET > /dev/null)
+(cd ps ; sgml2latex $TARGET > /dev/null)
+echo "done"
+
+# Copy examples
+echo -n "Copying examples"
+cp -R $EXAMPLES .
+(cd examples ; make clean ; rm -rf CVS */CVS)
+echo "done"
+
+# Package it all up
+echo -n "Creating packages.... "
+cd ..
+tar cvfz gtk_tutorial.$DATE.tar.gz gtk_tutorial.$DATE
+echo "done"
+
+rm -rf gtk_tutorial.$DATE
+
+echo
+echo Package gtk_tutorial.$DATE.tar.gz created.
+echo
--- a/docs/refcounting.txt
+++ b/docs/refcounting.txt
@@ -15,7 +15,7 @@ functions that follow these conventions:
 GtkObjects also provide the following functions:

  *_destroy:  Render an object `unusable', but as long as there are
-              references to it, it's allocated memory will not be freed.
+              references to it, its allocated memory will not be freed.
  *_sink:     Clear a GtkObjects `floating' state and decrement the
 	      reference count by 1.

@@ -240,7 +240,7 @@ Taking care of proper referencing
 ---------------------------------

 There are some cases where referencing of widgets from outside the toolkit
-(on the application side is needed).
+(on the application side) is needed.
 Once the application performes an operation on a widget that will cause
 its reference count to drop, if it wants to take further actions on the
 widget, it needs to hold a reference to it.
@@ -248,7 +248,7 @@ widget, it needs to hold a reference to it.
 Example code sequences that require reference wraps:

   /* gtk_container_remove() will unparent the child and therefore
-    * cause it's reference count to be decremented by one.
+    * cause its reference count to be decremented by one.
    */
   gtk_widget_ref (widget);
   gtk_container_remove (container, widget);
--- a/docs/styles.txt
+++ b/docs/styles.txt
@@ -88,13 +88,13 @@ GtkWidget::style_set
 Flag indications:

 !GTK_RC_STYLE && !GTK_USER_STYLE:
-  The widget has it's default style set, no rc lookup has been
+  The widget has its default style set, no rc lookup has been
  performed, the widget has not been size requested yet and is
  therefore not yet realized.

 GTK_USER_STYLE:
  GTK_RC_STYLE is not set.
-  The widget has a user style assigned, and it's default style has been
+  The widget has a user style assigned, and its default style has been
  saved.

 GTK_RC_STYLE:
--- a/docs/texinfo.tex
+++ b/docs/texinfo.tex
--- a/docs/text_widget.txt
+++ b/docs/text_widget.txt
@@ -398,7 +398,7 @@ according the the tab continuation of the previous line.
 Exposure and drawing:

 Exposure is handled from the EXPOSE_TEXT function.  It assumes that
-the LINE_START_CACHE and all it's parameters are accurate and simply
+the LINE_START_CACHE and all its parameters are accurate and simply
 exposes any line which is in the exposure region.  It calls the
 CLEAR_AREA function to clear the background and/or lay down a pixmap
 background.  The text widget has a scrollable pixmap background, which
--- a/docs/tutorial/gtk_tut.sgml
+++ b/docs/tutorial/gtk_tut.sgml
--- a/docs/tutorial/package_tutorial.sh
+++ b/docs/tutorial/package_tutorial.sh
@@ -0,0 +1,99 @@
+#! /bin/sh
+# package_tutorial.sh - Package up the tutorial into various formats
+# Copyright (C) Tony Gale 1999
+# Contact: gale@gtk.org
+#
+# NOTE: This script requires the following to be installed:
+#            o SGML Tools
+#            o Latex
+#            o DVI tools
+
+TARGET=`pwd`/gtk_tut.sgml
+GIFS="`pwd`/*.gif"
+EXAMPLES=`pwd`/../examples
+
+PATH=`pwd`:$PATH
+
+DATE=`date '+%y%m%d'`
+
+# Check top level directory
+if [ ! -d gtk_tutorial ]; then
+  if [ -e gtk_tutorial ]; then
+    echo "ERROR: gtk_tutorial is not a directory"
+    exit
+  fi
+  mkdir gtk_tutorial.$DATE
+fi 
+
+cd gtk_tutorial.$DATE
+
+# SGML Format
+echo -n "Copy SGML and GIF's.... "
+if [ ! -d sgml ]; then
+  if [ -e sgml ]; then
+    echo "ERROR: html is not a directory"
+    exit
+  fi
+  mkdir sgml
+fi
+
+(cd sgml ; cp $TARGET . ; cp $GIFS .)
+echo "done"
+
+# HTML Format
+echo -n "Formatting into HTML.... " 
+if [ ! -d html ]; then
+  if [ -e html ]; then
+    echo "ERROR: html is not a directory"
+    exit
+  fi
+  mkdir html
+fi
+
+(cd html ; sgml2html $TARGET ; cp $GIFS .)
+echo "done"
+
+# Text Format
+echo -n "Formatting into Text.... "
+if [ ! -d txt ]; then
+  if [ -e txt ]; then
+    echo "ERROR: txt is not a directory"
+    exit
+  fi
+  mkdir txt
+fi
+
+(cd txt ; sgml2txt -f $TARGET 2>&1 > /dev/null )
+echo "done"
+
+# PS and DVI Format
+echo -n "Formatting into PS and DVI.... "
+if [ ! -d ps ]; then
+  if [ -e ps ]; then
+    echo "ERROR: ps is not a directory"
+    exit
+  fi
+  mkdir ps
+fi
+
+(cd ps ; sgml2latex --output=ps $TARGET > /dev/null)
+(cd ps ; sgml2latex $TARGET > /dev/null)
+echo "done"
+
+# Copy examples
+echo -n "Copying examples"
+cp -R $EXAMPLES .
+(cd examples ; make clean ; rm -rf CVS */CVS)
+echo "done"
+
+# Package it all up
+echo -n "Creating packages.... "
+cd ..
+tar cvfz gtk_tutorial.$DATE.tar.gz gtk_tutorial.$DATE
+echo "done"
+
+rm -rf gtk_tutorial.$DATE
+
+echo
+echo Package gtk_tutorial.$DATE.tar.gz created.
+echo
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,9 +1,42 @@

-SUBDIRS = aspectframe eventbox gtkdial notebook progressbar scrolledwin tictactoe \
-	  clist filesel list paned rulers table \
-          entry menu pixmap scribble-simple text \
-	  base  helloworld packbox radiobuttons selection tree \
-	  buttons helloworld2 packer rangewidgets  statusbar wheelbarrow 
+SUBDIRS = 	arrow \
+		aspectframe \
+		base \
+		buttonbox \
+		buttons \
+		calendar \
+		clist \
+		entry \
+		eventbox \
+		filesel \
+		fixed \
+		frame \
+		gtkdial \
+		helloworld \
+		helloworld2 \
+		label \
+		list \
+		menu \
+		notebook \
+		packbox \
+		packer \
+		paned \
+		pixmap \
+		progressbar \
+		radiobuttons \
+		rangewidgets \
+		rulers \
+		scribble-simple \
+		scribble-xinput \
+		scrolledwin \
+		selection \
+		spinbutton \
+		statusbar \
+		table \
+		text \
+		tictactoe \
+		tree \
+		wheelbarrow

 all:
 	list='$(SUBDIRS)'; \
--- a/examples/arrow/Makefile
+++ b/examples/arrow/Makefile
@@ -0,0 +1,8 @@
+
+CC = gcc
+
+arrow: arrow.c 
+	$(CC) `gtk-config --cflags`  arrow.c -o arrow `gtk-config --libs`
+
+clean: 
+	rm -f *.o arrow
--- a/examples/arrow/arrow.c
+++ b/examples/arrow/arrow.c
@@ -0,0 +1,74 @@
+/* example-start arrow arrow.c */
+
+#include <gtk/gtk.h>
+
+/* Create an Arrow widget with the specified parameters
+ * and pack it into a button */
+GtkWidget *create_arrow_button( GtkArrowType  arrow_type,
+				GtkShadowType shadow_type )
+{
+  GtkWidget *button;
+  GtkWidget *arrow;
+
+  button = gtk_button_new();
+  arrow = gtk_arrow_new (arrow_type, shadow_type);
+
+  gtk_container_add (GTK_CONTAINER (button), arrow);
+  
+  gtk_widget_show(button);
+  gtk_widget_show(arrow);
+
+  return(button);
+}
+
+int main( int   argc,
+          char *argv[] )
+{
+  /* GtkWidget is the storage type for widgets */
+  GtkWidget *window;
+  GtkWidget *button;
+  GtkWidget *box;
+
+  /* Initialize the toolkit */
+  gtk_init (&argc, &argv);
+
+  /* Create a new window */
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+  gtk_window_set_title (GTK_WINDOW (window), "Arrow Buttons");
+
+  /* It's a good idea to do this for all windows. */
+  gtk_signal_connect (GTK_OBJECT (window), "destroy",
+		      GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
+
+  /* Sets the border width of the window. */
+  gtk_container_set_border_width (GTK_CONTAINER (window), 10);
+
+  /* Create a box to hold the arrows/buttons */
+  box = gtk_hbox_new (FALSE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (box), 2);
+  gtk_container_add (GTK_CONTAINER (window), box);
+
+  /* Pack and show all our widgets */
+  gtk_widget_show(box);
+
+  button = create_arrow_button(GTK_ARROW_UP, GTK_SHADOW_IN);
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 3);
+
+  button = create_arrow_button(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 3);
+  
+  button = create_arrow_button(GTK_ARROW_LEFT, GTK_SHADOW_ETCHED_IN);
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 3);
+  
+  button = create_arrow_button(GTK_ARROW_RIGHT, GTK_SHADOW_ETCHED_OUT);
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 3);
+  
+  gtk_widget_show (window);
+  
+  /* Rest in gtk_main and wait for the fun to begin! */
+  gtk_main ();
+  
+  return(0);
+}
+/* example-end */
--- a/examples/aspectframe/aspectframe.c
+++ b/examples/aspectframe/aspectframe.c
@@ -2,8 +2,8 @@

 #include <gtk/gtk.h>
   
-int
-main (int argc, char *argv[])
+int main( int argc,
+          char *argv[] )
 {
    GtkWidget *window;
    GtkWidget *aspect_frame;
@@ -14,7 +14,7 @@ main (int argc, char *argv[])
    gtk_window_set_title (GTK_WINDOW (window), "Aspect Frame");
    gtk_signal_connect (GTK_OBJECT (window), "destroy",
                        GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
-    gtk_container_border_width (GTK_CONTAINER (window), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
   
    /* Create an aspect_frame and add it to our toplevel window */
   
--- a/examples/buttonbox/Makefile
+++ b/examples/buttonbox/Makefile
@@ -0,0 +1,8 @@
+
+CC = gcc
+
+buttonbox: buttonbox.c 
+	$(CC) `gtk-config --cflags`  buttonbox.c -o buttonbox `gtk-config --libs`
+
+clean: 
+	rm -f *.o buttonbox
--- a/examples/buttonbox/buttonbox.c
+++ b/examples/buttonbox/buttonbox.c
@@ -0,0 +1,122 @@
+/* example-start buttonbox buttonbox.c */
+
+#include <gtk/gtk.h>
+
+/* Create a Button Box with the specified parameters */
+GtkWidget *create_bbox( gint  horizontal,
+                        char *title,
+                        gint  spacing,
+                        gint  child_w,
+                        gint  child_h,
+                        gint  layout )
+{
+  GtkWidget *frame;
+  GtkWidget *bbox;
+  GtkWidget *button;
+
+  frame = gtk_frame_new (title);
+
+  if (horizontal)
+    bbox = gtk_hbutton_box_new ();
+  else
+    bbox = gtk_vbutton_box_new ();
+
+  gtk_container_set_border_width (GTK_CONTAINER (bbox), 5);
+  gtk_container_add (GTK_CONTAINER (frame), bbox);
+
+  /* Set the appearance of the Button Box */
+  gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout);
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (bbox), spacing);
+  gtk_button_box_set_child_size (GTK_BUTTON_BOX (bbox), child_w, child_h);
+
+  button = gtk_button_new_with_label ("OK");
+  gtk_container_add (GTK_CONTAINER (bbox), button);
+
+  button = gtk_button_new_with_label ("Cancel");
+  gtk_container_add (GTK_CONTAINER (bbox), button);
+
+  button = gtk_button_new_with_label ("Help");
+  gtk_container_add (GTK_CONTAINER (bbox), button);
+
+  return(frame);
+}
+
+int main( int   argc,
+          char *argv[] )
+{
+  static GtkWidget* window = NULL;
+  GtkWidget *main_vbox;
+  GtkWidget *vbox;
+  GtkWidget *hbox;
+  GtkWidget *frame_horz;
+  GtkWidget *frame_vert;
+
+  /* Initialize GTK */
+  gtk_init( &argc, &argv );
+
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_title (GTK_WINDOW (window), "Button Boxes");
+
+  gtk_signal_connect (GTK_OBJECT (window), "destroy",
+		      GTK_SIGNAL_FUNC(gtk_main_quit),
+		      NULL);
+
+  gtk_container_set_border_width (GTK_CONTAINER (window), 10);
+
+  main_vbox = gtk_vbox_new (FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (window), main_vbox);
+
+  frame_horz = gtk_frame_new ("Horizontal Button Boxes");
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE, 10);
+
+  vbox = gtk_vbox_new (FALSE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
+  gtk_container_add (GTK_CONTAINER (frame_horz), vbox);
+
+  gtk_box_pack_start (GTK_BOX (vbox),
+	   create_bbox (TRUE, "Spread (spacing 40)", 40, 85, 20, GTK_BUTTONBOX_SPREAD),
+		      TRUE, TRUE, 0);
+
+  gtk_box_pack_start (GTK_BOX (vbox),
+	   create_bbox (TRUE, "Edge (spacing 30)", 30, 85, 20, GTK_BUTTONBOX_EDGE),
+		      TRUE, TRUE, 5);
+
+  gtk_box_pack_start (GTK_BOX (vbox),
+           create_bbox (TRUE, "Start (spacing 20)", 20, 85, 20, GTK_BUTTONBOX_START),
+		      TRUE, TRUE, 5);
+
+  gtk_box_pack_start (GTK_BOX (vbox),
+	   create_bbox (TRUE, "End (spacing 10)", 10, 85, 20, GTK_BUTTONBOX_END),
+		      TRUE, TRUE, 5);
+
+  frame_vert = gtk_frame_new ("Vertical Button Boxes");
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE, 10);
+
+  hbox = gtk_hbox_new (FALSE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
+  gtk_container_add (GTK_CONTAINER (frame_vert), hbox);
+
+  gtk_box_pack_start (GTK_BOX (hbox),
+           create_bbox (FALSE, "Spread (spacing 5)", 5, 85, 20, GTK_BUTTONBOX_SPREAD),
+		      TRUE, TRUE, 0);
+
+  gtk_box_pack_start (GTK_BOX (hbox),
+           create_bbox (FALSE, "Edge (spacing 30)", 30, 85, 20, GTK_BUTTONBOX_EDGE),
+		      TRUE, TRUE, 5);
+
+  gtk_box_pack_start (GTK_BOX (hbox),
+           create_bbox (FALSE, "Start (spacing 20)", 20, 85, 20, GTK_BUTTONBOX_START),
+		      TRUE, TRUE, 5);
+
+  gtk_box_pack_start (GTK_BOX (hbox),
+           create_bbox (FALSE, "End (spacing 20)", 20, 85, 20, GTK_BUTTONBOX_END),
+		      TRUE, TRUE, 5);
+
+  gtk_widget_show_all (window);
+
+  /* Enter the event loop */
+  gtk_main ();
+    
+  return(0);
+}
+/* example-end */
--- a/examples/buttons/buttons.c
+++ b/examples/buttons/buttons.c
@@ -18,7 +18,7 @@ GtkWidget *xpm_label_box( GtkWidget *parent,

    /* Create box for xpm and label */
    box1 = gtk_hbox_new (FALSE, 0);
-    gtk_container_border_width (GTK_CONTAINER (box1), 2);
+    gtk_container_set_border_width (GTK_CONTAINER (box1), 2);

    /* Get the style of the button to get the
     * background color. */
@@ -75,9 +75,8 @@ int main( int   argc,
    gtk_signal_connect (GTK_OBJECT (window), "delete_event",
 			GTK_SIGNAL_FUNC (gtk_exit), NULL);

-
    /* Sets the border width of the window. */
-    gtk_container_border_width (GTK_CONTAINER (window), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
    gtk_widget_realize(window);

    /* Create a new button */
--- a/examples/calendar/Makefile
+++ b/examples/calendar/Makefile
@@ -1,8 +1,8 @@

 CC = gcc

-gcalendar: gcalendar.c
-	$(CC) `gtk-config --cflags` gcalendar.c -o gcalendar `gtk-config --libs`
+calendar: calendar.c
+	$(CC) `gtk-config --cflags` calendar.c -o calendar `gtk-config --libs`

 clean: 
-	rm -f gcalendar
+	rm -f calendar
--- a/examples/calendar/gcalendar.c
+++ b/examples/calendar/gcalendar.c
@@ -1,5 +1,7 @@
-/* G Calendar
+/* example-start calendar calendar.c */
+/*
 * Copyright (C) 1998 Cesar Miquel, Shawn T. Amundson, Mattias Grönlund
+ * Copyright (C) 2000 Tony Gale
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -26,84 +28,18 @@

 #define TM_YEAR_BASE 1900

-
 typedef struct _CalendarData {
  GtkWidget *flag_checkboxes[5];
  gboolean  settings[5];
  gchar     *font;
  GtkWidget *font_dialog;
  GtkWidget *window;
-  GtkWidget *selected;
-  GtkWidget *selected_double_click;
+  GtkWidget *prev2_sig;
+  GtkWidget *prev_sig;
+  GtkWidget *last_sig;
  GtkWidget *month;
 } CalendarData;

-void create_calendar();
-gint delete_event(GtkWidget *widget, GdkEvent *event, gpointer data);
-void destroy (GtkWidget *widget, gpointer data);
-void day_selected_double_click (GtkWidget *widget, gpointer data);
-int main(int argc, char *argv[]);
-void calendar_month_changed (GtkWidget *widget, CalendarData *data);
-void calendar_day_selected (GtkWidget *widget, CalendarData *data);
-void calendar_day_selected_double_click (GtkWidget *widget, CalendarData *data);
-
-
-void calendar_set_flags(CalendarData *calendar);
-void calendar_toggle_flag(GtkWidget * toggle, CalendarData *calendar);
-void calendar_font_selection_ok(GtkWidget * button, CalendarData *calendar);
-void calendar_font_selection_destroy(GtkWidget * button, GtkWidget widget);
-void calendar_select_font(GtkWidget * button, CalendarData *calendar);
-void calendar_create_window_destroy(GtkWidget * ignore, CalendarData *calendar);
-void calendar_create_window(GtkWidget * ignored, CalendarData * calendar);
-void calendar_window_destroy(GtkWidget * ignore, CalendarData *calendar);
-void create_calendar();
-
-/*
- * GtkCalendar
- */
-
-void
-calendar_month_changed (GtkWidget *widget, CalendarData *data)
-{
-  char buffer[256];
-  struct tm tm;
-  time_t time;
-  memset (&tm, 0, sizeof (tm));
-  gtk_calendar_get_date (GTK_CALENDAR(data->window), &tm.tm_year, &tm.tm_mon, &tm.tm_mday);
-  tm.tm_year -= TM_YEAR_BASE;
-  time = mktime(&tm);
-  strftime (buffer, 255, "%x", gmtime(&time));
-  gtk_label_set (GTK_LABEL (data->month), buffer);
-}
-
-void
-calendar_day_selected (GtkWidget *widget, CalendarData *data)
-{
-  char buffer[256];
-  struct tm tm;
-  time_t time;
-  memset (&tm, 0, sizeof (tm));
-  gtk_calendar_get_date (GTK_CALENDAR(data->window), &tm.tm_year, &tm.tm_mon, &tm.tm_mday);
-  tm.tm_year -= TM_YEAR_BASE;
-  time = mktime(&tm);
-  strftime (buffer, 255, "%x", gmtime(&time));
-  gtk_label_set (GTK_LABEL (data->selected), buffer);
-}
-
-void
-calendar_day_selected_double_click (GtkWidget *widget, CalendarData *data)
-{
-  char buffer[256];
-  struct tm tm;
-  time_t time;
-  memset (&tm, 0, sizeof (tm));
-  gtk_calendar_get_date (GTK_CALENDAR(data->window), &tm.tm_year, &tm.tm_mon, &tm.tm_mday);
-  tm.tm_year -= TM_YEAR_BASE;
-  time = mktime(&tm);
-  strftime (buffer, 255, "%x", gmtime(&time));
-  gtk_label_set (GTK_LABEL (data->selected_double_click), buffer);
-}
-
 enum {
  calendar_show_header,
  calendar_show_days,
@@ -112,8 +48,115 @@ enum {
  calendar_monday_first
 };

-void
-calendar_set_flags(CalendarData *calendar)
+/*
+ * GtkCalendar
+ */
+
+void calendar_date_to_string( CalendarData *data,
+			      char         *buffer,
+			      gint          buff_len )
+{
+  struct tm tm;
+  time_t time;
+
+  memset (&tm, 0, sizeof (tm));
+  gtk_calendar_get_date (GTK_CALENDAR(data->window),
+			 &tm.tm_year, &tm.tm_mon, &tm.tm_mday);
+  tm.tm_year -= TM_YEAR_BASE;
+  time = mktime(&tm);
+  strftime (buffer, buff_len-1, "%x", gmtime(&time));
+}
+
+void calendar_set_signal_strings( char         *sig_str,
+				  CalendarData *data)
+{
+  gchar *prev_sig;
+
+  gtk_label_get (GTK_LABEL (data->prev_sig), &prev_sig);
+  gtk_label_set (GTK_LABEL (data->prev2_sig), prev_sig);
+
+  gtk_label_get (GTK_LABEL (data->last_sig), &prev_sig);
+  gtk_label_set (GTK_LABEL (data->prev_sig), prev_sig);
+  gtk_label_set (GTK_LABEL (data->last_sig), sig_str);
+}
+
+void calendar_month_changed( GtkWidget    *widget,
+                             CalendarData *data )
+{
+  char buffer[256] = "month_changed: ";
+
+  calendar_date_to_string (data, buffer+15, 256-15);
+  calendar_set_signal_strings (buffer, data);
+}
+
+void calendar_day_selected( GtkWidget    *widget,
+                            CalendarData *data )
+{
+  char buffer[256] = "day_selected: ";
+
+  calendar_date_to_string (data, buffer+14, 256-14);
+  calendar_set_signal_strings (buffer, data);
+}
+
+void calendar_day_selected_double_click( GtkWidget    *widget,
+                                         CalendarData *data )
+{
+  struct tm tm;
+  char buffer[256] = "day_selected_double_click: ";
+
+  calendar_date_to_string (data, buffer+27, 256-27);
+  calendar_set_signal_strings (buffer, data);
+
+  memset (&tm, 0, sizeof (tm));
+  gtk_calendar_get_date (GTK_CALENDAR(data->window),
+			 &tm.tm_year, &tm.tm_mon, &tm.tm_mday);
+  tm.tm_year -= TM_YEAR_BASE;
+
+  if(GTK_CALENDAR(data->window)->marked_date[tm.tm_mday-1] == 0) {
+    gtk_calendar_mark_day(GTK_CALENDAR(data->window),tm.tm_mday);
+  } else { 
+    gtk_calendar_unmark_day(GTK_CALENDAR(data->window),tm.tm_mday);
+  }
+}
+
+void calendar_prev_month( GtkWidget    *widget,
+                            CalendarData *data )
+{
+  char buffer[256] = "prev_month: ";
+
+  calendar_date_to_string (data, buffer+12, 256-12);
+  calendar_set_signal_strings (buffer, data);
+}
+
+void calendar_next_month( GtkWidget    *widget,
+                            CalendarData *data )
+{
+  char buffer[256] = "next_month: ";
+
+  calendar_date_to_string (data, buffer+12, 256-12);
+  calendar_set_signal_strings (buffer, data);
+}
+
+void calendar_prev_year( GtkWidget    *widget,
+                            CalendarData *data )
+{
+  char buffer[256] = "prev_year: ";
+
+  calendar_date_to_string (data, buffer+11, 256-11);
+  calendar_set_signal_strings (buffer, data);
+}
+
+void calendar_next_year( GtkWidget    *widget,
+                            CalendarData *data )
+{
+  char buffer[256] = "next_year: ";
+
+  calendar_date_to_string (data, buffer+11, 256-11);
+  calendar_set_signal_strings (buffer, data);
+}
+
+
+void calendar_set_flags( CalendarData *calendar )
 {
  gint i;
  gint options=0;
@@ -126,8 +169,8 @@ calendar_set_flags(CalendarData *calendar)
    gtk_calendar_display_options (GTK_CALENDAR (calendar->window), options);
 }

-void 
-calendar_toggle_flag(GtkWidget * toggle, CalendarData *calendar)
+void calendar_toggle_flag( GtkWidget    *toggle,
+                           CalendarData *calendar )
 {
  gint i;
  gint j;
@@ -140,13 +183,15 @@ calendar_toggle_flag(GtkWidget * toggle, CalendarData *calendar)
  calendar_set_flags(calendar);
  
 }
-void
-calendar_font_selection_ok(GtkWidget * button, CalendarData *calendar)
+
+void calendar_font_selection_ok( GtkWidget    *button,
+                                 CalendarData *calendar )
 {
  GtkStyle *style;
  GdkFont  *font;

-  calendar->font = gtk_font_selection_dialog_get_font_name (GTK_FONT_SELECTION_DIALOG (calendar->font_dialog));
+  calendar->font = gtk_font_selection_dialog_get_font_name(
+			GTK_FONT_SELECTION_DIALOG (calendar->font_dialog));
  if (calendar->window)
    {
      font = gtk_font_selection_dialog_get_font(GTK_FONT_SELECTION_DIALOG(calendar->font_dialog));
@@ -161,8 +206,8 @@ calendar_font_selection_ok(GtkWidget * button, CalendarData *calendar)
    }
 }

-void
-calendar_select_font(GtkWidget * button, CalendarData *calendar)
+void calendar_select_font( GtkWidget    *button,
+                           CalendarData *calendar )
 {
  GtkWidget *window;

@@ -193,8 +238,7 @@ calendar_select_font(GtkWidget * button, CalendarData *calendar)

 }

-void 
-create_calendar()
+void create_calendar()
 {
  GtkWidget *window;
  GtkWidget *vbox, *vbox2, *vbox3;
@@ -231,6 +275,7 @@ create_calendar()
  }

  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_title(GTK_WINDOW(window), "GtkCalendar Example");
  gtk_container_border_width (GTK_CONTAINER (window), 5);
  gtk_signal_connect(GTK_OBJECT(window), "destroy",
 		     GTK_SIGNAL_FUNC(gtk_main_quit),
@@ -257,7 +302,7 @@ create_calendar()

  /* Calendar widget */
  frame = gtk_frame_new("Calendar");
-  gtk_box_pack_start(GTK_BOX(hbbox), frame, TRUE, TRUE, DEF_PAD);
+  gtk_box_pack_start(GTK_BOX(hbbox), frame, FALSE, TRUE, DEF_PAD);
  calendar=gtk_calendar_new();
  calendar_data.window = calendar;
  calendar_set_flags(&calendar_data);
@@ -272,6 +317,18 @@ create_calendar()
  gtk_signal_connect (GTK_OBJECT (calendar), "day_selected_double_click", 
                      GTK_SIGNAL_FUNC (calendar_day_selected_double_click),
 		      &calendar_data);
+  gtk_signal_connect (GTK_OBJECT (calendar), "prev_month", 
+                      GTK_SIGNAL_FUNC (calendar_prev_month),
+		      &calendar_data);
+  gtk_signal_connect (GTK_OBJECT (calendar), "next_month", 
+                      GTK_SIGNAL_FUNC (calendar_next_month),
+		      &calendar_data);
+  gtk_signal_connect (GTK_OBJECT (calendar), "prev_year", 
+                      GTK_SIGNAL_FUNC (calendar_prev_year),
+		      &calendar_data);
+  gtk_signal_connect (GTK_OBJECT (calendar), "next_year", 
+                      GTK_SIGNAL_FUNC (calendar_next_year),
+		      &calendar_data);


  separator = gtk_vseparator_new ();
@@ -311,30 +368,31 @@ create_calendar()

  frame = gtk_frame_new("Signal events");
  gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, DEF_PAD);
+
  vbox2 = gtk_vbox_new(TRUE, DEF_PAD_SMALL);
  gtk_container_add(GTK_CONTAINER(frame), vbox2);
  
-  hbox = gtk_hbox_new (FALSE, 5);
+  hbox = gtk_hbox_new (FALSE, 3);
  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
-  label = gtk_label_new ("Day selected:");
+  label = gtk_label_new ("Signal:");
  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
-  calendar_data.selected = gtk_label_new ("");
-  gtk_box_pack_start (GTK_BOX (hbox), calendar_data.selected, FALSE, TRUE, 0);
+  calendar_data.last_sig = gtk_label_new ("");
+  gtk_box_pack_start (GTK_BOX (hbox), calendar_data.last_sig, FALSE, TRUE, 0);

-  hbox = gtk_hbox_new (FALSE, 5);
+  hbox = gtk_hbox_new (FALSE, 3);
  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
-  label = gtk_label_new ("Day selected double click:");
+  label = gtk_label_new ("Previous signal:");
  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
-  calendar_data.selected_double_click = gtk_label_new ("");
-  gtk_box_pack_start (GTK_BOX (hbox), calendar_data.selected_double_click, FALSE, TRUE, 0);
+  calendar_data.prev_sig = gtk_label_new ("");
+  gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev_sig, FALSE, TRUE, 0);

-  hbox = gtk_hbox_new (FALSE, 5);
+  hbox = gtk_hbox_new (FALSE, 3);
  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
-  label = gtk_label_new ("Month change:"); 
+  label = gtk_label_new ("Second previous signal:");
  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
-  calendar_data.month = gtk_label_new ("");
-  gtk_box_pack_start (GTK_BOX (hbox), calendar_data.month, FALSE, TRUE, 0);
-  
+  calendar_data.prev2_sig = gtk_label_new ("");
+  gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev2_sig, FALSE, TRUE, 0);
+
  bbox = gtk_hbutton_box_new ();
  gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
  gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
@@ -351,12 +409,16 @@ create_calendar()
 }


-int
-main(int argc, char *argv[])
+int main(int   argc,
+         char *argv[] )
 {
  gtk_set_locale ();
  gtk_init (&argc, &argv);
+
  create_calendar();
-  gtk_main ();
-  return 0;
+
+  gtk_main();
+
+  return(0);
 }
+/* example-end */
--- a/examples/clist/clist.c
+++ b/examples/clist/clist.c
@@ -1,26 +1,94 @@
 /* example-start clist clist.c */

-#include        <gtk/gtk.h>
-#include	<glib.h>
+#include <gtk/gtk.h>

-/* These are just the prototypes of the various callbacks */
-void button_add_clicked( GtkWidget *button, gpointer data);
-void button_clear_clicked( GtkWidget *button, gpointer data);
-void button_hide_show_clicked( GtkWidget *button, gpointer data);
-void selection_made( GtkWidget *clist, gint row, gint column,
-		     GdkEventButton *event, gpointer data);
+/* User clicked the "Add List" button. */
+void button_add_clicked( gpointer data )
+{
+    int indx;
+ 
+    /* Something silly to add to the list. 4 rows of 2 columns each */
+    gchar *drink[4][2] = { { "Milk",    "3 Oz" },
+                           { "Water",   "6 l" },
+                           { "Carrots", "2" },
+                           { "Snakes",  "55" } };

-gint main (int argc, gchar *argv[])
+    /* Here we do the actual adding of the text. It's done once for
+     * each row.
+     */
+    for ( indx=0 ; indx < 4 ; indx++ )
+	gtk_clist_append( (GtkCList *) data, drink[indx]);
+
+    return;
+}
+
+/* User clicked the "Clear List" button. */
+void button_clear_clicked( gpointer data )
+{
+    /* Clear the list using gtk_clist_clear. This is much faster than
+     * calling gtk_clist_remove once for each row.
+     */
+    gtk_clist_clear( (GtkCList *) data);
+
+    return;
+}
+
+/* The user clicked the "Hide/Show titles" button. */
+void button_hide_show_clicked( gpointer data )
+{
+    /* Just a flag to remember the status. 0 = currently visible */
+    static short int flag = 0;
+
+    if (flag == 0)
+    {
+        /* Hide the titles and set the flag to 1 */
+	gtk_clist_column_titles_hide((GtkCList *) data);
+	flag++;
+    }
+    else
+    {
+        /* Show the titles and reset flag to 0 */
+	gtk_clist_column_titles_show((GtkCList *) data);
+	flag--;
+    }
+
+    return;
+}
+
+/* If we come here, then the user has selected a row in the list. */
+void selection_made( GtkWidget      *clist,
+                     gint            row,
+                     gint            column,
+		     GdkEventButton *event,
+                     gpointer        data )
+{
+    gchar *text;
+
+    /* Get the text that is stored in the selected row and column
+     * which was clicked in. We will receive it as a pointer in the
+     * argument text.
+     */
+    gtk_clist_get_text(GTK_CLIST(clist), row, column, &text);
+
+    /* Just prints some information about the selected row */
+    g_print("You selected row %d. More specifically you clicked in "
+            "column %d, and the text in this cell is %s\n\n",
+	    row, column, text);
+
+    return;
+}
+
+int main( int    argc,
+          gchar *argv[] )
 {                                  
-    GtkWidget       *window;
-    GtkWidget       *vbox, *hbox;
-    GtkWidget	    *clist;
-    GtkWidget	    *button_add, *button_clear, *button_hide_show;    
-    gchar	    *titles[2] = {"Ingredients","Amount"};
+    GtkWidget *window;
+    GtkWidget *vbox, *hbox;
+    GtkWidget *scrolled_window, *clist;
+    GtkWidget *button_add, *button_clear, *button_hide_show;    
+    gchar *titles[2] = { "Ingredients", "Amount" };

    gtk_init(&argc, &argv);
    
-    
    window=gtk_window_new(GTK_WINDOW_TOPLEVEL);
    gtk_widget_set_usize(GTK_WIDGET(window), 300, 150);

@@ -31,11 +99,19 @@ gint main (int argc, gchar *argv[])
 		       NULL);
    
    vbox=gtk_vbox_new(FALSE, 5);
-    gtk_container_border_width(GTK_CONTAINER(vbox), 5);
+    gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
    gtk_container_add(GTK_CONTAINER(window), vbox);
    gtk_widget_show(vbox);
    
-    /* Create the GtkCList. For this example we use 2 columns */
+    /* Create a scrolled window to pack the CList widget into */
+    scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                    GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+
+    gtk_box_pack_start(GTK_BOX(vbox), scrolled_window, TRUE, TRUE, 0);
+    gtk_widget_show (scrolled_window);
+
+    /* Create the CList. For this example we use 2 columns */
    clist = gtk_clist_new_with_titles( 2, titles);

    /* When a selection is made, we want to know about it. The callback
@@ -53,8 +129,8 @@ gint main (int argc, gchar *argv[])
     */
    gtk_clist_set_column_width (GTK_CLIST(clist), 0, 150);

-    /* Add the GtkCList widget to the vertical box and show it. */
-    gtk_box_pack_start(GTK_BOX(vbox), clist, TRUE, TRUE, 0);
+    /* Add the CList widget to the vertical box and show it. */
+    gtk_container_add(GTK_CONTAINER(scrolled_window), clist);
    gtk_widget_show(clist);

    /* Create the buttons and add them to the window. See the button
@@ -95,75 +171,4 @@ gint main (int argc, gchar *argv[])
    
    return(0);
 }
-
-/* User clicked the "Add List" button. */
-void button_add_clicked( GtkWidget *button, gpointer data)
-{
-    int		indx;
-
-    /* Something silly to add to the list. 4 rows of 2 columns each */
-    gchar      *drink[4][2] = {{"Milk", "3 Oz"},
-			       {"Water", "6 l"},
-			       {"Carrots", "2"},
-			       {"Snakes", "55"}};
-
-    /* Here we do the actual adding of the text. It's done once for
-     * each row.
-     */
-    for( indx=0; indx < 4; indx++)
-	gtk_clist_append( (GtkCList*) data, drink[indx]);
-
-    return;
-}
-
-/* User clicked the "Clear List" button. */
-void button_clear_clicked( GtkWidget *button, gpointer data)
-{
-    /* Clear the list using gtk_clist_clear. This is much faster than
-     * calling gtk_clist_remove once for each row.
-     */
-    gtk_clist_clear((GtkCList*) data);
-
-    return;
-}
-
-/* The user clicked the "Hide/Show titles" button. */
-void button_hide_show_clicked( GtkWidget *button, gpointer data)
-{
-    /* Just a flag to remember the status. 0 = currently visible */
-    static short int flag = 0;
-
-    if (flag == 0)
-    {
-        /* Hide the titles and set the flag to 1 */
-	gtk_clist_column_titles_hide((GtkCList*) data);
-	flag++;
-    }
-    else
-    {
-        /* Show the titles and reset flag to 0 */
-	gtk_clist_column_titles_show((GtkCList*) data);
-	flag--;
-    }
-
-    return;
-}
-
-/* If we come here, then the user has selected a row in the list. */
-void selection_made( GtkWidget *clist, gint row, gint column,
-		     GdkEventButton *event, gpointer data)
-{
-    gchar	*text;
-
-    /* Get the text that is stored in the selected row and column
-     * which was clicked in. We will receive it as a pointer in the
-     * argument text.
-     */
-    gtk_clist_get_text(GTK_CLIST(clist), row, column, &text);
-
-    /* Just prints some information about the selected row */
-    g_print("You selected row %d. More specifically you clicked in column %d, and the text in this cell is %s\n\n", row, column, text);
-
-    return;
-}
 /* example-end */
--- a/examples/entry/entry.c
+++ b/examples/entry/entry.c
@@ -2,28 +2,30 @@

 #include <gtk/gtk.h>

-void enter_callback(GtkWidget *widget, GtkWidget *entry)
+void enter_callback( GtkWidget *widget,
+                     GtkWidget *entry )
 {
  gchar *entry_text;
  entry_text = gtk_entry_get_text(GTK_ENTRY(entry));
  printf("Entry contents: %s\n", entry_text);
 }

-void entry_toggle_editable (GtkWidget *checkbutton,
-				   GtkWidget *entry)
+void entry_toggle_editable( GtkWidget *checkbutton,
+                            GtkWidget *entry )
 {
  gtk_entry_set_editable(GTK_ENTRY(entry),
 			 GTK_TOGGLE_BUTTON(checkbutton)->active);
 }

-void entry_toggle_visibility (GtkWidget *checkbutton,
-				   GtkWidget *entry)
+void entry_toggle_visibility( GtkWidget *checkbutton,
+                              GtkWidget *entry )
 {
  gtk_entry_set_visibility(GTK_ENTRY(entry),
 			 GTK_TOGGLE_BUTTON(checkbutton)->active);
 }

-int main (int argc, char *argv[])
+int main( int   argc,
+          char *argv[] )
 {

    GtkWidget *window;
@@ -64,14 +66,14 @@ int main (int argc, char *argv[])
    gtk_box_pack_start (GTK_BOX (hbox), check, TRUE, TRUE, 0);
    gtk_signal_connect (GTK_OBJECT(check), "toggled",
 			GTK_SIGNAL_FUNC(entry_toggle_editable), entry);
-    gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(check), TRUE);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), TRUE);
    gtk_widget_show (check);
    
    check = gtk_check_button_new_with_label("Visible");
    gtk_box_pack_start (GTK_BOX (hbox), check, TRUE, TRUE, 0);
    gtk_signal_connect (GTK_OBJECT(check), "toggled",
 			GTK_SIGNAL_FUNC(entry_toggle_visibility), entry);
-    gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(check), TRUE);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), TRUE);
    gtk_widget_show (check);
                                   
    button = gtk_button_new_with_label ("Close");
--- a/examples/eventbox/eventbox.c
+++ b/examples/eventbox/eventbox.c
@@ -2,8 +2,8 @@

 #include <gtk/gtk.h>

-int 
-main (int argc, char *argv[])
+int main( int argc,
+          char *argv[] )
 {
    GtkWidget *window;
    GtkWidget *event_box;
@@ -18,7 +18,7 @@ main (int argc, char *argv[])
    gtk_signal_connect (GTK_OBJECT (window), "destroy",
 			GTK_SIGNAL_FUNC (gtk_exit), NULL);
    
-    gtk_container_border_width (GTK_CONTAINER (window), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
    
    /* Create an EventBox and add it to our toplevel window */
    
@@ -49,6 +49,6 @@ main (int argc, char *argv[])
    
    gtk_main ();
    
-    return 0;
+    return(0);
 }
 /* example-end */
--- a/examples/filesel/filesel.c
+++ b/examples/filesel/filesel.c
@@ -3,17 +3,20 @@
 #include <gtk/gtk.h>

 /* Get the selected filename and print it to the console */
-void file_ok_sel (GtkWidget *w, GtkFileSelection *fs)
+void file_ok_sel( GtkWidget        *w,
+                  GtkFileSelection *fs )
 {
    g_print ("%s\n", gtk_file_selection_get_filename (GTK_FILE_SELECTION (fs)));
 }

-void destroy (GtkWidget *widget, gpointer data)
+void destroy( GtkWidget *widget,
+              gpointer   data )
 {
    gtk_main_quit ();
 }

-int main (int argc, char *argv[])
+int main( int   argc,
+          char *argv[] )
 {
    GtkWidget *filew;
    
@@ -29,7 +32,8 @@ int main (int argc, char *argv[])
 			"clicked", (GtkSignalFunc) file_ok_sel, filew );
    
    /* Connect the cancel_button to destroy the widget */
-    gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (filew)->cancel_button),
+    gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION
+                                            (filew)->cancel_button),
 			       "clicked", (GtkSignalFunc) gtk_widget_destroy,
 			       GTK_OBJECT (filew));
    
--- a/examples/fixed/Makefile
+++ b/examples/fixed/Makefile
@@ -0,0 +1,8 @@
+
+CC = gcc
+
+fixed: fixed.c 
+	$(CC) `gtk-config --cflags`  fixed.c -o fixed `gtk-config --libs`
+
+clean: 
+	rm -f *.o fixed
--- a/examples/fixed/fixed.c
+++ b/examples/fixed/fixed.c
@@ -0,0 +1,74 @@
+/* example-start fixed fixed.c */
+
+#include <gtk/gtk.h>
+
+/* I'm going to be lazy and use some global variables to
+ * store the position of the widget within the fixed
+ * container */
+gint x=50;
+gint y=50;
+
+/* This callback function moves the button to a new position
+ * in the Fixed container. */
+void move_button( GtkWidget *widget,
+                  GtkWidget *fixed )
+{
+  x = (x+30)%300;
+  y = (y+50)%300;
+  gtk_fixed_move( GTK_FIXED(fixed), widget, x, y); 
+}
+
+int main( int   argc,
+          char *argv[] )
+{
+  /* GtkWidget is the storage type for widgets */
+  GtkWidget *window;
+  GtkWidget *fixed;
+  GtkWidget *button;
+  gint i;
+
+  /* Initialise GTK */
+  gtk_init(&argc, &argv);
+    
+  /* Create a new window */
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_title(GTK_WINDOW(window), "Fixed Container");
+
+  /* Here we connect the "destroy" event to a signal handler */ 
+  gtk_signal_connect (GTK_OBJECT (window), "destroy",
+		      GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
+ 
+  /* Sets the border width of the window. */
+  gtk_container_set_border_width (GTK_CONTAINER (window), 10);
+
+  /* Create a Fixed Container */
+  fixed = gtk_fixed_new();
+  gtk_container_add(GTK_CONTAINER(window), fixed);
+  gtk_widget_show(fixed);
+  
+  for (i = 1 ; i <= 3 ; i++) {
+    /* Creates a new button with the label "Press me" */
+    button = gtk_button_new_with_label ("Press me");
+  
+    /* When the button receives the "clicked" signal, it will call the
+     * function move_button() passing it the Fixed Container as its
+     * argument. */
+    gtk_signal_connect (GTK_OBJECT (button), "clicked",
+			GTK_SIGNAL_FUNC (move_button), fixed);
+  
+    /* This packs the button into the fixed containers window. */
+    gtk_fixed_put (GTK_FIXED (fixed), button, i*50, i*50);
+  
+    /* The final step is to display this newly created widget. */
+    gtk_widget_show (button);
+  }
+
+  /* Display the window */
+  gtk_widget_show (window);
+    
+  /* Enter the event loop */
+  gtk_main ();
+    
+  return(0);
+}
+/* example-end */
--- a/examples/frame/Makefile
+++ b/examples/frame/Makefile
@@ -0,0 +1,8 @@
+
+CC = gcc
+
+frame: frame.c 
+	$(CC) `gtk-config --cflags`  frame.c -o frame `gtk-config --libs`
+
+clean: 
+	rm -f *.o frame
--- a/examples/frame/frame.c
+++ b/examples/frame/frame.c
@@ -0,0 +1,52 @@
+/* example-start frame frame.c */
+
+#include <gtk/gtk.h>
+
+int main( int   argc,
+          char *argv[] )
+{
+  /* GtkWidget is the storage type for widgets */
+  GtkWidget *window;
+  GtkWidget *frame;
+  GtkWidget *button;
+  gint i;
+
+  /* Initialise GTK */
+  gtk_init(&argc, &argv);
+    
+  /* Create a new window */
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_title(GTK_WINDOW(window), "Frame Example");
+
+  /* Here we connect the "destroy" event to a signal handler */ 
+  gtk_signal_connect (GTK_OBJECT (window), "destroy",
+		      GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
+
+  gtk_widget_set_usize(window, 300, 300);
+  /* Sets the border width of the window. */
+  gtk_container_set_border_width (GTK_CONTAINER (window), 10);
+
+  /* Create a Frame */
+  frame = gtk_frame_new(NULL);
+  gtk_container_add(GTK_CONTAINER(window), frame);
+
+  /* Set the frame's label */
+  gtk_frame_set_label( GTK_FRAME(frame), "GTK Frame Widget" );
+
+  /* Align the label at the right of the frame */
+  gtk_frame_set_label_align( GTK_FRAME(frame), 1.0, 0.0);
+
+  /* Set the style of the frame */
+  gtk_frame_set_shadow_type( GTK_FRAME(frame), GTK_SHADOW_ETCHED_OUT);
+
+  gtk_widget_show(frame);
+  
+  /* Display the window */
+  gtk_widget_show (window);
+    
+  /* Enter the event loop */
+  gtk_main ();
+    
+  return(0);
+}
+/* example-end */
--- a/examples/gtkdial/gtkdial.c
+++ b/examples/gtkdial/gtkdial.c
@@ -275,12 +275,14 @@ gtk_dial_expose (GtkWidget      *widget,
 		 GdkEventExpose *event)
 {
  GtkDial *dial;
-  GdkPoint points[3];
+  GdkPoint points[6];
  gdouble s,c;
-  gdouble theta;
+  gdouble theta, last, increment;
+  GtkStyle      *blankstyle;
  gint xc, yc;
+  gint upper, lower;
  gint tick_length;
-  gint i;
+  gint i, inc;

  g_return_val_if_fail (widget != NULL, FALSE);
  g_return_val_if_fail (GTK_IS_DIAL (widget), FALSE);
@@ -291,37 +293,22 @@ gtk_dial_expose (GtkWidget      *widget,
  
  dial = GTK_DIAL (widget);

-  gdk_window_clear_area (widget->window,
+/*  gdk_window_clear_area (widget->window,
 			 0, 0,
 			 widget->allocation.width,
 			 widget->allocation.height);
-
+*/
  xc = widget->allocation.width/2;
  yc = widget->allocation.height/2;

-  /* Draw ticks */
+  upper = dial->adjustment->upper;
+  lower = dial->adjustment->lower;

-  for (i=0; i<25; i++)
-    {
-      theta = (i*M_PI/18. - M_PI/6.);
-      s = sin(theta);
-      c = cos(theta);
-
-      tick_length = (i%6 == 0) ? dial->pointer_width : dial->pointer_width/2;
-      
-      gdk_draw_line (widget->window,
-		     widget->style->fg_gc[widget->state],
-		     xc + c*(dial->radius - tick_length),
-		     yc - s*(dial->radius - tick_length),
-		     xc + c*dial->radius,
-		     yc - s*dial->radius);
-    }
-
-  /* Draw pointer */
-
-  s = sin(dial->angle);
-  c = cos(dial->angle);
+  /* Erase old pointer */

+  s = sin(dial->last_angle);
+  c = cos(dial->last_angle);
+  dial->last_angle = dial->angle;

  points[0].x = xc + s*dial->pointer_width/2;
  points[0].y = yc + c*dial->pointer_width/2;
@@ -329,14 +316,90 @@ gtk_dial_expose (GtkWidget      *widget,
  points[1].y = yc - s*dial->radius;
  points[2].x = xc - s*dial->pointer_width/2;
  points[2].y = yc - c*dial->pointer_width/2;
+  points[3].x = xc - c*dial->radius/10;
+  points[3].y = yc + s*dial->radius/10;
+  points[4].x = points[0].x;
+  points[4].y = points[0].y;
+
+  blankstyle = gtk_style_new ();
+  blankstyle->bg_gc[GTK_STATE_NORMAL] =
+                widget->style->bg_gc[GTK_STATE_NORMAL];
+  blankstyle->dark_gc[GTK_STATE_NORMAL] =
+                widget->style->bg_gc[GTK_STATE_NORMAL];
+  blankstyle->light_gc[GTK_STATE_NORMAL] =
+                widget->style->bg_gc[GTK_STATE_NORMAL];
+  blankstyle->black_gc =
+                widget->style->bg_gc[GTK_STATE_NORMAL];
+
+  gtk_draw_polygon (blankstyle,
+                    widget->window,
+                    GTK_STATE_NORMAL,
+                    GTK_SHADOW_OUT,
+                    points, 5,
+                    FALSE);
+
+  gtk_style_unref(blankstyle);
+
+
+  /* Draw ticks */
+
+  if ((upper - lower) == 0)
+    return;
+
+  increment = (100*M_PI)/(dial->radius*dial->radius);
+
+  inc = (upper - lower);
+
+  while (inc < 100) inc *=10;
+  while (inc >= 1000) inc /=10;
+  last = -1;
+
+  for (i=0; i<=inc; i++)
+    {
+      theta = ((gfloat)i*M_PI/(18*inc/24.) - M_PI/6.);
+
+      if ((theta - last) < (increment))
+	continue;     
+      last = theta;
+
+      s = sin(theta);
+      c = cos(theta);
+
+      tick_length = (i%(inc/10) == 0) ? dial->pointer_width : dial->pointer_width/2;
+
+      gdk_draw_line (widget->window,
+                     widget->style->fg_gc[widget->state],
+                     xc + c*(dial->radius - tick_length),
+                     yc - s*(dial->radius - tick_length),
+                     xc + c*dial->radius,
+                     yc - s*dial->radius);
+    }
+
+  /* Draw pointer */
+
+  s = sin(dial->angle);
+  c = cos(dial->angle);
+  dial->last_angle = dial->angle;
+
+  points[0].x = xc + s*dial->pointer_width/2;
+  points[0].y = yc + c*dial->pointer_width/2;
+  points[1].x = xc + c*dial->radius;
+  points[1].y = yc - s*dial->radius;
+  points[2].x = xc - s*dial->pointer_width/2;
+  points[2].y = yc - c*dial->pointer_width/2;
+  points[3].x = xc - c*dial->radius/10;
+  points[3].y = yc + s*dial->radius/10;
+  points[4].x = points[0].x;
+  points[4].y = points[0].y;
+

  gtk_draw_polygon (widget->style,
 		    widget->window,
 		    GTK_STATE_NORMAL,
 		    GTK_SHADOW_OUT,
-		    points, 3,
+		    points, 5,
 		    TRUE);
-  
+
  return FALSE;
 }

--- a/examples/gtkdial/gtkdial.h
+++ b/examples/gtkdial/gtkdial.h
@@ -59,6 +59,7 @@ struct _GtkDial

  /* Current angle */
  gfloat angle;
+  gfloat last_angle;

  /* Old values from adjustment stored so we know when something changes */
  gfloat old_value;
--- a/examples/helloworld/helloworld.c
+++ b/examples/helloworld/helloworld.c
@@ -50,7 +50,7 @@ int main( int   argc,
    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
    
    /* When the window is given the "delete_event" signal (this is given
-     * by the window manager, usually by the 'close' option, or on the
+     * by the window manager, usually by the "close" option, or on the
     * titlebar), we ask it to call the delete_event () function
     * as defined above. The data passed to the callback
     * function is NULL and is ignored in the callback function. */
@@ -59,12 +59,12 @@ int main( int   argc,
    
    /* Here we connect the "destroy" event to a signal handler.  
     * This event occurs when we call gtk_widget_destroy() on the window,
-     * or if we return 'FALSE' in the "delete_event" callback. */
+     * or if we return FALSE in the "delete_event" callback. */
    gtk_signal_connect (GTK_OBJECT (window), "destroy",
 			GTK_SIGNAL_FUNC (destroy), NULL);
    
    /* Sets the border width of the window. */
-    gtk_container_border_width (GTK_CONTAINER (window), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
    
    /* Creates a new button with the label "Hello World". */
    button = gtk_button_new_with_label ("Hello World");
--- a/examples/helloworld2/helloworld2.c
+++ b/examples/helloworld2/helloworld2.c
@@ -11,11 +11,12 @@ void callback( GtkWidget *widget,
 }

 /* another callback */
-void delete_event( GtkWidget *widget,
+gint delete_event( GtkWidget *widget,
                   GdkEvent  *event,
-		   gpointer   data )
+                   gpointer   data )
 {
-    gtk_main_quit ();
+    gtk_main_quit();
+    return(FALSE);
 }

 int main( int   argc,
@@ -33,7 +34,7 @@ int main( int   argc,
    /* Create a new window */
    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);

-    /* This is a new call, this just sets the title of our
+    /* This is a new call, which just sets the title of our
     * new window to "Hello Buttons!" */
    gtk_window_set_title (GTK_WINDOW (window), "Hello Buttons!");

@@ -43,7 +44,7 @@ int main( int   argc,
 			GTK_SIGNAL_FUNC (delete_event), NULL);

    /* Sets the border width of the window. */
-    gtk_container_border_width (GTK_CONTAINER (window), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (window), 10);

    /* We create a box to pack widgets into.  This is described in detail
     * in the "packing" section. The box is not really visible, it
--- a/examples/label/Makefile
+++ b/examples/label/Makefile
@@ -0,0 +1,8 @@
+
+CC = gcc
+
+label: label.c 
+	$(CC) `gtk-config --cflags`  label.c -o label `gtk-config --libs`
+
+clean: 
+	rm -f *.o label
--- a/examples/label/label.c
+++ b/examples/label/label.c
@@ -0,0 +1,102 @@
+/* example-start label label.c */
+
+#include <gtk/gtk.h>
+
+int main( int   argc,
+          char *argv[] )
+{
+  static GtkWidget *window = NULL;
+  GtkWidget *hbox;
+  GtkWidget *vbox;
+  GtkWidget *frame;
+  GtkWidget *label;
+
+  /* Initialise GTK */
+  gtk_init(&argc, &argv);
+
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_signal_connect (GTK_OBJECT (window), "destroy",
+		      GTK_SIGNAL_FUNC(gtk_main_quit),
+		      NULL);
+
+  gtk_window_set_title (GTK_WINDOW (window), "Label");
+  vbox = gtk_vbox_new (FALSE, 5);
+  hbox = gtk_hbox_new (FALSE, 5);
+  gtk_container_add (GTK_CONTAINER (window), hbox);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (window), 5);
+  
+  frame = gtk_frame_new ("Normal Label");
+  label = gtk_label_new ("This is a Normal label");
+  gtk_container_add (GTK_CONTAINER (frame), label);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  
+  frame = gtk_frame_new ("Multi-line Label");
+  label = gtk_label_new ("This is a Multi-line label.\nSecond line\n" \
+			 "Third line");
+  gtk_container_add (GTK_CONTAINER (frame), label);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  
+  frame = gtk_frame_new ("Left Justified Label");
+  label = gtk_label_new ("This is a Left-Justified\n" \
+			 "Multi-line label.\nThird      line");
+  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+  gtk_container_add (GTK_CONTAINER (frame), label);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  
+  frame = gtk_frame_new ("Right Justified Label");
+  label = gtk_label_new ("This is a Right-Justified\nMulti-line label.\n" \
+			 "Fourth line, (j/k)");
+  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT);
+  gtk_container_add (GTK_CONTAINER (frame), label);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+
+  vbox = gtk_vbox_new (FALSE, 5);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
+  frame = gtk_frame_new ("Line wrapped label");
+  label = gtk_label_new ("This is an example of a line-wrapped label.  It " \
+			 "should not be taking up the entire             " /* big space to test spacing */\
+			 "width allocated to it, but automatically " \
+			 "wraps the words to fit.  " \
+			 "The time has come, for all good men, to come to " \
+			 "the aid of their party.  " \
+			 "The sixth sheik's six sheep's sick.\n" \
+			 "     It supports multiple paragraphs correctly, " \
+			 "and  correctly   adds "\
+			 "many          extra  spaces. ");
+  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+  gtk_container_add (GTK_CONTAINER (frame), label);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  
+  frame = gtk_frame_new ("Filled, wrapped label");
+  label = gtk_label_new ("This is an example of a line-wrapped, filled label.  " \
+			 "It should be taking "\
+			 "up the entire              width allocated to it.  " \
+			 "Here is a sentence to prove "\
+			 "my point.  Here is another sentence. "\
+			 "Here comes the sun, do de do de do.\n"\
+			 "    This is a new paragraph.\n"\
+			 "    This is another newer, longer, better " \
+			 "paragraph.  It is coming to an end, "\
+			 "unfortunately.");
+  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_FILL);
+  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+  gtk_container_add (GTK_CONTAINER (frame), label);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  
+  frame = gtk_frame_new ("Underlined label");
+  label = gtk_label_new ("This label is underlined!\n"
+			 "This one is underlined in quite a funky fashion");
+  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+  gtk_label_set_pattern (GTK_LABEL (label),
+			 "_________________________ _ _________ _ ______     __ _______ ___");
+  gtk_container_add (GTK_CONTAINER (frame), label);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+  
+  gtk_widget_show_all (window);
+
+  gtk_main ();
+  
+  return(0);
+}
+/* example-end */
--- a/examples/list/list.c
+++ b/examples/list/list.c
@@ -1,6 +1,6 @@
 /* example-start list list.c */

-/* Include the gtk+ header files
+/* Include the GTK header files
 * Include stdio.h, we need that for the printf() function
 */
 #include        <gtk/gtk.h>
@@ -13,7 +13,7 @@ const gchar *list_item_data_key="list_item_data";


 /* prototypes for signal handler that we are going to connect
- * to the GtkList widget
+ * to the List widget
 */
 static void  sigh_print_selection( GtkWidget *gtklist,
                                   gpointer   func_data);
@@ -25,8 +25,8 @@ static void  sigh_button_event( GtkWidget      *gtklist,

 /* Main function to set up the user interface */

-gint main (int    argc,
-           gchar *argv[])
+gint main( int    argc,
+           gchar *argv[] )
 {                                  
    GtkWidget *separator;
    GtkWidget *window;
@@ -41,7 +41,7 @@ gint main (int    argc,
    gchar buffer[64];
    
    
-    /* Initialize gtk+ (and subsequently gdk) */
+    /* Initialize GTK (and subsequently GDK) */

    gtk_init(&argc, &argv);
    
@@ -61,19 +61,19 @@ gint main (int    argc,
    /* Inside the window we need a box to arrange the widgets
     * vertically */
    vbox=gtk_vbox_new(FALSE, 5);
-    gtk_container_border_width(GTK_CONTAINER(vbox), 5);
+    gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
    gtk_container_add(GTK_CONTAINER(window), vbox);
    gtk_widget_show(vbox);
    
-    /* This is the scrolled window to put the GtkList widget inside */
+    /* This is the scrolled window to put the List widget inside */
    scrolled_window=gtk_scrolled_window_new(NULL, NULL);
    gtk_widget_set_usize(scrolled_window, 250, 150);
    gtk_container_add(GTK_CONTAINER(vbox), scrolled_window);
    gtk_widget_show(scrolled_window);
    
-    /* Create the GtkList widget.
+    /* Create thekList widget.
     * Connect the sigh_print_selection() signal handler
-     * function to the "selection_changed" signal of the GtkList
+     * function to the "selection_changed" signal of the List
     * to print out the selected items each time the selection
     * has changed */
    gtklist=gtk_list_new();
@@ -88,12 +88,12 @@ gint main (int    argc,
    /* We create a "Prison" to put a list item in ;) */
    frame=gtk_frame_new("Prison");
    gtk_widget_set_usize(frame, 200, 50);
-    gtk_container_border_width(GTK_CONTAINER(frame), 5);
+    gtk_container_set_border_width(GTK_CONTAINER(frame), 5);
    gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT);
    gtk_container_add(GTK_CONTAINER(vbox), frame);
    gtk_widget_show(frame);
    
-    /* Connect the sigh_button_event() signal handler to the GtkList
+    /* Connect the sigh_button_event() signal handler to the List
     * which will handle the "arresting" of list items
     */
    gtk_signal_connect(GTK_OBJECT(gtklist),
@@ -106,7 +106,7 @@ gint main (int    argc,
    gtk_container_add(GTK_CONTAINER(vbox), separator);
    gtk_widget_show(separator);
    
-    /* Finally create a button and connect it's "clicked" signal
+    /* Finally create a button and connect its "clicked" signal
     * to the destruction of the window */
    button=gtk_button_new_with_label("Close");
    gtk_container_add(GTK_CONTAINER(vbox), button);
@@ -117,8 +117,8 @@ gint main (int    argc,
 			      GTK_OBJECT(window));
    
    
-    /* Now we create 5 list items, each having it's own
-     * label and add them to the GtkList using gtk_container_add()
+    /* Now we create 5 list items, each having its own
+     * label and add them to the List using gtk_container_add()
     * Also we query the text string from the label and
     * associate it with the list_item_data_key for each list item
     */
@@ -176,7 +176,7 @@ gint main (int    argc,
 }

 /* This is the signal handler that got connected to button
- * press/release events of the GtkList
+ * press/release events of the List
 */
 void sigh_button_event( GtkWidget      *gtklist,
                        GdkEventButton *event,
@@ -218,7 +218,7 @@ void sigh_button_event( GtkWidget      *gtklist,
 	g_list_free(free_list);
 	
 	/* If we have a new prisoner, remove him from the
-	 * GtkList and put him into the frame "Prison".
+	 * List and put him into the frame "Prison".
 	 * We need to unselect the item first.
 	 */
 	if (new_prisoner) {
@@ -235,16 +235,16 @@ void sigh_button_event( GtkWidget      *gtklist,
    }
 }

-/* This is the signal handler that gets called if GtkList
+/* This is the signal handler that gets called if List
 * emits the "selection_changed" signal
 */
 void sigh_print_selection( GtkWidget *gtklist,
-                           gpointer   func_data)
+                           gpointer   func_data )
 {
    GList   *dlist;
    
    /* Fetch the doubly linked list of selected items
-     * of the GtkList, remember to treat this as read-only!
+     * of the List, remember to treat this as read-only!
     */
    dlist=GTK_LIST(gtklist)->selection;
    
--- a/examples/menu/Makefile
+++ b/examples/menu/Makefile
@@ -1,19 +1,13 @@

 CC = gcc

-all: menu menufactory
+all: menu itemfactory

 menu: menu.c 
 	$(CC) `gtk-config --cflags` menu.c -o menu `gtk-config --libs`

-menufactory: menufactory.o mfmain.o
-	$(CC) `gtk-config --libs` menufactory.o mfmain.o -o menufactory
-
-menufactory.o: menufactory.c mfmain.h
-	$(CC) `gtk-config --cflags` -c menufactory.c -o menufactory.o
-
-mfmain.o: mfmain.c mfmain.h menufactory.h
-	$(CC) `gtk-config --cflags` -c mfmain.c -o mfmain.o
+itemfactory: itemfactory.c
+	$(CC) `gtk-config --cflags` itemfactory.c -o itemfactory `gtk-config --libs`

 clean: 
-	rm -f *.o menu menufactory
+	rm -f *.o menu itemfactory
--- a/examples/menu/itemfactory.c
+++ b/examples/menu/itemfactory.c
@@ -0,0 +1,114 @@
+/* example-start menu itemfactory.c */
+
+#include <gtk/gtk.h>
+#include <strings.h>
+
+/* Obligatory basic callback */
+static void print_hello( GtkWidget *w,
+                         gpointer   data )
+{
+  g_message ("Hello, World!\n");
+}
+
+/* This is the GtkItemFactoryEntry structure used to generate new menus.
+   Item 1: The menu path. The letter after the underscore indicates an
+           accelerator key once the menu is open.
+   Item 2: The accelerator key for the entry
+   Item 3: The callback function.
+   Item 4: The callback action.  This changes the parameters with
+           which the function is called.  The default is 0.
+   Item 5: The item type, used to define what kind of an item it is.
+           Here are the possible values:
+
+           NULL               -> "<Item>"
+           ""                 -> "<Item>"
+           "<Title>"          -> create a title item
+           "<Item>"           -> create a simple item
+           "<CheckItem>"      -> create a check item
+           "<ToggleItem>"     -> create a toggle item
+           "<RadioItem>"      -> create a radio item
+           <path>             -> path of a radio item to link against
+           "<Separator>"      -> create a separator
+           "<Branch>"         -> create an item to hold sub items (optional)
+           "<LastBranch>"     -> create a right justified branch 
+*/
+
+static GtkItemFactoryEntry menu_items[] = {
+  { "/_File",         NULL,         NULL, 0, "<Branch>" },
+  { "/File/_New",     "<control>N", print_hello, 0, NULL },
+  { "/File/_Open",    "<control>O", print_hello, 0, NULL },
+  { "/File/_Save",    "<control>S", print_hello, 0, NULL },
+  { "/File/Save _As", NULL,         NULL, 0, NULL },
+  { "/File/sep1",     NULL,         NULL, 0, "<Separator>" },
+  { "/File/Quit",     "<control>Q", gtk_main_quit, 0, NULL },
+  { "/_Options",      NULL,         NULL, 0, "<Branch>" },
+  { "/Options/Test",  NULL,         NULL, 0, NULL },
+  { "/_Help",         NULL,         NULL, 0, "<LastBranch>" },
+  { "/_Help/About",   NULL,         NULL, 0, NULL },
+};
+
+
+void get_main_menu( GtkWidget  *window,
+                    GtkWidget **menubar )
+{
+  GtkItemFactory *item_factory;
+  GtkAccelGroup *accel_group;
+  gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
+
+  accel_group = gtk_accel_group_new ();
+
+  /* This function initializes the item factory.
+     Param 1: The type of menu - can be GTK_TYPE_MENU_BAR, GTK_TYPE_MENU,
+              or GTK_TYPE_OPTION_MENU.
+     Param 2: The path of the menu.
+     Param 3: A pointer to a gtk_accel_group.  The item factory sets up
+              the accelerator table while generating menus.
+  */
+
+  item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", 
+				       accel_group);
+
+  /* This function generates the menu items. Pass the item factory,
+     the number of items in the array, the array itself, and any
+     callback data for the the menu items. */
+  gtk_item_factory_create_items (item_factory, nmenu_items, menu_items, NULL);
+
+  /* Attach the new accelerator group to the window. */
+  gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
+
+  if (menubar)
+    /* Finally, return the actual menu bar created by the item factory. */ 
+    *menubar = gtk_item_factory_get_widget (item_factory, "<main>");
+}
+
+int main( int argc,
+          char *argv[] )
+{
+  GtkWidget *window;
+  GtkWidget *main_vbox;
+  GtkWidget *menubar;
+  
+  gtk_init (&argc, &argv);
+  
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_signal_connect (GTK_OBJECT (window), "destroy", 
+		      GTK_SIGNAL_FUNC (gtk_main_quit), 
+		      "WM destroy");
+  gtk_window_set_title (GTK_WINDOW(window), "Item Factory");
+  gtk_widget_set_usize (GTK_WIDGET(window), 300, 200);
+  
+  main_vbox = gtk_vbox_new (FALSE, 1);
+  gtk_container_border_width (GTK_CONTAINER (main_vbox), 1);
+  gtk_container_add (GTK_CONTAINER (window), main_vbox);
+  gtk_widget_show (main_vbox);
+  
+  get_main_menu (window, &menubar);
+  gtk_box_pack_start (GTK_BOX (main_vbox), menubar, FALSE, TRUE, 0);
+  gtk_widget_show (menubar);
+  
+  gtk_widget_show (window);
+  gtk_main ();
+  
+  return(0);
+}
+/* example-end */
--- a/examples/menu/menu.c
+++ b/examples/menu/menu.c
@@ -5,7 +5,8 @@
 static gint button_press (GtkWidget *, GdkEvent *);
 static void menuitem_response (gchar *);

-int main (int argc, char *argv[])
+int main( int   argc,
+          char *argv[] )
 {

    GtkWidget *window;
@@ -21,17 +22,17 @@ int main (int argc, char *argv[])
    gtk_init (&argc, &argv);

    /* create a new window */
-    window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    gtk_widget_set_usize( GTK_WIDGET (window), 200, 100);
-    gtk_window_set_title(GTK_WINDOW (window), "GTK Menu Test");
-    gtk_signal_connect(GTK_OBJECT (window), "delete_event",
-                       (GtkSignalFunc) gtk_main_quit, NULL);
+    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    gtk_widget_set_usize (GTK_WIDGET (window), 200, 100);
+    gtk_window_set_title (GTK_WINDOW (window), "GTK Menu Test");
+    gtk_signal_connect (GTK_OBJECT (window), "delete_event",
+                        (GtkSignalFunc) gtk_main_quit, NULL);

    /* Init the menu-widget, and remember -- never
     * gtk_show_widget() the menu widget!! 
     * This is the menu that holds the menu items, the one that
     * will pop up when you click on the "Root Menu" in the app */
-    menu = gtk_menu_new();
+    menu = gtk_menu_new ();

    /* Next we make a little loop that makes three menu-entries for "test-menu".
     * Notice the call to gtk_menu_append.  Here we are adding a list of
@@ -39,64 +40,64 @@ int main (int argc, char *argv[])
     * signal on each of the menu items and setup a callback for it,
     * but it's omitted here to save space. */

-    for(i = 0; i < 3; i++)
+    for (i = 0; i < 3; i++)
        {
            /* Copy the names to the buf. */
-            sprintf(buf, "Test-undermenu - %d", i);
+            sprintf (buf, "Test-undermenu - %d", i);

            /* Create a new menu-item with a name... */
-            menu_items = gtk_menu_item_new_with_label(buf);
+            menu_items = gtk_menu_item_new_with_label (buf);

            /* ...and add it to the menu. */
-            gtk_menu_append(GTK_MENU (menu), menu_items);
+            gtk_menu_append (GTK_MENU (menu), menu_items);

 	    /* Do something interesting when the menuitem is selected */
-	    gtk_signal_connect_object(GTK_OBJECT(menu_items), "activate",
-		GTK_SIGNAL_FUNC(menuitem_response), (gpointer) g_strdup(buf));
+	    gtk_signal_connect_object (GTK_OBJECT (menu_items), "activate",
+		GTK_SIGNAL_FUNC (menuitem_response), (gpointer) g_strdup (buf));

            /* Show the widget */
-            gtk_widget_show(menu_items);
+            gtk_widget_show (menu_items);
        }

    /* This is the root menu, and will be the label
     * displayed on the menu bar.  There won't be a signal handler attached,
     * as it only pops up the rest of the menu when pressed. */
-    root_menu = gtk_menu_item_new_with_label("Root Menu");
+    root_menu = gtk_menu_item_new_with_label ("Root Menu");

-    gtk_widget_show(root_menu);
+    gtk_widget_show (root_menu);

    /* Now we specify that we want our newly created "menu" to be the menu
     * for the "root menu" */
-    gtk_menu_item_set_submenu(GTK_MENU_ITEM (root_menu), menu);
+    gtk_menu_item_set_submenu (GTK_MENU_ITEM (root_menu), menu);

    /* A vbox to put a menu and a button in: */
-    vbox = gtk_vbox_new(FALSE, 0);
-    gtk_container_add(GTK_CONTAINER(window), vbox);
-    gtk_widget_show(vbox);
+    vbox = gtk_vbox_new (FALSE, 0);
+    gtk_container_add (GTK_CONTAINER (window), vbox);
+    gtk_widget_show (vbox);

    /* Create a menu-bar to hold the menus and add it to our main window */
-    menu_bar = gtk_menu_bar_new();
-    gtk_box_pack_start(GTK_BOX(vbox), menu_bar, FALSE, FALSE, 2);
-    gtk_widget_show(menu_bar);
+    menu_bar = gtk_menu_bar_new ();
+    gtk_box_pack_start (GTK_BOX (vbox), menu_bar, FALSE, FALSE, 2);
+    gtk_widget_show (menu_bar);

    /* Create a button to which to attach menu as a popup */
-    button = gtk_button_new_with_label("press me");
-    gtk_signal_connect_object(GTK_OBJECT(button), "event",
-	GTK_SIGNAL_FUNC (button_press), GTK_OBJECT(menu));
-    gtk_box_pack_end(GTK_BOX(vbox), button, TRUE, TRUE, 2);
-    gtk_widget_show(button);
+    button = gtk_button_new_with_label ("press me");
+    gtk_signal_connect_object (GTK_OBJECT (button), "event",
+	GTK_SIGNAL_FUNC (button_press), GTK_OBJECT (menu));
+    gtk_box_pack_end (GTK_BOX (vbox), button, TRUE, TRUE, 2);
+    gtk_widget_show (button);

    /* And finally we append the menu-item to the menu-bar -- this is the
     * "root" menu-item I have been raving about =) */
-    gtk_menu_bar_append(GTK_MENU_BAR (menu_bar), root_menu);
+    gtk_menu_bar_append (GTK_MENU_BAR (menu_bar), root_menu);

    /* always display the window as the last step so it all splashes on
     * the screen at once. */
-    gtk_widget_show(window);
+    gtk_widget_show (window);

    gtk_main ();

-    return 0;
+    return(0);
 }

 /* Respond to a button-press by posting a menu passed in as widget.
@@ -105,12 +106,13 @@ int main (int argc, char *argv[])
 * the button that was pressed.
 */

-static gint button_press (GtkWidget *widget, GdkEvent *event)
+static gint button_press( GtkWidget *widget,
+                          GdkEvent *event )
 {

    if (event->type == GDK_BUTTON_PRESS) {
        GdkEventButton *bevent = (GdkEventButton *) event; 
-        gtk_menu_popup (GTK_MENU(widget), NULL, NULL, NULL, NULL,
+        gtk_menu_popup (GTK_MENU (widget), NULL, NULL, NULL, NULL,
                        bevent->button, bevent->time);
        /* Tell calling code that we have handled this event; the buck
         * stops here. */
@@ -124,8 +126,8 @@ static gint button_press (GtkWidget *widget, GdkEvent *event)

 /* Print a string when a menu item is selected */

-static void menuitem_response (gchar *string)
+static void menuitem_response( gchar *string )
 {
-    printf("%s\n", string);
+    printf ("%s\n", string);
 }
 /* example-end */
--- a/examples/menu/menufactory.c
+++ b/examples/menu/menufactory.c
@@ -1,54 +0,0 @@
-/* example-start menu menufactory.c */
-
-#include <gtk/gtk.h>
-#include <strings.h>
-
-#include "mfmain.h"
-
-static void print_hello(GtkWidget *widget, gpointer data);
-
-
-/* this is the GtkMenuEntry structure used to create new menus.  The
- * first member is the menu definition string.  The second, the
- * default accelerator key used to access this menu function with
- * the keyboard.  The third is the callback function to call when
- * this menu item is selected (by the accelerator key, or with the
- * mouse.) The last member is the data to pass to your callback function.
- */
-
-static GtkMenuEntry menu_items[] =
-{
-    {"<Main>/File/New", "<control>N", print_hello, NULL},
-    {"<Main>/File/Open", "<control>O", print_hello, NULL},
-    {"<Main>/File/Save", "<control>S", print_hello, NULL},
-    {"<Main>/File/Save as", NULL, NULL, NULL},
-    {"<Main>/File/<separator>", NULL, NULL, NULL},
-    {"<Main>/File/Quit", "<control>Q", file_quit_cmd_callback, "OK, I'll quit"},
-    {"<Main>/Options/Test", NULL, NULL, NULL}
-};
-
-
-static void
-print_hello(GtkWidget *widget, gpointer data)
-{
-    printf("hello!\n");
-}
-
-void get_main_menu(GtkWidget *window, GtkWidget ** menubar)
-{
-    int nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]);
-    GtkMenuFactory *factory;
-    GtkMenuFactory *subfactory;
-
-    factory = gtk_menu_factory_new(GTK_MENU_FACTORY_MENU_BAR);
-    subfactory = gtk_menu_factory_new(GTK_MENU_FACTORY_MENU_BAR);
-
-    gtk_menu_factory_add_subfactory(factory, subfactory, "<Main>");
-    gtk_menu_factory_add_entries(factory, menu_items, nmenu_items);
-    gtk_window_add_accelerator_table(GTK_WINDOW(window), subfactory->table);
-    
-    if (menubar)
-        *menubar = subfactory->widget;
-}
-
-/* example-end */
--- a/examples/menu/menufactory.h
+++ b/examples/menu/menufactory.h
@@ -1,18 +0,0 @@
-/* example-start menu menufactory.h */
-
-#ifndef __MENUFACTORY_H__
-#define __MENUFACTORY_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-void get_main_menu (GtkWidget *, GtkWidget **menubar);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __MENUFACTORY_H__ */
-
-/* example-end */
--- a/examples/menu/mfmain.c
+++ b/examples/menu/mfmain.c
@@ -1,48 +0,0 @@
-/* example-start menu mfmain.c */
-
-#include <gtk/gtk.h>
-
-#include "mfmain.h"
-#include "menufactory.h"
-
-int main(int argc, char *argv[])
-{
-    GtkWidget *window;
-    GtkWidget *main_vbox;
-    GtkWidget *menubar;
-    
-    gtk_init(&argc, &argv);
-    
-    window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    gtk_signal_connect(GTK_OBJECT(window), "destroy", 
-		       GTK_SIGNAL_FUNC(file_quit_cmd_callback), 
-		       "WM destroy");
-    gtk_window_set_title(GTK_WINDOW(window), "Menu Factory");
-    gtk_widget_set_usize(GTK_WIDGET(window), 300, 200);
-    
-    main_vbox = gtk_vbox_new(FALSE, 1);
-    gtk_container_border_width(GTK_CONTAINER(main_vbox), 1);
-    gtk_container_add(GTK_CONTAINER(window), main_vbox);
-    gtk_widget_show(main_vbox);
-    
-    get_main_menu(window, &menubar);
-    gtk_box_pack_start(GTK_BOX(main_vbox), menubar, FALSE, TRUE, 0);
-    gtk_widget_show(menubar);
-    
-    gtk_widget_show(window);
-    gtk_main();
-    
-    return(0);
-}
-
-/* This is just to demonstrate how callbacks work when using the
- * menufactory.  Often, people put all the callbacks from the menus
- * in a separate file, and then have them call the appropriate functions
- * from there.  Keeps it more organized. */
-void file_quit_cmd_callback (GtkWidget *widget, gpointer data)
-{
-    g_print ("%s\n", (char *) data);
-    gtk_exit(0);
-}
-
-/* example-end */
--- a/examples/menu/mfmain.h
+++ b/examples/menu/mfmain.h
@@ -1,19 +0,0 @@
-/* example-start menu mfmain.h */
-
-#ifndef __MFMAIN_H__
-#define __MFMAIN_H__
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-void file_quit_cmd_callback(GtkWidget *widget, gpointer data);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __MFMAIN_H__ */
-
-/* example-end */
--- a/examples/notebook/notebook.c
+++ b/examples/notebook/notebook.c
@@ -3,13 +3,15 @@
 #include <gtk/gtk.h>

 /* This function rotates the position of the tabs */
-void rotate_book (GtkButton *button, GtkNotebook *notebook)
+void rotate_book( GtkButton   *button,
+                  GtkNotebook *notebook )
 {
    gtk_notebook_set_tab_pos (notebook, (notebook->tab_pos +1) %4);
 }

 /* Add/Remove the page tabs and the borders */
-void tabsborder_book (GtkButton *button, GtkNotebook *notebook)
+void tabsborder_book( GtkButton   *button,
+                      GtkNotebook *notebook )
 {
    gint tval = FALSE;
    gint bval = FALSE;
@@ -23,7 +25,8 @@ void tabsborder_book (GtkButton *button, GtkNotebook *notebook)
 }

 /* Remove a page from the notebook */
-void remove_book (GtkButton *button, GtkNotebook *notebook)
+void remove_book( GtkButton   *button,
+                  GtkNotebook *notebook )
 {
    gint page;
    
@@ -34,12 +37,16 @@ void remove_book (GtkButton *button, GtkNotebook *notebook)
    gtk_widget_draw(GTK_WIDGET(notebook), NULL);
 }

-void delete (GtkWidget *widget, GtkWidget *event, gpointer data)
+gint delete( GtkWidget *widget,
+             GtkWidget *event,
+             gpointer   data )
 {
-    gtk_main_quit ();
+    gtk_main_quit();
+    return(FALSE);
 }

-int main (int argc, char *argv[])
+int main( int argc,
+          char *argv[] )
 {
    GtkWidget *window;
    GtkWidget *button;
@@ -59,7 +66,7 @@ int main (int argc, char *argv[])
    gtk_signal_connect (GTK_OBJECT (window), "delete_event",
 			GTK_SIGNAL_FUNC (delete), NULL);
    
-    gtk_container_border_width (GTK_CONTAINER (window), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (window), 10);

    table = gtk_table_new(3,6,FALSE);
    gtk_container_add (GTK_CONTAINER (window), table);
@@ -70,13 +77,13 @@ int main (int argc, char *argv[])
    gtk_table_attach_defaults(GTK_TABLE(table), notebook, 0,6,0,1);
    gtk_widget_show(notebook);
    
-    /* Lets append a bunch of pages to the notebook */
+    /* Let's append a bunch of pages to the notebook */
    for (i=0; i < 5; i++) {
 	sprintf(bufferf, "Append Frame %d", i+1);
 	sprintf(bufferl, "Page %d", i+1);
 	
 	frame = gtk_frame_new (bufferf);
-	gtk_container_border_width (GTK_CONTAINER (frame), 10);
+	gtk_container_set_border_width (GTK_CONTAINER (frame), 10);
 	gtk_widget_set_usize (frame, 100, 75);
 	gtk_widget_show (frame);
 	
@@ -88,7 +95,7 @@ int main (int argc, char *argv[])
 	gtk_notebook_append_page (GTK_NOTEBOOK (notebook), frame, label);
    }
      
-    /* Now lets add a page to a specific spot */
+    /* Now let's add a page to a specific spot */
    checkbutton = gtk_check_button_new_with_label ("Check me please!");
    gtk_widget_set_usize(checkbutton, 100, 75);
    gtk_widget_show (checkbutton);
@@ -96,13 +103,13 @@ int main (int argc, char *argv[])
    label = gtk_label_new ("Add page");
    gtk_notebook_insert_page (GTK_NOTEBOOK (notebook), checkbutton, label, 2);
    
-    /* Now finally lets prepend pages to the notebook */
+    /* Now finally let's prepend pages to the notebook */
    for (i=0; i < 5; i++) {
 	sprintf(bufferf, "Prepend Frame %d", i+1);
 	sprintf(bufferl, "PPage %d", i+1);
 	
 	frame = gtk_frame_new (bufferf);
-	gtk_container_border_width (GTK_CONTAINER (frame), 10);
+	gtk_container_set_border_width (GTK_CONTAINER (frame), 10);
 	gtk_widget_set_usize (frame, 100, 75);
 	gtk_widget_show (frame);
 	
@@ -139,22 +146,23 @@ int main (int argc, char *argv[])
    gtk_widget_show(button);
    
    button = gtk_button_new_with_label ("tab position");
-    gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
-			       (GtkSignalFunc) rotate_book, GTK_OBJECT(notebook));
+    gtk_signal_connect (GTK_OBJECT (button), "clicked",
+                        (GtkSignalFunc) rotate_book,
+			GTK_OBJECT(notebook));
    gtk_table_attach_defaults(GTK_TABLE(table), button, 3,4,1,2);
    gtk_widget_show(button);
    
    button = gtk_button_new_with_label ("tabs/border on/off");
-    gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
-			       (GtkSignalFunc) tabsborder_book,
-			       GTK_OBJECT (notebook));
+    gtk_signal_connect (GTK_OBJECT (button), "clicked",
+                        (GtkSignalFunc) tabsborder_book,
+                        GTK_OBJECT (notebook));
    gtk_table_attach_defaults(GTK_TABLE(table), button, 4,5,1,2);
    gtk_widget_show(button);
    
    button = gtk_button_new_with_label ("remove page");
-    gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
-			       (GtkSignalFunc) remove_book,
-			       GTK_OBJECT(notebook));
+    gtk_signal_connect (GTK_OBJECT (button), "clicked",
+                        (GtkSignalFunc) remove_book,
+                        GTK_OBJECT(notebook));
    gtk_table_attach_defaults(GTK_TABLE(table), button, 5,6,1,2);
    gtk_widget_show(button);
    
--- a/examples/packbox/packbox.c
+++ b/examples/packbox/packbox.c
@@ -1,13 +1,15 @@
 /* example-start packbox packbox.c */

 #include <stdio.h>
+#include <stdlib.h>
 #include "gtk/gtk.h"

-void delete_event( GtkWidget *widget,
+gint delete_event( GtkWidget *widget,
                   GdkEvent  *event,
-		   gpointer   data )
+                   gpointer   data )
 {
-    gtk_main_quit ();
+    gtk_main_quit();
+    return(FALSE);
 }

 /* Make a new hbox filled with button-labels. Arguments for the 
@@ -82,7 +84,7 @@ int main( int   argc,
    
    if (argc != 2) {
 	fprintf (stderr, "usage: packbox num, where num is 1, 2, or 3.\n");
-	/* this just does cleanup in GTK, and exits with an exit status of 1. */
+	/* This just does cleanup in GTK and exits with an exit status of 1. */
 	gtk_exit (1);
    }
    
@@ -91,12 +93,12 @@ int main( int   argc,
    /* Create our window */
    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);

-    /* You should always remember to connect the destroy signal to the
-     * main window. This is very important for proper intuitive
+    /* You should always remember to connect the delete_event signal
+     * to the main window. This is very important for proper intuitive
     * behavior */
    gtk_signal_connect (GTK_OBJECT (window), "delete_event",
 			GTK_SIGNAL_FUNC (delete_event), NULL);
-    gtk_container_border_width (GTK_CONTAINER (window), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
    
    /* We create a vertical box (vbox) to pack the horizontal boxes into.
     * This allows us to stack the horizontal boxes filled with buttons one
@@ -128,7 +130,7 @@ int main( int   argc,
 	gtk_widget_show (box2);

 	/* Call our make box function - homogeneous = FALSE, spacing = 0,
-	 * expand = FALSE, fill = FALSE, padding = 0 */
+	 * expand = TRUE, fill = FALSE, padding = 0 */
 	box2 = make_box (FALSE, 0, TRUE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0);
 	gtk_widget_show (box2);
@@ -142,8 +144,8 @@ int main( int   argc,
 	 * but they are quite simple. */
 	separator = gtk_hseparator_new ();
 	
-	/* Cack the separator into the vbox. Remember each of these
-	 * widgets are being packed into a vbox, so they'll be stacked
+        /* Pack the separator into the vbox. Remember each of these
+         * widgets is being packed into a vbox, so they'll be stacked
 	 * vertically. */
 	gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 5);
 	gtk_widget_show (separator);
@@ -166,7 +168,8 @@ int main( int   argc,
 	
 	/* Another new separator. */
 	separator = gtk_hseparator_new ();
-	/* The last 3 arguments to gtk_box_pack_start are: expand, fill, padding. */
+	/* The last 3 arguments to gtk_box_pack_start are:
+	 * expand, fill, padding. */
 	gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 5);
 	gtk_widget_show (separator);
 	
@@ -192,7 +195,8 @@ int main( int   argc,
 	gtk_widget_show (box2);
 	
 	separator = gtk_hseparator_new ();
-	/* The last 3 arguments to gtk_box_pack_start are: expand, fill, padding. */
+	/* The last 3 arguments to gtk_box_pack_start are:
+	 * expand, fill, padding. */
 	gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 5);
 	gtk_widget_show (separator);
 	
@@ -255,14 +259,13 @@ int main( int   argc,
    /* Our quit button. */
    button = gtk_button_new_with_label ("Quit");
    
-    /* Setup the signal to destroy the window. Remember that this will send
-     * the "destroy" signal to the window which will be caught by our signal
-     * handler as defined above. */
+    /* Setup the signal to terminate the program when the button is clicked */
    gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 			       GTK_SIGNAL_FUNC (gtk_main_quit),
 			       GTK_OBJECT (window));
    /* Pack the button into the quitbox.
-     * The last 3 arguments to gtk_box_pack_start are: expand, fill, padding. */
+     * The last 3 arguments to gtk_box_pack_start are:
+     * expand, fill, padding. */
    gtk_box_pack_start (GTK_BOX (quitbox), button, TRUE, FALSE, 0);
    /* pack the quitbox into the vbox (box1) */
    gtk_box_pack_start (GTK_BOX (box1), quitbox, FALSE, FALSE, 0);
--- a/examples/packer/Makefile
+++ b/examples/packer/Makefile
@@ -2,7 +2,7 @@
 CC = gcc

 packer: pack.c 
-	$(CC) `gtk-config --cflags`  pack.c -o packer `gtk-config --libs`
+	$(CC) -g `gtk-config --cflags`  pack.c -o packer `gtk-config --libs`

 clean: 
 	rm -f *.o packer
--- a/examples/packer/pack.c
+++ b/examples/packer/pack.c
@@ -81,7 +81,7 @@ main (int argv, char **argc)

    info = g_malloc(sizeof(Info));

-    window = gtk_window_new(GTK_TOPLEVEL);
+    window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
    gtk_signal_connect (GTK_OBJECT (window), "destroy",
                        GTK_SIGNAL_FUNC (destroy), NULL);

@@ -159,10 +159,10 @@ main (int argv, char **argc)
    button_left = gtk_toggle_button_new_with_label("Left");
    button_right = gtk_toggle_button_new_with_label("Right");

-    gtk_object_set_data(GTK_OBJECT(button_top), "side", (gpointer) GTK_SIDE_TOP);
-    gtk_object_set_data(GTK_OBJECT(button_bottom), "side", (gpointer) GTK_SIDE_BOTTOM);
-    gtk_object_set_data(GTK_OBJECT(button_left), "side", (gpointer) GTK_SIDE_LEFT);
-    gtk_object_set_data(GTK_OBJECT(button_right), "side", (gpointer) GTK_SIDE_RIGHT);
+    gtk_object_set_data(GTK_OBJECT(button_top), "side", GINT_TO_POINTER (GTK_SIDE_TOP));
+    gtk_object_set_data(GTK_OBJECT(button_bottom), "side", GINT_TO_POINTER (GTK_SIDE_BOTTOM));
+    gtk_object_set_data(GTK_OBJECT(button_left), "side", GINT_TO_POINTER (GTK_SIDE_LEFT));
+    gtk_object_set_data(GTK_OBJECT(button_right), "side", GINT_TO_POINTER (GTK_SIDE_RIGHT));

    gtk_widget_set_usize(button_top, 50, -1);
    gtk_widget_set_usize(button_bottom, 50, -1);
@@ -230,15 +230,15 @@ main (int argv, char **argc)
    button_sw = gtk_toggle_button_new_with_label("SW");
    button_center = gtk_toggle_button_new_with_label("");

-    gtk_object_set_data(GTK_OBJECT(button_n), "anchor", (gpointer) GTK_ANCHOR_N);
-    gtk_object_set_data(GTK_OBJECT(button_nw), "anchor", (gpointer) GTK_ANCHOR_NW);
-    gtk_object_set_data(GTK_OBJECT(button_ne), "anchor", (gpointer) GTK_ANCHOR_NE);
-    gtk_object_set_data(GTK_OBJECT(button_s), "anchor", (gpointer) GTK_ANCHOR_S);
-    gtk_object_set_data(GTK_OBJECT(button_sw), "anchor", (gpointer) GTK_ANCHOR_SW);
-    gtk_object_set_data(GTK_OBJECT(button_se), "anchor", (gpointer) GTK_ANCHOR_SE);
-    gtk_object_set_data(GTK_OBJECT(button_w), "anchor", (gpointer) GTK_ANCHOR_W);
-    gtk_object_set_data(GTK_OBJECT(button_e), "anchor", (gpointer) GTK_ANCHOR_E);
-    gtk_object_set_data(GTK_OBJECT(button_center), "anchor", (gpointer) GTK_ANCHOR_CENTER);
+    gtk_object_set_data(GTK_OBJECT(button_n), "anchor", GINT_TO_POINTER (GTK_ANCHOR_N));
+    gtk_object_set_data(GTK_OBJECT(button_nw), "anchor", GINT_TO_POINTER (GTK_ANCHOR_NW));
+    gtk_object_set_data(GTK_OBJECT(button_ne), "anchor", GINT_TO_POINTER (GTK_ANCHOR_NE));
+    gtk_object_set_data(GTK_OBJECT(button_s), "anchor", GINT_TO_POINTER (GTK_ANCHOR_S));
+    gtk_object_set_data(GTK_OBJECT(button_sw), "anchor", GINT_TO_POINTER (GTK_ANCHOR_SW));
+    gtk_object_set_data(GTK_OBJECT(button_se), "anchor", GINT_TO_POINTER (GTK_ANCHOR_SE));
+    gtk_object_set_data(GTK_OBJECT(button_w), "anchor", GINT_TO_POINTER (GTK_ANCHOR_W));
+    gtk_object_set_data(GTK_OBJECT(button_e), "anchor", GINT_TO_POINTER (GTK_ANCHOR_E));
+    gtk_object_set_data(GTK_OBJECT(button_center), "anchor", GINT_TO_POINTER (GTK_ANCHOR_CENTER));

    gtk_signal_connect (GTK_OBJECT (button_n), "toggled",
                        GTK_SIGNAL_FUNC (toggle_anchor), (gpointer) info);
@@ -321,9 +321,9 @@ main (int argv, char **argc)
                   GTK_FILL_X | GTK_PACK_EXPAND,
                   0, 10, 5, 0, 0);

-    gtk_object_set_data(GTK_OBJECT(button_fillx), "option", (gpointer) GTK_FILL_X);
-    gtk_object_set_data(GTK_OBJECT(button_filly), "option", (gpointer) GTK_FILL_Y);
-    gtk_object_set_data(GTK_OBJECT(button_expand), "option", (gpointer) GTK_PACK_EXPAND);
+    gtk_object_set_data(GTK_OBJECT(button_fillx), "option", GINT_TO_POINTER (GTK_FILL_X));
+    gtk_object_set_data(GTK_OBJECT(button_filly), "option", GINT_TO_POINTER (GTK_FILL_Y));
+    gtk_object_set_data(GTK_OBJECT(button_expand), "option", GINT_TO_POINTER (GTK_PACK_EXPAND));

    gtk_signal_connect (GTK_OBJECT (button_fillx), "toggled",
                        GTK_SIGNAL_FUNC (toggle_options), (gpointer) info);
@@ -373,7 +373,7 @@ toggle_options (GtkWidget *widget, gpointer data)

   info = (Info*) data;
 
-   option = (gint) gtk_object_get_data(GTK_OBJECT(widget), "option");
+   option = GPOINTER_TO_INT (gtk_object_get_data(GTK_OBJECT(widget), "option"));

   pchild = info->pchild;
   if (pchild == NULL) {
@@ -412,7 +412,7 @@ toggle_anchor (GtkWidget *widget, gpointer data)
   info = (Info*) data;
 
   if (GTK_TOGGLE_BUTTON(widget)->active) {
-       anchor = (gint) gtk_object_get_data(GTK_OBJECT(widget), "anchor");
+       anchor = GPOINTER_TO_INT (gtk_object_get_data(GTK_OBJECT(widget), "anchor"));

       pchild = info->pchild;
       if (pchild == NULL) {
@@ -483,7 +483,7 @@ toggle_side (GtkWidget *widget, gpointer data)
 
   if (GTK_TOGGLE_BUTTON(widget)->active) {

-       side = (gint) gtk_object_get_data(GTK_OBJECT(widget), "side");
+       side = GPOINTER_TO_INT (gtk_object_get_data(GTK_OBJECT(widget), "side"));

       pchild = info->pchild;
       if (pchild == NULL) {
--- a/examples/paned/paned.c
+++ b/examples/paned/paned.c
@@ -3,8 +3,7 @@
 #include <gtk/gtk.h>
   
 /* Create the list of "messages" */
-GtkWidget *
-create_list (void)
+GtkWidget *create_list( void )
 {

    GtkWidget *scrolled_window;
@@ -22,8 +21,8 @@ create_list (void)
   
    /* Create a new list and put it in the scrolled window */
    list = gtk_list_new ();
-    gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window),
-                                           list);
+    gtk_scrolled_window_add_with_viewport (
+               GTK_SCROLLED_WINDOW (scrolled_window), list);
    gtk_widget_show (list);
   
    /* Add some messages to the window */
@@ -44,8 +43,8 @@ when our window is realized. We could also force our window to be
 realized with gtk_widget_realize, but it would have to be part of
 a hierarchy first */

-void
-realize_text (GtkWidget *text, gpointer data)
+void realize_text( GtkWidget *text,
+                   gpointer data )
 {
    gtk_text_freeze (GTK_TEXT (text));
    gtk_text_insert (GTK_TEXT (text), NULL, &text->style->black, NULL,
@@ -62,8 +61,7 @@ realize_text (GtkWidget *text, gpointer data)
 }
   
 /* Create a scrolled text area that displays a "message" */
-GtkWidget *
-create_text (void)
+GtkWidget *create_text( void )
 {
    GtkWidget *table;
    GtkWidget *text;
@@ -100,8 +98,8 @@ create_text (void)
    return table;
 }
   
-int
-main (int argc, char *argv[])
+int main( int   argc,
+          char *argv[] )
 {
    GtkWidget *window;
    GtkWidget *vpaned;
@@ -114,7 +112,7 @@ main (int argc, char *argv[])
    gtk_window_set_title (GTK_WINDOW (window), "Paned Windows");
    gtk_signal_connect (GTK_OBJECT (window), "destroy",
 			GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
-    gtk_container_border_width (GTK_CONTAINER (window), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
    gtk_widget_set_usize (GTK_WIDGET(window), 450, 400);

    /* create a vpaned widget and add it to our toplevel window */
--- a/examples/pixmap/pixmap.c
+++ b/examples/pixmap/pixmap.c
@@ -29,18 +29,24 @@ static const char * xpm_data[] = {

 /* when invoked (via signal delete_event), terminates the application.
 */
-void close_application( GtkWidget *widget, GdkEvent *event, gpointer data ) {
+gint close_application( GtkWidget *widget,
+                        GdkEvent  *event,
+                        gpointer   data )
+{
    gtk_main_quit();
+    return(FALSE);
 }


 /* is invoked when the button is clicked.  It just prints a message.
 */
-void button_clicked( GtkWidget *widget, gpointer data ) {
-    printf( "button clicked\n" );
+void button_clicked( GtkWidget *widget,
+                     gpointer   data ) {
+    g_print( "button clicked\n" );
 }

-int main( int argc, char *argv[] )
+int main( int   argc,
+          char *argv[] )
 {
    /* GtkWidget is the storage type for widgets */
    GtkWidget *window, *pixmapwid, *button;
@@ -54,7 +60,7 @@ int main( int argc, char *argv[] )
    window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
    gtk_signal_connect( GTK_OBJECT (window), "delete_event",
                        GTK_SIGNAL_FUNC (close_application), NULL );
-    gtk_container_border_width( GTK_CONTAINER (window), 10 );
+    gtk_container_set_border_width( GTK_CONTAINER (window), 10 );
    gtk_widget_show( window );

    /* now for the pixmap from gdk */
--- a/examples/progressbar/progressbar.c
+++ b/examples/progressbar/progressbar.c
@@ -15,11 +15,12 @@ gint progress_timeout( gpointer data )
    gfloat new_val;
    GtkAdjustment *adj;

-    adj = GTK_PROGRESS (data)->adjustment;
-
    /* Calculate the value of the progress bar using the
     * value range set in the adjustment object */
-    new_val = adj->value + 1;
+
+    new_val = gtk_progress_get_value( GTK_PROGRESS(data) ) + 1;
+
+    adj = GTK_PROGRESS (data)->adjustment;
    if (new_val > adj->upper)
      new_val = adj->lower;

@@ -114,7 +115,7 @@ int main( int   argc,
    gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 5);
    gtk_widget_show(align);

-    /* Create a GtkAdjusment object to hold the range of the
+    /* Create a Adjusment object to hold the range of the
     * progress bar */
    adj = (GtkAdjustment *) gtk_adjustment_new (0, 1, 150, 0, 0, 0);

--- a/examples/radiobuttons/radiobuttons.c
+++ b/examples/radiobuttons/radiobuttons.c
@@ -3,11 +3,12 @@
 #include <gtk/gtk.h>
 #include <glib.h>

-void close_application( GtkWidget *widget,
+gint close_application( GtkWidget *widget,
                        GdkEvent  *event,
-			gpointer   data )
+                        gpointer   data )
 {
  gtk_main_quit();
+  return(FALSE);
 }

 int main( int   argc,
@@ -29,14 +30,14 @@ int main( int   argc,
                        NULL);

    gtk_window_set_title (GTK_WINDOW (window), "radio buttons");
-    gtk_container_border_width (GTK_CONTAINER (window), 0);
+    gtk_container_set_border_width (GTK_CONTAINER (window), 0);

    box1 = gtk_vbox_new (FALSE, 0);
    gtk_container_add (GTK_CONTAINER (window), box1);
    gtk_widget_show (box1);

    box2 = gtk_vbox_new (FALSE, 10);
-    gtk_container_border_width (GTK_CONTAINER (box2), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
    gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
    gtk_widget_show (box2);

@@ -46,7 +47,7 @@ int main( int   argc,

    group = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
    button = gtk_radio_button_new_with_label(group, "button2");
-    gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
    gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
    gtk_widget_show (button);

@@ -61,7 +62,7 @@ int main( int   argc,
    gtk_widget_show (separator);

    box2 = gtk_vbox_new (FALSE, 10);
-    gtk_container_border_width (GTK_CONTAINER (box2), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
    gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
    gtk_widget_show (box2);

--- a/examples/rangewidgets/rangewidgets.c
+++ b/examples/rangewidgets/rangewidgets.c
@@ -98,11 +98,11 @@ void create_range_controls( void )
    gtk_widget_show (box1);

    box2 = gtk_hbox_new (FALSE, 10);
-    gtk_container_border_width (GTK_CONTAINER (box2), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
    gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
    gtk_widget_show (box2);

-    /* calue, lower, upper, step_increment, page_increment, page_size */
+    /* value, lower, upper, step_increment, page_increment, page_size */
    /* Note that the page_size value only makes a difference for
     * scrollbar widgets, and the highest value you'll get is actually
     * (upper - page_size). */
@@ -134,20 +134,20 @@ void create_range_controls( void )
    gtk_widget_show (scrollbar);

    box2 = gtk_hbox_new (FALSE, 10);
-    gtk_container_border_width (GTK_CONTAINER (box2), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
    gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
    gtk_widget_show (box2);

    /* A checkbutton to control whether the value is displayed or not */
    button = gtk_check_button_new_with_label("Display value on scale widgets");
-    gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
    gtk_signal_connect (GTK_OBJECT (button), "toggled",
                        GTK_SIGNAL_FUNC(cb_draw_value), NULL);
    gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
    gtk_widget_show (button);
  
    box2 = gtk_hbox_new (FALSE, 10);
-    gtk_container_border_width (GTK_CONTAINER (box2), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (box2), 10);

    /* An option menu to change the position of the value */
    label = gtk_label_new ("Scale Value Position:");
@@ -182,7 +182,7 @@ void create_range_controls( void )
    gtk_widget_show (box2);

    box2 = gtk_hbox_new (FALSE, 10);
-    gtk_container_border_width (GTK_CONTAINER (box2), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (box2), 10);

    /* Yet another option menu, this time for the update policy of the
     * scale widgets */
@@ -216,9 +216,9 @@ void create_range_controls( void )
    gtk_widget_show (box2);

    box2 = gtk_hbox_new (FALSE, 10);
-    gtk_container_border_width (GTK_CONTAINER (box2), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
  
-    /* A GtkHScale widget for adjusting the number of digits on the
+    /* An HScale widget for adjusting the number of digits on the
     * sample scales. */
    label = gtk_label_new ("Scale Digits:");
    gtk_box_pack_start (GTK_BOX (box2), label, FALSE, FALSE, 0);
@@ -236,9 +236,9 @@ void create_range_controls( void )
    gtk_widget_show (box2);
  
    box2 = gtk_hbox_new (FALSE, 10);
-    gtk_container_border_width (GTK_CONTAINER (box2), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
  
-    /* And, one last GtkHScale widget for adjusting the page size of the
+    /* And, one last HScale widget for adjusting the page size of the
     * scrollbar. */
    label = gtk_label_new ("Scrollbar Page Size:");
    gtk_box_pack_start (GTK_BOX (box2), label, FALSE, FALSE, 0);
@@ -260,7 +260,7 @@ void create_range_controls( void )
    gtk_widget_show (separator);

    box2 = gtk_vbox_new (FALSE, 10);
-    gtk_container_border_width (GTK_CONTAINER (box2), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
    gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
    gtk_widget_show (box2);

--- a/examples/rulers/rulers.c
+++ b/examples/rulers/rulers.c
@@ -8,12 +8,17 @@
 #define YSIZE  400

 /* This routine gets control when the close button is clicked */
-void close_application( GtkWidget *widget, GdkEvent *event, gpointer data ) {
+gint close_application( GtkWidget *widget,
+                        GdkEvent  *event,
+                        gpointer   data )
+{
    gtk_main_quit();
+    return(FALSE);
 }

 /* The main routine */
-int main( int argc, char *argv[] ) {
+int main( int   argc,
+          char *argv[] ) {
    GtkWidget *window, *table, *area, *hrule, *vrule;

    /* Initialize GTK and create the main window */
@@ -22,7 +27,7 @@ int main( int argc, char *argv[] ) {
    window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
    gtk_signal_connect (GTK_OBJECT (window), "delete_event",
            GTK_SIGNAL_FUNC( close_application ), NULL);
-    gtk_container_border_width (GTK_CONTAINER (window), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (window), 10);

    /* Create a table for placing the ruler and the drawing area */
    table = gtk_table_new( 3, 2, FALSE );
@@ -32,28 +37,33 @@ int main( int argc, char *argv[] ) {
    gtk_drawing_area_size( (GtkDrawingArea *)area, XSIZE, YSIZE );
    gtk_table_attach( GTK_TABLE(table), area, 1, 2, 1, 2,
                      GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 0 );
-    gtk_widget_set_events( area, GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK );
+    gtk_widget_set_events( area, GDK_POINTER_MOTION_MASK |
+                                 GDK_POINTER_MOTION_HINT_MASK );

-    /* The horizontal ruler goes on top. As the mouse moves across the drawing area,
-     * a motion_notify_event is passed to the appropriate event handler for the ruler. */
+    /* The horizontal ruler goes on top. As the mouse moves across the
+     * drawing area, a motion_notify_event is passed to the
+     * appropriate event handler for the ruler. */
    hrule = gtk_hruler_new();
    gtk_ruler_set_metric( GTK_RULER(hrule), GTK_PIXELS );
    gtk_ruler_set_range( GTK_RULER(hrule), 7, 13, 0, 20 );
    gtk_signal_connect_object( GTK_OBJECT(area), "motion_notify_event",
-                               (GtkSignalFunc)EVENT_METHOD(hrule, motion_notify_event),
+                               (GtkSignalFunc)EVENT_METHOD(hrule,
+                                                        motion_notify_event),
                               GTK_OBJECT(hrule) );
    /*  GTK_WIDGET_CLASS(GTK_OBJECT(hrule)->klass)->motion_notify_event, */
    gtk_table_attach( GTK_TABLE(table), hrule, 1, 2, 0, 1,
                      GTK_EXPAND|GTK_SHRINK|GTK_FILL, GTK_FILL, 0, 0 );
    
-    /* The vertical ruler goes on the left. As the mouse moves across the drawing area,
-     * a motion_notify_event is passed to the appropriate event handler for the ruler. */
+    /* The vertical ruler goes on the left. As the mouse moves across
+     * the drawing area, a motion_notify_event is passed to the
+     * appropriate event handler for the ruler. */
    vrule = gtk_vruler_new();
    gtk_ruler_set_metric( GTK_RULER(vrule), GTK_PIXELS );
    gtk_ruler_set_range( GTK_RULER(vrule), 0, YSIZE, 10, YSIZE );
    gtk_signal_connect_object( GTK_OBJECT(area), "motion_notify_event",
                               (GtkSignalFunc)
-                                  GTK_WIDGET_CLASS(GTK_OBJECT(vrule)->klass)->motion_notify_event,
+                                  GTK_WIDGET_CLASS(GTK_OBJECT(vrule)->klass)->
+				                         motion_notify_event,
                               GTK_OBJECT(vrule) );
    gtk_table_attach( GTK_TABLE(table), vrule, 0, 1, 1, 2,
                      GTK_FILL, GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0 );
--- a/examples/scribble-simple/scribble-simple.c
+++ b/examples/scribble-simple/scribble-simple.c
@@ -25,8 +25,8 @@
 static GdkPixmap *pixmap = NULL;

 /* Create a new backing pixmap of the appropriate size */
-static gint
-configure_event (GtkWidget *widget, GdkEventConfigure *event)
+static gint configure_event( GtkWidget         *widget,
+                             GdkEventConfigure *event )
 {
  if (pixmap)
    gdk_pixmap_unref(pixmap);
@@ -46,8 +46,8 @@ configure_event (GtkWidget *widget, GdkEventConfigure *event)
 }

 /* Redraw the screen from the backing pixmap */
-static gint
-expose_event (GtkWidget *widget, GdkEventExpose *event)
+static gint expose_event( GtkWidget      *widget,
+                          GdkEventExpose *event )
 {
  gdk_draw_pixmap(widget->window,
 		  widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
@@ -60,8 +60,9 @@ expose_event (GtkWidget *widget, GdkEventExpose *event)
 }

 /* Draw a rectangle on the screen */
-static void
-draw_brush (GtkWidget *widget, gdouble x, gdouble y)
+static void draw_brush( GtkWidget *widget,
+                        gdouble    x,
+                        gdouble    y)
 {
  GdkRectangle update_rect;

@@ -77,8 +78,8 @@ draw_brush (GtkWidget *widget, gdouble x, gdouble y)
  gtk_widget_draw (widget, &update_rect);
 }

-static gint
-button_press_event (GtkWidget *widget, GdkEventButton *event)
+static gint button_press_event( GtkWidget      *widget,
+                                GdkEventButton *event )
 {
  if (event->button == 1 && pixmap != NULL)
    draw_brush (widget, event->x, event->y);
@@ -86,8 +87,8 @@ button_press_event (GtkWidget *widget, GdkEventButton *event)
  return TRUE;
 }

-static gint
-motion_notify_event (GtkWidget *widget, GdkEventMotion *event)
+static gint motion_notify_event( GtkWidget *widget,
+                                 GdkEventMotion *event )
 {
  int x, y;
  GdkModifierType state;
@@ -107,14 +108,13 @@ motion_notify_event (GtkWidget *widget, GdkEventMotion *event)
  return TRUE;
 }

-void
-quit ()
+void quit ()
 {
  gtk_exit (0);
 }

-int
-main (int argc, char *argv[])
+int main( int   argc, 
+          char *argv[] )
 {
  GtkWidget *window;
  GtkWidget *drawing_area;
--- a/examples/scribble-xinput/Makefile
+++ b/examples/scribble-xinput/Makefile
@@ -0,0 +1,8 @@
+
+CC = gcc
+
+scribble-xinput: scribble-xinput.c 
+	$(CC) `gtk-config --cflags`  scribble-xinput.c -o scribble-xinput `gtk-config --libs`
+
+clean: 
+	rm -f *.o scribble-xinput
--- a/examples/scribble-xinput/scribble-xinput.c
+++ b/examples/scribble-xinput/scribble-xinput.c
@@ -0,0 +1,270 @@
+/* example-start scribble-xinput scribble-xinput.c */
+
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <gtk/gtk.h>
+
+/* Backing pixmap for drawing area */
+static GdkPixmap *pixmap = NULL;
+
+/* Create a new backing pixmap of the appropriate size */
+static gint
+configure_event (GtkWidget *widget, GdkEventConfigure *event)
+{
+  if (pixmap)
+     gdk_pixmap_unref(pixmap);
+
+  pixmap = gdk_pixmap_new(widget->window,
+                          widget->allocation.width,
+                          widget->allocation.height,
+                          -1);
+  gdk_draw_rectangle (pixmap,
+                      widget->style->white_gc,
+                      TRUE,
+                      0, 0,
+                      widget->allocation.width,
+                      widget->allocation.height);
+
+  return TRUE;
+}
+
+/* Redraw the screen from the backing pixmap */
+static gint
+expose_event (GtkWidget *widget, GdkEventExpose *event)
+{
+  gdk_draw_pixmap(widget->window,
+                  widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+                  pixmap,
+                  event->area.x, event->area.y,
+                  event->area.x, event->area.y,
+                  event->area.width, event->area.height);
+
+  return FALSE;
+}
+
+/* Draw a rectangle on the screen, size depending on pressure,
+   and color on the type of device */
+static void
+draw_brush (GtkWidget *widget, GdkInputSource source,
+            gdouble x, gdouble y, gdouble pressure)
+{
+  GdkGC *gc;
+  GdkRectangle update_rect;
+
+  switch (source)
+    {
+    case GDK_SOURCE_MOUSE:
+      gc = widget->style->dark_gc[GTK_WIDGET_STATE (widget)];
+      break;
+    case GDK_SOURCE_PEN:
+      gc = widget->style->black_gc;
+      break;
+    case GDK_SOURCE_ERASER:
+      gc = widget->style->white_gc;
+      break;
+    default:
+      gc = widget->style->light_gc[GTK_WIDGET_STATE (widget)];
+    }
+
+  update_rect.x = x - 10 * pressure;
+  update_rect.y = y - 10 * pressure;
+  update_rect.width = 20 * pressure;
+  update_rect.height = 20 * pressure;
+  gdk_draw_rectangle (pixmap, gc, TRUE,
+                      update_rect.x, update_rect.y,
+                      update_rect.width, update_rect.height);
+  gtk_widget_draw (widget, &update_rect);
+}
+
+static void
+print_button_press (guint32 deviceid)
+{
+  GList *tmp_list;
+
+  /* gdk_input_list_devices returns an internal list, so we shouldn't
+     free it afterwards */
+  tmp_list = gdk_input_list_devices();
+
+  while (tmp_list)
+    {
+      GdkDeviceInfo *info = (GdkDeviceInfo *)tmp_list->data;
+
+      if (info->deviceid == deviceid)
+        {
+          g_print("Button press on device '%s'\n", info->name);
+          return;
+        }
+
+      tmp_list = tmp_list->next;
+    }
+}
+
+static gint
+button_press_event (GtkWidget *widget, GdkEventButton *event)
+{
+  print_button_press (event->deviceid);
+  
+  if (event->button == 1 && pixmap != NULL)
+    draw_brush (widget, event->source, event->x, event->y, event->pressure);
+
+  return TRUE;
+}
+
+static gint
+motion_notify_event (GtkWidget *widget, GdkEventMotion *event)
+{
+  gdouble x, y;
+  gdouble pressure;
+  GdkModifierType state;
+
+  if (event->is_hint)
+    gdk_input_window_get_pointer (event->window, event->deviceid,
+                                  &x, &y, &pressure,
+				  NULL, NULL, &state);
+  else
+    {
+      x = event->x;
+      y = event->y;
+      pressure = event->pressure;
+      state = event->state;
+    }
+    
+  if (state & GDK_BUTTON1_MASK && pixmap != NULL)
+    draw_brush (widget, event->source, x, y, pressure);
+  
+  return TRUE;
+}
+
+void
+input_dialog_destroy (GtkWidget *w, gpointer data)
+{
+  *((GtkWidget **)data) = NULL;
+}
+
+void
+create_input_dialog ()
+{
+  static GtkWidget *inputd = NULL;
+
+  if (!inputd)
+    {
+      inputd = gtk_input_dialog_new();
+
+      gtk_signal_connect (GTK_OBJECT(inputd), "destroy",
+                          (GtkSignalFunc)input_dialog_destroy, &inputd);
+      gtk_signal_connect_object (GTK_OBJECT(GTK_INPUT_DIALOG(inputd)->close_button),
+                                 "clicked",
+                                 (GtkSignalFunc)gtk_widget_hide,
+                                 GTK_OBJECT(inputd));
+      gtk_widget_hide ( GTK_INPUT_DIALOG(inputd)->save_button);
+
+      gtk_widget_show (inputd);
+    }
+  else
+    {
+      if (!GTK_WIDGET_MAPPED(inputd))
+        gtk_widget_show(inputd);
+      else
+        gdk_window_raise(inputd->window);
+    }
+}
+
+void
+quit ()
+{
+  gtk_exit (0);
+}
+
+int
+main (int argc, char *argv[])
+{
+  GtkWidget *window;
+  GtkWidget *drawing_area;
+  GtkWidget *vbox;
+
+  GtkWidget *button;
+
+  gtk_init (&argc, &argv);
+
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_widget_set_name (window, "Test Input");
+
+  vbox = gtk_vbox_new (FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_widget_show (vbox);
+
+  gtk_signal_connect (GTK_OBJECT (window), "destroy",
+                      GTK_SIGNAL_FUNC (quit), NULL);
+
+  /* Create the drawing area */
+
+  drawing_area = gtk_drawing_area_new ();
+  gtk_drawing_area_size (GTK_DRAWING_AREA (drawing_area), 200, 200);
+  gtk_box_pack_start (GTK_BOX (vbox), drawing_area, TRUE, TRUE, 0);
+
+  gtk_widget_show (drawing_area);
+
+  /* Signals used to handle backing pixmap */
+
+  gtk_signal_connect (GTK_OBJECT (drawing_area), "expose_event",
+                      (GtkSignalFunc) expose_event, NULL);
+  gtk_signal_connect (GTK_OBJECT(drawing_area),"configure_event",
+                      (GtkSignalFunc) configure_event, NULL);
+
+  /* Event signals */
+
+  gtk_signal_connect (GTK_OBJECT (drawing_area), "motion_notify_event",
+                      (GtkSignalFunc) motion_notify_event, NULL);
+  gtk_signal_connect (GTK_OBJECT (drawing_area), "button_press_event",
+                      (GtkSignalFunc) button_press_event, NULL);
+
+  gtk_widget_set_events (drawing_area, GDK_EXPOSURE_MASK
+                         | GDK_LEAVE_NOTIFY_MASK
+                         | GDK_BUTTON_PRESS_MASK
+                         | GDK_POINTER_MOTION_MASK
+                         | GDK_POINTER_MOTION_HINT_MASK);
+
+  /* The following call enables tracking and processing of extension
+     events for the drawing area */
+  gtk_widget_set_extension_events (drawing_area, GDK_EXTENSION_EVENTS_CURSOR);
+
+  /* .. And some buttons */
+  button = gtk_button_new_with_label ("Input Dialog");
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+                      GTK_SIGNAL_FUNC (create_input_dialog), NULL);
+  gtk_widget_show (button);
+
+  button = gtk_button_new_with_label ("Quit");
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+  gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
+                             GTK_SIGNAL_FUNC (gtk_widget_destroy),
+                             GTK_OBJECT (window));
+  gtk_widget_show (button);
+
+  gtk_widget_show (window);
+
+  gtk_main ();
+
+  return 0;
+}
+/* example-end */
--- a/examples/scrolledwin/scrolledwin.c
+++ b/examples/scrolledwin/scrolledwin.c
@@ -2,12 +2,14 @@

 #include <gtk/gtk.h>

-void destroy(GtkWidget *widget, gpointer data)
+void destroy( GtkWidget *widget,
+              gpointer   data )
 {
    gtk_main_quit();
 }

-int main (int argc, char *argv[])
+int main( int   argc,
+          char *argv[] )
 {
    static GtkWidget *window;
    GtkWidget *scrolled_window;
@@ -19,20 +21,18 @@ int main (int argc, char *argv[])
    gtk_init (&argc, &argv);
    
    /* Create a new dialog window for the scrolled window to be
-     * packed into. A dialog is just like a normal window except it has a 
-     * vbox and a horizontal separator packed into it. It's just a shortcut
-     * for creating dialogs */
+     * packed into.  */
    window = gtk_dialog_new ();
    gtk_signal_connect (GTK_OBJECT (window), "destroy",
 			(GtkSignalFunc) destroy, NULL);
    gtk_window_set_title (GTK_WINDOW (window), "GtkScrolledWindow example");
-    gtk_container_border_width (GTK_CONTAINER (window), 0);
+    gtk_container_set_border_width (GTK_CONTAINER (window), 0);
    gtk_widget_set_usize(window, 300, 300);
    
    /* create a new scrolled window. */
    scrolled_window = gtk_scrolled_window_new (NULL, NULL);
    
-    gtk_container_border_width (GTK_CONTAINER (scrolled_window), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 10);
    
    /* the policy is one of GTK_POLICY AUTOMATIC, or GTK_POLICY_ALWAYS.
     * GTK_POLICY_AUTOMATIC will automatically decide whether you need
@@ -54,8 +54,8 @@ int main (int argc, char *argv[])
    gtk_table_set_col_spacings (GTK_TABLE (table), 10);
    
    /* pack the table into the scrolled window */
-    gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window),
-                                           table);
+    gtk_scrolled_window_add_with_viewport (
+                   GTK_SCROLLED_WINDOW (scrolled_window), table);
    gtk_widget_show (table);
    
    /* this simply creates a grid of toggle buttons on the table
--- a/examples/selection/gettargets.c
+++ b/examples/selection/gettargets.c
@@ -2,13 +2,13 @@

 #include <gtk/gtk.h>

-void selection_received (GtkWidget *widget, 
-			 GtkSelectionData *selection_data, 
-			 gpointer data);
+void selection_received( GtkWidget        *widget, 
+                         GtkSelectionData *selection_data, 
+                         gpointer          data );

 /* Signal handler invoked when user clicks on the "Get Targets" button */
-void
-get_targets (GtkWidget *widget, gpointer data)
+void get_targets( GtkWidget *widget,
+                  gpointer data )
 {
  static GdkAtom targets_atom = GDK_NONE;

@@ -22,9 +22,9 @@ get_targets (GtkWidget *widget, gpointer data)
 }

 /* Signal handler called when the selections owner returns the data */
-void
-selection_received (GtkWidget *widget, GtkSelectionData *selection_data, 
-		    gpointer data)
+void selection_received( GtkWidget        *widget,
+                         GtkSelectionData *selection_data, 
+		         gpointer          data )
 {
  GdkAtom *atoms;
  GList *item_list;
@@ -60,8 +60,8 @@ selection_received (GtkWidget *widget, GtkSelectionData *selection_data,
  return;
 }

-int 
-main (int argc, char *argv[])
+int main( int   argc,
+          char *argv[] )
 {
  GtkWidget *window;
  GtkWidget *button;
@@ -72,7 +72,7 @@ main (int argc, char *argv[])

  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
  gtk_window_set_title (GTK_WINDOW (window), "Event Box");
-  gtk_container_border_width (GTK_CONTAINER (window), 10);
+  gtk_container_set_border_width (GTK_CONTAINER (window), 10);

  gtk_signal_connect (GTK_OBJECT (window), "destroy",
 		      GTK_SIGNAL_FUNC (gtk_exit), NULL);
--- a/examples/selection/setselection.c
+++ b/examples/selection/setselection.c
@@ -4,8 +4,8 @@
 #include <time.h>

 /* Callback when the user toggles the selection */
-void
-selection_toggled (GtkWidget *widget, gint *have_selection)
+void selection_toggled( GtkWidget *widget,
+                        gint      *have_selection )
 {
  if (GTK_TOGGLE_BUTTON(widget)->active)
    {
@@ -15,7 +15,7 @@ selection_toggled (GtkWidget *widget, gint *have_selection)
      /* if claiming the selection failed, we return the button to
 	 the out state */
      if (!*have_selection)
-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(widget), FALSE);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(widget), FALSE);
    }
  else
    {
@@ -32,26 +32,27 @@ selection_toggled (GtkWidget *widget, gint *have_selection)
 }

 /* Called when another application claims the selection */
-gint
-selection_clear (GtkWidget *widget, GdkEventSelection *event,
-		 gint *have_selection)
+gint selection_clear( GtkWidget         *widget,
+                      GdkEventSelection *event,
+                      gint              *have_selection )
 {
  *have_selection = FALSE;
-  gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(widget), FALSE);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(widget), FALSE);

  return TRUE;
 }

 /* Supplies the current time as the selection. */
-void
-selection_handle (GtkWidget *widget, 
-		  GtkSelectionData *selection_data,
-		  gpointer data)
+void selection_handle( GtkWidget        *widget, 
+                       GtkSelectionData *selection_data,
+                       guint             info,
+                       guint             time_stamp,
+                       gpointer          data )
 {
  gchar *timestr;
  time_t current_time;

-  current_time = time (NULL);
+  current_time = time(NULL);
  timestr = asctime (localtime(&current_time)); 
  /* When we return a single string, it should not be null terminated.
     That will be done for us */
@@ -60,11 +61,10 @@ selection_handle (GtkWidget *widget,
 			  8, timestr, strlen(timestr));
 }

-int
-main (int argc, char *argv[])
+int main( int   argc,
+          char *argv[] )
 {
  GtkWidget *window;
-
  GtkWidget *selection_button;

  static int have_selection = FALSE;
@@ -75,7 +75,7 @@ main (int argc, char *argv[])

  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
  gtk_window_set_title (GTK_WINDOW (window), "Event Box");
-  gtk_container_border_width (GTK_CONTAINER (window), 10);
+  gtk_container_set_border_width (GTK_CONTAINER (window), 10);

  gtk_signal_connect (GTK_OBJECT (window), "destroy",
 		      GTK_SIGNAL_FUNC (gtk_exit), NULL);
@@ -91,9 +91,12 @@ main (int argc, char *argv[])
  gtk_signal_connect (GTK_OBJECT(selection_button), "selection_clear_event",
 		      GTK_SIGNAL_FUNC (selection_clear), &have_selection);

-  gtk_selection_add_handler (selection_button, GDK_SELECTION_PRIMARY,
-			     GDK_SELECTION_TYPE_STRING,
-			     selection_handle, NULL);
+  gtk_selection_add_target (selection_button,
+			    GDK_SELECTION_PRIMARY,
+			    GDK_SELECTION_TYPE_STRING,
+		            1);
+  gtk_signal_connect (GTK_OBJECT(selection_button), "selection_get",
+		      GTK_SIGNAL_FUNC (selection_handle), &have_selection);

  gtk_widget_show (selection_button);
  gtk_widget_show (window);
--- a/examples/spinbutton/Makefile
+++ b/examples/spinbutton/Makefile
@@ -0,0 +1,8 @@
+
+CC = gcc
+
+spinbutton: spinbutton.c 
+	$(CC) `gtk-config --cflags`  spinbutton.c -o spinbutton `gtk-config --libs`
+
+clean: 
+	rm -f *.o spinbutton
--- a/examples/spinbutton/spinbutton.c
+++ b/examples/spinbutton/spinbutton.c
@@ -0,0 +1,226 @@
+/* example-start spinbutton spinbutton.c */
+
+#include <gtk/gtk.h>
+
+static GtkWidget *spinner1;
+
+void toggle_snap( GtkWidget     *widget,
+		  GtkSpinButton *spin )
+{
+  gtk_spin_button_set_snap_to_ticks (spin, GTK_TOGGLE_BUTTON (widget)->active);
+}
+
+void toggle_numeric( GtkWidget *widget,
+		     GtkSpinButton *spin )
+{
+  gtk_spin_button_set_numeric (spin, GTK_TOGGLE_BUTTON (widget)->active);
+}
+
+void change_digits( GtkWidget *widget,
+	            GtkSpinButton *spin )
+{
+  gtk_spin_button_set_digits (GTK_SPIN_BUTTON (spinner1),
+                              gtk_spin_button_get_value_as_int (spin));
+}
+
+void get_value( GtkWidget *widget,
+		gpointer data )
+{
+  gchar buf[32];
+  GtkLabel *label;
+  GtkSpinButton *spin;
+
+  spin = GTK_SPIN_BUTTON (spinner1);
+  label = GTK_LABEL (gtk_object_get_user_data (GTK_OBJECT (widget)));
+  if (GPOINTER_TO_INT (data) == 1)
+    sprintf (buf, "%d", gtk_spin_button_get_value_as_int (spin));
+  else
+    sprintf (buf, "%0.*f", spin->digits,
+             gtk_spin_button_get_value_as_float (spin));
+  gtk_label_set_text (label, buf);
+}
+
+
+int main( int   argc,
+          char *argv[] )
+{
+  GtkWidget *window;
+  GtkWidget *frame;
+  GtkWidget *hbox;
+  GtkWidget *main_vbox;
+  GtkWidget *vbox;
+  GtkWidget *vbox2;
+  GtkWidget *spinner2;
+  GtkWidget *spinner;
+  GtkWidget *button;
+  GtkWidget *label;
+  GtkWidget *val_label;
+  GtkAdjustment *adj;
+
+  /* Initialise GTK */
+  gtk_init(&argc, &argv);
+
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+  gtk_signal_connect (GTK_OBJECT (window), "destroy",
+		      GTK_SIGNAL_FUNC (gtk_main_quit),
+		      NULL);
+
+  gtk_window_set_title (GTK_WINDOW (window), "Spin Button");
+
+  main_vbox = gtk_vbox_new (FALSE, 5);
+  gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 10);
+  gtk_container_add (GTK_CONTAINER (window), main_vbox);
+  
+  frame = gtk_frame_new ("Not accelerated");
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
+  
+  vbox = gtk_vbox_new (FALSE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  
+  /* Day, month, year spinners */
+  
+  hbox = gtk_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 5);
+  
+  vbox2 = gtk_vbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
+  
+  label = gtk_label_new ("Day :");
+  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+  gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE, 0);
+  
+  adj = (GtkAdjustment *) gtk_adjustment_new (1.0, 1.0, 31.0, 1.0,
+					      5.0, 0.0);
+  spinner = gtk_spin_button_new (adj, 0, 0);
+  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
+  gtk_spin_button_set_shadow_type (GTK_SPIN_BUTTON (spinner),
+				   GTK_SHADOW_OUT);
+  gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE, 0);
+  
+  vbox2 = gtk_vbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
+  
+  label = gtk_label_new ("Month :");
+  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+  gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE, 0);
+  
+  adj = (GtkAdjustment *) gtk_adjustment_new (1.0, 1.0, 12.0, 1.0,
+					      5.0, 0.0);
+  spinner = gtk_spin_button_new (adj, 0, 0);
+  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
+  gtk_spin_button_set_shadow_type (GTK_SPIN_BUTTON (spinner),
+				   GTK_SHADOW_ETCHED_IN);
+  gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE, 0);
+  
+  vbox2 = gtk_vbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
+  
+  label = gtk_label_new ("Year :");
+  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+  gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE, 0);
+  
+  adj = (GtkAdjustment *) gtk_adjustment_new (1998.0, 0.0, 2100.0,
+					      1.0, 100.0, 0.0);
+  spinner = gtk_spin_button_new (adj, 0, 0);
+  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), FALSE);
+  gtk_spin_button_set_shadow_type (GTK_SPIN_BUTTON (spinner),
+				   GTK_SHADOW_IN);
+  gtk_widget_set_usize (spinner, 55, 0);
+  gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE, 0);
+  
+  frame = gtk_frame_new ("Accelerated");
+  gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
+  
+  vbox = gtk_vbox_new (FALSE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  
+  hbox = gtk_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 5);
+  
+  vbox2 = gtk_vbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
+  
+  label = gtk_label_new ("Value :");
+  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+  gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE, 0);
+  
+  adj = (GtkAdjustment *) gtk_adjustment_new (0.0, -10000.0, 10000.0,
+					      0.5, 100.0, 0.0);
+  spinner1 = gtk_spin_button_new (adj, 1.0, 2);
+  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE);
+  gtk_widget_set_usize (spinner1, 100, 0);
+  gtk_box_pack_start (GTK_BOX (vbox2), spinner1, FALSE, TRUE, 0);
+  
+  vbox2 = gtk_vbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
+  
+  label = gtk_label_new ("Digits :");
+  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+  gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE, 0);
+  
+  adj = (GtkAdjustment *) gtk_adjustment_new (2, 1, 5, 1, 1, 0);
+  spinner2 = gtk_spin_button_new (adj, 0.0, 0);
+  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner2), TRUE);
+  gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
+		      GTK_SIGNAL_FUNC (change_digits),
+		      (gpointer) spinner2);
+  gtk_box_pack_start (GTK_BOX (vbox2), spinner2, FALSE, TRUE, 0);
+  
+  hbox = gtk_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 5);
+  
+  button = gtk_check_button_new_with_label ("Snap to 0.5-ticks");
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+		      GTK_SIGNAL_FUNC (toggle_snap),
+		      spinner1);
+  gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
+  
+  button = gtk_check_button_new_with_label ("Numeric only input mode");
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+		      GTK_SIGNAL_FUNC (toggle_numeric),
+		      spinner1);
+  gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
+  
+  val_label = gtk_label_new ("");
+  
+  hbox = gtk_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 5);
+  button = gtk_button_new_with_label ("Value as Int");
+  gtk_object_set_user_data (GTK_OBJECT (button), val_label);
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+		      GTK_SIGNAL_FUNC (get_value),
+		      GINT_TO_POINTER (1));
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 5);
+  
+  button = gtk_button_new_with_label ("Value as Float");
+  gtk_object_set_user_data (GTK_OBJECT (button), val_label);
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+		      GTK_SIGNAL_FUNC (get_value),
+		      GINT_TO_POINTER (2));
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 5);
+  
+  gtk_box_pack_start (GTK_BOX (vbox), val_label, TRUE, TRUE, 0);
+  gtk_label_set_text (GTK_LABEL (val_label), "0");
+  
+  hbox = gtk_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE, 0);
+  
+  button = gtk_button_new_with_label ("Close");
+  gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
+			     GTK_SIGNAL_FUNC (gtk_widget_destroy),
+			     GTK_OBJECT (window));
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 5);
+
+  gtk_widget_show_all (window);
+
+  /* Enter the event loop */
+  gtk_main ();
+    
+  return(0);
+}
+/* example-end */
--- a/examples/statusbar/statusbar.c
+++ b/examples/statusbar/statusbar.c
@@ -5,31 +5,34 @@

 GtkWidget *status_bar;

-void push_item (GtkWidget *widget, gpointer data)
+void push_item( GtkWidget *widget,
+                gpointer   data )
 {
  static int count = 1;
  char buff[20];

  g_snprintf(buff, 20, "Item %d", count++);
-  gtk_statusbar_push( GTK_STATUSBAR(status_bar), (guint) &data, buff);
+  gtk_statusbar_push( GTK_STATUSBAR(status_bar), GPOINTER_TO_INT(data), buff);

  return;
 }

-void pop_item (GtkWidget *widget, gpointer data)
+void pop_item( GtkWidget *widget,
+               gpointer   data )
 {
-  gtk_statusbar_pop( GTK_STATUSBAR(status_bar), (guint) &data );
+  gtk_statusbar_pop( GTK_STATUSBAR(status_bar), GPOINTER_TO_INT(data) );
  return;
 }

-int main (int argc, char *argv[])
+int main( int   argc,
+          char *argv[] )
 {

    GtkWidget *window;
    GtkWidget *vbox;
    GtkWidget *button;

-    int context_id;
+    gint context_id;

    gtk_init (&argc, &argv);

@@ -48,17 +51,18 @@ int main (int argc, char *argv[])
    gtk_box_pack_start (GTK_BOX (vbox), status_bar, TRUE, TRUE, 0);
    gtk_widget_show (status_bar);

-    context_id = gtk_statusbar_get_context_id( GTK_STATUSBAR(status_bar), "Statusbar example");
+    context_id = gtk_statusbar_get_context_id(
+                          GTK_STATUSBAR(status_bar), "Statusbar example");

    button = gtk_button_new_with_label("push item");
    gtk_signal_connect(GTK_OBJECT(button), "clicked",
-        GTK_SIGNAL_FUNC (push_item), &context_id);
+        GTK_SIGNAL_FUNC (push_item), GINT_TO_POINTER(context_id) );
    gtk_box_pack_start(GTK_BOX(vbox), button, TRUE, TRUE, 2);
    gtk_widget_show(button);              

    button = gtk_button_new_with_label("pop last item");
    gtk_signal_connect(GTK_OBJECT(button), "clicked",
-        GTK_SIGNAL_FUNC (pop_item), &context_id);
+        GTK_SIGNAL_FUNC (pop_item), GINT_TO_POINTER(context_id) );
    gtk_box_pack_start(GTK_BOX(vbox), button, TRUE, TRUE, 2);
    gtk_widget_show(button);              

--- a/examples/table/table.c
+++ b/examples/table/table.c
@@ -11,11 +11,12 @@ void callback( GtkWidget *widget,
 }

 /* This callback quits the program */
-void delete_event( GtkWidget *widget,
+gint delete_event( GtkWidget *widget,
                   GdkEvent  *event,
-		   gpointer   data )
+                   gpointer   data )
 {
    gtk_main_quit ();
+    return(FALSE);
 }

 int main( int   argc,
@@ -39,7 +40,7 @@ int main( int   argc,
                        GTK_SIGNAL_FUNC (delete_event), NULL);

    /* Sets the border width of the window. */
-    gtk_container_border_width (GTK_CONTAINER (window), 20);
+    gtk_container_set_border_width (GTK_CONTAINER (window), 20);

    /* Create a 2x2 table */
    table = gtk_table_new (2, 2, TRUE);
--- a/examples/text/text.c
+++ b/examples/text/text.c
@@ -19,12 +19,14 @@ void text_toggle_word_wrap (GtkWidget *checkbutton,
 			 GTK_TOGGLE_BUTTON(checkbutton)->active);
 }

-void close_application( GtkWidget *widget, gpointer data )
+void close_application( GtkWidget *widget,
+                        gpointer   data )
 {
       gtk_main_quit();
 }

-int main (int argc, char *argv[])
+int main( int argc,
+          char *argv[] )
 {
  GtkWidget *window;
  GtkWidget *box1;
@@ -37,7 +39,7 @@ int main (int argc, char *argv[])
  GtkWidget *vscrollbar;
  GtkWidget *text;
  GdkColormap *cmap;
-  GdkColor colour;
+  GdkColor color;
  GdkFont *fixed_font;

  FILE *infile;
@@ -51,7 +53,7 @@ int main (int argc, char *argv[])
 		      GTK_SIGNAL_FUNC(close_application),
 		      NULL);
  gtk_window_set_title (GTK_WINDOW (window), "Text Widget Example");
-  gtk_container_border_width (GTK_CONTAINER (window), 0);
+  gtk_container_set_border_width (GTK_CONTAINER (window), 0);
  
  
  box1 = gtk_vbox_new (FALSE, 0);
@@ -60,7 +62,7 @@ int main (int argc, char *argv[])
  
  
  box2 = gtk_vbox_new (FALSE, 10);
-  gtk_container_border_width (GTK_CONTAINER (box2), 10);
+  gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
  gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
  gtk_widget_show (box2);
  
@@ -85,28 +87,29 @@ int main (int argc, char *argv[])
 		    GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
  gtk_widget_show (vscrollbar);

-  /* Get the system colour map and allocate the colour red */
+  /* Get the system color map and allocate the color red */
  cmap = gdk_colormap_get_system();
-  colour.red = 0xffff;
-  colour.green = 0;
-  colour.blue = 0;
-  if (!gdk_color_alloc(cmap, &colour)) {
-    g_error("couldn't allocate colour");
+  color.red = 0xffff;
+  color.green = 0;
+  color.blue = 0;
+  if (!gdk_color_alloc(cmap, &color)) {
+    g_error("couldn't allocate color");
  }

  /* Load a fixed font */
  fixed_font = gdk_font_load ("-misc-fixed-medium-r-*-*-*-140-*-*-*-*-*-*");

-  /* Realizing a widget creates a window for it, ready for us to insert some text */
+  /* Realizing a widget creates a window for it,
+   * ready for us to insert some text */
  gtk_widget_realize (text);

  /* Freeze the text widget, ready for multiple updates */
  gtk_text_freeze (GTK_TEXT (text));
  
-  /* Insert some coloured text */
+  /* Insert some colored text */
  gtk_text_insert (GTK_TEXT (text), NULL, &text->style->black, NULL,
 		   "Supports ", -1);
-  gtk_text_insert (GTK_TEXT (text), NULL, &colour, NULL,
+  gtk_text_insert (GTK_TEXT (text), NULL, &color, NULL,
 		   "colored ", -1);
  gtk_text_insert (GTK_TEXT (text), NULL, &text->style->black, NULL,
 		   "text and different ", -1);
@@ -145,13 +148,13 @@ int main (int argc, char *argv[])
  gtk_box_pack_start (GTK_BOX (hbox), check, FALSE, FALSE, 0);
  gtk_signal_connect (GTK_OBJECT(check), "toggled",
 		      GTK_SIGNAL_FUNC(text_toggle_editable), text);
-  gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(check), TRUE);
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), TRUE);
  gtk_widget_show (check);
  check = gtk_check_button_new_with_label("Wrap Words");
  gtk_box_pack_start (GTK_BOX (hbox), check, FALSE, TRUE, 0);
  gtk_signal_connect (GTK_OBJECT(check), "toggled",
 		      GTK_SIGNAL_FUNC(text_toggle_word_wrap), text);
-  gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(check), FALSE);
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), FALSE);
  gtk_widget_show (check);

  separator = gtk_hseparator_new ();
@@ -159,7 +162,7 @@ int main (int argc, char *argv[])
  gtk_widget_show (separator);

  box2 = gtk_vbox_new (FALSE, 10);
-  gtk_container_border_width (GTK_CONTAINER (box2), 10);
+  gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
  gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
  gtk_widget_show (box2);
  
@@ -176,6 +179,6 @@ int main (int argc, char *argv[])

  gtk_main ();
  
-  return 0;       
+  return(0);       
 }
 /* example-end */
--- a/examples/tictactoe/tictactoe.c
+++ b/examples/tictactoe/tictactoe.c
@@ -68,8 +68,10 @@ tictactoe_class_init (TictactoeClass *class)
  tictactoe_signals[TICTACTOE_SIGNAL] = gtk_signal_new ("tictactoe",
 					 GTK_RUN_FIRST,
 					 object_class->type,
-					 GTK_SIGNAL_OFFSET (TictactoeClass, tictactoe),
-					 gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
+					 GTK_SIGNAL_OFFSET (TictactoeClass,
+                                                            tictactoe),
+					 gtk_signal_default_marshaller,
+                                         GTK_TYPE_NONE, 0);


  gtk_object_class_add_signals (object_class, tictactoe_signals, LAST_SIGNAL);
@@ -115,7 +117,7 @@ tictactoe_clear (Tictactoe *ttt)
    for (j=0;j<3;j++)
      {
 	gtk_signal_handler_block_by_data (GTK_OBJECT(ttt->buttons[i][j]), ttt);
-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (ttt->buttons[i][j]),
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ttt->buttons[i][j]),
 				     FALSE);
 	gtk_signal_handler_unblock_by_data (GTK_OBJECT(ttt->buttons[i][j]), ttt);
      }
--- a/examples/tictactoe/ttt_test.c
+++ b/examples/tictactoe/ttt_test.c
@@ -3,15 +3,15 @@
 #include <gtk/gtk.h>
 #include "tictactoe.h"

-void
-win (GtkWidget *widget, gpointer data)
+void win( GtkWidget *widget,
+          gpointer   data )
 {
  g_print ("Yay!\n");
  tictactoe_clear (TICTACTOE (widget));
 }

-int 
-main (int argc, char *argv[])
+int main( int   argc,
+          char *argv[] )
 {
  GtkWidget *window;
  GtkWidget *ttt;
@@ -25,7 +25,7 @@ main (int argc, char *argv[])
  gtk_signal_connect (GTK_OBJECT (window), "destroy",
 		      GTK_SIGNAL_FUNC (gtk_exit), NULL);
  
-  gtk_container_border_width (GTK_CONTAINER (window), 10);
+  gtk_container_set_border_width (GTK_CONTAINER (window), 10);

  ttt = tictactoe_new ();
  
--- a/examples/tree/tree.c
+++ b/examples/tree/tree.c
@@ -3,12 +3,13 @@
 #include <gtk/gtk.h>

 /* for all the GtkItem:: and GtkTreeItem:: signals */
-static void cb_itemsignal (GtkWidget *item, gchar *signame)
+static void cb_itemsignal( GtkWidget *item,
+                           gchar     *signame )
 {
  gchar *name;
  GtkLabel *label;

-  /* It's a GtkBin, so it has one child, which we know to be a
+  /* It's a Bin, so it has one child, which we know to be a
     label, so get that */
  label = GTK_LABEL (GTK_BIN (item)->child);
  /* Get the text of the label */
@@ -19,8 +20,9 @@ static void cb_itemsignal (GtkWidget *item, gchar *signame)
 }

 /* Note that this is never called */
-static void cb_unselect_child (GtkWidget *root_tree, GtkWidget *child,
-			       GtkWidget *subtree)
+static void cb_unselect_child( GtkWidget *root_tree,
+                               GtkWidget *child,
+                               GtkWidget *subtree )
 {
  g_print ("unselect_child called for root tree %p, subtree %p, child %p\n",
 	   root_tree, subtree, child);
@@ -35,7 +37,7 @@ static void cb_select_child (GtkWidget *root_tree, GtkWidget *child,
 	   root_tree, subtree, child);
 }

-static void cb_selection_changed (GtkWidget *tree)
+static void cb_selection_changed( GtkWidget *tree )
 {
  GList *i;
  
@@ -58,7 +60,8 @@ static void cb_selection_changed (GtkWidget *tree)
  }
 }

-int main (int argc, char *argv[])
+int main( int   argc,
+          char *argv[] )
 {
  GtkWidget *window, *scrolled_win, *tree;
  static gchar *itemnames[] = {"Foo", "Bar", "Baz", "Quux",
@@ -71,7 +74,7 @@ int main (int argc, char *argv[])
  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
  gtk_signal_connect (GTK_OBJECT(window), "delete_event",
 		      GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
-  gtk_container_border_width (GTK_CONTAINER(window), 5);
+  gtk_container_set_border_width (GTK_CONTAINER(window), 5);

  /* A generic scrolled window */
  scrolled_win = gtk_scrolled_window_new (NULL, NULL);
--- a/examples/wheelbarrow/wheelbarrow.c
+++ b/examples/wheelbarrow/wheelbarrow.c
@@ -120,11 +120,16 @@ static char * WheelbarrowFull_xpm[] = {


 /* When invoked (via signal delete_event), terminates the application */
-void close_application( GtkWidget *widget, GdkEvent *event, gpointer data ) {
+gint close_application( GtkWidget *widget,
+                        GdkEvent  *event,
+                        gpointer   data )
+{
    gtk_main_quit();
+    return(FALSE);
 }

-int main (int argc, char *argv[])
+int main (int argc,
+          char *argv[] )
 {
    /* GtkWidget is the storage type for widgets */
    GtkWidget *window, *pixmap, *fixed;
--- a/Show More
+++ b/Show More