Forgotten file

xi2: Handle XIM modules that replace events
Fixes Bug 645993 - XIM has wierd behaviors. Some XIM modules filter every key event, possibly replacing it with their own one. These events usually have serial=0, so make GdkDeviceManagerXI2 also listen on these.
2011-06-13 07:33:47 -04:00 · 2011-06-13 07:16:16 -04:00 · 2011-06-13 06:56:12 -04:00 · 2011-06-13 00:16:55 -04:00 · 2011-06-12 23:27:18 -04:00 · 2011-06-13 03:52:09 +01:00
2000 changed files with 631992 additions and 672592 deletions
--- a/18
+++ b/18
@@ -1,9 +1,9 @@
 If you want to hack on the GTK+ project, you'll need to have
 the following packages installed:

-        - GNU autoconf 2.54
-        - GNU automake 1.7
-        - GNU libtool 1.4
+        - GNU autoconf 2.62
+        - GNU automake 1.11
+        - GNU libtool 2.2
        - indent (GNU indent 1.9.1 is known good)
        - GNU gettext 10.40

@@ -13,16 +13,16 @@ fine GNU mirrors.  Beta software can be found at alpha.gnu.org.
 Up-to-date instructions about developing GNOME applications and libraries
 can be found here:

-        http://developer.gnome.org
+        http://library.gnome.org/devel/

 Information about using git with GNOME can be found here:

        http://live.gnome.org/Git

-In order to get GIT gtk+ installed on your system, you need to have
-the most recent GIT versions of glib, pango, and atk installed as well.
-The installation process of these libraries is similar to that of gtk+, but
-needs to be fulfilled prior to installation of gtk+.
+In order to get GIT GTK+ installed on your system, you need to have
+the most recent GIT versions of GLib, Pango, and ATK installed as well.
+The installation process of these libraries is similar to that of GTK+,
+but needs to be fulfilled prior to installation of GTK+.

 If at all possible, please use GIT to get the latest development version of
 gtk+ and glib. You can do the following to get glib and gtk+ from GIT:
@@ -37,7 +37,7 @@ have a gnome account, you want to use the following instead:

        $ git clone ssh://<username>@git.gnome.org/git/gtk+

-To compile the GIT version of gtk+ on your system, you will need to take
+To compile the GIT version of GTK+ on your system, you will need to take
 several steps to setup the tree for compilation.  You can do all these
 steps at once by running:

--- a/INSTALL.in
+++ b/INSTALL.in
@@ -5,29 +5,30 @@ GTK+ requires the following packages:

 - The GLib, Pango, GdkPixbuf, ATK and cairo libraries, available at
   the same location as GTK+. GTK+ @GTK_VERSION@ requires at least
-   GLib 2.23.6, Pango 1.20, GdkPixbuf 2.21.0 ATK 1.29.2 and cairo 1.6.0.
+   GLib @GLIB_REQUIRED_VERSION@, Pango @PANGO_REQUIRED_VERSION@,
+   GdkPixbuf @GDK_PIXBUF_REQUIRED_VERSION@, ATK @ATK_REQUIRED_VERSION@
+   and cairo @CAIRO_REQUIRED_VERSION@.

- - gobject-introspection 0.6.7 or newer.
+ - gobject-introspection @INTROSPECTION_REQUIRED_VERSION@ or newer.

 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+
+  % cd gtk+-@GTK_VERSION@                          # change to the toplevel directory
+  % ./configure                                    # run the `configure' script
+  % make                                           # build GTK+
  [ Become root if necessary ]
-  % make install			   # install GTK+
+  % make install                                   # install GTK+

 The Details
 ===========

-Complete information about installing GTK+ and related libraries can be found 
-in the file:
+Complete information about installing GTK+ and related libraries
+can be found in the file:

 docs/reference/gtk/html/gtk-building.html

 Or online at:

- http://developer.gnome.org/doc/API/2.0/gtk/gtk-building.html
-
+ http://library.gnome.org/devel/gtk/stable/gtk-building.html
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,13 @@
 ## Makefile.am for GTK+
 include $(top_srcdir)/Makefile.decl

-SRC_SUBDIRS = gdk gtk modules demos tests perf
+SRC_SUBDIRS = gdk gtk modules demos tests perf examples
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build

 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}

 EXTRA_DIST +=			\
+	autogen.sh		\
 	HACKING			\
 	makecopyright		\
 	NEWS.pre-1-0		\
@@ -30,82 +31,8 @@ EXTRA_DIST +=			\
 	gtk-zip.sh.in		\
 	sanitize-la.sh		\
 	po/README.translators	\
-	po/po2tbl.sed.in	\
-	examples/aspectframe/Makefile  \
-	examples/aspectframe/aspectframe.c  \
-	examples/Makefile  \
-	examples/README.1ST  \
-	examples/extract.awk  \
-	examples/extract.sh  \
-	examples/arrow/Makefile	\
-	examples/arrow/arrow.c	\
-	examples/base/Makefile  \
-	examples/base/base.c  \
-	examples/buttonbox/Makefile \
-	examples/buttonbox/buttonbox.c	\
-	examples/buttons/Makefile  \
-	examples/buttons/buttons.c  \
-	examples/buttons/info.xpm  \
-	examples/calendar/Makefile  \
-	examples/calendar/calendar.c  \
-	examples/entry/Makefile  \
-	examples/entry/entry.c  \
-	examples/eventbox/Makefile  \
-	examples/eventbox/eventbox.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/label/Makefile	\
-	examples/label/label.c	\
-	examples/menu/Makefile  \
-	examples/menu/menu.c  \
-	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/rangewidgets/Makefile  \
-	examples/rangewidgets/rangewidgets.c  \
-	examples/rulers/Makefile  \
-	examples/rulers/rulers.c  \
-	examples/scribble-simple/Makefile  \
-	examples/scribble-simple/scribble-simple.c  \
-	examples/scribble-xinput/Makefile	\
-	examples/scribble-xinput/scribble-xinput.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/fixed/fixed.c  \
-	examples/fixed/Makefile  \
-	examples/frame/frame.c  \
-	examples/frame/Makefile  \
-	examples/spinbutton/spinbutton.c  \
-	examples/spinbutton/Makefile  \
-	examples/find-examples.sh
+	po/po2tbl.sed.in
+
 MAINTAINERCLEANFILES = \
 	$(srcdir)/INSTALL \
 	$(srcdir)/README \
@@ -120,47 +47,45 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/install-sh \
 	$(srcdir)/ltmain.sh \
 	$(srcdir)/missing \
-	$(srcdir)/mkinstalldirs \
 	$(srcdir)/omf.make \
 	$(srcdir)/xmldocs.make \
 	$(srcdir)/gtk-doc.make \
 	$(srcdir)/ChangeLog \
 	`find "$(srcdir)" -type f -name Makefile.in -print`

-GDKTARGET=@gdktarget@

 ## Copy .pc files to target-specific names
-gtk+-$(GDKTARGET)-3.0.pc: gtk+-3.0.pc
-	rm -f gtk+-$(GDKTARGET)-3.0.pc && \
-	cp gtk+-3.0.pc gtk+-$(GDKTARGET)-3.0.pc
+gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc gtk+-broadway-3.0.pc gtk+-wayland-3.0.pc: gtk+-3.0.pc
+	rm -f $@ && \
+	cp gtk+-3.0.pc $@

-gdk-$(GDKTARGET)-3.0.pc: gdk-3.0.pc
-	rm -f gdk-$(GDKTARGET)-3.0.pc && \
-	cp gdk-3.0.pc gdk-$(GDKTARGET)-3.0.pc
+gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc gdk-wayland-3.0.pc: gdk-3.0.pc
+	rm -f $@ && \
+	cp gdk-3.0.pc $@

-gtk+-$(GDKTARGET)-3.0-uninstalled.pc: gtk+-3.0-uninstalled.pc
-	rm -f gtk+-$(GDKTARGET)-3.0-uninstalled.pc && \
-	cp gtk+-3.0-uninstalled.pc gtk+-$(GDKTARGET)-3.0-uninstalled.pc
-
-gdk-$(GDKTARGET)-3.0-uninstalled.pc: gdk-3.0-uninstalled.pc
-	rm -f gdk-$(GDKTARGET)-3.0-uninstalled.pc && \
-	cp gdk-3.0-uninstalled.pc gdk-$(GDKTARGET)-3.0-uninstalled.pc
+gtk+-*-3.0-uninstalled.pc: gtk+-3.0-uninstalled.pc
+	rm -f $@ && \
+	cp gtk+-3.0-uninstalled.pc $@

 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gdk-$(GDKTARGET)-3.0.pc gtk+-$(GDKTARGET)-3.0.pc gail-3.0.pc
+pkgconfig_DATA = gdk-3.0.pc gtk+-3.0.pc gail-3.0.pc
+
+pkgconfig_DATA += ${GDK_BACKENDS:%=gtk+-%-3.0.pc}
+pkgconfig_DATA += ${GDK_BACKENDS:%=gdk-%-3.0.pc}

 if OS_UNIX
 pkgconfig_DATA += gtk+-unix-print-3.0.pc
 endif

-DISTCLEANFILES =				\
-	gtk+-unix-print-3.0.pc			\
-	gtk+-$(GDKTARGET)-3.0.pc		\
-	gdk-$(GDKTARGET)-3.0.pc			\
-	gail-3.0.pc				\
-	gtk+-$(GDKTARGET)-3.0-uninstalled.pc	\
-	gdk-$(GDKTARGET)-3.0-uninstalled.pc	\
-	gail-3.0-uninstalled.pc			\
+DISTCLEANFILES = \
+	gtk+-unix-print-3.0.pc		\
+	gtk+-3.0.pc			\
+	gtk+-x11-3.0.pc			\
+	gdk-3.0.pc			\
+	gdk-x11-3.0.pc			\
+	gail-3.0.pc			\
+	gtk+-3.0-uninstalled.pc		\
+	gail-3.0-uninstalled.pc		\
 	config.lt

 distclean-local:
@@ -169,8 +94,7 @@ distclean-local:
 	fi

 ChangeLog:
-	@echo Creating $@
-	@if test -d "$(srcdir)/.git"; then \
+	$(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
 	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log GTK_2_16_0^^.. --stat) | fmt --split-only > $@.tmp \
 	  && mv -f $@.tmp $@ \
 	  || ($(RM) $@.tmp; \
@@ -182,20 +106,7 @@ ChangeLog:
 	  echo A git checkout and git-log is required to generate this file >> $@); \
 	fi

-## copy the default target for this platform to gdk-3.0.pc and gtk+-3.0.pc
-DEFAULT_GDKTARGET=x11
-install-data-hook:
-	(cd $(DESTDIR)$(pkgconfigdir) && \
-	 test -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc && \
-	 test -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc && \
-	 rm -f gdk-3.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc gdk-3.0.pc && \
-	 rm -f gtk+-3.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc gtk+-3.0.pc) || \
-	(cd $(DESTDIR)$(pkgconfigdir) && \
-	 rm -f gdk-3.0.pc && cp -f gdk-$(GDKTARGET)-3.0.pc gdk-3.0.pc && \
-	 rm -f gtk+-3.0.pc && cp -f gtk+-$(GDKTARGET)-3.0.pc gtk+-3.0.pc)
-
 uninstall-local:
-	rm -f $(DESTDIR)$(pkgconfigdir)/gdk-3.0.pc
 	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc

 dist-hook:
--- a/Makefile.decl
+++ b/Makefile.decl
@@ -1,6 +1,6 @@
 # GTK+ - The GIMP Toolkit

-GTESTER        = gtester		# in $PATH for non-GLIB packages
+GTESTER        = gtester -k		# in $PATH for non-GLIB packages
 GTESTER_REPORT = gtester-report		# in $PATH for non-GLIB packages

 # initialize variables for unconditional += appending
@@ -17,9 +17,15 @@ XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
  1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \
  9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \
  9995 9996 9997 9998 9999
+
+if USE_X11
 SKIP_GDKTARGET = \
-	test "$(gdktarget)" != "x11" \
-	&& echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target."
+	false
+else
+SKIP_GDKTARGET = \
+	echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target."
+endif
+
 XVFB_START = \
 	${XVFB} -help 2>/dev/null 1>&2 \
 	&& XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \
--- a/1252
+++ b/1252
--- a/README.in
+++ b/README.in
@@ -18,7 +18,7 @@ The official web site is:
  http://www.gtk.org/

 Information about mailing lists can be found at
-  http://www.gtk.org/mailinglists.html
+  http://www.gtk.org/mailing-lists.html


 Installation
@@ -27,434 +27,20 @@ Installation
 See the file 'INSTALL'


-Release notes for 2.20
-======================
-
-* GtkStatusbar now has a message area (see gtk_status_bar_get_message_area)
-  which makes it easy to place additional widgets inside the statusbar
-  frame or to replace the label widgets. Previously, this was only possible
-  by accessing the innards of the statusbar widget directly. Applications
-  which are doing so may need some adjustments, since the addition of the
-  message area changed the internal widget hierarchy.
-
-* GtkBuilder no longer sets the "name" property of widgets to the ID
-  attribute of the <object>. Use gtk_buildable_get_name() instead of
-  gtk_widget_get_name() to obtain the ID.
-
-* GTK+ now includes introspection data, as a consequence, it gained a
-  dependency on gobject-introspection. It is possible to build without
-  introspection by passing --disable-introspection to configure.
-
-
-Release notes for 2.18
-======================
-
-* gtk_tooltip_set_custom now accept a NULL custom_widget to unset the
-  old custom_widget. Custom_widget does not get destroyed when the
-  tooltip goes away.
-
-* JPEG2000 support is no longer enabled by default. It must be
-  explicitly turned on, by passing --with-libjasper to configure.
-
-* GDK has been reworked to implement 'client-side windows'. This offers
-  exciting new possibilities, such as transformed, offscreen rendering,
-  but it breaks some long-standing assumptions that applications may
-  have about GDK windows. Setting the environment variable
-  GDK_NATIVE_WINDOWS makes GDK create a native X11 window for each
-  GDK window, which might make problematic applications work better.
-
-* GTK+ calls signal (SIGPIPE, SIG_IGN) during initialization, to ignore
-  SIGPIPE signals, since these are almost never wanted in graphical
-  applications. If you do need to handle SIGPIPE for some reason, reset
-  the handler after gtk_init(), but notice that other libraries (e.g.
-  libdbus or gvfs) might do similar things.
-
-Release notes for 2.16
-======================
-
-* Password entries now display a caps-lock warning. This can be turned off
-  with the caps-lock-warning property.
-
-* Various orientation-related functions have been deprecated in favour
-  of the new GtkOrientable interface: gtk_scale_button_get_orientation,
-  gtk_scale_button_set_orientation, gtk_toolbar_set_orientation.
-
-* The action-proxy interaction has been changed. Widgets that operate as
-  proxies have to implement the GtkActivatable interface now. GtkActivatable
-  implementation are responsible for syncing their appearance with the
-  action and for activating the action. All GTK+ widgets that are commonly
-  used as proxies implement the GtkActivatable interface.
-
-* The handling of keyboard shortcuts has been changed, to help with a
-  longstanding complaint about the way GTK+ handles multiple layouts. GTK+
-  now only uses keys from groups other than the current group if they are
-  not present in the current group.
-
-Release notes for 2.14
-======================
-
-* gtkitemfactory.h is now completely deprecated.
-  As gtkactiongroup.h and gtkstock.h no longer include the gtkitemfactory.h
-  header, this might break application using gtk_item_factory_* symbols
-  without including gtkitemfactory.h - even though this behaviour has never
-  been supported in the first place.
-
-* The GtkFileSystem semi-private interface has been removed.
-  The GTK+ filechooser implementation now uses GIO directly, which has
-  rendered external filesystem implementations unnecessary. Consequently,
-  the GtkFileSystem interface is no longer available, nor the filechooser
-  will load any GtkFileSystem implementation.
-
-* GtkComboBox now renders the popdown button insensitive when
-  the model is empty. Applications which want to populate the list
-  only before displaying it can set gtk_combo_box_set_button_sensitivity
-  to GTK_SENSITIVITY_ON, so that the button is always sensitive or
-  GTK_SENSITIVITY_OFF to make it insensitive respectively.
-
-* GtkAdjustment now enforces that values are restricted to the
-  range [lower, upper - page_size]. This has always been the documented
-  behaviour, and the recommended practice is to set page_size to 0
-  when using adjustments for simple scalar values, like in a slider
-  or spin button.
-
-* gdk-pixbuf will use GIO for mime type detection if possible. For
-  this to work, shared-mime-info needs to be installed and XDG_DATA_DIRS
-  set accordingly at configure time. Otherwise, gdk-pixbuf falls
-  back to its built-in sniffing implementation.
-
-Release notes for 2.12
-======================
-
-* gtk_about_dialog_get/set_name() were deprecated in favour of
-  gtk_about_dialog_get/set_program_name(), the GtkAboutDialog now uses the
-  "program-name" property instead of the conflicting "name" property.
-
-* The gdk-pixbuf tiff loader now requires libtiff 3.6.0 or later.
-
-* Support for Windows 9x/ME has officially been removed. It hasn't worked
-  since 2.6 anyway.
-
-* The GtkTextBufferTargetInfo enumeration values have been changed from
-  G_MAXUINT-0, G_MAXUINT-1, G_MAXUINT-2, etc, to -1, -2, -3 to stay within
-  ANSI C limits.
-
-* A change in the handling of _NET_WM_USER_TIME properties on toplevel
-  windows can cause deadlock problems with window managers that are using
-  GDK for drawing decorations. In particular, metacity <= 2.18.0 is affected
-  by this. The problem has been fixed in metacity 2.18.1.
-
-* Semi-private GtkTextLayout api has changed: new GtkTextLayout method
-  invalidate_cursors(), and new functions gtk_text_layout_invalidate_cursors()
-  and gtk_text_layout_cursors_changed(), which should be used in place of
-  gtk_text_layout_invalidate() and gtk_text_layout_changed() if invalidation
-  is due to marks moved or changed selection; new GtkTextLineDisplay structure
-  member. Source compatibility is preserved; binary compatibility may break
-  only if GtkTextLineDisplay structure was created on stack or as a part
-  of another structure (in particular GnomeCanvas and its clones do not need
-  recompiling).
-
-* Another new signal has been added to GtkNotebook. The new signal
-  is called create-window, so this name can no longer be used for signals
-  in objects derived from GtkNotebook.
-
-* The gtk_notebook_set/get_group_id() functions were found to be insufficient
-  and have been deprecated in favour of gtk_notebook_set/get_group().
-
-* The move-focus signal has been moved to GtkWidget, to unify the 
-  various implementations of this signal in specific widgets. Great care 
-  has been taken to make sure that all code using this signal continues
-  to work.
-
-* An unused and hardly visible GtkFrame has been removed from the menu 
-  widget hierarchy when GtkComboBox::appears-as-list style property is 
-  set. Any RC file applying a different style to any widget below the 
-  widget path "gtk-combobox-popup-window.GtkFrame" should take into 
-  account that the frame no longer exists.
-
-* The external print preview application used by GtkPrintOperationPreview 
-  is now passed the print settings on the command line with the 
-  --print-settings parameter pointing to a temp file containing the 
-  settings. The preview application assumes ownership of the file and 
-  should delete it once it does not need it anymore. The --print-settings 
-  commandline option is understood by Evince 0.9.0 and newer. To use a 
-  different print preview application, change the gtk-print-preview-command 
-  setting in your gtkrc file, e.g. gtk-print-preview-command = "ggv %f"
-
-* GtkMenuShell is now defined as an abstract type. It was already 
-  documented as an abstract class, and there is little reason to 
-  instantiate it.
-
-* The GtkTooltips struct (this is the old tooltips API) is now considered
-  private. Code that used to access this struct, in particular the
-  tips_data_list field, will need to change. All of the old tooltips
-  API has been deprecated in favour of a new implementation and
-  API. This affects all of the gtk_tooltips_ functions, and functions 
-  which take a GtkTooltips argument, such as gtk_tool_item_set_tooltip()
-  and gtk_menu_tool_button_set_arrow_tooltip().
-  
-* The memory management of the GtkRecentManager object has been changed,
-  as using the screen didn't guarantee that the singleton instance was
-  correctly destroyed. The screen-related functions have been deprecated,
-  and should not be used anymore; the GtkRecentManager instance returned by
-  the gtk_recent_manager_get_default() function is guaranteed to be valid
-  for the entire lifetime of an application.
-
-* A number of interfaces that have been superseded by newer interfaces for 
-  a long time have finally been deprecated. This includes 
-  gtk_widget_ref/unref(), gtk_rc_style_ref/unref() and the old file selector.
-
-* The various coordinate systems in use in GtkTreeView widgets have
-  been clarified in the documentation, and in the cause of doing so, 
-  the functions gtk_tree_view_widget_to_tree_coords() and
-  gtk_tree_view_tree_to_widget_coords() have been deprecated in 
-  favour of a new family of gtk_tree_view_convert_ functions.
-
-* gtk_menu_item_remove_submenu() has been deprecated in favour of
-  gtk_menu_item_set_submenu (..., NULL).
-
-* gtk_default_draw_check() has been fixed to really decrease the
-  indicator size by one pixel to ensure an odd size instead of
-  accidentially increasing it.
-  Consequently, gtk_cell_renderer_toggle_render() could be fixed to
-  not subtract 1 from the size passed to gtk_paint_option(), which
-  was just a workaround for above off-by-two for even sizes (theme
-  engines now get the real indicator size passed).
-  The default toggle size of GtkCheckMenuItem and GtkCellRendererToggle
-  has been changed to 13 to be consistent with GtkCheckButton.
-  The only visible change with default settings is that the indicator in
-  GtkCellRendererToggle has changed its size from 11 to 13 and is now
-  consistent with menus and toggle buttons.
-
-* GTK+ has always required that gtk_init() (or a variant thereof) is
-  called before any other GTK+ function. Some applications call functions
-  like gtk_clipboard_get() to check if they need to call gtk_init(),
-  anyway. A change in GLib 2.14 has recently broken this unsupported
-  practise. It is worth pointing out that calling gtk_init() twice
-  does no harm.
-
-
-Release notes for 2.10
-======================
-
-* The hexadecimal Unicode input feature has been reworked. It no longer
-  blocks the use of the sixteen Ctrl-Shift-<hex digit> key sequences. Now
-  it only uses Ctrl-Shift-u.
-
-* A memory leak in GtkStyle handling has been fixed. This may expose bugs
-  in third-party widgets which forget to call gtk_style_attach() in their
-  realize functions.
-
-* Range widgets like GtkScrollbar now render their arrows insensitive
-  when the slider is at the end. Applications which react to arrow
-  clicks even if the slider is at the end may want to use the new
-  gtk_range_set_[upper/lower]_stepper_sensitivity() functions to
-  prevent the arrows from being rendered insensitive.
-
-* GtkObject now uses the "floating reference" support in GObject. 
-  GTK_OBJECT_IS_FLOATING() will still work, but direct checking
-  of the GTK_FLOATING flag will no longer detect the floating 
-  reference. Details about floating references can be found in the docs:
-  http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html#floating-ref
-
-* Accelerators like (_F) are now stripped from labels when they are 
-  displayed in toolbars. If this is not wanted, the feature can be 
-  suppressed by inserting a Unicode control character, e.g ZWNJ.
-
-* The pixbuf theme engine can now customize expanders (in GtkTreeView
-  and GtkExpander) and resize grips, using the new EXPANDER and
-  RESIZE_GRIP function values.
-
-* Dialogs created by gtk_about_dialog_new() no longer hide automatically
-  when the user clicks close. It is the applications responsibility to
-  hide or destroy the dialog.
-
-* Several new signals have been added to GtkNotebook. Care has been taken
-  to choose signal names which do not collide with signals added by well-known
-  derived classes. The names which can no longer be used for signals in 
-  objects derived from GtkNotebook are page-reordered, page-removed and
-  page-added.
-
-* Due to the interface changes in the file chooser backend interface, 
-  the GTK+ ABI version has been bumped to 2.10.0. Third-party filesystem 
-  backends have to be ported to the new interface, other modules, such as 
-  theme engines, input method modules or pixbuf loaders have to be rebuilt 
-  so that they are installed in the right place for GTK+ to find them.
-
-
-Release notes for 2.8
+Release notes for 3.0
 =====================

-* GTK+ 2.8 and Pango 1.10 require the cairo library.
+* GTK+ 3 is a major new version of GTK+, which is parallel installable
+  with GTK+ 2.x. For information about porting applications from GTK+ 2.x
+  to GTK+ 3, see the file:

-* The default theme has been renamed to "Raleigh". Existing configurations
-  specifying the "Default" theme name should still work.
+  docs/reference/gtk/html/migrating.html

-* The GtkTreeView::enable-search property has been changed to control
-  only typeahead search, not the C-f keybinding to start an interactive
-  search. To turn off interactive searching completely, you have to
-  set GtkTreeView::search-column to -1.
+  Or online at:

-* The restriction on using the same cell renderer in multiple columns
-  of a GtkTreeView is now more strictly enforced.
+  http://library.gnome.org/devel/gtk/3.0/migrating.html

-* In GTK+ 2.8, GtkCalendar uses nl_langinfo() (if available) to determine
-  the first day of the week. Thus, it is possible to select the first day
-  of the week independently from the language, by setting LC_TIME.
-
-* In GTK+ 2.8, the gtk-update-icon-cache utility includes image data
-  in the icon caches, which will make the icon cache files larger than
-  the one produced by GTK+ 2.6. This change will reduce the memory
-  overhead of icon themes at runtime, since all GTK+ applications can
-  share the image data in memory.
-
-* In 2.8, GDK emits GdkEventGrabBroken events when a keyboard or pointer
-  grab is broken. On X11, this can happen if the same application grabs
-  again, or if the window used for the grab becomes unviewable. It happens
-  more often on Win32. Applications which use grabs should pay attention
-  to these events and do the necessary cleanups when the grab is lost.
-* The GIOChannel code for sockets on win32 has been rewritten.
-  Applications who make non-trivial use of GIOChannels on win32 should
-  be watched for possible problems.
-
-* GLib 2.8 uses atomic operations to implement reference counting, thus
-  g_object_ref/unref, g_closure_ref/sink/unref and g_iochannel_ref/unref
-  can be used without locking in multithreaded applications. Note that
-  other modifications, like concurrent setting of properties still require
-  locking.
-
-* g_convert() and related character set conversion functions have been
-  fixed to emit pending shift states and to not cache iconv descriptors
-  across multiple calls, since that is problematic for some encodings.
-  Note that these functions are not suitable for streaming conversions;
-  use g_iconv() to do streaming conversion.
-
-
-Release notes for 2.6
-=====================
-
-* GTK+ 2.6 supports clipboard persistency. To make use of this feature,
-  a clipboard manager following the specification at
-  http://www.freedesktop.org/wiki/Standards/clipboard-manager-spec
-  must be running. A sample implementation of such a clipboard manager
-  is available at 
-  http://people.imendio.com/andersca/archives/clipboard-manager-0.3.tar.gz
-  Applications can use the function gdk_display_supports_clipboard_persistence() 
-  to find out if clipboard persistence is available.
-
-* Notification on clipboard ownership changes via GdkOwnerChange events 
-  requires the XFIXES X extension. Applications can use the function
-  gdk_display_supports_selection_notification() to find out if ownerchip
-  change notification is available.
-
-* The icon theme code in GTK+ 2.6 follows the freedesktop.org icon theme 
-  specification. Setting the XDG_DATA_DIRS environtment variable may be 
-  necessary if your icons aren't installed in the default location 
-  /usr/share/icons.
-
-* The icon theme code in GTK+ 2.6 can make use of mmap()able cache files
-  to avoid a lot of disk searching overhead. GTK+ includes a utility named
-  gtk-update-icon-cache to generate these cache files. For further details,
-  see the gtk-update-icon-cache man page or the GTK+ documentation.
-
-* To reduce code size and improve efficiency, GTK+, when compiled 
-  with the GNU toolchain, has separate internal and external entry 
-  points for exported functions. The internal names, which begin with 
-  IA__, may be seen when debugging a GTK+ program.
-
-* The following functions have been deprecated in GTK+ 2.6:
-  gdk_pango_context_set_colormap
-  gtk_cell_renderer_editing_canceled
-
-* The new GtkFileChooser widget emphasizes simplicity and thus does 
-  not provide a navigation entry by default when opening files. 
-  Experienced command line users will likely want to make heavy use of
-  the location dialog brought up by the Control-L key shortcut.
-
-* The GTK+ libraries use an '_' prefix to indicate private symbols that
-  must not be used by applications. On some platforms, symbols beginning 
-  with prefixes such as _gtk, _gdk, and _pango will be exported
-  from the library, on others not. In no case can applications
-  use these private symbols. In addition to that, GTK+ 2.6 makes several
-  symbols private which were not in any installed header files and
-  were never intended to be exported.
-
-* The gdk_pixbuf_xlib library included in the contrib/ directory 
-  and the framebuffer GDK backend included in the gdk/linux-fb directory
-  of GTK+ are provided on an as-is basis and have not been tested at all. 
-  No guarantees about the degree of workingness or about future
-  compatibility are provided.
-
-* On Unix, the assumption of GLib and GTK+ by default is that filenames on 
-  the filesystem are encoded in UTF-8 rather than the encoding of the locale;
-  the GTK+ developers consider that having filenames whose interpretation
-  depends on the current locale is fundamentally a bad idea.
-
-  If you have filenames encoded in the encoding of your locale, then you 
-  may want to set the G_FILENAME_ENCODING environment variable:
-  
-   G_FILENAME_ENCODING=@locale
-   export G_FILENAME_ENCODING
-
-  (Earlier versions of GLib 2.x required a different environment variable
-  setting; G_BROKEN_FILENAMES=1 to achieve the same effect; this 
-  is still supported, but G_FILENAME_ENCODING is preferred.)
-  Best integration of GTK+ 2.6 with the environment is achieved by 
-  using a UTF-8 locale.
-
-  On Windows, filenames passed to GTK+ should always be in UTF-8, as
-  in GLib 2.6. This is different than in previous versions of GTK+
-  where the system codepage was used. As in GLib, for DLL ABI
-  stability, applications built against previous versions of GTK+ will
-  use entry points providing the old semantics.
-
-  When compiling against GTK+ 2.6, applications intended to be
-  portable to Windows must take the UTF-8 file name encoding into
-  consideration, and use the gstdio wrappers to access files whose 
-  names have been constructed from strings returned from GTK+ or GLib.
-
-
-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 one of the tests or demos built with GTK+, 
-  such as demos/gtk-demo/gtk-demo, that would 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.
-
-Patches should be in unified diff form. (The -up option to GNU diff.)
+* Note that the library sonames in this release have been changed from
+  libgtk-3.0 and libgdk-3.0 to libgtk-3 and libgdk-3, to prevent the
+  library versions from going backwards, compared to the 2.90/91/99
+  releases. Applications will have to be recompiled.
--- a/README.win32
+++ b/README.win32
@@ -7,9 +7,18 @@ Building GTK+ on Win32
 ======================

 First you obviously need developer packages for the compile-time
-dependencies: Pango, atk, glib, gettext-runtime, libiconv, libpng,
-zlib, libtiff at least. See
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies .
+dependencies: GDK-Pixbuf, Pango, atk, glib, gettext-runtime, libiconv at least.
+See http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies .
+
+For people compiling GTK+ with Visual C++ 2005 or later, it is
+recommended that the same compiler is used for at least GDK-Pixbuf,
+Pango, atk and glib so that crashes and errors caused by different CRTs
+can be avoided.  The VS 2008 project files and/or VS Makefiles are
+either already available or will be available in the next stable release.
+Unfortunately compiling with Microsoft's compilers versions 2003 or earlier
+is not supported as compiling the latest stable GLib (which *is* required for
+building this GTK+ release) requires features from newer compilers
+and/or Platform SDKs

 After installing the dependencies, there are two ways to build GTK+
 for win32.
@@ -85,7 +94,7 @@ LDFLAGS="-L/devel/dist/${ARCH}/${LIBPNG}/lib \
 LIBS=-lintl \
 CFLAGS=-O2 \
 ./configure \
--with-gdktarget=win32 \
+--enable-win32-backend \
 --disable-gdiplus \
 --with-included-immodules \
 --without-libjasper \
@@ -147,11 +156,17 @@ Use the Microsoft compiler, cl and Make, nmake. Say nmake -f
 makefile.msc in gdk and gtk. Be prepared to manually edit various
 makefile.msc files, and the makefile snippets in build/win32.

+There are also VS 2008 solution and project files to build GTK+, which
+are maintained by Chun-wei Fan.  They should build GTK+ out of the box,
+provided that the afore-mentioned dependencies are installed.  They will
+build GDK with the Win32 backend, GTK+ itself and the gtk-demo program.
+(The GAIL and GAIL-util sources are not built by this method yet)
+
 Alternative 1 also generates Microsoft import libraries (.lib), if you
 have lib.exe available. It might also work for cross-compilation from
 Unix.

-I use method 1 myself. Hans Breuer has been taking care of the MSVC
+I (Tor) use method 1 myself. Hans Breuer has been taking care of the MSVC
 makefiles. At times, we disagree a bit about various issues, and for
 instance the makefile.msc files might not produce identically named
 DLLs and import libraries as the "autoconfiscated" makefiles and
@@ -182,3 +197,4 @@ sources. Unfortunately it seems that only Wacom tablets come with
 support for the Wintab API nowadays.

 --Tor Lillqvist <tml@iki.fi>, <tml@novell.com>
+--Updated by Fan, Chun-wei <fanc999@yahoo.com.tw>
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,129 +1,32 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.

-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.

-ORIGDIR=`pwd`
-cd $srcdir
-PROJECT=Gtk+
-TEST_TYPE=-d
-FILE=gdk
+olddir=`pwd`
+cd "$srcdir"

-DIE=0
-
-have_libtool=false
-if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
-	libtool_version=`libtoolize --version |
-			 head -1 |
-			 sed -e 's/^\(.*\)([^)]*)\(.*\)$/\1\2/g' \
-			     -e 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
-	case $libtool_version in
-	    2.2*)
-		have_libtool=true
-		;;
-	esac
-fi
-if $have_libtool ; then : ; else
-	echo
-	echo "You must have libtool 2.2 installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
-	DIE=1
-fi
-
-(gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have gtk-doc installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
-	DIE=1
-}
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have autoconf installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
-	DIE=1
-}
-
-if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
-    AUTOMAKE=automake-1.11
-    ACLOCAL=aclocal-1.11
-else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
-    AUTOMAKE=automake-1.10
-    ACLOCAL=aclocal-1.10
+GTKDOCIZE=`which gtkdocize`
+if test -z $GTKDOCIZE; then
+        echo "*** No GTK-Doc found, please install it ***"
+        exit 1
 else
-	echo
-	echo "You must have automake 1,10.x or 1.11.x installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
-	DIE=1
+        gtkdocize || exit $?
 fi
-fi
-
-if test "$DIE" -eq 1; then
-	exit 1
-fi
-
-test $TEST_TYPE $FILE || {
-	echo "You must run this script in the top-level $PROJECT directory"
-	exit 1
-}
-
-# NOCONFIGURE is used by gnome-common; support both
-if ! test -z "$AUTOGEN_SUBDIR_MODE"; then
-    NOCONFIGURE=1
-fi
-
-if test -z "$NOCONFIGURE"; then
-        if test -z "$*"; then
-                echo "I am going to run ./configure with no arguments - if you wish "
-                echo "to pass any to it, please specify them on the $0 command line."
-        fi
-fi
-
-if test -z "$ACLOCAL_FLAGS"; then
-
-	acdir=`$ACLOCAL --print-ac-dir`
-        m4list="glib-2.0.m4 glib-gettext.m4"
-
-	for file in $m4list
-	do
-		if [ ! -f "$acdir/$file" ]; then
-			echo "WARNING: aclocal's directory is $acdir, but..."
-			echo "         no file $acdir/$file"
-			echo "         You may see fatal macro warnings below."
-			echo "         If these files are installed in /some/dir, set the ACLOCAL_FLAGS "
-			echo "         environment variable to \"-I /some/dir\", or install"
-			echo "         $acdir/$file."
-			echo ""
-		fi
-	done
-fi
-
-rm -rf autom4te.cache

 # README and INSTALL are required by automake, but may be deleted by clean
 # up rules. to get automake to work, simply touch these here, they will be
 # regenerated from their corresponding *.in files by ./configure anyway.
 touch README INSTALL

-$ACLOCAL -I m4 $ACLOCAL_FLAGS || exit $?
-
-libtoolize --force || exit $?
-gtkdocize || exit $?
-
-autoheader || exit $?
-
-$AUTOMAKE --add-missing || exit $?
-autoconf || exit $?
-cd $ORIGDIR || exit $?
-
-if test -z "$NOCONFIGURE"; then
-        $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
-
-        echo 
-        echo "Now type 'make' to compile $PROJECT."
+AUTORECONF=`which autoreconf`
+if test -z $AUTORECONF; then
+        echo "*** No autoreconf found, please install it ***"
+        exit 1
+else
+        autoreconf --force --install --verbose || exit $?
 fi
+
+cd "$olddir"
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/Makefile.decl

 SUBDIRS = \
-	vs9
+	vs9  \
+	vs10
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -0,0 +1,19 @@
+include $(top_srcdir)/Makefile.decl
+
+EXTRA_DIST += \
+	README.txt \
+	gtk+.sln \
+	gtk+.props \
+	gdk-win32.vcxproj \
+	gdk-win32.vcxproj.filters \
+	gdk.vcxproj \
+	gdk.vcxprojin \
+	gdk.vcxproj.filters \
+	gdk.vcxproj.filtersin \
+	gtk.vcxproj \
+	gtk.vcxprojin \
+	gtk.vcxproj.filters \
+	gtk.vcxproj.filtersin \
+	gtk-demo.vcxproj \
+	gtk-demo.vcxproj.filters \
+	install.vcxproj
--- a/build/win32/vs10/README.txt
+++ b/build/win32/vs10/README.txt
@@ -0,0 +1,90 @@
+Note that all this is rather experimental.
+
+This VS10 solution and the projects it includes are intented to be used
+in a GTK+ source tree unpacked from a tarball. In a git checkout you
+first need to use some Unix-like environment or manual work to expand
+the files needed, like config.h.win32.in into config.h.win32 and the
+.vcprojin files here into corresponding actual .vcproj files.
+
+You will need the parts from below in the GTK+ stack: GDK-Pixbuf, Pango,
+ATK and GLib.  External dependencies are at least Cairo
+(with Cairo-GObject support, meaning Cairo 1.10.x or later), zlib, libpng,
+gettext-runtime, fontconfig*, freetype*, expat*.  See the 
+build/win32/vs10/README.txt file in glib for details where to unpack them.
+
+It is recommended that one builds the dependencies with VS10 as far as
+possible, especially those from and using the GTK+ stack (i.e. GLib,
+Cairo, ATK, Pango, GDK-Pixbuf), so that crashes caused by mixing calls
+to different CRTs can be kept at a minimum.
+
+zlib, libpng, and Cairo do contain support for compiling under VS10
+using VS project files and/or makefiles at this time of writing, For the
+GTK+ stack, VS10 project files are either available under
+$(srcroot)/build/vs10 in the case of GLib (stable/unstable), ATK**
+(2.x stable/unstable) and GDK-Pixbuf (unstable), and should be in the next
+unstable version of Pango.  There is no known official VS10 build
+support for fontconfig (along with freetype and expat) and
+gettext-runtime, so please use the binaries from: 
+
+ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit)
+ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit)
+
+Unzip the binaries obtained from ftp.gnome.org in <root>\vs10\<PlatformName>,
+and build the following, if not already done so: 
+
+Note: put the resulting zlib, libpng, pcre and Cairo files as follows:
+ .dll files: <root>\vs10\<PlatformName>\bin
+ .lib files: <root>\vs10\<PlatformName>\lib
+ .h files: <root>\vs10\<PlatformName>\include
+
+The recommended build order for these dependencies:
+(first unzip any dependent binaries downloaded from the ftp.gnome.org
+ as described in the README.txt file in the build/win32/vs10 folder)
+-zlib
+-libpng
+-(for GDK-Pixbuf, if not using GDI+) IJG JPEG
+-(for GDK-Pixbuf, if not using GDI+) libtiff
+ [libtiff requires zlib and IJG JPEG]
+-(for GDK-Pixbuf, if not using GDI+) jasper [jpeg-2000 library]
+-(optional for GLib) PCRE (version 8.12 or later, use of CMake to
+  build PCRE is recommended-see build/win32/vs10/README.txt of GLib)
+-GLib ***
+-Cairo (inclusive of Cairo-GObject)
+-ATK-2.x** ***
+-Pango***
+-GDK-Pixbuf***
+(note the last 3 dependencies are not interdependent, so the last 3
+ dependencies can be built in any order)
+
+The "install" project will copy build results and headers into their
+appropriate location under <root>\vs10\<PlatformName>. For instance,
+built DLLs go into <root>\vs10\<PlatformName>\bin, built LIBs into
+<root>\vs10\<PlatformName>\lib and GTK+ headers into
+<root>\vs10\<PlatformName>\include\gtk-3.0. This is then from where
+project files higher in the stack are supposed to look for them, not
+from a specific GLib source tree.
+
+*About the dependencies marked with *: These dependencies are optional
+ as those are not compulsory components for building and running GTK+
+ itself, but note that they are needed for people running and building
+ GIMP or those who need complex script support via fontconfig.  They
+ are referred to by components in Cairo and Pango mainly.
+ Decide whether you need fontconfig support prior to building Cairo
+ and Pango.
+ 
+**Regarding ATK-2.x: prior to compiling ATK-2.x, please open atkprops
+  in VS under "Properties Manager" view (it is under any one of the
+  build configurations, right-click on atkprops and select "Properties").
+  Navigate to "User Macros", and edit the following fields:
+  AtkApiVersion -> 2.0
+  AtkLibToolCompatibleDllSuffix -> -2.0-0
+  AtkSeperateVS10DLLSuffix -> -2-vs10
+  Sorry this change did not make it upstream prior to ATK-2.0.0 release-
+  this will be in the subsequent releases of ATK-2.x and was committed
+  upstream.
+
+***:Put the sources of the packages marked with *** in <root>\<package-
+    source-tree>, and build with VS10 from there.
+
+--Tor Lillqvist <tml@iki.fi>
+--Updated by Chun-wei Fan <fanc999@yahoo.com.tw>
--- a/build/win32/vs10/gdk-win32.vcxproj
+++ b/build/win32/vs10/gdk-win32.vcxproj
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}</ProjectGuid>
+    <RootNamespace>gdkwin32</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\gdk\win32\gdkcursor-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkdevice-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkdevice-wintab.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkdevicemanager-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkdisplay-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkdnd-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkevents-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkgeometry-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkglobals-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkinput.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkkeys-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkmain-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkproperty-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkscreen-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkselection-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdktestutils-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkvisual-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkdisplaymanager-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkwin32id.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkwindow-win32.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/build/win32/vs10/gdk-win32.vcxproj.filters
+++ b/build/win32/vs10/gdk-win32.vcxproj.filters
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\gdk\win32\gdkcursor-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkdevice-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkdevice-wintab.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkdevicemanager-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkdisplay-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkdnd-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkevents-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkgeometry-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkglobals-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkinput.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkkeys-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkmain-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkproperty-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkscreen-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkselection-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdktestutils-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkvisual-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkdisplaymanager-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkwin32id.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkwindow-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
--- a/build/win32/vs10/gdk.vcxproj.filtersin
+++ b/build/win32/vs10/gdk.vcxproj.filtersin
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\gdk\win32\rc\gdk.rc"><Filter>Resource Files</Filter></ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+#include "libgdk.vs10.sourcefiles.filters"
+    <ClCompile Include="..\..\..\gdk\gdkkeynames.c"><Filter>Source Files</Filter></ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\gdk\gdk.symbols">
+      <Filter>Resource Files</Filter>
+    </CustomBuild>
+  </ItemGroup>
+</Project>
--- a/build/win32/vs10/gdk.vcxprojin
+++ b/build/win32/vs10/gdk.vcxprojin
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}</ProjectGuid>
+    <RootNamespace>gdk</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\gdk\gdk.symbols">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating gdk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkGenerateGdkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)gdk.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating gdk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkGenerateGdkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)gdk.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating gdk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkGenerateGdkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)gdk.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating gdk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkGenerateGdkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)gdk.def;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\gdk\win32\rc\gdk.rc" />
+  </ItemGroup>
+  <ItemGroup>
+#include "libgdk.vs10.sourcefiles"
+    <ClCompile Include="..\..\..\gdk\gdkkeynames.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="gdk-win32.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073fa}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/build/win32/vs10/gtk+.props
+++ b/build/win32/vs10/gtk+.props
@@ -0,0 +1,640 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+    <GlibEtcInstallRoot>..\..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
+    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
+    <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj</DefDir>
+    <GtkApiVersion>3.0</GtkApiVersion>
+    <GtkBinaryVersion>2.10.0</GtkBinaryVersion>
+    <GtkDummyPrefix>\"/dummy\"</GtkDummyPrefix>
+    <GtkPrefixDefine>GTK_PREFIX="\"$(GtkDummyPrefix)\""</GtkPrefixDefine>
+    <GdkDefines>GDK_COMPILATION;G_LOG_DOMAIN="\"Gdk\""</GdkDefines>
+    <GtkIncludedImmodulesDefines>INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr</GtkIncludedImmodulesDefines>
+    <GtkDefines>GTK_COMPILATION;G_LOG_DOMAIN="\"Gtk\"";GTK_HOST="\"i686-pc-vs10\"";GTK_PRINT_BACKENDS="\"file\"";GTK_PRINT_PREVIEW_COMMAND="\"undefined-gtk-print-preview-command\"";$(GtkIncludedImmodulesDefines);GTK_LIBDIR="\"$(GtkDummyPrefix)/lib\"";GTK_DATADIR="\"$(GtkDummyPrefix)/share\"";GTK_DATA_PREFIX="\"$(GtkDummyPrefix)\"";GTK_SYSCONFDIR="\"$(GtkDummyPrefix)/etc\"";MULTIPRESS_CONFDIR="\"$(GtkDummyPrefix)/etc/gtk-$(GtkApiVersion)\"";MULTIPRESS_LOCALEDIR="\"$(GtkDummyPrefix)/share/locale\"";GTK_VERSION="\"$(GtkVersion)/etc\"";GTK_BINARY_VERSION="\"$(GtkBinaryVersion)/etc\"";GDK_DISABLE_DEPRECATED</GtkDefines>
+    <GtkDoInstall>
+echo on
+
+mkdir $(CopyDir)\bin
+
+copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin
+
+
+mkdir $(CopyDir)\bin\gtk3-demo
+
+copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin\gtk3-demo
+
+copy ..\..\..\demos\gtk-demo\*.c $(CopyDir)\bin\gtk3-demo
+
+copy ..\..\..\demos\gtk-demo\*.h $(CopyDir)\bin\gtk3-demo
+
+copy ..\..\..\demos\gtk-demo\*.ui $(CopyDir)\bin\gtk3-demo
+
+copy ..\..\..\demos\gtk-demo\*.jpg $(CopyDir)\bin\gtk3-demo
+
+copy ..\..\..\demos\gtk-demo\*.png $(CopyDir)\bin\gtk3-demo
+
+copy ..\..\..\demos\gtk-demo\*.gif $(CopyDir)\bin\gtk3-demo
+
+
+mkdir $(CopyDir)\lib
+
+copy $(Configuration)\$(Platform)\bin\*-$(GtkApiVersion).lib $(CopyDir)\lib
+
+
+mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdk.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkapplaunchcontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkcairo.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkcolor.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkcursor.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkdevice.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkdevicemanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkdisplay.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkdisplaymanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkdnd.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkevents.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkkeys.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkkeysyms.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkmain.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkpango.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkpixbuf.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkprivate.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkproperty.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkrectangle.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkrgba.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkscreen.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkselection.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdktestutils.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkthreads.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdktypes.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkvisual.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+
+mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtk.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkaboutdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkaccelgroup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkaccelgroupprivate.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkaccellabel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkaccelmap.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkactiongroup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkactivatable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkadjustment.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkalignment.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkappchooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkappchooserbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkappchooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkappchooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkapplication.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkarrow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkaspectframe.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkassistant.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkbin.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkbindings.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkborder.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkbuildable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkbuilder.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcalendar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellarea.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellareabox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellareacontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcelleditable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcelllayout.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellrenderer.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellrendereraccel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellrenderercombo.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellrendererpixbuf.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellrendererprogress.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellrendererspin.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellrendererspinner.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellrenderertext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellrenderertoggle.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellview.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcheckbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcheckmenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkclipboard.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcolorbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcolorsel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcolorseldialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcombobox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcomboboxtext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcontainer.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcssprovider.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkdebug.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkdnd.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkdrawingarea.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkeditable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkentry.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkentrybuffer.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkentrycompletion.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkenums.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkeventbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkexpander.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkfilechooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkfilechooserbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkfilechooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkfilechooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkfilefilter.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkfixed.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkfontbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkfontsel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkframe.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkgradient.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkgrid.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhandlebox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhsv.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkiconfactory.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkicontheme.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkiconview.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkimage.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkimagemenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkimcontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkimcontextsimple.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkimmodule.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkimmulticontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkinfobar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkinvisible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtklabel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtklayout.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtklinkbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkliststore.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkmain.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkmenu.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkmenubar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkmenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkmenushell.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkmenutoolbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkmessagedialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkmisc.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkmodules.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkmountoperation.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtknotebook.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtknumerableicon.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkoffscreenwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkorientable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkpagesetup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkpapersize.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkplug.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkprintcontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkprintoperation.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkprintoperationpreview.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkprintsettings.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkprivate.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkprogressbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkradioaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkradiobutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkradiomenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkradiotoolbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkrange.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkrc.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkrecentaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkrecentchooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkrecentchooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkrecentchoosermenu.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkrecentchooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkrecentfilter.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkrecentmanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkscalebutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkscrollable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkscrolledwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkselection.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkseparatormenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkseparatortoolitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtksettings.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkshow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtksizegroup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtksizerequest.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtksocket.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkspinbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkspinner.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkstatusbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkstatusicon.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkstock.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkstyle.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkstylecontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkstyleproperties.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkstyleprovider.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkswitch.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtksymboliccolor.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktearoffmenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktestutils.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktextattributes.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktextbuffer.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktextbufferrichtext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktextchild.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktextdisplay.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktextiter.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktextlayout.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktextmark.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktexttag.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktexttagtable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktextview.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkthemingengine.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktoggleaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktogglebutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktoggletoolbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktoolbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktoolbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktoolitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktoolitemgroup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktoolpalette.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktoolshell.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktooltip.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktreednd.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktreemodel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktreemodelfilter.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktreemodelsort.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktreeselection.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktreesortable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktreestore.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktreeview.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktreeviewcolumn.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkuimanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkvbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkvbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkversion.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkviewport.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkvolumebutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkvpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkvscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkvscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkvseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+
+copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\include\gtk-3.0\gdk
+
+
+copy $(Configuration)\$(Platform)\bin\*-$(GtkApiVersion).lib $(CopyDir)\lib
+
+
+mkdir $(CopyDir)\share\glib-2.0\schemas
+
+copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
+
+echo "Compiling gsettings XML File(s)..."
+
+$(CopyDir)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
+
+
+</GtkDoInstall>
+    <GtkGenerateGdkDef>echo EXPORTS &gt;"$(DefDir)\gdk.def" &amp;&amp; cl /EP -DGDK_WINDOWING_WIN32 -DALL_FILES -DG_GNUC_CONST= ..\..\..\gdk\gdk.symbols &gt;&gt;"$(DefDir)\gdk.def"</GtkGenerateGdkDef>
+    <GtkGenerateGtkDef>echo EXPORTS &gt;"$(DefDir)\gtk.def" &amp;&amp; cl /EP -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gtk\gtk.symbols &gt;&gt;"$(DefDir)\gtk.def"</GtkGenerateGtkDef>
+    <GtkLibtoolCompatibleDllPrefix>lib</GtkLibtoolCompatibleDllPrefix>
+    <GtkLibtoolCompatibleDllSuffix>-$(GtkApiVersion)-0</GtkLibtoolCompatibleDllSuffix>
+    <GtkSeparateVS10DllPrefix />
+    <GtkSeparateVS10DllSuffix>-3-vs10</GtkSeparateVS10DllSuffix>
+    <GtkDllPrefix>$(GtkSeparateVS10DllPrefix)</GtkDllPrefix>
+    <GtkDllSuffix>$(GtkSeparateVS10DllSuffix)</GtkDllSuffix>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <_PropertySheetDisplayName>gtk+props</_PropertySheetDisplayName>
+    <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+    </ClCompile>
+	<Link>
+      <AdditionalDependencies>pangocairo-1.0.lib;cairo.lib;pango-1.0.lib;gdk_pixbuf-2.0.lib;gio-2.0.lib;gmodule-2.0.lib;gobject-2.0.lib;glib-2.0.lib;intl.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PreBuildEvent>
+      <Command>
+if exist ..\..\..\config.h goto DONE_CONFIG_H
+
+copy ..\..\..\config.h.win32 ..\..\..\config.h
+
+:DONE_CONFIG_H
+
+
+copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h
+
+</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="GlibEtcInstallRoot">
+      <Value>$(GlibEtcInstallRoot)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CopyDir">
+      <Value>$(CopyDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="DefDir">
+      <Value>$(DefDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkApiVersion">
+      <Value>$(GtkApiVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkBinaryVersion">
+      <Value>$(GtkBinaryVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkDummyPrefix">
+      <Value>$(GtkDummyPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkPrefixDefine">
+      <Value>$(GtkPrefixDefine)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GdkDefines">
+      <Value>$(GdkDefines)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkIncludedImmodulesDefines">
+      <Value>$(GtkIncludedImmodulesDefines)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkDefines">
+      <Value>$(GtkDefines)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkDoInstall">
+      <Value>$(GtkDoInstall)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkGenerateGdkDef">
+      <Value>$(GtkGenerateGdkDef)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkGenerateGtkDef">
+      <Value>$(GtkGenerateGtkDef)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkLibtoolCompatibleDllPrefix">
+      <Value>$(GtkLibtoolCompatibleDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkLibtoolCompatibleDllSuffix">
+      <Value>$(GtkLibtoolCompatibleDllSuffix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkSeparateVS10DllPrefix">
+      <Value>$(GtkSeparateVS10DllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkSeparateVS10DllSuffix">
+      <Value>$(GtkSeparateVS10DllSuffix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkDllPrefix">
+      <Value>$(GtkDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkDllSuffix">
+      <Value>$(GtkDllSuffix)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
--- a/build/win32/vs10/gtk+.sln
+++ b/build/win32/vs10/gtk+.sln
@@ -0,0 +1,65 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C++ Express 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-win32", "gdk-win32.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-demo", "gtk-demo.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
--- a/build/win32/vs10/gtk-demo.vcxproj
+++ b/build/win32/vs10/gtk-demo.vcxproj
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}</ProjectGuid>
+    <RootNamespace>gtkdemo</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\demos\gtk-demo\appwindow.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\assistant.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\builder.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\button_box.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\changedisplay.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\clipboard.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\colorsel.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\combobox.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\dialog.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\drawingarea.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\editable_cells.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\entry_buffer.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\entry_completion.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\expander.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\hypertext.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\iconview.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\iconview_edit.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\images.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\infobar.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\links.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\list_store.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\main.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\menus.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window2.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\panes.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\pickers.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\pixbufs.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\printing.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\rotated_text.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\search_entry.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\sizegroup.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\spinner.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\stock_browser.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\textview.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\tree_store.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\ui_manager.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="gdk.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="gtk.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f5}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/build/win32/vs10/gtk-demo.vcxproj.filters
+++ b/build/win32/vs10/gtk-demo.vcxproj.filters
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\demos\gtk-demo\appwindow.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\assistant.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\builder.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\button_box.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\changedisplay.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\clipboard.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\colorsel.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\combobox.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\dialog.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\drawingarea.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\editable_cells.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\entry_buffer.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\entry_completion.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\expander.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\hypertext.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\iconview.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\iconview_edit.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\images.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\infobar.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\links.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\list_store.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\main.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\menus.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window2.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\panes.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\pickers.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\pixbufs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\printing.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\rotated_text.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\search_entry.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\sizegroup.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\spinner.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\stock_browser.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\textview.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\tree_store.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\ui_manager.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
--- a/build/win32/vs10/gtk.vcxproj.filtersin
+++ b/build/win32/vs10/gtk.vcxproj.filtersin
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\gtk\gtk-win32.rc"><Filter>Resource Files</Filter></ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+#include "libgtk.vs10.sourcefiles.filters"
+    <ClCompile Include="..\..\..\modules\input\gtkimcontextime.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\gtkimcontextmultipress.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\gtkimcontextthai.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imam-et.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imcedilla.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imcyrillic-translit.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imime.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\iminuktitut.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imipa.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\immultipress.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imthai.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imti-er.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imti-et.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imviqr.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\thai-charprop.c"><Filter>Source Files</Filter></ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\gdk\gtk.symbols">
+      <Filter>Resource Files</Filter>
+    </CustomBuild>
+  </ItemGroup>
+</Project>
--- a/build/win32/vs10/gtk.vcxprojin
+++ b/build/win32/vs10/gtk.vcxprojin
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}</ProjectGuid>
+    <RootNamespace>gtk</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>atk-2.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>atk-2.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>atk-2.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>atk-2.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\gdk\gtk.symbols">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating gtk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkGenerateGtkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)gtk.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating gtk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkGenerateGtkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)gtk.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating gtk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkGenerateGtkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)gtk.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating gtk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkGenerateGtkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)gtk.def;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\gtk\gtk-win32.rc" />
+  </ItemGroup>
+  <ItemGroup>
+#include "libgtk.vs10.sourcefiles"
+    <ClCompile Include="..\..\..\modules\input\gtkimcontextime.c" />
+    <ClCompile Include="..\..\..\modules\input\gtkimcontextmultipress.c" />
+    <ClCompile Include="..\..\..\modules\input\gtkimcontextthai.c" />
+    <ClCompile Include="..\..\..\modules\input\imam-et.c" />
+    <ClCompile Include="..\..\..\modules\input\imcedilla.c" />
+    <ClCompile Include="..\..\..\modules\input\imcyrillic-translit.c" />
+    <ClCompile Include="..\..\..\modules\input\imime.c" />
+    <ClCompile Include="..\..\..\modules\input\iminuktitut.c" />
+    <ClCompile Include="..\..\..\modules\input\imipa.c" />
+    <ClCompile Include="..\..\..\modules\input\immultipress.c" />
+    <ClCompile Include="..\..\..\modules\input\imthai.c" />
+    <ClCompile Include="..\..\..\modules\input\imti-er.c" />
+    <ClCompile Include="..\..\..\modules\input\imti-et.c" />
+    <ClCompile Include="..\..\..\modules\input\imviqr.c" />
+    <ClCompile Include="..\..\..\modules\input\thai-charprop.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="gdk.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/build/win32/vs10/install.vcxproj
+++ b/build/win32/vs10/install.vcxproj
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}</ProjectGuid>
+    <RootNamespace>install</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstall)</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstall)</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstall)</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstall)</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="gdk.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="gtk-demo.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073fc}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="gtk.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f5}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -4,9 +4,6 @@ EXTRA_DIST += \
 	README.txt \
 	gtk+.sln \
 	gtk+.vsprops \
-	gdk-pixbuf.vcproj \
-	gdk-pixbuf-csource.vcproj \
-	gdk-pixbuf-query-loaders.vcproj \
 	gdk-win32.vcproj \
 	gdk.vcproj \
 	gdk.vcprojin \
--- a/build/win32/vs9/README.txt
+++ b/build/win32/vs9/README.txt
@@ -6,17 +6,85 @@ first need to use some Unix-like environment or manual work to expand
 the files needed, like config.h.win32.in into config.h.win32 and the
 .vcprojin files here into corresponding actual .vcproj files.

-You will need the parts from below in the GTK+ stack: pango, atk and
-glib. External dependencies are at least zlib, libpng, proxy-libintl,
-fontconfig, freetype, expat. See the corresponding README.txt file in
-glib for details where to unpack them.
+You will need the parts from below in the GTK+ stack: GDK-Pixbuf, Pango,
+ATK (2.x)** and GLib.  External dependencies are at least Cairo
+(with Cairo-GObject support, meaning Cairo 1.10.x or later), zlib, libpng,
+gettext-runtime, fontconfig*, freetype*, expat*.  See the 
+build/win32/vs9/README.txt file in glib for details where to unpack them.
+
+It is recommended that one builds the dependencies with VS9 as far as
+possible, especially those from and using the GTK+ stack (i.e. GLib,
+Cairo, ATK, Pango, GDK-Pixbuf), so that crashes caused by mixing calls
+to different CRTs can be kept at a minimum.  
+
+zlib, libpng, and Cairo do contain support for compiling under VS9
+using VS project files and/or makefiles at this time of writing, For the
+GTK+ stack, VS9 project files are either available under
+$(srcroot)/build/vs9 in the case of GLib (stable/unstable), ATK**
+(2.x stable/unstable) and GDK-Pixbuf (unstable), and should be in the next
+unstable version of Pango.  There is no known official VS9 build
+support for fontconfig (along with freetype and expat) and
+gettext-runtime, so please use the binaries from: 
+
+ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit)
+ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit)
+
+Unzip the binaries obtained from ftp.gnome.org in <root>\vs9\<PlatformName>,
+and build the following, if not already done so: 
+
+Note: put the resulting zlib, libpng, pcre and Cairo files as follows:
+ .dll files: <root>\vs9\<PlatformName>\bin
+ .lib files: <root>\vs9\<PlatformName>\lib
+ .h files: <root>\vs9\<PlatformName>\include
+
+The recommended build order for these dependencies:
+(first unzip any dependent binaries downloaded from the ftp.gnome.org
+ as described in the README.txt file in the build/win32/vs9 folder)
+-zlib
+-libpng
+-(for GDK-Pixbuf, if not using GDI+) IJG JPEG
+-(for GDK-Pixbuf, if not using GDI+) libtiff
+ [libtiff requires zlib and IJG JPEG]
+-(for GDK-Pixbuf, if not using GDI+) jasper [jpeg-2000 library])
+-(optional for GLib) PCRE (version 8.12 or later, use of CMake to
+  build PCRE is recommended-see build/win32/vs9/README.txt of GLib)
+-GLib ***
+-Cairo (inclusive of Cairo-GObject)
+-ATK-2.x** ***
+-Pango***
+-GDK-Pixbuf***
+(note the last 3 dependencies are not interdependent, so the last 3
+ dependencies can be built in any order)

 The "install" project will copy build results and headers into their
 appropriate location under <root>\vs9\<PlatformName>. For instance,
 built DLLs go into <root>\vs9\<PlatformName>\bin, built LIBs into
 <root>\vs9\<PlatformName>\lib and GTK+ headers into
-<root>\vs9\<PlatformName>\include\gtk-2.0. This is then from where
+<root>\vs9\<PlatformName>\include\gtk-3.0. This is then from where
 project files higher in the stack are supposed to look for them, not
 from a specific GLib source tree.

+*About the dependencies marked with *: These dependencies are optional
+ as those are not compulsory components for building and running GTK+
+ itself, but note that they are needed for people running and building
+ GIMP or those who need complex script support via fontconfig.  They
+ are referred to by components in Cairo and Pango mainly.
+ Decide whether you need fontconfig support prior to building Cairo
+ and Pango.
+
+**Regarding ATK-2.x: prior to compiling ATK-2.x, please open atkprops
+  in VS under "Properties Manager" view (it is under any one of the
+  build configurations, right-click on atkprops and select "Properties").
+  Navigate to "User Macros", and edit the following fields:
+  AtkApiVersion -> 2.0
+  AtkLibToolCompatibleDllSuffix -> -2.0-0
+  AtkSeperateVS9DLLSuffix -> -2-vs9
+  Sorry this change did not make it upstream prior to ATK-2.0.0 release-
+  this will be in the subsequent releases of ATK-2.x and was committed
+  upstream.
+
+***:Put the sources of the packages marked with *** in <root>\<package-
+    source-tree>, and build with VS9 from there.
+
 --Tor Lillqvist <tml@iki.fi>
+--Updated by Chun-wei Fan <fanc999@yahoo.com.tw>
--- a/build/win32/vs9/gdk-pixbuf-csource.vcproj
+++ b/build/win32/vs9/gdk-pixbuf-csource.vcproj
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="gdk-pixbuf-csource"
-	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}"
-	RootNamespace="gdkpixbufcsource"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-csource.c" />
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/build/win32/vs9/gdk-pixbuf-query-loaders.vcproj
+++ b/build/win32/vs9/gdk-pixbuf-query-loaders.vcproj
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gdk-pixbuf-query-loaders"
-	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}"
-	RootNamespace="gdkpixbufqueryloaders"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND;$(GtkPrefixDefine);$(GdkPixbufLibdirDefine)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\gdk-pixbuf\queryloaders.c" />
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/build/win32/vs9/gdk-pixbuf.vcproj
+++ b/build/win32/vs9/gdk-pixbuf.vcproj
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gdk_pixbuf"
-	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}"
-	RootNamespace="gdk_pixbuf"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libpng.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GdkPixbufDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libpng.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libpng.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GdkPixbufDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libpng.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf.symbols"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gdk-pixbuf.def"
-						CommandLine="$(GtkGenerateGdkPixbufDef)"
-						Outputs="$(IntDir)\gdk-pixbuf.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gdk-pixbuf.def"
-						CommandLine="$(GtkGenerateGdkPixbufDef)"
-						Outputs="$(IntDir)\gdk-pixbuf.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gdk-pixbuf.def"
-						CommandLine="$(GtkGenerateGdkPixbufDef)"
-						Outputs="$(IntDir)\gdk-pixbuf.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gdk-pixbuf.def"
-						CommandLine="$(GtkGenerateGdkPixbufDef)"
-						Outputs="$(IntDir)\gdk-pixbuf.def"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-aliasdef.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-animation.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-data.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-enum-types.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-io.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-loader.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-scale.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-scaled-anim.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-simple-anim.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-util.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixdata.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-ani.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-ani-animation.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-utils.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-animation.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-bmp.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-emf.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-gif.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-ico.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-jpeg.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-tiff.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-wmf.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-gif-animation.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-icns.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-pcx.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-png.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-pnm.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-ras.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-tga.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-wbmp.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-xbm.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-xpm.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\pixops\pixops.c" />
-		</Filter>
-	</Files>
-</VisualStudioProject>
--- a/build/win32/vs9/gdk-win32.vcproj
+++ b/build/win32/vs9/gdk-win32.vcproj
@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -52,7 +52,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -93,7 +93,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -122,29 +122,24 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File RelativePath="..\..\..\gdk\win32\gdkapplaunchcontext-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkcolor-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkcursor-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkdevice-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkdevice-wintab.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkdevicemanager-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkdisplay-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkdnd-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkdrawable-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkevents-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkfont-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkgc-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkgeometry-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkglobals-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkim-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkinput-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkinput.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkkeys-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkmain-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkpixmap-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkproperty-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkscreen-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkselection-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkspawn-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdktestutils-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkvisual-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkdisplaymanager-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkwin32id.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkwindow-win32.c" />
 		</Filter>
--- a/build/win32/vs9/gdk.vcprojin
+++ b/build/win32/vs9/gdk.vcprojin
@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib imm32.lib"
+				AdditionalDependencies="imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
@@ -63,7 +63,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GdkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib"
+				AdditionalDependencies="imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
@@ -96,7 +96,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -107,7 +107,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib"
+				AdditionalDependencies="imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
@@ -128,7 +128,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GdkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -137,7 +137,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib"
+				AdditionalDependencies="imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
@@ -208,6 +208,7 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File RelativePath="..\..\..\gdk\win32\rc\gdk.rc" />
 		</Filter>
 		<Filter
 			Name="Source Files"
@@ -215,6 +216,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 #include "libgdk.sourcefiles"
+			<File RelativePath="..\..\..\gdk\gdkkeynames.c" />
 		</Filter>
 	</Files>
 </VisualStudioProject>
--- a/build/win32/vs9/gtk+.sln
+++ b/build/win32/vs9/gtk+.sln
@@ -1,43 +1,25 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf", "gdk-pixbuf.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf-csource", "gdk-pixbuf-csource.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf-query-loaders", "gdk-pixbuf-query-loaders.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-win32", "gdk-win32.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-demo", "gtk-demo.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}
@@ -51,30 +33,6 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Release|x64.Build.0 = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Release|x64.Build.0 = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Release|x64.Build.0 = Release|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|Win32.Build.0 = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|x64.ActiveCfg = Debug|x64
--- a/build/win32/vs9/gtk+.vsprops
+++ b/build/win32/vs9/gtk+.vsprops
@@ -8,13 +8,13 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0"
+		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"
 		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES"
 		ForcedIncludeFiles="msvc_recommended_pragmas.h"
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
+		AdditionalDependencies="gdk_pixbuf-2.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
 		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
 	/>
 	<Tool
@@ -24,9 +24,7 @@ if exist ..\..\..\config.h goto DONE_CONFIG_H&#x0D;&#x0A;
 copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;
 :DONE_CONFIG_H&#x0D;&#x0A;

-if exist ..\..\..\gdk\gdkconfig.h goto DONE_GDKCONFIG_H&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
-:DONE_GDKCONFIG_H&#x0D;&#x0A;
 "
 	/>
 	<UserMacro
@@ -45,18 +43,6 @@ copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
 		Name="GtkPrefixDefine"
 		Value="GTK_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;"
 	/>
-	<UserMacro
-		Name="GdkPixbufIncludedLoaderDefines"
-		Value="INCLUDE_ani;INCLUDE_icns;INCLUDE_pcx;INCLUDE_ras;INCLUDE_tga;INCLUDE_png;INCLUDE_pnm;INCLUDE_wbmp;INCLUDE_xbm;INCLUDE_xpm;INCLUDE_gdiplus"
-	/>
-	<UserMacro
-		Name="GdkPixbufDefines"
-		Value="GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND;$(GtkPrefixDefine);$(GdkPixbufIncludedLoaderDefines)"
-	/>
-	<UserMacro
-		Name="GdkPixbufLibdirDefine"
-		Value="PIXBUF_LIBDIR=\&quot;$(GtkDummyPrefix)/lib/gtk-$(GtkApiVersion)/$(GtkBinaryVersion)/loaders\&quot;"
-	/>
 	<UserMacro
 		Name="GdkDefines"
 		Value="GDK_COMPILATION;G_LOG_DOMAIN=\&quot;Gdk\&quot;"
@@ -75,53 +61,45 @@ copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
 echo on&#x0D;&#x0A;
 mkdir $(OutDir)\bin&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(OutDir)\bin&#x0D;&#x0A;
+
+mkdir $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.c $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.h $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.ui $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.jpg $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.png $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.gif $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;

 mkdir $(OutDir)\lib&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;

-mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-animation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-core.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-enum-types.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-features.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-io.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-loader.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-marshal.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-simple-anim.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-transform.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixdata.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-
 mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdk.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkapplaunchcontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkcairo.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkcolor.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkcursor.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkdevice.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkdevicemanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkdisplay.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkdisplaymanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkdnd.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdrawable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkenumtypes.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkevents.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkfont.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkgc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdki18n.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkinput.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkkeys.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkkeysyms.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkmain.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkpango.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkpixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkpixmap.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkprivate.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkproperty.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkregion.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkrgb.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkrectangle.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkrgba.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkscreen.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkselection.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkspawn.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdktestutils.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkthreads.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdktypes.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkvisual.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\win32\gdkwin32.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
@@ -131,6 +109,7 @@ mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtk.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkaboutdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkaccelgroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaccelgroupprivate.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkaccellabel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkaccelmap.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkaccessible.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -139,6 +118,11 @@ copy ..\..\..\gtk\gtkactiongroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x
 copy ..\..\..\gtk\gtkactivatable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkadjustment.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkalignment.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkappchooser.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkappchooserbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkappchooserdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkappchooserwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkapplication.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkarrow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkaspectframe.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkassistant.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -146,10 +130,14 @@ copy ..\..\..\gtk\gtkbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0
 copy ..\..\..\gtk\gtkbin.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkbindings.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkborder.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkbuildable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkbuilder.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcalendar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellarea.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellareabox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellareacontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcelleditable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcelllayout.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcellrenderer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -158,22 +146,20 @@ copy ..\..\..\gtk\gtkcellrenderercombo.h $(OutDir)\include\gtk-$(GtkApiVersion)\
 copy ..\..\..\gtk\gtkcellrendererpixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcellrendererprogress.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcellrendererspin.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendererspinner.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcellrenderertext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcellrenderertoggle.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcellview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcheckbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcheckmenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkclipboard.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkclist.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcolorbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcolorsel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcolorseldialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcombo.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcombobox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcomboboxentry.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcomboboxtext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcontainer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkctree.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcurve.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcssprovider.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkdebug.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkdnd.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -190,18 +176,16 @@ copy ..\..\..\gtk\gtkfilechooserbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\
 copy ..\..\..\gtk\gtkfilechooserdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkfilechooserwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkfilefilter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilesel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkfixed.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkfontbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkfontsel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkframe.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkgamma.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkgc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkgradient.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkgrid.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkhandlebox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkhbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkhbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkhpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhruler.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkhscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkhscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkhseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -216,18 +200,12 @@ copy ..\..\..\gtk\gtkimcontextsimple.h $(OutDir)\include\gtk-$(GtkApiVersion)\gt
 copy ..\..\..\gtk\gtkimmodule.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkimmulticontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkinfobar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkinputdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkinvisible.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkitemfactory.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtklabel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtklayout.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtklinkbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklist.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklistitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkliststore.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkmain.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmarshal.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkmenu.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkmenubar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkmenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -238,22 +216,18 @@ copy ..\..\..\gtk\gtkmisc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0
 copy ..\..\..\gtk\gtkmodules.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkmountoperation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtknotebook.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkobject.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkoldeditable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkoptionmenu.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtknumerableicon.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkoffscreenwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkorientable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkpagesetup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkpapersize.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpixmap.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkplug.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpreview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkprintcontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkprintoperation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkprintoperationpreview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkprintsettings.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkprivate.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprogress.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkprogressbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkradioaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkradiobutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -268,9 +242,9 @@ copy ..\..\..\gtk\gtkrecentchoosermenu.h $(OutDir)\include\gtk-$(GtkApiVersion)\
 copy ..\..\..\gtk\gtkrecentchooserwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkrecentfilter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkrecentmanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkruler.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkscalebutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkscrollable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkscrolledwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkselection.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -279,18 +253,24 @@ copy ..\..\..\gtk\gtkseparatormenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\
 copy ..\..\..\gtk\gtkseparatortoolitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtksettings.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkshow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksignal.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtksizegroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksizerequest.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtksocket.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkspinbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkspinner.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkstatusbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkstatusicon.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkstock.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkstyle.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstylecontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstyleproperties.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstyleprovider.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkswitch.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksymboliccolor.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktearoffmenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktestutils.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextattributes.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktextbuffer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktextbufferrichtext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktextchild.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -301,19 +281,18 @@ copy ..\..\..\gtk\gtktextmark.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;
 copy ..\..\..\gtk\gtktexttag.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktexttagtable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktextview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktipsquery.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkthemingengine.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktoggleaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktogglebutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktoggletoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktoolbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktoolitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolitemgroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolpalette.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktoolshell.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktooltip.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktooltips.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktree.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktreednd.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreeitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktreemodel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktreemodelfilter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktreemodelsort.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -323,7 +302,6 @@ copy ..\..\..\gtk\gtktreestore.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D
 copy ..\..\..\gtk\gtktreeview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktreeviewcolumn.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktypebuiltins.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktypeutils.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkuimanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkvbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkvbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -331,30 +309,30 @@ copy ..\..\..\gtk\gtkversion.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&
 copy ..\..\..\gtk\gtkviewport.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkvolumebutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkvpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvruler.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkvscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkvscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkvseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkwidgetpath.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;

-mkdir $(OutDir)\lib\gtk-$(GtkApiVersion)\include&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkconfig.h $(OutDir)\lib\gtk-$(GtkApiVersion)\include&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkconfig.h $(OutDir)\include\gtk-3.0\gdk&#x0D;&#x0A;

 copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
+
+mkdir $(OutDir)\share\glib-2.0\schemas&#x0D;&#x0A;
+copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(OutDir)\share\glib-2.0\schemas&#x0D;&#x0A;
+echo &quot;Compiling gsettings XML File(s)...&quot;&#x0D;&#x0A;
+$(OutDir)\bin\glib-compile-schemas.exe $(OutDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 "
 	/>
-	<UserMacro
-		Name="GtkGenerateGdkPixbufDef"
-		Value="echo EXPORTS &gt;&quot;$(IntDir)\gdk-pixbuf.def&quot; &amp;&amp; cl /EP -DG_OS_WIN32 -DINCLUDE_VARIABLES -DALL_FILES -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= ..\..\..\gdk-pixbuf\gdk-pixbuf.symbols &gt;&gt;&quot;$(IntDir)\gdk-pixbuf.def&quot;"
-	/>
 	<UserMacro
 		Name="GtkGenerateGdkDef"
 		Value="echo EXPORTS &gt;&quot;$(IntDir)\gdk.def&quot; &amp;&amp; cl /EP -DGDK_WINDOWING_WIN32 -DALL_FILES -DG_GNUC_CONST= ..\..\..\gdk\gdk.symbols &gt;&gt;&quot;$(IntDir)\gdk.def&quot;"
 	/>
 	<UserMacro
 		Name="GtkGenerateGtkDef"
-		Value="echo EXPORTS &gt;&quot;$(IntDir)\gtk.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gtk\gtk.symbols &gt;&gt;&quot;$(IntDir)\gtk.def&quot;"
+		Value="echo EXPORTS &gt;&quot;$(IntDir)\gtk.def&quot; &amp;&amp; cl /EP -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gtk\gtk.symbols &gt;&gt;&quot;$(IntDir)\gtk.def&quot;"
 	/>
 	<UserMacro
 		Name="GtkLibtoolCompatibleDllPrefix"
@@ -370,17 +348,17 @@ copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\l
 	/>
 	<UserMacro
 		Name="GtkSeparateVS9DllSuffix"
-		Value="-2-vs9"
+		Value="-3-vs9"
 	/>
 	<!-- Change these two to GtkLibtoolCompatibleDllPrefix and
 	GtkLibtoolCompatibleDllSuffix if that is what you want -->
 	<UserMacro
 		Name="GtkDllPrefix"
-		Value="$(GtkLibtoolCompatibleDllPrefix)"
+		Value="$(GtkSeparateVS9DllPrefix)"
 	/>
 	<UserMacro
 		Name="GtkDllSuffix"
-		Value="$(GtkLibtoolCompatibleDllSuffix)"
+		Value="$(GtkSeparateVS9DllSuffix)"
 	/>
 	<UserMacro
 		Name="GlibEtcInstallRoot"
--- a/build/win32/vs9/gtk-demo.vcproj
+++ b/build/win32/vs9/gtk-demo.vcproj
@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -43,7 +43,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
+				AdditionalDependencies=""
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -64,7 +64,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -76,9 +76,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies=""
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
-				SubSystem="2"
+				SubSystem="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="17"
@@ -96,7 +97,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="$(GtkPrefixDefine)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -106,9 +107,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies=""
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
-				SubSystem="2"
+				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
@@ -128,7 +130,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="$(GtkPrefixDefine)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -138,9 +140,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies=""
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
-				SubSystem="2"
+				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
--- a/build/win32/vs9/gtk.vcprojin
+++ b/build/win32/vs9/gtk.vcprojin
@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib atk-1.0.lib pango-1.0.lib pangocairo-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
@@ -63,7 +63,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GtkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib atk-1.0.lib pango-1.0.lib pangocairo-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
@@ -96,7 +96,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -107,7 +107,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib atk-1.0.lib pango-1.0.lib pangocairo-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
@@ -128,7 +128,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GtkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -137,7 +137,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib atk-1.0.lib pango-1.0.lib pangocairo-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
@@ -208,6 +208,7 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File RelativePath="..\..\..\gtk\gtk-win32.rc" />
 		</Filter>
 		<Filter
 			Name="Source Files"
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -276,12 +276,6 @@
 /* Whether to load modules via .la files rather than directly */
 /* #undef USE_LA_MODULES */

-/* Define to 1 if medialib is available and should be used */
-/* #undef USE_MEDIALIB */
-
-/* Define to 1 if medialib 2.5 is available */
-/* #undef USE_MEDIALIB25 */
-
 /* Define to 1 if XXM is available and should be used */
 #ifndef _MSC_VER
 #  define USE_MMX 1
--- a/configure.ac
+++ b/configure.ac
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -1,60 +1,6 @@
 ## Makefile.am for gtk+/demos
 include $(top_srcdir)/Makefile.decl

-SUBDIRS = gtk-demo
-
-INCLUDES = 				\
-	-I$(top_srcdir) 		\
-	-I$(top_builddir)/gdk		\
-	-DGDK_DISABLE_DEPRECATED	\
-	-DGTK_DISABLE_DEPRECATED	\
-	$(GTK_DEBUG_FLAGS)		\
-	$(GTK_DEP_CFLAGS)
-
-DEPS = 									\
-	$(top_builddir)/gdk/$(gdktargetlib) 				\
-	$(top_builddir)/gtk/$(gtktargetlib)
-
-LDADDS = 								\
-	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)				\
-	$(GTK_DEP_LIBS)							\
-	$(MATH_LIB)
-
-noinst_PROGRAMS = 		\
-	testanimation 		\
-	testpixbuf-color	\
-	testpixbuf-save		\
-	testpixbuf-scale 	\
-	pixbuf-demo
-
-testpixbuf_save_DEPENDENCIES = $(DEPS)
-testpixbuf_color_DEPENDENCIES = $(DEPS)
-testpixbuf_scale_DEPENDENCIES = $(DEPS)
-testanimation_DEPENDENCIES = $(DEPS)
-pixbuf_demo_DEPENDENCIES = $(DEPS)
-
-testpixbuf_save_LDADD = $(LDADDS)
-testpixbuf_color_LDADD = $(LDADDS)
-testpixbuf_scale_LDADD = $(LDADDS)
-testanimation_LDADD = $(LDADDS)
-pixbuf_demo_LDADD = $(LDADDS)
-
-testpixbuf_save_SOURCES = testpixbuf-save.c
-testpixbuf_color_SOURCES = testpixbuf-color.c
-testpixbuf_scale_SOURCES = testpixbuf-scale.c pixbuf-init.c
-testanimation_SOURCES = testanimation.c pixbuf-init.c
-pixbuf_demo_SOURCES = pixbuf-demo.c pixbuf-init.c
-
-EXTRA_DIST +=			\
-	apple-red.png		\
-	background.jpg		\
-	gnome-applets.png	\
-	gnome-calendar.png	\
-	gnome-foot.png		\
-	gnome-gimp.png		\
-	gnome-gmush.png		\
-	gnome-gsame.png		\
-	gnu-keys.png
+SUBDIRS = gtk-demo pixbuf-demo

 -include $(top_srcdir)/git.mk
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -30,6 +30,7 @@ demos =						\
 	menus.c					\
 	offscreen_window.c			\
 	offscreen_window2.c			\
+	overlay.c				\
 	panes.c					\
 	pickers.c				\
 	pixbufs.c				\
@@ -55,13 +56,12 @@ INCLUDES = \
 	$(GTK_DEP_CFLAGS)

 DEPS = \
-	$(top_builddir)/gdk/$(gdktargetlib) 				\
-	$(top_builddir)/gtk/$(gtktargetlib)
+	$(top_builddir)/gtk/libgtk-3.la

 LDADDS = \
-	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)				\
-	$(GTK_DEP_LIBS)							\
+	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gdk/libgdk-3.la	\
+	$(GTK_DEP_LIBS)				\
 	-lm

 bin_PROGRAMS = gtk3-demo
--- a/demos/gtk-demo/appwindow.c
+++ b/demos/gtk-demo/appwindow.c
@@ -67,25 +67,6 @@ activate_radio_action (GtkAction *action, GtkRadioAction *current)
    }
 }

-static void
-activate_email (GtkAboutDialog *about,
-		const gchar    *link,
-		gpointer        data)
-{
-  gchar *text;
-  text = g_strdup_printf ("send mail to %s", link);
-  g_print ("%s\n", text);
-  g_free (text);
-}
-
-static void
-activate_url (GtkAboutDialog *about,
-	      const gchar    *link,
-	      gpointer        data)
-{
-  g_print ("show url %s\n", link);
-}
-
 static void
 about_cb (GtkAction *action,
 	  GtkWidget *window)
@@ -120,11 +101,13 @@ about_cb (GtkAction *action,
      g_object_unref (pixbuf);
    }

-  gtk_about_dialog_set_email_hook (activate_email, NULL, NULL);
-  gtk_about_dialog_set_url_hook (activate_url, NULL, NULL);
  gtk_show_about_dialog (GTK_WINDOW (window),
 			 "program-name", "GTK+ Code Demos",
-			 "version", PACKAGE_VERSION,
+			 "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
+						     PACKAGE_VERSION,
+						     gtk_get_major_version (),
+						     gtk_get_minor_version (),
+						     gtk_get_micro_version ()),
 			 "copyright", "(C) 1997-2009 The GTK+ Team",
 			 "license-type", GTK_LICENSE_LGPL_2_1,
 			 "website", "http://www.gtk.org",
@@ -401,23 +384,6 @@ mark_set_callback (GtkTextBuffer     *buffer,
  update_statusbar (buffer, GTK_STATUSBAR (data));
 }

-static void
-update_resize_grip (GtkWidget           *widget,
-		    GdkEventWindowState *event,
-		    GtkStatusbar        *statusbar)
-{
-  if (event->changed_mask & (GDK_WINDOW_STATE_MAXIMIZED |
-			     GDK_WINDOW_STATE_FULLSCREEN))
-    {
-      gboolean maximized;
-
-      maximized = event->new_window_state & (GDK_WINDOW_STATE_MAXIMIZED |
-					     GDK_WINDOW_STATE_FULLSCREEN);
-      gtk_statusbar_set_has_resize_grip (statusbar, !maximized);
-    }
-}
-
-
 GtkWidget *
 do_appwindow (GtkWidget *do_widget)
 {
@@ -586,12 +552,6 @@ do_appwindow (GtkWidget *do_widget)
                               statusbar,
                               0);

-      g_signal_connect_object (window,
-			       "window_state_event",
-			       G_CALLBACK (update_resize_grip),
-			       statusbar,
-			       0);
-
      update_statusbar (buffer, GTK_STATUSBAR (statusbar));
    }

--- a/demos/gtk-demo/assistant.c
+++ b/demos/gtk-demo/assistant.c
@@ -1,6 +1,6 @@
 /* Assistant
 *
- * Demonstrates a sample multistep assistant. Assistants are used to divide
+ * Demonstrates a sample multi-step assistant. Assistants are used to divide
 * an operation into several simpler sequential steps, and to guide the user
 * through these steps.
 */
@@ -29,6 +29,7 @@ apply_changes_gradually (gpointer data)
    {
      /* Close automatically once changes are fully applied. */
      gtk_widget_destroy (assistant);
+      assistant = NULL;
      return FALSE;
    }
 }
@@ -92,9 +93,8 @@ static void
 create_page1 (GtkWidget *assistant)
 {
  GtkWidget *box, *label, *entry;
-  GdkPixbuf *pixbuf;

-  box = gtk_hbox_new (FALSE, 12);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
  gtk_container_set_border_width (GTK_CONTAINER (box), 12);

  label = gtk_label_new ("You must fill out this entry to continue:");
@@ -103,46 +103,36 @@ create_page1 (GtkWidget *assistant)
  entry = gtk_entry_new ();
  gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 0);
  g_signal_connect (G_OBJECT (entry), "changed",
-		    G_CALLBACK (on_entry_changed), assistant);
+                    G_CALLBACK (on_entry_changed), assistant);

  gtk_widget_show_all (box);
  gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);
  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), box, "Page 1");
  gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), box, GTK_ASSISTANT_PAGE_INTRO);
-
-  pixbuf = gtk_widget_render_icon (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
-  gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), box, pixbuf);
-  g_object_unref (pixbuf);
 }

 static void
 create_page2 (GtkWidget *assistant)
 {
  GtkWidget *box, *checkbutton;
-  GdkPixbuf *pixbuf;

-  box = gtk_vbox_new (12, FALSE);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
  gtk_container_set_border_width (GTK_CONTAINER (box), 12);

  checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "
-						 "even if you do not check this");
+                                                 "even if you do not check this");
  gtk_box_pack_start (GTK_BOX (box), checkbutton, FALSE, FALSE, 0);

  gtk_widget_show_all (box);
  gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);
  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE);
  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), box, "Page 2");
-
-  pixbuf = gtk_widget_render_icon (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
-  gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), box, pixbuf);
-  g_object_unref (pixbuf);
 }

 static void
 create_page3 (GtkWidget *assistant)
 {
  GtkWidget *label;
-  GdkPixbuf *pixbuf;

  label = gtk_label_new ("This is a confirmation page, press 'Apply' to apply changes");

@@ -151,10 +141,6 @@ create_page3 (GtkWidget *assistant)
  gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), label, GTK_ASSISTANT_PAGE_CONFIRM);
  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), label, TRUE);
  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), label, "Confirmation");
-
-  pixbuf = gtk_widget_render_icon (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
-  gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), label, pixbuf);
-  g_object_unref (pixbuf);
 }

 static void
@@ -173,7 +159,8 @@ create_page4 (GtkWidget *assistant)
  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Applying changes");

  /* This prevents the assistant window from being
-   * closed while we're "busy" applying changes. */
+   * closed while we're "busy" applying changes.
+   */
  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, FALSE);
 }

@@ -184,10 +171,10 @@ do_assistant (GtkWidget *do_widget)
    {
      assistant = gtk_assistant_new ();

-	 gtk_window_set_default_size (GTK_WINDOW (assistant), -1, 300);
+         gtk_window_set_default_size (GTK_WINDOW (assistant), -1, 300);

      gtk_window_set_screen (GTK_WINDOW (assistant),
-			     gtk_widget_get_screen (do_widget));
+                             gtk_widget_get_screen (do_widget));

      create_page1 (assistant);
      create_page2 (assistant);
@@ -195,13 +182,13 @@ do_assistant (GtkWidget *do_widget)
      create_page4 (assistant);

      g_signal_connect (G_OBJECT (assistant), "cancel",
-			G_CALLBACK (on_assistant_close_cancel), &assistant);
+                        G_CALLBACK (on_assistant_close_cancel), &assistant);
      g_signal_connect (G_OBJECT (assistant), "close",
-			G_CALLBACK (on_assistant_close_cancel), &assistant);
+                        G_CALLBACK (on_assistant_close_cancel), &assistant);
      g_signal_connect (G_OBJECT (assistant), "apply",
-			G_CALLBACK (on_assistant_apply), NULL);
+                        G_CALLBACK (on_assistant_apply), NULL);
      g_signal_connect (G_OBJECT (assistant), "prepare",
-			G_CALLBACK (on_assistant_prepare), NULL);
+                        G_CALLBACK (on_assistant_prepare), NULL);
    }

  if (!gtk_widget_get_visible (assistant))
--- a/demos/gtk-demo/button_box.c
+++ b/demos/gtk-demo/button_box.c
@@ -18,9 +18,9 @@ create_bbox (gint  horizontal,
  frame = gtk_frame_new (title);

  if (horizontal)
-    bbox = gtk_hbutton_box_new ();
+    bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
  else
-    bbox = gtk_vbutton_box_new ();
+    bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);

  gtk_container_set_border_width (GTK_CONTAINER (bbox), 5);
  gtk_container_add (GTK_CONTAINER (frame), bbox);
@@ -63,13 +63,13 @@ do_button_box (GtkWidget *do_widget)
    
    gtk_container_set_border_width (GTK_CONTAINER (window), 10);

-    main_vbox = gtk_vbox_new (FALSE, 0);
+    main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 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);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
    gtk_container_add (GTK_CONTAINER (frame_horz), vbox);

@@ -92,7 +92,7 @@ do_button_box (GtkWidget *do_widget)
    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);
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
    gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
    gtk_container_add (GTK_CONTAINER (frame_vert), hbox);

--- a/demos/gtk-demo/changedisplay.c
+++ b/demos/gtk-demo/changedisplay.c
@@ -27,6 +27,9 @@
 *  - Using GtkDialog
 */
 #include <string.h>
+
+#undef GDK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
 #include "demo-common.h"

@@ -122,7 +125,7 @@ query_for_toplevel (GdkScreen  *screen,
  gtk_container_add (GTK_CONTAINER (popup), frame);

  label = gtk_label_new (prompt);
-  gtk_misc_set_padding (GTK_MISC (label), 10, 10);
+  g_object_set (label, "margin", 10, NULL);
  gtk_container_add (GTK_CONTAINER (frame), label);

  gtk_widget_show_all (popup);
@@ -151,7 +154,7 @@ query_for_toplevel (GdkScreen  *screen,
 	toplevel = NULL;
    }

-  gdk_cursor_unref (cursor);
+  g_object_unref (cursor);
  gtk_widget_destroy (popup);
  gdk_flush ();			/* Really release the grab */

@@ -357,7 +360,7 @@ create_frame (ChangeDisplayInfo *info,

  *frame = gtk_frame_new (title);

-  hbox = gtk_hbox_new (FALSE, 8);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
  gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
  gtk_container_add (GTK_CONTAINER (*frame), hbox);

@@ -375,7 +378,7 @@ create_frame (ChangeDisplayInfo *info,
  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (*tree_view));
  gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);

-  *button_vbox = gtk_vbox_new (FALSE, 5);
+  *button_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
  gtk_box_pack_start (GTK_BOX (hbox), *button_vbox, FALSE, FALSE, 0);

  if (!info->size_group)
@@ -585,7 +588,7 @@ destroy_info (ChangeDisplayInfo *info)
 }

 static void
-destroy_cb (GtkObject          *object,
+destroy_cb (GObject            *object,
 	    ChangeDisplayInfo **info)
 {
  destroy_info (*info);
@@ -610,7 +613,7 @@ do_changedisplay (GtkWidget *do_widget)

      info->window = gtk_dialog_new_with_buttons ("Change Screen or display",
 					    GTK_WINDOW (do_widget),
-					    GTK_DIALOG_NO_SEPARATOR,
+					    0,
 					    GTK_STOCK_CLOSE,  GTK_RESPONSE_CLOSE,
 					    "Change",         GTK_RESPONSE_OK,
 					    NULL);
@@ -624,7 +627,7 @@ do_changedisplay (GtkWidget *do_widget)

      content_area = gtk_dialog_get_content_area (GTK_DIALOG (info->window));

-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);

--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -77,8 +77,8 @@ get_image_pixbuf (GtkImage *image)
      return g_object_ref (gtk_image_get_pixbuf (image));
    case GTK_IMAGE_STOCK:
      gtk_image_get_stock (image, &stock_id, &size);
-      return gtk_widget_render_icon (GTK_WIDGET (image),
-                                     stock_id, size, NULL);
+      return gtk_widget_render_icon_pixbuf (GTK_WIDGET (image),
+                                            stock_id, size);
    default:
      g_warning ("Image storage type %d not handled",
                 gtk_image_get_storage_type (image));
@@ -125,7 +125,7 @@ drag_data_received (GtkWidget        *widget,
 {
  GdkPixbuf *pixbuf;

-  if (selection_data->length > 0)
+  if (gtk_selection_data_get_length (selection_data) > 0)
    {
      pixbuf = gtk_selection_data_get_pixbuf (selection_data);
      gtk_image_set_from_pixbuf (GTK_IMAGE (data), pixbuf);
@@ -210,7 +210,7 @@ do_clipboard (GtkWidget *do_widget)
      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);

-      vbox = gtk_vbox_new (FALSE, 0);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);

      gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -219,7 +219,7 @@ do_clipboard (GtkWidget *do_widget)

      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);

-      hbox = gtk_hbox_new (FALSE, 4);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
      gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);

@@ -236,7 +236,7 @@ do_clipboard (GtkWidget *do_widget)
      label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);

-      hbox = gtk_hbox_new (FALSE, 4);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
      gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);

@@ -253,7 +253,7 @@ do_clipboard (GtkWidget *do_widget)
      label = gtk_label_new ("Images can be transferred via the clipboard, too");
      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);

-      hbox = gtk_hbox_new (FALSE, 4);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
      gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);

--- a/demos/gtk-demo/colorsel.c
+++ b/demos/gtk-demo/colorsel.c
@@ -9,47 +9,36 @@

 static GtkWidget *window = NULL;
 static GtkWidget *da;
-static GdkColor color;
+static GdkRGBA color;
 static GtkWidget *frame;

-/* Expose callback for the drawing area
+/* draw callback for the drawing area
 */
 static gboolean
-expose_event_callback (GtkWidget      *widget, 
-                       GdkEventExpose *event, 
-                       gpointer        data)
+draw_callback (GtkWidget *widget,
+               cairo_t   *cr,
+               gpointer   data)
 {
-  GdkWindow *window;
+  GtkStyleContext *context;
+  GdkRGBA rgba;

-  window = gtk_widget_get_window (widget);
-  if (window)
-    {
-      GtkStyle *style;
-      cairo_t *cr;
-
-      style = gtk_widget_get_style (widget);
-
-      cr = gdk_cairo_create (window);
-
-      gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]);
-      gdk_cairo_rectangle (cr, &event->area);
-      cairo_fill (cr);
-
-      cairo_destroy (cr);
-    }
+  context = gtk_widget_get_style_context (widget);
+  gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &rgba);
+  gdk_cairo_set_source_rgba (cr, &rgba);
+  cairo_paint (cr);

  return TRUE;
 }

 static void
 change_color_callback (GtkWidget *button,
-		       gpointer	  data)
+                       gpointer   data)
 {
  GtkWidget *dialog;
  GtkColorSelection *colorsel;
  GtkColorSelectionDialog *selection_dialog;
  gint response;
-  
+
  dialog = gtk_color_selection_dialog_new ("Changing color");

  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
@@ -57,20 +46,19 @@ change_color_callback (GtkWidget *button,
  selection_dialog = GTK_COLOR_SELECTION_DIALOG (dialog);
  colorsel = GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection (selection_dialog));

-  gtk_color_selection_set_previous_color (colorsel, &color);
-  gtk_color_selection_set_current_color (colorsel, &color);
+  gtk_color_selection_set_previous_rgba (colorsel, &color);
+  gtk_color_selection_set_current_rgba (colorsel, &color);
  gtk_color_selection_set_has_palette (colorsel, TRUE);
-  
+
  response = gtk_dialog_run (GTK_DIALOG (dialog));

  if (response == GTK_RESPONSE_OK)
    {
-      gtk_color_selection_get_current_color (colorsel,
-					     &color);
-      
-      gtk_widget_modify_bg (da, GTK_STATE_NORMAL, &color);
+      gtk_color_selection_get_current_rgba (colorsel, &color);
+
+      gtk_widget_override_background_color (da, 0, &color);
    }
-  
+
  gtk_widget_destroy (dialog);
 }

@@ -80,57 +68,56 @@ do_colorsel (GtkWidget *do_widget)
  GtkWidget *vbox;
  GtkWidget *button;
  GtkWidget *alignment;
-  
+
  if (!window)
    {
      color.red = 0;
-      color.blue = 65535;
+      color.blue = 1;
      color.green = 0;
-      
+      color.alpha = 1;
+
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
+                             gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Color Selection");

      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
      gtk_container_add (GTK_CONTAINER (window), vbox);

      /*
       * Create the color swatch area
       */
-      
-      
+
+
      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);

      da = gtk_drawing_area_new ();

-      g_signal_connect (da, "expose_event",
-			G_CALLBACK (expose_event_callback), NULL);
+      g_signal_connect (da, "draw", G_CALLBACK (draw_callback), NULL);

      /* set a minimum size */
      gtk_widget_set_size_request (da, 200, 200);
      /* set the color */
-      gtk_widget_modify_bg (da, GTK_STATE_NORMAL, &color);
-      
+      gtk_widget_override_background_color (da, 0, &color);
+
      gtk_container_add (GTK_CONTAINER (frame), da);

-      alignment = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
-      
      button = gtk_button_new_with_mnemonic ("_Change the above color");
-      gtk_container_add (GTK_CONTAINER (alignment), button);
-      
-      gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
-      
+      gtk_widget_set_halign (button, GTK_ALIGN_END);
+      gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
+
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
      g_signal_connect (button, "clicked",
-			G_CALLBACK (change_color_callback), NULL);
+                        G_CALLBACK (change_color_callback), NULL);
    }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/combobox.c
+++ b/demos/gtk-demo/combobox.c
@@ -65,8 +65,8 @@ create_stock_icon_store (void)
    {
      if (stock_id[i])
 	{
-	  pixbuf = gtk_widget_render_icon (cellview, stock_id[i],
-					   GTK_ICON_SIZE_BUTTON, NULL);
+	  pixbuf = gtk_widget_render_icon_pixbuf (cellview, stock_id[i],
+					          GTK_ICON_SIZE_BUTTON);
 	  gtk_stock_lookup (stock_id[i], &item);
 	  label = strip_underscore (item.label);
 	  gtk_list_store_append (store, &iter);
@@ -238,12 +238,12 @@ is_capital_sensitive (GtkCellLayout   *cell_layout,
 }

 static void
-fill_combo_entry (GtkWidget *entry)
+fill_combo_entry (GtkWidget *combo)
 {
-  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "One");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "Two");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "2\302\275");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "Three");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "One");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Two");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "2\302\275");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Three");
 }


@@ -271,7 +271,7 @@ struct _MaskEntryClass
 };


-static void mask_entry_editable_init (GtkEditableClass *iface);
+static void mask_entry_editable_init (GtkEditableInterface *iface);

 G_DEFINE_TYPE_WITH_CODE (MaskEntry, mask_entry, GTK_TYPE_ENTRY,
 			 G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
@@ -281,18 +281,18 @@ G_DEFINE_TYPE_WITH_CODE (MaskEntry, mask_entry, GTK_TYPE_ENTRY,
 static void
 mask_entry_set_background (MaskEntry *entry)
 {
-  static const GdkColor error_color = { 0, 65535, 60000, 60000 };
+  static const GdkRGBA error_color = { 1.0, 0.9, 0.9, 1.0 };

  if (entry->mask)
    {
      if (!g_regex_match_simple (entry->mask, gtk_entry_get_text (GTK_ENTRY (entry)), 0, 0))
 	{
-	  gtk_widget_modify_base (GTK_WIDGET (entry), GTK_STATE_NORMAL, &error_color);
+	  gtk_widget_override_color (GTK_WIDGET (entry), 0, &error_color);
 	  return;
 	}
    }

-  gtk_widget_modify_base (GTK_WIDGET (entry), GTK_STATE_NORMAL, NULL);
+  gtk_widget_override_color (GTK_WIDGET (entry), 0, NULL);
 }


@@ -316,7 +316,7 @@ mask_entry_class_init (MaskEntryClass *klass)


 static void
-mask_entry_editable_init (GtkEditableClass *iface)
+mask_entry_editable_init (GtkEditableInterface *iface)
 {
  iface->changed = mask_entry_changed;
 }
@@ -345,7 +345,7 @@ do_combobox (GtkWidget *do_widget)
    
    gtk_container_set_border_width (GTK_CONTAINER (window), 10);

-    vbox = gtk_vbox_new (FALSE, 2);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
    gtk_container_add (GTK_CONTAINER (window), vbox);

    /* A combobox demonstrating cell renderers, separators and
@@ -354,7 +354,7 @@ do_combobox (GtkWidget *do_widget)
    frame = gtk_frame_new ("Some stock icons");
    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
    
-    box = gtk_vbox_new (FALSE, 0);
+    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
    gtk_container_add (GTK_CONTAINER (frame), box);
    
@@ -395,7 +395,7 @@ do_combobox (GtkWidget *do_widget)
    frame = gtk_frame_new ("Where are we ?");
    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);

-    box = gtk_vbox_new (FALSE, 0);
+    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
    gtk_container_add (GTK_CONTAINER (frame), box);
    
@@ -424,11 +424,11 @@ do_combobox (GtkWidget *do_widget)
    frame = gtk_frame_new ("Editable");
    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
    
-    box = gtk_vbox_new (FALSE, 0);
+    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
    gtk_container_add (GTK_CONTAINER (frame), box);
    
-    combo = gtk_combo_box_entry_new_text ();
+    combo = gtk_combo_box_text_new_with_entry ();
    fill_combo_entry (combo);
    gtk_container_add (GTK_CONTAINER (box), combo);
    
@@ -437,7 +437,26 @@ do_combobox (GtkWidget *do_widget)
     
    gtk_container_remove (GTK_CONTAINER (combo), gtk_bin_get_child (GTK_BIN (combo)));
    gtk_container_add (GTK_CONTAINER (combo), entry);
-  
+
+    /* A combobox with string IDs */
+    frame = gtk_frame_new ("String IDs");
+    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+
+    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
+    gtk_container_add (GTK_CONTAINER (frame), box);
+
+    combo = gtk_combo_box_text_new ();
+    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "never", "Not visible");
+    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "when-active", "Visible when active");
+    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "always", "Always visible");
+    gtk_container_add (GTK_CONTAINER (box), combo);
+
+    entry = gtk_entry_new ();
+    g_object_bind_property (combo, "active-id",
+                            entry, "text",
+                            G_BINDING_BIDIRECTIONAL);
+    gtk_container_add (GTK_CONTAINER (box), entry);
  }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -54,7 +54,7 @@ interactive_dialog_clicked (GtkButton *button,

  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));

-  hbox = gtk_hbox_new (FALSE, 8);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
  gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
  gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0);

@@ -120,24 +120,25 @@ do_dialog (GtkWidget *do_widget)
      frame = gtk_frame_new ("Dialogs");
      gtk_container_add (GTK_CONTAINER (window), frame);

-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
      gtk_container_add (GTK_CONTAINER (frame), vbox);

      /* Standard message dialog */
-      hbox = gtk_hbox_new (FALSE, 8);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
      button = gtk_button_new_with_mnemonic ("_Message Dialog");
      g_signal_connect (button, "clicked",
 			G_CALLBACK (message_dialog_clicked), NULL);
      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);

-      gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, FALSE, 0);
+      gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
+                          FALSE, FALSE, 0);

      /* Interactive dialog*/
-      hbox = gtk_hbox_new (FALSE, 8);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-      vbox2 = gtk_vbox_new (FALSE, 0);
+      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);

      button = gtk_button_new_with_mnemonic ("_Interactive Dialog");
      g_signal_connect (button, "clicked",
--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -51,19 +51,12 @@ scribble_configure_event (GtkWidget         *widget,

 /* Redraw the screen from the surface */
 static gboolean
-scribble_expose_event (GtkWidget      *widget,
-                       GdkEventExpose *event,
-                       gpointer        data)
+scribble_draw (GtkWidget *widget,
+               cairo_t   *cr,
+               gpointer   data)
 {
-  cairo_t *cr;
-
-  cr = gdk_cairo_create (gtk_widget_get_window (widget));
-  
  cairo_set_source_surface (cr, surface, 0, 0);
-  gdk_cairo_rectangle (cr, &event->area);
-  cairo_fill (cr);
-
-  cairo_destroy (cr);
+  cairo_paint (cr);

  return FALSE;
 }
@@ -144,45 +137,38 @@ scribble_motion_notify_event (GtkWidget      *widget,


 static gboolean
-checkerboard_expose (GtkWidget      *da,
-                     GdkEventExpose *event,
-                     gpointer        data)
+checkerboard_draw (GtkWidget *da,
+                   cairo_t   *cr,
+                   gpointer   data)
 {
-  GtkAllocation allocation;
-  gint i, j, xcount, ycount;
-  cairo_t *cr;
+  gint i, j, xcount, ycount, width, height;

 #define CHECK_SIZE 10
 #define SPACING 2

-  /* At the start of an expose handler, a clip region of event->area
-   * is set on the window, and event->area has been cleared to the
+  /* At the start of a draw handler, a clip region has been set on
+   * the Cairo context, and the contents have been cleared to the
   * widget's background color. The docs for
   * gdk_window_begin_paint_region() give more details on how this
   * works.
   */

-  cr = gdk_cairo_create (gtk_widget_get_window (da));
-  gdk_cairo_rectangle (cr, &event->area);
-  cairo_clip (cr);
-
-  gtk_widget_get_allocation (da, &allocation);
  xcount = 0;
+  width = gtk_widget_get_allocated_width (da);
+  height = gtk_widget_get_allocated_height (da);
  i = SPACING;
-  while (i < allocation.width)
+  while (i < width)
    {
      j = SPACING;
      ycount = xcount % 2; /* start with even/odd depending on row */
-      while (j < allocation.height)
+      while (j < height)
        {
          if (ycount % 2)
            cairo_set_source_rgb (cr, 0.45777, 0, 0.45777);
          else
            cairo_set_source_rgb (cr, 1, 1, 1);

-          /* If we're outside event->area, this will do nothing.
-           * It might be mildly more efficient if we handled
-           * the clipping ourselves, but again we're feeling lazy.
+          /* If we're outside the clip, this will do nothing.
           */
          cairo_rectangle (cr, i, j, CHECK_SIZE, CHECK_SIZE);
          cairo_fill (cr);
@@ -195,8 +181,6 @@ checkerboard_expose (GtkWidget      *da,
      ++xcount;
    }

-  cairo_destroy (cr);
-
  /* return TRUE because we've handled this event, so no
   * further processing is required.
   */
@@ -209,7 +193,7 @@ close_window (void)
  window = NULL;

  if (surface)
-    g_object_unref (surface);
+    cairo_surface_destroy (surface);
  surface = NULL;
 }

@@ -232,7 +216,7 @@ do_drawingarea (GtkWidget *do_widget)

      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
      gtk_container_add (GTK_CONTAINER (window), vbox);

@@ -255,8 +239,8 @@ do_drawingarea (GtkWidget *do_widget)

      gtk_container_add (GTK_CONTAINER (frame), da);

-      g_signal_connect (da, "expose-event",
-                        G_CALLBACK (checkerboard_expose), NULL);
+      g_signal_connect (da, "draw",
+                        G_CALLBACK (checkerboard_draw), NULL);

      /*
       * Create the scribble area
@@ -279,8 +263,8 @@ do_drawingarea (GtkWidget *do_widget)

      /* Signals used to handle backing surface */

-      g_signal_connect (da, "expose-event",
-                        G_CALLBACK (scribble_expose_event), NULL);
+      g_signal_connect (da, "draw",
+                        G_CALLBACK (scribble_draw), NULL);
      g_signal_connect (da,"configure-event",
                        G_CALLBACK (scribble_configure_event), NULL);

--- a/demos/gtk-demo/editable_cells.c
+++ b/demos/gtk-demo/editable_cells.c
@@ -48,27 +48,27 @@ add_items (void)
  g_return_if_fail (articles != NULL);

  foo.number = 3;
-  foo.product = g_strdup ("bottles of coke");
+  foo.product = "bottles of coke";
  foo.yummy = 20;
  g_array_append_vals (articles, &foo, 1);

  foo.number = 5;
-  foo.product = g_strdup ("packages of noodles");
+  foo.product = "packages of noodles";
  foo.yummy = 50;
  g_array_append_vals (articles, &foo, 1);

  foo.number = 2;
-  foo.product = g_strdup ("packages of chocolate chip cookies");
+  foo.product = "packages of chocolate chip cookies";
  foo.yummy = 90;
  g_array_append_vals (articles, &foo, 1);

  foo.number = 1;
-  foo.product = g_strdup ("can vanilla ice cream");
+  foo.product = "can vanilla ice cream";
  foo.yummy = 60;
  g_array_append_vals (articles, &foo, 1);

  foo.number = 6;
-  foo.product = g_strdup ("eggs");
+  foo.product = "eggs";
  foo.yummy = 10;
  g_array_append_vals (articles, &foo, 1);
 }
@@ -332,7 +332,7 @@ do_editable_cells (GtkWidget *do_widget)
      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);

-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
      gtk_container_add (GTK_CONTAINER (window), vbox);

      gtk_box_pack_start (GTK_BOX (vbox),
@@ -365,7 +365,8 @@ do_editable_cells (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (sw), treeview);

      /* some buttons */
-      hbox = gtk_hbox_new (TRUE, 4);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+      gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);

      button = gtk_button_new_with_label ("Add item");
--- a/demos/gtk-demo/entry_buffer.c
+++ b/demos/gtk-demo/entry_buffer.c
@@ -34,7 +34,7 @@ do_entry_buffer (GtkWidget *do_widget)

    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));

-    vbox = gtk_vbox_new (FALSE, 5);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
    gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);

--- a/demos/gtk-demo/entry_completion.c
+++ b/demos/gtk-demo/entry_completion.c
@@ -61,7 +61,7 @@ do_entry_completion (GtkWidget *do_widget)

    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));

-    vbox = gtk_vbox_new (FALSE, 5);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
    gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);

--- a/demos/gtk-demo/expander.c
+++ b/demos/gtk-demo/expander.c
@@ -35,7 +35,7 @@ do_expander (GtkWidget *do_widget)

    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));

-    vbox = gtk_vbox_new (FALSE, 5);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
    gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);

--- a/demos/gtk-demo/hypertext.c
+++ b/demos/gtk-demo/hypertext.c
@@ -113,8 +113,8 @@ key_press_event (GtkWidget *text_view,

  switch (event->keyval)
    {
-      case GDK_Return: 
-      case GDK_KP_Enter:
+      case GDK_KEY_Return: 
+      case GDK_KEY_KP_Enter:
        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
        gtk_text_buffer_get_iter_at_mark (buffer, &iter, 
                                          gtk_text_buffer_get_insert (buffer));
--- a/demos/gtk-demo/iconview.c
+++ b/demos/gtk-demo/iconview.c
@@ -105,6 +105,7 @@ fill_store (GtkListStore *store)

      name = g_dir_read_name (dir);
    }
+  g_dir_close (dir);
 }

 static gint
@@ -300,7 +301,7 @@ do_iconview (GtkWidget *do_widget)
 	  GtkWidget *tool_bar;
 	  GtkToolItem *home_button;

-	  vbox = gtk_vbox_new (FALSE, 0);
+	  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	  gtk_container_add (GTK_CONTAINER (window), vbox);

 	  tool_bar = gtk_toolbar_new ();
--- a/demos/gtk-demo/iconview_edit.c
+++ b/demos/gtk-demo/iconview_edit.c
@@ -120,8 +120,8 @@ do_iconview_edit (GtkWidget *do_widget)

      gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
 					GTK_SELECTION_SINGLE);
-      gtk_icon_view_set_orientation (GTK_ICON_VIEW (icon_view),
-				     GTK_ORIENTATION_HORIZONTAL);
+      gtk_icon_view_set_item_orientation (GTK_ICON_VIEW (icon_view),
+				          GTK_ORIENTATION_HORIZONTAL);
      gtk_icon_view_set_columns (GTK_ICON_VIEW (icon_view), 2);
      gtk_icon_view_set_reorderable (GTK_ICON_VIEW (icon_view), TRUE);

--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -261,7 +261,7 @@ start_progressive_loading (GtkWidget *image)
 }

 static void
-cleanup_callback (GtkObject *object,
+cleanup_callback (GObject   *object,
 		  gpointer   data)
 {
  if (load_timeout)
@@ -335,7 +335,7 @@ do_images (GtkWidget *do_widget)

      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
      gtk_container_add (GTK_CONTAINER (window), vbox);

@@ -432,7 +432,7 @@ do_images (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (align), frame);
      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);

-      gicon = g_themed_icon_new_with_default_fallbacks ("battery-critical-charging-symbolic");
+      gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic");
      image = gtk_image_new_from_gicon (gicon, GTK_ICON_SIZE_DIALOG);

      gtk_container_add (GTK_CONTAINER (frame), image);
--- a/demos/gtk-demo/infobar.c
+++ b/demos/gtk-demo/infobar.c
@@ -44,7 +44,7 @@ do_infobar (GtkWidget *do_widget)
      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

-      vbox = gtk_vbox_new (FALSE, 0);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
      gtk_container_add (GTK_CONTAINER (window), vbox);

      bar = gtk_info_bar_new ();
@@ -81,7 +81,7 @@ do_infobar (GtkWidget *do_widget)
      frame = gtk_frame_new ("Info bars");
      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 8);

-      vbox2 = gtk_vbox_new (FALSE, 8);
+      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
      gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
      gtk_container_add (GTK_CONTAINER (frame), vbox2);

--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -105,7 +105,7 @@ create_model (void)
      gboolean sensitive;

      if (i == 1 || i == 3)
-        icon_name = "battery-critical-charging-symbolic";
+        icon_name = "battery-caution-charging-symbolic";
      else
        icon_name = NULL;
      if (i == 3)
@@ -266,7 +266,7 @@ do_list_store (GtkWidget *do_widget)
                        G_CALLBACK (gtk_widget_destroyed), &window);
      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
      gtk_container_add (GTK_CONTAINER (window), vbox);

      label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though).");
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -223,7 +223,6 @@ static gchar *types[] =
  "FALSE",
  "TRUE",
  "FILE ",
-  "GtkObject ",
  "GtkColorSelection ",
  "GtkWidget ",
  "GtkButton ",
@@ -279,7 +278,7 @@ static gchar *types[] =
  "GtkTreeStore ",
  "GtkEntry ",
  "GtkEditable ",
-  "GtkEditableClass ",
+  "GtkEditableInterface ",
  "GdkPixmap ",
  "GdkEventConfigure ",
  "GdkEventMotion ",
@@ -752,7 +751,7 @@ create_text (GtkTextBuffer **buffer,
  if (is_source)
    {
      font_desc = pango_font_description_from_string ("monospace");
-      gtk_widget_modify_font (text_view, font_desc);
+      gtk_widget_override_font (text_view, font_desc);
      pango_font_description_free (font_desc);

      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view),
@@ -932,7 +931,6 @@ main (int argc, char **argv)
  GtkWidget *notebook;
  GtkWidget *hbox;
  GtkWidget *tree;
-  GtkTextTag *tag;

  /* Most code in gtk-demo is intended to be exemplary, but not
   * these few lines, which are just a hack so gtk-demo will work
@@ -955,7 +953,7 @@ main (int argc, char **argv)
  g_signal_connect_after (window, "destroy",
 		    G_CALLBACK (gtk_main_quit), NULL);

-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
  gtk_container_add (GTK_CONTAINER (window), hbox);

  tree = create_tree ();
@@ -968,38 +966,38 @@ main (int argc, char **argv)
 			    create_text (&info_buffer, FALSE),
 			    gtk_label_new_with_mnemonic ("_Info"));

-  tag = gtk_text_buffer_create_tag (info_buffer, "title",
-                                    "font", "Sans 18",
-                                    NULL);
-   g_object_unref (info_buffer);
+  gtk_text_buffer_create_tag (info_buffer, "title",
+                              "font", "Sans 18",
+                              NULL);
+  g_object_unref (info_buffer);

  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
 			    create_text (&source_buffer, TRUE),
 			    gtk_label_new_with_mnemonic ("_Source"));


-  tag = gtk_text_buffer_create_tag (source_buffer, "comment",
-				    "foreground", "DodgerBlue",
-                                    NULL);
-  tag = gtk_text_buffer_create_tag (source_buffer, "type",
-				    "foreground", "ForestGreen",
-                                    NULL);
-  tag = gtk_text_buffer_create_tag (source_buffer, "string",
-				    "foreground", "RosyBrown",
-				    "weight", PANGO_WEIGHT_BOLD,
-                                    NULL);
-  tag = gtk_text_buffer_create_tag (source_buffer, "control",
-				    "foreground", "purple",
-                                    NULL);
-  tag = gtk_text_buffer_create_tag (source_buffer, "preprocessor",
-				    "style", PANGO_STYLE_OBLIQUE,
- 				    "foreground", "burlywood4",
-                                    NULL);
-  tag = gtk_text_buffer_create_tag (source_buffer, "function",
-				    "weight", PANGO_WEIGHT_BOLD,
- 				    "foreground", "DarkGoldenrod4",
-                                    NULL);
-   g_object_unref (source_buffer);
+  gtk_text_buffer_create_tag (source_buffer, "comment",
+                              "foreground", "DodgerBlue",
+                              NULL);
+  gtk_text_buffer_create_tag (source_buffer, "type",
+                              "foreground", "ForestGreen",
+                              NULL);
+  gtk_text_buffer_create_tag (source_buffer, "string",
+                              "foreground", "RosyBrown",
+                              "weight", PANGO_WEIGHT_BOLD,
+                              NULL);
+  gtk_text_buffer_create_tag (source_buffer, "control",
+                              "foreground", "purple",
+                              NULL);
+  gtk_text_buffer_create_tag (source_buffer, "preprocessor",
+                              "style", PANGO_STYLE_OBLIQUE,
+                              "foreground", "burlywood4",
+                              NULL);
+  gtk_text_buffer_create_tag (source_buffer, "function",
+                              "weight", PANGO_WEIGHT_BOLD,
+                              "foreground", "DarkGoldenrod4",
+                              NULL);
+  g_object_unref (source_buffer);
  
  gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
  gtk_widget_show_all (window);
--- a/demos/gtk-demo/makefile.msc.in
+++ b/demos/gtk-demo/makefile.msc.in
@@ -14,15 +14,15 @@ PERL = perl
 ################################################################

 # 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@
+GTK_VER = 2.0
+GDK_PIXBUF_VER = 2.0

 GDK_LIBS = ../../gdk/gdk-win32-$(GTK_VER).lib
 GTK_LIBS = ../../gtk/gtk-win32-$(GTK_VER).lib
 GDK_PIXBUF_LIBS = ../../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib

 INCLUDES = -FImsvc_recommended_pragmas.h -I . -I ../.. -I ../../gdk -I ../../gdk-pixbuf -I ../../gtk
-DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS)
+DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS) $(CAIRO_CFLAGS)
 LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
 DEFINES = -DG_LOG_DOMAIN=\"GtkDemo\" -DGTK_VERSION=\"$(GTK_VER)\" \
 	-DDEMOCODEDIR=\".\"
@@ -90,5 +90,6 @@ OBJECTS = \
 	main.obj \

 gtk-demo.exe : demos.h $(OBJECTS)
-	$(CC) $(CFLAGS) -Fegtk-demo.exe $(OBJECTS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
+	$(CC) $(CFLAGS) -Fegtk-demo.exe $(OBJECTS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) \
+	$(CAIRO_LIBS) $(PANGOCAIRO_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)

--- a/demos/gtk-demo/menus.c
+++ b/demos/gtk-demo/menus.c
@@ -74,47 +74,17 @@ change_orientation (GtkWidget *button,
                    GtkWidget *menubar)
 {
  GtkWidget *parent;
-  GtkWidget *box = NULL;
+  GtkOrientation orientation;

  parent = gtk_widget_get_parent (menubar);
+  orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (parent));
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (parent), 1 - orientation);

-  if (GTK_IS_VBOX (parent))
-    {
-      box = gtk_widget_get_parent (parent);
-
-      g_object_ref (menubar);
-      gtk_container_remove (GTK_CONTAINER (parent), menubar);
-      gtk_container_add (GTK_CONTAINER (box), menubar);
-      gtk_box_reorder_child (GTK_BOX (box), menubar, 0);
-      g_object_unref (menubar);
-      g_object_set (menubar, 
-		    "pack-direction", GTK_PACK_DIRECTION_TTB,
-		    NULL);
-    }
+  if (orientation == GTK_ORIENTATION_VERTICAL)
+    g_object_set (menubar, "pack-direction", GTK_PACK_DIRECTION_TTB, NULL);
  else
-    {
-      GList *children, *l;
+    g_object_set (menubar, "pack-direction", GTK_PACK_DIRECTION_LTR, NULL);

-      children = gtk_container_get_children (GTK_CONTAINER (parent));
-      for (l = children; l; l = l->next)
-	{
-	  if (GTK_IS_VBOX (l->data))
-	    {
-	      box = l->data;
-	      break;
-	    }
-	}
-      g_list_free (children);
-
-      g_object_ref (menubar);
-      gtk_container_remove (GTK_CONTAINER (parent), menubar);
-      gtk_container_add (GTK_CONTAINER (box), menubar);
-      gtk_box_reorder_child (GTK_BOX (box), menubar, 0);
-      g_object_unref (menubar);
-      g_object_set (menubar, 
-		    "pack-direction", GTK_PACK_DIRECTION_LTR,
-		    NULL);
-    }
 }

 static GtkWidget *window = NULL;
@@ -146,11 +116,11 @@ do_menus (GtkWidget *do_widget)

      gtk_container_set_border_width (GTK_CONTAINER (window), 0);

-      box = gtk_hbox_new (FALSE, 0);
+      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
      gtk_container_add (GTK_CONTAINER (window), box);
      gtk_widget_show (box);

-      box1 = gtk_vbox_new (FALSE, 0);
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
      gtk_container_add (GTK_CONTAINER (box), box1);
      gtk_widget_show (box1);

@@ -172,11 +142,10 @@ do_menus (GtkWidget *do_widget)

      menuitem = gtk_menu_item_new_with_label ("bar");
      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (4, TRUE));
-      gtk_menu_item_set_right_justified (GTK_MENU_ITEM (menuitem), TRUE);
      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
      gtk_widget_show (menuitem);

-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 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/demos/gtk-demo/offscreen_window.c
+++ b/demos/gtk-demo/offscreen_window.c
@@ -39,14 +39,18 @@ void       gtk_rotated_bin_set_angle (GtkRotatedBin *bin,

 static void     gtk_rotated_bin_realize       (GtkWidget       *widget);
 static void     gtk_rotated_bin_unrealize     (GtkWidget       *widget);
-static void     gtk_rotated_bin_size_request  (GtkWidget       *widget,
-                                               GtkRequisition  *requisition);
+static void     gtk_rotated_bin_get_preferred_width  (GtkWidget *widget,
+                                                      gint      *minimum,
+                                                      gint      *natural);
+static void     gtk_rotated_bin_get_preferred_height (GtkWidget *widget,
+                                                      gint      *minimum,
+                                                      gint      *natural);
 static void     gtk_rotated_bin_size_allocate (GtkWidget       *widget,
                                               GtkAllocation   *allocation);
 static gboolean gtk_rotated_bin_damage        (GtkWidget       *widget,
                                               GdkEventExpose  *event);
-static gboolean gtk_rotated_bin_expose        (GtkWidget       *widget,
-                                               GdkEventExpose  *offscreen);
+static gboolean gtk_rotated_bin_draw          (GtkWidget       *widget,
+                                               cairo_t         *cr);

 static void     gtk_rotated_bin_add           (GtkContainer    *container,
                                               GtkWidget       *child);
@@ -148,9 +152,10 @@ gtk_rotated_bin_class_init (GtkRotatedBinClass *klass)

  widget_class->realize = gtk_rotated_bin_realize;
  widget_class->unrealize = gtk_rotated_bin_unrealize;
-  widget_class->size_request = gtk_rotated_bin_size_request;
+  widget_class->get_preferred_width = gtk_rotated_bin_get_preferred_width;
+  widget_class->get_preferred_height = gtk_rotated_bin_get_preferred_height;
  widget_class->size_allocate = gtk_rotated_bin_size_allocate;
-  widget_class->expose_event = gtk_rotated_bin_expose;
+  widget_class->draw = gtk_rotated_bin_draw;

  g_signal_override_class_closure (g_signal_lookup ("damage-event", GTK_TYPE_WIDGET),
                                   GTK_TYPE_ROTATED_BIN,
@@ -225,7 +230,7 @@ gtk_rotated_bin_realize (GtkWidget *widget)
 {
  GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
  GtkAllocation allocation;
-  GtkStyle *style;
+  GtkStyleContext *context;
  GdkWindow *window;
  GdkWindowAttr attributes;
  gint attributes_mask;
@@ -252,10 +257,9 @@ gtk_rotated_bin_realize (GtkWidget *widget)
                        | GDK_LEAVE_NOTIFY_MASK;

  attributes.visual = gtk_widget_get_visual (widget);
-  attributes.colormap = gtk_widget_get_colormap (widget);
  attributes.wclass = GDK_INPUT_OUTPUT;

-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;

  window = gdk_window_new (gtk_widget_get_parent_window (widget),
                           &attributes, attributes_mask);
@@ -286,10 +290,9 @@ gtk_rotated_bin_realize (GtkWidget *widget)
  g_signal_connect (bin->offscreen_window, "from-embedder",
                    G_CALLBACK (offscreen_window_from_parent), bin);

-  gtk_widget_style_attach (widget);
-  style = gtk_widget_get_style (widget);
-  gtk_style_set_background (style, window, GTK_STATE_NORMAL);
-  gtk_style_set_background (style, bin->offscreen_window, GTK_STATE_NORMAL);
+  context = gtk_widget_get_style_context (widget);
+  gtk_style_context_set_background (context, window);
+  gtk_style_context_set_background (context, bin->offscreen_window);
  gdk_window_show (bin->offscreen_window);
 }

@@ -392,7 +395,8 @@ gtk_rotated_bin_size_request (GtkWidget      *widget,
  child_requisition.height = 0;

  if (bin->child && gtk_widget_get_visible (bin->child))
-    gtk_widget_size_request (bin->child, &child_requisition);
+    gtk_widget_get_preferred_size ( (bin->child),
+                               &child_requisition, NULL);

  s = sin (bin->angle);
  c = cos (bin->angle);
@@ -404,6 +408,30 @@ gtk_rotated_bin_size_request (GtkWidget      *widget,
  requisition->height = border_width * 2 + h;
 }

+static void
+gtk_rotated_bin_get_preferred_width (GtkWidget *widget,
+                                     gint      *minimum,
+                                     gint      *natural)
+{
+  GtkRequisition requisition;
+
+  gtk_rotated_bin_size_request (widget, &requisition);
+
+  *minimum = *natural = requisition.width;
+}
+
+static void
+gtk_rotated_bin_get_preferred_height (GtkWidget *widget,
+                                      gint      *minimum,
+                                      gint      *natural)
+{
+  GtkRequisition requisition;
+
+  gtk_rotated_bin_size_request (widget, &requisition);
+
+  *minimum = *natural = requisition.height;
+}
+
 static void
 gtk_rotated_bin_size_allocate (GtkWidget     *widget,
                               GtkAllocation *allocation)
@@ -434,7 +462,8 @@ gtk_rotated_bin_size_allocate (GtkWidget     *widget,
      s = sin (bin->angle);
      c = cos (bin->angle);

-      gtk_widget_get_child_requisition (bin->child, &child_requisition);
+      gtk_widget_get_preferred_size (bin->child,
+                                     &child_requisition, NULL);
      child_allocation.x = 0;
      child_allocation.y = 0;
      child_allocation.height = child_requisition.height;
@@ -469,65 +498,59 @@ gtk_rotated_bin_damage (GtkWidget      *widget,
 }

 static gboolean
-gtk_rotated_bin_expose (GtkWidget      *widget,
-                        GdkEventExpose *event)
+gtk_rotated_bin_draw (GtkWidget *widget,
+                      cairo_t   *cr)
 {
  GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
  GdkWindow *window;
-  gint width, height;
  gdouble s, c;
  gdouble w, h;

-  if (gtk_widget_is_drawable (widget))
+  window = gtk_widget_get_window (widget);
+  if (gtk_cairo_should_draw_window (cr, window))
    {
-      window = gtk_widget_get_window (widget);
-      if (event->window == window)
+      cairo_surface_t *surface;
+      GtkAllocation child_area;
+
+      if (bin->child && gtk_widget_get_visible (bin->child))
        {
-          GdkPixmap *pixmap;
-          GtkAllocation child_area;
-          cairo_t *cr;
+          surface = gdk_offscreen_window_get_surface (bin->offscreen_window);
+          gtk_widget_get_allocation (bin->child, &child_area);

-          if (bin->child && gtk_widget_get_visible (bin->child))
-            {
-              pixmap = gdk_offscreen_window_get_pixmap (bin->offscreen_window);
-              gtk_widget_get_allocation (bin->child, &child_area);
+          /* transform */
+          s = sin (bin->angle);
+          c = cos (bin->angle);
+          w = c * child_area.width + s * child_area.height;
+          h = s * child_area.width + c * child_area.height;

-              cr = gdk_cairo_create (window);
+          cairo_translate (cr, (w - child_area.width) / 2, (h - child_area.height) / 2);
+          cairo_translate (cr, child_area.width / 2, child_area.height / 2);
+          cairo_rotate (cr, bin->angle);
+          cairo_translate (cr, -child_area.width / 2, -child_area.height / 2);

-              /* transform */
-              s = sin (bin->angle);
-              c = cos (bin->angle);
-              w = c * child_area.width + s * child_area.height;
-              h = s * child_area.width + c * child_area.height;
-
-              cairo_translate (cr, (w - child_area.width) / 2, (h - child_area.height) / 2);
-              cairo_translate (cr, child_area.width / 2, child_area.height / 2);
-              cairo_rotate (cr, bin->angle);
-              cairo_translate (cr, -child_area.width / 2, -child_area.height / 2);
-
-              /* clip */
-              gdk_drawable_get_size (pixmap, &width, &height);
-              cairo_rectangle (cr, 0, 0, width, height);
-              cairo_clip (cr);
-              /* paint */
-              gdk_cairo_set_source_pixmap (cr, pixmap, 0, 0);
-              cairo_paint (cr);
-
-              cairo_destroy (cr);
-            }
+          /* clip */
+          cairo_rectangle (cr,
+                           0, 0,
+                           gdk_window_get_width (bin->offscreen_window),
+                           gdk_window_get_height (bin->offscreen_window));
+          cairo_clip (cr);
+          /* paint */
+          cairo_set_source_surface (cr, surface, 0, 0);
+          cairo_paint (cr);
        }
-      else if (event->window == bin->offscreen_window)
-        {
-          gtk_paint_flat_box (gtk_widget_get_style (widget), event->window,
-                              GTK_STATE_NORMAL, GTK_SHADOW_NONE,
-                              &event->area, widget, "blah",
-                              0, 0, -1, -1);
+    }
+  if (gtk_cairo_should_draw_window (cr, bin->offscreen_window))
+    {
+      gtk_render_background (gtk_widget_get_style_context (widget),
+                             cr,
+                             0, 0,
+                             gdk_window_get_width (bin->offscreen_window),
+                             gdk_window_get_height (bin->offscreen_window));

-          if (bin->child)
-            gtk_container_propagate_expose (GTK_CONTAINER (widget),
-                                            bin->child,
-                                            event);
-        }
+      if (bin->child)
+        gtk_container_propagate_draw (GTK_CONTAINER (widget),
+                                      bin->child,
+                                      cr);
    }

  return FALSE;
@@ -550,7 +573,7 @@ do_offscreen_window (GtkWidget *do_widget)
  if (!window)
    {
      GtkWidget *bin, *vbox, *scale, *button;
-      GdkColor black;
+      GdkRGBA black;

      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
@@ -560,12 +583,13 @@ do_offscreen_window (GtkWidget *do_widget)
      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);

-      gdk_color_parse ("black", &black);
-      gtk_widget_modify_bg (window, GTK_STATE_NORMAL, &black);
+      gdk_rgba_parse (&black, "black");
+      gtk_widget_override_background_color (window, 0, &black);
      gtk_container_set_border_width (GTK_CONTAINER (window), 10);

-      vbox = gtk_vbox_new (0, FALSE);
-      scale = gtk_hscale_new_with_range (0, G_PI/2, 0.01);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
+                                        0, G_PI/2, 0.01);
      gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);

      button = gtk_button_new_with_label ("A Button");
--- a/demos/gtk-demo/offscreen_window2.c
+++ b/demos/gtk-demo/offscreen_window2.c
@@ -35,14 +35,18 @@ GtkWidget* gtk_mirror_bin_new       (void);

 static void     gtk_mirror_bin_realize       (GtkWidget       *widget);
 static void     gtk_mirror_bin_unrealize     (GtkWidget       *widget);
-static void     gtk_mirror_bin_size_request  (GtkWidget       *widget,
-                                               GtkRequisition  *requisition);
+static void     gtk_mirror_bin_get_preferred_width  (GtkWidget *widget,
+                                                     gint      *minimum,
+                                                     gint      *natural);
+static void     gtk_mirror_bin_get_preferred_height (GtkWidget *widget,
+                                                     gint      *minimum,
+                                                     gint      *natural);
 static void     gtk_mirror_bin_size_allocate (GtkWidget       *widget,
                                               GtkAllocation   *allocation);
 static gboolean gtk_mirror_bin_damage        (GtkWidget       *widget,
                                               GdkEventExpose  *event);
-static gboolean gtk_mirror_bin_expose        (GtkWidget       *widget,
-                                               GdkEventExpose  *offscreen);
+static gboolean gtk_mirror_bin_draw          (GtkWidget       *widget,
+                                              cairo_t         *cr);

 static void     gtk_mirror_bin_add           (GtkContainer    *container,
                                               GtkWidget       *child);
@@ -86,9 +90,10 @@ gtk_mirror_bin_class_init (GtkMirrorBinClass *klass)

  widget_class->realize = gtk_mirror_bin_realize;
  widget_class->unrealize = gtk_mirror_bin_unrealize;
-  widget_class->size_request = gtk_mirror_bin_size_request;
+  widget_class->get_preferred_width = gtk_mirror_bin_get_preferred_width;
+  widget_class->get_preferred_height = gtk_mirror_bin_get_preferred_height;
  widget_class->size_allocate = gtk_mirror_bin_size_allocate;
-  widget_class->expose_event = gtk_mirror_bin_expose;
+  widget_class->draw = gtk_mirror_bin_draw;

  g_signal_override_class_closure (g_signal_lookup ("damage-event", GTK_TYPE_WIDGET),
                                   GTK_TYPE_MIRROR_BIN,
@@ -163,7 +168,7 @@ gtk_mirror_bin_realize (GtkWidget *widget)
 {
  GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
  GtkAllocation allocation;
-  GtkStyle *style;
+  GtkStyleContext *context;
  GdkWindow *window;
  GdkWindowAttr attributes;
  gint attributes_mask;
@@ -190,10 +195,9 @@ gtk_mirror_bin_realize (GtkWidget *widget)
                        | GDK_LEAVE_NOTIFY_MASK;

  attributes.visual = gtk_widget_get_visual (widget);
-  attributes.colormap = gtk_widget_get_colormap (widget);
  attributes.wclass = GDK_INPUT_OUTPUT;

-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;

  window = gdk_window_new (gtk_widget_get_parent_window (widget),
                           &attributes, attributes_mask);
@@ -224,10 +228,9 @@ gtk_mirror_bin_realize (GtkWidget *widget)
  g_signal_connect (bin->offscreen_window, "from-embedder",
                    G_CALLBACK (offscreen_window_from_parent), bin);

-  gtk_widget_style_attach (widget);
-  style = gtk_widget_get_style (widget);
-  gtk_style_set_background (style, window, GTK_STATE_NORMAL);
-  gtk_style_set_background (style, bin->offscreen_window, GTK_STATE_NORMAL);
+  context = gtk_widget_get_style_context (widget);
+  gtk_style_context_set_background (context, window);
+  gtk_style_context_set_background (context, bin->offscreen_window);
  gdk_window_show (bin->offscreen_window);
 }

@@ -316,13 +319,38 @@ gtk_mirror_bin_size_request (GtkWidget      *widget,
  child_requisition.height = 0;

  if (bin->child && gtk_widget_get_visible (bin->child))
-    gtk_widget_size_request (bin->child, &child_requisition);
+    gtk_widget_get_preferred_size ( (bin->child),
+                               &child_requisition, NULL);

  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
  requisition->width = border_width * 2 + child_requisition.width + 10;
  requisition->height = border_width * 2 + child_requisition.height * 2 + 10;
 }

+static void
+gtk_mirror_bin_get_preferred_width (GtkWidget *widget,
+                                    gint      *minimum,
+                                    gint      *natural)
+{
+  GtkRequisition requisition;
+
+  gtk_mirror_bin_size_request (widget, &requisition);
+
+  *minimum = *natural = requisition.width;
+}
+
+static void
+gtk_mirror_bin_get_preferred_height (GtkWidget *widget,
+                                     gint      *minimum,
+                                     gint      *natural)
+{
+  GtkRequisition requisition;
+
+  gtk_mirror_bin_size_request (widget, &requisition);
+
+  *minimum = *natural = requisition.width;
+}
+
 static void
 gtk_mirror_bin_size_allocate (GtkWidget     *widget,
                               GtkAllocation *allocation)
@@ -349,7 +377,8 @@ gtk_mirror_bin_size_allocate (GtkWidget     *widget,
      GtkRequisition child_requisition;
      GtkAllocation child_allocation;

-      gtk_widget_get_child_requisition (bin->child, &child_requisition);
+      gtk_widget_get_preferred_size (bin->child,
+                                     &child_requisition, NULL);
      child_allocation.x = 0;
      child_allocation.y = 0;
      child_allocation.height = child_requisition.height;
@@ -375,78 +404,62 @@ gtk_mirror_bin_damage (GtkWidget      *widget,
 }

 static gboolean
-gtk_mirror_bin_expose (GtkWidget      *widget,
-                        GdkEventExpose *event)
+gtk_mirror_bin_draw (GtkWidget *widget,
+                     cairo_t   *cr)
 {
  GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
  GdkWindow *window;
-  gint width, height;

-  if (gtk_widget_is_drawable (widget))
+  window = gtk_widget_get_window (widget);
+  if (gtk_cairo_should_draw_window (cr, window))
    {
-      window = gtk_widget_get_window (widget);
-      if (event->window == window)
+      cairo_surface_t *surface;
+      cairo_matrix_t matrix;
+      cairo_pattern_t *mask;
+      int height;
+
+      if (bin->child && gtk_widget_get_visible (bin->child))
        {
-          GdkPixmap *pixmap;
-          cairo_t *cr;
-          cairo_matrix_t matrix;
-          cairo_pattern_t *mask;
+          surface = gdk_offscreen_window_get_surface (bin->offscreen_window);
+          height = gdk_window_get_height (bin->offscreen_window);

-          if (bin->child && gtk_widget_get_visible (bin->child))
-            {
-              pixmap = gdk_offscreen_window_get_pixmap (bin->offscreen_window);
-              gdk_drawable_get_size (pixmap, &width, &height);
+          /* paint the offscreen child */
+          cairo_set_source_surface (cr, surface, 0, 0);
+          cairo_paint (cr);

-              cr = gdk_cairo_create (window);
+          cairo_matrix_init (&matrix, 1.0, 0.0, 0.3, 1.0, 0.0, 0.0);
+          cairo_matrix_scale (&matrix, 1.0, -1.0);
+          cairo_matrix_translate (&matrix, -10, - 3 * height - 10);
+          cairo_transform (cr, &matrix);

-              cairo_save (cr);
+          cairo_set_source_surface (cr, surface, 0, height);

-              cairo_rectangle (cr, 0, 0, width, height);
-              cairo_clip (cr);
+          /* create linear gradient as mask-pattern to fade out the source */
+          mask = cairo_pattern_create_linear (0.0, height, 0.0, 2*height);
+          cairo_pattern_add_color_stop_rgba (mask, 0.0,  0.0, 0.0, 0.0, 0.0);
+          cairo_pattern_add_color_stop_rgba (mask, 0.25, 0.0, 0.0, 0.0, 0.01);
+          cairo_pattern_add_color_stop_rgba (mask, 0.5,  0.0, 0.0, 0.0, 0.25);
+          cairo_pattern_add_color_stop_rgba (mask, 0.75, 0.0, 0.0, 0.0, 0.5);
+          cairo_pattern_add_color_stop_rgba (mask, 1.0,  0.0, 0.0, 0.0, 1.0);

-              /* paint the offscreen child */
-              gdk_cairo_set_source_pixmap (cr, pixmap, 0, 0);
-              cairo_paint (cr);
+          /* paint the reflection */
+          cairo_mask (cr, mask);

-              cairo_restore (cr);
-
-              cairo_matrix_init (&matrix, 1.0, 0.0, 0.3, 1.0, 0.0, 0.0);
-              cairo_matrix_scale (&matrix, 1.0, -1.0);
-              cairo_matrix_translate (&matrix, -10, - 3 * height - 10);
-              cairo_transform (cr, &matrix);
-
-              cairo_rectangle (cr, 0, height, width, height);
-              cairo_clip (cr);
-
-              gdk_cairo_set_source_pixmap (cr, pixmap, 0, height);
-
-              /* create linear gradient as mask-pattern to fade out the source */
-              mask = cairo_pattern_create_linear (0.0, height, 0.0, 2*height);
-              cairo_pattern_add_color_stop_rgba (mask, 0.0,  0.0, 0.0, 0.0, 0.0);
-              cairo_pattern_add_color_stop_rgba (mask, 0.25, 0.0, 0.0, 0.0, 0.01);
-              cairo_pattern_add_color_stop_rgba (mask, 0.5,  0.0, 0.0, 0.0, 0.25);
-              cairo_pattern_add_color_stop_rgba (mask, 0.75, 0.0, 0.0, 0.0, 0.5);
-              cairo_pattern_add_color_stop_rgba (mask, 1.0,  0.0, 0.0, 0.0, 1.0);
-
-              /* paint the reflection */
-              cairo_mask (cr, mask);
-
-              cairo_pattern_destroy (mask);
-              cairo_destroy (cr);
-            }
+          cairo_pattern_destroy (mask);
        }
-      else if (event->window == bin->offscreen_window)
-        {
-          gtk_paint_flat_box (gtk_widget_get_style (widget), event->window,
-                              GTK_STATE_NORMAL, GTK_SHADOW_NONE,
-                              &event->area, widget, "blah",
-                              0, 0, -1, -1);
+    }
+  else if (gtk_cairo_should_draw_window (cr, bin->offscreen_window))
+    {
+      gtk_render_background (gtk_widget_get_style_context (widget),
+                             cr,
+                             0, 0,
+                             gdk_window_get_width (bin->offscreen_window),
+                             gdk_window_get_height (bin->offscreen_window));

-          if (bin->child)
-            gtk_container_propagate_expose (GTK_CONTAINER (widget),
-                                            bin->child,
-                                            event);
-        }
+      if (bin->child)
+        gtk_container_propagate_draw (GTK_CONTAINER (widget),
+                                      bin->child,
+                                      cr);
    }

  return FALSE;
@@ -475,13 +488,13 @@ do_offscreen_window2 (GtkWidget *do_widget)

      gtk_container_set_border_width (GTK_CONTAINER (window), 10);

-      vbox = gtk_vbox_new (0, FALSE);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);

      bin = gtk_mirror_bin_new ();

      group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);

-      hbox = gtk_hbox_new (FALSE, 6);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
      backbutton = gtk_button_new ();
      gtk_container_add (GTK_CONTAINER (backbutton),
                         gtk_image_new_from_stock (GTK_STOCK_GO_BACK, 4));
--- a/demos/gtk-demo/overlay.c
+++ b/demos/gtk-demo/overlay.c
@@ -0,0 +1,181 @@
+/* Overlay
+ *
+ * Stack widgets in static positions over a main widget
+ */
+
+#include <gtk/gtk.h>
+
+GtkWidget *
+do_overlay (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+
+  if (!window)
+    {
+      GtkWidget *view;
+      GtkWidget *sw;
+      GtkWidget *overlay;
+      GtkWidget *entry;
+      GtkWidget *label;
+
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
+      gtk_window_set_default_size (GTK_WINDOW (window),
+                                   450, 450);
+      
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      gtk_window_set_title (GTK_WINDOW (window), "Overlay");
+      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
+
+      view = gtk_text_view_new ();
+
+      sw = gtk_scrolled_window_new (NULL, NULL);
+      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+                                      GTK_POLICY_AUTOMATIC,
+                                      GTK_POLICY_AUTOMATIC);
+      gtk_container_add (GTK_CONTAINER (sw), view);
+
+      overlay = gtk_overlay_new ();
+      gtk_container_add (GTK_CONTAINER (overlay), sw);
+      gtk_container_add (GTK_CONTAINER (window), overlay);
+
+      entry = gtk_entry_new ();
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
+      gtk_widget_set_halign (entry, GTK_ALIGN_END);
+      gtk_widget_set_valign (entry, GTK_ALIGN_END);
+
+      label = gtk_label_new ("Hello world");
+      gtk_widget_set_halign (label, GTK_ALIGN_END);
+      gtk_widget_set_valign (label, GTK_ALIGN_END);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
+      gtk_widget_set_margin_left (label, 20);
+      gtk_widget_set_margin_right (label, 20);
+      gtk_widget_set_margin_top (label, 5);
+      gtk_widget_set_margin_bottom (label, 5);
+
+      entry = gtk_entry_new ();
+      gtk_widget_set_halign (entry, GTK_ALIGN_START);
+      gtk_widget_set_valign (entry, GTK_ALIGN_END);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
+
+      label = gtk_label_new ("Hello world");
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_END);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
+      gtk_widget_set_margin_left (label, 20);
+      gtk_widget_set_margin_right (label, 20);
+      gtk_widget_set_margin_top (label, 5);
+      gtk_widget_set_margin_bottom (label, 5);
+
+      entry = gtk_entry_new ();
+      gtk_widget_set_halign (entry, GTK_ALIGN_END);
+      gtk_widget_set_valign (entry, GTK_ALIGN_START);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
+
+      label = gtk_label_new ("Hello world");
+      gtk_widget_set_halign (label, GTK_ALIGN_END);
+      gtk_widget_set_valign (label, GTK_ALIGN_START);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
+      gtk_widget_set_margin_left (label, 20);
+      gtk_widget_set_margin_right (label, 20);
+      gtk_widget_set_margin_top (label, 5);
+      gtk_widget_set_margin_bottom (label, 5);
+
+      entry = gtk_entry_new ();
+      gtk_widget_set_halign (entry, GTK_ALIGN_START);
+      gtk_widget_set_valign (entry, GTK_ALIGN_START);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
+
+      label = gtk_label_new ("Hello world");
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_START);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
+      gtk_widget_set_margin_left (label, 20);
+      gtk_widget_set_margin_right (label, 20);
+      gtk_widget_set_margin_top (label, 5);
+      gtk_widget_set_margin_bottom (label, 5);
+
+      entry = gtk_entry_new ();
+      gtk_widget_set_halign (entry, GTK_ALIGN_END);
+      gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
+
+      label = gtk_label_new ("Hello world");
+      gtk_widget_set_halign (label, GTK_ALIGN_END);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
+      gtk_widget_set_margin_left (label, 20);
+      gtk_widget_set_margin_right (label, 20);
+      gtk_widget_set_margin_top (label, 5);
+      gtk_widget_set_margin_bottom (label, 5);
+
+      entry = gtk_entry_new ();
+      gtk_widget_set_halign (entry, GTK_ALIGN_START);
+      gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
+
+      label = gtk_label_new ("Hello world");
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
+      gtk_widget_set_margin_left (label, 20);
+      gtk_widget_set_margin_right (label, 20);
+      gtk_widget_set_margin_top (label, 5);
+      gtk_widget_set_margin_bottom (label, 5);
+
+      entry = gtk_entry_new ();
+      gtk_widget_set_halign (entry, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (entry, GTK_ALIGN_START);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
+
+      label = gtk_label_new ("Hello world");
+      gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (label, GTK_ALIGN_START);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
+      gtk_widget_set_margin_left (label, 20);
+      gtk_widget_set_margin_right (label, 20);
+      gtk_widget_set_margin_top (label, 5);
+      gtk_widget_set_margin_bottom (label, 5);
+
+      entry = gtk_entry_new ();
+      gtk_widget_set_halign (entry, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (entry, GTK_ALIGN_END);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
+
+      label = gtk_label_new ("Hello world");
+      gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (label, GTK_ALIGN_END);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
+      gtk_widget_set_margin_left (label, 10);
+      gtk_widget_set_margin_right (label, 10);
+      gtk_widget_set_margin_top (label, 5);
+      gtk_widget_set_margin_bottom (label, 5);
+
+      entry = gtk_entry_new ();
+      gtk_widget_set_halign (entry, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
+
+      label = gtk_label_new ("Hello world");
+      gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
+
+      gtk_widget_show_all (overlay);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    {
+      gtk_widget_show (window);
+    }
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}
--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -153,14 +153,14 @@ do_panes (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "Panes");
      gtk_container_set_border_width (GTK_CONTAINER (window), 0);

-      vbox = gtk_vbox_new (FALSE, 0);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
      gtk_container_add (GTK_CONTAINER (window), vbox);
-      
-      vpaned = gtk_vpaned_new ();
+
+      vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
      gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE, TRUE, 0);
      gtk_container_set_border_width (GTK_CONTAINER(vpaned), 5);

-      hpaned = gtk_hpaned_new ();
+      hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
      gtk_paned_add1 (GTK_PANED (vpaned), hpaned);

      frame = gtk_frame_new (NULL);
--- a/demos/gtk-demo/pickers.c
+++ b/demos/gtk-demo/pickers.c
@@ -1,7 +1,7 @@
-/* Pickers 
+/* Pickers
 *
 * These widgets are mainly intended for use in preference dialogs.
- * They allow to select colors, fonts, files and directories.
+ * They allow to select colors, fonts, files, directories and applications.
 */

 #include <gtk/gtk.h>
@@ -18,14 +18,14 @@ do_pickers (GtkWidget *do_widget)
    gtk_window_set_screen (GTK_WINDOW (window),
                           gtk_widget_get_screen (do_widget));
    gtk_window_set_title (GTK_WINDOW (window), "Pickers");
-   
+
    g_signal_connect (window, "destroy",
                      G_CALLBACK (gtk_widget_destroyed),
                      &window);
-    
+
    gtk_container_set_border_width (GTK_CONTAINER (window), 10);

-    table = gtk_table_new (4, 2, FALSE);    
+    table = gtk_table_new (5, 2, FALSE);
    gtk_table_set_col_spacing (GTK_TABLE (table), 0, 10);
    gtk_table_set_row_spacings (GTK_TABLE (table), 3);
    gtk_container_add (GTK_CONTAINER (window), table);
@@ -46,17 +46,24 @@ do_pickers (GtkWidget *do_widget)

    label = gtk_label_new ("File:");
    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-    picker = gtk_file_chooser_button_new ("Pick a File", 
+    picker = gtk_file_chooser_button_new ("Pick a File",
                                          GTK_FILE_CHOOSER_ACTION_OPEN);
    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 2, 3);

    label = gtk_label_new ("Folder:");
    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-    picker = gtk_file_chooser_button_new ("Pick a Folder", 
+    picker = gtk_file_chooser_button_new ("Pick a Folder",
                                          GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 3, 4);
+
+    label = gtk_label_new ("Mail:");
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    picker = gtk_app_chooser_button_new ("x-scheme-handler/mailto");
+    gtk_app_chooser_button_set_show_dialog_item (GTK_APP_CHOOSER_BUTTON (picker), TRUE);
+    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 4, 5);
+    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 4, 5);
  }

  if (!gtk_widget_get_visible (window))
@@ -64,7 +71,7 @@ do_pickers (GtkWidget *do_widget)
      gtk_widget_show_all (window);
    }
  else
-    {    
+    {
      gtk_widget_destroy (window);
      window = NULL;
    }
--- a/demos/gtk-demo/pixbufs.c
+++ b/demos/gtk-demo/pixbufs.c
@@ -96,19 +96,12 @@ load_pixbufs (GError **error)

 /* Expose callback for the drawing area */
 static gint
-expose_cb (GtkWidget      *widget,
-           GdkEventExpose *event,
-           gpointer        data)
+draw_cb (GtkWidget *widget,
+         cairo_t   *cr,
+         gpointer   data)
 {
-  cairo_t *cr;
-
-  cr = gdk_cairo_create (event->window);
-
  gdk_cairo_set_source_pixbuf (cr, frame, 0, 0);
-  gdk_cairo_rectangle (cr, &event->area);
-  cairo_fill (cr);
-
-  cairo_destroy (cr);
+  cairo_paint (cr);

  return TRUE;
 }
@@ -193,7 +186,7 @@ timeout (gpointer data)
 static guint timeout_id;

 static void
-cleanup_callback (GtkObject *object,
+cleanup_callback (GObject   *object,
                  gpointer   data)
 {
  g_source_remove (timeout_id);
@@ -246,8 +239,8 @@ do_pixbufs (GtkWidget *do_widget)

          da = gtk_drawing_area_new ();

-          g_signal_connect (da, "expose-event",
-                            G_CALLBACK (expose_cb), NULL);
+          g_signal_connect (da, "draw",
+                            G_CALLBACK (draw_cb), NULL);

          gtk_container_add (GTK_CONTAINER (window), da);

--- a/demos/gtk-demo/rotated_text.c
+++ b/demos/gtk-demo/rotated_text.c
@@ -18,17 +18,17 @@ const char text[] = "I ♥ GTK+";

 static void
 fancy_shape_renderer (cairo_t        *cr,
-		      PangoAttrShape *attr,
-		      gboolean        do_path,
-		      gpointer        data)
+                      PangoAttrShape *attr,
+                      gboolean        do_path,
+                      gpointer        data)
 {
  double x, y;
  cairo_get_current_point (cr, &x, &y);
  cairo_translate (cr, x, y);

  cairo_scale (cr,
-	       (double) attr->ink_rect.width  / PANGO_SCALE,
-	       (double) attr->ink_rect.height / PANGO_SCALE);
+               (double) attr->ink_rect.width  / PANGO_SCALE,
+               (double) attr->ink_rect.height / PANGO_SCALE);

  switch (GPOINTER_TO_UINT (attr->data))
    {
@@ -36,9 +36,9 @@ fancy_shape_renderer (cairo_t        *cr,
      {
        cairo_move_to (cr, .5, .0);
        cairo_line_to (cr, .9, -.4);
-	cairo_curve_to (cr, 1.1, -.8, .5, -.9, .5, -.5);
-	cairo_curve_to (cr, .5, -.9, -.1, -.8, .1, -.4);
-	cairo_close_path (cr);
+        cairo_curve_to (cr, 1.1, -.8, .5, -.9, .5, -.5);
+        cairo_curve_to (cr, .5, -.9, -.1, -.8, .1, -.4);
+        cairo_close_path (cr);
      }
      break;
    }
@@ -60,8 +60,8 @@ create_fancy_attr_list_for_layout (PangoLayout *layout)

  /* Get font metrics and prepare fancy shape size */
  metrics = pango_context_get_metrics (pango_layout_get_context (layout),
-				       pango_layout_get_font_description (layout),
-				       NULL);
+                                       pango_layout_get_font_description (layout),
+                                       NULL);
  ascent = pango_font_metrics_get_ascent (metrics);
  logical_rect.x = 0;
  logical_rect.width = ascent;
@@ -77,9 +77,9 @@ create_fancy_attr_list_for_layout (PangoLayout *layout)
      PangoAttribute *attr;
      
      attr = pango_attr_shape_new_with_data (&ink_rect,
-					     &logical_rect,
-					     GUINT_TO_POINTER (g_utf8_get_char (p)),
-					     NULL, NULL);
+                                             &logical_rect,
+                                             GUINT_TO_POINTER (g_utf8_get_char (p)),
+                                             NULL, NULL);

      attr->start_index = p - text;
      attr->end_index = attr->start_index + strlen (HEART);
@@ -91,43 +91,36 @@ create_fancy_attr_list_for_layout (PangoLayout *layout)
 }

 static gboolean
-rotated_text_expose_event (GtkWidget      *widget,
-			   GdkEventExpose *event,
-			   gpointer	   data)
+rotated_text_draw (GtkWidget *widget,
+                   cairo_t   *cr,
+                   gpointer   data)
 {
 #define RADIUS 150
 #define N_WORDS 5
 #define FONT "Serif 18"

-  GtkAllocation allocation;
-
  PangoContext *context;
  PangoLayout *layout;
  PangoFontDescription *desc;

-  cairo_t *cr;
  cairo_pattern_t *pattern;

  PangoAttrList *attrs;

-  int width;
-  int height;
  double device_radius;
+  int width, height;
  int i;

-  gtk_widget_get_allocation (widget, &allocation);
-  width = allocation.width;
-  height = allocation.height;
-
  /* Create a cairo context and set up a transformation matrix so that the user
   * space coordinates for the centered square where we draw are [-RADIUS, RADIUS],
   * [-RADIUS, RADIUS].
   * We first center, then change the scale. */
-  cr = gdk_cairo_create (gtk_widget_get_window (widget));
+  width = gtk_widget_get_allocated_width (widget);
+  height = gtk_widget_get_allocated_height (widget);
  device_radius = MIN (width, height) / 2.;
  cairo_translate (cr,
-		   device_radius + (width - 2 * device_radius) / 2,
-		   device_radius + (height - 2 * device_radius) / 2);
+                   device_radius + (width - 2 * device_radius) / 2,
+                   device_radius + (height - 2 * device_radius) / 2);
  cairo_scale (cr, device_radius / RADIUS, device_radius / RADIUS);

  /* Create and a subtle gradient source and use it. */
@@ -139,8 +132,8 @@ rotated_text_expose_event (GtkWidget      *widget,
  /* Create a PangoContext and set up our shape renderer */
  context = gtk_widget_create_pango_context (widget);
  pango_cairo_context_set_shape_renderer (context,
-					  fancy_shape_renderer,
-					  NULL, NULL);
+                                          fancy_shape_renderer,
+                                          NULL, NULL);

  /* Create a PangoLayout, set the text, font, and attributes */
  layout = pango_layout_new (context);
@@ -173,7 +166,6 @@ rotated_text_expose_event (GtkWidget      *widget,
  g_object_unref (layout);
  g_object_unref (context);
  cairo_pattern_destroy (pattern);
-  cairo_destroy (cr);
  
  return FALSE;
 }
@@ -189,16 +181,17 @@ do_rotated_text (GtkWidget *do_widget)
      PangoLayout *layout;
      PangoAttrList *attrs;

-      const GdkColor white = { 0, 0xffff, 0xffff, 0xffff };
-      
+      const GdkRGBA white = { 1.0, 1.0, 1.0, 1.0 };
+
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
+                             gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Rotated Text");
      gtk_window_set_default_size (GTK_WINDOW (window), 4 * RADIUS, 2 * RADIUS);
      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);

-      box = gtk_hbox_new (TRUE, 0);
+      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+      gtk_box_set_homogeneous (GTK_BOX (box), TRUE);
      gtk_container_add (GTK_CONTAINER (window), box);

      /* Add a drawing area */
@@ -207,10 +200,10 @@ do_rotated_text (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (box), drawing_area);

      /* This overrides the background color from the theme */
-      gtk_widget_modify_bg (drawing_area, GTK_STATE_NORMAL, &white);
+      gtk_widget_override_background_color (drawing_area, 0, &white);

-      g_signal_connect (drawing_area, "expose-event",
-			G_CALLBACK (rotated_text_expose_event), NULL);
+      g_signal_connect (drawing_area, "draw",
+                        G_CALLBACK (rotated_text_draw), NULL);

      /* And a label */

@@ -222,8 +215,8 @@ do_rotated_text (GtkWidget *do_widget)
      /* Set up fancy stuff on the label */
      layout = gtk_label_get_layout (GTK_LABEL (label));
      pango_cairo_context_set_shape_renderer (pango_layout_get_context (layout),
-					      fancy_shape_renderer,
-					      NULL, NULL);
+                                              fancy_shape_renderer,
+                                              NULL, NULL);
      attrs = create_fancy_attr_list_for_layout (layout);
      gtk_label_set_attributes (GTK_LABEL (label), attrs);
      pango_attr_list_unref (attrs);
--- a/demos/gtk-demo/search_entry.c
+++ b/demos/gtk-demo/search_entry.c
@@ -93,6 +93,7 @@ search_by_name (GtkWidget *item,
                                   GTK_ENTRY_ICON_PRIMARY,
                                   "Search by name\n"
                                   "Click here to change the search type");
+  gtk_entry_set_placeholder_text (entry, "name");
 }

 static void
@@ -106,6 +107,7 @@ search_by_description (GtkWidget *item,
                                   GTK_ENTRY_ICON_PRIMARY,
                                   "Search by description\n"
                                   "Click here to change the search type");
+  gtk_entry_set_placeholder_text (entry, "description");
 }

 static void
@@ -119,6 +121,7 @@ search_by_file (GtkWidget *item,
                                   GTK_ENTRY_ICON_PRIMARY,
                                   "Search by file name\n"
                                   "Click here to change the search type");
+  gtk_entry_set_placeholder_text (entry, "file name");
 }

 GtkWidget *
@@ -246,6 +249,7 @@ do_search_entry (GtkWidget *do_widget)
  GtkWidget *hbox;
  GtkWidget *label;
  GtkWidget *entry;
+  GtkWidget *button;
  GtkWidget *find_button;
  GtkWidget *cancel_button;

@@ -266,7 +270,7 @@ do_search_entry (GtkWidget *do_widget)

      content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));

-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
      gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);

@@ -274,7 +278,7 @@ do_search_entry (GtkWidget *do_widget)
      gtk_label_set_markup (GTK_LABEL (label), "Search entry demo");
      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);

-      hbox = gtk_hbox_new (FALSE, 10);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
      gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);

@@ -323,6 +327,10 @@ do_search_entry (GtkWidget *do_widget)
      /* add accessible alternatives for icon functionality */
      g_signal_connect (entry, "populate-popup",
                        G_CALLBACK (entry_populate_popup), NULL);
+
+      /* Give the focus to the close button */
+      button = gtk_dialog_get_widget_for_response (GTK_DIALOG (window), GTK_RESPONSE_NONE);
+      gtk_widget_grab_focus (button);
    }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/sizegroup.c
+++ b/demos/gtk-demo/sizegroup.c
@@ -25,10 +25,10 @@ create_combo_box (const char **strings)
  GtkWidget *combo_box;
  const char **str;

-  combo_box = gtk_combo_box_new_text ();
+  combo_box = gtk_combo_box_text_new ();
  
  for (str = strings; *str; str++)
-    gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), *str);
+    gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), *str);

  gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 0);

@@ -118,7 +118,7 @@ do_sizegroup (GtkWidget *do_widget)

      content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));

-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
      gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);

--- a/demos/gtk-demo/spinner.c
+++ b/demos/gtk-demo/spinner.c
@@ -50,12 +50,12 @@ do_spinner (GtkWidget *do_widget)

    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));

-    vbox = gtk_vbox_new (FALSE, 5);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
    gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);

    /* Sensitive */
-    hbox = gtk_hbox_new (FALSE, 5);
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
    spinner = gtk_spinner_new ();
    gtk_container_add (GTK_CONTAINER (hbox), spinner);
    gtk_container_add (GTK_CONTAINER (hbox), gtk_entry_new ());
@@ -63,7 +63,7 @@ do_spinner (GtkWidget *do_widget)
    spinner_sensitive = spinner;

    /* Disabled */
-    hbox = gtk_hbox_new (FALSE, 5);
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
    spinner = gtk_spinner_new ();
    gtk_container_add (GTK_CONTAINER (hbox), spinner);
    gtk_container_add (GTK_CONTAINER (hbox), gtk_entry_new ());
--- a/demos/gtk-demo/stock_browser.c
+++ b/demos/gtk-demo/stock_browser.c
@@ -166,9 +166,9 @@ create_model (void)
            }
          g_free (sizes);
          
-          info.small_icon = gtk_widget_render_icon (window, info.id,
-                                                    size,
-                                                    NULL);
+          info.small_icon = gtk_widget_render_icon_pixbuf (window, 
+                                                           info.id,
+                                                           size);
          
          if (size != GTK_ICON_SIZE_MENU)
            {
@@ -417,7 +417,7 @@ do_stock_browser (GtkWidget *do_widget)
      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

-      hbox = gtk_hbox_new (FALSE, 8);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
      gtk_container_add (GTK_CONTAINER (window), hbox);

      sw = gtk_scrolled_window_new (NULL, NULL);
@@ -486,7 +486,7 @@ do_stock_browser (GtkWidget *do_widget)
      frame = gtk_frame_new ("Selected Item");
      gtk_container_add (GTK_CONTAINER (align), frame);

-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
      gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
      gtk_container_add (GTK_CONTAINER (frame), vbox);

--- a/demos/gtk-demo/textscroll.c
+++ b/demos/gtk-demo/textscroll.c
@@ -184,7 +184,8 @@ do_textscroll (GtkWidget *do_widget)
 			G_CALLBACK (gtk_widget_destroyed), &window);
      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
      
-      hbox = gtk_hbox_new (TRUE, 6);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+      gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
      gtk_container_add (GTK_CONTAINER (window), hbox);

      create_text_view (hbox, TRUE);
--- a/demos/gtk-demo/textview.c
+++ b/demos/gtk-demo/textview.c
@@ -30,99 +30,99 @@ create_tags (GtkTextBuffer *buffer)
   * new copies of the same tags for every buffer.
   *
   * Tags are assigned default priorities in order of addition to the
-   * tag table.	 That is, tags created later that affect the same text
+   * tag table.  That is, tags created later that affect the same text
   * property affected by an earlier tag will override the earlier
   * tag.  You can modify tag priorities with
   * gtk_text_tag_set_priority().
   */

  gtk_text_buffer_create_tag (buffer, "heading",
-			      "weight", PANGO_WEIGHT_BOLD,
-			      "size", 15 * PANGO_SCALE,
-			      NULL);
-  
+                              "weight", PANGO_WEIGHT_BOLD,
+                              "size", 15 * PANGO_SCALE,
+                              NULL);
+
  gtk_text_buffer_create_tag (buffer, "italic",
-			      "style", PANGO_STYLE_ITALIC, NULL);
+                              "style", PANGO_STYLE_ITALIC, NULL);

  gtk_text_buffer_create_tag (buffer, "bold",
-			      "weight", PANGO_WEIGHT_BOLD, NULL);  
-  
+                              "weight", PANGO_WEIGHT_BOLD, NULL);
+
  gtk_text_buffer_create_tag (buffer, "big",
-			      /* points times the PANGO_SCALE factor */
-			      "size", 20 * PANGO_SCALE, NULL);
+                              /* points times the PANGO_SCALE factor */
+                              "size", 20 * PANGO_SCALE, NULL);

  gtk_text_buffer_create_tag (buffer, "xx-small",
-			      "scale", PANGO_SCALE_XX_SMALL, NULL);
+                              "scale", PANGO_SCALE_XX_SMALL, NULL);

  gtk_text_buffer_create_tag (buffer, "x-large",
-			      "scale", PANGO_SCALE_X_LARGE, NULL);
-  
+                              "scale", PANGO_SCALE_X_LARGE, NULL);
+
  gtk_text_buffer_create_tag (buffer, "monospace",
-			      "family", "monospace", NULL);
-  
+                              "family", "monospace", NULL);
+
  gtk_text_buffer_create_tag (buffer, "blue_foreground",
-			      "foreground", "blue", NULL);  
+                              "foreground", "blue", NULL);

  gtk_text_buffer_create_tag (buffer, "red_background",
-			      "background", "red", NULL);
+                              "background", "red", NULL);

  gtk_text_buffer_create_tag (buffer, "big_gap_before_line",
-			      "pixels_above_lines", 30, NULL);
+                              "pixels_above_lines", 30, NULL);

  gtk_text_buffer_create_tag (buffer, "big_gap_after_line",
-			      "pixels_below_lines", 30, NULL);
+                              "pixels_below_lines", 30, NULL);

  gtk_text_buffer_create_tag (buffer, "double_spaced_line",
-			      "pixels_inside_wrap", 10, NULL);
+                              "pixels_inside_wrap", 10, NULL);

  gtk_text_buffer_create_tag (buffer, "not_editable",
-			      "editable", FALSE, NULL);
-  
+                              "editable", FALSE, NULL);
+
  gtk_text_buffer_create_tag (buffer, "word_wrap",
-			      "wrap_mode", GTK_WRAP_WORD, NULL);
+                              "wrap_mode", GTK_WRAP_WORD, NULL);

  gtk_text_buffer_create_tag (buffer, "char_wrap",
-			      "wrap_mode", GTK_WRAP_CHAR, NULL);
+                              "wrap_mode", GTK_WRAP_CHAR, NULL);

  gtk_text_buffer_create_tag (buffer, "no_wrap",
-			      "wrap_mode", GTK_WRAP_NONE, NULL);
-  
+                              "wrap_mode", GTK_WRAP_NONE, NULL);
+
  gtk_text_buffer_create_tag (buffer, "center",
-			      "justification", GTK_JUSTIFY_CENTER, NULL);
+                              "justification", GTK_JUSTIFY_CENTER, NULL);

  gtk_text_buffer_create_tag (buffer, "right_justify",
-			      "justification", GTK_JUSTIFY_RIGHT, NULL);
+                              "justification", GTK_JUSTIFY_RIGHT, NULL);

  gtk_text_buffer_create_tag (buffer, "wide_margins",
-			      "left_margin", 50, "right_margin", 50,
-			      NULL);
-  
+                              "left_margin", 50, "right_margin", 50,
+                              NULL);
+
  gtk_text_buffer_create_tag (buffer, "strikethrough",
-			      "strikethrough", TRUE, NULL);
-  
+                              "strikethrough", TRUE, NULL);
+
  gtk_text_buffer_create_tag (buffer, "underline",
-			      "underline", PANGO_UNDERLINE_SINGLE, NULL);
+                              "underline", PANGO_UNDERLINE_SINGLE, NULL);

  gtk_text_buffer_create_tag (buffer, "double_underline",
-			      "underline", PANGO_UNDERLINE_DOUBLE, NULL);
+                              "underline", PANGO_UNDERLINE_DOUBLE, NULL);

  gtk_text_buffer_create_tag (buffer, "superscript",
-			      "rise", 10 * PANGO_SCALE,	  /* 10 pixels */
-			      "size", 8 * PANGO_SCALE,	  /* 8 points */
-			      NULL);
-  
+                              "rise", 10 * PANGO_SCALE,   /* 10 pixels */
+                              "size", 8 * PANGO_SCALE,    /* 8 points */
+                              NULL);
+
  gtk_text_buffer_create_tag (buffer, "subscript",
-			      "rise", -10 * PANGO_SCALE,   /* 10 pixels */
-			      "size", 8 * PANGO_SCALE,	   /* 8 points */
-			      NULL);
+                              "rise", -10 * PANGO_SCALE,   /* 10 pixels */
+                              "size", 8 * PANGO_SCALE,     /* 8 points */
+                              NULL);

  gtk_text_buffer_create_tag (buffer, "rtl_quote",
-			      "wrap_mode", GTK_WRAP_WORD,
-			      "direction", GTK_TEXT_DIR_RTL,
-			      "indent", 30,
-			      "left_margin", 20,
-			      "right_margin", 20,
-			      NULL);
+                              "wrap_mode", GTK_WRAP_WORD,
+                              "direction", GTK_TEXT_DIR_RTL,
+                              "indent", 30,
+                              "left_margin", 20,
+                              "right_margin", 20,
+                              NULL);
 }

 static void
@@ -132,7 +132,6 @@ insert_text (GtkTextBuffer *buffer)
  GtkTextIter start, end;
  GdkPixbuf *pixbuf;
  GdkPixbuf *scaled;
-  GtkTextChildAnchor *anchor;
  char *filename;

  /* demo_find_file() looks in the current directory first,
@@ -156,90 +155,99 @@ insert_text (GtkTextBuffer *buffer)
  scaled = gdk_pixbuf_scale_simple (pixbuf, 32, 32, GDK_INTERP_BILINEAR);
  g_object_unref (pixbuf);
  pixbuf = scaled;
-  
+
  /* get start of buffer; each insertion will revalidate the
   * iterator to point to just after the inserted text.
   */
  gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);

-  gtk_text_buffer_insert (buffer, &iter, "The text widget can display text with all kinds of nifty attributes. It also supports multiple views of the same buffer; this demo is showing the same buffer in two places.\n\n", -1);
+  gtk_text_buffer_insert (buffer, &iter,
+      "The text widget can display text with all kinds of nifty attributes. "
+      "It also supports multiple views of the same buffer; this demo is "
+      "showing the same buffer in two places.\n\n", -1);
+
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+                                            "Font styles. ", -1,
+                                            "heading", NULL);

-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Font styles. ", -1,
-					    "heading", NULL);
-  
  gtk_text_buffer_insert (buffer, &iter, "For example, you can have ", -1);
  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "italic", -1,
-					    "italic", NULL);
-  gtk_text_buffer_insert (buffer, &iter, ", ", -1);  
+                                            "italic", -1,
+                                            "italic", NULL);
+  gtk_text_buffer_insert (buffer, &iter, ", ", -1);
  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "bold", -1,
-					    "bold", NULL);
+                                            "bold", -1,
+                                            "bold", NULL);
  gtk_text_buffer_insert (buffer, &iter, ", or ", -1);
  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "monospace (typewriter)", -1,
-					    "monospace", NULL);
+                                            "monospace (typewriter)", -1,
+                                            "monospace", NULL);
  gtk_text_buffer_insert (buffer, &iter, ", or ", -1);
  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "big", -1,
-					    "big", NULL);
+                                            "big", -1,
+                                            "big", NULL);
  gtk_text_buffer_insert (buffer, &iter, " text. ", -1);
-  gtk_text_buffer_insert (buffer, &iter, "It's best not to hardcode specific text sizes; you can use relative sizes as with CSS, such as ", -1);
+  gtk_text_buffer_insert (buffer, &iter,
+      "It's best not to hardcode specific text sizes; you can use relative "
+      "sizes as with CSS, such as ", -1);
  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "xx-small", -1,
-					    "xx-small", NULL);
+                                            "xx-small", -1,
+                                            "xx-small", NULL);
  gtk_text_buffer_insert (buffer, &iter, " or ", -1);
  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "x-large", -1,
-					    "x-large", NULL);
-  gtk_text_buffer_insert (buffer, &iter, " to ensure that your program properly adapts if the user changes the default font size.\n\n", -1);
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Colors. ", -1,
-					    "heading", NULL);
-  
-  gtk_text_buffer_insert (buffer, &iter, "Colors such as ", -1);  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "a blue foreground", -1,
-					    "blue_foreground", NULL);
-  gtk_text_buffer_insert (buffer, &iter, " or ", -1);  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "a red background", -1,
-					    "red_background", NULL);
-  gtk_text_buffer_insert (buffer, &iter, " or even ", -1);  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "a blue foreground on red background", -1,
-					    "blue_foreground",
-					    "red_background",
-					    NULL);
-  gtk_text_buffer_insert (buffer, &iter, " (select that to read it) can be used.\n\n", -1);  
+                                            "x-large", -1,
+                                            "x-large", NULL);
+  gtk_text_buffer_insert (buffer, &iter,
+      " to ensure that your program properly adapts if the user changes the "
+      "default font size.\n\n", -1);

-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Underline, strikethrough, and rise. ", -1,
-					    "heading", NULL);
-  
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Colors. ", -1,
+                                            "heading", NULL);
+
+  gtk_text_buffer_insert (buffer, &iter, "Colors such as ", -1);
  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "Strikethrough", -1,
-					    "strikethrough", NULL);
+                                            "a blue foreground", -1,
+                                            "blue_foreground", NULL);
+  gtk_text_buffer_insert (buffer, &iter, " or ", -1);
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+                                            "a red background", -1,
+                                            "red_background", NULL);
+  gtk_text_buffer_insert (buffer, &iter, " or even ", -1);
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+                                            "a blue foreground on red background", -1,
+                                            "blue_foreground",
+                                            "red_background",
+                                            NULL);
+  gtk_text_buffer_insert (buffer, &iter, " (select that to read it) can be used.\n\n", -1);
+
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+                                            "Underline, strikethrough, and rise. ", -1,
+                                            "heading", NULL);
+
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+                                            "Strikethrough", -1,
+                                            "strikethrough", NULL);
  gtk_text_buffer_insert (buffer, &iter, ", ", -1);
  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "underline", -1,
-					    "underline", NULL);
+                                            "underline", -1,
+                                            "underline", NULL);
  gtk_text_buffer_insert (buffer, &iter, ", ", -1);
  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "double underline", -1, 
-					    "double_underline", NULL);
+                                            "double underline", -1,
+                                            "double_underline", NULL);
  gtk_text_buffer_insert (buffer, &iter, ", ", -1);
  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "superscript", -1,
-					    "superscript", NULL);
+                                            "superscript", -1,
+                                            "superscript", NULL);
  gtk_text_buffer_insert (buffer, &iter, ", and ", -1);
  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "subscript", -1,
-					    "subscript", NULL);
+                                            "subscript", -1,
+                                            "subscript", NULL);
  gtk_text_buffer_insert (buffer, &iter, " are all supported.\n\n", -1);

  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Images. ", -1,
-					    "heading", NULL);
-  
+                                            "heading", NULL);
+
  gtk_text_buffer_insert (buffer, &iter, "The buffer can have images in it: ", -1);
  gtk_text_buffer_insert_pixbuf (buffer, &iter, pixbuf);
  gtk_text_buffer_insert_pixbuf (buffer, &iter, pixbuf);
@@ -247,82 +255,142 @@ insert_text (GtkTextBuffer *buffer)
  gtk_text_buffer_insert (buffer, &iter, " for example.\n\n", -1);

  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Spacing. ", -1,
-					    "heading", NULL);
-
-  gtk_text_buffer_insert (buffer, &iter, "You can adjust the amount of space before each line.\n", -1);
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "This line has a whole lot of space before it.\n", -1,
-					    "big_gap_before_line", "wide_margins", NULL);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "You can also adjust the amount of space after each line; this line has a whole lot of space after it.\n", -1,
-					    "big_gap_after_line", "wide_margins", NULL);
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "You can also adjust the amount of space between wrapped lines; this line has extra space between each wrapped line in the same paragraph. To show off wrapping, some filler text: the quick brown fox jumped over the lazy dog. Blah blah blah blah blah blah blah blah blah.\n", -1,
-					    "double_spaced_line", "wide_margins", NULL);
-
-  gtk_text_buffer_insert (buffer, &iter, "Also note that those lines have extra-wide margins.\n\n", -1);
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Editability. ", -1,
-					    "heading", NULL);
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "This line is 'locked down' and can't be edited by the user - just try it! You can't delete this line.\n\n", -1,
-					    "not_editable", NULL);
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Wrapping. ", -1,
-					    "heading", NULL);
+                                            "heading", NULL);

  gtk_text_buffer_insert (buffer, &iter,
-			  "This line (and most of the others in this buffer) is word-wrapped, using the proper Unicode algorithm. Word wrap should work in all scripts and languages that GTK+ supports. Let's make this a long paragraph to demonstrate: blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah\n\n", -1);  
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "This line has character-based wrapping, and can wrap between any two character glyphs. Let's make this a long paragraph to demonstrate: blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah\n\n", -1,
-					    "char_wrap", NULL);
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "This line has all wrapping turned off, so it makes the horizontal scrollbar appear.\n\n\n", -1,
-					    "no_wrap", NULL);
-
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Justification. ", -1,
-					    "heading", NULL);  
-  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "\nThis line has center justification.\n", -1,
-					    "center", NULL);
+      "You can adjust the amount of space before each line.\n", -1);

  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "This line has right justification.\n", -1,
-					    "right_justify", NULL);
+      "This line has a whole lot of space before it.\n", -1,
+      "big_gap_before_line", "wide_margins", NULL);
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+      "You can also adjust the amount of space after each line; "
+      "this line has a whole lot of space after it.\n", -1,
+      "big_gap_after_line", "wide_margins", NULL);

  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "\nThis line has big wide margins. Text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text.\n", -1,
-					    "wide_margins", NULL);  
+      "You can also adjust the amount of space between wrapped lines; "
+      "this line has extra space between each wrapped line in the same "
+      "paragraph. To show off wrapping, some filler text: the quick "
+      "brown fox jumped over the lazy dog. Blah blah blah blah blah "
+      "blah blah blah blah.\n", -1,
+      "double_spaced_line", "wide_margins", NULL);

-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Internationalization. ", -1,
-					    "heading", NULL);
-	  
  gtk_text_buffer_insert (buffer, &iter,
-			  "You can put all sorts of Unicode text in the buffer.\n\nGerman (Deutsch S\303\274d) Gr\303\274\303\237 Gott\nGreek (\316\225\316\273\316\273\316\267\316\275\316\271\316\272\316\254) \316\223\316\265\316\271\316\254 \317\203\316\261\317\202\nHebrew	\327\251\327\234\327\225\327\235\nJapanese (\346\227\245\346\234\254\350\252\236)\n\nThe widget properly handles bidirectional text, word wrapping, DOS/UNIX/Unicode paragraph separators, grapheme boundaries, and so on using the Pango internationalization framework.\n", -1);  
+      "Also note that those lines have extra-wide margins.\n\n", -1);

-  gtk_text_buffer_insert (buffer, &iter, "Here's a word-wrapped quote in a right-to-left language:\n", -1);
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "\331\210\331\202\330\257 \330\250\330\257\330\243 \330\253\331\204\330\247\330\253 \331\205\331\206 \330\243\331\203\330\253\330\261 \330\247\331\204\331\205\330\244\330\263\330\263\330\247\330\252 \330\252\331\202\330\257\331\205\330\247 \331\201\331\212 \330\264\330\250\331\203\330\251 \330\247\331\203\330\263\331\212\331\210\331\206 \330\250\330\261\330\247\331\205\330\254\331\207\330\247 \331\203\331\205\331\206\330\270\331\205\330\247\330\252 \331\204\330\247 \330\252\330\263\330\271\331\211 \331\204\331\204\330\261\330\250\330\255\330\214 \330\253\331\205 \330\252\330\255\331\210\331\204\330\252 \331\201\331\212 \330\247\331\204\330\263\331\206\331\210\330\247\330\252 \330\247\331\204\330\256\331\205\330\263 \330\247\331\204\331\205\330\247\330\266\331\212\330\251 \330\245\331\204\331\211 \331\205\330\244\330\263\330\263\330\247\330\252 \331\205\330\247\331\204\331\212\330\251 \331\205\331\206\330\270\331\205\330\251\330\214 \331\210\330\250\330\247\330\252\330\252 \330\254\330\262\330\241\330\247 \331\205\331\206 \330\247\331\204\331\206\330\270\330\247\331\205 \330\247\331\204\331\205\330\247\331\204\331\212 \331\201\331\212 \330\250\331\204\330\257\330\247\331\206\331\207\330\247\330\214 \331\210\331\204\331\203\331\206\331\207\330\247 \330\252\330\252\330\256\330\265\330\265 \331\201\331\212 \330\256\330\257\331\205\330\251 \331\202\330\267\330\247\330\271 \330\247\331\204\331\205\330\264\330\261\331\210\330\271\330\247\330\252 \330\247\331\204\330\265\330\272\331\212\330\261\330\251. \331\210\330\243\330\255\330\257 \330\243\331\203\330\253\330\261 \331\207\330\260\331\207 \330\247\331\204\331\205\330\244\330\263\330\263\330\247\330\252 \331\206\330\254\330\247\330\255\330\247 \331\207\331\210 \302\273\330\250\330\247\331\206\331\203\331\210\330\263\331\210\331\204\302\253 \331\201\331\212 \330\250\331\210\331\204\331\212\331\201\331\212\330\247.\n\n", -1,
-						"rtl_quote", NULL);
-      
-  gtk_text_buffer_insert (buffer, &iter, "You can put widgets in the buffer: Here's a button: ", -1);
-  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+                                            "Editability. ", -1,
+                                            "heading", NULL);
+
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+      "This line is 'locked down' and can't be edited by the user - just "
+      "try it! You can't delete this line.\n\n", -1,
+      "not_editable", NULL);
+
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+                                            "Wrapping. ", -1,
+                                            "heading", NULL);
+
+  gtk_text_buffer_insert (buffer, &iter,
+      "This line (and most of the others in this buffer) is word-wrapped, "
+      "using the proper Unicode algorithm. Word wrap should work in all "
+      "scripts and languages that GTK+ supports. Let's make this a long "
+      "paragraph to demonstrate: blah blah blah blah blah blah blah blah "
+      "blah blah blah blah blah blah blah blah blah blah blah\n\n", -1);
+
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+      "This line has character-based wrapping, and can wrap between any two "
+      "character glyphs. Let's make this a long paragraph to demonstrate: "
+      "blah blah blah blah blah blah blah blah blah blah blah blah blah blah "
+      "blah blah blah blah blah\n\n", -1, "char_wrap", NULL);
+
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+      "This line has all wrapping turned off, so it makes the horizontal "
+      "scrollbar appear.\n\n\n", -1, "no_wrap", NULL);
+
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+                                            "Justification. ", -1,
+                                            "heading", NULL);
+
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+                                            "\nThis line has center justification.\n", -1,
+                                            "center", NULL);
+
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+                                            "This line has right justification.\n", -1,
+                                            "right_justify", NULL);
+
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+      "\nThis line has big wide margins. Text text text text text text text "
+      "text text text text text text text text text text text text text text "
+      "text text text text text text text text text text text text text text "
+      "text.\n", -1, "wide_margins", NULL);
+
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+                                            "Internationalization. ", -1,
+                                            "heading", NULL);
+
+  gtk_text_buffer_insert (buffer, &iter,
+      "You can put all sorts of Unicode text in the buffer.\n\nGerman "
+      "(Deutsch S\303\274d) Gr\303\274\303\237 Gott\nGreek "
+      "(\316\225\316\273\316\273\316\267\316\275\316\271\316\272\316\254) "
+      "\316\223\316\265\316\271\316\254 \317\203\316\261\317\202\nHebrew      "
+      "\327\251\327\234\327\225\327\235\nJapanese "
+      "(\346\227\245\346\234\254\350\252\236)\n\nThe widget properly handles "
+      "bidirectional text, word wrapping, DOS/UNIX/Unicode paragraph separators, "
+      "grapheme boundaries, and so on using the Pango internationalization "
+      "framework.\n", -1);
+
+  gtk_text_buffer_insert (buffer, &iter,
+      "Here's a word-wrapped quote in a right-to-left language:\n", -1);
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+      "\331\210\331\202\330\257 \330\250\330\257\330\243 "
+      "\330\253\331\204\330\247\330\253 \331\205\331\206 "
+      "\330\243\331\203\330\253\330\261 \330\247\331\204\331\205\330\244\330\263\330\263\330\247\330\252 "
+      "\330\252\331\202\330\257\331\205\330\247 \331\201\331\212 "
+      "\330\264\330\250\331\203\330\251 \330\247\331\203\330\263\331\212\331\210\331\206 "
+      "\330\250\330\261\330\247\331\205\330\254\331\207\330\247 "
+      "\331\203\331\205\331\206\330\270\331\205\330\247\330\252 "
+      "\331\204\330\247 \330\252\330\263\330\271\331\211 \331\204\331\204\330\261\330\250\330\255\330\214 "
+      "\330\253\331\205 \330\252\330\255\331\210\331\204\330\252 "
+      "\331\201\331\212 \330\247\331\204\330\263\331\206\331\210\330\247\330\252 "
+      "\330\247\331\204\330\256\331\205\330\263 \330\247\331\204\331\205\330\247\330\266\331\212\330\251 "
+      "\330\245\331\204\331\211 \331\205\330\244\330\263\330\263\330\247\330\252 "
+      "\331\205\330\247\331\204\331\212\330\251 \331\205\331\206\330\270\331\205\330\251\330\214 "
+      "\331\210\330\250\330\247\330\252\330\252 \330\254\330\262\330\241\330\247 "
+      "\331\205\331\206 \330\247\331\204\331\206\330\270\330\247\331\205 "
+      "\330\247\331\204\331\205\330\247\331\204\331\212 \331\201\331\212 "
+      "\330\250\331\204\330\257\330\247\331\206\331\207\330\247\330\214 "
+      "\331\210\331\204\331\203\331\206\331\207\330\247 \330\252\330\252\330\256\330\265\330\265 "
+      "\331\201\331\212 \330\256\330\257\331\205\330\251 \331\202\330\267\330\247\330\271 "
+      "\330\247\331\204\331\205\330\264\330\261\331\210\330\271\330\247\330\252 "
+      "\330\247\331\204\330\265\330\272\331\212\330\261\330\251. \331\210\330\243\330\255\330\257 "
+      "\330\243\331\203\330\253\330\261 \331\207\330\260\331\207 "
+      "\330\247\331\204\331\205\330\244\330\263\330\263\330\247\330\252 "
+      "\331\206\330\254\330\247\330\255\330\247 \331\207\331\210 "
+      "\302\273\330\250\330\247\331\206\331\203\331\210\330\263\331\210\331\204\302\253 "
+      "\331\201\331\212 \330\250\331\210\331\204\331\212\331\201\331\212\330\247.\n\n", -1,
+                                                "rtl_quote", NULL);
+
+  gtk_text_buffer_insert (buffer, &iter,
+                          "You can put widgets in the buffer: Here's a button: ", -1);
+  gtk_text_buffer_create_child_anchor (buffer, &iter);
  gtk_text_buffer_insert (buffer, &iter, " and a menu: ", -1);
-  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
+  gtk_text_buffer_create_child_anchor (buffer, &iter);
  gtk_text_buffer_insert (buffer, &iter, " and a scale: ", -1);
-  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
+  gtk_text_buffer_create_child_anchor (buffer, &iter);
  gtk_text_buffer_insert (buffer, &iter, " and an animation: ", -1);
-  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
+  gtk_text_buffer_create_child_anchor (buffer, &iter);
  gtk_text_buffer_insert (buffer, &iter, " finally a text entry: ", -1);
-  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
+  gtk_text_buffer_create_child_anchor (buffer, &iter);
  gtk_text_buffer_insert (buffer, &iter, ".\n", -1);
-  
-  gtk_text_buffer_insert (buffer, &iter, "\n\nThis demo doesn't demonstrate all the GtkTextBuffer features; it leaves out, for example: invisible/hidden text, tab stops, application-drawn areas on the sides of the widget for displaying breakpoints and such...", -1);
+
+  gtk_text_buffer_insert (buffer, &iter,
+      "\n\nThis demo doesn't demonstrate all the GtkTextBuffer features; "
+      "it leaves out, for example: invisible/hidden text, tab stops, "
+      "application-drawn areas on the sides of the widget for displaying "
+      "breakpoints and such...", -1);

  /* Apply word_wrap tag to whole buffer */
  gtk_text_buffer_get_bounds (buffer, &start, &end);
@@ -348,7 +416,7 @@ attach_widgets (GtkTextView *text_view)
  GtkTextIter iter;
  GtkTextBuffer *buffer;
  int i;
-  
+
  buffer = gtk_text_view_get_buffer (text_view);

  gtk_text_buffer_get_start_iter (buffer, &iter);
@@ -358,7 +426,7 @@ attach_widgets (GtkTextView *text_view)
    {
      GtkTextChildAnchor *anchor;
      GtkWidget *widget;
-      
+
      anchor = gtk_text_iter_get_child_anchor (&iter);

      if (i == 0)
@@ -371,23 +439,23 @@ attach_widgets (GtkTextView *text_view)
        }
      else if (i == 1)
        {
-          widget = gtk_combo_box_new_text ();
+          widget = gtk_combo_box_text_new ();

-          gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Option 1");
-          gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Option 2");
-          gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Option 3");
+          gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Option 1");
+          gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Option 2");
+          gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Option 3");
        }
      else if (i == 2)
        {
-          widget = gtk_hscale_new (NULL);
+          widget = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, NULL);
          gtk_range_set_range (GTK_RANGE (widget), 0, 100);
          gtk_widget_set_size_request (widget, 70, -1);
        }
      else if (i == 3)
        {
-	  gchar *filename = demo_find_file ("floppybuddy.gif", NULL);
-	  widget = gtk_image_new_from_file (filename);
-	  g_free (filename);
+          gchar *filename = demo_find_file ("floppybuddy.gif", NULL);
+          widget = gtk_image_new_from_file (filename);
+          g_free (filename);
        }
      else if (i == 4)
        {
@@ -421,20 +489,20 @@ do_textview (GtkWidget *do_widget)
      GtkWidget *view2;
      GtkWidget *sw;
      GtkTextBuffer *buffer;
-      
+
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
+                             gtk_widget_get_screen (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window),
-				   450, 450);
-      
+                                   450, 450);
+
      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      gtk_window_set_title (GTK_WINDOW (window), "TextView");
      gtk_container_set_border_width (GTK_CONTAINER (window), 0);

-      vpaned = gtk_vpaned_new ();
+      vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
      gtk_container_set_border_width (GTK_CONTAINER(vpaned), 5);
      gtk_container_add (GTK_CONTAINER (window), vpaned);

@@ -446,19 +514,19 @@ do_textview (GtkWidget *do_widget)
      view1 = gtk_text_view_new ();
      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view1));
      view2 = gtk_text_view_new_with_buffer (buffer);
-      
+
      sw = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-				      GTK_POLICY_AUTOMATIC,
-				      GTK_POLICY_AUTOMATIC);
+                                      GTK_POLICY_AUTOMATIC,
+                                      GTK_POLICY_AUTOMATIC);
      gtk_paned_add1 (GTK_PANED (vpaned), sw);

      gtk_container_add (GTK_CONTAINER (sw), view1);

      sw = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-				      GTK_POLICY_AUTOMATIC,
-				      GTK_POLICY_AUTOMATIC);
+                                      GTK_POLICY_AUTOMATIC,
+                                      GTK_POLICY_AUTOMATIC);
      gtk_paned_add2 (GTK_PANED (vpaned), sw);

      gtk_container_add (GTK_CONTAINER (sw), view2);
@@ -468,7 +536,7 @@ do_textview (GtkWidget *do_widget)

      attach_widgets (GTK_TEXT_VIEW (view1));
      attach_widgets (GTK_TEXT_VIEW (view2));
-      
+
      gtk_widget_show_all (vpaned);
    }

@@ -492,25 +560,25 @@ recursive_attach_view (int                 depth,
 {
  GtkWidget *child_view;
  GtkWidget *event_box;
-  GdkColor color;
+  GdkRGBA color;
  GtkWidget *align;
-  
+
  if (depth > 4)
    return;
-  
+
  child_view = gtk_text_view_new_with_buffer (gtk_text_view_get_buffer (view));

  /* Event box is to add a black border around each child view */
  event_box = gtk_event_box_new ();
-  gdk_color_parse ("black", &color);
-  gtk_widget_modify_bg (event_box, GTK_STATE_NORMAL, &color);
+  gdk_rgba_parse (&color, "black");
+  gtk_widget_override_background_color (event_box, 0, &color);

  align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
  gtk_container_set_border_width (GTK_CONTAINER (align), 1);
-  
+
  gtk_container_add (GTK_CONTAINER (event_box), align);
  gtk_container_add (GTK_CONTAINER (align), child_view);
-  
+
  gtk_text_view_add_child_at_anchor (view, event_box, anchor);

  recursive_attach_view (depth + 1, GTK_TEXT_VIEW (child_view), anchor);
@@ -533,21 +601,21 @@ easter_egg_callback (GtkWidget *button,
      gtk_window_present (GTK_WINDOW (window));
      return;
    }
-  
+
  buffer = gtk_text_buffer_new (NULL);

  gtk_text_buffer_get_start_iter (buffer, &iter);

  gtk_text_buffer_insert (buffer, &iter,
-                          "This buffer is shared by a set of nested text views.\n Nested view:\n", -1);
+      "This buffer is shared by a set of nested text views.\n Nested view:\n", -1);
  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
  gtk_text_buffer_insert (buffer, &iter,
                          "\nDon't do this in real applications, please.\n", -1);

  view = gtk_text_view_new_with_buffer (buffer);
-  
+
  recursive_attach_view (0, GTK_TEXT_VIEW (view), anchor);
-  
+
  g_object_unref (buffer);

  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -563,7 +631,7 @@ easter_egg_callback (GtkWidget *button,
  g_object_add_weak_pointer (G_OBJECT (window), window_ptr);

  gtk_window_set_default_size (GTK_WINDOW (window), 300, 400);
-  
+
  gtk_widget_show_all (window);
 }

--- a/demos/gtk-demo/toolpalette.c
+++ b/demos/gtk-demo/toolpalette.c
@@ -41,7 +41,7 @@ canvas_item_new (GtkWidget     *widget,
  GdkPixbuf *pixbuf;

  stock_id = gtk_tool_button_get_stock_id (button);
-  pixbuf = gtk_widget_render_icon (widget, stock_id, GTK_ICON_SIZE_DIALOG, NULL);
+  pixbuf = gtk_widget_render_icon_pixbuf (widget, stock_id, GTK_ICON_SIZE_DIALOG);

  if (pixbuf)
    {
@@ -81,22 +81,13 @@ canvas_item_draw (const CanvasItem *item,
 }

 static gboolean
-canvas_expose_event (GtkWidget      *widget,
-                     GdkEventExpose *event)
+canvas_draw (GtkWidget *widget,
+             cairo_t   *cr)
 {
-  GtkAllocation allocation;
-  cairo_t *cr;
  GList *iter;

-  cr = gdk_cairo_create (gtk_widget_get_window (widget));
-  gdk_cairo_region (cr, event->region);
-  cairo_clip (cr);
-
-  gtk_widget_get_allocation (widget, &allocation);
-
  cairo_set_source_rgb (cr, 1, 1, 1);
-  cairo_rectangle (cr, 0, 0, allocation.width, allocation.height);
-  cairo_fill (cr);
+  cairo_paint (cr);

  for (iter = canvas_items; iter; iter = iter->next)
    canvas_item_draw (iter->data, cr, FALSE);
@@ -104,8 +95,6 @@ canvas_expose_event (GtkWidget      *widget,
  if (drop_item)
    canvas_item_draw (drop_item, cr, TRUE);

-  cairo_destroy (cr);
-
  return TRUE;
 }

@@ -449,7 +438,7 @@ do_toolpalette (GtkWidget *do_widget)
      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

      /* Add widgets to control the ToolPalette appearance: */
-      box = gtk_vbox_new (FALSE, 6);
+      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
      gtk_container_add (GTK_CONTAINER (window), box);

      /* Orientation combo box: */
@@ -518,7 +507,7 @@ do_toolpalette (GtkWidget *do_widget)
      gtk_box_pack_start (GTK_BOX (box), combo_style, FALSE, FALSE, 0);

      /* Add hbox */
-      hbox = gtk_hbox_new (FALSE, 5);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
      gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, TRUE, 0);

      /* Add and fill the ToolPalette: */
@@ -572,7 +561,7 @@ do_toolpalette (GtkWidget *do_widget)
      gtk_widget_set_app_paintable (contents, TRUE);

      g_object_connect (contents,
-                        "signal::expose-event", canvas_expose_event, NULL,
+                        "signal::draw", canvas_draw, NULL,
                        "signal::drag-data-received", passive_canvas_drag_data_received, NULL,
                        NULL);

@@ -600,7 +589,7 @@ do_toolpalette (GtkWidget *do_widget)
      gtk_widget_set_app_paintable (contents, TRUE);

      g_object_connect (contents,
-                        "signal::expose-event", canvas_expose_event, NULL,
+                        "signal::draw", canvas_draw, NULL,
                        "signal::drag-motion", interactive_canvas_drag_motion, NULL,
                        "signal::drag-data-received", interactive_canvas_drag_data_received, NULL,
                        "signal::drag-leave", interactive_canvas_drag_leave, NULL,
--- a/demos/gtk-demo/tree_store.c
+++ b/demos/gtk-demo/tree_store.c
@@ -402,7 +402,7 @@ do_tree_store (GtkWidget *do_widget)
      g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);

-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
      gtk_container_add (GTK_CONTAINER (window), vbox);

--- a/demos/gtk-demo/ui_manager.c
+++ b/demos/gtk-demo/ui_manager.c
@@ -196,7 +196,7 @@ do_ui_manager (GtkWidget *do_widget)
 	  g_error_free (error);
 	}

-      box1 = gtk_vbox_new (FALSE, 0);
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
      gtk_container_add (GTK_CONTAINER (window), box1);
      
      gtk_box_pack_start (GTK_BOX (box1),
@@ -209,11 +209,11 @@ do_ui_manager (GtkWidget *do_widget)
      gtk_box_pack_start (GTK_BOX (box1), label, TRUE, TRUE, 0);


-      separator = gtk_hseparator_new ();
+      separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);


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

--- a/demos/pixbuf-demo/Makefile.am
+++ b/demos/pixbuf-demo/Makefile.am
@@ -0,0 +1,41 @@
+## Makefile.am for gtk+/demos
+include $(top_srcdir)/Makefile.decl
+
+INCLUDES = 				\
+	-I$(top_srcdir) 		\
+	-I$(top_builddir)/gdk		\
+	-DGDK_DISABLE_DEPRECATED	\
+	-DGTK_DISABLE_DEPRECATED	\
+	$(GTK_DEBUG_FLAGS)		\
+	$(GTK_DEP_CFLAGS)
+
+DEPS = \
+	$(top_builddir)/gtk/libgtk-3.la
+
+LDADDS = \
+	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gdk/libgdk-3.la	\
+	$(GTK_DEP_LIBS)			\
+	$(MATH_LIB)
+
+noinst_PROGRAMS = 		\
+	pixbuf-demo
+
+pixbuf_demo_DEPENDENCIES = $(DEPS)
+
+pixbuf_demo_LDADD = $(LDADDS)
+
+pixbuf_demo_SOURCES = pixbuf-demo.c
+
+EXTRA_DIST +=			\
+	apple-red.png		\
+	background.jpg		\
+	gnome-applets.png	\
+	gnome-calendar.png	\
+	gnome-foot.png		\
+	gnome-gimp.png		\
+	gnome-gmush.png		\
+	gnome-gsame.png		\
+	gnu-keys.png
+
+-include $(top_srcdir)/git.mk
--- a/demos/pixbuf-demo/apple-red.png
+++ b/demos/pixbuf-demo/apple-red.png
--- a/demos/pixbuf-demo/background.jpg
+++ b/demos/pixbuf-demo/background.jpg
--- a/demos/pixbuf-demo/gnome-applets.png
+++ b/demos/pixbuf-demo/gnome-applets.png
--- a/demos/pixbuf-demo/gnome-calendar.png
+++ b/demos/pixbuf-demo/gnome-calendar.png
--- a/demos/pixbuf-demo/gnome-foot.png
+++ b/demos/pixbuf-demo/gnome-foot.png
--- a/demos/pixbuf-demo/gnome-gimp.png
+++ b/demos/pixbuf-demo/gnome-gimp.png
--- a/demos/pixbuf-demo/gnome-gmush.png
+++ b/demos/pixbuf-demo/gnome-gmush.png
--- a/demos/pixbuf-demo/gnome-gsame.png
+++ b/demos/pixbuf-demo/gnome-gsame.png
--- a/demos/pixbuf-demo/gnu-keys.png
+++ b/demos/pixbuf-demo/gnu-keys.png
--- a/demos/pixbuf-demo/pixbuf-demo.c
+++ b/demos/pixbuf-demo/pixbuf-demo.c
@@ -86,17 +86,11 @@ load_pixbufs (void)
 }

 /* Expose callback for the drawing area */
-static gint
-expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
+static gboolean
+draw_cb (GtkWidget *widget, cairo_t *cr, gpointer data)
 {
-        cairo_t *cr;
-         
-        cr = gdk_cairo_create (event->window);
        gdk_cairo_set_source_pixbuf (cr, frame, 0, 0);
-        gdk_cairo_rectangle (cr, &event->area);
-        cairo_fill (cr);
-
-        cairo_destroy (cr);
+        cairo_paint (cr);

 	return TRUE;
 }
@@ -179,7 +173,7 @@ static guint timeout_id;

 /* Destroy handler for the window */
 static void
-destroy_cb (GtkObject *object, gpointer data)
+destroy_cb (GObject *object, gpointer data)
 {
 	g_source_remove (timeout_id);
 	timeout_id = 0;
@@ -187,14 +181,11 @@ destroy_cb (GtkObject *object, gpointer data)
 	gtk_main_quit ();
 }

-extern void pixbuf_init();
-
 int
 main (int argc, char **argv)
 {
 	GtkWidget *window;

-	pixbuf_init ();
 	gtk_init (&argc, &argv);

 	if (!load_pixbufs ()) {
@@ -214,8 +205,8 @@ main (int argc, char **argv)

 	da = gtk_drawing_area_new ();

-	g_signal_connect (da, "expose_event",
-			  G_CALLBACK (expose_cb), NULL);
+	g_signal_connect (da, "draw",
+			  G_CALLBACK (draw_cb), NULL);

 	gtk_container_add (GTK_CONTAINER (window), da);

--- a/demos/pixbuf-init.c
+++ b/demos/pixbuf-init.c
@@ -1,20 +0,0 @@
-#include "config.h"
-#include <glib.h>
-
-#include <sys/stat.h>
-#include <stdlib.h>
-
-static gboolean
-file_exists (const char *filename)
-{
-  struct stat statbuf;
-
-  return stat (filename, &statbuf) == 0;
-}
-
-void
-pixbuf_init (void)
-{
-  if (file_exists ("../gdk-pixbuf/libpixbufloader-pnm.la"))
-    g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/loaders.cache", TRUE);
-}
--- a/demos/testgtk/main.c
+++ b/demos/testgtk/main.c
@@ -1,392 +0,0 @@
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-#include <gtk/gtk.h>
-
-#include <demos.h>
-
-static GtkTextBuffer *info_buffer;
-static GtkTextBuffer *source_buffer;
-
-static gchar *current_file = NULL;
-
-enum {
-  TITLE_COLUMN,
-  FILENAME_COLUMN,
-  FUNC_COLUMN,
-  ITALIC_COLUMN,
-  NUM_COLUMNS
-};
-
-gboolean
-read_line (FILE *stream, GString *str)
-{
-  int n_read = 0;
-  
-  flockfile (stream);
-
-  g_string_truncate (str, 0);
-  
-  while (1)
-    {
-      int c;
-      
-      c = getc_unlocked (stream);
-
-      if (c == EOF)
-	goto done;
-      else
-	n_read++;
-
-      switch (c)
-	{
-	case '\r':
-	case '\n':
-	  {
-	    int next_c = getc_unlocked (stream);
-	    
-	    if (!(next_c == EOF ||
-		  (c == '\r' && next_c == '\n') ||
-		  (c == '\n' && next_c == '\r')))
-	      ungetc (next_c, stream);
-	    
-	    goto done;
-	  }
-	default:
-	  g_string_append_c (str, c);
-	}
-    }
-
- done:
-
-  funlockfile (stream);
-
-  return n_read > 0;
-}
-
-void
-load_file (const gchar *filename)
-{
-  FILE *file;
-  GtkTextIter start, end;
-  GString *buffer = g_string_new (NULL);
-  int state = 0;
-  gboolean in_para = 0;
-
-  if (current_file && !strcmp (current_file, filename))
-    return;
-
-  g_free (current_file);
-  current_file = g_strdup (filename);
-  
-  gtk_text_buffer_get_bounds (info_buffer, &start, &end);
-  gtk_text_buffer_delete (info_buffer, &start, &end);
-
-  gtk_text_buffer_get_bounds (source_buffer, &start, &end);
-  gtk_text_buffer_delete (source_buffer, &start, &end);
-
-  file = fopen (filename, "r");
-  if (!file)
-    {
-      g_warning ("Cannot open %s: %s\n", filename, g_strerror (errno));
-      return;
-    }
-
-  gtk_text_buffer_get_iter_at_offset (info_buffer, &start, 0);
-  while (read_line (file, buffer))
-    {
-      gchar *p = buffer->str;
-      gchar *q;
-      
-      switch (state)
-	{
-	case 0:
-	  /* Reading title */
-	  while (*p == '/' || *p == '*' || isspace (*p))
-	    p++;
-	  q = p + strlen (p);
-	  while (q > p && isspace (*(q - 1)))
-	    q--;
-
-	  if (q > p)
-	    {
-	      int len_chars = g_utf8_pointer_to_offset (p, q);
-
-	      end = start;
-
-	      g_assert (strlen (p) >= q - p);
-	      gtk_text_buffer_insert (info_buffer, &end, p, q - p);
-	      start = end;
-
-	      gtk_text_iter_backward_chars (&start, len_chars);
-	      gtk_text_buffer_apply_tag_by_name (info_buffer, "title", &start, &end);
-
-	      start = end;
-	      
-	      state++;
-	    }
-	  break;
-	    
-	case 1:
-	  /* Reading body of info section */
-	  while (isspace (*p))
-	    p++;
-	  if (*p == '*' && *(p + 1) == '/')
-	    {
-	      gtk_text_buffer_get_iter_at_offset (source_buffer, &start, 0);
-	      state++;
-	    }
-	  else
-	    {
-	      int len;
-	      
-	      while (*p == '*' || isspace (*p))
-		p++;
-
-	      len = strlen (p);
-	      while (isspace (*(p + len - 1)))
-		len--;
-	      
-	      if (len > 0)
-		{
-		  if (in_para)
-		    gtk_text_buffer_insert (info_buffer, &start, " ", 1);
-
-		  g_assert (strlen (p) >= len);
-		  gtk_text_buffer_insert (info_buffer, &start, p, len);
-		  in_para = 1;
-		}
-	      else
-		{
-		  gtk_text_buffer_insert (info_buffer, &start, "\n", 1);
-		  in_para = 0;
-		}
-	    }
-	  break;
-
-	case 2:
-	  /* Skipping blank lines */
-	  while (isspace (*p))
-	    p++;
-	  if (*p)
-	    {
-	      p = buffer->str;
-	      state++;
-	      /* Fall through */
-	    }
-	  else
-	    break;
-	  
-	case 3:
-	  /* Reading program body */
-	  gtk_text_buffer_insert (source_buffer, &start, p, -1);
-	  gtk_text_buffer_insert (info_buffer, &start, "\n", 1);
-	  break;
-	}
-    }
-
-  gtk_text_buffer_get_bounds (source_buffer, &start, &end);
-  gtk_text_buffer_apply_tag_by_name (info_buffer, "source", &start, &end);
-  fclose (file);
-}
-
-gboolean
-button_press_event_cb (GtkTreeView    *tree_view,
-		       GdkEventButton *event,
-		       GtkTreeModel   *model)
-{
-  if (event->type == GDK_2BUTTON_PRESS)
-    {
-      GtkTreePath *path = NULL;
-
-      gtk_tree_view_get_path_at_pos (tree_view,
-				     event->window,
-				     event->x,
-				     event->y,
-				     &path,
-				     NULL);
-
-      if (path)
-	{
-	  GtkTreeIter iter;
-	  gboolean italic;
-	  GVoidFunc func;
-
-	  gtk_tree_model_get_iter (model, &iter, path);
-	  gtk_tree_store_get (GTK_TREE_STORE (model),
-			      &iter,
-			      FUNC_COLUMN, &func,
-			      ITALIC_COLUMN, &italic,
-			      -1);
-	  (func) ();
-	  gtk_tree_store_set (GTK_TREE_STORE (model),
-			      &iter,
-			      ITALIC_COLUMN, !italic,
-			      -1);
-	  gtk_tree_path_free (path);
-	}
-
-      g_signal_stop_emission_by_name (tree_view, "button-press-event");
-      return TRUE;
-    }
-  
-  return FALSE;
-}
-
-static void
-selection_cb (GtkTreeSelection *selection,
-	      GtkTreeModel     *model)
-{
-  GtkTreeIter iter;
-  GValue value = {0, };
-
-  if (! gtk_tree_selection_get_selected (selection, NULL, &iter))
-    return;
-
-  gtk_tree_model_get_value (model, &iter,
-			    FILENAME_COLUMN,
-			    &value);
-  load_file (g_value_get_string (&value));
-  g_value_unset (&value);
-}
-
-static GtkWidget *
-create_text (GtkTextBuffer **buffer,
-	     gboolean        is_source)
-{
-  GtkWidget *scrolled_window;
-  GtkWidget *text_view;
-  PangoFontDescription *font_desc;
-
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-				  GTK_POLICY_AUTOMATIC,
-				  GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
-				       GTK_SHADOW_IN);
-  
-  text_view = gtk_text_view_new ();
-  gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
-  
-  *buffer = gtk_text_buffer_new (NULL);
-  gtk_text_view_set_buffer (GTK_TEXT_VIEW (text_view), *buffer);
-  gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE);
-  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (text_view), FALSE);
-
-  if (is_source)
-    {
-      font_desc = pango_font_description_from_string ("Courier 10");
-      gtk_widget_modify_font (text_view, font_desc);
-      pango_font_description_free (font_desc);
-    }
-  
-  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), !is_source);
-  
-  return scrolled_window;
-}
-
-/* Technically a list, but if we do go to 80 demos, we may want to move to a tree */
-static GtkWidget *
-create_tree (void)
-{
-  GtkTreeSelection *selection;
-  GtkCellRenderer *cell;
-  GtkWidget *tree_view;
-  GtkTreeViewColumn *column;
-  GtkTreeStore *model;
-  GtkTreeIter iter;
-  gint i;
-
-  model = gtk_tree_store_new_with_types (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN);
-  tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
-
-  gtk_tree_selection_set_type (GTK_TREE_SELECTION (selection),
-			       GTK_TREE_SELECTION_SINGLE);
-  gtk_widget_set_usize (tree_view, 200, -1);
-
-  for (i=0; i < G_N_ELEMENTS (testgtk_demos); i++)
-    {
-      gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
-
-      gtk_tree_store_set (GTK_TREE_STORE (model),
-			  &iter,
-			  TITLE_COLUMN, testgtk_demos[i].title,
-			  FILENAME_COLUMN, testgtk_demos[i].filename,
-			  FUNC_COLUMN, testgtk_demos[i].func,
-			  ITALIC_COLUMN, FALSE,
-			  -1);
-    }
-
-  cell = gtk_cell_renderer_text_new ();
-  column = gtk_tree_view_column_new_with_attributes ("Widget",
-						     cell,
-						     "text", TITLE_COLUMN,
-						     "italic", ITALIC_COLUMN,
-						     NULL);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),
-			       GTK_TREE_VIEW_COLUMN (column));
-
-  g_signal_connect (selection, "selection-changed", selection_cb, model);
-  g_signal_connect (tree_view, "button-press-event", G_CALLBACK (button_press_event_cb), model);
-
-  return tree_view;
-}
-
-int
-main (int argc, char **argv)
-{
-  GtkWidget *window;
-  GtkWidget *notebook;
-  GtkWidget *hbox;
-  GtkWidget *tree;
-  GtkTextTag *tag;
-
-  gtk_init (&argc, &argv);
-  
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  g_signal_connect (window, "destroy",
-                    G_CALLBACK (gtk_main_quit), NULL);
-
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_container_add (GTK_CONTAINER (window), hbox);
-
-  tree = create_tree ();
-  gtk_box_pack_start (GTK_BOX (hbox), tree, FALSE, FALSE, 0);
-
-  notebook = gtk_notebook_new ();
-  gtk_box_pack_start (GTK_BOX (hbox), notebook, TRUE, TRUE, 0);
-
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-			    create_text (&info_buffer, FALSE),
-			    gtk_label_new ("Info"));
-
-
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-			    create_text (&source_buffer, TRUE),
-			    gtk_label_new ("Source"));
-
-  tag = gtk_text_buffer_create_tag (info_buffer, "title");
-  gtk_object_set (GTK_OBJECT (tag),
-		 "font", "Sans 18",
-		 NULL);
-
-  tag = gtk_text_buffer_create_tag (info_buffer, "source");
-  gtk_object_set (GTK_OBJECT (tag),
-		  "font", "Courier 10",
-		  "pixels_above_lines", 0,
-		  "pixels_below_lines", 0,
-		 NULL);
-
-  gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-  gtk_widget_show_all (window);
-  
-
-  load_file (testgtk_demos[0].filename);
-  
-  gtk_main ();
-
-  return 0;
-}
--- a/docs/CODING-STYLE
+++ b/docs/CODING-STYLE
@@ -0,0 +1,635 @@
+GTK+ Coding Style
+-------------------------------------------------------------------------------
+
+This document is intended to be a short description of the preferred
+coding style to be used for the GTK+ source code. It was strongly
+inspired by Clutter's CODING_STYLE.
+
+Coding style is a matter of consistency, readability and maintainance;
+coding style is also completely arbitrary and a matter of taste. This
+document will use examples at the very least to provide authoritative
+and consistent answers to common questions regarding the coding style,
+and will also try to identify the allowed exceptions.
+
+The examples will show the preferred coding style; the negative examples
+will be clearly identified. Please, don't submit code to GTK+ that
+looks like any of these.
+
+Part of the rationales for these coding style rules are available either
+in the kernel CodingStyle document or in Cairo's CODING_STYLE one.
+
+When in doubt, check the surrounding code and try to imitate it.
+
+ Line width
+
+The maximum line width for source files is 80 characters, whenever possible.
+Longer lines are usually an indication that you either need a function
+or a pre-processor macro.
+
+ Indentation
+
+Each new level is indented 2 or more spaces than the previous level:
+
+  if (condition)
+    single_statement ();
+
+This can only be achieved using space characters. It may not be achieved
+using tab characters alone, or using a combination of spaces and tabs.
+
+Do not change the editor's configuration to change the meaning of a
+tab character (see below); code using tabs to indent will not be accepted
+into GTK+.
+
+Even if two spaces for each indentation level allows deeper nesting than
+8 spaces, GTK+ favours self-documenting function names that can take
+quite some space. For this reason you should avoid deeply nested code.
+
+ Tab characters
+
+The tab character must always be expanded to spaces. If a literal
+tab must be used inside the source, the tab must always be interpreted
+according to its traditional meaning:
+
+	Advance to the next column which is a multiple of 8.
+        [ these two lines should be aligned ]
+
+ Braces
+
+Curly braces should not be used for single statement blocks:
+
+  if (condition)
+    single_statement ();
+  else
+    another_single_statement (arg1);
+
+In case of multiple statements, curly braces should be put on another
+indentation level:
+
+  if (condition)
+    {
+      statement_1 ();
+      statement_2 ();
+      statement_3 ();
+    }
+
+The "no block for single statements" rule has only four exceptions:
+
+  ①  if the single statement covers multiple lines, e.g. for functions with
+     many arguments, and it is followed by else or else if:
+
+  /* valid */
+  if (condition)
+    {
+      a_single_statement_with_many_arguments (some_lengthy_argument,
+                                              another_lengthy_argument,
+                                              and_another_one,
+                                              plus_one);
+    }
+  else
+    another_single_statement (arg1, arg2);
+
+  ②  if the condition is composed of many lines:
+
+  /* valid */
+  if (condition1 ||
+      (condition2 && condition3) ||
+      condition4 ||
+      (condition5 && (condition6 || condition7)))
+    {
+      a_single_statement ();
+    }
+
+  ③  Nested if's, in which case the block should be placed on the
+     outermost if:
+
+  /* valid */
+  if (condition)
+    {
+      if (another_condition)
+        single_statement ();
+      else
+        another_single_statement ();
+    }
+
+  /* invalid */
+  if (condition)
+    if (another_condition)
+      single_statement ();
+    else if (yet_another_condition)
+      another_single_statement ();
+
+  ④  If either side of an if-else statement has braces, both sides
+     should, to match up indentation:
+
+  /* valid */
+  if (condition)
+    {
+      foo ();
+      bar ();
+    }
+  else
+    {
+      baz ();
+    }
+
+  /* invalid */
+  if (condition)
+    {
+      foo ();
+      bar ();
+    }
+  else
+    baz ();
+
+In general, new blocks should be placed on a new indentation level,
+like:
+
+  int retval = 0;
+
+  statement_1 ();
+  statement_2 ();
+
+  {
+    int var1 = 42;
+    gboolean res = FALSE;
+
+    res = statement_3 (var1);
+
+    retval = res ? -1 : 1;
+  }
+
+While curly braces for function definitions should rest on a new line
+they should not add an indentation level:
+
+  /* valid */
+  static void
+  my_function (int argument)
+  {
+    do_my_things ();
+  }
+
+  /* invalid */
+  static void
+  my_function (int argument) {
+    do_my_things ();
+  }
+
+  /* invalid */
+  static void
+  my_function (int argument)
+    {
+      do_my_things ();
+    }
+
+Curly braces must not be placed on the same line as a condition:
+
+  /* invalid */
+  if (condition) {
+    statement_1 ();
+    statement_2 ();
+  }
+ Conditions
+
+Do not check boolean values for equality:
+
+  /* invalid */
+  if (condition == TRUE)
+    do_foo ();
+
+  /* valid */
+  if (another_condition)
+    do_bar ();
+
+Even if C handles NULL equality like a boolean, be explicit:
+
+  /* valid */
+  if (some_pointer == NULL)
+    do_blah ();
+
+  /* invalid */
+  if (some_other_pointer)
+    do_blurp ();
+
+In case of conditions split over multiple lines, the logical operators should
+always go at the end of the line:
+
+  /* invalid */
+  if (condition1
+      || condition2
+      || condition3)
+    {
+      do_foo ();
+    }
+
+  /* valid */
+  if (condition1 &&
+      condition2 &&
+      (condition3 || (condition4 && condition5)))
+    {
+      do_blah ();
+    }
+
+ Functions
+
+Functions should be declared by placing the returned value on a separate
+line from the function name:
+
+  void
+  my_function (void)
+  {
+  }
+
+The arguments list must be broken into a new line for each argument,
+with the argument names right aligned, taking into account pointers:
+
+  void
+  my_function (some_type_t     type,
+               another_type_t *a_pointer,
+               final_type_t    another_type)
+  {
+  }
+
+The alignment also holds when invoking a function without breaking the
+80 characters limit:
+
+  align_function_arguments (first_argument,
+                            second_argument,
+                            third_argument);
+
+To respect the 80 characters limit do not break the function name from
+the arguments:
+
+  /* invalid */
+  a_very_long_function_name_with_long_parameters
+    (argument_the_first, argument_the_second);
+
+  /* valid */
+  first_a = argument_the_first;
+  second_a = argument_the_second;
+  a_very_long_function_name_with_long_parameters (first_a, second_a);
+
+ Whitespace
+
+Always put a space before a parenthesis but never after:
+
+  /* valid */
+  if (condition)
+    do_my_things ();
+
+  /* valid */
+  switch (condition)
+    {
+    }
+
+  /* invalid */
+  if(condition)
+    do_my_things();
+
+  /* invalid */
+  if ( condition )
+    do_my_things ( );
+
+A switch() should open a block on a new indentation level, and each case
+should start on the same indentation level as the curly braces, with the
+case block on a new indentation level:
+
+  /* valid */
+  switch (condition)
+    {
+    case FOO:
+      do_foo ();
+      break;
+
+    case BAR:
+      do_bar ();
+      break;
+    }
+
+  /* invalid */
+  switch (condition) {
+    case FOO: do_foo (); break;
+    case BAR: do_bar (); break;
+  }
+
+  /* invalid */
+  switch (condition)
+    {
+    case FOO: do_foo ();
+      break;
+    case BAR: do_bar ();
+      break;
+    }
+
+  /* invalid */
+  switch (condition)
+    {
+      case FOO:
+      do_foo ();
+      break;
+      case BAR:
+      do_bar ();
+      break;
+    }
+
+It is preferable, though not mandatory, to separate the various cases with
+a newline:
+
+  switch (condition)
+    {
+    case FOO:
+      do_foo ();
+      break;
+
+    case BAR:
+      do_bar ();
+      break;
+
+    default:
+      do_default ();
+    }
+
+The 'break' statement for the default: case is not mandatory.
+
+If a case block needs to declare new variables, the same rules as the
+inner blocks (see above) apply; the break statement should be placed
+outside of the inner block:
+
+  switch (condition)
+    {
+    case FOO:
+      {
+        int foo;
+
+        foo = do_foo ();
+      }
+      break;
+
+    ...
+    }
+
+When declaring a structure type use newlines to separate logical sections
+of the structure:
+
+  struct _GtkWrapBoxPrivate
+  {
+    GtkOrientation        orientation;
+    GtkWrapAllocationMode mode;
+
+    GtkWrapBoxSpreading   horizontal_spreading;
+    GtkWrapBoxSpreading   vertical_spreading;
+
+    guint16               vertical_spacing;
+    guint16               horizontal_spacing;
+
+    guint16               minimum_line_children;
+    guint16               natural_line_children;
+
+    GList                *children;
+  };
+
+
+Do not eliminate whitespace and newlines just because something would
+fit on 80 characters:
+
+  /* invalid */
+  if (condition) foo (); else bar ();
+
+Do eliminate trailing whitespace on any line, preferably as a separate
+patch or commit. Never use empty lines at the beginning or at the end of
+a file.
+
+Do enable the default git pre-commit hook that detect trailing
+whitespace for you and help you to avoid corrupting GTK+'s tree with
+it. Do that as follows:
+
+  chmod a+x .git/hooks/pre-commit
+
+You might also find the git-stripspace utility helpful which acts as a
+filter to remove trailing whitespace as well as initial, final, and
+duplicate blank lines.
+
+ Headers
+
+Headers are special, for GTK+, in that they don't have to obey the
+80 characters limit. The only major rule for headers is that the function
+definitions should be vertically aligned in three columns:
+
+  return value          function_name           (type   argument,
+                                                 type   argument,
+                                                 type   argument);
+
+The maximum width of each column is given by the longest element in the
+column:
+
+  void         gtk_type_set_property (GtkType      *type,
+                                      const gchar  *value,
+                                      GError      **error);
+  const gchar *gtk_type_get_property (GtkType      *type);
+
+It is also possible to align the columns to the next tab:
+
+  void          gtk_type_set_prop           (GtkType *type,
+                                             gfloat   value);
+  gfloat        gtk_type_get_prop           (GtkType *type);
+  gint          gtk_type_update_foobar      (GtkType *type);
+
+Public headers should never be included directly:
+
+  #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+  #error "Only <gtk/gtk.h> can be included directly."
+  #endif
+
+All headers should have inclusion guards (for internal usage)
+and C++ guards:
+
+  #ifndef __GTK_FOO_H__
+  #define __GTK_FOO_H__
+
+  #include <gtk/gtk-bar.h>
+
+  G_BEGIN_DECLS
+
+  ...
+
+  G_END_DECLS
+
+  #endif /* __GTK_FOO_H__ */
+
+ Includes
+
+GTK+ source files should never include the global gtk.h header, but
+instead include the individual headers that are needed. Every file must
+include config.h first, then its own header, then other GTK+ headers
+that it needs, then system and third-party headers that it needs.
+
+  /* valid */
+  #include "config.h"
+
+  #include "gtkfoo.h"
+
+  #include "gtkwidget.h"
+  #include "gtkbutton.h"
+
+  ...
+
+  #include <string.h>
+
+
+ GObject
+
+GObject classes definition and implementation require some additional
+coding style notices.
+
+Typedef declarations should be placed at the beginning of the file:
+
+  typedef struct _GtkFoo          GtkFoo;
+  typedef struct _GtkFooClass     GtkFooClass;
+  typedef struct _GtkFooPrivate   GtkFooPrivate;
+
+This includes enumeration types:
+
+  typedef enum
+  {
+    GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT,
+    GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH
+  } GtkSizeRequestMode;
+
+And callback types:
+
+  typedef void (* GtkCallback) (GtkWidget *widget,
+                                gpointer   user_data);
+
+Instance structures should only contain the parent type and a pointer to a
+private data structure, and they should be annotated as "private":
+
+  struct _GtkFoo
+  {
+    /*< private >*/
+    GtkWidget parent_instance;
+
+    GtkFooPrivate *priv;
+  };
+
+All the properties should be stored inside the private data structure, which
+is defined inside the source file - or, if needed, inside a private header
+file; the private header filename must end with "private.h" and must not be
+installed.
+
+The private data structure should only be accessed internally using the
+pointer inside the instance structure, and never using the
+G_TYPE_INSTANCE_GET_PRIVATE() macro or the g_type_instance_get_private()
+function.
+
+Always use the G_DEFINE_TYPE(), G_DEFINE_TYPE_WITH_CODE() macros, or
+their abstract variants G_DEFINE_ABSTRACT_TYPE() and
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE(), and the similar macros for defining
+interfaces.
+
+Interface types should always have the dummy typedef for cast purposes:
+
+        typedef struct _GtkFoo              GtkFoo;
+
+The interface structure should have "Interface" postfixed to the dummy typedef:
+
+        typedef struct _GtkFooInterface         GtkFooInterface;
+
+Interfaces must have the following macros:
+
+        - Macro:                                - Expands to:
+        • GTK_TYPE_<iface_name>             <iface_name>_get_type
+        • GTK_<iface_name>                  G_TYPE_CHECK_INSTANCE_CAST
+        • GTK_IS_<iface_name>               G_TYPE_CHECK_INSTANCE_TYPE
+        • GTK_<iface_name>_GET_IFACE        G_TYPE_INSTANCE_GET_INTERFACE
+
+ Memory allocation
+
+When dynamically allocating data on the heap either use g_new() or,
+if allocating multiple small data structures, g_slice_new().
+
+Public structure types should always be returned after being zero-ed,
+either explicitly for each member, or by using g_new0() or g_slice_new0().
+
+ Macros
+
+Try to avoid private macros unless strictly necessary. Remember to #undef
+them at the end of a block or a series of functions needing them.
+
+Inline functions are usually preferable to private macros.
+
+Public macros should not be used unless they evaluate to a constant.
+
+ Public API
+
+Avoid exporting variables as public API, since this is cumbersome on some
+platforms. It is always preferable to add getters and setters instead.
+
+All public functions must be listed in the gtk.symbols file.
+
+ Private API
+
+Non-exported functions that are needed in more than one source file
+should be named "_gtk_...", and declared in a private header file.
+
+Underscore-prefixed functions are never exported.
+
+Non-exported functions that are only needed in one source file
+should be declared static.
+
+ Documentation
+
+All public APIs must have gtk-doc comments. For functions, these should
+be placed in the source file, directly above the function.
+
+  /* valid */
+  /**
+   * gtk_get_flow:
+   * @widget: a #GtkWidget
+   *
+   * Gets the flow of a widget.
+   *
+   * Note that flows may be laminar or turbulent...
+   *
+   * Returns: (transfer none): the flow of @widget
+   */
+  GtkFlow *
+  gtk_get_flow (GtkWidget *widget)
+  {
+
+    ...
+
+  }
+
+Doc comments for macros, function types, class structs, etc should be
+placed next to the definitions, typically in headers.
+
+Section introductions should be placed in the source file they describe,
+after the license header:
+
+  /* valid */
+  /**
+   * SECTION:gtksizerequest
+   * @Short_Description: Height-for-width geometry management
+   * @Title: GtkSizeRequest
+   *
+   * The GtkSizeRequest interface is GTK+'s height-for-width (and
+   * width-for-height) geometry management system.
+   * ...
+   */
+
+To properly document a new function, macro, function type or struct,
+it needs to be listed in the gtk3-sections.txt file.
+
+To properly document a new class, it needs to be given its own section
+in gtk3-sections.txt, needs to be included in gtk-docs.sgml, and the
+get_type function needs to listed in gtk3.types.
+
+ Old code
+
+New code that is being added to GTK+ should adhere to the style
+explained above. Existing GTK+ code does largely follow these
+conventions, but there are some differences, e.g. occurrences
+of tabs, etc.
+
+It is ok to update the style of a code block or function when you
+are touching it anyway, but sweeping whitespace changes obscure the
+git history and should be avoided.
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,23 +1,24 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl

-SUBDIRS = tutorial faq reference tools
+SUBDIRS = reference tools

 EXTRA_DIST += \
-	defsformat.txt			\
+	CODING-STYLE			\
 	developers.txt			\
 	dnd_internals.txt		\
-	make-todo			\
-	refcounting.txt			\
-	sizing-test.txt			\
-	styles.txt			\
-	text_widget.txt 		\
-	text_widget_internals.txt	\
-	tree-column-sizing.txt		\
-	widget_geometry.txt		\
-	widget_system.txt 		\
+	focus_tracking.txt		\
 	generation.txt			\
 	gtkdocs_fix			\
-	RELEASE-HOWTO
+	make-todo			\
+	refcounting.txt			\
+	RELEASE-HOWTO			\
+	sizing-test.txt			\
+	styles.txt			\
+	text_widget_internals.txt	\
+	tree-column-sizing.png		\
+	tree-column-sizing.txt		\
+	widget_geometry.txt		\
+	widget_system.txt

 -include $(top_srcdir)/git.mk
--- a/docs/defsformat.txt
+++ b/docs/defsformat.txt
@@ -1,338 +0,0 @@
-
-The overall syntax is:
-
-     (type-of-thing-being-defined  name-used-to-refer-to-this-thing
-       (attribute-name  attribute-value-depending-on-the-attribute)
-       (attribute-name  attribute-value-depending-on-the-attribute)
-       (attribute-name  attribute-value-depending-on-the-attribute))
-
-Some definitions can have a c-declaration field that gives the C code
-we parsed to arrive at the definition. The c-declaration is a quoted
-string because it can contain parentheses and such.
-
-Defined types and their attributes:
-
-===
-(module module-name
-  (submodule-of module-name)) ;; submodule is optional
-
-Ex: (module Gtk)
-Ex: (module Rgb
-      (submodule-of Gdk))
-
-modules are later referred to with a list of module names, like 
-(Gdk Rgb) or (Gtk)
-
-Object and boxed type definitions automatically create a submodule.
-For example, GtkCList creates the module (module CList (submodule-of
-(Gtk))) which is referred to as module (Gtk CList).
-
-===
-
-(type
- (alias some-unique-identifier)
- (in-module module-name)   ;; optional, gchar* is not in a module
- (gtk-type-id gtk-type-system-id) ;; optional, absent if this is not
-                                  ;; in the type system
- (is-parametric boolean)          ;; optional default to #f
- (in-c-name name-of-symbol-in-C)
- (out-c-name name-of-symbol-in-C)
- (inout-c-name name-of-symbol-in-C))
-
-Ex: (type
-     (alias string)
-     (gtk-type-id GTK_TYPE_STRING)
-     (in-c-name "const gchar*")
-     (out-c-name "gchar**")      ;; actually I'm not sure how strings work out/inout
-     (inout-c-name "gchar*"))
-
- (type
-     (alias list)
-     (gtk-type-id GTK_TYPE_POINTER)
-     (is-parametric #t)
-     (in-c-name "GList*")
-     (out-c-name "GList**")
-     (inout-c-name "GList**"))
-
-
- ;; This one would be implied by the (object) def for GtkWidget I
- ;; think - (type) is only required for types that are not implied
- ;; by other definitions, such as int/boolean/etc.
- 
-    (type
-     (alias GtkWidget)
-     (in-module (Gtk))
-     (gtk-type-id GTK_TYPE_WIDGET)
-     (in-c-name "GtkWidget*")
-     (inout-c-name "GtkWidget*")
-     (out-c-name "GtkWidget**"))
-
-"Type" bindings are automatically assumed for objects, boxed types,
-etc. as defined below.
-
-The alias field is used to refer to the type later on.
-
-Whenever a type alias can be used, it is also possible to use the
-keyword "native", which implies that the type in question is too
-C-specific to represent. Then a c-declaration will typically be
-available for use.
-
-C types containing [] or () are function pointers or arrays. For
-arrays that don't specify a size, we just treat them as pointers. For
-function pointers, we need special (type) syntax/attributes of some
-kind, but since there basically aren't any of these right now in the
-libs we care about we can just ignore them. For arrays that specify a
-size ditto, you would handle them by adding an (array-size) attribute
-or something or using the "native" keyword and skipping the (type)
-stuff.
-
-===
-(object object-name
-   (in-module module-name-list)
-   (parent object-name optional-module-name-if-different)
-   (abstract boolean-is-abstract-class) ;; omit for default of #f
-   (c-name name-of-the-object-in-C)
-   (field (type-and-name type-alias-of-struct-field name-of-struct-field)
-          (access read-or-write-or-readwrite)))
-   
-
-Ex: (object Widget
-      (in-module (Gtk))
-      (parent Object)      ;; could say (parent Object (Gtk))
-      (abstract #t)
-      (c-name GtkWidget)
-      (field (type-and-name GdkWindow* window) (access read)))
-
-An "object" declaration automatically implies the type definition:
-
-(type
-  (alias concat-module-elements-and-object-name)
-  (in-c-name pointer-to-c-name)
-  (out-c-name pointer-to-pointer-to-c-name)
-  (inout-c-name pointer-to-c-name))
-
-Ex: 
- (type (alias GtkWidget) 
-       (in-c-name GtkWidget*) 
-       (out-c-name GtkWidget**) 
-       (inout-c-name GtkWidget*))
-
-It also implies a module that is the name broken into parts:
- (module CTree
-   (submodule-of Gtk))
-
-===
-
-(function function-name
-  (in-module module-name-list) ;; "static methods" go in their
-                               ;;  object's module
-  (is-constructor-of object-type-alias) ;; optional, marks a constructor
-  (c-name function-name)
-  (return-type return-value-type) ;; defaults to void
-  (caller-owns-return boolean-value) ;; defaults to #f
-  (can-return-null boolean-value) ;; defaults to #t
-  (parameter in-or-out-or-inout 
-      (type-and-name parameter-type-alias parameter-name)
-      (type-parameter name-of-contained-type) ;; optional, requires parametric type
-      (c-declaration "c-type-and-name")) ;; c-declaration only required
-                                         ;; if the type alias is "native"
-  (varargs #t) ;; has varargs at the end
-)
-
-Ex:
-  (function init
-    (in-module (Gdk Rgb)
-    (c-name gdk_rgb_init)))
-
-Ex: 
-  (function new
-    (in-module (Gdk Rgb Cmap))
-    (is-constructor-of GdkRgbCmap)
-    (c-name gdk_rgb_cmap_new)
-    (return-type GdkRgbCmap)
-    (caller-owns-return #t)   ;; perhaps this could be implied by is-constructor-of
-    (parameter in (type-and-name array-of-guint32 colors))
-    (parameter in (type-and-name gint n_colors)))
-
-Ex:
-  (function config_set_set_handler
-   (in-module (Gnome))
-   (c-name gnome_config_set_set_handler)
-   (parameter in (type-and-name native func)
-                 (c-declaration "void (*func)(void*)"))
-   (parameter in (type-and-name gpointer data)))  
-
-===
-(method method-name
-  (of-object object-name module-name)
-  ;; retval/arg attributes as for (function), but with first parameter
-  ;; omitted for non-constructors
-   )
- 
-Ex:
-  (method set_text
-     (of-object Label (Gtk))
-     (parameter (type-and-name const-gchar* str)))
-
-===
-(object-argument arg-name
-   (of-object object-we-are-an-argument-of optional-objects-module)
-   (type-id argument-type)       ;; GTK_TYPE_OBJECT etc.
-   ;; flags all default to #f
-   (readable bool-value)
-   (writeable bool-value)
-   (construct-only bool-value))
-
-Ex:
-  (object-argument label
-     (of-object Label (Gtk))
-     (type GTK_TYPE_STRING)
-     (readable #t)
-     (writeable #t))
-
-=== 
-(signal signal-name
-  (run-action bool-value)
-  (run-first bool-value)
-  (run-last bool-value)
-  (of-object object-we-are-a-signal-of optional-objects-module)
-  ;; return value and parameters as for a function, omitting the object
-  ;; and user data parameters
-
-  ;; what other properties matter for a signal?
-)
-
-Ex:
-  (signal select_row
-     (of-object CList (Gtk))
-     (run-first #t)
-     ;; return type defaults to void
-     (parameter in (type-and-name gint row))
-     (parameter in (type-and-name gint column))
-     (parameter in (type-and-name GdkEvent* event)))
-
-=== 
-(enum enum-name
-  (in-module modname)
-  (c-name name-in-c)
-  (value (nick value-name-noprefixes-hyphen-lowercase) (c-name value-c-name)))
-
-Ex:
-
-  (enum DirectionType
-    (in-module Gtk)
-    (c-name GtkDirectionType)
-    (value (nick tab-forward) (c-name GTK_DIR_TAB_FORWARD))
-    (value (nick tab-backward) (c-name GTK_DIR_TAB_BACKWARD))
-    (value (nick up) (c-name GTK_DIR_UP))
-    (value (nick down) (c-name GTK_DIR_DOWN))
-    (value (nick left) (c-name GTK_DIR_LEFT))
-    (value (nick right) (c-name GTK_DIR_RIGHT)))
-
-  (enum Pos
-    (in-module (Gtk CTree))
-    (c-name GtkCTreePos)
-    (value (nick before) (c-name GTK_CTREE_POS_BEFORE))
-    (value (nick as-child) (c-name GTK_CTREE_POS_AS_CHILD))
-    (value (nick after) (c-name GTK_CTREE_POS_AFTER)))
-
-===
-(flags) is just like enum, but some bindings may wrap enums and flags differently.
-    
-===
-
-(boxed boxed-name
-  (in-module modname)
-  (c-name c-name)
-  (ref-func func-to-increase-refcount)
-  (copy-func func-to-copy)
-  (release-func func-to-destroy-or-decrement-refcount)
-  (field (type-and-name type-alias-of-struct-field name-of-struct-field) (access access-rule)))
-
-It is never OK to use memcpy() to copy a boxed type, or use
-malloc()/free() to alloc/free one.
-
-Ex:
-
- (boxed Pixmap
-   (in-module (Gdk))
-   (c-name GdkPixmap)
-   (ref-func pixmap_ref)
-   (release-func pixmap_unref))
-
-An "object" declaration automatically implies the type definition:
-
-(type
-  (alias concat-module-elements-and-boxed-name)
-  (in-c-name pointer-to-c-name)
-  (out-c-name pointer-to-pointer-to-c-name)
-  (inout-c-name pointer-to-c-name))
-
-Ex: 
- (type (alias GdkPixmap) 
-       (in-c-name GdkPixmap*) 
-       (out-c-name GdkPixmap**) 
-       (inout-c-name GdkPixmap*))
-
-
-===
-
-(struct struct-name
-  (in-module modname)
-  (c-name c-name)
-  (field (type-and-name type-alias-of-struct-field name-of-struct-field) (access access-rule)))
-
-Unlike a boxed type, a struct type can be copied with memcpy() and
-allocated on the stack or with g_malloc().
-
-Ex:
- (struct Rectangle
-   (in-module (Gdk))
-   (c-name GdkRectangle)
-   (field (type-and-name gint16 x) (access readwrite))
-   (field (type-and-name gint16 y) (access readwrite))
-   (field (type-and-name guint16 width) (access readwrite))
-   (field (type-and-name guint16 height) (access readwrite)))
-
-Implies GdkRectangle type alias:
-
- (type (alias GdkRectangle) 
-       (in-c-name GdkRectangle*) 
-       (out-c-name GdkRectangle*)    ;; note - not the same as boxed types 
-       (inout-c-name GdkRectangle*))
-
-===
-
-(user-function name
-  (in-module module)
-  (c-name c-typedef-name)
-  ;; return-type and parameters as for (function)
-)
-
-Ex:
-
- (user-function PrintFunc
-    (in-module (Gtk))
-    (parameter in (type-and-name gpointer func_data))
-    (parameter in (type-and-name gchar* str)))
-
-===
-
-(typedef new-name
-  (in-module module)
-  (c-name c-full-name)
-  (orig-type alias-of-orig-type))
-
-Ex:
-
- (typedef Type
-   (in-module (Gtk))
-   (c-name GtkType)
-   (orig-type guint))
-
-
-
-
-  
-   
-
--- a/docs/faq/Makefile.am
+++ b/docs/faq/Makefile.am
@@ -1,44 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-EXTRA_DIST += 			\
-	gtk-faq.sgml
-
-if HAVE_DOCBOOK
-html:
-	if test -w $(srcdir); then \
-	  (cd $(srcdir); \
-	   db2html gtk-faq.sgml; \
-	   test -d html && rm -r html; \
-	   mv gtk-faq html); \
-	fi
-
-pdf:
-	if test -w $(srcdir); then \
-	  (cd $(srcdir); db2pdf gtk-faq.sgml); \
-	fi
-
-all-local: html
-
-dist-hook: html
-	cp -Rp $(srcdir)/html $(distdir)
-else
-html:
-	echo "***"
-	echo "*** Warning: FAQ not built"
-	echo "***"
-
-pdf:
-	echo "***"
-	echo "*** Warning: FAQ not built"
-	echo "***"
-
-dist-hook:
-	echo "***"
-	echo "*** Warning: FAQ not built"
-	echo "*** DISTRIBUTION IS INCOMPLETE"
-	echo "***"
-endif
-
-.PHONY: html
-
-include $(top_srcdir)/git.mk
--- a/docs/faq/gtk-faq.sgml
+++ b/docs/faq/gtk-faq.sgml
--- a/docs/gtk-config.txt
+++ b/docs/gtk-config.txt
@@ -1,236 +0,0 @@
-CONFIGURING PACKAGES TO WORK WITH GTK
-------------------------------------
-
-Compiling a program successfully against the GTK, GDK, and GLIB
-libraries can require a large number of command line options
-to your compiler and linker that are hard to guess correctly.
-The additional libraries required may, for example, depend on the
-manner which GTK was configured
-
-Several tools are included in this package to make process
-easier.
-
-First, there is the shell script 'gtk-config' (installed in
-$exec_prefix/bin):
-
-Invoking gtk-config
-------------------
-
-gtk-config takes the following flags:
-
-  --version
-     Prints out the version of GTK installed
-
-  --cflags
-     Prints '-I' flags pointing to the installed header files.
-
-  --libs
-     Prints out the linker flags necessary to link a program against GTK
-   
-  --prefix[=PREFIX]
-     If PREFIX is specified, overrides the configured value of $prefix.
-     (And of exec-prefix, unless --exec-prefix is also specified)
-     Otherwise, prints out the configured value of $prefix
-
-  --exec-prefix[=PREFIX]
-     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
---------------------------
-
-Typically, gtk-config will be used within a configure script,
-as described below. It, however, can also be used directly
-from the command line to compile a simple program. For example:
-
-  cc -o simple `gtk-config --cflags` simple.c `gtk-config --libs`
-
-This command line might expand to (for example):
-
-  cc -o simple -I/usr/local/lib/glib/include -I/usr/local/include \
-    -I/usr/X11R6/include simple.c -L/usr/local/lib -L/usr/X11R6/lib \
-    -lgtk -lgdk -lglib -lXi -lXext -lX11 -lm
-
-Not only is the form using gtk-config easier to type, it will
-work on any system, no matter how GTK was configured.
-
-
-AM_PATH_GTK
-----------
-
-For packages configured using GNU automake, GTK also provides
-a macro to automate the process of running GTK.
-
- AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-
-This macro:
-
- * Determines the location of GTK using gtk-config, which is either
-   found in the user's path, or from the environment variable
-   GTK_CONFIG
-
- * Tests the installed libraries to make sure that there version
-   is later than MINIMUM-VERSION. (A default version will be used
-   if not specified)
-
- * If the required version was found, sets the GTK_CFLAGS variable to
-   the output of `gtk-config --cflags` and the GTK_LIBS variable to
-   the output of `gtk-config --libs`, and calls AC_SUBST() for these
-   variables so they can be used in generated makefiles, and then
-   executes ACTION-IF-FOUND.
-
- * If the required version was not found, sets GTK_CFLAGS and GTK_LIBS
-   to empty strings, and executes ACTION-IF-NOT-FOUND.
-
-This macro is in file 'gtk.m4' which is installed in $datadir/aclocal.
-Note that if automake was installed with a different --prefix than
-GTK, you will either have to manually move gtk.m4 to automake's
-$datadir/aclocal, or give aclocal the -I option when running it.
-
-
-Configuring a package that uses AM_PATH_GTK
-------------------------------------------
-
-Simply make sure that gtk-config is in your path, and run
-the configure script.
-
-Notes:
-
-* The directory where the GTK libraries are installed needs
-  to be found by your system's dynamic linker.
-  
-  This is generally done by
-
-    editing /etc/ld.so.conf and running ldconfig
-
-  Or by:
-   
-    setting the environment variable LD_LIBRARY_PATH, 
-
-  or, as a last resort, 
- 
-    Giving a -R or -rpath flag (depending on your linker) when
-    running configure, for instance:
-
-      LDFLAGS=-R/usr/home/owen/lib ./configure
-
-* You can also specify a gtk-config not in your path by
-  setting the GTK_CONFIG environment variable to the
-  name of the executable
-
-* If you move the GTK package from its installed location,
-  you will need either need to modify gtk-config script
-  manually to point to the new location or rebuild GTK.
-
-Advanced note:
-
-* configure flags
-  
-  --with-gtk-prefix=PREFIX
-  --with-gtk-exec-prefix=PREFIX 
-
-  are provided to override the prefix and exec-prefix that were stored
-  in the gtk-config shell script by GTK's configure. You are generally
-  better off configuring GTK with the right path to begin with.
-
-Example of a package using AM_PATH_GTK
--------------------------------------
-
-The following shows how to build a simple package using automake
-and the AM_PATH_GTK macro. The program used here is the testinput.c
-
-You should first read the introductory portions of the automake
-Manual, if you are not already familiar with it.
-
-Two files are needed, 'configure.ac', which is used to build the
-configure script:
-
-==configure.ac===
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(testinput.c)
-
-AM_INIT_AUTOMAKE(testinput.c, 1.0.0)
-
-AC_PROG_CC
-AM_PROG_CC_STDC
-AC_PROG_INSTALL
-
-AM_PATH_GTK(0.99.5,
-          [LIBS="$LIBS $GTK_LIBS"
-           CFLAGS="$CFLAGS $GTK_CFLAGS"],
- 	  AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?))
-
-AC_OUTPUT(Makefile)
-=================
-
-The only command in this which is not standard for automake
-is the AM_PATH_GTK() macro.
-
-That command does the following:
-
- If a GTK version greater than 0.99.5 is found, adds $GTK_LIBS to 
- $LIBS and $GTK_CFLAGS to $CFLAGS. Otherwise, dies with the error
- message "Cannot find GTK: Is gtk-config in path?"
-
-And the 'Makefile.am', which will be used to build the Makefile.
-
-== Makefile.am ==
-bin_PROGRAMS = testinput
-testinput_SOURCES = testinput.c
-=================
-
-This Makefile.am, says that we are building a single executable,
-from a single sourcefile 'testinput.c'. Since every program
-we are building uses GTK we simply added the GTK options
-to $LIBS and $CFLAGS, but in other circumstances, we might
-want to specify them on a per-program basis: for instance by
-adding the lines:
-
-  testinput_LDADD = $(GTK_LIBS)
-  INCLUDES = $(GTK_CFLAGS)
-
-to the Makefile.am.
-
-To try this example out, create a new directory, add the two
-files above two it, and copy the testinput.c file from 
-the gtk/ subdirectory to the new directory. Edit the line:
-
-  #include "gtk.h"
-
-in testgtk.c, to read:
-
-  #include <gtk/gtk.h>
-
-
-Now execute the following commands:
-
-  automake --add-missing
-  aclocal
-  autoconf
-  
-You now have a package that can be built in the normal fashion
-
-  ./configure
-  make
-  make install
-
-
-Notes:
-
-* If you are converting a package that used a pre-1.0 version of
-  GTK, you should remove the autoconf tests for X. The results
-  of these tests are included in gtk-config and will be added
-  to GTK_LIBS and GTK_CFLAGS by the AM_PATH_GTK macro.
-
-                                        Owen Taylor
-                                        14 Mar 1997
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl

 AUTOMAKE_OPTIONS = 1.6

@@ -13,130 +12,127 @@ DOC_MAIN_SGML_FILE=gdk-docs.sgml
 SCAN_OPTIONS=--deprecated-guards="GDK_ENABLE_BROKEN|GDK_DISABLE_DEPRECATED"

 # The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../../gdk
+DOC_SOURCE_DIR=../../../gdk ../../../gdk/x11

 # Used for dependencies
 HFILE_GLOB=$(top_srcdir)/gdk/*.h $(top_srcdir)/gdk/x11/gdkx.h
 CFILE_GLOB=$(top_srcdir)/gdk/*.c

 # Header files to ignore when scanning
-IGNORE_HFILES=			\
+IGNORE_HFILES= 			\
 	gdkintl.h		\
 	gdkmarshalers.h		\
 	gdkkeysyms.h		\
 	gdkinternals.h		\
 	gdkprivate.h		\
-	gdkpoly-generic.h	\
+	gdk*private.h		\
 	keyname-table.h		\
-	win32 			\
+	win32			\
 	x11			\
 	quartz

 # Extra files to add when scanning (relative to $srcdir)
 EXTRA_HFILES=			\
-	../../../gdk/x11/gdkx.h 
+	../../../gdk/x11/gdkx.h

 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
-	-I$(top_srcdir) 	\
-	-I$(top_builddir) 	\
-	-I$(top_builddir)/gdk 	\
+INCLUDES = 			\
+	-I$(top_srcdir)		\
+	-I$(top_builddir)	\
+	-I$(top_builddir)/gdk	\
 	$(GTK_DEBUG_FLAGS)	\
 	$(GDK_DEP_CFLAGS)

-GTKDOC_LIBS = $(top_builddir)/gdk/$(gdktargetlib)
-
+GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-3.la $(GDK_DEP_LIBS)

 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gdk

 # Extra SGML files that are included by DOC_MAIN_SGML_FILE
 content_files = 		\
-	version.xml		\
-	multihead.sgml
+	version.xml

 # Images to copy into HTML directory
-HTML_IMAGES =				\
+HTML_IMAGES = 				\
 	images/rotated-text.png		\
-					\
-	images/X_cursor.png 		\
-	images/arrow.png 		\
-	images/based_arrow_down.png 	\
-	images/based_arrow_up.png 	\
-	images/boat.png 		\
-	images/bogosity.png 		\
-	images/bottom_left_corner.png 	\
-	images/bottom_right_corner.png 	\
-	images/bottom_side.png 		\
-	images/bottom_tee.png 		\
-	images/box_spiral.png 		\
-	images/center_ptr.png 		\
-	images/circle.png 		\
-	images/clock.png 		\
-	images/coffee_mug.png 		\
-	images/cross.png 		\
-	images/cross_reverse.png 	\
-	images/crosshair.png 		\
-	images/diamond_cross.png 	\
-	images/dot.png 			\
-	images/dotbox.png 		\
-	images/double_arrow.png 	\
-	images/draft_large.png 		\
-	images/draft_small.png 		\
-	images/draped_box.png 		\
-	images/exchange.png 		\
-	images/fleur.png 		\
-	images/gobbler.png 		\
-	images/gumby.png 		\
-	images/hand1.png 		\
-	images/hand2.png 		\
-	images/heart.png 		\
-	images/icon.png 		\
-	images/iron_cross.png 		\
-	images/left_ptr.png 		\
-	images/left_side.png 		\
-	images/left_tee.png 		\
-	images/leftbutton.png 		\
-	images/ll_angle.png 		\
-	images/lr_angle.png 		\
-	images/man.png 			\
-	images/middlebutton.png 	\
-	images/mouse.png 		\
-	images/pencil.png 		\
-	images/pirate.png 		\
-	images/plus.png 		\
-	images/question_arrow.png 	\
-	images/right_ptr.png 		\
-	images/right_side.png 		\
-	images/right_tee.png 		\
-	images/rightbutton.png 		\
-	images/rtl_logo.png 		\
-	images/sailboat.png 		\
-	images/sb_down_arrow.png 	\
-	images/sb_h_double_arrow.png 	\
-	images/sb_left_arrow.png 	\
-	images/sb_right_arrow.png 	\
-	images/sb_up_arrow.png 		\
-	images/sb_v_double_arrow.png 	\
-	images/shuttle.png 		\
-	images/sizing.png 		\
-	images/spider.png 		\
-	images/spraycan.png 		\
-	images/star.png 		\
-	images/target.png 		\
-	images/tcross.png 		\
-	images/top_left_arrow.png 	\
-	images/top_left_corner.png 	\
-	images/top_right_corner.png 	\
-	images/top_side.png 		\
-	images/top_tee.png 		\
-	images/trek.png 		\
-	images/ul_angle.png 		\
-	images/umbrella.png 		\
-	images/ur_angle.png 		\
-	images/watch.png 		\
-	images/xterm.png 
+	images/X_cursor.png		\
+	images/arrow.png		\
+	images/based_arrow_down.png	\
+	images/based_arrow_up.png	\
+	images/boat.png			\
+	images/bogosity.png		\
+	images/bottom_left_corner.png	\
+	images/bottom_right_corner.png	\
+	images/bottom_side.png		\
+	images/bottom_tee.png		\
+	images/box_spiral.png		\
+	images/center_ptr.png		\
+	images/circle.png		\
+	images/clock.png		\
+	images/coffee_mug.png		\
+	images/cross.png		\
+	images/cross_reverse.png	\
+	images/crosshair.png		\
+	images/diamond_cross.png	\
+	images/dot.png			\
+	images/dotbox.png		\
+	images/double_arrow.png		\
+	images/draft_large.png		\
+	images/draft_small.png		\
+	images/draped_box.png		\
+	images/exchange.png		\
+	images/fleur.png		\
+	images/gobbler.png		\
+	images/gumby.png		\
+	images/hand1.png		\
+	images/hand2.png		\
+	images/heart.png		\
+	images/icon.png			\
+	images/iron_cross.png		\
+	images/left_ptr.png		\
+	images/left_side.png		\
+	images/left_tee.png		\
+	images/leftbutton.png		\
+	images/ll_angle.png		\
+	images/lr_angle.png		\
+	images/man.png			\
+	images/middlebutton.png		\
+	images/mouse.png		\
+	images/pencil.png		\
+	images/pirate.png		\
+	images/plus.png			\
+	images/question_arrow.png	\
+	images/right_ptr.png		\
+	images/right_side.png		\
+	images/right_tee.png		\
+	images/rightbutton.png		\
+	images/rtl_logo.png		\
+	images/sailboat.png		\
+	images/sb_down_arrow.png	\
+	images/sb_h_double_arrow.png	\
+	images/sb_left_arrow.png	\
+	images/sb_right_arrow.png	\
+	images/sb_up_arrow.png		\
+	images/sb_v_double_arrow.png	\
+	images/shuttle.png		\
+	images/sizing.png		\
+	images/spider.png		\
+	images/spraycan.png		\
+	images/star.png			\
+	images/target.png		\
+	images/tcross.png		\
+	images/top_left_arrow.png	\
+	images/top_left_corner.png	\
+	images/top_right_corner.png	\
+	images/top_side.png		\
+	images/top_tee.png		\
+	images/trek.png			\
+	images/ul_angle.png		\
+	images/umbrella.png		\
+	images/ur_angle.png		\
+	images/watch.png		\
+	images/xterm.png

 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS= \
--- a/docs/reference/gdk/gdk-docs.sgml
+++ b/docs/reference/gdk/gdk-docs.sgml
@@ -6,58 +6,42 @@
 ]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
  <bookinfo>
-    <title>GDK Reference Manual</title>
+    <title>GDK 3 Reference Manual</title>
    <releaseinfo>
-      for GDK &version;
-      The latest version of this documentation can be found on-line at
-      <ulink role="online-location" url="http://library.gnome.org/devel/gdk/unstable/">http://library.gnome.org/devel/gdk/unstable/</ulink>.
+      This document is for the GDK 3 library, version &version;
+      The latest versions can be found online at
+      <ulink role="online-location" url="http://library.gnome.org/devel/gdk3/">http://library.gnome.org/devel/gdk3/</ulink>.
+      If you are looking for the older GDK 2 series of libraries,
+      see <ulink role="online-location" url="http://library.gnome.org/devel/gdk/">http://library.gnome.org/devel/gdk/</ulink>.
    </releaseinfo>
  </bookinfo>

  <reference id="reference">
    <title>API Reference</title>
    <xi:include href="xml/general.xml" />
-
-    <xi:include href="multihead.sgml" />
-    <xi:include href="xml/gdkdisplay.xml" />
    <xi:include href="xml/gdkdisplaymanager.xml" />
+    <xi:include href="xml/gdkdisplay.xml" />
    <xi:include href="xml/gdkscreen.xml" />
-
+    <xi:include href="xml/gdkdevicemanager.xml" />
+    <xi:include href="xml/gdkdevice.xml" />
    <xi:include href="xml/regions.xml" />
-    <xi:include href="xml/drawing.xml" />
-
-    <xi:include href="xml/pixmaps.xml" />
    <xi:include href="xml/pixbufs.xml" />
-
    <xi:include href="xml/colors.xml" />
+    <xi:include href="xml/rgba_colors.xml" />
    <xi:include href="xml/visuals.xml" />
-
-    <xi:include href="xml/fonts.xml" />
    <xi:include href="xml/cursors.xml" />
-
    <xi:include href="xml/windows.xml" />
-
    <xi:include href="xml/events.xml" />
    <xi:include href="xml/event_structs.xml" />
-
    <xi:include href="xml/keys.xml" />
-
    <xi:include href="xml/selections.xml" />
    <xi:include href="xml/dnd.xml" />
-
    <xi:include href="xml/properties.xml" />
-
    <xi:include href="xml/threads.xml" />
-
-    <xi:include href="xml/input.xml" />
-    <xi:include href="xml/gdkdevicemanager.xml" />
-
    <xi:include href="xml/pango_interaction.xml" />
    <xi:include href="xml/cairo_interaction.xml" />
    <xi:include href="xml/x_interaction.xml" />
-
    <xi:include href="xml/gdkapplaunchcontext.xml" />
-
    <xi:include href="xml/gdktesting.xml" />
  </reference>

--- a/docs/reference/gdk/gdk3-overrides.txt
+++ b/docs/reference/gdk/gdk3-overrides.txt
@@ -1,27 +1,4 @@

-# GdkPixmap, GdkBitmap and GdkDrawable are the same as GdkWindow.
-<STRUCT>
-<NAME>GdkWindow</NAME>
-struct GdkPixmap
-{
-  gpointer user_data;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkPixmap</NAME>
-struct GdkPixmap
-{
-  gpointer user_data;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkDrawable</NAME>
-struct GdkDrawable
-{
-  gpointer user_data;
-};
-</STRUCT>
-
 # GdkAtom is an opaque typedef
 <STRUCT>
 <NAME>GdkAtom</NAME>
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -8,8 +8,6 @@ gdk_init
 gdk_init_check
 gdk_parse_args
 gdk_get_display_arg_name
-gdk_set_locale
-gdk_set_sm_client_id
 gdk_notify_startup_complete
 gdk_notify_startup_complete_with_id

@@ -47,6 +45,7 @@ gdk_beep
 <SUBSECTION>
 gdk_error_trap_push
 gdk_error_trap_pop
+gdk_error_trap_pop_ignored

 <SUBSECTION>
 GDK_WINDOWING_X11
@@ -62,7 +61,6 @@ GdkStatus
 GDKVAR
 gdk_axis_use_get_type
 gdk_byte_order_get_type
-gdk_cap_style_get_type
 gdk_crossing_mode_get_type
 gdk_cursor_type_get_type
 gdk_drag_action_get_type
@@ -78,17 +76,14 @@ gdk_input_mode_get_type
 gdk_input_source_get_type
 gdk_modifier_type_get_type
 gdk_notify_type_get_type
-gdk_overlap_type_get_type
 gdk_property_state_get_type
 gdk_prop_mode_get_type
 gdk_scroll_direction_get_type
 gdk_setting_action_get_type
 gdk_status_get_type
-gdk_subwindow_mode_get_type
 gdk_visibility_state_get_type
 gdk_visual_type_get_type
 gdk_window_attributes_type_get_type
-gdk_window_class_get_type
 gdk_window_edge_get_type
 gdk_window_hints_get_type
 gdk_window_state_get_type
@@ -121,23 +116,16 @@ gdk_display_sync
 gdk_display_flush
 gdk_display_close
 gdk_display_is_closed
-gdk_display_list_devices
 gdk_display_get_event
 gdk_display_peek_event
 gdk_display_put_event
-gdk_display_add_client_message_filter
+gdk_display_has_pending
 gdk_display_set_double_click_time
 gdk_display_set_double_click_distance
 gdk_display_get_pointer
-gdk_display_get_device_state
+gdk_display_list_devices
 gdk_display_get_window_at_pointer
-gdk_display_get_window_at_device_position
-GdkDisplayPointerHooks
-gdk_display_set_pointer_hooks
-GdkDisplayDeviceHooks
-gdk_display_set_device_hooks
 gdk_display_warp_pointer
-gdk_display_warp_device
 gdk_display_supports_cursor_color
 gdk_display_supports_cursor_alpha
 gdk_display_get_default_cursor_size
@@ -150,7 +138,11 @@ gdk_display_store_clipboard
 gdk_display_supports_shapes
 gdk_display_supports_input_shapes
 gdk_display_supports_composite
+gdk_display_get_app_launch_context
+gdk_display_notify_startup_complete
+
 <SUBSECTION Standard>
+GDK_DISPLAY
 GDK_DISPLAY_OBJECT
 GDK_IS_DISPLAY
 GDK_TYPE_DISPLAY
@@ -172,7 +164,8 @@ gdk_display_manager_get
 gdk_display_manager_get_default_display
 gdk_display_manager_set_default_display
 gdk_display_manager_list_displays
-gdk_display_get_core_pointer
+gdk_display_manager_open_display
+
 <SUBSECTION Standard>
 GDK_DISPLAY_MANAGER
 GDK_DISPLAY_MANAGER_CLASS
@@ -189,11 +182,7 @@ gdk_display_manager_get_type
 <TITLE>GdkScreen</TITLE>
 GdkScreen
 gdk_screen_get_default
-gdk_screen_get_default_colormap
-gdk_screen_set_default_colormap
-gdk_screen_get_system_colormap
 gdk_screen_get_system_visual
-gdk_screen_get_rgba_colormap
 gdk_screen_get_rgba_visual
 gdk_screen_is_composited
 gdk_screen_get_root_window
@@ -214,7 +203,6 @@ gdk_screen_get_monitor_at_window
 gdk_screen_get_monitor_height_mm
 gdk_screen_get_monitor_width_mm
 gdk_screen_get_monitor_plug_name
-gdk_screen_broadcast_client_message
 gdk_screen_get_setting
 gdk_screen_get_font_options
 gdk_screen_set_font_options
@@ -222,10 +210,6 @@ gdk_screen_get_resolution
 gdk_screen_set_resolution
 gdk_screen_get_active_window
 gdk_screen_get_window_stack
-<SUBSECTION Spawning>
-gdk_spawn_on_screen
-gdk_spawn_on_screen_with_pipes
-gdk_spawn_command_line_on_screen

 <SUBSECTION Standard>
 GDK_SCREEN
@@ -239,50 +223,17 @@ GdkScreenClass
 gdk_screen_get_type
 </SECTION>

-<SECTION>
-<TITLE>Bitmaps and Pixmaps</TITLE>
-<FILE>pixmaps</FILE>
-GdkPixmap
-gdk_pixmap_new
-GdkBitmap
-
-<SUBSECTION Standard>
-GDK_PIXMAP
-GDK_PIXMAP_GET_CLASS
-GDK_PIXMAP_OBJECT
-GDK_TYPE_PIXMAP
-GDK_IS_PIXMAP
-GDK_PIXMAP_CLASS
-GDK_IS_PIXMAP_CLASS
-
-<SUBSECTION Private>
-gdk_pixmap_get_type
-GdkPixmapObject
-GdkPixmapObjectClass
-</SECTION>
-
 <SECTION>
 <TITLE>Pixbufs</TITLE>
 <FILE>pixbufs</FILE>
-gdk_pixbuf_render_threshold_alpha
-gdk_pixbuf_render_pixmap_and_mask
-gdk_pixbuf_render_pixmap_and_mask_for_colormap
-gdk_pixbuf_get_from_drawable
+gdk_pixbuf_get_from_window
 gdk_pixbuf_get_from_surface
 </SECTION>

 <SECTION>
-<TITLE>Colormaps and Colors</TITLE>
+<TITLE>Colors</TITLE>
 <FILE>colors</FILE>
 GdkColor
-GdkColormap
-gdk_colormap_new
-gdk_colormap_get_system
-gdk_colormap_alloc_colors
-gdk_colormap_alloc_color
-gdk_colormap_free_colors
-gdk_colormap_get_visual
-gdk_colormap_get_screen
 gdk_color_copy
 gdk_color_free
 gdk_color_parse
@@ -291,44 +242,28 @@ gdk_color_hash
 gdk_color_to_string

 <SUBSECTION Standard>
-GDK_COLORMAP
-GDK_COLORMAP_GET_CLASS
-GDK_TYPE_COLORMAP
-GDK_IS_COLORMAP
-GDK_COLORMAP_CLASS
-GDK_IS_COLORMAP_CLASS
 GDK_TYPE_COLOR

 <SUBSECTION Private>
-GdkColormapClass
-gdk_colormap_get_type
 gdk_color_get_type
 </SECTION>

 <SECTION>
-<TITLE>Drawing Primitives</TITLE>
-<FILE>drawing</FILE>
-GdkDrawable
-gdk_drawable_get_display
-gdk_drawable_get_screen
-gdk_drawable_get_visual
-gdk_drawable_set_colormap
-gdk_drawable_get_colormap
-gdk_drawable_get_depth
-gdk_drawable_get_size
-gdk_drawable_get_clip_region
-gdk_drawable_get_visible_region
+<TITLE>RGBA Colors</TITLE>
+<FILE>rgba_colors</FILE>
+GdkRGBA
+gdk_rgba_copy
+gdk_rgba_free
+gdk_rgba_parse
+gdk_rgba_equal
+gdk_rgba_hash
+gdk_rgba_to_string

 <SUBSECTION Standard>
-GDK_DRAWABLE
-GDK_DRAWABLE_GET_CLASS
-GDK_TYPE_DRAWABLE
-GDK_IS_DRAWABLE
-GDK_DRAWABLE_CLASS
-GDK_IS_DRAWABLE_CLASS
+GDK_TYPE_RGBA

 <SUBSECTION Private>
-GdkDrawableClass
+gdk_rgba_get_type
 </SECTION>

 <SECTION>
@@ -377,7 +312,7 @@ gdk_visual_get_type
 <FILE>windows</FILE>
 GdkWindow
 GdkWindowType
-GdkWindowClass
+GdkWindowWindowClass
 GdkWindowHints
 GdkGeometry
 GdkGravity
@@ -388,6 +323,9 @@ GdkWindowAttributesType
 gdk_window_new
 gdk_window_destroy
 gdk_window_get_window_type
+gdk_window_get_display
+gdk_window_get_screen
+gdk_window_get_visual
 gdk_window_at_pointer
 gdk_window_show
 gdk_window_show_unraised
@@ -421,9 +359,6 @@ gdk_window_flush
 gdk_window_has_native
 gdk_window_ensure_native
 gdk_window_reparent
-gdk_window_clear
-gdk_window_clear_area
-gdk_window_clear_area_e
 gdk_window_raise
 gdk_window_lower
 gdk_window_restack
@@ -435,13 +370,16 @@ gdk_window_constrain_size
 gdk_window_beep

 <SUBSECTION>
+gdk_window_get_clip_region
 gdk_window_begin_paint_rect
 gdk_window_begin_paint_region
 gdk_window_end_paint
+gdk_window_get_visible_region

 <SUBSECTION>
 gdk_window_invalidate_rect
 gdk_window_invalidate_region
+GdkWindowChildFunc
 gdk_window_invalidate_maybe_recurse
 gdk_window_get_update_area
 gdk_window_freeze_updates
@@ -449,7 +387,6 @@ gdk_window_thaw_updates
 gdk_window_process_all_updates
 gdk_window_process_updates
 gdk_window_set_debug_updates
-gdk_window_get_internal_paint_info
 gdk_window_enable_synchronized_configure
 gdk_window_configure_finished

@@ -465,18 +402,17 @@ gdk_window_remove_filter
 GdkFilterFunc
 GdkFilterReturn
 GdkXEvent
-gdk_window_shape_combine_mask
 gdk_window_shape_combine_region
 gdk_window_set_child_shapes
 gdk_window_merge_child_shapes
-gdk_window_input_shape_combine_mask
 gdk_window_input_shape_combine_region
 gdk_window_set_child_input_shapes
 gdk_window_merge_child_input_shapes
 gdk_window_set_static_gravities
 gdk_window_set_title
 gdk_window_set_background
-gdk_window_set_back_pixmap
+gdk_window_set_background_rgba
+gdk_window_set_background_pattern
 gdk_window_get_background_pattern
 GDK_PARENT_RELATIVE
 gdk_window_set_cursor
@@ -484,6 +420,8 @@ gdk_window_get_cursor
 gdk_window_get_user_data
 gdk_window_get_geometry
 gdk_window_set_geometry_hints
+gdk_window_get_width
+gdk_window_get_height
 gdk_window_set_icon_list
 gdk_window_set_modal_hint
 gdk_window_get_modal_hint
@@ -496,7 +434,6 @@ gdk_window_get_position
 gdk_window_get_root_origin
 gdk_window_get_frame_extents
 gdk_window_get_origin
-gdk_window_get_deskrelative_origin
 gdk_window_get_root_coords
 gdk_window_get_pointer
 gdk_window_get_device_position
@@ -507,7 +444,6 @@ gdk_window_get_children
 gdk_window_peek_children
 gdk_window_get_events
 gdk_window_set_events
-gdk_window_set_icon
 gdk_window_set_icon_name
 gdk_window_set_transient_for
 gdk_window_set_role
@@ -528,18 +464,14 @@ gdk_window_get_device_cursor
 gdk_window_set_device_cursor
 gdk_window_get_device_events
 gdk_window_set_device_events
+gdk_window_get_source_events
+gdk_window_set_source_events

 <SUBSECTION>
-GdkPointerHooks
-gdk_set_pointer_hooks
-
-<SUBSECTION>
-gdk_offscreen_window_get_pixmap
+gdk_offscreen_window_get_surface
 gdk_offscreen_window_set_embedder
 gdk_offscreen_window_get_embedder
 gdk_window_geometry_changed
-gdk_window_redirect_to_drawable
-gdk_window_remove_redirection
 gdk_window_coords_from_parent
 gdk_window_coords_to_parent
 gdk_window_get_effective_parent
@@ -556,7 +488,6 @@ GDK_TYPE_FILTER_RETURN
 GDK_TYPE_GRAVITY
 GDK_TYPE_MODIFIER_TYPE
 GDK_TYPE_WINDOW_ATTRIBUTES_TYPE
-GDK_TYPE_WINDOW_CLASS
 GDK_TYPE_WINDOW_EDGE
 GDK_TYPE_WINDOW_HINTS
 GDK_TYPE_WINDOW_TYPE
@@ -565,12 +496,11 @@ GDK_TYPE_WM_DECORATION
 GDK_TYPE_WM_FUNCTION

 <SUBSECTION Private>
-gdk_window_object_get_type
-gdk_drawable_get_type
-GdkWindowObject
-GdkWindowObjectClass
+gdk_window_get_type
+gdk_window_window_class_get_type
+GdkWindowClass
 GdkWindowImpl
-GdkWindowImplIface
+GdkWindowImplClass
 GdkWindowRedirect
 gdk_window_impl_get_type
 gdk_window_freeze_toplevel_updates_libgtk_only
@@ -613,17 +543,8 @@ GdkAtom
 GDK_ATOM_TO_POINTER
 GDK_POINTER_TO_ATOM
 GDK_NONE
-gdk_text_property_to_text_list
-gdk_text_property_to_text_list_for_display
-gdk_free_text_list
-gdk_text_property_to_utf8_list
 gdk_text_property_to_utf8_list_for_display
-gdk_string_to_compound_text
-gdk_string_to_compound_text_for_display
-gdk_free_compound_text
 gdk_utf8_to_string_target
-gdk_utf8_to_compound_text
-gdk_utf8_to_compound_text_for_display
 gdk_atom_intern
 gdk_atom_intern_static_string
 gdk_atom_name
@@ -650,12 +571,14 @@ gdk_pango_context_get_for_screen
 <FILE>cairo_interaction</FILE>
 gdk_window_create_similar_surface
 gdk_cairo_create
+gdk_cairo_get_clip_rectangle
 gdk_cairo_set_source_color
+gdk_cairo_set_source_rgba
 gdk_cairo_set_source_pixbuf
-gdk_cairo_set_source_pixmap
+gdk_cairo_set_source_window
 gdk_cairo_rectangle
 gdk_cairo_region
-gdk_cairo_reset_clip
+gdk_cairo_region_create_from_surface
 </SECTION>

 <SECTION>
@@ -680,7 +603,6 @@ GDK_THREADS_LEAVE
 gdk_threads_init
 gdk_threads_enter
 gdk_threads_leave
-gdk_threads_mutex
 gdk_threads_set_lock_functions
 gdk_threads_add_idle
 gdk_threads_add_idle_full
@@ -688,10 +610,6 @@ gdk_threads_add_timeout
 gdk_threads_add_timeout_full
 gdk_threads_add_timeout_seconds
 gdk_threads_add_timeout_seconds_full
-
-<SUBSECTION Private>
-gdk_threads_lock
-gdk_threads_unlock
 </SECTION>

 <SECTION>
@@ -741,25 +659,17 @@ gdk_keymap_get_type
 </SECTION>

 <SECTION>
-<TITLE>GdkDeviceManager</TITLE>
-<FILE>gdkdevicemanager</FILE>
-GdkDeviceManager
+<TITLE>GdkDevice</TITLE>
+<FILE>gdkdevice</FILE>
 GdkDevice
-GdkDeviceType
 GdkInputSource
 GdkInputMode
-GdkDeviceKey
-GdkDeviceAxis
 GdkAxisUse
+GdkDeviceType
 GdkGrabOwnership
-gdk_enable_multidevice
-gdk_device_manager_get_display
-gdk_device_manager_list_devices
-gdk_device_manager_get_client_pointer

 <SUBSECTION>
 gdk_device_get_name
-gdk_device_set_source
 gdk_device_get_source
 gdk_device_set_mode
 gdk_device_get_mode
@@ -768,10 +678,13 @@ gdk_device_get_key
 gdk_device_set_axis_use
 gdk_device_get_axis_use
 gdk_device_get_associated_device
+gdk_device_list_slave_devices
 gdk_device_get_device_type
 gdk_device_get_display
 gdk_device_get_has_cursor
 gdk_device_get_n_axes
+gdk_device_get_n_keys
+gdk_device_warp

 <SUBSECTION>
 gdk_device_grab
@@ -779,6 +692,8 @@ gdk_device_ungrab

 <SUBSECTION>
 gdk_device_get_state
+gdk_device_get_position
+gdk_device_get_window_at_position
 gdk_device_get_history
 gdk_device_free_history
 GdkTimeCoord
@@ -786,14 +701,6 @@ gdk_device_get_axis
 gdk_device_list_axes
 gdk_device_get_axis_value

-<SUBSECTION>
-gdk_input_set_extension_events
-GdkExtensionMode
-
-<SUBSECTION>
-gdk_devices_list
-gdk_device_get_core_pointer
-
 <SUBSECTION Standard>
 GDK_TYPE_AXIS_USE
 GDK_TYPE_EXTENSION_MODE
@@ -801,12 +708,6 @@ GDK_TYPE_INPUT_MODE
 GDK_TYPE_INPUT_SOURCE
 GDK_TYPE_DEVICE_TYPE
 GDK_TYPE_GRAB_OWNERSHIP
-GDK_DEVICE_MANAGER
-GDK_DEVICE_MANAGER_CLASS
-GDK_DEVICE_MANAGER_GET_CLASS
-GDK_IS_DEVICE_MANAGER
-GDK_IS_DEVICE_MANAGER_CLASS
-GDK_TYPE_DEVICE_MANAGER
 GDK_DEVICE
 GDK_DEVICE_CLASS
 GDK_DEVICE_GET_CLASS
@@ -816,15 +717,33 @@ GDK_TYPE_DEVICE

 <SUBSECTION Private>
 GdkDeviceClass
-GdkDevicePrivate
-GdkDeviceManagerClass
-GdkDeviceManagerPrivate
 gdk_device_get_type
-gdk_device_manager_get_type
 gdk_device_type_get_type
 GDK_MAX_TIMECOORD_AXES
 </SECTION>

+<SECTION>
+<TITLE>GdkDeviceManager</TITLE>
+<FILE>gdkdevicemanager</FILE>
+GdkDeviceManager
+gdk_disable_multidevice
+gdk_device_manager_get_display
+gdk_device_manager_list_devices
+gdk_device_manager_get_client_pointer
+
+<SUBSECTION Standard>
+GDK_DEVICE_MANAGER
+GDK_DEVICE_MANAGER_CLASS
+GDK_DEVICE_MANAGER_GET_CLASS
+GDK_IS_DEVICE_MANAGER
+GDK_IS_DEVICE_MANAGER_CLASS
+GDK_TYPE_DEVICE_MANAGER
+
+<SUBSECTION Private>
+GdkDeviceManagerClass
+gdk_device_manager_get_type
+</SECTION>
+
 <SECTION>
 <TITLE>Events</TITLE>
 <FILE>events</FILE>
@@ -834,7 +753,6 @@ GDK_CURRENT_TIME
 GDK_PRIORITY_EVENTS
 GDK_PRIORITY_REDRAW

-
 <SUBSECTION>
 gdk_events_pending
 gdk_event_peek
@@ -857,12 +775,6 @@ gdk_events_get_distance
 gdk_event_handler_set
 GdkEventFunc

-<SUBSECTION>
-gdk_event_send_client_message
-gdk_event_send_client_message_for_display
-gdk_event_send_clientmessage_toall
-gdk_add_client_message_filter
-
 <SUBSECTION>
 gdk_get_show_events
 gdk_set_show_events
@@ -870,6 +782,8 @@ gdk_event_set_screen
 gdk_event_get_screen
 gdk_event_get_device
 gdk_event_set_device
+gdk_event_get_source_device
+gdk_event_set_source_device

 <SUBSECTION>
 gdk_setting_get
@@ -897,11 +811,8 @@ GdkEventFocus
 GdkEventConfigure
 GdkEventProperty
 GdkEventSelection
-GdkNativeWindow
 GdkEventDND
 GdkEventProximity
-GdkEventClient
-GdkEventNoExpose
 GdkEventWindowState
 GdkEventSetting
 GdkEventOwnerChange
@@ -939,7 +850,6 @@ gdk_owner_change_get_type
 GdkCursor
 GdkCursorType
 gdk_cursor_new
-gdk_cursor_new_from_pixmap
 gdk_cursor_new_from_pixbuf
 gdk_cursor_new_from_name
 gdk_cursor_new_for_display
@@ -961,30 +871,31 @@ gdk_cursor_get_type
 <SECTION>
 <TITLE>Drag and Drop</TITLE>
 <FILE>dnd</FILE>
+GdkDragContext
 gdk_drag_get_selection
 gdk_drag_abort
 gdk_drop_reply
-gdk_drag_context_new
 gdk_drag_drop
-gdk_drag_find_window
 gdk_drag_find_window_for_screen
-gdk_drag_context_get_source_window
 gdk_drag_begin
+gdk_drag_begin_for_device
 gdk_drag_motion
 gdk_drop_finish
-gdk_drag_get_protocol
-gdk_drag_get_protocol_for_display
 GdkDragProtocol
-GdkDragContext
 GdkDragAction
 gdk_drag_status
 gdk_drag_drop_succeeded
+gdk_window_get_drag_protocol
+
 gdk_drag_context_get_actions
 gdk_drag_context_get_suggested_action
 gdk_drag_context_get_selected_action
 gdk_drag_context_list_targets
 gdk_drag_context_get_device
 gdk_drag_context_set_device
+gdk_drag_context_get_source_window
+gdk_drag_context_get_dest_window
+gdk_drag_context_get_protocol

 <SUBSECTION Standard>
 GDK_DRAG_CONTEXT
@@ -1006,66 +917,48 @@ gdk_drag_context_get_type
 <TITLE>X Window System Interaction</TITLE>
 <FILE>x_interaction</FILE>
 GDK_ROOT_WINDOW
-GDK_DISPLAY
-GDK_WINDOW_XDISPLAY
 GDK_WINDOW_XID
-GDK_PIXMAP_XDISPLAY
-GDK_PIXMAP_XID
 GDK_DISPLAY_XDISPLAY
-GDK_DRAWABLE_XDISPLAY
-GDK_DRAWABLE_XID
-GDK_COLORMAP_XDISPLAY
-GDK_COLORMAP_XCOLORMAP
 GDK_SCREEN_XDISPLAY
 GDK_SCREEN_XNUMBER
 GDK_SCREEN_XSCREEN
-GDK_VISUAL_XVISUAL
 GDK_CURSOR_XCURSOR
 GDK_CURSOR_XDISPLAY
-GDK_WINDOW_XWINDOW
-gdkx_visual_get
-gdk_pixmap_foreign_new
-gdk_pixmap_foreign_new_for_display
-gdk_pixmap_foreign_new_for_screen
-gdk_window_foreign_new
-gdk_window_foreign_new_for_display
-gdk_xid_table_lookup
-gdk_xid_table_lookup_for_display
-gdk_window_lookup
-gdk_window_lookup_for_display
-gdk_pixmap_lookup
-gdk_pixmap_lookup_for_display
+GDK_POINTER_TO_XID
+GDK_XID_TO_POINTER
 gdk_x11_lookup_xdisplay
 gdk_x11_get_server_time
-gdk_net_wm_supports
-gdk_x11_screen_supports_net_wm_hint
-gdk_x11_screen_get_window_manager_name
-gdk_x11_screen_get_monitor_output
-gdk_x11_screen_lookup_visual
-gdk_x11_window_set_user_time
-gdk_x11_window_move_to_current_desktop
 gdk_x11_display_get_user_time
-gdk_x11_colormap_foreign_new
-gdk_x11_colormap_get_xcolormap
-gdk_x11_colormap_get_xdisplay
-gdk_x11_cursor_get_xcursor
-gdk_x11_cursor_get_xdisplay
 gdk_x11_display_broadcast_startup_message
 gdk_x11_display_get_startup_notification_id
+gdk_x11_display_set_startup_notification_id
 gdk_x11_display_get_xdisplay
 gdk_x11_display_grab
 gdk_x11_display_ungrab
+gdk_x11_display_error_trap_push
+gdk_x11_display_error_trap_pop
+gdk_x11_display_error_trap_pop_ignored
 gdk_x11_display_set_cursor_theme
 gdk_x11_register_standard_event_type
-gdk_x11_drawable_get_xdisplay
-gdk_x11_drawable_get_xid
+gdk_x11_screen_get_screen_number
+gdk_x11_screen_get_xscreen
+gdk_x11_screen_get_window_manager_name
+gdk_x11_screen_get_monitor_output
+gdk_x11_screen_lookup_visual
+gdk_x11_screen_supports_net_wm_hint
+gdk_x11_window_foreign_new_for_display
+gdk_x11_window_lookup_for_display
+gdk_x11_window_get_xid
+gdk_x11_window_set_theme_variant
+gdk_x11_window_set_user_time
+gdk_x11_window_move_to_current_desktop
 gdk_x11_get_default_root_xwindow
 gdk_x11_get_default_screen
 gdk_x11_get_default_xdisplay
 gdk_x11_grab_server
-gdk_x11_screen_get_screen_number
-gdk_x11_screen_get_xscreen
 gdk_x11_ungrab_server
+gdk_x11_cursor_get_xcursor
+gdk_x11_cursor_get_xdisplay
 gdk_x11_visual_get_xvisual
 gdk_x11_atom_to_xatom
 gdk_x11_atom_to_xatom_for_display
@@ -1075,13 +968,30 @@ gdk_x11_get_xatom_by_name
 gdk_x11_get_xatom_by_name_for_display
 gdk_x11_get_xatom_name
 gdk_x11_get_xatom_name_for_display
+gdk_x11_set_sm_client_id
+gdk_x11_display_text_property_to_text_list
+gdk_x11_free_text_list
+gdk_x11_display_string_to_compound_text
+gdk_x11_display_utf8_to_compound_text
+gdk_x11_free_compound_text

 <SUBSECTION Private>
-gdk_display
-GDK_HAVE_WCHAR_H
-GDK_HAVE_WCTYPE_H
-gdk_x11_pixmap_get_drawable_impl
-gdk_x11_window_get_drawable_impl
+gdk_x11_app_launch_context_get_type
+gdk_x11_cursor_get_type
+gdk_x11_device_core_get_type
+gdk_x11_device_manager_core_get_type
+gdk_x11_device_manager_xi2_get_type
+gdk_x11_device_manager_xi_get_type
+gdk_x11_device_xi2_get_type
+gdk_x11_device_xi_get_type
+gdk_x11_display_get_type
+gdk_x11_display_manager_get_type
+gdk_x11_drag_context_get_type
+gdk_x11_keymap_get_type
+gdk_x11_screen_get_type
+gdk_x11_visual_get_type
+gdk_x11_window_get_type
+gdk_window_impl_x11_get_type
 </SECTION>

 <SECTION>
@@ -1103,7 +1013,6 @@ GDK_IS_APP_LAUNCH_CONTEXT
 GDK_IS_APP_LAUNCH_CONTEXT_CLASS
 GDK_TYPE_APP_LAUNCH_CONTEXT
 GdkAppLaunchContextClass
-GdkAppLaunchContextPrivate
 <SUBSECTION Private>
 gdk_app_launch_context_get_type
 </SECTION>
--- a/docs/reference/gdk/gdk3.types
+++ b/docs/reference/gdk/gdk3.types
@@ -1,11 +1,13 @@
 #include <gdk/gdk.h>

-gdk_display_get_type
-gdk_display_manager_get_type
-gdk_screen_get_type
-gdk_drawable_get_type
-gdk_window_object_get_type
-gdk_pixmap_get_type
-gdk_keymap_get_type
+gdk_app_launch_context_get_type
+gdk_cursor_get_type
 gdk_device_get_type
 gdk_device_manager_get_type
+gdk_display_get_type
+gdk_display_manager_get_type
+gdk_drag_context_get_type
+gdk_keymap_get_type
+gdk_screen_get_type
+gdk_visual_get_type
+gdk_window_get_type
--- a/docs/reference/gdk/multihead.sgml
+++ b/docs/reference/gdk/multihead.sgml
@@ -1,128 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<refentry id="multihead" revision="1 May 2002">
-  <refmeta>
-    <refentrytitle>Multi-head Support Overview</refentrytitle>
-    <manvolnum>3</manvolnum>
-    <refmiscinfo>GDK Library</refmiscinfo>
-  </refmeta>
-
-  <refnamediv>
-    <refname>Multi-head Support Overview</refname>
-    <refpurpose>Overview of GdkDisplay and GdkScreen</refpurpose>
-  </refnamediv>
-
-  <refsect1>
-    <title>Overview</title>
-      <para>
-	Multihead support is based around two main object types:
-	<itemizedlist>
-	  <listitem><para>GdkDisplay</para></listitem>
-	  <listitem><para>GdkScreen</para></listitem>
-	</itemizedlist>
-      </para>
-      
-      <para>
-	<link linkend="gdk-GdkDisplay">GdkDisplay</link> objects are the GDK
-	representation of the X Display which can be described as <emphasis>a
-	workstation consisting of a keyboard a pointing device (such as a
-	  mouse) and one or more screens</emphasis>. 
-	It is used to open and keep track of various <link
-	  linkend="gdk-GdkScreen">GdkScreen</link> objects currently 
-	instanciated by the application. It is also used to grab and release
-	the keyboard and the mouse pointer.
-      </para>
-      <para>
-	<link linkend="gdk-GdkScreen">GdkScreen</link> objects are the GDK
-	representation of a physical screen. It is used throughout GDK and GTK+
-	to specify which screen the top level windows are to be displayed on. 
-	It is also used to query the screen specification and default settings such as 
-	the default colormap (<link linkend="gdk-screen-get-default-colormap">gdk_screen_get_default_colormap</link>()),
-	the screen width (<link linkend="gdk-screen-get-width">gdk_screen_get_width</link>()), etc.
-      </para>
-      <para> 
-	The following code samples demonstrate common usage of the objects described above.
-      </para>
-      
-      <example>
-	<title>Testing the number of screen on the current display</title>
-	<programlisting><!--
-->gint num_screen = 0;
-gchar *displayname = NULL;
-GdkScreen **screen_list;
-GdkDisplay *display;
-
-gtk_init (&amp;argc, &amp;argv);
-
-display = gdk_display_get_default ();
-num_screen = gdk_display_get_n_screens (display);
-displayname = gdk_display_get_name (display);
-if (num_screen &lt;= 1)
-  {
-    printf ("This Xserver (%s) manages only one screen. exiting...\n",
-            displayname);
-    exit (1);
-  }
-else
-  {
-    printf ("This Xserver (%s) manages %d screens.\n", displayname,
-            num_screen);
-  }<!--
-
-->     </programlisting>
-      </example>
-      <example>
-	<title>Opening a second display</title>
-	<programlisting><!--
-->gchar *second_screen_name;
-GdkDisplay *second_display;
-GdkScreen *second_screen;
-GtkWidget *window;
-
-gtk_init (&amp;argc, &amp;argv);
-
-/* screen2_name needs to be initialized before calling 
-/* gdk_display_new() */
-second_display = gdk_display_new (&amp;argc, &amp;argv, second_screen_name);
-if (second_display)
-    second_screen = gdk_display_get_default_screen (second_display);
-else 
-  {
-	g_print ("Can't open display :\n\t%s\n\n",
-		  second_screen_name);
-    exit (1);	
-  }
-/* now GdkScreen can be assigned to GtkWindows */
-
-window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-gtk_window_set_screen (window, second_screen);<!--
-     --></programlisting>
-      </example>
-    </refsect1>
-    <refsect1>
-      <title>See Also</title>
-      <para>
-	<variablelist>
-	  <varlistentry>
-	    <term><link linkend="gdk-GdkDisplay">GdkDisplay</link></term>
-	    <listitem><para>the GDK Object used to represent and manipulate display
-		related data</para></listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><link linkend="gdk-GdkScreen">GdkScreen</link></term>
-	    <listitem><para>the GDK Object used to represent and query screen related
-		data</para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </refsect1>
-  </refentry>
-  
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gdk-docs.sgml" "book" "refentry" "")
-End:
-->
--- a/Show More
+++ b/Show More