a11y: Include window management buttons in headerbar

filechooser: keep file selected after being renamed

See merge request GNOME/gtk!1052

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/gtk/gtk-3-24:v1
+image: registry.gitlab.gnome.org/gnome/gtk/gtk-3-24:v2
 
 stages:
   - build
@@ -7,12 +7,38 @@ cache:
   paths:
     - _ccache/
 
-build:
+fedora-autotools:
   stage: build
   script:
-   - bash -x ./.gitlab-ci/test-docker.sh
+   - bash -x ./.gitlab-ci/test-docker-autotools.sh
 
-msys2-mingw32:
+fedora-meson:
+  stage: build
+  script:
+   - bash -x ./.gitlab-ci/test-docker-meson.sh
+  artifacts:
+    when: always
+    name: "gtk3-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
+    paths:
+      - "_build/meson-logs"
+
+msys2-mingw32-meson:
+  variables:
+    MSYSTEM: "MINGW32"
+    CHERE_INVOKING: "yes"
+  stage: build
+  tags:
+    - win32
+  script:
+    - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
+    - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2-meson.sh"
+  artifacts:
+    when: always
+    name: "gtk3-%CI_JOB_NAME%-%CI_COMMIT_REF_NAME%"
+    paths:
+      - "_build/meson-logs"
+
+msys2-mingw32-autotools:
   when: manual
   variables:
     MSYSTEM: "MINGW32"
@@ -22,4 +48,4 @@ msys2-mingw32:
     - win32
   script:
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
-    - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
+    - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2-autotools.sh"

.gitlab-ci/Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:28
+FROM fedora:29
 
 RUN dnf -y install \
     adwaita-icon-theme \
@@ -10,6 +10,7 @@ RUN dnf -y install \
     ccache \
     colord-devel \
     cups-devel \
+    dbus-x11 \
     fribidi-devel \
     gcc \
     gcc-c++ \
@@ -23,8 +24,10 @@ RUN dnf -y install \
     graphene-devel \
     gtk-doc \
     hicolor-icon-theme \
+    iso-codes \
     itstool \
     json-glib-devel \
+    libcloudproviders-devel \
     libepoxy-devel \
     libmount-devel \
     librsvg2 \
@@ -42,12 +45,19 @@ RUN dnf -y install \
     mesa-libEGL-devel \
     mesa-libwayland-egl-devel \
     meson \
+    ninja-build \
     pango-devel \
+    python3 \
+    python3-pip \
+    python3-wheel \
     redhat-rpm-config \
+    rest-devel \
+    sassc \
     vulkan-devel \
     wayland-devel \
     wayland-protocols-devel \
-    xorg-x11-server-Xvfb
+    xorg-x11-server-Xvfb \
+    && dnf clean all
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}

.gitlab-ci/run-docker.sh

@@ -8,7 +8,7 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/gtk/gtk-3-24:v1"
+TAG="registry.gitlab.gnome.org/gnome/gtk/gtk-3-24:v2"
 
 # HOST_USER_ID gets used to create a user with the same ID so that files
 # created in the mounted volume have the same owner

.gitlab-ci/test-docker-autotools.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+mkdir -p _ccache
+export CCACHE_BASEDIR="$(pwd)"
+export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
+
+mkdir _build
+cd _build
+../autogen.sh \
+    --enable-cloudproviders \
+    --enable-broadway-backend \
+    --enable-xinerama \
+    --enable-gtk-doc
+make -j8

.gitlab-ci/test-docker-meson.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+
+mkdir -p _ccache
+export CCACHE_BASEDIR="$(pwd)"
+export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
+
+export PATH="${HOME}/.local/bin:${PATH}"
+python3 -m pip install --user meson==0.49.2
+
+meson \
+    -Dgtk_doc=true \
+    -Dman=true \
+    -Dbroadway_backend=true \
+    -Dxinerama=yes \
+    -Dprint_backends="file,lpr,test,cloudprint,cups" \
+    _build
+
+cd _build
+ninja
+
+xvfb-run -a -s "-screen 0 1024x768x24" \
+    meson test \
+        --timeout-multiplier 4 \
+        --print-errorlogs \
+        --suite=gtk+-3.0 \
+        --no-suite=gtk+-3.0:a11y
+
+ninja gail-libgail-util3-doc gdk3-doc gtk3-doc

.gitlab-ci/test-docker.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -e
-
-mkdir -p _ccache
-export CCACHE_BASEDIR="$(pwd)"
-export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-
-./autogen.sh
-make -j8

.gitlab-ci/test-msys2-autotools.sh

@@ -14,7 +14,6 @@ pacman --noconfirm -Suy
 # Install the required packages
 pacman --noconfirm -S --needed \
     base-devel \
-    git \
     mingw-w64-$MSYS2_ARCH-toolchain \
     mingw-w64-$MSYS2_ARCH-ccache \
     mingw-w64-$MSYS2_ARCH-pkg-config \

.gitlab-ci/test-msys2-meson.sh

@@ -0,0 +1,49 @@
+#!/bin/bash
+
+set -e
+
+if [[ "$MSYSTEM" == "MINGW32" ]]; then
+    export MSYS2_ARCH="i686"
+else
+    export MSYS2_ARCH="x86_64"
+fi
+
+# Update everything
+pacman --noconfirm -Suy
+
+# Install the required packages
+pacman --noconfirm -S --needed \
+    mingw-w64-$MSYS2_ARCH-toolchain \
+    mingw-w64-$MSYS2_ARCH-ccache \
+    mingw-w64-$MSYS2_ARCH-pkg-config \
+    mingw-w64-$MSYS2_ARCH-gobject-introspection \
+    mingw-w64-$MSYS2_ARCH-adwaita-icon-theme \
+    mingw-w64-$MSYS2_ARCH-atk \
+    mingw-w64-$MSYS2_ARCH-cairo \
+    mingw-w64-$MSYS2_ARCH-gdk-pixbuf2 \
+    mingw-w64-$MSYS2_ARCH-glib2 \
+    mingw-w64-$MSYS2_ARCH-json-glib \
+    mingw-w64-$MSYS2_ARCH-libepoxy \
+    mingw-w64-$MSYS2_ARCH-pango \
+    mingw-w64-$MSYS2_ARCH-shared-mime-info \
+    mingw-w64-$MSYS2_ARCH-meson \
+    mingw-w64-$MSYS2_ARCH-ninja \
+    mingw-w64-$MSYS2_ARCH-gtk-doc \
+    mingw-w64-$MSYS2_ARCH-sassc
+
+mkdir -p _ccache
+export CCACHE_BASEDIR="$(pwd)"
+export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
+
+# Build
+ccache --zero-stats
+ccache --show-stats
+
+meson \
+    -Dman=true \
+    -Dbroadway_backend=true \
+    _build
+
+ninja -C _build
+
+ccache --show-stats

Makefile.am

@@ -22,7 +22,13 @@ EXTRA_DIST +=			\
 	sanitize-la.sh		\
 	po/README.translators	\
 	po/po2tbl.sed.in	\
-	make-pot
+	make-pot	\
+	meson_options.txt	\
+	meson.build	\
+	po/meson.build	\
+	po-properties/meson.build	\
+	build-aux/meson/post-install.py	\
+	config.h.meson
 
 MAINTAINERCLEANFILES = \
 	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \

NEWS

@@ -1,3 +1,169 @@
+Overview of Changes in GTK+ 3.24.10
+===================================
+
+* Make gtk_widget_get_action_group behave as documented
+
+* Make gdk_screen_get_monitor_plug_name works as before
+
+* Adwaita:
+  - Update infobar look
+  - Fix some issues with submenus and popovers
+
+* Wayland: Use the xdg-output protocol
+
+* Fix build issues around cups
+
+* Quartz: Build fixes
+
+* treeview: Bring the pixel cache back, since its removal
+  was causing problems in some applications
+
+* Various documentation improvements
+
+* Translation updates:
+ Slovenian
+ Croatian
+ Spanish
+
+
+Overview of Changes in GTK+ 3.24.9
+==================================
+
+* GTK can now be built with the meson build system
+
+* Quartz:
+ - Build fixes
+ - Fix a crash with DND
+
+* Win32:
+ - Enable GLES via libANGLE
+ - Fix preedit window placement on hi-dpi screens
+
+* Wayland:
+ - Support the xdg-output protocol for correct
+   monitor sizes with scaled displays
+ - Fix handling of cursor hotspots that was reading
+   uninitialized memory
+ - Update tablet cursors when scale changes
+
+* CSS:
+ - Use multiple font-family values
+
+* Emoji:
+ - Populate the Emoji chooser incrementally
+
+* Printing:
+ - Require CUPS 1.7
+
+* Scrolling:
+ - Add a gtk-overlay-scrolling setting that can be
+   used to force traditional (non-overlay) scrollbars
+
+* GtkTreeView:
+ - Update rubberband rectangles more often
+ - Remove the pixel cache, to avoid the redraw
+   issues that it causes
+
+* Tooling:
+ - Support sysprof profiling
+
+* Themes:
+ - Adwaita: Small tweaks to the theme refresh
+ - Adwaita: Update treeview progress bars
+ - HighContrast: Improve notebook tabs
+
+* Translation updates:
+ Brazilian Portuguese
+ Friulian
+ Hungarian
+ Indonesian
+ Italian
+ Lithuanian
+
+
+Overview of Changes in GTK+ 3.24.8
+==================================
+
+* Color editor: don't warn if editing is cancelled
+
+* Always redraw on allocate - not doing so is
+
+  not safe when any widget can have a background
+
+* Use GLSL 3.30 for shaders
+
+* Quartz: add a preliminary GdkGLContext implementation
+
+* Win32: Fix a bug that prevented storing printer driver prefs
+
+* Wayland: properly place window menus
+
+* GtkApplication: support session state changes in
+  sandboxes, using the inhibit portal
+
+* Fix a problem with autostart notification
+
+* Places: Show loop devices as reported by gvfs
+
+* Translation updates:
+  Brazilian Portuguese
+  Catalan
+  Czech
+  German
+  Hungarian
+  Indonesian
+  Italian
+  Polish
+  Romanian
+  Spanish
+  Swedish
+  Turkish
+
+
+Overview of Changes in GTK+ 3.24.7
+==================================
+
+* Undeprecate gtk_window_present
+
+
+Overview of Changes in GTK+ 3.24.6
+==================================
+
+* Link against fribidi
+
+* Broadway: Ensure focus on click
+
+* Fix some compiler warnings
+
+* Improve menu positioning with move-to-rect
+
+* Improve activation of the onscreen keyboard
+
+* Use C locale when generating code
+
+* Treeview: Make sure separator nodes have height > 0
+
+* theme
+ - Fix some inconsistences for radii
+
+* quartz:
+ - Full-screen only normal windows
+ - Restore key-window switching when changing windows
+ - Change monitor geometry calculation
+ - search: Limit the cop of Spotlight search
+
+* Translation updates:
+ Basque
+ Dutch
+ Finnish
+ Icelandic
+ Kazakh
+ Korean
+ Romanian
+ Serbian
+ Slovenian
+
+
 Overview of Changes in GTK+ 3.24.5
 ==================================
 

README.win32

@@ -181,6 +181,96 @@ instance the makefile.msc files might not produce identically named
 DLLs and import libraries as the "autoconfiscated" makefiles and
 libtool do. If this bothers you, you will have to fix the makefiles.
 
+3) Using Meson (for Visual Studio and MinGW builds)
+---
+
+Meson can now be used to build GTK+-3.x with either MinGW or Visual Studio.
+You will need the following items in addition to all the dependencies
+listed above:
+
+- Python 3.5 or later
+- Meson build system, 0.48.0 or later
+- Ninja (if not using the Visual Studio project generator for
+         Visual Studio 2010, 2015, 2017, 2019)
+- CMake (optional, used for dependency searching)
+- pkg-config (optional, or some compatible tool, highly recommended)
+
+For all Windows builds, note that unless -Dbuiltin_immodules=no is specified,
+the input modules (immodules) are built directly into the GTK DLL.
+
+For building with Meson using Visual Studio, do the following:
+
+Create an empty build directory somewhere that is on the same drive
+as the source tree, and launch the Visual Studio command prompt that
+matches the build configuration (Visual Studio version and architecture),
+and run the following:
+
+- Ensure that both the installation directory of Python and its script
+  directory is in your PATH, as well as the Ninja, CMake and pkg-config
+  executables (if used).  If a pkg-config compatible drop-in replacement
+  tool is being used, ensure that PKG_CONFIG is set to point to the
+  executable of that tool as well.
+
+- For non-GNOME dependencies (such as Cairo and Harfbuzz), where pkg-config
+  files or CMake files could not be properly located, set INCLUDE and LIB
+  to ensure that their header files and .lib files can be found respectively.
+  The DLLs of those dependencies should also be in the PATH during the build
+  as well, especially if introspection files are to be built.
+
+- For GNOME dependencies, the pkg-config files for those dependencies should
+  be searchable by pkg-config (or a compatible tool).  Verify this by running
+  $(PKG_CONFIG) --modversion <dependency>.
+
+- Run the following:
+  meson <path_to_directory_of_this_file> --buildtype=... --prefix=...,
+  where buildtype can be release, debugoptimized, debug or plain.  Please
+  refer to the Meson documentation for more details.  You may also wish to
+  pass in -Dbroadway_backend=true if building the Broadway GDK backend is
+  desired, and/or pass in -Dbuiltin_immodules=no to build the immodules as
+  standalone DLLs that can be loaded by GTK dynamically.  For Visual Studio
+  2010, 2015, 2017 and 2019 builds, you may pass in --backend=vs to generate
+  Visual Studio project files to be used to carry out the builds.
+
+If you are building with Visual Studio 2008, note the following items as well:
+
+- For x64 builds, the compiler may hang when building the certain files, due
+  to optimization issues in the compiler.  If this happens, use the Windows
+  Task Manager and terminate all cl.exe processes, and the build will fail
+  with the source files that did not finish compiling due to the hang.
+  Look for them in build.ninja in the build directory, and change their compiler
+  flag "/O2" to "/O1", and the compilation and linking should proceed normally.
+  At this time of writing, the following files are known to cause this hang:
+
+    gtk\gtkfilechoosernativewin32.c
+    gtk\gtkfilesystemmodel.c
+    gtk\gtktextsegment.c
+    gtk\gtktextbtree.c
+    gtk\gtkrbtree.c
+    testsuite\gtk\treemodel.c
+    testsuite\gtk\textbuffer.c
+    testsuite\gtk\rbtree.c
+    testsuite\gtk\icontheme.c
+
+- Upon running install (via "ninja install"), it is likely that
+  gtk-query-immodules-3.0.exe will fail to run as it cannot find msvcr90.dll or
+  msvcr90D.dll.  You can ignore this if you did not specify -Dbuiltin_immodules=no
+  when configuring via Meson.  If -Dbuiltin_immodules=no is specified, you need to
+  run the following after   embedding the manifests as outlined in the next point:
+
+    <gtk_install_prefix>\bin\gtk-query-immodules-3.0.exe > <gtk_install_prefix>\lib\gtk-3.0\3.0.0\immodules.cache
+
+- You will need to run the following upon completing install, from the build
+  directory in the Visual Studio 2008/SDK 6.0 command prompt (third line is not
+  needed unless -Dbuiltin_immodules=no is specified) so that the built binaries
+  can run:
+
+    for /r %f in (*.dll.manifest) do if exist <gtk_install_prefix>\bin\%~nf mt /manifest %f /outputresource:<gtk_install_prefix>\bin\%~nf;2
+    for /r %f in (*.exe.manifest) do if exist <gtk_install_prefix>\bin\%~nf mt /manifest %f /outputresource:<gtk_install_prefix>\bin\%~nf;1
+    for /r %f in (*.dll.manifest) do if exist <gtk_install_prefix>\lib\gtk-3.0\3.0.0\immodules\%~nf mt /manifest %f /outputresource:<gtk_install_prefix>\lib\gtk-3.0\3.0.0\immodules\%~nf;2
+
+- The more modern visual style for the print dialog is not applied for Visual
+  Studio 2008 builds.  Any solutions to this is really appreciated.
+
 Using GTK+ on Win32
 ===================
 

build-aux/meson/post-install.py

@@ -0,0 +1,46 @@
+#!/usr/bin/env python3
+
+import os
+import shutil
+import sys
+import subprocess
+
+if 'DESTDIR' not in os.environ:
+    gtk_api_version = sys.argv[1]
+    gtk_abi_version = sys.argv[2]
+    gtk_bindir = sys.argv[3]
+    gtk_libdir = sys.argv[4]
+    gtk_datadir = sys.argv[5]
+    gtk_query_immodules = os.path.join(gtk_bindir, 'gtk-query-immodules-' + gtk_api_version)
+    gtk_update_icon_cache = os.path.join(gtk_bindir, 'gtk-update-icon-cache')
+
+    gtk_moduledir = os.path.join(gtk_libdir, 'gtk-' + gtk_api_version, gtk_abi_version)
+    gtk_immodule_dir = os.path.join(gtk_moduledir, 'immodules')
+    gtk_printmodule_dir = os.path.join(gtk_moduledir, 'printbackends')
+
+    if os.name == 'nt':
+        for lib in ['gdk', 'gtk', 'gailutil']:
+            # Make copy for MSVC-built .lib files, e.g. xxx-3.lib->xxx-3.0.lib
+            installed_lib = os.path.join(gtk_libdir, lib + '-' + gtk_api_version.split('.')[0] + '.lib')
+            installed_lib_dst = os.path.join(gtk_libdir, lib + '-' + gtk_api_version + '.lib')
+            if os.path.isfile(installed_lib):
+                shutil.copyfile(installed_lib, installed_lib_dst)
+
+    print('Compiling GSettings schemas...')
+    subprocess.call(['glib-compile-schemas',
+                    os.path.join(gtk_datadir, 'glib-2.0', 'schemas')])
+
+    print('Updating icon cache...')
+    subprocess.call([gtk_update_icon_cache, '-q', '-t' ,'-f',
+                    os.path.join(gtk_datadir, 'icons', 'hicolor')])
+
+    print('Updating module cache for input methods...')
+    os.makedirs(gtk_immodule_dir, exist_ok=True)
+    immodule_cache_file = open(os.path.join(gtk_moduledir, 'immodules.cache'), 'w')
+    subprocess.call([gtk_query_immodules], stdout=immodule_cache_file)
+    immodule_cache_file.close()
+
+    # Untested!
+    print('Updating module cache for print backends...')
+    os.makedirs(gtk_printmodule_dir, exist_ok=True)
+    subprocess.call(['gio-querymodules', gtk_printmodule_dir])

build/Makefile-newvs.am

@@ -21,17 +21,17 @@ if MSVC_NO_TOOLSET_SET
 MSVC_TOOLSET = $(MSVC_VER)0
 endif
 
-%.sln:
+%.sln: $(top_builddir)/build/win32/vs10/Makefile
 	sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
 	sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
 	rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
 
-%.txt:
+%.txt: $(top_builddir)/build/win32/vs10/Makefile
 	sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
 	sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
 	rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
 
-%.vcxproj:
+%.vcxproj: $(top_builddir)/build/win32/vs10/Makefile
 	if test -e $(top_srcdir)/build/win32/vs10/$@; then \
 		sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
 	else \
@@ -45,7 +45,7 @@ endif
 		sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
 	fi
 
-%.vcxproj.filters:
+%.vcxproj.filters: $(top_builddir)/build/win32/vs10/Makefile
 	if test -e $(top_srcdir)/build/win32/vs10/$@; then \
 		cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
 	else \

build/Makefile.msvc-introspection

@@ -80,6 +80,7 @@ $(if $(or $(findstring --header-only,$($(_gir_name)_MSVC_SCANNERFLAGS)),
     $(error Need to define $(_gir_name)_MSVC_LIBS or $(_gir_name)_MSVC_PROGRAM))
 
 $(top_builddir)/build/win32/$(_gir_name)_list: Makefile
+	rm -f $(top_builddir)/build/win32/$(_gir_name)_list
 	for F in $(_gir_files_msvc); do \
 		case $$$$F in \
 		*.c|*.cpp|*.cc|*.cxx|*.h|*.hpp|*.hh|*.hxx) \

build/win32/Makefile.am

@@ -32,11 +32,17 @@ SUBDIRS =	\
 	vs11	\
 	vs12	\
 	vs14	\
-	vs15
+	vs15	\
+	vs16
 
 EXTRA_DIST +=	\
+	config-msvc.mak		\
+	config-msvc.mak.in		\
+	create-lists.bat	\
+	create-lists-msvc.mak		\
 	detectenv-msvc.mak		\
-	gentypefuncs.py			\
+	gen-gdkversionmacros-h.py	\
+	generate-msvc.mak	\
 	gtk-introspection-msvc.mak	\
 	introspection-msvc.mak		\
 	replace.py			\

build/win32/config-msvc.mak.in

@@ -0,0 +1,95 @@
+# NMake Makefile portion for enabling features for Windows builds
+
+!include detectenv-msvc.mak
+
+# Default prefix if not defined
+!ifndef PREFIX
+PREFIX=..\..\..\vs$(VSVER)\$(PLAT)
+!endif
+
+# Configurable paths to the various interpreters we need
+!ifndef PERL
+PERL = perl
+!endif
+
+!ifndef PYTHON
+PYTHON=python
+!endif
+
+# Path to the pkg-config tool, if not already in the PATH
+!if "$(PKG_CONFIG)" == ""
+PKG_CONFIG=pkg-config
+!endif
+
+# Configurable paths to the various scripts and tools that we are using
+!ifndef GLIB_MKENUMS
+GLIB_MKENUMS = $(PREFIX)\bin\glib-mkenums
+!endif
+
+!ifndef GLIB_GENMARSHAL
+GLIB_GENMARSHAL = $(PREFIX)\bin\glib-genmarshal
+!endif
+
+!ifndef GLIB_COMPILE_RESOURCES
+GLIB_COMPILE_RESOURCES = $(PREFIX)\bin\glib-compile-resources.exe
+!endif
+
+!ifndef GDBUS_CODEGEN
+GDBUS_CODEGEN = $(PREFIX)\bin\gdbus-codegen
+!endif
+
+# Please do not change anything beneath this line unless maintaining the NMake Makefiles
+GTK_VERSION = @GTK_VERSION@
+
+GDK_PREPROCESSOR_FLAGS =	\
+	/DG_LOG_USE_STRUCTURED=1	\
+	/DGDK_COMPILATION	\
+	/I..\..	\
+	/I..\..\gdk	\
+	/I..\..\gdk\win32
+
+GTK_PREPROCESSOR_FLAGS =	\
+	 /I..\..\gtk	\
+	 /I..\..\gdk	\
+	 /I..\..\gdk\win32	\
+	 /I..\..	\
+	 /I$(PREFIX)\include\gdk-pixbuf-2.0	\
+	 /I$(PREFIX)\include\pango-1.0	\
+	 /I$(PREFIX)\include\atk-1.0	\
+	 /I$(PREFIX)\include\cairo	\
+	 /I$(PREFIX)\include\gio-win32-2.0	\
+	 /I$(PREFIX)\include\glib-2.0	\
+	 /I$(PREFIX)\lib\glib-2.0\include	\
+	 /I$(PREFIX)\include	\
+	 /DHAVE_CONFIG_H	\
+	 /DG_DISABLE_SINGLE_INCLUDES	\
+	 /DATK_DISABLE_SINGLE_INCLUDES	\
+	 /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES	\
+	 /DGTK_DISABLE_SINGLE_INCLUDES	\
+	 /D_USE_MATH_DEFINES	\
+	 /DGTK_COMPILATION	\
+	 /DG_LOG_DOMAIN=\"Gtk\"	\
+	 /DGTK_HOST=\"i686-pc-vs$(VSVER)\"	\
+	 /DGTK_PRINT_BACKENDS=\"file\"	\
+	 /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	\
+	 /DGTK_LIBDIR=\"$(PREFIX:\=/)/lib\"	\
+	 /DGTK_DATADIR=\"$(PREFIX:\=/)/share\"	\
+	 /DGTK_DATA_PREFIX=\"$(PREFIX:\=/)\"	\
+	 /DGTK_SYSCONFDIR=\"$(PREFIX:\=/)/etc\"	\
+	 /DMULTIPRESS_CONFDIR=\"$(PREFIX:\=/)/etc/gtk-3.0\"	\
+	 /DMULTIPRESS_LOCALEDIR=\"$(PREFIX:\=/)/share/locale\"	\
+	 /DGTK_VERSION=\"$(GTK_VERSION)\"	\
+	 /DGTK_BINARY_VERSION=\"3.0.0\"	\
+	 /DGDK_DISABLE_DEPRECATED	\
+	 /DISOLATION_AWARE_ENABLED

build/win32/create-lists-msvc.mak

@@ -0,0 +1,101 @@
+# Convert the source listing to object (.obj) listing in
+# another NMake Makefile module, include it, and clean it up.
+# This is a "fact-of-life" regarding NMake Makefiles...
+# This file does not need to be changed unless one is maintaining the NMake Makefiles
+
+# For those wanting to add things here:
+# To add a list, do the following:
+# # $(description_of_list)
+# if [call create-lists.bat header $(makefile_snippet_file) $(variable_name)]
+# endif
+#
+# if [call create-lists.bat file $(makefile_snippet_file) $(file_name)]
+# endif
+#
+# if [call create-lists.bat footer $(makefile_snippet_file)]
+# endif
+# ... (repeat the if [call ...] lines in the above order if needed)
+# !include $(makefile_snippet_file)
+#
+# (add the following after checking the entries in $(makefile_snippet_file) is correct)
+# (the batch script appends to $(makefile_snippet_file), you will need to clear the file unless the following line is added)
+#!if [del /f /q $(makefile_snippet_file)]
+#!endif
+
+# In order to obtain the .obj filename that is needed for NMake Makefiles to build DLLs/static LIBs or EXEs, do the following
+# instead when doing 'if [call create-lists.bat file $(makefile_snippet_file) $(file_name)]'
+# (repeat if there are multiple $(srcext)'s in $(source_list), ignore any headers):
+# !if [for %c in ($(source_list)) do @if "%~xc" == ".$(srcext)" @call create-lists.bat file $(makefile_snippet_file) $(intdir)\%~nc.obj]
+#
+# $(intdir)\%~nc.obj needs to correspond to the rules added in build-rules-msvc.mak
+# %~xc gives the file extension of a given file, %c in this case, so if %c is a.cc, %~xc means .cc
+# %~nc gives the file name of a given file without extension, %c in this case, so if %c is a.cc, %~nc means a
+
+NULL=
+
+# For GDK resources
+
+!if [call create-lists.bat header resources_sources.mak GDK_RESOURCES]
+!endif
+
+!if [for %f in (..\..\gdk\resources\glsl\*.glsl) do @call create-lists.bat file resources_sources.mak %f]
+!endif
+
+!if [call create-lists.bat footer resources_sources.mak]
+!endif
+
+!if [call create-lists.bat header resources_sources.mak GTK_RESOURCES]
+!endif
+
+!if [for %f in (..\..\gtk\theme\Adwaita\gtk.css ..\..\gtk\theme\Adwaita\gtk-dark.css ..\..\gtk\theme\Adwaita\gtk-contained.css ..\..\gtk\theme\Adwaita\gtk-contained-dark.css) do @call create-lists.bat file resources_sources.mak %f]
+!endif
+
+!if [for %x in (png svg) do @(for %f in (..\..\gtk\theme\Adwaita\assets\*.%x) do @call create-lists.bat file resources_sources.mak %f)]
+!endif
+
+!if [for %f in (..\..\gtk\theme\HighContrast\gtk.css ..\..\gtk\theme\HighContrast\gtk-inverse.css ..\..\gtk\theme\HighContrast\gtk-contained.css ..\..\gtk\theme\HighContrast\gtk-contained-inverse.css) do @call create-lists.bat file resources_sources.mak %f]
+!endif
+
+!if [for %x in (png svg) do @(for %f in (..\..\gtk\theme\HighContrast\assets\*.%x) do @call create-lists.bat file resources_sources.mak %f)]
+!endif
+
+!if [for %f in (..\..\gtk\theme\win32\gtk-win32-base.css ..\..\gtk\theme\win32\gtk.css) do @call create-lists.bat file resources_sources.mak %f]
+!endif
+
+!if [for %f in (..\..\gtk\cursor\*.png ..\..\gtk\gesture\*.symbolic.png ..\..\gtk\ui\*.ui) do @call create-lists.bat file resources_sources.mak %f]
+!endif
+
+!if [for %s in (16 22 24 32 48) do @(for %c in (actions status categories) do @(for %f in (..\..\gtk\icons\%sx%s\%c\*.png) do @call create-lists.bat file resources_sources.mak %f))]
+!endif
+
+!if [for %s in (scalable) do @(for %c in (status) do @(for %f in (..\..\gtk\icons\%s\%c\*.svg) do @call create-lists.bat file resources_sources.mak %f))]
+!endif
+
+!if [for %f in (..\..\gtk\inspector\*.ui ..\..\gtk\inspector\logo.png ..\..\gtk\emoji\emoji.data) do @call create-lists.bat file resources_sources.mak %f]
+!endif
+
+!if [call create-lists.bat footer resources_sources.mak]
+!endif
+
+!if [call create-lists.bat header resources_sources.mak GTK_DEMO_RESOURCES]
+!endif
+
+!if [for /f %f in ('$(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=..\..\demos\gtk-demo ..\..\demos\gtk-demo\demo.gresource.xml') do @call create-lists.bat file resources_sources.mak %f]
+!endif
+
+!if [call create-lists.bat footer resources_sources.mak]
+!endif
+
+!if [call create-lists.bat header resources_sources.mak ICON_BROWSER_RESOURCES]
+!endif
+
+!if [for /f %f in ('$(GLIB_COMPILE_RESOURCES) --sourcedir=..\..\demos\icon-browser --generate-dependencies ..\..\demos\icon-browser\iconbrowser.gresource.xml') do @call create-lists.bat file resources_sources.mak %f]
+!endif
+
+!if [call create-lists.bat footer resources_sources.mak]
+!endif
+
+!include resources_sources.mak
+
+!if [del /f /q resources_sources.mak]
+!endif

build/win32/create-lists.bat

@@ -0,0 +1,42 @@
+@echo off
+rem Simple .bat script for creating the NMake Makefile snippets.
+
+if not "%1" == "header" if not "%1" == "file" if not "%1" == "footer" goto :error_cmd
+if "%2" == "" goto error_no_destfile
+
+if "%1" == "header" goto :header
+if "%1" == "file" goto :addfile
+if "%1" == "footer" goto :footer
+
+:header
+if "%3" == "" goto error_var
+echo %3 =	\>>%2
+goto done
+
+:addfile
+if "%3" == "" goto error_file
+echo.	%3	\>>%2
+goto done
+
+:footer
+echo.	$(NULL)>>%2
+echo.>>%2
+goto done
+
+:error_cmd
+echo Specified command '%1' was invalid.  Valid commands are: header file footer.
+goto done
+
+:error_no_destfile
+echo Destination NMake snippet file must be specified
+goto done
+
+:error_var
+echo A name must be specified for using '%1'.
+goto done
+
+:error_file
+echo A file must be specified for using '%1'.
+goto done
+
+:done

build/win32/detectenv-msvc.mak

@@ -42,8 +42,10 @@ VSVER = 11
 VSVER = 12
 !elseif $(VCVERSION) > 1899 && $(VCVERSION) < 1910
 VSVER = 14
-!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 2000
+!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 1920
 VSVER = 15
+!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 2000
+VSVER = 16
 !else
 VSVER = 0
 !endif
@@ -51,7 +53,7 @@ VSVER = 0
 !if "$(VSVER)" == "0"
 MSG = ^
 This NMake Makefile set supports Visual Studio^
-9 (2008) through 14 (2015).  Your Visual Studio^
+9 (2008) through 16 (2019).  Your Visual Studio^
 version is not supported.
 !error $(MSG)
 !endif

build/win32/gen-gdkversionmacros-h.py

@@ -0,0 +1,33 @@
+#!/usr/bin/python3
+
+# Generate gdk/gdkversionmacros.h
+
+# Author: Fan, Chun-wei
+# Date: July 25, 2019
+
+import os
+import sys
+import argparse
+
+from replace import replace_multi, replace
+
+def main(argv):
+    srcdir = os.path.dirname(__file__)
+    top_srcdir = os.path.join(srcdir, os.pardir, os.pardir)
+    parser = argparse.ArgumentParser(description='Generate gdkversionmacros.h')
+    parser.add_argument('--version', help='Version of the package',
+                        required=True)
+    args = parser.parse_args()
+    gdk_sourcedir = os.path.join(top_srcdir, 'gdk')
+    version_parts = args.version.split('.')
+
+    gdkversionmacro_replace_items = {'@GTK_MAJOR_VERSION@': version_parts[0],
+                                     '@GTK_MINOR_VERSION@': version_parts[1],
+                                     '@GTK_MICRO_VERSION@': version_parts[2]}
+
+    replace_multi(os.path.join(gdk_sourcedir, 'gdkversionmacros.h.in'),
+                  os.path.join(gdk_sourcedir, 'gdkversionmacros.h'),
+                  gdkversionmacro_replace_items)
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))

build/win32/generate-msvc.mak

@@ -0,0 +1,222 @@
+# NMake Makefile portion for code generation and
+# intermediate build directory creation
+# Items in here should not need to be edited unless
+# one is maintaining the NMake build files.
+
+!include config-msvc.mak
+!include create-lists-msvc.mak
+
+# Copy the pre-defined gdkconfig.h.[win32|win32_broadway]
+!if "$(CFG)" == "release" || "$(CFG)" == "Release"
+GDK_OLD_CFG = debug
+!else
+GDK_OLD_CFG = release
+!endif
+
+!ifdef BROADWAY
+GDK_CONFIG = broadway
+GDK_DEL_CONFIG = win32
+GDK_CONFIG_TEMPLATE = ..\..\gdk\gdkconfig.h.win32_broadway
+!else
+GDK_CONFIG = win32
+GDK_DEL_CONFIG = broadway
+GDK_CONFIG_TEMPLATE = ..\..\gdk\gdkconfig.h.win32
+!endif
+
+GDK_MARSHALERS_FLAGS = --prefix=_gdk_marshal --valist-marshallers
+GDK_RESOURCES_ARGS = ..\..\gdk\gdk.gresource.xml --target=$@ --sourcedir=..\..\gdk --c-name _gdk --manual-register
+GTK_MARSHALERS_FLAGS = --prefix=_gtk_marshal --valist-marshallers
+GTK_RESOURCES_ARGS = ..\..\gtk\gtk.gresource.xml --target=$@ --sourcedir=..\..\gtk --c-name _gtk --manual-register
+
+all:	\
+	..\..\config.h	\
+	..\..\gdk\gdkconfig.h	\
+	..\..\gdk\gdkversionmacros.h	\
+	..\..\gdk\gdkmarshalers.h	\
+	..\..\gdk\gdkmarshalers.c	\
+	..\..\gdk\gdkresources.h	\
+	..\..\gdk\gdkresources.c	\
+	..\..\gtk\gtk-win32.rc	\
+	..\..\gtk\libgtk3.manifest	\
+	..\..\gtk\gtkdbusgenerated.h	\
+	..\..\gtk\gtkdbusgenerated.c	\
+	..\..\gtk\gtktypefuncs.inc	\
+	..\..\gtk\gtk.gresource.xml	\
+	..\..\gtk\gtkmarshalers.h	\
+	..\..\gtk\gtkmarshalers.c	\
+	..\..\gtk\gtkresources.h	\
+	..\..\gtk\gtkresources.c	\
+	..\..\demos\gtk-demo\demos.h	\
+	..\..\demos\gtk-demo\demo_resources.c	\
+	..\..\demos\icon-browser\resources.c
+
+# Copy the pre-defined config.h.win32 and demos.h.win32
+..\..\config.h: ..\..\config.h.win32
+..\..\demos\gtk-demo\demos.h: ..\..\demos\gtk-demo\demos.h.win32
+..\..\gtk\gtk-win32.rc: ..\..\gtk\gtk-win32.rc.body
+
+..\..\gdk-$(CFG)-$(GDK_CONFIG)-build: $(GDK_CONFIG_TEMPLATE)
+	@if exist ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build del ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build
+	@if exist ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build del ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build
+	@if exist ..\..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build del ..\..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build
+	@copy $** $@
+	
+..\..\gdk\gdkconfig.h: ..\..\gdk-$(CFG)-$(GDK_CONFIG)-build
+
+..\..\config.h	\
+..\..\gdk\gdkconfig.h	\
+..\..\gtk\gtk-win32.rc	\
+..\..\demos\gtk-demo\demos.h:
+	@echo Copying $@...
+	@copy $** $@
+
+..\..\gdk\gdkversionmacros.h: ..\..\gdk\gdkversionmacros.h.in
+	@echo Generating $@...
+	@$(PYTHON) gen-gdkversionmacros-h.py --version=$(GTK_VERSION)
+
+..\..\gdk\gdkmarshalers.h: ..\..\gdk\gdkmarshalers.list
+	@echo Generating $@...
+	@$(PYTHON) $(GLIB_GENMARSHAL) $(GDK_MARSHALERS_FLAGS) --header $** > $@.tmp
+	@move $@.tmp $@
+
+..\..\gdk\gdkmarshalers.c: ..\..\gdk\gdkmarshalers.list
+	@echo Generating $@...
+	@$(PYTHON) $(GLIB_GENMARSHAL) $(GDK_MARSHALERS_FLAGS) --body $** > $@.tmp
+	@move $@.tmp $@
+
+..\..\gdk\gdk.gresource.xml: $(GDK_RESOURCES)
+	@echo Generating $@...
+	@echo ^<?xml version='1.0' encoding='UTF-8'?^> >$@
+	@echo ^<gresources^> >> $@
+	@echo  ^<gresource prefix='/org/gtk/libgdk'^> >> $@
+	@for %%f in (..\..\gdk\resources\glsl\*.glsl) do @echo     ^<file alias='glsl/%%~nxf'^>resources/glsl/%%~nxf^</file^> >> $@
+	@echo   ^</gresource^> >> $@
+	@echo ^</gresources^> >> $@
+
+..\..\gdk\gdkresources.h: ..\..\gdk\gdk.gresource.xml
+	@echo Generating $@...
+	@if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT)
+	@if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT)
+	@if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA)
+	@$(GLIB_COMPILE_RESOURCES) $(GDK_RESOURCES_ARGS) --generate-header
+
+..\..\gdk\gdkresources.c: ..\..\gdk\gdk.gresource.xml $(GDK_RESOURCES)
+	@echo Generating $@...
+	@if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT)
+	@if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT)
+	@if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA)
+	@$(GLIB_COMPILE_RESOURCES) $(GDK_RESOURCES_ARGS) --generate-source
+
+..\..\gtk\libgtk3.manifest: ..\..\gtk\libgtk3.manifest.in
+	@echo Generating $@...
+	@$(PYTHON) replace.py	\
+	--action=replace-var	\
+	--input=$**	--output=$@	\
+	--var=EXE_MANIFEST_ARCHITECTURE	\
+	--outstring=*
+
+..\..\gtk\gtkdbusgenerated.h ..\..\gtk\gtkdbusgenerated.c: ..\..\gtk\gtkdbusinterfaces.xml
+	@echo Generating GTK DBus sources...
+	@$(PYTHON) $(PREFIX)\bin\gdbus-codegen	\
+	--interface-prefix org.Gtk. --c-namespace _Gtk	\
+	--generate-c-code gtkdbusgenerated $**	\
+	--output-directory $(@D)
+
+..\..\gtk\gtktypefuncs.inc: ..\..\gtk\gentypefuncs.py
+	@echo Generating $@...
+	@echo #undef GTK_COMPILATION > $(@R).preproc.c
+	@echo #include "gtkx.h" >> $(@R).preproc.c
+	@cl /EP $(GTK_PREPROCESSOR_FLAGS) $(@R).preproc.c > $(@R).combined.c
+	@$(PYTHON) $** $@ $(@R).combined.c
+	@del $(@R).preproc.c $(@R).combined.c
+
+..\..\gtk\gtk.gresource.xml: $(GTK_RESOURCES)
+	@echo Generating $@...
+	@echo ^<?xml version='1.0' encoding='UTF-8'?^>> $@
+	@echo ^<gresources^>>> $@
+	@echo   ^<gresource prefix='/org/gtk/libgtk'^>>> $@
+	@echo     ^<file^>theme/Adwaita/gtk.css^</file^>>> $@
+	@echo     ^<file^>theme/Adwaita/gtk-dark.css^</file^>>> $@
+	@echo     ^<file^>theme/Adwaita/gtk-contained.css^</file^>>> $@
+	@echo     ^<file^>theme/Adwaita/gtk-contained-dark.css^</file^>>> $@
+	@for %%f in (..\..\gtk\theme\Adwaita\assets\*.png) do @echo     ^<file preprocess='to-pixdata'^>theme/Adwaita/assets/%%~nxf^</file^>>> $@
+	@for %%f in (..\..\gtk\theme\Adwaita\assets\*.svg) do @echo     ^<file^>theme/Adwaita/assets/%%~nxf^</file^>>> $@
+	@echo     ^<file^>theme/HighContrast/gtk.css^</file^>>> $@
+	@echo     ^<file alias='theme/HighContrastInverse/gtk.css'^>theme/HighContrast/gtk-inverse.css^</file^>>> $@
+	@echo     ^<file^>theme/HighContrast/gtk-contained.css^</file^>>> $@
+	@echo     ^<file^>theme/HighContrast/gtk-contained-inverse.css^</file^>>> $@
+	@for %%f in (..\..\gtk\theme\HighContrast\assets\*.png) do @echo     ^<file preprocess='to-pixdata'^>theme/HighContrast/assets/%%~nxf^</file^>>> $@
+	@for %%f in (..\..\gtk\theme\HighContrast\assets\*.svg) do @echo     ^<file^>theme/HighContrast/assets/%%~nxf^</file^>>> $@
+	@echo     ^<file^>theme/win32/gtk-win32-base.css^</file^>>> $@
+	@echo     ^<file^>theme/win32/gtk.css^</file^>>> $@
+	@for %%f in (..\..\gtk\cursor\*.png) do @echo     ^<file^>cursor/%%~nxf^</file^>>> $@
+	@for %%f in (..\..\gtk\gesture\*.symbolic.png) do @echo     ^<file alias='icons/64x64/actions/%%~nxf'^>gesture/%%~nxf^</file^>>> $@
+	@for %%f in (..\..\gtk\ui\*.ui) do @echo     ^<file preprocess='xml-stripblanks'^>ui/%%~nxf^</file^>>> $@
+	@for %%s in (16 22 24 32 48) do @(for %%c in (actions status categories) do @(for %%f in (..\..\gtk\icons\%%sx%%s\%%c\*.png) do @echo     ^<file^>icons/%%sx%%s/%%c/%%~nxf^</file^>>> $@))
+	@for %%s in (scalable) do @(for %%c in (status) do @(for %%f in (..\..\gtk\icons\%%s\%%c\*.svg) do @echo     ^<file^>icons/%%s/%%c/%%~nxf^</file^>>> $@))
+	@for %%f in (..\..\gtk\inspector\*.ui) do @echo     ^<file compressed='true' preprocess='xml-stripblanks'^>inspector/%%~nxf^</file^>>> $@
+	@echo     ^<file^>inspector/logo.png^</file^>>> $@
+	@echo     ^<file^>emoji/emoji.data^</file^>>> $@
+	@echo   ^</gresource^>>> $@
+	@echo ^</gresources^>>> $@
+
+..\..\gtk\gtkresources.h: ..\..\gtk\gtk.gresource.xml
+	@echo Generating $@...
+	@if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT)
+	@if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT)
+	@if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA)
+	@$(GLIB_COMPILE_RESOURCES) $(GTK_RESOURCES_ARGS) --generate-header
+
+..\..\gtk\gtkresources.c: ..\..\gtk\gtk.gresource.xml $(GTK_RESOURCES)
+	@echo Generating $@...
+	@if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT)
+	@if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT)
+	@if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA)
+	@$(GLIB_COMPILE_RESOURCES) $(GTK_RESOURCES_ARGS) --generate-source
+
+..\..\gtk\gtkmarshalers.h: ..\..\gtk\gtkmarshalers.list
+	@echo Generating $@...
+	@$(PYTHON) $(GLIB_GENMARSHAL) $(GTK_MARSHALERS_FLAGS) --header $** > $@.tmp
+	@move $@.tmp $@
+
+..\..\gtk\gtkmarshalers.c: ..\..\gtk\gtkmarshalers.list
+	@echo Generating $@...
+	@echo #undef G_ENABLE_DEBUG> $@.tmp
+	@$(PYTHON) $(GLIB_GENMARSHAL) $(GTK_MARSHALERS_FLAGS) --body $** >> $@.tmp
+	@move $@.tmp $@
+
+..\..\demos\gtk-demo\demo_resources.c: ..\..\demos\gtk-demo\demo.gresource.xml $(GTK_DEMO_RESOURCES)
+	@echo Generating $@...
+	@$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(@D) --generate-source $(@D)\demo.gresource.xml
+
+..\..\demos\icon-browser\resources.c: ..\..\demos\icon-browser\iconbrowser.gresource.xml $(ICON_BROWSER_RESOURCES)
+	@echo Generating $@...
+	@$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(@D) --generate-source $(@D)\iconbrowser.gresource.xml
+
+# Remove the generated files
+clean:
+	@-del /f /q ..\..\demos\icon-browser\resources.c
+	@-del /f /q ..\..\demos\gtk-demo\demo_resources.c
+	@-del /f /q ..\..\demos\gtk-demo\demos.h
+	@-del /f /q ..\..\gtk\gtkresources.c
+	@-del /f /q ..\..\gtk\gtkresources.h
+	@-del /f /q ..\..\gtk\gtkmarshalers.c
+	@-del /f /q ..\..\gtk\gtkmarshalers.h
+	@-del /f /q ..\..\gtk\gtk.gresource.xml
+	@-del /f /q ..\..\gtk\gtktypefuncs.inc
+	@-del /f /q ..\..\gtk\gtkdbusgenerated.c
+	@-del /f /q ..\..\gtk\gtkdbusgenerated.h
+	@-del /f /q ..\..\gtk\libgtk3.manifest
+	@-del /f /q ..\..\gtk\gtk-win32.rc
+	@-del /f /q ..\..\gdk\gdkresources.c
+	@-del /f /q ..\..\gdk\gdkresources.h
+	@-del /f /q ..\..\gdk\gdk.gresource.xml
+	@-del /f /q ..\..\gdk\gdkmarshalers.c
+	@-del /f /q ..\..\gdk\gdkmarshalers.h
+	@-del /f /q ..\..\gdk\gdkversionmacros.h
+	@-del /f /q ..\..\gdk\gdkconfig.h
+	@if exist ..\..\gdk-$(CFG)-$(GDK_CONFIG)-build del ..\..\gdk-$(CFG)-$(GDK_CONFIG)-build
+	@if exist ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build del ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build
+	@if exist ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build del ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build
+	@if exist ..\..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build del ..\..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build
+	@-del /f /q ..\..\config.h

build/win32/vs10/Makefile.am

@@ -33,7 +33,6 @@ EXTRA_DIST += \
 	README.txt				\
 	gtk+.sln				\
 	gtk3-prebuild.vcxproj			\
-	gtk3-prebuild.vcxproj.filters		\
 	gdk3-win32.vcxprojin			\
 	gdk3-win32.vcxproj.filtersin		\
 	gdk3-broadway.vcxprojin			\

build/win32/vs10/gtk-3.vcxproj.filtersin

@@ -17,12 +17,6 @@
   <ItemGroup>
     <ResourceCompile Include="..\..\..\gtk\gtk-win32.rc"><Filter>Resource Files</Filter></ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\gtk\gtkdbusinterfaces.xml"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\..\gtk\gtk-win32.rc.body"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\..\gtk\libgtk3.manifest.in"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\gentypefuncs.py"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
   <ItemGroup>
 #include "gtk-3.vs10.sourcefiles.filters"
     <ClCompile Include="..\..\..\modules\input\gtkimcontextime.c"><Filter>Source Files</Filter></ClCompile>

build/win32/vs10/gtk-3.vcxprojin

@@ -162,28 +162,6 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\gtk\gtkdbusinterfaces.xml">
-      <Message>Generating GTK+ DBus Sources...</Message>
-      <Command>$(GenerateGtkDbusBuiltSources)</Command>
-      <Outputs>..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\gtk\gtk-win32.rc.body">
-      <Message>Copying GTK+ Win32 Version Resource...</Message>
-      <Command>$(CopyGtkWin32RC)</Command>
-      <Outputs>..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\gtk\libgtk3.manifest.in">
-      <Message>Generating GTK+ Win32 Manifest...</Message>
-      <Command>$(GenerateGtkWin32Manifest)</Command>
-      <Outputs>..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\gentypefuncs.py">
-      <Message>Generating ..\..\..\gtk\gtktypefuncs.c</Message>
-      <Command>$(GenerateTypeFuncs)</Command>
-      <Outputs>..\..\..\gtk\gtktypefuncs.c</Outputs>
-    </CustomBuild>
-  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\gtk\gtk-win32.rc" />
   </ItemGroup>

build/win32/vs10/gtk3-build-defines.props

@@ -39,6 +39,7 @@ nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstall
       <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='12.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='14.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='15.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='16.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

build/win32/vs10/gtk3-gen-srcs.props

@@ -4,83 +4,28 @@
     <Import Project="gtk3-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <GenConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</GenConfigH>
-    <GenGdkConfigHWin32>
-if exist ..\..\..\MSVC_$(Configuration) goto DONE_GDKCONFIG_H
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h
-if exist ..\..\..\GDK_BROADWAY_BUILD del ..\..\..\GDK_BROADWAY_BUILD
-if exist ..\..\..\MSVC_$(Configuration)_Broadway del ..\..\..\MSVC_$(Configuration)_Broadway
-if exist $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll
-if exist $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib del $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib
-if "$(Configuration)" == "Release" del ..\..\..\MSVC_Debug
-if "$(Configuration)" == "Debug" del ..\..\..\MSVC_Release
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\GDK_WIN32ONLY_BUILD
-echo $(Configuration) &gt; ..\..\..\MSVC_$(Configuration)
-
-:DONE_GDKCONFIG_H
-    </GenGdkConfigHWin32>
-    <GenGdkConfigHBroadway>
-if exist ..\..\..\MSVC_$(Configuration)_Broadway goto DONE_GDKCONFIG_H
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h
-if exist ..\..\..\GDK_WIN32ONLY_BUILD del ..\..\..\GDK_WIN32ONLY_BUILD
-if exist ..\..\..\MSVC_Release del ..\..\..\MSVC_Release
-if exist ..\..\..\MSVC_Debug del ..\..\..\MSVC_Debug
-
-if "$(Configuration)" == "Release_Broadway" del ..\..\..\MSVC_Debug_Broadway
-if "$(Configuration)" == "Debug_Broadway" del ..\..\..\MSVC_Release_Broadway
-
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\gdk\gdkconfig.h
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\GDK_BROADWAY_BUILD
-echo $(Configuration) &gt; ..\..\..\MSVC_$(Configuration)_Broadway
-
-:DONE_GDKCONFIG_H
-    </GenGdkConfigHBroadway>
-    <GDbusCodeGenCmd>$(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml</GDbusCodeGenCmd>
-    <GenerateGtkDbusBuiltSources>cd ..\..\..\gtk &amp; $(PythonDir)\python $(GDbusCodeGenCmd) &amp; cd $(SolutionDir)</GenerateGtkDbusBuiltSources>
-    <CopyGtkWin32RC>copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc</CopyGtkWin32RC>
-    <GenerateGtkWin32Manifest>$(PythonDir)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*</GenerateGtkWin32Manifest>
-    <CopyDemosH>copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h</CopyDemosH>
-    <GenerateTypeFuncs>
-echo #undef GTK_COMPILATION &gt; ..\..\..\gtk\gtktypefuncs.preproc.c
-echo #include "gtkx.h" &gt;&gt; ..\..\..\gtk\gtktypefuncs.preproc.c
-cl /EP /I..\..\..\gtk /I..\..\..\gdk /I..\..\..\gdk\win32 /I..\..\.. /I$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0 /I$(GlibEtcInstallRoot)\include\pango-1.0 /I$(GlibEtcInstallRoot)\include\atk-1.0 /I$(GlibEtcInstallRoot)\include\cairo /I$(GlibEtcInstallRoot)\include\gio-win32-2.0 /I$(GlibEtcInstallRoot)\include\glib-2.0 /I$(GlibEtcInstallRoot)\lib\glib-2.0\include /I$(GlibEtcInstallRoot)\include /DHAVE_CONFIG_H /DG_DISABLE_SINGLE_INCLUDES /DATK_DISABLE_SINGLE_INCLUDES /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES /DGTK_DISABLE_SINGLE_INCLUDES /D_USE_MATH_DEFINES /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 /DGTK_COMPILATION /DG_LOG_DOMAIN=\"Gtk\" /DGTK_HOST=\"i686-pc-vs$(VSVer)\" /DGTK_PRINT_BACKENDS=\"file\" /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED /D$(GtkIncludedImmodulesDefines) /DGTK_LIBDIR=\"$(GtkDummyPrefix)/lib\" /DGTK_DATADIR=\"$(GtkDummyPrefix)/share\" /DGTK_DATA_PREFIX=\"$(GtkDummyPrefix)\" /DGTK_SYSCONFDIR=\"$(GtkDummyPrefix)/etc\" /DMULTIPRESS_CONFDIR=\"$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\" /DMULTIPRESS_LOCALEDIR=\"$(GtkDummyPrefix)/share/locale\" /DGTK_VERSION=\"$(GtkVersion)\" /DGTK_BINARY_VERSION=\"$(GtkBinaryVersion)\" /DGDK_DISABLE_DEPRECATED /DISOLATION_AWARE_ENABLED ..\..\..\gtk\gtktypefuncs.preproc.c &gt; ..\..\..\gtk\gtktypefuncs.combined.c
-$(PythonDir)\python ..\gentypefuncs.py ..\..\..\gtk\gtktypefuncs.c ..\..\..\gtk\gtktypefuncs.combined.c
-del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c
-    </GenerateTypeFuncs>
+    <GenerateRequiredSourcesBase>cd ..
+set VCInstallDir=$(VCInstallDir)
+nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot)</GenerateRequiredSourcesBase>
+    <GeneratedGdkSources>..\..\..\config.h;..\..\..\gdk\gdkconfig.h;..\..\gdk\gdkversionmacros.h;..\..\..\gdk\gdkmarshalers.h;..\..\..\gdk\gdkmarshalers.c;..\..\..\gdk\gdkresources.h;..\..\..\gdk\gdkresources.c</GeneratedGdkSources>
+    <GeneratedGtkSources>..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;..\..\..\gtk\gtkdbusgenerated.h;..\..\..\gtk\gtkdbusgenerated.c</GeneratedGtkSources>
+    <GeneratedDemoSources>..\..\..\demos\gtk-demo\demos.h</GeneratedDemoSources>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtk3gensrcsprops</_PropertySheetDisplayName>
   </PropertyGroup>
   <ItemGroup>
-    <BuildMacro Include="GenConfigH">
-      <Value>$(GenConfigH)</Value>
+    <BuildMacro Include="GenerateRequiredSourcesBase">
+      <Value>$(GenerateRequiredSourcesBase)</Value>
     </BuildMacro>
-    <BuildMacro Include="GenGdkConfigHWin32">
-      <Value>$(GenGdkConfigHWin32)</Value>
+    <BuildMacro Include="GeneratedGdkSources">
+      <Value>$(GeneratedGdkSources)</Value>
     </BuildMacro>
-    <BuildMacro Include="GenGdkConfigHBroadway">
-      <Value>$(GenGdkConfigHBroadway)</Value>
+    <BuildMacro Include="GeneratedGtkSources">
+      <Value>$(GeneratedGtkSources)</Value>
     </BuildMacro>
-    <BuildMacro Include="GDbusCodeGenCmd">
-      <Value>$(GDbusCodeGenCmd)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateGtkDbusBuiltSources">
-      <Value>$(GenerateGtkDbusBuiltSources)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyGtkWin32RC">
-      <Value>$(CopyGtkWin32RC)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateGtkWin32Manifest">
-      <Value>$(GenerateGtkWin32Manifest)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyDemosH">
-      <Value>$(CopyDemosH)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateTypeFuncs">
-      <Value>$(GenerateTypeFuncs)</Value>
+    <BuildMacro Include="GeneratedDemoSources">
+      <Value>$(GeneratedDemoSources)</Value>
     </BuildMacro>
   </ItemGroup>
 </Project>

build/win32/vs10/gtk3-prebuild.vcxproj

@@ -41,46 +41,46 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
@@ -121,121 +121,19 @@
   </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'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" />
+    <NMakeBuildCommandLine Condition="'$(Configuration)' == 'Debug_Broadway'">$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine Condition="'$(Configuration)' == 'Release_Broadway'">$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine Condition="'$(Configuration)' == 'Debug'">$(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine Condition="'$(Configuration)' == 'Release'">$(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam)</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)' == 'Debug_Broadway'">$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)' == 'Release_Broadway'">$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)' == 'Debug'">$(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)' == 'Release'">$(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine Condition="'$(Configuration)' == 'Debug_Broadway'">$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
+    <NMakeCleanCommandLine Condition="'$(Configuration)' == 'Release_Broadway'">$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
+    <NMakeCleanCommandLine Condition="'$(Configuration)' == 'Debug'">$(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
+    <NMakeCleanCommandLine Condition="'$(Configuration)' == 'Release'">$(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\config.h.win32">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">..\..\..\config.h;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\gdk\gdkconfig.h.win32">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying gdkconfig from gdkconfig.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenGdkConfigHWin32)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying gdkconfig from gdkconfig.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenGdkConfigHWin32)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying gdkconfig from gdkconfig.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenGdkConfigHWin32)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying gdkconfig from gdkconfig.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenGdkConfigHWin32)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\gdk\gdkconfig.h.win32_broadway">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Copying gdkconfig from gdkconfig.win32_broadway...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GenGdkConfigHBroadway)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Copying gdkconfig from gdkconfig.win32_broadway...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GenGdkConfigHBroadway)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Copying gdkconfig from gdkconfig.win32_broadway...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GenGdkConfigHBroadway)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Copying gdkconfig from gdkconfig.win32_broadway...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GenGdkConfigHBroadway)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\demos\gtk-demo\demos.h.win32">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying demos.h from demos.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyDemosH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Copying demos.h from demos.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(CopyDemosH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying demos.h from demos.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyDemosH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Copying demos.h from demos.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(CopyDemosH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying demos.h from demos.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyDemosH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Copying demos.h from demos.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(CopyDemosH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying demos.h from demos.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyDemosH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Copying demos.h from demos.h.win32...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(CopyDemosH)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
   <ItemGroup>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

build/win32/vs10/gtk3-prebuild.vcxproj.filters

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\..\gdk\gdkconfig.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\..\gdk\gdkconfig.h.win32_broadway"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\..\demos\gtk-demo\demos.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
-</Project>

build/win32/vs10/gtk3-version-paths.props.in

@@ -17,11 +17,13 @@
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '12.0|Win32'">c:\python34</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '14.0|Win32'">c:\python36</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '15.0|Win32'">c:\python36</PythonDir>
+    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '16.0|Win32'">c:\python36</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '10.0|x64'">c:\python34.x64</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '11.0|x64'">c:\python34.x64</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '12.0|x64'">c:\python34.x64</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '14.0|x64'">c:\python36.x64</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '15.0|x64'">c:\python36.x64</PythonDir>
+    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '16.0|x64'">c:\python36.x64</PythonDir>
     <IntrospectPythonParam>PYTHON=$(PythonDir)\python.exe</IntrospectPythonParam>
   </PropertyGroup>
   <PropertyGroup>

build/win32/vs11/Makefile.am

@@ -4,7 +4,6 @@ EXTRA_DIST +=	\
 	README.txt	\
 	gtk+.sln	\
 	gtk3-prebuild.vcxproj	\
-	gtk3-prebuild.vcxproj.filters	\
 	gdk3-win32.vcxproj	\
 	gdk3-win32.vcxproj.filters	\
 	gdk-3.vcxproj	\

build/win32/vs12/Makefile.am

@@ -4,7 +4,6 @@ EXTRA_DIST +=	\
 	README.txt	\
 	gtk+.sln	\
 	gtk3-prebuild.vcxproj	\
-	gtk3-prebuild.vcxproj.filters	\
 	gdk3-win32.vcxproj	\
 	gdk3-win32.vcxproj.filters	\
 	gdk-3.vcxproj	\

build/win32/vs14/Makefile.am

@@ -4,7 +4,6 @@ EXTRA_DIST +=	\
 	README.txt	\
 	gtk+.sln	\
 	gtk3-prebuild.vcxproj	\
-	gtk3-prebuild.vcxproj.filters	\
 	gdk3-win32.vcxproj	\
 	gdk3-win32.vcxproj.filters	\
 	gdk-3.vcxproj	\

build/win32/vs15/Makefile.am

@@ -4,7 +4,6 @@ EXTRA_DIST +=	\
 	README.txt	\
 	gtk+.sln	\
 	gtk3-prebuild.vcxproj	\
-	gtk3-prebuild.vcxproj.filters	\
 	gdk3-win32.vcxproj	\
 	gdk3-win32.vcxproj.filters	\
 	gdk-3.vcxproj	\

build/win32/vs16/Makefile.am

@@ -0,0 +1,52 @@
+include $(top_srcdir)/Makefile.decl
+
+EXTRA_DIST +=	\
+	README.txt	\
+	gtk+.sln	\
+	gtk3-prebuild.vcxproj	\
+	gdk3-win32.vcxproj	\
+	gdk3-win32.vcxproj.filters	\
+	gdk-3.vcxproj	\
+	gdk-3.vcxproj.filters	\
+	gtk-3.vcxproj	\
+	gtk-3.vcxproj.filters	\
+	gtk-builder-tool.vcxproj		\
+	gtk-builder-tool.vcxproj.filters	\
+	gtk-encode-symbolic-svg.vcxproj	\
+	gtk-encode-symbolic-svg.vcxproj.filters	\
+	gtk-query-settings.vcxproj		\
+	gtk-query-settings.vcxproj.filters	\
+	gtk-update-icon-cache.vcxproj		\
+	gtk-update-icon-cache.vcxproj.filters	\
+	gtk3-demo.vcxproj	\
+	gtk3-demo.vcxproj.filters	\
+	gtk3-demo-application.vcxproj	\
+	gtk3-demo-application.vcxproj.filters	\
+	gtk3-icon-browser.vcxproj	\
+	gtk3-icon-browser.vcxproj.filters	\
+	gailutil-3.vcxproj	\
+	gailutil-3.vcxproj.filters	\
+	gtk3-install.vcxproj	\
+	gtk3-install.vcxproj.filters	\
+	gtk3-introspect.vcxproj		\
+	broadwayd.vcxproj	\
+	broadwayd.vcxproj.filters	\
+	gdk3-broadway.vcxproj	\
+	gdk3-broadway.vcxproj.filters	\
+	gtk3-build-defines.props	\
+	gtk3-copy-gdk-broadway.props	\
+	gtk3-gen-srcs.props	\
+	gtk3-ignore-broadway.props	\
+	gtk3-install.props	\
+	gtk3-version-paths.props
+
+DISTCLEANFILES = $(EXTRA_DIST)
+
+MSVC_VER = 16
+MSVC_VER_LONG = 16
+MSVC_TOOLSET = 142
+MSVC_FORMAT_VER = 12
+
+include $(top_srcdir)/build/Makefile-newvs.am
+
+-include $(top_srcdir)/git.mk

build/win32/vs9/gtk-3.vcprojin

@@ -162,126 +162,6 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
-			<File RelativePath="..\..\..\gtk\gtkdbusinterfaces.xml">
-				<FileConfiguration Name="Debug|Win32">
-				<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ DBus Sources..."
-						CommandLine="$(GenerateGtkDbusBuiltSources)"
-						Outputs="..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ DBus Sources..."
-						CommandLine="$(GenerateGtkDbusBuiltSources)"
-						Outputs="..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ DBus Sources..."
-						CommandLine="$(GenerateGtkDbusBuiltSourcesX64)"
-						Outputs="..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ DBus Sources..."
-						CommandLine="$(GenerateGtkDbusBuiltSourcesX64)"
-						Outputs="..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\gtk\gtk-win32.rc.body">
-				<FileConfiguration Name="Debug|Win32">
-				<Tool Name="VCCustomBuildTool"
-						Description="Copying GTK+ Win32 Version Resource..."
-						CommandLine="$(CopyGtkWin32RC)"
-						Outputs="..\..\..\gtk\gtk-win32.rc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying GTK+ Win32 Version Resource..."
-						CommandLine="$(CopyGtkWin32RC)"
-						Outputs="..\..\..\gtk\gtk-win32.rc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying GTK+ Win32 Version Resource..."
-						CommandLine="$(CopyGtkWin32RC)"
-						Outputs="..\..\..\gtk\gtk-win32.rc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying GTK+ Win32 Version Resource..."
-						CommandLine="$(CopyGtkWin32RC)"
-						Outputs="..\..\..\gtk\gtk-win32.rc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\gtk\libgtk3.manifest.in">
-				<FileConfiguration Name="Debug|Win32">
-				<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ Win32 Manifest..."
-						CommandLine="$(GenerateGtkWin32Manifest)"
-						Outputs="..\..\..\gtk\libgtk3.manifest"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ Win32 Manifest..."
-						CommandLine="$(GenerateGtkWin32Manifest)"
-						Outputs="..\..\..\gtk\libgtk3.manifest"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ Win32 Manifest..."
-						CommandLine="$(GenerateGtkWin32Manifest)"
-						Outputs="..\..\..\gtk\libgtk3.manifest"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ Win32 Manifest..."
-						CommandLine="$(GenerateGtkWin32Manifest)"
-						Outputs="..\..\..\gtk\libgtk3.manifest"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\gentypefuncs.py">
-				<FileConfiguration Name="Debug|Win32">
-				<Tool Name="VCCustomBuildTool"
-						Description="Generating ..\..\..\gtk\gtktypefuncs.c..."
-						CommandLine="$(GenerateTypeFuncs)"
-						Outputs="..\..\..\gtk\gtktypefuncs.c"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating ..\..\..\gtk\gtktypefuncs.c..."
-						CommandLine="$(GenerateTypeFuncs)"
-						Outputs="..\..\..\gtk\gtktypefuncs.c"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating ..\..\..\gtk\gtktypefuncs.c..."
-						CommandLine="$(GenerateTypeFuncsX64)"
-						Outputs="..\..\..\gtk\gtktypefuncs.c"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating ..\..\..\gtk\gtktypefuncs.c..."
-						CommandLine="$(GenerateTypeFuncsX64)"
-						Outputs="..\..\..\gtk\gtktypefuncs.c"
-					/>
-				</FileConfiguration>
-			</File>
 			<File RelativePath="..\..\..\gtk\gtk-win32.rc" />
 			<File RelativePath="..\..\..\gtk\libgtk3.manifest" />
 		</Filter>

build/win32/vs9/gtk3-gen-srcs.vsprops

@@ -6,96 +6,19 @@
 	InheritedPropertySheets=".\gtk3-build-defines.vsprops"
 	>
 	<UserMacro
-		Name="GenConfigH"
-		Value="
-copy ..\..\..\config.h.win32 ..\..\..\config.h
-		      "
+		Name="GenerateRequiredSourcesBase"
+		Value="cd ..&#x0D;&#x0A;set VCInstallDir=$(VCInstallDir)&#x0D;&#x0A;nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot)"
 	/>
 	<UserMacro
-		Name="GenGdkConfigHWin32"
-		Value="
-if exist ..\..\..\MSVC_$(ConfigurationName) goto DONE_GDKCONFIG_H&#x0D;&#x0A;
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
-if exist ..\..\..\GDK_BROADWAY_BUILD del ..\..\..\GDK_BROADWAY_BUILD&#x0D;&#x0A;
-if exist ..\..\..\MSVC_$(ConfigurationName)_Broadway del ..\..\..\MSVC_$(ConfigurationName)_Broadway&#x0D;&#x0A;
-
-if exist $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll&#x0D;&#x0A;
-if exist $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib del $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib&#x0D;&#x0A;
-
-if &quot;$(ConfigurationName)&quot; == &quot;Release&quot; del ..\..\..\MSVC_Debug&#x0D;&#x0A;
-if &quot;$(ConfigurationName)&quot; == &quot;Debug&quot; del ..\..\..\MSVC_Release&#x0D;&#x0A;
-
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\GDK_WIN32ONLY_BUILD&#x0D;&#x0A;
-
-echo $(ConfigurationName) &gt; ..\..\..\MSVC_$(ConfigurationName)&#x0D;&#x0A;
-:DONE_GDKCONFIG_H&#x0D;&#x0A;
-		      "
+		Name="GeneratedGdkSources"
+		Value="..\..\..\config.h;..\..\..\gdk\gdkconfig.h;..\..\gdk\gdkversionmacros.h;..\..\..\gdk\gdkmarshalers.h;..\..\..\gdk\gdkmarshalers.c;..\..\..\gdk\gdkresources.h;..\..\..\gdk\gdkresources.c"
 	/>
 	<UserMacro
-		Name="GenGdkConfigHBroadway"
-		Value="
-if exist ..\..\..\MSVC_$(ConfigurationName)_Broadway goto DONE_GDKCONFIG_H&#x0D;&#x0A;
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
-if exist ..\..\..\GDK_WIN32ONLY_BUILD del ..\..\..\GDK_WIN32ONLY_BUILD&#x0D;&#x0A;
-
-if exist ..\..\..\MSVC_Release del ..\..\..\MSVC_Release&#x0D;&#x0A;
-if exist ..\..\..\MSVC_Debug del ..\..\..\MSVC_Debug&#x0D;&#x0A;
-
-if &quot;$(ConfigurationName)&quot; == &quot;Release_Broadway&quot; del ..\..\..\MSVC_Debug_Broadway&#x0D;&#x0A;
-if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; del ..\..\..\MSVC_Release_Broadway&#x0D;&#x0A;
-
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\GDK_BROADWAY_BUILD&#x0D;&#x0A;
-
-echo $(ConfigurationName) &gt; ..\..\..\MSVC_$(ConfigurationName)_Broadway&#x0D;&#x0A;
-:DONE_GDKCONFIG_H&#x0D;&#x0A;
-		      "
+		Name="GeneratedGtkSources"
+		Value="..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;..\..\..\gtk\gtkdbusgenerated.h;..\..\..\gtk\gtkdbusgenerated.c"
 	/>
 	<UserMacro
-		Name="GDbusCodeGenCmd"
-		Value="$(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml"
-	/>
-	<UserMacro
-		Name="GenerateGtkDbusBuiltSources"
-		Value="cd ..\..\..\gtk &amp; $(PythonDir)\python $(GDbusCodeGenCmd) &amp; cd $(SolutionDir)"
-	/>
-	<UserMacro
-		Name="GenerateGtkDbusBuiltSourcesX64"
-		Value="cd ..\..\..\gtk &amp; $(PythonDirX64)\python $(GDbusCodeGenCmd) &amp; cd $(SolutionDir)"
-	/>
-	<UserMacro
-		Name="CopyGtkWin32RC"
-		Value="copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc"
-	/>
-	<UserMacro
-		Name="GenerateGtkWin32Manifest"
-		Value="$(PythonDir)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*"
-	/>
-	<UserMacro
-		Name="CopyDemosH"
-		Value="copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h"
-	/>
-	<UserMacro
-		Name="GenerateTypeFuncs"
-		Value="
-echo #undef GTK_COMPILATION &gt; ..\..\..\gtk\gtktypefuncs.preproc.c&#x0D;&#x0A;
-echo #include &quot;gtkx.h&quot; &gt;&gt; ..\..\..\gtk\gtktypefuncs.preproc.c&#x0D;&#x0A;
-cl /EP /I..\..\..\gtk /I..\..\..\gdk /I..\..\..\gdk\win32 /I..\..\.. /I$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0 /I$(GlibEtcInstallRoot)\include\pango-1.0 /I$(GlibEtcInstallRoot)\include\atk-1.0 /I$(GlibEtcInstallRoot)\include\cairo /I$(GlibEtcInstallRoot)\include\gio-win32-2.0 /I$(GlibEtcInstallRoot)\include\glib-2.0 /I$(GlibEtcInstallRoot)\lib\glib-2.0\include /I$(GlibEtcInstallRoot)\include /DHAVE_CONFIG_H /DG_DISABLE_SINGLE_INCLUDES /DATK_DISABLE_SINGLE_INCLUDES /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES /DGTK_DISABLE_SINGLE_INCLUDES /D_USE_MATH_DEFINES /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 /DGTK_COMPILATION /DG_LOG_DOMAIN=\&quot;Gtk\&quot; /DGTK_HOST=\&quot;i686-pc-vs$(VSVer)\&quot; /DGTK_PRINT_BACKENDS=\&quot;file\&quot; /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED /D$(GtkIncludedImmodulesDefines) /DGTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot; /DGTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot; /DGTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot; /DGTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot; /DMULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\&quot; /DMULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot; /DGTK_VERSION=\&quot;$(GtkVersion)\&quot; /DGTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)\&quot; /DGDK_DISABLE_DEPRECATED /DISOLATION_AWARE_ENABLED ..\..\..\gtk\gtktypefuncs.preproc.c &gt; ..\..\..\gtk\gtktypefuncs.combined.c&#x0D;&#x0A;
-$(PythonDir)\python ..\gentypefuncs.py ..\..\..\gtk\gtktypefuncs.c ..\..\..\gtk\gtktypefuncs.combined.c&#x0D;&#x0A;
-del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c&#x0D;&#x0A;
-		      "
-	/>
-	<UserMacro
-		Name="GenerateTypeFuncsX64"
-		Value="
-echo #undef GTK_COMPILATION &gt; ..\..\..\gtk\gtktypefuncs.preproc.c&#x0D;&#x0A;
-echo #include &quot;gtkx.h&quot; &gt;&gt; ..\..\..\gtk\gtktypefuncs.preproc.c&#x0D;&#x0A;
-cl /EP /I..\..\..\gtk /I..\..\..\gdk /I..\..\..\gdk\win32 /I..\..\.. /I$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0 /I$(GlibEtcInstallRoot)\include\pango-1.0 /I$(GlibEtcInstallRoot)\include\atk-1.0 /I$(GlibEtcInstallRoot)\include\cairo /I$(GlibEtcInstallRoot)\include\gio-win32-2.0 /I$(GlibEtcInstallRoot)\include\glib-2.0 /I$(GlibEtcInstallRoot)\lib\glib-2.0\include /I$(GlibEtcInstallRoot)\include /DHAVE_CONFIG_H /DG_DISABLE_SINGLE_INCLUDES /DATK_DISABLE_SINGLE_INCLUDES /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES /DGTK_DISABLE_SINGLE_INCLUDES /D_USE_MATH_DEFINES /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 /DGTK_COMPILATION /DG_LOG_DOMAIN=\&quot;Gtk\&quot; /DGTK_HOST=\&quot;i686-pc-vs$(VSVer)\&quot; /DGTK_PRINT_BACKENDS=\&quot;file\&quot; /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED /D$(GtkIncludedImmodulesDefines) /DGTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot; /DGTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot; /DGTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot; /DGTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot; /DMULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\&quot; /DMULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot; /DGTK_VERSION=\&quot;$(GtkVersion)\&quot; /DGTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)\&quot; /DGDK_DISABLE_DEPRECATED /DISOLATION_AWARE_ENABLED ..\..\..\gtk\gtktypefuncs.preproc.c &gt; ..\..\..\gtk\gtktypefuncs.combined.c&#x0D;&#x0A;
-$(PythonDirX64)\python ..\gentypefuncs.py ..\..\..\gtk\gtktypefuncs.c ..\..\..\gtk\gtktypefuncs.combined.c&#x0D;&#x0A;
-del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c&#x0D;&#x0A;
-		      "
+		Name="GeneratedDemoSources"
+		Value="..\..\..\demos\gtk-demo\demos.h"
 	/>
 </VisualStudioPropertySheet>

build/win32/vs9/gtk3-prebuild.vcproj

@@ -21,262 +21,127 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			ConfigurationType="10"
+			ConfigurationType="0"
 			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
 			CharacterSet="2"
 			DeleteExtensionsOnClean=""
 			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam)"
+				ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam) clean all"
+				CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam) clean"
+				Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			ConfigurationType="10"
+			ConfigurationType="0"
 			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
 			CharacterSet="2"
 			DeleteExtensionsOnClean=""
 			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam)"
+				ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam) clean all"
+				CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam) clean"
+				Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug_Broadway|Win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="10"
+			ConfigurationType="0"
 			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
 			CharacterSet="2"
 			DeleteExtensionsOnClean=""
 			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam)"
+				ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) clean all"
+				CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) clean"
+				Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug_Broadway|x64"
-			ConfigurationType="10"
+			ConfigurationType="0"
 			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
 			CharacterSet="2"
 			DeleteExtensionsOnClean=""
 			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam)"
+				ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) clean all"
+				CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) clean"
+				Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="10"
+			ConfigurationType="0"
 			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
 			CharacterSet="2"
 			DeleteExtensionsOnClean=""
 			WholeProgramOptimization="1"
 			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam)"
+				ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam) clean all"
+				CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam) clean"
+				Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			ConfigurationType="10"
+			ConfigurationType="0"
 			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
 			CharacterSet="2"
 			DeleteExtensionsOnClean=""
 			WholeProgramOptimization="1"
 			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam)"
+				ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam) clean all"
+				CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=$(ConfigurationName) $(IntrospectPythonParam) clean"
+				Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release_Broadway|Win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="10"
+			ConfigurationType="0"
 			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
 			CharacterSet="2"
 			DeleteExtensionsOnClean=""
 			WholeProgramOptimization="1"
 			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam)"
+				ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean all"
+				CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean"
+				Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release_Broadway|x64"
-			ConfigurationType="10"
+			ConfigurationType="0"
 			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
 			CharacterSet="2"
 			DeleteExtensionsOnClean=""
 			WholeProgramOptimization="1"
 			>
+			<Tool
+				Name="VCNMakeTool"
+				BuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam)"
+				ReBuildCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean all"
+				CleanCommandLine="$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean"
+				Output="$(GeneratedGdkSources);$(GeneratedDemoSources);$(GeneratedGtkSources)"
+			/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File RelativePath="..\..\..\config.h.win32">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\gdk\gdkconfig.h.win32">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32..."
-						CommandLine="$(GenGdkConfigHWin32)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(ConfigurationName)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32..."
-						CommandLine="$(GenGdkConfigHWin32)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(ConfigurationName)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32..."
-						CommandLine="$(GenGdkConfigHWin32)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(ConfigurationName)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32..."
-						CommandLine="$(GenGdkConfigHWin32)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(ConfigurationName)"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\gdk\gdkconfig.h.win32_broadway">
-				<FileConfiguration Name="Debug_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32_broadway..."
-						CommandLine="$(GenGdkConfigHBroadway)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(ConfigurationName)_Broadway"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32_broadway..."
-						CommandLine="$(GenGdkConfigHBroadway)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(ConfigurationName)_Broadway"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32_broadway..."
-						CommandLine="$(GenGdkConfigHBroadway)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(ConfigurationName)_Broadway"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32_broadway..."
-						CommandLine="$(GenGdkConfigHBroadway)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(ConfigurationName)_Broadway"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\demos\gtk-demo\demos.h.win32">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>

config.h.meson

@@ -0,0 +1,289 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if translation of program messages to the user's native
+   language is requested. */
+#mesondefine ENABLE_NLS
+
+/* The prefix for our gettext translation domains. */
+#mesondefine GETTEXT_PACKAGE
+
+/* Disable deprecation warnings from glib */
+#mesondefine GLIB_DISABLE_DEPRECATION_WARNINGS
+
+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
+#mesondefine HAVE_BIND_TEXTDOMAIN_CODESET
+
+/* Define if libcloudproviders is available */
+#mesondefine HAVE_CLOUDPROVIDERS
+
+/* define if we have colord */
+#mesondefine HAVE_COLORD
+
+/* Define to 1 if you have the <crt_externs.h> header file. */
+#mesondefine HAVE_CRT_EXTERNS_H
+
+/* Define if the GNU dcgettext() function is already present or preinstalled.
+   */
+#mesondefine HAVE_DCGETTEXT
+
+/* Define to 1 if you have the declaration of `isinf', and to 0 if you don't.
+   */
+#mesondefine HAVE_DECL_ISINF
+
+/* Define to 1 if you have the declaration of `isnan', and to 0 if you don't.
+   */
+#mesondefine HAVE_DECL_ISNAN
+
+/* Define to 1 if you have the <dev/evdev/input.h> header file. */
+#mesondefine HAVE_DEV_EVDEV_INPUT_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#mesondefine HAVE_DLFCN_H
+
+/* Define to 1 if you have the `exp2' function. */
+#mesondefine HAVE_EXP2
+
+/* Define to 1 if you have the `flockfile' function. */
+#mesondefine HAVE_FLOCKFILE
+
+/* Define to 1 if you have the <ftw.h> header file. */
+#mesondefine HAVE_FTW_H
+
+/* Define to 1 if you have the `getpagesize' function. */
+#mesondefine HAVE_GETPAGESIZE
+
+/* Define to 1 if you have the `getresuid' function. */
+#mesondefine HAVE_GETRESUID
+
+/* Define if gio-unix is available */
+#mesondefine HAVE_GIO_UNIX
+
+/* defines whether we have HarfBuzz */
+#mesondefine HAVE_HARFBUZZ
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#mesondefine HAVE_INTTYPES_H
+
+/* Define to 1 if the system has the type `IPrintDialogCallback'. */
+#mesondefine HAVE_IPRINTDIALOGCALLBACK
+
+/* Define to 1 if you have the <linux/input.h> header file. */
+#mesondefine HAVE_LINUX_INPUT_H
+
+/* Define to 1 if you have the <linux/memfd.h> header file. */
+#mesondefine HAVE_LINUX_MEMFD_H
+
+/* Define to 1 if you have the `localtime_r' function. */
+#mesondefine HAVE_LOCALTIME_R
+
+/* Define to 1 if you have the `log2' function. */
+#mesondefine HAVE_LOG2
+
+/* Define to 1 if you have the `lstat' function. */
+#mesondefine HAVE_LSTAT
+
+/* Define to 1 if you have the `mallinfo' function. */
+#mesondefine HAVE_MALLINFO
+
+/* Define to 1 if you have the <memory.h> header file. */
+#mesondefine HAVE_MEMORY_H
+
+/* Define to 1 if you have the `mkstemp' function. */
+#mesondefine HAVE_MKSTEMP
+
+/* Define to 1 if you have a working `mmap' system call. */
+#mesondefine HAVE_MMAP
+
+/* Define to 1 if you have the `nearbyint' function. */
+#mesondefine HAVE_NEARBYINT
+
+/* defines whether we have pangoft2 */
+#mesondefine HAVE_PANGOFT
+
+/* Define to 1 if libpapi available */
+#mesondefine HAVE_PAPI
+
+/* Define to 1 if you have the `posix_fallocate' function. */
+#mesondefine HAVE_POSIX_FALLOCATE
+
+/* Have the Xrandr extension library */
+#mesondefine HAVE_RANDR
+
+/* Have the Xrandr 1.5 extension library */
+#mesondefine HAVE_RANDR15
+
+/* Define to 1 if you have the `rint' function. */
+#mesondefine HAVE_RINT
+
+/* Define to 1 if you have the `round' function. */
+#mesondefine HAVE_ROUND
+
+/* Define to 1 if you have the `sincos' function. */
+#mesondefine HAVE_SINCOS
+
+/* Define to 1 if solaris xinerama is available */
+#mesondefine HAVE_SOLARIS_XINERAMA
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#mesondefine HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#mesondefine HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#mesondefine HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#mesondefine HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#mesondefine HAVE_SYS_MMAN_H
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#mesondefine HAVE_SYS_PARAM_H
+
+/* Have the sysprof-capture library */
+#mesondefine HAVE_SYSPROF_CAPTURE
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#mesondefine HAVE_SYS_STAT_H
+
+/* Define to 1 if sys/sysinfo.h is available */
+#mesondefine HAVE_SYS_SYSINFO_H
+
+/* Define to 1 if sys/systeminfo.h is available */
+#mesondefine HAVE_SYS_SYSTEMINFO_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#mesondefine HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#mesondefine HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the `trunc' function. */
+#mesondefine HAVE_TRUNC
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#mesondefine HAVE_UNISTD_H
+
+/* Have the XCOMPOSITE X extension */
+#mesondefine HAVE_XCOMPOSITE
+
+/* Have the Xcursor library */
+#mesondefine HAVE_XCURSOR
+
+/* Have the XDAMAGE X extension */
+#mesondefine HAVE_XDAMAGE
+
+/* Have the XFIXES X extension */
+#mesondefine HAVE_XFIXES
+
+/* Define to 1 if XFree Xinerama is available */
+#mesondefine HAVE_XFREE_XINERAMA
+
+/* Have XGenericEvent */
+#mesondefine HAVE_XGENERICEVENTS
+
+/* Define to 1 if xinerama is available */
+#mesondefine HAVE_XINERAMA
+
+/* Define to use XKB extension */
+#mesondefine HAVE_XKB
+
+/* Have the SYNC extension library */
+#mesondefine HAVE_XSYNC
+
+/* Define to 1 if you have the `_lock_file' function. */
+#mesondefine HAVE__LOCK_FILE
+
+/* Define if _NL_MEASUREMENT_MEASUREMENT is available */
+#mesondefine HAVE__NL_MEASUREMENT_MEASUREMENT
+
+/* Define if _NL_PAPER_HEIGHT is available */
+#mesondefine HAVE__NL_PAPER_HEIGHT
+
+/* Define if _NL_PAPER_WIDTH is available */
+#mesondefine HAVE__NL_PAPER_WIDTH
+
+/* Define if _NL_TIME_FIRST_WEEKDAY is available */
+#mesondefine HAVE__NL_TIME_FIRST_WEEKDAY
+
+/* Define to 1 if you have the `_NSGetEnviron' function. */
+#mesondefine HAVE__NSGETENVIRON
+
+/* Define if <X11/extensions/XIproto.h> needed for xReply */
+#mesondefine NEED_XIPROTO_H_FOR_XREPLY
+
+/* Define to the address where bug reports for this package should be sent. */
+#mesondefine PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#mesondefine PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#mesondefine PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#mesondefine PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#mesondefine PACKAGE_URL
+
+/* Define to the version of this package. */
+#mesondefine PACKAGE_VERSION
+
+/* Use NSBundle functions to determine load paths for libraries, translations,
+   etc. */
+#mesondefine QUARTZ_RELOCATION
+
+/* The size of `DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY', as computed by sizeof.
+   */
+#mesondefine SIZEOF_DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY
+
+/* Define to 1 if XInput 2.0 is available */
+#mesondefine XINPUT_2
+
+/* Define to 1 if XInput 2.2 is available */
+#mesondefine XINPUT_2_2
+
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#mesondefine _FILE_OFFSET_BITS
+
+/* defines how to decorate public symbols while building */
+#mesondefine _GDK_EXTERN
+
+/* Define for large files, on AIX-style hosts. */
+#mesondefine _LARGE_FILES
+
+/* Define to 1 if on MINIX. */
+#mesondefine _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#mesondefine _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#mesondefine _POSIX_SOURCE
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#mesondefine gid_t
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#mesondefine uid_t
+
+#mesondefine GTK_DATADIR
+
+#mesondefine GTK_LIBDIR
+
+#mesondefine GTK_PRINT_BACKENDS
+
+/* Define the location where the catalogs will be installed */
+#mesondefine GTK_LOCALEDIR
+
+#mesondefine ISO_CODES_PREFIX

config.h.win32.in

@@ -29,9 +29,6 @@
 /* Define to 1 if you have the <crt_externs.h> header file. */
 /* #undef HAVE_CRT_EXTERNS_H */
 
-/* Define to 1 if CUPS 1.2 API is available */
-/* #undef HAVE_CUPS_API_1_2 */
-
 /* Define to 1 if you have the `dcgettext' function. */
 #define HAVE_DCGETTEXT 1
 
@@ -77,15 +74,6 @@
 /* Define if gio-unix is available */
 /* #undef HAVE_GIO_UNIX */
 
-/* Have GNU ftw */
-/* #undef HAVE_GNU_FTW */
-
-/* Define to 1 if you have the `httpGetAuthString' function. */
-/* #undef HAVE_HTTPGETAUTHSTRING */
-
-/* Define if cups http_t authstring field is accessible */
-/* #undef HAVE_HTTP_AUTHSTRING */
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #if !defined (_MSC_VER) || (_MSC_VER >= 1800)
 #define HAVE_INTTYPES_H 1
@@ -157,9 +145,6 @@
 /* Define to 1 if sincos() is available */
 /* #undef HAVE_SINCOS */
 
-/* Have the sockaddr_un.sun_len member */
-/* #undef HAVE_SOCKADDR_UN_SUN_LEN */
-
 /* Define to 1 if solaris xinerama is available */
 /* #undef HAVE_SOLARIS_XINERAMA */
 

configure.ac

@@ -10,8 +10,8 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [24])
-m4_define([gtk_micro_version], [5])
-m4_define([gtk_interface_age], [1])
+m4_define([gtk_micro_version], [10])
+m4_define([gtk_interface_age], [6])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
@@ -42,8 +42,8 @@ m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
 m4_define([glib_required_major], [2])
-m4_define([glib_required_minor], [53])
-m4_define([glib_required_micro], [4])
+m4_define([glib_required_minor], [57])
+m4_define([glib_required_micro], [2])
 m4_define([glib_required_version],
           [glib_required_major.glib_required_minor.glib_required_micro])
 m4_define([glib_min_required_minor],
@@ -61,11 +61,12 @@ m4_define([cairo_required_version], [1.14.0])
 m4_define([gdk_pixbuf_required_version], [2.30.0])
 m4_define([introspection_required_version], [1.39.0])
 m4_define([wayland_required_version], [1.9.91])
-m4_define([wayland_protocols_required_version], [1.12])
+m4_define([wayland_protocols_required_version], [1.14])
 m4_define([mirclient_required_version], [0.22.0])
 m4_define([mircookie_required_version], [0.17.0])
 m4_define([epoxy_required_version], [1.4])
 m4_define([cloudproviders_required_version], [0.2.5])
+m4_define([sysprof_required_version], [3.33.2])
 GLIB_REQUIRED_VERSION=glib_required_version
 PANGO_REQUIRED_VERSION=pango_required_version
 ATK_REQUIRED_VERSION=atk_required_version
@@ -353,6 +354,12 @@ AC_ARG_ENABLE(cloudproviders,
                               [enable libcloudproviders integration])],
                               [cloudproviders_set=yes])
 
+AC_ARG_ENABLE(profiler,
+              [AS_HELP_STRING([--enable-profiler],
+                              [enable profiler integration])],
+              [enable_profiler=$enableval],
+              [enable_profiler=no])
+
 if test -z "$backend_set"; then
   if test "$platform_win32" = yes; then
     enable_win32_backend=yes
@@ -751,32 +758,6 @@ AS_CASE([$host_os],
       [AC_MSG_ERROR([DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY is unavailable])],
       [AC_MSG_RESULT([DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY is not OK])]
     )
-    AC_MSG_CHECKING([for SetupDiGetDevicePropertyW])
-    gtk_save_LIBS="$LIBS"
-    LIBS="-lsetupapi $LIBS"
-    AC_TRY_LINK(
-      [
-#define _WIN32_WINNT 0x0600
-#include <windows.h>
-#include <devpropdef.h>
-#include <setupapi.h>
-      ],
-      [return SetupDiGetDevicePropertyW(NULL, NULL, NULL, NULL, NULL, 0, NULL, 0);],
-      [have_SetupDiGetDevicePropertyW=yes],
-      [have_SetupDiGetDevicePropertyW=no]
-    )
-    AS_IF(
-      [test x$have_SetupDiGetDevicePropertyW = xyes],
-      [
-       AC_DEFINE(
-         [HAVE_SETUP_DI_GET_DEVICE_PROPERTY_W],
-         [1],
-         [Define to 1 if SetupDiGetDevicePropertyW() is available]
-       )
-      ]
-    )
-    AC_MSG_RESULT([$have_SetupDiGetDevicePropertyW])
-    LIBS="$gtk_save_LIBS"
   ],
   []
 )
@@ -841,19 +822,6 @@ AC_CHECK_HEADERS(ftw.h,
                  AC_DEFINE(HAVE_FTW_H, 1,
                            [Define to 1 if ftw.h is available]))
 
-AC_MSG_CHECKING([for GNU ftw extensions])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _XOPEN_SOURCE 500
-                                     #define _GNU_SOURCE
-                                     #include <ftw.h>]],
-                                   [[int flags = FTW_ACTIONRETVAL;]])],
-                  [gtk_ok=yes],[gtk_ok=no])
-if test $gtk_ok = yes; then
-    AC_MSG_RESULT([yes])
-    AC_DEFINE(HAVE_GNU_FTW, 1, [Have GNU ftw])
-else
-    AC_MSG_RESULT([no])
-fi
-
 #
 # Disable deprecation checks for all libraries we depend on on stable branches.
 # This is so newer versions of those libraries don't cause more warnings with
@@ -1373,11 +1341,26 @@ if test "x$cloudproviders_set" = "xyes"; then
   fi
 fi
 
+# Check for profiler support
+
+PROFILER_PACKAGES=""
+if test "x$enable_profiler" = "xyes"; then
+  PROFILER_PACKAGES="sysprof-capture-3 >= sysprof_required_version"
+  if $PKG_CONFIG --exists $PROFILER_PACKAGES; then
+    AC_DEFINE(HAVE_SYSPROF_CAPTURE, [1],
+              [Define if sysprof-capture-3 is available]
+              )
+  else
+    AC_MSG_ERROR([
+*** sysprof-capture-3 not found.])
+  fi
+fi
+
 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 epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES fribidi >= fribidi_required_version"
+GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES $PROFILER_PACKAGES fribidi >= fribidi_required_version"
 
 PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
 GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB"
@@ -1411,7 +1394,7 @@ 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 epoxy >= epoxy_required_version fribidi >= fribidi_required_dep"
+GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version fribidi >= fribidi_required_version"
 if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then
   GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
 fi
@@ -1516,37 +1499,6 @@ AC_SUBST(GTK_XIM_FLAGS)
 GDK_PIXBUF_LIBS=`$PKG_CONFIG --libs gdk-pixbuf-2.0`
 AC_SUBST(GDK_PIXBUF_LIBS)
 
-########################
-# Checks needed for gail
-########################
-
-old_LIBS="$LIBS"
-dnl Checks for inet libraries:
-AC_SEARCH_LIBS(gethostent, nsl)
-AC_SEARCH_LIBS(setsockopt, socket)
-AC_SEARCH_LIBS(connect, inet)
-
-dnl check for the sockaddr_un.sun_len member
-AC_CHECK_MEMBER([struct sockaddr_un.sun_len],
-		[struct_sockaddr_un_sun_len=true],
-		[struct_sockaddr_un_suin_len=false],
-		[#include <sys/types.h>
-		 #include <sys/un.h>]
-		)
-case $struct_sockaddr_un_sun_len in
-	true)
-		AC_DEFINE_UNQUOTED(HAVE_SOCKADDR_UN_SUN_LEN, 1,
-		                   [Have the sockaddr_un.sun_len member])
-		;;
-	*)
-		;;
-esac
-
-GAIL_INET_LIBS="$LIBS"
-AC_SUBST([GAIL_INET_LIBS])
-
-LIBS="$old_LIBS"
-
 ################################################################
 # Printing system checks
 ################################################################
@@ -1574,19 +1526,13 @@ else
     CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
     CUPS_LIBS=`$CUPS_CONFIG --libs`
 
-    CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
+    CUPS_API_VERSION=`$CUPS_CONFIG --version`
     CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
     CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
 
     if test $CUPS_API_MAJOR -lt 1 -o \
-            $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 2; then
-      AC_MSG_ERROR([CUPS >= 1.2 not found])
-    fi
-    if test $CUPS_API_MAJOR -gt 1 -o \
-	    $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6; then
-      AC_DEFINE(HAVE_CUPS_API_1_6, 1,
-                [Define to 1 if CUPS 1.6 API is available])
-      have_cups_api_1_6=yes
+            $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 7; then
+      AC_MSG_ERROR([CUPS >= 1.7 not found])
     fi
 
     AC_SUBST(CUPS_API_MAJOR)
@@ -1599,22 +1545,6 @@ else
     PRINT_BACKENDS="$PRINT_BACKENDS cups"
     AM_CONDITIONAL(HAVE_CUPS, true)
     have_cups=yes
-
-    gtk_save_cflags="$CFLAGS"
-    CFLAGS="$CUPS_CFLAGS"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <cups/http.h>]],
-                                       [[http_t http; char *s = http.authstring;]])],
-                      [AC_DEFINE([HAVE_HTTP_AUTHSTRING], [],
-                                 [Define if cups http_t authstring field is accessible])],
-                      [])
-    CFLAGS="$gtk_save_cflags"
-
-    AC_SUBST(HAVE_HTTP_AUTHSTRING)
-
-    gtk_save_libs="$LIBS"
-    LIBS="$CUPS_LIBS"
-    AC_CHECK_FUNCS(httpGetAuthString)
-    LIBS="$gtk_save_libs"
   fi
 fi
 
@@ -2027,11 +1957,13 @@ docs/reference/gdk/version.xml
 docs/reference/gtk/Makefile
 docs/reference/gtk/gtk3.types
 docs/reference/gtk/version.xml
+docs/reference/gtk/getting_started.xml
 docs/reference/libgail-util/Makefile
 docs/reference/libgail-util/version.xml
 docs/tools/Makefile
 build/Makefile
 build/win32/Makefile
+build/win32/config-msvc.mak
 build/win32/vs9/Makefile
 build/win32/vs9/gtk3-version-paths.vsprops
 build/win32/vs10/Makefile
@@ -2040,6 +1972,7 @@ build/win32/vs11/Makefile
 build/win32/vs12/Makefile
 build/win32/vs14/Makefile
 build/win32/vs15/Makefile
+build/win32/vs16/Makefile
 gdk/Makefile
 gdk/broadway/Makefile
 gdk/x11/Makefile
@@ -2088,3 +2021,4 @@ echo "        colord support:       $have_colord"
 echo "        Introspection:        $found_introspection"
 echo "        Debugging:            $enable_debug"
 echo "        Documentation:        $enable_gtk_doc"
+echo "        Profiler:             $enable_profiler"

demos/Makefile.am

@@ -3,4 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = gtk-demo widget-factory icon-browser
 
+EXTRA_DIST = \
+	meson.build
+
 -include $(top_srcdir)/git.mk

demos/gtk-demo/Makefile.am

@@ -117,7 +117,9 @@ EXTRA_DIST += 				\
 	demo.gresource.xml		\
 	$(resource_files)		\
 	org.gtk.Demo.gschema.xml	\
-	demos.h.win32
+	demos.h.win32	\
+	meson.build	\
+	geninclude.py
 
 gsettings_SCHEMAS = \
 	org.gtk.Demo.gschema.xml

demos/gtk-demo/geninclude.py

@@ -0,0 +1,108 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import sys
+import re
+import os
+from collections import *
+
+out_file = sys.argv[1]
+in_files = sys.argv[2:]
+
+
+file_output = """
+typedef GtkWidget *(*GDoDemoFunc) (GtkWidget *do_widget);
+
+typedef struct _Demo Demo;
+
+struct _Demo
+{
+  gchar *name;
+  gchar *title;
+  gchar *filename;
+  GDoDemoFunc func;
+  Demo *children;
+};
+
+"""
+
+# Demo = namedtuple('Demo', ['name', 'title', 'file', 'func'])
+
+demos = []
+
+for demo_file in in_files:
+    filename =  demo_file[demo_file.rfind('/')+1:]
+    demo_name = filename.replace(".c", "")
+    with open(demo_file, 'r', encoding='utf-8') as f:
+        title = f.readline().replace("/*", "").strip()
+
+
+    file_output += "GtkWidget *do_" + demo_name + " (GtkWidget *do_widget);\n"
+    # demos += Demo(name = demo_name,
+                  # title = title,
+                  # file = demo_file,
+                  # func = "do_" + title)
+    demos.append((demo_name, title, filename, "do_" + demo_name, -1))
+
+# Generate a List of "Parent names"
+parents = []
+parent_ids = []
+parent_index = 0
+for demo in demos:
+    if "/" in demo[1]:
+        slash_index = demo[1].index('/')
+        parent_name = demo[1][:slash_index]
+        do_break = False
+
+        # Check for duplicates
+        if not parent_name in parents:
+            parents.append(parent_name)
+            parent_ids.append(parent_index)
+            demos.append(("NULL", parent_name, "NULL", "NULL", parent_index))
+
+        parent_index = parent_index + 1
+
+
+# For every child with a parent, generate a list of child demos
+i = 0
+for parent in parents:
+    id = parent_ids[i]
+    file_output += "\nDemo child" + str(id) + "[] = {\n"
+    # iterate over all demos and check if the name starts with the given parent name
+    for child in demos:
+        if child[1].startswith(parent + "/"):
+            title = child[1][child[1].rfind('/') + 1:]
+            file_output += "  { \"" + child[0] + "\", \"" + title + "\", \"" + child[2] + "\", " + child[3] + ", NULL },\n"
+
+
+    file_output += "  { NULL }\n};\n"
+    i = i + 1
+
+
+# Sort demos by title
+demos = sorted(demos, key=lambda x: x[1])
+
+file_output += "\nDemo gtk_demos[] = {\n"
+for demo in demos:
+    # Do not generate one of these for demos with a parent demo
+    if "/" not in demo[1]:
+        child_array = "NULL"
+        name = demo[0];
+        title = demo[1];
+        file = demo[2]
+        if name != "NULL":
+            name = "\"" + name + "\""
+        if title != "NULL":
+            title = "\"" + title + "\""
+        if file != "NULL":
+            file = "\"" + file + "\""
+
+        if demo[4] != -1:
+            child_array = "child" + str(demo[4])
+        file_output += "  { " + name + ", " + title + ", " + file + ", " + demo[3] + ", " + child_array + " },\n"
+
+file_output += "  { NULL }\n};\n"
+
+ofile = open(out_file, "w", encoding="utf-8")
+ofile.write(file_output)
+ofile.close()

demos/gtk-demo/meson.build

@@ -0,0 +1,148 @@
+
+## These should be in the order you want them to appear in the
+## demo app, which means alphabetized by demo title, not filename
+demos = files([
+  'application_demo.c',
+  'assistant.c',
+  'builder.c',
+  'button_box.c',
+  'changedisplay.c',
+  'clipboard.c',
+  'colorsel.c',
+  'combobox.c',
+  'css_accordion.c',
+  'css_basics.c',
+  'css_blendmodes.c',
+  'css_multiplebgs.c',
+  'css_pixbufs.c',
+  'css_shadows.c',
+  'cursors.c',
+  'dialog.c',
+  'drawingarea.c',
+  'editable_cells.c',
+  'entry_buffer.c',
+  'entry_completion.c',
+  'event_axes.c',
+  'expander.c',
+  'filtermodel.c',
+  'fishbowl.c',
+  'foreigndrawing.c',
+  'gestures.c',
+  'glarea.c',
+  'headerbar.c',
+  'hypertext.c',
+  'iconview.c',
+  'iconview_edit.c',
+  'images.c',
+  'infobar.c',
+  'links.c',
+  'listbox.c',
+  'flowbox.c',
+  'list_store.c',
+  'markup.c',
+  'menus.c',
+  'modelbutton.c',
+  'offscreen_window.c',
+  'offscreen_window2.c',
+  'overlay.c',
+  'overlay2.c',
+  'paint.c',
+  'panes.c',
+  'pickers.c',
+  'pixbufs.c',
+  'popover.c',
+  'printing.c',
+  'revealer.c',
+  'rotated_text.c',
+  'scale.c',
+  'search_entry.c',
+  'search_entry2.c',
+  'shortcuts.c',
+  'sidebar.c',
+  'sizegroup.c',
+  'spinbutton.c',
+  'spinner.c',
+  'stack.c',
+  'tabs.c',
+  'textmask.c',
+  'textview.c',
+  'textscroll.c',
+  'theming_style_classes.c',
+  'toolpalette.c',
+  'transparent.c',
+  'tree_store.c',
+])
+
+
+gtkdemo_deps = [libgtk_dep]
+
+if harfbuzz_dep.found() and pangoft_dep.found()
+  demos += files('font_features.c')
+  gtkdemo_deps += [harfbuzz_dep, pangoft_dep]
+endif
+
+if os_unix
+  demos += files('pagesetup.c')
+endif
+
+gtkdemo_sources = demos + files([
+  'gtkfishbowl.c',
+  'gtkfishbowl.h',
+  'main.c',
+])
+
+
+geninclude = find_program('geninclude.py')
+demos_h = custom_target(
+  'gtk3 demo header',
+  output  : 'demos.h',
+  input   : demos,
+  command : [geninclude, '@OUTPUT@', '@INPUT@'],
+)
+
+gtkdemo_resources = gnome.compile_resources(
+  'gtkdemo_resources',
+  'demo.gresource.xml',
+  source_dir: '.'
+)
+
+gtkdemo = executable(
+  'gtk3-demo',
+  gtkdemo_sources,
+  demos_h,
+  gtkdemo_resources,
+  dependencies: gtkdemo_deps,
+  include_directories : confinc,
+  install: true
+)
+
+gtkapplicationdemo = executable(
+  'gtk3-demo-application',
+  'application.c',
+  demos_h,
+  gtkdemo_resources,
+  dependencies: gtkdemo_deps,
+  include_directories : confinc,
+  install: true
+)
+
+gtk_settings_schemas = [
+  'org.gtk.Settings.FileChooser.gschema.xml',
+  'org.gtk.Settings.ColorChooser.gschema.xml',
+  'org.gtk.Settings.EmojiChooser.gschema.xml',
+  'org.gtk.Settings.Debug.gschema.xml',
+]
+
+foreach s: [ '16', '22', '24', '32', '48', '256']
+  icon_destdir = join_paths(gtk_datadir, 'icons', 'hicolor', '@0@x@0@'.format(s), 'apps')
+  icons = [join_paths('data', '@0@x@0@'.format(s), 'gtk3-demo.png'),
+           join_paths('data', '@0@x@0@'.format(s), 'gtk3-demo-symbolic.symbolic.png')]
+  install_data(icons, install_dir: icon_destdir)
+endforeach
+
+# desktop file
+install_data('gtk3-demo.desktop', install_dir: gtk_applicationsdir)
+
+# GSettings
+install_data('org.gtk.Demo.gschema.xml', install_dir: gtk_schemasdir)
+gnome.compile_schemas(depend_files: files(['org.gtk.Demo.gschema.xml']))

demos/icon-browser/Makefile.am

@@ -34,7 +34,8 @@ EXTRA_DIST = \
 	menus.ui \
 	iconbrowser.gresource.xml \
 	window.ui \
-	icon.list
+	icon.list \
+	meson.build
 
 # ------------------- MSVC Build Items ----------------
 MSVCPROJS = gtk3-icon-browser

demos/icon-browser/meson.build

@@ -0,0 +1,24 @@
+iconbrowser_sources = [
+  'main.c',
+  'iconbrowserapp.c',
+  'iconbrowserwin.c',
+  'iconstore.c'
+]
+
+iconbrowser_resources = gnome.compile_resources(
+  'iconbrowser_resources',
+  'iconbrowser.gresource.xml',
+  source_dir: '.'
+)
+
+iconbrowser = executable(
+  'gtk3-icon-browser',
+  iconbrowser_sources,
+  iconbrowser_resources,
+  dependencies: libgtk_dep,
+  include_directories : confinc,
+  install: true
+)
+
+# desktop file
+install_data('gtk3-icon-browser.desktop', install_dir: gtk_applicationsdir)

demos/meson.build

@@ -0,0 +1,3 @@
+  subdir('icon-browser')
+  subdir('widget-factory')
+  subdir('gtk-demo')

demos/widget-factory/Makefile.am

@@ -66,6 +66,7 @@ EXTRA_DIST += 				\
 	help-overlay.ui			\
 	widget-factory.gresource.xml	\
 	data/source.svg			\
-	data/symbolic-source.svg
+	data/symbolic-source.svg	\
+	meson.build
 
 -include $(top_srcdir)/git.mk

demos/widget-factory/meson.build

@@ -0,0 +1,29 @@
+
+widgetfactory_sources = [
+  'widget-factory.c'
+]
+
+widgetfactory_resources = gnome.compile_resources(
+  'widgetfactory_resources',
+  'widget-factory.gresource.xml',
+  source_dir: '.'
+)
+
+foreach s: [ '16', '22', '24', '32', '48', '256']
+  icon_destdir = join_paths(gtk_datadir, 'icons', 'hicolor', '@0@x@0@'.format(s), 'apps')
+  icons = [join_paths('data', '@0@x@0@'.format(s), 'gtk3-widget-factory.png'),
+           join_paths('data', '@0@x@0@'.format(s), 'gtk3-widget-factory-symbolic.symbolic.png')]
+  install_data(icons, install_dir: icon_destdir)
+endforeach
+
+widget_factory = executable(
+  'gtk3-widget-factory',
+  widgetfactory_sources,
+  widgetfactory_resources,
+  dependencies: libgtk_dep,
+  include_directories : confinc,
+  install: true
+)
+
+# desktop file
+install_data('gtk3-widget-factory.desktop', install_dir: gtk_applicationsdir)

demos/widget-factory/widget-factory.c

@@ -211,15 +211,15 @@ activate_about (GSimpleAction *action,
                              gtk_get_micro_version ());
 
   gtk_show_about_dialog (GTK_WINDOW (gtk_application_get_active_window (app)),
-                         "program-name", "GTK+ Widget Factory",
+                         "program-name", "GTK Widget Factory",
                          "version", version,
-                         "copyright", "(C) 1997-2013 The GTK+ Team",
+                         "copyright", "© 1997—2019 The GTK Team",
                          "license-type", GTK_LICENSE_LGPL_2_1,
                          "website", "http://www.gtk.org",
-                         "comments", "Program to demonstrate GTK+ themes and widgets",
+                         "comments", "Program to demonstrate GTK themes and widgets",
                          "authors", authors,
                          "logo-icon-name", "gtk3-widget-factory",
-                         "title", "About GTK+ Widget Factory",
+                         "title", "About GTK Widget Factory",
                          NULL);
 
   g_free (version);
@@ -246,6 +246,14 @@ activate_quit (GSimpleAction *action,
     }
 }
 
+static void
+activate_inspector (GSimpleAction *action,
+                    GVariant      *parameter,
+                    gpointer       user_data)
+{
+  gtk_window_set_interactive_debugging (TRUE);
+}
+
 static void
 spin_value_changed (GtkAdjustment *adjustment, GtkWidget *label)
 {
@@ -1696,7 +1704,7 @@ activate (GApplication *app)
   gtk_css_provider_load_from_resource (provider, "/org/gtk/WidgetFactory/widget-factory.css");
   gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
                                              GTK_STYLE_PROVIDER (provider),
-                                             GTK_STYLE_PROVIDER_PRIORITY_USER);
+                                             GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
   g_object_unref (provider);
 
   builder = gtk_builder_new_from_resource ("/org/gtk/WidgetFactory/widget-factory.ui");
@@ -1968,6 +1976,7 @@ main (int argc, char *argv[])
   static GActionEntry app_entries[] = {
     { "about", activate_about, NULL, NULL, NULL },
     { "quit", activate_quit, NULL, NULL, NULL },
+    { "inspector", activate_inspector, NULL, NULL, NULL },
     { "main", NULL, "s", "'steak'", NULL },
     { "wine", NULL, NULL, "false", NULL },
     { "beer", NULL, NULL, "false", NULL },

demos/widget-factory/widget-factory.ui

@@ -17,6 +17,10 @@
       </item>
     </section>
     <section>
+      <item>
+        <attribute name="label" translatable="yes">_Inspector</attribute>
+        <attribute name="action">app.inspector</attribute>
+      </item>
       <item>
         <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute>
         <attribute name="action">win.show-help-overlay</attribute>

docs/reference/Makefile.am

@@ -5,4 +5,7 @@ SUBDIRS = gdk gtk libgail-util
 
 GITIGNOREFILES = */*.1
 
+EXTRA_DIST += \
+	meson.build
+
 -include $(top_srcdir)/git.mk

docs/reference/gdk/Makefile.am

@@ -198,7 +198,9 @@ endif
 include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
-EXTRA_DIST += version.xml.in
+EXTRA_DIST += \
+	version.xml.in \
+	meson.build
 
 if ENABLE_GTK_DOC
 TESTS_ENVIRONMENT = cd $(srcdir) && \

docs/reference/gdk/gdk3-overrides.txt

@@ -1,8 +1,9 @@
 
 # GdkAtom is an opaque typedef
-<STRUCT>
+<TYPEDEF>
 <NAME>GdkAtom</NAME>
-</STRUCT>
+typedef struct _GdkAtom *GdkAtom;
+</TYPEDEF>
 
 <MACRO>
 <NAME>GDK_WINDOWING_X11</NAME>

docs/reference/gdk/meson.build

@@ -0,0 +1,180 @@
+private_headers = [
+  'gdkintl.h',
+  'gdkmarshalers.h',
+  'gdkkeysyms.h',
+  'gdkinternals.h',
+  'gdkprivate.h',
+  'gdk-private.h',
+  'gdkapplaunchcontextprivate.h',
+  'gdkcursorprivate.h',
+  'gdkdevicemanagerprivate.h',
+  'gdkdeviceprivate.h',
+  'gdkdisplaymanagerprivate.h',
+  'gdkdisplayprivate.h',
+  'gdkdndprivate.h',
+  'gdkframeclockprivate.h',
+  'gdkglcontextprivate.h',
+  'gdkkeysprivate.h',
+  'gdkscreenprivate.h',
+  'gdkseatdefaultprivate.h',
+  'gdkseatprivate.h',
+  'gdkvisualprivate.h',
+  'keyname-table.h',
+  'win32',
+  'x11',
+  'quartz',
+  'broadway',
+  'wayland',
+]
+
+images = [
+  'images/rotated-text.png',
+  'images/X_cursor.png',
+  'images/arrow.png',
+  'images/based_arrow_down.png',
+  'images/based_arrow_up.png',
+  'images/boat.png',
+  'images/bogosity.png',
+  'images/bottom_left_corner.png',
+  'images/bottom_right_corner.png',
+  'images/bottom_side.png',
+  'images/bottom_tee.png',
+  'images/box_spiral.png',
+  'images/center_ptr.png',
+  'images/circle.png',
+  'images/clock.png',
+  'images/coffee_mug.png',
+  'images/cross.png',
+  'images/cross_reverse.png',
+  'images/crosshair.png',
+  'images/diamond_cross.png',
+  'images/dot.png',
+  'images/dotbox.png',
+  'images/double_arrow.png',
+  'images/draft_large.png',
+  'images/draft_small.png',
+  'images/draped_box.png',
+  'images/exchange.png',
+  'images/fleur.png',
+  'images/gobbler.png',
+  'images/gumby.png',
+  'images/hand1.png',
+  'images/hand2.png',
+  'images/heart.png',
+  'images/icon.png',
+  'images/iron_cross.png',
+  'images/left_ptr.png',
+  'images/left_side.png',
+  'images/left_tee.png',
+  'images/leftbutton.png',
+  'images/ll_angle.png',
+  'images/lr_angle.png',
+  'images/man.png',
+  'images/middlebutton.png',
+  'images/mouse.png',
+  'images/pencil.png',
+  'images/pirate.png',
+  'images/plus.png',
+  'images/question_arrow.png',
+  'images/right_ptr.png',
+  'images/right_side.png',
+  'images/right_tee.png',
+  'images/rightbutton.png',
+  'images/rtl_logo.png',
+  'images/sailboat.png',
+  'images/sb_down_arrow.png',
+  'images/sb_h_double_arrow.png',
+  'images/sb_left_arrow.png',
+  'images/sb_right_arrow.png',
+  'images/sb_up_arrow.png',
+  'images/sb_v_double_arrow.png',
+  'images/shuttle.png',
+  'images/sizing.png',
+  'images/spider.png',
+  'images/spraycan.png',
+  'images/star.png',
+  'images/target.png',
+  'images/tcross.png',
+  'images/top_left_arrow.png',
+  'images/top_left_corner.png',
+  'images/top_right_corner.png',
+  'images/top_side.png',
+  'images/top_tee.png',
+  'images/trek.png',
+  'images/ul_angle.png',
+  'images/umbrella.png',
+  'images/ur_angle.png',
+  'images/watch.png',
+  'images/xterm.png',
+  'images/alias_cursor.png',
+  'images/all_scroll_cursor.png',
+  'images/cell_cursor.png',
+  'images/col_resize_cursor.png',
+  'images/copy_cursor.png',
+  'images/crosshair_cursor.png',
+  'images/default_cursor.png',
+  'images/e_resize_cursor.png',
+  'images/ew_resize_cursor.png',
+  'images/grabbing_cursor.png',
+  'images/grab_cursor.png',
+  'images/hand_cursor.png',
+  'images/context_menu_cursor.png',
+  'images/help_cursor.png',
+  'images/move_cursor.png',
+  'images/ne_resize_cursor.png',
+  'images/nesw_resize_cursor.png',
+  'images/no_drop_cursor.png',
+  'images/not_allowed_cursor.png',
+  'images/n_resize_cursor.png',
+  'images/ns_resize_cursor.png',
+  'images/nw_resize_cursor.png',
+  'images/nwse_resize_cursor.png',
+  'images/pointer_cursor.png',
+  'images/progress_cursor.png',
+  'images/row_resize_cursor.png',
+  'images/se_resize_cursor.png',
+  'images/s_resize_cursor.png',
+  'images/sw_resize_cursor.png',
+  'images/text_cursor.png',
+  'images/vertical_text_cursor.png',
+  'images/wait_cursor.png',
+  'images/w_resize_cursor.png',
+  'images/X_cursor.png',
+  'images/zoom_in_cursor.png',
+  'images/zoom_out_cursor.png',
+]
+
+src_dir = [ gdkinc ]
+
+if x11_enabled
+  src_dir += [ gdkx11_inc ]
+endif
+
+if wayland_enabled
+  src_dir += [ gdkwayland_inc ]
+endif
+
+if get_option('gtk_doc')
+
+    configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
+
+    gnome.gtkdoc('gdk3',
+                 mode: 'none',
+                 main_xml: 'gdk-docs.sgml',
+                 src_dir: src_dir,
+                 dependencies: libgdk_dep,
+                 gobject_typesfile: join_paths(meson.current_source_dir(), 'gdk3.types'),
+                 scan_args: [
+                   '--ignore-decorators=_GDK_EXTERN|G_GNUC_WARN_UNUSED_RESULT',
+                   '--ignore-headers=' + ' '.join(private_headers),
+                 ],
+                 fixxref_args: [
+                   '--html-dir=@0@'.format(docpath),
+                   '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
+                   '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
+                   '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')),
+                   '--extra-dir=@0@'.format(cairo_docpath),
+                 ],
+                 html_assets: images,
+                 install: true)
+endif

docs/reference/gtk/Makefile.am

@@ -276,7 +276,7 @@ GTKDOC_LIBS = \
 
 
 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--output-format=xml --name-space=gtk
+MKDB_OPTIONS=--output-format=xml --name-space=gtk --default-includes=gtk/gtk.h
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =					\
@@ -287,7 +287,7 @@ content_files =					\
 	css-overview.xml			\
 	css-properties.xml			\
 	drawing-model.xml			\
-	getting_started.xml			\
+	$(builddir)/getting_started.xml			\
 	glossary.xml				\
 	gtk3-demo-application.xml		\
 	gtk3-demo.xml				\
@@ -324,7 +324,7 @@ content_files =					\
 expand_content_files = 				\
 	compiling.sgml				\
 	drawing-model.xml			\
-	getting_started.xml			\
+	$(builddir)/getting_started.xml			\
 	glossary.xml				\
 	input-handling.xml			\
 	migrating-2to3.xml			\
@@ -496,7 +496,7 @@ endif
 include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
-EXTRA_DIST += version.xml.in gtk3.types.in
+EXTRA_DIST += version.xml.in gtk3.types.in getting_started.xml.in
 
 ########################################################################
 
@@ -543,7 +543,9 @@ endif
 
 MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES)
 
-EXTRA_DIST += $(man_MANS)
+EXTRA_DIST += \
+	$(man_MANS) \
+	meson.build
 
 if ENABLE_GTK_DOC
 TESTS_ENVIRONMENT = cd $(srcdir) && \

docs/reference/gtk/getting_started.xml.in

@@ -44,7 +44,7 @@
 
     <informalexample>
       <para>Create a new file with the following content named <filename>example-0.c.</filename></para>
-      <programlisting><xi:include href="../../../../examples/window-default.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+      <programlisting><xi:include href="@abs_top_srcdir@/examples/window-default.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
     </informalexample>
 
     <para>
@@ -153,7 +153,7 @@
     <example id="gtk-getting-started-hello-world">
       <title>Hello World in GTK+</title>
       <para>Create a new file with the following content named example-1.c.</para>
-      <programlisting><xi:include href="../../../../examples/hello-world.c" parse="text">
+      <programlisting><xi:include href="@abs_top_srcdir@/examples/hello-world.c" parse="text">
           <xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
     </example>
 
@@ -233,7 +233,7 @@
     <example id="gtk-getting-started-grid-packing">
       <title>Packing buttons</title>
       <para>Create a new file with the following content named example-2.c.</para>
-      <programlisting><xi:include href="../../../../examples/grid-packing.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+      <programlisting><xi:include href="@abs_top_srcdir@/examples/grid-packing.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
     </example>
     <para>
       You can compile the program above with GCC using:
@@ -257,9 +257,9 @@
     <example>
       <title>Packing buttons with GtkBuilder</title>
       <para>Create a new file with the following content named example-3.c.</para>
-      <programlisting><xi:include href="../../../../examples/builder.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+      <programlisting><xi:include href="@abs_top_srcdir@/examples/builder.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       <para>Create a new file with the following content named builder.ui.</para>
-      <programlisting><xi:include href="../../../../examples/builder.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+      <programlisting><xi:include href="@abs_top_srcdir@/examples/builder.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
     </example>
     <para>
       You can compile the program above with GCC using:
@@ -346,7 +346,7 @@
       of our application class.</para>
 
       <informalexample>
-        <programlisting><xi:include href="../../../../examples/application1/main.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="@abs_top_srcdir@/examples/application1/main.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>All the application logic is in the application class, which
@@ -364,7 +364,7 @@
       GIO <ulink url="https://developer.gnome.org/gio/2.36/GApplication.html#GApplication.description">documentation</ulink>.</para>
 
       <informalexample>
-        <programlisting><xi:include href="../../../../examples/application1/exampleapp.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="@abs_top_srcdir@/examples/application1/exampleapp.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>Another important class that is part of the application support
@@ -373,7 +373,7 @@
       window.</para>
 
       <informalexample>
-        <programlisting><xi:include href="../../../../examples/application1/exampleappwin.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="@abs_top_srcdir@/examples/application1/exampleappwin.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>As part of the initial setup of our application, we also
@@ -388,7 +388,7 @@
       </informalfigure>
 
       <informalexample>
-        <programlisting><xi:include href="../../../../examples/application1/exampleapp.desktop" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="@abs_top_srcdir@/examples/application1/exampleapp.desktop" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>Note that <replaceable>@<!-- -->bindir@</replaceable> needs to be replaced
@@ -420,7 +420,7 @@
       </para>
 
       <informalexample>
-        <programlisting><xi:include href="../../../../examples/application2/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="@abs_top_srcdir@/examples/application2/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>To make use of this file in our application, we revisit
@@ -460,7 +460,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
       </para>
 
       <informalexample>
-        <programlisting><xi:include href="../../../../examples/application2/exampleapp.gresource.xml" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="@abs_top_srcdir@/examples/application2/exampleapp.gresource.xml" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>This file has to be converted into a C source file that will be
@@ -598,7 +598,7 @@ example_app_window_open (ExampleAppWindow *win,
       in a ui file, and add it as a resource to our binary.</para>
 
       <informalexample>
-        <programlisting><xi:include href="../../../../examples/application4/app-menu.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="@abs_top_srcdir@/examples/application4/app-menu.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>To associate the app menu with the application, we have to call
@@ -697,7 +697,7 @@ example_app_class_init (ExampleAppClass *class)
       GSettings requires a schema that describes our settings:</para>
 
       <informalexample>
-        <programlisting><xi:include href="../../../../examples/application5/org.gtk.exampleapp.gschema.xml" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="@abs_top_srcdir@/examples/application5/org.gtk.exampleapp.gschema.xml" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>Before we can make use of this schema in our application,
@@ -749,13 +749,13 @@ example_app_window_init (ExampleAppWindow *win)
       <para>Lets start with the template.</para>
 
       <informalexample>
-        <programlisting><xi:include href="../../../../examples/application6/prefs.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="@abs_top_srcdir@/examples/application6/prefs.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>Next comes the dialog subclass.</para>
 
       <informalexample>
-        <programlisting><xi:include href="../../../../examples/application6/exampleappprefs.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="@abs_top_srcdir@/examples/application6/exampleappprefs.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>Now we revisit the <literal>preferences_activated(<!-- -->)</literal> function in our
@@ -807,7 +807,7 @@ preferences_activated (GSimpleAction *action,
       to slide out the search bar below the header bar.</para>
 
       <informalexample>
-        <programlisting><xi:include href="../../../../examples/application7/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="@abs_top_srcdir@/examples/application7/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>Implementing the search needs quite a few code changes that
@@ -887,7 +887,7 @@ example_app_window_init (ExampleAppWindow *win)
       which demonstrates #GtkMenuButton, #GtkRevealer and #GtkListBox.</para>
 
       <informalexample>
-        <programlisting><xi:include href="../../../../examples/application8/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="@abs_top_srcdir@/examples/application8/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>The code to populate the sidebar with buttons for the words
@@ -898,7 +898,7 @@ example_app_window_init (ExampleAppWindow *win)
       ui file.</para>
 
       <informalexample>
-        <programlisting><xi:include href="../../../../examples/application8/gears-menu.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="@abs_top_srcdir@/examples/application8/gears-menu.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>To connect the menuitem to the show-words setting, we use
@@ -957,7 +957,7 @@ example_app_window_init (ExampleAppWindow *win)
       triggers the show-lines action:</para>
 
       <informalexample>
-        <programlisting><xi:include href="../../../../examples/application9/gears-menu.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="@abs_top_srcdir@/examples/application9/gears-menu.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>To make this menu item do something, we create a property
@@ -1017,7 +1017,7 @@ example_app_window_init (ExampleAppWindow *win)
       be a direct child of the window, and set its type to be titlebar.</para>
 
       <informalexample>
-        <programlisting><xi:include href="../../../../examples/application10/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="@abs_top_srcdir@/examples/application10/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>A small extra bonus of using a header bar is that we get
@@ -1073,7 +1073,7 @@ example_app_window_init (ExampleAppWindow *win)
     <example id="gtk-getting-started-drawing">
       <title>Drawing in response to input</title>
       <para>Create a new file with the following content named example-4.c.</para>
-      <programlisting><xi:include href="../../../../examples/drawing.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+      <programlisting><xi:include href="@abs_top_srcdir@/examples/drawing.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
     </example>
     <para>
       You can compile the program above with GCC using:

docs/reference/gtk/gtk3-sections.txt

@@ -1,6 +1,3 @@
-
-<INCLUDE>gtk/gtk.h</INCLUDE>
-
 <SECTION>
 <FILE>gtkaboutdialog</FILE>
 <TITLE>GtkAboutDialog</TITLE>
@@ -1405,6 +1402,10 @@ gtk_file_chooser_get_preview_filename
 gtk_file_chooser_get_preview_uri
 gtk_file_chooser_set_extra_widget
 gtk_file_chooser_get_extra_widget
+gtk_file_chooser_add_choice
+gtk_file_chooser_remove_choice
+gtk_file_chooser_set_choice
+gtk_file_chooser_get_choice
 gtk_file_chooser_add_filter
 gtk_file_chooser_remove_filter
 gtk_file_chooser_list_filters
@@ -7089,7 +7090,6 @@ GtkPrintOperationPrivate
 
 
 <SECTION>
-<INCLUDE>gtk/gtkunixprint.h</INCLUDE>
 <FILE>gtkprintunixdialog</FILE>
 <TITLE>GtkPrintUnixDialog</TITLE>
 GtkPrintUnixDialog
@@ -7436,7 +7436,6 @@ gtk_print_context_get_type
 
 
 <SECTION>
-<INCLUDE>gtk/gtkunixprint.h</INCLUDE>
 <FILE>gtkprintjob</FILE>
 <TITLE>GtkPrintJob</TITLE>
 GtkPrintJob
@@ -7488,7 +7487,6 @@ gtk_print_job_get_type
 
 
 <SECTION>
-<INCLUDE>gtk/gtkunixprint.h</INCLUDE>
 <FILE>gtkpagesetupunixdialog</FILE>
 <TITLE>GtkPageSetupUnixDialog</TITLE>
 GtkPageSetupUnixDialog

docs/reference/gtk/meson.build

@@ -0,0 +1,535 @@
+private_headers = [
+  'inspector',
+  'a11y',
+  'gtkaccelgroupprivate.h',
+  'gtkaccelmapprivate.h',
+  'gtkadjustmentprivate.h',
+  'gtkallocatedbitmaskprivate.h',
+  'gtkappchooserprivate.h',
+  'gtkapplicationaccelsprivate.h',
+  'gtkapplicationprivate.h',
+  'gtkbindingsprivate.h',
+  'gtkbitmaskprivate.h',
+  'gtkboxprivate.h',
+  'gtkbuilderprivate.h',
+  'gtkbuttonprivate.h',
+  'gtkcairoblurprivate.h',
+  'gtkcellareaboxcontextprivate.h',
+  'gtkclipboardprivate.h',
+  'gtkcolorchooserprivate.h',
+  'gtkcoloreditorprivate.h',
+  'gtkcolorplaneprivate.h',
+  'gtkcolorscaleprivate.h',
+  'gtkcolorswatchprivate.h',
+  'gtkcomboboxprivate.h',
+  'gtkcontainerprivate.h',
+  'gtkcssanimatedstyleprivate.h',
+  'gtkcssanimationprivate.h',
+  'gtkcssarrayvalueprivate.h',
+  'gtkcssbgsizevalueprivate.h',
+  'gtkcssbordervalueprivate.h',
+  'gtkcsscolorvalueprivate.h',
+  'gtkcsscornervalueprivate.h',
+  'gtkcsscustompropertyprivate.h',
+  'gtkcsseasevalueprivate.h',
+  'gtkcssenginevalueprivate.h',
+  'gtkcssenumvalueprivate.h',
+  'gtkcssiconthemevalueprivate.h',
+  'gtkcssimagebuiltinprivate.h',
+  'gtkcssimagecrossfadeprivate.h',
+  'gtkcssimagegradientprivate.h',
+  'gtkcssimageiconthemeprivate.h',
+  'gtkcssimagelinearprivate.h',
+  'gtkcssimageprivate.h',
+  'gtkcssimagescaledprivate.h',
+  'gtkcssimagesurfaceprivate.h',
+  'gtkcssimageurlprivate.h',
+  'gtkcssimagevalueprivate.h',
+  'gtkcssimagewin32private.h',
+  'gtkcssinheritvalueprivate.h',
+  'gtkcssinitialvalueprivate.h',
+  'gtkcsskeyframesprivate.h',
+  'gtkcsslookupprivate.h',
+  'gtkcssmatcherprivate.h',
+  'gtkcssnodeprivate.h',
+  'gtkcssnodedeclarationprivate.h',
+  'gtkcssnumbervalueprivate.h',
+  'gtkcsspathnodeprivate.h',
+  'gtkcssparserprivate.h',
+  'gtkcsspositionvalueprivate.h',
+  'gtkcssproviderprivate.h',
+  'gtkcssrepeatvalueprivate.h',
+  'gtkcssrgbavalueprivate.h',
+  'gtkcsssectionprivate.h',
+  'gtkcssselectorprivate.h',
+  'gtkcssshadowsvalueprivate.h',
+  'gtkcssshadowvalueprivate.h',
+  'gtkcssshorthandpropertyprivate.h',
+  'gtkcssstaticstyleprivate.h',
+  'gtkcssstringvalueprivate.h',
+  'gtkcssstylefuncsprivate.h',
+  'gtkcssstyleprivate.h',
+  'gtkcssstylepropertyprivate.h',
+  'gtkcsstransformvalueprivate.h',
+  'gtkcsstransientnodeprivate.h',
+  'gtkcsstransitionprivate.h',
+  'gtkcsstypedvalueprivate.h',
+  'gtkcsstypesprivate.h',
+  'gtkcssunsetvalueprivate.h',
+  'gtkcssvalueprivate.h',
+  'gtkcsswidgetnodeprivate.h',
+  'gtkdialogprivate.h',
+  'gtkentryprivate.h',
+  'gtkeventcontrollerprivate.h',
+  'gtkfilechooserprivate.h',
+  'gtkfilechooserwidgetprivate.h',
+  'gtkfontchooserprivate.h',
+  'gtkgesturedragprivate.h',
+  'gtkgesturelongpressprivate.h',
+  'gtkgesturemultipressprivate.h',
+  'gtkgesturepanprivate.h',
+  'gtkgestureprivate.h',
+  'gtkgesturerotateprivate.h',
+  'gtkgesturesingleprivate.h',
+  'gtkgestureswipeprivate.h',
+  'gtkgesturezoomprivate.h',
+  'gtkheaderbarprivate.h',
+  'gtkhslaprivate.h',
+  'gtkiconhelperprivate.h',
+  'gtkiconviewprivate.h',
+  'gtkimageprivate.h',
+  'gtkimmoduleprivate.h',
+  'gtklabelprivate.h',
+  'gtklockbuttonprivate.h',
+  'gtkmagnifierprivate.h',
+  'gtkmenubuttonprivate.h',
+  'gtkmenuitemprivate.h',
+  'gtkmenuprivate.h',
+  'gtkmenushellprivate.h',
+  'gtkmodulesprivate.h',
+  'gtkmountoperationprivate.h',
+  'gtkorientableprivate.h',
+  'gtkpixelcacheprivate.h',
+  'gtkplacessidebarprivate.h',
+  'gtkplacesviewprivate.h',
+  'gtkplacesviewrowprivate.h',
+  'gtkpopoverprivate.h',
+  'gtkprinter-private.h',
+  'gtkprintoperation-private.h',
+  'gtkprivate.h',
+  'gtkrangeprivate.h',
+  'gtkrecentchooserprivate.h',
+  'gtkrenderbackgroundprivate.h',
+  'gtkrenderborderprivate.h',
+  'gtkrendericonprivate.h',
+  'gtkrenderprivate.h',
+  'gtkroundedboxprivate.h',
+  'gtkscaleprivate.h',
+  'gtksearchengine.h',
+  'gtksearchenginemodel.h',
+  'gtksearchenginequartz.h',
+  'gtksearchenginesimple.h',
+  'gtksearchenginetracker.h',
+  'gtksearchentryprivate.h',
+  'gtkselectionprivate.h',
+  'gtksettingsprivate.h',
+  'gtksidebarrowprivate.h',
+  'gtksizegroup-private.h',
+  'gtksizerequestcacheprivate.h',
+  'gtksocketprivate.h',
+  'gtkstyleanimationprivate.h',
+  'gtkstylecascadeprivate.h',
+  'gtkstylecontextprivate.h',
+  'gtkstylepropertyprivate.h',
+  'gtkstyleproviderprivate.h',
+  'gtktextattributesprivate.h',
+  'gtktextchildprivate.h',
+  'gtktexthandleprivate.h',
+  'gtktextiterprivate.h',
+  'gtktextmarkprivate.h',
+  'gtktexttagprivate.h',
+  'gtktogglebuttonprivate.h',
+  'gtktoolbarprivate.h',
+  'gtktoolpaletteprivate.h',
+  'gtktooltipprivate.h',
+  'gtktooltipwindowprivate.h',
+  'gtktreeprivate.h',
+  'gtkwidgetprivate.h',
+  'gtkwin32themeprivate.h',
+  'gtkwindowprivate.h',
+  'fnmatch.h',
+  'gtkactionmuxer.h',
+  'gtkactionobserver.h',
+  'gtkactionobservable.h',
+  'gtk9slice.h',
+  'gtkanimationdescription.h',
+  'gtkbitmaskprivateimpl.h',
+  'gtkbookmarksmanager.h',
+  'gtkdbusgenerated.c',
+  'gtkdbusgenerated.h',
+  'gtkdebug.h',
+  'gtkactionhelper.h',
+  'gtkdndcursors.h',
+  'gtkfilechooserdefault.h',
+  'gtkfilechooserembed.h',
+  'gtkfilechooserentry.h',
+  'gtkfilechoosersettings.h',
+  'gtkfilechooserutils.h',
+  'gtkfilesystem.h',
+  'gtkfilesystemmodel.h',
+  'gtkfilesystemunix.h',
+  'gtkfilesystemwin32.h',
+  'gtkfontchooserutils.h',
+  'gtkiconcache.h',
+  'gtkiconcachevalidator.h',
+  'gtkiconthemeparser.h',
+  'gtkintl.h',
+  'gtkkeyhash.h',
+  'gtkkineticscrolling.h',
+  'gtkmarshal.h',
+  'gtkmnemonichash.h',
+  'gtkmenutracker.h',
+  'gtkmenutrackeritem.h',
+  'gtkmenusectionbox.h',
+  'gtkmodelmenu.h',
+  'gtkmodelmenuitem.h',
+  'gtkmodifierstyle.h',
+  'gtkpathbar.h',
+  'gtkprintbackend.h',
+  'gtkprinteroption.h',
+  'gtkprinteroptionset.h',
+  'gtkprinteroptionwidget.h',
+  'gtkprint-win32.h',
+  'gtkprintutils.h',
+  'gtkprivate.h',
+  'gtkprivatetypebuiltins.h',
+  'gtkquery.h',
+  'gtkrbtree.h',
+  'gtkrecentchooserdefault.h',
+  'gtkrecentchooserutils.h',
+  'gtksearchengine.h',
+  'gtksearchenginetracker.h',
+  'gtksearchenginesimple.h',
+  'gtksearchenginequartz.h',
+  'gtksequence.h',
+  'gtksocketprivate.h',
+  'gtktextbtree.h',
+  'gtktextbufferserialize.h',
+  'gtktextdisplay.h',
+  'gtktextlayout.h',
+  'gtktextsegment.h',
+  'gtktexttypes.h',
+  'gtktextutil.h',
+  'gtktimeline.h',
+  'gtkthemes.h',
+  'gtktrashmonitor.h',
+  'gtktrayicon.h',
+  'gtktreedatalist.h',
+  'gtktreemenu.h',
+  'gtktypebuiltins.h',
+  'gtkxembed.h',
+  'gtkwin32embed.h',
+  'gtkwin32embedwidget.h',
+  'gtkwindow-decorate.h',
+  'xdgmime',
+  'xembed.h',
+]
+
+images = [
+  'images/aboutdialog.png',
+  'images/accel-label.png',
+  'images/action-bar.png',
+  'images/appchooserbutton.png',
+  'images/appchooserdialog.png',
+  'images/assistant.png',
+  'images/box-packing.png',
+  'images/box-expand.png',
+  'images/button.png',
+  'images/check-button.png',
+  'images/color-button.png',
+  'images/colorchooser.png',
+  'images/combo-box.png',
+  'images/combo-box-entry.png',
+  'images/combo-box-text.png',
+  'images/entry.png',
+  'images/figure-hierarchical-drawing.png',
+  'images/figure-windowed-label.png',
+  'images/file-button.png',
+  'images/filechooser.png',
+  'images/font-button.png',
+  'images/fontchooser.png',
+  'images/frame.png',
+  'images/glarea.png',
+  'images/headerbar.png',
+  'images/icon-view.png',
+  'images/image.png',
+  'images/info-bar.png',
+  'images/label.png',
+  'images/levelbar.png',
+  'images/link-button.png',
+  'images/list-and-tree.png',
+  'images/lock-button.png',
+  'images/lockbutton.png',
+  'images/lockbutton-locked.png',
+  'images/lockbutton-unlocked.png',
+  'images/lockbutton-sorry.png',
+  'images/menubar.png',
+  'images/menu-button.png',
+  'images/messagedialog.png',
+  'images/multiline-text.png',
+  'images/notebook.png',
+  'images/panes.png',
+  'images/pagesetupdialog.png',
+  'images/placessidebar.png',
+  'images/popup-anchors.png',
+  'images/popup-flip.png',
+  'images/popup-slide.png',
+  'images/printdialog.png',
+  'images/progressbar.png',
+  'images/radio-group.png',
+  'images/recentchooserdialog.png',
+  'images/scales.png',
+  'images/scrollbar.png',
+  'images/scrolledwindow.png',
+  'images/search-bar.png',
+  'images/search-entry.png',
+  'images/separator.png',
+  'images/sidebar.png',
+  'images/spinbutton.png',
+  'images/spinner.png',
+  'images/stack.png',
+  'images/stackswitcher.png',
+  'images/statusbar.png',
+  'images/toggle-button.png',
+  'images/toolbar.png',
+  'images/toolpalette.png',
+  'images/tree-view-coordinates.png',
+  'images/volumebutton.png',
+  'images/window.png',
+  'images/layout-btlr.png',
+  'images/layout-btrl.png',
+  'images/layout-lrbt.png',
+  'images/layout-lrtb.png',
+  'images/layout-rlbt.png',
+  'images/layout-rltb.png',
+  'images/layout-tblr.png',
+  'images/layout-tbrl.png',
+  'images/widget-hvalign.png',
+  'images/window-default.png',
+  'images/hello-world.png',
+  'images/grid-packing.png',
+  'images/drawing.png',
+  'images/switch.png',
+  'images/linear.png',
+  'images/ease.png',
+  'images/ease-in-out.png',
+  'images/ease-in.png',
+  'images/ease-out.png',
+  'images/gradient1.png',
+  'images/gradient2.png',
+  'images/gradient3.png',
+  'images/gradient4.png',
+  'images/border1.png',
+  'images/border2.png',
+  'images/border3.png',
+  'images/slices.png',
+  'images/checks.png',
+  'images/options.png',
+  'images/arrows.png',
+  'images/expanders.png',
+  'images/background.png',
+  'images/frames.png',
+  'images/frame-gap.png',
+  'images/sliders.png',
+  'images/focus.png',
+  'images/handles.png',
+  'images/extensions.png',
+  'images/numerableicon.png',
+  'images/numerableicon2.png',
+  'images/bloatpad-osx.png',
+  'images/bloatpad-gnome.png',
+  'images/bloatpad-xfce.png',
+  'images/down-center.png',
+  'images/down-end.png',
+  'images/down-start.png',
+  'images/left-center.png',
+  'images/left-end.png',
+  'images/left-start.png',
+  'images/right-center.png',
+  'images/right-end.png',
+  'images/right-start.png',
+  'images/up-center.png',
+  'images/up-end.png',
+  'images/up-start.png',
+  'images/list-box.png',
+  'images/getting-started-app1.png',
+  'images/getting-started-app2.png',
+  'images/getting-started-app3.png',
+  'images/getting-started-app4.png',
+  'images/getting-started-app6.png',
+  'images/getting-started-app7.png',
+  'images/getting-started-app8.png',
+  'images/getting-started-app9.png',
+  'images/getting-started-app10.png',
+  'images/exampleapp.png',
+  'images/flow-box.png',
+  'images/inspector.png',
+  'images/gedit-shortcuts.png',
+  'images/clocks-shortcuts.png',
+  'images/builder-shortcuts.png',
+]
+
+content_files = [
+  'broadway.xml',
+  'broadwayd.xml',
+  'building.sgml',
+  'css-overview.xml',
+  'css-properties.xml',
+  'gtk3-demo-application.xml',
+  'gtk3-demo.xml',
+  'gtk3-icon-browser.xml',
+  'gtk3-widget-factory.xml',
+  'gtk-builder-tool.xml',
+  'gtk-encode-symbolic-svg.xml',
+  'gtk-launch.xml',
+  'gtk-query-immodules-3.0.xml',
+  'gtk-query-settings.xml',
+  'gtk-update-icon-cache.xml',
+  'mir.xml',
+  'osx.sgml',
+  'overview.xml',
+  'resources.sgml',
+  'running.sgml',
+  'visual_index.xml',
+  'wayland.xml',
+  'windows.sgml',
+  'x11.sgml',
+]
+
+expand_content_files = [
+  'compiling.sgml',
+  'drawing-model.xml',
+  join_paths(meson.current_build_dir(), 'getting_started.xml'),
+  'glossary.xml',
+  'input-handling.xml',
+  'migrating-2to3.xml',
+  'migrating-3xtoy.xml',
+  'migrating-checklist.sgml',
+  'migrating-GtkGrid.xml',
+  'migrating-GtkStyleContext.xml',
+  'migrating-smclient-GtkApplication.xml',
+  'migrating-unique-GtkApplication.xml',
+  'question_index.sgml',
+  'text_widget.sgml',
+  'tree_widget.sgml',
+]
+
+content_files += expand_content_files
+
+types_conf = configuration_data()
+if os_win32
+  types_conf.set('DISABLE_ON_W32', '%')
+else
+  types_conf.set('DISABLE_ON_W32', '')
+endif
+
+if os_darwin
+  types_conf.set('DISABLE_ON_QUARTZ', '%')
+else
+  types_conf.set('DISABLE_ON_QUARTZ', '')
+endif
+
+if x11_enabled
+  types_conf.set('ENABLE_ON_X11', '')
+else
+  types_conf.set('ENABLE_ON_X11', '%')
+endif
+
+if get_option('gtk_doc')
+
+    configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
+    configure_file(input: 'getting_started.xml.in', output: 'getting_started.xml', configuration: src_dir_conf)
+
+    gnome.gtkdoc('gtk3',
+                 mode: 'none',
+                 main_xml: 'gtk-docs.sgml',
+                 src_dir: [
+                   gtkinc,
+                ],
+                 dependencies: libgtk_dep,
+                 gobject_typesfile: configure_file(
+                   input: 'gtk3.types.in',
+                   output: 'gtk3.types',
+                   configuration: types_conf,
+                 ),
+                 scan_args: [
+                   '--ignore-decorators=_GDK_EXTERN|G_GNUC_WARN_UNUSED_RESULT',
+                   '--ignore-headers=' + ' '.join(private_headers),
+                 ],
+                 mkdb_args: [
+                   '--default-includes=gtk/gtk.h',
+                 ],
+                 fixxref_args: [
+                   '--html-dir=@0@'.format(docpath),
+                   '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
+                   '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
+                   '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')),
+                   '--extra-dir=@0@'.format(cairo_docpath),
+                   '--extra-dir=@0@'.format(gdkpixbuf_docpath),
+                   '--extra-dir=../gdk',
+                 ],
+                 content_files: content_files,
+                 expand_content_files: expand_content_files,
+                 html_assets: images,
+                 install: true)
+endif
+
+xsltproc = find_program('xsltproc', required: false)
+if get_option('man') and not xsltproc.found()
+  error('No xsltproc found, but man pages were explicitly enabled')
+endif
+
+if get_option('man') and xsltproc.found()
+  xlstproc_flags = [
+    '--nonet',
+    '--stringparam', 'man.output.quietly', '1',
+    '--stringparam', 'funcsynopsis.style', 'ansi',
+    '--stringparam', 'man.th.extra1.suppress', '1',
+    '--stringparam', 'man.authors.section.enabled', '0',
+    '--stringparam', 'man.copyright.section.enabled', '0',
+  ]
+
+  man_files = [
+    [ 'gtk-query-immodules-3.0', '1', ],
+    [ 'gtk-update-icon-cache', '1', ],
+    [ 'gtk-encode-symbolic-svg', '1', ],
+    [ 'gtk-launch', '1', ],
+    [ 'gtk3-demo', '1', ],
+    [ 'gtk3-demo-application', '1', ],
+    [ 'gtk3-widget-factory', '1', ],
+    [ 'gtk3-icon-browser', '1', ],
+    [ 'gtk-builder-tool', '1', ],
+    [ 'gtk-query-settings', '1', ],
+  ]
+
+  if broadway_enabled
+    man_files += [[ 'broadwayd', '1', ]]
+  endif
+
+  foreach man: man_files
+    man_name = man.get(0)
+    man_section = man.get(1, '1')
+    custom_target('@0@.@1@'.format(man_name, man_section),
+                  input: '@0@.xml'.format(man_name),
+                  output: '@0@.@1@'.format(man_name, man_section),
+                  command: [
+                    xsltproc,
+                    xlstproc_flags,
+                    '-o', '@OUTPUT@',
+                    'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl',
+                    '@INPUT@',
+                  ],
+                  install: true,
+                  install_dir: join_paths(get_option('mandir'), 'man@0@'.format(man_section)))
+  endforeach
+endif

docs/reference/libgail-util/Makefile.am

@@ -34,6 +34,8 @@ HTML_IMAGES =
 include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
-EXTRA_DIST += version.xml.in
+EXTRA_DIST += \
+	version.xml.in \
+	meson.build
 
 -include $(top_srcdir)/git.mk

docs/reference/libgail-util/meson.build

@@ -0,0 +1,21 @@
+if get_option('gtk_doc')
+    configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
+
+    gnome.gtkdoc('gail-libgail-util3',
+                 mode: 'none',
+                 main_xml: 'gail-libgail-util-docs.sgml',
+                 src_dir: libgailutilinc,
+                 dependencies: [libgtk_dep, libgailutil],
+                 gobject_typesfile: join_paths(meson.current_source_dir(), 'gail-libgail-util3.types'),
+                 scan_args: [
+                   '--ignore-decorators=_GDK_EXTERN|G_GNUC_WARN_UNUSED_RESULT',
+                 ],
+                 fixxref_args: [
+                   '--html-dir=@0@'.format(docpath),
+                   '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
+                   '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
+                   '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')),
+                   '--extra-dir=../gtk',
+                 ],
+                 install: true)
+endif

docs/reference/meson.build

@@ -0,0 +1,22 @@
+if get_option('gtk_doc')
+    glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
+    glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
+
+    cairo_prefix = dependency('cairo-gobject').get_pkgconfig_variable('prefix')
+    cairo_docpath = join_paths(cairo_prefix, 'share', 'gtk-doc', 'html', 'cairo')
+
+    gdkpixbuf_prefix = dependency('gdk-pixbuf-2.0').get_pkgconfig_variable('prefix')
+    gdkpixbuf_docpath = join_paths(gdkpixbuf_prefix, 'share', 'gtk-doc', 'html', 'gdk-pixbuf')
+
+    docpath = join_paths(gtk_datadir, 'gtk-doc', 'html')
+
+    version_conf = configuration_data()
+    version_conf.set('GTK_VERSION', meson.project_version())
+
+    src_dir_conf = configuration_data()
+    src_dir_conf.set('abs_top_srcdir', meson.source_root())
+endif
+
+subdir('gdk')
+subdir('gtk')
+subdir('libgail-util')

docs/tools/Makefile.am

@@ -20,6 +20,9 @@ LDADDS = \
 	$(GDK_DEP_LIBS)			\
 	-lm
 
+EXTRA_DIST += \
+	meson.build
+
 if USE_X11
 noinst_PROGRAMS = 		\
 	doc-shooter

docs/tools/meson.build

@@ -0,0 +1,12 @@
+if x11_enabled
+  doc_shooter_sources = [
+    'shadow.c',
+    'shooter.c',
+    'widgets.c',
+    '../../tests/gtkgears.c',
+  ]
+
+  doc_shooter = executable('doc-shooter', doc_shooter_sources,
+                           include_directories: [ confinc, gdkinc, gtkinc, testinc, ],
+                           dependencies: libgtk_dep)
+endif

examples/Makefile.am

@@ -31,6 +31,8 @@ noinst_PROGRAMS = \
 	search-bar				\
 	listbox-dnd
 
-EXTRA_DIST = builder.ui
+EXTRA_DIST = \
+	builder.ui \
+	meson.build
 
 -include $(top_srcdir)/git.mk

examples/application1/Makefile.am

@@ -17,4 +17,7 @@ exampleapp_SOURCES = 				\
 	exampleapp.c exampleapp.h 		\
 	exampleappwin.c exampleappwin.h
 
+EXTRA_DIST = \
+	meson.build
+
 -include $(top_srcdir)/git.mk

examples/application1/meson.build

@@ -0,0 +1,11 @@
+
+
+app1 = executable(
+  'exampleapp',
+  'main.c',
+  'exampleapp.c',
+  'exampleapp.h',
+  'exampleappwin.c',
+  'exampleappwin.h',
+  dependencies: libgtk_dep
+)

examples/application10/Makefile.am

@@ -41,7 +41,8 @@ EXTRA_DIST = 					\
 	prefs.ui 				\
 	gears-menu.ui 				\
 	exampleapp.gresource.xml 		\
-	org.gtk.exampleapp.gschema.xml
+	org.gtk.exampleapp.gschema.xml	\
+	meson.build
 
 CLEANFILES = 					\
 	gschemas.compiled

examples/application10/meson.build

@@ -0,0 +1,23 @@
+
+app10_resources = gnome.compile_resources(
+  'exampleapp10 resources',
+  'exampleapp.gresource.xml',
+  source_dir: '.'
+)
+
+app10_schemas = gnome.compile_schemas()
+
+
+app10 = executable(
+  'exampleapp10',
+  'main.c',
+  'exampleapp.c',
+  'exampleapp.h',
+  'exampleappwin.c',
+  'exampleappwin.h',
+  'exampleappprefs.c',
+  'exampleappprefs.h',
+  app10_resources,
+  app10_schemas,
+  dependencies: libgtk_dep
+)

examples/application2/Makefile.am

@@ -26,6 +26,7 @@ resources.c: exampleapp.gresource.xml window.ui
 
 EXTRA_DIST = 					\
 	window.ui 				\
-	exampleapp.gresource.xml
+	exampleapp.gresource.xml	\
+	meson.build
 
 -include $(top_srcdir)/git.mk

examples/application2/meson.build

@@ -0,0 +1,17 @@
+
+app2_resources = gnome.compile_resources(
+  'exampleapp2 resources',
+  'exampleapp.gresource.xml',
+  source_dir: '.'
+)
+
+app2 = executable(
+  'exampleapp2',
+  'main.c',
+  'exampleapp.c',
+  'exampleapp.h',
+  'exampleappwin.c',
+  'exampleappwin.h',
+  app2_resources,
+  dependencies: libgtk_dep
+)

examples/application3/Makefile.am

@@ -26,6 +26,7 @@ resources.c: exampleapp.gresource.xml window.ui
 
 EXTRA_DIST = 					\
 	window.ui 				\
-	exampleapp.gresource.xml
+	exampleapp.gresource.xml	\
+	meson.build
 
 -include $(top_srcdir)/git.mk

examples/application3/meson.build

@@ -0,0 +1,17 @@
+
+app3_resources = gnome.compile_resources(
+  'exampleapp3 resources',
+  'exampleapp.gresource.xml',
+  source_dir: '.'
+)
+
+app3 = executable(
+  'exampleapp3',
+  'main.c',
+  'exampleapp.c',
+  'exampleapp.h',
+  'exampleappwin.c',
+  'exampleappwin.h',
+  app3_resources,
+  dependencies: libgtk_dep
+)

examples/application4/Makefile.am

@@ -27,6 +27,7 @@ resources.c: exampleapp.gresource.xml window.ui app-menu.ui
 EXTRA_DIST = 					\
 	window.ui 				\
 	app-menu.ui 				\
-	exampleapp.gresource.xml
+	exampleapp.gresource.xml	\
+	meson.build
 
 -include $(top_srcdir)/git.mk

examples/application4/meson.build

@@ -0,0 +1,17 @@
+
+app4_resources = gnome.compile_resources(
+  'exampleapp4 resources',
+  'exampleapp.gresource.xml',
+  source_dir: '.'
+)
+
+app4 = executable(
+  'exampleapp4',
+  'main.c',
+  'exampleapp.c',
+  'exampleapp.h',
+  'exampleappwin.c',
+  'exampleappwin.h',
+  app4_resources,
+  dependencies: libgtk_dep
+)

examples/application5/Makefile.am

@@ -38,7 +38,8 @@ EXTRA_DIST = 					\
 	window.ui 				\
 	app-menu.ui 				\
 	exampleapp.gresource.xml 		\
-	org.gtk.exampleapp.gschema.xml
+	org.gtk.exampleapp.gschema.xml	\
+	meson.build
 
 CLEANFILES = 					\
 	gschemas.compiled

examples/application5/meson.build

@@ -0,0 +1,21 @@
+
+app5_resources = gnome.compile_resources(
+  'exampleapp5 resources',
+  'exampleapp.gresource.xml',
+  source_dir: '.'
+)
+
+app5_schemas = gnome.compile_schemas()
+
+
+app5 = executable(
+  'exampleapp5',
+  'main.c',
+  'exampleapp.c',
+  'exampleapp.h',
+  'exampleappwin.c',
+  'exampleappwin.h',
+  app5_resources,
+  app5_schemas,
+  dependencies: libgtk_dep
+)

examples/application6/Makefile.am

@@ -40,7 +40,8 @@ EXTRA_DIST = 					\
 	app-menu.ui 				\
 	prefs.ui 				\
 	exampleapp.gresource.xml 		\
-	org.gtk.exampleapp.gschema.xml
+	org.gtk.exampleapp.gschema.xml	\
+	meson.build
 
 CLEANFILES = 					\
 	gschemas.compiled

examples/application6/meson.build

@@ -0,0 +1,23 @@
+
+app6_resources = gnome.compile_resources(
+  'exampleapp6 resources',
+  'exampleapp.gresource.xml',
+  source_dir: '.'
+)
+
+app6_schemas = gnome.compile_schemas()
+
+
+app6 = executable(
+  'exampleapp6',
+  'main.c',
+  'exampleapp.c',
+  'exampleapp.h',
+  'exampleappwin.c',
+  'exampleappwin.h',
+  'exampleappprefs.c',
+  'exampleappprefs.h',
+  app6_resources,
+  app6_schemas,
+  dependencies: libgtk_dep
+)

examples/application7/Makefile.am

@@ -40,7 +40,8 @@ EXTRA_DIST = 					\
 	app-menu.ui 				\
 	prefs.ui 				\
 	exampleapp.gresource.xml 		\
-	org.gtk.exampleapp.gschema.xml
+	org.gtk.exampleapp.gschema.xml	\
+	meson.build
 
 CLEANFILES = 					\
 	gschemas.compiled

examples/application7/meson.build

@@ -0,0 +1,23 @@
+
+app7_resources = gnome.compile_resources(
+  'exampleapp7 resources',
+  'exampleapp.gresource.xml',
+  source_dir: '.'
+)
+
+app7_schemas = gnome.compile_schemas()
+
+
+app7 = executable(
+  'exampleapp7',
+  'main.c',
+  'exampleapp.c',
+  'exampleapp.h',
+  'exampleappwin.c',
+  'exampleappwin.h',
+  'exampleappprefs.c',
+  'exampleappprefs.h',
+  app7_resources,
+  app7_schemas,
+  dependencies: libgtk_dep
+)

examples/application8/Makefile.am

@@ -41,7 +41,8 @@ EXTRA_DIST = 					\
 	prefs.ui 				\
 	gears-menu.ui 				\
 	exampleapp.gresource.xml 		\
-	org.gtk.exampleapp.gschema.xml
+	org.gtk.exampleapp.gschema.xml	\
+	meson.build
 
 CLEANFILES = 					\
 	gschemas.compiled

examples/application8/meson.build

@@ -0,0 +1,23 @@
+
+app8_resources = gnome.compile_resources(
+  'exampleapp8 resources',
+  'exampleapp.gresource.xml',
+  source_dir: '.'
+)
+
+app8_schemas = gnome.compile_schemas()
+
+
+app8 = executable(
+  'exampleapp8',
+  'main.c',
+  'exampleapp.c',
+  'exampleapp.h',
+  'exampleappwin.c',
+  'exampleappwin.h',
+  'exampleappprefs.c',
+  'exampleappprefs.h',
+  app8_resources,
+  app8_schemas,
+  dependencies: libgtk_dep
+)

examples/application9/Makefile.am

@@ -41,7 +41,8 @@ EXTRA_DIST = 					\
 	prefs.ui 				\
 	gears-menu.ui 				\
 	exampleapp.gresource.xml 		\
-	org.gtk.exampleapp.gschema.xml
+	org.gtk.exampleapp.gschema.xml	\
+	meson.build
 
 CLEANFILES = 					\
 	gschemas.compiled

examples/application9/meson.build

@@ -0,0 +1,23 @@
+
+app9_resources = gnome.compile_resources(
+  'exampleapp9 resources',
+  'exampleapp.gresource.xml',
+  source_dir: '.'
+)
+
+app9_schemas = gnome.compile_schemas()
+
+
+app9 = executable(
+  'exampleapp9',
+  'main.c',
+  'exampleapp.c',
+  'exampleapp.h',
+  'exampleappwin.c',
+  'exampleappwin.h',
+  'exampleappprefs.c',
+  'exampleappprefs.h',
+  app9_resources,
+  app9_schemas,
+  dependencies: libgtk_dep
+)

examples/bp/Makefile.am

@@ -27,6 +27,8 @@ bloatpad-gresources.c: $(resource_files)
 
 CLEANFILES = bloatpad-gresources.c
 
-EXTRA_DIST = $(resource_files)
+EXTRA_DIST = \
+	$(resource_files) \
+	meson.build
 
 -include $(top_srcdir)/git.mk

examples/bp/bloatpad.c

@@ -537,6 +537,7 @@ bloat_pad_startup (GApplication *application)
     { "win.justify::center", { "<Primary>m", NULL } },
     { "win.justify::right", { "<Primary>r", NULL } }
   };
+  const gchar *new_accels[] = { "<Primary>n", "<Primary>t", NULL };
 
   G_APPLICATION_CLASS (bloat_pad_parent_class)
     ->startup (application);
@@ -604,7 +605,6 @@ bloat_pad_startup (GApplication *application)
   g_object_unref (item);
   g_object_unref (icon);
 
-  const gchar *new_accels[] = { "<Primary>n", "<Primary>t", NULL };
   gtk_application_set_accels_for_action (GTK_APPLICATION (application), "app.new", new_accels);
 
   dump_accels (GTK_APPLICATION (application));

examples/bp/meson.build

@@ -0,0 +1,13 @@
+
+bp_resources = gnome.compile_resources(
+  'bloatpad resources',
+  'bloatpad.gresources.xml',
+  source_dir: '.'
+)
+
+bloatpad = executable(
+  'bloatpad',
+  'bloatpad.c',
+  bp_resources,
+  dependencies: libgtk_dep
+)

examples/meson.build

@@ -0,0 +1,60 @@
+builder_example = executable(
+  'builder_example',
+  'builder.c',
+  dependencies: libgtk_dep
+)
+
+drawing = executable(
+  'drawing',
+  'drawing.c',
+  dependencies: libgtk_dep
+)
+
+grid_packing = executable(
+  'grid-packing',
+  'grid-packing.c',
+  dependencies: libgtk_dep
+)
+
+hello_world = executable(
+  'hello-world',
+  'hello-world.c',
+  dependencies: libgtk_dep
+)
+
+plugman = executable(
+  'plugman',
+  'plugman.c',
+  dependencies: libgtk_dep
+)
+
+search_bar = executable(
+  'search-bar',
+  'search-bar.c',
+  dependencies: libgtk_dep
+)
+
+sunny = executable(
+  'sunny',
+  'sunny.c',
+  dependencies: libgtk_dep
+)
+
+window_default = executable(
+  'window-default',
+  'window-default.c',
+  dependencies: libgtk_dep
+)
+
+
+subdir('bp')
+subdir('application1')
+subdir('application2')
+subdir('application3')
+subdir('application4')
+subdir('application5')
+subdir('application6')
+subdir('application7')
+subdir('application8')
+subdir('application9')
+subdir('application10')

gdk/Makefile.am

@@ -31,7 +31,10 @@ EXTRA_DIST += 			\
 	makefile.msc		\
 	gdkenumtypes.c.template	\
 	gdkenumtypes.h.template	\
-	gdkversionmacros.h.in
+	gdkversionmacros.h.in	\
+	meson.build \
+	gen-gdk-gresources-xml.py \
+	gdkconfig.h.meson
 
 GDK_CFLAGS_DEFINES =	\
 	-DG_LOG_USE_STRUCTURED=1	\
@@ -112,6 +115,7 @@ gdk_h_sources =					\
 gdk_private_headers = 				\
 	gdk-private.h				\
 	gdkapplaunchcontextprivate.h		\
+	gdkconstructor.h		\
 	gdkcursorprivate.h			\
 	gdkdevicemanagerprivate.h		\
 	gdkdeviceprivate.h			\
@@ -125,6 +129,7 @@ gdk_private_headers = 				\
 	gdkframeclockprivate.h			\
 	gdkglcontextprivate.h			\
 	gdkmonitorprivate.h			\
+	gdkprofilerprivate.h			\
 	gdkscreenprivate.h			\
 	gdkseatprivate.h			\
 	gdkseatdefaultprivate.h			\
@@ -166,6 +171,7 @@ gdk_c_sources = 				\
 	gdkframeclockidle.c			\
 	gdkpango.c				\
 	gdkpixbuf-drawable.c			\
+	gdkprofiler.c				\
 	gdkproperty.c				\
 	gdkrectangle.c				\
 	gdkrgba.c				\
@@ -243,8 +249,7 @@ if HAVE_INTROSPECTION
 introspection_files = 		\
 	$(filter-out gdkkeysyms-compat.h, $(gdk_h_sources))	\
 	$(gdk_c_sources)	\
-        gdkenumtypes.c		\
-        gdkenumtypes.h
+	$(gdk_built_sources)
 
 Gdk-3.0.gir: libgdk-3.la Makefile
 Gdk_3_0_gir_SCANNERFLAGS = 	\
@@ -274,8 +279,10 @@ x11_introspection_files = 		\
 	x11/gdkeventsource.c		\
 	x11/gdkeventtranslator.c	\
 	x11/gdkgeometry-x11.c		\
+	x11/gdkglcontext-x11.c		\
 	x11/gdkkeys-x11.c		\
 	x11/gdkmain-x11.c		\
+	x11/gdkmonitor-x11.c		\
 	x11/gdkproperty-x11.c		\
 	x11/gdkscreen-x11.c		\
 	x11/gdkselection-x11.c		\
@@ -298,7 +305,9 @@ x11_introspection_files = 		\
 	x11/gdkx11display.h		\
 	x11/gdkx11displaymanager.h	\
 	x11/gdkx11dnd.h			\
+	x11/gdkx11glcontext.h		\
 	x11/gdkx11keys.h		\
+	x11/gdkx11monitor.h		\
 	x11/gdkx11property.h		\
 	x11/gdkx11screen.h		\
 	x11/gdkx11selection.h		\
@@ -442,6 +451,7 @@ gdkenumtypes.c: $(gdk_h_sources) gdkenumtypes.c.template
 gdkmarshalers.h: gdkmarshalers.list
 	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
 		--prefix=_gdk_marshal \
+		--valist-marshallers \
 		--header \
 		$(srcdir)/gdkmarshalers.list > gdkmarshalers-h.tmp \
 	&& mv gdkmarshalers-h.tmp gdkmarshalers.h \
@@ -449,6 +459,7 @@ gdkmarshalers.h: gdkmarshalers.list
 gdkmarshalers.c: gdkmarshalers.list
 	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
 		--prefix=_gdk_marshal \
+		--valist-marshallers \
 		--body \
 		$(srcdir)/gdkmarshalers.list > gdkmarshalers-c.tmp	\
 	&& mv gdkmarshalers-c.tmp gdkmarshalers.c \

gdk/broadway/Makefile.am

@@ -108,6 +108,10 @@ EXTRA_DIST += $(broadway_built_sources)
 
 BUILT_SOURCES = $(broadway_built_sources)
 
+EXTRA_DIST += \
+	meson.build \
+	gen-c-array.py
+
 # ------------------- MSVC Build Items ----------------
 MSVCPROJS = gdk3-broadway broadwayd
 

gdk/broadway/gen-c-array.py

@@ -0,0 +1,22 @@
+#!/usr/bin/env python3
+
+import argparse
+import sys
+
+parser = argparse.ArgumentParser()
+parser.add_argument('--array-name', help='The name of the array variable')
+parser.add_argument('--output', metavar='FILE', help='Output file',
+                    type=argparse.FileType('w'),
+                    default=sys.stdout)
+parser.add_argument('input', metavar='FILE', help='The input file',
+                    type=argparse.FileType('r'), nargs='+')
+
+args = parser.parse_args()
+
+args.output.write('static const char {}[] = {{\n'.format(args.array_name))
+for input in args.input:
+    for line in input:
+        for ch in line:
+            args.output.write('  0x{:02x},\n'.format(ord(ch)))
+
+args.output.write('};')

gdk/broadway/meson.build

@@ -0,0 +1,78 @@
+gdk_broadway_sources = files(
+  'gdkcursor-broadway.c',
+  'gdkdevice-broadway.c',
+  'gdkdevicemanager-broadway.c',
+  'gdkdisplay-broadway.c',
+  'gdkdnd-broadway.c',
+  'gdkeventsource.c',
+  'gdkglobals-broadway.c',
+  'gdkkeys-broadway.c',
+  'gdkmonitor-broadway.c',
+  'gdkproperty-broadway.c',
+  'gdkscreen-broadway.c',
+  'gdkselection-broadway.c',
+  'gdktestutils-broadway.c',
+  'gdkvisual-broadway.c',
+  'gdkwindow-broadway.c',
+  'gdkbroadway-server.c',
+)
+
+gdk_broadway_public_headers = files(
+  'gdkbroadwaydisplay.h',
+  'gdkbroadwaywindow.h',
+  'gdkbroadwaycursor.h',
+  'gdkbroadwaymonitor.h',
+  'gdkbroadwayvisual.h',
+)
+
+install_headers(gdk_broadway_public_headers, subdir: 'gtk-3.0/gdk/broadway/')
+install_headers('gdkbroadway.h', subdir: 'gtk-3.0/gdk/')
+
+gdk_broadway_deps = [shmlib]
+
+gen_c_array = find_program('gen-c-array.py')
+
+clienthtml_h = custom_target('clienthtml.h',
+  input : 'client.html',
+  output : 'clienthtml.h',
+  command : [
+    gen_c_array,
+    '--array-name=client_html',
+    '--output=@OUTPUT@',
+    '@INPUT@',
+  ],
+)
+
+broadwayjs_h = custom_target('broadwayjs.h',
+  input : ['broadway.js', 'rawinflate.min.js'],
+  output : 'broadwayjs.h',
+  command : [
+    gen_c_array,
+    '--array-name=broadway_js',
+    '--output=@OUTPUT@',
+    '@INPUT0@','@INPUT1@',
+  ],
+)
+
+libgdk_broadway = static_library('gdk-broadway',
+  clienthtml_h, broadwayjs_h,
+  gdk_broadway_sources, gdkconfig, gdkenum_h,
+  include_directories: [confinc, gdkinc],
+  c_args: [
+    '-DGDK_COMPILATION',
+    '-DG_LOG_DOMAIN="Gdk"',
+  ] + common_cflags,
+  link_args: common_ldflags,
+  dependencies: [gdk_deps, gdk_broadway_deps])
+
+# gtk4-broadwayd
+
+broadwayd_syslib = os_win32 ? cc.find_library('ws2_32') : shmlib
+
+executable('broadwayd',
+  clienthtml_h, broadwayjs_h,
+  'broadwayd.c', 'broadway-server.c', 'broadway-buffer.c', 'broadway-output.c',
+  include_directories: [confinc, gdkinc, include_directories('.')],
+  c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', ],
+  dependencies : [broadwayd_syslib, gdk_deps],
+  install : true)

gdk/gdk-private.c

@@ -1,5 +1,6 @@
 #include "config.h"
 #include "gdk-private.h"
+#include "gdkprofilerprivate.h"
 
 GdkPrivateVTable *
 gdk__private__ (void)
@@ -17,6 +18,11 @@ gdk__private__ (void)
     gdk_display_set_rendering_mode,
     gdk_display_get_debug_updates,
     gdk_display_set_debug_updates,
+    gdk_get_desktop_startup_id,
+    gdk_get_desktop_autostart_id,
+    gdk_profiler_is_running,
+    gdk_profiler_start,
+    gdk_profiler_stop
   };
 
   return &table;

gdk/gdk-private.h

@@ -31,6 +31,9 @@ gboolean         gdk_display_get_debug_updates (GdkDisplay *display);
 void             gdk_display_set_debug_updates (GdkDisplay *display,
                                                 gboolean    debug_updates);
 
+const gchar *   gdk_get_desktop_startup_id   (void);
+const gchar *   gdk_get_desktop_autostart_id (void);
+
 typedef struct {
   /* add all private functions here, initialize them in gdk-private.c */
   gboolean (* gdk_device_grab_info) (GdkDisplay  *display,
@@ -56,6 +59,13 @@ typedef struct {
   gboolean         (* gdk_display_get_debug_updates) (GdkDisplay *display);
   void             (* gdk_display_set_debug_updates) (GdkDisplay *display,
                                                       gboolean    debug_updates);
+
+  const gchar * (* gdk_get_desktop_startup_id)   (void);
+  const gchar * (* gdk_get_desktop_autostart_id) (void);
+
+  gboolean (* gdk_profiler_is_running) (void);
+  void     (* gdk_profiler_start)      (int fd);
+  void     (* gdk_profiler_stop)       (void);
 } GdkPrivateVTable;
 
 GDK_AVAILABLE_IN_ALL

gdk/gdk.c

@@ -27,6 +27,7 @@
 #include "gdkversionmacros.h"
 #include "gdkmain.h"
 
+#include "gdkprofilerprivate.h"
 #include "gdkinternals.h"
 #include "gdkintl.h"
 
@@ -38,6 +39,8 @@
 #include "gdkkeysyms.h"
 #endif
 
+#include "gdkconstructor.h"
+
 #include <string.h>
 #include <stdlib.h>
 
@@ -313,6 +316,10 @@ gdk_pre_parse (void)
       _gdk_debug_flags = g_parse_debug_string (debug_string,
                                               (GDebugKey *) gdk_debug_keys,
                                               G_N_ELEMENTS (gdk_debug_keys));
+    if (g_getenv ("GTK_TRACE_FD"))
+      gdk_profiler_start (atoi (g_getenv ("GTK_TRACE_FD")));
+    else if (g_getenv ("GTK_TRACE"))
+      gdk_profiler_start (-1);
   }
 #endif  /* G_ENABLE_DEBUG */
 
@@ -1132,3 +1139,81 @@ gdk_unichar_direction (gunichar ch)
   else
     return PANGO_DIRECTION_LTR;
 }
+
+#ifdef G_HAS_CONSTRUCTORS
+#ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
+#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(stash_startup_id)
+#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(stash_autostart_id)
+#endif
+G_DEFINE_CONSTRUCTOR(stash_startup_id)
+G_DEFINE_CONSTRUCTOR(stash_autostart_id)
+#endif
+
+static char *desktop_startup_id = NULL;
+static char *desktop_autostart_id = NULL;
+
+static void
+stash_startup_id (void)
+{
+  const char *startup_id = g_getenv ("DESKTOP_STARTUP_ID");
+
+  if (startup_id == NULL || startup_id[0] == '\0')
+    return;
+
+  if (!g_utf8_validate (startup_id, -1, NULL))
+    {
+      g_warning ("DESKTOP_STARTUP_ID contains invalid UTF-8");
+      return;
+    }
+
+  desktop_startup_id = g_strdup (startup_id);
+}
+
+static void
+stash_autostart_id (void)
+{
+  const char *autostart_id = g_getenv ("DESKTOP_AUTOSTART_ID");
+  desktop_autostart_id = g_strdup (autostart_id ? autostart_id : "");
+}
+
+const gchar *
+gdk_get_desktop_startup_id (void)
+{
+  static gsize init = 0;
+
+  if (g_once_init_enter (&init))
+    {
+#ifndef G_HAS_CONSTRUCTORS
+      stash_startup_id ();
+#endif
+      /* Clear the environment variable so it won't be inherited by
+       * child processes and confuse things.
+       */
+      g_unsetenv ("DESKTOP_STARTUP_ID");
+
+      g_once_init_leave (&init, 1);
+    }
+
+  return desktop_startup_id;
+}
+
+const gchar *
+gdk_get_desktop_autostart_id (void)
+{
+  static gsize init = 0;
+
+  if (g_once_init_enter (&init))
+    {
+#ifndef G_HAS_CONSTRUCTORS
+      stash_autostart_id ();
+#endif
+      /* Clear the environment variable so it won't be inherited by
+       * child processes and confuse things.
+       */
+      g_unsetenv ("DESKTOP_AUTOSTART_ID");
+
+      g_once_init_leave (&init, 1);
+    }
+
+  return desktop_autostart_id;
+}

gdk/gdkconfig.h.meson

@@ -0,0 +1,21 @@
+#ifndef __GDKCONFIG_H__
+#define __GDKCONFIG_H__
+
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+
+#mesondefine GDK_WINDOWING_X11
+#mesondefine GDK_WINDOWING_BROADWAY
+#mesondefine GDK_WINDOWING_WAYLAND
+#mesondefine GDK_WINDOWING_WIN32
+#mesondefine GDK_WINDOWING_QUARTZ
+
+G_END_DECLS
+
+#endif  /* __GDKCONFIG_H__ */

gdk/gdkconstructor.h

@@ -0,0 +1,120 @@
+/*
+  If G_HAS_CONSTRUCTORS is true then the compiler support *both* constructors and
+  destructors, in a sane way, including e.g. on library unload. If not you're on
+  your own.
+
+  Some compilers need #pragma to handle this, which does not work with macros,
+  so the way you need to use this is (for constructors):
+
+  #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
+  #pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(my_constructor)
+  #endif
+  G_DEFINE_CONSTRUCTOR(my_constructor)
+  static void my_constructor(void) {
+   ...
+  }
+
+*/
+
+#ifndef __GTK_DOC_IGNORE__
+
+#if  __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+
+#define G_HAS_CONSTRUCTORS 1
+
+#define G_DEFINE_CONSTRUCTOR(_func) static void __attribute__((constructor)) _func (void);
+#define G_DEFINE_DESTRUCTOR(_func) static void __attribute__((destructor)) _func (void);
+
+#elif defined (_MSC_VER) && (_MSC_VER >= 1500)
+/* Visual studio 2008 and later has _Pragma */
+
+#define G_HAS_CONSTRUCTORS 1
+
+/* We do some weird things to avoid the constructors being optimized
+ * away on VS2015 if WholeProgramOptimization is enabled. First we
+ * make a reference to the array from the wrapper to make sure its
+ * references. Then we use a pragma to make sure the wrapper function
+ * symbol is always included at the link stage. Also, the symbols
+ * need to be extern (but not dllexport), even though they are not
+ * really used from another object file.
+ */
+
+/* We need to account for differences between the mangling of symbols
+ * for Win32 (x86) and x64 programs, as symbols on Win32 are prefixed
+ * with an underscore but symbols on x64 are not.
+ */
+#ifdef _WIN64
+#define G_MSVC_SYMBOL_PREFIX ""
+#else
+#define G_MSVC_SYMBOL_PREFIX "_"
+#endif
+
+#define G_DEFINE_CONSTRUCTOR(_func) G_MSVC_CTOR (_func, G_MSVC_SYMBOL_PREFIX)
+#define G_DEFINE_DESTRUCTOR(_func) G_MSVC_DTOR (_func, G_MSVC_SYMBOL_PREFIX)
+
+#define G_MSVC_CTOR(_func,_sym_prefix) \
+  static void _func(void); \
+  extern int (* _array ## _func)(void);              \
+  int _func ## _wrapper(void) { _func(); g_slist_find (NULL,  _array ## _func); return 0; } \
+  __pragma(comment(linker,"/include:" _sym_prefix # _func "_wrapper")) \
+  __pragma(section(".CRT$XCU",read)) \
+  __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _wrapper;
+
+#define G_MSVC_DTOR(_func,_sym_prefix) \
+  static void _func(void); \
+  extern int (* _array ## _func)(void);              \
+  int _func ## _constructor(void) { atexit (_func); g_slist_find (NULL,  _array ## _func); return 0; } \
+   __pragma(comment(linker,"/include:" _sym_prefix # _func "_constructor")) \
+  __pragma(section(".CRT$XCU",read)) \
+  __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _constructor;
+
+#elif defined (_MSC_VER)
+
+#define G_HAS_CONSTRUCTORS 1
+
+/* Pre Visual studio 2008 must use #pragma section */
+#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1
+#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1
+
+#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \
+  section(".CRT$XCU",read)
+#define G_DEFINE_CONSTRUCTOR(_func) \
+  static void _func(void); \
+  static int _func ## _wrapper(void) { _func(); return 0; } \
+  __declspec(allocate(".CRT$XCU")) static int (*p)(void) = _func ## _wrapper;
+
+#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \
+  section(".CRT$XCU",read)
+#define G_DEFINE_DESTRUCTOR(_func) \
+  static void _func(void); \
+  static int _func ## _constructor(void) { atexit (_func); return 0; } \
+  __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor;
+
+#elif defined(__SUNPRO_C)
+
+/* This is not tested, but i believe it should work, based on:
+ * http://opensource.apple.com/source/OpenSSL098/OpenSSL098-35/src/fips/fips_premain.c
+ */
+
+#define G_HAS_CONSTRUCTORS 1
+
+#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1
+#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1
+
+#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \
+  init(_func)
+#define G_DEFINE_CONSTRUCTOR(_func) \
+  static void _func(void);
+
+#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \
+  fini(_func)
+#define G_DEFINE_DESTRUCTOR(_func) \
+  static void _func(void);
+
+#else
+
+/* constructors not supported for this compiler */
+
+#endif
+
+#endif /* __GTK_DOC_IGNORE__ */

gdk/gdkdevice.c

@@ -349,7 +349,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                   G_TYPE_FROM_CLASS (object_class),
                   G_SIGNAL_RUN_LAST,
                   0, NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL,
                   G_TYPE_NONE, 0);
 
   /**
@@ -367,7 +367,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                   G_TYPE_FROM_CLASS (object_class),
                   G_SIGNAL_RUN_LAST,
                   0, NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                   G_TYPE_NONE, 1, GDK_TYPE_DEVICE_TOOL);
 }
 

gdk/gdkdevicemanager.c

@@ -203,7 +203,7 @@ gdk_device_manager_class_init (GdkDeviceManagerClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GdkDeviceManagerClass, device_added),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                   G_TYPE_NONE, 1,
                   GDK_TYPE_DEVICE);
 
@@ -222,7 +222,7 @@ gdk_device_manager_class_init (GdkDeviceManagerClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GdkDeviceManagerClass, device_removed),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                   G_TYPE_NONE, 1,
                   GDK_TYPE_DEVICE);
 
@@ -248,7 +248,7 @@ gdk_device_manager_class_init (GdkDeviceManagerClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GdkDeviceManagerClass, device_changed),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL,
                   G_TYPE_NONE, 1,
                   GDK_TYPE_DEVICE);
 }