message dialog: Stop hardcoding title styles

Instead, use a new title-2 style class to let
themes influence title formatting. Note that
the theme style will be overridden if the
application uses markup for presentation,
such as <b> or <i>.

.gitlab-ci.yml

@@ -1,93 +1,51 @@
+image: registry.gitlab.gnome.org/gnome/gtk/gtk-3-24:v2
+
 stages:
   - build
-  - docs
 
 cache:
   paths:
     - _ccache/
 
 fedora-autotools:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v1
   stage: build
   script:
-    - bash -x ./.gitlab-ci/test-docker-autotools.sh
-
-fedora-distcheck:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v1
-  variables:
-    DO_DISTCHECK: "yes"
-  when: manual
-  stage: build
-  script:
-    - bash -x ./.gitlab-ci/test-docker-autotools.sh
+   - bash -x ./.gitlab-ci/test-docker-autotools.sh
 
 fedora-meson:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v1
   stage: build
-  variables:
-    EXTRA_MESON_FLAGS: "-Ddefault_library=both"
   script:
-    - bash -x ./.gitlab-ci/test-docker-meson.sh
+   - bash -x ./.gitlab-ci/test-docker-meson.sh
   artifacts:
     when: always
     name: "gtk3-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
     paths:
       - "_build/meson-logs"
-      - "_build/testsuite/reftests/output"
 
-debian-meson:
-  image: registry.gitlab.gnome.org/gnome/gtk/debian-gtk3:v1
-  stage: build
+msys2-mingw32-meson:
   variables:
-    EXTRA_MESON_FLAGS: "-Ddefault_library=both"
-  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"
-      - "_build/testsuite/reftests/output"
-
-reference:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v1
-  stage: docs
-  variables:
-    EXTRA_MESON_FLAGS: "--buildtype=release -Dgtk_doc=true -Dman=true"
-  script:
-    - bash -x ./.gitlab-ci/test-docker-meson.sh
-    - ninja -C _build gdk3-doc gtk3-doc
-    - tar -c -J -f gdk3-docs.tar.xz _build/docs/reference/gdk
-    - tar -c -J -f gtk3-docs.tar.xz _build/docs/reference/gtk
-  artifacts:
-    paths:
-      - gdk3-docs.tar.xz
-      - gtk3-docs.tar.xz
-
-msys2-mingw64-meson:
-  variables:
-    MSYSTEM: "MINGW64"
+    MSYSTEM: "MINGW32"
     CHERE_INVOKING: "yes"
   stage: build
   tags:
-    - win32-ps
+    - 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-${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}"
+    name: "gtk3-%CI_JOB_NAME%-%CI_COMMIT_REF_NAME%"
     paths:
       - "_build/meson-logs"
 
-msys2-mingw64-autotools:
+msys2-mingw32-autotools:
   when: manual
   variables:
-    MSYSTEM: "MINGW64"
+    MSYSTEM: "MINGW32"
     CHERE_INVOKING: "yes"
   stage: build
   tags:
-    - win32-ps
+    - win32
   script:
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
     - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2-autotools.sh"

.gitlab-ci/Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:31
+FROM fedora:29
 
 RUN dnf -y install \
     adwaita-icon-theme \
@@ -41,7 +41,6 @@ RUN dnf -y install \
     libxkbcommon-devel \
     libXrandr-devel \
     libXrender-devel \
-    libXtst-devel \
     make \
     mesa-libEGL-devel \
     mesa-libwayland-egl-devel \

.gitlab-ci/debian-gtk3.Dockerfile

@@ -1,71 +0,0 @@
-FROM debian:buster
-
-RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
-    adwaita-icon-theme \
-    ccache \
-    dconf-gsettings-backend \
-    g++ \
-    gcc \
-    gettext \
-    git \
-    gobject-introspection \
-    gvfs \
-    hicolor-icon-theme \
-    itstool \
-    libatk-bridge2.0-dev \
-    libatk1.0-dev \
-    libc6-dev \
-    libcairo2-dev \
-    libcairo-gobject2 \
-    libcolord-dev \
-    libcups2-dev \
-    libegl1-mesa-dev \
-    libepoxy-dev \
-    libfontconfig1-dev \
-    libfreetype6-dev \
-    libgdk-pixbuf2.0-dev \
-    libgirepository1.0-dev \
-    libglib2.0-dev \
-    libharfbuzz-dev \
-    libjson-glib-dev \
-    libpango1.0-dev \
-    librest-dev \
-    librsvg2-common \
-    libsoup2.4-dev \
-    libwayland-dev \
-    libx11-dev \
-    libxcomposite-dev \
-    libxcursor-dev \
-    libxdamage-dev \
-    libxext-dev \
-    libxfixes-dev \
-    libxi-dev \
-    libxinerama-dev \
-    libxkbcommon-dev \
-    libxkbcommon-x11-dev \
-    libxml2-dev \
-    libxrandr-dev \
-    locales \
-    ninja-build \
-    pkg-config \
-    python3 \
-    python3-pip \
-    python3-setuptools \
-    python3-wheel \
-    shared-mime-info \
-    wayland-protocols \
-    xauth \
-    xvfb \
- && rm -rf /usr/share/doc/* /usr/share/man/*
-
-# Locale for our build
-RUN locale-gen C.UTF-8 && /usr/sbin/update-locale LANG=C.UTF-8
-
-ARG HOST_USER_ID=5555
-ENV HOST_USER_ID ${HOST_USER_ID}
-RUN useradd -u $HOST_USER_ID -ms /bin/bash user
-
-USER user
-WORKDIR /home/user
-
-ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8

.gitlab-ci/run-docker.sh

@@ -1,135 +1,19 @@
 #!/bin/bash
-
-read_arg() {
-    # $1 = arg name
-    # $2 = arg value
-    # $3 = arg parameter
-    local rematch='^[^=]*=(.*)$'
-    if [[ $2 =~ $rematch ]]; then
-        read "$1" <<< "${BASH_REMATCH[1]}"
-    else
-        read "$1" <<< "$3"
-        # There is no way to shift our callers args, so
-        # return 1 to indicate they should do it instead.
-        return 1
-    fi
-}
+#
+# This script builds an image from the Dockerfile, starts a container with
+# the parent directory mounted as working directory and start a bash session
+# there so you can test things.
+# Once you are happy you can push it to the docker hub:
+#     sudo docker push "${TAG}"
 
 set -e
 
-build=0
-run=0
-push=0
-list=0
-print_help=0
-no_login=0
+TAG="registry.gitlab.gnome.org/gnome/gtk/gtk-3-24:v2"
 
-while (($# > 0)); do
-        case "${1%%=*}" in
-                build) build=1;;
-                run) run=1;;
-                push) push=1;;
-                list) list=1;;
-                help) print_help=1;;
-                --base|-b) read_arg base "$@" || shift;;
-                --base-version) read_arg base_version "$@" || shift;;
-                --no-login) no_login=1;;
-                *) echo -e "\e[1;31mERROR\e[0m: Unknown option '$1'"; exit 1;;
-        esac
-        shift
-done
-
-if [ $print_help == 1 ]; then
-        echo "$0 - Build and run Docker images"
-        echo ""
-        echo "Usage: $0 <command> [options] [basename]"
-        echo ""
-        echo "Available commands"
-        echo ""
-        echo "  build --base=<BASENAME> - Build Docker image <BASENAME>.Dockerfile"
-        echo "  run --base=<BASENAME>   - Run Docker image <BASENAME>"
-        echo "  push --base=<BASENAME>  - Push Docker image <BASENAME> to the registry"
-        echo "  list                    - List available images"
-        echo "  help                    - This help message"
-        echo ""
-        exit 0
-fi
-
-cd "$(dirname "$0")"
-
-if [ $list == 1 ]; then
-        echo "Available Docker images:"
-        for f in *.Dockerfile; do
-                filename=$( basename -- "$f" )
-                basename="${filename%.*}"
-
-                echo -e "  \e[1;39m$basename\e[0m"
-        done
-        exit 0
-fi
-
-# All commands after this require --base to be set
-if [ -z $base ]; then
-        echo "Usage: $0 <command>"
-        exit 1
-fi
-
-if [ ! -f "$base.Dockerfile" ]; then
-        echo -e "\e[1;31mERROR\e[0m: Dockerfile for '$base' not found"
-        exit 1
-fi
-
-if [ -z $base_version ]; then
-        base_version="latest"
-else
-        base_version="v$base_version"
-fi
-
-if [ ! -x "$(command -v docker)" ] || [ docker --help |& grep -q podman ]; then
-        # Docker is actually implemented by podman, and its OCI output
-        # is incompatible with some of the dockerd instances on GitLab
-        # CI runners.
-        echo "Using: Podman"
-        format="--format docker"
-        CMD="podman"
-else
-        echo "Using: Docker"
-        format=""
-        CMD="sudo socker"
-fi
-
-REGISTRY="registry.gitlab.gnome.org"
-TAG="${REGISTRY}/gnome/gtk/${base}:${base_version}"
-
-if [ $build == 1 ]; then
-        echo -e "\e[1;32mBUILDING\e[0m: ${base} as ${TAG}"
-        ${CMD} build \
-                ${format} \
-                --build-arg HOST_USER_ID="$UID" \
-                --tag "${TAG}" \
-                --file "${base}.Dockerfile" .
-        exit $?
-fi
-
-if [ $push == 1 ]; then
-        echo -e "\e[1;32mPUSHING\e[0m: ${base} as ${TAG}"
-
-        if [ $no_login == 0 ]; then
-                ${CMD} login ${REGISTRY}
-        fi
-
-        ${CMD} push ${TAG}
-        exit $?
-fi
-
-if [ $run == 1 ]; then
-        echo -e "\e[1;32mRUNNING\e[0m: ${base} as ${TAG}"
-        ${CMD} run \
-                --rm \
-                --volume "$(pwd)/..:/home/user/app" \
-                --workdir "/home/user/app" \
-                --tty \
-                --interactive "${TAG}" \
-                bash
-        exit $?
-fi
+# 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
+sudo docker build \
+    --build-arg HOST_USER_ID="$UID" --tag "${TAG}" --file "Dockerfile" .
+sudo docker run --security-opt label=disable \
+    --rm --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
+    --tty --interactive "${TAG}" bash

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

@@ -5,31 +5,12 @@ set -e
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
 export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-export N_PROCS=$(($(nproc) - 1))
-
-EXTRA_CONFIGURE_OPT=""
-
-# Only enable documentation when distchecking, since it's required
-if [ -n "${DO_DISTCHECK-}" ]; then
-    EXTRA_CONFIGURE_OPTS="${EXTRA_CONFIGURE_OPTS} --enable-gtk-doc"
-fi
-
-NOCONFIGURE=1 ./autogen.sh
 
 mkdir _build
 cd _build
-
-../configure \
+../autogen.sh \
     --enable-cloudproviders \
     --enable-broadway-backend \
-    --enable-wayland-backend \
-    --enable-x11-backend \
     --enable-xinerama \
-    ${EXTRA_CONFIGURE_OPTS}
-
-make -j${N_PROCS}
-
-if [ -n "${DO_DISTCHECK-}" ]; then
-  make -j${N_PROCS} check SKIP_GDKTARGET="echo Not actually running tests for now"
-  make -j${N_PROCS} distcheck SKIP_GDKTARGET="echo Not actually running tests for now"
-fi
+    --enable-gtk-doc
+make -j8

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

@@ -10,13 +10,11 @@ export PATH="${HOME}/.local/bin:${PATH}"
 python3 -m pip install --user meson==0.49.2
 
 meson \
-    -Dinstalled_tests=true \
+    -Dgtk_doc=true \
+    -Dman=true \
     -Dbroadway_backend=true \
-    -Dx11_backend=true \
-    -Dwayland_backend=true \
     -Dxinerama=yes \
     -Dprint_backends="file,lpr,test,cloudprint,cups" \
-    ${EXTRA_MESON_FLAGS:-} \
     _build
 
 cd _build
@@ -27,4 +25,5 @@ xvfb-run -a -s "-screen 0 1024x768x24" \
         --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-msys2-meson.sh

@@ -28,10 +28,8 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-shared-mime-info \
     mingw-w64-$MSYS2_ARCH-meson \
     mingw-w64-$MSYS2_ARCH-ninja \
-    mingw-w64-$MSYS2_ARCH-gtk-doc
-
-# https://github.com/msys2/MINGW-packages/pull/6465
-pacman --noconfirm -S --needed mingw-w64-$MSYS2_ARCH-brotli
+    mingw-w64-$MSYS2_ARCH-gtk-doc \
+    mingw-w64-$MSYS2_ARCH-sassc
 
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"

Makefile.am

@@ -2,7 +2,7 @@
 include $(top_srcdir)/Makefile.decl
 
 SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples
-SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros win32
+SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
@@ -16,7 +16,6 @@ EXTRA_DIST +=			\
 	NEWS.pre-1-0		\
 	README.commits		\
 	README.win32		\
-	check-version.py	\
 	config.h.win32		\
 	makefile.msc		\
 	gtk-zip.sh.in		\
@@ -29,8 +28,7 @@ EXTRA_DIST +=			\
 	po/meson.build	\
 	po-properties/meson.build	\
 	build-aux/meson/post-install.py	\
-	config.h.meson		\
-	gtk.supp
+	config.h.meson
 
 MAINTAINERCLEANFILES = \
 	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
@@ -42,17 +40,13 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/gtk-doc.make \
 	$(srcdir)/ChangeLog
 
-if OS_UNIX
-valgrinddir = $(datadir)/gtk-3.0/valgrind
-valgrind_DATA = gtk.supp
-endif
 
 ## Copy .pc files to target-specific names
-gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc gtk+-broadway-3.0.pc gtk+-wayland-3.0.pc: gtk+-3.0.pc
+gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc gtk+-broadway-3.0.pc gtk+-wayland-3.0.pc gtk+-mir-3.0.pc: gtk+-3.0.pc
 	rm -f $@ && \
 	cp gtk+-3.0.pc $@
 
-gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc gdk-wayland-3.0.pc: gdk-3.0.pc
+gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc gdk-wayland-3.0.pc gdk-mir-3.0.pc: gdk-3.0.pc
 	rm -f $@ && \
 	cp gdk-3.0.pc $@
 
@@ -73,20 +67,17 @@ DISTCLEANFILES = \
 	gtk+-quartz-3.0.pc		\
 	gtk+-broadway-3.0.pc		\
 	gtk+-wayland-3.0.pc		\
+	gtk+-mir-3.0.pc			\
 	gdk-3.0.pc			\
 	gdk-x11-3.0.pc			\
 	gdk-win32-3.0.pc		\
 	gdk-quartz-3.0.pc		\
 	gdk-broadway-3.0.pc		\
 	gdk-wayland-3.0.pc		\
+	gdk-mir-3.0.pc			\
 	gail-3.0.pc			\
 	config.lt
 
-dist-hook:
-	mkdir $(distdir)/subprojects
-	cp -p $(srcdir)/subprojects/*.wrap $(distdir)/subprojects
-	$(top_srcdir)/check-version.py $(top_srcdir)/configure.ac $(top_srcdir)/meson.build
-
 distclean-local:
 	if test "$(srcdir)" = "."; then :; else \
 		rm -f ChangeLog; \

NEWS

@@ -1,524 +1,9 @@
-Overview of Changes in GTK+ 3.24.23
-===================================
-
-* Adwaita:
- - Support error states for labels and entries
-
-* Printing:
- - Use the correct names for remote printers
-
-* File choser:
- - Default to tracker2 for search to prevent
-   symbol clashes in tracker-using applications
-
-* Wayland:
- - Support newer schemas for settings
- - Fix DND hotspot handling
- - Disconnect on display close
-
-* X11:
- - Fix a possible crash with disabled devices
-
-* Translation updates:
- Basque
- Chinese (China)
- Croatian
- Dutch
- Finnish
- Friulian
- Galician
- Hungarian
- Japanese
- Korean
- Portuguese
- Serbian
-
-
-Overview of Changes in GTK+ 3.24.22
-===================================
-
-* GtkTextView:
- - Fix some corner cases of pixelcache invalidation
- - Make select-all work on touch
-
-* Fix print portal support
-
-* Adwaita:
- - Tweak title style class
- - Add a public color for text view background
-
-* Windows:
- - Limit the size of the corner mask cache
- - Use native API for keycode conversion
- - Use GLES on arm64
-
-* Wayland: Add a way to change the application id
-
-* Quartz: Add axes to master devices
-
-* Add --enable-tracker3 option to configure
-
-* Translation updates:
- Catalan
- German
- Indonesian
- Italian
- Kazakh
- Spanish
- Turkish
-
-
-Overview of Changes in GTK+ 3.24.21
-===================================
-
-* Wayland:
- - Prevent crashes with offscreen windows
- - Handle disorderly tablet/pad disconnects
-
-* GtkFileChooser:
- - Translate the type column
- - Add a tracker3 search engine
- - Rate-limit trash monitoring
- - Make get_filter work for native chooser
-
-* GtkGLArea:
- - Fix a redraw problem
-
-* GtkScrolledWindow:
- - Fix kinetic scrolling
-
-* Add a gtk-cursor-aspect-ratio setting
-
-* GDK:
- - Improve frame clock smoothness
- - Fix frame clock monotonicity
-
-* OS X:
- - Support Pen / Eraser input
- - Support openfiles in GtkApplication
-
-* Adwaita:
- - Improve notebook tab legibility
-
-* Translation updates:
- Basque
- Brazilian Portuguese
- Catalan
- Chinese (Taiwan)
- German
- Indonesian
- Italian
- Japanese
- Kazakh
- Lithuanian
- Polish
- Romanian
- Slovak
- Slovenian
- Swedish
- Ukrainian
-
-
-Overview of Changes in GTK+ 3.24.20
-===================================
-
-* GtkFileChooser:
- - Prevent selection changes after overwrite confirmation
- - Don't grab focus to the sidebar on click
- - Avoid a use-after-free in GtkFileSystemModel
-
-* GtkEmojiChooser:
- - Remove blacklist
-
-* GtkAboutDialog:
- - Add more licenses
-
-* Adwaita:
- - Lower the contrast of checkboxes
-
-* HighContrast:
- - Export the same public colors as Adwaita
-
-* OS X:
- - Don't filter Escape in input methods
-
-* Windows:
- - Infer font settings from system settings
-
-* Translation updates
- Brazilian Portuguese
- Chinese
- Croatian
- French
- Japanese
- Lithuanian
- Polish
- Spanish
- Swedish
- Turkish
- Ukrainian
-
-
-Overview of Changes in GTK+ 3.24.18
-===================================
-
-* Wayland:
- - Fix more sizing regressions in Epiphany and LibreOffice
-   menus, and popups in general
-
-* Build:
- - Make resource build reproducible
-
-* Translation updates
- Basque
- Latvian
-
-
-Overview of Changes in GTK+ 3.24.17
-===================================
-
-* GtkFileChooser: Fix some keynav issues
-
-* GtkMenuButton: disable focus-on-click
-
-* Derive the HighContrast and HighContrastInverse themes from Adwaita
-
-* Wayland:
- - Fix firefox sizing problems
- - Prevent Alt lingering after Alt-Tab
- - Load compose sequences from ~/.Compose
- - Fix a crash in the Wayland input method
-
-* Translation updates
- Finnish
- Hebrew
-
-
-Overview of Changes in GTK+ 3.24.16
-===================================
-
-* Fix the build
-
-
-Overview of Changes in GTK+ 3.24.15
-===================================
-
-* filechooser:
- - Fix a crash
- - Support selecting directories with a new enough
-   file chooser portal
-
-* textview:
- - Speed up tag handling
-
-* wayland:
- - Fix problems with clipboard handling
- - Fix a crash in the Wayland input method
- - Support cursor scale of 400%
- - Fix a crash in glade
-
-* css: Support font-feature-settings
-
-* Adwaita:
- - Use tabular figures where appropriate
- - Color tweaks for dark mode
- - Improve rendering of rounded corners
-
-* Translation updates
- Dutch
- German
- Japanese
- Korean
- Lithuanian
- Norwegian Bokmål
- Persian
- Ukrainian
-
-
-Overview of Changes in GTK+ 3.24.14
-===================================
-
-* Fix the opaque region for windows on X11
-
-* theme:
- - Fix flat buttons in backdrop
- - Make popovers look more similar to menus
- - Tweak checkbox & radiobutton appearance
- - Add general typography classes (heading, title-1, etc)
-
-* language bindings:
- - Fix annotations for gtk_tree_model_sort_new_with_model
-
-* switch: Fix touch support
-
-* infobar: Make clickable for default action
-
-* emojichooser:
- - respect a no-emoji input hint
-
-* fontchooser:
- - Fix an oversight with hiding the size label
-
-* filechooser:
- - Disable recursive search without a system indexer
-
-* modelbutton:
- - Fix a11y support to reflect button state
-
-* input:
- - Fix touchpad gesture center calculation
-
-* x11:
- - Fix root window scaling
- - Support _GTK_WORKAREAS_Dn property
-
-* wayland:
- - Support a terminal purpose in input methods
- - Fix preedit cursor positioning
- - Fix enabling/disabling of text inputs
- - Support simultaneous selection requests
- - Require Wayland 1.14.91
-
-* OS X:
- - Fix fullscreen state
- - Fix an Inkscape crash at startup
- - Fix OpenGL extension detection
-
-* Printing:
- - Fix a crash with Avahi
-
-* Translation updates:
- Basque
- British English
- Catalan
- Finnish
- French 
- Galician
- Japanese
- Kurdish Sorani
- Malay
- Russian
- Slovak
- Spanish
- Turkish
-
-
-Overview of Changes in GTK+ 3.24.13
-===================================
-
-* listbox: Fix header row reuse
-
-* wayland: Fix handling of tablets
-
-* theme:
- - Adwaita: Fix menu rounding
- - Adwaita: Various improvements for the Emoji chooser
- - Adwaita: Refresh check and radio buttons
- - HighContrast: Fix entry colors
-
-* input:
- - Properly handle bubbling of scroll events
- - Handle modifier key events properly
- - Run key controllers in the bubble phase
- - Do not use VIQR for Vietnamese by default 
-
-* statusicons: Render sharply on hi-dpi
-
-* wayland: Fix handling of selection ownership
-
-* win32:
- - Set WS_BORDER for fullscreen GL windows if requested
- - Fix clipboard handling
-
-* quartz:
- - Handle titlebar events properly
- - Handle page up/down key events properly
-
-* broadway: Fix (lack of) clipboard handling
-
-* Translation updates:
- Catalan
- Chinese (Taiwan)
- Croatian
- Danish
- French
- German
- Hungarian
- Indonesian
- Russian
- Swedish
-
-
-Overview of Changes in GTK+ 3.24.12
-===================================
-
-* file chooser: allow sorting by file type
-
-* dnd: fix pointer offsets under X11 and Wayland
-
-* broadway: Fix a font problem
-
-* mir Drop this backend
-
-* printing: Get PPD from original host if needed
-
-* a11y: Fix interference with clutter a11y impl
-
-* Translation updates:
- Brazilian Portuguese
- Czech
- Danish
- Dutch
- Italian
- Greek
- Lithuanian
- Norwegian Bokmål
- Polish
- Romanian
- Slovenian
- Spanish
- Turkish
-
-
-Overview of Changes in GTK+ 3.24.11
-===================================
-
-* Adwaita:
- - Add drop shadow to icons
- - Small color fixes
- - Make title buttons round
-
-* OS X: Fix the monitors-changed signal
-
-* Win32:
- - Build fixes
- - Support choices in the native file chooser
- - Fix icon cache freshness checks on 64bit
-
-* Wayland:
- - Support xdg-output v3
- - Fix clipboard ownership handling
-
-* X11: Improve monitor metadata
-
-* Build: Require GLib 2.57.2
-
-* Translation updates:
- Basque
- Brazilian Portuguese
- British English
- Catalan
- Croatian
- French
- Friulian
- Galician
- German
- Greek
- Hungarian
- Indonesian
- Japanese
- Korean
- Latvian
- Lithuanian
- Polish
- Punjabi
- Romanian
- Serbian
- Slovenian
- Spanish
- Swedish
-
-
-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

README.win32

@@ -10,13 +10,15 @@ First you obviously need developer packages for the compile-time
 dependencies: GDK-Pixbuf, Pango, atk, glib, gettext-runtime, libiconv at least.
 See http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies .
 
-For people compiling GTK+ with Visual C++ or later, it is recommended that
-the same compiler is used for at least GDK-Pixbuf, Pango, atk and glib
-so that crashes and errors caused by different CRTs can be avoided. Currently
-building with Visual Studio 2008 or later is supported, either via Visual Studio
-project files or via the Meson build system, as described in the below sections.
-Interchanging between Visual Studio 2015, 2017 and 2019 builds should be fine
-as they use the same CRT (UCRT) DLLs.
+For people compiling GTK+ with Visual C++ 2005 or later, it is
+recommended that the same compiler is used for at least GDK-Pixbuf,
+Pango, atk and glib so that crashes and errors caused by different CRTs
+can be avoided.  The VS 2008 project files and/or VS Makefiles are
+either already available or will be available in the next stable release.
+Unfortunately compiling with Microsoft's compilers versions 2003 or earlier
+is not supported as compiling the latest stable GLib (which *is* required for
+building this GTK+ release) requires features from newer compilers
+and/or Platform SDKs
 
 After installing the dependencies, there are two ways to build GTK+
 for win32.
@@ -150,12 +152,16 @@ would require such for ABI stability).
 2) Microsoft's tools
 --------------------
 
-There are VS 2008~2019 solution and project files to build GTK+, which
+Use the Microsoft compiler, cl and Make, nmake. Say nmake -f
+makefile.msc in gdk and gtk. Be prepared to manually edit various
+makefile.msc files, and the makefile snippets in build/win32.
+
+There are also VS 2008~2017 solution and project files to build GTK+, which
 are maintained by Chun-wei Fan.  They should build GTK+ out of the box,
 provided that the afore-mentioned dependencies are installed.  They will
 build GDK with the Win32 backend, GTK+ itself (with GAIL/a11y built in),
 the GAIL-Util library and the gtk-demo program.  Please also refer to the
-README file(s) that reside in win32 on how to enable additional features
+README file(s) that reside in build/win32 on how to enable additional features
 that are not enabled by default, such as EGL support via libANGLE, which
 emulate the GL/EGL calls using Direct3D 9/11.
 

build-aux/meson/post-install.py

@@ -12,7 +12,6 @@ if 'DESTDIR' not in os.environ:
     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')
@@ -27,17 +26,11 @@ if 'DESTDIR' not in os.environ:
                 shutil.copyfile(installed_lib, installed_lib_dst)
 
     print('Compiling GSettings schemas...')
-    glib_compile_schemas = subprocess.check_output(['pkg-config',
-                                                   '--variable=glib_compile_schemas',
-                                                   'gio-2.0']).strip()
-    if not os.path.exists(glib_compile_schemas):
-        # pkg-config variables only available since GLib 2.62.0.
-        glib_compile_schemas = 'glib-compile-schemas'
-    subprocess.call([glib_compile_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',
+    subprocess.call(['gtk-update-icon-cache', '-q', '-t' ,'-f',
                     os.path.join(gtk_datadir, 'icons', 'hicolor')])
 
     print('Updating module cache for input methods...')
@@ -49,10 +42,4 @@ if 'DESTDIR' not in os.environ:
     # Untested!
     print('Updating module cache for print backends...')
     os.makedirs(gtk_printmodule_dir, exist_ok=True)
-    gio_querymodules = subprocess.check_output(['pkg-config',
-                                                '--variable=gio_querymodules',
-                                                'gio-2.0']).strip()
-    if not os.path.exists(gio_querymodules):
-        # pkg-config variables only available since GLib 2.62.0.
-        gio_querymodules = 'gio-querymodules'
-    subprocess.call([gio_querymodules, gtk_printmodule_dir])
+    subprocess.call(['gio-querymodules', gtk_printmodule_dir])

build/Makefile-newvs.am

@@ -0,0 +1,53 @@
+# Centralized autotools file
+# Create the Visual Studio 2012/2013/2015 project files
+# from the Visual Studio 2010 project files
+
+# This autotools file, from GLib, can be used in other projects
+# that have Visual Studio build support, and is copied into
+# $(srcroot)/build/.
+
+# Author: Fan, Chun-wei
+# November 05, 2012
+
+# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14 and so on)
+# MSVC_VER: Short Version of target Visual Studio (110 for 2012, 120 for 2013, 140 for 2015, 141 for 2017)
+# MSVC_TOOLSET: Use if target MSVC toolsett is not in the form v $(MSVC_VER)0, meaning v$(MSVC_TOOLSET)
+
+if MSVC_BASE_NO_TOOLSET_SET
+MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0
+endif
+
+if MSVC_NO_TOOLSET_SET
+MSVC_TOOLSET = $(MSVC_VER)0
+endif
+
+%.sln:
+	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:
+	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:
+	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 \
+		sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+	fi
+
+%.props: $(top_builddir)/build/win32/vs10/Makefile
+	if test -e $(top_srcdir)/build/win32/vs10/$@; then \
+		sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+	else \
+		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:
+	if test -e $(top_srcdir)/build/win32/vs10/$@; then \
+		cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+	else \
+		cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+	fi

build/Makefile.am

@@ -0,0 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
+SUBDIRS = win32
+
+-include $(top_srcdir)/git.mk

build/Makefile.msvc-introspection

@@ -79,50 +79,49 @@ $(if $(or $(findstring --header-only,$($(_gir_name)_MSVC_SCANNERFLAGS)),
           $($(_gir_name)_MSVC_PROGRAM)),,
     $(error Need to define $(_gir_name)_MSVC_LIBS or $(_gir_name)_MSVC_PROGRAM))
 
-$(top_builddir)/win32/$(_gir_name)_list: Makefile
-	rm -f $(top_builddir)/win32/$(_gir_name)_list
+$(top_builddir)/build/win32/$(_gir_name)_list: Makefile
 	for F in $(_gir_files_msvc); do \
 		case $$$$F in \
 		*.c|*.cpp|*.cc|*.cxx|*.h|*.hpp|*.hh|*.hxx) \
-			echo '..'$(_gir_source_subdir_msvc)$$$$F >>$(top_builddir)/win32/$(_gir_name)_list \
+			echo '..\..'$(_gir_source_subdir_msvc)$$$$F >>$(top_builddir)/build/win32/$(_gir_name)_list \
 			;; \
 		esac; \
 	done
 
-$(top_builddir)/win32/$(1).msvc.introspect: Makefile
-	-$(RM) $(top_builddir)/win32/$(1).msvc.introspect
+$(top_builddir)/build/win32/$(1).msvc.introspect: Makefile
+	-$(RM) $(top_builddir)/build/win32/$(1).msvc.introspect
 
 # Assemble the Command to Run g-ir-scanner
-	echo 'vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\'$(1)': '$(_gir_name)'_list '$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	@-echo Generating $$$$@...'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	$$$$(PYTHON) $$$$(G_IR_SCANNER)	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--verbose -no-libtool	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--namespace='$(_gir_namespace_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--nsversion='$(_gir_version_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$(_gir_packages_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$(_gir_libraries_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$(_gir_program_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--add-include-path=./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/bin	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--add-include-path=$$$$(G_IR_INCLUDEDIR)	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$(_gir_includes_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$(_gir_export_packages_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--cflags-begin	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$($(_gir_name)_MSVC_CFLAGS)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--cflags-end	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$($(_gir_name)_MSVC_SCANNERFLAGS)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--filelist='$(_gir_name)'_list	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	-L.\vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	-o $$$$@'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '' >>$(top_builddir)/win32/$(1).msvc.introspect
+	echo 'vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\'$(1)': '$(_gir_name)'_list '$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	@-echo Generating $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	$$$$(PYTHON) $$$$(G_IR_SCANNER)	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	--verbose -no-libtool	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	--namespace='$(_gir_namespace_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	--nsversion='$(_gir_version_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	'$(_gir_packages_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	'$(_gir_libraries_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	'$(_gir_program_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	--add-include-path=./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/bin	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	--add-include-path=$$$$(G_IR_INCLUDEDIR)	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	'$(_gir_includes_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	'$(_gir_export_packages_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	--cflags-begin	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	'$($(_gir_name)_MSVC_CFLAGS)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	--cflags-end	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	'$($(_gir_name)_MSVC_SCANNERFLAGS)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	--filelist='$(_gir_name)'_list	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	-L.\vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	-o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect
 
 # Finally Assemble the Command to Compile the generated .gir
-	echo 'vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\$(_typelib_basename_msvc).typelib: vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\'$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	@-echo Compiling $$$$@...'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	$$$$(G_IR_COMPILER)	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--includedir=$$$$(@D:\=/) --debug --verbose	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	$$$$(@R:\=/).gir	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	-o $$$$@'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '' >>$(top_builddir)/win32/$(1).msvc.introspect
+	echo 'vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\$(_typelib_basename_msvc).typelib: vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\'$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	@-echo Compiling $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	$$$$(G_IR_COMPILER)	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	--includedir=$$$$(@D:\=/) --debug --verbose	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	$$$$(@R:\=/).gir	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	-o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect
 endef
 
 $(foreach gir,$(MSVC_INTROSPECT_GIRS),$(eval $(call gir-nmake-builder,$(gir))))

build/Makefile.msvcproj

@@ -22,8 +22,8 @@
 #   YourProject_HEADERS_EXCLUDES = ... # <list of headers to exclude from installation, separated by '|', wildcards allowed; use random unsed value if none>
 #
 #   dist-hook: \ # (or add to it if it is already there, note the vs9 items will also call the vs10 items in the process)
-#   	$(top_builddir)/win32/vs9/YourProject.vcproj	\
-#   	$(top_builddir)/win32/vs9/YourProject.headers
+#   	$(top_builddir)/build/win32/vs9/YourProject.vcproj	\
+#   	$(top_builddir)/build/win32/vs9/YourProject.headers
 
 
 # Private functions
@@ -54,60 +54,59 @@ _headers_destdir=$(subst /,\\,$(_headers_dest_posix))
 
 define msvcproj-builder
 
-$(top_builddir)/win32/vs10/$(1).vcxproj: $(top_builddir)/win32/vs9/$(1).vcproj
-$(top_builddir)/win32/vs10/$(1).vcxproj.filters: $(top_builddir)/win32/vs9/$(1).vcproj
-$(1).sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj
-$(1).vs10.sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj
-$(1).vs10.sourcefiles.filters: $(top_builddir)/win32/vs9/$(1).vcproj
+$(top_builddir)/build/win32/vs10/$(1).vcxproj: $(top_builddir)/build/win32/vs9/$(1).vcproj
+$(top_builddir)/build/win32/vs10/$(1).vcxproj.filters: $(top_builddir)/build/win32/vs9/$(1).vcproj
+$(1).sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj
+$(1).vs10.sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj
+$(1).vs10.sourcefiles.filters: $(top_builddir)/build/win32/vs9/$(1).vcproj
+
+$(top_builddir)/build/win32/vs9/$(1).vcproj: Makefile
+	-$(RM) $(top_builddir)/build/win32/vs9/$(1).vcproj
+	-$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj
+	-$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj.filters
+	-$(RM) $(top_builddir)/build/win32/vs11/$(1).vcxproj
+	-$(RM) $(top_builddir)/build/win32/vs11/$(1).vcxproj.filters
+	-$(RM) $(top_builddir)/build/win32/vs12/$(1).vcxproj
+	-$(RM) $(top_builddir)/build/win32/vs12/$(1).vcxproj.filters
+	-$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj
+	-$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj.filters
+	-$(RM) $(top_builddir)/build/win32/vs15/$(1).vcxproj
+	-$(RM) $(top_builddir)/build/win32/vs15/$(1).vcxproj.filters
 
-$(top_builddir)/win32/vs9/$(1).vcproj: Makefile
-	-$(RM) $(top_builddir)/win32/vs9/$(1).vcproj
-	-$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj
-	-$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj.filters
-	-$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj
-	-$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj.filters
-	-$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj
-	-$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj.filters
-	-$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj
-	-$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj.filters
-	-$(RM) $(top_builddir)/win32/vs15/$(1).vcxproj
-	-$(RM) $(top_builddir)/win32/vs15/$(1).vcxproj.filters
-	-$(RM) $(top_builddir)/win32/vs16/$(1).vcxproj
-	-$(RM) $(top_builddir)/win32/vs16/$(1).vcxproj.filters
 
 	for F in $(_proj_files); do \
 		case $$$$F in \
 		$(_proj_filters)) \
 			;; \
 		*.c|*.cpp|*.cc|*.cxx) \
-			echo '   <File RelativePath="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).sourcefiles && \
-			echo '   <ClCompile Include="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).vs10.sourcefiles && \
-			echo '   <ClCompile Include="..\..'$(_proj_subdir)$$$$F'"><Filter>Source Files</Filter></ClCompile>' >>$(1).vs10.sourcefiles.filters \
+			echo '   <File RelativePath="..\..\..'$(_proj_subdir)$$$$F'" />' >>$(1).sourcefiles && \
+			echo '   <ClCompile Include="..\..\..'$(_proj_subdir)$$$$F'" />' >>$(1).vs10.sourcefiles && \
+			echo '   <ClCompile Include="..\..\..'$(_proj_subdir)$$$$F'"><Filter>Source Files</Filter></ClCompile>' >>$(1).vs10.sourcefiles.filters \
 			;; \
 		esac;	\
 	done
 
 
-	$(CPP) -P - <$(top_srcdir)/win32/vs9/$(1).vcprojin >$(top_builddir)/win32/vs9/$(1).vcproj
-	$(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxprojin >$(top_builddir)/win32/vs10/$(1).vcxproj
-	$(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxproj.filtersin >$(top_builddir)/win32/vs10/$(1).vcxproj.filters
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/$(1).vcprojin >$(top_builddir)/build/win32/vs9/$(1).vcproj
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/$(1).vcxprojin >$(top_builddir)/build/win32/vs10/$(1).vcxproj
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/$(1).vcxproj.filtersin >$(top_builddir)/build/win32/vs10/$(1).vcxproj.filters
 	$(RM) $(1).sourcefiles
 	$(RM) $(1).vs10.sourcefiles
 	$(RM) $(1).vs10.sourcefiles.filters
 
-$(top_builddir)/win32/vs10/$(1).vs10.headers: $(top_builddir)/win32/vs9/$(1).headers
+$(top_builddir)/build/win32/vs10/$(1).vs10.headers: $(top_builddir)/build/win32/vs9/$(1).headers
 
-$(top_builddir)/win32/vs9/$(1).headers: Makefile
-	-$(RM) $(top_builddir)/win32/vs9/$(1).headers
-	-$(RM) $(top_builddir)/win32/vs10/$(1).vs10.headers
+$(top_builddir)/build/win32/vs9/$(1).headers: Makefile
+	-$(RM) $(top_builddir)/build/win32/vs9/$(1).headers
+	-$(RM) $(top_builddir)/build/win32/vs10/$(1).vs10.headers
 
 	for F in $(_proj_headers); do \
 		case $$$$F in \
 		$(_proj_headers_excludes)) \
 			;; \
 		*.h|*.hpp|*.hh|*.hxx) \
-			echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F'&#x0D;&#x0A;' >>$(top_builddir)/win32/vs9/$(1).headers && \
-			echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs10/$(1).vs10.headers \
+			echo 'copy ..\..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F'&#x0D;&#x0A;' >>$(top_builddir)/build/win32/vs9/$(1).headers && \
+			echo 'copy ..\..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/build/win32/vs10/$(1).vs10.headers \
 			;; \
 		esac;	\
 	done

build/win32/Makefile.am

@@ -13,7 +13,7 @@ introspection.body.mak: $(MSVC_INTROSPECTION_INTERMEDIATE_FILES)
 	-$(RM) introspection.body.mak
 	for F in `ls *.msvc.introspect`; do \
 		case $$F in \
-			*)	cat $(top_builddir)/win32/$$F >>introspection.body.mak \
+			*)	cat $(top_builddir)/build/win32/$$F >>introspection.body.mak \
 			;; \
 		esac; \
 	done
@@ -32,17 +32,11 @@ SUBDIRS =	\
 	vs11	\
 	vs12	\
 	vs14	\
-	vs15	\
-	vs16
+	vs15
 
 EXTRA_DIST +=	\
-	config-msvc.mak		\
-	config-msvc.mak.in		\
-	create-lists.bat	\
-	create-lists-msvc.mak		\
 	detectenv-msvc.mak		\
-	gen-gdkversionmacros-h.py	\
-	generate-msvc.mak	\
+	gentypefuncs.py			\
 	gtk-introspection-msvc.mak	\
 	introspection-msvc.mak		\
 	replace.py			\

build/win32/detectenv-msvc.mak

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

build/win32/gentypefuncs.py

@@ -0,0 +1,53 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import sys
+import re
+import os
+
+debug = os.getenv('GTK_GENTYPEFUNCS_DEBUG') is not None
+
+out_file = sys.argv[1]
+in_file = sys.argv[2]
+
+funcs = []
+
+
+if debug: print ('Output file: ', out_file)
+
+# if debug: print (len(in_files), 'input files')
+
+def open_file(filename, mode):
+    if sys.version_info[0] < 3:
+        return open(filename, mode=mode)
+    else:
+        return open(filename, mode=mode, encoding='utf-8')
+
+with open(in_file, 'r') as f:
+  for line in f:
+    line = line.rstrip('\n').rstrip('\r')
+    # print line
+    match = re.search(r'\bg[td]k_[a-zA-Z0-9_]*_get_type\b', line)
+    if match:
+      func = match.group(0)
+      if not func in funcs:
+        funcs.append(func)
+        if debug: print ('Found ', func)
+
+file_output = 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS\n'
+
+funcs = sorted(funcs)
+
+for f in funcs:
+  if f.startswith('gdk_x11') or f.startswith('gtk_socket') or f.startswith('gtk_plug'):
+    file_output += '#ifdef GDK_WINDOWING_X11\n'
+    file_output += '*tp++ = {0}();\n'.format(f)
+    file_output += '#endif\n'
+  else:
+    file_output += '*tp++ = {0}();\n'.format(f)
+
+if debug: print (len(funcs), 'functions')
+
+ofile = open(out_file, "w")
+ofile.write(file_output)
+ofile.close()

build/win32/introspection-msvc.mak

@@ -8,7 +8,7 @@
 # Change or pass in or set the following to suit your environment
 
 !if "$(PREFIX)" == ""
-PREFIX = ..\..\vs$(VSVER)\$(PLAT)
+PREFIX = ..\..\..\vs$(VSVER)\$(PLAT)
 !endif
 
 !if ![setlocal]		&& \

build/win32/pc_base.py

@@ -23,7 +23,7 @@ class BasePCItems:
         self.libdir = ''
         self.prefix = ''
         self.srcdir = os.path.dirname(__file__)
-        self.top_srcdir = os.path.join(self.srcdir, os.pardir)
+        self.top_srcdir = self.srcdir + '\\..\\..'
         self.version = ''
 
     def setup(self, argv, parser=None):

build/win32/vs10/Makefile.am

@@ -33,6 +33,7 @@ EXTRA_DIST += \
 	README.txt				\
 	gtk+.sln				\
 	gtk3-prebuild.vcxproj			\
+	gtk3-prebuild.vcxproj.filters		\
 	gdk3-win32.vcxprojin			\
 	gdk3-win32.vcxproj.filtersin		\
 	gdk3-broadway.vcxprojin			\
@@ -73,13 +74,12 @@ EXTRA_DIST += \
 DISTCLEANFILES = \
 	$(GENERATED_ITEMS)
 
-gtk3-install.props: $(top_srcdir)/win32/vs10/gtk3-install.propsin $(MSVC10_HEADERS_LISTS)
-	-$(RM) $(top_builddir)/win32/vs11/gtk3-install.props
-	-$(RM) $(top_builddir)/win32/vs12/gtk3-install.props
-	-$(RM) $(top_builddir)/win32/vs14/gtk3-install.props
-	-$(RM) $(top_builddir)/win32/vs15/gtk3-install.props
-	-$(RM) $(top_builddir)/win32/vs16/gtk3-install.props
-	$(CPP) -P - <$(top_srcdir)/win32/vs10/gtk3-install.propsin >$@
+gtk3-install.props: $(top_srcdir)/build/win32/vs10/gtk3-install.propsin $(MSVC10_HEADERS_LISTS)
+	-$(RM) $(top_builddir)/build/win32/vs11/gtk3-install.props
+	-$(RM) $(top_builddir)/build/win32/vs12/gtk3-install.props
+	-$(RM) $(top_builddir)/build/win32/vs14/gtk3-install.props
+	-$(RM) $(top_builddir)/build/win32/vs15/gtk3-install.props
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk3-install.propsin >$@
 	rm $(MSVC10_HEADERS_LISTS)
 
 -include $(top_srcdir)/git.mk

build/win32/vs10/broadwayd.vcxprojin

@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -95,7 +95,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -120,7 +120,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -143,7 +143,7 @@
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

build/win32/vs10/gailutil-3.vcxprojin

@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -88,7 +88,7 @@
     <Link>
       <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ModuleDefinitionFile>..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
@@ -100,7 +100,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -112,7 +112,7 @@
     <Link>
       <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ModuleDefinitionFile>..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
@@ -125,7 +125,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -138,7 +138,7 @@
     <Link>
       <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ModuleDefinitionFile>..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
@@ -148,7 +148,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -159,7 +159,7 @@
     <Link>
       <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ModuleDefinitionFile>..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>

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

@@ -15,10 +15,10 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\gdk\win32\rc\gdk.rc"><Filter>Resource Files</Filter></ResourceCompile>
+    <ResourceCompile Include="..\..\..\gdk\win32\rc\gdk.rc"><Filter>Resource Files</Filter></ResourceCompile>
   </ItemGroup>
   <ItemGroup>
 #include "gdk-3.vs10.sourcefiles.filters"
-    <ClCompile Include="..\..\gdk\gdkkeynames.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\gdk\gdkkeynames.c"><Filter>Source Files</Filter></ClCompile>
   </ItemGroup>
 </Project>

build/win32/vs10/gdk-3.vcxprojin

@@ -133,7 +133,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -156,7 +156,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -178,7 +178,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -200,7 +200,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -223,7 +223,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -246,7 +246,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -268,7 +268,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -290,7 +290,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -311,11 +311,11 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\gdk\win32\rc\gdk.rc" />
+    <ResourceCompile Include="..\..\..\gdk\win32\rc\gdk.rc" />
   </ItemGroup>
   <ItemGroup>
 #include "gdk-3.vs10.sourcefiles"
-    <ClCompile Include="..\..\gdk\gdkkeynames.c" />
+    <ClCompile Include="..\..\..\gdk\gdkkeynames.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk3-broadway.vcxproj">

build/win32/vs10/gdk3-broadway.vcxprojin

@@ -69,7 +69,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -82,7 +82,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -94,7 +94,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -107,7 +107,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>

build/win32/vs10/gdk3-win32.vcxprojin

@@ -69,7 +69,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -82,7 +82,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -94,7 +94,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -107,7 +107,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>

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

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\gtk\gtk-win32.rc"><Filter>Resource Files</Filter></ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <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>
+    <ClCompile Include="..\..\..\modules\input\gtkimcontextmultipress.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\gtkimcontextthai.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imam-et.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imcedilla.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imcyrillic-translit.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imime.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\iminuktitut.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imipa.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\immultipress.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imthai.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imti-er.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imti-et.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imviqr.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\thai-charprop.c"><Filter>Source Files</Filter></ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="..\..\..\gtk\libgtk3.manifest"><Filter>Resource Files</Filter></Manifest>
+  </ItemGroup>
+</Project>

build/win32/vs10/gtk-3.vcxprojin

@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -97,7 +97,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -120,7 +120,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -142,7 +142,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -163,28 +163,50 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\gtk\gtk-win32.rc" />
+    <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>
   <ItemGroup>
 #include "gtk-3.vs10.sourcefiles"
-    <ClCompile Include="..\..\modules\input\gtkimcontextime.c" />
-    <ClCompile Include="..\..\modules\input\gtkimcontextmultipress.c" />
-    <ClCompile Include="..\..\modules\input\gtkimcontextthai.c" />
-    <ClCompile Include="..\..\modules\input\imam-et.c" />
-    <ClCompile Include="..\..\modules\input\imcedilla.c" />
-    <ClCompile Include="..\..\modules\input\imcyrillic-translit.c" />
-    <ClCompile Include="..\..\modules\input\imime.c" />
-    <ClCompile Include="..\..\modules\input\iminuktitut.c" />
-    <ClCompile Include="..\..\modules\input\imipa.c" />
-    <ClCompile Include="..\..\modules\input\immultipress.c" />
-    <ClCompile Include="..\..\modules\input\imthai.c" />
-    <ClCompile Include="..\..\modules\input\imti-er.c" />
-    <ClCompile Include="..\..\modules\input\imti-et.c" />
-    <ClCompile Include="..\..\modules\input\imviqr.c" />
-    <ClCompile Include="..\..\modules\input\thai-charprop.c" />
+    <ClCompile Include="..\..\..\modules\input\gtkimcontextime.c" />
+    <ClCompile Include="..\..\..\modules\input\gtkimcontextmultipress.c" />
+    <ClCompile Include="..\..\..\modules\input\gtkimcontextthai.c" />
+    <ClCompile Include="..\..\..\modules\input\imam-et.c" />
+    <ClCompile Include="..\..\..\modules\input\imcedilla.c" />
+    <ClCompile Include="..\..\..\modules\input\imcyrillic-translit.c" />
+    <ClCompile Include="..\..\..\modules\input\imime.c" />
+    <ClCompile Include="..\..\..\modules\input\iminuktitut.c" />
+    <ClCompile Include="..\..\..\modules\input\imipa.c" />
+    <ClCompile Include="..\..\..\modules\input\immultipress.c" />
+    <ClCompile Include="..\..\..\modules\input\imthai.c" />
+    <ClCompile Include="..\..\..\modules\input\imti-er.c" />
+    <ClCompile Include="..\..\..\modules\input\imti-et.c" />
+    <ClCompile Include="..\..\..\modules\input\imviqr.c" />
+    <ClCompile Include="..\..\..\modules\input\thai-charprop.c" />
   </ItemGroup>
   <ItemGroup>
-    <Manifest Include="..\..\gtk\libgtk3.manifest" />
+    <Manifest Include="..\..\..\gtk\libgtk3.manifest" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk-3.vcxproj">

build/win32/vs10/gtk-builder-tool.vcxproj

@@ -163,7 +163,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\gtk\gtk-builder-tool.c" />
+    <ClCompile Include="..\..\..\gtk\gtk-builder-tool.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk-3.vcxproj">

build/win32/vs10/gtk-builder-tool.vcxproj.filters

@@ -15,6 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\gtk\gtk-builder-tool.c"><Filter>Sources</Filter></ClCompile>
+    <ClCompile Include="..\..\..\gtk\gtk-builder-tool.c"><Filter>Sources</Filter></ClCompile>
   </ItemGroup>
 </Project>

build/win32/vs10/gtk-encode-symbolic-svg.vcxproj

@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -95,7 +95,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -120,7 +120,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -143,7 +143,7 @@
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -163,7 +163,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\gtk\encodesymbolic.c" />
+    <ClCompile Include="..\..\..\gtk\encodesymbolic.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk-3.vcxproj">

build/win32/vs10/gtk-encode-symbolic-svg.vcxproj.filters

@@ -15,6 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\gtk\encodesymbolic.c"><Filter>Sources</Filter></ClCompile>
+    <ClCompile Include="..\..\..\gtk\encodesymbolic.c"><Filter>Sources</Filter></ClCompile>
   </ItemGroup>
 </Project>

build/win32/vs10/gtk-query-settings.vcxproj

@@ -163,7 +163,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\gtk\gtk-query-settings.c" />
+    <ClCompile Include="..\..\..\gtk\gtk-query-settings.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk-3.vcxproj">

build/win32/vs10/gtk-query-settings.vcxproj.filters

@@ -15,6 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\gtk\gtk-query-settings.c"><Filter>Sources</Filter></ClCompile>
+    <ClCompile Include="..\..\..\gtk\gtk-query-settings.c"><Filter>Sources</Filter></ClCompile>
   </ItemGroup>
 </Project>

build/win32/vs10/gtk-update-icon-cache.vcxproj

@@ -163,7 +163,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\gtk\updateiconcache.c" />
+    <ClCompile Include="..\..\..\gtk\updateiconcache.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gtk3-prebuild.vcxproj">

build/win32/vs10/gtk-update-icon-cache.vcxproj.filters

@@ -15,6 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\gtk\updateiconcache.c"><Filter>Sources</Filter></ClCompile>
+    <ClCompile Include="..\..\..\gtk\updateiconcache.c"><Filter>Sources</Filter></ClCompile>
   </ItemGroup>
 </Project>

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

@@ -26,7 +26,7 @@ nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstall
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\fribidi;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\fribidi;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -39,7 +39,6 @@ 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-demo.vcxprojin

@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -97,7 +97,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -121,7 +121,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -143,7 +143,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>

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

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="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>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>gtk3gensrcsprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="GenConfigH">
+      <Value>$(GenConfigH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenGdkConfigHWin32">
+      <Value>$(GenGdkConfigHWin32)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenGdkConfigHBroadway">
+      <Value>$(GenGdkConfigHBroadway)</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>
+  </ItemGroup>
+</Project>

build/win32/vs10/gtk3-icon-browser.vcxprojin

@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -118,7 +118,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -140,7 +140,7 @@
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

build/win32/vs10/gtk3-install.propsin

@@ -121,7 +121,7 @@ copy ..\gail-3.0.pc $(CopyDir)\lib\pkgconfig
 echo off
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated
-copy ..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
+copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
 #include "gdk-3.vs10.headers"
 #include "gdk3-win32.vs10.headers"
 
@@ -133,17 +133,17 @@ mkdir $(CopyDir)\include\gail-$(ApiVersion)\libgail-util
 #include "gailutil-3.vs10.headers"
 
 
-for %%s in (16 22 24 32 48 256) do ((mkdir $(CopyDir)\share\icons\hicolor\%%sx%%s\apps) & (copy /b ..\..\demos\gtk-demo\data\%%sx%%s\gtk3-demo.png $(CopyDir)\share\icons\hicolor\%%sx%%s\apps))
+for %%s in (16 22 24 32 48 256) do ((mkdir $(CopyDir)\share\icons\hicolor\%%sx%%s\apps) & (copy /b ..\..\..\demos\gtk-demo\data\%%sx%%s\gtk3-demo.png $(CopyDir)\share\icons\hicolor\%%sx%%s\apps))
 
 mkdir $(CopyDir)\share\glib-2.0\schemas
-copy ..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
-copy ..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas
-copy ..\..\gtk\org.gtk.Settings.EmojiChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
-copy ..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
-copy ..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas
+copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
+copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas
+copy ..\..\..\gtk\org.gtk.Settings.EmojiChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
+copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
+copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas
     </GtkDoInstall>
     <GtkDoInstallBroadwayHeaders>
-copy ..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
+copy ..\..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway
 #include "gdk3-broadway.vs10.headers"
     </GtkDoInstallBroadwayHeaders>

build/win32/vs10/gtk3-install.vcxproj

@@ -155,7 +155,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32">
+    <CustomBuild Include="..\..\..\config.h.win32">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build Results...</Message>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkPCFiles)</AdditionalInputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>

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

@@ -7,7 +7,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+    <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
     <CustomBuild Include="..\gtkpc.py"><Filter>Resource Files</Filter></CustomBuild>
   </ItemGroup>
 </Project>

build/win32/vs10/gtk3-prebuild.vcxproj

@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_Broadway|Win32">
+      <Configuration>Debug_Broadway</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_Broadway|x64">
+      <Configuration>Debug_Broadway</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_Broadway|Win32">
+      <Configuration>Release_Broadway</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_Broadway|x64">
+      <Configuration>Release_Broadway</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B98FBE68-B03C-48E3-8F32-C3C010720D30}</ProjectGuid>
+    <RootNamespace>gtkprebuild</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk3-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk3-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk3-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk3-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk3-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk3-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk3-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk3-gen-srcs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <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'" />
+  </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" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

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

@@ -0,0 +1,15 @@
+<?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

@@ -2,8 +2,8 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
     <VSVer>10</VSVer>
-    <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
-    <CopyDir>..\..\..\vs$(VSVer)\$(Platform)</CopyDir>
+    <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+    <CopyDir>..\..\..\..\vs$(VSVer)\$(Platform)</CopyDir>
     <ApiVersion>3.0</ApiVersion>
     <GtkVersion>@GTK_VERSION@</GtkVersion>
     <GtkLibtoolCompatibleDllPrefix>lib</GtkLibtoolCompatibleDllPrefix>
@@ -17,13 +17,11 @@
     <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,6 +4,7 @@ EXTRA_DIST +=	\
 	README.txt	\
 	gtk+.sln	\
 	gtk3-prebuild.vcxproj	\
+	gtk3-prebuild.vcxproj.filters	\
 	gdk3-win32.vcxproj	\
 	gdk3-win32.vcxproj.filters	\
 	gdk-3.vcxproj	\
@@ -46,6 +47,6 @@ MSVC_VER = 11
 MSVC_FORMAT_VER = 12
 MSVC_VER_LONG = 2012
 
-include $(top_srcdir)/win32/Makefile-newvs.am
+include $(top_srcdir)/build/Makefile-newvs.am
 
 -include $(top_srcdir)/git.mk

build/win32/vs12/Makefile.am

@@ -4,6 +4,7 @@ EXTRA_DIST +=	\
 	README.txt	\
 	gtk+.sln	\
 	gtk3-prebuild.vcxproj	\
+	gtk3-prebuild.vcxproj.filters	\
 	gdk3-win32.vcxproj	\
 	gdk3-win32.vcxproj.filters	\
 	gdk-3.vcxproj	\
@@ -46,6 +47,6 @@ MSVC_VER = 12
 MSVC_FORMAT_VER = 12
 MSVC_VER_LONG = 2013
 
-include $(top_srcdir)/win32/Makefile-newvs.am
+include $(top_srcdir)/build/Makefile-newvs.am
 
 -include $(top_srcdir)/git.mk

build/win32/vs14/Makefile.am

@@ -4,6 +4,7 @@ EXTRA_DIST +=	\
 	README.txt	\
 	gtk+.sln	\
 	gtk3-prebuild.vcxproj	\
+	gtk3-prebuild.vcxproj.filters	\
 	gdk3-win32.vcxproj	\
 	gdk3-win32.vcxproj.filters	\
 	gdk-3.vcxproj	\
@@ -46,6 +47,6 @@ MSVC_VER = 14
 MSVC_FORMAT_VER = 12
 MSVC_VER_LONG = 14
 
-include $(top_srcdir)/win32/Makefile-newvs.am
+include $(top_srcdir)/build/Makefile-newvs.am
 
 -include $(top_srcdir)/git.mk

build/win32/vs15/Makefile.am

@@ -4,6 +4,7 @@ EXTRA_DIST +=	\
 	README.txt	\
 	gtk+.sln	\
 	gtk3-prebuild.vcxproj	\
+	gtk3-prebuild.vcxproj.filters	\
 	gdk3-win32.vcxproj	\
 	gdk3-win32.vcxproj.filters	\
 	gdk-3.vcxproj	\
@@ -47,6 +48,6 @@ MSVC_VER_LONG = 15
 MSVC_TOOLSET = 141
 MSVC_FORMAT_VER = 12
 
-include $(top_srcdir)/win32/Makefile-newvs.am
+include $(top_srcdir)/build/Makefile-newvs.am
 
 -include $(top_srcdir)/git.mk

build/win32/vs9/Makefile.am

@@ -47,8 +47,8 @@ EXTRA_DIST += \
 	gtk3-version-paths.vsprops.in	\
 	$(GENERATED_ITEMS)
 
-gtk3-install.vsprops: $(top_srcdir)/win32/vs9/gtk3-install.vspropsin $(MSVC_HEADERS_LISTS)
-	$(CPP) -P - <$(top_srcdir)/win32/vs9/gtk3-install.vspropsin >$@
+gtk3-install.vsprops: $(top_srcdir)/build/win32/vs9/gtk3-install.vspropsin $(MSVC_HEADERS_LISTS)
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk3-install.vspropsin >$@
 	rm $(MSVC_HEADERS_LISTS)
 
 DISTCLEANFILES = $(GENERATED_ITEMS)

build/win32/vs9/broadwayd.vcprojin

@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\broadway"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
 				PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -62,7 +62,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\broadway"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
 				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="$(GdkDefines)"
 				RuntimeLibrary="2"
@@ -95,7 +95,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\broadway"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
 				PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -127,7 +127,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\broadway"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
 				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="$(GdkDefines)"
 				RuntimeLibrary="2"

build/win32/vs9/gailutil-3.vcprojin

@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gtk;..\..\gdk;..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -46,7 +46,7 @@
 				AdditionalDependencies="atk-1.0.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				GenerateDebugInformation="true"
-				ModuleDefinitionFile="..\..\libgail-util\gailutil.def"
+				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
 				ImportLibrary="$(TargetDir)$(ProjectName).0.lib"
 				SubSystem="2"
 				TargetMachine="1"
@@ -64,7 +64,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gtk;..\..\gdk;..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -78,7 +78,7 @@
 				AdditionalDependencies="atk-1.0.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
-				ModuleDefinitionFile="..\..\libgail-util\gailutil.def"
+				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				ImportLibrary="$(TargetDir)$(ProjectName).0.lib"
@@ -99,7 +99,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\gtk;..\..\gdk;..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -113,7 +113,7 @@
 				AdditionalDependencies="atk-1.0.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				GenerateDebugInformation="true"
-				ModuleDefinitionFile="..\..\libgail-util\gailutil.def"
+				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
 				ImportLibrary="$(TargetDir)$(ProjectName).0.lib"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -133,7 +133,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\gtk;..\..\gdk;..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -145,7 +145,7 @@
 				AdditionalDependencies="atk-1.0.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
-				ModuleDefinitionFile="..\..\libgail-util\gailutil.def"
+				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"

build/win32/vs9/gdk-3.vcprojin

@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -95,7 +95,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GdkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -127,7 +127,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway"
 				PreprocessorDefinitions="$(GdkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -159,7 +159,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -191,7 +191,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -223,7 +223,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GdkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -255,7 +255,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway"
 				PreprocessorDefinitions="$(GdkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -290,7 +290,7 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
-			<File RelativePath="..\..\gdk\win32\rc\gdk.rc" />
+			<File RelativePath="..\..\..\gdk\win32\rc\gdk.rc" />
 		</Filter>
 		<Filter
 			Name="Source Files"
@@ -298,7 +298,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 #include "gdk-3.sourcefiles"
-			<File RelativePath="..\..\gdk\gdkkeynames.c" />
+			<File RelativePath="..\..\..\gdk\gdkkeynames.c" />
 		</Filter>
 	</Files>
 </VisualStudioProject>

build/win32/vs9/gdk3-broadway.vcprojin

@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\broadway"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -53,7 +53,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\broadway"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
 				PreprocessorDefinitions="$(GdkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\broadway"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -95,7 +95,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\broadway"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
 				PreprocessorDefinitions="$(GdkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"

build/win32/vs9/gdk3-win32.vcprojin

@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -53,7 +53,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -95,7 +95,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"

build/win32/vs9/gtk-3.vcprojin

@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="gtk-3"
+	ProjectGUID="{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}"
+	RootNamespace="gtk3"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(GtkAdditionalLibs)"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="$(TargetDir)$(ProjectName).0.lib"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="$(GtkDefines)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(GtkAdditionalLibs)"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(TargetDir)$(ProjectName).0.lib"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(GtkAdditionalLibs)"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="$(TargetDir)$(ProjectName).0.lib"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="$(GtkDefines)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(GtkAdditionalLibs)"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(TargetDir)$(ProjectName).0.lib"
+				TargetMachine="17"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File RelativePath="..\..\..\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>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+#include "gtk-3.sourcefiles"
+			<File RelativePath="..\..\..\modules\input\gtkimcontextime.c" />
+			<File RelativePath="..\..\..\modules\input\gtkimcontextmultipress.c" />
+			<File RelativePath="..\..\..\modules\input\gtkimcontextthai.c" />
+			<File RelativePath="..\..\..\modules\input\imam-et.c" />
+			<File RelativePath="..\..\..\modules\input\imcedilla.c" />
+			<File RelativePath="..\..\..\modules\input\imcyrillic-translit.c" />
+			<File RelativePath="..\..\..\modules\input\imime.c" />
+			<File RelativePath="..\..\..\modules\input\iminuktitut.c" />
+			<File RelativePath="..\..\..\modules\input\imipa.c" />
+			<File RelativePath="..\..\..\modules\input\immultipress.c" />
+			<File RelativePath="..\..\..\modules\input\imthai.c" />
+			<File RelativePath="..\..\..\modules\input\imti-er.c" />
+			<File RelativePath="..\..\..\modules\input\imti-et.c" />
+			<File RelativePath="..\..\..\modules\input\imviqr.c" />
+			<File RelativePath="..\..\..\modules\input\thai-charprop.c" />
+		</Filter>
+	</Files>
+</VisualStudioProject>

build/win32/vs9/gtk-builder-tool.vcproj

@@ -152,7 +152,7 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File RelativePath="..\..\gtk\gtk-builder-tool.c" />
+			<File RelativePath="..\..\..\gtk\gtk-builder-tool.c" />
 		</Filter>
 		<Filter
 			Name="Headers"

build/win32/vs9/gtk-encode-symbolic-svg.vcproj

@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gdk"
+				AdditionalIncludeDirectories="..\..\..\gdk"
 				PreprocessorDefinitions="_DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -62,7 +62,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\gdk"
+				AdditionalIncludeDirectories="..\..\..\gdk"
 				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions=""
 				RuntimeLibrary="2"
@@ -95,7 +95,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gdk"
+				AdditionalIncludeDirectories="..\..\..\gdk"
 				PreprocessorDefinitions="_DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -127,7 +127,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\gdk"
+				AdditionalIncludeDirectories="..\..\..\gdk"
 				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions=""
 				RuntimeLibrary="2"
@@ -156,7 +156,7 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File RelativePath="..\..\gtk\encodesymbolic.c" />
+			<File RelativePath="..\..\..\gtk\encodesymbolic.c" />
 		</Filter>
 		<Filter
 			Name="Headers"

build/win32/vs9/gtk-query-settings.vcproj

@@ -152,7 +152,7 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File RelativePath="..\..\gtk\gtk-query-settings.c" />
+			<File RelativePath="..\..\..\gtk\gtk-query-settings.c" />
 		</Filter>
 		<Filter
 			Name="Headers"

build/win32/vs9/gtk-update-icon-cache.vcproj

@@ -152,7 +152,7 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File RelativePath="..\..\gtk\updateiconcache.c" />
+			<File RelativePath="..\..\..\gtk\updateiconcache.c" />
 		</Filter>
 		<Filter
 			Name="Headers"

build/win32/vs9/gtk3-build-defines.vsprops

@@ -9,7 +9,7 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\fribidi;$(GlibEtcInstallRoot)\include"
+		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\fribidi;$(GlibEtcInstallRoot)\include"
 		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;_USE_MATH_DEFINES"
 		ForcedIncludeFiles="msvc_recommended_pragmas.h"
 		AdditionalOptions="/MP"

build/win32/vs9/gtk3-demo.vcprojin

@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -95,7 +95,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="$(GtkPrefixDefine)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -127,7 +127,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="$(GtkPrefixDefine)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"

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

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="gtk3gensrcsprops"
+	InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+	>
+	<UserMacro
+		Name="GenConfigH"
+		Value="
+copy ..\..\..\config.h.win32 ..\..\..\config.h
+		      "
+	/>
+	<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;
+		      "
+	/>
+	<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;
+		      "
+	/>
+	<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;
+		      "
+	/>
+</VisualStudioPropertySheet>

build/win32/vs9/gtk3-icon-browser.vcprojin

@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\demos\icon-browser"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\demos\icon-browser"
 				PreprocessorDefinitions="_DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -62,7 +62,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\demos\icon-browser"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\demos\icon-browser"
 				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions=""
 				RuntimeLibrary="2"
@@ -95,7 +95,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\demos\icon-browser"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\demos\icon-browser"
 				PreprocessorDefinitions="_DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -127,7 +127,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\gdk;..\..\demos\icon-browser"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\demos\icon-browser"
 				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions=""
 				RuntimeLibrary="2"

build/win32/vs9/gtk3-install.vcproj

@@ -139,7 +139,7 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
-			<File RelativePath="..\gtkpc.py">
+			<File RelativePath="..\..\..\gtkpc.py">
 				<FileConfiguration Name="Debug|Win32">
 					<Tool Name="VCCustomBuildTool"
 						Description="Generating .pc files..."

build/win32/vs9/gtk3-install.vspropsin

@@ -125,7 +125,7 @@ echo off

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

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

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

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

 #include "gdk-3.headers"
 #include "gdk3-win32.headers"
 
@@ -137,24 +137,24 @@ mkdir $(CopyDir)\include\gail-$(ApiVersion)\libgail-util

 #include "gailutil-3.headers"
 
 mkdir $(CopyDir)\share\icons\hicolor\16x16\apps

-copy ..\..\demos\gtk-demo\data\16x16\gtk3-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps\

+copy ..\..\..\demos\gtk-demo\data\16x16\gtk3-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps\

 mkdir $(CopyDir)\share\icons\hicolor\22x22\apps

-copy ..\..\demos\gtk-demo\data\22x22\gtk3-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps\

+copy ..\..\..\demos\gtk-demo\data\22x22\gtk3-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps\

 mkdir $(CopyDir)\share\icons\hicolor\24x24\apps

-copy ..\..\demos\gtk-demo\data\24x24\gtk3-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps\

+copy ..\..\..\demos\gtk-demo\data\24x24\gtk3-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps\

 mkdir $(CopyDir)\share\icons\hicolor\32x32\apps

-copy ..\..\demos\gtk-demo\data\32x32\gtk3-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps\

+copy ..\..\..\demos\gtk-demo\data\32x32\gtk3-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps\

 mkdir $(CopyDir)\share\icons\hicolor\48x48\apps

-copy ..\..\demos\gtk-demo\data\48x48\gtk3-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps\

+copy ..\..\..\demos\gtk-demo\data\48x48\gtk3-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps\

 mkdir $(CopyDir)\share\icons\hicolor\256x256\apps

-copy ..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\hicolor\256x256\apps\

+copy ..\..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\hicolor\256x256\apps\

 
 mkdir $(CopyDir)\share\glib-2.0\schemas

-copy ..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas

-copy ..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas

-copy ..\..\gtk\org.gtk.Settings.EmojiChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas

-copy ..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas

-copy ..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas

+copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas

+copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas

+copy ..\..\..\gtk\org.gtk.Settings.EmojiChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas

+copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas

+copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas

 		      "
 	/>
 	<UserMacro
@@ -170,7 +170,7 @@ $(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force &quot;$(Co
 	<UserMacro
 		Name="GtkDoInstallBroadwayHeaders"
 		Value="
-copy ..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway&#x0D;&#x0A;
 #include "gdk3-broadway.headers"
         "

build/win32/vs9/gtk3-prebuild.vcproj

@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="gtk3-prebuild"
+	ProjectGUID="{B98FBE68-B03C-48E3-8F32-C3C010720D30}"
+	RootNamespace="gtk3prebuild"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			ConfigurationType="10"
+			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+			CharacterSet="2"
+			DeleteExtensionsOnClean=""
+			>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			ConfigurationType="10"
+			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+			CharacterSet="2"
+			DeleteExtensionsOnClean=""
+			>
+		</Configuration>
+		<Configuration
+			Name="Debug_Broadway|Win32"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="10"
+			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+			CharacterSet="2"
+			DeleteExtensionsOnClean=""
+			>
+		</Configuration>
+		<Configuration
+			Name="Debug_Broadway|x64"
+			ConfigurationType="10"
+			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+			CharacterSet="2"
+			DeleteExtensionsOnClean=""
+			>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="10"
+			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+			CharacterSet="2"
+			DeleteExtensionsOnClean=""
+			WholeProgramOptimization="1"
+			>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			ConfigurationType="10"
+			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+			CharacterSet="2"
+			DeleteExtensionsOnClean=""
+			WholeProgramOptimization="1"
+			>
+		</Configuration>
+		<Configuration
+			Name="Release_Broadway|Win32"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="10"
+			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+			CharacterSet="2"
+			DeleteExtensionsOnClean=""
+			WholeProgramOptimization="1"
+			>
+		</Configuration>
+		<Configuration
+			Name="Release_Broadway|x64"
+			ConfigurationType="10"
+			InheritedPropertySheets=".\gtk3-gen-srcs.vsprops"
+			CharacterSet="2"
+			DeleteExtensionsOnClean=""
+			WholeProgramOptimization="1"
+			>
+		</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>

build/win32/vs9/gtk3-version-paths.vsprops.in

@@ -10,11 +10,11 @@
 	/>
 	<UserMacro
 		Name="GlibEtcInstallRoot"
-		Value="$(SolutionDir)\..\..\..\vs$(VSVer)\$(PlatformName)"
+		Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
 	/>
 	<UserMacro
 		Name="CopyDir"
-		Value="..\..\..\vs$(VSVer)\$(PlatformName)"
+		Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
 	/>
 	<UserMacro
 		Name="ApiVersion"

check-version.py

@@ -1,200 +0,0 @@
-#!/usr/bin/env python3
-
-import re
-import sys
-
-try:
-    configure_ac = sys.argv[1]
-except Exception:
-    configure_ac = 'configure.ac'
-
-try:
-    meson_build = sys.argv[2]
-except Exception:
-    meson_build = 'meson.build'
-
-CONFIGURE_MAJOR_VERSION_RE = re.compile(
-    r'''
-    ^
-    \s*
-    m4_define\(
-    \s*
-    \[gtk_major_version\]
-    \s*
-    ,
-    \s*
-    \[
-    (?P<version>[0-9]+)
-    \]
-    \s*
-    \)
-    $
-    ''',
-    re.UNICODE | re.VERBOSE
-)
-
-CONFIGURE_MINOR_VERSION_RE = re.compile(
-    r'''
-    ^
-    \s*
-    m4_define\(
-    \s*
-    \[gtk_minor_version\]
-    \s*
-    ,
-    \s*
-    \[
-    (?P<version>[0-9]+)
-    \]
-    \s*
-    \)
-    $
-    ''',
-    re.UNICODE | re.VERBOSE
-)
-
-CONFIGURE_MICRO_VERSION_RE = re.compile(
-    r'''
-    ^
-    \s*
-    m4_define\(
-    \s*
-    \[gtk_micro_version\]
-    \s*
-    ,
-    \s*
-    \[
-    (?P<version>[0-9]+)
-    \]
-    \s*
-    \)
-    $
-    ''',
-    re.UNICODE | re.VERBOSE
-)
-
-CONFIGURE_INTERFACE_AGE_RE = re.compile(
-    r'''
-    ^
-    \s*
-    m4_define\(
-    \s*
-    \[gtk_interface_age\]
-    \s*
-    ,
-    \s*
-    \[
-    (?P<age>[0-9]+)
-    \]
-    \s*
-    \)
-    $
-    ''',
-    re.UNICODE | re.VERBOSE
-)
-
-MESON_VERSION_RE = re.compile(
-    r'''
-    ^
-    \s*
-    version
-    \s*
-    :{1}
-    \s*
-    \'{1}
-    (?P<major>[0-9]+)
-    \.{1}
-    (?P<minor>[0-9]+)
-    \.{1}
-    (?P<micro>[0-9]+)
-    \'{1}
-    \s*
-    ,?
-    $
-    ''',
-    re.UNICODE | re.VERBOSE
-)
-
-MESON_INTERFACE_AGE_RE = re.compile(
-    r'''
-    ^\s*gtk_interface_age\s*={1}\s*(?P<age>[0-9]+)\s*$
-    ''',
-    re.UNICODE | re.VERBOSE
-)
-
-version = {}
-
-with open(configure_ac, 'r') as f:
-    line = f.readline()
-    while line:
-        res = CONFIGURE_MAJOR_VERSION_RE.match(line)
-        if res:
-            if 'major' in version:
-                print(f'Redefinition of major version; version is already set to {version["major"]}')
-                sys.exit(1)
-            version['major'] = res.group('version')
-            line = f.readline()
-            continue
-        res = CONFIGURE_MINOR_VERSION_RE.match(line)
-        if res:
-            if 'minor' in version:
-                print(f'Redefinition of minor version; version is already set to {version["minor"]}')
-                sys.exit(1)
-            version['minor'] = res.group('version')
-            line = f.readline()
-            continue
-        res = CONFIGURE_MICRO_VERSION_RE.match(line)
-        if res:
-            if 'micro' in version:
-                print(f'Redefinition of micro version; version is already set to {version["micro"]}')
-                sys.exit(1)
-            version['micro'] = res.group('version')
-            line = f.readline()
-            continue
-        res = CONFIGURE_INTERFACE_AGE_RE.match(line)
-        if res:
-            if 'age' in version:
-                print(f'Redefinition of interface age; age is already set to {version["age"]}')
-                sys.exit(1)
-            version['age'] = res.group('age')
-            line = f.readline()
-            continue
-        if ('major', 'minor', 'micro', 'age') in version:
-            break
-        line = f.readline()
-
-print(f'GTK version defined in {configure_ac}: {version["major"]}.{version["minor"]}.{version["micro"]} (age: {version["age"]})')
-
-configure_version = version
-version = {}
-
-with open(meson_build, 'r') as f:
-    line = f.readline()
-    inside_project = False
-    while line:
-        if line.startswith('project('):
-            inside_project = True
-        if inside_project:
-            res = MESON_VERSION_RE.match(line)
-            if res:
-                version['major'] = res.group('major')
-                version['minor'] = res.group('minor')
-                version['micro'] = res.group('micro')
-        if inside_project and line.endswith(')'):
-            inside_project = False
-        res = MESON_INTERFACE_AGE_RE.match(line)
-        if res:
-            version['age'] = res.group('age')
-        if ('major', 'minor', 'micro', 'age') in version:
-            break
-        line = f.readline()
-
-print(f'GTK version defined in {meson_build}: {version["major"]}.{version["minor"]}.{version["micro"]} (age: {version["age"]})')
-
-meson_version = version
-
-if configure_version != meson_version:
-    print('Version mismatch between Autotools and Meson builds')
-    sys.exit(1)
-
-sys.exit(0)

config.h.meson

@@ -20,6 +20,9 @@
 /* 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
@@ -59,6 +62,12 @@
 /* defines whether we have HarfBuzz */
 #mesondefine HAVE_HARFBUZZ
 
+/* Define to 1 if you have the `httpGetAuthString' function. */
+#mesondefine HAVE_HTTPGETAUTHSTRING
+
+/* Define if cups http_t authstring field is accessible */
+#mesondefine HAVE_HTTP_AUTHSTRING
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #mesondefine HAVE_INTTYPES_H
 
@@ -116,9 +125,6 @@
 /* Define to 1 if you have the `round' function. */
 #mesondefine HAVE_ROUND
 
-/* Define to 1 if SetupDiGetDevicePropertyW() is available */
-#mesondefine HAVE_SETUP_DI_GET_DEVICE_PROPERTY_W
-
 /* Define to 1 if you have the `sincos' function. */
 #mesondefine HAVE_SINCOS
 
@@ -143,9 +149,6 @@
 /* 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
 
@@ -209,6 +212,12 @@
 /* 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
 
@@ -281,6 +290,3 @@
 #mesondefine GTK_LOCALEDIR
 
 #mesondefine ISO_CODES_PREFIX
-
-/* Define if tracker3 is available */
-#mesondefine HAVE_TRACKER3

config.h.win32.in

@@ -26,6 +26,9 @@
 /* define if we have colord */
 /* #undef HAVE_COLORD */
 
+/* Define to 1 if you have the <crt_externs.h> header file. */
+/* #undef HAVE_CRT_EXTERNS_H */
+
 /* Define to 1 if you have the `dcgettext' function. */
 #define HAVE_DCGETTEXT 1
 
@@ -71,6 +74,12 @@
 /* Define if gio-unix is available */
 /* #undef HAVE_GIO_UNIX */
 
+/* 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
@@ -245,10 +254,16 @@
 /* Define if _NL_TIME_FIRST_WEEKDAY is available */
 /* #undef HAVE__NL_TIME_FIRST_WEEKDAY */
 
+/* Define to 1 if you have the `_NSGetEnviron' function. */
+/* #undef HAVE__NSGETENVIRON */
+
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
 #define LT_OBJDIR ".libs/"
 
+/* Define if <X11/extensions/XIproto.h> needed for xReply */
+/* #undef NEED_XIPROTO_H_FOR_XREPLY */
+
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 #ifndef _MSC_VER
 /* #undef NO_MINUS_C_MINUS_O */

configure.ac

@@ -10,8 +10,8 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [24])
-m4_define([gtk_micro_version], [23])
-m4_define([gtk_interface_age], [19])
+m4_define([gtk_micro_version], [8])
+m4_define([gtk_interface_age], [4])
 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], [57])
-m4_define([glib_required_micro], [2])
+m4_define([glib_required_minor], [53])
+m4_define([glib_required_micro], [4])
 m4_define([glib_required_version],
           [glib_required_major.glib_required_minor.glib_required_micro])
 m4_define([glib_min_required_minor],
@@ -56,15 +56,16 @@ GLIB_VERSION_CFLAGS="-DGLIB_MIN_REQUIRED_VERSION=glib_min_required_version -DGLI
 
 m4_define([pango_required_version], [1.41.0])
 m4_define([fribidi_required_version], [0.19.7])
-m4_define([atk_required_version], [2.32.0])
+m4_define([atk_required_version], [2.15.1])
 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.14.91])
-m4_define([wayland_protocols_required_version], [1.17])
+m4_define([wayland_required_version], [1.9.91])
+m4_define([wayland_protocols_required_version], [1.12])
+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
@@ -342,23 +343,23 @@ AC_ARG_ENABLE(wayland-backend,
               [AS_HELP_STRING([--enable-wayland-backend],
                               [enable the wayland gdk backend])],
 			      [backend_set=yes])
+AC_ARG_ENABLE(mir-backend,
+              [AS_HELP_STRING([--enable-mir-backend],
+                              [enable the Mir gdk backend])],
+			      [backend_set=yes])
+
 AC_ARG_ENABLE(cloudproviders,
               [AS_HELP_STRING([--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
   else
     enable_x11_backend=yes
     enable_wayland_backend=maybe
+    enable_mir_backend=no
   fi
 fi
 
@@ -471,6 +472,30 @@ else
   AM_CONDITIONAL(USE_WAYLAND, false)
 fi
 
+MIR_DEPENDENCIES="mirclient >= mirclient_required_version mircookie >= mircookie_required_version libcontent-hub-glib"
+if test "$enable_mir_backend" = "maybe" ; then
+  PKG_CHECK_EXISTS($MIR_DEPENDENCIES, [have_mir_deps=yes], [have_mir_deps=no])
+  AC_MSG_CHECKING([for MIR_DEPENDENCIES])
+  if test "$have_mir_deps" = "no" ; then
+    enable_mir_backend=no
+  else
+    enable_mir_backend=yes
+  fi
+  AC_MSG_RESULT($enable_mir_backend)
+fi
+
+if test "$enable_mir_backend" = "yes"; then
+  cairo_backends="$cairo_backends cairo"
+  GDK_BACKENDS="$GDK_BACKENDS mir"
+  GDK_WINDOWING="$GDK_WINDOWING
+#define GDK_WINDOWING_MIR"
+  MIR_PACKAGES="$MIR_DEPENDENCIES"
+
+  AM_CONDITIONAL(USE_MIR, true)
+else
+  AM_CONDITIONAL(USE_MIR, false)
+fi
+
 # strip leading space
 GDK_BACKENDS=${GDK_BACKENDS#* }
 
@@ -726,32 +751,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"
   ],
   []
 )
@@ -846,6 +845,10 @@ AC_CHECK_LIB(m,round,,)
 AC_CHECK_FUNCS(round rint nearbyint sincos exp2 log2 trunc)
 AC_CHECK_DECLS([isnan, isinf], [], [], [[#include <math.h>]])
 
+# Checks for gdkspawn
+AC_CHECK_HEADERS(crt_externs.h)
+AC_CHECK_FUNCS(_NSGetEnviron)
+
 AC_MSG_CHECKING(whether to build dynamic modules)
 
 AC_ARG_ENABLE(modules,
@@ -1045,6 +1048,17 @@ if test "x$enable_x11_backend" = xyes; then
   AC_CHECK_FUNC(XextFindDisplay, :,
                 AC_MSG_ERROR([*** libX11 and libXext not found. Check 'config.log' for more details.]))
 
+  # Check if <X11/extensions/XIproto.h> is needed for xReply.
+
+  AC_CHECK_TYPE([xReply], ,
+                [AC_CHECK_TYPE([xReply],
+                               [AC_DEFINE([NEED_XIPROTO_H_FOR_XREPLY], 1,
+                                          [Define if <X11/extensions/XIproto.h> needed for xReply])],
+                               [AC_MSG_ERROR([xReply type unavailable. X11 is too old])],
+                               [[#include <X11/extensions/XIproto.h>
+                                 #include <X11/Xlibint.h>]])],
+                [[#include <X11/Xlibint.h>]])
+
   # Check for XKB support.
 
   if test "x$enable_xkb" = "xyes"; then
@@ -1320,26 +1334,11 @@ 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 $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES $PROFILER_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 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"
@@ -1373,7 +1372,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 epoxy >= epoxy_required_version fribidi >= fribidi_required_version"
+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
@@ -1505,13 +1504,12 @@ 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 --version`
+    CUPS_API_VERSION=`$CUPS_CONFIG --api-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 7; then
-      AC_MSG_ERROR([CUPS >= 1.7 not found])
+    if test $CUPS_API_MAJOR -lt 2; then
+      AC_MSG_ERROR([CUPS >= 2.0 not found])
     fi
 
     AC_SUBST(CUPS_API_MAJOR)
@@ -1524,6 +1522,22 @@ 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
 
@@ -1552,30 +1566,6 @@ else
   fi
 fi
 
-# Checks to see if we should compile with tracker3 search engine
-#
-
-AC_ARG_ENABLE(tracker3,
-              [AS_HELP_STRING([--enable-tracker3],
-                              [enable tracker3 search engine])],
-              [enable_tracker3=yes],
-              [enable_tracker3=no])
-
-if test "x$enable_tracker3" = "xyes"; then
-  PKG_CHECK_MODULES(TRACKER3, [tracker-sparql-3.0], have_tracker3=yes, have_tracker3=no)
-  GTK_DEP_CFLAGS="$GTK_DEP_CFLAGS $TRACKER3_CFLAGS"
-  GTK_DEP_LIBS="$GTK_DEP_LIBS $TRACKER3_LIBS"
-  if test "x$have_tracker3" = "xyes"; then
-    AC_DEFINE([HAVE_TRACKER3], [], [Define if tracker3 is available])
-  else
-    AC_MSG_ERROR([
-*** tracker3 not found.
-])
-  fi
-fi
-
-AM_CONDITIONAL(HAVE_TRACKER3, test "x$have_tracker3" = "xyes")
-
 # Checks to see if we should compile with cloudprint backend for GTK+
 #
 
@@ -1964,17 +1954,16 @@ docs/reference/gtk/getting_started.xml
 docs/reference/libgail-util/Makefile
 docs/reference/libgail-util/version.xml
 docs/tools/Makefile
-win32/Makefile
-win32/config-msvc.mak
-win32/vs9/Makefile
-win32/vs9/gtk3-version-paths.vsprops
-win32/vs10/Makefile
-win32/vs10/gtk3-version-paths.props
-win32/vs11/Makefile
-win32/vs12/Makefile
-win32/vs14/Makefile
-win32/vs15/Makefile
-win32/vs16/Makefile
+build/Makefile
+build/win32/Makefile
+build/win32/vs9/Makefile
+build/win32/vs9/gtk3-version-paths.vsprops
+build/win32/vs10/Makefile
+build/win32/vs10/gtk3-version-paths.props
+build/win32/vs11/Makefile
+build/win32/vs12/Makefile
+build/win32/vs14/Makefile
+build/win32/vs15/Makefile
 gdk/Makefile
 gdk/broadway/Makefile
 gdk/x11/Makefile
@@ -1983,6 +1972,7 @@ gdk/win32/rc/Makefile
 gdk/win32/rc/gdk.rc
 gdk/quartz/Makefile
 gdk/wayland/Makefile
+gdk/mir/Makefile
 gdk/gdkversionmacros.h
 gtk/Makefile
 gtk/makefile.msc
@@ -2022,4 +2012,3 @@ 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,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = gtk-demo widget-factory icon-browser
 
-EXTRA_DIST += \
+EXTRA_DIST = \
 	meson.build
 
 -include $(top_srcdir)/git.mk

demos/gtk-demo/Makefile.am

@@ -116,7 +116,6 @@ EXTRA_DIST += 				\
 	data/symbolic-source.svg	\
 	demo.gresource.xml		\
 	$(resource_files)		\
-	makefile.msc.in			\
 	org.gtk.Demo.gschema.xml	\
 	demos.h.win32	\
 	meson.build	\
@@ -196,11 +195,11 @@ gtk3_demo_EXCLUDES = font_features.c|pagesetup.c
 gtk3_demo_application_FILES = $(gtk3_demo_application_SOURCES)
 gtk3_demo_application_EXCLUDES = dummy
 
-include $(top_srcdir)/win32/Makefile.msvcproj
+include $(top_srcdir)/build/Makefile.msvcproj
 
 dist-hook: \
-	$(top_builddir)/win32/vs9/gtk3-demo.vcproj	\
-	$(top_builddir)/win32/vs9/gtk3-demo-application.vcproj
+	$(top_builddir)/build/win32/vs9/gtk3-demo.vcproj	\
+	$(top_builddir)/build/win32/vs9/gtk3-demo-application.vcproj
 
 DISTCLEANFILES = demos.h demos.h.win32
 

demos/gtk-demo/geninclude.py

@@ -33,7 +33,7 @@ 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:
+    with open(demo_file, 'r') as f:
         title = f.readline().replace("/*", "").strip()
 
 
@@ -103,6 +103,6 @@ for demo in demos:
 
 file_output += "  { NULL }\n};\n"
 
-ofile = open(out_file, "w", encoding="utf-8")
+ofile = open(out_file, "w")
 ofile.write(file_output)
 ofile.close()