Index: gtk/gtk.h
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtk.h,v
retrieving revision 1.61
diff -u -p -r1.61 gtk.h
--- gtk/gtk.h	11 Jul 2003 12:51:23 -0000	1.61
+++ gtk/gtk.h	18 Aug 2003 21:49:27 -0000
@@ -37,6 +38,7 @@
 #include <gtk/gtkalignment.h>
 #include <gtk/gtkarrow.h>
 #include <gtk/gtkaspectframe.h>
+#include <gtk/gtkassistant.h>
 #include <gtk/gtkbbox.h>
 #include <gtk/gtkbin.h>
 #include <gtk/gtkbindings.h>
Index: gtk/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/Makefile.am,v
retrieving revision 1.228
diff -u -p -r1.228 Makefile.am
--- gtk/Makefile.am	11 Jul 2003 12:51:23 -0000	1.228
+++ gtk/Makefile.am	18 Aug 2003 21:49:28 -0000
@@ -95,6 +96,7 @@ gtk_public_h_sources =          \
 	gtkalignment.h		\
 	gtkarrow.h		\
 	gtkaspectframe.h	\
+	gtkassistant.h		\
 	gtkbbox.h		\
 	gtkbin.h		\
 	gtkbindings.h		\
@@ -275,6 +279,7 @@ gtk_c_sources =                 \
 	gtkalignment.c		\
 	gtkarrow.c		\
 	gtkaspectframe.c	\
+	gtkassistant.c		\
 	gtkbin.c		\
 	gtkbindings.c		\
 	gtkbbox.c		\
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/tests/Makefile.am,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile.am
--- tests/Makefile.am	4 Jul 2003 16:48:40 -0000	1.31
+++ tests/Makefile.am	18 Aug 2003 21:49:28 -0000
@@ -54,7 +54,8 @@ noinst_PROGRAMS =			\
 	pixbuf-read			\
 	pixbuf-lowmem			\
 	pixbuf-randomly-modified	\
-	pixbuf-random			
+	pixbuf-random			\
+	testassistant
 
 simple_DEPENDENCIES = $(TEST_DEPS)
 testicontheme_DEPENDENCIES = $(TEST_DEPS)
@@ -79,6 +80,7 @@ testtreecolumns_DEPENDENCIES = $(DEPS)
 testtreesort_DEPENDENCIES = $(DEPS)
 treestoretest_DEPENDENCIES = $(TEST_DEPS)
 testxinerama_DEPENDENCIES = $(TEST_DEPS)
+testassistant_DEPENDENCIES = $(TEST_DEPS)
 
 simple_LDADD = $(LDADDS)
 testcalendar_LDADD = $(LDADDS)
@@ -109,6 +111,7 @@ pixbuf_read_LDADD = $(LDADDS)
 pixbuf_lowmem_LDADD = $(LDADDS)
 pixbuf_randomly_modified_LDADD = $(LDADDS)
 pixbuf_random_LDADD = $(LDADDS)
+testassistant_LDADD = $(LDADDS)
 
 testgtk_SOURCES =	\
 	prop-editor.c   \
@@ -136,6 +139,9 @@ testsocket_SOURCES =    	\
 testsocket_child_SOURCES =    	\
 	testsocket_child.c	\
 	testsocket_common.c
+
+testassistant_SOURCES = 	\
+	testassistant.c
 
 EXTRA_DIST = 			\
 	prop-editor.h		\
Index: gtk/gtkenums.h
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkenums.h,v
retrieving revision 1.56
diff -u -p -r1.56 gtkenums.h
--- gtk/gtkenums.h	18 Jul 2003 18:52:02 -0000	1.56
+++ gtk/gtkenums.h	18 Aug 2003 21:52:57 -0000
@@ -453,6 +453,14 @@ typedef enum
   GTK_IM_STATUS_NONE
 } GtkIMStatusStyle;
 
+typedef enum
+{
+  GTK_ASSISTANT_PAGE_CONTENT,
+  GTK_ASSISTANT_PAGE_INTRO,
+  GTK_ASSISTANT_PAGE_CONFIRM,
+  GTK_ASSISTANT_PAGE_SUMMARY
+} GtkAssistantPageType;
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
