csstokenizer: Export the error location

This again is part of the quest to make it possible to "undo" reading
a token.

.gitlab-ci.yml

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

.gitlab-ci/Dockerfile

@@ -1,70 +0,0 @@
-FROM fedora:29
-
-RUN dnf -y install \
-    adwaita-icon-theme \
-    atk-devel \
-    at-spi2-atk-devel \
-    avahi-gobject-devel \
-    cairo-devel \
-    cairo-gobject-devel \
-    ccache \
-    colord-devel \
-    cups-devel \
-    dbus-x11 \
-    fribidi-devel \
-    gcc \
-    gcc-c++ \
-    gdk-pixbuf2-devel \
-    gdk-pixbuf2-modules \
-    gettext \
-    gettext-devel \
-    git \
-    glib2-devel \
-    gobject-introspection-devel \
-    graphene-devel \
-    gtk-doc \
-    hicolor-icon-theme \
-    iso-codes \
-    itstool \
-    json-glib-devel \
-    libcloudproviders-devel \
-    libepoxy-devel \
-    libmount-devel \
-    librsvg2 \
-    libXcomposite-devel \
-    libXcursor-devel \
-    libXcursor-devel \
-    libXdamage-devel \
-    libXfixes-devel \
-    libXi-devel \
-    libXinerama-devel \
-    libxkbcommon-devel \
-    libXrandr-devel \
-    libXrender-devel \
-    make \
-    mesa-libEGL-devel \
-    mesa-libwayland-egl-devel \
-    meson \
-    ninja-build \
-    pango-devel \
-    python3 \
-    python3-pip \
-    python3-wheel \
-    redhat-rpm-config \
-    rest-devel \
-    sassc \
-    vulkan-devel \
-    wayland-devel \
-    wayland-protocols-devel \
-    xorg-x11-server-Xvfb \
-    && dnf clean all
-
-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.utf8
-ENV PATH="/usr/lib64/ccache:${PATH}"

.gitlab-ci/run-docker.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-#
-# 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
-
-TAG="registry.gitlab.gnome.org/gnome/gtk/gtk-3-24:v2"
-
-# HOST_USER_ID gets used to create a user with the same ID so that files
-# created in the mounted volume have the same owner
-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

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

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

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

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

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

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

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

Makefile.am

@@ -22,13 +22,7 @@ EXTRA_DIST +=			\
 	sanitize-la.sh		\
 	po/README.translators	\
 	po/po2tbl.sed.in	\
-	make-pot	\
+	make-pot
-	meson_options.txt	\
-	meson.build	\
-	po/meson.build	\
-	po-properties/meson.build	\
-	build-aux/meson/post-install.py	\
-	config.h.meson
 
 MAINTAINERCLEANFILES = \
 	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
@@ -101,7 +95,7 @@ ChangeLog:
 uninstall-local:
 	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc
 
-AM_DISTCHECK_CONFIGURE_FLAGS =		\
+DISTCHECK_CONFIGURE_FLAGS =		\
 	--enable-gtk-doc 		\
 	--disable-doc-cross-references  \
 	--enable-man 			\
@@ -109,7 +103,14 @@ AM_DISTCHECK_CONFIGURE_FLAGS =		\
 	--enable-introspection  	\
 	--enable-installed-tests
 
-GITIGNORE_TRANSLATION_DIRS = po-properties
+GITIGNOREFILES = \
-GITIGNOREFILES = po-properties/gtk30-properties.pot
+	po-properties/Makefile.in.in \
+	po-properties/Makefile.in \
+	po-properties/Makefile \
+	po-properties/*.gmo \
+	po-properties/*.mo \
+	po-properties/POTFILES \
+	po-properties/stamp-it \
+	po-properties/.intltool-merge-cache
 
 -include $(top_srcdir)/git.mk

README.in

@@ -73,10 +73,286 @@ Patches should be in unified diff form. (The -up option to GNU diff)
 Even better are git-formatted patches. (Use git format-patch)
 
 
-Release notes
+Release notes for 3.20
-=============
+======================
 
-Release notes for releases of GTK+ 3.x are part of the migration
+* The way theming works in GTK+ has been reworked fundamentally, to
-guide in the GTK+ documentation. See
+  implement many more CSS features and make themes more expressive.
+  As a result, custom CSS that is shipped with applications and third-
+  party themes will need adjustments. Widgets now use element names much
+  more than style classes; type names are no longer used in style matching.
+  Every widget now documents the element names it has and the style classes
+  it uses. The GTK+ inspector can also help with finding this information.
 
-https://developer.gnome.org/gtk3/unstable/gtk-migrating-2-to-3.html
+* GTK+ now uses internal subobjects (also known as gadgets) for allocating
+  and drawing widget parts. Applications that subclass GTK+ widgets may see
+  warnings if they override the size_allocate vfunc and don't chain up.
+  The proper way to subclass is to chain up in size_allocate. If you do not
+  want to do that for some reason, you have to override the draw vfunc as
+  well.
+
+* Several fixes for window sizing and window placement with client-side
+  decorations may affect applications that are saving and restoring window
+  sizes. The recommended best practice for this which is known to work with
+  client-side and server-side decorations and with older and newer versions
+  of GTK+ is to use gtk_window_get_size() to save window sizes and
+  gtk_window_set_default_size() to restore it.
+  See https://wiki.gnome.org/HowDoI/SaveWindowState for a detailed example.
+
+* GtkDrawingArea used to implicitly render the theme background before
+  calling the ::draw handler. This is no longer the case. If you rely
+  on having a theme-provided background, call gtk_render_background()
+  from your ::draw handler.
+
+* The GtkFileChooser interface prerequisite changed from GtkWidget
+  to GObject, allowing non-widget implementations of this interface.
+  This is a minor change in ABI, as applications are no longer guaranteed
+  that a GtkFileChooser also supports all GtkWidget methods. However, all
+  previously existing implementations still derive from GtkWidget, so no
+  existing code should break.
+
+* The way in which GtkLevelBar determines the offset to apply was a bit
+  inconsistent in the past; this has been fixed. Applications that are using
+  custom offsets should double-check that their levels look as expected.
+
+Release notes for 3.18
+======================
+
+* The GtkListBox model support that was introduced in 3.16 has been
+  changed to no longer call gtk_widget_show_all on rows created by
+  the create_widget_func. You need to manage the visibility of child
+  widgets yourself in your create_widget_func.
+
+* The alpha component of foreground colors that are applied to
+  GtkCellRendererText is no longer ignored. If you don't want your
+  text to be translucent, use opaque colors.
+
+Release notes for 3.16
+======================
+
+* GTK+ now includes an OpenGL rendering widget. To support GL on various
+  platforms, GTK+ uses libepoxy.
+
+* GTK+ no longer uses gtk-update-icon-cache during its build. The
+  --enable-gtk2-dependency configure option has been removed.
+
+* The introspection annotations for the x and y parameters of
+  GtkMenuPositionFunc have been corrected from 'out' to 'inout'.
+  If you are using such a function from language-bindings, this
+  may require adjustments.
+
+* The lookup order for actions that are activated via keyboard
+  accelerators has been changed to start at the currently focused
+  widget. If your application is making use fo nested action groups
+  via gtk_widget_insert_action_group, you may want to check that
+  this change does not upset your accelerators.
+
+* The GtkScrollable interface has gained a new vfunc, get_border,
+  that is used to position overshoot and undershoot indications that
+  are drawn over the content by GtkScrolledWindow. Unless your scrollable
+  has non-scrolling parts similar to treeview headers, there is no need
+  to implement this vfunc.
+
+* The GtkSearchEntry widget has gained a number of new signals that
+  are emitted when certain key sequences are seen. In particular, it
+  now handles the Escape key and emits ::stop-search. Applications that
+  expect to handle Escape themselves will need to be updated.
+
+Release notes for 3.14
+======================
+
+* A new state, GTK_STATE_FLAG_CHECKED, has been added for checked states
+  of radio and check buttons and menuitems. Applications that are using
+  GTK+ styles without widgets will need adjustments.
+
+* Adwaita is now the default theme on all platforms.
+
+* The icon theme code has become a little pickier about sizes and is not
+  automatically scaling icons beyond the limits defined in the icon theme
+  unless explicitly asked to do so with GTK_ICON_LOOKUP_FORCE_SIZE.
+
+* GTK+ now includes an interactive debugger which can be activated with
+  the keyboard shortcuts Ctrl-Shift-d or Ctrl-Shift-i. If these shortcuts
+  interfere with application keybindings, they can be disabled with the
+  setting org.gtk.Settings.Debug.enable-inspector-keybinding.
+
+* Most widgets have been ported to use the new gesture framework internally
+  for event handling. Traditional event handlers in derived widgets are still
+  being called.
+
+* Using GTK+ under X11 without the X Render extension has been observed
+  to be problematic. This combination is using code paths in cairo and
+  graphics drivers which are rarely tested and likely buggy.
+
+* GtkTextView is now using a pixel-cache internally, and is drawing
+  a background underneath the text. This can cause problems for applications
+  which assumed that they could draw things below and above the text
+  by chaining up in the ::draw implementation of their GtkTextView subclass.
+  As a short-term workaround, you can make the application apply a
+  custom theme to the text view with a transparent background. For
+  a proper fix, use the new ::draw_layer vfunc.
+
+Release notes for 3.12
+======================
+
+* GtkWidget had a hack where if opacity is 0.999 we set up an opacity
+  group when rendering the widget. This is no longer needed in 3.10,
+  and GtkStack doesn't use it anymore. It has been removed in 3.12.
+  GdStack is using it, so applications should be ported from GdStack
+  to GtkStack in 3.12.
+
+* GtkHeaderBar in 3.10 was not ordering its pack-end children in
+  the right way. This has been fixed in 3.12. Applications which
+  pack multiple widgets at the end of a headerbar will have to
+  be updated.
+
+* gtk_text_view_add_child_in_window has changed behaviour a bit.
+  It now always positions the child in buffer coordinates, where
+  it used to inconsistently scroll with the buffer but then go
+  reposition to a window-relative position on redraw.
+
+* A number of container widgets have been made more compliant with
+  the uniform CSS rendering model by making them render backgrounds
+  and borders. This may require some adjustments in applications that
+  were making assumptions about containers never rendering backgrounds.
+
+Release notes for 3.10
+======================
+
+* GDK has been changed to allow only a single screen per display.
+  Only the X11 backend had multiple screens before, and multi-screen
+  setups (not multi-monitor!) are very rare nowadays. If you really
+  need multiple X screens, open them as separate displays.
+
+* The behavior of GtkBox::expand has been changed to never propagate
+  up. Previously, this was happening inconsistently. If you want the
+  expand to propagate, use the GtkWidget h/v expand properties.
+  If you experience sizing problems with widgets in ported code,
+  carefully check the expand and fill flags of your boxes.
+
+* GtkBin no longer provides default implementations for
+  get_height_for_width, subclasses now have to provide their own
+  implementation if they need height-for-width functionality.
+
+* Widget state propagation has been changed. Historically, all of
+  active, prelight, selected, insensitive, inconsistent and backdrop
+  have been propagated to children. This has now been restricted
+  to just the insensitive and backdrop states. This mostly affects
+  theming.
+
+* The way widget drawing happens has changed. Earlier versions handled
+  one expose event per GdkWindow, each with a separate cairo_t. Now we
+  only handle the expose event on the toplevel and reuse the same
+  cairo_t (with the right translation and clipping) for the entire
+  widget hierarchy, recursing down via the GtkWidget::draw signal.
+  Having all rendering in the same call tree allows effects like
+  opacity and offscreen rendering of entire widget sub-hierarchies.
+  Generally this should not require any changes in widgets, but
+  code looking at e.g. the current expose event may see different
+  behavior than before.
+
+* The Gtk+ scrolling implementation has changed. gdk_window_scroll()
+  and gdk_window_move_region() no longer copy the region on the
+  window, but rather invalidate the entire scrolled region. This is
+  slightly slower, but allowed us to implement a offscreen surface
+  scrolling method which better fits modern hardware. Most scrolling
+  widgets in Gtk+ have been converted to use this model for scrolling,
+  but external widgets implementing scrolling using GdkWindow may see
+  some slowdown.
+
+Release notes for 3.8
+=====================
+
+* GtkIconInfo has changed from being a boxed type to a GObject. This
+  is technically an ABI change, but basically all existing code
+  will keep working if its used as a boxed type, and its not
+  possible to instantiate GtkIconInfos outside Gtk, so this is not
+  expected to be a big problem.
+
+Release notes for 3.6
+=====================
+
+* The accessibility bridge code that exports accessible objects
+  on the bus is now used by default; atk-bridge has been converted
+  into a library that GTK+ links against. To void the linking,
+  pass --without-atk-bridge when configuring GTK+.
+
+* GDK threading support has been deprecated. It is recommended to
+  use g_idle_add(), g_main_context_invoke() and similar funtions
+  to make all GTK+ calls from the main thread.
+
+* GTK+ now follows the XDG Base Directory specification for
+  user configuration and data files. In detail,
+  * $XDG_CONFIG_HOME/gtk-3.0/custom-papers is the new location
+    for $HOME/.gtk-custom-papers
+  * $XDG_CONFIG_HOME/gtk-3.0/bookmarks is the new location
+    for $HOME/.gtk-bookmarks
+  * $XDG_DATA_HOME/themes is preferred over $HOME/.themes
+  * $XDG_DATA_HOME/icons is preferred over $HOME/.icons.
+  Existing files from the old location will still be read
+  if the new location does not exist.
+
+* $HOME/.gtk-3.0 is no longer in the default module load path.
+  If you want to load modules from there, add it to the GTK_PATH
+  environment variable.
+
+Release notes for 3.4
+=====================
+
+* Scroll events have been separated from button events, and smooth
+  scrolling has been added with a separate event mask. Widgets now
+  need to have either GDK_SCROLL_MASK or GDK_SMOOTH_SCROLL_MASK in
+  their event mask to receive scroll events. In addition, the
+  GdkScrollDirection enumeration has gained a new member,
+  GDK_SCROLL_SMOOTH, so switch statements will have to be amended
+  to cover this case.
+
+* GTK+ now uses <Primary> instead of <Control> in keyboard accelerators,
+  for improved cross-platform handling. This should not affect
+  applications, unless they parse or create these accelerator
+  manually.
+
+* The tacit assumption that the Alt key corresponds to the MOD1
+  modifier under X11 is now a hard requirement.
+
+* The beagle search backend for the file chooser has been dropped.
+  Tracker is the only supported search backend on Linux now.
+
+* GtkNotebook has been changed to destroy its action widgets when
+  it gets destroyed itself. If your application is using action
+  widgets in notebooks, you may have to adjust your code to take
+  this into account.
+
+* GtkApplication no longer uses the gtk mainloop wrappers, so
+  it is no longer possible to use gtk_main_quit() to stop it.
+
+* The -uninstalled variants of the pkg-config files have been dropped.
+
+* Excessive dependencies have been culled from Requires: lines
+  in .pc files. Dependent modules may have to declare dependencies
+  that there were getting 'for free' in the past.
+
+Release notes for 3.2
+=====================
+
+* The accessible implementations for GTK+ widgets have been integrated
+  into libgtk itself, and the gail module does not exist anymore. This
+  change should not affect applications very much.
+
+Release notes for 3.0
+=====================
+
+* GTK+ 3 is a major new version of GTK+, which is parallel installable
+  with GTK+ 2.x. For information about porting applications from GTK+ 2.x
+  to GTK+ 3, see the file:
+
+  docs/reference/gtk/html/migrating.html
+
+  Or online at:
+
+  http://library.gnome.org/devel/gtk/3.0/migrating.html
+
+* Note that the library sonames in this release have been changed from
+  libgtk-3.0 and libgdk-3.0 to libgtk-3 and libgdk-3, to prevent the
+  library versions from going backwards, compared to the 2.90/91/99
+  releases. Applications will have to be recompiled.

README.win32

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

build-aux/flatpak/org.gtk.WidgetFactory.json

@@ -1,45 +0,0 @@
-{
-    "app-id": "org.gtk.WidgetFactory",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
-    "sdk": "org.gnome.Sdk",
-    "command": "gtk3-widget-factory",
-    "tags": ["devel", "development", "nightly"],
-    "rename-desktop-file": "gtk3-widget-factory.desktop",
-    "rename-icon": "gtk3-widget-factory",
-    "finish-args": [
-        "--device=dri",
-        "--share=ipc",
-        "--socket=x11",
-        "--socket=wayland",
-        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*",
-        "--talk-name=ca.desrt.conf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
-    ],
-    "cleanup": [
-        "/include",
-        "/lib/pkgconfig", "/share/pkgconfig",
-        "/share/aclocal",
-        "/man", "/share/man", "/share/gtk-doc",
-        "*.la", ".a",
-        "/lib/girepository-1.0",
-        "/share/gir-1.0",
-        "/share/doc"
-    ],
-    "modules": [
-        {
-            "name": "gtk",
-            "buildsystem": "autotools",
-            "builddir": true,
-            "config-opts": [
-                "--libdir=/app/lib"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "branch": "gtk-3-24",
-                    "url": "https://gitlab.gnome.org/GNOME/gtk.git"
-                }
-            ]
-        }
-    ]
-}

build-aux/meson/post-install.py

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

build/Makefile-newvs.am

@@ -9,43 +9,35 @@
 # Author: Fan, Chun-wei
 # November 05, 2012
 
-# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14 and so on)
+# MSVC_VER_LONG: Long Version of 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_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on)
-# MSVC_TOOLSET: Use if target MSVC toolsett is not in the form v $(MSVC_VER)0, meaning v$(MSVC_TOOLSET)
+# MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015
 
-if MSVC_BASE_NO_TOOLSET_SET
+%.sln:
-MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0
-endif
-
-if MSVC_NO_TOOLSET_SET
-MSVC_TOOLSET = $(MSVC_VER)0
-endif
-
-%.sln: $(top_builddir)/build/win32/vs10/Makefile
 	sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
 	sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
 	rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
 
-%.txt: $(top_builddir)/build/win32/vs10/Makefile
+%.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: $(top_builddir)/build/win32/vs10/Makefile
+%.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)/$@; \
+		sed 's/v100/v$(MSVC_VER)0/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)/$@; \
+		sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
 	fi
 
-%.props: $(top_builddir)/build/win32/vs10/Makefile
+%.props:
 	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: $(top_builddir)/build/win32/vs10/Makefile
+%.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 \

build/Makefile.am

@@ -1,5 +1,14 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = win32
+SUBDIRS = \
+	win32
+
+EXTRA_DIST +=	\
+	msvcfiles.py	\
+	gen-file-list-gtk.py	\
+	detectenv_msvc.mak	\
+	introspection-msvc.mak	\
+	gtk-introspection-msvc.mak.in	\
+	gtk-introspection-msvc.mak
 
 -include $(top_srcdir)/git.mk

build/Makefile.msvcproj

@@ -60,19 +60,10 @@ $(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
+$(top_builddir)/build/win32/vs9/$(1).vcproj:
 	-$(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
-
 
 	for F in $(_proj_files); do \
 		case $$$$F in \
@@ -96,7 +87,7 @@ $(top_builddir)/build/win32/vs9/$(1).vcproj: Makefile
 
 $(top_builddir)/build/win32/vs10/$(1).vs10.headers: $(top_builddir)/build/win32/vs9/$(1).headers
 
-$(top_builddir)/build/win32/vs9/$(1).headers: Makefile
+$(top_builddir)/build/win32/vs9/$(1).headers:
 	-$(RM) $(top_builddir)/build/win32/vs9/$(1).headers
 	-$(RM) $(top_builddir)/build/win32/vs10/$(1).vs10.headers
 

build/detectenv_msvc.mak

@@ -1,8 +1,3 @@
-# Common NMake Makefile module for checking the build environment
-# This can be copied from $(glib_srcroot)\build\win32 for GNOME items
-# that support MSVC builds and introspection under MSVC, and can be used
-# for building test programs as well.
-
 # Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or
 # VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir)
 !if !defined(VCINSTALLDIR) && !defined(WINDOWSSDKDIR)
@@ -40,12 +35,6 @@ VSVER = 10
 VSVER = 11
 !elseif $(VCVERSION) > 1799 && $(VCVERSION) < 1900
 VSVER = 12
-!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 1910
-VSVER = 14
-!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 1920
-VSVER = 15
-!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 2000
-VSVER = 16
 !else
 VSVER = 0
 !endif
@@ -53,24 +42,20 @@ VSVER = 0
 !if "$(VSVER)" == "0"
 MSG = ^
 This NMake Makefile set supports Visual Studio^
-9 (2008) through 16 (2019).  Your Visual Studio^
+9 (2008) through 12 (2013).  Your Visual Studio^
 version is not supported.
 !error $(MSG)
 !endif
 
 VALID_CFGSET = FALSE
-!if "$(CFG)" == "release" || "$(CFG)" == "debug" || "$(CFG)" == "Release" || "$(CFG)" == "Debug"
+!if "$(CFG)" == "release" || "$(CFG)" == "debug"
 VALID_CFGSET = TRUE
 !endif
 
-# We want debugging symbols logged for all builds,
+!if "$(CFG)" == "release"
-# using .pdb files for release builds
+CFLAGS_ADD = /MD /O2
-CFLAGS_BASE = /Zi
-
-!if "$(CFG)" == "release" || "$(CFG)" == "Release"
-CFLAGS_ADD = /MD /O2 $(CFLAGS_BASE)
 !else
-CFLAGS_ADD = /MDd /Od $(CFLAGS_BASE)
+CFLAGS_ADD = /MDd /Od /Zi
 !endif
 
 !if "$(PLAT)" == "x64"

build/gen-file-list-gtk.py

@@ -0,0 +1,100 @@
+#!/usr/bin/python
+# vim: encoding=utf-8
+# Generate the file lists for processing with g-ir-scanner
+import os
+import sys
+import re
+import string
+import subprocess
+import optparse
+
+from msvcfiles import read_vars_from_AM
+
+def gen_gdk_filelist(srcroot, subdir, dest):
+    vars = read_vars_from_AM(os.path.join(srcroot, subdir, 'Makefile.am'),
+                             vars = {},
+                             conds = {},
+                             filters = ['gdk_h_sources', 'gdk_c_sources'])
+
+    vars['gdk_enums'] = 'gdkenumtypes.c gdkenumtypes.h'
+
+    files = vars['gdk_h_sources'].split() + \
+            vars['gdk_c_sources'].split() + \
+            vars['gdk_enums'].split()
+
+    sources = [i for i in files if (i != 'gdkkeysyms-compat.h')]
+
+    with open(dest, 'w') as d:
+        for i in sources:
+            d.write(srcroot + '\\' + subdir + '\\' + i.replace('/', '\\') + '\n')
+
+def gen_gdkwin32_filelist(srcroot, subdir, dest):
+    vars = read_vars_from_AM(os.path.join(srcroot, subdir, 'Makefile.am'),
+                             vars = {},
+                             conds = {'HAVE_INTROSPECTION': True,
+                                      'OS_WIN32': True},
+                             filters = ['w32_introspection_files'])
+
+    files = vars['w32_introspection_files'].split()
+
+    with open(dest, 'w') as d:
+        for i in files:
+            d.write(srcroot + '\\' + subdir + '\\' + i.replace('/', '\\') + '\n')
+
+def gen_gtk_filelist(srcroot, subdir, dest):
+    vars = read_vars_from_AM(os.path.join(srcroot, 'gtk', 'Makefile.am'),
+                             vars = {},
+                             conds = {'USE_WIN32': True,
+                                      'USE_QUARTZ': False,
+                                      'USE_X11': False,
+                                      'USE_EXTERNAL_ICON_CACHE': False},
+                             filters = ['gtkinclude_HEADERS',
+                                        'a11yinclude_HEADERS',
+                                        'deprecatedinclude_HEADERS',
+                                        'gtk_base_c_sources',
+                                        'gtk_clipboard_dnd_c_sources'])
+
+    vars_depr = read_vars_from_AM(os.path.join(srcroot, 'gtk', 'deprecated', 'Makefile.inc'),
+                                  vars = {},
+                                  conds = {},
+                                  filters = ['deprecated_h_sources',
+                                             'deprecated_c_sources'])
+
+    vars_a11y = read_vars_from_AM(os.path.join(srcroot, 'gtk', 'a11y', 'Makefile.inc'),
+                                  vars = {},
+                                  conds = {},
+                                  filters = ['a11y_h_sources',
+                                             'a11y_c_sources'])
+
+    vars['gtk_other_src'] = 'gtkprintoperation-win32.c gtktypebuiltins.h gtktypebuiltins.c'
+
+    files = vars['gtkinclude_HEADERS'].split() + \
+            vars_a11y['a11y_h_sources'].split() + \
+            vars_depr['deprecated_h_sources'].split() + \
+            vars['gtk_base_c_sources'].split() + \
+            vars_a11y['a11y_c_sources'].split() + \
+            vars_depr['deprecated_c_sources'].split() + \
+            vars['gtk_other_src'].split()
+
+    sources = [i for i in files \
+               if not (i.endswith('private.h')) \
+               and i != 'gtktextdisplay.h' \
+               and i != 'gtktextlayout.h' \
+               and i != 'gtkx.h']
+
+    with open(dest, 'w') as d:
+        for i in sources:
+            d.write(srcroot + '\\' + subdir + '\\' + i.replace('/', '\\') + '\n')
+
+def main(argv):
+    srcroot = '..'
+    subdir_gdk = 'gdk'
+    subdir_gtk = 'gtk'
+
+    gen_gdk_filelist(srcroot, subdir_gdk, 'gdk_list')
+    gen_gdkwin32_filelist(srcroot, subdir_gdk, 'gdkwin32_list')
+    gen_gtk_filelist(srcroot, subdir_gtk, 'gtk_list')
+    return 0
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))

build/gtk-introspection-msvc.mak.in

@@ -0,0 +1,101 @@
+# NMake Makefile to build Introspection Files for GTK+
+
+!include detectenv_msvc.mak
+
+APIVERSION = 3.0
+
+CHECK_PACKAGE = gdk-pixbuf-2.0 atk pangocairo gio-2.0
+
+built_install_girs = Gdk-$(APIVERSION).gir GdkWin32-$(APIVERSION).gir Gtk-$(APIVERSION).gir
+built_install_typelibs = Gdk-$(APIVERSION).typelib GdkWin32-$(APIVERSION).typelib Gtk-$(APIVERSION).typelib
+
+!include introspection-msvc.mak
+
+!if "$(BUILD_INTROSPECTION)" == "TRUE"
+all: setgirbuildnev $(built_install_girs) $(built_install_typelibs)
+
+gdk_list gdkwin32_list gtk_list:
+	@-echo Generating Filelist to Introspect for GDK/GTK...
+	$(PYTHON2) gen-file-list-gtk.py
+
+setgirbuildnev:
+	@set CC=$(CC)
+	@set PYTHONPATH=$(BASEDIR)\lib\gobject-introspection
+	@set PATH=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(BASEDIR)\bin;$(PATH)
+	@set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
+	@set LIB=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB)
+
+Gdk-$(APIVERSION).gir: gdk_list
+	@-echo Generating Gdk-$(APIVERSION).gir...
+	$(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gdk	\
+	-I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include	\
+	-I$(BASEDIR)\include\pango-1.0 -I$(BASEDIR)\include\atk-1.0	\
+	-I$(BASEDIR)\include\gdk-pixbuf-2.0 -I$(BASEDIR)\include	\
+	--namespace=Gdk --nsversion=3.0	\
+	--include=Gio-2.0 --include=GdkPixbuf-2.0	\
+	--include=Pango-1.0 --include=cairo-1.0	\
+	--no-libtool --library=gdk-3.0	\
+	--reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) --add-include-path=.	\
+	--pkg-export gdk-3.0 --warn-all --c-include="gdk/gdk.h"	\
+	-DG_LOG_DOMAIN=\"Gdk\" -DGDK_COMPILATION	\
+	--filelist=gdk_list	-o $@
+
+GdkWin32-$(APIVERSION).gir: gdkwin32_list
+	@-echo Generating GdkWin32-$(APIVERSION).gir...
+	$(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gdk	\
+	-I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include	\
+	-I$(BASEDIR)\include\pango-1.0 -I$(BASEDIR)\include\atk-1.0	\
+	-I$(BASEDIR)\include\gdk-pixbuf-2.0 -I$(BASEDIR)\include	\
+	--namespace=GdkWin32 --nsversion=3.0	\
+	--include=Gio-2.0 --include=GdkPixbuf-2.0	\
+	--include=Pango-1.0	--include-uninstalled=./Gdk-$(APIVERSION).gir	\
+	--no-libtool --library=gdk-3.0	\
+	--reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) --add-include-path=.	\
+	--pkg-export gdk-win32-3.0 --warn-all --c-include="gdk/gdkwin32.h"	\
+	-DG_LOG_DOMAIN=\"Gdk\" -DGDK_COMPILATION	\
+	--filelist=gdkwin32_list	-o $@
+
+Gtk-$(APIVERSION).gir: gtk_list
+	$(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gtk -I..\gdk	\
+	-I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include	\
+	-I$(BASEDIR)\include\pango-1.0 -I$(BASEDIR)\include\atk-1.0	\
+	-I$(BASEDIR)\include\gdk-pixbuf-2.0 -I$(BASEDIR)\include	\
+	--namespace=Gtk --nsversion=3.0	\
+	--include=Atk-1.0	\
+	--include-uninstalled=./Gdk-$(APIVERSION).gir	\
+	--no-libtool --library=gtk-3.0 --library=gdk-3.0	\
+	--reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) --add-include-path=.	\
+	--pkg-export gtk+-3.0 --warn-all --c-include="gtk/gtkx.h"	\
+	-DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"/dummy/lib\"	\
+	-DGTK_DATADIR=\"/dummy/share\" -DGTK_DATA_PREFIX=\"/dummy\"	\
+	-DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"@GTK_VERSION@\"	\
+	-DGTK_BINARY_VERSION=\"3.0.0\" -DGTK_HOST=\"i686-pc-vs$(VSVER)\"	\
+	-DGTK_COMPILATION -DGTK_PRINT_BACKENDS=\"file\"	\
+	-DGTK_PRINT_PREVIEW_COMMAND=\"undefined-gtk-print-preview-command\"	\
+	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED	\
+	-DINCLUDE_IM_am_et -DINCLUDE_IM_cedilla -DINCLUDE_IM_cyrillic_translit	\
+	-DINCLUDE_IM_ime -DINCLUDE_IM_inuktitut -DINCLUDE_IM_ipa	\
+	-DINCLUDE_IM_multipress -DINCLUDE_IM_thai -DINCLUDE_IM_ti_er	\
+	-DINCLUDE_IM_ti_et -DINCLUDE_IM_viqr --filelist=gtk_list	\
+	-o $@
+
+$(built_install_typelibs): $(built_install_girs)
+	@-echo Compiling $*.typelib...
+	@-$(G_IR_COMPILER) --includedir=. --debug --verbose $*.gir -o $@
+
+install-introspection: setgirbuildnev $(built_install_girs) $(built_install_typelibs)
+	@-copy *.gir $(G_IR_INCLUDEDIR)
+	@-copy /b *.typelib $(G_IR_TYPELIBDIR)
+
+!else
+all:
+	@-echo $(ERROR_MSG)
+!endif
+
+clean:
+	@-del /f/q *.typelib
+	@-del /f/q *.gir
+	@-del /f/q gtk_list
+	@-del /f/q gdkwin32_list
+	@-del /f/q gdk_list
+	@-del /f/q *.pyc

build/introspection-msvc.mak

@@ -0,0 +1,65 @@
+# Common Utility NMake Makefile Template
+# Used to Generate Introspection files for various Projects
+
+# Can Override with env vars as needed
+# You will need to have built gobject-introspection for this to work.
+# Change or pass in or set the following to suit your environment
+
+BASEDIR = ..\..\vs$(VSVER)\$(PLAT)
+GIR_SUBDIR = share\gir-1.0
+GIR_TYPELIBDIR = lib\girepository-1.0
+G_IR_SCANNER = $(BASEDIR)\bin\g-ir-scanner
+G_IR_COMPILER = $(BASEDIR)\bin\g-ir-compiler.exe
+G_IR_INCLUDEDIR = $(BASEDIR)\$(GIR_SUBDIR)
+G_IR_TYPELIBDIR = $(BASEDIR)\$(GIR_TYPELIBDIR)
+
+# Note: The PYTHON2 must be a Python 2.6.x or 2.7.x Interpretor!
+# Either having python.exe from Python 2.6.x/2.7.x in your PATH will work
+# or passing in PYTHON2=<full path to your Python 2.6.x/2.7.x interpretor> will do
+
+# This is required, and gobject-introspection needs to be built
+# before this can be successfully run.
+PYTHON2=python
+
+# Don't change anything following this line!
+VALID_PKG_CONFIG_PATH = FALSE
+VALID_GCC_INSTPATH = FALSE
+
+MSG_INVALID_PKGCONFIG = You must set or specifiy a valid PKG_CONFIG_PATH
+MSG_INVALID_CFG = You need to specify or set CFG to be release or debug to use this Makefile to build the Introspection Files
+
+ERROR_MSG =
+
+BUILD_INTROSPECTION = TRUE
+
+!if ![pkg-config --print-errors --errors-to-stdout $(CHECK_PACKAGE) > pkgconfig.x]	\
+	&& ![setlocal]	\
+	&& ![set file="pkgconfig.x"]	\
+	&& ![FOR %A IN (%file%) DO @echo PKG_CHECK_SIZE=%~zA > pkgconfig.chksize]	\
+	&& ![del $(ERRNUL) /q/f pkgconfig.x]
+!endif
+
+!include pkgconfig.chksize
+!if "$(PKG_CHECK_SIZE)" == "0"
+VALID_PKG_CONFIG_PATH = TRUE
+!else
+VALID_PKG_CONFIG_PATH = FALSE
+!endif
+
+!if ![del $(ERRNUL) /q/f pkgconfig.chksize]
+!endif
+
+VALID_CFGSET = FALSE
+!if "$(CFG)" == "release" || "$(CFG)" == "debug"
+VALID_CFGSET = TRUE
+!endif
+
+!if "$(VALID_PKG_CONFIG_PATH)" != "TRUE"
+BUILD_INTROSPECTION = FALSE
+ERROR_MSG = $(MSG_INVALID_PKGCONFIG)
+!endif
+
+!if "$(VALID_CFGSET)" != "TRUE"
+BUILD_INTROSPECTION = FALSE
+ERROR_MSG = $(MSG_INVALID_CFG)
+!endif

build/msvcfiles.py

@@ -0,0 +1,261 @@
+#!/usr/bin/python
+# vim: encoding=utf-8
+#expand *.in files
+import os
+import sys
+import re
+import optparse
+
+def parent_dir(path):
+    if not os.path.isabs(path):
+        path = os.path.abspath(path)
+    if os.path.isfile(path):
+        path = os.path.dirname(path)
+    return os.path.split(path)[0]
+
+def check_output_type (btype):
+    print_bad_type = False
+    output_type = -1
+    if (btype is None):
+        output_type = -1
+        print_bad_type = False
+    elif (btype == "vs9"):
+        output_type = 1
+    elif (btype == "vs10"):
+        output_type = 2
+    elif (btype == "nmake-exe"):
+        output_type = 3
+    else:
+        output_type = -1
+        print_bad_type = True
+    if (output_type == -1):
+        if (print_bad_type is True):
+            print ("The entered output build file type '%s' is not valid" % btype)
+        else:
+            print ("Output build file type is not specified.\nUse -t <type> to specify the output build file type.")
+        print ("Valid output build file types are: nmake-exe, vs9 , vs10")
+    return output_type
+
+def read_vars_from_AM(path, vars = {}, conds = {}, filters = None):
+    '''
+    path: path to the Makefile.am
+    vars: predefined variables
+    conds: condition variables for Makefile
+    filters: if None, all variables defined are returned,
+             otherwise, it is a list contains that variables should be returned
+    '''
+    cur_vars = vars.copy()
+    RE_AM_VAR_REF = re.compile(r'\$\((\w+?)\)')
+    RE_AM_VAR = re.compile(r'^\s*(\w+)\s*=(.*)$')
+    RE_AM_INCLUDE = re.compile(r'^\s*include\s+(\w+)')
+    RE_AM_VAR_ADD = re.compile(r'^\s*(\w+)\s*\+=(.*)$')
+    RE_AM_CONTINUING = re.compile(r'\\\s*$')
+    RE_AM_IF = re.compile(r'^\s*if\s+(\w+)')
+    RE_AM_IFNOT = re.compile(r'^\s*if\s!+(\w+)')
+    RE_AM_ELSE = re.compile(r'^\s*else')
+    RE_AM_ENDIF = re.compile(r'^\s*endif')
+    def am_eval(cont):
+        return RE_AM_VAR_REF.sub(lambda x: cur_vars.get(x.group(1), ''), cont)
+    with open(path, 'r') as f:
+        contents = f.readlines()
+    #combine continuing lines
+    i = 0
+    ncont = []
+    while i < len(contents):
+        line = contents[i]
+        if RE_AM_CONTINUING.search(line):
+            line = RE_AM_CONTINUING.sub('', line)
+            j = i + 1
+            while j < len(contents) and RE_AM_CONTINUING.search(contents[j]):
+                line += RE_AM_CONTINUING.sub('', contents[j])
+                j += 1
+            else:
+                if j < len(contents):
+                    line += contents[j]
+            i = j
+        else:
+            i += 1
+        ncont.append(line)
+
+    #include, var define, var evaluation
+    i = -1
+    skip = False
+    oldskip = []
+    while i < len(ncont) - 1:
+        i += 1
+        line = ncont[i]
+        mo = RE_AM_IF.search(line)
+        if mo:
+            oldskip.append(skip)
+            skip = False if mo.group(1) in conds and conds[mo.group(1)] \
+                         else True
+            continue
+        mo = RE_AM_IFNOT.search(line)
+        if mo:
+            oldskip.append(skip)
+            skip = False if mo.group(1) not in conds and conds[mo.group(1)] \
+                         else True
+            continue
+        mo = RE_AM_ELSE.search(line)
+        if mo:
+            skip = not skip
+            continue
+        mo = RE_AM_ENDIF.search(line)
+        if mo:
+            if oldskip:
+                skip = oldskip.pop()
+            continue
+        if not skip:
+            mo = RE_AM_INCLUDE.search(line)
+            if mo:
+                cur_vars.update(read_vars_from_AM(am_eval(mo.group(1)), cur_vars, conds, None))
+                continue
+            mo = RE_AM_VAR.search(line)
+            if mo:
+                cur_vars[mo.group(1)] = am_eval(mo.group(2).strip())
+                continue
+            mo = RE_AM_VAR_ADD.search(line)
+            if mo:
+                try:
+                    cur_vars[mo.group(1)] += ' '
+                except KeyError:
+                    cur_vars[mo.group(1)] = ''
+                cur_vars[mo.group(1)] += am_eval(mo.group(2).strip())
+                continue
+
+    #filter:
+    if filters != None:
+        ret = {}
+        for i in filters:
+            ret[i] = cur_vars.get(i, '')
+        return ret
+    else:
+        return cur_vars
+
+def process_include(src, dest, includes):
+    RE_INCLUDE = re.compile(r'^\s*#include\s+"(.*)"')
+    with open(src, 'r') as s:
+        with open(dest, 'w') as d:
+            for i in s:
+                mo = RE_INCLUDE.search(i)
+                if mo:
+                    target = ''
+                    for j in includes:
+                        #print "searching in ", j
+                        if mo.group(1) in os.listdir(j):
+                            target = os.path.join(j, mo.group(1))
+                            break
+                    if not target:
+                        raise Exception("Couldn't find include file %s" % mo.group(1))
+                    else:
+                        with open(target, 'r') as t:
+                            for inc in t.readlines():
+                                d.write(inc)
+                else:
+                    d.write(i)
+
+#Generate the source files listing that is used
+def generate_src_list (srcroot, srcdir, filters_src, filter_conds, filter_c, mk_am_file):
+    mkfile = ''
+    if mk_am_file is None or mk_am_file == '':
+        mkfile = 'Makefile.am'
+    else:
+        mkfile = mk_am_file
+    vars = read_vars_from_AM(os.path.join(srcdir, mkfile),
+                             vars = {'top_srcdir': srcroot},
+                             conds = filter_conds,
+                             filters = filters_src)
+    files = []
+    for src_filters_item in filters_src:
+        files += vars[src_filters_item].split()
+    if filter_c is True:
+        sources = [i for i in files if i.endswith('.c') ]
+        return sources
+    else:
+        return files
+
+# Generate the Visual Studio 2008 Project Files from the templates
+def gen_vs9_project (projname, srcroot, srcdir_name, sources_list):
+    vs_file_list_dir = os.path.join (srcroot, 'build', 'win32')
+
+    with open (os.path.join (vs_file_list_dir,
+              projname + '.sourcefiles'), 'w') as vs9srclist:
+        for i in sources_list:
+            vs9srclist.write ('\t\t\t<File RelativePath="..\\..\\..\\' + srcdir_name + '\\' + i.replace('/', '\\') + '" />\n')
+
+    process_include (os.path.join(srcroot, 'build', 'win32', 'vs9', projname + '.vcprojin'),
+                     os.path.join(srcroot, 'build', 'win32', 'vs9', projname + '.vcproj'),
+                     includes = [vs_file_list_dir])
+
+    os.unlink(os.path.join(srcroot, 'build', 'win32', projname + '.sourcefiles'))
+
+# Generate the Visual Studio 2010 Project Files from the templates
+def gen_vs10_project (projname, srcroot, srcdir_name, sources_list):
+    vs_file_list_dir = os.path.join (srcroot, 'build', 'win32')
+
+    with open (os.path.join (vs_file_list_dir,
+              projname + '.vs10.sourcefiles'), 'w') as vs10srclist:
+        for j in sources_list:
+            vs10srclist.write ('    <ClCompile Include="..\\..\\..\\' + srcdir_name + '\\' + j.replace('/', '\\') + '" />\n')
+
+    with open (os.path.join (vs_file_list_dir,
+              projname + '.vs10.sourcefiles.filters'), 'w') as vs10srclist_filter:
+        for k in sources_list:
+             vs10srclist_filter.write ('    <ClCompile Include="..\\..\\..\\' + srcdir_name + '\\' + k.replace('/', '\\') + '"><Filter>Source Files</Filter></ClCompile>\n')
+
+    process_include (os.path.join(srcroot, 'build', 'win32', 'vs10', projname + '.vcxprojin'),
+                     os.path.join(srcroot, 'build', 'win32', 'vs10', projname + '.vcxproj'),
+                     includes = [vs_file_list_dir])
+    process_include (os.path.join(srcroot, 'build', 'win32', 'vs10', projname + '.vcxproj.filtersin'),
+                     os.path.join(srcroot, 'build', 'win32', 'vs10', projname + '.vcxproj.filters'),
+                     includes = [vs_file_list_dir])
+
+    os.unlink(os.path.join(srcroot, 'build', 'win32', projname + '.vs10.sourcefiles'))
+    os.unlink(os.path.join(srcroot, 'build', 'win32', projname + '.vs10.sourcefiles.filters'))
+
+def gen_vs_inst_list (projname, srcroot, srcdirs, inst_lists, destdir_names, isVS9):
+    vs_file_list_dir = os.path.join (srcroot, 'build', 'win32')
+    vsver = ''
+    vsprops_line_ending = ''
+    vsprops_file_ext = ''
+    if isVS9 is True:
+        vsver = '9'
+        vsprops_line_ending = '&#x0D;&#x0A;\n'
+        vsprops_file_ext = '.vsprops'
+    else:
+        vsver = '10'
+        vsprops_line_ending = '\n\n'
+        vsprops_file_ext = '.props'
+
+    with open (os.path.join (vs_file_list_dir,
+              projname + '.vs' + vsver + 'instfiles'), 'w') as vsinstlist:
+
+        for file_list, srcdir, dir_name in zip (inst_lists, srcdirs, destdir_names):
+            for i in file_list:
+                vsinstlist.write ('copy ..\\..\\..\\' +
+                                  srcdir + '\\' +
+                                  i.replace ('/', '\\') +
+                                  ' $(CopyDir)\\' +
+                                  dir_name +
+                                  vsprops_line_ending)
+    process_include (os.path.join(srcroot, 'build', 'win32', 'vs' + vsver, projname + '-install' + vsprops_file_ext + 'in'),
+                     os.path.join(srcroot, 'build', 'win32', 'vs' + vsver, projname + '-install' + vsprops_file_ext),
+                     includes = [vs_file_list_dir])
+
+    os.unlink(os.path.join (vs_file_list_dir, projname + '.vs' + vsver + 'instfiles'))
+
+def generate_nmake_makefiles(srcroot, srcdir, base_name, makefile_name, progs_list):
+    file_list_dir = os.path.join (srcroot, 'build', 'win32')
+
+    with open (os.path.join (file_list_dir,
+              base_name + '_progs'), 'w') as proglist:
+        for i in progs_list:
+            proglist.write ('\t' + i + '$(EXEEXT)\t\\\n')
+
+
+    process_include (os.path.join(srcdir, makefile_name + 'in'),
+                    os.path.join(srcdir, makefile_name),
+                    includes = [file_list_dir])
+
+    os.unlink(os.path.join (file_list_dir, base_name + '_progs'))
+

build/win32/Makefile.am

@@ -5,23 +5,8 @@ SUBDIRS =	\
 	vs10	\
 	vs11	\
 	vs12	\
-	vs14	\
+	vs14
-	vs15	\
-	vs16
 
-EXTRA_DIST +=	\
+EXTRA_DIST += replace.py
-	config-msvc.mak		\
-	config-msvc.mak.in		\
-	create-lists.bat	\
-	create-lists-msvc.mak		\
-	detectenv-msvc.mak		\
-	gen-gdkversionmacros-h.py	\
-	generate-msvc.mak	\
-	gtk-introspection-msvc.mak	\
-	introspection-msvc.mak		\
-	replace.py			\
-	pc_base.py			\
-	gtkpc.py			\
-	README_EGL_MSVC.txt
 
 -include $(top_srcdir)/git.mk

build/win32/README_EGL_MSVC.txt

@@ -1,29 +0,0 @@
-Notes on enabling EGL (ANGLE/D3D support) for Windows/Visual Studio builds
-==========================================================================
-There is now support in the GL context creation code for Windows in GDK for
-creating and using EGL (OpenGL ES 3) contexts, which can be used instead of
-the existing OpenGL (Desktop) support, especially when the graphics drivers
-do not support OpenGL adequately.
-
-This support is not enabled by default in the project files.  In order to do
-so, please do the following:
-
--Obtain or compile a build of recent version of ANGLE.  The one that comes
- with QT 5.10.x is sufficiently recent, but not the one that comes with QT-
- 5.6.x.  Note that Visual Studio 2013 or later is required for building
- ANGLE from QT-5.10.x, but the Visual Studio 2013-built ANGLE DLLs does work
- without problems with GTK+ built with Visual Studio 2008~2013.  You may
- need to obtain D3Dcompiler_[47|43|42].dll if it does not come with the
- system (which is part of the DirectX runtimes).  Its headers and .lib
- needs to be set to be found by the compiler and linker respectively before
- building libepoxy.
--Build libepoxy with EGL support, which has to be enabled explicitly on
- Windows builds.  Pass in -Degl=yes when building libepoxy using Meson.
- Build and install, making sure the headers and .lib can be located by the
- compiler and linker respectively.
--Open the vsX/gtk+.sln, and open the project properties in the "gdk3-win32"
- project.  Under "C/C++", add GDK_WIN32_ENABLE_EGL in the "Preprocessor
- Definitions" to the existing definitions in there for the configuration
- that is being built.  Then build the solution.
--To force the use of the EGL code, set the envvar GDK_GL=(...,)gles , where (...,)
- are the other GDK_GL options desired.

build/win32/config-msvc.mak.in

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

build/win32/create-lists-msvc.mak

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

build/win32/create-lists.bat

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

build/win32/gen-gdkversionmacros-h.py

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

build/win32/generate-msvc.mak

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

build/win32/gtk-introspection-msvc.mak

@@ -1,126 +0,0 @@
-# NMake Makefile to build Introspection Files for GTK+
-
-!include detectenv-msvc.mak
-!include config-msvc.mak
-
-!include ..\..\gdk\Makefile.inc
-!include ..\..\gtk\a11y\Makefile.inc
-!include ..\..\gtk\deprecated\Makefile.inc
-!include ..\..\gtk\inspector\Makefile.inc
-!include ..\..\gtk\Makefile.inc
-
-APIVERSION = 3.0
-
-CHECK_PACKAGE = gdk-pixbuf-2.0 atk pangocairo gio-2.0
-
-built_install_girs =	\
-	vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-$(APIVERSION).gir	\
-	vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).gir	\
-	vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-$(APIVERSION).gir
-
-built_install_typelibs =	\
-	vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-$(APIVERSION).typelib	\
-	vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).typelib	\
-	vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-$(APIVERSION).typelib
-
-!include introspection-msvc.mak
-
-!if "$(BUILD_INTROSPECTION)" == "TRUE"
-
-!if "$(PLAT)" == "x64"
-AT_PLAT=x86_64
-!else
-AT_PLAT=i686
-!endif
-
-all: setgirbuildenv $(built_install_girs) $(built_install_typelibs)
-
-setgirbuildenv:
-	@set PYTHONPATH=$(PREFIX)\lib\gobject-introspection
-	@set PATH=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(PREFIX)\bin;$(PATH)
-	@set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
-	@set LIB=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB)
-
-gdk-introspect-list: ..\..\gdk\Makefile.inc
-	@echo Generating $@...
-	@$(PYTHON) -c "srcs='$(gdk_public_h_sources:		=) $(gdk_deprecated_h_sources:		=)';filter=['gdkkeysyms-compat.h'];result=[l for l in srcs.replace('/','\\').split() if l not in filter];result[0]='..\\..\\gdk\\' + result[0];f=open('$@', 'a');f.write('\n..\\..\\gdk\\'.join(result));f.close()"
-	@$(PYTHON) -c "srcs='$(gdk_c_sources:		=) $(gdk_built_sources:		=)';result=srcs.replace('/','\\').split();result[0]='\n..\\..\\gdk\\' + result[0];f=open('$@', 'a');f.write('\n..\\..\\gdk\\'.join(result));f.close()"
-
-gdk-win32-introspect-list: ..\..\gdk\Makefile.inc
-	@echo Generating $@...
-	@$(PYTHON) -c "srcs='$(w32_introspection_files:		=)';result=srcs.replace('/','\\').split();result[0]='..\\..\\gdk\\' + result[0];f=open('$@', 'a');f.write('\n..\\..\\gdk\\'.join(result));f.close()"
-
-gtk-introspect-list: ..\..\gtk\Makefile.inc
-	@echo Generating $@...
-	@$(PYTHON) -c "srcs='$(gtk_public_h_sources:		=) $(gtk_semi_private_h_sources:		=) $(gtk_built_public_sources:		=) gtkversion.h';filter=['gtktextdisplay.h', 'gtktextlayout.h', 'gtkx.h'];result=[l for l in srcs.replace('/','\\').split() if l not in filter];result[0]='..\\..\\gtk\\' + result[0];f=open('$@', 'a');f.write('\n..\\..\\gtk\\'.join(result));f.close()"
-	@$(PYTHON) -c "srcs='$(a11y_h_sources:		=) $(gtk_deprecated_h_sources:		=)';result=srcs.replace('/','\\').split();result[0]='\n..\\..\\gtk\\' + result[0];f=open('$@', 'a');f.write('\n..\\..\\gtk\\'.join(result));f.close()"
-	@$(PYTHON) -c "import re;srcs='$(a11y_c_sources:		=) $(gtk_deprecated_c_sources:		=) $(inspector_c_sources:		=) $(gtk_base_c_sources_base:		=)';filter=re.compile('(.*)win32.c');result=[l for l in srcs.replace('/','\\').split() if not filter.match(l)];result[0]='\n..\\..\\gtk\\' + result[0];f=open('$@', 'a');f.write('\n..\\..\\gtk\\'.join(result));f.close()"
-	@$(PYTHON) -c "srcs='gtkprintoperation-unix.c gtktypebuiltins.h gtktypebuiltins.c';result=srcs.replace('/','\\').split();result[0]='\n..\\..\\gtk\\' + result[0];f=open('$@', 'a');f.write('\n..\\..\\gtk\\'.join(result));f.close()"
-
-vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-$(APIVERSION).gir: vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib gdk-introspect-list
-	@echo Generating $@...
-	$(PYTHON) $(G_IR_SCANNER) --verbose -no-libtool	\
-	--namespace=Gdk --nsversion=$(APIVERSION) --library=gdk-$(APIVERSION)	\
-	--add-include-path=./$(@D:\=/) --add-include-path=$(G_IR_INCLUDEDIR)	\
-	--include=Gio-2.0 --include=GdkPixbuf-2.0 --include=Pango-1.0 --include=cairo-1.0	\
-	--pkg-export=gdk-$(APIVERSION)	\
-	--cflags-begin	\
-	$(GDK_PREPROCESSOR_FLAGS)	\
-	--cflags-end	\
-	--c-include=gdk/gdk.h --filelist=gdk-introspect-list	\
-	-L.\$(@D)	\
-	-o $@
-
-vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).gir: vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-3.0.gir gdk-win32-introspect-list
-	@echo Generating $@...
-	$(PYTHON) $(G_IR_SCANNER) --verbose -no-libtool	\
-	--namespace=GdkWin32 --nsversion=$(APIVERSION)	\
-	--library=gdk-$(APIVERSION)	\
-	--add-include-path=./$(@D:\=/) --add-include-path=$(G_IR_INCLUDEDIR)	\
-	--cflags-begin	\
-	$(GDK_PREPROCESSOR_FLAGS)	\
-	--cflags-end	\
-	--identifier-prefix=Gdk --c-include=gdk/gdkwin32.h --include-uninstalled=./$(@D:\=/)/Gdk-3.0.gir	\
-	--filelist=gdk-win32-introspect-list	\
-	-L.\$(@D)	\
-	-o $@
-
-vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-3.0.gir: vs$(VSVER)\$(CFG)\$(PLAT)\bin\gtk-3.0.lib vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-3.0.gir gtk-introspect-list
-	@echo Generating $@...
-	$(PYTHON) $(G_IR_SCANNER) --verbose -no-libtool	\
-	--namespace=Gtk	--nsversion=$(APIVERSION)	\
-	--library=gtk-$(APIVERSION) --library=gdk-$(APIVERSION)	\
-	--add-include-path=./$(@D:\=/) --add-include-path=$(G_IR_INCLUDEDIR)	\
-	--include=Atk-1.0	\
-	--pkg-export=gtk+-$(APIVERSION)	\
-	--cflags-begin	\
-	-DG_LOG_USE_STRUCTURED=1 $(GTK_PREPROCESSOR_FLAGS:\"=\\\")	\
-	--cflags-end	\
-	--warn-all --include-uninstalled=./$(@D:\=/)/Gdk-3.0.gir	\
-	--filelist=gtk-introspect-list	\
-	-L.\$(@D)	\
-	-o $@
-
-vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-3.0.typelib: vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-3.0.gir
-vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-3.0.typelib: vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-3.0.typelib vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-3.0.gir
-vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-3.0.typelib: vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-3.0.typelib vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-3.0.gir
-
-vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-3.0.typelib	\
-vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-3.0.typelib	\
-vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-3.0.typelib:
-	@-echo Compiling $@...
-	$(G_IR_COMPILER) --includedir=$(@D:\=/) --debug --verbose $(@R:\=/).gir -o $@
-
-install-introspection: all
-	@-copy vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.gir "$(G_IR_INCLUDEDIR)"
-	@-copy /b vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.typelib "$(G_IR_TYPELIBDIR)"
-
-!else
-all:
-	@-echo $(ERROR_MSG)
-!endif
-
-clean:
-	@-del /f/q vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.typelib
-	@-del /f/q vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.gir
-	@-del /f/q *-list

build/win32/gtkpc.py

@@ -1,94 +0,0 @@
-#!/usr/bin/python
-#
-# Utility script to generate .pc files for GTK+
-# for Visual Studio builds, to be used for
-# building introspection files
-
-# Author: Fan, Chun-wei
-# Date: April 26, 2016
-
-import os
-import sys
-import argparse
-
-from replace import replace_multi, replace
-from pc_base import BasePCItems
-
-def main(argv):
-    base_pc = BasePCItems()
-
-    gdk_parser = argparse.ArgumentParser(description='Setup basic .pc file info')
-    gdk_parser.add_argument('--broadway',
-                              action='store_const',
-                              const=1,
-                              help='GDK with Broadway backend')
-    gdk_parser.add_argument('--host',
-                            required=True,
-                            help='Build type')
-    base_pc.setup(argv, gdk_parser)
-
-    atk_min_ver = '2.15.1'
-    cairo_min_ver = '1.14.0'
-    gdk_pixbuf_min_ver = '2.30.0'
-    gdk_win32_sys_libs = '-lgdi32 -limm32 -lshell32 -lole32 -lwinmm -ldwmapi'
-    cairo_libs = '-lcairo-gobject -lcairo '
-    glib_min_ver = '2.45.8'
-
-    gdk_backends = 'win32'
-    gio_package = 'gio-2.0 >= ' + glib_min_ver
-    broadway_extra_libs = ''
-
-    gdk_args = gdk_parser.parse_args()
-    if getattr(gdk_args, 'broadway', None) is 1:
-        # On Visual Studio, we link to zlib1.lib
-        broadway_extra_libs = ' -lzlib1'
-        gdk_backends += ' broadway'
-
-    pkg_replace_items = {'@GTK_API_VERSION@': '3.0',
-                         '@GDK_BACKENDS@': gdk_backends}
-
-    pkg_required_packages = 'gdk-pixbuf-2.0 >= ' + gdk_pixbuf_min_ver
-
-    gdk_pc_replace_items = {'@GDK_PACKAGES@': gio_package + ' ' + \
-                                              'pangowin32 pangocairo' + ' ' + \
-                                              pkg_required_packages,
-                            '@GDK_PRIVATE_PACKAGES@': gio_package,
-                            '@GDK_EXTRA_LIBS@': cairo_libs + gdk_win32_sys_libs + broadway_extra_libs,
-                            '@GDK_EXTRA_CFLAGS@': '',
-                            'gdk-3': 'gdk-3.0'}
-
-    gtk_pc_replace_items = {'@host@': gdk_args.host,
-                            '@GTK_BINARY_VERSION@': '3.0.0',
-                            '@GTK_PACKAGES@': 'atk >= ' + atk_min_ver + ' ' + \
-                                              pkg_required_packages + ' ' + \
-                                              gio_package,
-                            '@GTK_PRIVATE_PACKAGES@': 'atk',
-                            '@GTK_EXTRA_CFLAGS@': '',
-                            '@GTK_EXTRA_LIBS@': '',
-                            '@GTK_EXTRA_CFLAGS@': '',
-                            'gtk-3': 'gtk-3.0'}
-
-    gail_pc_replace_items = {'gailutil-3': 'gailutil-3.0'}
-
-    pkg_replace_items.update(base_pc.base_replace_items)
-    gdk_pc_replace_items.update(pkg_replace_items)
-    gtk_pc_replace_items.update(pkg_replace_items)
-    gail_pc_replace_items.update(base_pc.base_replace_items)
-
-    # Generate gdk-3.0.pc
-    replace_multi(base_pc.top_srcdir + '/gdk-3.0.pc.in',
-                  base_pc.srcdir + '/gdk-3.0.pc',
-                  gdk_pc_replace_items)
-
-    # Generate gtk+-3.0.pc
-    replace_multi(base_pc.top_srcdir + '/gtk+-3.0.pc.in',
-                  base_pc.srcdir + '/gtk+-3.0.pc',
-                  gtk_pc_replace_items)
-
-    # Generate gail-3.0.pc
-    replace_multi(base_pc.top_srcdir + '/gail-3.0.pc.in',
-                  base_pc.srcdir + '/gail-3.0.pc',
-                  gail_pc_replace_items)
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))

build/win32/introspection-msvc.mak

@@ -1,82 +0,0 @@
-# Common NMake Makefile module for checking the build environment is sane
-# for building introspection files under MSVC/NMake.
-# This can be copied from $(gi_srcroot)\build\win32 for GNOME items
-# that support MSVC builds and introspection under MSVC.
-
-# Can override with env vars as needed
-# You will need to have built gobject-introspection for this to work.
-# Change or pass in or set the following to suit your environment
-
-!if ![setlocal]		&& \
-    ![set PFX=$(PREFIX)]	&& \
-    ![for %P in (%PFX%) do @echo PREFIX_FULL=%~dpnfP > pfx.x]
-!endif
-!include pfx.x
-
-!if "$(PKG_CONFIG_PATH)" == ""
-PKG_CONFIG_PATH=$(PREFIX_FULL)\lib\pkgconfig
-!else
-PKG_CONFIG_PATH=$(PREFIX_FULL)\lib\pkgconfig;$(PKG_CONFIG_PATH)
-!endif
-
-!if ![del $(ERRNUL) /q/f pfx.x]
-!endif
-
-# Note: The PYTHON must be the Python release series that was used to build
-# the GObject-introspection scanner Python module!
-# Either having python.exe your PATH will work or passing in
-# PYTHON=<full path to your Python interpretor> will do
-
-# This is required, and gobject-introspection needs to be built
-# before this can be successfully run.
-
-# Don't change anything following this line!
-
-GIR_SUBDIR = share\gir-1.0
-GIR_TYPELIBDIR = lib\girepository-1.0
-G_IR_SCANNER = $(PREFIX)\bin\g-ir-scanner
-G_IR_COMPILER = $(PREFIX)\bin\g-ir-compiler.exe
-G_IR_INCLUDEDIR = $(PREFIX)\$(GIR_SUBDIR)
-G_IR_TYPELIBDIR = $(PREFIX)\$(GIR_TYPELIBDIR)
-
-VALID_PKG_CONFIG_PATH = FALSE
-
-MSG_INVALID_PKGCONFIG = You must set or specifiy a valid PKG_CONFIG_PATH
-MSG_INVALID_CFG = You need to specify or set CFG to be release or debug to use this Makefile to build the Introspection Files
-
-ERROR_MSG =
-
-BUILD_INTROSPECTION = TRUE
-
-!if ![set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)]	\
-	&& ![$(PKG_CONFIG) --print-errors --errors-to-stdout $(CHECK_PACKAGE) > pkgconfig.x]	\
-	&& ![setlocal]	\
-	&& ![set file="pkgconfig.x"]	\
-	&& ![FOR %A IN (%file%) DO @echo PKG_CHECK_SIZE=%~zA > pkgconfig.chksize]	\
-	&& ![del $(ERRNUL) /q/f pkgconfig.x]
-!endif
-
-!include pkgconfig.chksize
-!if "$(PKG_CHECK_SIZE)" == "0"
-VALID_PKG_CONFIG_PATH = TRUE
-!else
-VALID_PKG_CONFIG_PATH = FALSE
-!endif
-
-!if ![del $(ERRNUL) /q/f pkgconfig.chksize]
-!endif
-
-VALID_CFGSET = FALSE
-!if "$(CFG)" == "release" || "$(CFG)" == "debug" || "$(CFG)" == "Release" || "$(CFG)" == "Debug"
-VALID_CFGSET = TRUE
-!endif
-
-!if "$(VALID_PKG_CONFIG_PATH)" != "TRUE"
-BUILD_INTROSPECTION = FALSE
-ERROR_MSG = $(MSG_INVALID_PKGCONFIG)
-!endif
-
-!if "$(VALID_CFGSET)" != "TRUE"
-BUILD_INTROSPECTION = FALSE
-ERROR_MSG = $(MSG_INVALID_CFG)
-!endif

build/win32/pc_base.py

@@ -1,124 +0,0 @@
-#!/usr/bin/python
-#
-# Simple utility script to generate the basic info
-# needed in a .pc (pkg-config) file, used especially
-# for introspection purposes
-
-# This can be used in various projects where
-# there is the need to generate .pc files,
-# and is copied from GLib's $(srcroot)/build/win32
-
-# Author: Fan, Chun-wei
-# Date: March 10, 2016
-
-import os
-import sys
-import argparse
-
-class BasePCItems:
-    def __init__(self):
-        self.base_replace_items = {}
-        self.exec_prefix = ''
-        self.includedir = ''
-        self.libdir = ''
-        self.prefix = ''
-        self.srcdir = os.path.dirname(__file__)
-        self.top_srcdir = self.srcdir + '\\..\\..'
-        self.version = ''
-
-    def setup(self, argv, parser=None):
-        if parser is None:
-            parser = argparse.ArgumentParser(description='Setup basic .pc file info')
-        parser.add_argument('--prefix', help='prefix of the installed library',
-                            required=True)
-        parser.add_argument('--exec-prefix',
-                            help='prefix of the installed programs, \
-                                  if different from the prefix')
-        parser.add_argument('--includedir',
-                            help='includedir of the installed library, \
-                                  if different from ${prefix}/include')
-        parser.add_argument('--libdir',
-                            help='libdir of the installed library, \
-                                  if different from ${prefix}/lib')
-        parser.add_argument('--version', help='Version of the package',
-                            required=True)
-        args = parser.parse_args()
-
-        self.version = args.version
-
-        # check whether the prefix and exec_prefix are valid
-        if not os.path.exists(args.prefix):
-            raise SystemExit('Specified prefix \'%s\' is invalid' % args.prefix)
-
-        # use absolute paths for prefix
-        self.prefix = os.path.abspath(args.prefix).replace('\\','/')
-
-        # check and setup the exec_prefix
-        if getattr(args, 'exec_prefix', None) is None:
-            exec_prefix_use_shorthand = True
-            self.exec_prefix = '${prefix}'
-        else:
-            if args.exec_prefix.startswith('${prefix}'):
-                exec_prefix_use_shorthand = True
-                input_exec_prefix = args.prefix + args.exec_prefix[len('${prefix}'):]
-            else:
-                exec_prefix_use_shorthand = False
-                input_exec_prefix = args.exec_prefix
-            if not os.path.exists(input_exec_prefix):
-                raise SystemExit('Specified exec_prefix \'%s\' is invalid' %
-                                  args.exec_prefix)
-            if exec_prefix_use_shorthand is True:
-                self.exec_prefix = args.exec_prefix.replace('\\','/')
-            else:
-                self.exec_prefix = os.path.abspath(input_exec_prefix).replace('\\','/')
-
-        # check and setup the includedir
-        if getattr(args, 'includedir', None) is None:
-            self.includedir = '${prefix}/include'
-        else:
-            if args.includedir.startswith('${prefix}'):
-                includedir_use_shorthand = True
-                input_includedir = args.prefix + args.includedir[len('${prefix}'):]
-            else:
-                if args.includedir.startswith('${exec_prefix}'):
-                    includedir_use_shorthand = True
-                    input_includedir = input_exec_prefix + args.includedir[len('${exec_prefix}'):]
-                else:
-                    includedir_use_shorthand = False
-                    input_includedir = args.includedir
-            if not os.path.exists(input_includedir):
-                raise SystemExit('Specified includedir \'%s\' is invalid' %
-                                  args.includedir)
-            if includedir_use_shorthand is True:
-                self.includedir = args.includedir.replace('\\','/')
-            else:
-                self.includedir = os.path.abspath(input_includedir).replace('\\','/')
-
-        # check and setup the libdir
-        if getattr(args, 'libdir', None) is None:
-            self.libdir = '${prefix}/lib'
-        else:
-            if args.libdir.startswith('${prefix}'):
-                libdir_use_shorthand = True
-                input_libdir = args.prefix + args.libdir[len('${prefix}'):]
-            else:
-                if args.libdir.startswith('${exec_prefix}'):
-                    libdir_use_shorthand = True
-                    input_libdir = input_exec_prefix + args.libdir[len('${exec_prefix}'):]
-                else:
-                    libdir_use_shorthand = False
-                    input_libdir = args.libdir
-            if not os.path.exists(input_libdir):
-                raise SystemExit('Specified libdir \'%s\' is invalid' %
-			                      args.libdir)
-            if libdir_use_shorthand is True:
-                self.libdir = args.libdir.replace('\\','/')
-            else:
-                self.libdir = os.path.abspath(input_libdir).replace('\\','/')
-
-        # setup dictionary for replacing items in *.pc.in
-        self.base_replace_items.update({'@VERSION@': self.version})
-        self.base_replace_items.update({'@prefix@': self.prefix})
-        self.base_replace_items.update({'@exec_prefix@': self.exec_prefix})
-        self.base_replace_items.update({'@libdir@': self.libdir})
-        self.base_replace_items.update({'@includedir@': self.includedir})

build/win32/replace.py

@@ -21,25 +21,12 @@ valid_actions = ['remove-prefix',
                  'replace-str',
                  'remove-str']
 
-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')
-
-def replace_multi(src, dest, replace_items):
-    with open_file(src, 'r') as s:
-        with open_file(dest, 'w') as d:
-            for line in s:
-                replace_dict = dict((re.escape(key), value) \
-                               for key, value in replace_items.items())
-                replace_pattern = re.compile("|".join(replace_dict.keys()))
-                d.write(replace_pattern.sub(lambda m: \
-                        replace_dict[re.escape(m.group(0))], line))
-
 def replace(src, dest, instring, outstring):
-    replace_item = {instring: outstring}
+    with open(src, 'r') as s:
-    replace_multi(src, dest, replace_item)
+        with open(dest, 'w') as d:
+            for line in s:
+                i = line.replace(instring, outstring)
+                d.write(i)
 
 def check_required_args(args, params):
     for param in params:

build/win32/vs10/Makefile.am

@@ -60,8 +60,6 @@ EXTRA_DIST += \
 	gailutil-3.vcxprojin			\
 	gailutil-3.vcxproj.filtersin		\
 	gtk3-install.vcxproj			\
-	gtk3-install.vcxproj.filters		\
-	gtk3-introspect.vcxproj			\
 	gtk3-build-defines.props		\
 	gtk3-copy-gdk-broadway.props		\
 	gtk3-gen-srcs.props			\
@@ -74,10 +72,6 @@ DISTCLEANFILES = \
 	$(GENERATED_ITEMS)
 
 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)
 

build/win32/vs10/README.txt

@@ -24,8 +24,8 @@ You will also need a Python 2.6+/3.x interpretor installed on your system,
 which can be obtained from the official installers available from
 http://www.python.org.  Please note that the Python interpretor (python.exe)
 either needs to be in your PATH before attempting the build of GTK+, or it
-can be found in the path specified by PythonDir in gtk-version-paths.props.
+can be found in the path specified by PythonPath in gtk-version-paths.props.
-If you happen to change the PythonDir setting in gtk-version-paths.props after
+If you happen to change the PythonPath setting in gtk-version-paths.props after
 opening gtk+.sln with Visual Studio, you will need to close the gtk+.sln solution,
 delete all the *.sdf, *.suo and *.user files before re-attempting the build.
 
@@ -81,21 +81,6 @@ built DLLs go into <root>\vs10\<PlatformName>\bin, built LIBs into
 project files higher in the stack are supposed to look for them, not
 from a specific GLib source tree.
 
-There is now a "gtk3-introspect" project that is used to build the
-introspection files.  In order for this to work, check that the paths for
-PythonDir (32-bit builds) and PythonDirX64 (x64 builds) are correct for your
-system.  Note that it must be the same Python installation that was used to
-build GObject-Introspection (G-I), and a complete G-I build/installation
-needs to be found in <root>\vs10\<PlatformName>\, with the introspection files
-for ATK, Pango and GDK-Pixbuf.  Note also that this is not built by default,
-so you will need to right-click on the project to build it, which will build
-and "install" the other projects that are normally built, if those were not yet
-built.  The introspection files that are built will be "installed" to
-<root>\vs10\<PlatformName>\share\gir-1.0 (the .gir file(s)) and
-<root>\vs10\<PlatformName>\lib\girepository-1.0 (the .typelib files(s)) upon
-successful build.  for building this in a different configuration, therefore,
-you will need to clean this project specifically and then rebuild.
-
 Please note, as GTK+ uses the Adwaita theme for all platforms by default,
 most icons used are not included with GTK+ (which *are* needed), so please see
 https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack (under the

build/win32/vs10/gdk-3.vcxprojin

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -144,7 +144,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
@@ -167,7 +167,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -187,7 +187,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -209,7 +209,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -234,7 +234,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -257,7 +257,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -277,7 +277,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -299,7 +299,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>

build/win32/vs10/gtk+.sln

@@ -30,8 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-query-settings", "gtk-q
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-install.vcxproj", "{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-introspect", "gtk3-introspect.vcxproj", "{A8092C4E-0A21-4B1D-AC82-16764E418D1F}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -276,14 +274,6 @@ Global
 		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.Build.0 = Release|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug|x64.ActiveCfg = Debug|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release|Win32.ActiveCfg = Release|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release|x64.ActiveCfg = Release|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release_Broadway|x64.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

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

@@ -17,6 +17,11 @@
   <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>
+  </ItemGroup>
   <ItemGroup>
 #include "gtk-3.vs10.sourcefiles.filters"
     <ClCompile Include="..\..\..\modules\input\gtkimcontextime.c"><Filter>Source Files</Filter></ClCompile>

build/win32/vs10/gtk-3.vcxprojin

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -86,7 +86,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -106,7 +106,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -131,7 +131,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -151,7 +151,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -162,6 +162,50 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\gtk\gtkdbusinterfaces.xml">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating GTK+ DBus Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateGtkDbusBuiltSources)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating GTK+ DBus Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateGtkDbusBuiltSources)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating GTK+ DBus Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateGtkDbusBuiltSources)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating GTK+ DBus Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGtkDbusBuiltSources)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\gtk\gtk-win32.rc.body">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying GTK+ Win32 Version Resource...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyGtkWin32RC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying GTK+ Win32 Version Resource...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyGtkWin32RC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying GTK+ Win32 Version Resource...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyGtkWin32RC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying GTK+ Win32 Version Resource...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyGtkWin32RC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\gtk\libgtk3.manifest.in">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating GTK+ Win32 Manifest...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateGtkWin32Manifest)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating GTK+ Win32 Manifest...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateGtkWin32Manifest)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating GTK+ Win32 Manifest...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateGtkWin32Manifest)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating GTK+ Win32 Manifest...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGtkWin32Manifest)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\gtk\gtk-win32.rc" />
   </ItemGroup>

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

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}</ProjectGuid>
-    <RootNamespace>gtkbuildertool</RootNamespace>
+    <RootNamespace>gtkencodesymbolicsvg</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

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

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{9F22107A-3EF7-4B52-B269-747B65307F36}</ProjectGuid>
-    <RootNamespace>gtkquerysettings</RootNamespace>
+    <RootNamespace>gtkencodesymbolicsvg</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

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

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{FC98AF16-4C68-42DF-906B-93A6804C198A}</ProjectGuid>
-    <RootNamespace>gtkupdateiconcache</RootNamespace>
+    <RootNamespace>gtkencodesymbolicsvg</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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-version-paths.props" />
@@ -10,14 +10,6 @@
     <GdkDefines>GDK_COMPILATION;G_LOG_DOMAIN="Gdk"</GdkDefines>
     <GtkIncludedImmodulesDefines>INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr</GtkIncludedImmodulesDefines>
     <GtkDefines>GTK_COMPILATION;G_LOG_DOMAIN="Gtk";GTK_HOST="i686-pc-vs$(VSVer)";GTK_PRINT_BACKENDS="file";GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED;$(GtkIncludedImmodulesDefines);GTK_LIBDIR="$(GtkDummyPrefix)/lib";GTK_DATADIR="$(GtkDummyPrefix)/share";GTK_DATA_PREFIX="$(GtkDummyPrefix)";GTK_SYSCONFDIR="$(GtkDummyPrefix)/etc";MULTIPRESS_CONFDIR="$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)";MULTIPRESS_LOCALEDIR="$(GtkDummyPrefix)/share/locale";GTK_VERSION="$(GtkVersion)/etc";GTK_BINARY_VERSION="$(GtkBinaryVersion)/etc";GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED</GtkDefines>
-    <GtkGdkCommonLibs>pangowin32-1.0.lib;fribidi.lib;imm32.lib</GtkGdkCommonLibs>
-    <GdkAdditionalLibs>winmm.lib;dwmapi.lib;setupapi.lib;$(GtkGdkCommonLibs)</GdkAdditionalLibs>
-    <GdkBroadwayAdditionalLibs>ws2_32.lib</GdkBroadwayAdditionalLibs>
-    <GtkAdditionalLibs>atk-1.0.lib;winspool.lib;comctl32.lib;$(GtkGdkCommonLibs)</GtkAdditionalLibs>
-    <GtkIntrospectNMakeCmd>cd ..
-set VCInstallDir=$(VCInstallDir)
-nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstallRoot)</GtkIntrospectNMakeCmd>
-    <GtkIntrospectBuiltFiles>$(BinDir)\Gtk-3.0.gir;$(BinDir)\Gtk-3.0.typelib</GtkIntrospectBuiltFiles>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtk3builddefinesprops</_PropertySheetDisplayName>
@@ -26,20 +18,15 @@ 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;%(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>
       <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
-    <Link>
+	<Link>
       <AdditionalDependencies>pangocairo-1.0.lib;cairo.lib;cairo-gobject.lib;pango-1.0.lib;gdk_pixbuf-2.0.lib;gio-2.0.lib;gmodule-2.0.lib;gobject-2.0.lib;glib-2.0.lib;intl.lib;epoxy.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='11.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <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>
@@ -61,23 +48,5 @@ nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstall
     <BuildMacro Include="GtkDefines">
       <Value>$(GtkDefines)</Value>
     </BuildMacro>
-    <BuildMacro Include="GtkGdkCommonLibs">
-      <Value>$(GtkGdkCommonLibs)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkAdditionalLibs">
-      <Value>$(GdkAdditionalLibs)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkBroadwayAdditionalLibs">
-      <Value>$(GdkBroadwayAdditionalLibs)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkAdditionalLibs">
-      <Value>$(GtkAdditionalLibs)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkIntrospectNMakeCmd">
-      <Value>$(GtkIntrospectNMakeCmd)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkIntrospectBuiltFiles">
-      <Value>$(GtkIntrospectBuiltFiles)</Value>
-    </BuildMacro>
   </ItemGroup>
 </Project>

build/win32/vs10/gtk3-copy-gdk-broadway.props

@@ -25,7 +25,7 @@ if "$(Configuration)" == "Debug_Broadway" goto DoDebug
 
 mkdir .\Release\$(Platform)\bin
 
-copy /b $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll .\Release\$(Platform)\bin\
+copy /b $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll .\Release\$(Platform)\bin\
 
 copy /b $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib .\Release\$(Platform)\bin\
 

build/win32/vs10/gtk3-demo.vcxprojin

@@ -90,6 +90,7 @@
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
@@ -113,6 +114,7 @@
       <FunctionLevelLinking>false</FunctionLevelLinking>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
@@ -136,6 +138,7 @@
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX64</TargetMachine>
@@ -159,6 +162,7 @@
       <FunctionLevelLinking>false</FunctionLevelLinking>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX64</TargetMachine>

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

@@ -4,28 +4,94 @@
     <Import Project="gtk3-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <GenerateRequiredSourcesBase>cd ..
+    <GenConfigH>
-set VCInstallDir=$(VCInstallDir)
+copy ..\..\..\config.h.win32 ..\..\..\config.h
-nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot)</GenerateRequiredSourcesBase>
+    </GenConfigH>
-    <GeneratedGdkSources>..\..\..\config.h;..\..\..\gdk\gdkconfig.h;..\..\gdk\gdkversionmacros.h;..\..\..\gdk\gdkmarshalers.h;..\..\..\gdk\gdkmarshalers.c;..\..\..\gdk\gdkresources.h;..\..\..\gdk\gdkresources.c</GeneratedGdkSources>
+    <GenGdkConfigHWin32>
-    <GeneratedGtkSources>..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;..\..\..\gtk\gtkdbusgenerated.h;..\..\..\gtk\gtkdbusgenerated.c</GeneratedGtkSources>
+if exist ..\..\..\MSVC_$(Configuration) goto DONE_GDKCONFIG_H
-    <GeneratedDemoSources>..\..\..\demos\gtk-demo\demos.h</GeneratedDemoSources>
+
+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>
+    <GenerateGtkDbusBuiltSources>
+cd ..\..\..\gtk
+
+$(PythonPath)\python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml
+
+cd $(SolutionDir)
+    </GenerateGtkDbusBuiltSources>
+    <CopyGtkWin32RC>copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc</CopyGtkWin32RC>
+    <GenerateGtkWin32Manifest>$(PythonPath)\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>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtk3gensrcsprops</_PropertySheetDisplayName>
   </PropertyGroup>
   <ItemGroup>
-    <BuildMacro Include="GenerateRequiredSourcesBase">
+    <BuildMacro Include="GenConfigH">
-      <Value>$(GenerateRequiredSourcesBase)</Value>
+      <Value>$(GenConfigH)</Value>
     </BuildMacro>
-    <BuildMacro Include="GeneratedGdkSources">
+    <BuildMacro Include="GenGdkConfigHWin32">
-      <Value>$(GeneratedGdkSources)</Value>
+      <Value>$(GenGdkConfigHWin32)</Value>
     </BuildMacro>
-    <BuildMacro Include="GeneratedGtkSources">
+    <BuildMacro Include="GenGdkConfigHBroadway">
-      <Value>$(GeneratedGtkSources)</Value>
+      <Value>$(GenGdkConfigHBroadway)</Value>
     </BuildMacro>
-    <BuildMacro Include="GeneratedDemoSources">
+    <BuildMacro Include="GenerateGtkDbusBuiltSources">
-      <Value>$(GeneratedDemoSources)</Value>
+      <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>
   </ItemGroup>
 </Project>

build/win32/vs10/gtk3-install.propsin

@@ -5,11 +5,12 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
+    <InstalledDlls>$(BinDir)\$(GtkDllPrefix)gdk(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gtk(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gailutil(GtkDllSuffix).dll</InstalledDlls>
+    <InstalledBins>$(BinDir)\gtk3-demo.exe;$(BinDir)\gtk3-demo-application.exe;$(BinDir)\gtk3-icon-browser.exe;$(BinDir)\gtk-encode-symbolic-svg.exe</InstalledBins>
+    <InstalledBroadwayBins>$(BinDir)\broadwayd.exe</InstalledBroadwayBins>
     <GtkDoInstallBin>
 mkdir $(CopyDir)\bin
-mkdir $(CopyDir)\share\gir-1.0
+mkdir $(CopyDir)\lib
-mkdir $(CopyDir)\lib\pkgconfig
-mkdir $(CopyDir)\lib\girepository-1.0
 
 copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll" $(CopyDir)\bin
 copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).pdb" $(CopyDir)\bin
@@ -37,12 +38,6 @@ copy "$(BinDir)\gtk-query-settings.exe" $(CopyDir)\bin
 copy "$(BinDir)\gtk-query-settings.pdb" $(CopyDir)\bin
 copy "$(BinDir)\gtk-builder-tool.exe" $(CopyDir)\bin
 copy "$(BinDir)\gtk-builder-tool.pdb" $(CopyDir)\bin
-if exist $(BinDir)\Gdk-3.0.gir copy "$(BinDir)\Gdk-3.0.gir" $(CopyDir)\share\gir-1.0
-if exist $(BinDir)\GdkWin32-3.0.gir copy "$(BinDir)\GdkWin32-3.0.gir" $(CopyDir)\share\gir-1.0
-if exist $(BinDir)\Gtk-3.0.gir copy "$(BinDir)\Gtk-3.0.gir" $(CopyDir)\share\gir-1.0
-if exist $(BinDir)\Gdk-3.0.typelib copy "$(BinDir)\Gdk-3.0.typelib" $(CopyDir)\lib\girepository-1.0
-if exist $(BinDir)\GdkWin32-3.0.typelib copy "$(BinDir)\GdkWin32-3.0.typelib" $(CopyDir)\lib\girepository-1.0
-if exist $(BinDir)\Gtk-3.0.typelib copy "$(BinDir)\Gtk-3.0.typelib" $(CopyDir)\lib\girepository-1.0
 goto DONE_BIN
 
 :DO_BROADWAY_BIN
@@ -72,12 +67,6 @@ copy .\Release\$(Platform)\bin\gtk-query-settings.exe $(CopyDir)\bin
 copy .\Release\$(Platform)\bin\gtk-query-settings.pdb $(CopyDir)\bin
 copy .\Release\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin
 copy .\Release\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin
-if exist .\Release\$(Platform)\bin\Gdk-3.0.gir copy .\Release\$(Platform)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0
-if exist .\Release\$(Platform)\bin\GdkWin32-3.0.gir copy .\Release\$(Platform)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0
-if exist .\Release\$(Platform)\bin\Gtk-3.0.gir copy .\Release\$(Platform)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0
-if exist .\Release\$(Platform)\bin\Gdk-3.0.typelib copy .\Release\$(Platform)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0
-if exist .\Release\$(Platform)\bin\GdkWin32-3.0.typelib copy .\Release\$(Platform)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0
-if exist .\Release\$(Platform)\bin\Gtk-3.0.typelib copy .\Release\$(Platform)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0
 
 goto DONE_BIN
 
@@ -102,20 +91,8 @@ copy .\Debug\$(Platform)\bin\gtk-query-settings.exe $(CopyDir)\bin
 copy .\Debug\$(Platform)\bin\gtk-query-settings.pdb $(CopyDir)\bin
 copy .\Debug\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin
 copy .\Debug\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin
-if exist .\Debug\$(Platform)\bin\Gdk-3.0.gir copy .\Debug\$(Platform)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0
-if exist .\Debug\$(Platform)\bin\GdkWin32-3.0.gir copy .\Debug\$(Platform)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0
-if exist .\Debug\$(Platform)\bin\Gtk-3.0.gir copy .\Debug\$(Platform)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0
-if exist .\Debug\$(Platform)\bin\Gdk-3.0.typelib copy .\Debug\$(Platform)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0
-if exist .\Debug\$(Platform)\bin\GdkWin32-3.0.typelib copy .\Debug\$(Platform)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0
-if exist .\Debug\$(Platform)\bin\Gtk-3.0.typelib copy .\Debug\$(Platform)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0
 
 :DONE_BIN
-
-copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig
-copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig\gdk-win32-3.0.pc
-copy "..\gtk+-3.0.pc" $(CopyDir)\lib\pkgconfig
-copy "..\gtk+-3.0.pc" "$(CopyDir)\lib\pkgconfig\gtk+-3.0.pc"
-copy ..\gail-3.0.pc $(CopyDir)\lib\pkgconfig
     </GtkDoInstallBin>
     <GtkDoInstall>
 echo off
@@ -132,31 +109,35 @@ mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
 mkdir $(CopyDir)\include\gail-$(ApiVersion)\libgail-util
 #include "gailutil-3.vs10.headers"
 
-
+mkdir $(CopyDir)\share\icons\hicolor\16x16\apps
-for &#37;&#37;s in (16 22 24 32 48 256) do ((mkdir $(CopyDir)\share\icons\hicolor\&#37;&#37;sx&#37;&#37;s\apps) &amp; (copy /b ..\..\..\demos\gtk-demo\data\&#37;&#37;sx&#37;&#37;s\gtk3-demo.png $(CopyDir)\share\icons\hicolor\&#37;&#37;sx&#37;&#37;s\apps))
+copy ..\..\..\demos\gtk-demo\data\16x16\gtk3-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps
-
+mkdir $(CopyDir)\share\icons\hicolor\22x22\apps
+copy ..\..\..\demos\gtk-demo\data\22x22\gtk3-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps
+mkdir $(CopyDir)\share\icons\hicolor\24x24\apps
+copy ..\..\..\demos\gtk-demo\data\24x24\gtk3-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps
+mkdir $(CopyDir)\share\icons\hicolor\32x32\apps
+copy ..\..\..\demos\gtk-demo\data\32x32\gtk3-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps
+mkdir $(CopyDir)\share\icons\hicolor\48x48\apps
+copy ..\..\..\demos\gtk-demo\data\48x48\gtk3-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps
+mkdir $(CopyDir)\share\icons\hicolor\256x256\apps
+copy ..\..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\hicolor\256x256\apps
 mkdir $(CopyDir)\share\glib-2.0\schemas
+copy ..\..\..\gtk\org.gtk.Settings.FileChooser.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
+
+echo "Compiling gsettings XML Files..."
+$(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
+
+echo "Generating icon cache......"
+$(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor"
     </GtkDoInstall>
     <GtkDoInstallBroadwayHeaders>
 copy ..\..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway
 #include "gdk3-broadway.vs10.headers"
     </GtkDoInstallBroadwayHeaders>
-    <GtkPostInstall>
-echo "Compiling gsettings XML Files..."
-$(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
-
-echo "Generating icon cache......"
-$(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor"
-    </GtkPostInstall>
-    <GenerateGtkPC>$(PythonDir)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer)</GenerateGtkPC>
-    <GenerateGtkPCX64>$(PythonDir)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer)</GenerateGtkPCX64>
-    <GtkPCFiles>..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc</GtkPCFiles>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtk3installsprops</_PropertySheetDisplayName>
@@ -183,17 +164,5 @@ $(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir
     <BuildMacro Include="GtkDoInstallBroadwayHeaders">
       <Value>$(GtkDoInstallBroadwayHeaders)</Value>
     </BuildMacro>
-    <BuildMacro Include="GtkPostInstall">
-      <Value>$(GtkPostInstall)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateGtkPC">
-      <Value>$(GenerateGtkPC)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateGtkPCX64">
-      <Value>$(GenerateGtkPCX64)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkPCFiles">
-      <Value>$(GtkPCFiles)</Value>
-    </BuildMacro>
   </ItemGroup>
 </Project>

build/win32/vs10/gtk3-install.vcxproj

@@ -157,63 +157,29 @@
   <ItemGroup>
     <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)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">blah;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GtkPCFiles)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">blah;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkPCFiles)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">blah;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GtkPCFiles)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">blah;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkPCFiles)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">blah;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GtkPCFiles)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">blah;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkPCFiles)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">blah;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GtkPCFiles)</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">blah;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\gtkpc.py">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateGtkPC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GenerateGtkPC) --broadway</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateGtkPCX64)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GenerateGtkPCX64) --broadway</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateGtkPC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GenerateGtkPC) --broadway</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGtkPCX64)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GenerateGtkPCX64) --broadway</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GtkPCFiles);%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
@@ -249,7 +215,7 @@
       <Project>{f280bf1a-777a-4fb5-8005-dfbe04621edb}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="gtk-update-icon-cache.vcxproj">
+    <ProjectReference Include="gtk-udpate-icon-cache.vcxproj">
       <Project>{fc98af16-4c68-42df-906b-93a6804c198a}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>

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

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

build/win32/vs10/gtk3-introspect.vcxproj

@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A8092C4E-0A21-4B1D-AC82-16764E418D1F}</ProjectGuid>
-    <RootNamespace>gtk3introspect</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <NMakeBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GtkIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <NMakeBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GtkIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <NMakeBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GtkIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GtkIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="gdk-3.vcxproj">
-      <Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gtk-3.vcxproj">
-      <Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

build/win32/vs10/gtk3-prebuild.vcxproj

@@ -41,46 +41,46 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
+    <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
+    <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
+    <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
+    <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
+    <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
+    <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
+    <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
+    <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
@@ -121,19 +121,121 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <NMakeBuildCommandLine Condition="'$(Configuration)' == 'Debug_Broadway'">$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam)</NMakeBuildCommandLine>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)' == 'Release_Broadway'">$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam)</NMakeBuildCommandLine>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <NMakeBuildCommandLine Condition="'$(Configuration)' == 'Debug'">$(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam)</NMakeBuildCommandLine>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)' == 'Release'">$(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam)</NMakeBuildCommandLine>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <NMakeReBuildCommandLine Condition="'$(Configuration)' == 'Debug_Broadway'">$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)' == 'Release_Broadway'">$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <NMakeReBuildCommandLine Condition="'$(Configuration)' == 'Debug'">$(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)' == 'Release'">$(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <NMakeCleanCommandLine Condition="'$(Configuration)' == 'Debug_Broadway'">$(GenerateRequiredSourcesBase) CFG=Debug BROADWAY=1 $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <NMakeCleanCommandLine Condition="'$(Configuration)' == 'Release_Broadway'">$(GenerateRequiredSourcesBase) CFG=Release BROADWAY=1 $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" />
-    <NMakeCleanCommandLine Condition="'$(Configuration)' == 'Debug'">$(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <NMakeCleanCommandLine Condition="'$(Configuration)' == 'Release'">$(GenerateRequiredSourcesBase) CFG=$(Configuration) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
+    <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" />

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

@@ -12,19 +12,7 @@
     <GtkSeparateVSDllSuffix>-vs$(VSVer)</GtkSeparateVSDllSuffix>
     <GtkDllPrefix>$(GtkSeparateVSDllPrefix)</GtkDllPrefix>
     <GtkDllSuffix>$(GtkSeparateVSDllSuffix)</GtkDllSuffix>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '10.0|Win32'">c:\python34</PythonDir>
+    <PythonPath>c:\python27</PythonPath>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '11.0|Win32'">c:\python34</PythonDir>
-    <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>
     <_PropertySheetDisplayName>gtk3versionpathsprops</_PropertySheetDisplayName>
@@ -63,11 +51,8 @@
     <BuildMacro Include="GtkDllSuffix">
       <Value>$(GtkDllSuffix)</Value>
     </BuildMacro>
-    <BuildMacro Include="PythonDir">
+    <BuildMacro Include="PythonPath">
-      <Value>$(PythonDir)</Value>
+      <Value>$(PythonPath)</Value>
-    </BuildMacro>
-    <BuildMacro Include="IntrospectPythonParam">
-      <Value>$(IntrospectPythonParam)</Value>
     </BuildMacro>
   </ItemGroup>
 </Project>

build/win32/vs11/Makefile.am

@@ -27,8 +27,6 @@ EXTRA_DIST +=	\
 	gailutil-3.vcxproj	\
 	gailutil-3.vcxproj.filters	\
 	gtk3-install.vcxproj	\
-	gtk3-install.vcxproj.filters	\
-	gtk3-introspect.vcxproj		\
 	broadwayd.vcxproj	\
 	broadwayd.vcxproj.filters	\
 	gdk3-broadway.vcxproj	\

build/win32/vs12/Makefile.am

@@ -27,8 +27,6 @@ EXTRA_DIST +=	\
 	gailutil-3.vcxproj	\
 	gailutil-3.vcxproj.filters	\
 	gtk3-install.vcxproj	\
-	gtk3-install.vcxproj.filters	\
-	gtk3-introspect.vcxproj		\
 	broadwayd.vcxproj	\
 	broadwayd.vcxproj.filters	\
 	gdk3-broadway.vcxproj	\

build/win32/vs14/Makefile.am

@@ -27,8 +27,6 @@ EXTRA_DIST +=	\
 	gailutil-3.vcxproj	\
 	gailutil-3.vcxproj.filters	\
 	gtk3-install.vcxproj	\
-	gtk3-install.vcxproj.filters	\
-	gtk3-introspect.vcxproj		\
 	broadwayd.vcxproj	\
 	broadwayd.vcxproj.filters	\
 	gdk3-broadway.vcxproj	\

build/win32/vs15/Makefile.am

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

build/win32/vs16/Makefile.am

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

build/win32/vs9/Makefile.am

@@ -36,7 +36,6 @@ EXTRA_DIST += \
 	gtk3-icon-browser.vcprojin	\
 	gailutil-3.vcprojin		\
 	gtk3-install.vcproj		\
-	gtk3-introspect.vcproj		\
 	broadwayd.vcprojin		\
 	gdk3-broadway.vcprojin		\
 	gtk3-build-defines.vsprops	\

build/win32/vs9/README.txt

@@ -23,8 +23,8 @@ You will also need a Python 2.6+/3.x interpretor installed on your system,
 which can be obtained from the official installers available from
 http://www.python.org.  Please note that the Python interpretor (python.exe)
 either needs to be in your PATH before attempting the build of GTK+, or it
-can be found in the path specified by PythonDir in gtk-version-paths.vsprops.
+can be found in the path specified by PythonPath in gtk-version-paths.vsprops.
-If you happen to change the PythonDir setting in gtk-version-paths.vsprops after
+If you happen to change the PythonPath setting in gtk-version-paths.vsprops after
 opening gtk+.sln with Visual Studio, you will need to close the gtk+.sln solution,
 delete all the *.ncb, *.suo and *.user files before re-attempting the build.
 
@@ -80,21 +80,6 @@ built DLLs go into <root>\vs9\<PlatformName>\bin, built LIBs into
 project files higher in the stack are supposed to look for them, not
 from a specific GLib source tree.
 
-There is now a "gtk3-introspect" project that is used to build the
-introspection files.  In order for this to work, check that the paths for
-PythonDir (32-bit builds) and PythonDirX64 (x64 builds) are correct for your
-system.  Note that it must be the same Python installation that was used to
-build GObject-Introspection (G-I), and a complete G-I build/installation
-needs to be found in <root>\vs9\<PlatformName>\, with the introspection files
-for ATK, Pango and GDK-Pixbuf.  Note also that this is not built by default,
-so you will need to right-click on the project to build it, which will build
-and "install" the other projects that are normally built, if those were not yet
-built.  The introspection files that are built will be "installed" to
-<root>\vs9\<PlatformName>\share\gir-1.0 (the .gir file(s)) and
-<root>\vs9\<PlatformName>\lib\girepository-1.0 (the .typelib files(s)) upon
-successful build.  for building this in a different configuration, therefore,
-you will need to clean this project specifically and then rebuild.
-
 Please note, as GTK+ uses the Adwaita theme for all platforms by default,
 most icons used are not included with GTK+ (which *are* needed), so please see
 https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack (under the

build/win32/vs9/gdk-3.vcprojin

@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs)"
+				AdditionalDependencies="imm32.lib winmm.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -74,7 +74,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs) $(GdkBroadwayAdditionalLibs)"
+				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -104,7 +104,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs)"
+				AdditionalDependencies="imm32.lib winmm.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -136,7 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs) $(GdkBroadwayAdditionalLibs)"
+				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -170,7 +170,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs)"
+				AdditionalDependencies="imm32.lib winmm.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -202,7 +202,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs) $(GdkBroadwayAdditionalLibs)"
+				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -232,7 +232,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs)"
+				AdditionalDependencies="imm32.lib winmm.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -264,7 +264,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs) $(GdkBroadwayAdditionalLibs)"
+				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"

build/win32/vs9/gtk+.sln

@@ -89,12 +89,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-instal
 		{9F22107A-3EF7-4B52-B269-747B65307F36} = {9F22107A-3EF7-4B52-B269-747B65307F36}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-introspect", "gtk3-introspect.vcproj", "{A8092C4E-0A21-4B1D-AC82-16764E418D1F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}
-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -331,14 +325,6 @@ Global
 		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.Build.0 = Release|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug|x64.ActiveCfg = Debug|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release|Win32.ActiveCfg = Release|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release|x64.ActiveCfg = Release|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release_Broadway|x64.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

build/win32/vs9/gtk-3.vcprojin

@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GtkAdditionalLibs)"
+				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -72,7 +72,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GtkAdditionalLibs)"
+				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -106,7 +106,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GtkAdditionalLibs)"
+				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -136,7 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GtkAdditionalLibs)"
+				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -162,6 +162,96 @@
 			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="$(GenerateGtkDbusBuiltSources)"
+						Outputs="..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating GTK+ DBus Sources..."
+						CommandLine="$(GenerateGtkDbusBuiltSources)"
+						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="..\..\..\gtk\gtk-win32.rc" />
 			<File RelativePath="..\..\..\gtk\libgtk3.manifest" />
 		</Filter>

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"
 		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"
@@ -43,28 +43,4 @@
 		Name="GtkDefines"
 		Value="GTK_COMPILATION;G_LOG_DOMAIN=\&quot;Gtk\&quot;;GTK_HOST=\&quot;i686-pc-vs$(VSVer)\&quot;;GTK_PRINT_BACKENDS=\&quot;file\&quot;;GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED;$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot;;GTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot;GTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;;GTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot;;MULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\&quot;;MULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot;;GTK_VERSION=\&quot;$(GtkVersion)/etc\&quot;;GTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)/etc\&quot;;GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED"
 	/>
-	<UserMacro
-		Name="GtkGdkCommonLibs"
-		Value="pangowin32-1.0.lib fribidi.lib imm32.lib"
-	/>
-	<UserMacro
-		Name="GdkBroadwayAdditionalLibs"
-		Value="ws2_32.lib"
-	/>
-	<UserMacro
-		Name="GdkAdditionalLibs"
-		Value="winmm.lib dwmapi.lib setupapi.lib $(GtkGdkCommonLibs)"
-	/>
-	<UserMacro
-		Name="GtkAdditionalLibs"
-		Value="atk-1.0.lib winspool.lib comctl32.lib $(GtkGdkCommonLibs)"
-	/>
-	<UserMacro
-		Name="GtkIntrospectNMakeCmd"
-		Value="cd ..&#x0D;&#x0A;set VCInstallDir=$(VCInstallDir)&#x0D;&#x0A;nmake -f gtk-introspection-msvc.mak CFG=$(ConfigurationName) PREFIX=$(GlibEtcInstallRoot)"
-	/>
-	<UserMacro
-		Name="GtkIntrospectBuiltFiles"
-		Value="$(SolutionDir)\$(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.gir;$(SolutionDir)\$(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.typelib;$(SolutionDir)\$(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.gir;$(SolutionDir)\$(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.typelib;$(SolutionDir)\$(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.gir;$(SolutionDir)\$(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.typelib"
-	/>
 </VisualStudioPropertySheet>

build/win32/vs9/gtk3-copy-gdk-broadway.vsprops

@@ -17,7 +17,7 @@ if "$(ConfigurationName)" == "Debug_Broadway" goto DoDebug&#
 
 :DoRelease

 mkdir .\Release\$(PlatformName)\bin

-copy /b $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll .\Release\$(PlatformName)\bin\

+copy /b $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll .\Release\$(PlatformName)\bin\

 copy /b $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib .\Release\$(PlatformName)\bin\

 goto END

 

build/win32/vs9/gtk3-demo.vcprojin

@@ -47,6 +47,7 @@
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
+				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
@@ -79,6 +80,7 @@
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
+				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="17"
 			/>
@@ -111,6 +113,7 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
@@ -143,6 +146,7 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="17"
 			/>

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

@@ -6,19 +6,72 @@
 	InheritedPropertySheets=".\gtk3-build-defines.vsprops"
 	>
 	<UserMacro
-		Name="GenerateRequiredSourcesBase"
+		Name="GenConfigH"
-		Value="cd ..&#x0D;&#x0A;set VCInstallDir=$(VCInstallDir)&#x0D;&#x0A;nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot)"
+		Value="
+copy ..\..\..\config.h.win32 ..\..\..\config.h
+		      "
 	/>
 	<UserMacro
-		Name="GeneratedGdkSources"
+		Name="GenGdkConfigHWin32"
-		Value="..\..\..\config.h;..\..\..\gdk\gdkconfig.h;..\..\gdk\gdkversionmacros.h;..\..\..\gdk\gdkmarshalers.h;..\..\..\gdk\gdkmarshalers.c;..\..\..\gdk\gdkresources.h;..\..\..\gdk\gdkresources.c"
+		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="GeneratedGtkSources"
+		Name="GenGdkConfigHBroadway"
-		Value="..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;..\..\..\gtk\gtkdbusgenerated.h;..\..\..\gtk\gtkdbusgenerated.c"
+		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="GeneratedDemoSources"
+		Name="GenerateGtkDbusBuiltSources"
-		Value="..\..\..\demos\gtk-demo\demos.h"
+		Value="
+cd ..\..\..\gtk&#x0D;&#x0A;
+$(PythonPath)\python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml&#x0D;&#x0A;
+cd $(SolutionDir)&#x0D;&#x0A;
+		      "
+	/>
+	<UserMacro
+		Name="CopyGtkWin32RC"
+		Value="copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc"
+	/>
+	<UserMacro
+		Name="GenerateGtkWin32Manifest"
+		Value="$(PythonPath)\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"
 	/>
 </VisualStudioPropertySheet>

build/win32/vs9/gtk3-install.vcproj

@@ -28,8 +28,8 @@
 			DeleteExtensionsOnClean=""
 			>
 			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPreBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)"
+				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"
 			/>
 		</Configuration>
 		<Configuration
@@ -41,8 +41,8 @@
 			DeleteExtensionsOnClean=""
 			>
 			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPreBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)"
+				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"
 			/>
 		</Configuration>
 		<Configuration
@@ -55,8 +55,8 @@
 			DeleteExtensionsOnClean=""
 			>
 			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPreBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)"
+				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"
 			/>
 		</Configuration>
 		<Configuration
@@ -68,8 +68,8 @@
 			DeleteExtensionsOnClean=""
 			>
 			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPreBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)"
+				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"
 			/>
 		</Configuration>
 		<Configuration
@@ -83,8 +83,8 @@
 			WholeProgramOptimization="1"
 			>
 			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPreBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)"
+				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"
 			/>
 		</Configuration>
 		<Configuration
@@ -97,8 +97,8 @@
 			WholeProgramOptimization="1"
 			>
 			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPreBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)"
+				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"
 			/>
 		</Configuration>
 		<Configuration
@@ -112,8 +112,8 @@
 			WholeProgramOptimization="1"
 			>
 			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPreBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)"
+				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"
 			/>
 		</Configuration>
 		<Configuration
@@ -126,78 +126,14 @@
 			WholeProgramOptimization="1"
 			>
 			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPreBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)"
+				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"
 			/>
 		</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="..\..\..\gtkpc.py">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPC)"
-						Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPC)"
-						Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPCX64)"
-						Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPCX64)"
-						Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPC) --broadway"
-						Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPC) --broadway"
-						Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPCX64) --broadway"
-						Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPCX64) --broadway"
-						Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>

build/win32/vs9/gtk3-install.vspropsin

@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioPropertySheet
-	ProjectType="Visual C++"
+ ProjectType="Visual C++"
-	Version="8.00"
+ Version="8.00"
-	Name="gtkinstallprops"
+ Name="gtkinstallprops"
-	InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-	>
+ >
-	<UserMacro
+ <UserMacro
-		Name="GtkDoInstallBin"
+  Name="GtkDoInstallBin"
-		Value="
+  Value="
 mkdir $(CopyDir)\bin&#x0D;&#x0A;
-mkdir $(CopyDir)\share\gir-1.0&#x0D;&#x0A;
+mkdir $(CopyDir)\lib&#x0D;&#x0A;
-mkdir $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-mkdir $(CopyDir)\lib\girepository-1.0&#x0D;&#x0A;
 
 copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).pdb $(CopyDir)\bin&#x0D;&#x0A;
@@ -39,12 +37,6 @@ copy $(ConfigurationName)\$(PlatformName)\bin\gtk-query-settings.exe $(CopyDir)\
 copy $(ConfigurationName)\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin&#x0D;&#x0A;
-if exist $(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.gir copy $(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0&#x0D;&#x0A;
-if exist $(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.gir copy $(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0&#x0D;&#x0A;
-if exist $(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.gir copy $(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0&#x0D;&#x0A;
-if exist $(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.typelib copy $(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0&#x0D;&#x0A;
-if exist $(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.typelib copy $(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0&#x0D;&#x0A;
-if exist $(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.typelib copy $(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0&#x0D;&#x0A;
 goto DONE_BIN&#x0D;&#x0A;
 
 :DO_BROADWAY_BIN&#x0D;&#x0A;
@@ -74,12 +66,6 @@ copy .\Release\$(PlatformName)\bin\gtk-query-settings.exe $(CopyDir)\bin&#x0D;&#
 copy .\Release\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin&#x0D;&#x0A;
 copy .\Release\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin&#x0D;&#x0A;
 copy .\Release\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin&#x0D;&#x0A;
-if exist .\Release\$(PlatformName)\bin\Gdk-3.0.gir copy .\Release\$(PlatformName)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0&#x0D;&#x0A;
-if exist .\Release\$(PlatformName)\bin\GdkWin32-3.0.gir copy .\Release\$(PlatformName)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0&#x0D;&#x0A;
-if exist .\Release\$(PlatformName)\bin\Gtk-3.0.gir copy .\Release\$(PlatformName)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0&#x0D;&#x0A;
-if exist .\Release\$(PlatformName)\bin\Gdk-3.0.typelib copy .\Release\$(PlatformName)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0&#x0D;&#x0A;
-if exist .\Release\$(PlatformName)\bin\GdkWin32-3.0.typelib copy .\Release\$(PlatformName)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0&#x0D;&#x0A;
-if exist .\Release\$(PlatformName)\bin\Gtk-3.0.typelib copy .\Release\$(PlatformName)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0&#x0D;&#x0A;
 goto DONE_BIN&#x0D;&#x0A;
 
 :DO_BROADWAY_DEBUG&#x0D;&#x0A;
@@ -103,24 +89,12 @@ copy .\Debug\$(PlatformName)\bin\gtk-query-settings.exe $(CopyDir)\bin&#x0D;&#x0
 copy .\Debug\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin&#x0D;&#x0A;
 copy .\Debug\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin&#x0D;&#x0A;
 copy .\Debug\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin&#x0D;&#x0A;
-if exist .\Debug\$(PlatformName)\bin\Gdk-3.0.gir copy .\Debug\$(PlatformName)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0&#x0D;&#x0A;
-if exist .\Debug\$(PlatformName)\bin\GdkWin32-3.0.gir copy .\Debug\$(PlatformName)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0&#x0D;&#x0A;
-if exist .\Debug\$(PlatformName)\bin\Gtk-3.0.gir copy .\Debug\$(PlatformName)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0&#x0D;&#x0A;
-if exist .\Debug\$(PlatformName)\bin\Gdk-3.0.typelib copy .\Debug\$(PlatformName)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0&#x0D;&#x0A;
-if exist .\Debug\$(PlatformName)\bin\GdkWin32-3.0.typelib copy .\Debug\$(PlatformName)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0&#x0D;&#x0A;
-if exist .\Debug\$(PlatformName)\bin\Gtk-3.0.typelib copy .\Debug\$(PlatformName)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0&#x0D;&#x0A;
 :DONE_BIN&#x0D;&#x0A;
-
+                       "
-copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
+ />
-copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig\gdk-win32-3.0.pc&#x0D;&#x0A;
+ <UserMacro
-copy &quot;..\gtk+-3.0.pc&quot; $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
+  Name="GtkDoInstall"
-copy &quot;..\gtk+-3.0.pc&quot; &quot;$(CopyDir)\lib\pkgconfig\gtk+-win32-3.0.pc&quot;&#x0D;&#x0A;
+  Value="
-copy ..\gail-3.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-			  "
-	/>
-	<UserMacro
-		Name="GtkDoInstall"
-		Value="
 echo off&#x0D;&#x0A;
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated&#x0D;&#x0A;
@@ -150,37 +124,24 @@ mkdir $(CopyDir)\share\icons\hicolor\256x256\apps&#x0D;&#x0A;
 copy ..\..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\hicolor\256x256\apps\&#x0D;&#x0A;
 
 mkdir $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
+copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-copy ..\..\..\gtk\org.gtk.Settings.EmojiChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-		      "
+
-	/>
-	<UserMacro
-		Name="GtkPostInstall"
-		Value="
 echo &quot;Compiling gsettings XML Files...&quot;&#x0D;&#x0A;
 $(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 
 echo &quot;Generating icon cache...&quot;&#x0D;&#x0A;
 $(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force &quot;$(CopyDir)\share\icons\hicolor&quot;
-		      "
+"
-	/>
+ />
-	<UserMacro
+ <UserMacro
-		Name="GtkDoInstallBroadwayHeaders"
+  Name="GtkDoInstallBroadwayHeaders"
-		Value="
+  Value="
 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"
         "
-	/>
+ />
-	<UserMacro
-		Name="GenerateGtkPC"
-		Value="$(PythonDir)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer)"
-	/>
-	<UserMacro
-		Name="GenerateGtkPCX64"
-		Value="$(PythonDirX64)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer)"
-	/>
 </VisualStudioPropertySheet>

build/win32/vs9/gtk3-introspect.vcproj

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk3-introspect"
-	ProjectGUID="{A8092C4E-0A21-4B1D-AC82-16764E418D1F}"
-	Keyword="MakeFileProj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam)"
-				ReBuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all"
-				CleanCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean"
-				Output="$(GtkIntrospectBuiltFiles)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64)"
-				ReBuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all"
-				CleanCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean"
-				Output="$(GtkIntrospectBuiltFiles)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam)"
-				ReBuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all"
-				CleanCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean"
-				Output="$(GtkIntrospectBuiltFiles)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64)"
-				ReBuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all"
-				CleanCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean"
-				Output="$(GtkIntrospectBuiltFiles)"
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioProject>

build/win32/vs9/gtk3-prebuild.vcproj

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

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

@@ -51,19 +51,7 @@
 		Value="$(GtkSeparateVSDllSuffix)"
 	/>
 	<UserMacro
-		Name="PythonDir"
+		Name="PythonPath"
 		Value="c:\python27"
 	/>
-	<UserMacro
-		Name="PythonDirX64"
-		Value="$(PythonDir).x64"
-	/>
-	<UserMacro
-		Name="IntrospectPythonParam"
-		Value="PYTHON=$(PythonDir)\python.exe"
-	/>
-	<UserMacro
-		Name="IntrospectPythonParamX64"
-		Value="PYTHON=$(PythonDirX64)\python.exe"
-	/>
 </VisualStudioPropertySheet>

config.h.meson

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

config.h.win32.in

@@ -29,6 +29,9 @@
 /* Define to 1 if you have the <crt_externs.h> header file. */
 /* #undef HAVE_CRT_EXTERNS_H */
 
+/* Define to 1 if CUPS 1.2 API is available */
+/* #undef HAVE_CUPS_API_1_2 */
+
 /* Define to 1 if you have the `dcgettext' function. */
 #define HAVE_DCGETTEXT 1
 
@@ -47,11 +50,6 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 /* #undef HAVE_DLFCN_H */
 
-/* Define to 1 if you have the `exp2' function. */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-#define HAVE_EXP2 1
-#endif
-
 /* Define to 1 if you have the `flockfile' function. */
 #undef HAVE_FLOCKFILE
 
@@ -74,6 +72,15 @@
 /* Define if gio-unix is available */
 /* #undef HAVE_GIO_UNIX */
 
+/* Have GNU ftw */
+/* #undef HAVE_GNU_FTW */
+
+/* Define to 1 if you have the `httpGetAuthString' function. */
+/* #undef HAVE_HTTPGETAUTHSTRING */
+
+/* Define if cups http_t authstring field is accessible */
+/* #undef HAVE_HTTP_AUTHSTRING */
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #if !defined (_MSC_VER) || (_MSC_VER >= 1800)
 #define HAVE_INTTYPES_H 1
@@ -98,11 +105,6 @@
 /* Define to 1 if you have the `localtime_r' function. */
 /* #undef HAVE_LOCALTIME_R */
 
-/* Define to 1 if you have the `log2' function. */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-#define HAVE_LOG2 1
-#endif
-
 /* Define to 1 if you have the `lstat' function. */
 /* #undef HAVE_LSTAT */
 
@@ -145,6 +147,9 @@
 /* Define to 1 if sincos() is available */
 /* #undef HAVE_SINCOS */
 
+/* Have the sockaddr_un.sun_len member */
+/* #undef HAVE_SOCKADDR_UN_SUN_LEN */
+
 /* Define to 1 if solaris xinerama is available */
 /* #undef HAVE_SOLARIS_XINERAMA */
 
@@ -194,11 +199,6 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
-/* Define to 1 if trunc() is available */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-# define HAVE_TRUNC 1
-#endif
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #ifndef _MSC_VER
 #define HAVE_UNISTD_H 1

configure.ac

@@ -9,9 +9,9 @@
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [24])
+m4_define([gtk_minor_version], [20])
-m4_define([gtk_micro_version], [10])
+m4_define([gtk_micro_version], [0])
-m4_define([gtk_interface_age], [6])
+m4_define([gtk_interface_age], [0])
 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_minor], [45])
-m4_define([glib_required_micro], [2])
+m4_define([glib_required_micro], [8])
 m4_define([glib_required_version],
           [glib_required_major.glib_required_minor.glib_required_micro])
 m4_define([glib_min_required_minor],
@@ -54,19 +54,16 @@ m4_define([glib_min_required_version], m4_join([_], [GLIB_VERSION], glib_require
 m4_define([glib_max_allowed_version], m4_join([_], [GLIB_VERSION], glib_required_major, glib_max_allowed_minor))
 GLIB_VERSION_CFLAGS="-DGLIB_MIN_REQUIRED_VERSION=glib_min_required_version -DGLIB_MAX_ALLOWED_VERSION=glib_max_allowed_version"
 
-m4_define([pango_required_version], [1.41.0])
+m4_define([pango_required_version], [1.37.3])
-m4_define([fribidi_required_version], [0.19.7])
 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.9.91])
-m4_define([wayland_protocols_required_version], [1.14])
+m4_define([wayland_protocols_required_version], [1.0])
-m4_define([mirclient_required_version], [0.22.0])
+m4_define([mirclient_required_version], [0.11.0])
 m4_define([mircookie_required_version], [0.17.0])
-m4_define([epoxy_required_version], [1.4])
+m4_define([epoxy_required_version], [1.0])
-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
@@ -84,7 +81,7 @@ AC_SUBST(INTROSPECTION_REQUIRED_VERSION)
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}
 
-AM_INIT_AUTOMAKE([1.11 -Wall subdir-objects no-define -Wno-portability tar-ustar no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([1.11 -Wall no-define -Wno-portability tar-ustar no-dist-gzip dist-xz])
 AM_MAINTAINER_MODE([enable])
 
 # Support silent build rules. Disable
@@ -164,13 +161,6 @@ AC_PROG_MKDIR_P
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
-# Define _GNU_SOURCE etc. where appropriate, e.g. for strptime() on glibc
-AC_USE_SYSTEM_EXTENSIONS
-
-# i18n stuff
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.7])
-
 GETTEXT_PACKAGE=gtk30
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
@@ -214,6 +204,9 @@ case $host in
     ;;
 esac
 
+# Define _GNU_SOURCE etc. where appropriate, e.g. for strptime() on glibc
+AC_USE_SYSTEM_EXTENSIONS
+
 dnl
 dnl Check for a working C++ compiler, but do not bail out, if none is found.
 dnl We use this for an automated test for C++ header correctness.
@@ -349,17 +342,6 @@ AC_ARG_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
@@ -403,7 +385,7 @@ if test "$enable_win32_backend" = "yes"; then
   backend_immodules="$backend_immodules,ime"
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WIN32"
-  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm -ldwmapi -lsetupapi -lcfgmgr32"
+  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm -ldwmapi"
   AM_CONDITIONAL(USE_WIN32, true)
   PANGO_PACKAGES="pangowin32 pangocairo"
 else
@@ -417,7 +399,7 @@ if test "x$enable_quartz_backend" = xyes; then
   backend_immodules="$backend_immodules,quartz"
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_QUARTZ"
-  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -Wl,-framework,Cocoa"
+  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
   DISABLE_ON_QUARTZ='%'
   AM_CONDITIONAL(USE_QUARTZ, true)
   if test "x$quartz_relocation" = xyes; then
@@ -467,11 +449,10 @@ if test "$enable_wayland_backend" = "yes"; then
   GDK_BACKENDS="$GDK_BACKENDS wayland"
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WAYLAND"
-  backend_immodules="$backend_immodules,wayland"
   WAYLAND_PACKAGES="$WAYLAND_DEPENDENCIES"
   AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
   AS_IF([test "x$WAYLAND_SCANNER" = "xno"],
-    [AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols])])
+    AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols]))
   AC_SUBST([WAYLAND_SCANNER])
 
   AM_CONDITIONAL(USE_WAYLAND, true)
@@ -479,7 +460,7 @@ else
   AM_CONDITIONAL(USE_WAYLAND, false)
 fi
 
-MIR_DEPENDENCIES="mirclient >= mirclient_required_version mircookie >= mircookie_required_version libcontent-hub-glib"
+MIR_DEPENDENCIES="mirclient >= mirclient_required_version mircookie >= mircookie_required_version"
 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])
@@ -593,29 +574,25 @@ PKG_CHECK_MODULES(BASE_DEPENDENCIES,
   [glib-2.0 >= glib_required_version dnl
    atk >= atk_required_version dnl
    pango >= pango_required_version dnl
-   fribidi >= fribidi_required_version dnl
    cairo >= cairo_required_version dnl
    cairo-gobject >= cairo_required_version dnl
    gdk-pixbuf-2.0 >= gdk_pixbuf_required_version])
 
 PKG_CHECK_MODULES(CAIRO_BACKEND, [$cairo_backends])
 
-# Remove this check once cairo_required_version reaches at least 1.16.0
+# Remove this check once cairo_required_version reaches at least 1.14.4
-AS_CASE([$host_os],
+case $host_os in
-  [mingw*],
+  mingw*)
-  [
     PKG_CHECK_MODULES(CAIRO, [cairo >= cairo_required_version])
-    gtk_save_LIBS="$LIBS"
-    LIBS="$CAIRO_LIBS $LIBS"
     AC_CHECK_LIB([cairo], [cairo_win32_surface_create_with_format],
       [AC_MSG_RESULT([found])],
       [AC_MSG_ERROR(
 [cairo_win32_surface_create_with_format is not found in cairo library
-You need a cairo snapshot 1.15.x or 1.16.x release or newer])])
+You need cairo version newer than 2015-04-14])])
-    LIBS="$gtk_save_LIBS"
+    ;;
-  ],
+  *)
-  []
+    ;;
-)
+esac
 
 
 PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
@@ -705,7 +682,46 @@ if test "$gtk_ok" = "yes"; then
 	    [Define if _NL_PAPER_WIDTH is available])
 fi
 
+# i18n stuff
+ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
+AM_GLIB_GNU_GETTEXT
+
+AC_MSG_CHECKING([whether xgettext supports ui files])
+if $ac_cv_path_XGETTEXT --output=- --color=no --language=Glade $srcdir/gtk/ui/gtkfilechooserwidget.ui > /dev/null 2>&1; then
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([no])
+  AC_MSG_ERROR([GNU gettext 0.18.3 or newer is required])
+fi
+
 LIBS="$LIBS $INTLLIBS"
+AC_CONFIG_COMMANDS([po-properties],
+                   [[case "$CONFIG_FILES" in *po-properties/Makefile.in*)
+                       sed -e "/POTFILES =/r po-properties/POTFILES" po-properties/Makefile.in > po-properties/Makefile
+                     esac]],
+                   [[]])
+
+dnl Snippet below is copied from AM_GLIB_GNU_GETTEXT to generate a first
+dnl po-properties/POTFILES during configure; see GNOME #573515.
+dnl
+dnl Generate list of files to be processed by xgettext which will
+dnl be included in po-properties/Makefile.
+test -d po-properties || mkdir po-properties
+if test "x$srcdir" != "x."; then
+  if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+    popropsrcprefix="$srcdir/"
+  else
+    popropsrcprefix="../$srcdir/"
+  fi
+else
+  popropsrcprefix="../"
+fi
+rm -f po-properties/POTFILES
+sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$popropsrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+< $srcdir/po-properties/POTFILES.in > po-properties/POTFILES
+dnl (End of adapted AM_GLIB_GNU_GETTEXT snippet.)
+
+AM_GLIB_DEFINE_LOCALEDIR(GTK_LOCALEDIR)
 
 dnl The DU4 header files don't provide library prototypes unless
 dnl -std1 is given to the native cc.
@@ -740,28 +756,6 @@ case $host in
   ;;
 esac
 
-AS_CASE([$host_os],
-  [mingw*],
-  [
-    AC_CHECK_SIZEOF(
-      [DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY],
-      [],
-      [
-#define _WIN32_WINNT 0x601
-#include <windows.h>
-      ]
-    )
-    AS_IF(
-      [test x$ac_cv_sizeof_DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY = x4],
-      [AC_MSG_RESULT([DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY is OK])],
-      [test x$ac_cv_sizeof_DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY = x0],
-      [AC_MSG_ERROR([DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY is unavailable])],
-      [AC_MSG_RESULT([DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY is not OK])]
-    )
-  ],
-  []
-)
-
 AC_SUBST(MATH_LIB)
 #
 # see bug 162979
@@ -800,15 +794,6 @@ LIBS="$LIBS $GLIB_LIBS"
 AC_CHECK_FUNCS(bind_textdomain_codeset)
 LIBS=$gtk_save_LIBS
 
-AC_CHECK_HEADERS(linux/memfd.h,
-                 AC_DEFINE(HAVE_LINUX_MEMFD_H, 1,
-                           [Define to 1 if linux/memfd.h is available]))
-AC_CHECK_HEADERS(linux/input.h,
-                 AC_DEFINE(HAVE_LINUX_INPUT_H, 1,
-                           [Define to 1 if linux/input.h is available]))
-AC_CHECK_HEADERS(dev/evdev/input.h,
-                 AC_DEFINE(HAVE_DEV_EVDEV_INPUT_H, 1,
-                           [Define to 1 if dev/evdev/input.h is available]))
 AC_CHECK_HEADERS(sys/mman.h,
                  AC_DEFINE(HAVE_SYS_MMAN_H, 1,
                            [Define to 1 if mman.h is available]))
@@ -822,6 +807,19 @@ AC_CHECK_HEADERS(ftw.h,
                  AC_DEFINE(HAVE_FTW_H, 1,
                            [Define to 1 if ftw.h is available]))
 
+AC_MSG_CHECKING([for GNU ftw extensions])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _XOPEN_SOURCE 500
+                                     #define _GNU_SOURCE
+                                     #include <ftw.h>]],
+                                   [[int flags = FTW_ACTIONRETVAL;]])],
+                  [gtk_ok=yes],[gtk_ok=no])
+if test $gtk_ok = yes; then
+    AC_MSG_RESULT([yes])
+    AC_DEFINE(HAVE_GNU_FTW, 1, [Have GNU ftw])
+else
+    AC_MSG_RESULT([no])
+fi
+
 #
 # Disable deprecation checks for all libraries we depend on on stable branches.
 # This is so newer versions of those libraries don't cause more warnings with
@@ -846,10 +844,9 @@ AC_CHECK_FUNCS(mallinfo)
 AC_CHECK_FUNCS(getresuid)
 AC_TYPE_UID_T
 
-# Check for round(), rint(), isnan() and isinf()
+# Check for round(), rint(), isnan(), isinf() and nearbyint()
-# Check for log2(), exp2(), nearbyint() and trunc()
 AC_CHECK_LIB(m,round,,)
-AC_CHECK_FUNCS(round rint nearbyint sincos exp2 log2 trunc)
+AC_CHECK_FUNCS(round rint nearbyint sincos)
 AC_CHECK_DECLS([isnan, isinf], [], [], [[#include <math.h>]])
 
 # Checks for gdkspawn
@@ -968,7 +965,6 @@ AM_CONDITIONAL(INCLUDE_IM_TI_ER, [test x"$INCLUDE_ti_er" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_TI_ET, [test x"$INCLUDE_ti_et" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_VIQR, [test x"$INCLUDE_viqr" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_XIM, [test x"$INCLUDE_xim" = xyes])
-AM_CONDITIONAL(INCLUDE_IM_WAYLAND, [test x"$INCLUDE_wayland" = xyes])
 
 # Checks to see whether we should include mediaLib
 # support.
@@ -1326,41 +1322,11 @@ else
         LIBS="$gtk_save_LIBS"
 fi
 
-# Check for libcloudproviders
-
-CLOUDPROVIDER_PACKAGES=""
-if test "x$cloudproviders_set" = "xyes"; then
-  CLOUDPROVIDER_PACKAGES="cloudproviders >= cloudproviders_required_version"
-  if $PKG_CONFIG --exists $CLOUDPROVIDER_PACKAGES ; then
-    AC_DEFINE(HAVE_CLOUDPROVIDERS, [1],
-              [Define if libcloudproviders is available]
-              )
-  else
-    AC_MSG_ERROR([
-*** libcloudproviders not found.])
-  fi
-fi
-
-# Check for profiler support
-
-PROFILER_PACKAGES=""
-if test "x$enable_profiler" = "xyes"; then
-  PROFILER_PACKAGES="sysprof-capture-3 >= sysprof_required_version"
-  if $PKG_CONFIG --exists $PROFILER_PACKAGES; then
-    AC_DEFINE(HAVE_SYSPROF_CAPTURE, [1],
-              [Define if sysprof-capture-3 is available]
-              )
-  else
-    AC_MSG_ERROR([
-*** sysprof-capture-3 not found.])
-  fi
-fi
-
 CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"
 
 GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
-GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES $PROFILER_PACKAGES fribidi >= fribidi_required_version"
+GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version"
 
 PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
 GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB"
@@ -1394,7 +1360,7 @@ fi
 PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
 
 GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"
-GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version fribidi >= fribidi_required_version"
+GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version"
 if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then
   GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
 fi
@@ -1412,22 +1378,6 @@ if test x"$os_win32" = xyes; then
   GTK_EXTRA_CFLAGS="$msnative_struct"
 fi
 
-##################################################
-# Check for harfbuzz and pangoft2
-##################################################
-
-PKG_CHECK_MODULES(GTK_FONT_CHOOSER_WIDGET,
-                  harfbuzz >= 0.9 pangoft2,
-                  build_font_demo=yes,
-                  build_font_demo=no)
-AM_CONDITIONAL(BUILD_FONT_DEMO, [ test "x$build_font_demo" = xyes ])
-if test "x$build_font_demo" = xyes; then
-  AC_DEFINE([HAVE_HARFBUZZ], 1, [defines whether we have HarfBuzz])
-  AC_DEFINE([HAVE_PANGOFT], 1, [defines whether we have pangoft2])
-  GTK_DEP_CFLAGS="$GTK_DEP_CFLAGS $GTK_FONT_CHOOSER_WIDGET_CFLAGS"
-  GTK_DEP_LIBS="$GTK_DEP_LIBS $GTK_FONT_CHOOSER_WIDGET_LIBS"
-fi
-
 if $PKG_CONFIG --exists x11; then
   X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`"
 elif test x"$prefix" != xNONE; then
@@ -1436,48 +1386,10 @@ else
   X11_PREFIX="$ac_default_prefix"
 fi
 
-AC_ARG_ENABLE(win32-gles,
-              [AS_HELP_STRING([--enable-win32-gles],
-                              [enable OpenGL ES rendering in Win32 backend, disabled by default])],
-                              [win32_gles=yes],
-                              [win32_gles=no])
-
-if test x"$enable_win32_backend" = xyes; then
-  AC_MSG_CHECKING(WGL support in epoxy)
-  WGL_SUPPORT="`$PKG_CONFIG --variable=epoxy_has_wgl epoxy`"
-  if test x"$WGL_SUPPORT" = x1; then
-    AC_MSG_RESULT([supported])
-  else
-    AC_MSG_ERROR([
-*** epoxy was not built with WGL support or epoxy version is too old.
-*** WGL support in epoxy is enabled by default for all Windows builds,
-*** and is used by GTK+ uncondititonally. If it is not there, then
-*** something is very wrong.
-])
-  fi
-  if test x"$win32_gles" = xyes; then
-    AC_MSG_CHECKING(EGL support in epoxy)
-    EGL_SUPPORT="`$PKG_CONFIG --variable=epoxy_has_egl epoxy`"
-    if test x"$EGL_SUPPORT" = x1; then
-      AC_MSG_RESULT([supported])
-    else
-      AC_MSG_ERROR([
-*** epoxy was not built with EGL support or epoxy version is too old.
-*** EGL support in epoxy is disabled by default in Windows builds,
-*** you might need to rebuild epoxy with explicit --enable-egl=yes.
-*** EGL support is needed for OpenGL ES rendering.
-])
-    fi
-  fi
-fi
-
-AM_CONDITIONAL(WIN32_GLES, test x"$platform_win32" = xyes -a x"$win32_gles" = xyes)
-
 GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
 ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`"
 PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
 CAIRO_PREFIX="`$PKG_CONFIG --variable=prefix cairo`"
-ISO_CODES_PREFIX="`$PKG_CONFIG --variable=prefix iso-codes`"
 
 AC_SUBST(GTK_PACKAGES)
 AC_SUBST(GTK_PRIVATE_PACKAGES)
@@ -1491,7 +1403,6 @@ AC_SUBST(GLIB_PREFIX)
 AC_SUBST(ATK_PREFIX)
 AC_SUBST(PANGO_PREFIX)
 AC_SUBST(CAIRO_PREFIX)
-AC_SUBST(ISO_CODES_PREFIX)
 
 AC_SUBST(GTK_DEBUG_FLAGS)
 AC_SUBST(GTK_XIM_FLAGS)
@@ -1499,6 +1410,37 @@ AC_SUBST(GTK_XIM_FLAGS)
 GDK_PIXBUF_LIBS=`$PKG_CONFIG --libs gdk-pixbuf-2.0`
 AC_SUBST(GDK_PIXBUF_LIBS)
 
+########################
+# Checks needed for gail
+########################
+
+old_LIBS="$LIBS"
+dnl Checks for inet libraries:
+AC_SEARCH_LIBS(gethostent, nsl)
+AC_SEARCH_LIBS(setsockopt, socket)
+AC_SEARCH_LIBS(connect, inet)
+
+dnl check for the sockaddr_un.sun_len member
+AC_CHECK_MEMBER([struct sockaddr_un.sun_len],
+		[struct_sockaddr_un_sun_len=true],
+		[struct_sockaddr_un_suin_len=false],
+		[#include <sys/types.h>
+		 #include <sys/un.h>]
+		)
+case $struct_sockaddr_un_sun_len in
+	true)
+		AC_DEFINE_UNQUOTED(HAVE_SOCKADDR_UN_SUN_LEN, 1,
+		                   [Have the sockaddr_un.sun_len member])
+		;;
+	*)
+		;;
+esac
+
+GAIL_INET_LIBS="$LIBS"
+AC_SUBST([GAIL_INET_LIBS])
+
+LIBS="$old_LIBS"
+
 ################################################################
 # Printing system checks
 ################################################################
@@ -1526,13 +1468,19 @@ 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 \
+    if test $CUPS_API_MAJOR -gt 1 -o \
-            $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 7; then
+            $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 2; then
-      AC_MSG_ERROR([CUPS >= 1.7 not found])
+      AC_MSG_ERROR([CUPS >= 1.2 not found])
+    fi
+    if test $CUPS_API_MAJOR -gt 1 -o \
+	    $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6; then
+      AC_DEFINE(HAVE_CUPS_API_1_6, 1,
+                [Define to 1 if CUPS 1.6 API is available])
+      have_cups_api_1_6=yes
     fi
 
     AC_SUBST(CUPS_API_MAJOR)
@@ -1545,6 +1493,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
 
@@ -1726,6 +1690,15 @@ if test "$have_colord" = "yes"; then
 fi
 AM_CONDITIONAL(HAVE_COLORD, test "x$have_colord" = "xyes")
 
+##################################################
+# Check for harfbuzz and pangoft2
+##################################################
+
+PKG_CHECK_MODULES(FONTDEMO, harfbuzz >= 0.9 pangoft2, build_font_demo=yes, build_font_demo=no)
+AC_SUBST(FONTDEMO_CFLAGS)
+AC_SUBST(FONTDEMO_LIBS)
+AM_CONDITIONAL(BUILD_FONT_DEMO, [ test "x$build_font_demo" = xyes ])
+
 ##################################################
 # Checks for gtk-doc and docbook-tools
 ##################################################
@@ -1807,7 +1780,7 @@ case "$host" in
     SAVED_CFLAGS="${CFLAGS}"
     CFLAGS="-fvisibility=hidden"
     AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
-    AC_TRY_COMPILE([], [return 0],
+    AC_TRY_COMPILE([], [int main (void) { return 0; }],
                    AC_MSG_RESULT(yes)
                    enable_fvisibility_hidden=yes,
                    AC_MSG_RESULT(no)
@@ -1823,14 +1796,6 @@ case "$host" in
 esac
 AC_SUBST(GDK_HIDDEN_VISIBILITY_CFLAGS)
 
-##################################################
-# Theming
-##################################################
-
-AC_PATH_PROG([SASSC], [sassc])
-AC_ARG_VAR(SASSC)
-AM_CONDITIONAL([REBUILD_SCSS], [test "x$SASSC" != x])
-
 ##################################################
 # Output commands
 ##################################################
@@ -1888,7 +1853,8 @@ AC_ARG_ENABLE(Bsymbolic,
               [SAVED_LDFLAGS="${LDFLAGS}"
                AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
                LDFLAGS=-Wl,-Bsymbolic-functions
-               AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[return 0]])],
+               AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
+                                               [[int main (void) { return 0; }]])],
                               [AC_MSG_RESULT(yes)
                                enable_Bsymbolic=yes],
                               [AC_MSG_RESULT(no)
@@ -1900,13 +1866,6 @@ if test "x${enable_Bsymbolic}" = "xyes" ; then
 fi
 AC_SUBST(GTK_LINK_FLAGS)
 
-dnl
-dnl Check whether MSVC toolset is explicitly set
-dnl
-
-AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x])
-AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x])
-
 AC_CONFIG_FILES([
 README
 INSTALL
@@ -1957,13 +1916,12 @@ docs/reference/gdk/version.xml
 docs/reference/gtk/Makefile
 docs/reference/gtk/gtk3.types
 docs/reference/gtk/version.xml
-docs/reference/gtk/getting_started.xml
 docs/reference/libgail-util/Makefile
 docs/reference/libgail-util/version.xml
 docs/tools/Makefile
 build/Makefile
+build/gtk-introspection-msvc.mak
 build/win32/Makefile
-build/win32/config-msvc.mak
 build/win32/vs9/Makefile
 build/win32/vs9/gtk3-version-paths.vsprops
 build/win32/vs10/Makefile
@@ -1971,8 +1929,6 @@ build/win32/vs10/gtk3-version-paths.props
 build/win32/vs11/Makefile
 build/win32/vs12/Makefile
 build/win32/vs14/Makefile
-build/win32/vs15/Makefile
-build/win32/vs16/Makefile
 gdk/Makefile
 gdk/broadway/Makefile
 gdk/x11/Makefile
@@ -2021,4 +1977,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,4 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = gtk-demo widget-factory icon-browser
 
-EXTRA_DIST = \
-	meson.build
-
 -include $(top_srcdir)/git.mk

demos/gtk-demo/Makefile.am

@@ -1,16 +1,83 @@
 ## Makefile.am for gtk+/demos
 include $(top_srcdir)/Makefile.decl
 
-include $(srcdir)/Makefile.inc
+## These should be in the order you want them to appear in the
+## demo app, which means alphabetized by demo title, not filename
+demos_base =					\
+	application_demo.c			\
+	assistant.c				\
+	builder.c				\
+	button_box.c				\
+	changedisplay.c				\
+	clipboard.c				\
+	colorsel.c				\
+	combobox.c				\
+	css_accordion.c                         \
+	css_basics.c				\
+	css_multiplebgs.c			\
+	css_pixbufs.c				\
+	css_shadows.c				\
+	cursors.c				\
+	dialog.c				\
+	drawingarea.c				\
+	editable_cells.c			\
+	entry_buffer.c				\
+	entry_completion.c			\
+	event_axes.c				\
+	expander.c  				\
+        filtermodel.c				\
+	foreigndrawing.c			\
+	gestures.c				\
+	glarea.c				\
+	headerbar.c				\
+	hypertext.c				\
+	iconview.c				\
+	iconview_edit.c				\
+	images.c				\
+	infobar.c				\
+	links.c					\
+	listbox.c				\
+	flowbox.c				\
+	list_store.c				\
+	markup.c				\
+	menus.c					\
+	modelbutton.c				\
+	offscreen_window.c			\
+	offscreen_window2.c			\
+	overlay.c				\
+	overlay2.c				\
+	panes.c					\
+	pickers.c				\
+	pixbufs.c				\
+	popover.c				\
+	printing.c				\
+	revealer.c				\
+	rotated_text.c				\
+	scale.c					\
+	search_entry.c				\
+	search_entry2.c				\
+	shortcuts.c				\
+	sidebar.c				\
+	sizegroup.c				\
+	spinbutton.c				\
+	spinner.c				\
+	stack.c					\
+	textmask.c				\
+	textview.c				\
+	textscroll.c				\
+	theming_style_classes.c			\
+	toolpalette.c				\
+	transparent.c				\
+	tree_store.c
 
 demos_opt =
 
 if BUILD_FONT_DEMO
-demos_opt += $(font_features_demo)
+demos_opt += font_features.c
 endif
 
 if OS_UNIX
-demos_opt += $(page_setup_demo)
+demos_opt += pagesetup.c
 endif
 
 demos = $(demos_base) $(demos_opt)
@@ -33,6 +100,11 @@ LDADDS = \
 	$(GDK_DEP_LIBS)				\
 	-lm
 
+if BUILD_FONT_DEMO
+AM_CPPFLAGS += $(FONTDEMO_CFLAGS)
+LDADDS += $(FONTDEMO_LIBS)
+endif
+
 bin_PROGRAMS = gtk3-demo gtk3-demo-application
 
 desktopdir = $(datadir)/applications
@@ -46,9 +118,7 @@ EXTRA_DIST += 				\
 	demo.gresource.xml		\
 	$(resource_files)		\
 	org.gtk.Demo.gschema.xml	\
-	demos.h.win32	\
+	demos.h.win32
-	meson.build	\
-	geninclude.py
 
 gsettings_SCHEMAS = \
 	org.gtk.Demo.gschema.xml
@@ -65,8 +135,6 @@ nodist_gtk3_demo_SOURCES = demos.h
 
 gtk3_demo_SOURCES = 		\
 	$(demos)		\
-	gtkfishbowl.c		\
-	gtkfishbowl.h		\
 	demo_resources.c	\
 	main.c
 
@@ -80,7 +148,7 @@ gtk3_demo_application_SOURCES = \
 
 gtk3_demo_application_LDADD = $(LDADDS)
 
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/demo.gresource.xml)
+resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/demo.gresource.xml)
 
 demo_resources.c: demo.gresource.xml $(resource_files)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/demo.gresource.xml

demos/gtk-demo/Makefile.inc

@@ -1,75 +0,0 @@
-## These should be in the order you want them to appear in the
-## demo app, which means alphabetized by demo title, not filename
-demos_base =					\
-	application_demo.c			\
-	assistant.c				\
-	builder.c				\
-	button_box.c				\
-	changedisplay.c				\
-	clipboard.c				\
-	colorsel.c				\
-	combobox.c				\
-	css_accordion.c                         \
-	css_basics.c				\
-	css_blendmodes.c			\
-	css_multiplebgs.c			\
-	css_pixbufs.c				\
-	css_shadows.c				\
-	cursors.c				\
-	dialog.c				\
-	drawingarea.c				\
-	editable_cells.c			\
-	entry_buffer.c				\
-	entry_completion.c			\
-	event_axes.c				\
-	expander.c  				\
-        filtermodel.c				\
-	fishbowl.c				\
-	foreigndrawing.c			\
-	gestures.c				\
-	glarea.c				\
-	headerbar.c				\
-	hypertext.c				\
-	iconview.c				\
-	iconview_edit.c				\
-	images.c				\
-	infobar.c				\
-	links.c					\
-	listbox.c				\
-	flowbox.c				\
-	list_store.c				\
-	markup.c				\
-	menus.c					\
-	modelbutton.c				\
-	offscreen_window.c			\
-	offscreen_window2.c			\
-	overlay.c				\
-	overlay2.c				\
-	paint.c					\
-	panes.c					\
-	pickers.c				\
-	pixbufs.c				\
-	popover.c				\
-	printing.c				\
-	revealer.c				\
-	rotated_text.c				\
-	scale.c					\
-	search_entry.c				\
-	search_entry2.c				\
-	shortcuts.c				\
-	sidebar.c				\
-	sizegroup.c				\
-	spinbutton.c				\
-	spinner.c				\
-	stack.c					\
-	tabs.c					\
-	textmask.c				\
-	textview.c				\
-	textscroll.c				\
-	theming_style_classes.c			\
-	toolpalette.c				\
-	transparent.c				\
-	tree_store.c
-
-font_features_demo = font_features.c
-page_setup_demo = pagesetup.c

demos/gtk-demo/blendmodes.ui

@@ -1,392 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="3.20"/>
-  <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
-    <property name="resizable">False</property>
-    <property name="title">CSS Blend Modes</property>
-    <property name="default_width">400</property>
-    <property name="default_height">300</property>
-    <child>
-      <object class="GtkGrid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="border_width">12</property>
-        <property name="row_spacing">12</property>
-        <property name="column_spacing">12</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Blend mode:</property>
-            <property name="xalign">0</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="vexpand">True</property>
-            <property name="shadow_type">in</property>
-            <property name="min_content_width">150</property>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkStackSwitcher">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">center</property>
-            <property name="hexpand">True</property>
-            <property name="stack">stack</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkStack" id="stack">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="hhomogeneous">False</property>
-            <property name="vhomogeneous">False</property>
-            <property name="transition_type">crossfade</property>
-            <child>
-              <object class="GtkGrid">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="hexpand">False</property>
-                <property name="vexpand">True</property>
-                <property name="row_spacing">12</property>
-                <property name="column_spacing">12</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Duck</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Background</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <style>
-                      <class name="duck"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <style>
-                      <class name="gradient"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">
-Blended picture</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">center</property>
-                    <style>
-                      <class name="blend0"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="name">page0</property>
-                <property name="title" translatable="yes">Ducky</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkGrid">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="hexpand">False</property>
-                <property name="vexpand">True</property>
-                <property name="row_spacing">12</property>
-                <property name="column_spacing">12</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Red</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Blue</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <style>
-                      <class name="red"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <style>
-                      <class name="blue"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">
-Blended picture</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">center</property>
-                    <style>
-                      <class name="blend1"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="name">page1</property>
-                <property name="title" translatable="yes">Blends</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkGrid">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">12</property>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <style>
-                      <class name="cyan"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <style>
-                      <class name="magenta"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <style>
-                      <class name="yellow"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">center</property>
-                    <style>
-                      <class name="blend2"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Cyan</property>
-                    <property name="xalign">0</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Magenta</property>
-                    <property name="xalign">0</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Yellow</property>
-                    <property name="xalign">0</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Blended picture</property>
-                    <property name="xalign">0</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="name">page2</property>
-                <property name="title" translatable="yes">CMYK</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
-  </object>
-</interface>

demos/gtk-demo/changedisplay.c

@@ -151,7 +151,7 @@ query_for_toplevel (GdkScreen  *screen,
 
   g_object_unref (cursor);
   gtk_widget_destroy (popup);
-  gdk_display_flush (display);                 /* Really release the grab */
+  gdk_flush ();                 /* Really release the grab */
 
   return toplevel;
 }

demos/gtk-demo/clipboard.c

@@ -193,7 +193,7 @@ button_press (GtkWidget      *widget,
   gtk_widget_show (item);
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 
-  gtk_menu_popup_at_pointer (GTK_MENU (menu), (GdkEvent *) button);
+  gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 3, button->time);
   return TRUE;
 }
 

demos/gtk-demo/combobox.c

@@ -144,7 +144,7 @@ create_capital_store (void)
     { NULL, "Jackson" },
     { NULL, "Jefferson City" },
     { NULL, "Juneau" },
-    { "K - O", NULL },
+    { "K - O" },
     { NULL, "Lansing" },
     { NULL, "Lincoln" },
     { NULL, "Little Rock" },
@@ -154,7 +154,7 @@ create_capital_store (void)
     { NULL, "Nashville" },
     { NULL, "Oklahoma City" },
     { NULL, "Olympia" },
-    { "P - S", NULL },
+    { NULL, "P - S" },
     { NULL, "Phoenix" },
     { NULL, "Pierre" },
     { NULL, "Providence" },

demos/gtk-demo/css_accordion.c

@@ -1,4 +1,4 @@
-/* Theming/CSS Accordion
+/* CSS Theming/CSS Accordion
  *
  * A simple accordion demo written using CSS transitions and multiple backgrounds
  *

demos/gtk-demo/css_accordion.css

@@ -4,7 +4,7 @@
     transition-property: color, background-color, border-color, background-image, padding, border-width;
     transition-duration: 1s;
 
-    font: 20px Cantarell;
+    font: Cantarell 20px;
 }
 
 window {

demos/gtk-demo/css_basics.c

@@ -1,4 +1,4 @@
-/* Theming/CSS Basics
+/* CSS Theming/CSS Basics
  *
  * Gtk themes are written using CSS. Every widget is build of multiple items
  * that you can style very similarly to a regular website.

demos/gtk-demo/css_blendmodes.c

@@ -1,146 +0,0 @@
-/* Theming/CSS Blend Modes
- *
- * You can blend multiple backgrounds using the CSS blend modes available.
- */
-
-#include <gtk/gtk.h>
-
-#define WID(x) ((GtkWidget*) gtk_builder_get_object (builder, x))
-
-/*
- * These are the available blend modes.
- */
-struct {
-  gchar *name;
-  gchar *id;
-} blend_modes[] =
-{
-  { "Color", "color" },
-  { "Color (burn)", "color-burn" },
-  { "Color (dodge)", "color-dodge" },
-  { "Darken", "darken" },
-  { "Difference", "difference" },
-  { "Exclusion", "exclusion" },
-  { "Hard Light", "hard-light" },
-  { "Hue", "hue" },
-  { "Lighten", "lighten" },
-  { "Luminosity", "luminosity" },
-  { "Multiply", "multiply" },
-  { "Normal", "normal" },
-  { "Overlay", "overlay" },
-  { "Saturate", "saturate" },
-  { "Screen", "screen" },
-  { "Soft Light", "soft-light" },
-  { NULL }
-};
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-static void
-update_css_for_blend_mode (GtkCssProvider *provider,
-                           const gchar    *blend_mode)
-{
-  GBytes *bytes;
-  gchar *css;
-
-  bytes = g_resources_lookup_data ("/css_blendmodes/css_blendmodes.css", 0, NULL);
-
-  css = g_strdup_printf ((gchar*) g_bytes_get_data (bytes, NULL),
-                         blend_mode,
-                         blend_mode,
-                         blend_mode);
-
-  gtk_css_provider_load_from_data (provider, css, -1, NULL);
-
-  g_bytes_unref (bytes);
-  g_free (css);
-}
-#pragma GCC diagnostic pop
-
-static void
-row_activated (GtkListBox     *listbox,
-               GtkListBoxRow  *row,
-               GtkCssProvider *provider)
-{
-  const gchar *blend_mode;
-
-  blend_mode = blend_modes[gtk_list_box_row_get_index (row)].id;
-
-  update_css_for_blend_mode (provider, blend_mode);
-}
-
-static void
-setup_listbox (GtkBuilder       *builder,
-               GtkStyleProvider *provider)
-{
-  GtkWidget *normal_row;
-  GtkWidget *listbox;
-  gint i;
-
-  normal_row = NULL;
-  listbox = gtk_list_box_new ();
-  gtk_container_add (GTK_CONTAINER (WID ("scrolledwindow")), listbox);
-
-  g_signal_connect (listbox, "row-activated", G_CALLBACK (row_activated), provider);
-
-  /* Add a row for each blend mode available */
-  for (i = 0; blend_modes[i].name != NULL; i++)
-    {
-      GtkWidget *label;
-      GtkWidget *row;
-
-      row = gtk_list_box_row_new ();
-      label = g_object_new (GTK_TYPE_LABEL,
-                            "label", blend_modes[i].name,
-                            "xalign", 0.0,
-                            NULL);
-
-      gtk_container_add (GTK_CONTAINER (row), label);
-
-      gtk_container_add (GTK_CONTAINER (listbox), row);
-
-      /* The first selected row is "normal" */
-      if (g_strcmp0 (blend_modes[i].id, "normal") == 0)
-        normal_row = row;
-    }
-
-  /* Select the "normal" row */
-  gtk_list_box_select_row (GTK_LIST_BOX (listbox), GTK_LIST_BOX_ROW (normal_row));
-  g_signal_emit_by_name (G_OBJECT (normal_row), "activate");
-
-  gtk_widget_grab_focus (normal_row);
-}
-
-GtkWidget *
-do_css_blendmodes (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkStyleProvider *provider;
-      GtkBuilder *builder;
-
-      builder = gtk_builder_new_from_resource ("/css_blendmodes/blendmodes.ui");
-
-      window = WID ("window");
-      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
-
-      /* Setup the CSS provider for window */
-      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
-
-      gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
-                                                 provider,
-                                                 GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-
-      setup_listbox (builder, provider);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/css_blendmodes.css

@@ -1,77 +0,0 @@
-/*
- * First page.
- */
-image.duck {
-    background-image: url('resource://css_blendmodes/ducky.png');
-    background-size: cover;
-    min-width: 200px;
-    min-height: 200px;
-}
-
-image.gradient {
-    background-image: linear-gradient(to right, red 0%%, green 50%%, blue 100%%);
-    min-width: 200px;
-    min-height: 200px;
-}
-
-/*
- * Second page.
- */
-image.red {
-    background: url('resource://css_blendmodes/blends.png') top center;
-    min-width: 200px;
-    min-height: 200px;
-}
-
-image.blue {
-    background: url('resource://css_blendmodes/blends.png') bottom center;
-    min-width: 200px;
-    min-height: 200px;
-}
-
-/*
- * Third page.
- */
-image.cyan {
-    background: url('resource://css_blendmodes/cmy.jpg') top center;
-    min-width: 200px;
-    min-height: 200px;
-}
-
-image.magenta {
-    background: url('resource://css_blendmodes/cmy.jpg') center center;
-    min-width: 200px;
-    min-height: 200px;
-}
-
-image.yellow {
-    background: url('resource://css_blendmodes/cmy.jpg') bottom center;
-    min-width: 200px;
-    min-height: 200px;
-}
-
-image.blend0 {
-  background-image: url('resource://css_blendmodes/ducky.png'),
-                    linear-gradient(to right, red 0%%, green 50%%, blue 100%%);
-  background-size: cover;
-  background-blend-mode: %s;
-  min-width: 200px;
-  min-height: 200px;
-}
-
-image.blend1 {
-  background: url('resource://css_blendmodes/blends.png') top center,
-              url('resource://css_blendmodes/blends.png') bottom center;
-  background-blend-mode: %s;
-  min-width: 200px;
-  min-height: 200px;
-}
-
-image.blend2 {
-  background: url('resource://css_blendmodes/cmy.jpg') top center,
-              url('resource://css_blendmodes/cmy.jpg') center center,
-              url('resource://css_blendmodes/cmy.jpg') bottom center;
-  background-blend-mode: %s;
-  min-width: 200px;
-  min-height: 200px;
-}

demos/gtk-demo/css_multiplebgs.c

@@ -1,4 +1,4 @@
-/* Theming/Multiple Backgrounds
+/* CSS Theming/Multiple Backgrounds
  *
  * Gtk themes are written using CSS. Every widget is build of multiple items
  * that you can style very similarly to a regular website.

demos/gtk-demo/css_pixbufs.c

@@ -1,4 +1,4 @@
-/* Theming/Animated Backgrounds
+/* CSS Theming/Animated Backgrounds
  *
  * This demo is done in honour of the Pixbufs demo further down.
  * It is done exclusively with CSS as the background of the window.

demos/gtk-demo/css_shadows.c

@@ -1,4 +1,4 @@
-/* Theming/Shadows
+/* CSS Theming/Shadows
  *
  * This demo shows how to use CSS shadows.
  */

demos/gtk-demo/cssview.css

@@ -1,7 +1,7 @@
 /* Make the text editor has a nice style */
 .view {
   color: #2e3436;
-  font-family: Monospace;
+  font: Monospace;
   background-color: alpha(white, 0.30);
 }
 

demos/gtk-demo/demo.gresource.xml

@@ -20,13 +20,6 @@
     <file>css_basics.css</file>
     <file>reset.css</file>
   </gresource>
-  <gresource prefix="/css_blendmodes">
-    <file>css_blendmodes.css</file>
-    <file>blendmodes.ui</file>
-    <file>blends.png</file>
-    <file>ducky.png</file>
-    <file>cmy.jpg</file>
-  </gresource>
   <gresource prefix="/css_multiplebgs">
     <file>css_multiplebgs.css</file>
     <file>brick.png</file>
@@ -61,7 +54,6 @@
     <file>all_scroll_cursor.png</file>
     <file>cell_cursor.png</file>
     <file>col_resize_cursor.png</file>
-    <file>context_menu_cursor.png</file>
     <file>copy_cursor.png</file>
     <file>crosshair_cursor.png</file>
     <file>default_cursor.png</file>
@@ -94,11 +86,6 @@
     <file>zoom_in_cursor.png</file>
     <file>zoom_out_cursor.png</file>
   </gresource>
-  <gresource prefix="/fishbowl">
-    <file>fishbowl.ui</file>
-    <file>gtkfishbowl.c</file>
-    <file>gtkfishbowl.h</file>
-  </gresource>
   <gresource prefix="/iconview">
     <file preprocess="to-pixdata">gnome-fs-directory.png</file>
     <file preprocess="to-pixdata">gnome-fs-regular.png</file>
@@ -142,7 +129,6 @@
     <file>combobox.c</file>
     <file>css_accordion.c</file>
     <file>css_basics.c</file>
-    <file>css_blendmodes.c</file>
     <file>css_multiplebgs.c</file>
     <file>css_pixbufs.c</file>
     <file>css_shadows.c</file>
@@ -155,7 +141,6 @@
     <file>event_axes.c</file>
     <file>expander.c</file>
     <file>filtermodel.c</file>
-    <file>fishbowl.c</file>
     <file>flowbox.c</file>
     <file>foreigndrawing.c</file>
     <file>font_features.c</file>
@@ -177,7 +162,6 @@
     <file>offscreen_window2.c</file>
     <file>overlay.c</file>
     <file>overlay2.c</file>
-    <file>paint.c</file>
     <file>pagesetup.c</file>
     <file>panes.c</file>
     <file>pickers.c</file>
@@ -195,7 +179,6 @@
     <file>stack.c</file>
     <file>spinbutton.c</file>
     <file>spinner.c</file>
-    <file>tabs.c</file>
     <file>textview.c</file>
     <file>textscroll.c</file>
     <file>theming_style_classes.c</file>
@@ -216,10 +199,8 @@
     <file>popover.ui</file>
   </gresource>
   <gresource prefix="/glarea">
-    <file>glarea-gl.fs.glsl</file>
+    <file>glarea-fragment.glsl</file>
-    <file>glarea-gl.vs.glsl</file>
+    <file>glarea-vertex.glsl</file>
-    <file>glarea-gles.fs.glsl</file>
-    <file>glarea-gles.vs.glsl</file>
   </gresource>
   <gresource prefix="/font_features">
     <file>font-features.ui</file>

demos/gtk-demo/event_axes.c

@@ -1,12 +1,11 @@
-/* Touch and Drawing Tablets
+/* Event Axes
  *
  * Demonstrates advanced handling of event information from exotic
  * input devices.
  *
- * On one hand, this snippet demonstrates management of drawing tablets,
+ * On one hand, this snippet demonstrates management of input axes,
  * those contain additional information for the pointer other than
- * X/Y coordinates. Tablet pads events are mapped to actions, which
+ * X/Y coordinates.
- * are both defined and interpreted by the application.
  *
  * Input axes are dependent on hardware devices, on linux/unix you
  * can see the device axes through xinput list <device>. Each time
@@ -21,20 +20,18 @@
  * touchpoints can be tracked.
  */
 
-#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
 typedef struct {
   GdkDevice *last_source;
-  GdkDeviceTool *last_tool;
+  GHashTable *axes; /* axis label atom -> value */
-  gdouble *axes;
   GdkRGBA color;
   gdouble x;
   gdouble y;
 } AxesInfo;
 
 typedef struct {
-  GHashTable *pointer_info; /* GdkDevice -> AxesInfo */
+  AxesInfo *pointer_info;
   GHashTable *touch_info; /* GdkEventSequence -> AxesInfo */
 } EventData;
 
@@ -53,30 +50,7 @@ const gchar *colors[] = {
   "burlywood"
 };
 
-static GtkPadActionEntry pad_actions[] = {
-  { GTK_PAD_ACTION_BUTTON, 1, -1, N_("Nuclear strike"), "pad.nuke" },
-  { GTK_PAD_ACTION_BUTTON, 2, -1, N_("Release siberian methane reserves"), "pad.heat" },
-  { GTK_PAD_ACTION_BUTTON, 3, -1, N_("Release solar flare"), "pad.fry" },
-  { GTK_PAD_ACTION_BUTTON, 4, -1, N_("De-stabilize Oort cloud"), "pad.fall" },
-  { GTK_PAD_ACTION_BUTTON, 5, -1, N_("Ignite WR-104"), "pad.burst" },
-  { GTK_PAD_ACTION_BUTTON, 6, -1, N_("Lart whoever asks about this button"), "pad.lart" },
-  { GTK_PAD_ACTION_RING, -1, -1, N_("Earth axial tilt"), "pad.tilt" },
-  { GTK_PAD_ACTION_STRIP, -1, -1, N_("Extent of weak nuclear force"), "pad.dissolve" },
-};
-
-static const gchar *pad_action_results[] = {
-  "☢",
-  "♨",
-  "☼",
-  "☄",
-  "⚡",
-  "💫",
-  "◑",
-  "⚛"
-};
-
 static guint cur_color = 0;
-static guint pad_action_timeout_id = 0;
 
 static AxesInfo *
 axes_info_new (void)
@@ -85,22 +59,51 @@ axes_info_new (void)
 
   info = g_new0 (AxesInfo, 1);
   gdk_rgba_parse (&info->color, colors[cur_color]);
+  info->axes = g_hash_table_new_full (NULL, NULL, NULL,
+                                      (GDestroyNotify) g_free);
 
   cur_color = (cur_color + 1) % G_N_ELEMENTS (colors);
 
   return info;
 }
 
+static void
+axes_info_free (AxesInfo *info)
+{
+  g_hash_table_destroy (info->axes);
+  g_free (info);
+}
+
+static gboolean
+axes_info_lookup (AxesInfo    *info,
+                  const gchar *axis_label,
+                  gdouble     *value)
+{
+  gdouble *val;
+  GdkAtom atom;
+
+  atom = gdk_atom_intern (axis_label, FALSE);
+
+  if (atom == GDK_NONE)
+    return FALSE;
+
+  val = g_hash_table_lookup (info->axes, GDK_ATOM_TO_POINTER (atom));
+
+  if (!val)
+    return FALSE;
+
+  *value = *val;
+  return TRUE;
+}
+
 static EventData *
 event_data_new (void)
 {
   EventData *data;
 
   data = g_new0 (EventData, 1);
-  data->pointer_info = g_hash_table_new_full (NULL, NULL, NULL,
-                                              (GDestroyNotify) g_free);
   data->touch_info = g_hash_table_new_full (NULL, NULL, NULL,
-                                            (GDestroyNotify) g_free);
+                                            (GDestroyNotify) axes_info_free);
 
   return data;
 }
@@ -108,7 +111,8 @@ event_data_new (void)
 static void
 event_data_free (EventData *data)
 {
-  g_hash_table_destroy (data->pointer_info);
+  if (data->pointer_info)
+    axes_info_free (data->pointer_info);
   g_hash_table_destroy (data->touch_info);
   g_free (data);
 }
@@ -119,14 +123,13 @@ update_axes_from_event (GdkEvent  *event,
 {
   GdkDevice *device, *source_device;
   GdkEventSequence *sequence;
-  GdkDeviceTool *tool;
+  gdouble x, y, value;
-  gdouble x, y;
+  GList *l, *axes;
   AxesInfo *info;
 
   device = gdk_event_get_device (event);
   source_device = gdk_event_get_source_device (event);
   sequence = gdk_event_get_event_sequence (event);
-  tool = gdk_event_get_device_tool (event);
 
   if (event->type == GDK_TOUCH_END ||
       event->type == GDK_TOUCH_CANCEL)
@@ -136,19 +139,17 @@ update_axes_from_event (GdkEvent  *event,
     }
   else if (event->type == GDK_LEAVE_NOTIFY)
     {
-      g_hash_table_remove (data->pointer_info, device);
+      if (data->pointer_info)
+        axes_info_free (data->pointer_info);
+      data->pointer_info = NULL;
       return;
     }
 
   if (!sequence)
     {
-      info = g_hash_table_lookup (data->pointer_info, device);
+      if (!data->pointer_info)
-
+        data->pointer_info = axes_info_new ();
-      if (!info)
+      info = data->pointer_info;
-        {
-          info = axes_info_new ();
-          g_hash_table_insert (data->pointer_info, device, info);
-        }
     }
   else
     {
@@ -162,31 +163,41 @@ update_axes_from_event (GdkEvent  *event,
     }
 
   if (info->last_source != source_device)
-    info->last_source = source_device;
+    {
-
+      g_hash_table_remove_all (info->axes);
-  if (info->last_tool != tool)
+      info->last_source = source_device;
-    info->last_tool = tool;
+    }
-
-  g_clear_pointer (&info->axes, g_free);
 
   if (event->type == GDK_TOUCH_BEGIN ||
-      event->type == GDK_TOUCH_UPDATE)
+      event->type == GDK_TOUCH_UPDATE ||
+      event->type == GDK_MOTION_NOTIFY ||
+      event->type == GDK_BUTTON_PRESS ||
+      event->type == GDK_BUTTON_RELEASE)
     {
+      axes = gdk_device_list_axes (device);
+
       if (sequence && event->touch.emulating_pointer)
-        g_hash_table_remove (data->pointer_info, device);
+        {
-    }
+          if (data->pointer_info)
-  if (event->type == GDK_MOTION_NOTIFY)
+            axes_info_free (data->pointer_info);
-    {
+          data->pointer_info = NULL;
-      info->axes =
+        }
-      g_memdup (event->motion.axes,
+
-                sizeof (gdouble) * gdk_device_get_n_axes (source_device));
+      for (l = axes; l; l = l->next)
-    }
+        {
-  else if (event->type == GDK_BUTTON_PRESS ||
+          gdouble *ptr;
-           event->type == GDK_BUTTON_RELEASE)
+
-    {
+          /* All those event types are compatible wrt axes position in the struct */
-      info->axes =
+          if (!gdk_device_get_axis_value (device, event->motion.axes,
-      g_memdup (event->button.axes,
+                                          l->data, &value))
-                sizeof (gdouble) * gdk_device_get_n_axes (source_device));
+            continue;
+
+          ptr = g_new0 (gdouble, 1);
+          *ptr = value;
+          g_hash_table_insert (info->axes, GDK_ATOM_TO_POINTER (l->data), ptr);
+        }
+
+      g_list_free (axes);
     }
 
   if (gdk_event_get_coords (event, &x, &y))
@@ -231,8 +242,7 @@ draw_axes_info (cairo_t       *cr,
                 AxesInfo      *info,
                 GtkAllocation *allocation)
 {
-  gdouble pressure, tilt_x, tilt_y, distance, wheel, rotation, slider;
+  gdouble pressure, tilt_x, tilt_y, wheel;
-  GdkAxisFlags axes = gdk_device_get_axes (info->last_source);
 
   cairo_save (cr);
 
@@ -247,19 +257,10 @@ draw_axes_info (cairo_t       *cr,
 
   cairo_translate (cr, info->x, info->y);
 
-  if (!info->axes)
+  if (axes_info_lookup (info, "Abs Pressure", &pressure))
-    {
-      cairo_restore (cr);
-      return;
-    }
-
-  if (axes & GDK_AXIS_FLAG_PRESSURE)
     {
       cairo_pattern_t *pattern;
 
-      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_PRESSURE,
-                           &pressure);
-
       pattern = cairo_pattern_create_radial (0, 0, 0, 0, 0, 100);
       cairo_pattern_add_color_stop_rgba (pattern, pressure, 1, 0, 0, pressure);
       cairo_pattern_add_color_stop_rgba (pattern, 1, 0, 0, 1, 0);
@@ -272,49 +273,12 @@ draw_axes_info (cairo_t       *cr,
       cairo_pattern_destroy (pattern);
     }
 
-  if (axes & GDK_AXIS_FLAG_XTILT &&
+  if (axes_info_lookup (info, "Abs Tilt X", &tilt_x) &&
-      axes & GDK_AXIS_FLAG_YTILT)
+      axes_info_lookup (info, "Abs Tilt Y", &tilt_y))
+    render_arrow (cr, tilt_x * 100, tilt_y * 100, "Tilt");
+
+  if (axes_info_lookup (info, "Abs Wheel", &wheel))
     {
-      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_XTILT,
-                           &tilt_x);
-      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_YTILT,
-                           &tilt_y);
-
-      render_arrow (cr, tilt_x * 100, tilt_y * 100, "Tilt");
-    }
-
-  if (axes & GDK_AXIS_FLAG_DISTANCE)
-    {
-      double dashes[] = { 5.0, 5.0 };
-      cairo_text_extents_t extents;
-
-      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_DISTANCE,
-                           &distance);
-
-      cairo_save (cr);
-
-      cairo_move_to (cr, distance * 100, 0);
-
-      cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
-      cairo_set_dash (cr, dashes, 2, 0.0);
-      cairo_arc (cr, 0, 0, distance * 100, 0, 2 * G_PI);
-      cairo_stroke (cr);
-
-      cairo_move_to (cr, 0, -distance * 100);
-      cairo_text_extents (cr, "Distance", &extents);
-      cairo_rel_move_to (cr, -extents.width / 2, 0);
-      cairo_show_text (cr, "Distance");
-
-      cairo_move_to (cr, 0, 0);
-
-      cairo_restore (cr);
-    }
-
-  if (axes & GDK_AXIS_FLAG_WHEEL)
-    {
-      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_WHEEL,
-                           &wheel);
-
       cairo_save (cr);
       cairo_set_line_width (cr, 10);
       cairo_set_source_rgba (cr, 0, 0, 0, 0.5);
@@ -325,88 +289,9 @@ draw_axes_info (cairo_t       *cr,
       cairo_restore (cr);
     }
 
-  if (axes & GDK_AXIS_FLAG_ROTATION)
-    {
-      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_ROTATION,
-                           &rotation);
-      rotation *= 2 * G_PI;
-
-      cairo_save (cr);
-      cairo_rotate (cr, - G_PI / 2);
-      cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
-      cairo_set_line_width (cr, 5);
-
-      cairo_new_sub_path (cr);
-      cairo_arc (cr, 0, 0, 100, 0, rotation);
-      cairo_stroke (cr);
-      cairo_restore (cr);
-    }
-
-  if (axes & GDK_AXIS_FLAG_SLIDER)
-    {
-      cairo_pattern_t *pattern, *mask;
-
-      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_SLIDER,
-                           &slider);
-
-      cairo_save (cr);
-
-      cairo_move_to (cr, 0, -10);
-      cairo_rel_line_to (cr, 0, -50);
-      cairo_rel_line_to (cr, 10, 0);
-      cairo_rel_line_to (cr, -5, 50);
-      cairo_close_path (cr);
-
-      cairo_clip_preserve (cr);
-
-      pattern = cairo_pattern_create_linear (0, -10, 0, -60);
-      cairo_pattern_add_color_stop_rgb (pattern, 0, 0, 1, 0);
-      cairo_pattern_add_color_stop_rgb (pattern, 1, 1, 0, 0);
-      cairo_set_source (cr, pattern);
-      cairo_pattern_destroy (pattern);
-
-      mask = cairo_pattern_create_linear (0, -10, 0, -60);
-      cairo_pattern_add_color_stop_rgba (mask, 0, 0, 0, 0, 1);
-      cairo_pattern_add_color_stop_rgba (mask, slider, 0, 0, 0, 1);
-      cairo_pattern_add_color_stop_rgba (mask, slider, 0, 0, 0, 0);
-      cairo_pattern_add_color_stop_rgba (mask, 1, 0, 0, 0, 0);
-      cairo_mask (cr, mask);
-      cairo_pattern_destroy (mask);
-
-      cairo_set_source_rgb (cr, 0, 0, 0);
-      cairo_stroke (cr);
-
-      cairo_restore (cr);
-    }
-
   cairo_restore (cr);
 }
 
-static const gchar *
-tool_type_to_string (GdkDeviceToolType tool_type)
-{
-  switch (tool_type)
-    {
-    case GDK_DEVICE_TOOL_TYPE_PEN:
-      return "Pen";
-    case GDK_DEVICE_TOOL_TYPE_ERASER:
-      return "Eraser";
-    case GDK_DEVICE_TOOL_TYPE_BRUSH:
-      return "Brush";
-    case GDK_DEVICE_TOOL_TYPE_PENCIL:
-      return "Pencil";
-    case GDK_DEVICE_TOOL_TYPE_AIRBRUSH:
-      return "Airbrush";
-    case GDK_DEVICE_TOOL_TYPE_MOUSE:
-      return "Mouse";
-    case GDK_DEVICE_TOOL_TYPE_LENS:
-      return "Lens cursor";
-    case GDK_DEVICE_TOOL_TYPE_UNKNOWN:
-    default:
-      return "Unknown";
-    }
-}
-
 static void
 draw_device_info (GtkWidget        *widget,
                   cairo_t          *cr,
@@ -428,19 +313,6 @@ draw_device_info (GtkWidget        *widget,
     g_string_append_printf (string, "\nSequence: %d",
                             GPOINTER_TO_UINT (sequence));
 
-  if (info->last_tool)
-    {
-      const gchar *tool_type;
-      guint64 serial;
-
-      tool_type = tool_type_to_string (gdk_device_tool_get_tool_type (info->last_tool));
-      serial = gdk_device_tool_get_serial (info->last_tool);
-      g_string_append_printf (string, "\nTool: %s", tool_type);
-
-      if (serial != 0)
-        g_string_append_printf (string, ", Serial: %lx", serial);
-    }
-
   cairo_move_to (cr, 10, *y);
   layout = gtk_widget_create_pango_layout (widget, string->str);
   pango_cairo_show_layout (cr, layout);
@@ -469,7 +341,7 @@ draw_cb (GtkWidget *widget,
 {
   EventData *data = user_data;
   GtkAllocation allocation;
-  AxesInfo *info;
+  AxesInfo *touch_info;
   GHashTableIter iter;
   gpointer key, value;
   gint y = 0;
@@ -477,144 +349,38 @@ draw_cb (GtkWidget *widget,
   gtk_widget_get_allocation (widget, &allocation);
 
   /* Draw Abs info */
-  g_hash_table_iter_init (&iter, data->pointer_info);
+  if (data->pointer_info)
-
+    draw_axes_info (cr, data->pointer_info, &allocation);
-  while (g_hash_table_iter_next (&iter, NULL, &value))
-    {
-      info = value;
-      draw_axes_info (cr, info, &allocation);
-    }
 
   g_hash_table_iter_init (&iter, data->touch_info);
 
   while (g_hash_table_iter_next (&iter, NULL, &value))
     {
-      info = value;
+      touch_info = value;
-      draw_axes_info (cr, info, &allocation);
+      draw_axes_info (cr, touch_info, &allocation);
     }
 
   /* Draw name, color legend and misc data */
-  g_hash_table_iter_init (&iter, data->pointer_info);
+  if (data->pointer_info)
-
+    draw_device_info (widget, cr, NULL, &y, data->pointer_info);
-  while (g_hash_table_iter_next (&iter, NULL, &value))
-    {
-      info = value;
-      draw_device_info (widget, cr, NULL, &y, info);
-    }
 
   g_hash_table_iter_init (&iter, data->touch_info);
 
   while (g_hash_table_iter_next (&iter, &key, &value))
     {
-      info = value;
+      touch_info = value;
-      draw_device_info (widget, cr, key, &y, info);
+      draw_device_info (widget, cr, key, &y, touch_info);
     }
 
   return FALSE;
 }
 
-static void
-update_label_text (GtkWidget   *label,
-                   const gchar *text)
-{
-  gchar *markup = NULL;
-
-  if (text)
-    markup = g_strdup_printf ("<span font='48.0'>%s</span>", text);
-  gtk_label_set_markup (GTK_LABEL (label), markup);
-  g_free (markup);
-}
-
-static gboolean
-reset_label_text_timeout_cb (gpointer user_data)
-{
-  GtkWidget *label = user_data;
-
-  update_label_text (label, NULL);
-  pad_action_timeout_id = 0;
-  return G_SOURCE_REMOVE;
-}
-
-static void
-update_label_and_timeout (GtkWidget   *label,
-                          const gchar *text)
-{
-  if (pad_action_timeout_id)
-    g_source_remove (pad_action_timeout_id);
-
-  update_label_text (label, text);
-  pad_action_timeout_id = g_timeout_add (200, reset_label_text_timeout_cb, label);
-}
-
-static void
-on_action_activate (GSimpleAction *action,
-                    GVariant      *parameter,
-                    gpointer       user_data)
-{
-  GtkWidget *label = user_data;
-  const gchar *result;
-  gchar *str;
-
-  result = g_object_get_data (G_OBJECT (action), "action-result");
-
-  if (!parameter)
-    update_label_and_timeout (label, result);
-  else
-    {
-      str = g_strdup_printf ("%s %.2f", result, g_variant_get_double (parameter));
-      update_label_and_timeout (label, str);
-      g_free (str);
-    }
-}
-
-static void
-init_pad_controller (GtkWidget *window,
-                     GtkWidget *label)
-{
-  GtkPadController *pad_controller;
-  GSimpleActionGroup *action_group;
-  GSimpleAction *action;
-  gint i;
-
-  action_group = g_simple_action_group_new ();
-  pad_controller = gtk_pad_controller_new (GTK_WINDOW (window),
-                                           G_ACTION_GROUP (action_group),
-                                           NULL);
-
-  for (i = 0; i < G_N_ELEMENTS (pad_actions); i++)
-    {
-      if (pad_actions[i].type == GTK_PAD_ACTION_BUTTON)
-        {
-          action = g_simple_action_new (pad_actions[i].action_name, NULL);
-        }
-      else
-        {
-          action = g_simple_action_new_stateful (pad_actions[i].action_name,
-                                                 G_VARIANT_TYPE_DOUBLE, NULL);
-        }
-
-      g_signal_connect (action, "activate",
-                        G_CALLBACK (on_action_activate), label);
-      g_object_set_data (G_OBJECT (action), "action-result",
-                         (gpointer) pad_action_results[i]);
-      g_action_map_add_action (G_ACTION_MAP (action_group), G_ACTION (action));
-      g_object_unref (action);
-    }
-
-  gtk_pad_controller_set_action_entries (pad_controller, pad_actions,
-                                         G_N_ELEMENTS (pad_actions));
-  g_object_set_data_full (G_OBJECT (window), "pad-controller",
-                          pad_controller, g_object_unref);
-
-  g_object_unref (action_group);
-}
-
 GtkWidget *
 do_event_axes (GtkWidget *toplevel)
 {
   static GtkWidget *window = NULL;
   EventData *event_data;
-  GtkWidget *box, *label;
+  GtkWidget *box;
 
   if (!window)
     {
@@ -627,14 +393,11 @@ do_event_axes (GtkWidget *toplevel)
 
       box = gtk_event_box_new ();
       gtk_container_add (GTK_CONTAINER (window), box);
-      gtk_widget_set_support_multidevice (box, TRUE);
       gtk_widget_add_events (box,
 			     GDK_POINTER_MOTION_MASK |
 			     GDK_BUTTON_PRESS_MASK |
 			     GDK_BUTTON_RELEASE_MASK |
 			     GDK_SMOOTH_SCROLL_MASK |
-			     GDK_ENTER_NOTIFY_MASK |
-			     GDK_LEAVE_NOTIFY_MASK |
 			     GDK_TOUCH_MASK);
 
       event_data = event_data_new ();
@@ -645,12 +408,6 @@ do_event_axes (GtkWidget *toplevel)
                         G_CALLBACK (event_cb), event_data);
       g_signal_connect (box, "draw",
                         G_CALLBACK (draw_cb), event_data);
-
-      label = gtk_label_new ("");
-      gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-      gtk_container_add (GTK_CONTAINER (box), label);
-
-      init_pad_controller (window, label);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/filtermodel.c

@@ -6,7 +6,6 @@
  */
 
 #include <gtk/gtk.h>
-#include <stdlib.h>
 
 enum {
   WIDTH_COLUMN,
@@ -84,28 +83,6 @@ visible_func (GtkTreeModel *model,
   return width < 10;
 }
 
-static void
-cell_edited (GtkCellRendererSpin *cell,
-             const char          *path_string,
-             const char          *new_text,
-             GtkListStore        *store)
-{
-  int val;
-  GtkTreePath *path;
-  GtkTreeIter iter;
-  int column;
-
-  path = gtk_tree_path_new_from_string (path_string);
-  gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path);
-  gtk_tree_path_free (path);
-
-  column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (cell), "column"));
-
-  val = atoi (new_text);
-
-  gtk_list_store_set (store, &iter, column, val, -1);
-}
-
 GtkWidget *
 do_filtermodel (GtkWidget *do_widget)
 {
@@ -129,21 +106,15 @@ do_filtermodel (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
-      store = (GtkListStore*)gtk_builder_get_object (builder, "liststore1");
-
       column = (GtkTreeViewColumn*)gtk_builder_get_object (builder, "treeviewcolumn1");
       cell = (GtkCellRenderer*)gtk_builder_get_object (builder, "cellrenderertext1");
       gtk_tree_view_column_set_cell_data_func (column, cell,
                                                format_number, GINT_TO_POINTER (WIDTH_COLUMN), NULL);
-      g_object_set_data (G_OBJECT (cell), "column", GINT_TO_POINTER (WIDTH_COLUMN));
-      g_signal_connect (cell, "edited", G_CALLBACK (cell_edited), store);
 
       column = (GtkTreeViewColumn*)gtk_builder_get_object (builder, "treeviewcolumn2");
       cell = (GtkCellRenderer*)gtk_builder_get_object (builder, "cellrenderertext2");
       gtk_tree_view_column_set_cell_data_func (column, cell,
                                                format_number, GINT_TO_POINTER (HEIGHT_COLUMN), NULL);
-      g_object_set_data (G_OBJECT (cell), "column", GINT_TO_POINTER (HEIGHT_COLUMN));
-      g_signal_connect (cell, "edited", G_CALLBACK (cell_edited), store);
 
       column = (GtkTreeViewColumn*)gtk_builder_get_object (builder, "treeviewcolumn3");
       cell = (GtkCellRenderer*)gtk_builder_get_object (builder, "cellrenderertext3");
@@ -164,6 +135,7 @@ do_filtermodel (GtkWidget *do_widget)
       cell = (GtkCellRenderer*)gtk_builder_get_object (builder, "cellrendererpixbuf1");
       gtk_tree_view_column_add_attribute (column, cell, "visible", SQUARE_COLUMN);
 
+      store = (GtkListStore*)gtk_builder_get_object (builder, "liststore1");
       tree = (GtkWidget*)gtk_builder_get_object (builder, "treeview2");
 
       types[WIDTH_COLUMN] = G_TYPE_INT;

demos/gtk-demo/filtermodel.ui

@@ -24,12 +24,6 @@
       </row>
     </data>
   </object>
-  <object class="GtkAdjustment" id="adj">
-    <property name="lower">5</property>
-    <property name="upper">50</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">5</property>
-  </object>
   <object class="GtkWindow" id="window1">
     <property name="title" translatable="yes">Filter Model</property>
     <child>
@@ -69,10 +63,7 @@
               <object class="GtkTreeViewColumn" id="treeviewcolumn1">
                 <property name="title" translatable="yes">Width</property>
                 <child>
-                  <object class="GtkCellRendererSpin" id="cellrenderertext1">
+                  <object class="GtkCellRendererText" id="cellrenderertext1"/>
-                    <property name="editable">1</property>
-                    <property name="adjustment">adj</property>
-                  </object>
                 </child>
               </object>
             </child>
@@ -80,10 +71,7 @@
               <object class="GtkTreeViewColumn" id="treeviewcolumn2">
                 <property name="title" translatable="yes">Height</property>
                 <child>
-                  <object class="GtkCellRendererSpin" id="cellrenderertext2">
+                  <object class="GtkCellRendererText" id="cellrenderertext2"/>
-                    <property name="editable">1</property>
-                    <property name="adjustment">adj</property>
-                  </object>
                 </child>
               </object>
             </child>

demos/gtk-demo/fishbowl.c

@@ -1,269 +0,0 @@
-/* Benchmark/Fishbowl
- *
- * This demo models the fishbowl demos seen on the web in a GTK way.
- * It's also a neat little tool to see how fast your computer (or
- * your GTK version) is.
- */
-
-#include <gtk/gtk.h>
-
-#include "gtkfishbowl.h"
-
-const char *const css =
-".blurred-button {"
-"  box-shadow: 0px 0px 5px 10px rgba(0, 0, 0, 0.5);"
-"}"
-"";
-
-char **icon_names = NULL;
-gsize n_icon_names = 0;
-
-static void
-init_icon_names (GtkIconTheme *theme)
-{
-  GPtrArray *icons;
-  GList *l, *icon_list;
-
-  if (icon_names)
-    return;
-
-  icon_list = gtk_icon_theme_list_icons (theme, NULL);
-  icons = g_ptr_array_new ();
-
-  for (l = icon_list; l; l = l->next)
-    {
-      if (g_str_has_suffix (l->data, "symbolic"))
-        continue;
-
-      g_ptr_array_add (icons, g_strdup (l->data));
-    }
-
-  n_icon_names = icons->len;
-  g_ptr_array_add (icons, NULL); /* NULL-terminate the array */
-  icon_names = (char **) g_ptr_array_free (icons, FALSE);
-
-  /* don't free strings, we assigned them to the array */
-  g_list_free_full (icon_list, g_free);
-}
-
-static const char *
-get_random_icon_name (GtkIconTheme *theme)
-{
-  init_icon_names (theme);
-
-  return icon_names[g_random_int_range(0, n_icon_names)];
-}
-
-GtkWidget *
-create_icon (void)
-{
-  GtkWidget *image;
-
-  image = gtk_image_new_from_icon_name (get_random_icon_name (gtk_icon_theme_get_default ()), GTK_ICON_SIZE_DND);
-
-  return image;
-}
-
-static GtkWidget *
-create_button (void)
-{
-  return gtk_button_new_with_label ("Button");
-}
-
-static GtkWidget *
-create_blurred_button (void)
-{
-  GtkWidget *w = gtk_button_new ();
-
-  gtk_style_context_add_class (gtk_widget_get_style_context (w), "blurred-button");
-
-  return w;
-}
-
-static GtkWidget *
-create_font_button (void)
-{
-  return gtk_font_button_new ();
-}
-
-static GtkWidget *
-create_level_bar (void)
-{
-  GtkWidget *w = gtk_level_bar_new_for_interval (0, 100);
-
-  gtk_level_bar_set_value (GTK_LEVEL_BAR (w), 50);
-
-  /* Force them to be a bit larger */
-  gtk_widget_set_size_request (w, 200, -1);
-
-  return w;
-}
-
-static GtkWidget *
-create_spinner (void)
-{
-  GtkWidget *w = gtk_spinner_new ();
-
-  gtk_spinner_start (GTK_SPINNER (w));
-
-  return w;
-}
-
-static GtkWidget *
-create_spinbutton (void)
-{
-  GtkWidget *w = gtk_spin_button_new_with_range (0, 10, 1);
-
-  return w;
-}
-
-static GtkWidget *
-create_label (void)
-{
-  GtkWidget *w = gtk_label_new ("pLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.");
-
-  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
-  gtk_label_set_max_width_chars (GTK_LABEL (w), 100);
-
-  return w;
-}
-
-#if 0
-static GtkWidget *
-create_gears (void)
-{
-  GtkWidget *w = gtk_gears_new ();
-
-  gtk_widget_set_size_request (w, 100, 100);
-
-  return w;
-}
-#endif
-
-static GtkWidget *
-create_switch (void)
-{
-  GtkWidget *w = gtk_switch_new ();
-
-  gtk_switch_set_state (GTK_SWITCH (w), TRUE);
-
-  return w;
-}
-
-static const struct {
-  const char *name;
-  GtkWidget * (*create_func) (void);
-} widget_types[] = {
-  { "Icon",       create_icon           },
-  { "Button",     create_button         },
-  { "Blurbutton", create_blurred_button },
-  { "Fontbutton", create_font_button    },
-  { "Levelbar",   create_level_bar      },
-  { "Label",      create_label          },
-  { "Spinner",    create_spinner        },
-  { "Spinbutton", create_spinbutton     },
- // { "Gears",      create_gears          },
-  { "Switch",     create_switch         },
-};
-
-static int selected_widget_type = -1;
-static const int N_WIDGET_TYPES = G_N_ELEMENTS (widget_types);
-
-static void
-set_widget_type (GtkFishbowl *fishbowl,
-                 int          widget_type_index)
-{
-  GtkWidget *window, *headerbar;
-
-  if (widget_type_index == selected_widget_type)
-    return;
-
-  selected_widget_type = widget_type_index;
-
-  gtk_fishbowl_set_creation_func (fishbowl,
-                                  widget_types[selected_widget_type].create_func);
-
-  window = gtk_widget_get_toplevel (GTK_WIDGET (fishbowl));
-  headerbar = gtk_window_get_titlebar (GTK_WINDOW (window));
-  gtk_header_bar_set_title (GTK_HEADER_BAR (headerbar),
-                            widget_types[selected_widget_type].name);
-}
-
-void
-next_button_clicked_cb (GtkButton *source,
-                        gpointer   user_data)
-{
-  GtkFishbowl *fishbowl = user_data;
-  int new_index;
-
-  if (selected_widget_type + 1 >= N_WIDGET_TYPES)
-    new_index = 0;
-  else
-    new_index = selected_widget_type + 1;
-
-  set_widget_type (fishbowl, new_index);
-}
-
-void
-prev_button_clicked_cb (GtkButton *source,
-                        gpointer   user_data)
-{
-  GtkFishbowl *fishbowl = user_data;
-  int new_index;
-
-  if (selected_widget_type - 1 < 0)
-    new_index = N_WIDGET_TYPES - 1;
-  else
-    new_index = selected_widget_type - 1;
-
-  set_widget_type (fishbowl, new_index);
-}
-
-
-GtkWidget *
-do_fishbowl (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  static GtkCssProvider *provider = NULL;
-
-  if (provider == NULL)
-    {
-      provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_data (provider, css, -1, NULL);
-      gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
-                                                 GTK_STYLE_PROVIDER (provider),
-                                                 GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-    }
-
-  if (!window)
-    {
-      GtkBuilder *builder;
-      GtkWidget *bowl;
-
-      g_type_ensure (GTK_TYPE_FISHBOWL);
-
-      builder = gtk_builder_new_from_resource ("/fishbowl/fishbowl.ui");
-      gtk_builder_add_callback_symbols (builder,
-                                        "next_button_clicked_cb", G_CALLBACK (next_button_clicked_cb),
-                                        "prev_button_clicked_cb", G_CALLBACK (prev_button_clicked_cb),
-                                        NULL);
-      gtk_builder_connect_signals (builder, NULL);
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      bowl = GTK_WIDGET (gtk_builder_get_object (builder, "bowl"));
-      set_widget_type (GTK_FISHBOWL (bowl), 0);
-      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      gtk_widget_realize (window);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-
-  return window;
-}

demos/gtk-demo/fishbowl.ui

@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.6 -->
-  <object class="GtkWindow" id="window">
-    <property name="title" translatable="yes">Fishbowl</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="">
-        <property name="visible">True</property>
-        <property name="show-close-button">True</property>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <style>
-              <class name="linked"/>
-            </style>
-            <child>
-              <object class="GtkButton">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkImage">
-                    <property name="icon-name">pan-start-symbolic</property>
-                    <property name="visible">True</property>
-                  </object>
-                </child>
-                <signal name="clicked" handler="prev_button_clicked_cb" object="bowl" swapped="no"/>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkImage">
-                    <property name="icon-name">pan-end-symbolic</property>
-                    <property name="visible">True</property>
-                  </object>
-                </child>
-                <signal name="clicked" handler="next_button_clicked_cb" object="bowl" swapped="no"/>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="label">fps</property>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="label" bind-source="bowl" bind-property="framerate"/>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="label">Icons, </property>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="label" bind-source="bowl" bind-property="count"/>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToggleButton" id="changes_allow">
-            <property name="visible" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean"/>
-            <property name="relief">none</property>
-            <child>
-              <object class="GtkImage">
-                <property name="icon-name">changes-allow</property>
-                <property name="visible">True</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToggleButton" id="changes_prevent">
-            <property name="active" bind-source="changes_allow" bind-property="active" bind-flags="bidirectional|invert-boolean">True</property>
-            <property name="visible" bind-source="changes_prevent" bind-property="active" bind-flags="invert-boolean">False</property>
-            <property name="relief">none</property>
-            <child>
-              <object class="GtkImage">
-                <property name="icon-name">changes-prevent</property>
-                <property name="visible">True</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkFishbowl" id="bowl">
-        <property name="visible">True</property>
-        <property name="animating">True</property>
-        <property name="benchmark" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean">True</property>
-      </object>
-    </child>
-  </object>
-</interface>