gtkwindow: Always report _GTK_FRAME_EXTENTS for the normal, unmaximized, untiled state

updateiconcache: Don't include image data by default anymore
Since large images are in the icon cache, and apps don't tend to use that many icons anymore, simply don't include image data and instead make apps load files from disk. Additionally, since they're stored in GdkPixbuf data, that means that we have to first convert them either to a cairo_surface_t, which requires converting pixel data to be premulitplied, or an OpenGL texture, which requires a whole GPU upload anyway. So, even with the icon cache, the goal of icons through zero-copy, mmap()'d data from disk just isn't doable with the icon cache format we have. The icon cache on my disk is nearing 100MB, since we include a bunch of high-resolution application icons, that I doubt would be used by apps at all. Removing this inefficient pixel data makes memory usage for all applications go down, with no speed loss. The icon cache also, however, has an index of what icons are in each folder, which prevents a readdir() and allows GTK+ to know what icon is where without having to do a bunch of stat(); calls. Keeping this data is good for GTK+, so we should still keep the index. It doesn't make sense to remove any code for mapping pixel data from the icon cache. There's a plan in the works to have a symbolic icon cache that does pixel math on 16x16 icons to prevent slow SVG rendering. 16x16 pixels are fairly small, and such images are flat colors, which should compress easily, so the icon cache would be worthwhile here. So let's keep the code around in preparation for that case. https://bugzilla.gnome.org/show_bug.cgi?id=721895
2014-01-10 15:12:50 -05:00 · 2014-01-10 14:14:17 -05:00
995 changed files with 121694 additions and 150230 deletions
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,11 +33,11 @@ MAINTAINERCLEANFILES = \


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

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

@@ -59,14 +59,12 @@ DISTCLEANFILES = \
 	gtk+-quartz-3.0.pc		\
 	gtk+-broadway-3.0.pc		\
 	gtk+-wayland-3.0.pc		\
-	gtk+-mir-3.0.pc			\
 	gdk-3.0.pc			\
 	gdk-x11-3.0.pc			\
 	gdk-win32-3.0.pc		\
 	gdk-quartz-3.0.pc		\
 	gdk-broadway-3.0.pc		\
 	gdk-wayland-3.0.pc		\
-	gdk-mir-3.0.pc			\
 	gail-3.0.pc			\
 	config.lt

--- a/446
+++ b/446
@@ -1,449 +1,3 @@
-Overview of Changes in GTK+ 3.12.1 to 3.12.2
-============================================
-
-* Bug fixes:
- 495105 Open recent file keyboard shortcuts do not work correctly
- 686170 gdk/win32: VK_SNAPSHOT maps to GDK_Print
- 726592 W32: problems with CSDed windows
- 727487 Color picker check marks not cleared properly
- 728093 Add missing transfer annotation to gtk_box_get_center_widget
- 728140 Illegal parameter passed to g_variant_new in gtk_application...
- 728183 Drag and drop (GdkFrameClock) does not work for hidden widgets
- 728272 make broadway backend build on OpenBSD
- 728284 Graphics artifact when scrolling with hover-selection
- 728526 weird black border appear when dragging file
- 728745 win32: add more clipboard data checks to avoid crash
- 728806 W32: Check- and radio-buttons have a selection rectangle on ac...
- 728807 W32: Checkbutton focus rectangle becomes almost white on prelight
- 728808 W32: Checkboxes on modelbuttons are drawn like buttons themselves
- 728810 W32: Modelbuttons look like buttons
- 728992 GtkLockButton crash if clicked and permission is NULL
- 729346 W32: App-notification has no theme, shows up transparent
- 729451 Removing accels with application_set_accels_for_action
- 729670 cairo surface leaked for each cursor created from pixmap 
-
-* Translation updates:
- Belarusian
- German
- Indonesian
- Japanese
- Russian
- Slovenian
- Spanish
-
-
-Overview of Changes in GTK+ 3.12.0 to 3.12.1
-============================================
-
-* Bug fixes:
- 712752 GtkClipboard: add _get_default and _get_primary
- 722058 GtkTreeModelFilter bug
- 722817 Add gobject-introspection for GdkWin32
- 726298 gtk-font-name isn't correctly handled on Windows
- 726475 After looking at Asielriot solitare, I get rendering glitches...
- 726859 Assertion/crash if gtk_radio_menu_item_set_group() is called twice
- 726870 all: Name more idles and timeouts
- 726871 treeview: Lower the duration of validation iterations
- 726996 Label-for/Labelled-by AtkRelations missing for containers in ...
- 727009 redefinition of GtkPrinterCloudprint: cloudprint fails to build
- 727022 W32: Both inc- and dec-buttons on GtkSpinbutton are "inc"
- 727035 W32: Combobox button is drawn with two arrows
- 727036 W32: Combobox dropdown color is button-gray instead of window-white
- 727037 W32: Menu items look thin, while submenu arrows are huge
- 727075 W32: Combobox (with an entry) is gigantic
- 727078 W32: GtkPopover is transparent and non-interactable
- 727080 W32: Window re-size grip looks UGLY.
- 727210 W32: Prelight doesn't apply to check/radio marks
- 727211 W32: Selection background color applies to check/radio marks
- 727213 W32: Notebook widget is not styled correctly
- 727244 W32: Items selected in listbox have correct background color,...
- 727245 W32: No .dim-label style
- 727313 a11y: do not use deprecated a11y functions.
- 727322 docs: Remove '\' escape character from literals
- 727391 W32: scrollbar sliders have no "active" and "insensitive" styles
- 727410 W32: tooltips are not themed
- 727414 Redundant text in titlebar
- 727643 Segfault in gtk-3.12.0
- 727662 [PATCH] GtkVolumeButton displays "missing image" icons
- 727973 W32: focused button is visibly smaller  
- 728023 Warning when passing NULL window to inhibit
- 727644 SEGV in gtk_window_propagate_key_event()
-
-* Translation updates:
- Basque
- Catalan
- Greek
- Russian
-
-Overview of Changes in GTK+ 3.11.9 to 3.12.0
-============================================
-
-* Wayland:
- - Add support for input regions
- - Correctly report display capabilities
- - Fix resizing from the north-east corner
-
-* Bugs fixed:
- 723045 Window re-size causes artifacts
- 724728 GtkPrintOperation is below is parent in fullscreen mode
- 726369 gnome-terminal crashes when closing a window
- 726476 New fontchooser dialog doesn't update font list upon change
- 726717 Nesting GtkExpander gives Gdk-CRITICAL error
- 726749 Segmentation fault in libglib-2.0.so.0 with glib-2.39.92
- 726825 possible invalid reads on delete event
- 726838 crash when unsetting GtkTreeView model
- 726855 When subdirectory selected, subdirectory name only briefly appears...
- 726858 GTK_ENABLE_DEBUG should be G_ENABLE_DEBUG
- 726900 gtk_recent_filter_filter() requirements aren't fully documented 
-
-* Translation updates:
- Czech
- Danish
- Germans
- Hungarian
- Indonesian
- Italian
- Scottish Gaelic
- Serbian
- Ukrainian
-
-
-Overview of Changes in GTK+ 3.11.8 to 3.11.9
-============================================
-
-* GtkPopover:
- - Improve focus and grab handling
- - Add accessibility support
-
-* Client-side decorations:
- - Make F10 move focus to the header bar
- - Make header bars draggable on touch systems
- - Make shadows unclickable
-
-* Bugs fixed:
- 591258 Easy to accidentally select first option in popup menus
- 693200 Printing via evince crashes badly when /tmp is not writable
- 701884 lots of invalid reads in iconview a11y code
- 709914 Cannot move windows on touchscreen (except from WM decorations)
- 723668 Message Dialog Layout
- 724785 Tooltips get shown even if the widget is hidden by a GtkPopover
- 725141 Add shortcut to move focus to the GtkHeaderBar
- 725727 Fix DnD on popovers
- 725733 Crash when accessing freed AtkObject
- 725754 Fix font size when gdk_x11_display_set_window_scale() is used
- 725824 gtkentrycompletion: fix a critical warning
- 725864 Add GtkPopover a11y
- 725866 DnD fixes
- 726125 Cannot click through CSD window shadows
- 726135 documentation: clarify gtk_icon_theme_add_builtin_icon() usage
- 726136 use && instead of 'and' in deprecation warnings
- 726149 broadway: remove unused libcrypt
- 726187 Use GDK's current window tracking when synthesizing events in GTK+
- 726209	GtkTreeView: stop ignoring crossing events from grabs
- 726492 Possible crash when setting titlebar 
-
-* Translation updates:
- Brazilian Portuguese
- Chinese
- Czech
- Finnish
- French
- Korean
- Latvian
- Norwegian bokmål
- Portuguese
- Punjabi
- Spanish
- Traditional Chinese
-
-
-Overview of Changes in GTK+ 3.11.7 to 3.11.8
-============================================
-
-* Documentation: Update screenshots
-
-* Printing: Google cloud print support
-
-* Bugs fixed:
- 724742 revealer: Allocate extra size to child
- 724895 printing: Fix visibility of tabs in dialog
- 481073	allow "visibility-notify-event" signal to work when composited
- 547988	Open button sensitive when nothing selected, returns nothing
- 554618	GtkFileChooserDialog leaks memory
- 723368	GTK+ print module for Google Cloud Print
- 723438	jhbuild buildone glib gtk+ fails with `HAVE_INTROSPECTION do...
- 724411	GtkAboutDialog: License visible even if not set and predefin...
- 724799	gtk_menu_tool_button_set_menu () broken in gtk3-3.11.6+
- 724891	GtkTreeViewColumn::button never freed
- 724921	Gtk-CRITICAL **: gtk_widget_unregister_window: assertion 'GD...
- 724968	wayland: Fix gdk_window_wayland_resize_cairo_surface()
- 724999	GtkRevealer changes broke gedit infobar messages
- 725089	Cairo context sent to the "draw" signal handler has incorrec...
- 725172	GdkWindow: fix redraws for backends that keep the same backi...
- 725205	[patch] treeselection docs: spelling fix
- 725225	auto scroll in vertical popover from volume button goes the ...
- 725345	dialogs: always use CSD on dialogs
- 725559	Fix typo in gtk_window_set_default() documentation
- 725560	GtkTreeView documentation fixes 
-        Make sure CSS theme is loaded when needed
-        GtkStackSwitcher: Avoid unnecessary updates
-
-* Translation updates:
- Brazilian Portuguese
- Galician
- Hebrew
- Kazakh
- Lithuanian
- Norwegian bokmål
- Polish
- Russian
- Scottish Gaelic
- Thai
- Traditional Chinese
-
-
-Overview of Changes in GTK+ 3.11.6 to 3.11.7
-============================================
-
-* GtkActionBar:
- - Fix theming
-
-* GtkBox:
- - Allow setting center widget to NULL
- - Fix a size-allocation error
-
-* GtkPopover:
- - Fix a crash with text handles (#724392)
- - Allow resetting relative-to  (#724407)
-
-* Wayland:
- - Use new xdg-shell ping
- - Use new xdg-shell focus methods
-
-* Printing:
- - Fix a small memory leak (#724631)
-
-
-Overview of Changes in GTK+ 3.11.5 to 3.11.6
-============================================
-
-* GtkActionBar is a new widget that is meant to be used
-  for actions at the bottom of a window.
-
-* GtkPopover:
- - A ::closed signal has been added
- - Style propagation to popovers has been fixed
- - Popovers can now be populated from a menu model
- - GtkMenuButton can use popovers instead of menus
-
-* GtkAppChooserDialog has been redesigned
-
-* GtkBox can now place a widget centered, regardless of
-  the sizes of children on either side, similar to GtkHeaderBar.
-
-* The API documentation has been converted to markdown, and
-  many cleanups and improvements have been made at the same time.
-
-* Bug fixes:
- 706515 HeaderBars are sometimes too tall
- 707999 HeaderBar height increases when the subtitle label is set...
- 721309 Links inside dimmed labels get different colors depending...
- 723014 wip: Make popover from menu model
- 723394 const parameter to GtkPopover gtk_popover_set_pointing_to
- 723627 The padding aroung the timelabel is wrong
- 723637 GtkTreeViewColumn: fix critical warning
- 723672 Dialogs with header bars - buttons should have an equal w...
- 723716 GtkFlowBox::child-activated match slot signature
- 723771 gtkwindow: remove delete-event idle function on finalize
- 723863 Implementation for component->get_size not needed
- 723929 Add a generic center box
- 724008 void function should not return void expression
- 724094 Add GtkEntry:max-width-chars
- 724218 App chooser dialog looks rough
- 724411 GtkAboutDialog: License visible even if not set and prede...
- 724503 Make gtk_popover_bind_model() public
- 724539 Can't drag primary toolbars with a GtkSeparatorToolItem i...
- 724541 Labels with links can't be activated in a GtkListBox 
-
-* Translation updates:
- French
- Galician
- Hebrew
- Indonesian
- Norwegian bokmål
- Russian
- Scottish Gaelic
- Slovenian
- Spanish
- Tajik
- Thai
-
-
-Overview of Changes in GTK+ 3.11.4 to 3.11.5
-============================================
-
-* GtkPopover: A new widget that is can be used for transient
-  views, as an alternative to menus or dialogs.
-
-* Dialogs:
- - Dialogs have been modernized, can use a header bar now
- - Built-in dialogs react to a setting, gtk-dialogs-use-header
-   for this, dialogs derived from GtkDialog: default to no headerbar
- - GtkAssistant also respects the setting
-
-* OS X:
- - Better menu integration. Items such as 'Hide', 'Hide Others'
-   and 'Show All' are now handled specially
- - GTK+ provides a default application menu now
-
-* Theming:
- - GTK+ now uses RGBA visuals by default
- - Notebook tabs now support a prelight state
- - Reorderable notebook tabs can be themed differently
-
-* Documentation:
- - The API documentation has seen numerous fixes and improvements
- - Docbook markup is being phased out in favor of markdown
-
-* Bugs fixed:
- 350190 Need specific icon for GTK_ICON_SIZE_SMALL_TOOLBAR for...
- 566945 gtk_widget_override_color() documentation should menti...
- 630217 RGBA visual by default
- 634793 Use g_object_notify_by_pspec() / g_object_class_instal...
- 636594 The default value of the property 'logo' in GtkAboutDi...
- 665928 GtkWindow: Add comment about floating reference
- 692931 The list of printers should be searchable/sortable
- 699224 file chooser does not respect 12/24-hour clock setting
- 704456 Synthesized crossing events don't have correct device ...
- 711298 "Edit Scheduled Transaction" window way too modal
- 720059 use headerbars in dialogs
- 720552 Provide a more "native" Mac OS application menu
- 721895 Remove GtkIconCache
- 722429 docs/comments: Fix spelling of 'explicitly'
- 722515 csd menu icon should use default window icon if per-wi...
- 722574 GtkAboutDialog doesn't get headerbars when used from JS
- 722588 GtkStack: add gtk_stack_get_child_by_name()
- 722638 Version the gio-2.0 and wayland-client requirements (g...
- 722642 Use symbolic icon for file chooser
- 722722 Fix vertical alignment of labels in "Paper" section of...
- 722919 Setting custom titlebar on realized window looks weird
- 723119 docs: use |[ ]| instead of <programlisting></programli...
- 723121 GtkPlacesSidebar: pressing "eject" icon does not power...
- 723157 Merge GtkFileChooserWidget and GtkFileChooserDefault
- 723159 CSD shadows are clipped
- 723181 Use GtkPopover for GtkScaleButton
- 723183 GtkStyleContext: don't use disconnect_by_func()
- 723212 Use headerbar in GtkAssistant
- 723366 GtkFileChooser crashes due to a signal connection left...
- 723390 gdkwindow: Use an InputOnly window for focus_window
- 723402 widget: Fix set_focus_child handling during focus changes
- 723555 Decode extension names in X11 error handler
-
-* Translation updates:
- Aragonese
- Brazilian Portuguese
- Estonian
- Galician
- Greek
- Hebrew
- Indonesian
- Kazakh
- Lithuanian
- Scottish Gaelic
- Simplified Chinese
- Spanish
- Tajik
- Traditional Chinese
- Ukrainian
-
-
-Overview of Changes in GTK+ 3.11.3 to 3.11.4
-============================================
-
-* GtkActionBar: A new container, which has a centered
-  child like GtkHeaderBar. It can be used in places
-  where header bar theming is not suitable
-
-* GtkAppChooser: The online support has been simplified
-  and modernized 
-
-* GtkHeaderBar button theming has been changed to be
-  more flexible. There is now a gtk-decoraton-layout
-  setting and a decoration-layout property.
-
-* Accessibility:
-  - Links in labels are now accessible
-  - Model-based menus are accessible
-  - Accessible roles of several widgets have been fixed
-  - GtkColorChooser accessibility is improved
-
-* Theming: The Raleigh theme has been updated for
-  several new features, including client-side decorations
-
-* Model-based menus now support a hidden-when attribute
-  on items that allows them to be hidden on various
-  conditions
-
-* Bugs fixed:
- 688421 GMenuModel menus should have a hint to hide items
- 698248 race in placement for popup-menu/tooltip-window
- 698786 window: add a maximized property to GtkWindow
- 706119 Add introspection friendly version of gtk_tree_path_new...
- 707729 orca speaks wrong label when using flat review on GtkTree
- 709491 dark theme setting not propagated to vertical spinbutto...
- 710315 Revert "treeview: Store editable position differently"
- 710351 Migrate Mac OS menu backend to use GtkMenuTracker
- 711552 Crash when processing list of GdkWindows
- 711826 gtk_text_view_add_child_in_window not scrolling
- 720264 Hovering item over sidebar "desktop"-entry crashes appl...
- 720357 csd not working on Mac OS
- 720401 gtk_menu_popup() doesn't destroy the menu after it is c...
- 720535 CUPS backend leaks http connection to CUPS
- 720551 improve/simplify quartz inhibit code
- 720554 cell-renderer: Check for NULL return in vfunc start_edi...
- 720939 GtkMenuButton direction = up isn't aligned correctly
- 720945 Make nick names for properties "popup", "menu-model", ...
- 720983 Objects of ATK_ROLE_CHECK_MENU_ITEM fail to emit object...
- 721045 The accessible role of GtkColorSwatch should not be ATK...
- 721048 GtkColorSwatch fails to emit an accessible object:state...
- 721086 Accessible keybindings/mnemonics missing from certain m...
- 721119 GtkMenuTracker: tweak separator logic
- 721304 GtkApplicationX11: read the startup ID from the platfor...
- 721317 Fix crash in testbbox and update gtkenum docs
- 721346 non-standard CFLAGS_FOR_BUILD, CPPFLAGS_FOR_BUILD, LDFL...
- 721406 Accessible object:state-changed:focused events missing ...
- 721407 Criticals on GtkScrolledWindow composite widget
- 721410 GtkLabels containing links should expose accessible chi...
- 721421 Links within a GtkLabel should expose their URIs via ATK
- 721480 3.8->3.10 scrolled window is empty
- 721530 License text contains obsolete FSF postal address
- 721633 bloatpad: fix the action associated with the notification
- 721665 Provide a better way to display contextual actions
- 721700 invalid callback prototypes leads to test issues
- 721800 using border-style: dotted seems to freak out all drawing
- 721836 Simplify GtkActionHelper
- 722029 Memory leak in gtkplacessidebar.c
- 722030 Memory leak when scrolling through GtkTreeView
- 722070 gdk: Don't leak GValue when xsetting is unknown
- 722076 Add separator before "Always on Top" to the CSD window
- 722106 By clicking "Menu key" you can open as many menus as yo...
-
-* Translation updates:
- Brazilian Portuguese
- Czech
- Galician
- German
- Greek
- Hebrew
- Hungarian
- Italian
- Kazakh
- Russian
- Simplified Chinese
- Spanish
- Tajik
-
-
 Overview of Changes in GTK+ 3.11.1 to 3.11.3
 ============================================

--- a/README.in
+++ b/README.in
@@ -92,11 +92,6 @@ Release notes for 3.12
  it used to inconsistently scroll with the buffer but then go
  reposition to a window-relative position on redraw.

-* A number of container widgets have been made more compliant with
-  the uniform CSS rendering model by making them render backgrounds
-  and borders. This may require some adjustments in applications that
-  were making assumptions about containers never rendering backgrounds.
-
 Release notes for 3.10
 ======================

--- a/autogen.sh
+++ b/autogen.sh
@@ -17,18 +17,6 @@ else
        gtkdocize || exit $?
 fi

-PKGCONFIG=`which pkg-config`
-if test -z "$PKGCONFIG"; then
-        echo "*** pkg-config not found, please install it ***"
-        exit 1
-fi
-
-pkg-config --print-errors gobject-introspection-1.0
-if [ $? != 0 ]; then
-	echo "You probably need to install 'libgirepository1.0-dev'"
-	exit 1
-fi
-
 # README and INSTALL are required by automake, but may be deleted by clean
 # up rules. to get automake to work, simply touch these here, they will be
 # regenerated from their corresponding *.in files by ./configure anyway.
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -3,11 +3,4 @@ include $(top_srcdir)/Makefile.decl
 SUBDIRS = \
 	win32

-EXTRA_DIST +=	\
-	msvcfiles.py	\
-	gen-file-list-gtk.py	\
-	detectenv_msvc.mak	\
-	introspection-msvc.mak	\
-	gtk-introspection-msvc.mak
-
 -include $(top_srcdir)/git.mk
--- a/build/detectenv_msvc.mak
+++ b/build/detectenv_msvc.mak
@@ -1,65 +0,0 @@
-# Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or
-# VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir)
-!if !defined(VCINSTALLDIR) && !defined(WINDOWSSDKDIR)
-MSG = ^
-This Makefile is only for Visual Studio 2008 and later.^
-You need to ensure that the Visual Studio Environment is properly set up^
-before running this Makefile.
-!error $(MSG)
-!endif
-
-ERRNUL  = 2>NUL
-_HASH=^#
-
-!if ![echo VCVERSION=_MSC_VER > vercl.x] \
-    && ![echo $(_HASH)if defined(_M_IX86) >> vercl.x] \
-    && ![echo PLAT=Win32 >> vercl.x] \
-    && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \
-    && ![echo PLAT=x64 >> vercl.x] \
-    && ![echo $(_HASH)endif >> vercl.x] \
-    && ![cl -nologo -TC -P vercl.x $(ERRNUL)]
-!include vercl.i
-!if ![echo VCVER= ^\> vercl.vc] \
-    && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc]
-!include vercl.vc
-!endif
-!endif
-!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc]
-!endif
-
-!if $(VCVERSION) > 1499 && $(VCVERSION) < 1600
-VSVER = 9
-!elseif $(VCVERSION) > 1599 && $(VCVERSION) < 1700
-VSVER = 10
-!elseif $(VCVERSION) > 1699 && $(VCVERSION) < 1800
-VSVER = 11
-!elseif $(VCVERSION) > 1799 && $(VCVERSION) < 1900
-VSVER = 12
-!else
-VSVER = 0
-!endif
-
-!if "$(VSVER)" == "0"
-MSG = ^
-This NMake Makefile set supports Visual Studio^
-9 (2008) through 12 (2013).  Your Visual Studio^
-version is not supported.
-!error $(MSG)
-!endif
-
-VALID_CFGSET = FALSE
-!if "$(CFG)" == "release" || "$(CFG)" == "debug"
-VALID_CFGSET = TRUE
-!endif
-
-!if "$(CFG)" == "release"
-CFLAGS_ADD = /MD /O2
-!else
-CFLAGS_ADD = /MDd /Od /Zi
-!endif
-
-!if "$(PLAT)" == "x64"
-LDFLAGS_ARCH = /machine:x64
-!else
-LDFLAGS_ARCH = /machine:x86
-!endif
--- a/build/gen-file-list-gtk.py
+++ b/build/gen-file-list-gtk.py
@@ -1,81 +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
-
-from msvcfiles import read_vars_from_AM
-
-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_gdkwin32_filelist(srcroot, subdir, dest):
-    vars = read_vars_from_AM(os.path.join(srcroot, subdir, 'Makefile.am'),
-                             vars = {},
-                             conds = {'HAVE_INTROSPECTION': True,
-                                      'OS_WIN32': True},
-                             filters = ['w32_introspection_files'])
-
-    files = vars['w32_introspection_files'].split()
-
-    with open(dest, 'w') as d:
-        for i in files:
-            d.write(srcroot + '\\' + subdir + '\\' + i.replace('/', '\\') + '\n')
-
-def gen_gtk_filelist(srcroot, subdir, dest):
-    vars = read_vars_from_AM(os.path.join(srcroot, 'gtk', 'Makefile.am'),
-                             vars = {},
-                             conds = {'USE_WIN32': True,
-                                      'USE_QUARTZ': False,
-                                      'USE_X11': False,
-                                      'USE_EXTERNAL_ICON_CACHE': False},
-                             filters = ['gtkinclude_HEADERS',
-                                        'deprecatedinclude_HEADERS',
-                                        'gtk_base_c_sources',
-                                        'gtk_clipboard_dnd_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_clipboard_dnd_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 main(argv):
-    srcroot = '..'
-    subdir_gdk = 'gdk'
-    subdir_gtk = 'gtk'
-
-    gen_gdk_filelist(srcroot, subdir_gdk, 'gdk_list')
-    gen_gdkwin32_filelist(srcroot, subdir_gdk, 'gdkwin32_list')
-    gen_gtk_filelist(srcroot, subdir_gtk, 'gtk_list')
-    return 0
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))
--- a/build/gtk-introspection-msvc.mak
+++ b/build/gtk-introspection-msvc.mak
@@ -1,112 +0,0 @@
-# NMake Makefile to build Introspection Files for GTK+
-
-!include detectenv_msvc.mak
-
-APIVERSION = 3.0
-
-CHECK_PACKAGE = gdk-pixbuf-2.0 atk pangocairo gio-2.0
-
-built_install_girs = Gdk-$(APIVERSION).gir GdkWin32-$(APIVERSION).gir Gtk-$(APIVERSION).gir
-built_install_typelibs = Gdk-$(APIVERSION).typelib GdkWin32-$(APIVERSION).typelib Gtk-$(APIVERSION).typelib
-
-!if "$(PLAT)" == "x64"
-TIME_T_DEFINE = -Dtime_t=long long
-!else
-TIME_T_DEFINE = -Dtime_t=long
-!endif
-
-!include introspection-msvc.mak
-
-!if "$(BUILD_INTROSPECTION)" == "TRUE"
-all: setgirbuildnev $(built_install_girs) $(built_install_typelibs)
-
-gdk_list gdkwin32_list gtk_list:
-	@-echo Generating Filelist to Introspect for GDK/GTK...
-	$(PYTHON2) gen-file-list-gtk.py
-
-setgirbuildnev:
-	@set CC=$(CC)
-	@set PYTHONPATH=$(BASEDIR)\lib\gobject-introspection
-	@set PATH=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(BASEDIR)\bin;$(PATH);$(MINGWDIR)\bin
-	@set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
-	@set LIB=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB)
-
-win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib: win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib
-	@-echo Copying win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib from win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib...
-	@-copy /b win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib
-
-Gdk-$(APIVERSION).gir: gdk_list
-	@-echo Generating Gdk-$(APIVERSION).gir...
-	$(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gdk	\
-	-I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include	\
-	-I$(BASEDIR)\include\pango-1.0 -I$(BASEDIR)\include\atk-1.0	\
-	-I$(BASEDIR)\include\gdk-pixbuf-2.0 -I$(BASEDIR)\include	\
-	$(TIME_T_DEFINE) --namespace=Gdk --nsversion=3.0	\
-	--include=Gio-2.0 --include=GdkPixbuf-2.0	\
-	--include=Pango-1.0 --include=cairo-1.0	\
-	--no-libtool --library=gdk-3.0	\
-	--reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) --add-include-path=.	\
-	--pkg-export gdk-3.0 --warn-all --c-include="gdk/gdk.h"	\
-	-DG_LOG_DOMAIN=\"Gdk\" -DGDK_COMPILATION	\
-	--filelist=gdk_list	-o $@
-
-GdkWin32-$(APIVERSION).gir: gdkwin32_list win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib
-	@-echo Generating GdkWin32-$(APIVERSION).gir...
-	$(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gdk	\
-	-I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include	\
-	-I$(BASEDIR)\include\pango-1.0 -I$(BASEDIR)\include\atk-1.0	\
-	-I$(BASEDIR)\include\gdk-pixbuf-2.0 -I$(BASEDIR)\include	\
-	$(TIME_T_DEFINE) --namespace=GdkWin32 --nsversion=3.0	\
-	--include=Gio-2.0 --include=GdkPixbuf-2.0	\
-	--include=Pango-1.0	--include-uninstalled=./Gdk-$(APIVERSION).gir	\
-	--no-libtool --library=gdk-3.0	\
-	--reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) --add-include-path=.	\
-	--pkg-export gdk-win32-3.0 --warn-all --c-include="gdk/gdkwin32.h"	\
-	-DG_LOG_DOMAIN=\"Gdk\" -DGDK_COMPILATION	\
-	--filelist=gdkwin32_list	-o $@
-
-Gtk-$(APIVERSION).gir: gtk_list
-	$(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gtk -I..\gdk	\
-	-I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include	\
-	-I$(BASEDIR)\include\pango-1.0 -I$(BASEDIR)\include\atk-1.0	\
-	-I$(BASEDIR)\include\gdk-pixbuf-2.0 -I$(BASEDIR)\include	\
-	--namespace=Gtk --nsversion=3.0	\
-	--include=Atk-1.0	\
-	--include-uninstalled=./Gdk-$(APIVERSION).gir	\
-	--no-libtool --library=gtk-3.0 --library=gdk-3.0	\
-	--reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) --add-include-path=.	\
-	--pkg-export gtk+-3.0 --warn-all --c-include="gtk/gtkx.h"	\
-	-DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"/dummy/lib\"	\
-	$(TIME_T_DEFINE) -DGTK_DATADIR=\"/dummy/share\" -DGTK_DATA_PREFIX=\"/dummy\"	\
-	-DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"3.12.0\"	\
-	-DGTK_BINARY_VERSION=\"3.0.0\" -DGTK_HOST=\"i686-pc-vs$(VSVER)\"	\
-	-DGTK_COMPILATION -DGTK_PRINT_BACKENDS=\"file\"	\
-	-DGTK_PRINT_PREVIEW_COMMAND=\"undefined-gtk-print-preview-command\"	\
-	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED	\
-	-DINCLUDE_IM_am_et -DINCLUDE_IM_cedilla -DINCLUDE_IM_cyrillic_translit	\
-	-DINCLUDE_IM_ime -DINCLUDE_IM_inuktitut -DINCLUDE_IM_ipa	\
-	-DINCLUDE_IM_multipress -DINCLUDE_IM_thai -DINCLUDE_IM_ti_er	\
-	-DINCLUDE_IM_ti_et -DINCLUDE_IM_viqr --filelist=gtk_list	\
-	-o $@
-
-$(built_install_typelibs): $(built_install_girs)
-	@-echo Compiling $*.typelib...
-	@-$(G_IR_COMPILER) --includedir=. --debug --verbose $*.gir -o $@
-
-install-introspection: setgirbuildnev $(built_install_girs) $(built_install_typelibs)
-	@-copy *.gir $(G_IR_INCLUDEDIR)
-	@-copy /b *.typelib $(G_IR_TYPELIBDIR)
-
-!else
-all:
-	@-echo $(ERROR_MSG)
-!endif
-
-clean:
-	@-del /f/q *.typelib
-	@-del /f/q *.gir
-	@-del /f/q win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib
-	@-del /f/q gtk_list
-	@-del /f/q gdkwin32_list
-	@-del /f/q gdk_list
-	@-del /f/q *.pyc
--- a/build/introspection-msvc.mak
+++ b/build/introspection-msvc.mak
@@ -1,79 +0,0 @@
-# Common Utility NMake Makefile Template
-# Used to Generate Introspection files for various Projects
-
-# Can Override with env vars as needed
-# You will need to have built gobject-introspection for this to work.
-# Change or pass in or set the following to suit your environment
-
-BASEDIR = ..\..\vs$(VSVER)\$(PLAT)
-GIR_SUBDIR = share\gir-1.0
-GIR_TYPELIBDIR = lib\girepository-1.0
-G_IR_SCANNER = $(BASEDIR)\bin\g-ir-scanner
-G_IR_COMPILER = $(BASEDIR)\bin\g-ir-compiler.exe
-G_IR_INCLUDEDIR = $(BASEDIR)\$(GIR_SUBDIR)
-G_IR_TYPELIBDIR = $(BASEDIR)\$(GIR_TYPELIBDIR)
-
-# Note: The PYTHON2 must be a Python 2.6.x or 2.7.x Interpretor!
-# Either having python.exe from Python 2.6.x/2.7.x in your PATH will work
-# or passing in PYTHON2=<full path to your Python 2.6.x/2.7.x interpretor> will do
-
-# This is required, and gobject-introspection needs to be built
-# before this can be successfully run.
-PYTHON2=python
-
-# Don't change anything following this line!
-VALID_PKG_CONFIG_PATH = FALSE
-VALID_GCC_INSTPATH = FALSE
-
-MSG_INVALID_PKGCONFIG = You must set or specifiy a valid PKG_CONFIG_PATH
-MSG_INVALID_MINGWDIR = You must set or specifiy a valid MINGWDIR, where gcc.exe can be found in %MINGWDIR%\bin
-MSG_INVALID_CFG = You need to specify or set CFG to be release or debug to use this Makefile to build the Introspection Files
-
-ERROR_MSG =
-
-BUILD_INTROSPECTION = TRUE
-
-!if ![pkg-config --print-errors --errors-to-stdout $(CHECK_PACKAGE) > pkgconfig.x]	\
-	&& ![setlocal]	\
-	&& ![set file="pkgconfig.x"]	\
-	&& ![FOR %A IN (%file%) DO @echo PKG_CHECK_SIZE=%~zA > pkgconfig.chksize]	\
-	&& ![del $(ERRNUL) /q/f pkgconfig.x]
-!endif
-
-!include pkgconfig.chksize
-!if "$(PKG_CHECK_SIZE)" == "0"
-VALID_PKG_CONFIG_PATH = TRUE
-!else
-VALID_PKG_CONFIG_PATH = FALSE
-!endif
-
-!if ![IF EXIST %MINGWDIR%\bin\gcc.exe @echo VALID_GCC_INSTPATH=TRUE > gcccheck.x]
-!endif
-
-!if ![IF NOT EXIST %MINGWDIR%\bin\gcc.exe @echo VALID_GCC_INSTPATH=FALSE > gcccheck.x]
-!endif
-
-!include gcccheck.x
-
-!if ![del $(ERRNUL) /q/f pkgconfig.chksize gcccheck.x]
-!endif
-
-VALID_CFGSET = FALSE
-!if "$(CFG)" == "release" || "$(CFG)" == "debug"
-VALID_CFGSET = TRUE
-!endif
-
-!if "$(VALID_GCC_INSTPATH)" != "TRUE"
-BUILD_INTROSPECTION = FALSE
-ERROR_MSG = $(MSG_INVALID_MINGWDIR)
-!endif
-
-!if "$(VALID_PKG_CONFIG_PATH)" != "TRUE"
-BUILD_INTROSPECTION = FALSE
-ERROR_MSG = $(MSG_INVALID_PKGCONFIG)
-!endif
-
-!if "$(VALID_CFGSET)" != "TRUE"
-BUILD_INTROSPECTION = FALSE
-ERROR_MSG = $(MSG_INVALID_CFG)
-!endif
--- a/build/msvcfiles.py
+++ b/build/msvcfiles.py
@@ -1,261 +0,0 @@
-#!/usr/bin/python
-# vim: encoding=utf-8
-#expand *.in files
-import os
-import sys
-import re
-import optparse
-
-def parent_dir(path):
-    if not os.path.isabs(path):
-        path = os.path.abspath(path)
-    if os.path.isfile(path):
-        path = os.path.dirname(path)
-    return os.path.split(path)[0]
-
-def check_output_type (btype):
-    print_bad_type = False
-    output_type = -1
-    if (btype is None):
-        output_type = -1
-        print_bad_type = False
-    elif (btype == "vs9"):
-        output_type = 1
-    elif (btype == "vs10"):
-        output_type = 2
-    elif (btype == "nmake-exe"):
-        output_type = 3
-    else:
-        output_type = -1
-        print_bad_type = True
-    if (output_type == -1):
-        if (print_bad_type is True):
-            print ("The entered output build file type '%s' is not valid" % btype)
-        else:
-            print ("Output build file type is not specified.\nUse -t <type> to specify the output build file type.")
-        print ("Valid output build file types are: nmake-exe, vs9 , vs10")
-    return output_type
-
-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_VAR_ADD = re.compile(r'^\s*(\w+)\s*\+=(.*)$')
-    RE_AM_CONTINUING = re.compile(r'\\\s*$')
-    RE_AM_IF = re.compile(r'^\s*if\s+(\w+)')
-    RE_AM_IFNOT = 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_IFNOT.search(line)
-        if mo:
-            oldskip.append(skip)
-            skip = False if mo.group(1) not 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
-            mo = RE_AM_VAR_ADD.search(line)
-            if mo:
-                try:
-                    cur_vars[mo.group(1)] += ' '
-                except KeyError:
-                    cur_vars[mo.group(1)] = ''
-                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 process_include(src, dest, includes):
-    RE_INCLUDE = re.compile(r'^\s*#include\s+"(.*)"')
-    with open(src, 'r') as s:
-        with open(dest, 'w') as d:
-            for i in s:
-                mo = RE_INCLUDE.search(i)
-                if mo:
-                    target = ''
-                    for j in includes:
-                        #print "searching in ", j
-                        if mo.group(1) in os.listdir(j):
-                            target = os.path.join(j, mo.group(1))
-                            break
-                    if not target:
-                        raise Exception("Couldn't find include file %s" % mo.group(1))
-                    else:
-                        with open(target, 'r') as t:
-                            for inc in t.readlines():
-                                d.write(inc)
-                else:
-                    d.write(i)
-
-#Generate the source files listing that is used
-def generate_src_list (srcroot, srcdir, filters_src, filter_conds, filter_c, mk_am_file):
-    mkfile = ''
-    if mk_am_file is None or mk_am_file == '':
-        mkfile = 'Makefile.am'
-    else:
-        mkfile = mk_am_file
-    vars = read_vars_from_AM(os.path.join(srcdir, mkfile),
-                             vars = {'top_srcdir': srcroot},
-                             conds = filter_conds,
-                             filters = filters_src)
-    files = []
-    for src_filters_item in filters_src:
-        files += vars[src_filters_item].split()
-    if filter_c is True:
-        sources = [i for i in files if i.endswith('.c') ]
-        return sources
-    else:
-        return files
-
-# Generate the Visual Studio 2008 Project Files from the templates
-def gen_vs9_project (projname, srcroot, srcdir_name, sources_list):
-    vs_file_list_dir = os.path.join (srcroot, 'build', 'win32')
-
-    with open (os.path.join (vs_file_list_dir,
-              projname + '.sourcefiles'), 'w') as vs9srclist:
-        for i in sources_list:
-            vs9srclist.write ('\t\t\t<File RelativePath="..\\..\\..\\' + srcdir_name + '\\' + i.replace('/', '\\') + '" />\n')
-
-    process_include (os.path.join(srcroot, 'build', 'win32', 'vs9', projname + '.vcprojin'),
-                     os.path.join(srcroot, 'build', 'win32', 'vs9', projname + '.vcproj'),
-                     includes = [vs_file_list_dir])
-
-    os.unlink(os.path.join(srcroot, 'build', 'win32', projname + '.sourcefiles'))
-
-# Generate the Visual Studio 2010 Project Files from the templates
-def gen_vs10_project (projname, srcroot, srcdir_name, sources_list):
-    vs_file_list_dir = os.path.join (srcroot, 'build', 'win32')
-
-    with open (os.path.join (vs_file_list_dir,
-              projname + '.vs10.sourcefiles'), 'w') as vs10srclist:
-        for j in sources_list:
-            vs10srclist.write ('    <ClCompile Include="..\\..\\..\\' + srcdir_name + '\\' + j.replace('/', '\\') + '" />\n')
-
-    with open (os.path.join (vs_file_list_dir,
-              projname + '.vs10.sourcefiles.filters'), 'w') as vs10srclist_filter:
-        for k in sources_list:
-             vs10srclist_filter.write ('    <ClCompile Include="..\\..\\..\\' + srcdir_name + '\\' + k.replace('/', '\\') + '"><Filter>Source Files</Filter></ClCompile>\n')
-
-    process_include (os.path.join(srcroot, 'build', 'win32', 'vs10', projname + '.vcxprojin'),
-                     os.path.join(srcroot, 'build', 'win32', 'vs10', projname + '.vcxproj'),
-                     includes = [vs_file_list_dir])
-    process_include (os.path.join(srcroot, 'build', 'win32', 'vs10', projname + '.vcxproj.filtersin'),
-                     os.path.join(srcroot, 'build', 'win32', 'vs10', projname + '.vcxproj.filters'),
-                     includes = [vs_file_list_dir])
-
-    os.unlink(os.path.join(srcroot, 'build', 'win32', projname + '.vs10.sourcefiles'))
-    os.unlink(os.path.join(srcroot, 'build', 'win32', projname + '.vs10.sourcefiles.filters'))
-
-def gen_vs_inst_list (projname, srcroot, srcdirs, inst_lists, destdir_names, isVS9):
-    vs_file_list_dir = os.path.join (srcroot, 'build', 'win32')
-    vsver = ''
-    vsprops_line_ending = ''
-    vsprops_file_ext = ''
-    if isVS9 is True:
-        vsver = '9'
-        vsprops_line_ending = '&#x0D;&#x0A;\n'
-        vsprops_file_ext = '.vsprops'
-    else:
-        vsver = '10'
-        vsprops_line_ending = '\n\n'
-        vsprops_file_ext = '.props'
-
-    with open (os.path.join (vs_file_list_dir,
-              projname + '.vs' + vsver + 'instfiles'), 'w') as vsinstlist:
-
-        for file_list, srcdir, dir_name in zip (inst_lists, srcdirs, destdir_names):
-            for i in file_list:
-                vsinstlist.write ('copy ..\\..\\..\\' +
-                                  srcdir + '\\' +
-                                  i.replace ('/', '\\') +
-                                  ' $(CopyDir)\\' +
-                                  dir_name +
-                                  vsprops_line_ending)
-    process_include (os.path.join(srcroot, 'build', 'win32', 'vs' + vsver, projname + '-install' + vsprops_file_ext + 'in'),
-                     os.path.join(srcroot, 'build', 'win32', 'vs' + vsver, projname + '-install' + vsprops_file_ext),
-                     includes = [vs_file_list_dir])
-
-    os.unlink(os.path.join (vs_file_list_dir, projname + '.vs' + vsver + 'instfiles'))
-
-def generate_nmake_makefiles(srcroot, srcdir, base_name, makefile_name, progs_list):
-    file_list_dir = os.path.join (srcroot, 'build', 'win32')
-
-    with open (os.path.join (file_list_dir,
-              base_name + '_progs'), 'w') as proglist:
-        for i in progs_list:
-            proglist.write ('\t' + i + '$(EXEEXT)\t\\\n')
-
-
-    process_include (os.path.join(srcdir, makefile_name + 'in'),
-                    os.path.join(srcdir, makefile_name),
-                    includes = [file_list_dir])
-
-    os.unlink(os.path.join (file_list_dir, base_name + '_progs'))
-
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -5,4 +5,8 @@ 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
@@ -0,0 +1,140 @@
+#!/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
@@ -0,0 +1,180 @@
+@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
+if "%PLAT%" == "x64" echo -D__int64=long long ^^>> gtk_gir.bat
+if "%PLAT%" == "Win32" echo -Dtime_t=long ^^>> 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
+if "%PLAT%" == "x64" echo -D__int64=long long ^^>> gtk_gir.bat
+if "%PLAT%" == "Win32" 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
@@ -24,6 +24,7 @@ EXTRA_DIST +=	\
 	gtka11y.vcxproj.filtersin	\
 	gailutil.vcxproj	\
 	gailutil.vcxproj.filters	\
+	gengir.vcxproj	\
 	install.vcxproj	\
 	broadwayd.vcxproj	\
 	broadwayd.vcxproj.filters	\
@@ -32,6 +33,7 @@ EXTRA_DIST +=	\
 	gtk-build-defines.props	\
 	gtk-copy-gdk-broadway.props	\
 	gtk-gen-srcs.props	\
+	gtk-gengir.props	\
 	gtk-ignore-broadway.props	\
 	gtk-install.props	\
 	gtk-version-paths.props
--- a/build/win32/vs10/README.txt
+++ b/build/win32/vs10/README.txt
@@ -20,14 +20,10 @@ ATK and GLib.  External dependencies are at least Cairo
 gettext-runtime, fontconfig*, freetype*, expat*.  See the 
 build/win32/vs10/README.txt file in glib for details where to unpack them.

-You will also need a Python 2.6+/3.x interpretor installed on your system,
+You will also need a Python 2.x/3.x interpretor installed on your system,
 which can be obtained from the official installers available from
 http://www.python.org.  Please note that the Python interpretor (python.exe)
-either needs to be in your PATH before attempting the build of GTK+, or it
-can be found in the path specified by PythonPath in gtk-version-paths.props.
-If you happen to change the PythonPath setting in gtk-version-paths.props after
-opening gtk+.sln with Visual Studio, you will need to close the gtk+.sln solution,
-delete all the *.sdf, *.suo and *.user files before re-attempting the build.
+needs to be in your PATH before attempting the build of GTK+.

 It is recommended that one builds the dependencies with VS10 as far as
 possible, especially those from and using the GTK+ stack (i.e. GLib,
--- a/build/win32/vs10/gengir.vcxproj
+++ b/build/win32/vs10/gengir.vcxproj
@@ -0,0 +1,112 @@
+<?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>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </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-gengir.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-gengir.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-gengir.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-gengir.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+.sln
+++ b/build/win32/vs10/gtk+.sln
@@ -22,6 +22,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcxpro
 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
@@ -202,6 +204,14 @@ Global
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|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
+		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
+		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_Broadway|x64.ActiveCfg = Debug|x64
+		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release_Broadway|Win32.ActiveCfg = Release|Win32
+		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release_Broadway|x64.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/build/win32/vs10/gtk-copy-gdk-broadway.props
+++ b/build/win32/vs10/gtk-copy-gdk-broadway.props
@@ -7,9 +7,6 @@
    <_PropertySheetDisplayName>gtkcopygdkbroadwayprops</_PropertySheetDisplayName>
  </PropertyGroup>
  <ItemDefinitionGroup>
-    <Link>
-      <AdditionalOptions>/EXPORT:gdk_win32_display_manager_get_type</AdditionalOptions>
-    </Link
    <PostBuildEvent>
      <Command>
 if "$(Configuration)" == "Release" goto END
--- a/build/win32/vs10/gtk-gen-srcs.props
+++ b/build/win32/vs10/gtk-gen-srcs.props
@@ -58,8 +58,6 @@ echo $(Configuration) &gt; ..\..\..\MSVC_$(Configuration)
 :DONE_GDKCONFIG_H
    </GenGdkConfigHBroadway>
    <GenerateGtkDbusBuiltSources>
-set PATH=$(PATH);$(PythonPath)
-
 cd ..\..\..\gtk

 python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml
--- a/build/win32/vs10/gtk-gengir.props
+++ b/build/win32/vs10/gtk-gengir.props
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="gtk-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <DoGenGir>
+set VSVER=$(VSVer)
+
+set CONF=$(Configuration)
+
+set PLAT=$(Platform)
+
+set BASEDIR=$(GlibEtcInstallRootFromBuildWin32)
+
+cd ..
+
+
+call gengir_gtk.bat
+
+cd vs$(VSVer)
+
+        </DoGenGir>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>gtkinstallbinprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="DoGenGir">
+      <Value>$(DoGenGir)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
--- a/build/win32/vs10/gtk-ignore-broadway.props
+++ b/build/win32/vs10/gtk-ignore-broadway.props
@@ -12,7 +12,6 @@
    </ProjectReference>
    <Link>
      <AdditionalDependencies>$(OutDir)\gdk-win32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalOptions>/EXPORT:gdk_win32_display_manager_get_type</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
 </Project>
--- a/build/win32/vs10/gtk-install.props
+++ b/build/win32/vs10/gtk-install.props
@@ -4,10 +4,6 @@
    <Import Project="gtk-build-defines.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros">
-    <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
-    <InstalledDlls>$(BinDir)\$(GtkDllPrefix)gdk(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gtk(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gailutil(GtkDllSuffix).dll</InstalledDlls>
-    <InstalledBins>$(BinDir)\gtk3-demo.exe;$(BinDir)\gtk3-demo-application.exe</InstalledBins>
-    <InstalledBroadwayBins>$(BinDir)\broadwayd.exe</InstalledBroadwayBins>
    <GtkDoInstallBin>
 mkdir $(CopyDir)\bin

@@ -19,22 +15,22 @@ if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_BIN
 if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_BIN


-copy $(BinDir)\*.dll $(CopyDir)\bin
+copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin

-copy $(BinDir)\*-$(ApiVersion).lib $(CopyDir)\lib
+copy $(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib

-copy $(BinDir)\*.exe $(CopyDir)\bin
+copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin

 goto DONE_BIN


 :DO_BROADWAY_BIN

-copy $(BinDir)\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll $(CopyDir)\bin
+copy $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll $(CopyDir)\bin

-copy $(BinDir)\gdk-$(ApiVersion).lib $(CopyDir)\lib
+copy $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib

-copy $(BinDir)\broadwayd.exe $(CopyDir)\bin
+copy $(Configuration)\$(Platform)\bin\broadwayd.exe $(CopyDir)\bin


 if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin
@@ -66,32 +62,6 @@ echo off

 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk

-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32
-
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
-
-copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
-
-copy ..\..\..\gdk\win32\gdkwin32cursor.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32
-
-copy ..\..\..\gdk\win32\gdkwin32display.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32
-
-copy ..\..\..\gdk\win32\gdkwin32displaymanager.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32
-
-copy ..\..\..\gdk\win32\gdkwin32dnd.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32
-
-copy ..\..\..\gdk\win32\gdkwin32keys.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32
-
-copy ..\..\..\gdk\win32\gdkwin32misc.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32
-
-copy ..\..\..\gdk\win32\gdkwin32screen.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32
-
-copy ..\..\..\gdk\win32\gdkwin32window.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32
-
 copy ..\..\..\gdk\gdk.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

 copy ..\..\..\gdk\gdkapplaunchcontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
@@ -112,22 +82,22 @@ copy ..\..\..\gdk\gdkdisplaymanager.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

 copy ..\..\..\gdk\gdkdnd.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

+copy ..\..\..\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
+
 copy ..\..\..\gdk\gdkevents.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

+copy ..\..\..\gdk\gdkframeclock.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
+
 copy ..\..\..\gdk\gdkframetimings.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

 copy ..\..\..\gdk\gdkkeys.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

 copy ..\..\..\gdk\gdkkeysyms.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

-copy ..\..\..\gdk\gdkkeysyms-compat.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
-
 copy ..\..\..\gdk\gdkmain.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

 copy ..\..\..\gdk\gdkpango.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

-copy ..\..\..\gdk\gdkframeclock.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
-
 copy ..\..\..\gdk\gdkpixbuf.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

 copy ..\..\..\gdk\gdkprivate.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
@@ -148,115 +118,35 @@ copy ..\..\..\gdk\gdkthreads.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

 copy ..\..\..\gdk\gdktypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

+copy ..\..\..\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
+
 copy ..\..\..\gdk\gdkvisual.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

+copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
+
 copy ..\..\..\gdk\gdkwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

-copy ..\..\..\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

-copy ..\..\..\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
+mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32

-copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
+copy ..\..\..\gdk\win32\gdkwin32cursor.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32

-copy ..\..\..\gtk\a11y\gtkarrowaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
+copy ..\..\..\gdk\win32\gdkwin32display.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32

-copy ..\..\..\gtk\a11y\gtkbooleancellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
+copy ..\..\..\gdk\win32\gdkwin32displaymanager.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32

-copy ..\..\..\gtk\a11y\gtkbuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
+copy ..\..\..\gdk\win32\gdkwin32dnd.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32

-copy ..\..\..\gtk\a11y\gtkcellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
+copy ..\..\..\gdk\win32\gdkwin32keys.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32

-copy ..\..\..\gtk\a11y\gtkcellaccessibleparent.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
+copy ..\..\..\gdk\win32\gdkwin32misc.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32

-copy ..\..\..\gtk\a11y\gtkcheckmenuitemaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
+copy ..\..\..\gdk\win32\gdkwin32screen.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32

-copy ..\..\..\gtk\a11y\gtkcomboboxaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
+copy ..\..\..\gdk\win32\gdkwin32window.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32

-copy ..\..\..\gtk\a11y\gtkcontaineraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y

-copy ..\..\..\gtk\a11y\gtkcontainercellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkentryaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkexpanderaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkflowboxaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkflowboxchildaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkframeaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkiconviewaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkimageaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkimagecellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtklabelaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtklevelbaraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtklinkbuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtklistboxaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtklistboxrowaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtklockbuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkmenuaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkmenubuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkmenuitemaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkmenushellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtknotebookaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtknotebookpageaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkpanedaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkpopoveraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkprogressbaraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkradiobuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkradiomenuitemaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkrangeaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkrenderercellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkscaleaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkscalebuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkscrolledwindowaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkspinbuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkspinneraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkstatusbaraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkswitchaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtktextcellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtktextviewaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtktogglebuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtktoplevelaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtktreeviewaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkwidgetaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-
-copy ..\..\..\gtk\a11y\gtkwindowaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
+mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtk.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

@@ -268,15 +158,16 @@ copy ..\..\..\gtk\gtkaboutdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkaccelgroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtkaccelgroupprivate.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkaccellabel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkaccelmap.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtkactionable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtkactionbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+copy ..\..\..\gtk\gtkactionable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkadjustment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

@@ -306,24 +197,24 @@ copy ..\..\..\gtk\gtkbin.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkbindings.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtkborder.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtkbuilder.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+copy ..\..\..\gtk\gtkborder.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkbuildable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtkbuilder.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkcalendar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkcellarea.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtkcellareacontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkcellareabox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtkcellareacontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkcelleditable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkcelllayout.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -500,8 +391,6 @@ copy ..\..\..\gtk\gtkplacessidebar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkplug.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtkpopover.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkprintcontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkprintoperation.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -510,6 +399,10 @@ copy ..\..\..\gtk\gtkprintoperationpreview.h $(CopyDir)\include\gtk-$(ApiVersion

 copy ..\..\..\gtk\gtkprintsettings.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtkprivate.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkprivatetypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkprogressbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkradiobutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -600,6 +493,8 @@ copy ..\..\..\gtk\gtktextdisplay.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtktextiter.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtktextlayout.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
 copy ..\..\..\gtk\gtktextmark.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtktexttag.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -646,30 +541,32 @@ copy ..\..\..\gtk\gtktreeview.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtktreeviewcolumn.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
 copy ..\..\..\gtk\gtktypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtkversion.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkviewport.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkvolumebutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
+;
 copy ..\..\..\gtk\gtkwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtktextlayout.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\gtkversion.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
-copy ..\..\..\gtk\deprecated\gtkactivatable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkactiongroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

+copy ..\..\..\gtk\deprecated\gtkactivatable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
+
 copy ..\..\..\gtk\deprecated\gtkcolorsel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkcolorseldialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
@@ -688,12 +585,12 @@ copy ..\..\..\gtk\deprecated\gtkhpaned.h $(CopyDir)\include\gtk-$(ApiVersion)\gt

 copy ..\..\..\gtk\deprecated\gtkhscale.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

+copy ..\..\..\gtk\deprecated\gtkhsv.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
+
 copy ..\..\..\gtk\deprecated\gtkhscrollbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkhseparator.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkhsv.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
-
 copy ..\..\..\gtk\deprecated\gtkiconfactory.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkimagemenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
@@ -731,6 +628,106 @@ copy ..\..\..\gtk\deprecated\gtkvseparator.h $(CopyDir)\include\gtk-$(ApiVersion
 copy ..\..\..\gtk\deprecated\gtkvpaned.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated


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

 copy ..\..\..\libgail-util\gail-util.h $(CopyDir)\include\gail-$(ApiVersion)\libgail-util
@@ -740,34 +737,7 @@ copy ..\..\..\libgail-util\gailmisc.h $(CopyDir)\include\gail-$(ApiVersion)\libg
 copy ..\..\..\libgail-util\gailtextutil.h $(CopyDir)\include\gail-$(ApiVersion)\libgail-util


-mkdir $(CopyDir)\share\icons\hicolor\16x16\apps
-
-copy ..\..\..\demos\gtk-demo\data\16x16\gtk3-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps\
-
-
-mkdir $(CopyDir)\share\icons\hicolor\22x22\apps
-
-copy ..\..\..\demos\gtk-demo\data\22x22\gtk3-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps\
-
-
-mkdir $(CopyDir)\share\icons\hicolor\24x24\apps
-
-copy ..\..\..\demos\gtk-demo\data\24x24\gtk3-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps\
-
-
-mkdir $(CopyDir)\share\icons\hicolor\32x32\apps
-
-copy ..\..\..\demos\gtk-demo\data\32x32\gtk3-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps\
-
-
-mkdir $(CopyDir)\share\icons\hicolor\48x48\apps
-
-copy ..\..\..\demos\gtk-demo\data\48x48\gtk3-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps\
-
-
-mkdir $(CopyDir)\share\icons\hicolor\256x256\apps
-
-copy ..\..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\hicolor\256x256\apps\
+copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk


 mkdir $(CopyDir)\share\glib-2.0\schemas
@@ -802,18 +772,6 @@ copy ..\..\..\gdk\broadway\gdkbroadwayvisual.h $(CopyDir)\include\gtk-$(ApiVersi
    <_PropertySheetDisplayName>gtkinstallsprops</_PropertySheetDisplayName>
  </PropertyGroup>
  <ItemGroup>
-    <BuildMacro Include="BinDir">
-      <Value>$(BinDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="InstalledDlls">
-      <Value>$(InstalledDlls)</Value>
-    </BuildMacro>
-    <BuildMacro Include="InstalledBins">
-      <Value>$(InstalledBins)</Value>
-    </BuildMacro>
-    <BuildMacro Include="InstalledBroadwayBins">
-      <Value>$(InstalledBroadwayBins)</Value>
-    </BuildMacro>
    <BuildMacro Include="GtkDoInstallBin">
      <Value>$(GtkDoInstallBin)</Value>
    </BuildMacro>
@@ -824,4 +782,4 @@ copy ..\..\..\gdk\broadway\gdkbroadwayvisual.h $(CopyDir)\include\gtk-$(ApiVersi
      <Value>$(GtkDoInstallBroadwayHeaders)</Value>
    </BuildMacro>
  </ItemGroup>
-</Project>
+</Project>
--- a/build/win32/vs10/gtk-version-paths.props
+++ b/build/win32/vs10/gtk-version-paths.props
@@ -3,6 +3,7 @@
  <PropertyGroup Label="UserMacros">
    <VSVer>10</VSVer>
    <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+    <GlibEtcInstallRootFromBuildWin32>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRootFromBuildWin32>
    <CopyDir>..\..\..\..\vs$(VSVer)\$(Platform)</CopyDir>
    <ApiVersion>3.0</ApiVersion>
    <GtkLibtoolCompatibleDllPrefix>lib</GtkLibtoolCompatibleDllPrefix>
@@ -11,7 +12,6 @@
    <GtkSeparateVSDllSuffix>-3-vs$(VSVer)</GtkSeparateVSDllSuffix>
    <GtkDllPrefix>$(GtkSeparateVSDllPrefix)</GtkDllPrefix>
    <GtkDllSuffix>$(GtkSeparateVSDllSuffix)</GtkDllSuffix>
-    <PythonPath>c:\python27</PythonPath>
  </PropertyGroup>
  <PropertyGroup>
    <_PropertySheetDisplayName>gtkversionpathsprops</_PropertySheetDisplayName>
@@ -23,6 +23,9 @@
    <BuildMacro Include="GlibEtcInstallRoot">
      <Value>$(GlibEtcInstallRoot)</Value>
    </BuildMacro>
+    <BuildMacro Include="GlibEtcInstallRootFromBuildWin32">
+      <Value>$(GlibEtcInstallRootFromBuildWin32)</Value>
+    </BuildMacro>
    <BuildMacro Include="CopyDir">
      <Value>$(CopyDir)</Value>
    </BuildMacro>
@@ -47,8 +50,5 @@
    <BuildMacro Include="GtkDllSuffix">
      <Value>$(GtkDllSuffix)</Value>
    </BuildMacro>
-    <BuildMacro Include="PythonPath">
-      <Value>$(PythonPath)</Value>
-    </BuildMacro>
  </ItemGroup>
-</Project>
+</Project>
--- a/build/win32/vs10/gtk3-demo.vcxproj
+++ b/build/win32/vs10/gtk3-demo.vcxproj
@@ -182,13 +182,15 @@
    <ClCompile Include="..\..\..\demos\gtk-demo\css_multiplebgs.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\css_pixbufs.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\css_shadows.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\dialog.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\drawingarea.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\editable_cells.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\entry_buffer.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\entry_completion.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\event_axes.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\event_axes.c" />	
    <ClCompile Include="..\..\..\demos\gtk-demo\expander.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\flowbox.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\headerbar.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\hypertext.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\iconview.c" />
@@ -197,8 +199,8 @@
    <ClCompile Include="..\..\..\demos\gtk-demo\infobar.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\links.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\listbox.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\flowbox.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\list_store.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\main.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\menus.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window2.c" />
@@ -206,7 +208,6 @@
    <ClCompile Include="..\..\..\demos\gtk-demo\panes.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\pickers.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\pixbufs.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\popover.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\printing.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\revealer.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\rotated_text.c" />
@@ -215,14 +216,12 @@
    <ClCompile Include="..\..\..\demos\gtk-demo\sizegroup.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\spinner.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\stack.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\textview.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\textview.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\theming_style_classes.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\transparent.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\tree_store.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\main.c" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="gdk.vcxproj">
@@ -237,4 +236,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
--- a/build/win32/vs10/gtk3-demo.vcxproj.filters
+++ b/build/win32/vs10/gtk3-demo.vcxproj.filters
@@ -24,6 +24,7 @@
    <ClCompile Include="..\..\..\demos\gtk-demo\css_multiplebgs.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\css_pixbufs.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\css_shadows.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\dialog.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\drawingarea.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\editable_cells.c"><Filter>Source Files</Filter></ClCompile>
@@ -31,6 +32,7 @@
    <ClCompile Include="..\..\..\demos\gtk-demo\entry_completion.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\event_axes.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\expander.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\flowbox.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\headerbar.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\hypertext.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\iconview.c"><Filter>Source Files</Filter></ClCompile>
@@ -39,8 +41,8 @@
    <ClCompile Include="..\..\..\demos\gtk-demo\infobar.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\links.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\listbox.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\flowbox.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\list_store.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\main.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\menus.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window2.c"><Filter>Source Files</Filter></ClCompile>
@@ -48,7 +50,6 @@
    <ClCompile Include="..\..\..\demos\gtk-demo\panes.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\pickers.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\pixbufs.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\popover.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\printing.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\revealer.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\rotated_text.c"><Filter>Source Files</Filter></ClCompile>
@@ -57,13 +58,11 @@
    <ClCompile Include="..\..\..\demos\gtk-demo\sizegroup.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\spinner.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\stack.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\textview.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\textview.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\theming_style_classes.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\transparent.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\tree_store.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\main.c"><Filter>Source Files</Filter></ClCompile>
  </ItemGroup>
 </Project>
--- a/build/win32/vs10/install.vcxproj
+++ b/build/win32/vs10/install.vcxproj
@@ -139,49 +139,45 @@
    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" />
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstallBin)$(GtkDoInstall)</Command>
+    </PreBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstallBin)$(GtkDoInstall)</Command>
+    </PreBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstallBin)$(GtkDoInstall)</Command>
+    </PreBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstallBin)$(GtkDoInstall)</Command>
+    </PreBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
+    </PreBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
+    </PreBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
+    </PreBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
+    </PreBuildEvent>
  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\config.h.win32">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Installing Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Installing Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Installing Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Installing Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="gdk.vcxproj">
      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 EXTRA_DIST +=	\
 	README.txt	\
 	gtk+.sln	\
-	gtk-prebuild.vcproj	\
+	gdk-prebuild.vcproj	\
 	gdk-win32.vcproj	\
 	gdk.vcproj	\
 	gdk.vcprojin	\
@@ -14,12 +14,14 @@ EXTRA_DIST +=	\
 	gtka11y.vcproj	\
 	gtka11y.vcprojin	\
 	gailutil.vcproj	\
+	gengir.vcproj	\
 	install.vcproj	\
 	broadwayd.vcproj	\
 	gdk-broadway.vcproj	\
 	gtk-build-defines.vsprops	\
 	gtk-copy-gdk-broadway.vsprops	\
 	gtk-gen-srcs.vsprops	\
+	gtk-gengir.vsprops	\
 	gtk-ignore-broadway.vsprops	\
 	gtk-install.vsprops	\
 	gtk-version-paths.vsprops
--- a/build/win32/vs9/README.txt
+++ b/build/win32/vs9/README.txt
@@ -19,14 +19,10 @@ ATK and GLib.  External dependencies are at least Cairo
 gettext-runtime, fontconfig*, freetype*, expat*.  See the 
 build/win32/vs9/README.txt file in glib for details where to unpack them.

-You will also need a Python 2.6+/3.x interpretor installed on your system,
+You will also need a Python 2.x/3.x interpretor installed on your system,
 which can be obtained from the official installers available from
 http://www.python.org.  Please note that the Python interpretor (python.exe)
-either needs to be in your PATH before attempting the build of GTK+, or it
-can be found in the path specified by PythonPath in gtk-version-paths.vsprops.
-If you happen to change the PythonPath setting in gtk-version-paths.vsprops after
-opening gtk+.sln with Visual Studio, you will need to close the gtk+.sln solution,
-delete all the *.ncb, *.suo and *.user files before re-attempting the build.
+needs to be in your PATH before attempting the build of GTK+.

 It is recommended that one builds the dependencies with VS9 as far as
 possible, especially those from and using the GTK+ stack (i.e. GLib,
--- a/build/win32/vs9/gengir.vcproj
+++ b/build/win32/vs9/gengir.vcproj
@@ -0,0 +1,77 @@
+<?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-gengir.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			DeleteExtensionsOnClean=""
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="$(DoGenGir)"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			InheritedPropertySheets=".\gtk-gengir.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			DeleteExtensionsOnClean=""
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="$(DoGenGir)"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\gtk-gengir.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			DeleteExtensionsOnClean=""
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="$(DoGenGir)"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			InheritedPropertySheets=".\gtk-gengir.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
@@ -62,6 +62,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj",
 		{3281202A-CD26-4C67-B892-EB34BDBC6130} = {3281202A-CD26-4C67-B892-EB34BDBC6130}
 	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
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -234,6 +240,14 @@ Global
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|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
+		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
+		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_Broadway|x64.ActiveCfg = Debug|x64
+		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release_Broadway|Win32.ActiveCfg = Release|Win32
+		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release_Broadway|x64.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/build/win32/vs9/gtk-copy-gdk-broadway.vsprops
+++ b/build/win32/vs9/gtk-copy-gdk-broadway.vsprops
@@ -5,10 +5,6 @@
 	Name="gtkcopygdkbroadwayprops"
 	InheritedPropertySheets=".\gtk-build-defines.vsprops"
 	>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalOptions="/EXPORT:gdk_win32_display_manager_get_type"
-	/>
 	<Tool
 		Name="VCPostBuildEventTool"
 		CommandLine="
--- a/build/win32/vs9/gtk-gen-srcs.vsprops
+++ b/build/win32/vs9/gtk-gen-srcs.vsprops
@@ -57,8 +57,6 @@ echo $(ConfigurationName) &gt; ..\..\..\MSVC_$(ConfigurationName)&#x0D;&#x0A;
 	<UserMacro
 		Name="GenerateGtkDbusBuiltSources"
 		Value="
-set PATH=$(PATH);$(PythonPath)&#x0D;&#x0A;
-
 cd ..\..\..\gtk&#x0D;&#x0A;
 python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml&#x0D;&#x0A;
 cd $(SolutionDir)&#x0D;&#x0A;
--- a/build/win32/vs9/gtk-gengir.vsprops
+++ b/build/win32/vs9/gtk-gengir.vsprops
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="gtkinstallbinprops"
+	InheritedPropertySheets=".\gtk-build-defines.vsprops"
+	>
+	<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;
+		      "
+	/>
+</VisualStudioPropertySheet>
--- a/build/win32/vs9/gtk-ignore-broadway.vsprops
+++ b/build/win32/vs9/gtk-ignore-broadway.vsprops
@@ -9,6 +9,5 @@
 		Name="VCLinkerTool"
 		LinkLibraryDependencies="false"
 		AdditionalDependencies="$(OutDir)\gdk-win32.lib"
-		AdditionalOptions="/EXPORT:gdk_win32_display_manager_get_type"
 	/>
 </VisualStudioPropertySheet>
--- a/build/win32/vs9/gtk-install.vsprops
+++ b/build/win32/vs9/gtk-install.vsprops
@@ -44,20 +44,6 @@ if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; copy .\Debug\$
 echo off&#x0D;&#x0A;

 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-
-copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#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\gdkwin32misc.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;
 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;
@@ -68,14 +54,14 @@ copy ..\..\..\gdk\gdkdevicemanager.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x
 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\gdkkeysyms-compat.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\gdkframeclock.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;
@@ -86,71 +72,33 @@ copy ..\..\..\gdk\gdkselection.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&
 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\gdkvisual.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#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\gtkflowboxaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkflowboxchildaccessible.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\gtklistboxaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtklistboxrowaccessible.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\gtkmenubuttonaccessible.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\gtkpopoveraccessible.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 ..\..\..\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-$(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\gdkwin32misc.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-$(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\gtkactionable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkactionbar.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;
@@ -165,15 +113,15 @@ copy ..\..\..\gtk\gtkassistant.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&
 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\gtkborder.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbuilder.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\gtkcellareacontext.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;
@@ -262,11 +210,12 @@ copy ..\..\..\gtk\gtkpaned.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A
 copy ..\..\..\gtk\gtkpapersize.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkplacessidebar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkplug.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpopover.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\gtkradiobutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkradiomenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
@@ -312,6 +261,7 @@ copy ..\..\..\gtk\gtktextbufferrichtext.h $(CopyDir)\include\gtk-$(ApiVersion)\g
 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;
@@ -335,18 +285,20 @@ copy ..\..\..\gtk\gtktreesortable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0
 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\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\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;
-copy ..\..\..\gtk\gtktextlayout.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkversion.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkactivatable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+
+mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+
 copy ..\..\..\gtk\deprecated\gtkaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
 copy ..\..\..\gtk\deprecated\gtkactiongroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkactivatable.h $(CopyDir)\include\gtk-$(ApiVersion)\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;
@@ -356,9 +308,9 @@ copy ..\..\..\gtk\deprecated\gtkhbbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 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\gtkhsv.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
 copy ..\..\..\gtk\deprecated\gtkiconfactory.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
 copy ..\..\..\gtk\deprecated\gtkimagemenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
 copy ..\..\..\gtk\deprecated\gtkradioaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
@@ -378,28 +330,63 @@ copy ..\..\..\gtk\deprecated\gtkvscrollbar.h $(CopyDir)\include\gtk-$(ApiVersion
 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;

+mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\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\gtkflowboxaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkflowboxchildaccessible.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\gtklistboxaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtklistboxrowaccessible.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;
+
 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)\share\icons\hicolor\16x16\apps&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\data\16x16\gtk3-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps\&#x0D;&#x0A;
-
-mkdir $(CopyDir)\share\icons\hicolor\22x22\apps&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\data\22x22\gtk3-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps\&#x0D;&#x0A;
-
-mkdir $(CopyDir)\share\icons\hicolor\24x24\apps&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\data\24x24\gtk3-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps\&#x0D;&#x0A;
-
-mkdir $(CopyDir)\share\icons\hicolor\32x32\apps&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\data\32x32\gtk3-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps\&#x0D;&#x0A;
-
-mkdir $(CopyDir)\share\icons\hicolor\48x48\apps&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\data\48x48\gtk3-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps\&#x0D;&#x0A;
-
-mkdir $(CopyDir)\share\icons\hicolor\256x256\apps&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\hicolor\256x256\apps\&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#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;
--- a/build/win32/vs9/gtk-version-paths.vsprops
+++ b/build/win32/vs9/gtk-version-paths.vsprops
@@ -12,6 +12,10 @@
 		Name="GlibEtcInstallRoot"
 		Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
 	/>
+	<UserMacro
+		Name="GlibEtcInstallRootFromBuildWin32"
+		Value="..\..\..\vs$(VSVer)\$(PlatformName)"
+	/>
 	<UserMacro
 		Name="CopyDir"
 		Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
@@ -46,8 +50,4 @@
 		Name="GtkDllSuffix"
 		Value="$(GtkSeparateVSDllSuffix)"
 	/>
-	<UserMacro
-		Name="PythonPath"
-		Value="c:\python27"
-	/>
-</VisualStudioPropertySheet>
+</VisualStudioPropertySheet>
--- a/build/win32/vs9/gtk3-demo.vcproj
+++ b/build/win32/vs9/gtk3-demo.vcproj
@@ -170,9 +170,10 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\combobox.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\css_accordion.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\css_basics.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\css_multiplebgs.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\css_pixbufs.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\css_shadows.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\css_multiplebgs.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\demo_resources.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\dialog.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\drawingarea.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\editable_cells.c" />
@@ -180,6 +181,7 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\entry_completion.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\event_axes.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\expander.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\flowbox.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\headerbar.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\hypertext.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\iconview.c" />
@@ -188,16 +190,15 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\infobar.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\links.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\listbox.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\flowbox.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\list_store.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\main.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\menus.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\overlay.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\offscreen_window.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\offscreen_window2.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\overlay.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\panes.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\pickers.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\pixbufs.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\popover.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\printing.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\revealer.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\rotated_text.c" />
@@ -206,14 +207,12 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\sizegroup.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\spinner.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\stack.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\textview.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\textscroll.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\textview.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\theming_style_classes.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\toolpalette.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\transparent.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\tree_store.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\demo_resources.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\main.c" />
 		</Filter>
 		<Filter
 			Name="Header Files"
--- a/configure.ac
+++ b/configure.ac
@@ -9,9 +9,9 @@
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.

 m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [12])
-m4_define([gtk_micro_version], [3])
-m4_define([gtk_interface_age], [3])
+m4_define([gtk_minor_version], [11])
+m4_define([gtk_micro_version], [4])
+m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
          [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
@@ -41,13 +41,12 @@ AC_CANONICAL_HOST
 m4_define([gtk_binary_version], [3.0.0])

 # required versions of other packages
-m4_define([glib_required_version], [2.39.5])
+m4_define([glib_required_version], [2.39.0])
 m4_define([pango_required_version], [1.32.4])
 m4_define([atk_required_version], [2.7.5])
 m4_define([cairo_required_version], [1.12.0])
 m4_define([gdk_pixbuf_required_version], [2.27.1])
 m4_define([introspection_required_version], [1.39.0])
-m4_define([wayland_required_version], [1.3.90])
 GLIB_REQUIRED_VERSION=glib_required_version
 PANGO_REQUIRED_VERSION=pango_required_version
 ATK_REQUIRED_VERSION=atk_required_version
@@ -322,10 +321,6 @@ AC_ARG_ENABLE(wayland-backend,
              [AS_HELP_STRING([--enable-wayland-backend],
                              [enable the wayland gdk backend])],
 			      [backend_set=yes])
-AC_ARG_ENABLE(mir-backend,
-              [AS_HELP_STRING([--enable-mir-backend],
-                              [enable the Mir gdk backend])],
-			      [backend_set=yes])

 if test -z "$backend_set"; then
  if test "$platform_win32" = yes; then
@@ -333,7 +328,6 @@ if test -z "$backend_set"; then
  else
    enable_x11_backend=yes
    enable_wayland_backend=maybe
-    enable_mir_backend=maybe
  fi
 fi

@@ -402,11 +396,6 @@ else
 fi
 AC_SUBST(DISABLE_ON_QUARTZ)

-AC_CHECK_LIB([rt], [shm_open], [SHM_LIBS="-lrt"], [SHM_LIBS=""])
-AC_SUBST(SHM_LIBS)
-
-AC_CHECK_FUNCS(posix_fallocate)
-
 if test "x$enable_broadway_backend" = xyes; then
  GDK_BACKENDS="$GDK_BACKENDS broadway"
  cairo_backends="$cairo_backends cairo"
@@ -424,7 +413,7 @@ fi

 PKG_PROG_PKG_CONFIG

-WAYLAND_DEPENDENCIES="wayland-client >= wayland_required_version xkbcommon >= 0.2.0 wayland-cursor >= wayland_required_version"
+WAYLAND_DEPENDENCIES="wayland-client >= 1.2.0 xkbcommon >= 0.2.0 wayland-cursor"
 if test "$enable_wayland_backend" = "maybe" ; then
  AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
  PKG_CHECK_EXISTS($WAYLAND_DEPENDENCIES, [have_wayland_deps=yes], [have_wayland_deps=no])
@@ -455,30 +444,6 @@ else
  AM_CONDITIONAL(USE_WAYLAND, false)
 fi

-MIR_DEPENDENCIES="mirclient"
-if test "$enable_mir_backend" = "maybe" ; then
-  PKG_CHECK_EXISTS($MIR_DEPENDENCIES, [have_mir_deps=yes], [have_mir_deps=no])
-  AC_MSG_CHECKING([for MIR_DEPENDENCIES])
-  if test "$have_mir_deps" = "no" ; then
-    enable_mir_backend=no
-  else
-    enable_mir_backend=yes
-  fi
-  AC_MSG_RESULT($enable_mir_backend)
-fi
-
-if test "$enable_mir_backend" = "yes"; then
-  cairo_backends="$cairo_backends cairo"
-  GDK_BACKENDS="$GDK_BACKENDS mir"
-  GDK_WINDOWING="$GDK_WINDOWING
-#define GDK_WINDOWING_MIR"
-  MIR_PACKAGES="$MIR_DEPENDENCIES"
-
-  AM_CONDITIONAL(USE_MIR, true)
-else
-  AM_CONDITIONAL(USE_MIR, false)
-fi
-
 # strip leading space
 GDK_BACKENDS=${GDK_BACKENDS#* }

@@ -1300,11 +1265,11 @@ fi

 # Check for gio-unix
 if test "$have_gio_unix" = "yes"; then
-  GDK_GIO_PACKAGE="gio-unix-2.0 >= glib_required_version"
+  GDK_GIO_PACKAGE=gio-unix-2.0
  AC_DEFINE([HAVE_GIO_UNIX], [1],
            [Define if gio-unix is available])
 else
-  GDK_GIO_PACKAGE="gio-2.0 >= glib_required_version"
+  GDK_GIO_PACKAGE=gio-2.0
 fi

 # Check for Pango flags
@@ -1349,8 +1314,8 @@ LIBS="$gtk_save_LIBS"
 CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"

-GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
-GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends"
+GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 cairo cairo-gobject"
+GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $cairo_backends"
 if test "x$enable_x11_backend" = xyes; then
  GDK_PRIVATE_PACKAGES="$GDK_PRIVATE_PACKAGES pangoft2"
 fi
@@ -1386,13 +1351,13 @@ fi

 PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)

-GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"
-GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES"
+GTK_PACKAGES="atk cairo cairo-gobject gdk-pixbuf-2.0 gio-2.0"
+GTK_PRIVATE_PACKAGES="$ATK_PACKAGES"
 if test "x$enable_x11_backend" = xyes; then
  GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
 fi
 if test "$have_gio_unix" = "yes"; then
-  GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES gio-unix-2.0 >= glib_required_version"
+  GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES gio-unix-2.0"
 fi
 GTK_EXTRA_LIBS=

@@ -1554,37 +1519,6 @@ else
  fi
 fi

-# Checks to see if we should compile with cloudprint backend for GTK+
-#
-
-AC_ARG_ENABLE(cloudprint,
-              [AS_HELP_STRING([--disable-cloudprint],
-                              [disable cloudprint print backend])],,
-              [enable_cloudprint=auto])
-
-if test "x$enable_cloudprint" = "xno"; then
-  AM_CONDITIONAL(HAVE_CLOUDPRINT, false)
-else
-  PKG_CHECK_MODULES(REST, [rest-0.7], have_rest=yes, have_rest=no)
-  PKG_CHECK_MODULES(JSON_GLIB, [json-glib-1.0], have_json_glib=yes, have_json_glib=no)
-  if test "x$have_rest" = "xyes" -a "x$have_json_glib" = "xyes"; then
-    PRINT_BACKENDS="$PRINT_BACKENDS cloudprint"
-  fi
-  AM_CONDITIONAL(HAVE_CLOUDPRINT, test "x$have_rest" = "xyes" -a "x$have_json_glib" = "xyes")
-fi
-
-if test "x$enable_cloudprint" = "xyes" -a "x$have_rest" = "xno"; then
-    AC_MSG_ERROR([
-*** rest not found.
-])
-fi
-
-if test "x$enable_cloudprint" = "xyes" -a "x$have_json_glib" = "xno"; then
-    AC_MSG_ERROR([
-*** json-glib not found.
-])
-fi
-
 AM_CONDITIONAL(HAVE_PAPI_CUPS, test "x$have_papi" = "xyes" -a "x$CUPS_CONFIG" != "xno")

 gtk_save_cppflags="$CPPFLAGS"
@@ -1698,7 +1632,7 @@ AM_CONDITIONAL(HAVE_COLORD, test "x$have_colord" = "xyes")
 # Checks for gtk-doc and docbook-tools
 ##################################################

-GTK_DOC_CHECK([1.20],[--flavour no-tmpl])
+GTK_DOC_CHECK([1.11],[--flavour no-tmpl])

 AC_ARG_ENABLE(man,
              [AS_HELP_STRING([--enable-man],
@@ -1910,7 +1844,6 @@ gdk/win32/rc/Makefile
 gdk/win32/rc/gdk.rc
 gdk/quartz/Makefile
 gdk/wayland/Makefile
-gdk/mir/Makefile
 gdk/gdkversionmacros.h
 gtk/Makefile
 gtk/makefile.msc
@@ -1925,7 +1858,6 @@ modules/engines/pixbuf/Makefile
 modules/input/Makefile
 modules/printbackends/Makefile
 modules/printbackends/cups/Makefile
-modules/printbackends/cloudprint/Makefile
 modules/printbackends/lpr/Makefile
 modules/printbackends/file/Makefile
 modules/printbackends/papi/Makefile
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -41,7 +41,6 @@ demos =						\
 	panes.c					\
 	pickers.c				\
 	pixbufs.c				\
-	popover.c				\
 	printing.c				\
 	revealer.c				\
 	rotated_text.c				\
--- a/demos/gtk-demo/application.ui
+++ b/demos/gtk-demo/application.ui
@@ -6,9 +6,6 @@
        <property name="orientation">horizontal</property>
        <property name="halign">fill</property>
        <property name="hexpand">True</property>
-        <style>
-          <class name="primary-toolbar"/>
-        </style>
        <child>
          <object class="GtkMenuToolButton" id="menutool">
            <property name="icon-name">document-open</property>
--- a/demos/gtk-demo/builder.c
+++ b/demos/gtk-demo/builder.c
@@ -37,7 +37,6 @@ do_builder (GtkWidget *do_widget)
 {
  static GtkWidget *window = NULL;
  GError *err = NULL;
-  GtkWidget *toolbar;

  if (!window)
    {
@@ -54,9 +53,6 @@ do_builder (GtkWidget *do_widget)
                             gtk_widget_get_screen (do_widget));
      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);
-      toolbar = GTK_WIDGET (gtk_builder_get_object (builder, "toolbar1"));
-      gtk_style_context_add_class (gtk_widget_get_style_context (toolbar),
-                                   "primary-toolbar");
    }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/button_box.c
+++ b/demos/gtk-demo/button_box.c
@@ -90,14 +90,6 @@ do_button_box (GtkWidget *do_widget)
                        create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END),
                        TRUE, TRUE, 5);

-    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Center", 40, GTK_BUTTONBOX_CENTER),
-                        TRUE, TRUE, 5);
-
-    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Expand", 40, GTK_BUTTONBOX_EXPAND),
-                        TRUE, TRUE, 5);
-
    frame_vert = gtk_frame_new ("Vertical Button Boxes");
    gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE, 10);

@@ -106,25 +98,19 @@ do_button_box (GtkWidget *do_widget)
    gtk_container_add (GTK_CONTAINER (frame_vert), hbox);

    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Spread", 10, GTK_BUTTONBOX_SPREAD),
+                        create_bbox (FALSE, "Spread", 30, GTK_BUTTONBOX_SPREAD),
                        TRUE, TRUE, 0);

    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Edge", 10, GTK_BUTTONBOX_EDGE),
+                        create_bbox (FALSE, "Edge", 30, GTK_BUTTONBOX_EDGE),
                        TRUE, TRUE, 5);

    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Start", 10, GTK_BUTTONBOX_START),
+                        create_bbox (FALSE, "Start", 30, GTK_BUTTONBOX_START),
                        TRUE, TRUE, 5);

    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "End", 10, GTK_BUTTONBOX_END),
-                        TRUE, TRUE, 5);
-    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Center", 10, GTK_BUTTONBOX_CENTER),
-                        TRUE, TRUE, 5);
-    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Expand", 10, GTK_BUTTONBOX_EXPAND),
+                        create_bbox (FALSE, "End", 30, GTK_BUTTONBOX_END),
                        TRUE, TRUE, 5);
  }

--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -110,7 +110,6 @@
    <file>panes.c</file>
    <file>pickers.c</file>
    <file>pixbufs.c</file>
-    <file>popover.c</file>
    <file>printing.c</file>
    <file>revealer.c</file>
    <file>rotated_text.c</file>
@@ -134,7 +133,4 @@
    <file>messages.txt</file>
    <file>apple-red.png</file>
  </gresource>
-  <gresource prefix="/popover">
-    <file>popover.ui</file>
-  </gresource>
 </gresources>
--- a/demos/gtk-demo/demo.ui
+++ b/demos/gtk-demo/demo.ui
@@ -151,7 +151,6 @@
    </object>
    <object class="GtkAboutDialog" id="aboutdialog1">
        <property name="program-name" translatable="yes">GtkBuilder demo</property>
-        <property name="logo-icon-name" translatable="yes">gtk3-demo</property>
         <accessibility>
 	     <relation target="window1" type="subwindow-of"/>
 	 </accessibility>
@@ -244,6 +243,9 @@
                          </child>
                        </object>
                      </child>
+		    <accessibility>
+		      	<action action_name="move-cursor" description="Move the cursor to select another person."/>
+		    </accessibility>
                    </object>
                    <packing>
                        <property name="position">2</property>
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -20,7 +20,7 @@ message_dialog_clicked (GtkButton *button,
  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                   GTK_MESSAGE_INFO,
-                                   GTK_BUTTONS_OK_CANCEL,
+                                   GTK_BUTTONS_OK,
                                   "This message box has been popped up the following\n"
                                   "number of times:");
  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
--- a/demos/gtk-demo/iconview.c
+++ b/demos/gtk-demo/iconview.c
@@ -270,7 +270,6 @@ do_iconview (GtkWidget *do_widget)

      up_button = gtk_tool_button_new (NULL, NULL);
      gtk_tool_button_set_label (GTK_TOOL_BUTTON (up_button), _("_Up"));
-      gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (up_button), TRUE);
      gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (up_button), "go-up");
      gtk_tool_item_set_is_important (up_button, TRUE);
      gtk_widget_set_sensitive (GTK_WIDGET (up_button), FALSE);
@@ -278,7 +277,6 @@ do_iconview (GtkWidget *do_widget)

      home_button = gtk_tool_button_new (NULL, NULL);
      gtk_tool_button_set_label (GTK_TOOL_BUTTON (home_button), _("_Home"));
-      gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (home_button), TRUE);
      gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (home_button), "go-home");
      gtk_tool_item_set_is_important (home_button, TRUE);
      gtk_toolbar_insert (GTK_TOOLBAR (tool_bar), home_button, -1);
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -50,21 +50,18 @@ progressive_updated_callback (GdkPixbufLoader *loader,
                              gpointer     data)
 {
  GtkWidget *image;
-  GdkPixbuf *pixbuf;

  image = GTK_WIDGET (data);

  /* We know the pixbuf inside the GtkImage has changed, but the image
-   * itself doesn't know this; so give it a hint by setting the pixbuf
-   * again. Queuing a redraw used to be sufficient, but nowadays GtkImage
-   * uses GtkIconHelper which caches the pixbuf state and will just redraw
-   * from the cache.
+   * itself doesn't know this; so queue a redraw.  If we wanted to be
+   * really efficient, we could use a drawing area or something
+   * instead of a GtkImage, so we could control the exact position of
+   * the pixbuf on the display, then we could queue a draw for only
+   * the updated area of the image.
   */

-  pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (image));
-  g_object_ref (pixbuf);
-  gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
-  g_object_unref (pixbuf);
+  gtk_widget_queue_draw (image);
 }

 static gint
@@ -273,7 +270,6 @@ start_progressive_loading (GtkWidget *image)
  load_timeout = gdk_threads_add_timeout (150,
                                progressive_timeout,
                                image);
-  g_source_set_name_by_id (load_timeout, "[gtk+] progressive_timeout");
 }

 static void
--- a/demos/gtk-demo/links.c
+++ b/demos/gtk-demo/links.c
@@ -33,7 +33,6 @@ activate_link (GtkWidget   *label,
                 "The term <i>keynav</i> is a shorthand for "
                 "keyboard navigation and refers to the process of using "
                 "a program (exclusively) via keyboard input.");
-      gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);

      gtk_window_present (GTK_WINDOW (dialog));
      g_signal_connect (dialog, "response", G_CALLBACK (response_cb), NULL);
--- a/demos/gtk-demo/main.ui
+++ b/demos/gtk-demo/main.ui
@@ -31,8 +31,8 @@
    </columns>
  </object>
  <object class="GtkApplicationWindow" id="window">
-    <property name="default-width">800</property>
-    <property name="default-height">600</property>
+    <property name="width_request">800</property>
+    <property name="height_request">600</property>
    <property name="can_focus">False</property>
    <property name="title">GTK+ Demo</property>
    <signal name="delete-event" handler="gtk_false" swapped="no"/>
@@ -46,7 +46,7 @@
          <object class="GtkButton" id="run_button">
            <property name="visible">True</property>
            <property name="valign">center</property>
-            <property name="can_focus">True</property>
+            <property name="can_focus">False</property>
            <property name="action_name">win.run</property>
            <style>
              <class name="text-button"/>
@@ -123,6 +123,7 @@
              <object class="GtkScrolledWindow" id="scrolledwindow1">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">never</property>
                <property name="shadow_type">none</property>
                <child>
                  <object class="GtkTextView" id="info-textview">
--- a/demos/gtk-demo/offscreen_window.c
+++ b/demos/gtk-demo/offscreen_window.c
@@ -279,7 +279,7 @@ gtk_rotated_bin_realize (GtkWidget *widget)
      attributes.width = child_allocation.width;
      attributes.height = child_allocation.height;
    }
-  bin->offscreen_window = gdk_window_new (gdk_screen_get_root_window (gtk_widget_get_screen (widget)),
+  bin->offscreen_window = gdk_window_new (gtk_widget_get_root_window (widget),
                                          &attributes, attributes_mask);
  gdk_window_set_user_data (bin->offscreen_window, widget);
  if (bin->child)
--- a/demos/gtk-demo/offscreen_window2.c
+++ b/demos/gtk-demo/offscreen_window2.c
@@ -218,7 +218,7 @@ gtk_mirror_bin_realize (GtkWidget *widget)
      attributes.width = child_allocation.width;
      attributes.height = child_allocation.height;
    }
-  bin->offscreen_window = gdk_window_new (gdk_screen_get_root_window (gtk_widget_get_screen (widget)),
+  bin->offscreen_window = gdk_window_new (gtk_widget_get_root_window (widget),
                                          &attributes, attributes_mask);
  gdk_window_set_user_data (bin->offscreen_window, widget);
  if (bin->child)
--- a/demos/gtk-demo/popover.c
+++ b/demos/gtk-demo/popover.c
@@ -1,185 +0,0 @@
-/* Popovers
- *
- * A bubble-like window containing contextual information or options.
- * GtkPopovers can be attached to any widget, and will be displayed
- * within the same window, but on top of all its content.
- */
-
-#include <gtk/gtk.h>
-
-static void
-toggle_changed_cb (GtkToggleButton *button,
-                   GtkWidget       *popover)
-{
-  gtk_widget_set_visible (popover,
-                          gtk_toggle_button_get_active (button));
-}
-
-static GtkWidget *
-create_popover (GtkWidget       *parent,
-                GtkWidget       *child,
-                GtkPositionType  pos)
-{
-  GtkWidget *popover;
-
-  popover = gtk_popover_new (parent);
-  gtk_popover_set_position (GTK_POPOVER (popover), pos);
-  gtk_container_add (GTK_CONTAINER (popover), child);
-  gtk_container_set_border_width (GTK_CONTAINER (popover), 6);
-  gtk_widget_show (child);
-
-  return popover;
-}
-
-static GtkWidget *
-create_complex_popover (GtkWidget       *parent,
-                        GtkPositionType  pos)
-{
-  GtkWidget *popover, *window, *content;
-  GtkBuilder *builder;
-
-  builder = gtk_builder_new ();
-  gtk_builder_add_from_resource (builder, "/popover/popover.ui", NULL);
-  window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-  content = gtk_bin_get_child (GTK_BIN (window));
-  g_object_ref (content);
-  gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (content)),
-                        content);
-  gtk_widget_destroy (window);
-  g_object_unref (builder);
-
-  popover = create_popover (parent, content, GTK_POS_BOTTOM);
-  g_object_unref (content);
-
-  gtk_widget_set_size_request (popover, 200, -1);
-  gtk_widget_set_vexpand (popover, TRUE);
-
-  gtk_widget_set_margin_start (popover, 10);
-  gtk_widget_set_margin_end (popover, 10);
-  gtk_widget_set_margin_bottom (popover, 10);
-
-  return popover;
-}
-
-static void
-entry_size_allocate_cb (GtkEntry      *entry,
-                        GtkAllocation *allocation,
-                        gpointer       user_data)
-{
-  GtkEntryIconPosition popover_pos;
-  GtkPopover *popover = user_data;
-  cairo_rectangle_int_t rect;
-
-  if (gtk_widget_is_visible (GTK_WIDGET (popover)))
-    {
-      popover_pos =
-        GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (entry),
-                                             "popover-icon-pos"));
-      gtk_entry_get_icon_area (entry, popover_pos, &rect);
-      gtk_popover_set_pointing_to (GTK_POPOVER (popover), &rect);
-    }
-}
-
-static void
-entry_icon_press_cb (GtkEntry             *entry,
-                     GtkEntryIconPosition  icon_pos,
-                     GdkEvent             *event,
-                     gpointer              user_data)
-{
-  GtkWidget *popover = user_data;
-  cairo_rectangle_int_t rect;
-
-  gtk_entry_get_icon_area (entry, icon_pos, &rect);
-  gtk_popover_set_pointing_to (GTK_POPOVER (popover), &rect);
-  gtk_widget_show (popover);
-
-  g_object_set_data (G_OBJECT (entry), "popover-icon-pos",
-                     GUINT_TO_POINTER (icon_pos));
-}
-
-static void
-day_selected_cb (GtkCalendar *calendar,
-                 gpointer     user_data)
-{
-  cairo_rectangle_int_t rect;
-  GtkAllocation allocation;
-  GtkWidget *popover;
-  GdkEvent *event;
-
-  event = gtk_get_current_event ();
-
-  if (event->type != GDK_BUTTON_PRESS)
-    return;
-
-  gdk_window_coords_to_parent (event->button.window,
-                               event->button.x, event->button.y,
-                               &event->button.x, &event->button.y);
-  gtk_widget_get_allocation (GTK_WIDGET (calendar), &allocation);
-  rect.x = event->button.x - allocation.x;
-  rect.y = event->button.y - allocation.y;
-  rect.width = rect.height = 1;
-
-  popover = create_popover (GTK_WIDGET (calendar),
-                            gtk_entry_new (),
-                            GTK_POS_BOTTOM);
-  gtk_popover_set_pointing_to (GTK_POPOVER (popover), &rect);
-
-  gtk_widget_show (popover);
-
-  gdk_event_free (event);
-}
-
-GtkWidget *
-do_popover (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  GtkWidget *popover, *box, *widget;
-
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 24);
-      gtk_container_set_border_width (GTK_CONTAINER (box), 24);
-      gtk_container_add (GTK_CONTAINER (window), box);
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      widget = gtk_toggle_button_new_with_label ("Button");
-      popover = create_popover (widget,
-                                gtk_label_new ("This popover does not grab input"),
-                                GTK_POS_TOP);
-      gtk_popover_set_modal (GTK_POPOVER (popover), FALSE);
-      g_signal_connect (widget, "toggled",
-                        G_CALLBACK (toggle_changed_cb), popover);
-      gtk_container_add (GTK_CONTAINER (box), widget);
-
-      widget = gtk_entry_new ();
-      popover = create_complex_popover (widget, GTK_POS_TOP);
-      gtk_entry_set_icon_from_icon_name (GTK_ENTRY (widget),
-                                         GTK_ENTRY_ICON_PRIMARY, "edit-find");
-      gtk_entry_set_icon_from_icon_name (GTK_ENTRY (widget),
-                                         GTK_ENTRY_ICON_SECONDARY, "edit-clear");
-
-      g_signal_connect (widget, "icon-press",
-                        G_CALLBACK (entry_icon_press_cb), popover);
-      g_signal_connect (widget, "size-allocate",
-                        G_CALLBACK (entry_size_allocate_cb), popover);
-      gtk_container_add (GTK_CONTAINER (box), widget);
-
-      widget = gtk_calendar_new ();
-      g_signal_connect (widget, "day-selected",
-                        G_CALLBACK (day_selected_cb), NULL);
-      gtk_container_add (GTK_CONTAINER (box), widget);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
--- a/demos/gtk-demo/popover.ui
+++ b/demos/gtk-demo/popover.ui
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Wed Nov 13 16:45:55 2013 -->
-<interface>
-  <!-- interface-requires gtk+ 3.10 -->
-  <object class="GtkListStore" id="liststore1">
-    <columns>
-      <!-- column-name Name -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Item 1</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Item 2</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Item 3</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Item 4</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Item 5</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Item 6</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Item 7</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Item 8</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Item 9</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Item 10</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkBox" id="box">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">6</property>
-        <child>
-          <object class="GtkEntry" id="entry1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="primary_icon_name">edit-find</property>
-            <property name="secondary_icon_name">edit-clear</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="shadow_type">in</property>
-            <child>
-              <object class="GtkTreeView" id="treeview1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="vexpand">True</property>
-                <property name="model">liststore1</property>
-                <property name="headers_visible">False</property>
-                <property name="enable_search">False</property>
-                <property name="search_column">2</property>
-                <child internal-child="selection">
-                  <object class="GtkTreeSelection" id="treeview-selection1"/>
-                </child>
-                <child>
-                  <object class="GtkTreeViewColumn" id="column1">
-                    <child>
-                      <object class="GtkCellRendererText" id="cellrenderer1"/>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
--- a/demos/gtk-demo/revealer.c
+++ b/demos/gtk-demo/revealer.c
@@ -18,8 +18,6 @@ change_direction (GtkRevealer *revealer)
  gtk_revealer_set_reveal_child (revealer, !revealed);
 }

-static guint timeout = 0;
-
 static gboolean
 reveal_one (gpointer data)
 {
@@ -35,15 +33,11 @@ reveal_one (gpointer data)
                    G_CALLBACK (change_direction), NULL);
  count++;

-  if (count >= 9)
-    {
-      timeout = 0;
-      return FALSE;
-    }
-  else
-    return TRUE;
+  return count < 9;
 }

+static guint timeout = 0;
+
 static void
 response_cb (GtkWidget *dialog,
             gint       response_id,
--- a/demos/gtk-demo/textscroll.c
+++ b/demos/gtk-demo/textscroll.c
@@ -116,7 +116,7 @@ setup_scroll (GtkTextView *textview,
    {
      /* If we want to scroll to the end, including horizontal scrolling,
       * then we just create a mark with right gravity at the end of the
-       * buffer. It will stay at the end unless explicitly moved with
+       * buffer. It will stay at the end unless explicitely moved with
       * gtk_text_buffer_move_mark.
       */
      gtk_text_buffer_create_mark (buffer, "end", &iter, FALSE);
@@ -129,7 +129,7 @@ setup_scroll (GtkTextView *textview,
      /* If we want to scroll to the bottom, but not scroll horizontally,
       * then an end mark won't do the job. Just create a mark so we can
       * use it with gtk_text_view_scroll_mark_onscreen, we'll position it
-       * explicitly when needed. Use left gravity so the mark stays where
+       * explicitely when needed. Use left gravity so the mark stays where
       * we put it after inserting new text.
       */
      gtk_text_buffer_create_mark (buffer, "scroll", &iter, TRUE);
--- a/demos/pixbuf-demo/pixbuf-demo.c
+++ b/demos/pixbuf-demo/pixbuf-demo.c
@@ -195,6 +195,7 @@ main (int argc, char **argv)
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);

 	gtk_widget_set_size_request (window, back_width, back_height);
+        gtk_window_set_resizable (GTK_WINDOW (window), FALSE);

 	g_signal_connect (window, "destroy",
 			  G_CALLBACK (destroy_cb), NULL);
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -163,47 +163,6 @@ update_pulse_time (GtkAdjustment *adjustment, GtkWidget *widget)
    }
 }

-static guint pulse_entry_id = 0;
-
-static gboolean
-pulse_entry (GtkEntry *entry)
-{
-  gtk_entry_progress_pulse (entry);
-
-  pulse_entry_id = g_timeout_add (100, (GSourceFunc)pulse_entry, entry);
-
-  return G_SOURCE_REMOVE;
-}
-
-static void
-on_entry_icon_release (GtkEntry            *entry,
-                       GtkEntryIconPosition icon_pos,
-                       GdkEvent            *event,
-                       gpointer             user_data)
-{
-  static int num = 0;
-
-  if (icon_pos != GTK_ENTRY_ICON_SECONDARY)
-    return;
-
-  num++;
-
-  if (num % 3 == 0)
-    {
-      if (pulse_entry_id > 0)
-        g_source_remove (pulse_entry_id);
-      gtk_entry_set_progress_fraction (entry, 0);
-    }
-  else if (num % 3 == 1)
-    gtk_entry_set_progress_fraction (entry, 0.25);
-  else if (num % 3 == 2)
-    {
-      gtk_entry_set_progress_pulse_step (entry, 0.1);
-      pulse_entry (entry);
-    }
-
-}
-
 static void
 startup (GApplication *app)
 {
@@ -233,8 +192,6 @@ activate (GApplication *app)

  builder = gtk_builder_new ();
  gtk_builder_add_from_resource (builder, "/ui/widget-factory.ui", NULL);
-  gtk_builder_add_callback_symbol (builder, "on_entry_icon_release", (GCallback)on_entry_icon_release);
-  gtk_builder_connect_signals (builder, NULL);

  window = (GtkWindow *)gtk_builder_get_object (builder, "window");
  gtk_application_add_window (GTK_APPLICATION (app), window);
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -117,7 +117,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
            <property name="valign">center</property>
            <property name="can_focus">False</property>
            <property name="menu_model">gear_menu</property>
-            <property name="use_popover">True</property>
            <style>
              <class name="image-button"/>
            </style>
@@ -140,6 +139,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="orientation">vertical</property>
+        <property name="border-width">10</property>
        <child>
          <object class="GtkStack" id="toplevel_stack">
            <property name="visible">True</property>
@@ -147,7 +147,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
              <object class="GtkBox" id="page1">
                <property name="visible">True</property>
                <property name="orientation">vertical</property>
-                <property name="border-width">10</property>
                <property name="spacing">10</property>
                <child>
                  <object class="GtkBox" id="box2">
@@ -207,9 +206,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                            <property name="visible">True</property>
                            <property name="can_focus">True</property>
                            <property name="invisible_char">•</property>
-                            <property name="placeholder-text" translatable="yes">Click icon to change mode</property>
-                            <property name="secondary_icon_name">view-refresh-symbolic</property>
-                            <signal name="icon-release" handler="on_entry_icon_release" swapped="no"/>
+                            <property name="text" translatable="yes">entry</property>
                          </object>
                          <packing>
                            <property name="expand">False</property>
@@ -1753,9 +1750,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                    <child>
                      <object class="GtkFrame" id="page2frame">
                        <property name="visible">True</property>
-                        <style>
-                          <class name="app-notification"/>
-                        </style>
+                        <property name="margin-top">2</property>
                        <child>
                          <object class="GtkBox" id="page2box">
                            <property name="visible">True</property>
@@ -1775,7 +1770,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                            <child>
                              <object class="GtkButton" id="page2dismiss">
                                <property name="visible">True</property>
-                                <property name="relief">none</property>
                                <child>
                                  <object class="GtkImage" id="page2dismissi">
                                    <property name="visible">True</property>
@@ -1797,7 +1791,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                    <property name="column-homogeneous">True</property>
                    <property name="row-spacing">6</property>
                    <property name="column-spacing">6</property>
-                    <property name="border-width">16</property>
+                    <property name="border-width">6</property>
                    <child>
                      <object class="GtkBox" id="page2box1">
                        <property name="visible">True</property>
@@ -1818,23 +1812,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                            <property name="adjustment">adjustment1</property>
                          </object>
                        </child>
-                        <child>
-                          <object class="GtkVolumeButton">
-                            <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
-                            <property name="valign">center</property>
-                            <property name="use-symbolic">True</property>
-                            <property name="value">.5</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkVolumeButton">
-                            <property name="orientation">horizontal</property>
-                            <property name="valign">center</property>
-                            <property name="use-symbolic">True</property>
-                            <property name="value">.5</property>
-                          </object>
-                        </child>
                      </object>
                      <packing>
                        <property name="left-attach">0</property>
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -48,7 +48,7 @@ AM_CPPFLAGS = 			\
 GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-3.la $(GDK_DEP_LIBS)

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

 # Extra SGML files that are included by DOC_MAIN_SGML_FILE
 content_files = 		\
--- a/docs/reference/gdk/gdk3-overrides.txt
+++ b/docs/reference/gdk/gdk3-overrides.txt
@@ -13,18 +13,3 @@
 <NAME>GDK_WINDOWING_WIN32</NAME>
 #define GDK_WINDOWING_WIN32
 </MACRO>
-
-<MACRO>
-<NAME>GDK_WINDOWING_QUARTZ</NAME>
-#define GDK_WINDOWING_QUARTZ
-</MACRO>
-
-<MACRO>
-<NAME>GDK_WINDOWING_WAYLAND</NAME>
-#define GDK_WINDOWING_WAYLAND
-</MACRO>
-
-<MACRO>
-<NAME>GDK_DISABLE_DEPRECATION_WARNINGS</NAME>
-#define GDK_DISABLE_DEPRECATION_WARNINGS
-</MACRO>
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -463,7 +463,6 @@ gdk_window_get_pointer
 gdk_window_get_device_position
 gdk_window_get_device_position_double
 GdkModifierType
-GdkModifierIntent
 gdk_window_get_parent
 gdk_window_get_toplevel
 gdk_window_get_children
@@ -736,7 +735,6 @@ GdkTimeCoord
 gdk_device_get_axis
 gdk_device_list_axes
 gdk_device_get_axis_value
-gdk_device_get_last_event_window

 <SUBSECTION Standard>
 GDK_TYPE_AXIS_USE
@@ -1164,7 +1162,8 @@ 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_xdg_shell
+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

--- a/docs/reference/gdk/gdk3.types
+++ b/docs/reference/gdk/gdk3.types
@@ -7,7 +7,6 @@ gdk_device_manager_get_type
 gdk_display_get_type
 gdk_display_manager_get_type
 gdk_drag_context_get_type
-gdk_frame_clock_get_type
 gdk_keymap_get_type
 gdk_screen_get_type
 gdk_visual_get_type
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -112,7 +112,6 @@ AM_CPPFLAGS = \
 	-I$(top_builddir) 	\
 	-I$(top_builddir)/gdk	\
 	-DGTK_ENABLE_BROKEN	\
-	-Wno-deprecated-declarations \
 	$(GTK_DEBUG_FLAGS)	\
 	$(GTK_DEP_CFLAGS)

@@ -126,7 +125,7 @@ GTKDOC_LIBS = \


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

 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =					\
@@ -145,7 +144,6 @@ content_files =					\
 	osx.sgml				\
 	broadway.xml				\
 	wayland.xml				\
-	mir.xml					\
 	question_index.sgml			\
 	resources.sgml				\
 	text_widget.sgml			\
--- a/docs/reference/gtk/building.sgml
+++ b/docs/reference/gtk/building.sgml
@@ -394,11 +394,6 @@ How to compile GTK+ itself
            <arg choice="plain">--disable-wayland-backend</arg>
          </group>
          <sbr/>
-          <group>
-            <arg choice="plain">--enable-mir-backend</arg>
-            <arg choice="plain">--disable-mir-backend</arg>
-          </group>
-          <sbr/>
          <group>
            <arg choice="plain">--enable-introspection=[no/auto/yes]</arg>
          </group>
@@ -600,10 +595,8 @@ How to compile GTK+ itself
          <systemitem>--disable-quartz-backend</systemitem>,
          <systemitem>--enable-broadway-backend</systemitem>,
          <systemitem>--disable-broadway-backend</systemitem>,
-          <systemitem>--enable-wayland-backend</systemitem>,
-          <systemitem>--disable-wayland-backend</systemitem>
-          <systemitem>--enable-mir-backend</systemitem>, and
-          <systemitem>--disable-mir-backend</systemitem></title>
+          <systemitem>--enable-wayland-backend</systemitem>, and
+          <systemitem>--disable-wayland-backend</systemitem></title>

        <para>
          Enables specific backends for GDK.  If none of these options
--- a/docs/reference/gtk/getting_started.xml
+++ b/docs/reference/gtk/getting_started.xml
@@ -419,7 +419,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
        <para>(<ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application2/exampleappwin.c">full source</ulink>)</para>
      </informalexample>

-      <para>You may have noticed that we used the <literal>_from_resource(<!-- -->)</literal> variant
+      <para>You may have noticed that we used the _from_resource() variant
      of the function that sets a template. Now we need to use GLib's resource
      functionality to include the ui file in the binary. This is commonly
      done by listing all resources in a .gresource.xml file, such as this:
@@ -456,10 +456,10 @@ example_app_window_class_init (ExampleAppWindowClass *class)

      <para>To this end, we add a private struct to our application
      window subclass and keep a reference to the #GtkStack there.
-      The gtk_widget_class_bind_template_child_private() function
-      arranges things so that after instantiating the template, the
-      @stack member of the private struct will point to the widget of
-      the same name from the template.</para>
+      The gtk_widget_class_bind_child() function arranges things so
+      that after instantiating the template, the @stack member of
+      the private struct will point to the widget of the same name
+      from the template.</para>

      <informalexample>
        <programlisting><![CDATA[
@@ -605,16 +605,12 @@ example_app_startup (GApplication *app)
 {
  GtkBuilder *builder;
  GMenuModel *app_menu;
-  const gchar *quit_accels[2] = { "&lt;Ctrl&gt;Q", NULL };

  G_APPLICATION_CLASS (example_app_parent_class)->startup (app);

  g_action_map_add_action_entries (G_ACTION_MAP (app),
                                   app_entries, G_N_ELEMENTS (app_entries),
                                   app);
-  gtk_application_set_accels_for_action (GTK_APPLICATION (app),
-                                         "app.quit",
-                                         quit_accels);

  builder = gtk_builder_new_from_resource ("/org/gtk/exampleapp/app-menu.ui");
  app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"));
@@ -637,7 +633,7 @@ example_app_class_init (ExampleAppClass *class)
      <para>Our preferences menu item does not do anything yet,
      but the Quit menu item is fully functional. Note that it
      can also be activated by the usual Ctrl-Q shortcut. The
-      shortcut was added with gtk_application_set_accels_for_action().
+      shortcut was specified in the ui file.
      </para>

      <para>The application menu looks like this:</para>
@@ -724,7 +720,7 @@ example_app_window_init (ExampleAppWindow *win)
        <programlisting><xi:include href="../../../../examples/application6/exampleappprefs.c" parse="text"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
      </informalexample>

-      <para>Now we revisit the <literal>preferences_activated(<!-- -->)</literal> function in our
+      <para>Now we revisit the preferences_activated() function in our
      application class, and make it open a new preference dialog.</para>

      <informalexample>
@@ -867,8 +863,8 @@ example_app_window_init (ExampleAppWindow *win)
        <programlisting><xi:include href="../../../../examples/application8/gears-menu.ui" parse="text"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
      </informalexample>

-      <para>To connect the menuitem to the show-words setting, we use
-      a #GAction corresponding to the given #GSettings key.</para>
+      <para>To connect the menuitem to the show-words setting,
+      we use a #GSettingsAction.</para>

      <informalexample>
        <programlisting><![CDATA[
@@ -986,8 +982,9 @@ example_app_window_init (ExampleAppWindow *win)
        <programlisting><xi:include href="../../../../examples/application10/window.ui" parse="text"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
      </informalexample>

-      <para>A small extra bonus of using a header bar is that we get
-      a fallback application menu for free. Here is how the
+      <para>A small extra refinement that we have added here is to allow
+      the header bar to provide a fallback application menu, by setting
+      the show-fallback-app-menu property to TRUE. Here is how the
      application now looks, if this fallback is used.</para>

      <informalfigure>
--- a/docs/reference/gtk/glossary.xml
+++ b/docs/reference/gtk/glossary.xml
@@ -196,7 +196,9 @@
 	A widget that does not have a GdkWindow of its own on which to
 	draw its contents, but rather shares its <glossterm
 	linkend="parent">parent's</glossterm>.  This can be tested with
-	the gtk_widget_get_has_window() function.
+	the gtk_widget_get_has_window() function.  See
+	<xref linkend="window-no-window-widgets"/> for a detailed
+	description of this flag.
      </para>
    </glossdef>
  </glossentry>
@@ -235,7 +237,8 @@
      </para>

      <para>
-	Note that when a #GtkWidget creates a window in its #GtkWidget::realize
+	Note that when a widget creates a window in its <link
+	linkend="gtkwidget-realize"><methodname>::realize()</methodname></link>
 	handler, it does not actually show the window.  That is, the
 	window's structure is just created in memory.  The widget
 	actually shows the window when it gets <glossterm
@@ -283,7 +286,7 @@
      <para>
        A style encapsulates what GTK+ needs to know in order to draw
        a widget. Styles can be modified with 
-        <link linkend="gtk3-Resource-Files">resource files</link>.
+        <link linkend="gtk-Resource-Files">resource files</link>.
      </para>
    </glossdef>
  </glossentry>
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -56,14 +56,14 @@

    <chapter id="WindowWidgets">
      <title>Windows</title>
-      <xi:include href="xml/gtkwindow.xml" />
      <xi:include href="xml/gtkdialog.xml" />
      <xi:include href="xml/gtkmessagedialog.xml" />
      <xi:include href="xml/gtkaboutdialog.xml" />
      <xi:include href="xml/gtkassistant.xml" />
+      <xi:include href="xml/gtkwindow.xml" />
+      <xi:include href="xml/gtkwindowgroup.xml" />
      <xi:include href="xml/gtkinvisible.xml" />
      <xi:include href="xml/gtkoffscreenwindow.xml" />
-      <xi:include href="xml/gtkwindowgroup.xml" />
    </chapter>

    <chapter id="LayoutContainers">
@@ -117,7 +117,7 @@
    </chapter>

    <chapter id="NumericEntry">
-      <title>Numeric and Text Data Entry</title>
+      <title>Numeric/Text Data Entry</title>
      <xi:include href="xml/gtkentry.xml" />
      <xi:include href="xml/gtkentrybuffer.xml" />
      <xi:include href="xml/gtkentrycompletion.xml" />
@@ -190,11 +190,10 @@
      <xi:include href="xml/gtkmenutoolbutton.xml" />
      <xi:include href="xml/gtktoggletoolbutton.xml" />
      <xi:include href="xml/gtkradiotoolbutton.xml" />
-      <xi:include href="xml/gtkpopover.xml" />
    </chapter>

    <chapter id="SelectorWidgets">
-      <title>Selector Widgets and Dialogs</title>
+      <title>Selectors (Color/File/Font)</title>
      <xi:include href="xml/gtkcolorchooser.xml" />
      <xi:include href="xml/gtkcolorbutton.xml" />
      <xi:include href="xml/gtkcolorchooserwidget.xml" />
@@ -394,7 +393,6 @@
    <xi:include href="osx.sgml" />
    <xi:include href="broadway.xml" />
    <xi:include href="wayland.xml" />
-    <xi:include href="mir.xml" />
  </part>

  <xi:include href="glossary.xml" />
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -55,7 +55,6 @@ gtk_about_dialog_get_type
 <FILE>gtkaccelgroup</FILE>
 <TITLE>Keyboard Accelerators</TITLE>
 GtkAccelGroup
-GtkAccelGroupClass
 gtk_accel_group_new
 gtk_accel_group_connect
 gtk_accel_group_connect_by_path
@@ -84,6 +83,7 @@ gtk_accelerator_set_default_mod_mask
 gtk_accelerator_get_default_mod_mask

 <SUBSECTION Standard>
+GtkAccelGroupClass
 GTK_TYPE_ACCEL_GROUP
 GTK_ACCEL_GROUP
 GTK_IS_ACCEL_GROUP
@@ -178,7 +178,6 @@ gtk_accessible_get_type
 <FILE>gtkaction</FILE>
 <TITLE>GtkAction</TITLE>
 GtkAction
-GtkActionClass
 gtk_action_new
 gtk_action_get_name
 gtk_action_is_sensitive
@@ -229,6 +228,7 @@ GTK_ACTION_CLASS
 GTK_IS_ACTION
 GTK_IS_ACTION_CLASS
 GTK_ACTION_GET_CLASS
+GtkActionClass
 <SUBSECTION Private>
 gtk_action_get_type
 GtkActionPrivate
@@ -259,7 +259,6 @@ gtk_activatable_get_type
 <FILE>gtkactiongroup</FILE>
 <TITLE>GtkActionGroup</TITLE>
 GtkActionGroup
-GtkActionGroupClass
 gtk_action_group_new
 gtk_action_group_get_name
 gtk_action_group_get_sensitive
@@ -293,6 +292,7 @@ GTK_ACTION_GROUP_CLASS
 GTK_IS_ACTION_GROUP
 GTK_IS_ACTION_GROUP_CLASS
 GTK_ACTION_GROUP_GET_CLASS
+GtkActionGroupClass
 <SUBSECTION Private>
 gtk_action_group_get_type
 GtkActionGroupPrivate
@@ -335,7 +335,6 @@ gtk_adjustment_get_type
 <FILE>gtkalignment</FILE>
 <TITLE>GtkAlignment</TITLE>
 GtkAlignment
-GtkAlignmentClass
 gtk_alignment_new
 gtk_alignment_set
 gtk_alignment_get_padding
@@ -356,7 +355,6 @@ GtkAlignmentPrivate
 <FILE>gtkassistant</FILE>
 <TITLE>GtkAssistant</TITLE>
 GtkAssistant
-GtkAssistantClass
 gtk_assistant_new
 gtk_assistant_get_current_page
 gtk_assistant_set_current_page
@@ -387,6 +385,7 @@ gtk_assistant_next_page
 gtk_assistant_previous_page

 <SUBSECTION Standard>
+GtkAssistantClass
 GTK_TYPE_ASSISTANT
 GTK_ASSISTANT
 GTK_ASSISTANT_CLASS
@@ -420,7 +419,6 @@ gtk_arrow_get_type
 <FILE>gtkaspectframe</FILE>
 <TITLE>GtkAspectFrame</TITLE>
 GtkAspectFrame
-GtkAspectFrameClass
 gtk_aspect_frame_new
 gtk_aspect_frame_set
 <SUBSECTION Standard>
@@ -439,7 +437,6 @@ gtk_aspect_frame_get_type
 <FILE>gtkbbox</FILE>
 <TITLE>GtkButtonBox</TITLE>
 GtkButtonBox
-GtkButtonBoxClass
 gtk_button_box_new
 gtk_button_box_get_layout
 gtk_button_box_get_child_secondary
@@ -463,7 +460,6 @@ gtk_button_box_get_type
 <FILE>gtkbin</FILE>
 <TITLE>GtkBin</TITLE>
 GtkBin
-GtkBinClass
 gtk_bin_get_child
 <SUBSECTION Standard>
 GTK_BIN
@@ -481,7 +477,6 @@ gtk_bin_get_type
 <FILE>gtkbox</FILE>
 <TITLE>GtkBox</TITLE>
 GtkBox
-GtkBoxClass
 gtk_box_new
 gtk_box_pack_start
 gtk_box_pack_end
@@ -494,8 +489,6 @@ gtk_box_query_child_packing
 gtk_box_set_child_packing
 gtk_box_get_baseline_position
 gtk_box_set_baseline_position
-gtk_box_get_center_widget
-gtk_box_set_center_widget
 <SUBSECTION Standard>
 GTK_BOX
 GTK_IS_BOX
@@ -512,9 +505,7 @@ gtk_box_get_type
 <FILE>gtklistbox</FILE>
 <TITLE>GtkListBox</TITLE>
 GtkListBox
-GtkListBoxClass
 GtkListBoxRow
-GtkListBoxRowClass
 GtkListBoxFilterFunc
 GtkListBoxSortFunc
 GtkListBoxUpdateHeaderFunc
@@ -560,7 +551,6 @@ GTK_TYPE_LIST_BOX_ROW

 <SUBSECTION Private>
 gtk_list_box_get_type
-gtk_list_box_row_get_type
 </SECTION>

 <SECTION>
@@ -610,6 +600,9 @@ 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_set_application
@@ -619,7 +612,13 @@ gtk_builder_value_from_string
 gtk_builder_value_from_string_type
 GTK_BUILDER_WARN_INVALID_CHILD_TYPE
 GTK_BUILDER_ERROR
-
+<SUBSECTION>
+gtk_builder_new
+gtk_builder_add_from_file
+gtk_builder_add_from_resource
+gtk_builder_add_from_string
+gtk_builder_add_objects_from_file
+gtk_builder_add_objects_from_string
 <SUBSECTION Standard>
 GTK_BUILDER
 GTK_IS_BUILDER
@@ -637,7 +636,6 @@ GtkBuilderPrivate
 <FILE>gtkbutton</FILE>
 <TITLE>GtkButton</TITLE>
 GtkButton
-GtkButtonClass
 gtk_button_new
 gtk_button_new_with_label
 gtk_button_new_with_mnemonic
@@ -741,7 +739,6 @@ gtk_check_button_get_type
 <SECTION>
 <FILE>gtkcheckmenuitem</FILE>
 GtkCheckMenuItem
-GtkCheckMenuItemClass
 <TITLE>GtkCheckMenuItem</TITLE>
 gtk_check_menu_item_new
 gtk_check_menu_item_new_with_label
@@ -823,7 +820,6 @@ gtk_hsv_get_type
 <FILE>gtkcolorsel</FILE>
 <TITLE>GtkColorSelection</TITLE>
 GtkColorSelection
-GtkColorSelectionClass
 gtk_color_selection_new
 gtk_color_selection_set_has_opacity_control
 gtk_color_selection_get_has_opacity_control
@@ -881,7 +877,6 @@ gtk_color_selection_dialog_get_type
 <FILE>gtkcombobox</FILE>
 <TITLE>GtkComboBox</TITLE>
 GtkComboBox
-GtkComboBoxClass
 gtk_combo_box_new
 gtk_combo_box_new_with_entry
 gtk_combo_box_new_with_model
@@ -968,7 +963,6 @@ gtk_combo_box_text_get_type
 <FILE>gtkcontainer</FILE>
 <TITLE>GtkContainer</TITLE>
 GtkContainer
-GtkContainerClass
 GTK_IS_RESIZE_CONTAINER
 GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID
 gtk_container_add
@@ -1024,7 +1018,6 @@ gtk_container_get_type
 <FILE>gtkdialog</FILE>
 <TITLE>GtkDialog</TITLE>
 GtkDialog
-GtkDialogClass
 GtkDialogFlags
 GtkResponseType
 gtk_dialog_new
@@ -1040,7 +1033,6 @@ gtk_dialog_get_response_for_widget
 gtk_dialog_get_widget_for_response
 gtk_dialog_get_action_area
 gtk_dialog_get_content_area
-gtk_dialog_get_header_bar
 <SUBSECTION>
 gtk_alternative_dialog_button_order
 gtk_dialog_set_alternative_button_order
@@ -1120,12 +1112,10 @@ gtk_entry_get_activates_default
 gtk_entry_get_has_frame
 gtk_entry_get_inner_border
 gtk_entry_get_width_chars
-gtk_entry_get_max_width_chars
 gtk_entry_set_activates_default
 gtk_entry_set_has_frame
 gtk_entry_set_inner_border
 gtk_entry_set_width_chars
-gtk_entry_set_max_width_chars
 gtk_entry_get_invisible_char
 gtk_entry_set_alignment
 gtk_entry_get_alignment
@@ -1273,7 +1263,6 @@ gtk_entry_completion_get_type
 <FILE>gtkeventbox</FILE>
 <TITLE>GtkEventBox</TITLE>
 GtkEventBox
-GtkEventBoxClass
 gtk_event_box_new
 gtk_event_box_set_above_child
 gtk_event_box_get_above_child
@@ -1294,7 +1283,6 @@ gtk_event_box_get_type
 <FILE>gtkexpander</FILE>
 <TITLE>GtkExpander</TITLE>
 GtkExpander
-GtkExpanderClass
 gtk_expander_new
 gtk_expander_new_with_mnemonic
 gtk_expander_set_expanded
@@ -1422,7 +1410,6 @@ GtkFileChooserDialogPrivate
 <FILE>gtkfilechooserwidget</FILE>
 <TITLE>GtkFileChooserWidget</TITLE>
 GtkFileChooserWidget
-GtkFileChooserWidgetClass
 gtk_file_chooser_widget_new
 <SUBSECTION Standard>
 GTK_FILE_CHOOSER_WIDGET
@@ -1440,7 +1427,6 @@ GtkFileChooserWidgetPrivate
 <FILE>gtkfilechooserbutton</FILE>
 <TITLE>GtkFileChooserButton</TITLE>
 GtkFileChooserButton
-GtkFileChooserButtonClass
 gtk_file_chooser_button_new
 gtk_file_chooser_button_new_with_dialog
 gtk_file_chooser_button_get_title
@@ -1625,10 +1611,10 @@ gtk_font_chooser_get_type
 <FILE>gtkfontchooserwidget</FILE>
 <TITLE>GtkFontChooserWidget</TITLE>
 GtkFontChooserWidget
-GtkFontChooserWidgetClass
 gtk_font_chooser_widget_new

 <SUBSECTION Standard>
+GtkFontChooserWidgetClass
 GTK_TYPE_FONT_CHOOSER_WIDGET
 GTK_FONT_CHOOSER_WIDGET
 GTK_FONT_CHOOSER_WIDGET_CLASS
@@ -1645,10 +1631,10 @@ gtk_font_chooser_widget_get_type
 <FILE>gtkfontchooserdialog</FILE>
 <TITLE>GtkFontChooserDialog</TITLE>
 GtkFontChooserDialog
-GtkFontChooserDialogClass
 gtk_font_chooser_dialog_new

 <SUBSECTION Standard>
+GtkFontChooserDialogClass
 GTK_TYPE_FONT_CHOOSER_DIALOG
 GTK_FONT_CHOOSER_DIALOG
 GTK_FONT_CHOOSER_DIALOG_CLASS
@@ -1665,7 +1651,6 @@ gtk_font_chooser_dialog_get_type
 <FILE>gtkframe</FILE>
 <TITLE>GtkFrame</TITLE>
 GtkFrame
-GtkFrameClass
 gtk_frame_new
 gtk_frame_set_label
 gtk_frame_set_label_widget
@@ -1691,7 +1676,6 @@ gtk_frame_get_type
 <FILE>gtkhandlebox</FILE>
 <TITLE>GtkHandleBox</TITLE>
 GtkHandleBox
-GtkHandleBoxClass
 gtk_handle_box_new
 gtk_handle_box_set_shadow_type
 gtk_handle_box_set_handle_position
@@ -1947,7 +1931,6 @@ GtkImageGIconData
 <FILE>gtkimagemenuitem</FILE>
 <TITLE>GtkImageMenuItem</TITLE>
 GtkImageMenuItem
-GtkImageMenuItemClass
 gtk_image_menu_item_set_image
 gtk_image_menu_item_get_image
 gtk_image_menu_item_new
@@ -1960,6 +1943,7 @@ gtk_image_menu_item_get_always_show_image
 gtk_image_menu_item_set_always_show_image
 gtk_image_menu_item_set_accel_group
 <SUBSECTION Standard>
+GtkImageMenuItemClass
 GTK_IMAGE_MENU_ITEM
 GTK_IMAGE_MENU_ITEM_CLASS
 GTK_IMAGE_MENU_ITEM_GET_CLASS
@@ -2151,7 +2135,6 @@ gtk_layout_get_type
 <FILE>gtklinkbutton</FILE>
 <TITLE>GtkLinkButton</TITLE>
 GtkLinkButton
-GtkLinkButtonClass
 gtk_link_button_new
 gtk_link_button_new_with_label
 gtk_link_button_get_uri
@@ -2166,6 +2149,7 @@ GTK_IS_LINK_BUTTON
 GTK_LINK_BUTTON_CLASS
 GTK_IS_LINK_BUTTON_CLASS
 GTK_LINK_BUTTON_GET_CLASS
+GtkLinkButtonClass
 <SUBSECTION Private>
 GtkLinkButtonPrivate
 gtk_link_button_get_type
@@ -2246,12 +2230,8 @@ GtkMenuButton
 gtk_menu_button_new
 gtk_menu_button_set_popup
 gtk_menu_button_get_popup
-gtk_menu_button_set_popover
-gtk_menu_button_get_popover
 gtk_menu_button_set_menu_model
 gtk_menu_button_get_menu_model
-gtk_menu_button_set_use_popover
-gtk_menu_button_get_use_popover
 gtk_menu_button_set_direction
 gtk_menu_button_get_direction
 gtk_menu_button_set_align_widget
@@ -2272,7 +2252,6 @@ gtk_menu_button_get_type
 <FILE>gtkmenuitem</FILE>
 <TITLE>GtkMenuItem</TITLE>
 GtkMenuItem
-GtkMenuItemClass
 gtk_menu_item_new
 gtk_menu_item_new_with_label
 gtk_menu_item_new_with_mnemonic
@@ -2541,7 +2520,6 @@ gtk_numerable_icon_get_type
 <FILE>gtkoffscreenwindow</FILE>
 <TITLE>GtkOffscreenWindow</TITLE>
 GtkOffscreenWindow
-GtkOffscreenWindowClass
 gtk_offscreen_window_new
 gtk_offscreen_window_get_surface
 gtk_offscreen_window_get_pixbuf
@@ -2601,8 +2579,6 @@ gtk_places_sidebar_list_shortcuts
 gtk_places_sidebar_get_nth_bookmark
 gtk_places_sidebar_get_show_connect_to_server
 gtk_places_sidebar_set_show_connect_to_server
-gtk_places_sidebar_get_local_only
-gtk_places_sidebar_set_local_only
 <SUBSECTION Standard>
 GTK_PLACES_SIDEBAR
 GTK_IS_PLACES_SIDEBAR
@@ -3102,7 +3078,6 @@ gtk_scrollbar_get_type
 <FILE>gtkscrolledwindow</FILE>
 <TITLE>GtkScrolledWindow</TITLE>
 GtkScrolledWindow
-GtkScrolledWindowClass
 gtk_scrolled_window_new
 gtk_scrolled_window_get_hadjustment
 gtk_scrolled_window_get_vadjustment
@@ -3143,7 +3118,6 @@ GtkScrolledWindowPrivate
 <FILE>gtksearchbar</FILE>
 <TITLE>GtkSearchBar</TITLE>
 GtkSearchBar
-GtkSearchBarClass
 gtk_search_bar_new
 gtk_search_bar_connect_entry
 gtk_search_bar_get_search_mode
@@ -3199,9 +3173,9 @@ GtkSeparatorPrivate
 <FILE>gtkseparatormenuitem</FILE>
 <TITLE>GtkSeparatorMenuItem</TITLE>
 GtkSeparatorMenuItem
-GtkSeparatorMenuItemClass
 gtk_separator_menu_item_new
 <SUBSECTION Standard>
+GtkSeparatorMenuItemClass
 GTK_SEPARATOR_MENU_ITEM
 GTK_SEPARATOR_MENU_ITEM_CLASS
 GTK_SEPARATOR_MENU_ITEM_GET_CLASS
@@ -3496,7 +3470,6 @@ gtk_table_get_type
 <FILE>gtktearoffmenuitem</FILE>
 <TITLE>GtkTearoffMenuItem</TITLE>
 GtkTearoffMenuItem
-GtkTearoffMenuItemClass
 gtk_tearoff_menu_item_new
 <SUBSECTION Standard>
 GTK_TEAROFF_MENU_ITEM
@@ -3994,7 +3967,6 @@ GtkToolbarPrivate
 <FILE>gtktoolitem</FILE>
 <TITLE>GtkToolItem</TITLE>
 GtkToolItem
-GtkToolItemClass
 gtk_tool_item_new
 gtk_tool_item_set_homogeneous
 gtk_tool_item_get_homogeneous
@@ -4041,7 +4013,6 @@ GtkToolItemPrivate
 <FILE>gtkseparatortoolitem</FILE>
 <TITLE>GtkSeparatorToolItem</TITLE>
 GtkSeparatorToolItem
-GtkSeparatorToolItemClass
 gtk_separator_tool_item_new
 gtk_separator_tool_item_set_draw
 gtk_separator_tool_item_get_draw
@@ -4063,7 +4034,6 @@ GtkSeparatorToolItemPrivate
 <FILE>gtktoolbutton</FILE>
 <TITLE>GtkToolButton</TITLE>
 GtkToolButton
-GtkToolButtonClass
 gtk_tool_button_new
 gtk_tool_button_new_from_stock
 gtk_tool_button_set_label
@@ -4096,7 +4066,6 @@ GtkToolButtonPrivate
 <FILE>gtkmenutoolbutton</FILE>
 <TITLE>GtkMenuToolButton</TITLE>
 GtkMenuToolButton
-GtkMenuToolButtonClass
 gtk_menu_tool_button_new
 gtk_menu_tool_button_new_from_stock
 gtk_menu_tool_button_set_menu
@@ -4105,6 +4074,7 @@ gtk_menu_tool_button_set_arrow_tooltip_text
 gtk_menu_tool_button_set_arrow_tooltip_markup

 <SUBSECTION Standard>
+GtkMenuToolButtonClass
 GTK_TYPE_MENU_TOOL_BUTTON
 GTK_MENU_TOOL_BUTTON
 GTK_MENU_TOOL_BUTTON_CLASS
@@ -4144,13 +4114,13 @@ gtk_radio_tool_button_get_type
 <FILE>gtktoggletoolbutton</FILE>
 <TITLE>GtkToggleToolButton</TITLE>
 GtkToggleToolButton
-GtkToggleToolButtonClass
 gtk_toggle_tool_button_new
 gtk_toggle_tool_button_new_from_stock
 gtk_toggle_tool_button_set_active
 gtk_toggle_tool_button_get_active

 <SUBSECTION Standard>
+GtkToggleToolButtonClass
 GTK_TYPE_TOGGLE_TOOL_BUTTON
 GTK_TOGGLE_TOOL_BUTTON
 GTK_TOGGLE_TOOL_BUTTON_CLASS
@@ -4167,7 +4137,6 @@ GtkToggleToolButtonPrivate
 <FILE>gtktoolitemgroup</FILE>
 <TITLE>GtkToolItemGroup</TITLE>
 GtkToolItemGroup
-GtkToolItemGroupClass
 gtk_tool_item_group_get_collapsed
 gtk_tool_item_group_get_drop_item
 gtk_tool_item_group_get_ellipsize
@@ -4187,6 +4156,7 @@ gtk_tool_item_group_set_label_widget
 gtk_tool_item_group_set_header_relief

 <SUBSECTION Standard>
+GtkToolItemGroupClass
 GTK_TOOL_ITEM_GROUP
 GTK_IS_TOOL_ITEM_GROUP
 GTK_TYPE_TOOL_ITEM_GROUP
@@ -4203,7 +4173,6 @@ gtk_tool_item_group_get_type
 <FILE>gtktoolpalette</FILE>
 <TITLE>GtkToolPalette</TITLE>
 GtkToolPalette
-GtkToolPaletteClass
 gtk_tool_palette_new
 gtk_tool_palette_get_exclusive
 gtk_tool_palette_set_exclusive
@@ -4229,6 +4198,7 @@ gtk_tool_palette_get_hadjustment
 gtk_tool_palette_get_vadjustment

 <SUBSECTION Standard>
+GtkToolPaletteClass
 GTK_TOOL_PALETTE
 GTK_IS_TOOL_PALETTE
 GTK_TYPE_TOOL_PALETTE
@@ -4401,7 +4371,6 @@ gtk_tree_model_filter_get_type
 <FILE>gtktreeselection</FILE>
 <TITLE>GtkTreeSelection</TITLE>
 GtkTreeSelection
-GtkTreeSelectionClass
 GtkTreeSelectionFunc
 GtkTreeSelectionForeachFunc
 gtk_tree_selection_set_mode
@@ -4441,8 +4410,6 @@ gtk_tree_selection_get_type
 GtkTreeSortable
 GtkTreeSortableIface
 GtkTreeIterCompareFunc
-GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID
-GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID
 gtk_tree_sortable_sort_column_changed
 gtk_tree_sortable_get_sort_column_id
 gtk_tree_sortable_set_sort_column_id
@@ -4711,6 +4678,7 @@ gtk_tree_view_get_tooltip_column
 gtk_tree_view_set_tooltip_column

 <SUBSECTION Standard>
+GtkTreeSelectionClass
 GTK_TREE_VIEW
 GTK_IS_TREE_VIEW
 GTK_TYPE_TREE_VIEW
@@ -4725,7 +4693,6 @@ gtk_tree_view_get_type
 <FILE>gtkcellview</FILE>
 <TITLE>GtkCellView</TITLE>
 GtkCellView
-GtkCellViewClass
 gtk_cell_view_new
 gtk_cell_view_new_with_context
 gtk_cell_view_new_with_text
@@ -4743,6 +4710,7 @@ gtk_cell_view_get_draw_sensitive
 gtk_cell_view_set_fit_model
 gtk_cell_view_get_fit_model
 <SUBSECTION Standard>
+GtkCellViewClass
 GTK_TYPE_CELL_VIEW
 GTK_CELL_VIEW
 GTK_CELL_VIEW_CLASS
@@ -5187,7 +5155,6 @@ gtk_vbox_get_type
 <FILE>gtkviewport</FILE>
 <TITLE>GtkViewport</TITLE>
 GtkViewport
-GtkViewportClass
 gtk_viewport_new
 gtk_viewport_get_hadjustment
 gtk_viewport_get_vadjustment
@@ -5429,6 +5396,7 @@ gtk_widget_get_display
 gtk_widget_get_root_window
 gtk_widget_get_screen
 gtk_widget_has_screen
+gtk_widget_get_scale_factor
 gtk_widget_get_size_request
 gtk_widget_set_child_visible
 gtk_widget_set_size_request
@@ -5497,6 +5465,9 @@ 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

@@ -5586,7 +5557,6 @@ gtk_requisition_get_type
 <FILE>gtkwindow</FILE>
 <TITLE>GtkWindow</TITLE>
 GtkWindow
-GtkWindowClass
 gtk_window_new
 gtk_window_set_title
 gtk_window_set_wmclass
@@ -5610,7 +5580,6 @@ gtk_window_set_hide_titlebar_when_maximized
 gtk_window_set_screen
 gtk_window_get_screen
 gtk_window_is_active
-gtk_window_is_maximized
 gtk_window_has_toplevel_focus
 gtk_window_list_toplevels
 gtk_window_add_mnemonic
@@ -6218,7 +6187,6 @@ gtk_gradient_get_type
 <TITLE>GtkStyle</TITLE>
 GTK_STYLE_ATTACHED
 GtkStyle
-GtkStyleClass
 gtk_style_new
 gtk_style_copy
 gtk_style_attach
@@ -6259,6 +6227,7 @@ GtkRcProperty
 GtkRcPropertyParser

 <SUBSECTION Standard>
+GtkStyleClass
 GTK_STYLE
 GTK_IS_STYLE
 GTK_TYPE_STYLE
@@ -6274,7 +6243,6 @@ GtkThemeEngine
 <FILE>gtkrc</FILE>
 <TITLE>Resource Files</TITLE>
 GtkRcStyle
-GtkRcStyleClass
 GtkRcFlags
 GtkRcTokenType
 gtk_rc_scanner_new
@@ -6302,6 +6270,7 @@ gtk_rc_style_new
 gtk_rc_style_copy

 <SUBSECTION Standard>
+GtkRcStyleClass
 GTK_RC_STYLE
 GTK_IS_RC_STYLE
 GTK_TYPE_RC_STYLE
@@ -6500,7 +6469,6 @@ GtkAccelFlags
 GtkArrowPlacement
 GtkArrowType
 GtkAttachOptions
-GtkBaselinePosition
 GtkButtonBoxStyle
 GtkCornerType
 GtkDeleteType
@@ -6661,7 +6629,6 @@ GTK_STOCK_ZOOM_OUT
 <TITLE>GtkIconTheme</TITLE>
 GtkIconInfo
 GtkIconTheme
-GtkIconThemeClass
 GtkIconLookupFlags
 GTK_ICON_THEME_ERROR
 GtkIconThemeError
@@ -6714,6 +6681,7 @@ gtk_icon_info_get_attach_points
 gtk_icon_info_get_display_name
 gtk_icon_info_is_symbolic
 <SUBSECTION Standard>
+GtkIconThemeClass
 GTK_ICON_THEME
 GTK_IS_ICON_THEME
 GTK_TYPE_ICON_THEME
@@ -6733,7 +6701,6 @@ gtk_icon_theme_error_quark
 <TITLE>Themeable Stock Images</TITLE>
 GtkIconSource
 GtkIconFactory
-GtkIconFactoryClass
 GtkIconSet
 GtkIconSize
 gtk_icon_source_copy
@@ -6780,6 +6747,7 @@ gtk_icon_source_set_size_wildcarded
 gtk_icon_source_set_state
 gtk_icon_source_set_state_wildcarded
 <SUBSECTION Standard>
+GtkIconFactoryClass
 GTK_TYPE_ICON_FACTORY
 GTK_ICON_FACTORY
 GTK_IS_ICON_FACTORY
@@ -6800,7 +6768,6 @@ gtk_icon_source_get_type
 <FILE>gtkprintoperation</FILE>
 <TITLE>High-level Printing API</TITLE>
 GtkPrintOperation
-GtkPrintOperationClass
 GtkPrintStatus
 GtkPrintOperationAction
 GtkPrintOperationResult
@@ -6857,6 +6824,7 @@ GTK_IS_PRINT_OPERATION_PREVIEW
 GTK_PRINT_OPERATION_PREVIEW
 GTK_PRINT_OPERATION_PREVIEW_GET_IFACE
 GTK_TYPE_PRINT_OPERATION_PREVIEW
+GtkPrintOperationClass
 GtkPrintOperationPreviewIface

 <SUBSECTION Private>
@@ -7260,7 +7228,6 @@ gtk_print_job_get_type
 <FILE>gtkpagesetupunixdialog</FILE>
 <TITLE>GtkPageSetupUnixDialog</TITLE>
 GtkPageSetupUnixDialog
-GtkPageSetupUnixDialogClass
 gtk_page_setup_unix_dialog_new
 gtk_page_setup_unix_dialog_set_page_setup
 gtk_page_setup_unix_dialog_get_page_setup
@@ -7268,6 +7235,7 @@ gtk_page_setup_unix_dialog_set_print_settings
 gtk_page_setup_unix_dialog_get_print_settings

 <SUBSECTION Standard>
+GtkPageSetupUnixDialogClass
 GTK_TYPE_PAGE_SETUP_UNIX_DIALOG
 GTK_PAGE_SETUP_UNIX_DIALOG
 GTK_PAGE_SETUP_UNIX_DIALOG_CLASS
@@ -7306,7 +7274,6 @@ gtk_test_widget_wait_for_draw
 <FILE>filesystem</FILE>
 <TITLE>Filesystem utilities</TITLE>
 GtkMountOperation
-GtkMountOperationClass
 gtk_mount_operation_new
 gtk_mount_operation_is_showing
 gtk_mount_operation_set_parent
@@ -7315,6 +7282,7 @@ gtk_mount_operation_set_screen
 gtk_mount_operation_get_screen
 gtk_show_uri
 <SUBSECTION Standard>
+GtkMountOperationClass
 GTK_IS_MOUNT_OPERATION
 GTK_IS_MOUNT_OPERATION_CLASS
 GTK_MOUNT_OPERATION
@@ -7351,7 +7319,6 @@ gtk_orientable_get_type
 <FILE>gtkapplication</FILE>
 <TITLE>GtkApplication</TITLE>
 GtkApplication
-GtkApplicationClass

 gtk_application_new
 gtk_application_add_window
@@ -7380,6 +7347,7 @@ gtk_application_get_accels_for_action
 gtk_application_set_accels_for_action

 <SUBSECTION Standard>
+GtkApplicationClass
 GTK_TYPE_APPLICATION
 GTK_APPLICATION
 GTK_APPLICATION_CLASS
@@ -7395,13 +7363,13 @@ GtkApplicationPrivate
 <FILE>gtkapplicationwindow</FILE>
 <TITLE>GtkApplicationWindow</TITLE>
 GtkApplicationWindow
-GtkApplicationWindowClass
 gtk_application_window_new
 gtk_application_window_set_show_menubar
 gtk_application_window_get_show_menubar
 gtk_application_window_get_id

 <SUBSECTION Standard>
+GtkApplicationWindowClass
 GTK_TYPE_APPLICATION_WINDOW
 GTK_APPLICATION_WINDOW
 GTK_APPLICATION_WINDOW_CLASS
@@ -7444,7 +7412,6 @@ GTK_TYPE_ACTIONABLE
 <FILE>gtkgrid</FILE>
 <TITLE>GtkGrid</TITLE>
 GtkGrid
-GtkGridClass
 gtk_grid_new
 gtk_grid_attach
 gtk_grid_attach_next_to
@@ -7468,6 +7435,7 @@ gtk_grid_get_row_baseline_position
 gtk_grid_set_row_baseline_position

 <SUBSECTION Standard>
+GtkGridClass
 GTK_TYPE_GRID
 GTK_GRID
 GTK_GRID_CLASS
@@ -7483,12 +7451,12 @@ gtk_grid_get_type
 <SECTION>
 <FILE>gtkswitch</FILE>
 GtkSwitch
-GtkSwitchClass
 gtk_switch_new
 gtk_switch_set_active
 gtk_switch_get_active

 <SUBSECTION Standard>
+GtkSwitchClass
 GTK_TYPE_SWITCH
 GTK_SWITCH
 GTK_SWITCH_CLASS
@@ -7531,7 +7499,6 @@ GTK_IS_APP_CHOOSER_ONLINE_PK_CLASS
 <FILE>gtkappchooserbutton</FILE>
 <TITLE>GtkAppChooserButton</TITLE>
 GtkAppChooserButton
-GtkAppChooserButtonClass
 gtk_app_chooser_button_new
 gtk_app_chooser_button_append_custom_item
 gtk_app_chooser_button_append_separator
@@ -7544,6 +7511,7 @@ gtk_app_chooser_button_get_heading
 gtk_app_chooser_button_set_heading

 <SUBSECTION Standard>
+GtkAppChooserButtonClass
 GTK_TYPE_APP_CHOOSER_BUTTON
 GTK_APP_CHOOSER_BUTTON
 GTK_APP_CHOOSER_BUTTON_CLASS
@@ -7560,7 +7528,6 @@ gtk_app_chooser_button_get_type
 <FILE>gtkappchooserdialog</FILE>
 <TITLE>GtkAppChooserDialog</TITLE>
 GtkAppChooserDialog
-GtkAppChooserDialogClass
 gtk_app_chooser_dialog_new
 gtk_app_chooser_dialog_new_for_content_type
 gtk_app_chooser_dialog_get_widget
@@ -7568,6 +7535,7 @@ gtk_app_chooser_dialog_set_heading
 gtk_app_chooser_dialog_get_heading

 <SUBSECTION Standard>
+GtkAppChooserDialogClass
 GTK_TYPE_APP_CHOOSER_DIALOG
 GTK_APP_CHOOSER_DIALOG
 GTK_APP_CHOOSER_DIALOG_CLASS
@@ -7584,7 +7552,6 @@ gtk_app_chooser_dialog_get_type
 <FILE>gtkappchooserwidget</FILE>
 <TITLE>GtkAppChooserWidget</TITLE>
 GtkAppChooserWidget
-GtkAppChooserWidgetClass
 gtk_app_chooser_widget_new
 gtk_app_chooser_widget_set_show_default
 gtk_app_chooser_widget_get_show_default
@@ -7600,6 +7567,7 @@ gtk_app_chooser_widget_set_default_text
 gtk_app_chooser_widget_get_default_text

 <SUBSECTION Standard>
+GtkAppChooserWidgetClass
 GTK_TYPE_APP_CHOOSER_WIDGET
 GTK_APP_CHOOSER_WIDGET
 GTK_APP_CHOOSER_WIDGET_CLASS
@@ -7616,13 +7584,13 @@ gtk_app_chooser_widget_get_type
 <FILE>gtklockbutton</FILE>
 <TITLE>GtkLockButton</TITLE>
 GtkLockButton
-GtkLockButtonClass

 gtk_lock_button_new
 gtk_lock_button_get_permission
 gtk_lock_button_set_permission

 <SUBSECTION Standard>
+GtkLockButtonClass
 GTK_TYPE_LOCK_BUTTON
 GTK_LOCK_BUTTON
 GTK_IS_LOCK_BUTTON
@@ -7638,7 +7606,6 @@ GtkLockButtonPrivate
 <FILE>gtkoverlay</FILE>
 <TITLE>GtkOverlay</TITLE>
 GtkOverlay
-GtkOverlayClass

 gtk_overlay_new
 gtk_overlay_add_overlay
@@ -7650,6 +7617,7 @@ GTK_OVERLAY_CLASS
 GTK_IS_OVERLAY
 GTK_IS_OVERLAY_CLASS
 GTK_OVERLAY_GET_CLASS
+GtkOverlayClass

 <SUBSECTION Private>
 gtk_overlay_get_type
@@ -7680,7 +7648,6 @@ gtk_color_chooser_get_type
 <FILE>gtkcolorchooserwidget</FILE>
 <TITLE>GtkColorChooserWidget</TITLE>
 GtkColorChooserWidget
-GtkColorChooserWidgetClass
 gtk_color_chooser_widget_new

 <SUBSECTION Standard>
@@ -7776,7 +7743,6 @@ GtkStack
 gtk_stack_new
 gtk_stack_add_named
 gtk_stack_add_titled
-gtk_stack_get_child_by_name
 gtk_stack_set_visible_child
 gtk_stack_get_visible_child
 gtk_stack_set_visible_child_name
@@ -7805,7 +7771,6 @@ gtk_stack_switcher_get_stack
 <FILE>gtkrevealer</FILE>
 <TITLE>GtkRevealer</TITLE>
 GtkRevealer
-GtkRevealerClass
 gtk_revealer_new
 gtk_revealer_get_reveal_child
 gtk_revealer_set_reveal_child
@@ -7865,20 +7830,3 @@ gtk_flow_box_child_get_index
 gtk_flow_box_child_is_selected
 gtk_flow_box_child_changed
 </SECTION>
-
-<SECTION>
-<FILE>gtkpopover</FILE>
-<TITLE>GtkPopover</TITLE>
-GtkPopover
-gtk_popover_new
-gtk_popover_new_from_model
-gtk_popover_bind_model
-gtk_popover_set_relative_to
-gtk_popover_get_relative_to
-gtk_popover_set_pointing_to
-gtk_popover_get_pointing_to
-gtk_popover_set_position
-gtk_popover_get_position
-gtk_popover_set_modal
-gtk_popover_get_modal
-</SECTION>
--- a/docs/reference/gtk/gtk3.types.in
+++ b/docs/reference/gtk/gtk3.types.in
@@ -126,7 +126,6 @@ gtk_paned_get_type
 gtk_paper_size_get_type
 gtk_places_sidebar_get_type
@ENABLE_ON_X11@gtk_plug_get_type
-gtk_popover_get_type
@DISABLE_ON_W32@gtk_printer_get_type
 gtk_print_context_get_type
@DISABLE_ON_W32@gtk_print_job_get_type
--- a/docs/reference/gtk/images/aboutdialog.png
+++ b/docs/reference/gtk/images/aboutdialog.png
--- a/docs/reference/gtk/images/accel-label.png
+++ b/docs/reference/gtk/images/accel-label.png
--- a/docs/reference/gtk/images/appchooserbutton.png
+++ b/docs/reference/gtk/images/appchooserbutton.png
--- a/docs/reference/gtk/images/appchooserdialog.png
+++ b/docs/reference/gtk/images/appchooserdialog.png
--- a/docs/reference/gtk/images/assistant.png
+++ b/docs/reference/gtk/images/assistant.png
--- a/docs/reference/gtk/images/button.png
+++ b/docs/reference/gtk/images/button.png
--- a/docs/reference/gtk/images/check-button.png
+++ b/docs/reference/gtk/images/check-button.png
--- a/docs/reference/gtk/images/color-button.png
+++ b/docs/reference/gtk/images/color-button.png
--- a/docs/reference/gtk/images/colorchooser.png
+++ b/docs/reference/gtk/images/colorchooser.png
--- a/docs/reference/gtk/images/combo-box-entry.png
+++ b/docs/reference/gtk/images/combo-box-entry.png
--- a/docs/reference/gtk/images/combo-box-text.png
+++ b/docs/reference/gtk/images/combo-box-text.png
--- a/docs/reference/gtk/images/combo-box.png
+++ b/docs/reference/gtk/images/combo-box.png
--- a/docs/reference/gtk/images/entry.png
+++ b/docs/reference/gtk/images/entry.png
--- a/docs/reference/gtk/images/file-button.png
+++ b/docs/reference/gtk/images/file-button.png
--- a/docs/reference/gtk/images/filechooser.png
+++ b/docs/reference/gtk/images/filechooser.png
--- a/docs/reference/gtk/images/flow-box.png
+++ b/docs/reference/gtk/images/flow-box.png
--- a/docs/reference/gtk/images/font-button.png
+++ b/docs/reference/gtk/images/font-button.png
--- a/docs/reference/gtk/images/fontchooser.png
+++ b/docs/reference/gtk/images/fontchooser.png
--- a/docs/reference/gtk/images/frame.png
+++ b/docs/reference/gtk/images/frame.png
--- a/docs/reference/gtk/images/getting-started-app1.png
+++ b/docs/reference/gtk/images/getting-started-app1.png
--- a/docs/reference/gtk/images/getting-started-app10.png
+++ b/docs/reference/gtk/images/getting-started-app10.png
--- a/docs/reference/gtk/images/getting-started-app2.png
+++ b/docs/reference/gtk/images/getting-started-app2.png
--- a/docs/reference/gtk/images/getting-started-app3.png
+++ b/docs/reference/gtk/images/getting-started-app3.png
--- a/docs/reference/gtk/images/getting-started-app4.png
+++ b/docs/reference/gtk/images/getting-started-app4.png
--- a/docs/reference/gtk/images/getting-started-app6.png
+++ b/docs/reference/gtk/images/getting-started-app6.png
--- a/docs/reference/gtk/images/getting-started-app7.png
+++ b/docs/reference/gtk/images/getting-started-app7.png
--- a/docs/reference/gtk/images/getting-started-app8.png
+++ b/docs/reference/gtk/images/getting-started-app8.png
--- a/docs/reference/gtk/images/getting-started-app9.png
+++ b/docs/reference/gtk/images/getting-started-app9.png
--- a/docs/reference/gtk/images/headerbar.png
+++ b/docs/reference/gtk/images/headerbar.png
--- a/docs/reference/gtk/images/icon-view.png
+++ b/docs/reference/gtk/images/icon-view.png
--- a/docs/reference/gtk/images/image.png
+++ b/docs/reference/gtk/images/image.png
--- a/Show More
+++ b/Show More