GtkContainer: fix disconnection from frame clock

We need to disconnect the frame clock when we unrealize (at which point the old clock is still alive) not in destroy(). Since there is no common unrealize for containers, trigger this from GtkWidget.
GtkTickCallback: document use of G_SOURCE_CONTINUE/REMOVE for return value
2013-02-14 17:11:28 -05:00 · 2013-02-14 16:34:34 -05:00 · 2013-02-14 16:25:49 -05:00 · 2013-02-14 13:52:09 -05:00 · 2013-02-14 13:50:55 -05:00 · 2013-02-13 08:35:05 -05:00
559 changed files with 72897 additions and 115138 deletions
--- a/113
+++ b/113
@@ -1,116 +1,3 @@
-Overview of Changes in GTK+ 3.7.12
-==================================
-
-* We now support touch friendly popups on entries and text views
-  in place of context menus, on touch devices
-
-* The print dialog now shows printers that are discovered
-  using avahi, if configured with --enable-avahi-browsing
-
-* Bugs fixed:
- 650424 treeview: expander is not easily themable
- 674207 window: Compiler warning when not building on X11
- 675333 Cannot forget association in Open With dialog: program...
- 688956 Print dialog needs to support Bonjour broadcasting of ...
- 691426 get_current_desktop does not interpret property data c...
- 692955 GtkIconCache fails to load non-builtin icons
- 693995 GkColorChooserWidget crashes in select_swatch if palet...
- 694059 GtkTreeView accessible object:state-changed-expanded e...
- 694162 Memory leaks due to extra ref in gtk_ui_manager_builda...
- 694217 drag&drop half-broken – items get stuck while dragging
- 694274 wayland: don't attempt to unqueue events when events a...
- 694302 Convert pixbuf animation demo (both copies) to GdkFram...
- 694395 Remove unused code
- 694406 Excessive amount of accessible text events when changi...
- 694451 Containers shouldn't special case RTL positions
- 694732 gdk: prevent NULL pointer access when debugging is ena...
- 694742 Fix possible memory leak when GlobalAlloc() fails
- 694924 Dead code in GtkClipboard
- 694925 non-expose based draw() doesn't render window background
- 694968 GtkIconTheme: fix failed assertion when asynchrnously ...
- 694990 use primary icon slot for search icon
- 695131 gtkbin: initialize minimum and natural size to zero fo...
-
-Translation updates:
- Brazilian Portuguese
- Czech
- Estonian
- German
- Greek
- Gujarati
- Lithuanian
- Polish
- Punjabi
- Russian
- Serbian
- Simplified Chinese
- Slovenian
- Spanish
- Traditional Chinese
- Vietnamese
-
-
-Overview of Changes in GTK+ 3.7.10
-==================================
-
-* We now support the Window Manager frame synchronization protocol draft (when
-  running under a WM that supports it). This means applications will throttle
-  their drawing cycle to what the compositor is drawing, and the compositor
-  will never render half-updated windows, for seamless resizing and improved
-  smoothness in drawing.
-  See https://mail.gnome.org/archives/wm-spec-list/2013-January/msg00000.html
-  and the articles at http://blog.fishsoup.net/ for more details.
-
-* We now support setting an opacity to any GtkWidget, not just toplevels:
-  gtk_window_set_opacity has been deprecated in favor of gtk_widget_set_opacity.
-
-* GtkIconTheme gained asynchronous loaders for GtkIconInfo objects
-
-* GtkIconInfo has changed from being a boxed type to a GObject. This
-  is technically an ABI change, but basically all existing code
-  will keep working if its used as a boxed type, and its not
-  possible to instantiate GtkIconInfos outside Gtk, so this is not
-  expected to be a big problem.
-
-* Bugs fixed:
- 590325 gtkbuilder needs a public policy about extension name
- 673243 GtkRadioMenuItem accelerators no longer appear
- 681578 gtk-demo: demo.ui is outdated
- 683311 Leak in GtkIconViewAccessible
- 685460 Add frame synchronization to GTK+
- 687842 Support partially transparent widgets
- 690247 multiple context in a immodule can't be selected
- 692411 Slave device tracking goes wrong when there are no GDK_DEVICE_TYPE_SLAVE
- 692728 wayland evet source doesn't handle poll err/hup
- 693251 wayland: fix the direction of scrolling
- 693253 wayland: remove debug message
- 693256 wayland: use the GdkCursorType enum information to lookup the cursor name
- 693257 wayland: avoid returning NULL when getting a cursor
- 693313 Improve tooltip support
- 693338 wayland: skip pointer and keyboard events without a surface
- 693400 gtkcellrenderertext: Sink floating entry before using as signal argument
- 693709 Hide recently used if it is turned off in the control center
- 693724 Add a gtk-recent-files-enabled GtkSetting
- 693802 Add async GtkIconInfo loaders
- 693912 wayland: look further through the hierarchy for the surface with the grab
- 693913 wayland: attempt to determine the possible parent surface for popups
- 693934 Add gdk_frame_clock_begin/end_updating()
- 694022 GtkViewport: annotate the adjustment args of the constructor
- 694075 GtkAccelLabel: Don't show "+" if there's no more keys to add
-        Added scroll and touch events to GtkToolPalette
-
-* Translation updates:
- Arabic
- Catalan
- Catalan (Valencian)
- Czech
- Japanese
- Kazakh
- Lithuanian
- Malayalam
- Polish
- Serbian
-
 Overview of Changes in GTK+ 3.7.8
 =================================

--- a/README.in
+++ b/README.in
@@ -69,27 +69,9 @@ 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)
-Even better are git-formatted patches. (Use git format-patch)
+Patches should be in unified diff form. (The -up option to GNU diff.)


-Release notes for 3.10
-======================
-
-* GDK has been changed to allow only a single screen per display.
-  Only the X11 backend had multiple screens before, and multi-screen
-  setups (not multi-monitor!) are very rare nowadays. If you really
-  need multiple X screens, open them as separate displays.
-
-Release notes for 3.8
-=====================
-
-* GtkIconInfo has changed from being a boxed type to a GObject. This
-  is technically an ABI change, but basically all existing code
-  will keep working if its used as a boxed type, and its not
-  possible to instantiate GtkIconInfos outside Gtk, so this is not
-  expected to be a big problem.
-
 Release notes for 3.6
 =====================

--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -4,8 +4,4 @@ SUBDIRS = \
 	vs9  \
 	vs10

-EXTRA_DIST +=	\
-	gen-file-list-gtk.py	\
-	gengir_gtk.bat
-
 -include $(top_srcdir)/git.mk
--- a/build/win32/gen-file-list-gtk.py
+++ b/build/win32/gen-file-list-gtk.py
@@ -1,140 +0,0 @@
-#!/usr/bin/python
-# vim: encoding=utf-8
-# Generate the file lists for processing with g-ir-scanner
-import os
-import sys
-import re
-import string
-import subprocess
-import optparse
-
-def gen_gdk_filelist(srcroot, subdir, dest):
-    vars = read_vars_from_AM(os.path.join(srcroot, subdir, 'Makefile.am'),
-                             vars = {},
-                             conds = {},
-                             filters = ['gdk_public_h_sources', 'gdk_c_sources'])
-
-    vars['gdk_enums'] = 'gdkenumtypes.c gdkenumtypes.h'
-
-    files = vars['gdk_public_h_sources'].split() + \
-            vars['gdk_c_sources'].split() + \
-            vars['gdk_enums'].split()
-
-    sources = [i for i in files if (i != 'gdkkeysyms-compat.h')]
-
-    with open(dest, 'w') as d:
-        for i in sources:
-            d.write(srcroot + '\\' + subdir + '\\' + i.replace('/', '\\') + '\n')
-
-def gen_filelist_gtk(srcroot, subdir, dest):
-    vars = read_vars_from_AM(os.path.join(srcroot, 'gtk', 'Makefile.am'),
-                             vars = {},
-                             conds = {'USE_WIN32':True},
-                             filters = ['gtkinclude_HEADERS',
-                                        'deprecatedinclude_HEADERS',
-                                        'gtk_base_c_sources'])
-
-    vars['gtk_other_src'] = 'gtkprintoperation-win32.c gtktypebuiltins.h gtktypebuiltins.c'
-
-    files = vars['gtkinclude_HEADERS'].split() + \
-            vars['deprecatedinclude_HEADERS'].split() + \
-            vars['gtk_base_c_sources'].split() + \
-            vars['gtk_other_src'].split()
-
-    sources = [i for i in files if not (i.endswith('private.h')) and i != 'gtktextdisplay.h' and i != 'gtktextlayout.h']
-
-    with open(dest, 'w') as d:
-        for i in sources:
-            d.write(srcroot + '\\' + subdir + '\\' + i.replace('/', '\\') + '\n')
-
-def read_vars_from_AM(path, vars = {}, conds = {}, filters = None):
-    '''
-    path: path to the Makefile.am
-    vars: predefined variables
-    conds: condition variables for Makefile
-    filters: if None, all variables defined are returned,
-             otherwise, it is a list contains that variables should be returned
-    '''
-    cur_vars = vars.copy()
-    RE_AM_VAR_REF = re.compile(r'\$\((\w+?)\)')
-    RE_AM_VAR = re.compile(r'^\s*(\w+)\s*=(.*)$')
-    RE_AM_INCLUDE = re.compile(r'^\s*include\s+(\w+)')
-    RE_AM_CONTINUING = re.compile(r'\\\s*$')
-    RE_AM_IF = re.compile(r'^\s*if\s+(\w+)')
-    RE_AM_ELSE = re.compile(r'^\s*else')
-    RE_AM_ENDIF = re.compile(r'^\s*endif')
-    def am_eval(cont):
-        return RE_AM_VAR_REF.sub(lambda x: cur_vars.get(x.group(1), ''), cont)
-    with open(path, 'r') as f:
-        contents = f.readlines()
-    #combine continuing lines
-    i = 0
-    ncont = []
-    while i < len(contents):
-        line = contents[i]
-        if RE_AM_CONTINUING.search(line):
-            line = RE_AM_CONTINUING.sub('', line)
-            j = i + 1
-            while j < len(contents) and RE_AM_CONTINUING.search(contents[j]):
-                line += RE_AM_CONTINUING.sub('', contents[j])
-                j += 1
-            else:
-                if j < len(contents):
-                    line += contents[j]
-            i = j
-        else:
-            i += 1
-        ncont.append(line)
-
-    #include, var define, var evaluation
-    i = -1
-    skip = False
-    oldskip = []
-    while i < len(ncont) - 1:
-        i += 1
-        line = ncont[i]
-        mo = RE_AM_IF.search(line)
-        if mo:
-            oldskip.append(skip)
-            skip = False if mo.group(1) in conds and conds[mo.group(1)] \
-                         else True
-            continue
-        mo = RE_AM_ELSE.search(line)
-        if mo:
-            skip = not skip
-            continue
-        mo = RE_AM_ENDIF.search(line)
-        if mo:
-            if oldskip:
-                skip = oldskip.pop()
-            continue
-        if not skip:
-            mo = RE_AM_INCLUDE.search(line)
-            if mo:
-                cur_vars.update(read_vars_from_AM(am_eval(mo.group(1)), cur_vars, conds, None))
-                continue
-            mo = RE_AM_VAR.search(line)
-            if mo:
-                cur_vars[mo.group(1)] = am_eval(mo.group(2).strip())
-                continue
-
-    #filter:
-    if filters != None:
-        ret = {}
-        for i in filters:
-            ret[i] = cur_vars.get(i, '')
-        return ret
-    else:
-        return cur_vars
-
-def main(argv):
-    srcroot = '..\\..'
-    subdir_gdk = 'gdk'
-    subdir_gtk = 'gtk'
-
-    gen_gdk_filelist(srcroot, subdir_gdk, 'gdk_list')
-    gen_filelist_gtk(srcroot, subdir_gtk, 'gtk_list')
-    return 0
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))
--- a/build/win32/gengir_gtk.bat
+++ b/build/win32/gengir_gtk.bat
@@ -1,177 +0,0 @@
-@echo off
-
-setlocal EnableDelayedExpansion
-
-rem Needed environmental variables:
-rem PLAT: Windows platform-Win32 (i.e. x86) or x64 (i.e. x86-64)
-rem CONF: Configuration Type, Release or Debug
-rem VSVER: Visual C++ version used [9, 10 or 11]
-rem BASEDIR: Where the dependent libraries/headers are located
-rem PKG_CONFIG_PATH: Where the GLib/ATK/Pango/GDK-Pixbuf and their dependent pkg-config .pc files can be found
-rem MINGWDIR: Installation path of MINGW GCC, so gcc.exe can be found in %MINGWDIR%\bin.
-
-rem Note that the Python executable/installation and all the runtime dependencies of the
-rem library/libraries need to be in your PATH or %BASEBIN%\bin.
-
-rem Check the environemental variables...
-if /i "%PLAT%" == "Win32" goto PLAT_OK
-if /i "%PLAT%" == "x64" goto PLAT_OK
-if /i "%PLAT%" == "x86" (
-   set PLAT=Win32
-   goto PLAT_OK
-)
-if /i "%PLAT%" == "x86-64" (
-   set PLAT=x64
-   goto PLAT_OK
-)
-goto ERR_PLAT
-
-:PLAT_OK
-if "%VSVER%" == "9" goto VSVER_OK
-if "%VSVER%" == "10" goto VSVER_OK
-if "%VSVER%" == "11" goto VSVER_OK
-goto ERR_VSVER
-:VSVER_OK
-if /i "%CONF%" == "Release" goto CONF_OK
-if /i "%CONF%" == "Debug" goto CONF_OK
-goto ERR_CONF
-:CONF_OK
-if "%BASEDIR%" == "" goto ERR_BASEDIR
-if not exist %BASEDIR% goto ERR_BASEDIR
-
-if "%PKG_CONFIG_PATH%" == "" goto ERR_PKGCONFIG
-if not exist %PKG_CONFIG_PATH%\gobject-2.0.pc goto ERR_PKGCONFIG
-
-if "%MINGWDIR%" == "" goto ERR_MINGWDIR
-if not exist %MINGWDIR%\bin\gcc.exe goto ERR_MINGWDIR
-
-set CC=cl
-set BINDIR=%CD%\vs%VSVER%\%CONF%\%PLAT%\bin
-set INCLUDE=%BASEDIR%\include\glib-2.0;%BASEDIR%\lib\glib-2.0\include;%INCLUDE%
-set LIB=%BINDIR%;%BASEDIR%\lib;%LIB%
-set PATH=%BINDIR%;%BASEDIR%\bin;%PATH%;%MINGWDIR%\bin
-set PYTHONPATH=%BASEDIR%\lib\gobject-introspection;%BINDIR%
-
-echo Creating filelist files for generating GDK3/GTK3 .gir's...
-call python gen-file-list-gtk.py
-
-echo Setup .bat for generating GDK3/GTK3 .gir's...
-
-rem ===============================================================================
-rem Begin setup of gtk_gir.bat to create Gdk-3.0.gir
-rem (The ^^ is necessary to span the command to multiple lines on Windows cmd.exe!)
-rem ===============================================================================
-
-echo echo Generating Gdk-3.0.gir...> gtk_gir.bat
-echo @echo off>> gtk_gir.bat
-echo.>> gtk_gir.bat
-rem ===============================================================
-rem Setup the command line flags to g-ir-scanner for Gdk-3.0.gir...
-rem ===============================================================
-echo python %BASEDIR%\bin\g-ir-scanner --verbose -I..\.. -I..\..\gdk ^^>> gtk_gir.bat
-echo -I%BASEDIR%\include\glib-2.0 -I%BASEDIR%\lib\glib-2.0\include ^^>> gtk_gir.bat
-echo -I%BASEDIR%\include\pango-1.0 -I%BASEDIR%\include\atk-1.0 ^^>> gtk_gir.bat
-echo -I%BASEDIR%\include\gdk-pixbuf-2.0 -I%BASEDIR%\include ^^>> gtk_gir.bat
-echo --namespace=Gdk --nsversion=3.0 ^^>> gtk_gir.bat
-echo --include=Gio-2.0 --include=GdkPixbuf-2.0 ^^>> gtk_gir.bat
-echo --include=Pango-1.0 --include=cairo-1.0 ^^>> gtk_gir.bat
-echo --no-libtool --library=gdk-3-vs%VSVER% ^^>> gtk_gir.bat
-echo --reparse-validate --add-include-path=%BASEDIR%\share\gir-1.0 --add-include-path=. ^^>> gtk_gir.bat
-echo --pkg-export gdk-3.0 --warn-all --c-include="gdk/gdk.h" ^^>> gtk_gir.bat
-echo -I..\.. -DG_LOG_DOMAIN=\"Gdk\" -DGDK_COMPILATION ^^>> gtk_gir.bat
-echo --filelist=gdk_list ^^>> gtk_gir.bat
-echo -o Gdk-3.0.gir>> gtk_gir.bat
-echo.>> gtk_gir.bat
-
-echo Completed setup of .bat for generating Gdk-3.0.gir.
-echo.>> gtk_gir.bat
-
-rem =================================================
-rem Finish setup of gtk_gir.bat to create Gtk-3.0.gir
-rem =================================================
-
-rem ===============================================================================
-rem Begin setup of gtk_gir.bat to create Gtk-3.0.gir
-rem (The ^^ is necessary to span the command to multiple lines on Windows cmd.exe!)
-rem ===============================================================================
-
-echo echo Generating Gtk-3.0.gir...>> gtk_gir.bat
-echo.>> gtk_gir.bat
-rem ===============================================================
-rem Setup the command line flags to g-ir-scanner for Gtk-3.0.gir...
-rem ===============================================================
-echo python %BASEDIR%\bin\g-ir-scanner --verbose -I..\.. -I..\..\gtk -I..\..\gdk ^^>> gtk_gir.bat
-echo -I%BASEDIR%\include\glib-2.0 -I%BASEDIR%\lib\glib-2.0\include ^^>> gtk_gir.bat
-echo -I%BASEDIR%\include\pango-1.0 -I%BASEDIR%\include\atk-1.0 ^^>> gtk_gir.bat
-echo -I%BASEDIR%\include\gdk-pixbuf-2.0 -I%BASEDIR%\include ^^>> gtk_gir.bat
-echo --namespace=Gtk --nsversion=3.0 ^^>> gtk_gir.bat
-echo --include=Atk-1.0 ^^>> gtk_gir.bat
-echo --include-uninstalled=./Gdk-3.0.gir ^^>> gtk_gir.bat
-echo --no-libtool --library=gtk-3-vs%VSVER% ^^>> gtk_gir.bat
-echo --reparse-validate --add-include-path=%BASEDIR%\share\gir-1.0 --add-include-path=. ^^>> gtk_gir.bat
-echo --pkg-export gtk+-3.0 --warn-all --c-include="gtk/gtkx.h" ^^>> gtk_gir.bat
-echo -I..\.. -DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"/dummy/lib\" ^^>> gtk_gir.bat
-echo -Dtime_t=long ^^>> gtk_gir.bat
-echo -DGTK_DATADIR=\"/dummy/share\" -DGTK_DATA_PREFIX=\"/dummy\" ^^>> gtk_gir.bat
-echo -DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"3.6.2\" ^^>> gtk_gir.bat
-echo -DGTK_BINARY_VERSION=\"3.0.0\" -DGTK_HOST=\"i686-pc-vs%VSVER%\" ^^>> gtk_gir.bat
-echo -DGTK_COMPILATION -DGTK_PRINT_BACKENDS=\"file\" ^^>> gtk_gir.bat
-echo -DGTK_PRINT_PREVIEW_COMMAND=\"undefined-gtk-print-preview-command\" ^^>> gtk_gir.bat
-echo -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED ^^>> gtk_gir.bat
-echo -DINCLUDE_IM_am_et -DINCLUDE_IM_cedilla -DINCLUDE_IM_cyrillic_translit ^^>> gtk_gir.bat
-echo -DINCLUDE_IM_ime -DINCLUDE_IM_inuktitut -DINCLUDE_IM_ipa ^^>> gtk_gir.bat
-echo -DINCLUDE_IM_multipress -DINCLUDE_IM_thai -DINCLUDE_IM_ti_er ^^>> gtk_gir.bat
-echo -DINCLUDE_IM_ti_et -DINCLUDE_IM_viqr --filelist=gtk_list ^^>> gtk_gir.bat
-echo -o Gtk-3.0.gir>> gtk_gir.bat
-echo.>> gtk_gir.bat
-
-echo Completed setup of .bat for generating Gtk-3.0.gir.
-echo.>> gtk_gir.bat
-
-rem =================================================
-rem Finish setup of gtk_gir.bat to create Gtk-3.0.gir
-rem =================================================
-
-rem =======================
-rem Now generate the .gir's
-rem =======================
-CALL gtk_gir.bat
-
-rem Clean up the .bat/filelists for generating the .gir files...
-del gtk_gir.bat
-del gdk_list
-del gtk_list
-
-rem Now compile the generated .gir files
-%BASEDIR%\bin\g-ir-compiler --includedir=. --debug --verbose Gdk-3.0.gir -o Gdk-3.0.typelib
-%BASEDIR%\bin\g-ir-compiler --includedir=. --debug --verbose Gtk-3.0.gir -o Gtk-3.0.typelib
-rem Copy the generated .girs and .typelibs to their appropriate places
-
-mkdir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\share\gir-1.0
-move /y *.gir %BASEDIR%\share\gir-1.0\
-
-mkdir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\lib\girepository-1.0
-move /y *.typelib %BASEDIR%\lib\girepository-1.0\
-
-goto DONE
-
-:ERR_PLAT
-echo You need to specify a valid Platform [set PLAT=Win32 or PLAT=x64]
-goto DONE
-:ERR_VSVER
-echo You need to specify your Visual Studio version [set VSVER=9 or VSVER=10 or VSVER=11]
-goto DONE
-:ERR_CONF
-echo You need to specify a valid Configuration [set CONF=Release or CONF=Debug]
-goto DONE
-:ERR_BASEDIR
-echo You need to specify a valid BASEDIR.
-goto DONE
-:ERR_PKGCONFIG
-echo You need to specify a valid PKG_CONFIG_PATH
-goto DONE
-:ERR_MINGWDIR
-echo You need to specify a valid MINGWDIR, where a valid gcc installation can be found.
-goto DONE
-:DONE
-
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -1,30 +1,27 @@
 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	\
-	gtk3-demo.vcxproj	\
-	gtk3-demo.vcxproj.filters	\
-	gtk3-demo-application.vcxproj	\
-	gtk3-demo-application.vcxproj.filters	\
-	gtka11y.vcxproj	\
-	gtka11y.vcxproj.filters	\
-	gtka11y.vcxprojin	\
-	gtka11y.vcxproj.filtersin	\
-	gailutil.vcxproj	\
-	gailutil.vcxproj.filters	\
-	gengir.vcxproj	\
+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 \
+	gtk3-demo.vcxproj \
+	gtk3-demo.vcxproj.filters \
+	libgail.vcxproj \
+	libgail.vcxproj.filters \
+	libgail.vcxprojin \
+	libgail.vcxproj.filtersin \
+	gailutil.vcxproj \
+	gailutil.vcxproj.filters \
 	install.vcxproj

 -include $(top_srcdir)/git.mk
--- a/build/win32/vs10/gailutil.vcxproj
+++ b/build/win32/vs10/gailutil.vcxproj
@@ -90,7 +90,7 @@
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
      <SubSystem>Windows</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@@ -114,7 +114,7 @@
      <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
  </ItemDefinitionGroup>
@@ -136,7 +136,7 @@
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
      <SubSystem>Windows</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -161,7 +161,7 @@
      <SubSystem>Windows</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
  </ItemDefinitionGroup>
--- a/build/win32/vs10/gdk-win32.vcxproj
+++ b/build/win32/vs10/gdk-win32.vcxproj
@@ -75,7 +75,7 @@
      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
--- a/build/win32/vs10/gdk.vcxprojin
+++ b/build/win32/vs10/gdk.vcxprojin
@@ -79,19 +79,19 @@
      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
  </ItemDefinitionGroup>
@@ -106,14 +106,14 @@
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
  </ItemDefinitionGroup>
@@ -131,12 +131,12 @@
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
  </ItemDefinitionGroup>
@@ -151,14 +151,14 @@
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
  </ItemDefinitionGroup>
--- a/build/win32/vs10/gengir.vcxproj
+++ b/build/win32/vs10/gengir.vcxproj
@@ -1,108 +0,0 @@
-<?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>{2093D218-190E-4194-9421-3BA7CBF33B15}</ProjectGuid>
-    <RootNamespace>gengir</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>
-    <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>$(DoGenGir)</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>$(DoGenGir)</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>$(DoGenGir)</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>$(DoGenGir)</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <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+.props
+++ b/build/win32/vs10/gtk+.props
--- a/build/win32/vs10/gtk+.sln
+++ b/build/win32/vs10/gtk+.sln
@@ -8,16 +8,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcxproj", "{FC5A
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo-application", "gtk3-demo-application.vcxproj", "{3281202A-CD26-4C67-B892-EB34BDBC612F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.vcxproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgail", "libgail.vcxproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcxproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gengir", "gengir.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B15}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -82,18 +78,6 @@ Global
 		{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
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|Win32.Build.0 = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|x64.ActiveCfg = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|x64.Build.0 = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release|Win32.ActiveCfg = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release|Win32.Build.0 = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release|x64.ActiveCfg = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release|x64.Build.0 = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|x64.ActiveCfg = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release|Win32.ActiveCfg = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release|x64.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/build/win32/vs10/gtk.vcxprojin
+++ b/build/win32/vs10/gtk.vcxprojin
@@ -79,7 +79,7 @@
      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
@@ -91,7 +91,7 @@
      <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
  </ItemDefinitionGroup>
@@ -113,7 +113,7 @@
      <SubSystem>Windows</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
  </ItemDefinitionGroup>
@@ -136,7 +136,7 @@
      <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
  </ItemDefinitionGroup>
@@ -158,7 +158,7 @@
      <SubSystem>Windows</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
  </ItemDefinitionGroup>
@@ -204,7 +204,7 @@
      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
-    <ProjectReference Include="gtka11y.vcxproj">
+    <ProjectReference Include="libgail.vcxproj">
      <Project>{f756b0db-40a1-4e9f-be1f-8f02cb86ea46}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
--- a/build/win32/vs10/gtk3-demo-application.vcxproj
+++ b/build/win32/vs10/gtk3-demo-application.vcxproj
@@ -1,170 +0,0 @@
-<?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>{3281202A-CD26-4C67-B892-EB34BDBC612F}</ProjectGuid>
-    <RootNamespace>gtk3demoapplication</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>false</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>false</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>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\demos\gtk-demo\application-standalone.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.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/gtk3-demo-application.vcxproj.filters
+++ b/build/win32/vs10/gtk3-demo-application.vcxproj.filters
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <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;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\demos\gtk-demo\application-standalone.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
--- a/build/win32/vs10/gtk3-demo.vcxproj
+++ b/build/win32/vs10/gtk3-demo.vcxproj
@@ -27,7 +27,7 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
    <PlatformToolset>v100</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -38,7 +38,7 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
    <PlatformToolset>v100</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -79,7 +79,7 @@
      <PreprocessorDefinitions>_DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
@@ -135,7 +135,6 @@
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -159,7 +158,6 @@
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -213,6 +211,7 @@
    <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\theming_custom_css.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\theming_style_classes.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\transparent.c" />
--- a/build/win32/vs10/gtk3-demo.vcxproj.filters
+++ b/build/win32/vs10/gtk3-demo.vcxproj.filters
@@ -143,6 +143,9 @@
    <ClCompile Include="..\..\..\demos\gtk-demo\textview.c">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\theming_custom_css.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\theming_style_classes.c">
      <Filter>Source Files</Filter>
    </ClCompile>
--- a/build/win32/vs10/install.vcxproj
+++ b/build/win32/vs10/install.vcxproj
@@ -113,10 +113,6 @@
      <Project>{29e3e814-1ba3-4ad7-a3a7-3669cb80a942}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
-    <ProjectReference Include="gtk-demo-application.vcxproj">
-      <Project>{3281202a-cd26-4c67-b892-eb34bdbc612f}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/build/win32/vs10/libgail.vcxproj.filtersin
+++ b/build/win32/vs10/libgail.vcxproj.filtersin
@@ -15,6 +15,6 @@
    </Filter>
  </ItemGroup>
  <ItemGroup>
-#include "gtka11y.vs10.sourcefiles.filters"
+#include "libgail.vs10.sourcefiles.filters"
  </ItemGroup>
-</Project>
+</Project>
--- a/build/win32/vs10/libgail.vcxprojin
+++ b/build/win32/vs10/libgail.vcxprojin
@@ -20,7 +20,7 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}</ProjectGuid>
-    <RootNamespace>gtka11y</RootNamespace>
+    <RootNamespace>libgail</RootNamespace>
    <Keyword>Win32Proj</Keyword>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -120,9 +120,9 @@
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
-#include "gtka11y.vs10.sourcefiles"
+#include "libgail.vs10.sourcefiles"
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -1,20 +1,18 @@
 include $(top_srcdir)/Makefile.decl

-EXTRA_DIST +=	\
-	README.txt	\
-	gtk+.sln	\
-	gtk+.vsprops	\
-	gdk-win32.vcproj	\
-	gdk.vcproj	\
-	gdk.vcprojin	\
-	gtk.vcproj	\
-	gtk.vcprojin	\
-	gtk3-demo.vcproj	\
-	gtk3-demo-application.vcproj	\
-	gtka11y.vcproj	\
-	gtka11y.vcprojin	\
-	gailutil.vcproj	\
-	gengir.vcproj	\
+EXTRA_DIST += \
+	README.txt \
+	gtk+.sln \
+	gtk+.vsprops \
+	gdk-win32.vcproj \
+	gdk.vcproj \
+	gdk.vcprojin \
+	gtk.vcproj \
+	gtk.vcprojin \
+	gtk3-demo.vcproj \
+	libgail.vcproj \
+	libgail.vcprojin \
+	gailutil.vcproj \
 	install.vcproj

 -include $(top_srcdir)/git.mk
--- a/build/win32/vs9/gailutil.vcproj
+++ b/build/win32/vs9/gailutil.vcproj
@@ -47,7 +47,7 @@
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				GenerateDebugInformation="true"
 				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -81,7 +81,7 @@
 				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>
@@ -114,7 +114,7 @@
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				GenerateDebugInformation="true"
 				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -150,7 +150,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>
--- a/build/win32/vs9/gdk-win32.vcproj
+++ b/build/win32/vs9/gdk-win32.vcproj
@@ -35,7 +35,7 @@
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
--- a/build/win32/vs9/gdk.vcprojin
+++ b/build/win32/vs9/gdk.vcprojin
@@ -35,20 +35,20 @@
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="imm32.lib winmm.lib"
+				AdditionalDependencies="imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="1"
 			/>
 		</Configuration>
@@ -73,7 +73,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="imm32.lib winmm.lib"
+				AdditionalDependencies="imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
@@ -81,7 +81,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="1"
 			/>
 		</Configuration>
@@ -108,13 +108,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="imm32.lib winmm.lib"
+				AdditionalDependencies="imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>
@@ -139,7 +139,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="imm32.lib winmm.lib"
+				AdditionalDependencies="imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
@@ -147,7 +147,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>
--- a/build/win32/vs9/gengir.vcproj
+++ b/build/win32/vs9/gengir.vcproj
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gengir"
-	ProjectGUID="{2093D218-190E-4194-9421-3BA7CBF33B15}"
-	RootNamespace="gengir"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(DoGenGir)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(DoGenGir)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(DoGenGir)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(DoGenGir)"
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioProject>
--- a/build/win32/vs9/gtk+.sln
+++ b/build/win32/vs9/gtk+.sln
@@ -19,13 +19,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcpr
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo-application", "gtk3-demo-application.vcproj", "{3281202A-CD26-4C67-B892-EB34BDBC612F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{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}") = "gtka11y", "gtka11y.vcproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgail", "libgail.vcproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -39,13 +33,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj",
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}
 		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942} = {29E3E814-1BA3-4AD7-A3A7-3669CB80A942}
-		{3281202A-CD26-4C67-B892-EB34BDBC612F} = {3281202A-CD26-4C67-B892-EB34BDBC612F}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gengir", "gengir.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B15}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
 	EndProjectSection
 EndProject
 Global
@@ -112,18 +99,6 @@ Global
 		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|Win32.Build.0 = Release|Win32
 		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|x64.ActiveCfg = Release|x64
 		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|x64.Build.0 = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|Win32.Build.0 = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|x64.ActiveCfg = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|x64.Build.0 = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release|Win32.ActiveCfg = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release|Win32.Build.0 = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release|x64.ActiveCfg = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release|x64.Build.0 = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|x64.ActiveCfg = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release|Win32.ActiveCfg = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release|x64.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/build/win32/vs9/gtk+.vsprops
+++ b/build/win32/vs9/gtk+.vsprops
@@ -27,24 +27,16 @@ copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
 "
 	/>
-	<UserMacro
-		Name="VSVer"
-		Value="9"
-	/>
 	<UserMacro
 		Name="GlibEtcInstallRoot"
-		Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
-	/>
-	<UserMacro
-		Name="GlibEtcInstallRootFromBuildWin32"
-		Value="..\..\..\vs$(VSVer)\$(PlatformName)"
+		Value="..\..\..\..\vs9\$(PlatformName)"
 	/>
 	<UserMacro
 		Name="CopyDir"
 		Value="$(GlibEtcInstallRoot)"
 	/>
 	<UserMacro
-		Name="ApiVersion"
+		Name="GtkApiVersion"
 		Value="3.0"
 	/>
 	<UserMacro
@@ -69,7 +61,7 @@ copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
 	/>
 	<UserMacro
 		Name="GtkDefines"
-		Value="GTK_COMPILATION;G_LOG_DOMAIN=\&quot;Gtk\&quot;;GTK_HOST=\&quot;i686-pc-vs$(VSVer)\&quot;;GTK_PRINT_BACKENDS=\&quot;file\&quot;;GTK_PRINT_PREVIEW_COMMAND=\&quot;undefined-gtk-print-preview-command\&quot;;$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot;;GTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot;GTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;;GTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot;;MULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\&quot;;MULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot;;GTK_VERSION=\&quot;$(GtkVersion)/etc\&quot;;GTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)/etc\&quot;;GDK_DISABLE_DEPRECATED"
+		Value="GTK_COMPILATION;G_LOG_DOMAIN=\&quot;Gtk\&quot;;GTK_HOST=\&quot;i686-pc-vs9\&quot;;GTK_PRINT_BACKENDS=\&quot;file\&quot;;GTK_PRINT_PREVIEW_COMMAND=\&quot;undefined-gtk-print-preview-command\&quot;;$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot;;GTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot;GTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;;GTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot;;MULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(GtkApiVersion)\&quot;;MULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot;;GTK_VERSION=\&quot;$(GtkVersion)/etc\&quot;;GTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)/etc\&quot;;GDK_DISABLE_DEPRECATED"
 	/>
 	<UserMacro
 		Name="GtkDoInstall"
@@ -79,364 +71,356 @@ mkdir $(CopyDir)\bin&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin&#x0D;&#x0A;

+mkdir $(CopyDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
+
+copy ..\..\..\demos\gtk-demo\*.c $(CopyDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.css $(CopyDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.h $(CopyDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.ui $(CopyDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.jpg $(CopyDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.png $(CopyDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.gif $(CopyDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
+
 mkdir $(CopyDir)\lib&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;

-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdk.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkapplaunchcontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkcairo.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkcolor.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkcursor.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdevice.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdevicemanager.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdisplay.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdisplaymanager.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdnd.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkevents.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkframeclock.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkframetimings.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkkeys.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkkeysyms.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkmain.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkpango.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkpixbuf.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkprivate.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkproperty.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkrectangle.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkrgba.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkscreen.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkselection.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdktestutils.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkthreads.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdktypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkvisual.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdk.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkapplaunchcontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkcairo.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkcolor.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkcursor.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkdevice.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkdevicemanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkdisplay.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkdisplaymanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkdnd.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkevents.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkkeys.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkkeysyms.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkmain.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkpango.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkpixbuf.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkprivate.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkproperty.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkrectangle.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkrgba.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkscreen.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkselection.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdktestutils.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkthreads.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdktypes.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkvisual.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;

-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32cursor.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32display.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32displaymanager.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32dnd.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32keys.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32screen.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32window.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
+mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32cursor.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32display.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32displaymanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32dnd.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32keys.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32screen.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32window.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;

-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtk.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkx.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtk-a11y.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaboutdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccelgroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccelgroupprivate.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccellabel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccelmap.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkactiongroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkactionable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkactivatable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkadjustment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkalignment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkappchooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkappchooserbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkappchooserdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkappchooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkapplication.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkapplicationwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkarrow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaspectframe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkassistant.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbin.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbindings.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkborder.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbuildable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbuilder.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcalendar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellarea.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellareabox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellareacontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcelleditable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcelllayout.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderer.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendereraccel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderercombo.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererpixbuf.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererprogress.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererspin.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererspinner.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderertext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderertoggle.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellview.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcheckbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcheckmenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkclipboard.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorchooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorchooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorchooserdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorutils.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcombobox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcomboboxtext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcontainer.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcssprovider.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcsssection.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdebug.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdnd.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdrawingarea.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkeditable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkentry.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkentrybuffer.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkentrycompletion.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkenums.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkeventbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkexpander.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooserbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooserdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilefilter.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfixed.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfontbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfontchooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfontchooserdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfontchooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkframe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkgrid.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkiconfactory.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkicontheme.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkiconview.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimage.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimagemenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimcontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimcontextinfo.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimcontextsimple.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimmodule.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimmulticontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkinfobar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkinvisible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklabel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklayout.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklevelbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklinkbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkliststore.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklockbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmain.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenu.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenubar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenubutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenushell.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenutoolbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmessagedialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmisc.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmodules.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmountoperation.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtknotebook.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtknumerableicon.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkoffscreenwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkorientable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkoverlay.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpagesetup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpaned.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpapersize.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkplug.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintcontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintoperation.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintoperationpreview.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintsettings.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprivate.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprivatetypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprogressbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradioaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradiobutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradiomenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradiotoolbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrange.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchooserdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchoosermenu.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentfilter.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentmanager.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscale.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscalebutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscrollable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscrollbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscrolledwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksearchentry.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkselection.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkseparator.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkseparatormenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkseparatortoolitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksettings.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkshow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksizegroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksizerequest.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksocket.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkspinbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkspinner.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstatusbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstatusicon.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstock.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstylecontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstyleproperties.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstyleprovider.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkswitch.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktestutils.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextattributes.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextbuffer.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextbufferrichtext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextchild.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextdisplay.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextiter.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextlayout.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextmark.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktexttag.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktexttagtable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextview.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkthemingengine.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoggleaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktogglebutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoggletoolbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolitemgroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolpalette.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolshell.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktooltip.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreednd.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreemodel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreemodelfilter.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreemodelsort.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreeselection.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreesortable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreestore.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreeview.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreeviewcolumn.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkuimanager.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkversion.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkviewport.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvolumebutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;;
-copy ..\..\..\gtk\gtkwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtk.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkx.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtk-a11y.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaboutdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaccelgroup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaccelgroupprivate.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaccellabel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaccelmap.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkactiongroup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkactionable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkactivatable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkadjustment.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkalignment.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkappchooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkappchooserbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkappchooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkappchooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkapplication.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkapplicationwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkarrow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaspectframe.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkassistant.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbin.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbindings.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkborder.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbuildable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbuilder.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcalendar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellarea.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellareabox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellareacontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcelleditable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcelllayout.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrenderer.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendereraccel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrenderercombo.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendererpixbuf.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendererprogress.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendererspin.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendererspinner.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrenderertext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrenderertoggle.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellview.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcheckbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcheckmenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkclipboard.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcolorbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcolorchooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcolorchooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcolorchooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcolorutils.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcombobox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcomboboxtext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcontainer.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcssprovider.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcsssection.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkdebug.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkdnd.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkdrawingarea.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkeditable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkentry.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkentrybuffer.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkentrycompletion.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkenums.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkeventbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkexpander.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfilechooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfilechooserbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfilechooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfilechooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfilefilter.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfixed.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfontbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfontchooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfontchooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfontchooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkframe.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkgrid.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkiconfactory.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkicontheme.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkiconview.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimage.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimagemenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimcontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimcontextinfo.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimcontextsimple.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimmodule.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimmulticontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkinfobar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkinvisible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklabel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklayout.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklevelbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklinkbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkliststore.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklockbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmain.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenu.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenubar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenubutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenushell.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenutoolbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmessagedialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmisc.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmodules.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmountoperation.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtknotebook.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtknumerableicon.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkoffscreenwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkorientable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkoverlay.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkpagesetup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkpapersize.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkplug.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprintcontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprintoperation.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprintoperationpreview.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprintsettings.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprivate.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprivatetypebuiltins.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprogressbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkradioaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkradiobutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkradiomenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkradiotoolbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrange.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentchooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentchooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentchoosermenu.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentchooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentfilter.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentmanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkscalebutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkscrollable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkscrolledwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksearchentry.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkselection.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkseparatormenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkseparatortoolitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksettings.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkshow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksizegroup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksizerequest.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksocket.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkspinbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkspinner.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstatusbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstatusicon.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstock.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstylecontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstyleproperties.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstyleprovider.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkswitch.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktestutils.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextattributes.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextbuffer.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextbufferrichtext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextchild.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextdisplay.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextiter.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextlayout.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextmark.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktexttag.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktexttagtable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextview.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkthemingengine.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoggleaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktogglebutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoggletoolbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolitemgroup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolpalette.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolshell.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktooltip.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreednd.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreemodel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreemodelfilter.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreemodelsort.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreeselection.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreesortable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreestore.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreeview.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreeviewcolumn.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktypes.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkuimanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkversion.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkviewport.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkvolumebutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;;
+copy ..\..\..\gtk\gtkwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;

-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;

-copy ..\..\..\gtk\deprecated\gtkcolorsel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkcolorseldialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkfontsel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkgradient.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhandlebox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhbbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhpaned.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhscale.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhsv.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhscrollbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhseparator.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkrc.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkstyle.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtksymboliccolor.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtktable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtktearoffmenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvbbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvscale.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvscrollbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvseparator.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvpaned.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkcolorsel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkcolorseldialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkfontsel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkgradient.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhandlebox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhsv.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkrc.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkstyle.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtksymboliccolor.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtktable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtktearoffmenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkvbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkvbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkvscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkvscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkvseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkvpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;

-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\a11y&#x0D;&#x0A;

-copy ..\..\..\gtk\a11y\gtkarrowaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkbooleancellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkbuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkcellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkcellaccessibleparent.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkcheckmenuitemaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkcomboboxaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkcontaineraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkcontainercellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkentryaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkexpanderaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkframeaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkiconviewaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkimageaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkimagecellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtklabelaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtklevelbaraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtklinkbuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtklockbuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkmenuaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkmenuitemaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkmenushellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtknotebookaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtknotebookpageaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkpanedaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkprogressbaraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkradiobuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkradiomenuitemaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkrangeaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkrenderercellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkscaleaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkscalebuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkscrolledwindowaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkspinbuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkspinneraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkstatusbaraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkswitchaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtktextcellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtktextviewaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtktogglebuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtktoplevelaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtktreeviewaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkwidgetaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkwindowaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkarrowaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkbooleancellaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkbuttonaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkcellaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkcellaccessibleparent.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkcheckmenuitemaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkcomboboxaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkcontaineraccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkcontainercellaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkentryaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkexpanderaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkframeaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkiconviewaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkimageaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkimagecellaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtklabelaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtklinkbuttonaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtklockbuttonaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkmenuaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkmenuitemaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkmenushellaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtknotebookaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtknotebookpageaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkpanedaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkprogressbaraccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkradiobuttonaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkradiomenuitemaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkrangeaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkrenderercellaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkscaleaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkscalebuttonaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkscrolledwindowaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkspinbuttonaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkspinneraccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkstatusbaraccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkswitchaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtktextcellaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtktextviewaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtktogglebuttonaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtktoplevelaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtktreeviewaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkwidgetaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkwindowaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\a11y&#x0D;&#x0A;

-mkdir $(CopyDir)\include\gail-$(ApiVersion)\libgail-util&#x0D;&#x0A;
-copy ..\..\..\libgail-util\gail-util.h $(CopyDir)\include\gail-$(ApiVersion)\libgail-util&#x0D;&#x0A;
-copy ..\..\..\libgail-util\gailmisc.h $(CopyDir)\include\gail-$(ApiVersion)\libgail-util&#x0D;&#x0A;
-copy ..\..\..\libgail-util\gailtextutil.h $(CopyDir)\include\gail-$(ApiVersion)\libgail-util&#x0D;&#x0A;
+mkdir $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
+copy ..\..\..\libgail-util\gail-util.h $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
+copy ..\..\..\libgail-util\gailmisc.h $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
+copy ..\..\..\libgail-util\gailtextutil.h $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;

 copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\include\gtk-3.0\gdk&#x0D;&#x0A;

-copy $(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;

 mkdir $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-
 echo &quot;Compiling gsettings XML Files...&quot;&#x0D;&#x0A;
 $(CopyDir)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 "
 	/>
-	<UserMacro
-		Name="DoGenGir"
-		Value="
-set VSVER=$(VSVer)&#x0D;&#x0A;
-set CONF=$(ConfigurationName)&#x0D;&#x0A;
-set PLAT=$(PlatformName)&#x0D;&#x0A;
-set BASEDIR=$(GlibEtcInstallRootFromBuildWin32)&#x0D;&#x0A;
-cd ..&#x0D;&#x0A;
-
-call gengir_gtk.bat&#x0D;&#x0A;
-cd vs$(VSVer)&#x0D;&#x0A;
-		      "
-	/>
 	<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;"
@@ -451,24 +435,24 @@ cd vs$(VSVer)&#x0D;&#x0A;
 	/>
 	<UserMacro
 		Name="GtkLibtoolCompatibleDllSuffix"
-		Value="-$(ApiVersion)-0"
+		Value="-$(GtkApiVersion)-0"
 	/>
 	<UserMacro
-		Name="GtkSeparateVSDllPrefix"
+		Name="GtkSeparateVS9DllPrefix"
 		Value=""
 	/>
 	<UserMacro
-		Name="GtkSeparateVSDllSuffix"
-		Value="-3-vs$(VSVer)"
+		Name="GtkSeparateVS9DllSuffix"
+		Value="-3-vs9"
 	/>
 	<!-- Change these two to GtkLibtoolCompatibleDllPrefix and
 	GtkLibtoolCompatibleDllSuffix if that is what you want -->
 	<UserMacro
 		Name="GtkDllPrefix"
-		Value="$(GtkSeparateVSDllPrefix)"
+		Value="$(GtkSeparateVS9DllPrefix)"
 	/>
 	<UserMacro
 		Name="GtkDllSuffix"
-		Value="$(GtkSeparateVSDllSuffix)"
+		Value="$(GtkSeparateVS9DllSuffix)"
 	/>
 </VisualStudioPropertySheet>
--- a/build/win32/vs9/gtk.vcprojin
+++ b/build/win32/vs9/gtk.vcprojin
@@ -35,7 +35,7 @@
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
@@ -48,7 +48,7 @@
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="1"
 			/>
 		</Configuration>
@@ -81,7 +81,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="1"
 			/>
 		</Configuration>
@@ -114,7 +114,7 @@
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>
@@ -147,7 +147,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>
--- a/build/win32/vs9/gtk3-demo-application.vcproj
+++ b/build/win32/vs9/gtk3-demo-application.vcproj
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk3-demo-application"
-	ProjectGUID="{3281202A-CD26-4C67-B892-EB34BDBC612F}"
-	RootNamespace="gtk3demoapplication"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-		</Filter>
-			<File RelativePath="..\..\..\demos\gtk-demo\application-standalone.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\demo_resources.c" />
-		<Filter
-			Name="Headers"
-			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;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/build/win32/vs9/gtk3-demo.vcproj
+++ b/build/win32/vs9/gtk3-demo.vcproj
@@ -35,7 +35,7 @@
 				PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
@@ -90,7 +90,7 @@
 			ConfigurationType="1"
 			InheritedPropertySheets=".\gtk+.vsprops"
 			CharacterSet="2"
-			WholeProgramOptimization="0"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -123,7 +123,7 @@
 			ConfigurationType="1"
 			InheritedPropertySheets=".\gtk+.vsprops"
 			CharacterSet="2"
-			WholeProgramOptimization="0"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -204,6 +204,7 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\stock_browser.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\textscroll.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\textview.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\theming_custom_css.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\theming_style_classes.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\toolpalette.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\transparent.c" />
--- a/build/win32/vs9/libgail.vcprojin
+++ b/build/win32/vs9/libgail.vcprojin
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="gtka11y"
+	Name="libgail"
 	ProjectGUID="{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
-	RootNamespace="gtka11y"
+	RootNamespace="libgail"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
 	>
@@ -115,7 +115,7 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-#include "gtka11y.sourcefiles"
+#include "libgail.sourcefiles"
 		</Filter>
 		<Filter
 			Name="Headers"
--- a/configure.ac
+++ b/configure.ac
@@ -9,8 +9,8 @@
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.

 m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [9])
-m4_define([gtk_micro_version], [0])
+m4_define([gtk_minor_version], [7])
+m4_define([gtk_micro_version], [9])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
          [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -42,7 +42,7 @@ AC_CANONICAL_TARGET
 m4_define([gtk_binary_version], [3.0.0])

 # required versions of other packages
-m4_define([glib_required_version], [2.37.0])
+m4_define([glib_required_version], [2.35.3])
 m4_define([pango_required_version], [1.32.4])
 m4_define([atk_required_version], [2.7.5])
 m4_define([cairo_required_version], [1.10.0])
@@ -350,7 +350,7 @@ if test "$enable_win32_backend" = "yes"; then
  backend_immodules="$backend_immodules,ime"
  GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WIN32"
-  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm"
+  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid"
  AM_CONDITIONAL(USE_WIN32, true)
  PANGO_PACKAGES="pangowin32 pangocairo"
 else
@@ -390,7 +390,6 @@ else
  AM_CONDITIONAL(USE_BROADWAY, false)
 fi

-DISABLE_ON_WAYLAND=''
 if test "x$enable_wayland_backend" = "xyes"; then
  # For the cairo image backend
  cairo_backends="$cairo_backends cairo"
@@ -398,13 +397,11 @@ if test "x$enable_wayland_backend" = "xyes"; then
  have_gio_unix=yes
  GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WAYLAND"
-  DISABLE_ON_WAYLAND='%'
  WAYLAND_PACKAGES="wayland-client >= 1.0.0 xkbcommon >= 0.2.0 wayland-cursor"
  AM_CONDITIONAL(USE_WAYLAND, true)
 else
  AM_CONDITIONAL(USE_WAYLAND, false)
 fi
-AC_SUBST(DISABLE_ON_WAYLAND)

 # strip leading space
 GDK_BACKENDS=${GDK_BACKENDS#* }
@@ -1424,7 +1421,7 @@ else
 	    $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6; then
      AC_DEFINE(HAVE_CUPS_API_1_6, 1,
                [Define to 1 if CUPS 1.6 API is available])
-      have_cups_api_1_6=yes
+
    fi

    AC_SUBST(CUPS_API_MAJOR)
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -43,7 +43,6 @@ demos =						\
 	search_entry.c				\
 	sizegroup.c				\
 	spinner.c				\
-	stack.c					\
 	stock_browser.c				\
 	textview.c				\
 	textscroll.c				\
@@ -111,7 +110,6 @@ RESOURCES=	$(demos)			\
 		application.ui			\
 		demo.ui				\
 		menus.ui			\
-		stack.ui			\
 		theming.ui			\
 		alphatest.png			\
 		apple-red.png			\
--- a/demos/gtk-demo/changedisplay.c
+++ b/demos/gtk-demo/changedisplay.c
@@ -1,23 +1,24 @@
 /* Change Display
 *
- * Demonstrates migrating a window between different displays.
- * A display is a mouse and keyboard with some number of
- * associated monitors. The neat thing about having multiple 
- * displays is that they can be on a completely separate
+ * Demonstrates migrating a window between different displays and
+ * screens. A display is a mouse and keyboard with some number of
+ * associated monitors. A screen is a set of monitors grouped
+ * into a single physical work area. The neat thing about having
+ * multiple displays is that they can be on a completely separate
 * computers, as long as there is a network connection to the
 * computer where the application is running.
 *
 * Only some of the windowing systems where GTK+ runs have the
- * concept of multiple displays. (The X Window System is the
- * main example.) Other windowing systems can only handle one
- * keyboard and mouse, and combine all monitors into
- * a single display.
+ * concept of multiple displays and screens. (The X Window System
+ * is the main example.) Other windowing systems can only
+ * handle one keyboard and mouse, and combine all monitors into
+ * a single screen.
 *
 * This is a moderately complex example, and demonstrates:
 *
- *  - Tracking the currently open displays
+ *  - Tracking the currently open displays and screens
 *
- *  - Changing the display for a window
+ *  - Changing the screen for a window
 *
 *  - Letting the user choose a window by clicking on it
 *
@@ -44,8 +45,11 @@ struct _ChangeDisplayInfo
  GtkSizeGroup *size_group;

  GtkTreeModel *display_model;
+  GtkTreeModel *screen_model;
+  GtkTreeSelection *screen_selection;

  GdkDisplay *current_display;
+  GdkScreen *current_screen;
 };

 /* These enumerations provide symbolic names for the columns
@@ -173,11 +177,40 @@ query_change_display (ChangeDisplayInfo *info)
                                 "to move to the new screen");

  if (toplevel)
-    gtk_window_set_screen (GTK_WINDOW (toplevel), gdk_display_get_screen (info->current_display, 0));
+    gtk_window_set_screen (GTK_WINDOW (toplevel), info->current_screen);
  else
    gdk_display_beep (gdk_screen_get_display (screen));
 }

+/* Fills in the screen list based on the current display
+ */
+static void
+fill_screens (ChangeDisplayInfo *info)
+{
+  gtk_list_store_clear (GTK_LIST_STORE (info->screen_model));
+
+  if (info->current_display)
+    {
+      gint n_screens = gdk_display_get_n_screens (info->current_display);
+      gint i;
+
+      for (i = 0; i < n_screens; i++)
+        {
+          GdkScreen *screen = gdk_display_get_screen (info->current_display, i);
+          GtkTreeIter iter;
+
+          gtk_list_store_append (GTK_LIST_STORE (info->screen_model), &iter);
+          gtk_list_store_set (GTK_LIST_STORE (info->screen_model), &iter,
+                              SCREEN_COLUMN_NUMBER, i,
+                              SCREEN_COLUMN_SCREEN, screen,
+                              -1);
+
+          if (i == 0)
+            gtk_tree_selection_select_iter (info->screen_selection, &iter);
+        }
+    }
+}
+
 /* Called when the user clicks on a button in our dialog or
 * closes the dialog through the window manager. Unless the
 * "Change" button was clicked, we destroy the dialog.
@@ -287,6 +320,28 @@ display_changed_cb (GtkTreeSelection  *selection,
                        -1);
  else
    info->current_display = NULL;
+
+  fill_screens (info);
+}
+
+/* Called when the selected row in the sceen list changes.
+ * Updates info->current_screen.
+ */
+static void
+screen_changed_cb (GtkTreeSelection  *selection,
+                   ChangeDisplayInfo *info)
+{
+  GtkTreeModel *model;
+  GtkTreeIter iter;
+
+  if (info->current_screen)
+    g_object_unref (info->current_screen);
+  if (gtk_tree_selection_get_selected (selection, &model, &iter))
+    gtk_tree_model_get (model, &iter,
+                        SCREEN_COLUMN_SCREEN, &info->current_screen,
+                        -1);
+  else
+    info->current_screen = NULL;
 }

 /* This function is used both for creating the "Display" and
@@ -391,6 +446,37 @@ create_display_frame (ChangeDisplayInfo *info)
  return frame;
 }

+/* Creates the "Screen" frame in the main window.
+ */
+GtkWidget *
+create_screen_frame (ChangeDisplayInfo *info)
+{
+  GtkWidget *frame;
+  GtkWidget *tree_view;
+  GtkWidget *button_vbox;
+  GtkTreeViewColumn *column;
+
+  create_frame (info, "Screen", &frame, &tree_view, &button_vbox);
+
+  info->screen_model = (GtkTreeModel *)gtk_list_store_new (SCREEN_NUM_COLUMNS,
+                                                           G_TYPE_INT,
+                                                           GDK_TYPE_SCREEN);
+
+  gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), info->screen_model);
+
+  column = gtk_tree_view_column_new_with_attributes ("Number",
+                                                     gtk_cell_renderer_text_new (),
+                                                     "text", SCREEN_COLUMN_NUMBER,
+                                                     NULL);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
+
+  info->screen_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
+  g_signal_connect (info->screen_selection, "changed",
+                    G_CALLBACK (screen_changed_cb), info);
+
+  return frame;
+}
+
 /* Called when one of the currently open displays is closed.
 * Remove it from our list of displays.
 */
@@ -494,9 +580,12 @@ destroy_info (ChangeDisplayInfo *info)

  g_object_unref (info->size_group);
  g_object_unref (info->display_model);
+  g_object_unref (info->screen_model);

  if (info->current_display)
    g_object_unref (info->current_display);
+  if (info->current_screen)
+    g_object_unref (info->current_screen);

  g_free (info);
 }
@@ -548,6 +637,9 @@ do_changedisplay (GtkWidget *do_widget)
      frame = create_display_frame (info);
      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);

+      frame = create_screen_frame (info);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+
      initialize_displays (info);

      gtk_widget_show_all (info->window);
--- a/demos/gtk-demo/css_accordion.css
+++ b/demos/gtk-demo/css_accordion.css
@@ -1,4 +1,4 @@
-@import url("resource://css_accordion/reset.css");
+@import url("reset.css");

 * {
    transition-property: color, background-color, border-color, background-image, padding, border-width;
--- a/demos/gtk-demo/css_basics.css
+++ b/demos/gtk-demo/css_basics.css
@@ -6,7 +6,7 @@

 /* This CSS resets all properties to their defaults values
 *    and overrides all user settings and the theme in use */
-@import url("resource://css_basics/reset.css");
+@import url("reset.css");

 /* Set a very futuristic style by default */
 * {
--- a/demos/gtk-demo/css_multiplebgs.css
+++ b/demos/gtk-demo/css_multiplebgs.css
@@ -6,8 +6,8 @@

 /* This CSS resets all properties to their defaults values
 *    and overrides all user settings and the theme in use */
-@import url("resource://css_multiplebgs/reset.css");
-@import url("resource://css_multiplebgs/cssview.css");
+@import url("reset.css");
+@import url("cssview.css");

 #canvas {
    transition-property: background-color, background-image;
--- a/demos/gtk-demo/css_pixbufs.css
+++ b/demos/gtk-demo/css_pixbufs.css
@@ -6,8 +6,8 @@

 /* This CSS resets all properties to their defaults values
 *    and overrides all user settings and the theme in use */
-@import url("resource://css_pixbufs/reset.css");
-@import url("resource://css_pixbufs/cssview.css");
+@import url("reset.css");
+@import url("cssview.css");

@keyframes move-the-image {
 0% { background-position: 50.00% 75.00%, 67.68% 67.68%, 75.00% 50.00%, 67.68% 32.32%, 50.00% 25.00%, 32.32% 32.32%, 25.00% 50.00%, 32.32% 67.68%, 0% 0%; }
@@ -51,15 +51,15 @@
 }

 GtkWindow {
-    background-image: url("resource://css_pixbufs/apple-red.png"),
-                      url("resource://css_pixbufs/gnome-applets.png"),
-                      url("resource://css_pixbufs/gnome-calendar.png"),
-                      url("resource://css_pixbufs/gnome-foot.png"),
-                      url("resource://css_pixbufs/gnome-gmush.png"),
-                      url("resource://css_pixbufs/gnome-gimp.png"),
-                      url("resource://css_pixbufs/gnome-gsame.png"),
-                      url("resource://css_pixbufs/gnu-keys.png"),
-                      url("resource://css_pixbufs/background.jpg");
+    background-image: url("apple-red.png"),
+                      url("gnome-applets.png"),
+                      url("gnome-calendar.png"),
+                      url("gnome-foot.png"),
+                      url("gnome-gmush.png"),
+                      url("gnome-gimp.png"),
+                      url("gnome-gsame.png"),
+                      url("gnu-keys.png"),
+                      url("background.jpg");
    background-position: 50.00% 75.00%, 67.68% 67.68%, 75.00% 50.00%, 67.68% 32.32%, 50.00% 25.00%, 32.32% 32.32%, 25.00% 50.00%, 32.32% 67.68%, 0% 0%;
    background-repeat: no-repeat, no-repeat, no-repeat, no-repeat, no-repeat, no-repeat, no-repeat, no-repeat, repeat;
    animation: move-the-image infinite linear 3s, size-the-image infinite alternate ease-in-out 0.75s;
--- a/demos/gtk-demo/css_shadows.css
+++ b/demos/gtk-demo/css_shadows.css
@@ -6,8 +6,8 @@

 /* This CSS resets all properties to their defaults values
 *    and overrides all user settings and the theme in use */
-@import url("resource://css_shadows/reset.css");
-@import url("resource://css_shadows/cssview.css");
+@import url("reset.css");
+@import url("cssview.css");

 /* Get a nice background for the window */
 .background {
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -55,9 +55,6 @@
    <file preprocess="to-pixdata">gnome-fs-directory.png</file>
    <file preprocess="to-pixdata">gnome-fs-regular.png</file>
  </gresource>
-  <gresource prefix="/stack">
-    <file>stack.ui</file>
-  </gresource>
  <gresource prefix="/images">
    <file>alphatest.png</file>
    <file>floppybuddy.gif</file>
@@ -113,7 +110,6 @@
    <file>rotated_text.c</file>
    <file>search_entry.c</file>
    <file>sizegroup.c</file>
-    <file>stack.c</file>
    <file>spinner.c</file>
    <file>stock_browser.c</file>
    <file>textview.c</file>
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -9,8 +9,8 @@

 #include "demos.h"

-static GtkWidget *info_view;
-static GtkWidget *source_view;
+static GtkTextBuffer *info_buffer;
+static GtkTextBuffer *source_buffer;

 static gchar *current_file = NULL;

@@ -353,7 +353,7 @@ parse_chars (gchar     *text,

 /* While not as cool as c-mode, this will do as a quick attempt at highlighting */
 static void
-fontify (GtkTextBuffer *source_buffer)
+fontify (void)
 {
  GtkTextIter start_iter, next_iter, tmp_iter;
  gint state;
@@ -398,12 +398,13 @@ fontify (GtkTextBuffer *source_buffer)
    }
 }

-static GtkWidget *create_text (GtkWidget **text_view, gboolean is_source);
+static GtkWidget *create_text (GtkTextBuffer **buffer, gboolean is_source);

 static void
 add_data_tab (const gchar *demoname)
 {
-  gchar *resource_dir, *resource_name, *content_type, *content_mime;
+  GtkTextBuffer *buffer = NULL;
+  gchar *resource_dir, *resource_name, *content_type;
  gchar **resources;
  GBytes *bytes;
  GtkWidget *widget, *label;
@@ -427,33 +428,24 @@ add_data_tab (const gchar *demoname)
                                           g_bytes_get_data (bytes, NULL),
                                           g_bytes_get_size (bytes),
                                           NULL);
-      content_mime = g_content_type_get_mime_type (content_type);

      /* In theory we should look at all the mime types gdk-pixbuf supports
       * and go from there, but we know what file types we've added.
       */
-      if (g_content_type_is_a (content_mime, "image/png") ||
-          g_content_type_is_a (content_mime, "image/gif") ||
-          g_content_type_is_a (content_mime, "image/jpeg"))
+      if (g_content_type_is_a (content_type, "image/png") ||
+          g_content_type_is_a (content_type, "image/gif") ||
+          g_content_type_is_a (content_type, "image/jpeg"))
        {
          widget = gtk_image_new_from_resource (resource_name);
        }
-      else if (g_content_type_is_a (content_mime, "text/plain") ||
-               g_content_type_is_a (content_mime, "application/x-ext-ui") ||
-               g_content_type_is_a (content_mime, "text/css"))
+      else if (g_content_type_is_a (content_type, "text/plain"))
        {
-          GtkTextBuffer *buffer;
-          GtkWidget *textview;
-
-          widget = create_text (&textview, FALSE);
-          buffer = gtk_text_buffer_new (NULL);
+          widget = create_text (&buffer, FALSE);
          gtk_text_buffer_set_text (buffer, g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes));
-          gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);
        }
      else
        {
-
-          g_warning ("Don't know how to display resource '%s' of type '%s'\n", resource_name, content_mime);
+          g_warning ("Don't know how to display resource '%s' of type '%s'\n", resource_name, content_type);
          widget = NULL;
        }

@@ -462,7 +454,6 @@ add_data_tab (const gchar *demoname)
      gtk_widget_show (label);
      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), widget, label);

-      g_free (content_mime);
      g_free (content_type);
      g_free (resource_name);
      g_bytes_unref (bytes);
@@ -485,7 +476,6 @@ void
 load_file (const gchar *demoname,
           const gchar *filename)
 {
-  GtkTextBuffer *info_buffer, *source_buffer;
  GtkTextIter start, end;
  char *resource_filename;
  GError *err = NULL;
@@ -505,34 +495,11 @@ load_file (const gchar *demoname,
  g_free (current_file);
  current_file = g_strdup (filename);

-  info_buffer = gtk_text_buffer_new (NULL);
-  gtk_text_buffer_create_tag (info_buffer, "title",
-                              "font", "Sans 18",
-                              "pixels-below-lines", 10,
-                              NULL);
+  gtk_text_buffer_get_bounds (info_buffer, &start, &end);
+  gtk_text_buffer_delete (info_buffer, &start, &end);

-  source_buffer = gtk_text_buffer_new (NULL);
-  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);
+  gtk_text_buffer_get_bounds (source_buffer, &start, &end);
+  gtk_text_buffer_delete (source_buffer, &start, &end);

  resource_filename = g_strconcat ("/sources/", filename, NULL);
  bytes = g_resources_lookup_data (resource_filename, 0, &err);
@@ -662,14 +629,9 @@ load_file (const gchar *demoname,
        }
    }

-  fontify (source_buffer);
+  fontify ();

  g_strfreev (lines);
-
-  gtk_text_view_set_buffer (GTK_TEXT_VIEW (info_view), info_buffer);
-  g_object_unref (info_buffer);
-  gtk_text_view_set_buffer (GTK_TEXT_VIEW (source_view), source_buffer);
-  g_object_unref (source_buffer);
 }

 void
@@ -737,8 +699,8 @@ selection_cb (GtkTreeSelection *selection,
 }

 static GtkWidget *
-create_text (GtkWidget **view,
-             gboolean    is_source)
+create_text (GtkTextBuffer **buffer,
+             gboolean        is_source)
 {
  GtkWidget *scrolled_window;
  GtkWidget *text_view;
@@ -751,9 +713,11 @@ create_text (GtkWidget **view,
  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
                                       GTK_SHADOW_IN);

-  *view = text_view = gtk_text_view_new ();
+  text_view = gtk_text_view_new ();
  g_object_set (text_view, "margin", 20, NULL);

+  *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);

@@ -935,13 +899,43 @@ main (int argc, char **argv)
  gtk_box_pack_start (GTK_BOX (hbox), notebook, TRUE, TRUE, 0);

  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-                            create_text (&info_view, FALSE),
+                            create_text (&info_buffer, FALSE),
                            gtk_label_new_with_mnemonic ("_Info"));

+  gtk_text_buffer_create_tag (info_buffer, "title",
+                              "font", "Sans 18",
+                              "pixels-below-lines", 10,
+                              NULL);
+  g_object_unref (info_buffer);
+
  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-                            create_text (&source_view, TRUE),
+                            create_text (&source_buffer, TRUE),
                            gtk_label_new_with_mnemonic ("_Source"));

+
+  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/pixbufs.c
+++ b/demos/gtk-demo/pixbufs.c
@@ -16,6 +16,8 @@
 #include <gtk/gtk.h>
 #include <math.h>

+#define FRAME_DELAY 50
+
 #define BACKGROUND_NAME "/pixbufs/background.jpg"

 static const char *image_names[] = {
@@ -86,17 +88,14 @@ draw_cb (GtkWidget *widget,
  return TRUE;
 }

-#define CYCLE_TIME 3000000 /* 3 seconds */
+#define CYCLE_LEN 60

-static gint64 start_time;
+static int frame_num;

-/* Handler to regenerate the frame */
-static gboolean
-on_tick (GtkWidget     *widget,
-         GdkFrameClock *frame_clock,
-         gpointer       data)
+/* Timeout handler to regenerate the frame */
+static gint
+timeout (gpointer data)
 {
-  gint64 current_time;
  double f;
  int i;
  double xmid, ymid;
@@ -105,11 +104,7 @@ on_tick (GtkWidget     *widget,
  gdk_pixbuf_copy_area (background, 0, 0, back_width, back_height,
                        frame, 0, 0);

-  if (start_time == 0)
-    start_time = gdk_frame_clock_get_frame_time (frame_clock);
-
-  current_time = gdk_frame_clock_get_frame_time (frame_clock);
-  f = ((current_time - start_time) % CYCLE_TIME) / (double)CYCLE_TIME;
+  f = (double) (frame_num % CYCLE_LEN) / CYCLE_LEN;

  xmid = back_width / 2.0;
  ymid = back_height / 2.0;
@@ -164,9 +159,20 @@ on_tick (GtkWidget     *widget,

  gtk_widget_queue_draw (da);

+  frame_num++;
  return G_SOURCE_CONTINUE;
 }

+static guint timeout_id;
+
+static void
+cleanup_callback (GObject   *object,
+                  gpointer   data)
+{
+  g_source_remove (timeout_id);
+  timeout_id = 0;
+}
+
 GtkWidget *
 do_pixbufs (GtkWidget *do_widget)
 {
@@ -182,6 +188,8 @@ do_pixbufs (GtkWidget *do_widget)

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


      error = NULL;
@@ -216,7 +224,7 @@ do_pixbufs (GtkWidget *do_widget)

          gtk_container_add (GTK_CONTAINER (window), da);

-          gtk_widget_add_tick_callback (da, on_tick, NULL, NULL);
+          timeout_id = g_timeout_add (FRAME_DELAY, timeout, NULL);
        }
    }

--- a/demos/gtk-demo/stack.c
+++ b/demos/gtk-demo/stack.c
@@ -1,48 +0,0 @@
-/* Stack
- *
- * GtkStack is a container that shows a single child at a time,
- * with nice transitions when the visible child changes.
- *
- * GtkStackSwitcher adds buttons to control which child is visible.
- */
-
-#include <gtk/gtk.h>
-
-static GtkBuilder *builder;
-
-GtkWidget *
-do_stack (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  GError *err = NULL;
-
-  if (!window)
-    {
-      builder = gtk_builder_new ();
-      gtk_builder_add_from_resource (builder, "/stack/stack.ui", &err);
-      if (err)
-        {
-          g_error ("ERROR: %s\n", err->message);
-          return NULL;
-        }
-      gtk_builder_connect_signals (builder, NULL);
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
-      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-
-  return window;
-}
--- a/demos/gtk-demo/stack.ui
+++ b/demos/gtk-demo/stack.ui
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.6 -->
-  <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">GtkStack</property>
-    <child>
-      <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <child>
-          <object class="GtkStackSwitcher" id="switcher">
-            <property name="visible">True</property>
-            <property name="stack">stack</property>
-            <property name="halign">center</property>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkStack" id="stack">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="transition-type">crossfade</property>
-            <child>
-              <object class="GtkImage" id="image1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin-top">20</property>
-                <property name="margin-bottom">20</property>
-                <property name="resource">/application/gtk-logo-48.png</property>
-              </object>
-              <packing>
-                <property name="name">page1</property>
-                <property name="title" translatable="yes">Page 1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="checkbutton1">
-                <property name="label" translatable="yes">Page 2</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="xalign">0</property>
-                <property name="draw_indicator">True</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-              </object>
-              <packing>
-                <property name="name">page2</property>
-                <property name="title" translatable="yes">Page 2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinner" id="spinner1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="active">True</property>
-              </object>
-              <packing>
-                <property name="name">page3</property>
-                <property name="icon-name">face-laugh-symbolic</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
--- a/demos/gtk-demo/textscroll.c
+++ b/demos/gtk-demo/textscroll.c
@@ -85,7 +85,7 @@ scroll_to_bottom (GtkTextView *textview)
  gtk_text_iter_set_line_offset (&iter, 0);

  /* and place the mark at iter. the mark will stay there after we
-   * insert some text at the end because it has left gravity.
+   * insert some text at the end because it has right gravity.
   */
  mark = gtk_text_buffer_get_mark (buffer, "scroll");
  gtk_text_buffer_move_mark (buffer, mark, &iter);
--- a/demos/pixbuf-demo/pixbuf-demo.c
+++ b/demos/pixbuf-demo/pixbuf-demo.c
@@ -25,6 +25,8 @@



+#define FRAME_DELAY 50
+
 #define BACKGROUND_NAME "background.jpg"

 static const char *image_names[] = {
@@ -91,17 +93,14 @@ draw_cb (GtkWidget *widget, cairo_t *cr, gpointer data)
 	return TRUE;
 }

-#define CYCLE_TIME 3000000 /* 3 seconds */
+#define CYCLE_LEN 60

-static gint64 start_time;
+static int frame_num;

-/* Handler to regenerate the frame */
-static gboolean
-on_tick (GtkWidget     *widget,
-         GdkFrameClock *frame_clock,
-         gpointer       data)
+/* Timeout handler to regenerate the frame */
+static gint
+timeout (gpointer data)
 {
-	gint64	current_time;
 	double f;
 	int i;
 	double xmid, ymid;
@@ -110,11 +109,7 @@ on_tick (GtkWidget     *widget,
 	gdk_pixbuf_copy_area (background, 0, 0, back_width, back_height,
 			      frame, 0, 0);

-        if (start_time == 0)
-          start_time = gdk_frame_clock_get_frame_time (frame_clock);
-
-	current_time = gdk_frame_clock_get_frame_time (frame_clock);
-	f = ((current_time - start_time) % CYCLE_TIME) / (double)CYCLE_TIME;
+	f = (double) (frame_num % CYCLE_LEN) / CYCLE_LEN;

 	xmid = back_width / 2.0;
 	ymid = back_height / 2.0;
@@ -168,13 +163,19 @@ on_tick (GtkWidget     *widget,

 	gtk_widget_queue_draw (da);

-	return G_SOURCE_CONTINUE;
+	frame_num++;
+	return TRUE;
 }

+static guint timeout_id;
+
 /* Destroy handler for the window */
 static void
 destroy_cb (GObject *object, gpointer data)
 {
+	g_source_remove (timeout_id);
+	timeout_id = 0;
+
 	gtk_main_quit ();
 }

@@ -207,7 +208,7 @@ main (int argc, char **argv)

 	gtk_container_add (GTK_CONTAINER (window), da);

-	gtk_widget_add_tick_callback (da, on_tick, NULL, NULL);
+	timeout_id = gdk_threads_add_timeout (FRAME_DELAY, timeout, NULL);

 	gtk_widget_show_all (window);
 	gtk_main ();
--- a/docs/reference/gdk/gdk-docs.sgml
+++ b/docs/reference/gdk/gdk-docs.sgml
@@ -31,8 +31,6 @@
    <xi:include href="xml/visuals.xml" />
    <xi:include href="xml/cursors.xml" />
    <xi:include href="xml/windows.xml" />
-    <xi:include href="xml/gdkframeclock.xml" />
-    <xi:include href="xml/gdkframetimings.xml" />
    <xi:include href="xml/events.xml" />
    <xi:include href="xml/event_structs.xml" />
    <xi:include href="xml/keys.xml" />
@@ -43,7 +41,6 @@
    <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/wayland_interaction.xml" />
    <xi:include href="xml/gdkapplaunchcontext.xml" />
    <xi:include href="xml/gdktestutils.xml" />
  </reference>
@@ -72,10 +69,6 @@
    <title>Index of new symbols in 3.6</title>
    <xi:include href="xml/api-index-3.6.xml"><xi:fallback /></xi:include>
  </index>
-  <index id="api-index-3-8" role="3.8">
-    <title>Index of new symbols in 3.8</title>
-    <xi:include href="xml/api-index-3.8.xml"><xi:fallback /></xi:include>
-  </index>

  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>

--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -10,7 +10,6 @@ gdk_parse_args
 gdk_get_display_arg_name
 gdk_notify_startup_complete
 gdk_notify_startup_complete_with_id
-gdk_set_allowed_backends

 <SUBSECTION>
 gdk_get_program_class
@@ -52,7 +51,6 @@ gdk_error_trap_pop_ignored
 GDK_WINDOWING_X11
 GDK_WINDOWING_WIN32
 GDK_WINDOWING_QUARTZ
-GDK_WINDOWING_WAYLAND

 <SUBSECTION>
 GDK_VERSION_3_0
@@ -172,7 +170,6 @@ GdkDisplayClass
 <TITLE>GdkDisplayManager</TITLE>
 GdkDisplayManager
 gdk_display_manager_get
-gdk_display_manager_peek
 gdk_display_manager_get_default_display
 gdk_display_manager_set_default_display
 gdk_display_manager_list_displays
@@ -407,7 +404,6 @@ gdk_window_process_updates
 gdk_window_set_debug_updates
 gdk_window_enable_synchronized_configure
 gdk_window_configure_finished
-gdk_window_get_frame_clock

 <SUBSECTION>
 gdk_window_set_user_data
@@ -992,7 +988,6 @@ gdk_x11_window_set_hide_titlebar_when_maximized
 gdk_x11_window_set_theme_variant
 gdk_x11_window_set_user_time
 gdk_x11_window_move_to_current_desktop
-gdk_x11_window_set_utf8_property
 gdk_x11_get_default_root_xwindow
 gdk_x11_get_default_screen
 gdk_x11_get_default_xdisplay
@@ -1129,54 +1124,6 @@ gdk_x11_window_get_type
 gdk_window_impl_x11_get_type
 </SECTION>

-<SECTION>
-<INCLUDE>gdk/gdkwayland.h</INCLUDE>
-<TITLE>Wayland Interaction</TITLE>
-<FILE>wayland_interaction</FILE>
-gdk_wayland_device_get_wl_keyboard
-gdk_wayland_device_get_wl_pointer
-gdk_wayland_device_get_wl_seat
-gdk_wayland_display_get_wl_compositor
-gdk_wayland_display_get_wl_display
-gdk_wayland_display_get_wl_shell
-gdk_wayland_window_get_wl_shell_surface
-gdk_wayland_window_get_wl_surface
-gdk_wayland_window_set_use_custom_surface
-
-<SUBSECTION Standard>
-GDK_TYPE_WAYLAND_DEVICE
-GDK_WAYLAND_DEVICE
-GDK_WAYLAND_DEVICE_CLASS
-GDK_WAYLAND_DEVICE_GET_CLASS
-GDK_IS_WAYLAND_DEVICE
-GDK_IS_WAYLAND_DEVICE_CLASS
-GDK_TYPE_WAYLAND_DISPLAY
-GDK_WAYLAND_DISPLAY
-GDK_WAYLAND_DISPLAY_CLASS
-GDK_WAYLAND_DISPLAY_GET_CLASS
-GDK_IS_WAYLAND_DISPLAY
-GDK_IS_WAYLAND_DISPLAY_CLASS
-GDK_TYPE_WAYLAND_DISPLAY_MANAGER
-GDK_WAYLAND_DISPLAY_MANAGER
-GDK_WAYLAND_DISPLAY_MANAGER_CLASS
-GDK_WAYLAND_DISPLAY_MANAGER_GET_CLASS
-GDK_IS_WAYLAND_DISPLAY_MANAGER
-GDK_IS_WAYLAND_DISPLAY_MANAGER_CLASS
-GDK_TYPE_WAYLAND_WINDOW
-GDK_WAYLAND_WINDOW
-GDK_WAYLAND_WINDOW_CLASS
-GDK_WAYLAND_WINDOW_GET_CLASS
-GDK_IS_WAYLAND_WINDOW
-GDK_IS_WAYLAND_WINDOW_CLASS
-
-<SUBSECTION Private>
-gdk_wayland_device_get_type
-gdk_wayland_display_get_type
-gdk_wayland_display_manager_get_type
-gdk_wayland_window_get_type
-
-</SECTION>
-
 <SECTION>
 <TITLE>Application launching</TITLE>
 <FILE>gdkapplaunchcontext</FILE>
@@ -1207,38 +1154,3 @@ gdk_test_render_sync
 gdk_test_simulate_button
 gdk_test_simulate_key
 </SECTION>
-
-<SECTION>
-<TITLE>GdkFrameClock</TITLE>
-<FILE>gdkframeclock</FILE>
-GdkFrameClock
-gdk_frame_clock_get_frame_time
-GdkFrameClockPhase
-gdk_frame_clock_request_phase
-gdk_frame_clock_begin_updating
-gdk_frame_clock_end_updating
-gdk_frame_clock_get_frame_counter
-gdk_frame_clock_get_history_start
-gdk_frame_clock_get_timings
-gdk_frame_clock_get_current_timings
-gdk_frame_clock_get_refresh_info
-<SUBSECTION Private>
-GdkFrameClockPrivate
-gdk_frame_clock_get_type
-</SECTION>
-
-<SECTION>
-<TITLE>GdkFrameTimings</TITLE>
-<FILE>gdkframetimings</FILE>
-GdkFrameTimings
-gdk_frame_timings_ref
-gdk_frame_timings_unref
-gdk_frame_timings_get_frame_counter
-gdk_frame_timings_get_complete
-gdk_frame_timings_get_frame_time
-gdk_frame_timings_get_presentation_time
-gdk_frame_timings_get_refresh_interval
-gdk_frame_timings_get_predicted_presentation_time
-<SUBSECTION Private>
-gdk_frame_get_type
-</SECTION>
--- a/docs/reference/gtk/broadwayd.xml
+++ b/docs/reference/gtk/broadwayd.xml
@@ -54,15 +54,6 @@ Start your applications like this:
 BROADWAY_DISPLAY=:5 gtk3-demo
 </programlisting>

-You can add password protection for your session by creating a file in
-<filename>$XDG_CONFIG_HOME/broadway.passwd</filename> or <filename>$HOME/.config/broadway.passwd</filename>
-with a crypt(3) style password hash.
-
-A simple way to generate it is with openssl:
-<programlisting>
-openssl passwd -1  > ~/.config/broadway.passwd
-</programlisting>
-
 </para>
 </refsect1>

--- a/docs/reference/gtk/compiling.sgml
+++ b/docs/reference/gtk/compiling.sgml
@@ -67,7 +67,7 @@ this range will trigger compiler warnings.
 Here is how you would compile hello.c if you want to allow it
 to use symbols that were not deprecated in 3.2:
 <programlisting>
-$ cc -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_2 `pkg-config --cflags --libs gtk+-3.0` hello.c -o hello
+$ cc -DGDK_VERSION_MIN_REQIRED=GDK_VERSION_3_2 `pkg-config --cflags --libs gtk+-3.0` hello.c -o hello
 </programlisting>
 </para>

--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -220,7 +220,6 @@
      <xi:include href="xml/gtkfontbutton.xml" />
      <xi:include href="xml/gtkfontchooserwidget.xml" />
      <xi:include href="xml/gtkfontchooserdialog.xml" />
-      <xi:include href="xml/gtkplacessidebar.xml" />
    </chapter>
    
    <chapter id="LayoutContainers">
@@ -234,11 +233,8 @@
      <xi:include href="xml/gtkpaned.xml" />
      <xi:include href="xml/gtklayout.xml" />
      <xi:include href="xml/gtknotebook.xml" />
-      <xi:include href="xml/gtkstack.xml" />
-      <xi:include href="xml/gtkstackswitcher.xml" />
      <xi:include href="xml/gtkexpander.xml" />
      <xi:include href="xml/gtkoverlay.xml" />
-      <xi:include href="xml/gtkheaderbar.xml" />
      <xi:include href="xml/gtkorientable.xml" />
    </chapter>

@@ -420,10 +416,6 @@
    <title>Index of new symbols in 3.8</title>
    <xi:include href="xml/api-index-3.8.xml"><xi:fallback /></xi:include>
  </index>
-  <index id="api-index-3-10" role="3.10">
-    <title>Index of new symbols in 3.10</title>
-    <xi:include href="xml/api-index-3.10.xml"><xi:fallback /></xi:include>
-  </index>

  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>

--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -539,9 +539,6 @@ gtk_builder_get_objects
 gtk_builder_expose_object
 gtk_builder_connect_signals
 gtk_builder_connect_signals_full
-gtk_builder_add_callback_symbol
-gtk_builder_add_callback_symbols
-gtk_builder_lookup_callback_symbol
 gtk_builder_set_translation_domain
 gtk_builder_get_translation_domain
 gtk_builder_get_type_from_name
@@ -2483,32 +2480,6 @@ GTK_PANED_GET_CLASS
 gtk_paned_get_type
 </SECTION>

-<SECTION>
-<FILE>gtkplacessidebar</FILE>
-<TITLE>GtkPlacesSidebar</FILE>
-GtkPlacesSidebar
-GtkPlacesOpenFlags
-gtk_places_sidebar_new
-gtk_places_sidebar_set_open_flags
-gtk_places_sidebar_set_location
-gtk_places_sidebar_get_location
-gtk_places_sidebar_set_show_desktop
-gtk_places_sidebar_set_accept_uri_drops
-gtk_places_sidebar_add_shortcut
-gtk_places_sidebar_remove_shortcut
-gtk_places_sidebar_list_shortcuts
-gtk_places_sidebar_get_nth_bookmark
-<SUBSECTION Standard>
-GTK_PLACES_SIDEBAR
-GTK_IS_PLACES_SIDEBAR
-GTK_TYPE_PLACES_SIDEBAR
-GTK_PLACES_SIDEBAR_CLASS
-GTK_IS_PLACES_SIDEBAR_CLASS
-GTK_PLACES_SIDEBAR_GET_CLASS
-<SUBSECTION Private>
-gtk_places_sidebar_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkplug</FILE>
 <TITLE>GtkPlug</TITLE>
@@ -3605,11 +3576,11 @@ gtk_text_mark_get_type
 <TITLE>GtkTextTag</TITLE>
 GtkTextTag
 GtkWrapMode
+GtkTextAttributes
 gtk_text_tag_new
 gtk_text_tag_get_priority
 gtk_text_tag_set_priority
 gtk_text_tag_event
-GtkTextAttributes
 GtkTextAppearance
 gtk_text_attributes_new
 gtk_text_attributes_copy
@@ -4771,7 +4742,6 @@ GtkCellRendererState
 GtkCellRendererMode
 GtkCellRenderer
 GtkCellRendererClass
-gtk_cell_renderer_class_set_accessible_type
 gtk_cell_renderer_get_aligned_area
 gtk_cell_renderer_get_size
 gtk_cell_renderer_render
@@ -5181,10 +5151,6 @@ gtk_widget_draw
 gtk_widget_queue_draw
 gtk_widget_queue_resize
 gtk_widget_queue_resize_no_redraw
-gtk_widget_get_frame_clock
-GtkTickCallback
-gtk_widget_add_tick_callback
-gtk_widget_remove_tick_callback
 gtk_widget_size_request
 gtk_widget_get_child_requisition
 gtk_widget_size_allocate
@@ -5312,8 +5278,6 @@ gtk_widget_get_has_tooltip
 gtk_widget_set_has_tooltip
 gtk_widget_trigger_tooltip_query
 gtk_widget_get_window
-gtk_widget_register_window
-gtk_widget_unregister_window
 gtk_cairo_should_draw_window
 gtk_cairo_transform_to_window
 gtk_widget_get_allocated_width
@@ -5357,11 +5321,6 @@ gtk_widget_get_requisition
 gtk_widget_device_is_shadowed
 gtk_widget_get_modifier_mask
 gtk_widget_insert_action_group
-gtk_widget_add_tick_callback
-gtk_widget_remove_tick_callback
-gtk_widget_get_frame_clock
-gtk_widget_get_opacity
-gtk_widget_set_opacity

 <SUBSECTION>
 gtk_widget_get_path
@@ -5411,18 +5370,6 @@ gtk_widget_set_vexpand_set
 gtk_widget_queue_compute_expand
 gtk_widget_compute_expand

-<SUBSECTION Templates>
-gtk_widget_init_template
-gtk_widget_class_set_template
-gtk_widget_class_set_template_from_resource
-gtk_widget_get_automated_child
-gtk_widget_class_bind_child
-gtk_widget_class_bind_child_internal
-gtk_widget_class_automate_child
-gtk_widget_class_bind_callback
-gtk_widget_class_declare_callback
-gtk_widget_class_set_connect_func
-
 <SUBSECTION Standard>
 GTK_WIDGET
 GTK_IS_WIDGET
@@ -5554,7 +5501,6 @@ gtk_window_get_resize_grip_area
 gtk_window_get_application
 gtk_window_set_application
 gtk_window_set_has_user_ref_count
-gtk_window_set_titlebar

 <SUBSECTION Standard>
 GTK_WINDOW
@@ -5856,7 +5802,6 @@ gtk_style_context_get_parent
 gtk_style_context_get_path
 gtk_style_context_get_property
 gtk_style_context_get_screen
-gtk_style_context_get_frame_clock
 gtk_style_context_get_state
 gtk_style_context_get_style
 gtk_style_context_get_style_property
@@ -5898,7 +5843,6 @@ gtk_style_context_remove_region
 gtk_style_context_has_region
 gtk_style_context_list_regions
 gtk_style_context_set_screen
-gtk_style_context_set_frame_clock
 gtk_style_context_set_state

 <SUBSECTION>
@@ -6536,15 +6480,9 @@ gtk_icon_info_get_base_size
 gtk_icon_info_get_filename
 gtk_icon_info_get_builtin_pixbuf
 gtk_icon_info_load_icon
-gtk_icon_info_load_icon_async
-gtk_icon_info_load_icon_finish
 gtk_icon_info_load_symbolic
-gtk_icon_info_load_symbolic_async
-gtk_icon_info_load_symbolic_finish
 gtk_icon_info_load_symbolic_for_style
 gtk_icon_info_load_symbolic_for_context
-gtk_icon_info_load_symbolic_for_context_async
-gtk_icon_info_load_symbolic_for_context_finish
 gtk_icon_info_set_raw_coordinates
 gtk_icon_info_get_embedded_rect
 gtk_icon_info_get_attach_points
@@ -7279,8 +7217,6 @@ gtk_grid_attach_next_to
 gtk_grid_get_child_at
 gtk_grid_insert_row
 gtk_grid_insert_column
-gtk_grid_remove_row
-gtk_grid_remove_column
 gtk_grid_insert_next_to
 gtk_grid_set_row_homogeneous
 gtk_grid_get_row_homogeneous
@@ -7538,59 +7474,3 @@ GTK_COLOR_CHOOSER_DIALOG_GET_CLASS
 GtkColorChooserDialogPrivate
 gtk_color_chooser_dialog_get_type
 </SECTION>
-
-<SECTION>
-<FILE>gtkheaderbar</FILE>
-<TITLE>GtkHeaderBar</TITLE>
-GtkHeaderBar
-gtk_header_bar_new
-gtk_header_bar_set_title
-gtk_header_bar_get_title
-gtk_header_bar_set_subtitle
-gtk_header_bar_get_subtitle
-gtk_header_bar_set_custom_title
-gtk_header_bar_get_custom_title
-gtk_header_bar_pack_start
-gtk_header_bar_pack_end
-
-<SUBSECTION Standard>
-GTK_TYPE_HEADER_BAR
-GTK_HEADER_BAR
-GTK_HEADER_BAR_CLASS
-GTK_IS_HEADER_BAR
-GTK_IS_HEADER_BAR_CLASS
-GTK_HEADER_BAR_GET_CLASS
-
-<SUBSECTION Private>
-gtk_header_bar_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkstack</FILE>
-<TITLE>GtkStack</TITLE>
-GtkStack
-gtk_stack_new
-gtk_stack_add_named
-gtk_stack_add_titled
-gtk_stack_set_visible_child
-gtk_stack_get_visible_child
-gtk_stack_set_visible_child_name
-gtk_stack_get_visible_child_name
-gtk_stack_set_visible_child_full
-gtk_stack_set_homogeneous
-gtk_stack_get_homogeneous
-gtk_stack_set_transition_duration
-gtk_stack_get_transition_duration
-GtkStackTransitionType
-gtk_stack_set_transition_type
-gtk_stack_get_transition_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkstackswitcher</FILE>
-<TITLE>GtkStackSwitcher</TITLE>
-GtkStackSwitcher
-gtk_stack_switcher_new
-gtk_stack_switcher_set_stack
-gtk_stack_switcher_get_stack
-</SECTION>
--- a/docs/reference/gtk/gtk3.types.in
+++ b/docs/reference/gtk/gtk3.types.in
@@ -119,7 +119,7 @@ gtk_page_setup_get_type
@DISABLE_ON_W32@gtk_page_setup_unix_dialog_get_type
 gtk_paned_get_type
 gtk_paper_size_get_type
-@DISABLE_ON_W32@@DISABLE_ON_QUARTZ@@DISABLE_ON_WAYLAND@gtk_plug_get_type
+@DISABLE_ON_W32@@DISABLE_ON_QUARTZ@gtk_plug_get_type
@DISABLE_ON_W32@gtk_printer_get_type
 gtk_print_context_get_type
@DISABLE_ON_W32@gtk_print_job_get_type
@@ -151,7 +151,7 @@ gtk_separator_menu_item_get_type
 gtk_separator_tool_item_get_type
 gtk_settings_get_type
 gtk_size_group_get_type
-@DISABLE_ON_W32@@DISABLE_ON_QUARTZ@@DISABLE_ON_WAYLAND@gtk_socket_get_type
+@DISABLE_ON_W32@@DISABLE_ON_QUARTZ@gtk_socket_get_type
 gtk_spin_button_get_type
 gtk_spinner_get_type
 gtk_statusbar_get_type
--- a/docs/reference/gtk/running.sgml
+++ b/docs/reference/gtk/running.sgml
@@ -461,9 +461,6 @@ nevertheless.
      </varlistentry>

    </variablelist>
-    Since 3.10, this environment variable can contain a comma-separated list
-    of backend names, which are tried in order. The list may also contain
-    a *, which means: try all remaining backends.
    For more information about selecting backends, see the gdk_display_manager_get() function.
  </para>
 </formalpara>
--- a/docs/reference/gtk/text_widget.sgml
+++ b/docs/reference/gtk/text_widget.sgml
@@ -153,7 +153,7 @@ You can change the default attributes for a given #GtkTextView, and you can
 apply tags that change the attributes for a region of text.  For text features 
 that come from the theme &mdash; such as font and foreground color &mdash; use 
 standard #GtkWidget functions such as gtk_widget_modify_font() or
-gtk_widget_override_color(). For other attributes there are dedicated methods on
+gtk_widget_override_text(). For other attributes there are dedicated methods on
 #GtkTextView such as gtk_text_view_set_tabs().

 <informalexample><programlisting>
--- a/docs/reference/gtk/wayland.xml
+++ b/docs/reference/gtk/wayland.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
-<refentry id="gtk-wayland">
+<refentry id="gtk-osx">
 <refmeta>
 <refentrytitle>Using GTK+ with Wayland</refentrytitle>
 <manvolnum>3</manvolnum>
--- a/examples/bloatpad.c
+++ b/examples/bloatpad.c
@@ -34,29 +34,6 @@ change_fullscreen_state (GSimpleAction *action,
  g_simple_action_set_state (action, state);
 }

-static void
-change_busy_state (GSimpleAction *action,
-                   GVariant      *state,
-                   gpointer       user_data)
-{
-  GtkWindow *window = user_data;
-  GApplication *application = G_APPLICATION (gtk_window_get_application (window));
-
-  /* do this twice to test multiple busy counter increases */
-  if (g_variant_get_boolean (state))
-    {
-      g_application_mark_busy (application);
-      g_application_mark_busy (application);
-    }
-  else
-    {
-      g_application_unmark_busy (application);
-      g_application_unmark_busy (application);
-    }
-
-  g_simple_action_set_state (action, state);
-}
-
 static void
 change_justify_state (GSimpleAction *action,
                      GVariant      *state,
@@ -117,7 +94,6 @@ static GActionEntry win_entries[] = {
  { "copy", window_copy, NULL, NULL, NULL },
  { "paste", window_paste, NULL, NULL, NULL },
  { "fullscreen", activate_toggle, NULL, "false", change_fullscreen_state },
-  { "busy", activate_toggle, NULL, "false", change_busy_state },
  { "justify", activate_radio, "s", "'left'", change_justify_state }
 };

@@ -380,10 +356,6 @@ bloat_pad_startup (GApplication *application)
                               "          <attribute name='action'>win.fullscreen</attribute>"
                               "          <attribute name='accel'>F11</attribute>"
                               "        </item>"
-                               "        <item>"
-                               "          <attribute name='label' translatable='yes'>_Look Busy</attribute>"
-                               "          <attribute name='action'>win.busy</attribute>"
-                               "        </item>"
                               "      </section>"
                               "    </submenu>"
                               "    <submenu id='time-menu'>"
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -134,7 +134,6 @@ gdk_c_sources = 				\
 	gdkframeclockidle.c			\
 	gdkpango.c				\
 	gdkpixbuf-drawable.c			\
-	gdkproperty.c				\
 	gdkrectangle.c				\
 	gdkrgba.c				\
 	gdkscreen.c				\
@@ -237,6 +236,7 @@ x11_introspection_files = 		\
 	x11/gdkxftdefaults.c		\
 	x11/gdkxid.c			\
 	x11/xsettings-client.c		\
+	x11/xsettings-common.c		\
 	x11/gdkx.h			\
 	x11/gdkx11cursor.h		\
 	x11/gdkx11display.h		\
--- a/gdk/broadway/Makefile.am
+++ b/gdk/broadway/Makefile.am
@@ -60,7 +60,9 @@ libgdk_broadway_la_SOURCES =		\
 	gdkeventsource.c	\
 	gdkeventsource.h	\
 	gdkglobals-broadway.c	\
+	gdkim-broadway.c	\
 	gdkkeys-broadway.c	\
+	gdkmain-broadway.c	\
 	gdkproperty-broadway.c	\
 	gdkscreen-broadway.c	\
 	gdkscreen-broadway.h	\
@@ -81,7 +83,7 @@ broadwayd_SOURCES = \
 	broadway-output.h		\
 	broadway-output.c

-broadwayd_LDADD = $(GDK_DEP_LIBS) -lrt -lcrypt
+broadwayd_LDADD = $(GDK_DEP_LIBS) -lrt

 MAINTAINERCLEANFILES = $(broadway_built_sources)
 EXTRA_DIST += $(broadway_built_sources)
--- a/gdk/broadway/broadway-output.c
+++ b/gdk/broadway/broadway-output.c
@@ -317,13 +317,6 @@ broadway_output_get_next_serial (BroadwayOutput *output)
  return output->serial;
 }

-void
-broadway_output_set_next_serial (BroadwayOutput *output,
-				 guint32 serial)
-{
-  output->serial = serial;
-}
-

 /************************************************************************
 *                     Core rendering operations                        *
@@ -478,24 +471,6 @@ broadway_output_new_surface(BroadwayOutput *output,
  append_bool (output, is_temp);
 }

-void
-broadway_output_request_auth (BroadwayOutput *output)
-{
-  write_header (output, BROADWAY_OP_REQUEST_AUTH);
-}
-
-void
-broadway_output_auth_ok (BroadwayOutput *output)
-{
-  write_header (output, BROADWAY_OP_AUTH_OK);
-}
-
-void
-broadway_output_disconnected (BroadwayOutput *output)
-{
-  write_header (output, BROADWAY_OP_DISCONNECTED);
-}
-
 void
 broadway_output_show_surface(BroadwayOutput *output,  int id)
 {
--- a/gdk/broadway/broadway-output.h
+++ b/gdk/broadway/broadway-output.h
@@ -23,8 +23,6 @@ BroadwayOutput *broadway_output_new             (GOutputStream  *out,
 void            broadway_output_free            (BroadwayOutput *output);
 int             broadway_output_flush           (BroadwayOutput *output);
 int             broadway_output_has_error       (BroadwayOutput *output);
-void            broadway_output_set_next_serial (BroadwayOutput *output,
-						 guint32         serial);
 guint32         broadway_output_get_next_serial (BroadwayOutput *output);
 void            broadway_output_new_surface     (BroadwayOutput *output,
 						 int             id,
@@ -33,9 +31,6 @@ void            broadway_output_new_surface     (BroadwayOutput *output,
 						 int             w,
 						 int             h,
 						 gboolean        is_temp);
-void            broadway_output_request_auth    (BroadwayOutput *output);
-void            broadway_output_auth_ok         (BroadwayOutput *output);
-void            broadway_output_disconnected    (BroadwayOutput *output);
 void            broadway_output_show_surface    (BroadwayOutput *output,
 						 int             id);
 void            broadway_output_hide_surface    (BroadwayOutput *output,
--- a/gdk/broadway/broadway-protocol.h
+++ b/gdk/broadway/broadway-protocol.h
@@ -36,9 +36,6 @@ typedef enum {
  BROADWAY_OP_SET_TRANSIENT_FOR = 'p',
  BROADWAY_OP_PUT_RGB = 'i',
  BROADWAY_OP_FLUSH = 'f',
-  BROADWAY_OP_REQUEST_AUTH = 'l',
-  BROADWAY_OP_AUTH_OK = 'L',
-  BROADWAY_OP_DISCONNECTED = 'D',
 } BroadwayOpType;

 typedef struct {
@@ -163,7 +160,7 @@ typedef struct {
 typedef struct {
  BroadwayRequestBase base;
  guint32 id;
-  char name[36];
+  char name[34];
  guint32 width;
  guint32 height;
 } BroadwayRequestUpdate;
--- a/gdk/broadway/broadway-server.c
+++ b/gdk/broadway/broadway-server.c
@@ -2,8 +2,6 @@

 #include "broadway-output.h"

-#define _XOPEN_SOURCE /* for crypt */
-
 #include <glib.h>
 #include <glib/gprintf.h>
 #include "gdktypes.h"
@@ -11,10 +9,6 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
-#include <crypt.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -25,7 +19,6 @@ typedef struct BroadwayWindow BroadwayWindow;
 struct _BroadwayServer {
  GObject parent_instance;

-  char *password;
  char *address;
  int port;
  GSocketService *service;
@@ -76,7 +69,6 @@ typedef struct HttpRequest {

 struct BroadwayInput {
  BroadwayServer *server;
-  BroadwayOutput *output;
  GSocketConnection *connection;
  GByteArray *buffer;
  GSource *source;
@@ -84,7 +76,6 @@ struct BroadwayInput {
  gint64 time_base;
  gboolean proto_v7_plus;
  gboolean binary;
-  gboolean active;
 };

 struct BroadwayWindow {
@@ -99,9 +90,6 @@ struct BroadwayWindow {
  gint32 transient_for;

  cairo_surface_t *last_surface;
-
-  char *cached_surface_name;
-  cairo_surface_t *cached_surface;
 };

 static void broadway_server_resync_windows (BroadwayServer *server);
@@ -112,8 +100,6 @@ static void
 broadway_server_init (BroadwayServer *server)
 {
  BroadwayWindow *root;
-  char *passwd_file;
-  char *password, *p;

  server->service = g_socket_service_new ();
  server->pointer_grab_window_id = -1;
@@ -122,22 +108,6 @@ broadway_server_init (BroadwayServer *server)
  server->id_ht = g_hash_table_new (NULL, NULL);
  server->id_counter = 0;

-  passwd_file = g_build_filename (g_get_user_config_dir (),
-				  "broadway.passwd", NULL);
-
-  if (g_file_get_contents (passwd_file,
-			   &password, NULL, NULL))
-    {
-      p = strchr (password, '\n');
-      if (p)
-	*p = 0;
-      g_strstrip (password);
-      if (strlen (password) > 3)
-	server->password = password;
-      else
-	g_free (password);
-    }
-
  root = g_new0 (BroadwayWindow, 1);
  root->id = server->id_counter++;
  root->width = 1024;
@@ -169,7 +139,7 @@ broadway_server_class_init (BroadwayServerClass * class)
  object_class->finalize = broadway_server_finalize;
 }

-static void start (BroadwayInput *input);
+static void start_output (HttpRequest *request, gboolean proto_v7_plus, gboolean binary);

 static void
 http_request_free (HttpRequest *request)
@@ -379,14 +349,6 @@ update_future_pointer_info (BroadwayServer *server, BroadwayInputPointerMsg *dat
  server->future_mouse_in_toplevel = data->mouse_window_id;
 }

-static gboolean
-verify_password (BroadwayServer *server, const char *password)
-{
-  char *hash;
-  hash = crypt (password, server->password);
-  return strcmp (hash, server->password) == 0;
-}
-
 static void
 parse_input_message (BroadwayInput *input, const char *message)
 {
@@ -395,22 +357,6 @@ parse_input_message (BroadwayInput *input, const char *message)
  char *p;
  gint64 time_;

-  if (!input->active)
-    {
-      /* The input has not been activated yet, handle auth/start */
-
-      if (message[0] != 'l' ||
-	  !verify_password (server, message+1))
-	{
-	  broadway_output_request_auth (input->output);
-	  broadway_output_flush (input->output);
-	}
-      else
-	start (input);
-
-      return;
-    }
-
  memset (&msg, 0, sizeof (msg));

  p = (char *)message;
@@ -624,7 +570,7 @@ parse_input (BroadwayInput *input)
 	      }
 	    break;
 	  case BROADWAY_WS_CNX_PING:
-	    broadway_output_pong (input->output);
+	    broadway_output_pong (server->output);
 	    break;
 	  case BROADWAY_WS_CNX_PONG:
 	    break; /* we never send pings, but tolerate pongs */
@@ -650,8 +596,7 @@ parse_input (BroadwayInput *input)

      if (buf[0] != 0)
 	{
-	  if (server->input == input)
-	    server->input = NULL;
+	  server->input = NULL;
 	  broadway_input_free (input);
 	  return;
 	}
@@ -668,8 +613,7 @@ parse_input (BroadwayInput *input)

 	  if (len > 0 && buf[0] != 0)
 	    {
-	      if (server->input == input)
-		server->input = NULL;
+	      server->input = NULL;
 	      broadway_input_free (input);
 	      break;
 	    }
@@ -696,16 +640,19 @@ queue_process_input_at_idle (BroadwayServer *server)
 }

 static void
-broadway_server_read_all_input_nonblocking (BroadwayInput *input)
+broadway_server_read_all_input_nonblocking (BroadwayServer *server)
 {
  GInputStream *in;
  gssize res;
  guint8 buffer[1024];
  GError *error;
+  BroadwayInput *input;

-  if (input == NULL)
+  if (server->input == NULL)
    return;

+  input = server->input;
+
  in = g_io_stream_get_input_stream (G_IO_STREAM (input->connection));

  error = NULL;
@@ -721,8 +668,7 @@ broadway_server_read_all_input_nonblocking (BroadwayInput *input)
 	  return;
 	}

-      if (input->server->input == input)
-	input->server->input = NULL;
+      server->input = NULL;
      broadway_input_free (input);
      if (res < 0)
 	{
@@ -740,7 +686,7 @@ broadway_server_read_all_input_nonblocking (BroadwayInput *input)
 static void
 broadway_server_consume_all_input (BroadwayServer *server)
 {
-  broadway_server_read_all_input_nonblocking (server->input);
+  broadway_server_read_all_input_nonblocking (server);

  /* Since we're parsing input but not processing the resulting messages
     we might not get a readable callback on the stream, so queue an idle to
@@ -755,10 +701,9 @@ input_data_cb (GObject  *stream,
 {
  BroadwayServer *server = input->server;

-  broadway_server_read_all_input_nonblocking (input);
+  broadway_server_read_all_input_nonblocking (server);

-  if (input->active)
-    process_input_messages (server);
+  process_input_messages (server);

  return TRUE;
 }
@@ -933,14 +878,15 @@ start_input (HttpRequest *request, gboolean binary)
  gsize len;
  GChecksum *checksum;
  char *origin, *host;
+  BroadwayServer *server;
  BroadwayInput *input;
  const void *data_buffer;
  gsize data_buffer_size;
  GInputStream *in;
  char *key_v7;
  gboolean proto_v7_plus;
-  GSocket *socket;
-  int flag = 1;
+
+  server = request->server;

 #ifdef DEBUG_WEBSOCKETS
  g_print ("incoming request:\n%s\n", request->request->str);
@@ -1087,11 +1033,15 @@ start_input (HttpRequest *request, gboolean binary)
      proto_v7_plus = FALSE;
    }

-  socket = g_socket_connection_get_socket (request->connection);
-  setsockopt (g_socket_get_fd (socket), IPPROTO_TCP,
-	      TCP_NODELAY, (char *) &flag, sizeof(int));
+
+  if (server->input != NULL)
+    {
+      broadway_input_free (server->input);
+      server->input = NULL;
+    }

  input = g_new0 (BroadwayInput, 1);
+
  input->server = request->server;
  input->connection = g_object_ref (request->connection);
  input->proto_v7_plus = proto_v7_plus;
@@ -1101,9 +1051,9 @@ start_input (HttpRequest *request, gboolean binary)
  input->buffer = g_byte_array_sized_new (data_buffer_size);
  g_byte_array_append (input->buffer, data_buffer, data_buffer_size);

-  input->output =
-    broadway_output_new (g_io_stream_get_output_stream (G_IO_STREAM (request->connection)),
-			 0, proto_v7_plus, binary);
+  server->input = input;
+
+  start_output (request, proto_v7_plus, binary);

  /* This will free and close the data input stream, but we got all the buffered content already */
  http_request_free (request);
@@ -1113,53 +1063,35 @@ start_input (HttpRequest *request, gboolean binary)
  g_source_set_callback (input->source, (GSourceFunc)input_data_cb, input, NULL);
  g_source_attach (input->source, NULL);

-  if (input->server->password)
-    {
-      broadway_output_request_auth (input->output);
-      broadway_output_flush (input->output);
-    }
-  else
-    start (input);
-
  /* Process any data in the pipe already */
  parse_input (input);
+  process_input_messages (server);

  g_strfreev (lines);
 }

 static void
-start (BroadwayInput *input)
+start_output (HttpRequest *request, gboolean proto_v7_plus, gboolean binary)
 {
+  GSocket *socket;
  BroadwayServer *server;
+  int flag = 1;

-  input->active = TRUE;
+  socket = g_socket_connection_get_socket (request->connection);
+  setsockopt(g_socket_get_fd (socket), IPPROTO_TCP,
+	     TCP_NODELAY, (char *) &flag, sizeof(int));

-  server = BROADWAY_SERVER (input->server);
-
-  if (server->output)
-    {
-      broadway_output_disconnected (server->output);
-      broadway_output_flush (server->output);
-    }
-
-  if (server->input != NULL)
-    {
-      broadway_input_free (server->input);
-      server->input = NULL;
-    }
-
-  server->input = input;
+  server = BROADWAY_SERVER (request->server);

  if (server->output)
    {
      server->saved_serial = broadway_output_get_next_serial (server->output);
      broadway_output_free (server->output);
    }
-  server->output = input->output;

-  broadway_output_set_next_serial (server->output, server->saved_serial);
-  broadway_output_auth_ok (server->output);
-  broadway_output_flush (server->output);
+  server->output =
+    broadway_output_new (g_io_stream_get_output_stream (G_IO_STREAM (request->connection)),
+			 server->saved_serial, proto_v7_plus, binary);

  broadway_server_resync_windows (server);

@@ -1167,8 +1099,6 @@ start (BroadwayInput *input)
    broadway_output_grab_pointer (server->output,
 				  server->pointer_grab_window_id,
 				  server->pointer_grab_owner_events);
-
-  process_input_messages (server);
 }

 static void
@@ -1419,12 +1349,6 @@ broadway_server_destroy_window (BroadwayServer *server,
      server->toplevels = g_list_remove (server->toplevels, window);
      g_hash_table_remove (server->id_ht,
 			   GINT_TO_POINTER (id));
-
-      if (window->cached_surface_name != NULL)
-	g_free (window->cached_surface_name);
-      if (window->cached_surface != NULL)
-	cairo_surface_destroy (window->cached_surface);
-
      g_free (window);
    }
 }
@@ -1659,11 +1583,6 @@ broadway_server_window_update (BroadwayServer *server,
 						       window->width,
 						       window->height);

-  g_assert (window->width == cairo_image_surface_get_width (window->last_surface));
-  g_assert (window->width == cairo_image_surface_get_width (surface));
-  g_assert (window->height == cairo_image_surface_get_height (window->last_surface));
-  g_assert (window->height == cairo_image_surface_get_height (surface));
-
  if (server->output != NULL)
    {
      if (window->last_synced)
@@ -1820,86 +1739,6 @@ broadway_server_ungrab_pointer (BroadwayServer *server,
  return serial;
 }

-static const cairo_user_data_key_t shm_cairo_key;
-
-typedef struct {
-  void *data;
-  gsize data_size;
-} ShmSurfaceData;
-
-static void
-shm_data_unmap (void *_data)
-{
-  ShmSurfaceData *data = _data;
-  munmap (data->data, data->data_size);
-  g_free (data);
-}
-
-cairo_surface_t *
-broadway_server_open_surface (BroadwayServer *server,
-			      guint32 id,
-			      char *name,
-			      int width,
-			      int height)
-{
-  BroadwayWindow *window;
-  ShmSurfaceData *data;
-  cairo_surface_t *surface;
-  gsize size;
-  void *ptr;
-  int fd;
-
-  window = g_hash_table_lookup (server->id_ht,
-				GINT_TO_POINTER (id));
-  if (window == NULL)
-    return NULL;
-
-  if (window->cached_surface_name != NULL &&
-      strcmp (name, window->cached_surface_name) == 0)
-    return cairo_surface_reference (window->cached_surface);
-
-  size = width * height * sizeof (guint32);
-
-  fd = shm_open(name, O_RDONLY, 0600);
-  if (fd == -1)
-    {
-      perror ("Failed to shm_open");
-      return NULL;
-    }
-
-  ptr = mmap(0, size, PROT_READ, MAP_SHARED, fd, 0);
-  (void) close(fd);
-
-  shm_unlink (name);
-
-  if (ptr == NULL)
-    return NULL;
-
-  data = g_new0 (ShmSurfaceData, 1);
-
-  data->data = ptr;
-  data->data_size = size;
-
-  surface = cairo_image_surface_create_for_data ((guchar *)data->data,
-						 CAIRO_FORMAT_RGB24,
-						 width, height,
-						 width * sizeof (guint32));
-  g_assert (surface != NULL);
-
-  cairo_surface_set_user_data (surface, &shm_cairo_key,
-			       data, shm_data_unmap);
-
-  if (window->cached_surface_name != NULL)
-    g_free (window->cached_surface_name);
-  window->cached_surface_name = g_strdup (name);
-
-  if (window->cached_surface != NULL)
-    cairo_surface_destroy (window->cached_surface);
-  window->cached_surface = cairo_surface_reference (surface);
-
-  return surface;
-}
-
 guint32
 broadway_server_new_window (BroadwayServer *server,
 			    int x,
--- a/gdk/broadway/broadway-server.h
+++ b/gdk/broadway/broadway-server.h
@@ -78,10 +78,5 @@ gboolean            broadway_server_window_move_resize       (BroadwayServer   *
 							      int               y,
 							      int               width,
 							      int               height);
-cairo_surface_t * broadway_server_open_surface (BroadwayServer *server,
-						guint32 id,
-						char *name,
-						int width,
-						int height);

 #endif /* __BROADWAY_SERVER__ */
--- a/gdk/broadway/broadway.js
+++ b/gdk/broadway/broadway.js
@@ -225,16 +225,34 @@ function flushSurface(surface)
 	    context.save();
 	    context.beginPath();

+	    var minx;
+	    var miny;
+	    var maxx;
+	    var maxy;
 	    for (var j = 0; j < cmd.rects.length; j++) {
 		var rect = cmd.rects[j];
 		context.rect(rect.x, rect.y, rect.w, rect.h);
+		if (j == 0) {
+		    minx = rect.x;
+		    miny = rect.y;
+		    maxx = rect.x + rect.w;
+		    maxy = rect.y + rect.h;
+		} else {
+		    if (rect.x < minx)
+			minx = rect.x;
+		    if (rect.y < miny)
+			miny = rect.y;
+		    if (rect.x + rect.w > maxx)
+			maxx = rect.x + rect.w;
+		    if (rect.y + rect.h > maxy)
+			maxy = rect.y + rect.h;
+		}
 	    }
 	    context.clip();
-	    // This seems to break chrome when src overlaps dest
-	    // But source-over should be fine for rgb surfaces anyway
-	    //context.globalCompositeOperation = "copy";
-	    context.drawImage(surface.canvas,
-			      cmd.dx, cmd.dy);
+	    context.globalCompositeOperation = "copy";
+	    context.drawImage(context.canvas,
+			      minx - cmd.dx, miny - cmd.dy, maxx - minx, maxy - miny,
+			      minx, miny, maxx - minx, maxy - miny);
 	    context.restore();
 	    break;

@@ -478,6 +496,12 @@ function cmdMoveResizeSurface(id, has_pos, x, y, has_size, w, h)
 	    var xOffset = surface.x;
 	    var yOffset = surface.y;

+	    var transientToplevel = getTransientToplevel(surface);
+	    if (transientToplevel) {
+		xOffset = surface.x - transientToplevel.x;
+		yOffset = surface.y - transientToplevel.y;
+	    }
+
 	    var element = surface.canvas;
 	    if (surface.frame) {
 		element = surface.frame;
@@ -519,21 +543,6 @@ function handleCommands(cmd)
 	var command = cmd.get_char();
 	lastSerial = cmd.get_32();
 	switch (command) {
-	case 'l':
-	    login ();
-	    break;
-
-	case 'L':
-	    if (loginDiv != null)
-		loginDiv.parentNode.removeChild(loginDiv);
-	    start ();
-	    break;
-
-	case 'D':
-	    alert ("disconnected");
-	    inputSocket = null;
-	    break;
-
 	case 's': // create new surface
 	    id = cmd.get_16();
 	    x = cmd.get_16s();
@@ -733,12 +742,8 @@ BinCommands.prototype.get_32 = function() {
 };
 BinCommands.prototype.get_image_url = function() {
    var size = this.get_32();
-    var png_blob = new Blob ([new Uint8Array (this.arraybuffer, this.pos, size)], {type:"image/png"});
-    var url;
-    if (window.webkitURL)
-	url = window.webkitURL.createObjectURL(png_blob);
-    else
-	url = window.URL.createObjectURL(png_blob, {oneTimeOnly: true});
+    var png_blob = new Blob ([this.arraybuffer.slice (this.pos, this.pos + size)], {type:"image/png"});
+    var url = URL.createObjectURL(png_blob, {oneTimeOnly: true});
    this.pos = this.pos + size;
    return url;
 };
@@ -2585,7 +2590,7 @@ function onMouseWheel(ev)
    var id = getSurfaceId(ev);
    var pos = getPositionsFromEvent(ev, id);

-    var offset = ev.detail ? ev.detail : -ev.wheelDelta;
+    var offset = ev.detail ? ev.detail : ev.wheelDelta;
    var dir = 0;
    if (offset > 0)
 	dir = 1;
@@ -2626,47 +2631,6 @@ function newWS(loc) {
    return ws;
 }

-function start()
-{
-    setupDocument(document);
-
-    var w, h;
-    w = window.innerWidth;
-    h = window.innerHeight;
-    window.onresize = function(ev) {
-	var w, h;
-	w = window.innerWidth;
-	h = window.innerHeight;
-	sendInput ("d", [w, h]);
-    };
-    sendInput ("d", [w, h]);
-}
-
-var loginDiv = null;
-function login()
-{
-    if (loginDiv == null) {
-	var div = document.createElement('div');
-	document.body.appendChild(div);
-	div.innerHTML = "Please enter password<br>";
-	div.style.marginTop = "40px";
-	div.style.textAlign = "center";
-
-	var input = document.createElement("input");
-	input.setAttribute("type", "password");
-	div.appendChild(input);
-	input.focus ();
-	input.onkeyup = function(e) {
-	    if (e.keyCode === 13 && input.value != "") {
-		inputSocket.send ("l" + input.value);
-	    }
-	}
-	loginDiv = div;
-    } else {
-	alert ("Wrong password");
-    }
-}
-
 function connect()
 {
    var url = window.location.toString();
@@ -2675,7 +2639,7 @@ function connect()
 	var params = query_string[1].split("&");
    }

-    var loc = window.location.toString().replace("http:", "ws:").replace("https:", "wss:");
+    var loc = window.location.toString().replace("http:", "ws:");
    loc = loc.substr(0, loc.lastIndexOf('/')) + "/socket";

    var supports_binary = newWS (loc + "-test").binaryType == "blob";
@@ -2688,13 +2652,23 @@ function connect()

    ws.onopen = function() {
 	inputSocket = ws;
+	var w, h;
+	w = window.innerWidth;
+	h = window.innerHeight;
+	window.onresize = function(ev) {
+	    var w, h;
+	    w = window.innerWidth;
+	    h = window.innerHeight;
+	    sendInput ("d", [w, h]);
+	};
+	sendInput ("d", [w, h]);
    };
    ws.onclose = function() {
-	if (inputSocket != null)
-	    alert ("disconnected");
 	inputSocket = null;
    };
    ws.onmessage = function(event) {
 	handleMessage(event.data);
    };
+
+    setupDocument(document);
 }
--- a/gdk/broadway/broadwayd.c
+++ b/gdk/broadway/broadwayd.c
@@ -140,6 +140,62 @@ region_from_rects (BroadwayRect *rects, int n_rects)
  return region;
 }

+static const cairo_user_data_key_t shm_cairo_key;
+
+typedef struct {
+  void *data;
+  gsize data_size;
+} ShmSurfaceData;
+
+static void
+shm_data_unmap (void *_data)
+{
+  ShmSurfaceData *data = _data;
+  munmap (data->data, data->data_size);
+  g_free (data);
+}
+
+cairo_surface_t *
+open_surface (char *name, int width, int height)
+{
+  ShmSurfaceData *data;
+  cairo_surface_t *surface;
+  gsize size;
+  void *ptr;
+  int fd;
+
+  size = width * height * sizeof (guint32);
+
+  fd = shm_open(name, O_RDONLY, 0600);
+  if (fd == -1)
+    {
+      perror ("Failed to shm_open");
+      return NULL;
+    }
+
+  ptr = mmap(0, size, PROT_READ, MAP_SHARED, fd, 0); 
+  (void) close(fd);
+
+  if (ptr == NULL)
+    return NULL;
+
+  data = g_new0 (ShmSurfaceData, 1);
+
+  data->data = ptr;
+  data->data_size = size;
+
+  surface = cairo_image_surface_create_for_data ((guchar *)data->data,
+						 CAIRO_FORMAT_RGB24,
+						 width, height,
+						 width * sizeof (guint32));
+  g_assert (surface != NULL);
+  
+  cairo_surface_set_user_data (surface, &shm_cairo_key,
+			       data, shm_data_unmap);
+
+  return surface;
+}
+
 void
 add_client_serial_mapping (BroadwayClient *client,
 			   guint32 client_serial,
@@ -281,11 +337,9 @@ client_handle_request (BroadwayClient *client,
      cairo_region_destroy (area);
      break;
    case BROADWAY_REQUEST_UPDATE:
-      surface = broadway_server_open_surface (server,
-					      request->update.id,
-					      request->update.name,
-					      request->update.width,
-					      request->update.height);
+      surface = open_surface (request->update.name,
+			      request->update.width,
+			      request->update.height);
      if (surface != NULL)
 	{
 	  broadway_server_window_update (server,
@@ -355,6 +409,7 @@ client_fill_cb (GObject *source_object,
      guint32 size;
      gsize count, remaining;
      guint8 *buffer;
+      BroadwayRequest request;

      buffer = (guint8 *)g_buffered_input_stream_peek_buffer (client->in, &count);

@@ -362,10 +417,14 @@ client_fill_cb (GObject *source_object,
      while (remaining >= sizeof (guint32))
 	{
 	  memcpy (&size, buffer, sizeof (guint32));
-
+	  
 	  if (size <= remaining)
 	    {
-	      client_handle_request (client, (BroadwayRequest *)buffer);
+	      g_assert (size >= sizeof (BroadwayRequestBase));
+	      g_assert (size <= sizeof (BroadwayRequest));
+
+	      memcpy (&request, buffer, size);
+	      client_handle_request (client, &request);

 	      remaining -= size;
 	      buffer += size;
--- a/gdk/broadway/gdkbroadway-server.c
+++ b/gdk/broadway/gdkbroadway-server.c
@@ -506,7 +506,7 @@ make_valid_fs_char (char c)
 {
  char chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890";

-  return chars[c % (sizeof (chars) - 1)];
+  return chars[c % sizeof (chars)];
 }

 /* name must have at least space for 34 bytes */
@@ -550,7 +550,7 @@ create_random_shm (char *name)
 static const cairo_user_data_key_t gdk_broadway_shm_cairo_key;

 typedef struct {
-  char name[36];
+  char name[34];
  void *data;
  gsize data_size;
 } BroadwayShmSurfaceData;
@@ -582,13 +582,6 @@ _gdk_broadway_server_create_surface (int                 width,
  res = ftruncate (fd, data->data_size);
  g_assert (res != -1);

-  res = posix_fallocate (fd, 0, data->data_size);
-  if (res != 0)
-    {
-      shm_unlink (data->name);
-      g_error ("Not enough shared memory for window surface");
-    }
-
  data->data = mmap(0, data->data_size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); 
  (void) close(fd);

@@ -617,7 +610,7 @@ _gdk_broadway_server_window_update (GdkBroadwayServer *server,
  g_assert (data != NULL);

  msg.id = id;
-  memcpy (msg.name, data->name, 36);
+  memcpy (msg.name, data->name, 34);
  msg.width = cairo_image_surface_get_width (surface);
  msg.height = cairo_image_surface_get_height (surface);

--- a/gdk/broadway/gdkdevice-broadway.c
+++ b/gdk/broadway/gdkdevice-broadway.c
@@ -116,7 +116,7 @@ gdk_broadway_device_get_state (GdkDevice       *device,
 {
  gint x_int, y_int;

-  gdk_window_get_device_position (window, device, &x_int, &y_int, mask);
+  gdk_window_get_pointer (window, &x_int, &y_int, mask);

  if (axes)
    {
@@ -157,7 +157,7 @@ gdk_broadway_device_query_state (GdkDevice        *device,
  GdkBroadwayDisplay *broadway_display;
  GdkScreen *screen;
  gint32 device_root_x, device_root_y;
-  guint32 mouse_toplevel_id;
+  gint32 mouse_toplevel_id;
  GdkWindow *mouse_toplevel;
  guint32 mask32;

@@ -181,14 +181,14 @@ gdk_broadway_device_query_state (GdkDevice        *device,
 				    &device_root_x,
 				    &device_root_y,
 				    &mask32);
-  mouse_toplevel = g_hash_table_lookup (broadway_display->id_ht, GUINT_TO_POINTER (mouse_toplevel_id));
+  mouse_toplevel = g_hash_table_lookup (broadway_display->id_ht, GINT_TO_POINTER (mouse_toplevel_id));

  if (root_x)
    *root_x = device_root_x;
  if (root_y)
    *root_y = device_root_y;
  if (win_x)
-    *win_x = device_root_x - toplevel->x;
+    *win_x = device_root_y - toplevel->x;
  if (win_y)
    *win_y = device_root_y - toplevel->y;
  if (mask)
@@ -211,29 +211,6 @@ gdk_broadway_device_query_state (GdkDevice        *device,
  return;
 }

-void
-_gdk_broadway_window_grab_check_unmap (GdkWindow *window,
-				       gulong     serial)
-{
-  GdkDisplay *display = gdk_window_get_display (window);
-  GdkDeviceManager *device_manager;
-  GList *devices, *d;
-
-  device_manager = gdk_display_get_device_manager (display);
-
-  /* Get all devices */
-  devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
-  devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_SLAVE));
-  devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_FLOATING));
-
-  /* End all grabs on the newly hidden window */
-  for (d = devices; d; d = d->next)
-    _gdk_display_end_device_grab (display, d->data, serial, window, TRUE);
-
-  g_list_free (devices);
-}
-
-
 void
 _gdk_broadway_window_grab_check_destroy (GdkWindow *window)
 {
--- a/gdk/broadway/gdkdisplay-broadway.c
+++ b/gdk/broadway/gdkdisplay-broadway.c
@@ -55,6 +55,8 @@ G_DEFINE_TYPE (GdkBroadwayDisplay, gdk_broadway_display, GDK_TYPE_DISPLAY)
 static void
 gdk_broadway_display_init (GdkBroadwayDisplay *display)
 {
+  _gdk_broadway_display_manager_add_display (gdk_display_manager_get (),
+					     GDK_DISPLAY_OBJECT (display));
  display->id_ht = g_hash_table_new (NULL, NULL);
 }

@@ -171,6 +173,7 @@ _gdk_broadway_display_open (const gchar *display_name)
    }

  g_signal_emit_by_name (display, "opened");
+  g_signal_emit_by_name (gdk_display_manager_get (), "display-opened", display);

  return display;
 }
@@ -183,6 +186,24 @@ gdk_broadway_display_get_name (GdkDisplay *display)
  return (gchar *) "Broadway";
 }

+static gint
+gdk_broadway_display_get_n_screens (GdkDisplay *display)
+{
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), 0);
+
+  return 1;
+}
+
+static GdkScreen *
+gdk_broadway_display_get_screen (GdkDisplay *display,
+				 gint        screen_num)
+{
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+  g_return_val_if_fail (screen_num == 0, NULL);
+
+  return GDK_BROADWAY_DISPLAY (display)->screens[screen_num];
+}
+
 static GdkScreen *
 gdk_broadway_display_get_default_screen (GdkDisplay *display)
 {
@@ -236,6 +257,9 @@ gdk_broadway_display_dispose (GObject *object)
 {
  GdkBroadwayDisplay *broadway_display = GDK_BROADWAY_DISPLAY (object);

+  _gdk_broadway_display_manager_remove_display (gdk_display_manager_get (),
+						GDK_DISPLAY_OBJECT (object));
+
  g_list_foreach (broadway_display->input_devices, (GFunc) g_object_run_dispose, NULL);

  _gdk_screen_close (broadway_display->screens[0]);
@@ -370,6 +394,8 @@ gdk_broadway_display_class_init (GdkBroadwayDisplayClass * class)
  display_class->window_type = GDK_TYPE_BROADWAY_WINDOW;

  display_class->get_name = gdk_broadway_display_get_name;
+  display_class->get_n_screens = gdk_broadway_display_get_n_screens;
+  display_class->get_screen = gdk_broadway_display_get_screen;
  display_class->get_default_screen = gdk_broadway_display_get_default_screen;
  display_class->beep = gdk_broadway_display_beep;
  display_class->sync = gdk_broadway_display_sync;
--- a/gdk/broadway/gdkdisplay-broadway.h
+++ b/gdk/broadway/gdkdisplay-broadway.h
@@ -66,8 +66,6 @@ struct _GdkBroadwayDisplay
  GdkWindow *active_offscreen_window;

  GdkBroadwayServer *server;
-
-  gpointer move_resize_data;
 };

 struct _GdkBroadwayDisplayClass
--- a/gdk/broadway/gdkdisplaymanager-broadway.c
+++ b/gdk/broadway/gdkdisplaymanager-broadway.c
@@ -22,7 +22,6 @@

 #include "config.h"

-#include <stdlib.h>
 #include "gdkdisplay-broadway.h"
 #include "gdkbroadwaydisplaymanager.h"
 #include "gdkprivate-broadway.h"
@@ -34,63 +33,68 @@ struct _GdkBroadwayDisplayManager
 {
  GdkDisplayManager parent;

-  gboolean init_failed;
+  GdkDisplay *default_display;
+  GSList *displays;
 };

-static void g_initable_iface_init (GInitableIface *iface);
+G_DEFINE_TYPE (GdkBroadwayDisplayManager, gdk_broadway_display_manager, GDK_TYPE_DISPLAY_MANAGER)

-G_DEFINE_TYPE_WITH_CODE (GdkBroadwayDisplayManager, gdk_broadway_display_manager, GDK_TYPE_DISPLAY_MANAGER,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, g_initable_iface_init))
-
-static gboolean
-gdk_broadway_display_manager_initable_init (GInitable     *initable,
-                                            GCancellable  *cancellable,
-                                            GError       **error)
+static GdkDisplay *
+gdk_broadway_display_manager_open_display (GdkDisplayManager *manager,
+                                         const gchar       *name)
 {
-  const gchar *display_name;
-  gint port;
-  GdkBroadwayServer *server;
-
-  display_name = g_getenv ("BROADWAY_DISPLAY");
-
-  port = 0;
-  if (display_name != NULL)
-    {
-      if (*display_name == ':')
-        display_name++;
-      port = strtol(display_name, NULL, 10);
-    }
-  if (port == 0)
-    port = 1;
-
-  server = _gdk_broadway_server_new (port, NULL);
-  if (server == NULL)
-    {
-      GDK_BROADWAY_DISPLAY_MANAGER (initable)->init_failed = TRUE;
-      return FALSE;
-    }
-
-  g_object_unref (server);
-
-  return TRUE;
+  return _gdk_broadway_display_open (name);
 }

-void
-g_initable_iface_init (GInitableIface *iface)
+static GSList *
+gdk_broadway_display_manager_list_displays (GdkDisplayManager *manager)
 {
-  iface->init = gdk_broadway_display_manager_initable_init;
+  GdkBroadwayDisplayManager *manager_broadway = GDK_BROADWAY_DISPLAY_MANAGER (manager);
+
+  return g_slist_copy (manager_broadway->displays);
+}
+
+static GdkDisplay *
+gdk_broadway_display_manager_get_default_display (GdkDisplayManager *manager)
+{
+  return GDK_BROADWAY_DISPLAY_MANAGER (manager)->default_display;
+}
+
+static void
+gdk_broadway_display_manager_set_default_display (GdkDisplayManager *manager,
+                                                GdkDisplay        *display)
+{
+  GdkBroadwayDisplayManager *manager_broadway = GDK_BROADWAY_DISPLAY_MANAGER (manager);
+
+  manager_broadway->default_display = display;
+}
+
+#include "../gdkkeynames.c"
+
+static gchar *
+gdk_broadway_display_manager_get_keyval_name (GdkDisplayManager *manager,
+                                            guint              keyval)
+{
+  return _gdk_keyval_name (keyval);
+}
+
+static guint
+gdk_broadway_display_manager_lookup_keyval (GdkDisplayManager *manager,
+                                          const gchar       *name)
+{
+  return _gdk_keyval_from_name (name);
 }

 static void
 gdk_broadway_display_manager_init (GdkBroadwayDisplayManager *manager)
 {
+  _gdk_broadway_windowing_init ();
 }

 static void
 gdk_broadway_display_manager_finalize (GObject *object)
 {
-  if (!GDK_BROADWAY_DISPLAY_MANAGER (object)->init_failed)
-    g_error ("A GdkBroadwayDisplayManager object was finalized. This should not happen");
+  g_error ("A GdkBroadwayDisplayManager object was finalized. This should not happen");
  G_OBJECT_CLASS (gdk_broadway_display_manager_parent_class)->finalize (object);
 }

@@ -98,6 +102,45 @@ static void
 gdk_broadway_display_manager_class_init (GdkBroadwayDisplayManagerClass *class)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GdkDisplayManagerClass *manager_class = GDK_DISPLAY_MANAGER_CLASS (class);

  object_class->finalize = gdk_broadway_display_manager_finalize;
+
+  manager_class->open_display = gdk_broadway_display_manager_open_display;
+  manager_class->list_displays = gdk_broadway_display_manager_list_displays;
+  manager_class->set_default_display = gdk_broadway_display_manager_set_default_display;
+  manager_class->get_default_display = gdk_broadway_display_manager_get_default_display;
+  manager_class->atom_intern = _gdk_broadway_display_manager_atom_intern;
+  manager_class->get_atom_name = _gdk_broadway_display_manager_get_atom_name;
+  manager_class->lookup_keyval = gdk_broadway_display_manager_lookup_keyval;
+  manager_class->get_keyval_name = gdk_broadway_display_manager_get_keyval_name;
+}
+
+void
+_gdk_broadway_display_manager_add_display (GdkDisplayManager *manager,
+					   GdkDisplay        *display)
+{
+  GdkBroadwayDisplayManager *manager_broadway = GDK_BROADWAY_DISPLAY_MANAGER (manager);
+
+  if (manager_broadway->displays == NULL)
+    gdk_display_manager_set_default_display (manager, display);
+
+  manager_broadway->displays = g_slist_prepend (manager_broadway->displays, display);
+}
+
+void
+_gdk_broadway_display_manager_remove_display (GdkDisplayManager *manager,
+					      GdkDisplay        *display)
+{
+  GdkBroadwayDisplayManager *manager_broadway = GDK_BROADWAY_DISPLAY_MANAGER (manager);
+
+  manager_broadway->displays = g_slist_remove (manager_broadway->displays, display);
+
+  if (manager_broadway->default_display == display)
+    {
+      if (manager_broadway->displays)
+        gdk_display_manager_set_default_display (manager, manager_broadway->displays->data);
+      else
+        gdk_display_manager_set_default_display (manager, NULL);
+    }
 }
--- a/gdk/broadway/gdkeventsource.c
+++ b/gdk/broadway/gdkeventsource.c
@@ -61,11 +61,7 @@ gdk_event_source_prepare (GSource *source,
  gdk_threads_enter ();

  *timeout = -1;
-
-  if (display->event_pause_count > 0)
-    retval = FALSE;
-  else
-    retval = (_gdk_event_queue_find_first (display) != NULL);
+  retval = (_gdk_event_queue_find_first (display) != NULL);

  gdk_threads_leave ();

@@ -80,9 +76,7 @@ gdk_event_source_check (GSource *source)

  gdk_threads_enter ();

-  if (event_source->display->event_pause_count > 0)
-    retval = FALSE;
-  else if (event_source->event_poll_fd.revents & G_IO_IN)
+  if (event_source->event_poll_fd.revents & G_IO_IN)
    retval = (_gdk_event_queue_find_first (event_source->display) != NULL);
  else
    retval = FALSE;
@@ -247,7 +241,7 @@ _gdk_broadway_events_got_input (BroadwayInputMsg *message)
    break;
  case BROADWAY_EVENT_GRAB_NOTIFY:
  case BROADWAY_EVENT_UNGRAB_NOTIFY:
-    _gdk_display_device_grab_update (display, display->core_pointer, display->core_pointer, message->base.serial);
+    _gdk_display_device_grab_update (display, display->core_pointer, NULL, message->base.serial);
    break;

  case BROADWAY_EVENT_CONFIGURE_NOTIFY:
@@ -256,6 +250,10 @@ _gdk_broadway_events_got_input (BroadwayInputMsg *message)
      {
 	window->x = message->configure_notify.x;
 	window->y = message->configure_notify.y;
+	window->width = message->configure_notify.width;
+	window->height = message->configure_notify.height;
+	_gdk_window_update_size (window);
+	_gdk_broadway_window_resize_surface (window);

 	event = gdk_event_new (GDK_CONFIGURE);
 	event->configure.window = g_object_ref (window);
--- a/gdk/broadway/gdkim-broadway.c
+++ b/gdk/broadway/gdkim-broadway.c
@@ -0,0 +1,38 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+#include "config.h"
+
+#include "gdkmain.h"
+#include "gdkinternals.h"
+#include "gdkdisplay-broadway.h"
+
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+
+void
+_gdk_broadway_initialize_locale (void)
+{
+}
--- a/gdk/broadway/gdkmain-broadway.c
+++ b/gdk/broadway/gdkmain-broadway.c
@@ -0,0 +1,44 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+#include "config.h"
+
+#include "gdkdisplay-broadway.h"
+#include "gdkinternals.h"
+#include "gdkprivate-broadway.h"
+#include "gdkintl.h"
+#include "gdkdeviceprivate.h"
+
+#include <glib/gprintf.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <limits.h>
+#include <errno.h>
+
+void
+_gdk_broadway_windowing_init (void)
+{
+  _gdk_broadway_initialize_locale ();
+}
--- a/gdk/broadway/gdkprivate-broadway.h
+++ b/gdk/broadway/gdkprivate-broadway.h
@@ -40,6 +40,20 @@
 #include "gdkbroadwaywindow.h"

 void _gdk_broadway_resync_windows (void);
+void _gdk_broadway_windowing_init (void);
+
+gchar * _gdk_broadway_display_manager_get_atom_name (GdkDisplayManager *manager,
+						     GdkAtom atom);
+void _gdk_broadway_display_manager_add_display (GdkDisplayManager *manager,
+						GdkDisplay        *display);
+void _gdk_broadway_display_manager_remove_display (GdkDisplayManager *manager,
+						   GdkDisplay        *display);
+GdkAtom _gdk_broadway_display_manager_atom_intern_static_string (GdkDisplayManager *manager,
+								 const gchar *atom_name);
+GdkAtom _gdk_broadway_display_manager_atom_intern (GdkDisplayManager *manager,
+						   const gchar *atom_name, 
+						   gboolean     only_if_exists);
+

 void     _gdk_broadway_window_register_dnd (GdkWindow      *window);
 GdkDragContext * _gdk_broadway_window_drag_begin (GdkWindow *window,
@@ -78,8 +92,6 @@ gboolean _gdk_broadway_moveresize_configure_done (GdkDisplay *display,

 void     _gdk_broadway_selection_window_destroyed (GdkWindow *window);
 void     _gdk_broadway_window_grab_check_destroy (GdkWindow *window);
-void     _gdk_broadway_window_grab_check_unmap (GdkWindow *window,
-						gulong     serial);

 void _gdk_keymap_keys_changed     (GdkDisplay      *display);
 gint _gdk_broadway_get_group_for_state (GdkDisplay      *display,
@@ -89,6 +101,8 @@ void _gdk_keymap_add_virtual_modifiers_compat (GdkKeymap       *keymap,
 gboolean _gdk_keymap_key_is_modifier   (GdkKeymap       *keymap,
 					guint            keycode);

+void _gdk_broadway_initialize_locale (void);
+
 void _gdk_broadway_screen_events_init   (GdkScreen *screen);
 GdkVisual *_gdk_broadway_screen_get_system_visual (GdkScreen * screen);
 gint _gdk_broadway_screen_visual_get_best_depth (GdkScreen * screen);
@@ -203,6 +217,9 @@ void _gdk_broadway_window_resize_surface        (GdkWindow *window);
 void _gdk_broadway_cursor_update_theme (GdkCursor *cursor);
 void _gdk_broadway_cursor_display_finalize (GdkDisplay *display);

+#define GDK_SCREEN_DISPLAY(screen)    (GDK_BROADWAY_SCREEN (screen)->display)
+#define GDK_WINDOW_SCREEN(win)	      (GDK_WINDOW_IMPL_BROADWAY (((GdkWindow *)win)->impl)->screen)
+#define GDK_WINDOW_DISPLAY(win)       (GDK_BROADWAY_SCREEN (GDK_WINDOW_SCREEN (win))->display)
 #define GDK_WINDOW_IS_BROADWAY(win)   (GDK_IS_WINDOW_IMPL_BROADWAY (((GdkWindow *)win)->impl))

 #endif /* __GDK_PRIVATE_BROADWAY_H__ */
--- a/gdk/broadway/gdkproperty-broadway.c
+++ b/gdk/broadway/gdkproperty-broadway.c
@@ -35,6 +35,34 @@

 #include <string.h>

+GdkAtom
+_gdk_broadway_display_manager_atom_intern (GdkDisplayManager *manager,
+					   const gchar *atom_name, 
+					   gboolean     only_if_exists)
+{
+  return _GDK_MAKE_ATOM (g_quark_from_string (atom_name));
+}
+
+GdkAtom
+_gdk_broadway_display_manager_atom_intern_static_string (GdkDisplayManager *manager,
+							 const gchar *atom_name)
+{
+  return _GDK_MAKE_ATOM (g_quark_from_static_string (atom_name));
+}
+
+static const char *
+get_atom_name (GdkAtom atom)
+{
+  return g_quark_to_string (GPOINTER_TO_UINT(atom));
+}
+
+gchar *
+_gdk_broadway_display_manager_get_atom_name (GdkDisplayManager *manager,
+					     GdkAtom atom)
+{
+  return g_strdup (get_atom_name (atom));
+}
+
 gboolean
 _gdk_broadway_window_get_property (GdkWindow   *window,
 				   GdkAtom      property,
--- a/gdk/broadway/gdkwindow-broadway.c
+++ b/gdk/broadway/gdkwindow-broadway.c
@@ -83,16 +83,18 @@ G_DEFINE_TYPE (GdkWindowImplBroadway,
 	       gdk_window_impl_broadway,
 	       GDK_TYPE_WINDOW_IMPL)

-static void
-update_dirty_windows_and_sync (void)
+static guint dirty_flush_id = 0;
+
+static gboolean
+dirty_flush_idle (gpointer data)
 {
  GList *l;
  GdkBroadwayDisplay *display;
-  gboolean updated_surface;
+
+  dirty_flush_id = 0;

  display = GDK_BROADWAY_DISPLAY (gdk_display_get_default ());

-  updated_surface = FALSE;
  for (l = display->toplevels; l != NULL; l = l->next)
    {
      GdkWindowImplBroadway *impl = l->data;
@@ -100,7 +102,6 @@ update_dirty_windows_and_sync (void)
      if (impl->dirty)
 	{
 	  impl->dirty = FALSE;
-	  updated_surface = TRUE;
 	  _gdk_broadway_server_window_update (display->server,
 					      impl->id,
 					      impl->surface);
@@ -109,32 +110,16 @@ update_dirty_windows_and_sync (void)

  /* We sync here to ensure all references to the impl->surface memory
     is done, as we may later paint new data in them. */
-  if (updated_surface)
-    gdk_display_sync (GDK_DISPLAY (display));
-  else
-    gdk_display_flush (GDK_DISPLAY (display));
-}
-
-static guint flush_id = 0;
-
-static gboolean
-flush_idle (gpointer data)
-{
-  flush_id = 0;
-
-  gdk_display_flush (gdk_display_get_default ());
+  gdk_display_sync (GDK_DISPLAY (display));

  return FALSE;
 }

-/* We need to flush in an idle rather than AFTER_PAINT, as the clock
-   is frozen during e.g. window resizes so the paint will not happen
-   and the window resize request is never flushed. */
 static void
-queue_flush (GdkWindow *window)
+queue_dirty_flush (GdkBroadwayDisplay *display)
 {
-  if (flush_id == 0)
-    flush_id = gdk_threads_add_idle (flush_idle, NULL);
+  if (dirty_flush_id == 0)
+    dirty_flush_id = gdk_threads_add_idle (dirty_flush_idle, NULL);
 }

 static void
@@ -212,25 +197,6 @@ _gdk_broadway_screen_init_root_window (GdkScreen * screen)
  _gdk_window_update_size (broadway_screen->root_window);
 }

-static void
-on_frame_clock_after_paint (GdkFrameClock *clock,
-                            GdkWindow     *window)
-{
-  update_dirty_windows_and_sync ();
-}
-
-static void
-connect_frame_clock (GdkWindow *window)
-{
-  if (WINDOW_IS_TOPLEVEL (window))
-    {
-      GdkFrameClock *frame_clock = gdk_window_get_frame_clock (window);
-
-      g_signal_connect (frame_clock, "after-paint",
-                        G_CALLBACK (on_frame_clock_after_paint), window);
-    }
-}
-
 void
 _gdk_broadway_display_create_window_impl (GdkDisplay    *display,
 					  GdkWindow     *window,
@@ -263,21 +229,22 @@ _gdk_broadway_display_create_window_impl (GdkDisplay    *display,
  g_assert (GDK_WINDOW_TYPE (window->parent) == GDK_WINDOW_ROOT);

  broadway_display->toplevels = g_list_prepend (broadway_display->toplevels, impl);
-
-  connect_frame_clock (window);
 }

 void
 _gdk_broadway_window_resize_surface (GdkWindow *window)
 {
  GdkWindowImplBroadway *impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
+  cairo_surface_t *old;

  if (impl->surface)
    {
-      cairo_surface_destroy (impl->surface);
+      old = impl->surface;

      impl->surface = _gdk_broadway_server_create_surface (gdk_window_get_width (impl->wrapper),
 							   gdk_window_get_height (impl->wrapper));
+
+      cairo_surface_destroy (old);
    }

  if (impl->ref_surface)
@@ -417,7 +384,7 @@ gdk_window_broadway_show (GdkWindow *window, gboolean already_mapped)

  broadway_display = GDK_BROADWAY_DISPLAY (gdk_window_get_display (window));
  if (_gdk_broadway_server_window_show (broadway_display->server, impl->id))
-    queue_flush (window);
+    queue_dirty_flush (broadway_display);

 }

@@ -437,12 +404,8 @@ gdk_window_broadway_hide (GdkWindow *window)
    _gdk_make_event (GDK_WINDOW (window), GDK_UNMAP, NULL, FALSE);

  broadway_display = GDK_BROADWAY_DISPLAY (gdk_window_get_display (window));
-
-  _gdk_broadway_window_grab_check_unmap (window,
-					 _gdk_broadway_server_get_next_serial (broadway_display->server));
-
  if (_gdk_broadway_server_window_hide (broadway_display->server, impl->id))
-    queue_flush (window);
+    queue_dirty_flush (broadway_display);

  _gdk_window_clear_update_area (window);
 }
@@ -497,7 +460,7 @@ gdk_window_broadway_move_resize (GdkWindow *window,
 					   with_move,
 					   x, y,
 					   window->width, window->height);
-  queue_flush (window);
+  queue_dirty_flush (broadway_display);
  if (size_changed)
    window->resize_count++;
 }
@@ -582,12 +545,6 @@ gdk_broadway_window_set_geometry_hints (GdkWindow         *window,
 					const GdkGeometry *geometry,
 					GdkWindowHints     geom_mask)
 {
-  GdkWindowImplBroadway *impl;
-
-  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
-
-  impl->geometry_hints = *geometry;
-  impl->geometry_hints_mask = geom_mask;
 }

 static void
@@ -653,7 +610,7 @@ gdk_window_broadway_set_device_cursor (GdkWindow *window,
    {
      _gdk_broadway_cursor_update_theme (cursor);
      g_hash_table_replace (impl->device_cursor,
-                            device, g_object_ref (cursor));
+                            device, gdk_cursor_ref (cursor));
    }

  if (!GDK_WINDOW_DESTROYED (window))
@@ -1035,8 +992,6 @@ struct _MoveResizeData
  gint moveresize_orig_width;
  gint moveresize_orig_height;
  long moveresize_process_time;
-  GdkWindowHints moveresize_geom_mask;
-  GdkGeometry moveresize_geometry;
  BroadwayInputMsg *moveresize_pending_event;
 };

@@ -1044,19 +999,20 @@ static MoveResizeData *
 get_move_resize_data (GdkDisplay *display,
 		      gboolean    create)
 {
-  GdkBroadwayDisplay *broadway_display;
  MoveResizeData *mv_resize;
+  static GQuark move_resize_quark = 0;

-  broadway_display = GDK_BROADWAY_DISPLAY (display);
+  if (!move_resize_quark)
+    move_resize_quark = g_quark_from_static_string ("gdk-window-moveresize");

-  mv_resize = broadway_display->move_resize_data;
+  mv_resize = g_object_get_qdata (G_OBJECT (display), move_resize_quark);

  if (!mv_resize && create)
    {
      mv_resize = g_new0 (MoveResizeData, 1);
      mv_resize->display = display;

-      broadway_display->move_resize_data = mv_resize;
+      g_object_set_qdata (G_OBJECT (display), move_resize_quark, mv_resize);
    }

  return mv_resize;
@@ -1125,13 +1081,6 @@ update_pos (MoveResizeData *mv_resize,
      w = MAX (w, 1);
      h = MAX (h, 1);

-      if (mv_resize->moveresize_geom_mask)
-	{
-	  gdk_window_constrain_size (&mv_resize->moveresize_geometry,
-				     mv_resize->moveresize_geom_mask,
-				     w, h, &w, &h);
-	}
-
      gdk_window_move_resize (mv_resize->moveresize_window, x, y, w, h);
    }
  else
@@ -1186,7 +1135,7 @@ _gdk_broadway_moveresize_handle_event (GdkDisplay *display,

  switch (event->base.type)
    {
-    case BROADWAY_EVENT_POINTER_MOVE:
+    case 'm':
      if (mv_resize->moveresize_window->resize_count > 0)
 	{
 	  if (mv_resize->moveresize_pending_event)
@@ -1214,7 +1163,7 @@ _gdk_broadway_moveresize_handle_event (GdkDisplay *display,
 	finish_drag (mv_resize);
      break;

-    case BROADWAY_EVENT_BUTTON_RELEASE:
+    case 'B':
      update_pos (mv_resize,
 		  event->pointer.root_x,
 		  event->pointer.root_y);
@@ -1275,7 +1224,6 @@ create_moveresize_window (MoveResizeData *mv_resize,

  gdk_window_show (mv_resize->moveresize_emulation_window);

-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
  status = gdk_pointer_grab (mv_resize->moveresize_emulation_window,
 			     FALSE,
 			     GDK_BUTTON_RELEASE_MASK |
@@ -1283,7 +1231,6 @@ create_moveresize_window (MoveResizeData *mv_resize,
 			     NULL,
 			     NULL,
 			     timestamp);
-  G_GNUC_END_IGNORE_DEPRECATIONS;

  if (status != GDK_GRAB_SUCCESS)
    {
@@ -1296,71 +1243,6 @@ create_moveresize_window (MoveResizeData *mv_resize,
  mv_resize->moveresize_process_time = 0;
 }

-static void
-calculate_unmoving_origin (MoveResizeData *mv_resize)
-{
-  GdkRectangle rect;
-  gint width, height;
-
-  if (mv_resize->moveresize_geom_mask & GDK_HINT_WIN_GRAVITY &&
-      mv_resize->moveresize_geometry.win_gravity == GDK_GRAVITY_STATIC)
-    {
-      gdk_window_get_origin (mv_resize->moveresize_window,
-			     &mv_resize->moveresize_orig_x,
-			     &mv_resize->moveresize_orig_y);
-    }
-  else
-    {
-      gdk_window_get_frame_extents (mv_resize->moveresize_window, &rect);
-      gdk_window_get_geometry (mv_resize->moveresize_window,
-			       NULL, NULL, &width, &height);
-
-      switch (mv_resize->moveresize_geometry.win_gravity)
-	{
-	case GDK_GRAVITY_NORTH_WEST:
-	  mv_resize->moveresize_orig_x = rect.x;
-	  mv_resize->moveresize_orig_y = rect.y;
-	  break;
-	case GDK_GRAVITY_NORTH:
-	  mv_resize->moveresize_orig_x = rect.x + rect.width / 2 - width / 2;
-	  mv_resize->moveresize_orig_y = rect.y;
-	  break;
-	case GDK_GRAVITY_NORTH_EAST:
-	  mv_resize->moveresize_orig_x = rect.x + rect.width - width;
-	  mv_resize->moveresize_orig_y = rect.y;
-	  break;
-	case GDK_GRAVITY_WEST:
-	  mv_resize->moveresize_orig_x = rect.x;
-	  mv_resize->moveresize_orig_y = rect.y + rect.height / 2 - height / 2;
-	  break;
-	case GDK_GRAVITY_CENTER:
-	  mv_resize->moveresize_orig_x = rect.x + rect.width / 2 - width / 2;
-	  mv_resize->moveresize_orig_y = rect.y + rect.height / 2 - height / 2;
-	  break;
-	case GDK_GRAVITY_EAST:
-	  mv_resize->moveresize_orig_x = rect.x + rect.width - width;
-	  mv_resize->moveresize_orig_y = rect.y + rect.height / 2 - height / 2;
-	  break;
-	case GDK_GRAVITY_SOUTH_WEST:
-	  mv_resize->moveresize_orig_x = rect.x;
-	  mv_resize->moveresize_orig_y = rect.y + rect.height - height;
-	  break;
-	case GDK_GRAVITY_SOUTH:
-	  mv_resize->moveresize_orig_x = rect.x + rect.width / 2 - width / 2;
-	  mv_resize->moveresize_orig_y = rect.y + rect.height - height;
-	  break;
-	case GDK_GRAVITY_SOUTH_EAST:
-	  mv_resize->moveresize_orig_x = rect.x + rect.width - width;
-	  mv_resize->moveresize_orig_y = rect.y + rect.height - height;
-	  break;
-	default:
-	  mv_resize->moveresize_orig_x = rect.x;
-	  mv_resize->moveresize_orig_y = rect.y;
-	  break;
-	}
-    }
-}
-
 static void
 gdk_broadway_window_begin_resize_drag (GdkWindow     *window,
 				       GdkWindowEdge  edge,
@@ -1370,16 +1252,17 @@ gdk_broadway_window_begin_resize_drag (GdkWindow     *window,
 				       gint           root_y,
 				       guint32        timestamp)
 {
+  GdkBroadwayDisplay *broadway_display;
  MoveResizeData *mv_resize;
-  GdkWindowImplBroadway *impl;
-
-  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);

  if (GDK_WINDOW_DESTROYED (window) ||
      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
    return;

-  mv_resize = get_move_resize_data (gdk_window_get_display (window), TRUE);
+  /* We need a connection to be able to get mouse events, if not, punt */
+  broadway_display = GDK_BROADWAY_DISPLAY (gdk_window_get_display (window));
+
+  mv_resize = get_move_resize_data (GDK_WINDOW_DISPLAY (window), TRUE);

  mv_resize->is_resize = TRUE;
  mv_resize->moveresize_button = button;
@@ -1388,14 +1271,12 @@ gdk_broadway_window_begin_resize_drag (GdkWindow     *window,
  mv_resize->moveresize_y = root_y;
  mv_resize->moveresize_window = g_object_ref (window);

+  gdk_window_get_origin (mv_resize->moveresize_window,
+			 &mv_resize->moveresize_orig_x,
+			 &mv_resize->moveresize_orig_y);
  mv_resize->moveresize_orig_width = gdk_window_get_width (window);
  mv_resize->moveresize_orig_height = gdk_window_get_height (window);

-  mv_resize->moveresize_geom_mask = impl->geometry_hints_mask;
-  mv_resize->moveresize_geometry = impl->geometry_hints;
-
-  calculate_unmoving_origin (mv_resize);
-
  create_moveresize_window (mv_resize, timestamp);
 }

@@ -1451,6 +1332,7 @@ gdk_broadway_window_process_updates_recurse (GdkWindow *window,

  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
  impl->dirty = TRUE;
+  queue_dirty_flush (GDK_BROADWAY_DISPLAY (gdk_window_get_display (window)));
 }

 void
@@ -1516,7 +1398,7 @@ _gdk_broadway_window_translate (GdkWindow      *window,
      if (_gdk_broadway_server_window_translate (broadway_display->server,
 						 impl->id,
 						 area, dx, dy))
-	queue_flush (window);
+	queue_dirty_flush (broadway_display);
    }
 }

--- a/gdk/broadway/gdkwindow-broadway.h
+++ b/gdk/broadway/gdkwindow-broadway.h
@@ -64,9 +64,6 @@ struct _GdkWindowImplBroadway
  gint8 toplevel_window_type;
  gboolean dirty;
  gboolean last_synced;
-
-  GdkGeometry geometry_hints;
-  GdkWindowHints geometry_hints_mask;
 };

 struct _GdkWindowImplBroadwayClass
--- a/gdk/fallback-c89.c
+++ b/gdk/fallback-c89.c
@@ -42,15 +42,3 @@ isinf (double x)
  return (!_finite (x) && !_isnan (x));
 }
 #endif
-
-/* Workaround for round() for non-GCC/non-C99 compilers */
-#ifndef HAVE_ROUND
-static inline double
-round (double x)
-{
-  if (x >= 0)
-    return floor (x + 0.5);
-  else
-    return ceil (x - 0.5);
-}
-#endif
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -139,8 +139,7 @@ static const GDebugKey gdk_debug_keys[] = {
  {"xinerama",      GDK_DEBUG_XINERAMA},
  {"draw",          GDK_DEBUG_DRAW},
  {"eventloop",     GDK_DEBUG_EVENTLOOP},
-  {"frames",        GDK_DEBUG_FRAMES},
-  {"settings",      GDK_DEBUG_SETTINGS}
+  {"frames",        GDK_DEBUG_FRAMES}
 };

 static gboolean
@@ -275,6 +274,9 @@ gdk_pre_parse_libgtk_only (void)
      else if (g_str_equal (rendering_mode, "recording"))
        _gdk_rendering_mode = GDK_RENDERING_MODE_RECORDING;
    }
+
+  /* Do any setup particular to the windowing system */
+  gdk_display_manager_get ();
 }

  
@@ -325,24 +327,6 @@ gdk_parse_args (int    *argc,
  GDK_NOTE (MISC, g_message ("progname: \"%s\"", g_get_prgname ()));
 }

-/**
- * gdk_get_display:
- *
- * Gets the name of the display, which usually comes from the
- * <envar>DISPLAY</envar> environment variable or the
- * <option>--display</option> command line option.
- *
- * Returns: the name of the display.
- *
- * Deprecated: 3.8: Call gdk_display_get_name (gdk_display_get_default ()))
- *    instead.
- */
-gchar *
-gdk_get_display (void)
-{
-  return g_strdup (gdk_display_get_name (gdk_display_get_default ()));
-}
-
 /**
 * gdk_get_display_arg_name:
 *
@@ -368,7 +352,7 @@ gdk_get_display_arg_name (void)
 *
 * Opens the default display specified by command line arguments or
 * environment variables, sets it as the default display, and returns
- * it. gdk_parse_args() must have been called first. If the default
+ * it.  gdk_parse_args must have been called first. If the default
 * display has previously been set, simply returns that. An internal
 * function that should not be used by applications.
 *
@@ -382,9 +366,6 @@ gdk_display_open_default_libgtk_only (void)

  g_return_val_if_fail (gdk_initialized, NULL);

-  if (gdk_display_manager_peek () == NULL)
-    return NULL;
-
  display = gdk_display_get_default ();
  if (display)
    return display;
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -40,8 +40,6 @@
 #include <gdk/gdkdnd.h>
 #include <gdk/gdkenumtypes.h>
 #include <gdk/gdkevents.h>
-#include <gdk/gdkframeclock.h>
-#include <gdk/gdkframetimings.h>
 #include <gdk/gdkkeys.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkmain.h>
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -101,7 +101,6 @@ gdk_display_is_closed
 gdk_display_keyboard_ungrab
 gdk_display_list_devices
 gdk_display_manager_get
-gdk_display_manager_peek
 gdk_display_manager_get_default_display
 gdk_display_manager_get_type
 gdk_display_manager_list_displays
@@ -189,27 +188,6 @@ gdk_events_pending
 gdk_event_type_get_type
 gdk_filter_return_get_type
 gdk_flush
-gdk_frame_clock_begin_updating
-gdk_frame_clock_end_updating
-gdk_frame_clock_get_current_timings
-gdk_frame_clock_get_frame_counter
-gdk_frame_clock_get_frame_time
-gdk_frame_clock_get_history_start
-gdk_frame_clock_get_refresh_info
-gdk_frame_clock_get_timings
-gdk_frame_clock_get_type
-gdk_frame_clock_idle_get_type
-gdk_frame_clock_phase_get_type
-gdk_frame_clock_request_phase
-gdk_frame_timings_get_complete
-gdk_frame_timings_get_frame_counter
-gdk_frame_timings_get_frame_time
-gdk_frame_timings_get_predicted_presentation_time
-gdk_frame_timings_get_presentation_time
-gdk_frame_timings_get_refresh_interval
-gdk_frame_timings_get_type
-gdk_frame_timings_ref
-gdk_frame_timings_unref
 gdk_fullscreen_mode_get_type
 gdk_get_default_root_window
 gdk_get_display
@@ -336,7 +314,6 @@ gdk_set_program_class
 gdk_set_show_events
 gdk_setting_action_get_type
 gdk_setting_get
-gdk_set_allowed_backends
 gdk_status_get_type
 gdk_synthesize_window_state
 gdk_test_render_sync
@@ -433,7 +410,6 @@ gdk_window_get_effective_parent
 gdk_window_get_effective_toplevel
 gdk_window_get_events
 gdk_window_get_focus_on_map
-gdk_window_get_frame_clock
 gdk_window_get_frame_extents
 gdk_window_get_fullscreen_mode
 gdk_window_get_geometry
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -25,7 +25,6 @@
 #include "gdkdisplayprivate.h"

 #include "gdkdeviceprivate.h"
-#include "gdkdisplaymanagerprivate.h"
 #include "gdkevents.h"
 #include "gdkwindowimpl.h"
 #include "gdkinternals.h"
@@ -82,36 +81,6 @@ static guint signals[LAST_SIGNAL] = { 0 };

 G_DEFINE_TYPE (GdkDisplay, gdk_display, G_TYPE_OBJECT)

-static void
-gdk_display_real_make_default (GdkDisplay *display)
-{
-}
-
-static void
-device_removed_cb (GdkDeviceManager *device_manager,
-                   GdkDevice        *device,
-                   GdkDisplay       *display)
-{
-  g_hash_table_remove (display->multiple_click_info, device);
-  g_hash_table_remove (display->device_grabs, device);
-  g_hash_table_remove (display->pointers_info, device);
-
-  /* FIXME: change core pointer and remove from device list */
-}
-
-static void
-gdk_display_real_opened (GdkDisplay *display)
-{
-  GdkDeviceManager *device_manager;
-
-  device_manager = gdk_display_get_device_manager (display);
-
-  g_signal_connect (device_manager, "device-removed",
-                    G_CALLBACK (device_removed_cb), display);
-
-  _gdk_display_manager_add_display (gdk_display_manager_get (), display);
-}
-
 static void
 gdk_display_class_init (GdkDisplayClass *class)
 {
@@ -123,9 +92,6 @@ gdk_display_class_init (GdkDisplayClass *class)
  class->get_app_launch_context = gdk_display_real_get_app_launch_context;
  class->window_type = GDK_TYPE_WINDOW;

-  class->opened = gdk_display_real_opened;
-  class->make_default = gdk_display_real_make_default;
-
  /**
   * GdkDisplay::opened:
   * @display: the object on which the signal is emitted
@@ -137,8 +103,7 @@ gdk_display_class_init (GdkDisplayClass *class)
    g_signal_new (g_intern_static_string ("opened"),
 		  G_OBJECT_CLASS_TYPE (object_class),
                  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (GdkDisplayClass, opened),
-                  NULL, NULL,
+                  0, NULL, NULL,
                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);

@@ -192,6 +157,29 @@ free_device_grabs_foreach (gpointer key,
  return TRUE;
 }

+static void
+device_removed_cb (GdkDeviceManager *device_manager,
+                   GdkDevice        *device,
+                   GdkDisplay       *display)
+{
+  g_hash_table_remove (display->multiple_click_info, device);
+  g_hash_table_remove (display->device_grabs, device);
+  g_hash_table_remove (display->pointers_info, device);
+
+  /* FIXME: change core pointer and remove from device list */
+}
+
+static void
+gdk_display_opened (GdkDisplay *display)
+{
+  GdkDeviceManager *device_manager;
+
+  device_manager = gdk_display_get_device_manager (display);
+
+  g_signal_connect (device_manager, "device-removed",
+                    G_CALLBACK (device_removed_cb), display);
+}
+
 static void
 gdk_display_init (GdkDisplay *display)
 {
@@ -208,6 +196,9 @@ gdk_display_init (GdkDisplay *display)

  display->multiple_click_info = g_hash_table_new_full (NULL, NULL, NULL,
                                                        (GDestroyNotify) g_free);
+
+  g_signal_connect (display, "opened",
+                    G_CALLBACK (gdk_display_opened), NULL);
 }

 static void
@@ -218,8 +209,6 @@ gdk_display_dispose (GObject *object)

  device_manager = gdk_display_get_device_manager (GDK_DISPLAY (object));

-  _gdk_display_manager_remove_display (gdk_display_manager_get (), display);
-
  g_list_free_full (display->queued_events, (GDestroyNotify) gdk_event_free);
  display->queued_events = NULL;
  display->queued_tail = NULL;
@@ -1426,6 +1415,12 @@ gdk_display_get_name (GdkDisplay *display)
  return GDK_DISPLAY_GET_CLASS (display)->get_name (display);
 }

+gchar *
+gdk_get_display (void)
+{
+  return g_strdup (gdk_display_get_name (gdk_display_get_default ()));
+}
+
 /**
 * gdk_display_get_n_screens:
 * @display: a #GdkDisplay
@@ -1435,15 +1430,13 @@ gdk_display_get_name (GdkDisplay *display)
 * Returns: number of screens.
 *
 * Since: 2.2
- *
- * Deprecated: 3.10: The number of screens is always 1.
 */
 gint
 gdk_display_get_n_screens (GdkDisplay *display)
 {
  g_return_val_if_fail (GDK_IS_DISPLAY (display), 0);

-  return 1;
+  return GDK_DISPLAY_GET_CLASS (display)->get_n_screens (display);
 }

 /**
@@ -1462,9 +1455,8 @@ gdk_display_get_screen (GdkDisplay *display,
 			gint        screen_num)
 {
  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-  g_return_val_if_fail (screen_num == 0, NULL);

-  return gdk_display_get_default_screen (display);
+  return GDK_DISPLAY_GET_CLASS (display)->get_screen (display, screen_num);
 }

 /**
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -45,7 +45,6 @@ GdkDisplay *gdk_display_open                (const gchar *display_name);

 const gchar * gdk_display_get_name         (GdkDisplay *display);

-GDK_DEPRECATED_IN_3_10
 gint        gdk_display_get_n_screens      (GdkDisplay  *display);
 GdkScreen * gdk_display_get_screen         (GdkDisplay  *display,
                                            gint         screen_num);
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -26,7 +26,6 @@

 #include "gdkconfig.h"
 #include "gdkdisplaymanagerprivate.h"
-#include "gdkdisplayprivate.h"
 #include "gdkinternals.h"
 #include "gdkkeysprivate.h"
 #include "gdkmarshalers.h"
@@ -34,7 +33,6 @@

 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"
-#include "x11/gdkprivate-x11.h"
 #endif

 #ifdef GDK_WINDOWING_QUARTZ
@@ -43,22 +41,18 @@
 * "generic" GDK source code.
 */
 #include "quartz/gdkquartzdisplaymanager.h"
-#include "quartz/gdkprivate-quartz.h"
 #endif

 #ifdef GDK_WINDOWING_BROADWAY
 #include "broadway/gdkbroadwaydisplaymanager.h"
-#include "broadway/gdkprivate-broadway.h"
 #endif

 #ifdef GDK_WINDOWING_WIN32
 #include "win32/gdkwin32.h"
-#include "win32/gdkprivate-win32.h"
 #endif

 #ifdef GDK_WINDOWING_WAYLAND
 #include "wayland/gdkwayland.h"
-#include "wayland/gdkprivate-wayland.h"
 #endif

 /**
@@ -131,24 +125,7 @@ static void gdk_display_manager_get_property (GObject                *object,

 static guint signals[LAST_SIGNAL] = { 0 };

-static void g_initable_iface_init (GInitableIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (GdkDisplayManager, gdk_display_manager, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, g_initable_iface_init))
-
-static gboolean
-gdk_display_manager_initable_init (GInitable     *initable,
-                                   GCancellable  *cancellable,
-                                   GError       **error)
-{
-  return TRUE;
-}
-
-static void
-g_initable_iface_init (GInitableIface *iface)
-{
-  iface->init = gdk_display_manager_initable_init;
-}
+G_DEFINE_TYPE (GdkDisplayManager, gdk_display_manager, G_TYPE_OBJECT)

 static void
 gdk_display_manager_class_init (GdkDisplayManagerClass *klass)
@@ -158,6 +135,8 @@ gdk_display_manager_class_init (GdkDisplayManagerClass *klass)
  object_class->set_property = gdk_display_manager_set_property;
  object_class->get_property = gdk_display_manager_get_property;

+  klass->keyval_convert_case = _gdk_display_manager_real_keyval_convert_case;
+
  /**
   * GdkDisplayManager::display-opened:
   * @manager: the object on which the signal is emitted
@@ -229,50 +208,6 @@ gdk_display_manager_get_property (GObject      *object,
    }
 }

-static const gchar *allowed_backends;
-
-/**
- * gdk_set_allowed_backends:
- * @backends: a comma-separated list of backends
- *
- * Sets a list of backends that GDK should try to use.
- *
- * This can be be useful if your application does not
- * work with certain GDK backends.
- *
- * By default, GDK tries all included backends.
- *
- * For example,
- * <programlisting>
- * gdk_set_allowed_backends ("wayland,quartz,*");
- * </programlisting>
- * instructs GDK to try the Wayland backend first,
- * followed by the Quartz backend, and then all
- * others.
- *
- * If the <envvar>GDK_BACKEND</envvar> environment variable
- * is set, it determines what backends are tried in what
- * order, while still respecting the set of allowed backends
- * that are specified by this function.
- *
- * The possible backend names are x11, win32, quartz,
- * broadway, wayland. You can also include a * in the
- * list to try all remaining backends.
- *
- * This call must happen prior to gdk_display_open(),
- * gtk_init(), gtk_init_with_args() or gtk_init_check()
- * in order to take effect.
- *
- * Since: 3.10
- */
-void
-gdk_set_allowed_backends (const gchar *backends)
-{
-  allowed_backends = g_strdup (backends);
-}
-
-static GdkDisplayManager *manager = NULL;
-
 /**
 * gdk_display_manager_get:
 *
@@ -281,8 +216,7 @@ static GdkDisplayManager *manager = NULL;
 * When called for the first time, this function consults the
 * <envar>GDK_BACKEND</envar> environment variable to find out which
 * of the supported GDK backends to use (in case GDK has been compiled
- * with multiple backends). Applications can use gdk_set_allowed_backends()
- * to limit what backends can be used.
+ * with multiple backends).
 *
 * Returns: (transfer none): The global #GdkDisplayManager singleton;
 *     gdk_parse_args(), gdk_init(), or gdk_init_check() must have
@@ -293,95 +227,42 @@ static GdkDisplayManager *manager = NULL;
 GdkDisplayManager*
 gdk_display_manager_get (void)
 {
-  gdk_display_manager_peek ();
+  static GdkDisplayManager *manager = NULL;

-  if (manager == NULL)
-    g_error ("No GDK backend found (%s)", allowed_backends);
+  if (!manager)
+    {
+      const gchar *backend;

-  return manager;
-}
-
-typedef struct _GdkBackend GdkBackend;
-
-struct _GdkBackend {
-  const char *name;
-  GType (* get_backend_type) (void);
-  GdkDisplay * (* open_display) (const char *name);
-};
-
-GdkBackend gdk_backends[] = {
+      backend = g_getenv ("GDK_BACKEND");
 #ifdef GDK_WINDOWING_QUARTZ
-  { "quartz",   gdk_quartz_display_manager_get_type,    _gdk_quartz_display_open },
+      if (backend == NULL || strcmp (backend, "quartz") == 0)
+        manager = g_object_new (gdk_quartz_display_manager_get_type (), NULL);
+      else
 #endif
 #ifdef GDK_WINDOWING_WIN32
-  { "win32",    gdk_win32_display_manager_get_type,     _gdk_win32_display_open },
+      if (backend == NULL || strcmp (backend, "win32") == 0)
+        manager = g_object_new (gdk_win32_display_manager_get_type (), NULL);
+      else
 #endif
 #ifdef GDK_WINDOWING_X11
-  { "x11",      gdk_x11_display_manager_get_type,       _gdk_x11_display_open },
+      if (backend == NULL || strcmp (backend, "x11") == 0)
+        manager = g_object_new (gdk_x11_display_manager_get_type (), NULL);
+      else
 #endif
 #ifdef GDK_WINDOWING_WAYLAND
-  { "wayland",  gdk_wayland_display_manager_get_type,   _gdk_wayland_display_open },
+      if (backend == NULL || strcmp (backend, "wayland") == 0)
+        manager = g_object_new (gdk_wayland_display_manager_get_type (), NULL);
+      else
 #endif
 #ifdef GDK_WINDOWING_BROADWAY
-  { "broadway", gdk_broadway_display_manager_get_type,  _gdk_broadway_display_open },
+      if (backend == NULL || strcmp (backend, "broadway") == 0)
+        manager = g_object_new (gdk_broadway_display_manager_get_type (), NULL);
+      else
 #endif
-  /* NULL-terminating this array so we can use commas above */
-  { NULL, NULL }
-};
-
-/**
- * gdk_display_manager_peek:
- *
- * Gets the singleton #GdkDisplayManager object. If GDK could
- * not be initialized, %NULL is returned.
- *
- * Returns: (transfer none): The global #GdkDisplayManager singleton,
- *     or %NULL if GDK could not be initialized. gdk_parse_args(),
- *     gdk_init(), or gdk_init_check() must have been called first
- *
- * Since: 3.10
- */
-GdkDisplayManager *
-gdk_display_manager_peek (void)
-{
-  if (manager == NULL)
-    {
-      const gchar *backend_list;
-      gchar **backends;
-      gint i, j;
-      gboolean allow_any;
-
-      if (allowed_backends == NULL)
-        allowed_backends = "*";
-      allow_any = strstr (allowed_backends, "*") != NULL;
-
-      backend_list = g_getenv ("GDK_BACKEND");
-      if (backend_list == NULL)
-        backend_list = allowed_backends;
-      backends = g_strsplit (backend_list, ",", 0);
-
-      for (i = 0; manager == NULL && backends[i] != NULL; i++)
-        {
-          const gchar *backend = backends[i];
-          gboolean any = g_str_equal (backend, "*");
-
-          if (!allow_any && !any && !strstr (allowed_backends, backend))
-            continue;
-
-          for (j = 0; gdk_backends[j].name != NULL; j++)
-            {
-              if ((any && allow_any) ||
-                  (any && strstr (allowed_backends, gdk_backends[j].name)) ||
-                  g_str_equal (backend, gdk_backends[j].name))
-                {
-                  GDK_NOTE (MISC, g_message ("Trying %s backend", gdk_backends[j].name));
-                  manager = g_initable_new (gdk_backends[j].get_backend_type (), NULL, NULL, NULL);
-                  if (manager)
-                    break;
-                }
-            }
-        }
-      g_strfreev (backends);
+      if (backend != NULL)
+        g_error ("Unsupported GDK backend: %s", backend);
+      else
+        g_error ("No GDK backend found");
    }

  return manager;
@@ -401,7 +282,7 @@ gdk_display_manager_peek (void)
 GdkDisplay *
 gdk_display_manager_get_default_display (GdkDisplayManager *manager)
 {
-  return manager->default_display;
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->get_default_display (manager);
 }

 /**
@@ -458,10 +339,7 @@ void
 gdk_display_manager_set_default_display (GdkDisplayManager *manager,
                                         GdkDisplay        *display)
 {
-  manager->default_display = display;
-
-  if (display)
-    GDK_DISPLAY_GET_CLASS (display)->make_default (display);
+  GDK_DISPLAY_MANAGER_GET_CLASS (manager)->set_default_display (manager, display);

  g_object_notify (G_OBJECT (manager), "default-display");
 }
@@ -481,7 +359,7 @@ gdk_display_manager_set_default_display (GdkDisplayManager *manager,
 GSList *
 gdk_display_manager_list_displays (GdkDisplayManager *manager)
 {
-  return g_slist_copy (manager->displays);
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->list_displays (manager);
 }

 /**
@@ -500,45 +378,71 @@ GdkDisplay *
 gdk_display_manager_open_display (GdkDisplayManager *manager,
                                  const gchar       *name)
 {
-  guint i;
-
-  for (i = 0; gdk_backends[i].name != NULL; i++)
-    {
-      if (G_OBJECT_TYPE (manager) == gdk_backends[i].get_backend_type ())
-        {
-          return gdk_backends[i].open_display (name);
-        }
-    }
-
-  g_assert_not_reached ();
-
-  return NULL;
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->open_display (manager, name);
 }

-void
-_gdk_display_manager_add_display (GdkDisplayManager *manager,
-                                  GdkDisplay        *display)
+/**
+ * gdk_atom_intern:
+ * @atom_name: a string.
+ * @only_if_exists: if %TRUE, GDK is allowed to not create a new atom, but
+ *   just return %GDK_NONE if the requested atom doesn't already
+ *   exists. Currently, the flag is ignored, since checking the
+ *   existance of an atom is as expensive as creating it.
+ *
+ * Finds or creates an atom corresponding to a given string.
+ *
+ * Returns: (transfer none): the atom corresponding to @atom_name.
+ */
+GdkAtom
+gdk_atom_intern (const gchar *atom_name,
+                 gboolean     only_if_exists)
 {
-  if (manager->displays == NULL)
-    gdk_display_manager_set_default_display (manager, display);
+  GdkDisplayManager *manager = gdk_display_manager_get ();

-  manager->displays = g_slist_prepend (manager->displays, display);
-
-  g_signal_emit (manager, signals[DISPLAY_OPENED], 0, display);
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->atom_intern (manager, atom_name, TRUE);
 }

-/* NB: This function can be called multiple times per display. */
-void
-_gdk_display_manager_remove_display (GdkDisplayManager *manager,
-                                     GdkDisplay        *display)
+/**
+ * gdk_atom_intern_static_string:
+ * @atom_name: a static string
+ *
+ * Finds or creates an atom corresponding to a given string.
+ *
+ * Note that this function is identical to gdk_atom_intern() except
+ * that if a new #GdkAtom is created the string itself is used rather
+ * than a copy. This saves memory, but can only be used if the string
+ * will <emphasis>always</emphasis> exist. It can be used with statically
+ * allocated strings in the main program, but not with statically
+ * allocated memory in dynamically loaded modules, if you expect to
+ * ever unload the module again (e.g. do not use this function in
+ * GTK+ theme engines).
+ *
+ * Returns: (transfer none): the atom corresponding to @atom_name
+ *
+ * Since: 2.10
+ */
+GdkAtom
+gdk_atom_intern_static_string (const gchar *atom_name)
 {
-  manager->displays = g_slist_remove (manager->displays, display);
+  GdkDisplayManager *manager = gdk_display_manager_get ();

-  if (manager->default_display == display)
-    {
-      if (manager->displays)
-        gdk_display_manager_set_default_display (manager, manager->displays->data);
-      else
-        gdk_display_manager_set_default_display (manager, NULL);
-    }
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->atom_intern (manager, atom_name, FALSE);
+}
+
+/**
+ * gdk_atom_name:
+ * @atom: a #GdkAtom.
+ *
+ * Determines the string corresponding to an atom.
+ *
+ * Returns: a newly-allocated string containing the string
+ *   corresponding to @atom. When you are done with the
+ *   return value, you should free it using g_free().
+ */
+gchar *
+gdk_atom_name (GdkAtom atom)
+{
+  GdkDisplayManager *manager = gdk_display_manager_get ();
+
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->get_atom_name (manager, atom);
 }
--- a/gdk/gdkdisplaymanager.h
+++ b/gdk/gdkdisplaymanager.h
@@ -43,8 +43,6 @@ G_BEGIN_DECLS
 GType              gdk_display_manager_get_type            (void) G_GNUC_CONST;

 GdkDisplayManager *gdk_display_manager_get                 (void);
-GDK_AVAILABLE_IN_3_10
-GdkDisplayManager *gdk_display_manager_peek                (void);
 GdkDisplay *       gdk_display_manager_get_default_display (GdkDisplayManager *manager);
 void               gdk_display_manager_set_default_display (GdkDisplayManager *manager,
                                                            GdkDisplay        *display);
--- a/gdk/gdkdisplaymanagerprivate.h
+++ b/gdk/gdkdisplaymanagerprivate.h
@@ -31,26 +31,39 @@ typedef struct _GdkDisplayManagerClass GdkDisplayManagerClass;
 struct _GdkDisplayManager
 {
  GObject parent_instance;
-
-  GdkDisplay *default_display;
-
-  GSList *displays;
 };

 struct _GdkDisplayManagerClass
 {
  GObjectClass parent_class;

+  GSList *     (*list_displays)       (GdkDisplayManager *manager);
+  GdkDisplay * (*get_default_display) (GdkDisplayManager *manager);
+  void         (*set_default_display) (GdkDisplayManager *manager,
+                                       GdkDisplay        *display);
+  GdkDisplay * (*open_display)        (GdkDisplayManager *manager,
+                                       const gchar       *name);
+
+  /* FIXME the following should really be frontend-only, not vfuncs */
+  GdkAtom      (*atom_intern)         (GdkDisplayManager *manager,
+                                       const gchar       *atom_name,
+                                       gboolean           copy_name);
+  gchar *      (*get_atom_name)       (GdkDisplayManager *manager,
+                                       GdkAtom            atom);
+  guint        (*lookup_keyval)       (GdkDisplayManager *manager,
+                                       const gchar       *name);
+  gchar *      (*get_keyval_name)     (GdkDisplayManager *manager,
+                                       guint              keyval);
+  void         (*keyval_convert_case) (GdkDisplayManager *manager,
+                                       guint              keyval,
+                                       guint             *lower,
+                                       guint             *upper);
+
  /* signals */
  void         (*display_opened)      (GdkDisplayManager *manager,
                                       GdkDisplay        *display);
 };

-void            _gdk_display_manager_add_display        (GdkDisplayManager      *manager,
-                                                         GdkDisplay             *display);
-void            _gdk_display_manager_remove_display     (GdkDisplayManager      *manager,
-                                                         GdkDisplay             *display);
-
 G_END_DECLS

 #endif
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -136,13 +136,15 @@ struct _GdkDisplayClass
  GType window_type;          /* type for native windows for this display, set in class_init */

  const gchar *              (*get_name)           (GdkDisplay *display);
+  gint                       (*get_n_screens)      (GdkDisplay *display);
+  GdkScreen *                (*get_screen)         (GdkDisplay *display,
+                                                    gint        screen_num);
  GdkScreen *                (*get_default_screen) (GdkDisplay *display);
  void                       (*beep)               (GdkDisplay *display);
  void                       (*sync)               (GdkDisplay *display);
  void                       (*flush)              (GdkDisplay *display);
  gboolean                   (*has_pending)        (GdkDisplay *display);
  void                       (*queue_events)       (GdkDisplay *display);
-  void                       (*make_default)       (GdkDisplay *display);
  GdkWindow *                (*get_default_group)  (GdkDisplay *display);
  gboolean                   (*supports_selection_notification) (GdkDisplay *display);
  gboolean                   (*request_selection_notification)  (GdkDisplay *display,
@@ -237,7 +239,6 @@ struct _GdkDisplayClass
                                                        const gchar    *text);

  /* Signals */
-  void                   (*opened)                     (GdkDisplay     *display);
  void (*closed) (GdkDisplay *display,
                  gboolean    is_error);
 };
--- a/gdk/gdkdnd.h
+++ b/gdk/gdkdnd.h
@@ -66,7 +66,7 @@ typedef enum
 /**
 * GdkDragProtocol:
 * @GDK_DRAG_PROTO_NONE: no protocol.
- * @GDK_DRAG_PROTO_MOTIF: The Motif DND protocol. No longer supported
+ * @GDK_DRAG_PROTO_MOTIF: The Motif DND protocol.
 * @GDK_DRAG_PROTO_XDND: The Xdnd protocol.
 * @GDK_DRAG_PROTO_ROOTWIN: An extension to the Xdnd protocol for
 *  unclaimed root window drops.
--- a/gdk/gdkenumtypes.c.template
+++ b/gdk/gdkenumtypes.c.template
@@ -1,5 +1,5 @@
 /*** BEGIN file-header ***/
-#include "config.h"
+#define GDK_ENABLE_BROKEN
 #include "gdk.h"

 /*** END file-header ***/
--- a/gdk/gdkframeclock.c
+++ b/gdk/gdkframeclock.c
@@ -30,7 +30,7 @@
 #include "gdkinternals.h"

 /**
- * SECTION:gdkframeclock
+ * SECTION:frameclock
 * @Short_description: Frame clock syncs painting to a window or display
 * @Title: Frame clock
 *
@@ -52,10 +52,10 @@
 * sense for the synchronization being implemented, the clock will
 * process a frame and emit signals for each phase that has been
 * requested. (See the signals of the #GdkFrameClock class for
- * documentation of the phases. %GDK_FRAME_CLOCK_PHASE_UPDATE and the
- * #GdkFrameClock::update signal are most interesting for application
- * writers, and are used to update the animations, using the frame time
- * given by gdk_frame_clock_get_frame_time().
+ * documentation of the phases. GDK_FRAME_CLOCK_PHASE_UPDATE and the
+ * ::update signal are most interesting for application writers, and
+ * are used to update the animations, using the frame time given by
+ * gdk_frame_clock_get_frame_time().
 *
 * The frame time is reported in microseconds and generally in the same
 * timescale as g_get_monotonic_time(), however, it is not the same
@@ -65,8 +65,8 @@
 * are called at a "similar" time get the same value. This means that
 * if different animations are timed by looking at the difference in
 * time between an initial value from gdk_frame_clock_get_frame_time()
- * and the value inside the #GdkFrameClock::update signal of the clock,
- * they will stay exactly synchronized.
+ * and the value inside the ::update signal of the clock, they will
+ * stay exactly synchronized.
 */

 G_DEFINE_ABSTRACT_TYPE (GdkFrameClock, gdk_frame_clock, G_TYPE_OBJECT)
@@ -174,7 +174,7 @@ gdk_frame_clock_class_init (GdkFrameClockClass *klass)
   * This signal is emitted as the second step of toolkit and
   * application processing of the frame. Any work to update
   * sizes and positions of application elements should be
-   * performed. GTK+ normally handles this internally.
+   * performed. GTK normally handles this internally.
   */
  signals[LAYOUT] =
    g_signal_new (g_intern_static_string ("layout"),
@@ -186,14 +186,14 @@ gdk_frame_clock_class_init (GdkFrameClockClass *klass)
                  G_TYPE_NONE, 0);

  /**
-   * GdkFrameClock::paint:
+   * GdkFrameClock::layout:
   * @clock: the frame clock emitting the signal
   *
   * This signal is emitted as the third step of toolkit and
   * application processing of the frame. The frame is
   * repainted. GDK normally handles this internally and
-   * produces expose events, which are turned into GTK+
-   * #GtkWidget::draw signals.
+   * produce expose events, which are turned into GTK
+   * GtkWidget::draw signals.
   */
  signals[PAINT] =
    g_signal_new (g_intern_static_string ("paint"),
@@ -280,18 +280,12 @@ gdk_frame_clock_get_frame_time (GdkFrameClock *frame_clock)
 /**
 * gdk_frame_clock_request_phase:
 * @frame_clock: a #GdkFrameClock
- * @phase: the phase that is requested
 *
 * Asks the frame clock to run a particular phase. The signal
 * corresponding the requested phase will be emitted the next
 * time the frame clock processes. Multiple calls to
- * gdk_frame_clock_request_phase() will be combined together
- * and only one frame processed. If you are displaying animated
- * content and want to continually request the
- * %GDK_FRAME_CLOCK_PHASE_UPDATE phase for a period of time,
- * you should use gdk_frame_clock_begin_updating() instead, since
- * this allows GTK+ to adjust system parameters to get maximally
- * smooth animations.
+ * gdk_frame_clock_request_phase() will be combined togethe
+ * and only one frame processed.
 *
 * Since: 3.8
 */
@@ -304,43 +298,6 @@ gdk_frame_clock_request_phase (GdkFrameClock      *frame_clock,
  GDK_FRAME_CLOCK_GET_CLASS (frame_clock)->request_phase (frame_clock, phase);
 }

-/**
- * gdk_frame_clock_begin_updating:
- * @frame_clock: a #GdkFrameClock
- *
- * Starts updates for an animation. Until a matching call to
- * gdk_frame_clock_end_updating() is made, the frame clock will continually
- * request a new frame with the %GDK_FRAME_CLOCK_PHASE_UPDATE phase.
- * This function may be called multiple times and frames will be
- * requested until gdk_frame_clock_end_updating() is called the same
- * number of times.
- *
- * Since: 3.8
- */
-void
-gdk_frame_clock_begin_updating (GdkFrameClock *frame_clock)
-{
-  g_return_if_fail (GDK_IS_FRAME_CLOCK (frame_clock));
-
-  GDK_FRAME_CLOCK_GET_CLASS (frame_clock)->begin_updating (frame_clock);
-}
-
-/**
- * gdk_frame_clock_end_updating:
- * @frame_clock: a #GdkFrameClock
- *
- * Stops updates for an animation. See the documentation for
- * gdk_frame_clock_begin_updating().
- *
- * Since: 3.8
- */
-void
-gdk_frame_clock_end_updating (GdkFrameClock *frame_clock)
-{
-  g_return_if_fail (GDK_IS_FRAME_CLOCK (frame_clock));
-
-  GDK_FRAME_CLOCK_GET_CLASS (frame_clock)->end_updating (frame_clock);
-}

 void
 _gdk_frame_clock_freeze (GdkFrameClock *clock)
--- a/gdk/gdkframeclock.h
+++ b/gdk/gdkframeclock.h
@@ -58,7 +58,7 @@ typedef struct _GdkFrameClockClass         GdkFrameClockClass;
 * @GDK_FRAME_CLOCK_PHASE_AFTER_PAINT: corresponds to GdkFrameClock::after-paint. Should not be handled by applications.
 *
 * #GdkFrameClockPhase is used to represent the different paint clock
- * phases that can be requested. The elements of the enumeration
+ * phases that can be requested. The element of the enumeration
 * correspond to the signals of #GdkPaintClock.
 *
 * Since: 3.8
@@ -76,18 +76,12 @@ typedef enum {

 GType    gdk_frame_clock_get_type             (void) G_GNUC_CONST;

-GDK_AVAILABLE_IN_3_8
 gint64   gdk_frame_clock_get_frame_time            (GdkFrameClock *frame_clock);

 GDK_AVAILABLE_IN_3_8
 void               gdk_frame_clock_request_phase (GdkFrameClock      *frame_clock,
                                                  GdkFrameClockPhase  phase);

-GDK_AVAILABLE_IN_3_8
-void               gdk_frame_clock_begin_updating (GdkFrameClock      *frame_clock);
-GDK_AVAILABLE_IN_3_8
-void               gdk_frame_clock_end_updating   (GdkFrameClock      *frame_clock);
-
 /* Frame history */
 GDK_AVAILABLE_IN_3_8
 gint64           gdk_frame_clock_get_frame_counter (GdkFrameClock *frame_clock);
--- a/gdk/gdkframeclockidle.c
+++ b/gdk/gdkframeclockidle.c
@@ -31,11 +31,7 @@
 #include "gdkframeclockidle.h"
 #include "gdk.h"

-#ifdef G_OS_WIN32
-#include <windows.h>
-#endif
-
-#define FRAME_INTERVAL 16667 /* microseconds */
+#define FRAME_INTERVAL 16667 // microseconds

 struct _GdkFrameClockIdlePrivate
 {
@@ -49,27 +45,25 @@ struct _GdkFrameClockIdlePrivate
  guint flush_idle_id;
  guint paint_idle_id;
  guint freeze_count;
-  guint updating_count;

  GdkFrameClockPhase requested;
  GdkFrameClockPhase phase;

  guint in_paint_idle : 1;
-#ifdef G_OS_WIN32
-  guint begin_period : 1;
-#endif
 };

 static gboolean gdk_frame_clock_flush_idle (void *data);
 static gboolean gdk_frame_clock_paint_idle (void *data);

+static void gdk_frame_clock_idle_finalize             (GObject                *object);
+
 G_DEFINE_TYPE (GdkFrameClockIdle, gdk_frame_clock_idle, GDK_TYPE_FRAME_CLOCK)

 static gint64 sleep_serial;
 static gint64 sleep_source_prepare_time;
 static GSource *sleep_source;

-static gboolean
+gboolean
 sleep_source_prepare (GSource *source,
                      gint    *timeout)
 {
@@ -78,7 +72,7 @@ sleep_source_prepare (GSource *source,
  return FALSE;
 }

-static gboolean
+gboolean
 sleep_source_check (GSource *source)
 {
  if (g_source_get_time (source) != sleep_source_prepare_time)
@@ -87,7 +81,7 @@ sleep_source_check (GSource *source)
  return FALSE;
 }

-static gboolean
+gboolean
 sleep_source_dispatch (GSource     *source,
                       GSourceFunc  callback,
                       gpointer     user_data)
@@ -127,35 +121,18 @@ gdk_frame_clock_idle_init (GdkFrameClockIdle *frame_clock_idle)
                                                        GdkFrameClockIdlePrivate);
  priv = frame_clock_idle->priv;

+  priv->timer = g_timer_new ();
  priv->freeze_count = 0;
 }

 static void
-gdk_frame_clock_idle_dispose (GObject *object)
+gdk_frame_clock_idle_finalize (GObject *object)
 {
  GdkFrameClockIdlePrivate *priv = GDK_FRAME_CLOCK_IDLE (object)->priv;

-  if (priv->flush_idle_id != 0)
-    {
-      g_source_remove (priv->flush_idle_id);
-      priv->flush_idle_id = 0;
-    }
+  g_timer_destroy (priv->timer);

-  if (priv->paint_idle_id != 0)
-    {
-      g_source_remove (priv->paint_idle_id);
-      priv->paint_idle_id = 0;
-    }
-
-#ifdef G_OS_WIN32
-  if (priv->begin_period) 
-    {
-      timeEndPeriod(1);
-      priv->begin_period = FALSE;
-    }
-#endif
-
-  G_OBJECT_CLASS (gdk_frame_clock_idle_parent_class)->dispose (object);
+  G_OBJECT_CLASS (gdk_frame_clock_idle_parent_class)->finalize (object);
 }

 static gint64
@@ -208,26 +185,12 @@ gdk_frame_clock_idle_get_frame_time (GdkFrameClock *clock)
  return priv->frame_time;
 }

-#define RUN_FLUSH_IDLE(priv)                                            \
-  ((priv)->freeze_count == 0 &&                                         \
-   ((priv)->requested & GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS) != 0)
-
-/* The reason why we track updating_count separately here and don't
- * just add GDK_FRAME_CLOCK_PHASE_UPDATE into ->request on every frame
- * is so that we can avoid doing one more frame when an animation
- * is cancelled.
- */
-#define RUN_PAINT_IDLE(priv)                                            \
-  ((priv)->freeze_count == 0 &&                                         \
-   (((priv)->requested & ~GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS) != 0 ||   \
-    (priv)->updating_count > 0))
-
 static void
 maybe_start_idle (GdkFrameClockIdle *clock_idle)
 {
  GdkFrameClockIdlePrivate *priv = clock_idle->priv;

-  if (RUN_FLUSH_IDLE (priv) || RUN_PAINT_IDLE (priv))
+  if (priv->freeze_count == 0 && priv->requested != 0)
    {
      guint min_interval = 0;

@@ -238,7 +201,8 @@ maybe_start_idle (GdkFrameClockIdle *clock_idle)
          min_interval = (min_interval_us + 500) / 1000;
        }

-      if (priv->flush_idle_id == 0 && RUN_FLUSH_IDLE (priv))
+      if (priv->flush_idle_id == 0 &&
+          (priv->requested & GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS) != 0)
        {
          priv->flush_idle_id = gdk_threads_add_timeout_full (GDK_PRIORITY_EVENTS + 1,
                                                              min_interval,
@@ -247,8 +211,9 @@ maybe_start_idle (GdkFrameClockIdle *clock_idle)
                                                              (GDestroyNotify) g_object_unref);
        }

-      if (!priv->in_paint_idle &&
-	  priv->paint_idle_id == 0 && RUN_PAINT_IDLE (priv))
+      if (priv->paint_idle_id == 0 &&
+          !priv->in_paint_idle &&
+          (priv->requested & ~GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS) != 0)
        {
          priv->paint_idle_id = gdk_threads_add_timeout_full (GDK_PRIORITY_REDRAW,
                                                              min_interval,
@@ -259,24 +224,6 @@ maybe_start_idle (GdkFrameClockIdle *clock_idle)
    }
 }

-static void
-maybe_stop_idle (GdkFrameClockIdle *clock_idle)
-{
-  GdkFrameClockIdlePrivate *priv = clock_idle->priv;
-
-  if (priv->flush_idle_id != 0 && !RUN_FLUSH_IDLE (priv))
-    {
-      g_source_remove (priv->flush_idle_id);
-      priv->flush_idle_id = 0;
-    }
-
-  if (priv->paint_idle_id != 0 && !RUN_PAINT_IDLE (priv))
-    {
-      g_source_remove (priv->paint_idle_id);
-      priv->paint_idle_id = 0;
-    }
-}
-
 static gint64
 compute_min_next_frame_time (GdkFrameClockIdle *clock_idle,
                             gint64             last_frame_time)
@@ -311,8 +258,7 @@ gdk_frame_clock_flush_idle (void *data)

  g_signal_emit_by_name (G_OBJECT (clock), "flush-events");

-  if ((priv->requested & ~GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS) != 0 ||
-      priv->updating_count > 0)
+  if ((priv->requested & ~GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS) != 0)
    priv->phase = GDK_FRAME_CLOCK_PHASE_BEFORE_PAINT;
  else
    priv->phase = GDK_FRAME_CLOCK_PHASE_NONE;
@@ -334,8 +280,7 @@ gdk_frame_clock_paint_idle (void *data)
  priv->min_next_frame_time = 0;

  skip_to_resume_events =
-    (priv->requested & ~(GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS | GDK_FRAME_CLOCK_PHASE_RESUME_EVENTS)) == 0 &&
-    priv->updating_count == 0;
+    (priv->requested & ~(GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS | GDK_FRAME_CLOCK_PHASE_RESUME_EVENTS)) == 0;

  if (priv->phase > GDK_FRAME_CLOCK_PHASE_BEFORE_PAINT)
    {
@@ -365,8 +310,7 @@ gdk_frame_clock_paint_idle (void *data)
              /* We always emit ::before-paint and ::after-paint if
               * any of the intermediate phases are requested and
               * they don't get repeated if you freeze/thaw while
-               * in them.
-               */
+               * in them. */
              priv->requested &= ~GDK_FRAME_CLOCK_PHASE_BEFORE_PAINT;
              g_signal_emit_by_name (G_OBJECT (clock), "before-paint");
              priv->phase = GDK_FRAME_CLOCK_PHASE_UPDATE;
@@ -374,8 +318,7 @@ gdk_frame_clock_paint_idle (void *data)
        case GDK_FRAME_CLOCK_PHASE_UPDATE:
          if (priv->freeze_count == 0)
            {
-              if ((priv->requested & GDK_FRAME_CLOCK_PHASE_UPDATE) != 0 ||
-                  priv->updating_count > 0)
+              if (priv->requested & GDK_FRAME_CLOCK_PHASE_UPDATE)
                {
                  priv->requested &= ~GDK_FRAME_CLOCK_PHASE_UPDATE;
                  g_signal_emit_by_name (G_OBJECT (clock), "update");
@@ -441,7 +384,7 @@ gdk_frame_clock_paint_idle (void *data)
 #ifdef G_ENABLE_DEBUG
  if ((_gdk_debug_flags & GDK_DEBUG_FRAMES) != 0)
    {
-      if (timings && timings->complete)
+      if (timings->complete)
        _gdk_frame_clock_debug_print_timings (clock, timings);
    }
 #endif /* G_ENABLE_DEBUG */
@@ -485,53 +428,26 @@ gdk_frame_clock_idle_request_phase (GdkFrameClock      *clock,
  maybe_start_idle (clock_idle);
 }

-static void
-gdk_frame_clock_idle_begin_updating (GdkFrameClock *clock)
-{
-  GdkFrameClockIdle *clock_idle = GDK_FRAME_CLOCK_IDLE (clock);
-  GdkFrameClockIdlePrivate *priv = clock_idle->priv;
-
-#ifdef G_OS_WIN32
-  /* We need a higher resolution timer while doing animations */
-  if (priv->updating_count == 0 && !priv->begin_period)
-    {
-      timeBeginPeriod(1);
-      priv->begin_period = TRUE;
-    }
-#endif
-
-  priv->updating_count++;
-  maybe_start_idle (clock_idle);
-}
-
-static void
-gdk_frame_clock_idle_end_updating (GdkFrameClock *clock)
-{
-  GdkFrameClockIdle *clock_idle = GDK_FRAME_CLOCK_IDLE (clock);
-  GdkFrameClockIdlePrivate *priv = clock_idle->priv;
-
-  g_return_if_fail (priv->updating_count > 0);
-
-  priv->updating_count--;
-  maybe_stop_idle (clock_idle);
-
-#ifdef G_OS_WIN32
-  if (priv->updating_count == 0 && priv->begin_period)
-    {
-      timeEndPeriod(1);
-      priv->begin_period = FALSE;
-    }
-#endif
-}
-
 static void
 gdk_frame_clock_idle_freeze (GdkFrameClock *clock)
 {
-  GdkFrameClockIdle *clock_idle = GDK_FRAME_CLOCK_IDLE (clock);
-  GdkFrameClockIdlePrivate *priv = clock_idle->priv;
+  GdkFrameClockIdlePrivate *priv = GDK_FRAME_CLOCK_IDLE (clock)->priv;

  priv->freeze_count++;
-  maybe_stop_idle (clock_idle);
+
+  if (priv->freeze_count == 1)
+    {
+      if (priv->flush_idle_id)
+	{
+	  g_source_remove (priv->flush_idle_id);
+	  priv->flush_idle_id = 0;
+	}
+      if (priv->paint_idle_id)
+	{
+	  g_source_remove (priv->paint_idle_id);
+	  priv->paint_idle_id = 0;
+	}
+    }
 }

 static void
@@ -548,8 +464,7 @@ gdk_frame_clock_idle_thaw (GdkFrameClock *clock)
      maybe_start_idle (clock_idle);
      /* If nothing is requested so we didn't start an idle, we need
       * to skip to the end of the state chain, since the idle won't
-       * run and do it for us.
-       */
+       * run and do it for us. */
      if (priv->paint_idle_id == 0)
        priv->phase = GDK_FRAME_CLOCK_PHASE_NONE;

@@ -563,12 +478,10 @@ gdk_frame_clock_idle_class_init (GdkFrameClockIdleClass *klass)
  GObjectClass *gobject_class = (GObjectClass*) klass;
  GdkFrameClockClass *frame_clock_class = (GdkFrameClockClass *)klass;

-  gobject_class->dispose = gdk_frame_clock_idle_dispose;
+  gobject_class->finalize     = gdk_frame_clock_idle_finalize;

  frame_clock_class->get_frame_time = gdk_frame_clock_idle_get_frame_time;
  frame_clock_class->request_phase = gdk_frame_clock_idle_request_phase;
-  frame_clock_class->begin_updating = gdk_frame_clock_idle_begin_updating;
-  frame_clock_class->end_updating = gdk_frame_clock_idle_end_updating;
  frame_clock_class->freeze = gdk_frame_clock_idle_freeze;
  frame_clock_class->thaw = gdk_frame_clock_idle_thaw;

--- a/gdk/gdkframeclockprivate.h
+++ b/gdk/gdkframeclockprivate.h
@@ -33,6 +33,8 @@

 G_BEGIN_DECLS

+typedef struct _GdkFrameClockIdlePrivate       GdkFrameClockIdlePrivate;
+
 struct _GdkFrameClock
 {
  GObject parent_instance;
@@ -49,8 +51,6 @@ struct _GdkFrameClockClass

  void     (* request_phase)  (GdkFrameClock      *clock,
                               GdkFrameClockPhase  phase);
-  void     (* begin_updating) (GdkFrameClock      *clock);
-  void     (* end_updating)   (GdkFrameClock      *clock);

  void     (* freeze)         (GdkFrameClock *clock);
  void     (* thaw)           (GdkFrameClock *clock);
--- a/gdk/gdkframetimings.c
+++ b/gdk/gdkframetimings.c
@@ -20,7 +20,7 @@
 #include "gdkframeclockprivate.h"

 /**
- * SECTION:gdkframetimings
+ * SECTION:frametimings
 * @Short_description: Object holding timing information for a single frame
 * @Title: Frame timings
 *
@@ -106,7 +106,7 @@ gdk_frame_timings_get_frame_counter (GdkFrameTimings *timings)
 }

 /**
- * gdk_frame_timings_get_complete:
+ * gdk_frame_timings_complete:
 * @timings: a #GdkFrameTimings
 *
 * The timing information in a #GdkFrameTimings is filled in
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -83,8 +83,7 @@ typedef enum {
  GDK_DEBUG_XINERAMA      = 1 <<  8,
  GDK_DEBUG_DRAW          = 1 <<  9,
  GDK_DEBUG_EVENTLOOP     = 1 << 10,
-  GDK_DEBUG_FRAMES        = 1 << 11,
-  GDK_DEBUG_SETTINGS      = 1 << 12
+  GDK_DEBUG_FRAMES        = 1 << 11
 } GdkDebugFlag;

 typedef enum {
@@ -346,6 +345,8 @@ void       _gdk_screen_close             (GdkScreen      *screen);
 void _gdk_cursor_destroy (GdkCursor *cursor);

 extern const GOptionEntry _gdk_windowing_args[];
+gchar *_gdk_windowing_substitute_screen_number (const gchar *display_name,
+                                                gint         screen_number);

 void _gdk_windowing_got_event                (GdkDisplay       *display,
                                              GList            *event_link,
--- a/gdk/gdkkeynames.c
+++ b/gdk/gdkkeynames.c
@@ -90,10 +90,7 @@ _gdk_keyval_from_name (const gchar *keyval_name)
  gdk_key *found;

  g_return_val_if_fail (keyval_name != NULL, 0);
-
-  if (strncmp (keyval_name,"XF86", 4) == 0)
-    keyval_name += 4;
-
+  
  found = bsearch (keyval_name, gdk_keys_by_name,
 		   GDK_NUM_KEYS, sizeof (gdk_key),
 		   gdk_keys_name_compare);
--- a/gdk/gdkkeys.c
+++ b/gdk/gdkkeys.c
@@ -189,6 +189,25 @@ gdk_keymap_init (GdkKeymap *keymap)
 /* Other key-handling stuff
 */

+/**
+ * gdk_keyval_convert_case:
+ * @symbol: a keyval
+ * @lower: (out): return location for lowercase version of @symbol
+ * @upper: (out): return location for uppercase version of @symbol
+ *
+ * Obtains the upper- and lower-case versions of the keyval @symbol.
+ * Examples of keyvals are #GDK_KEY_a, #GDK_KEY_Enter, #GDK_KEY_F1, etc.
+ */
+void
+gdk_keyval_convert_case (guint symbol,
+                         guint *lower,
+                         guint *upper)
+{
+  GdkDisplayManager *manager = gdk_display_manager_get ();
+
+  GDK_DISPLAY_MANAGER_GET_CLASS (manager)->keyval_convert_case (manager, symbol, lower, upper);
+}
+
 /**
 * gdk_keyval_to_upper:
 * @keyval: a key value.
@@ -674,7 +693,6 @@ gdk_keymap_get_modifier_mask (GdkKeymap         *keymap,
  return GDK_KEYMAP_GET_CLASS (keymap)->get_modifier_mask (keymap, intent);
 }

-#include "gdkkeynames.c"

 /**
 * gdk_keyval_name:
@@ -693,7 +711,10 @@ gdk_keymap_get_modifier_mask (GdkKeymap         *keymap,
 gchar *
 gdk_keyval_name (guint keyval)
 {
-  return _gdk_keyval_name (keyval);
+  GdkDisplayManager *manager = gdk_display_manager_get ();
+
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->get_keyval_name (manager,
+                                                                   keyval);
 }

 /**
@@ -712,27 +733,20 @@ gdk_keyval_name (guint keyval)
 guint
 gdk_keyval_from_name (const gchar *keyval_name)
 {
-  return _gdk_keyval_from_name (keyval_name);
+  GdkDisplayManager *manager = gdk_display_manager_get ();
+
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->lookup_keyval (manager,
+                                                                 keyval_name);
 }

-/**
- * gdk_keyval_convert_case:
- * @symbol: a keyval
- * @lower: (out): return location for lowercase version of @symbol
- * @upper: (out): return location for uppercase version of @symbol
- *
- * Obtains the upper- and lower-case versions of the keyval @symbol.
- * Examples of keyvals are #GDK_KEY_a, #GDK_KEY_Enter, #GDK_KEY_F1, etc.
- */
 void
-gdk_keyval_convert_case (guint symbol,
-                         guint *lower,
-                         guint *upper)
+_gdk_display_manager_real_keyval_convert_case (GdkDisplayManager *manager,
+                                               guint              symbol,
+                                               guint             *lower,
+                                               guint             *upper)
 {
-  guint xlower, xupper;
-
-  xlower = symbol;
-  xupper = symbol;
+  guint xlower = symbol;
+  guint xupper = symbol;

  /* Check for directly encoded 24-bit UCS characters: */
  if ((symbol & 0xff000000) == 0x01000000)
--- a/gdk/gdkkeysprivate.h
+++ b/gdk/gdkkeysprivate.h
@@ -76,6 +76,11 @@ struct _GdkKeymap
  GdkDisplay *display;
 };

+void _gdk_display_manager_real_keyval_convert_case (GdkDisplayManager *manager,
+                                                    guint              symbol,
+                                                    guint             *lower,
+                                                    guint             *upper);
+
 G_END_DECLS

 #endif
--- a/gdk/gdkkeysyms-compat.h
+++ b/gdk/gdkkeysyms-compat.h
@@ -2278,7 +2278,6 @@
 #define GDK_TouchpadToggle 0x1008ffa9
 #define GDK_TouchpadOn 0x1008ffb0
 #define GDK_TouchpadOff 0x1008ffb1
-#define GDK_AudioMicMute 0x1008ffb2
 #define GDK_Switch_VT_1 0x1008fe01
 #define GDK_Switch_VT_2 0x1008fe02
 #define GDK_Switch_VT_3 0x1008fe03
--- a/Show More
+++ b/Show More