20 files changed, 793 insertions, 557 deletions
diff --git a/ChangeLog b/ChangeLog
index a0cec02c8..75ab8c615 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2000-10-22  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/makefile.mingw.in
+	* gtk/gtk.def: Updates.
+
+	* gtk/testgtk.c: sleep() is called _sleep in MS's C
+	library.
+
+	* gtk/gtkimcontextsimple.c: Include <stdlib.h> for bsearch().
+
+	* gtk/makefile.msc: Remove
+
+	* gtk/makefile.msc.in: New file, like makefile.mingw.in.
+
+	* gtk/Makefile.am: Add it.
+
+	* configure.in: Generate it.
+
+	* gtk/gtktextbuffer.c (gtk_text_buffer_create_child_anchor)
+	* gtk/gtktextbtree.c (gtk_text_line_char_to_byte): Return
+	something even if not implemented, to satisfy picky MSVC.
+
 2000-10-22  Robert Brady  <robert@suse.co.uk>
 
 	* configure.in: Check for bind_textdomain_codeset
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a0cec02c8..75ab8c615 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,25 @@
+2000-10-22  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/makefile.mingw.in
+	* gtk/gtk.def: Updates.
+
+	* gtk/testgtk.c: sleep() is called _sleep in MS's C
+	library.
+
+	* gtk/gtkimcontextsimple.c: Include <stdlib.h> for bsearch().
+
+	* gtk/makefile.msc: Remove
+
+	* gtk/makefile.msc.in: New file, like makefile.mingw.in.
+
+	* gtk/Makefile.am: Add it.
+
+	* configure.in: Generate it.
+
+	* gtk/gtktextbuffer.c (gtk_text_buffer_create_child_anchor)
+	* gtk/gtktextbtree.c (gtk_text_line_char_to_byte): Return
+	something even if not implemented, to satisfy picky MSVC.
+
 2000-10-22  Robert Brady  <robert@suse.co.uk>
 
 	* configure.in: Check for bind_textdomain_codeset
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a0cec02c8..75ab8c615 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,25 @@
+2000-10-22  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/makefile.mingw.in
+	* gtk/gtk.def: Updates.
+
+	* gtk/testgtk.c: sleep() is called _sleep in MS's C
+	library.
+
+	* gtk/gtkimcontextsimple.c: Include <stdlib.h> for bsearch().
+
+	* gtk/makefile.msc: Remove
+
+	* gtk/makefile.msc.in: New file, like makefile.mingw.in.
+
+	* gtk/Makefile.am: Add it.
+
+	* configure.in: Generate it.
+
+	* gtk/gtktextbuffer.c (gtk_text_buffer_create_child_anchor)
+	* gtk/gtktextbtree.c (gtk_text_line_char_to_byte): Return
+	something even if not implemented, to satisfy picky MSVC.
+
 2000-10-22  Robert Brady  <robert@suse.co.uk>
 
 	* configure.in: Check for bind_textdomain_codeset
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a0cec02c8..75ab8c615 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,25 @@
+2000-10-22  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/makefile.mingw.in
+	* gtk/gtk.def: Updates.
+
+	* gtk/testgtk.c: sleep() is called _sleep in MS's C
+	library.
+
+	* gtk/gtkimcontextsimple.c: Include <stdlib.h> for bsearch().
+
+	* gtk/makefile.msc: Remove
+
+	* gtk/makefile.msc.in: New file, like makefile.mingw.in.
+
+	* gtk/Makefile.am: Add it.
+
+	* configure.in: Generate it.
+
+	* gtk/gtktextbuffer.c (gtk_text_buffer_create_child_anchor)
+	* gtk/gtktextbtree.c (gtk_text_line_char_to_byte): Return
+	something even if not implemented, to satisfy picky MSVC.
+
 2000-10-22  Robert Brady  <robert@suse.co.uk>
 
 	* configure.in: Check for bind_textdomain_codeset
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a0cec02c8..75ab8c615 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,25 @@
+2000-10-22  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/makefile.mingw.in
+	* gtk/gtk.def: Updates.
+
+	* gtk/testgtk.c: sleep() is called _sleep in MS's C
+	library.
+
+	* gtk/gtkimcontextsimple.c: Include <stdlib.h> for bsearch().
+
+	* gtk/makefile.msc: Remove
+
+	* gtk/makefile.msc.in: New file, like makefile.mingw.in.
+
+	* gtk/Makefile.am: Add it.
+
+	* configure.in: Generate it.
+
+	* gtk/gtktextbuffer.c (gtk_text_buffer_create_child_anchor)
+	* gtk/gtktextbtree.c (gtk_text_line_char_to_byte): Return
+	something even if not implemented, to satisfy picky MSVC.
+
 2000-10-22  Robert Brady  <robert@suse.co.uk>
 
 	* configure.in: Check for bind_textdomain_codeset
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a0cec02c8..75ab8c615 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,25 @@
+2000-10-22  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/makefile.mingw.in
+	* gtk/gtk.def: Updates.
+
+	* gtk/testgtk.c: sleep() is called _sleep in MS's C
+	library.
+
+	* gtk/gtkimcontextsimple.c: Include <stdlib.h> for bsearch().
+
+	* gtk/makefile.msc: Remove
+
+	* gtk/makefile.msc.in: New file, like makefile.mingw.in.
+
+	* gtk/Makefile.am: Add it.
+
+	* configure.in: Generate it.
+
+	* gtk/gtktextbuffer.c (gtk_text_buffer_create_child_anchor)
+	* gtk/gtktextbtree.c (gtk_text_line_char_to_byte): Return
+	something even if not implemented, to satisfy picky MSVC.
+
 2000-10-22  Robert Brady  <robert@suse.co.uk>
 
 	* configure.in: Check for bind_textdomain_codeset
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a0cec02c8..75ab8c615 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,25 @@
+2000-10-22  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/makefile.mingw.in
+	* gtk/gtk.def: Updates.
+
+	* gtk/testgtk.c: sleep() is called _sleep in MS's C
+	library.
+
+	* gtk/gtkimcontextsimple.c: Include <stdlib.h> for bsearch().
+
+	* gtk/makefile.msc: Remove
+
+	* gtk/makefile.msc.in: New file, like makefile.mingw.in.
+
+	* gtk/Makefile.am: Add it.
+
+	* configure.in: Generate it.
+
+	* gtk/gtktextbuffer.c (gtk_text_buffer_create_child_anchor)
+	* gtk/gtktextbtree.c (gtk_text_line_char_to_byte): Return
+	something even if not implemented, to satisfy picky MSVC.
+
 2000-10-22  Robert Brady  <robert@suse.co.uk>
 
 	* configure.in: Check for bind_textdomain_codeset
diff --git a/configure.in b/configure.in
index 1abcf8c00..833a1fc54 100644
--- a/configure.in
+++ b/configure.in
@@ -1042,6 +1042,7 @@ gdk/nanox/Makefile
 gdk/linux-fb/Makefile
 gtk/Makefile
 gtk/makefile.mingw
+gtk/makefile.msc
 gtk/gtkcompat.h
 gtk/stock-icons/Makefile
 modules/Makefile
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 172bd5306..d6165192f 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-16  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk-pixbuf-io.c: Define also m_save (for the non-gmodule case).
+
 2000-10-16  Havoc Pennington  <hp@redhat.com>
 
 	* gdk-pixbuf-io.c (gdk_pixbuf_get_module)
diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index 02a517e43..ad4c29924 100644
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -360,6 +360,12 @@ gdk_pixbuf_load_module (GdkPixbufModule *image_module,
 #define m_stop_load(type)  extern void mname(type,stop_load) (gpointer context);
 #define m_load_increment(type)  extern gboolean mname(type,load_increment) (gpointer context, const guchar *buf, guint size);
 #define m_load_animation(type)  extern GdkPixbufAnimation * mname(type,load_animation) (FILE *f);
+#define m_save(type) \
+   extern gboolean mname(type,save) (FILE          *f, \
+				     GdkPixbuf     *pixbuf, \
+                                     gchar        **keys, \
+				     gchar        **values, \
+				     GError       **error);
 
 /* PNG */
 m_load (png);
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 14921862a..6dbee7dba 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -602,6 +602,9 @@ simple_LDADD = $(LDADDS)
 makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gtk/makefile.mingw.in
 	cd $(top_builddir) && CONFIG_FILES=gtk/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
+makefile.msc: $(top_builddir)/config.status $(top_srcdir)/gtk/makefile.msc.in
+	cd $(top_builddir) && CONFIG_FILES=gtk/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
 .PHONY: files test test-debug
 
 files:
@@ -644,9 +647,10 @@ EXTRA_DIST += @STRIP_BEGIN@ 	\
 	gtkcompat.h.win32	\
 	gtk.def			\
 	gtk.rc			\
-	makefile.msc		\
 	makefile.mingw		\
 	makefile.mingw.in	\
+	makefile.msc		\
+	makefile.msc.in		\
 	$(gtkconf_DATA)		\
 @STRIP_END@
 
diff --git a/gtk/gtk.def b/gtk/gtk.def
index 777868c23..529868028 100755
--- a/gtk/gtk.def
+++ b/gtk/gtk.def
@@ -209,6 +209,8 @@ EXPORTS
 	gtk_button_get_type
 	gtk_button_leave
 	gtk_button_new
+	gtk_button_new_accel
+	gtk_button_new_stock
 	gtk_button_new_with_label
 	gtk_button_pressed
 	gtk_button_released
@@ -566,9 +568,27 @@ EXPORTS
 	gtk_idle_remove
 	gtk_idle_remove_by_data
 	gtk_image_get
+	gtk_image_get_icon_set
+	gtk_image_get_image
+	gtk_image_get_pixbuf
+	gtk_image_get_pixmap
+	gtk_image_get_stock
+	gtk_image_get_storage_type
 	gtk_image_get_type
 	gtk_image_new
+	gtk_image_new_from_file
+	gtk_image_new_from_icon_set
+	gtk_image_new_from_image
+	gtk_image_new_from_pixbuf
+	gtk_image_new_from_pixmap
+	gtk_image_new_from_stock
 	gtk_image_set
+	gtk_image_set_from_file
+	gtk_image_set_from_icon_set
+	gtk_image_set_from_image
+	gtk_image_set_from_pixbuf
+	gtk_image_set_from_pixmap
+	gtk_image_set_from_stock
 	gtk_init
 	gtk_init_abi_check
 	gtk_init_add
@@ -754,6 +774,8 @@ EXPORTS
 	gtk_menu_shell_insert
 	gtk_menu_shell_prepend
 	gtk_menu_shell_select_item
+	gtk_message_dialog_get_type
+	gtk_message_dialog_new
 	gtk_micro_version
 	gtk_minor_version
 	gtk_misc_get_type
@@ -828,6 +850,7 @@ EXPORTS
 	gtk_object_unref
 	gtk_object_weakref
 	gtk_object_weakunref
+	gtk_option_menu_get_history
 	gtk_option_menu_get_menu
 	gtk_option_menu_get_type
 	gtk_option_menu_new
@@ -1401,6 +1424,7 @@ EXPORTS
 	gtk_window_activate_focus
 	gtk_window_add_accel_group
 	gtk_window_add_embedded_xid
+	gtk_window_get_default_accel_group
 	gtk_window_get_type
 	gtk_window_new
 	gtk_window_remove_accel_group
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 7dcee42a4..edfdb5729 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -17,6 +17,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <stdlib.h>
+
 #include <gdk/gdkkeysyms.h>
 #include "gtksignal.h"
 #include "gtkimcontextsimple.h"
diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index 4fbf2ddd7..dcb569360 100644
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -3417,6 +3417,8 @@ gtk_text_line_char_to_byte (GtkTextLine *line,
                             gint         char_offset)
 {
   g_warning("FIXME not implemented");
+
+  return 0;
 }
 
 /* FIXME sync with char_locate (or figure out a clean
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 143f822f3..a686a4531 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -1383,8 +1383,9 @@ GtkTextChildAnchor*
 gtk_text_buffer_create_child_anchor (GtkTextBuffer      *buffer,
                                      const GtkTextIter  *where)
 {
-  
+  /* FIXME: Implement? */
 
+  return NULL;
 }
 
 void
diff --git a/gtk/makefile.mingw.in b/gtk/makefile.mingw.in
index 59ace1cdb..9a40de6f1 100644
--- a/gtk/makefile.mingw.in
+++ b/gtk/makefile.mingw.in
@@ -119,6 +119,7 @@ gtk_OBJECTS =					\
 	gtkmenufactory.o			\
 	gtkmenuitem.o				\
 	gtkmenushell.o				\
+	gtkmessagedialog.o			\
 	gtkmisc.o				\
 	gtknotebook.o				\
 	gtkobject.o				\
@@ -182,147 +183,147 @@ gtk_OBJECTS =					\
 
 # Source headers which are non-autogenerated headers
 source_headers =				\
-	gtk.h					\
-	gtkaccelgroup.h				\
-	gtkaccellabel.h				\
-	gtkadjustment.h				\
-	gtkalignment.h				\
-	gtkarg.h				\
-	gtkarrow.h				\
-	gtkaspectframe.h			\
-	gtkbin.h				\
-	gtkbindings.h				\
-	gtkbbox.h				\
-	gtkbox.h				\
-	gtkbutton.h				\
-	gtkcalendar.h				\
-	gtkcheckbutton.h			\
-	gtkcheckmenuitem.h			\
-	gtkclist.h				\
-	gtkcolorsel.h				\
-	gtkcolorseldialog.h			\
-	gtkcombo.h				\
-	gtkcompat.h				\
-	gtkcontainer.h				\
-	gtkctree.h				\
-	gtkcurve.h				\
-	gtkdata.h				\
-	gtkdebug.h				\
-	gtkdialog.h				\
-	gtkdnd.h				\
-	gtkdrawingarea.h			\
-	gtkeditable.h				\
-	gtkentry.h				\
-	gtkenums.h				\
-	gtkeventbox.h				\
-	gtkfilesel.h				\
-	gtkfixed.h				\
-	gtkfontsel.h				\
-	gtkframe.h				\
-	gtkgamma.h				\
-	gtkgc.h					\
-	gtkhandlebox.h				\
-	gtkhbbox.h				\
-	gtkhbox.h				\
-	gtkhpaned.h				\
-	gtkhruler.h				\
-	gtkhscale.h				\
-	gtkhscrollbar.h				\
-	gtkhseparator.h				\
-	gtkhsv.h				\
-	gtkimage.h				\
-	gtkimcontext.h				\
-	gtkimmulticontext.h			\
-	gtkinputdialog.h			\
-	gtkinvisible.h				\
-	gtkitem.h				\
-	gtkitemfactory.h			\
-	gtklabel.h				\
-	gtklayout.h				\
-	gtklist.h				\
-	gtklistitem.h				\
-	gtkmain.h				\
-	gtkmenu.h				\
-	gtkmenubar.h				\
-	gtkmenufactory.h			\
-	gtkmenuitem.h				\
-	gtkmenushell.h				\
-	gtkmisc.h				\
-	gtknotebook.h				\
-	gtkobject.h				\
-	gtkoptionmenu.h				\
-	gtkpacker.h				\
-	gtkpaned.h				\
-	gdk-pixbuf-loader.h			\
-	gtkpixmap.h				\
-	gtkplug.h				\
-	gtkpreview.h				\
-	gtkprivate.h				\
-	gtkprogress.h				\
-	gtkprogressbar.h			\
-	gtkradiobutton.h			\
-	gtkradiomenuitem.h			\
-	gtkrange.h				\
-	gtkrc.h					\
-	gtkruler.h				\
-	gtkscale.h				\
-	gtkscrollbar.h				\
-	gtkscrolledwindow.h			\
-	gtkselection.h				\
-	gtkseparator.h				\
-	gtksignal.h				\
-	gtksocket.h				\
-	gtkspinbutton.h				\
-	gtkstyle.h				\
-	gtkstatusbar.h				\
-	gtktable.h				\
-	gtktearoffmenuitem.h			\
-	gtktextbuffer.h				\
-	gtktextiter.h				\
-	gtktextmark.h				\
-	gtktexttag.h				\
-	gtktexttagtable.h			\
-	gtktextview.h				\
-	gtktext.h				\
-	gtkthemes.h				\
-	gtktipsquery.h				\
-	gtktogglebutton.h			\
-	gtktoolbar.h				\
-	gtktooltips.h				\
-	gtktree.h				\
-	gtktreeitem.h				\
-	gtktypeutils.h				\
-	gtkvbbox.h				\
-	gtkvbox.h				\
-	gtkviewport.h				\
-	gtkvpaned.h				\
-	gtkvruler.h				\
-	gtkvscale.h				\
-	gtkvscrollbar.h				\
-	gtkvseparator.h				\
-	gtkwidget.h				\
+	gtk.h			\
+	gtkaccelgroup.h		\
+	gtkaccellabel.h		\
+	gtkadjustment.h		\
+	gtkalignment.h		\
+	gtkarg.h		\
+	gtkarrow.h		\
+	gtkaspectframe.h	\
+	gtkbin.h		\
+	gtkbindings.h		\
+	gtkbbox.h		\
+	gtkbox.h		\
+	gtkbutton.h		\
+	gtkcalendar.h		\
+	gtkcheckbutton.h	\
+	gtkcheckmenuitem.h	\
+	gtkclist.h		\
+	gtkcolorsel.h		\
+	gtkcolorseldialog.h	\
+	gtkcombo.h		\
+	gtkcompat.h		\
+	gtkcontainer.h		\
+	gtkctree.h		\
+	gtkcurve.h		\
+	gtkdata.h		\
+	gtkdebug.h		\
+	gtkdialog.h		\
+	gtkdnd.h		\
+	gtkdrawingarea.h	\
+	gtkeditable.h		\
+	gtkentry.h		\
+	gtkenums.h		\
+	gtkeventbox.h		\
+	gtkfilesel.h		\
+	gtkfixed.h		\
+	gtkfontsel.h		\
+	gtkframe.h		\
+	gtkgamma.h		\
+	gtkgc.h			\
+	gtkhandlebox.h		\
+	gtkhbbox.h		\
+	gtkhbox.h		\
+	gtkhpaned.h		\
+	gtkhruler.h		\
+	gtkhscale.h		\
+	gtkhscrollbar.h		\
+	gtkhseparator.h		\
+	gtkhsv.h		\
+	gtkimage.h		\
+	gtkimcontext.h		\
+	gtkimmulticontext.h	\
+	gtkinputdialog.h	\
+	gtkinvisible.h		\
+	gtkitem.h		\
+	gtkitemfactory.h	\
+	gtklabel.h		\
+	gtklayout.h		\
+	gtklist.h		\
+	gtklistitem.h		\
+	gtkmain.h		\
+	gtkmenu.h		\
+	gtkmenubar.h		\
+	gtkmenufactory.h	\
+	gtkmenuitem.h		\
+	gtkmenushell.h		\
+	gtkmisc.h		\
+	gtknotebook.h		\
+	gtkobject.h		\
+	gtkoptionmenu.h		\
+	gtkpacker.h		\
+	gtkpaned.h		\
+	gdk-pixbuf-loader.h	\
+	gtkpixmap.h		\
+	gtkplug.h		\
+	gtkpreview.h		\
+	gtkprivate.h		\
+	gtkprogress.h		\
+	gtkprogressbar.h	\
+	gtkradiobutton.h	\
+	gtkradiomenuitem.h	\
+	gtkrange.h		\
+	gtkrc.h			\
+	gtkruler.h		\
+	gtkscale.h		\
+	gtkscrollbar.h		\
+	gtkscrolledwindow.h	\
+	gtkselection.h		\
+	gtkseparator.h		\
+	gtksignal.h		\
+	gtksocket.h		\
+	gtkspinbutton.h		\
+	gtkstyle.h		\
+	gtkstatusbar.h		\
+	gtktable.h		\
+	gtktearoffmenuitem.h	\
+	gtktextbuffer.h		\
+	gtktextiter.h		\
+	gtktextmark.h		\
+	gtktexttag.h		\
+	gtktexttagtable.h	\
+	gtktextview.h		\
+	gtktext.h		\
+	gtkthemes.h		\
+	gtktipsquery.h		\
+	gtktogglebutton.h	\
+	gtktoolbar.h		\
+	gtktooltips.h		\
+	gtktree.h		\
+	gtktreeitem.h		\
+	gtktypeutils.h		\
+	gtkvbbox.h		\
+	gtkvbox.h		\
+	gtkviewport.h		\
+	gtkvpaned.h		\
+	gtkvruler.h		\
+	gtkvscale.h		\
+	gtkvscrollbar.h		\
+	gtkvseparator.h		\
+	gtkwidget.h		\
 	gtkwindow.h
 
 # More headers to use when autogenerating.
-gdk_headers =					\
-	../gdk/gdkcc.h				\
-	../gdk/gdkcolor.h			\
-	../gdk/gdkcursor.h			\
-	../gdk/gdkdnd.h				\
-	../gdk/gdkdrawable.h			\
-	../gdk/gdkevents.h			\
-	../gdk/gdkfont.h			\
-	../gdk/gdkgc.h				\
-	../gdk/gdkim.h				\
-	../gdk/gdkimage.h			\
-	../gdk/gdkinput.h			\
-	../gdk/gdkpixmap.h			\
-	../gdk/gdkproperty.h			\
-	../gdk/gdkregion.h			\
-	../gdk/gdkrgb.h				\
-	../gdk/gdkselection.h			\
-	../gdk/gdktypes.h			\
-	../gdk/gdkvisual.h			\
+gdk_headers =			\
+	../gdk/gdkcc.h		\
+	../gdk/gdkcolor.h	\
+	../gdk/gdkcursor.h	\
+	../gdk/gdkdnd.h		\
+	../gdk/gdkdrawable.h	\
+	../gdk/gdkevents.h	\
+	../gdk/gdkfont.h	\
+	../gdk/gdkgc.h		\
+	../gdk/gdkim.h		\
+	../gdk/gdkimage.h	\
+	../gdk/gdkinput.h	\
+	../gdk/gdkpixmap.h	\
+	../gdk/gdkproperty.h	\
+	../gdk/gdkregion.h	\
+	../gdk/gdkrgb.h		\
+	../gdk/gdkselection.h	\
+	../gdk/gdktypes.h	\
+	../gdk/gdkvisual.h	\
 	../gdk/gdkwindow.h
 
 ../config.h : ../config.h.win32
diff --git a/gtk/makefile.msc b/gtk/makefile.msc
deleted file mode 100755
index 0cf0121ef..000000000
--- a/gtk/makefile.msc
+++ /dev/null
@@ -1,417 +0,0 @@
-## Makefile for building the gtk DLL with Microsoft C
-## Use: nmake -f makefile.msc
-
-# Change this to wherever you want to install the DLLs. This directory
-# should be in your PATH.
-BIN = C:\bin
-
-# This is the location of pthreads for Win32, 
-# see http://sourceware.cygnus.com/pthreads-win32/
-PTHREADS = ..\..\pthreads-snap-1999-05-30
-PTHREAD_LIB = $(PTHREADS)\pthread.lib
-PTHREAD_INC = -I $(PTHREADS)
-
-################################################################
-
-# Nothing much configurable below
-
-!IFNDEF DEBUG
-# Full optimization:
-OPTIMIZE = -Ox -MD
-LINKDEBUG =
-!ELSE
-# Debugging:
-OPTIMIZE = -Zi -MDd
-LINKDEBUG = /debug
-!ENDIF
-
-# cl -? describes the options
-# Some files use near as an identifier
-CC = cl -G5 -GF $(OPTIMIZE) -W3 -DHAVE_CONFIG_H -nologo -Dnear=xxnear
-
-# Perl and awk are needed to generate some source files.
-# These generated source files are distribuyted with the Win32 GTk+ source
-# distributions, so don't worry if you don't have perl and awk.
-PERL = perl
-AWK = awk
-
-LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
-INSTALL = copy
-TOUCH = copy makefile.msc+nul
-
-GLIB_VER=1.3
-GTK_VER=1.3
-
-GLIB = ..\..\glib
-INTL = ..\..\intl
-
-CFLAGS = -I. -I.. -I..\gdk -I$(GLIB) -I$(GLIB)\gmodule -I$(INTL) -DGTK_DISABLE_COMPAT_H
-
-all : \
-	..\config.h	\
-	gtkcompat.h	\
-	generated	\
-	gtk-$(GTK_VER).dll\
-	testdnd.exe	\
-	testgtk.exe	\
-	testinput.exe	\
-	testrgb.exe	\
-	testselection.exe \
-	simple.exe
-
-install : all
-	$(INSTALL) gtk-$(GTK_VER).dll $(BIN)
-
-gtk_OBJECTS = \
-	fnmatch.obj	\
-	gtkaccelgroup.obj \
-	gtkaccellabel.obj \
-	gtkadjustment.obj \
-	gtkalignment.obj \
-	gtkarg.obj	\
-	gtkarrow.obj	\
-	gtkaspectframe.obj \
-	gtkbbox.obj	\
-	gtkbin.obj	\
-	gtkbindings.obj	\
-	gtkbox.obj	\
-	gtkbutton.obj	\
-	gtkcalendar.obj	\
-	gtkcheckbutton.obj \
-	gtkcheckmenuitem.obj \
-	gtkclist.obj	\
-	gtkcolorsel.obj	\
-	gtkcolorseldialog.obj \
-	gtkcombo.obj	\
-	gtkcontainer.obj \
-	gtkctree.obj	\
-	gtkcurve.obj	\
-	gtkdata.obj	\
-	gtkdialog.obj	\
-	gtkdnd.obj	\
-	gtkdrawingarea.obj \
-	gtkeditable.obj	\
-	gtkentry.obj	\
-	gtkeventbox.obj	\
-	gtkfilesel.obj	\
-	gtkfixed.obj	\
-	gtkfontsel.obj	\
-	gtkframe.obj	\
-	gtkgamma.obj	\
-	gtkgc.obj	\
-	gtkhandlebox.obj \
-	gtkhbbox.obj	\
-	gtkhbox.obj	\
-	gtkhpaned.obj	\
-	gtkhruler.obj	\
-	gtkhscale.obj	\
-	gtkhscrollbar.obj \
-	gtkhseparator.obj \
-	gtkhsv.obj	\
-	gtkimage.obj	\
-	gtkinputdialog.obj \
-	gtkinvisible.obj \
-	gtkitem.obj	\
-	gtkitemfactory.obj \
-	gtklabel.obj	\
-	gtklayout.obj	\
-	gtklist.obj	\
-	gtklistitem.obj	\
-	gtkmain.obj	\
-	gtkmarshal.obj	\
-	gtkmenu.obj	\
-	gtkmenubar.obj	\
-	gtkmenufactory.obj \
-	gtkmenuitem.obj	\
-	gtkmenushell.obj \
-	gtkmisc.obj	\
-	gtknotebook.obj	\
-	gtkobject.obj	\
-	gtkoptionmenu.obj \
-	gtkpacker.obj	\
-	gtkpaned.obj	\
-	gtkpixmap.obj	\
-	gtkplug.obj	\
-	gtkpreview.obj	\
-	gtkprogress.obj	\
-	gtkprogressbar.obj \
-	gtkradiobutton.obj \
-	gtkradiomenuitem.obj \
-	gtkrange.obj	\
-	gtkrc.obj	\
-	gtkruler.obj	\
-	gtkscale.obj	\
-	gtkscrollbar.obj \
-	gtkscrolledwindow.obj \
-	gtkselection.obj \
-	gtkseparator.obj \
-	gtksignal.obj	\
-	gtksocket.obj	\
-	gtkspinbutton.obj \
-	gtkstatusbar.obj \
-	gtkstyle.obj	\
-	gtktable.obj	\
-	gtktearoffmenuitem.obj \
-	gtktext.obj	\
-	gtkthemes.obj	\
-	gtktipsquery.obj \
-	gtktogglebutton.obj \
-	gtktoolbar.obj	\
-	gtktooltips.obj	\
-	gtktree.obj	\
-	gtktreeitem.obj	\
-	gtktypeutils.obj\
-	gtkvbbox.obj	\
-	gtkvbox.obj	\
-	gtkviewport.obj	\
-	gtkvpaned.obj	\
-	gtkvruler.obj	\
-	gtkvscale.obj	\
-	gtkvscrollbar.obj \
-	gtkvseparator.obj \
-	gtkwidget.obj	\
-	gtkwindow.obj
-
-# Source headers which are non-autogenerated headers
-source_headers = \
-	gtk.h			\
-	gtkaccelgroup.h		\
-	gtkaccellabel.h		\
-	gtkadjustment.h		\
-	gtkalignment.h		\
-	gtkarg.h		\
-	gtkarrow.h		\
-	gtkaspectframe.h	\
-	gtkbin.h		\
-	gtkbindings.h		\
-	gtkbbox.h		\
-	gtkbox.h		\
-	gtkbutton.h		\
-	gtkcalendar.h		\
-	gtkcheckbutton.h	\
-	gtkcheckmenuitem.h	\
-	gtkclist.h		\
-	gtkcolorsel.h		\
-	gtkcombo.h		\
-	gtkcontainer.h		\
-	gtkctree.h		\
-	gtkcurve.h		\
-	gtkdata.h		\
-	gtkdebug.h              \
-	gtkdialog.h		\
-	gtkdnd.h		\
-	gtkdrawingarea.h	\
-	gtkeditable.h           \
-	gtkentry.h		\
-	gtkenums.h		\
-	gtkeventbox.h		\
-	gtkfilesel.h		\
-	gtkfixed.h		\
-	gtkfontsel.h		\
-	gtkframe.h		\
-	gtkgamma.h		\
-	gtkgc.h			\
-	gtkhandlebox.h		\
-	gtkhbbox.h		\
-	gtkhbox.h		\
-	gtkhpaned.h		\
-	gtkhruler.h		\
-	gtkhscale.h		\
-	gtkhscrollbar.h		\
-	gtkhseparator.h		\
-	gtkimage.h		\
-	gtkinputdialog.h	\
-	gtkinvisible.h		\
-	gtkitem.h		\
-	gtkitemfactory.h	\
-	gtklabel.h		\
-	gtklayout.h             \
-	gtklist.h		\
-	gtklistitem.h		\
-	gtkmain.h		\
-	gtkmenu.h		\
-	gtkmenubar.h		\
-	gtkmenufactory.h	\
-	gtkmenuitem.h		\
-	gtkmenushell.h		\
-	gtkmisc.h		\
-	gtknotebook.h		\
-	gtkobject.h		\
-	gtkoptionmenu.h		\
-	gtkpacker.h		\
-	gtkpaned.h		\
-	gtkpixmap.h		\
-	gtkplug.h		\
-	gtkpreview.h		\
-	gtkprivate.h		\
-	gtkprogress.h		\
-	gtkprogressbar.h	\
-	gtkradiobutton.h	\
-	gtkradiomenuitem.h	\
-	gtkrange.h		\
-	gtkrc.h			\
-	gtkruler.h		\
-	gtkscale.h		\
-	gtkscrollbar.h		\
-	gtkscrolledwindow.h	\
-	gtkselection.h		\
-	gtkseparator.h		\
-	gtksignal.h		\
-	gtksocket.h		\
-	gtkspinbutton.h		\
-	gtkstyle.h		\
-	gtkstatusbar.h		\
-	gtktable.h		\
-	gtktearoffmenuitem.h    \
-	gtktext.h		\
-	gtkthemes.h		\
-	gtktipsquery.h		\
-	gtktogglebutton.h	\
-	gtktoolbar.h		\
-	gtktooltips.h		\
-	gtktree.h		\
-	gtktreeitem.h		\
-	gtktypeutils.h		\
-	gtkvbbox.h		\
-	gtkvbox.h		\
-	gtkviewport.h		\
-	gtkvpaned.h		\
-	gtkvruler.h		\
-	gtkvscale.h		\
-	gtkvscrollbar.h		\
-	gtkvseparator.h		\
-	gtkwidget.h		\
-	gtkwindow.h
-
-# More headers to use when autogenerating.
-gdk_headers = \
-	..\gdk\gdkcc.h		\
-	..\gdk\gdkcolor.h	\
-	..\gdk\gdkcursor.h     	\
-	..\gdk\gdkdnd.h		\
-	..\gdk\gdkdrawable.h	\
-	..\gdk\gdkevents.h	\
-	..\gdk\gdkfont.h	\
-	..\gdk\gdkgc.h		\
-	..\gdk\gdkim.h		\
-	..\gdk\gdkimage.h	\
-	..\gdk\gdkinput.h	\
-	..\gdk\gdkpixmap.h	\
-	..\gdk\gdkproperty.h	\
-	..\gdk\gdkregion.h	\
-	..\gdk\gdkrgb.h		\
-	..\gdk\gdkselection.h	\
-	..\gdk\gdktypes.h	\
-	..\gdk\gdkvisual.h	\
-	..\gdk\gdkwindow.h
-
-..\config.h : ..\config.h.win32
-	copy ..\config.h.win32 ..\config.h
-
-gtkcompat.h : gtkcompat.h.win32
-	copy gtkcompat.h.win32 gtkcompat.h
-
-#
-# Generated source files:
-#
-generated : gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_ids.c gtktypebuiltins_evals.c gtkmarshal.h gtkmarshal.c
-	$(TOUCH) generated
-
-gtk.defs : makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers)
-	$(PERL) makeenums.pl defs $(source_headers) $(gdk_headers) >gd.tmp
-	copy gd.tmp+gtk-boxed.defs gtk.defs
-	@erase gd.tmp
-
-# generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
-gtktypebuiltins.h: gtk.defs maketypes.awk
-	$(AWK) -f maketypes.awk gtk.defs macros >gtktypebuiltins.h
-
-# generate type identifier variables (GTK_TYPE_WIDGET_FLAGS)
-gtktypebuiltins_vars.c: gtk.defs maketypes.awk
-	$(AWK) -f maketypes.awk gtk.defs variables >gtktypebuiltins_vars.c
-
-# generate type entries for type-id registration
-gtktypebuiltins_ids.c: gtk.defs maketypes.awk
-	$(AWK) -f maketypes.awk gtk.defs entries >gtktypebuiltins_ids.c
-
-# generate enum value arrays
-gtktypebuiltins_evals.c: makeenums.pl gtk.defs
-	$(PERL) makeenums.pl arrays $(source_headers) $(gdk_headers) >gtktypebuiltins_evals.c
-
-gtkmarshal.h gtkmarshal.c : gtkmarshal.list genmarshal.pl
-	$(PERL) genmarshal.pl gtkmarshal.list s-gmh s-gmc
-	del gtkmarshal.c
-	rename s-gmc gtkmarshal.c
-	del gtkmarshal.h
-	rename s-gmh gtkmarshal.h
-
-#
-# Linking:
-#
-gtk-$(GTK_VER).dll : $(gtk_OBJECTS) gtk.def
-	$(CC) $(CFLAGS) -LD -Fegtk-$(GTK_VER).dll $(gtk_OBJECTS) ..\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib gdi32.lib user32.lib advapi32.lib $(LDFLAGS) /def:gtk.def
-
-# General rule for compiling the objects into the DLL
-.c.obj :
-	$(CC) $(CFLAGS) -GD -c -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" $<
-
-#
-# Test programs:
-#
-testdnd.exe : gtk-$(GTK_VER).dll testdnd.obj
-	$(CC) $(CFLAGS) testdnd.obj gtk-$(GTK_VER).lib ..\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
-
-# Must have separate rules for these objects that don't go in the DLL
-testdnd.obj : testdnd.c
-	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testdnd\" testdnd.c
-
-testgtk.exe : gtk-$(GTK_VER).dll testgtk.obj
-	$(CC) $(CFLAGS) testgtk.obj gtk-$(GTK_VER).lib ..\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gthread-$[GLIB_VER).lib $(LDFLAGS)
-
-testgtk.obj : testgtk.c
-	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testgtk\" testgtk.c
-
-testinput.exe : gtk-$(GTK_VER).dll testinput.obj
-	$(CC) $(CFLAGS) testinput.obj gtk-$(GTK_VER).lib ..\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
-
-testinput.obj : testinput.c
-	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testinput\" testinput.c
-
-testrgb.exe : gtk-$(GTK_VER).dll testrgb.obj
-	$(CC) $(CFLAGS) testrgb.obj gtk-$(GTK_VER).lib ..\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
-
-testrgb.obj : testrgb.c
-	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testrgb\" testrgb.c
-
-testselection.exe : gtk-$(GTK_VER).dll testselection.obj
-	$(CC) $(CFLAGS) testselection.obj gtk-$(GTK_VER).lib ..\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
-
-testselection.obj : testselection.c
-	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testselection\" testselection.c
-
-testthreads.exe : gtk-$(GTK_VER).dll testthreads.obj
-	$(CC) $(CFLAGS) testthreads.obj gtk-$(GTK_VER).lib ..\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gthread-$(GLIB_VER).lib $(PTHREAD_LIB) $(LDFLAGS)
-
-testthreads.obj : testthreads.c
-	$(CC) $(CFLAGS) $(PTHREAD_INC) -c -DG_LOG_DOMAIN=\"testthreads\" -DUSE_PTHREADS=1 testthreads.c
-
-simple.exe : gtk-$(GTK_VER).dll simple.obj
-	$(CC) $(CFLAGS) simple.obj gtk-$(GTK_VER).lib ..\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
-
-simple.obj : simple.c
-	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"simple\" simple.c
-
-# The clean target doesn't remove the generated sources
-clean:
-	del *.exe
-	del *.obj
-	del *.dll
-	del *.lib
-	del *.exp
-	del *.err
-	del *.map
-	del *.sym
-	del *.lk1
-	del *.mk1
-	del *.pdb
-	del *.ilk
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
new file mode 100644
index 000000000..0a624e84e
--- /dev/null
+++ b/gtk/makefile.msc.in
@@ -0,0 +1,446 @@
+## Makefile for building the gtk DLL with Microsoft C
+## Use: nmake -f makefile.msc
+
+## There is no install target, you have to decide where and 
+## how to install for yourself.
+
+TOP = ../..
+!INCLUDE $(TOP)/build/win32/make.msc
+
+################################################################
+
+# Possibly override versions from build/win32/module.defs
+GTK_VER = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@
+GDK_PIXBUF_VER = @GDK_PIXBUF_MAJOR@.@GDK_PIXBUF_MINOR@
+
+GDK_LIBS = ../gdk/gdk-win32-$(GTK_VER).lib
+GTK_LIBS = gtk-win32-$(GTK_VER).lib
+GDK_PIXBUF_LIBS = ../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib
+
+# Perl and awk are needed to generate some source files.
+# These generated source files are distribuyted with the Win32 GTk+ source
+# distributions, so don't worry if you don't have perl and awk.
+PERL = perl
+AWK = gawk
+
+INCLUDES = -I . -I .. -I ../gdk -I ../gdk-pixbuf
+DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS)
+LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
+# Some files use near as an identifier
+DEFINES = -DGTK_DISABLE_COMPAT_H -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear
+
+TOUCH = copy makefile.msc+nul
+
+GTK_VER=1.3
+
+all :						\
+	..\config.h				\
+	gtkcompat.h				\
+	generated				\
+	gtk-win32-$(GTK_VER).dll		\
+	testcalendar.exe			\
+	testdnd.exe				\
+	testgtk.exe				\
+	testinput.exe				\
+	testrgb.exe				\
+	testselection.exe			\
+	testtext.exe				\
+	testtextbuffer.exe			\
+	simple.exe
+
+gtk_OBJECTS = \
+	fnmatch.obj				\
+	gdk-pixbuf-loader.obj			\
+	gtkaccelgroup.obj			\
+	gtkaccellabel.obj			\
+	gtkadjustment.obj			\
+	gtkalignment.obj			\
+	gtkarg.obj				\
+	gtkarrow.obj				\
+	gtkaspectframe.obj			\
+	gtkbin.obj				\
+	gtkbindings.obj				\
+	gtkbbox.obj				\
+	gtkbox.obj				\
+	gtkbutton.obj				\
+	gtkcalendar.obj				\
+	gtkcheckbutton.obj			\
+	gtkcheckmenuitem.obj			\
+	gtkclipboard.obj			\
+	gtkclist.obj				\
+	gtkcolorsel.obj				\
+	gtkcolorseldialog.obj			\
+	gtkcombo.obj				\
+	gtkcontainer.obj			\
+	gtkctree.obj				\
+	gtkcurve.obj				\
+	gtkdata.obj				\
+	gtkdialog.obj				\
+	gtkdnd.obj				\
+	gtkdrawingarea.obj			\
+	gtkeditable.obj				\
+	gtkentry.obj				\
+	gtkeventbox.obj				\
+	gtkfilesel.obj				\
+	gtkfixed.obj				\
+	gtkfontsel.obj				\
+	gtkframe.obj				\
+	gtkgamma.obj				\
+	gtkgc.obj				\
+	gtkhandlebox.obj			\
+	gtkhbbox.obj				\
+	gtkhbox.obj				\
+	gtkhpaned.obj				\
+	gtkhruler.obj				\
+	gtkhscale.obj				\
+	gtkhscrollbar.obj			\
+	gtkhseparator.obj			\
+	gtkhsv.obj				\
+	gtkiconfactory.obj			\
+	gtkimage.obj				\
+	gtkimcontext.obj			\
+	gtkimcontextsimple.obj			\
+	gtkimmulticontext.obj			\
+	gtkinputdialog.obj			\
+	gtkinvisible.obj			\
+	gtkitem.obj				\
+	gtkitemfactory.obj			\
+	gtklabel.obj				\
+	gtklayout.obj				\
+	gtklist.obj				\
+	gtklistitem.obj				\
+	gtkmain.obj				\
+	gtkmarshal.obj				\
+	gtkmenu.obj				\
+	gtkmenubar.obj				\
+	gtkmenufactory.obj			\
+	gtkmenuitem.obj				\
+	gtkmenushell.obj			\
+	gtkmessagedialog.obj			\
+	gtkmisc.obj				\
+	gtknotebook.obj				\
+	gtkobject.obj				\
+	gtkoptionmenu.obj			\
+	gtkpacker.obj				\
+	gtkpaned.obj				\
+	gtkpixmap.obj				\
+	gtkplug.obj				\
+	gtkpreview.obj				\
+	gtkprogress.obj				\
+	gtkprogressbar.obj			\
+	gtkradiobutton.obj			\
+	gtkradiomenuitem.obj			\
+	gtkrange.obj				\
+	gtkrc.obj				\
+	gtkruler.obj				\
+	gtkscale.obj				\
+	gtkscrollbar.obj			\
+	gtkscrolledwindow.obj			\
+	gtkselection.obj			\
+	gtkseparator.obj			\
+	gtksignal.obj				\
+	gtksocket.obj				\
+	gtkspinbutton.obj			\
+	gtkstyle.obj				\
+	gtkstatusbar.obj			\
+	gtkstock.obj				\
+	gtktable.obj				\
+	gtktearoffmenuitem.obj			\
+	gtktext.obj				\
+	gtktextbtree.obj			\
+	gtktextbuffer.obj			\
+	gtktextchild.obj			\
+	gtktextdisplay.obj			\
+	gtktextiter.obj				\
+	gtktextlayout.obj			\
+	gtktextmark.obj				\
+	gtktextsegment.obj			\
+	gtktexttag.obj				\
+	gtktexttagtable.obj			\
+	gtktexttypes.obj			\
+	gtktextview.obj				\
+	gtkthemes.obj				\
+	gtktipsquery.obj			\
+	gtktogglebutton.obj			\
+	gtktoolbar.obj				\
+	gtktooltips.obj				\
+	gtktree.obj				\
+	gtktreeitem.obj				\
+	gtktypeutils.obj			\
+	gtkvbbox.obj				\
+	gtkvbox.obj				\
+	gtkviewport.obj				\
+	gtkvpaned.obj				\
+	gtkvruler.obj				\
+	gtkvscale.obj				\
+	gtkvscrollbar.obj			\
+	gtkvseparator.obj			\
+	gtkwidget.obj				\
+	gtkwindow.obj
+
+# Source headers which are non-autogenerated headers
+source_headers = \
+	gtk.h			\
+	gtkaccelgroup.h		\
+	gtkaccellabel.h		\
+	gtkadjustment.h		\
+	gtkalignment.h		\
+	gtkarg.h		\
+	gtkarrow.h		\
+	gtkaspectframe.h	\
+	gtkbin.h		\
+	gtkbindings.h		\
+	gtkbbox.h		\
+	gtkbox.h		\
+	gtkbutton.h		\
+	gtkcalendar.h		\
+	gtkcheckbutton.h	\
+	gtkcheckmenuitem.h	\
+	gtkclist.h		\
+	gtkcolorsel.h		\
+	gtkcolorseldialog.h	\
+	gtkcombo.h		\
+	gtkcompat.h		\
+	gtkcontainer.h		\
+	gtkctree.h		\
+	gtkcurve.h		\
+	gtkdata.h		\
+	gtkdebug.h		\
+	gtkdialog.h		\
+	gtkdnd.h		\
+	gtkdrawingarea.h	\
+	gtkeditable.h		\
+	gtkentry.h		\
+	gtkenums.h		\
+	gtkeventbox.h		\
+	gtkfilesel.h		\
+	gtkfixed.h		\
+	gtkfontsel.h		\
+	gtkframe.h		\
+	gtkgamma.h		\
+	gtkgc.h			\
+	gtkhandlebox.h		\
+	gtkhbbox.h		\
+	gtkhbox.h		\
+	gtkhpaned.h		\
+	gtkhruler.h		\
+	gtkhscale.h		\
+	gtkhscrollbar.h		\
+	gtkhseparator.h		\
+	gtkhsv.h		\
+	gtkimage.h		\
+	gtkimcontext.h		\
+	gtkimmulticontext.h	\
+	gtkinputdialog.h	\
+	gtkinvisible.h		\
+	gtkitem.h		\
+	gtkitemfactory.h	\
+	gtklabel.h		\
+	gtklayout.h		\
+	gtklist.h		\
+	gtklistitem.h		\
+	gtkmain.h		\
+	gtkmenu.h		\
+	gtkmenubar.h		\
+	gtkmenufactory.h	\
+	gtkmenuitem.h		\
+	gtkmenushell.h		\
+	gtkmisc.h		\
+	gtknotebook.h		\
+	gtkobject.h		\
+	gtkoptionmenu.h		\
+	gtkpacker.h		\
+	gtkpaned.h		\
+	gdk-pixbuf-loader.h	\
+	gtkpixmap.h		\
+	gtkplug.h		\
+	gtkpreview.h		\
+	gtkprivate.h		\
+	gtkprogress.h		\
+	gtkprogressbar.h	\
+	gtkradiobutton.h	\
+	gtkradiomenuitem.h	\
+	gtkrange.h		\
+	gtkrc.h			\
+	gtkruler.h		\
+	gtkscale.h		\
+	gtkscrollbar.h		\
+	gtkscrolledwindow.h	\
+	gtkselection.h		\
+	gtkseparator.h		\
+	gtksignal.h		\
+	gtksocket.h		\
+	gtkspinbutton.h		\
+	gtkstyle.h		\
+	gtkstatusbar.h		\
+	gtktable.h		\
+	gtktearoffmenuitem.h	\
+	gtktextbuffer.h		\
+	gtktextiter.h		\
+	gtktextmark.h		\
+	gtktexttag.h		\
+	gtktexttagtable.h	\
+	gtktextview.h		\
+	gtktext.h		\
+	gtkthemes.h		\
+	gtktipsquery.h		\
+	gtktogglebutton.h	\
+	gtktoolbar.h		\
+	gtktooltips.h		\
+	gtktree.h		\
+	gtktreeitem.h		\
+	gtktypeutils.h		\
+	gtkvbbox.h		\
+	gtkvbox.h		\
+	gtkviewport.h		\
+	gtkvpaned.h		\
+	gtkvruler.h		\
+	gtkvscale.h		\
+	gtkvscrollbar.h		\
+	gtkvseparator.h		\
+	gtkwidget.h		\
+	gtkwindow.h
+
+# More headers to use when autogenerating.
+gdk_headers =			\
+	..\gdk\gdkcc.h		\
+	..\gdk\gdkcolor.h	\
+	..\gdk\gdkcursor.h     	\
+	..\gdk\gdkdnd.h		\
+	..\gdk\gdkdrawable.h	\
+	..\gdk\gdkevents.h	\
+	..\gdk\gdkfont.h	\
+	..\gdk\gdkgc.h		\
+	..\gdk\gdkim.h		\
+	..\gdk\gdkimage.h	\
+	..\gdk\gdkinput.h	\
+	..\gdk\gdkpixmap.h	\
+	..\gdk\gdkproperty.h	\
+	..\gdk\gdkregion.h	\
+	..\gdk\gdkrgb.h		\
+	..\gdk\gdkselection.h	\
+	..\gdk\gdktypes.h	\
+	..\gdk\gdkvisual.h	\
+	..\gdk\gdkwindow.h
+
+..\config.h : ..\config.h.win32
+	copy ..\config.h.win32 ..\config.h
+
+gtkcompat.h : gtkcompat.h.win32
+	copy gtkcompat.h.win32 gtkcompat.h
+
+GENERATED = gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_ids.c gtktypebuiltins_evals.c gtkmarshal.h gtkmarshal.c
+
+#
+# Generated source files:
+#
+generated : $(GENERATED)
+	$(TOUCH) generated
+
+gtk.defs : makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers)
+	$(PERL) makeenums.pl defs $(source_headers) $(gdk_headers) >gd.tmp
+	copy gd.tmp+gtk-boxed.defs gtk.defs
+	@erase gd.tmp
+
+# generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
+gtktypebuiltins.h: gtk.defs maketypes.awk
+	$(AWK) -f maketypes.awk gtk.defs macros >gtktypebuiltins.h
+
+# generate type identifier variables (GTK_TYPE_WIDGET_FLAGS)
+gtktypebuiltins_vars.c: gtk.defs maketypes.awk
+	$(AWK) -f maketypes.awk gtk.defs variables >gtktypebuiltins_vars.c
+
+# generate type entries for type-id registration
+gtktypebuiltins_ids.c: gtk.defs maketypes.awk
+	$(AWK) -f maketypes.awk gtk.defs entries >gtktypebuiltins_ids.c
+
+# generate enum value arrays
+gtktypebuiltins_evals.c: makeenums.pl gtk.defs
+	$(PERL) makeenums.pl arrays $(source_headers) $(gdk_headers) >gtktypebuiltins_evals.c
+
+gtkmarshal.h gtkmarshal.c : gtkmarshal.list genmarshal.pl
+	$(PERL) genmarshal.pl gtkmarshal.list s-gmh s-gmc
+	del gtkmarshal.c
+	rename s-gmc gtkmarshal.c
+	del gtkmarshal.h
+	rename s-gmh gtkmarshal.h
+
+#
+# Linking:
+#
+gtk-win32-$(GTK_VER).dll : $(gtk_OBJECTS) gtk.def
+	$(CC) $(CFLAGS) -LD -Fegtk-win32-$(GTK_VER).dll $(gtk_OBJECTS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) gdi32.lib user32.lib advapi32.lib $(LDFLAGS) /def:gtk.def
+
+# General rule for compiling the objects into the DLL
+.c.obj :
+	$(CC) $(CFLAGS) -GD -c -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" $<
+
+#
+# Test programs:
+#
+testcalendar.exe : gtk-win32-$(GTK_VER).dll testcalendar.obj
+	$(CC) $(CFLAGS) testcalendar.obj $(GTK_LIBS) $(GDK_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
+
+# Must have separate rules for these objects that don't go in the DLL
+testcalendar.obj : testcalendar.c
+	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testcalendar\" testcalendar.c
+
+testdnd.exe : gtk-win32-$(GTK_VER).dll testdnd.obj
+	$(CC) $(CFLAGS) testdnd.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
+
+testdnd.obj : testdnd.c
+	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testdnd\" testdnd.c
+
+testgtk.exe : gtk-win32-$(GTK_VER).dll testgtk.obj
+	$(CC) $(CFLAGS) testgtk.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(LDFLAGS)
+
+testgtk.obj : testgtk.c
+	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testgtk\" testgtk.c
+
+testinput.exe : gtk-win32-$(GTK_VER).dll testinput.obj
+	$(CC) $(CFLAGS) testinput.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
+
+testinput.obj : testinput.c
+	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testinput\" testinput.c
+
+testrgb.exe : gtk-win32-$(GTK_VER).dll testrgb.obj
+	$(CC) $(CFLAGS) testrgb.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
+
+testrgb.obj : testrgb.c
+	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testrgb\" testrgb.c
+
+testselection.exe : gtk-win32-$(GTK_VER).dll testselection.obj
+	$(CC) $(CFLAGS) testselection.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
+
+testselection.obj : testselection.c
+	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testselection\" testselection.c
+
+testtext.exe : gtk-win32-$(GTK_VER).dll testtext.obj
+	$(CC) $(CFLAGS) testtext.obj $(PANGO_LIBS) $(GDK_PIXBUF_LIBS) $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
+
+testtext.obj : testtext.c
+	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testtext\" testtext.c
+
+testtextbuffer.exe : gtk-win32-$(GTK_VER).dll testtextbuffer.obj
+	$(CC) $(CFLAGS) testtextbuffer.obj $(GDK_PIXBUF_LIBS) $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
+
+testtextbuffer.obj : testtextbuffer.c
+	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testtextbuffer\" testtextbuffer.c
+
+testthreads.exe : gtk-win32-$(GTK_VER).dll testthreads.obj
+	$(CC) $(CFLAGS) testthreads.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(PTHREAD_LIBS) $(LDFLAGS)
+
+testthreads.obj : testthreads.c
+	$(CC) $(CFLAGS) $(PTHREAD_CFLAGS) -c -DG_LOG_DOMAIN=\"testthreads\" -DUSE_PTHREADS=1 testthreads.c
+
+simple.exe : gtk-win32-$(GTK_VER).dll simple.obj
+	$(CC) $(CFLAGS) simple.obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
+
+simple.obj : simple.c
+	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"simple\" simple.c
+
+makefile.msc: makefile.msc.in
+	sed -e s,@GTK[_]MAJOR_VERSION@,@GTK_MAJOR_VERSION@, \
+	    -e s,@GTK[_]MINOR_VERSION@,@GTK_MINOR_VERSION@, \
+	    -e 's,@GDK_PIXBUF[_]MAJOR@,@GDK_PIXBUF_MAJOR@,' \
+	    -e 's,@GDK_PIXBUF[_]MINOR@,@GDK_PIXBUF_MINOR@,'  <makefile.msc.in >$@
diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index a24554f6b..0be827228 100644
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -42,6 +42,10 @@
 #include "gdk/gdk.h"
 #include "gdk/gdkkeysyms.h"
 
+#ifdef G_OS_WIN32
+#define sleep(n) _sleep(n)
+#endif
+
 #include "circles.xbm"
 #include "test.xpm"
 
diff --git a/tests/testgtk.c b/tests/testgtk.c
index a24554f6b..0be827228 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -42,6 +42,10 @@
 #include "gdk/gdk.h"
 #include "gdk/gdkkeysyms.h"
 
+#ifdef G_OS_WIN32
+#define sleep(n) _sleep(n)
+#endif
+
 #include "circles.xbm"
 #include "test.xpm"