Define GTK_HAVE_RC_SET_IMAGE_LOADER, to be used in gnome-libs

1998-05-22  Miguel de Icaza  <miguel@nuclecu.unam.mx>

	* gtk/gtkfeatures.h.in: Define GTK_HAVE_RC_SET_IMAGE_LOADER, to be
	used in gnome-libs

12 files changed, 517 insertions, 220 deletions

diff --git a/ChangeLog b/ChangeLog
index f18865205b..978d0b01b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-05-22  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gtk/gtkfeatures.h.in: Define GTK_HAVE_RC_SET_IMAGE_LOADER, to be
+	used in gnome-libs
+
 1998-05-22    <sopwith@redhat.com>
 
 	* gtk/gtkeventbox.c: Pass size_allocate on to the child
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f18865205b..978d0b01b2 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+1998-05-22  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gtk/gtkfeatures.h.in: Define GTK_HAVE_RC_SET_IMAGE_LOADER, to be
+	used in gnome-libs
+
 1998-05-22    <sopwith@redhat.com>
 
 	* gtk/gtkeventbox.c: Pass size_allocate on to the child
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f18865205b..978d0b01b2 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+1998-05-22  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gtk/gtkfeatures.h.in: Define GTK_HAVE_RC_SET_IMAGE_LOADER, to be
+	used in gnome-libs
+
 1998-05-22    <sopwith@redhat.com>
 
 	* gtk/gtkeventbox.c: Pass size_allocate on to the child
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f18865205b..978d0b01b2 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+1998-05-22  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gtk/gtkfeatures.h.in: Define GTK_HAVE_RC_SET_IMAGE_LOADER, to be
+	used in gnome-libs
+
 1998-05-22    <sopwith@redhat.com>
 
 	* gtk/gtkeventbox.c: Pass size_allocate on to the child
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f18865205b..978d0b01b2 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+1998-05-22  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gtk/gtkfeatures.h.in: Define GTK_HAVE_RC_SET_IMAGE_LOADER, to be
+	used in gnome-libs
+
 1998-05-22    <sopwith@redhat.com>
 
 	* gtk/gtkeventbox.c: Pass size_allocate on to the child
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f18865205b..978d0b01b2 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+1998-05-22  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gtk/gtkfeatures.h.in: Define GTK_HAVE_RC_SET_IMAGE_LOADER, to be
+	used in gnome-libs
+
 1998-05-22    <sopwith@redhat.com>
 
 	* gtk/gtkeventbox.c: Pass size_allocate on to the child
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f18865205b..978d0b01b2 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+1998-05-22  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gtk/gtkfeatures.h.in: Define GTK_HAVE_RC_SET_IMAGE_LOADER, to be
+	used in gnome-libs
+
 1998-05-22    <sopwith@redhat.com>
 
 	* gtk/gtkeventbox.c: Pass size_allocate on to the child
diff --git a/Makefile.in b/Makefile.in
index cf35930636..6417312533 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.2c from Makefile.am
+# Makefile.in generated automatically by automake 1.3 from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -32,6 +32,8 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
+DISTDIR =
+
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -49,19 +51,26 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 CC = @CC@
-CPP = @CPP@
+GTK_MAJOR_VERSION = @GTK_MAJOR_VERSION@
+GTK_MICRO_VERSION = @GTK_MICRO_VERSION@
+GTK_MINOR_VERSION = @GTK_MINOR_VERSION@
+GTK_VERSION = @GTK_VERSION@
 LD = @LD@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
+LT_AGE = @LT_AGE@
+LT_CURRENT = @LT_CURRENT@
+LT_RELEASE = @LT_RELEASE@
+LT_REVISION = @LT_REVISION@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NM = @NM@
@@ -77,14 +86,88 @@ xinput_progs = @xinput_progs@
 SRC_SUBDIRS = glib gdk gtk
 SUBDIRS = $(SRC_SUBDIRS) docs
 
-EXTRA_DIST = gtk+.prj makecopyright TODO REFCOUNTING BUGS
+bin_SCRIPTS = gtk-config
+
+EXTRA_DIST =	\
+	gtk+.spec	\
+        gtk.m4          \
+	makecopyright	\
+	TODO		\
+	NEWS.pre-1-0	\
+	ChangeLog.pre-1-0	\
+	examples/aspectframe/Makefile  \
+	examples/aspectframe/aspectframe.c  \
+	examples/buttons/Makefile  \
+	examples/buttons/buttons.c  \
+	examples/buttons/info.xpm  \
+	examples/entry/Makefile  \
+	examples/entry/entry.c  \
+	examples/eventbox/Makefile  \
+	examples/eventbox/eventbox.c  \
+	examples/filesel/Makefile  \
+	examples/filesel/filesel.c  \
+	examples/gtkdial/Makefile  \
+	examples/gtkdial/dial_test.c  \
+	examples/gtkdial/gtkdial.c  \
+	examples/gtkdial/gtkdial.h  \
+	examples/helloworld/Makefile  \
+	examples/helloworld/helloworld.c  \
+	examples/helloworld2/Makefile  \
+	examples/helloworld2/helloworld2.c  \
+	examples/list/Makefile  \
+	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/notebook/Makefile  \
+	examples/notebook/notebook.c  \
+	examples/packbox/Makefile  \
+	examples/packbox/packbox.c  \
+	examples/paned/Makefile  \
+	examples/paned/paned.c  \
+	examples/pixmap/Makefile  \
+	examples/pixmap/pixmap.c  \
+	examples/progressbar/Makefile  \
+	examples/progressbar/progressbar.c  \
+	examples/radiobuttons/Makefile  \
+	examples/radiobuttons/radiobuttons.c  \
+	examples/rulers/Makefile  \
+	examples/rulers/rulers.c  \
+	examples/scribble-simple/Makefile  \
+	examples/scribble-simple/scribble-simple.c  \
+	examples/scrolledwin/Makefile  \
+	examples/scrolledwin/scrolledwin.c  \
+	examples/selection/Makefile  \
+	examples/selection/gettargets.c  \
+	examples/selection/setselection.c  \
+	examples/statusbar/Makefile  \
+	examples/statusbar/statusbar.c  \
+	examples/table/Makefile  \
+	examples/table/table.c  \
+	examples/tictactoe/Makefile  \
+	examples/tictactoe/tictactoe.c  \
+	examples/tictactoe/tictactoe.h  \
+	examples/tictactoe/ttt_test.c  \
+	examples/wheelbarrow/Makefile  \
+	examples/wheelbarrow/wheelbarrow.c  \
+	examples/find-examples.sh
+
+m4datadir = $(datadir)/aclocal
+m4data_DATA = gtk.m4
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =  gtk+.xconfig
+CONFIG_CLEAN_FILES =  gtk-config
+SCRIPTS =  $(bin_SCRIPTS)
+
+DATA =  $(m4data_DATA)
+
 DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
 Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess config.h.in \
-config.sub configure configure.in gtk+.xconfig.in install-sh ltconfig \
+config.sub configure configure.in gtk-config.in install-sh ltconfig \
 ltmain.sh missing mkinstalldirs stamp-h.in
 
 
@@ -92,13 +175,13 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP = --best
-default: all
+all: all-recursive-am all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -130,9 +213,47 @@ distclean-hdr:
 	-rm -f config.h
 
 maintainer-clean-hdr:
-gtk+.xconfig: $(top_builddir)/config.status gtk+.xconfig.in
+gtk-config: $(top_builddir)/config.status gtk-config.in
 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
 
+install-binSCRIPTS: $(bin_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+	  else if test -f $(srcdir)/$$p; then \
+	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+	  else :; fi; fi; \
+	done
+
+uninstall-binSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	list='$(bin_SCRIPTS)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+	done
+
+install-m4dataDATA: $(m4data_DATA)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
+	@list='$(m4data_DATA)'; for p in $$list; do \
+	  if test -f $(srcdir)/$$p; then \
+	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(m4datadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(m4datadir)/$$p; \
+	  else if test -f $$p; then \
+	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(m4datadir)/$$p"; \
+	    $(INSTALL_DATA) $$p $(DESTDIR)$(m4datadir)/$$p; \
+	  fi; fi; \
+	done
+
+uninstall-m4dataDATA:
+	@$(NORMAL_UNINSTALL)
+	list='$(m4data_DATA)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(m4datadir)/$$p; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -146,7 +267,7 @@ all-recursive install-data-recursive install-exec-recursive \
 installdirs-recursive install-recursive uninstall-recursive  \
 check-recursive installcheck-recursive info-recursive dvi-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
-	for subdir in $(SUBDIRS); do \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  target=`echo $@ | sed s/-recursive//`; \
 	  echo "Making $$target in $$subdir"; \
 	  (cd $$subdir && $(MAKE) $$target) \
@@ -156,7 +277,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
-	rev=''; for subdir in $(SUBDIRS); do rev="$$subdir $$rev"; done; \
+	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+	  rev="$$subdir $$rev"; \
+	done; \
 	for subdir in $$rev; do \
 	  target=`echo $@ | sed s/-recursive//`; \
 	  echo "Making $$target in $$subdir"; \
@@ -170,17 +293,22 @@ tags-recursive:
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES)
-	here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES)
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
 	tags=; \
 	here=`pwd`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
 	done; \
-	test -z "$(ETAGS_ARGS)config.h.in$(SOURCES)$(HEADERS)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $(SOURCES) $(HEADERS) -o $$here/TAGS)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
@@ -232,6 +360,20 @@ distdir: $(DISTFILES)
 	distdir=`cd $(distdir) && pwd`; \
 	cd $(top_srcdir) \
 	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
+	$(mkinstalldirs) $(distdir)/examples $(distdir)/examples/aspectframe \
+	   $(distdir)/examples/buttons $(distdir)/examples/entry \
+	   $(distdir)/examples/eventbox $(distdir)/examples/filesel \
+	   $(distdir)/examples/gtkdial $(distdir)/examples/helloworld \
+	   $(distdir)/examples/helloworld2 $(distdir)/examples/list \
+	   $(distdir)/examples/menu $(distdir)/examples/notebook \
+	   $(distdir)/examples/packbox $(distdir)/examples/paned \
+	   $(distdir)/examples/pixmap $(distdir)/examples/progressbar \
+	   $(distdir)/examples/radiobuttons $(distdir)/examples/rulers \
+	   $(distdir)/examples/scribble-simple \
+	   $(distdir)/examples/scrolledwin \
+	   $(distdir)/examples/selection $(distdir)/examples/statusbar \
+	   $(distdir)/examples/table $(distdir)/examples/tictactoe \
+	   $(distdir)/examples/wheelbarrow
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  test -f $(distdir)/$$file \
@@ -254,24 +396,29 @@ installcheck: installcheck-recursive
 all-recursive-am: config.h
 	$(MAKE) all-recursive
 
-all-am: Makefile config.h
+all-am: Makefile $(SCRIPTS) $(DATA) config.h
 
-install-exec: install-exec-recursive
+install-exec-am: install-binSCRIPTS
+
+install-data-am: install-m4dataDATA
+
+uninstall-am: uninstall-binSCRIPTS uninstall-m4dataDATA
+
+install-exec: install-exec-recursive install-exec-am
 	@$(NORMAL_INSTALL)
 
-install-data: install-data-recursive
+install-data: install-data-recursive install-data-am
 	@$(NORMAL_INSTALL)
 
-install: install-recursive
+install: install-recursive install-exec-am install-data-am
 	@:
 
-uninstall: uninstall-recursive
-
-all: all-recursive-am all-am
+uninstall: uninstall-recursive uninstall-am
 
 install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs: installdirs-recursive
+	$(mkinstalldirs)  $(DATADIR)$(bindir) $(DATADIR)$(m4datadir)
 
 
 mostlyclean-generic:
@@ -310,18 +457,19 @@ maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
 	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f config.status
 
-.PHONY: default mostlyclean-hdr distclean-hdr clean-hdr \
-maintainer-clean-hdr install-data-recursive uninstall-data-recursive \
+.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+uninstall-binSCRIPTS install-binSCRIPTS uninstall-m4dataDATA \
+install-m4dataDATA install-data-recursive uninstall-data-recursive \
 install-exec-recursive uninstall-exec-recursive installdirs-recursive \
 uninstalldirs-recursive all-recursive check-recursive \
 installcheck-recursive info-recursive dvi-recursive \
 mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
-installcheck all-recursive-am all-am install-exec install-data install \
-uninstall all installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
+installcheck all-recursive-am all-am install-exec-am install-data-am \
+uninstall-am install-exec install-data install uninstall all \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 .PHONY: files populate checkin release
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 98094211aa..dec979cf6d 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.2c from Makefile.am
+# Makefile.in generated automatically by automake 1.3 from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -32,6 +32,8 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
+DISTDIR =
+
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -49,19 +51,26 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 CC = @CC@
-CPP = @CPP@
+GTK_MAJOR_VERSION = @GTK_MAJOR_VERSION@
+GTK_MICRO_VERSION = @GTK_MICRO_VERSION@
+GTK_MINOR_VERSION = @GTK_MINOR_VERSION@
+GTK_VERSION = @GTK_VERSION@
 LD = @LD@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
+LT_AGE = @LT_AGE@
+LT_CURRENT = @LT_CURRENT@
+LT_RELEASE = @LT_RELEASE@
+LT_REVISION = @LT_REVISION@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NM = @NM@
@@ -74,17 +83,41 @@ x_ldflags = @x_ldflags@
 x_libs = @x_libs@
 xinput_progs = @xinput_progs@
 
-info_TEXINFOS = gdk.texi gtk.texi
-
-EXTRA_DIST = texinfo.tex macros.texi Makefile.gtkfaq gtkfaq.sgml gtkfaq_fix
+info_TEXINFOS = gdk.texi gtk.texi glib.texi
+
+man_MANS = gtk-config.1
+
+EXTRA_DIST =	\
+	texinfo.tex 		\
+	macros.texi		\
+	Makefile.sgml		\
+	gtkdocs_fix		\
+	gtkfaq.sgml		\
+        gtk-config.txt          \
+	gtk_tut.sgml		\
+	gtk_tut_it.sgml		\
+	debugging.txt		\
+	developers.txt		\
+	refcounting.txt		\
+	styles.txt		\
+	text_widget.txt 	\
+	widget_system.txt 	\
+	gtk_tut_packbox1.gif 	\
+	gtk_tut_packbox2.gif 	\
+	gtk_tut_table.gif	\
+	gtk-config.1
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
 TEXI2DVI = texi2dvi
 TEXINFO_TEX = $(srcdir)/texinfo.tex
-INFO_DEPS = gdk.info gtk.info
-DVIS = gdk.dvi gtk.dvi
-TEXINFOS = gdk.texi gtk.texi
+INFO_DEPS = gdk.info gtk.info glib.info
+DVIS = gdk.dvi gtk.dvi glib.dvi
+TEXINFOS = gdk.texi gtk.texi glib.texi
+man1dir = $(mandir)/man1
+MANS = $(man_MANS)
+
+NROFF = nroff
 DIST_COMMON =  Makefile.am Makefile.in texinfo.tex
 
 
@@ -92,14 +125,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP = --best
-default: all
+all: Makefile $(INFO_DEPS) $(MANS)
 
 .SUFFIXES:
-.SUFFIXES: .dvi .info .ps .texi .texinfo
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+.SUFFIXES: .dvi .info .ps .texi .texinfo .txi
+$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -112,6 +145,10 @@ gtk.info: gtk.texi
 gtk.dvi: gtk.texi
 
 
+glib.info: glib.texi
+glib.dvi: glib.texi
+
+
 DVIPS = dvips
 
 .texi.info:
@@ -141,26 +178,40 @@ DVIPS = dvips
 .texinfo.dvi:
 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
+
+.txi.info:
+	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+	cd $(srcdir) \
+	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+
+.txi.dvi:
+	TEXINPUTS=$(srcdir):$$TEXINPUTS \
+	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
+
+.txi:
+	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+	cd $(srcdir) \
+	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 .dvi.ps:
 	$(DVIPS) $< -o $@
 
 install-info-am: $(INFO_DEPS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(infodir)
+	$(mkinstalldirs) $(DESTDIR)$(infodir)
 	@for file in $(INFO_DEPS); do \
 	  d=$(srcdir); \
 	  for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
 	    if test -f $$d/$$ifile; then \
-	      echo " $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile"; \
-	      $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile; \
+	      echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
+	      $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
 	    else : ; fi; \
 	  done; \
 	done
 	@$(POST_INSTALL)
 	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
 	  for file in $(INFO_DEPS); do \
-	    echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\
-	    install-info --info-dir=$(infodir) $(infodir)/$$file || :;\
+	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
+	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
 	  done; \
 	else : ; fi
 
@@ -170,11 +221,12 @@ uninstall-info:
 	  ii=yes; \
 	else ii=; fi; \
 	for file in $(INFO_DEPS); do \
-	  test -z $ii || install-info --info-dir=$(infodir) --remove $$file; \
+	  test -z "$ii" \
+	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
 	done
-	$(NORMAL_UNINSTALL)
+	@$(NORMAL_UNINSTALL)
 	for file in $(INFO_DEPS); do \
-	  (cd $(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \
+	  (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \
 	done
 
 dist-info: $(INFO_DEPS)
@@ -192,7 +244,10 @@ mostlyclean-aminfo:
 	  gdk.ps gdk.log gdk.pg gdk.toc gdk.tp gdk.tps gdk.vr gdk.vrs \
 	  gdk.op gdk.tr gdk.cv gdk.cn gtk.aux gtk.cp gtk.cps gtk.dvi \
 	  gtk.fn gtk.fns gtk.ky gtk.kys gtk.ps gtk.log gtk.pg gtk.toc \
-	  gtk.tp gtk.tps gtk.vr gtk.vrs gtk.op gtk.tr gtk.cv gtk.cn
+	  gtk.tp gtk.tps gtk.vr gtk.vrs gtk.op gtk.tr gtk.cv gtk.cn \
+	  glib.aux glib.cp glib.cps glib.dvi glib.fn glib.fns glib.ky \
+	  glib.kys glib.ps glib.log glib.pg glib.toc glib.tp glib.tps \
+	  glib.vr glib.vrs glib.op glib.tr glib.cv glib.cn
 
 clean-aminfo:
 
@@ -205,6 +260,45 @@ maintainer-clean-aminfo:
 	    rm -f $$i-[0-9]*; \
 	  fi; \
 	done
+
+install-man1:
+	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+	@list='$(man1_MANS)'; \
+	l2='$(man_MANS)'; for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+	done
+
+uninstall-man1:
+	@list='$(man1_MANS)'; \
+	l2='$(man_MANS)'; for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
+	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
+	done
+install-man: $(MANS)
+	@$(NORMAL_INSTALL)
+	$(MAKE) install-man1
+uninstall-man:
+	@$(NORMAL_UNINSTALL)
+	$(MAKE) uninstall-man1
 tags: TAGS
 TAGS:
 
@@ -234,20 +328,18 @@ installcheck:
 install-exec: 
 	@$(NORMAL_INSTALL)
 
-install-data: install-info-am
+install-data: install-info-am install-man
 	@$(NORMAL_INSTALL)
 
 install: install-exec install-data all
 	@:
 
-uninstall: uninstall-info
-
-all: Makefile $(INFO_DEPS)
+uninstall: uninstall-info uninstall-man
 
 install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:
-	$(mkinstalldirs)  $(infodir)
+	$(mkinstalldirs)  $(DESTDIR)$(infodir) $(DESTDIR)$(mandir)/man1
 
 
 mostlyclean-generic:
@@ -277,9 +369,10 @@ maintainer-clean:  maintainer-clean-aminfo maintainer-clean-generic \
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
-.PHONY: default install-info-am uninstall-info mostlyclean-aminfo \
-distclean-aminfo clean-aminfo maintainer-clean-aminfo tags distdir info \
-dvi installcheck install-exec install-data install uninstall all \
+.PHONY: install-info-am uninstall-info mostlyclean-aminfo \
+distclean-aminfo clean-aminfo maintainer-clean-aminfo install-man1 \
+uninstall-man1 install-man uninstall-man tags distdir info dvi \
+installcheck install-exec install-data install uninstall all \
 installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
diff --git a/gtk/Makefile.in b/gtk/Makefile.in
index 57c6c3cf26..48cc410cb3 100644
--- a/gtk/Makefile.in
+++ b/gtk/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.2c from Makefile.am
+# Makefile.in generated automatically by automake 1.3 from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -32,6 +32,8 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
+DISTDIR =
+
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -49,19 +51,26 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 CC = @CC@
-CPP = @CPP@
+GTK_MAJOR_VERSION = @GTK_MAJOR_VERSION@
+GTK_MICRO_VERSION = @GTK_MICRO_VERSION@
+GTK_MINOR_VERSION = @GTK_MINOR_VERSION@
+GTK_VERSION = @GTK_VERSION@
 LD = @LD@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
+LT_AGE = @LT_AGE@
+LT_CURRENT = @LT_CURRENT@
+LT_RELEASE = @LT_RELEASE@
+LT_REVISION = @LT_REVISION@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NM = @NM@
@@ -76,9 +85,9 @@ xinput_progs = @xinput_progs@
 
 gtkincludedir = $(includedir)/gtk
 
-lib_LTLIBRARIES = libgtk.la
+lib_LTLIBRARIES = libgtk-1.1.la
 
-libgtk_la_SOURCES = \
+libgtk_1_1_la_SOURCES = \
 	gtkaccelerator.c	\
 	gtkadjustment.c		\
 	gtkaspectframe.c	\
@@ -94,10 +103,12 @@ libgtk_la_SOURCES = \
 	gtkcolorsel.c		\
 	gtkcombo.c		\
 	gtkcontainer.c		\
+	gtkctree.c		\
 	gtkcurve.c		\
 	gtkdata.c		\
 	gtkdialog.c		\
 	gtkdrawingarea.c	\
+	gtkeditable.c           \
 	gtkentry.c		\
 	gtkeventbox.c		\
 	gtkfilesel.c		\
@@ -144,10 +155,12 @@ libgtk_la_SOURCES = \
 	gtkselection.c		\
 	gtkseparator.c		\
 	gtksignal.c		\
+	gtkspinbutton.c		\
 	gtkstyle.c		\
 	gtkstatusbar.c		\
 	gtktable.c		\
 	gtktext.c		\
+	gtktipsquery.c		\
 	gtktogglebutton.c	\
 	gtktoolbar.c		\
 	gtktooltips.c		\
@@ -184,13 +197,17 @@ gtkinclude_HEADERS = \
 	gtkcolorsel.h		\
 	gtkcombo.h		\
 	gtkcontainer.h		\
+	gtkctree.h		\
 	gtkcurve.h		\
 	gtkdata.h		\
+	gtkdebug.h              \
 	gtkdialog.h		\
 	gtkdrawingarea.h	\
+	gtkeditable.h           \
 	gtkentry.h		\
 	gtkenums.h		\
 	gtkeventbox.h		\
+	gtkfeatures.h		\
 	gtkfilesel.h		\
 	gtkfixed.h		\
 	gtkframe.h		\
@@ -223,6 +240,7 @@ gtkinclude_HEADERS = \
 	gtkpaned.h		\
 	gtkpixmap.h		\
 	gtkpreview.h		\
+	gtkprivate.h		\
 	gtkprogressbar.h	\
 	gtkradiobutton.h	\
 	gtkradiomenuitem.h	\
@@ -235,10 +253,12 @@ gtkinclude_HEADERS = \
 	gtkselection.h		\
 	gtkseparator.h		\
 	gtksignal.h		\
+	gtkspinbutton.h		\
 	gtkstyle.h		\
 	gtkstatusbar.h		\
 	gtktable.h		\
 	gtktext.h		\
+	gtktipsquery.h		\
 	gtktogglebutton.h	\
 	gtktoolbar.h		\
 	gtktooltips.h		\
@@ -257,13 +277,15 @@ gtkinclude_HEADERS = \
 	gtkwindow.h             \
 	gtktypebuiltins.h
 
-libgtk_la_LDFLAGS = -version-info 1:0:0
+libgtk_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 EXTRA_DIST = \
 	line-arrow.xbm 		\
 	line-wrap.xbm 		\
 	testgtkrc 		\
+	testgtkrc2 		\
 	gtk.defs		\
+	gtkfeatures.h.in	\
 	runelisp 		\
 	gentypeinfo.el 		\
 	gtktypebuiltins.c	\
@@ -275,64 +297,41 @@ EXTRA_DIST = \
 	tree_plus.xpm		\
 	tree_minus.xpm		\
 	tree_plus.xbm		\
-	tree_minus.xbm
-
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib @x_cflags@ 
-
-noinst_PROGRAMS = testgtk testinput testselection simple testtree
-testgtk_LDADD = \
-	libgtk.la				\
-	$(top_builddir)/gdk/libgdk.la		\
-	@x_ldflags@				\
-	@x_libs@				\
-	$(top_builddir)/glib/libglib.la		\
-	-lm
+	tree_minus.xbm          \
+        circles.xbm
 
-testinput_LDADD = \
-	libgtk.la				\
-	$(top_builddir)/gdk/libgdk.la		\
-	@x_ldflags@				\
-	@x_libs@				\
-	$(top_builddir)/glib/libglib.la		\
-	-lm
+INCLUDES = -I$(top_srcdir) -I../glib -I$(top_srcdir)/glib @x_cflags@ 
 
-testselection_LDADD = \
-	libgtk.la				\
-	$(top_builddir)/gdk/libgdk.la		\
-	@x_ldflags@				\
-	@x_libs@				\
-	$(top_builddir)/glib/libglib.la		\
-	-lm
+noinst_PROGRAMS = testgtk testinput testselection testthreads simple 
 
-simple_LDADD = \
-	libgtk.la				\
-	$(top_builddir)/gdk/libgdk.la		\
-	@x_ldflags@				\
-	@x_libs@				\
-	$(top_builddir)/glib/libglib.la		\
-	-lm
+# FIXME, we currently rely on linking against libglib-1.1
 
-testtree_LDADD = \
-	libgtk.la				\
-	$(top_builddir)/gdk/libgdk.la		\
-	@x_ldflags@				\
-	@x_libs@				\
-	$(top_builddir)/glib/libglib.la		\
+DEPS =	\
+	libgtk-@LT_RELEASE@.la				\
+	$(top_builddir)/gdk/libgdk-@LT_RELEASE@.la	\
+	$(top_builddir)/glib/libglib-1.1.la
+LDADDS = \
+	libgtk-@LT_RELEASE@.la				\
+	$(top_builddir)/gdk/libgdk-@LT_RELEASE@.la	\
+	@x_ldflags@					\
+	@x_libs@					\
+	$(top_builddir)/glib/libglib-1.1.la		\
 	-lm
 
-DEPS = \
-	$(top_builddir)/gtk/libgtk.la		\
-	$(top_builddir)/gdk/libgdk.la		\
-	$(top_builddir)/glib/libglib.la
-
 testgtk_DEPENDENCIES = $(DEPS)
 testinput_DEPENDENCIES = $(DEPS)
+testthreads_DEPENDENCIES = $(DEPS)
 testselection_DEPENDENCIES = $(DEPS)
 simple_DEPENDENCIES = $(DEPS)
-testtree_DEPENDENCIES = $(DEPS)
+
+testgtk_LDADD = $(LDADDS)
+testinput_LDADD = $(LDADDS)
+testthreads_LDADD = $(LDADDS)
+testselection_LDADD = $(LDADDS)
+simple_LDADD = $(LDADDS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
+CONFIG_CLEAN_FILES =  gtkfeatures.h
 LTLIBRARIES =  $(lib_LTLIBRARIES)
 
 
@@ -344,25 +343,26 @@ X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libgtk_la_LIBADD = 
-libgtk_la_OBJECTS =  gtkaccelerator.lo gtkadjustment.lo \
+libgtk_1_1_la_LIBADD = 
+libgtk_1_1_la_OBJECTS =  gtkaccelerator.lo gtkadjustment.lo \
 gtkaspectframe.lo gtkalignment.lo gtkarrow.lo gtkbin.lo gtkbbox.lo \
 gtkbox.lo gtkbutton.lo gtkcheckbutton.lo gtkcheckmenuitem.lo \
-gtkclist.lo gtkcolorsel.lo gtkcombo.lo gtkcontainer.lo gtkcurve.lo \
-gtkdata.lo gtkdialog.lo gtkdrawingarea.lo gtkentry.lo gtkeventbox.lo \
-gtkfilesel.lo gtkfixed.lo gtkframe.lo gtkgamma.lo gtkgc.lo \
-gtkhandlebox.lo gtkhbbox.lo gtkhbox.lo gtkhpaned.lo gtkhruler.lo \
-gtkhscale.lo gtkhscrollbar.lo gtkhseparator.lo gtkimage.lo \
-gtkinputdialog.lo gtkitem.lo gtklabel.lo gtklist.lo gtklistitem.lo \
-gtkmain.lo gtkmenu.lo gtkmenubar.lo gtkmenufactory.lo gtkmenuitem.lo \
-gtkmenushell.lo gtkmisc.lo gtknotebook.lo gtkobject.lo gtkoptionmenu.lo \
-gtkpaned.lo gtkpixmap.lo gtkpreview.lo gtkprogressbar.lo \
-gtkradiobutton.lo gtkradiomenuitem.lo gtkrange.lo gtkrc.lo gtkruler.lo \
-gtkscale.lo gtkscrollbar.lo gtkscrolledwindow.lo gtkselection.lo \
-gtkseparator.lo gtksignal.lo gtkstyle.lo gtkstatusbar.lo gtktable.lo \
-gtktext.lo gtktogglebutton.lo gtktoolbar.lo gtktooltips.lo gtktree.lo \
-gtktreeitem.lo gtktypeutils.lo gtkvbbox.lo gtkvbox.lo gtkviewport.lo \
-gtkvpaned.lo gtkvruler.lo gtkvscale.lo gtkvscrollbar.lo \
+gtkclist.lo gtkcolorsel.lo gtkcombo.lo gtkcontainer.lo gtkctree.lo \
+gtkcurve.lo gtkdata.lo gtkdialog.lo gtkdrawingarea.lo gtkeditable.lo \
+gtkentry.lo gtkeventbox.lo gtkfilesel.lo gtkfixed.lo gtkframe.lo \
+gtkgamma.lo gtkgc.lo gtkhandlebox.lo gtkhbbox.lo gtkhbox.lo \
+gtkhpaned.lo gtkhruler.lo gtkhscale.lo gtkhscrollbar.lo \
+gtkhseparator.lo gtkimage.lo gtkinputdialog.lo gtkitem.lo gtklabel.lo \
+gtklist.lo gtklistitem.lo gtkmain.lo gtkmenu.lo gtkmenubar.lo \
+gtkmenufactory.lo gtkmenuitem.lo gtkmenushell.lo gtkmisc.lo \
+gtknotebook.lo gtkobject.lo gtkoptionmenu.lo gtkpaned.lo gtkpixmap.lo \
+gtkpreview.lo gtkprogressbar.lo gtkradiobutton.lo gtkradiomenuitem.lo \
+gtkrange.lo gtkrc.lo gtkruler.lo gtkscale.lo gtkscrollbar.lo \
+gtkscrolledwindow.lo gtkselection.lo gtkseparator.lo gtksignal.lo \
+gtkspinbutton.lo gtkstyle.lo gtkstatusbar.lo gtktable.lo gtktext.lo \
+gtktipsquery.lo gtktogglebutton.lo gtktoolbar.lo gtktooltips.lo \
+gtktree.lo gtktreeitem.lo gtktypeutils.lo gtkvbbox.lo gtkvbox.lo \
+gtkviewport.lo gtkvpaned.lo gtkvruler.lo gtkvscale.lo gtkvscrollbar.lo \
 gtkvseparator.lo gtkwidget.lo gtkwindow.lo fnmatch.lo
 PROGRAMS =  $(noinst_PROGRAMS)
 
@@ -375,19 +375,19 @@ testinput_LDFLAGS =
 testselection_SOURCES = testselection.c
 testselection_OBJECTS =  testselection.o
 testselection_LDFLAGS = 
+testthreads_SOURCES = testthreads.c
+testthreads_OBJECTS =  testthreads.o
+testthreads_LDFLAGS = 
 simple_SOURCES = simple.c
 simple_OBJECTS =  simple.o
 simple_LDFLAGS = 
-testtree_SOURCES = testtree.c
-testtree_OBJECTS =  testtree.o
-testtree_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 HEADERS =  $(gtkinclude_HEADERS)
 
-DIST_COMMON =  Makefile.am Makefile.in
+DIST_COMMON =  Makefile.am Makefile.in gtkfeatures.h.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -399,14 +399,15 @@ DEP_FILES =  .deps/fnmatch.P .deps/gtkaccelerator.P \
 .deps/gtkaspectframe.P .deps/gtkbbox.P .deps/gtkbin.P .deps/gtkbox.P \
 .deps/gtkbutton.P .deps/gtkcheckbutton.P .deps/gtkcheckmenuitem.P \
 .deps/gtkclist.P .deps/gtkcolorsel.P .deps/gtkcombo.P \
-.deps/gtkcontainer.P .deps/gtkcurve.P .deps/gtkdata.P .deps/gtkdialog.P \
-.deps/gtkdrawingarea.P .deps/gtkentry.P .deps/gtkeventbox.P \
-.deps/gtkfilesel.P .deps/gtkfixed.P .deps/gtkframe.P .deps/gtkgamma.P \
-.deps/gtkgc.P .deps/gtkhandlebox.P .deps/gtkhbbox.P .deps/gtkhbox.P \
-.deps/gtkhpaned.P .deps/gtkhruler.P .deps/gtkhscale.P \
-.deps/gtkhscrollbar.P .deps/gtkhseparator.P .deps/gtkimage.P \
-.deps/gtkinputdialog.P .deps/gtkitem.P .deps/gtklabel.P .deps/gtklist.P \
-.deps/gtklistitem.P .deps/gtkmain.P .deps/gtkmenu.P .deps/gtkmenubar.P \
+.deps/gtkcontainer.P .deps/gtkctree.P .deps/gtkcurve.P .deps/gtkdata.P \
+.deps/gtkdialog.P .deps/gtkdrawingarea.P .deps/gtkeditable.P \
+.deps/gtkentry.P .deps/gtkeventbox.P .deps/gtkfilesel.P \
+.deps/gtkfixed.P .deps/gtkframe.P .deps/gtkgamma.P .deps/gtkgc.P \
+.deps/gtkhandlebox.P .deps/gtkhbbox.P .deps/gtkhbox.P .deps/gtkhpaned.P \
+.deps/gtkhruler.P .deps/gtkhscale.P .deps/gtkhscrollbar.P \
+.deps/gtkhseparator.P .deps/gtkimage.P .deps/gtkinputdialog.P \
+.deps/gtkitem.P .deps/gtklabel.P .deps/gtklist.P .deps/gtklistitem.P \
+.deps/gtkmain.P .deps/gtkmenu.P .deps/gtkmenubar.P \
 .deps/gtkmenufactory.P .deps/gtkmenuitem.P .deps/gtkmenushell.P \
 .deps/gtkmisc.P .deps/gtknotebook.P .deps/gtkobject.P \
 .deps/gtkoptionmenu.P .deps/gtkpaned.P .deps/gtkpixmap.P \
@@ -414,28 +415,31 @@ DEP_FILES =  .deps/fnmatch.P .deps/gtkaccelerator.P \
 .deps/gtkradiomenuitem.P .deps/gtkrange.P .deps/gtkrc.P \
 .deps/gtkruler.P .deps/gtkscale.P .deps/gtkscrollbar.P \
 .deps/gtkscrolledwindow.P .deps/gtkselection.P .deps/gtkseparator.P \
-.deps/gtksignal.P .deps/gtkstatusbar.P .deps/gtkstyle.P \
-.deps/gtktable.P .deps/gtktext.P .deps/gtktogglebutton.P \
-.deps/gtktoolbar.P .deps/gtktooltips.P .deps/gtktree.P \
-.deps/gtktreeitem.P .deps/gtktypeutils.P .deps/gtkvbbox.P \
-.deps/gtkvbox.P .deps/gtkviewport.P .deps/gtkvpaned.P .deps/gtkvruler.P \
-.deps/gtkvscale.P .deps/gtkvscrollbar.P .deps/gtkvseparator.P \
-.deps/gtkwidget.P .deps/gtkwindow.P .deps/simple.P .deps/testgtk.P \
-.deps/testinput.P .deps/testselection.P .deps/testtree.P
-SOURCES = $(libgtk_la_SOURCES) testgtk.c testinput.c testselection.c simple.c testtree.c
-OBJECTS = $(libgtk_la_OBJECTS) testgtk.o testinput.o testselection.o simple.o testtree.o
-
-default: all
+.deps/gtksignal.P .deps/gtkspinbutton.P .deps/gtkstatusbar.P \
+.deps/gtkstyle.P .deps/gtktable.P .deps/gtktext.P .deps/gtktipsquery.P \
+.deps/gtktogglebutton.P .deps/gtktoolbar.P .deps/gtktooltips.P \
+.deps/gtktree.P .deps/gtktreeitem.P .deps/gtktypeutils.P \
+.deps/gtkvbbox.P .deps/gtkvbox.P .deps/gtkviewport.P .deps/gtkvpaned.P \
+.deps/gtkvruler.P .deps/gtkvscale.P .deps/gtkvscrollbar.P \
+.deps/gtkvseparator.P .deps/gtkwidget.P .deps/gtkwindow.P \
+.deps/simple.P .deps/testgtk.P .deps/testinput.P .deps/testselection.P \
+.deps/testthreads.P
+SOURCES = $(libgtk_1_1_la_SOURCES) testgtk.c testinput.c testselection.c testthreads.c simple.c
+OBJECTS = $(libgtk_1_1_la_OBJECTS) testgtk.o testinput.o testselection.o testthreads.o simple.o
+
+all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+.SUFFIXES: .S .c .lo .o .s
+$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && $(AUTOMAKE) --gnu gtk/Makefile
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
+gtkfeatures.h: $(top_builddir)/config.status gtkfeatures.h.in
+	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
 
 mostlyclean-libLTLIBRARIES:
 
@@ -448,25 +452,28 @@ maintainer-clean-libLTLIBRARIES:
 
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(libdir)
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo "$(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(libdir)/$$p"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(libdir)/$$p; \
+	    echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
-	$(NORMAL_UNINSTALL)
+	@$(NORMAL_UNINSTALL)
 	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  $(LIBTOOL)  --mode=uninstall rm -f $(libdir)/$$p; \
+	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
 	done
 
-.c.o:
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
 	$(COMPILE) -c $<
 
 mostlyclean-compile:
-	-rm -f *.o core
+	-rm -f *.o core *.core
 
 clean-compile:
 
@@ -475,21 +482,24 @@ distclean-compile:
 
 maintainer-clean-compile:
 
-.c.lo:
+.s.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.S.lo:
 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
-	-rm -rf .libs
+	-rm -rf .libs _libs
 
 distclean-libtool:
 
 maintainer-clean-libtool:
 
-libgtk.la: $(libgtk_la_OBJECTS) $(libgtk_la_DEPENDENCIES)
-	$(LINK) -rpath $(libdir) $(libgtk_la_LDFLAGS) $(libgtk_la_OBJECTS) $(libgtk_la_LIBADD) $(LIBS)
+libgtk-1.1.la: $(libgtk_1_1_la_OBJECTS) $(libgtk_1_1_la_DEPENDENCIES)
+	$(LINK) -rpath $(libdir) $(libgtk_1_1_la_LDFLAGS) $(libgtk_1_1_la_OBJECTS) $(libgtk_1_1_la_LIBADD) $(LIBS)
 
 mostlyclean-noinstPROGRAMS:
 
@@ -512,38 +522,44 @@ testselection: $(testselection_OBJECTS) $(testselection_DEPENDENCIES)
 	@rm -f testselection
 	$(LINK) $(testselection_LDFLAGS) $(testselection_OBJECTS) $(testselection_LDADD) $(LIBS)
 
+testthreads: $(testthreads_OBJECTS) $(testthreads_DEPENDENCIES)
+	@rm -f testthreads
+	$(LINK) $(testthreads_LDFLAGS) $(testthreads_OBJECTS) $(testthreads_LDADD) $(LIBS)
+
 simple: $(simple_OBJECTS) $(simple_DEPENDENCIES)
 	@rm -f simple
 	$(LINK) $(simple_LDFLAGS) $(simple_OBJECTS) $(simple_LDADD) $(LIBS)
 
-testtree: $(testtree_OBJECTS) $(testtree_DEPENDENCIES)
-	@rm -f testtree
-	$(LINK) $(testtree_LDFLAGS) $(testtree_OBJECTS) $(testtree_LDADD) $(LIBS)
-
 install-gtkincludeHEADERS: $(gtkinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(gtkincludedir)
+	$(mkinstalldirs) $(DESTDIR)$(gtkincludedir)
 	@list='$(gtkinclude_HEADERS)'; for p in $$list; do \
-	  echo " $(INSTALL_DATA) $(srcdir)/$$p $(gtkincludedir)/$$p"; \
-	  $(INSTALL_DATA) $(srcdir)/$$p $(gtkincludedir)/$$p; \
+	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gtkincludedir)/$$p"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gtkincludedir)/$$p; \
 	done
 
 uninstall-gtkincludeHEADERS:
-	$(NORMAL_UNINSTALL)
+	@$(NORMAL_UNINSTALL)
 	list='$(gtkinclude_HEADERS)'; for p in $$list; do \
-	  rm -f $(gtkincludedir)/$$p; \
+	  rm -f $(DESTDIR)$(gtkincludedir)/$$p; \
 	done
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES)
-	here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) -o $$here/TAGS)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
@@ -571,12 +587,7 @@ distdir: $(DISTFILES)
 	  || cp -p $$d/$$file $(distdir)/$$file; \
 	done
 
-MKDEP = $(CC) -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-
 DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
--include .deps/.P
-.deps/.P: $(BUILT_SOURCES)
-	echo > $@
 
 -include $(DEP_FILES)
 
@@ -589,13 +600,16 @@ distclean-depend:
 maintainer-clean-depend:
 	-rm -rf .deps
 
-.deps/%.P: %.c
-	@echo "Computing dependencies for $<..."
-	@o='o'; \
-	test -n "$o" && o='$$o'; \
-	$(MKDEP) $< >$@.tmp \
-	  && sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," < $@.tmp > $@ \
-	  && rm -f $@.tmp
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).P -c $<
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $<
+	@-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \
+	  < .deps/$(*F).p > .deps/$(*F).P
+	@-rm -f .deps/$(*F).p
 info:
 dvi:
 check: all
@@ -612,12 +626,10 @@ install: install-exec install-data all
 
 uninstall: uninstall-libLTLIBRARIES uninstall-gtkincludeHEADERS
 
-all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
-
 install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:
-	$(mkinstalldirs)  $(libdir) $(gtkincludedir)
+	$(mkinstalldirs)  $(DATADIR)$(libdir) $(DATADIR)$(gtkincludedir)
 
 
 mostlyclean-generic:
@@ -656,7 +668,7 @@ maintainer-clean:  maintainer-clean-libLTLIBRARIES \
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
-.PHONY: default mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
+.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
 clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
 uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
 distclean-compile clean-compile maintainer-clean-compile \
@@ -672,19 +684,29 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-../gtk/gtktypebuiltins.h: gtk.defs gentypeinfo.el
+$(srcdir)/gtktypebuiltins.h: @MAINT@ $(srcdir)/gtk.defs $(srcdir)/gentypeinfo.el
 	$(SHELL) $(srcdir)/runelisp $(srcdir)/gentypeinfo.el idmac $< $@
 
-gtktypebuiltins.c: gtk.defs gentypeinfo.el
+$(srcdir)/gtktypebuiltins.c: @MAINT@ $(srcdir)/gtk.defs $(srcdir)/gentypeinfo.el
 	$(SHELL) $(srcdir)/runelisp $(srcdir)/gentypeinfo.el id $< $@
 
-.PHONY: files
+.PHONY: files test test-debug
 
 files:
 	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
 	  echo $$p; \
 	done
 
+test: testgtk
+	builddir=`pwd`; cd $(top_builddir); top_builddir=`pwd`; \
+	cd $$builddir; cd $(srcdir); \
+	$(SHELL) $$top_builddir/libtool --mode=execute $$builddir/testgtk
+
+test-debug: testgtk
+	builddir=`pwd`; cd $(top_builddir); top_builddir=`pwd`; \
+	cd $$builddir; cd $(srcdir); \
+	$(SHELL) $$top_builddir/libtool --mode=execute gdb $$builddir/testgtk
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/gtk/gtkfeatures.h.in b/gtk/gtkfeatures.h.in
index ecf1d2c3f5..b71b69594a 100644
--- a/gtk/gtkfeatures.h.in
+++ b/gtk/gtkfeatures.h.in
@@ -43,7 +43,7 @@ extern "C" {
  */
 #define GTK_HAVE_SIGNAL_INIT				1-0-2
   
-
+#define GTK_HAVE_RC_SET_IMAGE_LOADER			1-1-0
 
 #ifdef __cplusplus
 }
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 2014fcdd6a..2afc5dc6af 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -3683,7 +3683,6 @@ gtk_widget_real_realize (GtkWidget *widget)
 {
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (GTK_WIDGET_NO_WINDOW (widget));
   
   GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
   if (widget->parent)