wip hacks to handle version symbols

It does no good to iterate through a series of mime types to call a
function when the eventually-called function,
_gtk_quartz_get_selection_data_from_pasteboard() in this case, gives the
wrong answer and stops the iteration on all but one especially if that
one isn't first.

The one is "image/tiff" and the quartz pasteboard function will return
any image type Quartz knows about for it, so lose the iteration and use
only "image/tiff".

.clang-format

@@ -1,11 +0,0 @@
-# See https://wiki.apertis.org/Guidelines/Coding_conventions#Code_formatting
-BasedOnStyle: GNU
-AlwaysBreakAfterDefinitionReturnType: All
-BreakBeforeBinaryOperators: None
-BinPackParameters: false
-SpaceAfterCStyleCast: true
-# Our column limit is actually 80, but setting that results in clang-format
-# making a lot of dubious hanging-indent choices; disable it and assume the
-# developer will line wrap appropriately. clang-format will still check
-# existing hanging indents.
-ColumnLimit: 0

.gitignore

@@ -1 +0,0 @@
-/subprojects/*/

.gitlab-ci.yml

@@ -1,283 +0,0 @@
-include:
-  - project: 'gnome/citemplates'
-    file: 'flatpak/flatpak_ci_initiative.yml'
-
-stages:
-  - build
-  - analysis
-  - docs
-  - flatpak
-  - deploy
-
-.cache-paths: &cache-paths
-  paths:
-    - _ccache/
-    - subprojects/gdk-pixbuf/
-    - subprojects/glib/
-    - subprojects/graphene/
-    - subprojects/libepoxy/
-    - subprojects/pango/
-
-# Common variables
-variables:
-  COMMON_MESON_FLAGS: "-Dwerror=true -Dglib:werror=false -Dpango:werror=false -Dgtk-doc:werror=false -Dwayland-protocols:werror=false -Dsysprof:werror=false"
-  BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
-  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
-  MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v25"
-  FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
-  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v25"
-
-.only-default:
-  only:
-    - branches
-  except:
-    - tags
-
-style-check-diff:
-  extends: .only-default
-  image: $FEDORA_IMAGE
-  stage: .pre
-  allow_failure: true
-  script:
-    - .gitlab-ci/run-style-check-diff.sh
-
-.build-fedora-default:
-  image: $FEDORA_IMAGE
-  artifacts:
-    when: always
-    reports:
-      junit:
-        - "${CI_PROJECT_DIR}/_build/report-x11.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
-        - "${CI_PROJECT_DIR}/_build/report-broadway.xml"
-    name: "gtk-${CI_COMMIT_REF_NAME}"
-    paths:
-      - "${CI_PROJECT_DIR}/_build/meson-logs"
-      - "${CI_PROJECT_DIR}/_build/report*.xml"
-      - "${CI_PROJECT_DIR}/_build/report*.html"
-      - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*/*.png"
-      - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*/*.png"
-      - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*/*.syscap"
-  cache:
-    key: "$CI_JOB_NAME"
-    paths:
-      - _ccache/
-      - subprojects/gdk-pixbuf/
-      - subprojects/glib/
-      - subprojects/graphene/
-      - subprojects/libepoxy/
-      - subprojects/pango/
-
-fedora-x86_64:
-  extends: .build-fedora-default
-  stage: build
-  needs: []
-  variables:
-    EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
-  script:
-    - meson subprojects update
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
-            _build
-    - ninja -C _build
-    - .gitlab-ci/run-tests.sh _build x11
-    - .gitlab-ci/run-tests.sh _build wayland
-    - .gitlab-ci/run-tests.sh _build broadway
-
-release-build:
-  extends: .build-fedora-default
-  stage: build
-  needs: []
-  variables:
-    EXTRA_MESON_FLAGS: "--buildtype=release"
-  script:
-    - meson subprojects update
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
-            _build
-    - ninja -C _build
-    - .gitlab-ci/run-tests.sh _build x11
-
-installed-tests:
-  extends: .build-fedora-default
-  stage: build
-  needs: []
-  variables:
-    EXTRA_MESON_FLAGS: "--prefix=/usr --libdir=/usr/lib64 -Dinstall-tests=true"
-    G_TEST_ACCESSIBLE: 1
-  script:
-    - meson subprojects update
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
-            _build
-    - ninja -C _build
-    - sudo ninja -C _build install
-    - dbus-run-session xvfb-run -a -s "-screen 0 1024x768x24"
-            gnome-desktop-testing-runner
-                   --report-directory=_build/installed-tests-report/failed/
-                   --parallel=0
-                   gtk-4.0
-  artifacts:
-    paths:
-      - "_build/installed-tests-report/"
-
-
-.mingw-defaults:
-  stage: build
-  tags:
-    - win32-ps
-  script:
-    - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
-    - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
-  cache:
-    key: "$CI_JOB_NAME"
-    paths:
-      - _ccache/
-      - subprojects/gdk-pixbuf/
-      - subprojects/glib/
-      - subprojects/graphene/
-      - subprojects/libepoxy/
-      - subprojects/pango/
-
-msys2-mingw64:
-  extends: .mingw-defaults
-  needs: []
-  variables:
-    MSYSTEM: "MINGW64"
-    CHERE_INVOKING: "yes"
-
-.flatpak-defaults:
-  image: $FLATPAK_IMAGE
-  stage: flatpak
-  allow_failure: true
-  tags:
-    - flatpak
-  artifacts:
-    paths:
-      - "${APPID}-dev.flatpak"
-      - 'repo.tar'
-    expire_in: 1 day
-  script:
-    - bash -x ./.gitlab-ci/flatpak-build.sh "${APPID}"
-
-# Manual jobs, for branches and MRs
-.flatpak-manual:
-  extends: .flatpak-defaults
-  when: manual
-
-# Only build Flatpak bundles automatically on master
-.flatpak-master:
-  extends: .flatpak-defaults
-  only:
-    - master
-
-flatpak-manual:demo:
-  extends: .flatpak-manual
-  needs: []
-  variables:
-    APPID: org.gtk.Demo4
-
-flatpak-master:demo:
-  extends: .flatpak-master
-  needs: []
-  variables:
-    APPID: org.gtk.Demo4
-
-flatpak-manual:widget-factory:
-  extends: .flatpak-manual
-  needs: []
-  variables:
-    APPID: org.gtk.WidgetFactory4
-
-flatpak-master:widget-factory:
-  extends: .flatpak-master
-  needs: []
-  variables:
-    APPID: org.gtk.WidgetFactory4
-
-flatpak-manual:icon-browser:
-  extends: .flatpak-manual
-  needs: []
-  variables:
-    APPID: org.gtk.IconBrowser4
-
-flatpak-master:icon-browser:
-  extends: .flatpak-master
-  needs: []
-  variables:
-    APPID: org.gtk.IconBrowser4
-
-# Publish the demo apps to the GNOME Nightly repo
-# https://wiki.gnome.org/Apps/Nightly
-# https://gitlab.gnome.org/GNOME/Initiatives/-/wikis/DevOps-with-Flatpak
-nightly demo:
-    extends: '.publish_nightly'
-    dependencies: ['flatpak-master:demo']
-    needs: ['flatpak-master:demo']
-
-nightly factory:
-    extends: '.publish_nightly'
-    dependencies: ['flatpak-master:widget-factory']
-    needs: ['flatpak-master:widget-factory']
-
-nightly icon-browser:
-    extends: '.publish_nightly'
-    dependencies: ['flatpak-master:icon-browser']
-    needs: ['flatpak-master:icon-browser']
-
-static-scan:
-  image: $FEDORA_IMAGE
-  stage: analysis
-  needs: []
-  variables:
-    EXTRA_MESON_FLAGS: "--buildtype=debug"
-  script:
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} _scan_build
-    - ninja -C _scan_build scan-build
-  artifacts:
-    paths:
-      - _scan_build/meson-logs
-  allow_failure: true
-
-# Run tests with the address sanitizer. We need to turn off introspection,
-# since it is incompatible with asan
-asan-build:
-  image: $FEDORA_IMAGE
-  tags: [ asan ]
-  stage: analysis
-  needs: []
-  variables:
-  script:
-    - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled _build
-    - ninja -C _build
-    - .gitlab-ci/run-tests.sh _build wayland
-  artifacts:
-    paths:
-      - _build/meson-logs
-  allow_failure: true
-
-reference:
-  image: $DOCS_IMAGE
-  stage: docs
-  needs: []
-  variables:
-    EXTRA_MESON_FLAGS: "--buildtype=release"
-  script:
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} -Dgtk_doc=true _build
-    - ninja -C _build gdk4-doc gsk4-doc gtk4-doc
-    - mkdir -p _reference/
-    - mv _build/docs/reference/gdk/html/ _reference/gdk/
-    - mv _build/docs/reference/gsk/html/ _reference/gsk/
-    - mv _build/docs/reference/gtk/html/ _reference/gtk/
-  artifacts:
-    paths:
-      - _reference
-
-pages:
-  stage: deploy
-  needs: ['reference']
-  script:
-    - mv _reference/ public/
-  artifacts:
-    paths:
-      - public
-  only:
-    - master

.gitlab-ci/README.md

@@ -1,47 +0,0 @@
-## GTK CI infrastructure
-
-GTK uses different CI images depending on platform and jobs.
-
-The CI images are Docker containers, generated either using `docker` or
-`podman`, and pushed to the GitLab [container registry][registry].
-
-Each Docker image has a tag composed of two parts:
-
- - `${image}`: the base image for a given platform, like "fedora" or
-   "debian-stable"
- - `${number}`: an incremental version number, or `latest`
-
-See the [container registry][registry] for the available images for each
-branch, as well as their available versions.
-
-### Checklist for Updating a CI image
-
- - [ ] Update the `${image}.Dockerfile` file with the dependencies
- - [ ] Run `./run-docker.sh build --base ${image} --base-version ${number}`
- - [ ] Run `./run-docker.sh push --base ${image} --base-version ${number}`
-   once the Docker image is built; you may need to log in by using
-   `docker login` or `podman login`
- - [ ] Update the `image` keys in the `.gitlab-ci.yml` file with the new
-   image tag
- - [ ] Open a merge request with your changes and let it run
-
-### Checklist for Adding a new CI image
-
- - [ ] Write a new `${image}.Dockerfile` with the instructions to set up
-   a build environment
- - [ ] Add the `pip3 install meson` incantation
- - [ ] Run `./run-docker.sh build --base ${image} --base-version ${number}`
- - [ ] Run `./run-docker.sh push --base ${image} --base-version ${number}`
- - [ ] Add the new job to `.gitlab-ci.yml` referencing the image
- - [ ] Open a merge request with your changes and let it run
-
-### Checklist for Adding a new dependency to a CI image
-
-Our images are layered, and the base (called fedora-base) contains
-all the rpm payload. Therefore, adding a new dependency is a 2-step
-process:
-
- 1. [ ] Build and upload fedora-base:$version+1
- 1. [ ] Build and upload fedora:$version+1 based on fedora-base:version+1
-
-[registry]: https://gitlab.gnome.org/GNOME/gtk/container_registry

.gitlab-ci/clang-format-diff.py

@@ -1,133 +0,0 @@
-#!/usr/bin/env python3
-#
-# === clang-format-diff.py - ClangFormat Diff Reformatter ---*- python -*-=== #
-#
-# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-# See https://llvm.org/LICENSE.txt for license information.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-#
-# ===---------------------------------------------------------------------=== #
-
-"""
-This script reads input from a unified diff and reformats all the changed
-lines. This is useful to reformat all the lines touched by a specific patch.
-Example usage for git/svn users:
-
-  git diff -U0 --no-color HEAD^ | clang-format-diff.py -p1 -i
-  svn diff --diff-cmd=diff -x-U0 | clang-format-diff.py -i
-
-"""
-from __future__ import absolute_import, division, print_function
-
-import argparse
-import difflib
-import re
-import subprocess
-import sys
-
-if sys.version_info.major >= 3:
-    from io import StringIO
-else:
-    from io import BytesIO as StringIO
-
-
-def main():
-    parser = argparse.ArgumentParser(
-        description=__doc__,
-        formatter_class=argparse.RawDescriptionHelpFormatter)
-    parser.add_argument('-i', action='store_true', default=False,
-                        help='apply edits to files instead of displaying a '
-                             'diff')
-    parser.add_argument('-p', metavar='NUM', default=0,
-                        help='strip the smallest prefix containing P slashes')
-    parser.add_argument('-regex', metavar='PATTERN', default=None,
-                        help='custom pattern selecting file paths to reformat '
-                        '(case sensitive, overrides -iregex)')
-    parser.add_argument('-iregex', metavar='PATTERN',
-                        default=r'.*\.(cpp|cc|c\+\+|cxx|c|cl|h|hh|hpp|m|mm|inc'
-                                r'|js|ts|proto|protodevel|java|cs)',
-                        help='custom pattern selecting file paths to reformat '
-                             '(case insensitive, overridden by -regex)')
-    parser.add_argument('-sort-includes', action='store_true', default=False,
-                        help='let clang-format sort include blocks')
-    parser.add_argument('-v', '--verbose', action='store_true',
-                        help='be more verbose, ineffective without -i')
-    parser.add_argument('-style',
-                        help='formatting style to apply (LLVM, Google, '
-                        'Chromium, Mozilla, WebKit)')
-    parser.add_argument('-binary', default='clang-format',
-                        help='location of binary to use for clang-format')
-    args = parser.parse_args()
-
-    # Extract changed lines for each file.
-    filename = None
-    lines_by_file = {}
-    for line in sys.stdin:
-        match = re.search(r'^\+\+\+\ (.*?/){%s}(\S*)' % args.p, line)
-        if match:
-            filename = match.group(2)
-        if filename is None:
-            continue
-
-        if args.regex is not None:
-            if not re.match('^%s$' % args.regex, filename):
-                continue
-        else:
-            if not re.match('^%s$' % args.iregex, filename, re.IGNORECASE):
-                continue
-
-        match = re.search(r'^@@.*\+(\d+)(,(\d+))?', line)
-        if match:
-            start_line = int(match.group(1))
-            line_count = 1
-            if match.group(3):
-                line_count = int(match.group(3))
-            if line_count == 0:
-                continue
-            end_line = start_line + line_count - 1
-            lines_by_file.setdefault(filename, []).extend(
-                ['-lines', str(start_line) + ':' + str(end_line)])
-
-    # Reformat files containing changes in place.
-    # We need to count amount of bytes generated in the output of
-    # clang-format-diff. If clang-format-diff doesn't generate any bytes it
-    # means there is nothing to format.
-    format_line_counter = 0
-    for filename, lines in lines_by_file.items():
-        if args.i and args.verbose:
-            print('Formatting {}'.format(filename))
-        command = [args.binary, filename]
-        if args.i:
-            command.append('-i')
-        if args.sort_includes:
-            command.append('-sort-includes')
-        command.extend(lines)
-        if args.style:
-            command.extend(['-style', args.style])
-        p = subprocess.Popen(command,
-                             stdout=subprocess.PIPE,
-                             stderr=None,
-                             stdin=subprocess.PIPE,
-                             universal_newlines=True)
-        stdout, _ = p.communicate()
-        if p.returncode != 0:
-            sys.exit(p.returncode)
-
-        if not args.i:
-            with open(filename) as f:
-                code = f.readlines()
-            formatted_code = StringIO(stdout).readlines()
-            diff = difflib.unified_diff(code, formatted_code,
-                                        filename, filename,
-                                        '(before formatting)',
-                                        '(after formatting)')
-            diff_string = ''.join(diff)
-            if diff_string:
-                format_line_counter += sys.stdout.write(diff_string)
-
-    if format_line_counter > 0:
-        sys.exit(1)
-
-
-if __name__ == '__main__':
-    main()

.gitlab-ci/fedora-base.Dockerfile

@@ -1,91 +0,0 @@
-FROM fedora:31
-
-RUN dnf -y install \
-    adwaita-icon-theme \
-    atk-devel \
-    at-spi2-atk-devel \
-    avahi-gobject-devel \
-    cairo-devel \
-    cairo-gobject-devel \
-    ccache \
-    clang \
-    clang-analyzer \
-    colord-devel \
-    cups-devel \
-    dbus-daemon \
-    dbus-x11 \
-    dejavu-sans-mono-fonts \
-    desktop-file-utils \
-    diffutils \
-    elfutils-libelf-devel \
-    fribidi-devel \
-    gcc \
-    gcc-c++ \
-    gdk-pixbuf2-devel \
-    gdk-pixbuf2-modules \
-    gettext \
-    git \
-    glib2-devel \
-    glib2-static \
-    glibc-devel \
-    glibc-headers \
-    gnome-desktop-testing \
-    gobject-introspection-devel \
-    graphene-devel \
-    gstreamer1-devel \
-    gstreamer1-plugins-good \
-    gstreamer1-plugins-bad-free-devel \
-    gstreamer1-plugins-base-devel \
-    gtk-doc \
-    hicolor-icon-theme \
-    iso-codes \
-    itstool \
-    json-glib-devel \
-    lcov \
-    libasan \
-    libattr-devel \
-    libcloudproviders-devel \
-    libepoxy-devel \
-    libffi-devel \
-    libmount-devel \
-    librsvg2 \
-    libselinux-devel \
-    libubsan \
-    libXcomposite-devel \
-    libXcursor-devel \
-    libXcursor-devel \
-    libXdamage-devel \
-    libXfixes-devel \
-    libXi-devel \
-    libXinerama-devel \
-    libxkbcommon-devel \
-    libXrandr-devel \
-    libXrender-devel \
-    libXtst-devel \
-    libxslt \
-    mesa-dri-drivers \
-    mesa-libEGL-devel \
-    mesa-libwayland-egl-devel \
-    ninja-build \
-    pango-devel \
-    pcre-devel \
-    pcre-static \
-    python3 \
-    python3-jinja2 \
-    python3-pip \
-    python3-pygments \
-    python3-wheel \
-    redhat-rpm-config \
-    sassc \
-    systemtap-sdt-devel \
-    vulkan-devel \
-    wayland-devel \
-    wayland-protocols-devel \
-    weston \
-    weston-libs \
-    which \
-    xorg-x11-server-Xvfb \
- && dnf clean all
-
-RUN pip3 install meson==0.55.3
-

.gitlab-ci/fedora-docs.Dockerfile

@@ -1,12 +0,0 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v25
-
-RUN dnf -y install pandoc
-
-ARG HOST_USER_ID=5555
-ENV HOST_USER_ID ${HOST_USER_ID}
-RUN useradd -u $HOST_USER_ID -ms /bin/bash user
-
-USER user
-WORKDIR /home/user
-
-ENV LANG C.UTF-8

.gitlab-ci/fedora.Dockerfile

@@ -1,13 +0,0 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v25
-
-# Enable sudo for wheel users
-RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers
-
-ARG HOST_USER_ID=5555
-ENV HOST_USER_ID ${HOST_USER_ID}
-RUN useradd -u $HOST_USER_ID -G wheel -ms /bin/bash user
-
-USER user
-WORKDIR /home/user
-
-ENV LANG C.UTF-8

.gitlab-ci/flatpak-build.sh

@@ -1,47 +0,0 @@
-#!/bin/bash
-
-set -e
-
-appid=$1
-
-builddir=flatpak_app
-repodir=repo
-
-flatpak-builder \
-        --user --disable-rofiles-fuse \
-        --stop-at=gtk \
-        ${builddir} \
-        build-aux/flatpak/${appid}.json
-
-flatpak build ${builddir} meson \
-                --prefix=/app \
-                --libdir=/app/lib \
-                --buildtype=release \
-                -Dx11-backend=true \
-                -Dwayland-backend=true \
-                -Dprint-backends=file \
-                -Dbuild-tests=false \
-                -Dbuild-examples=false \
-                -Dintrospection=disabled \
-                -Ddemos=true \
-                _flatpak_build
-
-flatpak build ${builddir} ninja -C _flatpak_build install
-
-flatpak-builder \
-        --user --disable-rofiles-fuse \
-        --finish-only \
-        --repo=${repodir} \
-        ${builddir} \
-        build-aux/flatpak/${appid}.json
-
-flatpak build-bundle \
-        ${repodir} \
-        ${appid}-dev.flatpak \
-        --runtime-repo=https://nightly.gnome.org/gnome-nightly.flatpakrepo \
-        ${appid}
-
-# to be consumed by the nightly publish jobs
-if [[ $CI_COMMIT_BRANCH == master ]]; then
-        tar cf repo.tar ${repodir}
-fi

.gitlab-ci/meson-html-report.py

@@ -1,371 +0,0 @@
-#!/usr/bin/env python3
-
-# Turns a Mason testlog.json file into an HTML report
-#
-# Copyright 2019  GNOME Foundation
-#
-# SPDX-License-Identifier: LGPL-2.1-or-later
-#
-# Original author: Emmanuele Bassi
-
-import argparse
-import datetime
-import json
-import os
-import sys
-from jinja2 import Template
-
-REPORT_TEMPLATE = '''
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>{{ report.project_name }} Test Report</title>
-  <meta charset="utf-8" />
-  <style type="text/css">
-body {
-  background: white;
-  color: #333;
-  font-family: 'Cantarell', sans-serif;
-}
-
-h1 {
-  color: #333333;
-  font-size: 1.9em;
-  font-weight: normal;
-  margin-bottom: 1em;
-  border-bottom: 1px solid #333333;
-}
-
-header {
-  position: fixed;
-  padding-bottom: 12px;
-  margin-bottom: 24px;
-  background: rgba(255, 255, 255, 0.85);
-  box-shadow: 0 0 1px rgba(0, 0, 0, 0.15);
-  z-index: 500;
-  left: 0;
-  top: 0;
-  width: 100%;
-  color: rgba(0, 0, 0, 0.3);
-  transform: translateY(0px);
-  transition: .2s background-color, color;
-  box-sizing: border-box;
-  display: block;
-  visibility: visible;
-  text-align: center;
-}
-
-article {
-  padding-top: 200px;
-  margin: 2em;
-}
-
-div.report-meta {
-  width: auto;
-  border: 1px solid #ccc;
-  padding: .5em 2em;
-  color: #3c3c3c;
-}
-
-span.result {
-  font-weight: bold;
-}
-
-span.pass {
-  color: rgb(51, 209, 122);
-}
-
-span.skip {
-  color: rgb(255, 163, 72);
-}
-
-span.fail {
-  color: rgb(224, 27, 36);
-}
-
-span.xfail {
-  color: rgb(163, 71, 186);
-}
-
-div.result {
-  border-top: 1px solid #c0c0c0;
-  padding-top: 1em;
-  padding-bottom: 1em;
-  width: 100%;
-}
-
-div.result h4 {
-  border-bottom: 1px solid #c0c0c0;
-  margin-bottom: 0.7em;
-}
-
-pre {
-  color: #fafafa;
-  background-color: black;
-  border-radius: 6px;
-  box-shadow: 0px 5px 8px 0px rgba(0, 0, 0, 0.25);
-  font-family: monospace;
-  line-height: 1.2em;
-  border: none;
-  padding: 10px 1em;
-  font-size: 0.9em;
-  overflow: auto;
-  white-space: pre;
-  word-break: normal;
-  word-wrap: normal;
-}
-
-ul.passed li {
-  display: inline;
-}
-
-ul.passed li:after {
-  content: ",";
-}
-
-ul.passed li:last-child:after {
-  content: "";
-}
-
-ul.images {
-  padding-bottom: 1em;
-}
-
-ul.images li {
-  display: inline;
-}
-  </style>
-</head>
-<body>
-  <header>
-    <h1>{{ report.project_name }}/{{ report.backend }}/{{ report.branch_name }} :: Test Reports</h1>
-  </header>
-
-  <article>
-    <section>
-      <div class="report-meta">
-        <p><strong>Backend:</strong> {{ report.backend }}</p>
-        <p><strong>Branch:</strong> {{ report.branch_name }}</p>
-        <p><strong>Date:</strong> <time datetime="{{ report.date.isoformat() }}">{{ report.locale_date }}</time></p>
-        {% if report.job_id %}<p><strong>Job ID:</strong> {{ report.job_id }}</p>{% endif %}
-      </div>
-    </section>
-
-    <section>
-      <div class="summary">
-        <h3><a name="summary">Summary</a></h3>
-        <ul>
-          <li><strong>Total units:</strong> {{ report.total_units }}</li>
-          <li><strong>Failed:</strong> {{ report.total_failures }}</li>
-          <li><strong>Passed:</strong> {{ report.total_successes }}</li>
-        </ul>
-      </div>
-    </section>
-
-    {% for suite_result in report.results_list %}
-    <section>
-      <div class="result">
-        <h3><a name="results">Suite: {{ suite_result.suite_name }}</a></h3>
-        <ul>
-          <li><strong>Units:</strong> {{ suite_result.n_units }}</li>
-          <li><strong>Failed:</strong> <a href="#{{ suite_result.suite_name }}-failed">{{ suite_result.n_failures }}</a></li>
-          <li><strong>Passed:</strong> <a href="#{{ suite_result.suite_name }}-passed">{{ suite_result.n_successes }}</a></li>
-        </ul>
-
-        <div class="failures">
-          <h4><a name="{{ suite_result.suite_name }}-failed">Failures</a></h4>
-          <ul class="failed">
-            {% for failure in suite_result.failures if failure.result in [ 'ERROR', 'FAIL', 'UNEXPECTEDPASS' ] %}
-            <li><a name="{{ failure.name }}">{{ failure.name }}</a> - result: <span class="result fail">{{ failure.result }}</span><br/>
-              {% if failure.stdout %}
-              Output: <pre>{{ failure.stdout }}</pre>
-              {% endif %}
-              {% if failure.image_data is defined %}
-              <ul class="images">
-                <li><img alt="ref" src="{{ failure.image_data.ref }}" /></li>
-                <li><img alt="out" src="{{ failure.image_data.out }}" /></li>
-                <li><img alt="diff" src="{{ failure.image_data.diff }}" /></li>
-              </ul>
-              {% endif %}
-            </li>
-            {% else %}
-            <li>None</li>
-            {% endfor %}
-          </ul>
-
-          <h4><a name="{{ suite_result.suite_name }}-timed-out">Timed out</a></h4>
-          <ul class="failed">
-            {% for failure in suite_result.failures if failure.result == 'TIMEOUT' %}
-            <li><a name="{{ failure.name }}">{{ failure.name }}</a> - result: <span class="result fail">{{ failure.result }}</span><br/>
-              {% if failure.stdout %}
-              Output: <pre>{{ failure.stdout }}</pre>
-              {% endif %}
-            </li>
-            {% else %}
-            <li>None</li>
-            {% endfor %}
-          </ul>
-        </div>
-
-        <div class="successes">
-          <h4><a name="{{ suite_result.suite_name }}-expected-fail">Expected failures</a></h4>
-          <ul>
-          {% for success in suite_result.successes if success.result == 'EXPECTEDFAIL' %}
-            <li><a name="{{ success.name }}">{{ success.name }}</a> - result: <span class="result xfail">{{ success.result }}</span><br/>
-            {% if success.stdout %}
-              Output: <pre>{{ success.stdout }}</pre>
-            {% endif %}
-            {% if success.image_data is defined %}
-              <ul class="images">
-                <li><img alt="ref" src="{{ success.image_data.ref }}" /></li>
-                <li><img alt="out" src="{{ success.image_data.out }}" /></li>
-                <li><img alt="diff" src="{{ success.image_data.diff }}" /></li>
-              </ul>
-            {% endif %}
-            </li>
-          {% else %}
-            <li>None</li>
-          {% endfor %}
-          </ul>
-
-          <h4><a name="{{ suite_result.suite_name }}-skipped">Skipped</a></h4>
-          <ul>
-            {% for success in suite_result.successes if success.result == 'SKIP' %}
-            <li>{{ success.name }} - result: <span class="result skip">{{ success.result }}</li>
-            {% else %}
-            <li>None</li>
-            {% endfor %}
-          </ul>
-
-          <h4><a name="{{ suite_result.suite_name }}-passed">Passed</a></h4>
-          <ul class="passed">
-            {% for success in suite_result.successes if success.result == 'OK' %}
-            <li>{{ success.name }} - result: <span class="result pass">{{ success.result }}</li>
-            {% else %}
-            <li>None</li>
-            {% endfor %}
-          </ul>
-        </div>
-
-      </div>
-    </section>
-    {% endfor %}
-
-  </article>
-</body>
-</html>
-'''
-
-aparser = argparse.ArgumentParser(description='Turns a Meson test log into an HTML report')
-aparser.add_argument('--project-name', metavar='NAME',
-                     help='The project name',
-                     default='Unknown')
-aparser.add_argument('--backend', metavar='NAME',
-                     help='The used backend',
-                     default='unknown')
-aparser.add_argument('--job-id', metavar='ID',
-                     help='The job ID for the report',
-                     default=None)
-aparser.add_argument('--branch', metavar='NAME',
-                     help='Branch of the project being tested',
-                     default='master')
-aparser.add_argument('--output', metavar='FILE',
-                     help='The output HTML file, stdout by default',
-                     type=argparse.FileType('w', encoding='UTF-8'),
-                     default=sys.stdout)
-aparser.add_argument('--reftest-suite', metavar='NAME',
-                     help='The name of the reftests suite',
-                     default='reftest')
-aparser.add_argument('--reftest-output-dir', metavar='DIR',
-                     help='The output directory for reftests data',
-                     default=None)
-aparser.add_argument('infile', metavar='FILE',
-                     help='The input testlog.json, stdin by default',
-                     type=argparse.FileType('r', encoding='UTF-8'),
-                     default=sys.stdin)
-
-args = aparser.parse_args()
-
-outfile = args.output
-
-suites = {}
-for line in args.infile:
-    data = json.loads(line)
-    (full_suite, unit_name) = data['name'].split(' / ')
-    (project_name, suite_name) = full_suite.split(':')
-
-    unit = {
-        'project-name': project_name,
-        'suite': suite_name,
-        'name': unit_name,
-        'duration': data['duration'],
-        'returncode': data['returncode'],
-        'result': data['result'],
-        'stdout': data['stdout'],
-    }
-
-    if args.reftest_output_dir is not None and suite_name == args.reftest_suite:
-        filename = unit_name.split(' ')[1]
-        basename = os.path.splitext(filename)[0]
-
-        image_data = {
-            'ref': os.path.join(args.reftest_output_dir, '{}.ref.png'.format(basename)),
-            'out': os.path.join(args.reftest_output_dir, '{}.out.png'.format(basename)),
-            'diff': os.path.join(args.reftest_output_dir, '{}.diff.png'.format(basename)),
-        }
-
-        unit['image_data'] = image_data
-
-    units = suites.setdefault(full_suite, [])
-    units.append(unit)
-
-report = {}
-report['date'] = datetime.datetime.utcnow()
-report['locale_date'] = report['date'].strftime("%c")
-report['project_name'] = args.project_name
-report['backend'] = args.backend
-report['job_id'] = args.job_id
-report['branch_name'] = args.branch
-report['total_successes'] = 0
-report['total_failures'] = 0
-report['total_units'] = 0
-report['results_list'] = []
-
-for name, units in suites.items():
-    (project_name, suite_name) = name.split(':')
-    print('Processing {} suite {}:'.format(project_name, suite_name))
-
-    def if_failed(unit):
-        if unit['result'] in ['FAIL', 'UNEXPECTEDPASS', 'TIMEOUT', 'ERROR',]:
-            return True
-        return False
-
-    def if_succeded(unit):
-        if unit['result'] in ['OK', 'EXPECTEDFAIL', 'SKIP']:
-            return True
-        return False
-
-    successes = list(filter(if_succeded, units))
-    failures = list(filter(if_failed, units))
-
-    n_units = len(units)
-    n_successes = len(successes)
-    n_failures = len(failures)
-
-    report['total_units'] += n_units
-    report['total_successes'] += n_successes
-    report['total_failures'] += n_failures
-    print(' - {}: {} total, {} pass, {} fail'.format(suite_name, n_units, n_successes, n_failures))
-
-    suite_report = {
-        'suite_name': suite_name,
-        'n_units': n_units,
-        'successes': successes,
-        'n_successes': n_successes,
-        'failures': failures,
-        'n_failures': n_failures,
-    }
-    report['results_list'].append(suite_report)
-
-template = Template(REPORT_TEMPLATE)
-outfile.write(template.render({'report': report}))

.gitlab-ci/meson-junit-report.py

@@ -1,114 +0,0 @@
-#!/usr/bin/env python3
-
-# Turns a Meson testlog.json file into a JUnit XML report
-#
-# Copyright 2019  GNOME Foundation
-#
-# SPDX-License-Identifier: LGPL-2.1-or-later
-#
-# Original author: Emmanuele Bassi
-
-import argparse
-import datetime
-import json
-import os
-import sys
-import xml.etree.ElementTree as ET
-
-aparser = argparse.ArgumentParser(description='Turns a Meson test log into a JUnit report')
-aparser.add_argument('--project-name', metavar='NAME',
-                     help='The project name',
-                     default='unknown')
-aparser.add_argument('--backend', metavar='NAME',
-                     help='The used backend',
-                     default='unknown')
-aparser.add_argument('--job-id', metavar='ID',
-                     help='The job ID for the report',
-                     default='Unknown')
-aparser.add_argument('--branch', metavar='NAME',
-                     help='Branch of the project being tested',
-                     default='master')
-aparser.add_argument('--output', metavar='FILE',
-                     help='The output file, stdout by default',
-                     type=argparse.FileType('w', encoding='UTF-8'),
-                     default=sys.stdout)
-aparser.add_argument('infile', metavar='FILE',
-                     help='The input testlog.json, stdin by default',
-                     type=argparse.FileType('r', encoding='UTF-8'),
-                     default=sys.stdin)
-
-args = aparser.parse_args()
-
-outfile = args.output
-
-testsuites = ET.Element('testsuites')
-testsuites.set('id', '{}/{}'.format(args.job_id, args.branch))
-testsuites.set('package', args.project_name)
-testsuites.set('timestamp', datetime.datetime.utcnow().isoformat(timespec='minutes'))
-
-suites = {}
-for line in args.infile:
-    data = json.loads(line)
-    (full_suite, unit_name) = data['name'].split(' / ')
-    (project_name, suite_name) = full_suite.split(':')
-
-    duration = data['duration']
-    return_code = data['returncode']
-    result = data['result']
-    log = data['stdout']
-
-    unit = {
-        'suite': suite_name,
-        'name': unit_name,
-        'duration': duration,
-        'returncode': return_code,
-        'result': result,
-        'stdout': log,
-    }
-
-    units = suites.setdefault(suite_name, [])
-    units.append(unit)
-
-for name, units in suites.items():
-    print('Processing suite {} (units: {})'.format(name, len(units)))
-
-    def if_failed(unit):
-        if unit['result'] in ['ERROR', 'FAIL', 'UNEXPECTEDPASS', 'TIMEOUT']:
-            return True
-        return False
-
-    def if_succeded(unit):
-        if unit['result'] in ['OK', 'EXPECTEDFAIL', 'SKIP']:
-            return True
-        return False
-
-    successes = list(filter(if_succeded, units))
-    failures = list(filter(if_failed, units))
-    print(' - {}: {} pass, {} fail'.format(name, len(successes), len(failures)))
-
-    testsuite = ET.SubElement(testsuites, 'testsuite')
-    testsuite.set('name', '{}/{}'.format(args.project_name, name))
-    testsuite.set('tests', str(len(units)))
-    testsuite.set('errors', str(len(failures)))
-    testsuite.set('failures', str(len(failures)))
-
-    for unit in successes:
-        testcase = ET.SubElement(testsuite, 'testcase')
-        testcase.set('classname', '{}/{}'.format(args.project_name, unit['suite']))
-        testcase.set('name', '{}/{}'.format(args.backend, unit['name']))
-        testcase.set('time', str(unit['duration']))
-
-    for unit in failures:
-        testcase = ET.SubElement(testsuite, 'testcase')
-        testcase.set('classname', '{}/{}'.format(args.project_name, unit['suite']))
-        testcase.set('name', '{}/{}'.format(args.backend, unit['name']))
-        testcase.set('time', str(unit['duration']))
-
-        failure = ET.SubElement(testcase, 'failure')
-        failure.set('classname', '{}/{}'.format(args.project_name, unit['suite']))
-        testcase.set('name', '{}/{}'.format(args.backend, unit['name']))
-        failure.set('type', 'error')
-        failure.text = unit['stdout']
-
-output = ET.tostring(testsuites, encoding='unicode')
-outfile.write(output)

.gitlab-ci/run-docker.sh

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

.gitlab-ci/run-style-check-diff.sh

@@ -1,44 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# We need to add a new remote for the upstream master, since this script could
-# be running in a personal fork of the repository which has out of date branches.
-if [ "${CI_PROJECT_NAMESPACE}" != "GNOME" ]; then
-    echo "Retrieving the current upstream repository from ${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}..."
-    git remote add upstream https://gitlab.gnome.org/GNOME/gtk.git
-    git fetch upstream
-    ORIGIN="upstream"
-else
-    echo "Reusing the existing repository on ${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}"
-    ORIGIN="origin"
-fi
-
-# Work out the newest common ancestor between the detached HEAD that this CI job
-# has checked out, and the upstream target branch (which will typically be
-# `upstream/master` or `upstream/gtk-3-24`).
-#
-# `${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}` is only defined if we’re running in
-# a merge request pipeline; fall back to `${CI_DEFAULT_BRANCH}` otherwise.
-newest_common_ancestor_sha=$(diff --old-line-format='' --new-line-format='' <(git rev-list --first-parent "${ORIGIN}/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}") <(git rev-list --first-parent HEAD) | head -1)
-git diff -U0 --no-color "${newest_common_ancestor_sha}" | .gitlab-ci/clang-format-diff.py -binary "clang-format" -p1
-exit_status=$?
-
-# The style check is not infallible. The clang-format configuration cannot
-# perfectly describe GTK’s coding style: in particular, it cannot align
-# function arguments. The documented coding style for GTK takes priority over
-# clang-format suggestions. Hopefully we can eventually improve clang-format to
-# be configurable enough for our coding style. That’s why this CI check is OK
-# to fail: the idea is that people can look through the output and ignore it if
-# it’s wrong. (That situation can also happen if someone touches pre-existing
-# badly formatted code and it doesn’t make sense to tidy up the wider coding
-# style with the changes they’re making.)
-echo ""
-echo "Note that clang-format output is advisory and cannot always match the"
-echo "GTK coding style, documented at:"
-echo "   https://gitlab.gnome.org/GNOME/gtk/blob/master/docs/CODING-STYLE"
-echo "Warnings from this tool can be ignored in favour of the documented "
-echo "coding style, or in favour of matching the style of existing"
-echo "surrounding code."
-
-exit ${exit_status}

.gitlab-ci/run-tests.sh

@@ -1,82 +0,0 @@
-#!/bin/bash
-
-set +x
-set +e
-
-srcdir=$( pwd )
-builddir=$1
-backend=$2
-
-# Ignore memory leaks lower in dependencies
-export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp
-
-case "${backend}" in
-  x11)
-    xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
-          meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
-                --print-errorlogs \
-                --setup=${backend} \
-                --suite=gtk \
-                --no-suite=gsk-compare-broadway
-
-    # Store the exit code for the CI run, but always
-    # generate the reports
-    exit_code=$?
-    ;;
-
-  wayland)
-    export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-
-    weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
-    compositor=$!
-    export WAYLAND_DISPLAY=wayland-5
-
-    meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
-                --print-errorlogs \
-                --setup=${backend} \
-                --suite=gtk \
-                --no-suite=gsk-compare-broadway
-
-    exit_code=$?
-    kill ${compositor}
-    ;;
-
-  broadway)
-    export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-
-    ${builddir}/gdk/broadway/gtk4-broadwayd :5 &
-    server=$!
-    export BROADWAY_DISPLAY=:5
-
-    meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
-                --print-errorlogs \
-                --setup=${backend} \
-                --suite=gtk \
-                --no-suite=gsk-compare-opengl
-
-    # don't let Broadway failures fail the run, for now
-    exit_code=0
-    kill ${server}
-    ;;
-esac
-
-cd ${builddir}
-
-$srcdir/.gitlab-ci/meson-junit-report.py \
-        --project-name=gtk \
-        --backend=${backend} \
-        --job-id="${CI_JOB_NAME}" \
-        --output=report-${backend}.xml \
-        meson-logs/testlog-${backend}.json
-$srcdir/.gitlab-ci/meson-html-report.py \
-        --project-name=gtk \
-        --backend=${backend} \
-        --job-id="${CI_JOB_NAME}" \
-        --reftest-output-dir="testsuite/reftests/output/${backend}" \
-        --output=report-${backend}.html \
-        meson-logs/testlog-${backend}.json
-
-exit $exit_code

.gitlab-ci/test-docker.sh

@@ -1,56 +0,0 @@
-#!/bin/bash
-
-set -e
-
-srcdir=$(pwd)
-
-mkdir -p _ccache
-export CCACHE_BASEDIR="$(pwd)"
-export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-
-ccache --zero-stats
-ccache --show-stats
-export CCACHE_DISABLE=true
-meson \
-        -Dx11-backend=true \
-        -Dwayland-backend=true \
-        -Dbroadway-backend=true \
-        -Dvulkan=yes \
-        -Dprofiler=true \
-        --werror \
-        ${EXTRA_MESON_FLAGS:-} \
-        _build $srcdir
-unset CCACHE_DISABLE
-
-cd _build
-
-ninja
-ccache --show-stats
-
-set +e
-
-xvfb-run -a -s "-screen 0 1024x768x24" \
-    meson test \
-        --timeout-multiplier 2 \
-        --print-errorlogs \
-        --suite=gtk \
-        --no-suite=gtk:a11y
-
-# Save the exit code
-exit_code=$?
-
-# We always want to run the report generators
-$srcdir/.gitlab-ci/meson-junit-report.py \
-        --project-name=gtk \
-        --job-id="${CI_JOB_NAME}" \
-        --output=report.xml \
-        meson-logs/testlog.json
-
-$srcdir/.gitlab-ci/meson-html-report.py \
-        --project-name=GTK \
-        --job-id="${CI_JOB_NAME}" \
-        --reftest-output-dir="testsuite/reftests/output" \
-        --output=report.html \
-        meson-logs/testlog.json
-
-exit $exit_code

.gitlab-ci/test-msys2.sh

@@ -1,74 +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 \
-    git \
-    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-meson \
-    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-graphene \
-    mingw-w64-$MSYS2_ARCH-json-glib \
-    mingw-w64-$MSYS2_ARCH-libepoxy \
-    mingw-w64-$MSYS2_ARCH-pango \
-    mingw-w64-$MSYS2_ARCH-fribidi \
-    mingw-w64-$MSYS2_ARCH-gst-plugins-bad \
-    mingw-w64-$MSYS2_ARCH-shared-mime-info
-
-mkdir -p _ccache
-export CCACHE_BASEDIR="$(pwd)"
-export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-
-# https://gitlab.gnome.org/GNOME/gtk/-/issues/2243
-# https://gitlab.gnome.org/GNOME/gtk/-/issues/3002
-
-if ! pkg-config --atleast-version=2.65.0 glib-2.0; then
-    git clone https://gitlab.gnome.org/GNOME/glib.git _glib
-    meson setup _glib_build _glib
-    meson compile -C _glib_build
-    meson install -C _glib_build
-fi
-pkg-config --modversion glib-2.0
-
-if ! pkg-config --atleast-version=1.47.0 pango; then
-    git clone https://gitlab.gnome.org/GNOME/pango.git _pango
-    meson setup _pango_build _pango
-    meson compile -C _pango_build
-    meson install -C _pango_build
-fi
-pkg-config --modversion pango
-
-# Build
-ccache --zero-stats
-ccache --show-stats
-export CCACHE_DISABLE=true
-meson \
-    -Dx11-backend=false \
-    -Dwayland-backend=false \
-    -Dwin32-backend=true \
-    -Dvulkan=disabled \
-    -Dintrospection=enabled \
-    -Dgtk:werror=true \
-    _build
-unset CCACHE_DISABLE
-
-ninja -C _build
-ccache --show-stats

.gitlab/issue_templates/Bug.md

@@ -1,36 +0,0 @@
-## Steps to reproduce
-
- 1. ...
- 2. ...
- 3. ...
-
-<!--
-  You should try and reproduce with the demos applications available
-  under the `demos` directory, or the test programs in the `tests` directory.
-  Alternatively, please attach a *small and self-contained* example
-  *written in C* that exhibits the issue.
--->
-
-## Current behavior
-<!--
-  Please describe the current behaviour
--->
-
-## Expected outcome
-<!--
-  Please describe the expected outcome
--->
-
-## Version information
-<!--
- - Which version of GTK you are using
- - What operating system and version
-  - For Linux, which distribution
- - If you built GTK yourself, the list of options used to configure the build
--->
-
-## Additional information
-<!--
- - Screenshots or screen recordings are useful for visual errors
- - Please report any warning or message printed on the terminal
--->

.gitlab/issue_templates/Crash.md

@@ -1,34 +0,0 @@
-## Steps to reproduce
-
- 1. ...
- 2. ...
- 3. ...
-
-<!--
-  You should try and reproduce with the demos applications available
-  under the `demos` directory, or the test programs in the `tests` directory.
-  Alternatively, please attach a *small and self-contained* example that
-  exhibits the issue.
--->
-
-## Version information
-<!--
- - Which version of GTK you are using
- - What operating system and version
-  - for Linux, which distribution
- - If you built GTK yourself, the list of options used to configure the build
--->
-
-## Warnings
-<!--
- - If the application generates warning messages before crashing please
-   report them here
--->
-
-## Backtrace
-<!--
- - Attaching a stack trace obtained using GDB is appreciated; follow the
-   instructions on the wiki:
-
-   https://wiki.gnome.org/Community/GettingInTouch/Bugzilla/GettingTraces
--->

AUTHORS

@@ -1,5 +1,5 @@
-Please do not mail any of the authors listed here
-asking questions about this version of GTK.
+Please do not mail any of the authors listed here 
+asking questions about this version of GTK+. 
 
 Original Authors
 ----------------
@@ -7,8 +7,8 @@ Peter Mattis      <petm@xcf.berkeley.edu>
 Spencer Kimball   <spencer@xcf.berkeley.edu>
 Josh MacDonald    <jmacd@xcf.berkeley.edu>
 
-The Team that build GTK 2 (in alphabetical order)
--------------------------------------------------
+The GTK+ Team (in alphabetical order)
+-------------------------------------
 Shawn T. Amundson <amundson@gtk.org>
 Jerome Bolliet    <bolliet@gtk.org>
 Damon Chaplin     <damon@gtk.org>
@@ -28,24 +28,11 @@ Jay Painter       <jpaint@gtk.org>
 Manish Singh      <manish@gtk.org>
 Owen Taylor       <otaylor@gtk.org>
 
-The current team (GTK 3 and 4)
-------------------------------
-
-Jonas Ådahl       <jadahl@gmail.com>
-Tim Bäder         <mail@baedert.org>
-Emmanuele Bassi   <ebassi@gnome.org>
-Chun-wei Fan      <fanchunwei@src.gnome.org>
-Matthias Clasen   <mclasen@redhat.com>
-Carlos Garnacho   <mrgarnacho@gmail.com>
-Alexander Larsson <alexl@redhat.com>
-Benjamin Otte     <otte@gnome.org>
-
-
 There are many others who have contributed patches; we thank them,
-GTK is much better because of them.
+GTK+ is much better because of them.
 
 
-Over time, GTK has incorporated some pieces of software which
+Over time, GTK+ has incorporated some pieces of software which 
 started as independent projects. We list the original authors here:
 
 
@@ -76,8 +63,3 @@ DirectFB backend
 Denis Oliver Kropp
 Sven Neumann
 Mike Emmel
-
-
-gtkparasite
------------
-Christian Hammond

CONTRIBUTING.md

@@ -1,261 +0,0 @@
-# Contribution guidelines
-
-Thank you for considering contributing to the GTK project!
-
-These guidelines are meant for new contributors, regardless of their level
-of proficiency; following them allows the maintainers of the GTK project to
-more effectively evaluate your contribution, and provide prompt feedback to
-you. Additionally, by following these guidelines you clearly communicate
-that you respect the time and effort that the people developing GTK put into
-managing the project.
-
-GTK is a complex free software GUI toolkit, and it would not exist without
-contributions from the free and open source software community. There are
-many things that we value:
-
- - bug reporting and fixing
- - documentation and examples
- - tests
- - new features
-
-Please, do not use the issue tracker for support questions. If you have
-questions on how to use GTK effectively, you can use:
-
- - the `#gtk` IRC channel on irc.gnome.org
- - the [gtk tag on the GNOME Discourse instance](https://discourse.gnome.org/tag/gtk)
-
-You can also look at the GTK tag on [Stack
-Overflow](https://stackoverflow.com/questions/tagged/gtk).
-
-The issue tracker is meant to be used for actionable issues only.
-
-## How to report bugs
-
-### Security issues
-
-You should not open a new issue for security related questions.
-
-When in doubt, send an email to the [security](mailto:security@gnome.org)
-mailing list.
-
-### Bug reports
-
-If you're reporting a bug make sure to list:
-
- 0. which version of GTK are you using?
- 0. which operating system are you using?
- 0. the necessary steps to reproduce the issue
- 0. the expected outcome
- 0. a description of the behavior; screenshots are also welcome
- 0. a small, self-contained example exhibiting the behavior; if this
-    is not available, try reproducing the issue using the GTK examples
-    or interactive tests
-
-If the issue includes a crash, you should also include:
-
- 0. the eventual warnings printed on the terminal
- 0. a backtrace, obtained with tools such as GDB or LLDB
-
-For small issues, such as:
-
- - spelling/grammar fixes in the documentation
- - typo correction
- - comment clean ups
- - changes to metadata files (CI, `.gitignore`)
- - build system changes
- - source tree clean ups and reorganizations
-
-You should directly open a merge request instead of filing a new issue.
-
-### Features and enhancements
-
-Feature discussion can be open ended and require high bandwidth channels; if
-you are proposing a new feature on the issue tracker, make sure to make
-an actionable proposal, and list:
-
- 0. what you're trying to achieve
- 0. prior art, in other toolkits or applications
- 0. design and theming changes
-
-If you're proposing the integration of new features it helps to have
-multiple applications using shared or similar code, especially if they have
-iterated over it various times.
-
-Each feature should also come fully documented, and with tests.
-
-## Your first contribution
-
-### Prerequisites
-
-If you want to contribute to the GTK project, you will need to have the
-development tools appropriate for your operating system, including:
-
- - Python 3.x
- - Meson
- - Ninja
- - Gettext (19.7 or newer)
- - a [C99 compatible compiler](https://wiki.gnome.org/Projects/GLib/CompilerRequirements)
-
-Up-to-date instructions about developing GNOME applications and libraries
-can be found on [the GNOME Developer Center](https://developer.gnome.org).
-
-The GTK project uses GitLab for code hosting and for tracking issues. More
-information about using GitLab can be found [on the GNOME
-wiki](https://wiki.gnome.org/GitLab).
-
-### Dependencies
-
-In order to get GTK from Git installed on your system, you need to have the
-required versions of all the software dependencies required by GTK; typically,
-this means a recent version of GLib, Cairo, Pango, and ATK, as well as the
-platform-specific dependencies for the windowing system you are using (Wayland,
-X11, Windows, or macOS).
-
-The core dependencies for GTK are:
-
- - [GLib, GObject, and GIO](https://gitlab.gnome.org/GNOME/glib)
- - [Cairo](http://cairographics.org)
- - [Pango](https://gitlab.gnome.org/GNOME/pango)
- - [GdkPixbuf](https://gitlab.gnome.org/GNOME/gdk-pixbuf)
- - [Epoxy](https://github.com/anholt/libepoxy)
- - [ATK](https://gitlab.gnome.org/GNOME/atk)
- - [Graphene](https://github.com/ebassi/graphene)
-
-GTK will attempt to download and build some of these dependencies if it
-cannot find them on your system.
-
-Additionally, you may want to look at projects that create a development
-environment for you, like [jhbuild](https://wiki.gnome.org/HowDoI/Jhbuild)
-and [gvsbuild](https://github.com/wingtk/gvsbuild).
-
-### Getting started
-
-You should start by forking the GTK repository from the GitLab web UI, and
-cloning from your fork:
-
-```sh
-$ git clone https://gitlab.gnome.org/yourusername/gtk.git
-$ cd gtk
-```
-
-**Note**: if you plan to push changes to back to the main repository and
-have a GNOME account, you can skip the fork, and use the following instead:
-
-```sh
-$ git clone git@gitlab.gnome.org:GNOME/gtk.git
-$ cd gtk
-```
-
-To compile the Git version of GTK on your system, you will need to
-configure your build using Meson:
-
-```sh
-$ meson _builddir .
-$ cd _builddir
-$ ninja
-```
-
-Typically, you should work on your own branch:
-
-```sh
-$ git checkout -b your-branch
-```
-
-Once you've finished working on the bug fix or feature, push the branch
-to the Git repository and open a new merge request, to let the GTK
-maintainers review your contribution.
-
-### Code reviews
-
-Each contribution is reviewed by the core developers of the GTK project.
-
-The [CODEOWNERS](./docs/CODEOWNERS) document contains the list of core
-contributors to GTK and the areas for which they are responsible; you
-should ensure to receive their review and signoff on your changes.
-
-### Commit messages
-
-The expected format for git commit messages is as follows:
-
-```plain
-Short explanation of the commit
-
-Longer explanation explaining exactly what's changed, whether any
-external or private interfaces changed, what bugs were fixed (with bug
-tracker reference if applicable) and so forth. Be concise but not too
-brief.
-
-Closes #1234
-```
-
- - Always add a brief description of the commit to the _first_ line of
- the commit and terminate by two newlines (it will work without the
- second newline, but that is not nice for the interfaces).
-
- - First line (the brief description) must only be one sentence and
- should start with a capital letter unless it starts with a lowercase
- symbol or identifier. Don't use a trailing period either. Don't exceed
- 72 characters.
-
- - The main description (the body) is normal prose and should use normal
- punctuation and capital letters where appropriate. Consider the commit
- message as an email sent to the developers (or yourself, six months
- down the line) detailing **why** you changed something. There's no need
- to specify the **how**: the changes can be inlined.
-
- - When committing code on behalf of others use the `--author` option, e.g.
- `git commit -a --author "Joe Coder <joe@coder.org>"` and `--signoff`.
-
- - If your commit is addressing an issue, use the
- [GitLab syntax](https://docs.gitlab.com/ce/user/project/issues/automatic_issue_closing.html)
- to automatically close the issue when merging the commit with the upstream
- repository:
-
-```plain
-Closes #1234
-Fixes #1234
-Closes: https://gitlab.gnome.org/GNOME/gtk/issues/1234
-```
-
- - If you have a merge request with multiple commits and none of them
- completely fixes an issue, you should add a reference to the issue in
- the commit message, e.g. `Bug: #1234`, and use the automatic issue
- closing syntax in the description of the merge request.
-
-### Commit access to the GTK repository
-
-GTK is part of the GNOME infrastructure. At the current time, any
-person with write access to the GNOME repository can merge changes to
-GTK. This is a good thing, in that it encourages many people to work
-on GTK, and progress can be made quickly. However, GTK is a fairly
-large and complicated project on which many other things depend, so to
-avoid unnecessary breakage, and to take advantage of the knowledge
-about GTK that has been built up over the years, we'd like to ask
-people committing to GTK to follow a few rules:
-
-0. Ask first. If your changes are major, or could possibly break existing
-   code, you should always ask. If your change is minor and you've been
-   working on GTK for a while it probably isn't necessary to ask. But when
-   in doubt, ask. Even if your change is correct, somebody may know a
-   better way to do things. If you are making changes to GTK, you should
-   be subscribed to the [gtk-devel](https://mail.gnome.org/mailman/listinfo/gtk-devel-list)
-   mailing list; this is a good place to ask about intended changes.
-   The `#gtk` IRC channel on irc.gnome.org is also a good place to find GTK
-   developers to discuss changes, but if you live outside of the EU/US time
-   zones, an email to the gtk-devel mailing list is the most certain and
-   preferred method.
-
-0. Ask _first_.
-
-0. Always write a meaningful commit message. Changes without a sufficient
-   commit message will be reverted.
-
-0. Never push to the `master` branch, or any stable branches, directly; you
-   should always go through a merge request, to ensure that the code is
-   tested on the CI infrastructure at the very least. A merge request is
-   also the proper place to get a comprehensive code review from the core
-   developers of GTK.
-
-If you have been contributing to GTK for a while and you don't have commit
-access to the repository, you may ask to obtain it following the [GNOME account
-process](https://wiki.gnome.org/AccountsTeam/NewAccounts).

COPYING

@@ -1,15 +1,15 @@
-                  GNU LIBRARY GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
 
  Copyright (C) 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    		    59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
 [This is the first released version of the library GPL.  It is
  numbered 2 because it goes with version 2 of the ordinary GPL.]
 
-                            Preamble
+			    Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -99,7 +99,7 @@ works together with the library.
   Note that it is possible for a library to be covered by the ordinary
 General Public License rather than by this special one.
 
-                  GNU LIBRARY GENERAL PUBLIC LICENSE
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library which
@@ -411,7 +411,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-                            NO WARRANTY
+			    NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -434,7 +434,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-                     END OF TERMS AND CONDITIONS
+		     END OF TERMS AND CONDITIONS
 
            How to Apply These Terms to Your New Libraries
 
@@ -463,8 +463,9 @@ convey the exclusion of warranty; and each file should have at least the
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    License along with this library; if not, write to the 
+    Free Software Foundation, Inc., 59 Temple Place - Suite 330, 
+    Boston, MA  02111-1307  USA.
 
 Also add information on how to contact you by electronic and paper mail.
 

ChangeLog.gtk-async-file-chooser

@@ -0,0 +1,514 @@
+2006-04-30  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilesystem.[ch] (gtk_file_info_render_icon): remove the
+	caching code,
+	(gtk_file_info_get_icon_name): new function,
+	(gtk_file_system_volume_get_icon_name): new function,
+	(gtk_file_system_volume_render_icon): refactor to use
+	get_icon_name() and render the icon on the fly.
+
+	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_volume_render_icon),
+	(gtk_file_system_unix_volume_get_icon_name): reflect updates in
+	file system interface,
+	(get_fallback_icon): remove, along with icon caching code.
+
+	* gtk/gtk.symbols: updated.
+
+2006-04-30  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilesystemmodel.c (got_root_folder_cb), (ref_path_cb),
+	(get_children_get_folder_cb): don't leak the handle,
+	(got_root_folder_cb), (get_children_get_folder_cb): emit
+	row-inserted for the newly added nodes.
+
+2006-04-30  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilechooserdefault.c (file_list_drag_data_select_uris),
+	(file_list_drag_data_received_get_info_cb),
+	(file_list_drag_data_received_cb): refactor code for selecting
+	multiple uris into file_list_drag_data_select_uris().
+
+2006-04-23  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilechooserbutton.c (dnd_select_folder_get_info_cb): don't
+	leak handle,
+	(change_icon_theme_get_info_cb), (set_info_get_info_cb),
+	(model_add_special_get_info_cb), (update_label_get_info_cb): ditto.
+
+	* gtk/gtkfilechooserdefault.c (shortcuts_reload_icons_get_info_cb):
+	don't leak the handle,
+	(get_file_info_finished), (edited_idle_create_folder_cb),
+	(file_list_drag_data_received_get_info_cb),
+	(show_and_select_paths_get_folder_cb),
+	(update_current_folder_get_info_cb), (add_shortcut_get_info_cb),
+	(confirmation_confirm_get_info_cb), (action_create_folder_cb),
+	(save_entry_get_info_cb), (shortcuts_activate_volume_mount_cb),
+	(shortcuts_activate_get_info_cb), (update_from_entry_get_info_cb):
+	ditto.
+
+	* gtk/gtkfilechooserentry.c (load_directory_get_folder_callback):
+	don't leak the handle.
+
+	* gtk/gtkpathbar.c (set_button_image_get_info_cb),
+	(gtk_path_bar_get_info_callback): don't leak the handle.
+
+2006-04-23  Kristian Rietveld  <kris@imendio.com>
+
+	Review.
+
+	* gtk/gtkfilechooserdefault.c (shortcuts_reload_icons_get_info_cb):
+	don't forget to unref data->impl at the end.
+
+2006-04-23  Kristian Rietveld  <kris@imendio.com>
+
+	Review, continued.
+
+	* gtk/gtkfilechooserdialog.c (response_cb): set response_requested
+	to FALSE after stopping emission of the response signal.
+
+2006-03-16  Kristian Rietveld  <kris@imendio.com>
+
+	More review work.
+
+	* gtk/gtkfilechooserprivate.h: remove idle_finished_loading_source
+	from GtkFileSystemModel.
+
+	* gtk/gtkfilesystemmodel.c (gtk_file_system_model_finalize): remove
+	idle_finished_loading_source,
+	(idle_finished_loading_cb), (queue_finished_loading): removed,
+	(got_root_folder_cb): save a list walk, immediately emit
+	finished-loading and don't queue it, since we are already in an
+	idle here, always list_children() so the children the folder already
+	has are returned, 
+	(_gtk_file_system_model_new): handle the case where NULL is
+	returned by _get_folder(),
+	(_gtk_file_system_model_path_do): remove comment, and append the
+	new handle to the list, don't try to remove,
+	(get_children_get_folder_cb): save a list walk, remove the dummy
+	child if the _get_folder() call fails or is cancelled.
+
+2006-03-14  Kristian Rietveld  <kris@imendio.com>
+
+	More suggestions from Federico.
+
+	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_create_folder):
+	remove check for filename_is_root(), since we never hit that code
+	and else mkdir will fail anyway,
+	(gtk_file_system_unix_create_folder): fixup parent folder refresh
+	code.
+
+2006-03-14  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilesystemunix.c (read_hidden_file), (fill_in_hidden),
+	(get_is_hidden_for_file): factor out g_file_get_contents() code
+	in read_hidden_file().  (Federico Mena Quintero).
+
+2006-03-14  Kristian Rietveld  <kris@imendio.com>
+
+	Icon name code suggestions by Federico Mena Quintero.
+
+	* gtk/gtkfilesystemunix.c: add GTK_FILE_INFO_ICON to
+	STAT_NEEDED_MASK,
+	(get_fallback_icon_name), (get_fallback_icon),
+	(get_icon_name_for_directory), (get_special_icon_name): get rid
+	of strdups,
+	(get_icon_type_from_path): add a statbuf argument and use the
+	statbuf when folder_unix is NULL,
+	(create_file_info): adapt to work with above changes.
+
+2006-03-14  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_info): path
+	is NULL is an error here (gtk_file_system_get_info() already guards
+	path = NULL),
+	(gtk_file_system_unix_get_info): move basename creation to just
+	before create_file_info().  (Federico Mena Quintero).
+
+2006-03-14  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilesystemunix.c (struct _GtkFileFolderUnix): add
+	load_folder_id field,
+	(load_folder): add thread enter/leave construct, set load_folder_id
+	to zero since we have the idle removed when we return,
+	(gtk_file_system_unix_get_folder): initialize load_folder_id to 0
+	and store the source id of the load_folder idle,
+	(gtk_file_folder_unix_finalize): remove the load_folder idle
+	if necessary.  (Federico Mena Quintero).
+
+2006-03-14  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilechooser.c (gtk_file_chooser_get_current_folder): return
+	NULL if there is no current folder path.
+
+	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_map): we
+	reload the current folder if there is one, else we continue the
+	still pending load.
+
+2006-03-14  Kristian Rietveld  <kris@imendio.com>
+
+	Couple of fixes from Markku Vire.
+
+	* gtk/gtkfilesystem.c (gtk_file_info_copy): also strdup icon_name
+	and display_key.
+
+	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_create_folder):
+	initialize error to NULL,
+	(gtk_file_folder_unix_list_children): return an empty list for now if
+	we couldn't read the directory.
+
+2005-12-23  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilechooserdefault.c (update_current_folder_get_info_cb),
+	(gtk_file_chooser_default_update_current_folder): set and unset
+	busy cursor while checking whether the given path is a folder.
+
+2005-12-23  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilesystem.h: change the GtkFileInfo argument of the
+	GetInfoCallback to be const.
+
+	* gtk/gtkfilechooserbutton.c, gtk/gtkfilechooserdefault.c,
+	gtk/gtkpathbar.c: changes functions to reflect the above change.
+
+2005-12-23  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilechooserdefault.c, gtk/gtkfilechooserprivate.h: keep track
+	of handles, cancel all pending operations on dispose.
+
+2005-12-23  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilechooserprivate.h (struct _GtkFileSystemModel): add
+	pending_handles field,
+	(struct _FileModelNode): add load_pending flag.
+
+	* gtk/gtkfilesystemmodel.c (gtk_file_system_model_dispose): introduce, 
+	cancel all pending operations here,
+	(got_root_folder_cb), (_gtk_file_system_model_new), (ref_path_cb),
+	(_gtk_file_system_model_path_do): keep track of all pending
+	operations, handle cancelled operations.
+
+2005-12-23  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_finalize),
+	(gtk_file_chooser_button_destroy): move all handle cancellations
+	and object unrefs to destroy.
+
+	* gtk/gtkpathbar.c (gtk_path_bar_finalize), (gtk_path_bar_dispose):
+	likewise.
+
+	* gtk/gtkfilechooserentry.c (gtk_file_chooser_entry_class_init): 
+	add dispose,
+	(gtk_file_chooser_entry_dispose): cancel handles and unrefs
+	objects here instead of finalize.
+
+2005-12-23  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilesystem.c (get_cached_icon): check if "name" is an
+	absolute path, if so load the icon from that file.
+
+	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_folder): fix
+	the build.
+
+2005-12-21  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_folder): remove
+	the FIXME since it doesn't make sense, when we return a cached
+	folder we won't emit finished-loading either,
+	(gtk_file_system_unix_create_folder): remove unused variable,
+	(gtk_file_folder_unix_list_children): remove unused code,
+	(get_is_hidden_for_file): new function,
+	(create_file_info): also handle getting is_hidden when called
+	without a folder unix (from _system_get_info() for example).
+
+2005-12-20  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilechooserdefault.c (check_is_folder): fully removed!
+	woo!,
+	(check_save_entry): add is_folder argument,
+	(gtk_file_chooser_default_get_paths): update check_save_entry() call,
+	(get_display_name_for_folder): removed,
+	(confirmation_confirm_get_info_cb): new function which will
+	handle the confirmation dialog now we have all information for it,
+	(should_respond_after_confirm_overwrite): replace the call to
+	get_display_name_for_folder() with an asynchronous solution,
+	(action_create_folder_cb): request dialog response on successfull
+	folder creation,
+	(gtk_file_chooser_default_should_respond): update call to
+	check_save_entry(); replace the check is folder call for "path"
+	by just using the is_folder return value from check_save_entry();
+	replaced the check is folder call for "parent_path" with an
+	asynchronous setup, remainder of that work is now done in
+	save_entry_get_info_cb(),
+	(save_entry_get_info_cb): new function.
+
+	* gtk/gtkfilechoosermebed.[ch]: add response-requested signal.
+
+	* gtk/gtkfilechooserdialog.c, gtk/gtkfilechooserprivate.h: handle
+	response_requested signal.
+
+	* gtk/gtkfilechooserentry.[ch]
+	(_gtk_file_chooser_entry_get_is_folder): new function.
+
+2005-12-20  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilechooserdefault.c (ref_path_cb): when called with
+	!folder, check if node is the node we are looking for (can be
+	triggered when we call ref_path_cb ourselves after a find_child_node),
+	(_gtk_file_system_model_path_do): introduce parent_node field;
+	after finding a child node in a loaded parent node, don't forget
+	to call ref_path_cb,
+	(get_children_get_folder_cb): don't forget to set data->node->folder
+	to the newly acquired folder.
+
+2005-12-20  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilechooserdefault.c (show_and_select_paths_get_folder_cb):
+	handle case where the folder we get already finished loading.
+
+	* gtk/gtkfilesystemmodel.c (ref_path_cb),
+	(_gtk_file_system_model_path_do): make this work.
+
+2005-12-19  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilechooserdefault.c (shortcuts_update_count): modify
+	in such a way that it can also negatively update the count on
+	failures,
+	(get_file_info_finished): handle failures, update save folder
+	combo box on success,
+	(shortcuts_insert_path): change the boolean return value into a
+	void one, also refilter the model and update the save folder combo
+	box for the non-asynchronous case,
+	(shortcuts_append_home), (shortcuts_append_desktop),
+	(shortcuts_add_volumes), (shortcuts_add_current_folder),
+	(add_shortcuts_get_info_cb): adapt to shortcuts_insert_path() updates.
+
+2005-12-19  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkpathbar.[ch]: add handle fields to ButtonData and
+	GtkPathBar; do correct handle bookkeeping.
+
+	* gtk/gtkfilesystemunix.c (load_folder),
+	(gtk_file_system_unix_get_folder),
+	(gtk_file_folder_unix_is_finished_loading): add is_finished_loading
+	field to GtkFileFolderUnix, which is set to true once we are
+	really finished with loading (previous assumption that we are
+	always finshed loading is not true anymore).
+
+	* gtk/gtkfilesystemmodel.c (got_root_folder_cb): if the folder is
+	finished loading, list the children and update the root level.
+
+	* gtk/gtkfilechooserdefault.c (update_current_folder_get_info_cb):
+	handle cancellation.
+
+2005-12-16  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilesystemunix.c: always call the callback, even when
+	cancelled; ref handles passed to the callback queue functions;
+	don't set cancelled to TRUE in _cancel_operation(), since operations
+	in this backend are always completed,
+	(get_special_icon_name): don't strdup the value of
+	get_icon_name_for_directory() again.
+
+	* gtk/gtkfilechooserbutton.c: adapt to new cancellation policy;
+	reference all objects which are passed as callback arguments; in the
+	callback check if the handles match.
+
+	* gtk/gtkfilechooserentry.c: likewise.
+
+	* gtk/gtkfilechooserdefault.c: likewise.  Also changed the shortcut
+	loading code to be more like the code in GtkFileChooserButton, where
+	we store all handles in the model and have model_row_free_data
+	cancel any pending operations,
+	(shortcuts_model_create): copy the error.
+
+	* gtk/gtkfilechooserprivate.h (struct _GtkFileChooserDefault): remove
+	loading_volumes and loading_bookmarks fields.
+
+	* gtk/gtkfilesystem.c (gtk_file_info_free): free icon_name here...
+
+2005-12-13  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilechooserdefault.c (edited_idle_create_folder_cb): fix
+	thinko.
+
+	* gtk/gtkfilesystemunix.c (dispatch_create_folder_callback),
+	(queue_create_folder_callback): need to copy/free the path,
+	(gtk_file_system_unix_create_folder): put the "reget folder" hack
+	back in, though it's working different now.
+
+2005-12-13  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_finalize),
+	(dnd_select_folder_get_info_cb), (gtk_file_chooser_drag_data_received),
+	(change_icon_theme_get_info_cb), (change_icon_theme),
+	(model_add_special_get_info_cb), (model_add_special),
+	(update_label_get_info_cb), (update_label_and_image): cancel existing
+	operations, if any; added apprioriate fields to
+	GtkFileChooserButtonPrivate.
+
+2005-12-13  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilechooserentry.c (gtk_file_chooser_entry_finalize): if
+	there's a folder loading, cancel the operation,
+	(load_directory_get_folder_callback): set the loading folder handle
+	to NULL,
+	(load_directory_callback): cancel any currently loading folders
+	before starting a new get folder operation.
+
+2005-12-13  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilechooserdefault.c (shortcuts_insert_path): don't overwrite
+	data if it's already set (for example by the "is volume" case).
+
+2005-12-13  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilechooserbutton.c (set_info_get_info_cb),
+	(set_info_for_path_at_iter): store a row reference in the temporary
+	data structure and not an iter,
+	(model_add_special), (model_update_current_folder),
+	(gtk_file_chooser_button_add_shorcut_folder): remove unused pixbuf
+	variable.
+
+2005-12-13  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilechooserdefault.c (get_file_info_finished),
+	(shortcuts_insert_path): replace gtk_file_system_render_icon() call
+	with gtk_file_system_get_file_info(),
+	(gtk_file_chooser_default_add_shortcut_folder),
+	(gtk_file_chooser_default_remove_shortcut_folder): handle shortcuts
+	which are still loading.
+
+	* gtk/gtkfilechooserprivate.h: add shortcuts_loading field to
+	struct _GtkFileChooserDefault.
+
+	* gtk/gtkfilechooserbutton.c (set_info_get_info_cb),
+	(set_info_for_path_at_iter), (model_free_row_data): keep handle
+	and path together; now supports adding/removing shortcuts
+	which are still loading.
+
+2005-12-13  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilesystem.c: make the cancelled field an GObject property.
+
+2005-12-13  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilesystem.h: make the GError argument in the callbacks
+	const.
+
+	* gtk/gtkfilechooserbutton.c: update callbacks,
+	* gtk/gtkfilechooserentry.c: likewise,
+	* gtk/gtkfilechooserdefault.c: likewise,
+	* gtk/gtkfilesystemmodel.c: likewise,
+	* gtk/gtkpathbar.c: likewise.
+
+	* gtk/gtkfilechooserdefault.c (edited_idle_create_folder_cb): copy
+	the error which will be passed to error_creating_folder_dialog(),
+	(action_create_folder_cb): likewise,
+	(file_list_drag_data_received_get_info_cb): add forgotten GError
+	declaration.
+
+2005-12-13  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkpathbar.c (get_button_image), (set_button_image),
+	(set_button_image_get_info_cb),
+	(gtk_path_bar_update_button_appearance): update to new icon
+	rendering call.
+
+2005-12-09  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilechooserdefault.c (file_list_drag_data_received),
+	(gtk_file_chooser_default_add_shortcut_folder),
+	(shortcuts_activate_get_info_cb): replace synchronous check_is_folder
+	calls with an async gtk_file_system_get_info() solution.
+
+2005-12-09  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilesystem.c (icon_cache_element_free), (icon_theme_changed),
+	(get_cached_icon), (gtk_file_info_render_icon): implement pixbuf
+	caching as found in the file system backends.
+
+2005-12-09  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtk.symbols: updated.
+
+	* gtk/gtkfilesystem.[ch] (struct GtkFileInfo): added icon_name field,
+	(enum GtkFileInfoType): added GTK_FILE_INFO_ICON,
+	(gtk_file_info_set_icon_name): new function,
+	(gtk_file_info_render_icon): new function,
+	(gtk_file_system_render_icon): removed.
+
+	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_render_icon): removed,
+	(create_file_info): fill icon_name field if required,
+	(get_*_icon): modified to suit create_file_info() better.
+
+	* gtk/gtkfilechooserbutton.c: modified to use
+	gtk_file_info_render_icon() instead of gtk_file_system_render_icon().
+
+	* gtk/gtkfilechooserdefault.c: likewise.
+
+2005-12-06  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilechooserdefault.c (get_file_info_finished),
+	(update_current_folder_get_info_cb): fix mem leaks.
+
+	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_info): ditto.
+
+	* gtk/gtkpathbar.c (gtk_path_bar_set_path_finish): ditto.
+
+2005-12-06  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilechooserbutton.c (dnd_select_folder_get_info_cb),
+	(gtk_file_chooser_button_drag_data_received): make asynchronous,
+	(update_label_and_image): remove unused variable.
+
+	* gtk/gtkfilechooserdefault.c
+	(gtk_file_chooser_default_update_current_folder): split in two
+	functions, so we can have the is_folder check back.
+	* gtk/gtkfilechooserprivate.h: add update_current_folder_handle
+	field.
+
+2005-12-06  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkfilechooserdefault.c (show_and_select_paths): fixed a typo.
+
+2005-12-05  Federico Mena Quintero  <federico@ximian.com>
+
+	(merge from HEAD)
+
+	* gtk/gtkfilechooserdefault.c (trap_activate_cb): "event->state &
+	modifiers", not "event->state && modifiers".  Patch by Sadrul
+	Habib Chowdhury <imadil@gmail.com>.  Fixes bug #323073.
+
+2005-12-06  Kristian Rietveld  <kris@imendio.com>
+
+	Beginnings of an asynchronous file chooser.
+
+	* gtk/gtkfilechooserbutton.c: display name and the is folder property
+	are now asynchronously set using set_info_for_at_path_iter(), the
+	is folder property is now also stored in the tree model.
+
+	* gtk/gtkfilechooserdefault.c: lots of changes to the shortcuts
+	model code to make it operate asynchronously, check_is_folder() has
+	been "disabled" for now, all other synchronous calls were
+	replaced with asychronous ones.
+
+	* gtk/gtkfilechooserentry.c: update call to 
+	gtk_file_system_get_folder().
+
+	* gtk/gtkfilechooserprivate.h: added two fields.
+
+	* gtk/gtkfilesystem.[ch]: for about 85% changed to the changes
+	outlined in the proposal discussed on gtk-devel-list.
+
+	* gtk/gtkfilesystemmodel.[ch]: updated all asynchronous calls,
+	_gtk_file_system_model_path_do() basically had to be rewritten
+	(and I still need to finish that).
+
+	* gtk/gtkfilesystemunix.c: changed to be compatible with the new
+	GtkFileSystem interface.
+
+	* gtk/gtkpathbar.c (button_clicked_cb): block/unblock the
+	button_clicked_cb callback around the call to
+	gtk_toggle_button_set_active(), avoids button_clicked_cb getting
+	called twice.
+	(_gtk_path_bar_set_path): refactored to be asynchronous.

ChangeLog.gtk-printing

@@ -0,0 +1,500 @@
+2006-04-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* docs/tools/widgets.c (get_all_widgets): Add print dialog
+	and page setup dialog.
+
+2006-04-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkpapersize.c (gtk_paper_size_get_display_name):
+	Call gettext on the standard paper names. 
+
+2006-04-11  Alexander Larsson  <alexl@redhat.com>
+
+	* gdk/gdk.symbols:
+	* gdk/win32/gdkevents-win32.c:
+	* gdk/win32/gdkwin32.h:
+	Add gdk_win32_set_modal_dialog_libgtk_only that we
+	need for handling the mainloop in the print dialogs.
+
+	* gtk/gtkprintoperation-win32.c:
+	Pump the gtk+ mainloop when needed in the print dialogs.
+	This means gtk+ windows will redraw while the print dialogs
+	are up.
+
+2006-04-10  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtkprintoperation-win32.c: 
+	Better size handling.
+	Save win32-specific settings in additions to the generic ones
+	if the generic one is lossy.
+
+2006-04-10  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtkprintoperation-win32.c:
+	Finish implementing run_page_setup_dialog.
+
+	* gtk/gtkpagesetup.h:
+	* gtk/gtkpapersize.h:
+	* gtk/gtkprint-win32.h:
+	* gtk/gtkprintcontext.h:
+	* gtk/gtkprinter-private.h:
+	* gtk/gtkprintoperation-private.h:
+	* gtk/gtkprintoperation-unix.c:
+	* gtk/gtkprintoperation.h:
+	* gtk/gtkprintsettings.h:
+	s/EGG/GTK/
+
+2006-04-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk+-unix-print-2.0.pc.in: Fix a typo  (#337698)
+
+2006-04-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/paper_names_offsets.c: 
+	* gtk/gen-paper-names.c: Correct the suffix/duplicate optimizations.
+
+2006-04-07  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtkprintoperation-win32.c:
+	Initial work on gtk_print_run_page_setup_dialog.
+	Not reading margins yet.
+
+2006-04-07  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/Makefile.am:
+	Link to winspool
+	
+	* gtk/gtk.symbols:
+	* gtk/gtkprintoperation-private.h:
+	* gtk/gtkprintoperation-unix.c:
+	* gtk/gtkprintoperation.[ch]: 
+	Add gtk_print_operation_get_status_string() and status
+	string to _gtk_print_operation_set_status.
+	Rename GTK_PRINT_STATUS_PROCESSING to GTK_PRINT_STATUS_PRINTING.
+	
+	* gtk/gtkprintoperation-win32.c:
+	Poll for status updates
+	
+	* modules/printbackends/cups/gtkprintbackendcups.c:
+	Rename GTK_PRINT_STATUS_PROCESSING to GTK_PRINT_STATUS_PRINTING.
+	
+	* tests/print-editor.c:
+	Show print status string
+
+2006-04-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/paper_names_offsets.c: 
+	* gtk/gtkpapersize.c: Save 4K of .data by converting
+	the array of paper names to offsets. 
+
+	* gtk/gen-paper-names.c: Utility used to create
+	paper_names_offsets.c from paper_names.c.
+
+	* gtk/Makefile.am: Necessary glue.
+
+2006-04-06  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtkprintoperation-win32.c: 
+	Use glib base64 code.
+	Set up manual_* vars fully.
+
+2006-04-06  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/Makefile.am:
+	Add -lcomdlg32 on win32
+	
+	* gtk/gtkprint-win32.h:
+	Move WINVER define to .c files
+	
+	* gtk/gtk.symbols:
+	* gtk/gtkprintoperation-win32.c:
+	Add empty gtk_print_run_page_setup win implementation
+	Move WINVER define to this file
+	
+	* modules/Makefile.am:
+	Only build print backends on unix
+
+2006-04-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkprintunixdialog.c:
+	* gtk/gtkprintoperation-unix.c: Use GTK_RESPONSE_CANCEL/OK
+	instead of GTK_RESPONSE_REJECT/ACCEPT, to make Esc close
+	the dialog, and to not use values which are documented
+	as reserved for apps.
+
+2006-04-05  Alexander Larsson  <alexl@redhat.com>
+
+	* modules/printbackends/lpr/gtkprintbackendlpr.c:
+	Don't hardcode lpr command, expose full commandline.
+
+2006-04-05  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtkpagesetupunixdialog.c:
+	* gtk/gtkprintunixdialog.c:
+	Don't check for printer changes after dialog is dead.
+	
+	* gtk/gtkprintbackend.c: (gtk_print_backend_load_modules):
+	Strip whitespace from backend strings
+	
+	* gtk/gtkprintbackend.h:
+	Add private printer functions
+	
+	* gtk/gtkprinter-private.h:
+	Move GtkPrinterPrivate into gtkprinter.c
+	
+	* gtk/gtkprinter.[ch]:
+	Move GtkPrinterPrivate into gtkprinter.c
+	Add new construct properties.
+	Add setter functions.
+	
+	* modules/printbackends/cups/gtkprintbackendcups.c:
+	* modules/printbackends/cups/gtkprintercups.[ch]:
+	Update to new APIs.
+	
+	* modules/printbackends/lpr/Makefile.am:
+	* modules/printbackends/lpr/gtkprintbackendlpr.c:
+	* modules/printbackends/lpr/gtkprinterlpr.[ch]
+	Update to new APIs.
+	Remove GtkPrinterLPR.
+	Read/Save command line option in settings
+	
+	* modules/printbackends/pdf/Makefile.am:
+	* modules/printbackends/pdf/gtkprintbackendpdf.c:
+	* modules/printbackends/pdf/gtkprinterpdf.[ch]:
+	Update to new APIs.
+	Remove GtkPrinterPDF.
+
+2006-04-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkprintoperation.h: Add missing standard
+	GObject macros.  (#337277, Yevgen Muntyan)
+
+2006-04-04  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtkprinteroption.[ch]:
+	Add gtk_printer_option_has_choice.
+	
+	* gtk/gtkprintunixdialog.c:
+	* modules/printbackends/cups/gtkprintbackendcups.c:
+	Add support for "print at time".
+
+2006-04-04  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtkpapersize.c:
+	Handle ppd names with ".Transverse" suffix
+	Don't force width < height
+	
+	* gtk/gtkprinteroption.c:
+	Make sure that value is never NULL.
+	
+	* modules/printbackends/cups/gtkprintbackendcups.c:
+	Add some HP whitelist names
+	Remove spew from ignored options.
+
+2006-04-03  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtkpagesetupunixdialog.c:
+	Fix warnings
+	
+	* gtk/gtkprinter-private.h:
+	* gtk/gtkprinter.[ch]:
+	Add gtk_printer_is_default.
+	
+	* gtk/gtkprintunixdialog.c:
+	Use gtk_printer_is_default.
+	
+	* modules/printbackends/cups/gtkprintbackendcups.c:
+	Get default printer info
+	
+	* modules/printbackends/pdf/gtkprintbackendpdf.c:
+	Fix warning.
+
+2006-04-03  Alexander Larsson  <alexl@redhat.com>
+
+	* modules/printbackends/pdf/gtkprintbackendpdf.c:
+	* modules/printbackends/pdf/gtkprinterpdf.[ch]:
+	Correctly read/write/use the output filename setting.
+
+2006-04-03  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtkpagesetupunixdialog.c:
+	Disable margin from printers if there are no printers.
+	
+	* gtk/gtkpapersize.c:
+	Fix build.
+
+2006-04-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk.symbols: protect unix-only symbols by 
+	G_OS_UNIX (#336819, Yevgen Muntyan)
+
+	* gtk/gtkpapersize.c: Win32 fixes.  (#336806, Yevgen Muntyan)
+
+2006-03-30  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtk.symbols:
+	Update
+	
+	* gtk/gtkprintbackend.[ch]:
+	Add dnotify to gtk_print_backend_print_stream
+	
+	* gtk/gtkprinter-private.h:
+	Declare gtk_print_job_set_status
+	
+	* gtk/gtkprinter.[ch]:
+	Remove gtk_printer_prepare_job.
+	
+	* gtk/gtkprintjob.[ch]:
+	Now you create print job directly with gtk_print_job_new() and
+	they'll be prepared automatically.
+	Add status_changed signal and get_status.
+	Add gtk_print_job_set_source_file to allow sending a file.
+	
+	* gtk/gtkprintoperation-private.h:
+	Add destroy notify for platform_data.
+	Declare _gtk_print_operation_set_status.
+	
+	* gtk/gtkprintoperation-unix.c:
+	Hook up status change handling.
+	Use the new way to get a print job.
+
+	* gtk/gtkprintoperation.[ch]:
+	Add status_changed signal and get_status/is_finished.
+
+	
+	* modules/printbackends/cups/gtkprintbackendcups.c:
+	* modules/printbackends/lpr/gtkprintbackendlpr.c:
+	* modules/printbackends/pdf/gtkprintbackendpdf.c:
+	Update to use new APIs and set status on the job.
+	Cups polls for the status.
+	
+	* tests/print-editor.c:
+	Track the print operations in the status bar.
+
+2006-03-30  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/Makefile.am:
+	* gtk/gtkprintbackend.c:
+	Default to "pdf,cups" if we found cups, and
+	"pdf,lpr" otherwise.
+
+2006-03-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* modules/printbackends/Makefile.am: 
+	* configure.in: Don't build the cups backend 
+	if cups is not there.
+
+2006-03-29  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtk.symbols:
+	gtk_printer_prep_job -> gtk_printer_prepare_job
+	gtk_print_job_prep -> gtk_print_job_prepare
+	
+	* gtk/gtkprintbackend.h:
+	* gtk/gtkprinter-private.h:
+	* gtk/gtkprinter.[ch]:
+	Add print_job argument to printer_prepare_for_print
+	gtk_printer_prep_job -> gtk_printer_prepare_job
+	
+	* gtk/gtkprintjob.[ch]:
+	Add manual rendering settings to GtkPrintJob.
+	gtk_print_job_prep -> gtk_print_job_prepare
+	
+	* gtk/gtkprintoperation-private.h:
+	* gtk/gtkprintoperation-unix.c:
+	* gtk/gtkprintoperation.c:
+	Get more manual_* settings working.
+	Run mainloop after each printed page.
+
+	* gtk/gtkprintunixdialog.c:
+	Save page ranges.
+	
+	* modules/printbackends/cups/gtkprintbackendcups.c:
+	* modules/printbackends/lpr/gtkprintbackendlpr.c:
+	* modules/printbackends/pdf/gtkprintbackendpdf.c:
+	Now put the manual_* settings inside the PrintJob in
+	prepare_for_print.
+
+2006-03-29  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtkprintunixdialog.c:
+	Make sure we remember the format-for printer.
+	Also, use it as the default if set.
+
+2006-03-28  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtkprintunixdialog.c:
+	Remove unnecessary padding under list.
+	
+2006-03-28  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtkpagesetupunixdialog.c:
+	* gtk/gtkprintunixdialog.c:
+	More HIGy layout.
+
+2006-03-28  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtkpagesetupunixdialog.c:
+	HIG conformance of spacing and titles.
+	
+	* gtk/gtkprintunixdialog.c:
+	Use standard constructor form print button too.
+
+2006-03-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* modules/printbackends/*/Makefile.am: Fix 
+	a problem with builddir != srcdir builds.
+	(#335915, Yevgen Muntyan)
+
+2006-03-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkprintbackend.c: Simply the syntax
+	of the setting to "cups,pdf", and get rid
+	of the GScanner used to parse it.
+
+2006-03-27  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtkprintunixdialog.c:
+	Reorder print list so status is at the end.
+	Ellipsize the status column.
+
+2006-03-27  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtkpagesetupunixdialog.c:
+	Handle removed printers and status-changed.
+	Handle NULL printer location.
+
+2006-03-27  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/Makefile.am:
+	* gtk/stock-icons/24/gtk-orientation-landscape.png:
+	* gtk/stock-icons/24/gtk-orientation-portrait.png:
+	* gtk/stock-icons/24/gtk-orientation-reverse-landscape.png:
+	* gtk/gtkiconfactory.c: (get_default_icons):
+	* gtk/gtkstock.h:
+	Add orientation stock icons.
+	
+	* gtk/gtkpagesetupunixdialog.c:
+	Use the orientation icons.
+
+2006-03-27  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtkpagesetupunixdialog.c:
+	* gtk/gtkprintjob.c:
+	* gtk/gtkprintoperation-unix.c:
+	* gtk/gtkprintunixdialog.c:
+	s/impl/dialog/
+	Don't prefix static functions with _
+
+2006-03-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkprintunixdialog.c: Don't use _(""). (#335898,
+	Christian Persch)
+
+	* modules/printbackends/*: Don't use G_DEFINE_TYPE
+	in modules.
+
+	* gtk/gtkprintbackend.c: Remove an unused static function.
+
+2006-03-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk.symbols: Add printing symbols
+
+	* gtk/gtkpapersize.[hc]: 
+	* gtk/gtkpage*.[hc]: 
+	* gtk/gtkprint*.[hc]: Add aliasing, #include cleanups.
+
+	* gtk/gtkprintcontext.h:
+	* gtk/gtkprintoperation.h:
+	* gtk/gtkprintsettings.h: Make get_type function const.
+
+	* modules/printbackends/pdf/gtkprintbackendpdf.c: Remove
+	C99ism.
+
+	* modules/printbackends/cups/gtkcupsutils.c: Use unsigned
+	integers for bitfields.
+
+2006-03-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtknotebook.c: Fix docs
+
+	* gtk/Makefile.am (EXTRA_DIST): Add the stock icons here.
+
+	* gdk/directfb/Makefile.am (EXTRA_DIST): Remove ChangeLog,
+	to make make dist happier.
+
+2006-03-24  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	* gtk/gtkprintbackend.c:
+	* modules/printbackends/Makefile.am:
+	* modules/printbackends/cups/Makefile.am:
+	* modules/printbackends/lpr/Makefile.am:
+	* modules/printbackends/lpr/gtkprintbackendlpr.[ch]:
+	* modules/printbackends/lpr/gtkprinterlpr.[ch]:
+	* modules/printbackends/pdf/Makefile.am:
+	* modules/printbackends/pdf/gtkprintbackendpdf.[ch]:
+	* modules/printbackends/pdf/gtkprinterpdf.[ch]:
+	Import pdf and lpr backend
+
+2006-03-24  Alexander Larsson  <alexl@redhat.com>
+
+        Import print-operation into gtk+
+	
+	* .cvsignore:
+	* Makefile.am:
+	* gtk+-unix-print-2.0.pc.in:
+	Add gtk+-unix-print-2.0.pc
+	
+	* configure.in:
+	Look for cups
+	Look for various _NL_* extensions
+	Output new makefiles and .pc.in
+	
+	* gtk/Makefile.am:
+	Add new files
+	
+	* gtk/gtk.h:
+	Include gtkprintoperation.h
+	
+	* gtk/gtkenums.h:
+	Add printing enums
+	
+	* gtk/gtkmarshalers.list:
+	Add required new marshallers
+	
+	* gtk/gtkpagesetup.[ch]:
+	* gtk/gtkpagesetupunixdialog.[ch]:
+	* gtk/gtkpagesetupunixdialog.h:
+	* gtk/gtkpapersize.[ch]:
+	* gtk/gtkprint-win32.[ch]:
+	* gtk/gtkprintbackend.[ch]:
+	* gtk/gtkprintcontext.[ch]:
+	* gtk/gtkprinter-private.h:
+	* gtk/gtkprinter.[ch]:
+	* gtk/gtkprinteroption.[ch]:
+	* gtk/gtkprinteroptionset.[ch]:
+	* gtk/gtkprinteroptionwidget.[ch]:
+	* gtk/gtkprintjob.[ch]:
+	* gtk/gtkprintoperation-private.h:
+	* gtk/gtkprintoperation-unix.c:
+	* gtk/gtkprintoperation-win32.c:
+	* gtk/gtkprintoperation.[ch]:
+	* gtk/gtkprintsettings.[ch]:
+	* gtk/gtkprintunixdialog.[ch]:
+	* gtk/paper_names.c:
+	Generic printing support
+	
+	* modules/Makefile.am:
+	* modules/printbackends/Makefile.am:
+	* modules/printbackends/cups/Makefile.am:
+	* modules/printbackends/cups/gtkcupsutils.[ch]:
+	* modules/printbackends/cups/gtkprintbackendcups.[ch]:
+	* modules/printbackends/cups/gtkprintercups.[ch]:
+	Cups backend
+	
+	* tests/.cvsignore:
+	* tests/Makefile.am:
+	* tests/print-editor.c:
+	Add printing test app
+

HACKING

@@ -0,0 +1,64 @@
+If you want to hack on the GTK+ project, you'll need to have
+the following packages installed:
+
+        - GNU autoconf 2.54
+        - GNU automake 1.7
+        - GNU libtool 1.4
+        - indent (GNU indent 1.9.1 is known good)
+        - GNU gettext 10.40
+
+These should be available by ftp from ftp.gnu.org or any of the
+fine GNU mirrors.  Beta software can be found at alpha.gnu.org.
+
+Up-to-date instructions about developing GNOME applications and libraries
+can be found here:
+
+        http://developer.gnome.org
+
+Information about using git with GNOME can be found here:
+
+        http://live.gnome.org/Git
+
+In order to get GIT gtk+ installed on your system, you need to have
+the most recent GIT versions of glib, pango, and atk installed as well.
+The installation process of these libraries is similar to that of gtk+, but
+needs to be fulfilled prior to installation of gtk+.
+
+If at all possible, please use GIT to get the latest development version of
+gtk+ and glib. You can do the following to get glib and gtk+ from GIT:
+
+        $ git clone git://git.gnome.org/glib
+        $ git clone git://git.gnome.org/pango
+        $ git clone git://git.gnome.org/atk
+        $ git clone git://git.gnome.org/gtk+
+
+Note: if you plan to push changes to back to the master repository and
+have a gnome account, you want to use the following instead:
+
+        $ git clone ssh://<username>@git.gnome.org/git/gtk+
+
+To compile the GIT version of gtk+ on your system, you will need to take
+several steps to setup the tree for compilation.  You can do all these
+steps at once by running:
+
+        gtk+$ ./autogen.sh
+
+Basically this does the following for you:
+
+        gtk+$ aclocal; automake; autoconf
+
+The above commands create the `configure' script.  Now you
+run the `configure' script in `gtk+/' to create all Makefiles.
+More information about that in `INSTALL'.
+
+Before running `autogen.sh' or `configure', make sure you have libtool
+in your path.
+
+Note that autogen.sh runs configure for you.  If you wish to pass
+options like `--prefix=/usr' to `configure' you can give those options
+to `autogen.sh' and they will be passed on to `configure'.
+
+For information about submitting patches and pushing changes
+to GIT, see the `README' and `README.commits' files. In particular,
+don't, under any circumstances, push anything to GIT before
+reading and understanding `README.commmits'.

INSTALL.in

@@ -0,0 +1,33 @@
+Prerequisites
+=============
+
+GTK+ requires the following packages:
+
+ - The GLib, Pango, GdkPixbuf, ATK and cairo libraries, available at the same
+   location as GTK+. GTK+ @GTK_VERSION@ requires at least GLib 2.28.0,
+   Pango 1.20, GdkPixbuf 2.21.0, ATK 1.29.2 and cairo 1.6.0.
+
+ - gobject-introspection 0.9.3 or newer.
+
+Simple install procedure
+========================
+
+  % gzip -cd gtk+-@GTK_VERSION@.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-@GTK_VERSION@			   # change to the toplevel directory
+  % ./configure				   # run the `configure' script
+  % make				   # build GTK+
+  [ Become root if necessary ]
+  % make install			   # install GTK+
+
+The Details
+===========
+
+Complete information about installing GTK+ and related libraries can be found 
+in the file:
+
+ docs/reference/gtk/html/gtk-building.html
+
+Or online at:
+
+ http://developer.gnome.org/doc/API/2.0/gtk/gtk-building.html
+

MAINTAINERS

@@ -0,0 +1,12 @@
+Matthias Clasen
+E-mail: mclasen@redhat.com
+Userid: matthiasc
+
+Tim Janik
+E-mail: timj@gtk.org
+Userid: timj
+
+Note that a lot of people are contributing to GTK+, and some parts of it 
+are technically maintained by other people. The people listed above are
+meant as contacts for administrative questions such as cvs accounts. Other
+questions are best directed to the mailing list gtk-devel-list@gnome.org.

Makefile.am

@@ -0,0 +1,258 @@
+## Makefile.am for GTK+
+include $(top_srcdir)/Makefile.decl
+
+SRC_SUBDIRS = gdk gtk modules demos tests perf
+SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
+
+# require automake 1.4
+AUTOMAKE_OPTIONS = 1.7
+ACLOCAL_AMFLAGS = -I m4
+
+EXTRA_DIST +=			\
+	HACKING			\
+	makecopyright		\
+	NEWS.pre-1-0		\
+	ChangeLog.pre-1-0	\
+	ChangeLog.pre-1-2	\
+	ChangeLog.pre-2-0	\
+	ChangeLog.pre-2-2	\
+	ChangeLog.pre-2-4	\
+	ChangeLog.pre-2-6	\
+	ChangeLog.pre-2-8	\
+	ChangeLog.pre-2-10	\
+	ChangeLog.pre-2-12	\
+	ChangeLog.pre-2-14	\
+	ChangeLog.pre-2-16	\
+	ChangeLog.gtk-async-file-chooser	\
+	ChangeLog.gtk-printing	\
+	README.commits	\
+	README.win32		\
+	config.h.win32		\
+	makefile.msc	\
+	gtk-zip.sh.in		\
+	sanitize-la.sh		\
+	po/README.translators	\
+	po/po2tbl.sed.in	\
+	examples/aspectframe/Makefile  \
+	examples/aspectframe/aspectframe.c  \
+	examples/Makefile  \
+	examples/README.1ST  \
+	examples/extract.awk  \
+	examples/extract.sh  \
+	examples/arrow/Makefile	\
+	examples/arrow/arrow.c	\
+	examples/base/Makefile  \
+	examples/base/base.c  \
+	examples/buttonbox/Makefile \
+	examples/buttonbox/buttonbox.c	\
+	examples/buttons/Makefile  \
+	examples/buttons/buttons.c  \
+	examples/buttons/info.xpm  \
+	examples/calendar/Makefile  \
+	examples/calendar/calendar.c  \
+	examples/clist/Makefile  \
+	examples/clist/clist.c  \
+	examples/entry/Makefile  \
+	examples/entry/entry.c  \
+	examples/eventbox/Makefile  \
+	examples/eventbox/eventbox.c  \
+	examples/filesel/Makefile  \
+	examples/filesel/filesel.c  \
+	examples/gtkdial/Makefile  \
+	examples/gtkdial/dial_test.c  \
+	examples/gtkdial/gtkdial.c  \
+	examples/gtkdial/gtkdial.h  \
+	examples/helloworld/Makefile  \
+	examples/helloworld/helloworld.c  \
+	examples/helloworld2/Makefile  \
+	examples/helloworld2/helloworld2.c  \
+	examples/label/Makefile	\
+	examples/label/label.c	\
+	examples/list/Makefile  \
+	examples/list/list.c  \
+	examples/menu/Makefile  \
+	examples/menu/menu.c  \
+	examples/menu/itemfactory.c  \
+	examples/notebook/Makefile  \
+	examples/notebook/notebook.c  \
+	examples/packbox/Makefile  \
+	examples/packbox/packbox.c  \
+	examples/paned/Makefile  \
+	examples/paned/paned.c  \
+	examples/pixmap/Makefile  \
+	examples/pixmap/pixmap.c  \
+	examples/progressbar/Makefile  \
+	examples/progressbar/progressbar.c  \
+	examples/radiobuttons/Makefile  \
+	examples/radiobuttons/radiobuttons.c  \
+	examples/rangewidgets/Makefile  \
+	examples/rangewidgets/rangewidgets.c  \
+	examples/rulers/Makefile  \
+	examples/rulers/rulers.c  \
+	examples/scribble-simple/Makefile  \
+	examples/scribble-simple/scribble-simple.c  \
+	examples/scribble-xinput/Makefile	\
+	examples/scribble-xinput/scribble-xinput.c	\
+	examples/scrolledwin/Makefile  \
+	examples/scrolledwin/scrolledwin.c  \
+	examples/selection/Makefile  \
+	examples/selection/gettargets.c  \
+	examples/selection/setselection.c  \
+	examples/statusbar/Makefile  \
+	examples/statusbar/statusbar.c  \
+	examples/table/Makefile  \
+	examples/table/table.c  \
+	examples/text/Makefile  \
+	examples/text/text.c  \
+	examples/tictactoe/Makefile  \
+	examples/tictactoe/tictactoe.c  \
+	examples/tictactoe/tictactoe.h  \
+	examples/tictactoe/ttt_test.c  \
+	examples/tree/Makefile  \
+	examples/tree/tree.c  \
+	examples/wheelbarrow/Makefile  \
+	examples/wheelbarrow/wheelbarrow.c  \
+	examples/fixed/fixed.c  \
+	examples/fixed/Makefile  \
+	examples/frame/frame.c  \
+	examples/frame/Makefile  \
+	examples/spinbutton/spinbutton.c  \
+	examples/spinbutton/Makefile  \
+	examples/find-examples.sh
+MAINTAINERCLEANFILES = \
+	$(srcdir)/INSTALL \
+	$(srcdir)/README \
+	$(srcdir)/aclocal.m4 \
+	$(srcdir)/autoscan.log \
+	$(srcdir)/compile \
+	$(srcdir)/config.guess \
+	$(srcdir)/config.h.in \
+	$(srcdir)/config.sub \
+	$(srcdir)/configure.scan \
+	$(srcdir)/depcomp \
+	$(srcdir)/install-sh \
+	$(srcdir)/ltmain.sh \
+	$(srcdir)/missing \
+	$(srcdir)/mkinstalldirs \
+	$(srcdir)/omf.make \
+	$(srcdir)/xmldocs.make \
+	$(srcdir)/gtk-doc.make \
+	$(srcdir)/ChangeLog \
+	`find "$(srcdir)" -type f -name Makefile.in -print`
+
+GDKTARGET=@gdktarget@
+
+## Copy .pc files to target-specific names
+gtk+-$(GDKTARGET)-2.0.pc: gtk+-2.0.pc
+	rm -f gtk+-$(GDKTARGET)-2.0.pc && \
+	cp gtk+-2.0.pc gtk+-$(GDKTARGET)-2.0.pc
+
+gdk-$(GDKTARGET)-2.0.pc: gdk-2.0.pc
+	rm -f gdk-$(GDKTARGET)-2.0.pc && \
+	cp gdk-2.0.pc gdk-$(GDKTARGET)-2.0.pc
+
+gtk+-$(GDKTARGET)-2.0-uninstalled.pc: gtk+-2.0-uninstalled.pc
+	rm -f gtk+-$(GDKTARGET)-2.0-uninstalled.pc && \
+	cp gtk+-2.0-uninstalled.pc gtk+-$(GDKTARGET)-2.0-uninstalled.pc
+
+gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc
+	rm -f gdk-$(GDKTARGET)-2.0-uninstalled.pc && \
+	cp gdk-2.0-uninstalled.pc gdk-$(GDKTARGET)-2.0-uninstalled.pc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA= gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc gail.pc
+
+if OS_UNIX
+pkgconfig_DATA += gtk+-unix-print-2.0.pc
+endif
+
+DISTCLEANFILES =				\
+	gtk+-unix-print-2.0.pc			\
+	gtk+-$(GDKTARGET)-2.0.pc		\
+	gdk-$(GDKTARGET)-2.0.pc			\
+	gail.pc					\
+	gtk+-$(GDKTARGET)-2.0-uninstalled.pc	\
+	gdk-$(GDKTARGET)-2.0-uninstalled.pc	\
+	gail-uninstalled.pc 			\
+	config.lt
+
+distclean-local:
+	if test "$(srcdir)" = "."; then :; else \
+		rm -f ChangeLog; \
+	fi
+
+ChangeLog:
+	@echo Creating $@
+	@if test -d "$(srcdir)/.git"; then \
+	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log GTK_2_16_0^^.. --stat) | fmt --split-only > $@.tmp \
+	  && mv -f $@.tmp $@ \
+	  || ($(RM) $@.tmp; \
+	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
+	else \
+	  test -f $@ || \
+	  (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
+	  echo A git checkout and git-log is required to generate this file >> $@); \
+	fi
+
+## copy the default target for this platform to gdk-2.0.pc and gtk+-2.0.pc
+DEFAULT_GDKTARGET=x11
+install-data-hook:
+	(cd $(DESTDIR)$(pkgconfigdir) && \
+	 test -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc && \
+	 test -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc && \
+	 rm -f gdk-2.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc gdk-2.0.pc && \
+	 rm -f gtk+-2.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc gtk+-2.0.pc) || \
+	(cd $(DESTDIR)$(pkgconfigdir) && \
+	 rm -f gdk-2.0.pc && cp -f gdk-$(GDKTARGET)-2.0.pc gdk-2.0.pc && \
+	 rm -f gtk+-2.0.pc && cp -f gtk+-$(GDKTARGET)-2.0.pc gtk+-2.0.pc)
+
+uninstall-local:
+	rm -f $(DESTDIR)$(pkgconfigdir)/gdk-2.0.pc
+	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-2.0.pc
+
+dist-hook:
+	if test -f $(srcdir)/INSTALL.in && test -f $(srcdir)/README.in ; then \
+	     CONFIG_FILES="INSTALL:$(srcdir)/INSTALL.in README:$(srcdir)/README.in" \
+	     CONFIG_HEADERS= \
+	     $(SHELL) config.status \
+	     && cp INSTALL README $(distdir) ; \
+	fi
+
+.PHONY: files release sanity snapshot ChangeLog
+
+files:
+	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
+	  echo $$p; \
+	done
+	@for subdir in $(SUBDIRS); do \
+	  files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \
+	  for file in $$files; do \
+	    echo $$subdir/$$file; \
+	  done; \
+	done
+
+release:
+	rm -rf .deps */.deps
+	$(MAKE) distcheck
+
+sanity:
+	./sanity_check $(VERSION)
+
+
+snapshot:
+	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds --enable-introspection
+
+GITIGNOREFILES = \
+	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

Makefile.decl

@@ -0,0 +1,86 @@
+# GTK+ - The GIMP Toolkit
+
+GTESTER        = gtester		# in $PATH for non-GLIB packages
+GTESTER_REPORT = gtester-report		# in $PATH for non-GLIB packages
+
+# initialize variables for unconditional += appending
+EXTRA_DIST =
+TEST_PROGS =
+
+### testing rules
+
+# Xvfb based test rules
+XVFB = Xvfb -ac -noreset -screen 0 800x600x16
+XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
+   491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \
+   991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \
+  1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \
+  9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \
+  9995 9996 9997 9998 9999
+SKIP_GDKTARGET = \
+	test "$(gdktarget)" != "x11" \
+	&& echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target."
+XVFB_START = \
+	${XVFB} -help 2>/dev/null 1>&2 \
+	&& XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \
+	&& { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \
+	       trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \
+	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+	&& DISPLAY=:$$XID && export DISPLAY
+# call as: $(XVFB_START) && someprogram
+
+# test: run all tests in cwd and subdirs
+test: test-cwd test-recurse
+# test-cwd: run tests in cwd
+test-cwd: ${TEST_PROGS}
+	@$(SKIP_GDKTARGET) || test -z "${TEST_PROGS}" || { \
+	  $(XVFB_START) && { set -e; $(TESTS_ENVIRONMENT) ${GTESTER} --verbose ${TEST_PROGS}; }; \
+	}
+# test-recurse: run tests in subdirs
+test-recurse:
+	@ for subdir in $(SUBDIRS) ; do \
+	    test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \
+	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) test ) || exit $? ; \
+	  done
+# test-report: run tests in subdirs and generate report
+# perf-report: run tests in subdirs with -m perf and generate report
+# full-report: like test-report: with -m perf and -m slow
+test-report perf-report full-report:	${TEST_PROGS}
+	@ ignore_logdir=true ; \
+	  if test -z "$$GTESTER_LOGDIR" ; then \
+	    GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
+	    ignore_logdir=false ; \
+	  fi ; \
+	  for subdir in $(SUBDIRS) ; do \
+	    test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \
+	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
+	  done ; \
+	  $(SKIP_GDKTARGET) || test -z "${TEST_PROGS}" || { \
+	    case $@ in \
+	    test-report) test_options="-k";; \
+	    perf-report) test_options="-k -m=perf";; \
+	    full-report) test_options="-k -m=perf -m=slow";; \
+	    esac ; \
+	    $(XVFB_START) && { \
+	      set -e; \
+	      if test -z "$$GTESTER_LOGDIR" ; then \
+	        ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
+	      elif test -n "${TEST_PROGS}" ; then \
+	        ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
+	      fi ; \
+	    }; \
+	  }; \
+	  $$ignore_logdir || { \
+	    echo '<?xml version="1.0"?>' > $@.xml ; \
+	    echo '<report-collection>'  >> $@.xml ; \
+	    for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
+	      sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
+	    done ; \
+	    echo >> $@.xml ; \
+	    echo '</report-collection>' >> $@.xml ; \
+	    rm -rf "$$GTESTER_LOGDIR"/ ; \
+	    ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
+	  }
+.PHONY: test test-cwd test-recurse test-report perf-report full-report
+# run make test-cwd as part of make check
+check-local: test-cwd

NEWS.pre-2.0

@@ -1,903 +0,0 @@
-Overview of Changes in GTK+ 2.0.0
-=================================
-
-* GtkTreeView fixes [Jonathan Blandford, Kristian Rietveld, Darin Adler]
-* Build fixes [Anders Carlsson, Tor Lillqvist, Manish Singh]
-* Bug fixes. [Thomas Leonard, Owen Taylor]
-
-Overview of Changes in GTK+ 2.0.0 rc1
-=====================================
-
-* GtkTreeView fixes [Kristian Rietveld, Jonathan Blandford, Richard Hult]
-* Text widget fixes [Havoc Pennington]
-* Efficiency fixes when using Xft [Owen Taylor]
-* Key handling fixes and other fixes for Win32 [Hans Breuer, Tor Lillqvist]
-* Try to fix key handling without XKEYBOARD extension [Owen]
-* Documentation fixes and improvements 
-  [Matthias Clasen, Alexey Malyshev, Akira Tagoh, Vitaly Tishkov]
-* Widget drawing improvements [Soeren Sandmann]
-* Allow cycling between multiple menu bars with <Control>Tab [Owen]
-* Try to build libraries with only shared library dependencies on Xft to 
-  deal with transition to Xft2 [Owen]
-* Portability fixes [Owen, Miroslaw Dobrzanski-Neumann]
-* Don't use red as the default cursor color [Owen]
-* Bug fixes, bug fixes, bug fixes.
-
-Other contributors: Darin Adler, Jacob Berkman, Kevin Breit, Hans Breuer, 
-  Anders Carlsson, Damon Chaplin, Finlay Dobbie, Jody Goldberg,
-  Andreas J. Guelzow, Scott Guilbeaux, Vlad Harchev, James Henstridge,
-  Tim Janik, Satyajit Kanungo, Charles Kerr, Sergey Kuzminov, Miles Lane, 
-  Alexander Larsson, Paolo Maggi, Skip Montaro, Jan Mynarik, Sven Neumann, 
-  Padraig O'Briain, Narayani Pattipati, Mark Patton, Havoc Pennington, 
-  Ettore Perazzoli, Guillermo S. Romero, Manish Singh, Morten Welinder
-
-Overview of Changes in GTK+ 1.3.15
-==================================
-
-* New stock and improved icon images
-  [Tuomas Kuosmanen, Jakub Steiner, Anders Carlsson]
-* Widget drawing improvements for check and radio buttons,
-  spinbuttons [Soeren Sandmann]
-* Clean up module search path algorithm, use GTK_PATH [Owen Taylor]
-* Add GtkSetting for font name. [Richard Hestilow]
-* Much improved key matching code, accelerators work independent
-  of group [Owen]
-* Make mnemonics work for embedded GtkPlug widgets [Owen]
-* Keynav improvements for GtkTreeView [Kristian Rietveld]
-* Fix gtk_tree_view_scroll_to_cell() [Jonathan Blandford]
-* Rename gtk_tree_view_get_iter_root() and gtk_tree_path_new_root()
-  to gtk_tree_view_get_iter_first() and gtk_tree_path_new_first(),
-  add compatibility macros.
-* GtkTreeView bug fixes [Kristian, Anders, Damon Chaplin]
-* GtkTextView bug fixes [Havoc Pennington]
-* Pad class structures for future binary compatibility [Owen]
-* Tutorial improvements [Sven Neumann, Matthias Clasen]
-* Fixes for MULTIPLE selection target [Gregory Merchan, Owen]
-* Fix problems with initial widget size [Owen]
-* AIX compilation fixes [Miroslaw Dobrzanski-Neumann]
-* Win32 fixes [Hans Breuer, Tor Lillqvist]
-* Miscellaneous bug fixes
-
-Other contributors: David L. Cooper, Eric Fischer, Jody Goldberg, 
-  Satajyit Kanungo, Thomas Leonard, Mark Patton, Manish Singh, 
-  Nicolas Setton
-
-Overview of Changes in GTK+ 1.3.14
-==================================
-
-* Keyboard focus improvements [Owen Taylor]
-* Code cleanup [Matthias Clasen, Manish Singh, Darin Adler]
-* Fix accidentally exported variables [Mark McLoughlin]
-* GtkTreeView fixes [Jonathan Blandford, Kristian Rietveld, John Harper, Darin]
-* Default to yellow tooltips [Owen]
-* RC file fixes for reloading, priorities [Owen, Matthias]
-* GtkMenu behavior improvements and bug fixes [Owen, Arnaud Charlet]
-* GtkTextView fixes [Havoc Pennington, Daniel Elstner, Dennis Bjorklund]
-* Improve keynav for paned widgets, tooltips, spin buttons, notebooks, 
-  scrolled windows [Soeren Sandmann, Padraig, Owen]
-* Add Emacs/Default key themes [Owen]
-* Win32 fixes [Hans Breuer, Tor Lillqvist]
-* Ethiopic input methods [Daniel Yacob]
-* Opaque paned window resizing [Soeren]
-* Tweak table expansion behavior [Tim Janik]
-* Fix GtkCalendar focus drawing [Bill Haneman]
-* Allow themeable cursor thickness [Bill]
-* Start of fixing of tutorial for GTK+-2.0 [Matthias]
-* Add a ::adjust-bounds signal to GtkRange to allow spreadsheet style
-  scrollbars. [Jody Goldberg]
-* Add the ability to turn on multiple selection for GtkFileSel [Manish]
-* Bug fixes
-
-Other contributors: Jacob Berkman, Padraig O'Briain, Anders Carlsson,
- Johan Dahlin, Richard Hult, Stefan Kost, Alex Larsson, Thomas Leonard,
- Paolo Maggi, Alexey Malyshev, Federico Mena Quintero, Skip Montaro,
- Sven Neumann, Havoc Pennington, Laszlo Peter, Christian Rose, Joe Shaw,
- Kevin Vandersloot,  Morten Welinder, Peter Williams
-
-Overview of Changes in GTK+ 1.3.13
-==================================
-
-* Tree view fixes. [Kristian Rietveld, Jonathan Blandford, Anders Carlsson]
-* Tree view support for low-vision themes [Bill Haneman]
-* Text view bug fixes. [Havoc Pennington]
-* Win32 fixes and improvements.  [Tor Lillqvist, Hans Breuer, 
-  Archaeopteryx Software]
-* Documentation improvements [Matthias Clasen, Havoc Pennington]
-* Accelerate alpha compositing using RENDER extension if present,
-  and optimize the non-RENDER case a lot. [Owen Taylor]
-* Add support for "optional keybindings" (action signal returns FALSE) [Owen]
-* Fixed the infamous changing directory deletes filename bug 
-  [Owen and a cast of thousands]
-* Add mouse cursor hiding for text widgets [Anders Carlsson]
-* Simple Hangul input module [Yusuke Tabata]
-* Removed the scary startup warning.
-* GdkPixbuf pixel handling fixes [Owen, Michael Hore, Jim Cape]
-* Converted GtkFileSelection and GtkFontSelection to use GtKTreeView widgets
-  instead of the deprecated GtkCList [Owen]
-* gtkhsv.h was installed by mistake, fixed that. [reported by Ross Burton]
-* gdk_pixbuf_render_to_drawable() now also handles alpha pixbufs.
-* Made Gtkimage draw GtkPixmap, GtkImage, GdkPixbuf insensitive, prelighted,
-  etc. [Havoc, Owen]
-* Marked gtk_item_factory_path_from_widget() G_CONST_RETURN. [Matt Wilson]
-* gtk_image_menu_item_new_from_stock() now falls back to
-  new_with_mnemonic, for consistency with gtk_button_new_from_stock()
-  [Havoc Pennington]
-* GdkModifierType is now consistently used for modifier mask parameters
-  [Mark Patton]
-* gtk_widget_set_accel_path() is now publically exported.
-
-Other contributors: Darin Adler, Jeffrey Baker, Damon Chaplin, Brian Cameron, 
-  Murray Cumming, James Henstridge, Jacob Berkman, Arnaud Charlet, Jeff Franks, 
-  Jeff Garzik, Jody Goldberg, Diego Gonzalez, Melvin Hadasht, Raja Harinath, 
-  Tim Janik, Mike Kestner, Mathieu Lacage, Alex Larsson, Ryan Lovett, 
-  Mark McLoughlin, Sven Neumann, Padraig O'Briain, Xavier Ordoquy, Chris Phelps, 
-  Detlef Reichl, Guillermo S. Romero, Federico Mena Quintero, Manish Singh,
-  HideToshi Tajima, Vitaly Tishkov, Jon Trowbridge, Sergey Vlasov.
-
-Overview of Changes in GTK+ 1.3.12
-==================================
-
-* Fix problems with PNG saving [Michael Natterer]
-* Cleanups of deprecated usages [Sebastian Wilhelmi]
-* Win32 fixes [Tor Lillqvist]
-* Documentation improvements [Matthias Clasen, Havoc Pennington, 
-  Vitaly Tishkov]
-* Frame buffer port fixes [Manish Singh]
-* GtkTextView bug fixes [Havoc Pennington, Chris Phelps]
-* Menu behavior improvements [Kristian Rietveld]
-* Make focus line width configurable, focus color work on 
-  dark themes. [Bill Haneman, Owen Taylor]
-* Add state argument to gtk_paint_focus() [Bill]
-* Added incremental revalidation to tree view, for better apparent speed 
-  [Jonathan Blandford]
-* Remove useless gtk_tree_view_column_cell_event() [Jonathan]
-* Display XIM status in a separate window [HideToshi Tajima]
-* Add GDK_DEBUG=nograbs to disable pointer, keyboard grabs [Jacob Berkman]
-* Add menu of Unicode control characters to GtkEntry, GtkTextView 
-  [Dov Grobgeld, Havoc]
-* Pass key releases along to input methods [Owen]
-* Many bug fixes
-
-Other contributors: Darin Adler, Fabrice Bellet, Chris Blizzard, 
-  Hans Breuer, Anders Carlsson, Damon Chaplin, Murray Cumming, Jeff Franks, 
-  James Henstridge, Tim Janik, Alex Larsson, George Lebl, Kjartan, Maraas, 
-  Sven Neumann, Seth Nickell, Padraig O'Briain, Soeren Sandmann, Manish Singh, 
-  Matt Wilson
-
-Overview of Changes in GTK+ 1.3.11
-==================================
-
-* Massive rework of accelerator API and implementation (Tim Janik)
-* Major fixes to resizing and redrawing to eliminate hysteresis
-  and optimize. (Owen Taylor, Soeren Sandmann)
-* Make many widgets NO_WINDOW to improve appearance and reduce
-  drawing overhead (Owen)
-* Text view fixes (Havoc Pennington)
-* Make child widgets in GtkTextView work (Havoc)
-* GtkTreeModelSort fixage (Jonathan Blandford, Kristian Rietveld)
-* Clean up GtkTreeView drag and drop support (Owen)
-* Misc tree view fixes and improvements (Jonathan, Kristian, Anders, Matt Wilson)
-* Add gtk_window_get/set_focus(), gtk_window_set_default() as public
-  functions (Owen, Damian Ivereigh)
-* Fixes to GtkPlug/GtkSocket (Michael Meeks, Owen)
-* Change button ordering in standard dialogs to correspond to 
-  GNOME usability project proposal (Gregory Merchan)
-* Add support for context sensitivity in input methods (Owen)
-* Hook up gtk_im_context_set_use_preedit() (Hidetoshi Tajima)
-* Fix gdk_window_scroll() and other aspects of big windows (Owen)
-* Remove need for X connection for class initialization (Jacob Berkman)
-* Propagate key events to parents of focused widget (Owen)
-* Don't export normal GTK+ marshalers, export deprecated compat marshalers (Owen)
-* Many Win32 Fixes and improvements (Hans Breuer, Tor Lillqvist)
-* Bug and documentation fixing (Matthias Clasen, Anders Carlsson,
-  Jacob Berkman, others.)
-
-Other Contributors:
-  Darin Adler, Marius Andreiana, Erwann Chenede, Murray Cumming, Janet Davis, 
-  Daniel Egger, Daniel Elstner, Jeff Franks, Alex Larsson, George Lebl, 
-  Sergey Kuzminov, Eric Lemings, Arkadiusz Miskiewicz, Padraig O'Briain, Sven Neumann, 
-  Kristian Rietveld, Nicolas Setton, Manish Singh,  Vitaly Tishkov, Sebastian Wilhelmi, 
-  Michael Natterer
-
-Overview of Changes in GTK+ 1.3.10
-==================================
-
-* GtkTextView fixes [Havoc Pennington]
-* GtkTreeView fixes and improvements [Jonathan Blandford, Kristian,
-  Manish Singh, Joshua Pritikin, Oleg Maiboroda, James Henstridge]
-* gtkdemo improvements [Kristian Rietveld]
-* Drag and drop fixes to generic code and widgets 
-  [Owen Taylor, Damian Ivereigh]
-* Documentation improvement [Havoc Pennington, Matthias Clasen]
-* Spelling fixes [Jacob Berkman]
-* Move signals to the GtkEditable interface [Kristian]
-* Further stock image improvements [Jakub Steiner]
-* Support text chunks for the PGN loader, add gdk_pixbuf_get_option()
-  [Sven Neumann]
-* Rename gdk_pixbuf_new_from_stream back to new_from_inline [Owen]
-* Automatically call setlocale(), unless explicitly disabled [Owen]
-* Property addition to various widgets [Michael Meeks, Owen]
-* Support building with automake-1.4 [James]
-* Make GtkRadioButton groups act as a single focus point [Owen]
-* Move gdk_window_lookup etc. to be cross-platform [Matthias]
-* Draw spinbuttons variably sized [Kristian]
-* Separate GdkAtom out from X atoms for compatibility with future
-  multihead changes [Owen]
-* Require gdk_threads_init() to be explicitly called instead
-  of piggybacking off of g_thread_init(). [Owen]
-* Improvements to text-view/label/entry popup menus [Damian, Jacob, Owen]
-* Bug fixes and cleanup [Matthias, others]
-
-Other Contributors:
-  Mark McLoughin, Mikael Hermansson, Soeren Sandmann, Anders Carlsson,
-  Tim Janik, Murray Cumming, Hidetoshi Tajima, Padraig O'Briain, 
-  Hans Breuer, Vitaly Tishkov, Dov Grobgeld
- 
-
-Overview of Changes in GTK+ 1.3.9
-=================================
-
-* Add editable text cells to GtkTreeView.
-  Keynav, drawing fixes in GtkTreeView [Jonathan Blandford]
-* Text widget no longer always has a \n in it. [Havoc Pennington]
-* Text widget bug fixes [Havoc, Dov Grobgeld, Hidetoshi Tajima]
-* Allow -1 for width/height in gdk_pixbuf_render_*(). [Matthias Clasen]
-* Minor fix for major resizing problems in recent releases [Owen Taylor]
-* Restore ability to set _set properties to TRUE for 
-  GtkCellRendererText, GtkTextTag [Owen]
-* Cursor drawing improvements [Owen]
-* Win32 fixes [Hans Breuer]
-* Mark various functions as deprecated or private.
-* Misc bug fixes, portability fixes, and cleanups.
-
-Other Contributors: 
- Vitaly Tishkov, Christian Rose, Frank Belew, Jeff Franks, Sven Neumann,
- Kristian Rietveld, Vitaly Tishkov, Joshua N. Pritikin, Matt Wilson, 
- James Henstridge, Detlef Reichl
-
-Overview of Changes in GTK+ 1.3.8
-=================================
-
-* GtkTreeView and GtkTreeModel API cleanups/improvements [Jrb]
-* GtkOptionMenu scrollwheel support [Alex]
-* GtkModule search paths [Owen]
-* Documenatation updates [Havoc,Jrb]
-* Major Gdk cleanup [Owen]
-* Miscellaneous other fixes/cleanups
-
-Other Contributors:
-  Joshua N Pritikin, Padraig O'Briain, Jakub Steiner, Matthias Clasen,
-  Matt Wilson, James Henstridge
-
-Overview of Changes in GTK+ 1.3.7
-=================================
-
-* Many Pixbuf (loader) improvements [Matthias Clasen, Soeren Sandmann]
-* Added publically installed utility gdk-pixbuf-csource to generate
-  inlined pixbufs in C source code [Tim Janik]
-* Optional movement of button children on press [Soeren, Owen Taylor]
-* Interactive searching in GtkTreeView [Kristian Rietveld]
-* Sorting/ordering improvements for GtkTreeView [Kris, Jonathan Blandford]
-* Animation of expander motion for GtkTreeView [Anders Carlsson]
-* Lots of misc GtkTreeView fixes and improvements [Jonathan]
-* New/improved stock icons [Jakub Steiner] 
-* Code and API rework for window resizing [Havoc Pennington]
-* Converted accel groups to GObject [James Henstridge]
-* More property support improvements
-* Add facility for "secondary" buttons in 
-  GtkButtonBox/GtkDialog [Gregory Merchan]
-* Disentangled child visability from MAPPED state [Owen]
-* Plug/Socket improvements and port to the XEMBED protocol [Owen]
-* Added priorities for styles in RC files, 
-  support multiple parse contents [Owen]
-* Made GdkVisual and GdkDevice GObjects [Alexander Larsson]
-* Key binding improvements [Havoc]
-* Added GtkWidget::event-after signal since normal event handling
-  is now aborted as soon as a handler returned TRUE [Tim]
-* Dnd fixes and improved icon support [Owen]
-* Removed GtkPacker widget
-* Fixing missing paired getters/setters [Kris]
-* Nuked remaining GtkArg cruft, implemented container/child properties [Tim]
-* Added window grab groups [Owen]
-* Many frame buffer improvements [Alex]
-* Win32 fixes and improvements [Hans Breuer]
-* Warning fixes [Darin Adler]
-* Miscellaneous bug and API fixes [Matthias et. al]
-
-Other Contributors:
-  Joshua N Pritikin, Hidetoshi Tajima, Manish Singh, ERDI Gergo, Jens Finke,
-  Chema Celorio, Lee Mallabone, Vitaly Tishkov, Sebastian Wilhelmi,
-  Nicola Girardi, Sven Neumann, Padraig O'Briain, Michael Natterer,
-  Suresh Chandrasekharan, Jonas Borgström, Jay Cox, Michael Meeks,
-  Mathias Hasselmann, Peter Williams, Thomas Broyer, Kjartan Maraas,
-  Joel Becker, Jeff Franks, Brian Cameron, Skip Montanaro
-
-Overview of Changes in GTK+ 1.3.6
-=================================
-
-* Properly renders strikethrough text
-* win32 fixes
-* Added "scale" property to GtkTextTag and GtkCellRendererText to do 
-  relative font scaling
-* Added "format_value" signal to GtkScale to reformat value text
-* framebuffer fixes
-* Property support added to lots of widgets
-* Many GtkTreeView new features and API/implementation fixes
-* Lots of new_with_mnemonic() convenience functions
-* Change GtkImageMenuItem API to be more consistent/useful
-* Added lots of new stock items/icons
-* Rewrote GtkRange/GtkScale/GtkScrollbar, includes support for
-  enabling/disabling extra scrollbar stepper arrows in gtkrc so NeXT
-  themes won't need broken hacks
-* Convenience API for GtkRange similar to the one added to GtkSpinButton
-  a while back
-* Make menubar/toolbar work properly with xthickness/ythickness of 1 or 0, 
-  and move some attributes from program settings to user settings.
-  Allows nice 1-pixel-bevel themes.
-* Moved ::focus virtual function from GtkContainer to GtkWidget
-* Plenty of bug fixes
-
-Overview of Changes in GTK+ 1.3.5
-=================================
-
-* New default theme based on Raleigh theme for 1.2.x.
-* Dependency on the ATK library added as a step to
-  providing accessibility-enabling interfaces
-* XEMBED-based GtkPlug/GtkSocket now basically works.
-* Drag and drop of column headers in GtkTreeView
-* GtkColorSelector work: hooks for saving and propagating palette, UI tweaks,
-  and API sanitation
-* Key binding fixes
-* Configurable padding/spacing in a lot of places
-* Invisible text in GtkTextView fixed
-* SHM segments now created with a mode of 0600
-* Bug fixes
-
-Overview of Changes in GTK+ 1.3.4
-=================================
-
-* Win32 fixes
-* GtkTreeView improvements and fixes
-* Fix glib-2.0.m4
-* Miscellaneous bug fixes
-
-Overview of Changes in GTK+ 1.3.3
-=================================
-
-[ 5600 lines of ChangeLog ]
-
-* API cleanups
-* Win32 work (Tor, Hans Breuer)
-* Focus improvements (Owen)
-* Frame buffer improvements (Alex)
-* Work on GtkTextView (Havoc)
-* Much work on GtkTreeView (Jonathan)
-* Selectable labels (Havoc)
-* Converted many arguments to properties (Lee Mallabone, John Margaglione)
-* Add exact regions to GdkExposeEvent, propagate it. (Alex)
-* Added ability to have resize grips in status bars (etc.) using
-  _NET_WM_MOVERESIZE protocol. (Havoc)
-* Added mnemnonic mechanism to make setting underline accelerators
-  much easier. (Alex)
-* Add per-style property mechanism to allow themes to change 
-  geometry parameters. (Tim)
-* Added global settings mechanisms for settings such as double-click
-  time. (Tim, Owen)
-* Various support functions for new and old WM properties (Havoc, Alex)
-* Add TRUE-stops-returns for boolean-returning signals (Ron Steinke)
-
-Overview of Changes in GTK+ 1.3.2
-=================================
-
-GTK Core:
-
-* New stock-icon and stock-item system. Use themeable pixbufs in
-  dialogs, buttons, etc. [Havoc]
-* Theme engines reworked to use derivation and new object system. [Owen]
-* Added GtkClipboard object for simple selection handling. [Owen]
-* Make GtkEditable an interface, move implementation to GtkOldEditable for
-  compat. [Owen]
-* Better handling of default directionality. [Robert]
-* Use GSignal as backend for GtkSignal and other GObject stuff. [Tim]
-* Move theme engines to GTypePlugin. [Owen]
-
-GDK:
-
-* Beginning of implementation of client parts of new window manager spec. [Owen]
-* Make gdk_drawable_get_image() work with backing store. [Havoc]
-
-Widgets:
-
-* New text widget [Havoc]
-  - Adjustable tab handling.
-  - Ability to have scrolling side areas in new text widget for tabs/line numbers.
-  - Many cleanups and small improvements.
-* Improvements to submenu navigation [Nils Barth/David Santiago] and
-  scrolling menus. [Alex]
-* Simplification of progress bar API. [Havoc]
-* Make GtkImage a generic image-display widget. [Havoc]
-* New GtkTreeView tree widget. Model/view architecture, flexible rendering,
-  large datasets, etc. [Jonathan]
-* New GtkMessageBox widget for message display. [Havoc]
-* Allow labels to have contents set from XML-like markup language. [Havoc]
-* Make dialogs derive from GtkDialog and use stock buttons. [Havoc]
-
-Internationalization:
-
-* Proper character set conversion for clipboard/selection. [Owen]
-* New input method system via loadable modules; support on-the-spot
-  preedit in GtkEntry and new text widget; allow switching input methods
-  on the fly; include modules for XIM and demo Cyrillic-transliteration 
-  module. [Owen]
-* VIQR, Thai, and Inuktitut input methods. [Robert]
-* Convert po files to UTF-8. [Robert]
-
-gdk-pixbuf:
-
-* Full-alpha compositing for gdk-pixbuf on drawable. [Havoc]
-* Add simple saving to gdk-pixbuf. [David Welton/Havoc]
-* Add improved error handling with GError to gdk-pixbuf. [Havoc]
-
-Ports:
-
-* Much work on Win32 Port. [Tor/Hans]
-* Much work on Linux-FB Port. [Elliot/Alex]
-
-Misc:
-
-* Start of new gtk-demo demo program. [Owen/Jonathan]
-* Bug fixes and more bug fixes.
-
-
-Overview of Changes in GTK+ 1.3.1:
-
-* GTK+ now uses the Pango library for text manipulation. All
-  strings in GTK+ now are in Unicode, languages written
-  from right-to-left, and complex-text languages are now supported.
-* The gdk-pixbuf library for image loading and manipulation is 
-  has been integrated with GTK+.
-* The GTK+ object system has mostly been moved to GLib, separating
-  it from the GUI code. Many significant enhancements have been
-  made as part of this.
-* A new text widget is now included. This started as a port
-  of the Tk text widget, and includes such features of the Tk
-  text widget as tags, marks, and unicode text support. It
-  has been enhanced to support model-view operation and the
-  full power of Pango.
-* The GDK library has been extensively revised to support multiple
-  windowing systems. The only fully functional backend in 1.3.1
-  is the X11 backend, however, ports to Win32, Linux-framebuffer,
-  Nano-X, BeOS, and MacOS exist in various states of completion,
-  and at least some of these will be finished and integrated in 
-  before the final GTK+-2.0 release.
-* 32-bit coordinates are now supported throughout GDK and GTK+
-  (they are emulated where not supported by the windowing system.)
-* Many minor bug fixes and enhancements. Incompatible changes
-  are documented in docs/Changes-2.0.txt
-
-Overview of Changes in GTK+ 1.2.8:
-
-* GNU Make 3.79 bug workaround
-* FAQ and tutorial updates and improvements
-* Miscellaneous bug fixes: CList, Calendar, rc-files, FontSelection
-
-Overview of Changes in GTK+ 1.2.7:
-
-* More header cleanups.
-* Fixed activation bug for insensitive widgets.
-* Locale fixes to RC file parsing code.
-* Miscellaneous bugfixes for Item Factory, CList, CTree, X Selections,
-  HScale, VScale, Pixmap, Viewport, OptionMenu, Entry and Notebook.
-* Upgrade to libtool 1.3.4.
-
-Overview of Changes in GTK+ 1.2.6:
-
-* container queue_resize fixes
-* gtk[vh]scale: minor fixups
-* rename idle to idle_id in testgtk to avoid conflicts with 
-  broken libs
-* More consistent naming of gtkrc files
-* Added language support: ro, uk
-
-Overview of Changes in GTK+ 1.2.5:
-
-* more GtkCTree and GtkWindow bug fixes.
-* more redraw/resize queue fixes, better expose event
-  discarding code.
-* more miscellaneous bugs fixed
-* new configure.in option --disable-rebuilds to completely disable
-  rebuilds of autogenerated sources.
-* check for 5.002 now, to avoid failing autogeneration build rules due
-  to old perl versions.
-* fonts (and fontsets) are cached now.
-* more autogeneration make rules and dependency fixups, we should be
-  save with autogeneration up to make -j12 now ;)
-* new window position GTK_WIN_POS_CENTER_ALWAYS, which will recenter the
-  GtkWindow on every size change.
-* major rework of window manager hints handling code, fixed a bunch of
-  races with the new resizing code.
-* the new wm hints and resizing code is absolutely perfect and bug free now,
-  it only lacks testing ;)
-* fixed up various rc style memory problems.
-* gtk_widget_modify_style() now properly changes the style of realized widgets
-  and references the style passed into it. if people worked around this bug,
-  this will introduce a slight memory leak in their code.
-  The code should typically look like:
-            GtkRcStyle *rc_style = gtk_rc_style_new ();
-            [...]
-            gtk_widget_modify_style (widget, rc_style);
-            gtk_rc_style_unref (rc_style);
-* fix problems with positioning menus offscreen.
-* GtkText fixes for some crashes and drawing errors.
-* Better handling for unexpected window destroys in GDK and GTK+.
-  This should make it possible to use a GtkPlug and catch the
-  case where its parent socket is randomly killed.
-* FAQ updates.
-* FileSelection i18n patches, RadioButton fixups.
-* many translation improvements.
-* miscellaneous other bugs fixed.
-
-Overview of Changes in GTK+ 1.2.4:
-
-* DnD improvements (drags can be canceled with Esc now).
-* suppressed configure event reordering in Gdk.
-* rewrite of Gtk's configure event handling.
-* major improvements for the object argument system (Elena Devdariani).
-* major bugfixes for threading, GtkNotebook, GtkItemFactory, GtkCList and
-  GtkCTree.
-* tutorial/FAQ updates, new file generation.txt on autogenerated sources.
-* configure's --with-glib= is "officially" unsupported.
-* upgrade to libtool 1.3.3.
-* various buglets fixed.
-
-Overview of Changes in GTK+ 1.2.3:
-
-* Upgrade to libtool 1.3
-* Check for dgettext (for systems with old versions of GNU Gettext)
-* Many bug fixes (see ChangeLog for details)
-
-Overview of Changes in GTK+ 1.2.2:
-
-* Improved Dnd behaviour with Motif applications.
-* Bug fixes for the Gtk selection code.
-* Minor bug fixes to the Gdk Atom cache and Dnd code (with --display option).
-* Bug fixes and leak plugs for the Gdk IM code.
-* Added gtk_object_get() facility to retrieve object arguments easily.
-  The var args list expects ("arg-name", &value) pairs.
-* Fixed mapping for GdkInputCondition<->GIOCondition, this should fix
-  problems where closed pipes were no longer signaling GDK_INPUT_READ on
-  systems with a native poll().
-* Some cleanups to GtkLabel's memory allocation code (shouldn't leak memory
-  anymore).
-* We don't attempt to lookup xpm color "None" anymore, this should prevent
-  eXodus (commercial X windows server) from popping up a color dialog every
-  time a transparent pixmap is created.
-* Fixed bug where Gtk timeout/idle handlers would execute without the global
-  Gdk lock being held.
-* Other minor bug fixes.
-
-Overview of Changes in GTK+ 1.2.1:
-
-* Many Bug fixes have been applied to the menu and accelerator code.
-* GtkItemFactory can "adopt" foreign menu items now and manage their
-  accelerator installation. This is often required to get GtkItemFactory
-  like accelerator propagation between different windows with the same
-  menu hierarchy and for centralized parsing and saving of accelerators.
-* GtkCList/GtkCTree buttons should always display correctly now.
-* Miscellaneous other bug fixes.
-
-What's New in GTK+ 1.2.0 (since 1.0.x):
-
-* New widgets: GtkFontSelector, GtkPacker, GtkItemFactory, GtkCTree,
-  GtkInvisible, GtkCalendar, GtkLayout, GtkPlug, GtkSocket
-* Many new features and robustness for existing widgets
-* Theme support
-* New DND implementation
-* Internationalization of standard dialogs
-* New key binding system
-* Tearoff menus and menu accelerators
-* Wide character support for entry and text
-* Resizing code has been overhauled
-* Queued redraws of partial areas
-* Far better support for object arguments
-* Speed optimizations
-* Runtime loading of dynamic modules
-* Support for GLib log domains
-* Tutorial improvements
-* A bug fix or two
-
-Overview of Changes in GTK+ 1.1.16:
-
-* Major fixes and improvements for handlebox
-* A change to the way widget->requisition works. Now,
-  widget->requisition is always what the widget requested,
-  unmodified by the usize. See Changes-1.2.txt for details.
-  This correct various bugs with gtk_widget_set_usize().
-* Fixes for XIM on X11R5 systems
-* Don't allow cut-and-paste of text in password-style entries
-* --enable-debug is now on by default for the development release.
-  (When compiling for "production", use --enable-debug=minimum)
-* Handle systems where Helvetica is not present more gracefully
-* Fixes for memory leaks
-* CList and CTree fixes
-* Bug fixes for drawing problems. 
-* Miscellaneous bug fixes to GtkLabel, GtkCList, GtkCTree,
-  GtkColorsel, Focusing, DND
-* Tutorial improvements
-
-Overview of Changes in GTK+ 1.1.15:
-
-* Tutorial Updates
-* Added --libs gthread to gtk-config 
-* Bug fixes
-
-What is new in GTK+ 1.1.14:
-
-* Additions to docs/Changes-1.2.txt
-* Just warn when loading theme engine fails
-* CLAMP GtkScale digits to a meaningful range
-* GTK_LOCALDIR is now defined in a better fashion
-* New functions (feature freeze, we know...):
-    gtk_menu_set_title()
-    gtk_toggle_button_get_active()
-* Some locale fixups in gtkrc code
-* Fixes to make gtk_radio_button_set_group() keep only
-  one radio button in the group active
-* Foreign windows are now always treated as viewable; this fixes
-  a problem where updating didn't occur properly in GtkPlug
-* DND fixes for 64 bit architectures, and for specifying operations 
-  with modifier keys.
-* Major revisions to GtkLayout: avoid having to create window
-  for NO_WINDOW children, adjust allocations of children as 
-  scrolled so queued draws work, and a resize is queued instead
-  of allocating directly in a put() or move()
-
-What is new in GTK+ 1.1.13:
-
-* Dnd and selection bug fixes and memory purification.
-* Widget sensitivity fixups.
-* Tooltips windows are now named "gtk-tooltips" so rc file rules
-  can match tooltips windows. Fixed interaction of tooltips and NO_WINDOW
-  widgets.
-* Spin buttons now update their values upon value retrieval.
-* Overhaul of the resizing vs. redrawing logic to reduce redrawing needs
-  a lot. Gtk makes full use of the draw_area coalescing code now, which
-  got minorly improved as well.
-* Containers map their Gdk windows after their children now to reduce
-  expose event generation.
-* Gdk event queue fixups, this solves the double-click problems people were
-  recently having.
-* Account for the fact that GSource's are only properly reentrant from
-  within dispatch(), thus we don't do Gdk event processing from within
-  check() or prepare() anymore.
-* Rc files feature a bg_pixmap value of "<none>" now.
-* Improved session management support in Gdk.  
-* Automatic disabling of NLS if no gettext is found should work now.
-* Removed deprecated functions, docs/Changes-1.2.txt gives an overview.
-* Gtk+ development now requires GNU autoconf 2.13, GNU automake 1.4
-  and GNU libtool 1.2d.
-* More bug fixes all over the place.
-
-What is new in GTK+ 1.1.12:
-
-* Korean translation added
-* Fixed memory leaks
-* A few other bug fixes
-
-What is new in GTK+ 1.1.11:
-
-* Dutch, Japanese, Swedish, Polish, and Norwegian translations
-* Removed deprecated _interp variants: gtk_container_foreach_interp, 
-  gtk_idle_add_interp, gtk_timeout_add_interp, gtk_signal_connect_interp
-* Lots of cast corrections
-* Many fixes 
-
-What is new in GTK+ 1.1.9:
-
-* Check for broken glibc 2.0 mb functions and avoid them
-* Label and Entry display fixes 
-* Move main thread back to GDK, for locking when translating events
-* Bug fixes
-
-What is new in GTK+ 1.1.8:
-
-* Added support for gettext and the localization of the standard
-  dialogs.
-* Added line-wrapping for the label, and JUSTIFY_FILL
-* Support reordering via drag and drop in  CList and CTree.
-* Replaced GtkDrawWindow widget with a GTK_USER_DRAW flag
-* Extended gtkpaned API to support minimum sizes and proportional
-  resizing.
-* Changed the handling of shared memory segments so as to 
-  remove the need for GTK+ to set up signal handlers.
-* Re-implemented event loop in terms of the event loop
-  that has been added to GLib 1.1.8
-* Added 'grab_focus' signal to allow keyboard accelerators
-  for entries.
-* Load locale specific RC files if present.
-* Bug fixes.
-
-What is new in GTK+ 1.1.7:
-
-* Fixed memory mis-allocation in default files code
-* Various event handling fixes
-* Wide character support for entry and text
-* Destroy widgets _after_ propagating unrealize signals through 
-  widget hierarchy
-* Only build XIM-support if available
-* Tutorial and examples updates
-* Added gtk_drag_source_unset()
-
-What is new in GTK+ 1.1.6:
-
-* The signal system now features emission hooks with special semantics,
-  refer to the ChangeLog for this.
-* Minor? speedups and memory reductions to the emission handling of the
-  signal system.
-* _interp() function variants are deprecated now. the corresponding *_full()
-  variants are provided for a long time now.
-* Dnd abort timeout increased to 10 minutes.
-* GtkScrolledWindow inherits from GtkBin now.
-* GTK_POLICY_NEVER is implemented for scrolled windows now.
-* Lots of API clean ups.
-* Incremental freezing abilities.
-* Integrated widgets from the GNOME tree: GtkLayout, GtkPlug and GtkSocket.
-* New window functions for transient relationship, default size, and 
-  geometry hints
-* Default rc files are now read in (<sysconfdir/etc/gtkrc and ~/.gtkrc)
-  GTK_RC_FILES environment variable and functions are provided to configure
-  this behavior
-* Read doc/Changes-1.2.txt to properly adapt your code.
-* Bug Fixes.
-
-What is new in GTK+ 1.1.5:
-
-* Theme integration
-* Widget style modification is now handled through GtkRcStyles
-* GtkPixmaps now grey out pixmaps when insensitive
-* Notebook enhancements
-* Shadow configurability for menubars and handleboxes
-* DND enhancements
-* gtkfilesel now supports automounters better
-* Implementation of expose compression
-* Queued redraws of partial areas
-* Scrolledwindow (+Viewport) source incompatibilities, children that are added
-  to a scrolled window don't get an automatic viewport anymore. a convenience
-  function gtk_scrolled_window_add_with_viewport() is supplied for this task
-* Deprecated functions will now issue a message, informing the programmer about
-  the use of this function. These functions will get removed in future versions
-* Non-functional functions got removed entirely
-* gtk_widget_new() and gtk_object_new() will now auto-construct new objects.
-  A new function gtk_object_default_construct() is provided now which should
-  be called after every gtk_type_new() to perform the auto-construction
-* Improved argument support of several widgets
-* Bug Fixes
-
-What is new in GTK+ 1.1.3:
-
-* GtkCList/GtkCTree now have the ability to:
-    - hide/show individual columns
-    - disable/enable column resizing
-    - set min and max for column widths
-    - set expander style of the ctree
-    - set/get row and cell styles
-    - set spacing between tree expander and cell contents in ctree
-    - toggle auto_resize for columns
-* Must enhanced DND support, removed old DND code
-* Idle functions are now implemented via GHook, giving a slight speed
-  improvement
-* An environment variable GTK_MODULES which takes a colon separated
-  list of module names GTK+ will now automatically load at gtk_init() startup
-* GtkFontSel now has support for an extra 'base' filter
-* New function gdk_window_set_root_origin to get the real geometry taking
-  into account window manager offsets
-* New function gtk_text_set_line_wrap to toggle line wrapping
-* New function gtk_widget_add_events which safely adds additional
-  events to a widget's event mask
-* New function gdk_event_get_time to get the timestamp from a generic
-  event
-* New widget GtkCalendar
-* New widget GtkInvisible - InputOnly offscreen windows used for reliable
-  pointer grabs and selection handling in DND code
-* New functions gtk_object_remove_no_notify[_by_id] to remove a certain
-  data portion without invocation of its destroy notifier 
-* gtk_spin_button_construct is now deprecated, use gtk_spin_button_configure
-  instead 
-* gtk_clist_set_border is now deprecated, use gtk_clist_set_shadow_type 
-  instead
-* Removed functions gtk_object_set_data_destroy[_by_id] 
-* Documentation additions/updates 
-* HTML and plain text files are now included in the distribution
-* Bug fixes, typeness corrections, and general fixups
-
-What is new in GTK+ 1.1.2:
-
-* Gtk+ is now featuring runtime loading of dynamic modules via the
-  --gtk-modules= command line switch. such modules have to export a
-  G_MODULE_EXPORT void gtk_module_init (gint *argc, gchar ***argv);
-  function which will be invoked to initialize the module. since such
-  modules may create new widget types, they are always resident.
-* The tutorial has been updated again.
-* Changes to menus including tearoff menus and accelerators.
-* Better support for modal dialogs.
-* Removed CAN_FOCUS by default from scrollbars and button children of toolbar.
-* More improvements and fixes for GtkCList and GtkCTree (i.e. row sorting).
-* GtkCTree rows can be unselectable now.
-* The GtkCTree API has undergone major renames (see ChangeLog entry from Lars
-  Hamann on Tue Aug 18 00:29:13 1998).
-* A bunch of varargs functions changed to get va_lists working on systems that
-  implement va_lists as arrays.
-* Improvements to the gdkrgb code.
-* Improvements to Gdk color handling so we greatly reduce server traffic and
-  don't leak colors anymore.
-* Improved internal widget tree iterators (the GtkContainer::foreach signal
-  vanished because of this).
-* Option menus can have the keyboard focus now.
-* More fixups to the text widget.
-* GtkFileSelection should behave much more nicely in combination with AFS now.
-* Support for label underlining.
-* Support for GLib 1.1.3 log domains.
-* Documentation improvements.
-* Configuration fixes on various platforms.
-* Miscellaneous fixes to XInput support.
-* Build with shared library dependencies on Linux
-* Fix for a major bug in the type systems memory allocation code that could
-  cause random crashes.
-* Libtool update to version 1.2b.
-* Lots of bugfixes and cleanups again ;)
-
-
-What is new in GTK+ 1.1.1:
-
-* Tutorial updates and additions.
-* Key binding support for GtkListItems and GtkList.
-* Extended selection mode and autoscrolling for GtkLists.
-* A GtkCtree now operates on GtkCTreeNode* structures rather than GList*.
-* GtkCTreeNodes can now be created from GNode trees.
-* Bug fixes for GtkNotebook, GtkCList, GtkCombo and GdkWindow reparentation.
-
-
-What is new in GTK+ 1.1.0:
-
-* New widget GtkFontSelector.
-* New featureful progress bar.
-* New container widget GtkPacker.
-* New object GtkItemFactory, GtkMenuFactory is deprecated.
-* New key binding system, configurable via rcfiles, similar to styles.
-* New widget GtkCTree with drag selections and keyboard movement and
-  and horizontal scrolling. Features also implemented for GtkCList.
-* Significant speedups to widget creation and destruction through caching
-  colormap and visual queries to the XServer.
-* Speedups for type creation and especially gtk_type_is_a() checks.
-* Speedups in signal lookup, creation and emissions and connection handling.
-* Minor speedups with object data allocation and destruction.
-* Additions to the signal handling API (e.g. *_emitv).
-* Support for rc-file reparsing.
-* Resizing logic is now implemented on container widget basis, rather than
-  for toplevel GtkWindows only.
-* Buttons support relief styles now.
-* Some widgets are now allocated through memchunks to behave more memory wise.
-* Newly included file gtkfeatures.h which defines compatibility macros to
-  test for certain API features upon program compilation.
-* Child arguments support for container widgets.
-* Far better support for object arguments, revamp of the underlying
-  mechanism for speed and reusability. Child/object arguments don't
-  need to be preceded by the "GtkType::" portion anymore.
-* Removed GtkAcceleratorTable in favour of GtkAccelGroup, accelerator display
-  is now performed by a new widget GtkAccelLabel.
-* Overhaul of the resizing code. Resizing behaviour can now be specified
-  on GtkContainer basis, so the underlying algorithm isn't only available
-  for GtkWindows.
-* GtkTables are now fully resizable.
-* The GtkType system now supports an additional base class initialization
-  function.
-* GtkStyles and key bindings can now be looked up depending on the base
-  types of a widget, through a new keyword `class' in rc files.
-* GtkButton derives from GtkBin (finally).  
-* More descriptive error messages on rc parsing.  
-* Runtime information is available to query enum/flag definition values.
-* Upgrade to libtool-1.2
-* Legions of bug fixes, memory leaks, segfaults, of-by-something errors...
-  including those that already went into the 1.0.x branch.
-* A big bunch of features and cosmetic fixups that just got lost in
-  the masses of changesonfigure problem when cross-compiling

README.commits

@@ -0,0 +1,72 @@
+GTK+ is part of the GNOME git repository. At the current time, any
+person with write access to the GNOME repository, can make changes to
+GTK+. This is a good thing, in that it encourages many people to work
+on GTK+, and progress can be made quickly. However, GTK+ is a fairly
+large and complicated package that many other things depend on, so to
+avoid unnecessary breakage, and to take advantage of the knowledge
+about GTK+ that has been built up over the years, we'd like to ask
+people committing to GTK+ to follow a few rules:
+
+0) Ask first. If your changes are major, or could possibly break existing
+   code, you should always ask. If your change is minor and you've
+   been working on GTK+ for a while it probably isn't necessary
+   to ask. But when in doubt, ask. Even if your change is correct,
+   somebody may know a better way to do things.
+
+   If you are making changes to GTK+, you should be subscribed
+   to gtk-devel-list@gnome.org. (Subscription address:
+   gtk-devel-list-request@gnome.org.) This is a good place to ask
+   about intended changes.
+
+   #gtk+ on GIMPNet (irc.gimp.org, irc.us.gimp.org, irc.eu.gimp.org, ...)
+   is also a good place to find GTK+ developers to discuss changes with,
+   however, email to gtk-devel-list is the most certain and preferred
+   method.
+
+1) Ask _first_.
+
+2) With git, we no longer maintain a ChangeLog file, but you are expected
+   to produce a meaningful commit message. Changes without a sufficient
+   commit message will be reverted. See below for the expected format
+   of commit messages.
+
+Notes:
+
+* When developing larger features or complicated bug fixes, it is
+  advisable to work in a branch in your own cloned GTK+ repository.
+  You may even consider making your repository publically available
+  so that others can easily test and review your changes.
+
+* The expected format for git commit messages is as follows:
+
+=== begin example commit ===
+Short explanation of the commit
+
+Longer explanation explaining exactly what's changed, whether any
+external or private interfaces changed, what bugs were fixed (with bug
+tracker reference if applicable) and so forth. Be concise but not too brief.
+=== end example commit ===
+
+  - Always add a brief description of the commit to the _first_ line of
+    the commit and terminate by two newlines (it will work without the
+    second newline, but that is not nice for the interfaces).
+
+  - First line (the brief description) must only be one sentence and
+    should start with a capital letter unless it starts with a lowercase
+    symbol or identifier. Don't use a trailing period either. Don't exceed
+    72 characters.
+
+  - The main description (the body) is normal prose and should use normal
+    punctuation and capital letters where appropriate. Normally, for patches
+    sent to a mailing list it's copied from there.
+
+  - When committing code on behalf of others use the --author option, e.g.
+    git commit -a --author "Joe Coder <joe@coder.org>" and --signoff.
+
+
+Owen Taylor
+13 Aug 1998
+17 Apr 2001
+
+Matthias Clasen
+31 Mar 2009

README.in

@@ -0,0 +1,464 @@
+General Information
+===================
+
+This is GTK+ version @GTK_VERSION@. GTK+ is a multi-platform toolkit for
+creating graphical user interfaces. Offering a complete set of widgets,
+GTK+ is suitable for projects ranging from small one-off projects to
+complete application suites.
+
+GTK+ is free software and part of the GNU Project. However, the
+licensing terms for GTK+, the GNU LGPL, allow it to be used by all
+developers, including those developing proprietary software, without any
+license fees or royalties.
+
+The official ftp site is:
+  ftp://ftp.gtk.org/pub/gtk
+
+The official web site is:
+  http://www.gtk.org/
+
+Information about mailing lists can be found at
+  http://www.gtk.org/mailinglists.html
+
+
+Installation
+============
+
+See the file 'INSTALL'
+
+
+Release notes for 2.20
+======================
+
+* GtkStatusbar now has a message area (see gtk_status_bar_get_message_area)
+  which makes it easy to place additional widgets inside the statusbar
+  frame or to replace the label widgets. Previously, this was only possible
+  by accessing the innards of the statusbar widget directly. Applications
+  which are doing so may need some adjustments, since the addition of the
+  message area changed the internal widget hierarchy.
+
+* GtkBuilder no longer sets the "name" property of widgets to the ID
+  attribute of the <object>. Use gtk_buildable_get_name() instead of
+  gtk_widget_get_name() to obtain the ID.
+
+* GTK+ now includes introspection data, as a consequence, it gained a
+  dependency on gobject-introspection. It is possible to build without
+  introspection by passing --disable-introspection to configure.
+
+
+Release notes for 2.18
+======================
+
+* gtk_tooltip_set_custom now accept a NULL custom_widget to unset the
+  old custom_widget. Custom_widget does not get destroyed when the
+  tooltip goes away.
+
+* JPEG2000 support is no longer enabled by default. It must be
+  explicitly turned on, by passing --with-libjasper to configure.
+
+* GDK has been reworked to implement 'client-side windows'. This offers
+  exciting new possibilities, such as transformed, offscreen rendering,
+  but it breaks some long-standing assumptions that applications may
+  have about GDK windows. Setting the environment variable
+  GDK_NATIVE_WINDOWS makes GDK create a native X11 window for each
+  GDK window, which might make problematic applications work better.
+
+* GTK+ calls signal (SIGPIPE, SIG_IGN) during initialization, to ignore
+  SIGPIPE signals, since these are almost never wanted in graphical
+  applications. If you do need to handle SIGPIPE for some reason, reset
+  the handler after gtk_init(), but notice that other libraries (e.g.
+  libdbus or gvfs) might do similar things.
+
+Release notes for 2.16
+======================
+
+* Password entries now display a caps-lock warning. This can be turned off
+  with the caps-lock-warning property.
+
+* Various orientation-related functions have been deprecated in favour
+  of the new GtkOrientable interface: gtk_scale_button_get_orientation,
+  gtk_scale_button_set_orientation, gtk_toolbar_set_orientation.
+
+* The action-proxy interaction has been changed. Widgets that operate as
+  proxies have to implement the GtkActivatable interface now. GtkActivatable
+  implementation are responsible for syncing their appearance with the
+  action and for activating the action. All GTK+ widgets that are commonly
+  used as proxies implement the GtkActivatable interface.
+
+* The handling of keyboard shortcuts has been changed, to help with a
+  longstanding complaint about the way GTK+ handles multiple layouts. GTK+
+  now only uses keys from groups other than the current group if they are
+  not present in the current group.
+
+Release notes for 2.14
+======================
+
+* gtkitemfactory.h is now completely deprecated.
+  As gtkactiongroup.h and gtkstock.h no longer include the gtkitemfactory.h
+  header, this might break application using gtk_item_factory_* symbols
+  without including gtkitemfactory.h - even though this behaviour has never
+  been supported in the first place.
+
+* The GtkFileSystem semi-private interface has been removed.
+  The GTK+ filechooser implementation now uses GIO directly, which has
+  rendered external filesystem implementations unnecessary. Consequently,
+  the GtkFileSystem interface is no longer available, nor the filechooser
+  will load any GtkFileSystem implementation.
+
+* GtkComboBox now renders the popdown button insensitive when
+  the model is empty. Applications which want to populate the list
+  only before displaying it can set gtk_combo_box_set_button_sensitivity
+  to GTK_SENSITIVITY_ON, so that the button is always sensitive or
+  GTK_SENSITIVITY_OFF to make it insensitive respectively.
+
+* In the early 2.14.x releases, GtkAdjustment was changed to enforce
+  that values are restricted to the range [lower, upper - page_size].
+  This has always been the documented behaviour, and the recommended
+  practice is to set page_size to 0 when using adjustments for simple
+  scalar values, like in a slider or spin button.
+  Due to the large number of applications that are affected by this
+  change, the behaviour has been reverted to the old behaviour in
+  2.14.3, with an explicit warning that this change will be
+  reintroduced in 2.90.
+
+* gdk-pixbuf will use GIO for mime type detection if possible. For
+  this to work, shared-mime-info needs to be installed and XDG_DATA_DIRS
+  set accordingly at configure time. Otherwise, gdk-pixbuf falls
+  back to its built-in sniffing implementation.
+
+Release notes for 2.12
+======================
+
+* gtk_about_dialog_get/set_name() were deprecated in favour of
+  gtk_about_dialog_get/set_program_name(), the GtkAboutDialog now uses the
+  "program-name" property instead of the conflicting "name" property.
+
+* The gdk-pixbuf tiff loader now requires libtiff 3.6.0 or later.
+
+* Support for Windows 9x/ME has officially been removed. It hasn't worked
+  since 2.6 anyway.
+
+* The GtkTextBufferTargetInfo enumeration values have been changed from
+  G_MAXUINT-0, G_MAXUINT-1, G_MAXUINT-2, etc, to -1, -2, -3 to stay within
+  ANSI C limits.
+
+* A change in the handling of _NET_WM_USER_TIME properties on toplevel
+  windows can cause deadlock problems with window managers that are using
+  GDK for drawing decorations. In particular, metacity <= 2.18.0 is affected
+  by this. The problem has been fixed in metacity 2.18.1.
+
+* Semi-private GtkTextLayout api has changed: new GtkTextLayout method
+  invalidate_cursors(), and new functions gtk_text_layout_invalidate_cursors()
+  and gtk_text_layout_cursors_changed(), which should be used in place of
+  gtk_text_layout_invalidate() and gtk_text_layout_changed() if invalidation
+  is due to marks moved or changed selection; new GtkTextLineDisplay structure
+  member. Source compatibility is preserved; binary compatibility may break
+  only if GtkTextLineDisplay structure was created on stack or as a part
+  of another structure (in particular GnomeCanvas and its clones do not need
+  recompiling).
+
+* Another new signal has been added to GtkNotebook. The new signal
+  is called create-window, so this name can no longer be used for signals
+  in objects derived from GtkNotebook.
+
+* The gtk_notebook_set/get_group_id() functions were found to be insufficient
+  and have been deprecated in favour of gtk_notebook_set/get_group().
+
+* The move-focus signal has been moved to GtkWidget, to unify the 
+  various implementations of this signal in specific widgets. Great care 
+  has been taken to make sure that all code using this signal continues
+  to work.
+
+* An unused and hardly visible GtkFrame has been removed from the menu 
+  widget hierarchy when GtkComboBox::appears-as-list style property is 
+  set. Any RC file applying a different style to any widget below the 
+  widget path "gtk-combobox-popup-window.GtkFrame" should take into 
+  account that the frame no longer exists.
+
+* The external print preview application used by GtkPrintOperationPreview 
+  is now passed the print settings on the command line with the 
+  --print-settings parameter pointing to a temp file containing the 
+  settings. The preview application assumes ownership of the file and 
+  should delete it once it does not need it anymore. The --print-settings 
+  commandline option is understood by Evince 0.9.0 and newer. To use a 
+  different print preview application, change the gtk-print-preview-command 
+  setting in your gtkrc file, e.g. gtk-print-preview-command = "ggv %f"
+
+* GtkMenuShell is now defined as an abstract type. It was already 
+  documented as an abstract class, and there is little reason to 
+  instantiate it.
+
+* The GtkTooltips struct (this is the old tooltips API) is now considered
+  private. Code that used to access this struct, in particular the
+  tips_data_list field, will need to change. All of the old tooltips
+  API has been deprecated in favour of a new implementation and
+  API. This affects all of the gtk_tooltips_ functions, and functions 
+  which take a GtkTooltips argument, such as gtk_tool_item_set_tooltip()
+  and gtk_menu_tool_button_set_arrow_tooltip().
+  
+* The memory management of the GtkRecentManager object has been changed,
+  as using the screen didn't guarantee that the singleton instance was
+  correctly destroyed. The screen-related functions have been deprecated,
+  and should not be used anymore; the GtkRecentManager instance returned by
+  the gtk_recent_manager_get_default() function is guaranteed to be valid
+  for the entire lifetime of an application.
+
+* A number of interfaces that have been superseded by newer interfaces for 
+  a long time have finally been deprecated. This includes 
+  gtk_widget_ref/unref(), gtk_rc_style_ref/unref() and the old file selector.
+
+* The various coordinate systems in use in GtkTreeView widgets have
+  been clarified in the documentation, and in the cause of doing so, 
+  the functions gtk_tree_view_widget_to_tree_coords() and
+  gtk_tree_view_tree_to_widget_coords() have been deprecated in 
+  favour of a new family of gtk_tree_view_convert_ functions.
+
+* gtk_menu_item_remove_submenu() has been deprecated in favour of
+  gtk_menu_item_set_submenu (..., NULL).
+
+* gtk_default_draw_check() has been fixed to really decrease the
+  indicator size by one pixel to ensure an odd size instead of
+  accidentially increasing it.
+  Consequently, gtk_cell_renderer_toggle_render() could be fixed to
+  not subtract 1 from the size passed to gtk_paint_option(), which
+  was just a workaround for above off-by-two for even sizes (theme
+  engines now get the real indicator size passed).
+  The default toggle size of GtkCheckMenuItem and GtkCellRendererToggle
+  has been changed to 13 to be consistent with GtkCheckButton.
+  The only visible change with default settings is that the indicator in
+  GtkCellRendererToggle has changed its size from 11 to 13 and is now
+  consistent with menus and toggle buttons.
+
+* GTK+ has always required that gtk_init() (or a variant thereof) is
+  called before any other GTK+ function. Some applications call functions
+  like gtk_clipboard_get() to check if they need to call gtk_init(),
+  anyway. A change in GLib 2.14 has recently broken this unsupported
+  practise. It is worth pointing out that calling gtk_init() twice
+  does no harm.
+
+
+Release notes for 2.10
+======================
+
+* The hexadecimal Unicode input feature has been reworked. It no longer
+  blocks the use of the sixteen Ctrl-Shift-<hex digit> key sequences. Now
+  it only uses Ctrl-Shift-u.
+
+* A memory leak in GtkStyle handling has been fixed. This may expose bugs
+  in third-party widgets which forget to call gtk_style_attach() in their
+  realize functions.
+
+* Range widgets like GtkScrollbar now render their arrows insensitive
+  when the slider is at the end. Applications which react to arrow
+  clicks even if the slider is at the end may want to use the new
+  gtk_range_set_[upper/lower]_stepper_sensitivity() functions to
+  prevent the arrows from being rendered insensitive.
+
+* GtkObject now uses the "floating reference" support in GObject. 
+  GTK_OBJECT_IS_FLOATING() will still work, but direct checking
+  of the GTK_FLOATING flag will no longer detect the floating 
+  reference. Details about floating references can be found in the docs:
+  http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html#floating-ref
+
+* Accelerators like (_F) are now stripped from labels when they are 
+  displayed in toolbars. If this is not wanted, the feature can be 
+  suppressed by inserting a Unicode control character, e.g ZWNJ.
+
+* The pixbuf theme engine can now customize expanders (in GtkTreeView
+  and GtkExpander) and resize grips, using the new EXPANDER and
+  RESIZE_GRIP function values.
+
+* Dialogs created by gtk_about_dialog_new() no longer hide automatically
+  when the user clicks close. It is the applications responsibility to
+  hide or destroy the dialog.
+
+* Several new signals have been added to GtkNotebook. Care has been taken
+  to choose signal names which do not collide with signals added by well-known
+  derived classes. The names which can no longer be used for signals in 
+  objects derived from GtkNotebook are page-reordered, page-removed and
+  page-added.
+
+* Due to the interface changes in the file chooser backend interface, 
+  the GTK+ ABI version has been bumped to 2.10.0. Third-party filesystem 
+  backends have to be ported to the new interface, other modules, such as 
+  theme engines, input method modules or pixbuf loaders have to be rebuilt 
+  so that they are installed in the right place for GTK+ to find them.
+
+
+Release notes for 2.8
+=====================
+
+* GTK+ 2.8 and Pango 1.10 require the cairo library.
+
+* The default theme has been renamed to "Raleigh". Existing configurations
+  specifying the "Default" theme name should still work.
+
+* The GtkTreeView::enable-search property has been changed to control
+  only typeahead search, not the C-f keybinding to start an interactive
+  search. To turn off interactive searching completely, you have to
+  set GtkTreeView::search-column to -1.
+
+* The restriction on using the same cell renderer in multiple columns
+  of a GtkTreeView is now more strictly enforced.
+
+* In GTK+ 2.8, GtkCalendar uses nl_langinfo() (if available) to determine
+  the first day of the week. Thus, it is possible to select the first day
+  of the week independently from the language, by setting LC_TIME.
+
+* In GTK+ 2.8, the gtk-update-icon-cache utility includes image data
+  in the icon caches, which will make the icon cache files larger than
+  the one produced by GTK+ 2.6. This change will reduce the memory
+  overhead of icon themes at runtime, since all GTK+ applications can
+  share the image data in memory.
+
+* In 2.8, GDK emits GdkEventGrabBroken events when a keyboard or pointer
+  grab is broken. On X11, this can happen if the same application grabs
+  again, or if the window used for the grab becomes unviewable. It happens
+  more often on Win32. Applications which use grabs should pay attention
+  to these events and do the necessary cleanups when the grab is lost.
+* The GIOChannel code for sockets on win32 has been rewritten.
+  Applications who make non-trivial use of GIOChannels on win32 should
+  be watched for possible problems.
+
+* GLib 2.8 uses atomic operations to implement reference counting, thus
+  g_object_ref/unref, g_closure_ref/sink/unref and g_iochannel_ref/unref
+  can be used without locking in multithreaded applications. Note that
+  other modifications, like concurrent setting of properties still require
+  locking.
+
+* g_convert() and related character set conversion functions have been
+  fixed to emit pending shift states and to not cache iconv descriptors
+  across multiple calls, since that is problematic for some encodings.
+  Note that these functions are not suitable for streaming conversions;
+  use g_iconv() to do streaming conversion.
+
+
+Release notes for 2.6
+=====================
+
+* GTK+ 2.6 supports clipboard persistency. To make use of this feature,
+  a clipboard manager following the specification at
+  http://www.freedesktop.org/wiki/Standards/clipboard-manager-spec
+  must be running. A sample implementation of such a clipboard manager
+  is available at 
+  http://people.imendio.com/andersca/archives/clipboard-manager-0.3.tar.gz
+  Applications can use the function gdk_display_supports_clipboard_persistence() 
+  to find out if clipboard persistence is available.
+
+* Notification on clipboard ownership changes via GdkOwnerChange events 
+  requires the XFIXES X extension. Applications can use the function
+  gdk_display_supports_selection_notification() to find out if ownerchip
+  change notification is available.
+
+* The icon theme code in GTK+ 2.6 follows the freedesktop.org icon theme 
+  specification. Setting the XDG_DATA_DIRS environtment variable may be 
+  necessary if your icons aren't installed in the default location 
+  /usr/share/icons.
+
+* The icon theme code in GTK+ 2.6 can make use of mmap()able cache files
+  to avoid a lot of disk searching overhead. GTK+ includes a utility named
+  gtk-update-icon-cache to generate these cache files. For further details,
+  see the gtk-update-icon-cache man page or the GTK+ documentation.
+
+* To reduce code size and improve efficiency, GTK+, when compiled 
+  with the GNU toolchain, has separate internal and external entry 
+  points for exported functions. The internal names, which begin with 
+  IA__, may be seen when debugging a GTK+ program.
+
+* The following functions have been deprecated in GTK+ 2.6:
+  gdk_pango_context_set_colormap
+  gtk_cell_renderer_editing_canceled
+
+* The new GtkFileChooser widget emphasizes simplicity and thus does 
+  not provide a navigation entry by default when opening files. 
+  Experienced command line users will likely want to make heavy use of
+  the location dialog brought up by the Control-L key shortcut.
+
+* The GTK+ libraries use an '_' prefix to indicate private symbols that
+  must not be used by applications. On some platforms, symbols beginning 
+  with prefixes such as _gtk, _gdk, and _pango will be exported
+  from the library, on others not. In no case can applications
+  use these private symbols. In addition to that, GTK+ 2.6 makes several
+  symbols private which were not in any installed header files and
+  were never intended to be exported.
+
+* The gdk_pixbuf_xlib library included in the contrib/ directory 
+  and the framebuffer GDK backend included in the gdk/linux-fb directory
+  of GTK+ are provided on an as-is basis and have not been tested at all. 
+  No guarantees about the degree of workingness or about future
+  compatibility are provided.
+
+* On Unix, the assumption of GLib and GTK+ by default is that filenames on 
+  the filesystem are encoded in UTF-8 rather than the encoding of the locale;
+  the GTK+ developers consider that having filenames whose interpretation
+  depends on the current locale is fundamentally a bad idea.
+
+  If you have filenames encoded in the encoding of your locale, then you 
+  may want to set the G_FILENAME_ENCODING environment variable:
+  
+   G_FILENAME_ENCODING=@locale
+   export G_FILENAME_ENCODING
+
+  (Earlier versions of GLib 2.x required a different environment variable
+  setting; G_BROKEN_FILENAMES=1 to achieve the same effect; this 
+  is still supported, but G_FILENAME_ENCODING is preferred.)
+  Best integration of GTK+ 2.6 with the environment is achieved by 
+  using a UTF-8 locale.
+
+  On Windows, filenames passed to GTK+ should always be in UTF-8, as
+  in GLib 2.6. This is different than in previous versions of GTK+
+  where the system codepage was used. As in GLib, for DLL ABI
+  stability, applications built against previous versions of GTK+ will
+  use entry points providing the old semantics.
+
+  When compiling against GTK+ 2.6, applications intended to be
+  portable to Windows must take the UTF-8 file name encoding into
+  consideration, and use the gstdio wrappers to access files whose 
+  names have been constructed from strings returned from GTK+ or GLib.
+
+
+How to report bugs
+==================
+
+Bugs should be reported to the GNOME bug tracking system.
+(http://bugzilla.gnome.org, product gtk+.) You will need to create an
+account for yourself.
+  
+In the bug report please include:
+  
+* Information about your system. For instance:
+
+   - What operating system and version
+   - What version of X
+   - For Linux, what version of the C library
+
+  And anything else you think is relevant.
+
+* How to reproduce the bug. 
+
+  If you can reproduce it with one of the tests or demos built with GTK+, 
+  such as demos/gtk-demo/gtk-demo, that would be most convenient. Otherwise, 
+  please include a short test program that exhibits the behavior. As a 
+  last resort, you can also provide a pointer to a larger piece of software 
+  that can be downloaded.
+
+* If the bug was a crash, the exact text that was printed out when the
+  crash occured.
+
+* Further information such as stack traces may be useful, but is not
+  necessary. If you do send a stack trace, and the error is an X error,
+  it will be more useful if the stacktrace is produced running the test
+  program with the --sync command line option.
+
+
+Patches
+=======
+
+Patches should also be submitted to bugzilla.gnome.org. If the patch
+fixes an existing bug, add the patch as an attachment to that bug
+report.
+
+Otherwise, enter a new bug report that describes the patch, and attach
+the patch to that bug report.
+
+Patches should be in unified diff form. (The -up option to GNU diff.)

README.md

@@ -1,167 +0,0 @@
-GTK — The GTK toolkit
-=====================
-
-[![Build status](https://gitlab.gnome.org/GNOME/gtk/badges/master/pipeline.svg)](https://gitlab.gnome.org/GNOME/gtk/-/commits/master)
-
-General information
--------------------
-
-GTK is a multi-platform toolkit for creating graphical user interfaces.
-Offering a complete set of widgets, GTK is suitable for projects ranging
-from small one-off projects to complete application suites.
-
-GTK is free software and part of the GNU Project. However, the
-licensing terms for GTK, the GNU LGPL, allow it to be used by all
-developers, including those developing proprietary software, without any
-license fees or royalties.
-
-The official download location
-
-  - https://download.gnome.org/sources/gtk+
-
-The official web site
-
-  - https://www.gtk.org
-
-The official developers blog
-
-  - https://blog.gtk.org
-
-Discussion forum
-
-  - https://discourse.gnome.org/c/platform/core/
-
-Nightly documentation can be found at
-  - Gtk: https://gnome.pages.gitlab.gnome.org/gtk/gtk/
-  - Gdk: https://gnome.pages.gitlab.gnome.org/gtk/gdk/
-  - Gsk: https://gnome.pages.gitlab.gnome.org/gtk/gsk/
-
-Building and installing
------------------------
-
-In order to build GTK you will need:
-
-  - [a C99 compatible compiler](https://wiki.gnome.org/Projects/GLib/CompilerRequirements)
-  - [Python 3](https://www.python.org/)
-  - [Meson](http://mesonbuild.com)
-  - [Ninja](https://ninja-build.org)
-
-You will also need various dependencies, based on the platform you are
-building for:
-
-  - [GLib](https://download.gnome.org/sources/glib)
-  - [GdkPixbuf](https://download.gnome.org/sources/gdk-pixbuf)
-  - [GObject-Introspection](https://download.gnome.org/sources/gobject-introspection)
-  - [Cairo](https://www.cairographics.org)
-  - [Pango](https://download.gnome.org/sources/pango)
-  - [Epoxy](https://github.com/anholt/libepoxy)
-  - [Graphene](https://github.com/ebassi/graphene)
-  - [Xkb-common](https://github.com/xkbcommon/libxkbcommon)
-
-If you are building the X11 backend, you will also need:
-
-  - Xlib, and the following X extensions:
-    - xrandr
-    - xrender
-    - xi
-    - xext
-    - xfixes
-    - xcursor
-    - xdamage
-    - xcomposite
-
-If you are building the Wayland backend, you will also need:
-
-  - Wayland-client
-  - Wayland-protocols
-  - Wayland-cursor
-  - Wayland-EGL
-
-Once you have all the necessary dependencies, you can build GTK by using
-Meson:
-
-```sh
-$ meson _build .
-$ cd _build
-$ ninja
-```
-
-You can run the test suite using:
-
-```sh
-$ meson test
-```
-
-And, finally, you can install GTK using:
-
-```
-$ sudo ninja install
-```
-
-Complete information about installing GTK and related libraries
-can be found in the file:
-
-```
-docs/reference/gtk/html/gtk-building.html
-```
-
-Or [online](https://developer.gnome.org/gtk4/stable/gtk-building.html)
-
-How to report bugs
-------------------
-
-Bugs should be reported on the [issues page](https://gitlab.gnome.org/GNOME/gtk/issues/new).
-
-In the bug report please include:
-
-* Information about your system. For instance:
-
-   - which version of GTK you are using
-   - what operating system and version
-   - for Linux, which distribution
-   - if you built GTK, the list of options used to configure the build
-
-  And anything else you think is relevant.
-
-* How to reproduce the bug.
-
-  If you can reproduce it with one of the demo applications that are
-  built in the demos/ subdirectory, on one of the test programs that
-  are built in the tests/ subdirectory, that will be most convenient.
-  Otherwise, please include a short test program that exhibits the
-  behavior. As a last resort, you can also provide a pointer to a
-  larger piece of software that can be downloaded.
-
-* If the bug was a crash, the exact text that was printed out
-  when the crash occurred.
-
-* Further information such as stack traces may be useful, but
-  is not necessary.
-
-Contributing to GTK
--------------------
-
-Please, follow the [contribution guide](./CONTRIBUTING.md) to know how to
-start contributing to GTK.
-
-Release notes
--------------
-
-The release notes for GTK are part of the migration guide in the API
-reference. See:
-
- - [3.x release notes](https://developer.gnome.org/gtk3/unstable/gtk-migrating-2-to-3.html)
- - [4.x release notes](https://developer.gnome.org/gtk4/unstable/gtk-migrating-3-to-4.html)
-
-Licensing terms
----------------
-
-GTK is released under the terms of the GNU Lesser General Public License,
-version 2.1 or, at your option, any later version, as published by the Free
-Software Foundation.
-
-Please, see the [`COPYING`](./COPYING) file for further information.
-
-GTK includes a small number of source files under the Apache license:
-- A fork of the roaring bitmaps implementation in [gtk/roaring](./gtk/roaring)
-- An adaptation of timsort from python in [gtk/timsort](./gtk/timsort)

README.win32

@@ -0,0 +1,206 @@
+The Win32 backend in GTK+ is not as stable or correct as the X11 one.
+
+For prebuilt runtime and developer packages see
+http://ftp.gnome.org/pub/gnome/binaries/win32/
+
+Building GTK+ on Win32
+======================
+
+First you obviously need developer packages for the compile-time
+dependencies: GDK-Pixbuf, Pango, atk, glib, gettext-runtime, libiconv
+at least.  See
+http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies.
+
+For people compiling GTK+ on Visual C++ 2005 or later, it is recommended
+that you build GDK-Pixbuf, Pango, atk, glib with the same compiler to avoid
+crashes and errors caused by the usage of different CRTS.  VS 2008
+project files and/or VS Makefiles are either already available in these
+packages or will be available in the next stable release.  Unfortunately
+compiling with Microsoft's compilers (version 2003 or earlier) is not
+supported as compiling GLib requires features from the newer compilers
+and/or the newer Platform SDKs at this time of writing.
+
+After installing the dependencies, there are two ways to build GTK+
+for win32.
+
+1) GNU tools, ./configure && make install
+-----------------------------------------
+
+This requires you have mingw and MSYS.
+
+Use the configure script, and the resulting Makefiles (which use
+libtool and gcc to do the compilation). I use this myself, but it can
+be hard to setup correctly.
+
+The full script I run to build GTK+ 2.16 unpacked from a source
+distribution is as below. This is from bulding GTK+ 2.16.5. I don't
+use any script like this to build the development branch, as I don't
+distribute any binaries from development branches.
+
+# This is a shell script that calls functions and scripts from
+# tml@iki.fi's personal work env<6E>ronment. It is not expected to be
+# usable unmodified by others, and is included only for reference.
+
+MOD=gtk+
+VER=2.16.5
+REV=1
+ARCH=win32
+
+THIS=${MOD}_${VER}-${REV}_${ARCH}
+
+RUNZIP=${MOD}_${VER}-${REV}_${ARCH}.zip
+DEVZIP=${MOD}-dev_${VER}-${REV}_${ARCH}.zip
+
+HEX=`echo $THIS | md5sum | cut -d' ' -f1`
+TARGET=c:/devel/target/$HEX
+
+usedev
+usemsvs6
+
+(
+
+set -x
+
+DEPS=`latest --arch=${ARCH} glib atk cairo pango libpng zlib libtiff jpeg`
+PROXY_LIBINTL=`latest --arch=${ARCH} proxy-libintl`
+
+PKG_CONFIG_PATH=
+for D in $DEPS; do
+    PATH=/devel/dist/${ARCH}/$D/bin:$PATH
+    [ -d /devel/dist/${ARCH}/$D/lib/pkgconfig ] && PKG_CONFIG_PATH=/devel/dist/${ARCH}/$D/lib/pkgconfig:$PKG_CONFIG_PATH
+done
+
+LIBPNG=`latest --arch=${ARCH} libpng`
+ZLIB=`latest --arch=${ARCH} zlib`
+LIBTIFF=`latest --arch=${ARCH} libtiff`
+JPEG=`latest --arch=${ARCH} jpeg`
+
+patch -p0 <<'EOF'
+EOF
+
+lt_cv_deplibs_check_method='pass_all' \
+CC='gcc -mtune=pentium3 -mthreads' \
+CPPFLAGS="-I/devel/dist/${ARCH}/${LIBPNG}/include \
+-I/devel/dist/${ARCH}/${ZLIB}/include \
+-I/devel/dist/${ARCH}/${LIBTIFF}/include \
+-I/devel/dist/${ARCH}/${JPEG}/include \
+-I/devel/dist/${ARCH}/${PROXY_LIBINTL}/include" \
+LDFLAGS="-L/devel/dist/${ARCH}/${LIBPNG}/lib \
+-L/devel/dist/${ARCH}/${ZLIB}/lib \
+-L/devel/dist/${ARCH}/${LIBTIFF}/lib \
+-L/devel/dist/${ARCH}/${JPEG}/lib \
+-L/devel/dist/${ARCH}/${PROXY_LIBINTL}/lib -Wl,--exclude-libs=libintl.a \
+-Wl,--enable-auto-image-base" \
+LIBS=-lintl \
+CFLAGS=-O2 \
+./configure \
+--with-gdktarget=win32 \
+--disable-gdiplus \
+--with-included-immodules \
+--without-libjasper \
+--enable-debug=yes \
+--enable-explicit-deps=no \
+--disable-gtk-doc \
+--disable-static \
+--prefix=$TARGET &&
+
+libtoolcacheize &&
+rm gtk/gtk.def &&
+(PATH="$PWD/gdk-pixbuf/.libs:/devel/target/$HEX/bin:$PATH" make -j3 install || (rm .libtool-cache* && PATH="/devel/target/$HEX/bin:$PATH" make -j3 install)) &&
+
+PATH="/devel/target/$HEX/bin:$PATH" gdk-pixbuf-query-loaders >/devel/target/$HEX/etc/gtk-2.0/gdk-pixbuf.loaders &&
+
+grep -v -E 'Automatically generated|Created by|LoaderDir =' <$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders >$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders.temp &&
+    mv $TARGET/etc/gtk-2.0/gdk-pixbuf.loaders.temp $TARGET/etc/gtk-2.0/gdk-pixbuf.loaders &&
+grep -v -E 'Automatically generated|Created by|ModulesPath =' <$TARGET/lib/gtk-2.0/2.10.0/immodules.cache >$TARGET/lib/gtk-2.0/2.10.0/immodules.temp &&
+    mv $TARGET/lib/gtk-2.0/2.10.0/immodules.temp $TARGET/lib/gtk-2.0/2.10.0/immodules.cache &&
+
+./gtk-zip.sh &&
+
+mv /tmp/${MOD}-${VER}.zip /tmp/$RUNZIP &&
+mv /tmp/${MOD}-dev-${VER}.zip /tmp/$DEVZIP
+
+) 2>&1 | tee /devel/src/tml/packaging/$THIS.log
+
+(cd /devel && zip /tmp/$DEVZIP src/tml/packaging/$THIS.{sh,log}) &&
+manifestify /tmp/$RUNZIP /tmp/$DEVZIP
+
+You should not just copy the above blindly. There are some things in
+the script that are very specific to *my* build setup on *my* current
+machine. For instance the "latest" command, the "usedev" and
+"usemsvs6" shell functions, the /devel/dist folder. The above script
+is really just meant for reference, to give an idea. You really need
+to understand what things like PKG_CONFIG_PATH are and set them up
+properly after installing the dependencies before building GTK+.
+
+As you see above, after running configure, one can just say "make
+install", like on Unix. A post-build fix is needed, running
+gdk-pixbuf-query-loaders once more to get a correct gdk-pixbuf.loaders
+file.
+
+For a 64-bit build you need to remove the gtk/gtk.def file and let it
+be regenerated by the makefilery. This is because the 64-bit GTK dll
+has a slightly different list of exported function names. This is on
+purpose and not a bug. The API is the same at the source level, and
+the same #defines of some function names to actually have a _utf8
+suffix is used (just to keep the header simpler). But the
+corresponding non-suffixed function to maintain ABI stability are not
+needed in the 64-bit case (because there are no older EXEs around that
+would require such for ABI stability).
+
+
+2) Microsoft's tools
+--------------------
+
+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/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 and the gtk-demo program.
+(The GAIL and GAIL-util sources are not built by this method yet)
+
+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
+C++:
+
+https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack 
+
+Alternative 1 also generates Microsoft import libraries (.lib), if you
+have lib.exe available. It might also work for cross-compilation from
+Unix.
+
+I (Tor) use method 1 myself. Hans Breuer has been taking care of the MSVC
+makefiles. At times, we disagree a bit about various issues, and for
+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.
+
+Using GTK+ on Win32
+===================
+
+To use GTK+ on Win32, you also need either one of the above mentioned
+compilers. Other compilers might work, but don't count on it. Look for
+prebuilt developer packages (DLLs, import libraries, headers) on the
+above website.
+
+Multi-threaded use of GTK+ on Win32
+===================================
+
+Multi-threaded GTK+ programs might work on Windows in special simple
+cases, but not in general. Sorry. If you have all GTK+ and GDK calls
+in the same thread, it might work. Otherwise, probably not at
+all. Possible ways to fix this are being investigated.
+
+Wintab
+======
+
+The tablet support uses the Wintab API. The Wintab development kit is
+no longer required. The wintab.h header file is bundled with GTK+
+sources. Unfortunately it seems that only Wacom tablets come with
+support for the Wintab API nowadays.
+
+--Tor Lillqvist <tml@iki.fi>, <tml@novell.com>
+--Updated by Fan, Chun-wei <fanc999@yahoo.com.tw>

acinclude.m4

@@ -0,0 +1,79 @@
+# autoconf 2.13 / 2.50 compatibility macro
+
+# GLIB_AC_DIVERT_BEFORE_HELP(STUFF)
+# ---------------------------------
+# Put STUFF early enough so that they are available for $ac_help expansion.
+# Handle both classic (<= v2.13) and modern autoconf
+AC_DEFUN([GLIB_AC_DIVERT_BEFORE_HELP],
+[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])],
+       [ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])],
+              [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+$1
+AC_DIVERT_POP()])])])
+
+# GTK_ADD_LIB(VAR,LIBNAME)
+# ---------------------------------
+# Helper macro to add a -lBlah to a variable, avoiding repeats
+# Note that this needs to be quoted when used in an enclosing macro
+AC_DEFUN([GTK_ADD_LIB],
+[ case "$$1 " in
+    *-l$2[[\ \	]]*)               ;;
+    *)               $1="-l$2 $$1" ;;
+  esac
+])
+
+
+# Checks the location of the XML Catalog
+# Usage:
+#   JH_PATH_XML_CATALOG([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# Defines XMLCATALOG and XML_CATALOG_FILE substitutions
+AC_DEFUN([JH_PATH_XML_CATALOG],
+[
+  # check for the presence of the XML catalog
+  AC_ARG_WITH([xml-catalog],
+              AC_HELP_STRING([--with-xml-catalog=CATALOG],
+                             [path to xml catalog to use]),,
+              [with_xml_catalog=/etc/xml/catalog])
+  jh_found_xmlcatalog=true
+  XML_CATALOG_FILE="$with_xml_catalog"
+  AC_SUBST([XML_CATALOG_FILE])
+  AC_MSG_CHECKING([for XML catalog ($XML_CATALOG_FILE)])
+  if test -f "$XML_CATALOG_FILE"; then
+    AC_MSG_RESULT([found])
+  else
+    jh_found_xmlcatalog=false
+    AC_MSG_RESULT([not found])
+  fi
+
+  # check for the xmlcatalog program
+  AC_PATH_PROG(XMLCATALOG, xmlcatalog, no)
+  if test "x$XMLCATALOG" = xno; then
+    jh_found_xmlcatalog=false
+  fi
+
+  if $jh_found_xmlcatalog; then
+    ifelse([$1],,[:],[$1])
+  else
+    ifelse([$2],,[AC_MSG_ERROR([could not find XML catalog])],[$2])
+  fi
+])
+
+# Checks if a particular URI appears in the XML catalog
+# Usage:
+#   JH_CHECK_XML_CATALOG(URI, [FRIENDLY-NAME], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+AC_DEFUN([JH_CHECK_XML_CATALOG],
+[
+  AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
+  AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
+  if $jh_found_xmlcatalog && \
+     AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
+    AC_MSG_RESULT([found])
+    ifelse([$3],,,[$3
+])dnl
+  else
+    AC_MSG_RESULT([not found])
+    ifelse([$4],,
+       [AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],
+       [$4])
+  fi
+])

autogen.sh

@@ -0,0 +1,150 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+PROJECT=Gtk+
+TEST_TYPE=-d
+FILE=gdk
+
+DIE=0
+
+have_libtool=false
+if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
+	libtool_version=`libtoolize --version |
+			 head -1 |
+			 sed -e 's/^\(.*\)([^)]*)\(.*\)$/\1\2/g' \
+			     -e 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+	case $libtool_version in
+	    1.4*|1.5*|2.2*|2.4*)
+		have_libtool=true
+		;;
+	esac
+fi
+if $have_libtool ; then : ; else
+	echo
+	echo "You must have libtool 1.4 installed to compile $PROJECT."
+	echo "Install the appropriate package for your distribution,"
+	echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
+	DIE=1
+fi
+
+(gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
+	echo
+	echo "You must have gtk-doc installed to compile $PROJECT."
+	echo "Install the appropriate package for your distribution,"
+	echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
+	DIE=1
+}
+
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+	echo
+	echo "You must have autoconf installed to compile $PROJECT."
+	echo "Install the appropriate package for your distribution,"
+	echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
+	DIE=1
+}
+
+if automake-1.15 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.15
+    ACLOCAL=aclocal-1.15
+else if automake-1.14 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.14
+    ACLOCAL=aclocal-1.14
+else if automake-1.13 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.13
+    ACLOCAL=aclocal-1.13
+else if automake-1.12 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.12
+    ACLOCAL=aclocal-1.12
+else if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.11
+    ACLOCAL=aclocal-1.11
+else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.10
+    ACLOCAL=aclocal-1.10
+else if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.7
+    ACLOCAL=aclocal-1.7
+else
+	echo
+	echo "You must have automake 1.7.x, 1,10.x, 1.11.x, 1.12.x, 1.13.x, 1.14.x"
+	echo "or 1.15.x installed to compile $PROJECT."
+	echo "Install the appropriate package for your distribution,"
+	echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
+	DIE=1
+fi
+fi
+fi
+fi
+fi
+fi
+fi
+
+if test "$DIE" -eq 1; then
+	exit 1
+fi
+
+test $TEST_TYPE $FILE || {
+	echo "You must run this script in the top-level $PROJECT directory"
+	exit 1
+}
+
+# NOCONFIGURE is used by gnome-common; support both
+if ! test -z "$AUTOGEN_SUBDIR_MODE"; then
+    NOCONFIGURE=1
+fi
+
+if test -z "$NOCONFIGURE"; then
+        if test -z "$*"; then
+                echo "I am going to run ./configure with no arguments - if you wish "
+                echo "to pass any to it, please specify them on the $0 command line."
+        fi
+fi
+
+if test -z "$ACLOCAL_FLAGS"; then
+
+	acdir=`$ACLOCAL --print-ac-dir`
+        m4list="glib-2.0.m4 glib-gettext.m4"
+
+	for file in $m4list
+	do
+		if [ ! -f "$acdir/$file" ]; then
+			echo "WARNING: aclocal's directory is $acdir, but..."
+			echo "         no file $acdir/$file"
+			echo "         You may see fatal macro warnings below."
+			echo "         If these files are installed in /some/dir, set the ACLOCAL_FLAGS "
+			echo "         environment variable to \"-I /some/dir\", or install"
+			echo "         $acdir/$file."
+			echo ""
+		fi
+	done
+fi
+
+rm -rf autom4te.cache
+
+# README and INSTALL are required by automake, but may be deleted by clean
+# up rules. to get automake to work, simply touch these here, they will be
+# regenerated from their corresponding *.in files by ./configure anyway.
+touch README INSTALL
+
+$ACLOCAL -I m4 $ACLOCAL_FLAGS || exit $?
+
+libtoolize --force || exit $?
+gtkdocize || exit $?
+
+autoheader || exit $?
+
+$AUTOMAKE --add-missing || exit $?
+autoconf || exit $?
+cd $ORIGDIR || exit $?
+
+if test -z "$NOCONFIGURE"; then
+        $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
+
+        echo 
+        echo "Now type 'make' to compile $PROJECT."
+fi

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

@@ -1,118 +0,0 @@
-{
-    "app-id" : "org.gtk.Demo4",
-    "runtime" : "org.gnome.Platform",
-    "runtime-version" : "master",
-    "sdk" : "org.gnome.Sdk",
-    "command" : "gtk4-demo",
-    "tags" : [
-        "devel",
-        "development",
-        "nightly"
-    ],
-    "desktop-file-name-prefix" : "(Development) ",
-    "finish-args" : [
-        "--device=dri",
-        "--share=ipc",
-        "--socket=fallback-x11",
-        "--socket=wayland",
-        "--talk-name=org.gtk.vfs",
-        "--talk-name=org.gtk.vfs.*"
-    ],
-    "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" : "wayland",
-            "buildsystem" : "autotools",
-            "builddir" : true,
-            "config-opts" : [
-                "--disable-documentation"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/wayland-project/wayland.git"
-                }
-            ]
-        },
-        {
-            "name" : "graphene",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib",
-                "-Dtests=false",
-                "-Dbenchmarks=false"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/ebassi/graphene.git"
-                }
-            ]
-        },
-        {
-            "name" : "libsass",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/lazka/libsass.git",
-                    "branch" : "meson"
-                }
-            ]
-        },
-        {
-            "name" : "sassc",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/lazka/sassc.git",
-                    "branch" : "meson"
-                }
-            ]
-        },
-        {
-            "name" : "gtk",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib",
-                "-Denable_vulkan=no",
-                "-Dbuildtype=debugoptimized"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git"
-                }
-            ]
-        }
-    ],
-    "build-options" : {
-        "env" : {
-            "GSK_RENDERER" : "opengl"
-        }
-    }
-}

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

@@ -1,117 +0,0 @@
-{
-    "app-id" : "org.gtk.IconBrowser4",
-    "runtime" : "org.gnome.Platform",
-    "runtime-version" : "master",
-    "sdk" : "org.gnome.Sdk",
-    "command" : "gtk4-icon-browser",
-    "tags" : [
-        "devel",
-        "development",
-        "nightly"
-    ],
-    "desktop-file-name-prefix" : "(Development) ",
-    "finish-args" : [
-        "--device=dri",
-        "--share=ipc",
-        "--socket=fallback-x11",
-        "--socket=wayland",
-        "--talk-name=org.gtk.vfs",
-        "--talk-name=org.gtk.vfs.*"
-    ],
-    "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" : "wayland",
-            "buildsystem" : "autotools",
-            "builddir" : true,
-            "config-opts" : [
-                "--disable-documentation"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/wayland-project/wayland.git"
-                }
-            ]
-        },
-        {
-            "name" : "graphene",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib",
-                "-Dtests=false",
-                "-Dbenchmarks=false"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/ebassi/graphene.git"
-                }
-            ]
-        },
-        {
-            "name" : "libsass",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/lazka/libsass.git",
-                    "branch" : "meson"
-                }
-            ]
-        },
-        {
-            "name" : "sassc",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/lazka/sassc.git",
-                    "branch" : "meson"
-                }
-            ]
-        },
-        {
-            "name" : "gtk",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib",
-                "-Denable_vulkan=no",
-                "-Dbuildtype=debugoptimized"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git"
-                }
-            ]
-        }
-    ],
-    "build-options" : {
-        "env" : {
-        }
-    }
-}

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

@@ -1,121 +0,0 @@
-{
-    "app-id" : "org.gtk.WidgetFactory4",
-    "runtime" : "org.gnome.Platform",
-    "runtime-version" : "master",
-    "sdk" : "org.gnome.Sdk",
-    "command" : "gtk4-widget-factory",
-    "tags" : [
-        "devel",
-        "development",
-        "nightly"
-    ],
-    "desktop-file-name-prefix" : "(Development) ",
-    "finish-args" : [
-        "--device=dri",
-        "--share=ipc",
-        "--socket=fallback-x11",
-        "--socket=wayland",
-        "--talk-name=org.gtk.vfs",
-        "--talk-name=org.gtk.vfs.*"
-    ],
-    "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" : "wayland",
-            "buildsystem" : "autotools",
-            "builddir" : true,
-            "config-opts" : [
-                "--disable-documentation"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/wayland-project/wayland.git"
-                }
-            ]
-        },
-        {
-            "name" : "graphene",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib",
-                "-Dtests=false",
-                "-Dbenchmarks=false"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/ebassi/graphene.git"
-                }
-            ]
-        },
-        {
-            "name" : "libsass",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/lazka/libsass.git",
-                    "branch" : "meson"
-                }
-            ]
-        },
-        {
-            "name" : "sassc",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/lazka/sassc.git",
-                    "branch" : "meson"
-                }
-            ]
-        },
-        {
-            "name" : "gtk",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib",
-                "-Denable_vulkan=no",
-                "-Dbuildtype=debugoptimized"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git"
-                }
-            ]
-        }
-    ],
-    "build-options" : {
-        "env" : {
-            "DBUS_SESSION_BUS_ADDRESS" : "''",
-            "GSK_RENDERER" : "opengl",
-            "GDK_DEBUG" : "vulkan-disable",
-            "G_ENABLE_DEBUG" : "true"
-        }
-    }
-}

build-aux/meson/post-install.py

@@ -1,43 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import sys
-import subprocess
-
-if 'DESTDIR' not in os.environ:
-    gtk_api_version = sys.argv[1]
-    gtk_abi_version = sys.argv[2]
-    gtk_libdir = sys.argv[3]
-    gtk_datadir = sys.argv[4]
-
-    gtk_moduledir = os.path.join(gtk_libdir, 'gtk-' + gtk_api_version, gtk_abi_version)
-    gtk_printmodule_dir = os.path.join(gtk_moduledir, 'printbackends')
-    gtk_immodule_dir = os.path.join(gtk_moduledir, 'immodules')
-
-    print('Compiling GSettings schemas...')
-    glib_compile_schemas = subprocess.check_output(['pkg-config',
-                                                   '--variable=glib_compile_schemas',
-                                                   'gio-2.0']).strip()
-    if not os.path.exists(glib_compile_schemas):
-        # pkg-config variables only available since GLib 2.62.0.
-        glib_compile_schemas = 'glib-compile-schemas'
-    subprocess.call([glib_compile_schemas,
-                    os.path.join(gtk_datadir, 'glib-2.0', 'schemas')])
-
-    print('Updating icon cache...')
-    subprocess.call(['gtk4-update-icon-cache', '-q', '-t' ,'-f',
-                    os.path.join(gtk_datadir, 'icons', 'hicolor')])
-
-    print('Updating module cache for print backends...')
-    os.makedirs(gtk_printmodule_dir, exist_ok=True)
-    gio_querymodules = subprocess.check_output(['pkg-config',
-                                                '--variable=gio_querymodules',
-                                                'gio-2.0']).strip()
-    if not os.path.exists(gio_querymodules):
-        # pkg-config variables only available since GLib 2.62.0.
-        gio_querymodules = 'gio-querymodules'
-    subprocess.call([gio_querymodules, gtk_printmodule_dir])
-
-    print('Updating module cache for input methods...')
-    os.makedirs(gtk_immodule_dir, exist_ok=True)
-    subprocess.call([gio_querymodules, gtk_immodule_dir])

build/Makefile-newvs.am

@@ -0,0 +1,45 @@
+# Centralized autotools file
+# Create the Visual Studio 2012/2013/2015 project files
+# from the Visual Studio 2010 project files
+
+# This autotools file, from GLib, can be used in other projects
+# that have Visual Studio build support, and is copied into
+# $(srcroot)/build/.
+
+# Author: Fan, Chun-wei
+# November 05, 2012
+
+# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on)
+# MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on)
+# MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015
+
+%.sln:
+	sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
+	sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
+	rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
+
+%.txt:
+	sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
+	sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
+	rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
+
+%.vcxproj:
+	if test -e $(top_srcdir)/build/win32/vs10/$@; then \
+		sed 's/v100/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+	else \
+		sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+	fi
+
+%.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:
+	if test -e $(top_srcdir)/build/win32/vs10/$@; then \
+		cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+	else \
+		cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+	fi

build/Makefile.am

@@ -0,0 +1,4 @@
+include $(top_srcdir)/Makefile.decl
+
+SUBDIRS = \
+	win32

build/Makefile.msvcproj

@@ -0,0 +1,107 @@
+# Author: Fan, Chun-wei
+# Common Autotools file used to generate Visual Studio 2008+
+# Projects from their templates
+
+# This autotools file, from GLib, can be used in other projects
+# that have Visual Studio build support, and is copied into
+# $(srcroot)/build/.
+
+# * Input variables:
+#
+#   MSVCPROJS - List of Projects that should be generated
+#
+# * Simple tutorial
+#
+# Add this to Makefile.am where your library/program is built:
+#   include $(top_srcdir)/build/Makefile.msvcproj
+#   MSVCPROJS = YourProject (can be multiple projects in a single srcdir)
+#   YourProject_FILES = $(libyourlib_1_0_SOURCES)
+#   YourProject_EXCLUDES = ... # list of sources to exclude, separated by '|', wildcards allowed; use random unsed value if none
+#   YourProject_HEADERS_DIR = $(libyourlibincludedir)
+#   YourProject_HEADERS_INST = $(libyourlib_1_0_HEADERS)
+#   YourProject_HEADERS_EXCLUDES = ... # <list of headers to exclude from installation, separated by '|', wildcards allowed; use random unsed value if none>
+#
+#   dist-hook: \ # (or add to it if it is already there, note the vs9 items will also call the vs10 items in the process)
+#   	$(top_builddir)/build/win32/vs9/YourProject.vcproj	\
+#   	$(top_builddir)/build/win32/vs9/YourProject.headers
+
+
+# Private functions
+
+## Transform the MSVC project filename (no filename extensions) to something which can reference through a variable
+## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0
+_proj_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1))))
+_proj_path_raw:=$(subst $(abs_top_srcdir),,$(abs_srcdir))
+_proj_path=$(subst /,\\,$(_proj_path_raw))
+_proj_subdir_int=$(subst \\\\,\\,\\$(_proj_path)\\)
+_proj_subdir=$(subst \\.\\,\\,$(_proj_subdir_int))
+
+_proj_files_raw=$(subst /,\\,$($(_proj_name)_FILES))
+_proj_files=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_files_raw))))
+_proj_filters=$($(_proj_name)_EXCLUDES)
+
+_proj_headers_raw=$(subst /,\\,$($(_proj_name)_HEADERS_INST))
+_proj_headers=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_headers_raw))))
+_proj_headers_excludes=$($(_proj_name)_HEADERS_EXCLUDES)
+
+_headers_dest_posix=$(subst $(includedir),,$($(_proj_name)_HEADERS_DIR))
+_headers_destdir=$(subst /,\\,$(_headers_dest_posix))
+
+#
+# Creates Visual Studio 2008/2010 projects from items passed in from autotools files
+# $(1) - Base Name of the MSVC project files (outputs)
+#
+
+define msvcproj-builder
+
+$(top_builddir)/build/win32/vs10/$(1).vcxproj: $(top_builddir)/build/win32/vs9/$(1).vcproj
+$(top_builddir)/build/win32/vs10/$(1).vcxproj.filters: $(top_builddir)/build/win32/vs9/$(1).vcproj
+$(1).sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj
+$(1).vs10.sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj
+$(1).vs10.sourcefiles.filters: $(top_builddir)/build/win32/vs9/$(1).vcproj
+
+$(top_builddir)/build/win32/vs9/$(1).vcproj:
+	-$(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
+
+	for F in $(_proj_files); do \
+		case $$$$F in \
+		$(_proj_filters)) \
+			;; \
+		*.c|*.cpp|*.cc|*.cxx) \
+			echo '   <File RelativePath="..\..\..'$(_proj_subdir)$$$$F'" />' >>$(1).sourcefiles && \
+			echo '   <ClCompile Include="..\..\..'$(_proj_subdir)$$$$F'" />' >>$(1).vs10.sourcefiles && \
+			echo '   <ClCompile Include="..\..\..'$(_proj_subdir)$$$$F'"><Filter>Source Files</Filter></ClCompile>' >>$(1).vs10.sourcefiles.filters \
+			;; \
+		esac;	\
+	done
+
+
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/$(1).vcprojin >$(top_builddir)/build/win32/vs9/$(1).vcproj
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/$(1).vcxprojin >$(top_builddir)/build/win32/vs10/$(1).vcxproj
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/$(1).vcxproj.filtersin >$(top_builddir)/build/win32/vs10/$(1).vcxproj.filters
+	$(RM) $(1).sourcefiles
+	$(RM) $(1).vs10.sourcefiles
+	$(RM) $(1).vs10.sourcefiles.filters
+
+$(top_builddir)/build/win32/vs10/$(1).vs10.headers: $(top_builddir)/build/win32/vs9/$(1).headers
+
+$(top_builddir)/build/win32/vs9/$(1).headers:
+	-$(RM) $(top_builddir)/build/win32/vs9/$(1).headers
+	-$(RM) $(top_builddir)/build/win32/vs10/$(1).vs10.headers
+
+	for F in $(_proj_headers); do \
+		case $$$$F in \
+		$(_proj_headers_excludes)) \
+			;; \
+		*.h|*.hpp|*.hh|*.hxx) \
+			echo 'copy ..\..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F'&#x0D;&#x0A;' >>$(top_builddir)/build/win32/vs9/$(1).headers && \
+			echo 'copy ..\..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/build/win32/vs10/$(1).vs10.headers \
+			;; \
+		esac;	\
+	done
+
+endef
+
+$(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj))))

build/win32/Makefile.am

@@ -0,0 +1,8 @@
+include $(top_srcdir)/Makefile.decl
+
+SUBDIRS =	\
+	vs9	\
+	vs10	\
+	vs11	\
+	vs12	\
+	vs14

build/win32/vs10/Makefile.am

@@ -0,0 +1,48 @@
+include $(top_srcdir)/Makefile.decl
+
+GENERATED_ITEMS = \
+	gdk-win32.vcxproj	\
+	gdk.vcxproj		\
+	gtk.vcxproj		\
+	gailutil.vcxproj	\
+	libwimp.vcxproj		\
+	gtk-demo.vcxproj	\
+	gdk-win32.vcxproj.filters	\
+	gdk.vcxproj.filters	\
+	gtk.vcxproj.filters	\
+	gailutil.vcxproj.filters	\
+	libwimp.vcxproj.filters	\
+	gtk-demo.vcxproj.filters	\
+	gtk-install.props
+
+EXTRA_DIST +=	\
+	README.txt	\
+	gtk+.sln	\
+	gtk-build-defines.props	\
+	gtk-gen-srcs.props	\
+	gtk-install.propsin	\
+	gtk-version-paths.props	\
+	gdk-win32.vcxprojin	\
+	gdk-win32.vcxproj.filtersin	\
+	gdk.vcxprojin	\
+	gdk.vcxproj.filtersin	\
+	gtk.vcxprojin	\
+	gtk.vcxproj.filtersin	\
+	gtk-demo.vcxprojin	\
+	gtk-demo.vcxproj.filtersin	\
+	gailutil.vcxprojin	\
+	gailutil.vcxproj.filtersin	\
+	libwimp.vcxprojin	\
+	libwimp.vcxproj.filtersin	\
+	gtk-update-icon-cache.vcxproj	\
+	gtk-update-icon-cache.vcxproj.filters	\
+	gtk-install.vcxproj	\
+	$(GENERATED_ITEMS)
+
+MSVC_INTERMEDIATE_FILES = gdk-win32.vs10.headers gdk.vs10.headers gtk.vs10.headers gailutil.vs10.headers
+
+gtk-install.props: $(MSVC_INTERMEDIATE_FILES)
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk-install.propsin >$@
+	rm $(MSVC_INTERMEDIATE_FILES)
+
+DISTCLEANFILES = $(GENERATED_ITEMS)

build/win32/vs10/README.txt

@@ -0,0 +1,74 @@
+Please do not compile this package (GTK+) in paths that contain
+spaces in them-as strange problems may occur during compilation or during
+the use of the library.
+
+A more detailed outline for instructions on building the GTK+ with Visual
+C++ can be found in the following GNOME Live! page:
+
+https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack 
+
+This VS10 solution and the projects it includes are intented to be used
+in a GTK+ source tree unpacked from a tarball. In a git checkout you
+first need to use some Unix-like environment or manual work to expand
+the files needed, like config.h.win32.in into config.h.win32 and the
+.vcxprojin and .vcxproj.fintersin files here into corresponding actual
+.vcxproj and .vcxproj.filters files.
+
+You will need the parts from below in the GTK+ stack: GDK-Pixbuf, Pango,
+ATK and GLib.  External dependencies are at least Cairo, zlib, libpng,
+gettext-runtime; and optional dependencies  are fontconfig*, freetype*
+and expat*.  See the build/win32/vs10/README.txt file in glib for
+details where to unpack them.
+
+It is recommended that one builds the dependencies with VS10 as far as
+possible, especially those from and using the GTK+ stack (i.e. GLib,
+ATK, Pango, GDK-Pixbuf), so that crashes caused by mixing calls
+to different CRTs can be kept at a minimum.  zlib, libpng, and Cairo
+do contain support for compiling under VS10 using VS
+project files and/or makefiles at this time of writing, For the
+GTK+ stack, VS10 project files are either available under
+$(srcroot)/build/vs10 in the case of GLib (stable/unstable), ATK
+(unstable) and GDK-Pixbuf (unstable), and should be in the next
+unstable version of Pango.  There is no known official VS10 build
+support for fontconfig (along with freetype and expat) and
+gettext-runtime, so please use the binaries from: 
+
+ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit)
+ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit)
+
+The recommended build order for these dependencies:
+(first unzip any dependent binaries downloaded from the ftp.gnome.org
+ as described in the README.txt file in the build/win32/vs10 folder)
+-zlib
+-libpng
+-(optional for GDK-Pixbuf) IJG JPEG
+-(optional for GDK-Pixbuf) requires zlib and IJG JPEG)libtiff
+-(optional for GDK-Pixbuf) jasper [jpeg-2000 library])
+-(optional for GLib) PCRE (version 8.12 or later, use of CMake to
+  build PCRE is recommended-see build/win32/vs10/README.txt of GLib)
+-Cairo
+-GLib
+-ATK
+-Pango
+-GDK-Pixbuf
+(note the last 3 dependencies are not interdependent, so the last 3
+ dependencies can be built in any order)
+
+The "install" project will copy build results and headers into their
+appropriate location under <root>\vs10\<PlatformName>. For instance,
+built DLLs go into <root>\vs10\<PlatformName>\bin, built LIBs into
+<root>\vs10\<PlatformName>\lib and GTK+ headers into
+<root>\vs10\<PlatformName>\include\gtk-2.0. This is then from where
+project files higher in the stack are supposed to look for them, not
+from a specific GLib source tree.
+
+*About the dependencies marked with *: These dependencies are not
+ compulsory components for building and running GTK+ itself, but note
+ that they are needed for people running and building GIMP.
+ They are referred to by components in Cairo and Pango mainly-so decide
+ whether you will need FontConfig/FreeType support prior to building
+ Cairo and Pango, which are hard requirements for building and running
+ GTK+. 
+
+--Tor Lillqvist <tml@iki.fi>
+--Updated by Fan, Chun-wei <fanc999@yahoo.com.tw>

build/win32/vs10/gailutil.vcxproj.filtersin

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Sources">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Headers">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+#include "gailutil.vs10.sourcefiles.filters"
+  </ItemGroup>
+</Project>

build/win32/vs10/gailutil.vcxprojin

@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}</ProjectGuid>
+    <RootNamespace>gailutil</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>pango-1.0.lib;atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>..\..\..\modules\other\gail\libgail-util\gailutil.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>pango-1.0.lib;atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>..\..\..\modules\other\gail\libgail-util\gailutil.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>pango-1.0.lib;atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>..\..\..\modules\other\gail\libgail-util\gailutil.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>pango-1.0.lib;atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>..\..\..\modules\other\gail\libgail-util\gailutil.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+#include "gailutil.vs10.sourcefiles"
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="gdk.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="gtk.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f5}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+#include "gdk-win32.vs10.sourcefiles.filters"
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+    <CustomBuild Include="..\..\..\gdk\gdkconfig.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+  </ItemGroup>
+</Project>

build/win32/vs10/gdk-win32.vcxprojin

@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}</ProjectGuid>
+    <RootNamespace>gdkwin32</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-gen-srcs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+#include "gdk-win32.vs10.sourcefiles"
+  </ItemGroup>
+  <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'">$(CopyConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|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'">$(CopyConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|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'">$(CopyConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|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'">$(CopyConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|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'">$(CopyGdkConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gdk\gdkconfig.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying gdkconfig from gdkconfig.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyGdkConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gdk\gdkconfig.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying gdkconfig from gdkconfig.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyGdkConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gdk\gdkconfig.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying gdkconfig from gdkconfig.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyGdkConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gdk\gdkconfig.h;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

build/win32/vs10/gdk.vcxproj.filtersin

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\gdk\win32\rc\gdk.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+#include "gdk.vs10.sourcefiles.filters"
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\gdk\gdk.symbols">
+      <Filter>Resource Files</Filter>
+    </CustomBuild>
+  </ItemGroup>
+</Project>

build/win32/vs10/gdk.vcxprojin

@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}</ProjectGuid>
+    <RootNamespace>gdk</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-gen-srcs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(ApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(ApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(ApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(ApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\gdk\gdk.symbols">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating gdk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkGenerateGdkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)gdk.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating gdk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkGenerateGdkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)gdk.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating gdk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkGenerateGdkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)gdk.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating gdk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkGenerateGdkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)gdk.def;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\gdk\win32\rc\gdk.rc" />
+  </ItemGroup>
+  <ItemGroup>
+#include "gdk.vs10.sourcefiles"
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="gdk-win32.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073fa}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

build/win32/vs10/gtk+.sln

@@ -0,0 +1,95 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-win32", "gdk-win32.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-demo", "gtk-demo.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcxproj", "{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwimp", "libwimp.vcxproj", "{7660FB4E-2AE6-483E-8813-0974CBE6F97F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-update-icon-cache", "gtk-update-icon-cache.vcxproj", "{FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-install", "gtk-install.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE8073FB}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|x64.Build.0 = Release|x64
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Debug|Win32.Build.0 = Debug|Win32
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Debug|x64.ActiveCfg = Debug|x64
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Debug|x64.Build.0 = Debug|x64
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Release|Win32.ActiveCfg = Release|Win32
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Release|Win32.Build.0 = Release|Win32
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Release|x64.ActiveCfg = Release|x64
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Release|x64.Build.0 = Release|x64
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Debug|Win32.Build.0 = Debug|Win32
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Debug|x64.ActiveCfg = Debug|x64
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Debug|x64.Build.0 = Debug|x64
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Release|Win32.ActiveCfg = Release|Win32
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Release|Win32.Build.0 = Release|Win32
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Release|x64.ActiveCfg = Release|x64
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Release|x64.Build.0 = Release|x64
+		{FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945}.Debug|Win32.Build.0 = Debug|Win32
+		{FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945}.Debug|x64.ActiveCfg = Debug|x64
+		{FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945}.Debug|x64.Build.0 = Debug|x64
+		{FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945}.Release|Win32.ActiveCfg = Release|Win32
+		{FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945}.Release|Win32.Build.0 = Release|Win32
+		{FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945}.Release|x64.ActiveCfg = Release|x64
+		{FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE8073FB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE8073FB}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE8073FB}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE8073FB}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE8073FB}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE8073FB}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE8073FB}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE8073FB}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

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

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="gtk-version-paths.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <GtkBinaryVersion>2.10.0</GtkBinaryVersion>
+    <GtkDummyPrefix>\"/dummy\"</GtkDummyPrefix>
+    <GtkHost>i686-pc-vs$(VSVer)</GtkHost>
+    <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="$(GtkHost)";GTK_PRINT_BACKENDS="file";GTK_PRINT_PREVIEW_COMMAND="undefined-gtk-print-preview-command";$(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"</GtkDefines>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>gtkbuilddefinesprops</_PropertySheetDisplayName>
+    <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\cairo;$(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;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+	<Link>
+      <AdditionalDependencies>pangocairo-1.0.lib;cairo.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;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="GtkBinaryVersion">
+      <Value>$(GtkBinaryVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkDummyPrefix">
+      <Value>$(GtkDummyPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GdkDefines">
+      <Value>$(GdkDefines)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkHost">
+      <Value>$(GtkHost)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkIncludedImmodulesDefines">
+      <Value>$(GtkIncludedImmodulesDefines)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkDefines">
+      <Value>$(GtkDefines)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+#include "gtk-demo.vs10.sourcefiles.filters"
+  </ItemGroup>
+</Project>

build/win32/vs10/gtk-demo.vcxprojin

@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}</ProjectGuid>
+    <RootNamespace>gtkdemo</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>cairo.lib;pango-1.0.lib;pangocairo-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>cairo.lib;pango-1.0.lib;pangocairo-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>cairo.lib;pango-1.0.lib;pangocairo-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>cairo.lib;pango-1.0.lib;pangocairo-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+#include "gtk-demo.vs10.sourcefiles"
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="gdk.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="gtk.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f5}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

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

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="gtk-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <CopyConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</CopyConfigH>
+    <CopyGdkConfigH>copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h</CopyGdkConfigH>
+    <GtkGenerateGdkDef>
+echo EXPORTS &gt; $(DefDir)\gdk.def
+cl /EP -DGDK_WINDOWING_WIN32 -DALL_FILES -DG_GNUC_CONST= ..\..\..\gdk\gdk.symbols &gt;&gt; $(DefDir)\gdk.def
+    </GtkGenerateGdkDef>
+    <GtkGenerateGtkDefW64>
+echo EXPORTS &gt; $(DefDir)\gtk.def
+cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -D_WIN64 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gtk\gtk.symbols &gt;&gt; $(DefDir)\gtk.def
+    </GtkGenerateGtkDefW64>
+    <GtkGenerateGtkDef>
+echo EXPORTS &gt; $(DefDir)\gtk.def
+cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gtk\gtk.symbols &gt;&gt; $(DefDir)\gtk.def
+    </GtkGenerateGtkDef>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>gtkgensrcsprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="CopyConfigH">
+      <Value>$(CopyConfigH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CopyGdkConfigH">
+      <Value>$(CopyGdkConfigH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkGenerateGdkDef">
+      <Value>$(GtkGenerateGdkDef)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkGenerateGtkDefW64">
+      <Value>$(GtkGenerateGtkDefW64)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkGenerateGtkDef">
+      <Value>$(GtkGenerateGtkDef)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>

build/win32/vs10/gtk-install.propsin

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="gtk-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
+    <InstalledDlls>$(BinDir)\$(GtkDllPrefix)gdk-win32(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gtk-win32(GtkDllSuffix).dll;$(BinDir)\libwimp.dll</InstalledDlls>
+    <InstalledBins>$(BinDir)\gtk-demo.exe</InstalledBins>
+    <GtkDoInstall>
+mkdir $(CopyDir)\bin
+copy "$(BinDir)\$(GtkDllPrefix)gdk-win32$(GtkDllSuffix).dll" $(CopyDir)\bin
+copy "$(BinDir)\$(GtkDllPrefix)gdk-win32$(GtkDllSuffix).pdb" $(CopyDir)\bin
+copy "$(BinDir)\$(GtkDllPrefix)gtk-win32$(GtkDllSuffix).dll" $(CopyDir)\bin
+copy "$(BinDir)\$(GtkDllPrefix)gtk-win32$(GtkDllSuffix).pdb" $(CopyDir)\bin
+copy "$(BinDir)\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll" $(CopyDir)\bin
+copy "$(BinDir)\$(GtkDllPrefix)gailutil$(GtkDllSuffix).pdb" $(CopyDir)\bin
+copy "$(BinDir)\gtk-demo.exe" $(CopyDir)\bin
+copy "$(BinDir)\gtk-demo.pdb" $(CopyDir)\bin
+
+mkdir $(CopyDir)\lib
+copy "$(BinDir)\gdk-win32-$(ApiVersion).lib" $(CopyDir)\lib
+copy "$(BinDir)\gtk-win32-$(ApiVersion).lib" $(CopyDir)\lib
+copy "$(BinDir)\gailutil-$(ApiVersion).lib" $(CopyDir)\lib
+
+mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk
+#include "gdk.vs10.headers"
+#include "gdk-win32.vs10.headers"
+
+mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+#include "gtk.vs10.headers"
+
+mkdir $(CopyDir)\lib\gtk-$(ApiVersion)\include
+copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\lib\gtk-$(ApiVersion)\include
+
+mkdir $(CopyDir)\include\gail-1.0\libgail-util
+#include "gailutil.vs10.headers"
+
+mkdir $(CopyDir)\lib\gtk-$(ApiVersion)\$(GtkHost)\engines
+copy "$(BinDir)\libwimp.dll" $(CopyDir)\lib\gtk-$(ApiVersion)\$(GtkHost)\engines
+
+mkdir $(CopyDir)\share\gtk-$(ApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.png $(CopyDir)\share\gtk-$(ApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.gif $(CopyDir)\share\gtk-$(ApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.ui $(CopyDir)\share\gtk-$(ApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.jpg $(CopyDir)\share\gtk-$(ApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.c $(CopyDir)\share\gtk-$(ApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.h $(CopyDir)\share\gtk-$(ApiVersion)\demo
+
+mkdir $(CopyDir)\share\themes\Default\gtk-2.0-key
+copy ..\..\..\gtk\gtkrc.key.default $(CopyDir)\share\themes\Default\gtk-2.0-key\gtkrc
+
+mkdir $(CopyDir)\share\themes\Emacs\gtk-2.0-key
+copy ..\..\..\gtk\gtkrc.key.emacs $(CopyDir)\share\themes\Emacs\gtk-2.0-key\gtkrc
+
+mkdir $(CopyDir)\share\themes\MS-Windows\gtk-2.0
+copy ..\..\..\modules\engines\ms-windows\Theme\gtk-2.0\gtkrc $(CopyDir)\share\themes\MS-Windows\gtk-2.0
+
+mkdir $(CopyDir)\share\themes\Raleigh\gtk-2.0
+copy ..\..\..\gtk\gtkrc.default $(CopyDir)\share\themes\Raleigh\gtk-2.0\gtkrc
+
+if exist $(CopyDir)\share\icons\hicolor $(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor"
+</GtkDoInstall>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>gtkinstallprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="BinDir">
+      <Value>$(BinDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="InstalledDlls">
+      <Value>$(InstalledDlls)</Value>
+    </BuildMacro>
+    <BuildMacro Include="InstalledBins">
+      <Value>$(InstalledBins)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkDoInstall">
+      <Value>$(GtkDoInstall)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>

build/win32/vs10/gtk-install.vcxproj

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FC5AADB5-95CD-4BF0-BA8B-0C16FE8073FB}</ProjectGuid>
+    <RootNamespace>gtkinstall</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-install.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-install.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-install.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-install.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\config.h.win32">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="gtk-update-icon-cache.vcxproj">
+      <Project>{fab0Ad6f-aebf-4af8-a1cc-6890a9090945}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="libwimp.vcxproj">
+      <Project>{7660fb4e-2ae6-483e-8813-0974cbe6f97f}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="gailutil.vcxproj">
+      <Project>{b3b6558a-01c8-4c72-9bde-84abb1ae67df}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="gdk.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="gtk-demo.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073fc}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="gtk.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f5}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

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

@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945}</ProjectGuid>
+    <RootNamespace>gtkdemo</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+   <ClCompile Include="..\..\..\gtk\updateiconcache.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="gdk-win32.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073fa}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+   <ClCompile Include="..\..\..\gtk\updateiconcache.c"><Filter>Source Files</Filter></ClCompile>
+  </ItemGroup>
+</Project>

build/win32/vs10/gtk-version-paths.props

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+    <VSVer>10</VSVer>
+    <GlibEtcInstallRoot>..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
+    <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>
+    <ApiVersion>2.0</ApiVersion>
+    <GtkLibtoolCompatibleDllPrefix>lib</GtkLibtoolCompatibleDllPrefix>
+    <GtkLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</GtkLibtoolCompatibleDllSuffix>
+    <GtkSeparateVSDllPrefix />
+    <GtkSeparateVSDllSuffix>-2-vs$(VSVer)</GtkSeparateVSDllSuffix>
+    <GtkDllPrefix>$(GtkSeparateVSDllPrefix)</GtkDllPrefix>
+    <GtkDllSuffix>$(GtkSeparateVSDllSuffix)</GtkDllSuffix>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>gtkversionpathsprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="VSVer">
+      <Value>$(VSVer)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GlibEtcInstallRoot">
+      <Value>$(GlibEtcInstallRoot)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CopyDir">
+      <Value>$(CopyDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="DefDir">
+      <Value>$(DefDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ApiVersion">
+      <Value>$(ApiVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkLibtoolCompatibleDllPrefix">
+      <Value>$(GtkLibtoolCompatibleDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkLibtoolCompatibleDllSuffix">
+      <Value>$(GtkLibtoolCompatibleDllSuffix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkSeparateVSDllPrefix">
+      <Value>$(GtkSeparateVSDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkSeparateVSDllSuffix">
+      <Value>$(GtkSeparateVSDllSuffix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkDllPrefix">
+      <Value>$(GtkDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkDllSuffix">
+      <Value>$(GtkDllSuffix)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>

build/win32/vs10/gtk.vcxproj.filtersin

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

build/win32/vs10/gtk.vcxprojin

@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}</ProjectGuid>
+    <RootNamespace>gtk</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-gen-srcs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-gen-srcs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(ApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(ApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(ApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(ApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\gdk\gtk.symbols">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating gtk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkGenerateGtkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)gtk.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating gtk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkGenerateGtkDefW64)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)gtk.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating gtk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkGenerateGtkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)gtk.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating gtk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkGenerateGtkDefW64)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)gtk.def;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\gtk\gtk-win32.rc" />
+  </ItemGroup>
+  <ItemGroup>
+#include "gtk.vs10.sourcefiles"
+    <ClCompile Include="..\..\..\modules\input\gtkimcontextime.c" />
+    <ClCompile Include="..\..\..\modules\input\gtkimcontextmultipress.c" />
+    <ClCompile Include="..\..\..\modules\input\gtkimcontextthai.c" />
+    <ClCompile Include="..\..\..\modules\input\imam-et.c" />
+    <ClCompile Include="..\..\..\modules\input\imcedilla.c" />
+    <ClCompile Include="..\..\..\modules\input\imcyrillic-translit.c" />
+    <ClCompile Include="..\..\..\modules\input\imime.c" />
+    <ClCompile Include="..\..\..\modules\input\iminuktitut.c" />
+    <ClCompile Include="..\..\..\modules\input\imipa.c" />
+    <ClCompile Include="..\..\..\modules\input\immultipress.c" />
+    <ClCompile Include="..\..\..\modules\input\imthai.c" />
+    <ClCompile Include="..\..\..\modules\input\imti-er.c" />
+    <ClCompile Include="..\..\..\modules\input\imti-et.c" />
+    <ClCompile Include="..\..\..\modules\input\imviqr.c" />
+    <ClCompile Include="..\..\..\modules\input\thai-charprop.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="gdk.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

build/win32/vs10/libwimp.vcxproj.filtersin

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Sources">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Headers">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+#include "libwimp.vs10.sourcefiles.filters"
+    <ClCompile Include="..\..\..\modules\engines\ms-windows\msw_rc_style.c"><Filter>Sources</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\engines\ms-windows\msw_style.c"><Filter>Sources</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\engines\ms-windows\msw_theme_main.c"><Filter>Sources</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\engines\ms-windows\xp_theme.c"><Filter>Sources</Filter></ClCompile>
+  </ItemGroup>
+</Project>

build/win32/vs10/libwimp.vcxprojin

@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{7660FB4E-2AE6-483E-8813-0974CBE6F97F}</ProjectGuid>
+    <RootNamespace>libwimp</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-build-defines.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>pangowin32-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>pangowin32-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>pangowin32-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>pangowin32-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+#include "libwimp.vs10.sourcefiles"
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="gdk.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="gtk.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f5}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

build/win32/vs11/Makefile.am

@@ -0,0 +1,32 @@
+include $(top_srcdir)/Makefile.decl
+
+EXTRA_DIST +=	\
+	README.txt	\
+	gtk+.sln	\
+	gtk-build-defines.props	\
+	gtk-gen-srcs.props	\
+	gtk-install.props	\
+	gtk-version-paths.props	\
+	gdk-win32.vcxproj	\
+	gdk-win32.vcxproj.filters	\
+	gdk.vcxproj	\
+	gdk.vcxproj.filters	\
+	gtk.vcxproj	\
+	gtk.vcxproj.filters	\
+	gtk-demo.vcxproj	\
+	gtk-demo.vcxproj.filters	\
+	gailutil.vcxproj	\
+	gailutil.vcxproj.filters	\
+	libwimp.vcxproj	\
+	libwimp.vcxproj.filters	\
+	gtk-update-icon-cache.vcxproj	\
+	gtk-update-icon-cache.vcxproj.filters	\
+	gtk-install.vcxproj
+
+DISTCLEANFILES = $(EXTRA_DIST)
+
+MSVC_VER = 11
+MSVC_VER_LONG = 2012
+MSVC_FORMAT_VER = 12
+
+include $(top_srcdir)/build/Makefile-newvs.am

build/win32/vs12/Makefile.am

@@ -0,0 +1,33 @@
+include $(top_srcdir)/Makefile.decl
+
+EXTRA_DIST +=	\
+	README.txt	\
+	gtk+.sln	\
+	gtk-build-defines.props	\
+	gtk-gen-srcs.props	\
+	gtk-install.props	\
+	gtk-version-paths.props	\
+	gdk-win32.vcxproj	\
+	gdk-win32.vcxproj.filters	\
+	gdk.vcxproj	\
+	gdk.vcxproj.filters	\
+	gtk.vcxproj	\
+	gtk.vcxproj.filters	\
+	gtk-demo.vcxproj	\
+	gtk-demo.vcxproj.filters	\
+	gailutil.vcxproj	\
+	gailutil.vcxproj.filters	\
+	libwimp.vcxproj	\
+	libwimp.vcxproj.filters	\
+	gtk-update-icon-cache.vcxproj	\
+	gtk-update-icon-cache.vcxproj.filters	\
+	gtk-install.vcxproj
+
+DISTCLEANFILES = $(EXTRA_DIST)
+
+
+MSVC_VER = 12
+MSVC_VER_LONG = 2013
+MSVC_FORMAT_VER = 12
+
+include $(top_srcdir)/build/Makefile-newvs.am

build/win32/vs14/Makefile.am

@@ -0,0 +1,33 @@
+include $(top_srcdir)/Makefile.decl
+
+EXTRA_DIST +=	\
+	README.txt	\
+	gtk+.sln	\
+	gtk-build-defines.props	\
+	gtk-gen-srcs.props	\
+	gtk-install.props	\
+	gtk-version-paths.props	\
+	gdk-win32.vcxproj	\
+	gdk-win32.vcxproj.filters	\
+	gdk.vcxproj	\
+	gdk.vcxproj.filters	\
+	gtk.vcxproj	\
+	gtk.vcxproj.filters	\
+	gtk-demo.vcxproj	\
+	gtk-demo.vcxproj.filters	\
+	gailutil.vcxproj	\
+	gailutil.vcxproj.filters	\
+	libwimp.vcxproj	\
+	libwimp.vcxproj.filters	\
+	gtk-update-icon-cache.vcxproj	\
+	gtk-update-icon-cache.vcxproj.filters	\
+	gtk-install.vcxproj
+
+DISTCLEANFILES = $(EXTRA_DIST)
+
+
+MSVC_VER = 14
+MSVC_VER_LONG = 14
+MSVC_FORMAT_VER = 12
+
+include $(top_srcdir)/build/Makefile-newvs.am

build/win32/vs9/Makefile.am

@@ -0,0 +1,36 @@
+include $(top_srcdir)/Makefile.decl
+
+GENERATED_ITEMS = \
+	gdk-win32.vcproj	\
+	gdk.vcproj	\
+	gtk.vcproj	\
+	gailutil.vcproj	\
+	gtk-demo.vcproj	\
+	libwimp.vcproj	\
+	gtk-install.vsprops
+
+EXTRA_DIST +=	\
+	README.txt	\
+	gtk+.sln	\
+	gtk-build-defines.vsprops	\
+	gtk-gen-srcs.vsprops	\
+	gtk-install.vspropsin	\
+	gtk-version-paths.vsprops	\
+	gdk-win32.vcprojin	\
+	gdk.vcprojin	\
+	gtk.vcprojin	\
+	gtk-demo.vcprojin	\
+	gailutil.vcprojin	\
+	libwimp.vcprojin	\
+	gtk-update-icon-cache.vcproj	\
+	gtk-install.vcproj	\
+	$(GENERATED_ITEMS)
+
+MSVC_INTERMEDIATE_FILES = gdk-win32.headers gdk.headers gtk.headers gailutil.headers
+
+gtk-install.vsprops: $(MSVC_INTERMEDIATE_FILES)
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk-install.vspropsin >$@
+	rm $(MSVC_INTERMEDIATE_FILES)
+
+DISTCLEANFILES = $(GENERATED_ITEMS)
+

build/win32/vs9/README.txt

@@ -0,0 +1,72 @@
+Please do not compile this package (GTK+) in paths that contain
+spaces in them-as strange problems may occur during compilation or during
+the use of the library.
+
+A more detailed outline for instructions on building the GTK+ with Visual
+C++ can be found in the following GNOME Live! page:
+
+https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack 
+
+This VS9 solution and the projects it includes are intented to be used
+in a GTK+ source tree unpacked from a tarball. In a git checkout you
+first need to use some Unix-like environment or manual work to expand
+the files needed, like config.h.win32.in into config.h.win32 and the
+.vcprojin files here into corresponding actual .vcproj files.
+
+You will need the parts from below in the GTK+ stack: GDK-Pixbuf, Pango,
+ATK and GLib.  External dependencies are at least Cairo, zlib, libpng,
+gettext-runtime; and optional dependencies  are fontconfig*, freetype*
+and expat*.  See the build/win32/vs10/README.txt file in glib for
+details where to unpack them.
+
+It is recommended that one builds the dependencies with VS9 as far as
+possible, especially those from and using the GTK+ stack (i.e. GLib,
+ATK, Pango, GDK-Pixbuf), so that crashes caused by mixing calls
+to different CRTs can be kept at a minimum.  zlib, libpng, and Cairo
+do contain support for compiling under VS9 using VS
+project files and/or makefiles at this time of writing, For the
+GTK+ stack, VS9 project files are either available under
+$(srcroot)/build/vs9 in the case of GLib (stable/unstable), ATK
+(unstable) and GDK-Pixbuf (unstable), and should be in the next
+unstable version of Pango.  There is no known official VS9 build
+support for fontconfig (along with freetype and expat) and
+gettext-runtime, so please use the binaries from: 
+
+ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit)
+ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit)
+
+The recommended build order for these dependencies:
+(first unzip any dependent binaries downloaded from the ftp.gnome.org
+ as described in the README.txt file in the build/win32/vs9 folder)
+-zlib
+-libpng
+-(optional for GDK-Pixbuf) IJG JPEG
+-(optional for GDK-Pixbuf) requires zlib and IJG JPEG)libtiff
+-(optional for GDK-Pixbuf) jasper [jpeg-2000 library])
+-(optional for GLib) PCRE (version 8.12 or later, use of CMake to
+  build PCRE is recommended-see build/win32/vs9/README.txt of GLib)
+-Cairo
+-GLib
+-ATK
+-Pango
+-GDK-Pixbuf
+(note the last 3 dependencies are not interdependent, so the last 3
+ dependencies can be built in any order)
+
+The "install" project will copy build results and headers into their
+appropriate location under <root>\vs9\<PlatformName>. For instance,
+built DLLs go into <root>\vs9\<PlatformName>\bin, built LIBs into
+<root>\vs9\<PlatformName>\lib and GTK+ headers into
+<root>\vs9\<PlatformName>\include\gtk-2.0. This is then from where
+project files higher in the stack are supposed to look for them, not
+from a specific GLib source tree.
+
+*About the dependencies marked with *: These dependencies are not
+ compulsory components for building and running GTK+ itself, but note
+ that they are needed for people running and building GIMP.
+ They are referred to by components in Cairo and Pango mainly-so decide
+ whether you will need FontConfig/FreeType support prior to building
+ Cairo and Pango, which are hard requirements for building and running
+ GTK+. 
+--Tor Lillqvist <tml@iki.fi>
+--Updated by Fan, Chun-wei <fanc999@yahoo.com.tw>

build/win32/vs9/gailutil.vcprojin

@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="gailutil"
+	ProjectGUID="{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}"
+	RootNamespace="gailutil"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			ConfigurationType="2"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk"
+				PreprocessorDefinitions="_DEBUG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="pango-1.0.lib atk-1.0.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="..\..\..\modules\other\gail\libgail-util\gailutil.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			ConfigurationType="2"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\..\..\gdk"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions=""
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="pango-1.0.lib atk-1.0.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				LinkIncremental="1"
+				ModuleDefinitionFile="..\..\..\modules\other\gail\libgail-util\gailutil.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk"
+				PreprocessorDefinitions="_DEBUG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="pango-1.0.lib atk-1.0.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="..\..\..\modules\other\gail\libgail-util\gailutil.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk"
+				PreprocessorDefinitions=""
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="pango-1.0.lib atk-1.0.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="..\..\..\modules\other\gail\libgail-util\gailutil.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				TargetMachine="17"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Sources"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+#include "gailutil.sourcefiles"
+		</Filter>
+		<Filter
+			Name="Headers"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

build/win32/vs9/gdk-win32.vcprojin

@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="gdk-win32"
+	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}"
+	RootNamespace="gdkwin32"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\gtk-gen-srcs.vsprops"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\gtk-gen-srcs.vsprops"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			InheritedPropertySheets=".\gtk-gen-srcs.vsprops"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			InheritedPropertySheets=".\gtk-gen-srcs.vsprops"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File RelativePath="..\..\..\config.h.win32">
+				<FileConfiguration Name="Debug|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Copying config.h from config.h.win32..."
+						CommandLine="$(CopyConfigH)"
+						Outputs="..\..\..\config.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Copying config.h from config.h.win32..."
+						CommandLine="$(CopyConfigH)"
+						Outputs="..\..\..\config.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Copying config.h from config.h.win32..."
+						CommandLine="$(CopyConfigH)"
+						Outputs="..\..\..\config.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Copying config.h from config.h.win32..."
+						CommandLine="$(CopyConfigH)"
+						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="$(CopyGdkConfigH)"
+						Outputs="..\..\..\gdk\gdkconfig.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Copying gdkconfig.h from gdkconfig.h.win32..."
+						CommandLine="$(CopyGdkConfigH)"
+						Outputs="..\..\..\gdk\gdkconfig.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Copying gdkconfig.h from gdkconfig.h.win32..."
+						CommandLine="$(CopyGdkConfigH)"
+						Outputs="..\..\..\gdk\gdkconfig.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Copying gdkconfig.h from gdkconfig.h.win32..."
+						CommandLine="$(CopyGdkConfigH)"
+						Outputs="..\..\..\gdk\gdkconfig.h"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+#include "gdk-win32.sourcefiles"
+		</Filter>
+	</Files>
+</VisualStudioProject>

build/win32/vs9/gdk.vcprojin

@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="gdk"
+	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}"
+	RootNamespace="gdk"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\gtk-gen-srcs.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib imm32.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="$(IntDir)\gdk.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(ApiVersion).lib"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\gtk-gen-srcs.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="$(GdkDefines)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib imm32.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="$(IntDir)\gdk.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(ApiVersion).lib"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			InheritedPropertySheets=".\gtk-gen-srcs.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib imm32.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="$(IntDir)\gdk.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(ApiVersion).lib"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			InheritedPropertySheets=".\gtk-gen-srcs.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="$(GdkDefines)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib imm32.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="$(IntDir)\gdk.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(ApiVersion).lib"
+				TargetMachine="17"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\..\..\gdk\gdk.symbols"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating gdk.def"
+						CommandLine="$(GtkGenerateGdkDef)"
+						Outputs="$(IntDir)\gdk.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating gdk.def"
+						CommandLine="$(GtkGenerateGdkDef)"
+						Outputs="$(IntDir)\gdk.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating gdk.def"
+						CommandLine="$(GtkGenerateGdkDef)"
+						Outputs="$(IntDir)\gdk.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating gdk.def"
+						CommandLine="$(GtkGenerateGdkDef)"
+						Outputs="$(IntDir)\gdk.def"
+					/>
+				</FileConfiguration>
+			</File>
+			<File RelativePath="..\..\..\gdk\win32\rc\gdk.rc" />
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+#include "gdk.sourcefiles"
+		</Filter>
+	</Files>
+</VisualStudioProject>

build/win32/vs9/gtk+.sln

@@ -0,0 +1,124 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-win32", "gdk-win32.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-demo", "gtk-demo.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-install", "gtk-install.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE8073FB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF} = {B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F} = {7660FB4E-2AE6-483E-8813-0974CBE6F97F}
+		{FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945} = {FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcproj", "{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwimp", "libwimp.vcproj", "{7660FB4E-2AE6-483E-8813-0974CBE6F97F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-update-icon-cache", "gtk-update-icon-cache.vcproj", "{FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE8073FB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE8073FB}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE8073FB}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE8073FB}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE8073FB}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE8073FB}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE8073FB}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE8073FB}.Release|x64.Build.0 = Release|x64
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Debug|Win32.Build.0 = Debug|Win32
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Debug|x64.ActiveCfg = Debug|x64
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Debug|x64.Build.0 = Debug|x64
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Release|Win32.ActiveCfg = Release|Win32
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Release|Win32.Build.0 = Release|Win32
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Release|x64.ActiveCfg = Release|x64
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Release|x64.Build.0 = Release|x64
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Debug|Win32.Build.0 = Debug|Win32
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Debug|x64.ActiveCfg = Debug|x64
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Debug|x64.Build.0 = Debug|x64
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Release|Win32.ActiveCfg = Release|Win32
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Release|Win32.Build.0 = Release|Win32
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Release|x64.ActiveCfg = Release|x64
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Release|x64.Build.0 = Release|x64
+		{FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945}.Debug|Win32.Build.0 = Debug|Win32
+		{FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945}.Debug|x64.ActiveCfg = Debug|x64
+		{FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945}.Debug|x64.Build.0 = Debug|x64
+		{FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945}.Release|Win32.ActiveCfg = Release|Win32
+		{FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945}.Release|Win32.Build.0 = Release|Win32
+		{FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945}.Release|x64.ActiveCfg = Release|x64
+		{FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

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

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="gtkbuilddefinesprops"
+	OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
+	IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
+	InheritedPropertySheets=".\gtk-version-paths.vsprops"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include"
+		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES"
+		ForcedIncludeFiles="msvc_recommended_pragmas.h"
+		AdditionalOptions="/MP"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="gdk_pixbuf-2.0.lib gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
+		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
+	/>
+	<UserMacro
+		Name="GtkBinaryVersion"
+		Value="2.10.0"
+	/>
+	<UserMacro
+		Name="GtkDummyPrefix"
+		Value="/dummy"
+	/>
+	<UserMacro
+		Name="GdkDefines"
+		Value="GDK_COMPILATION;G_LOG_DOMAIN=\&quot;Gdk\&quot;"
+	/>
+	<UserMacro
+		Name="GtkHost"
+		Value="i686-pc-vs$(VSVer)"
+	/>
+	<UserMacro
+		Name="GtkIncludedImmodulesDefines"
+		Value="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"
+	/>
+	<UserMacro
+		Name="GtkDefines"
+		Value="GTK_COMPILATION;G_LOG_DOMAIN=\&quot;Gtk\&quot;;GTK_HOST=\&quot;$(GtkHost)\&quot;;GTK_PRINT_BACKENDS=\&quot;file\&quot;;GTK_PRINT_PREVIEW_COMMAND=\&quot;undefined-gtk-print-preview-command\&quot;;$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot;;GTK_SYSCONFDIR=&quot;$(GtkDummyPrefix)/etc&quot;;MULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\&quot;;MULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot;;GTK_VERSION=\&quot;$(GtkVersion)\&quot;;GTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)\&quot;"
+	/>
+</VisualStudioPropertySheet>

build/win32/vs9/gtk-demo.vcprojin

@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="gtk-demo"
+	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
+	RootNamespace="gtkdemo"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions=""
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions=""
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+#include "gtk-demo.sourcefiles"
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

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

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="gtkgensrcsprops"
+	InheritedPropertySheets=".\gtk-build-defines.vsprops"
+	>
+	<UserMacro
+		Name="CopyConfigH"
+		Value="copy ..\..\..\config.h.win32 ..\..\..\config.h"
+	/>
+	<UserMacro
+		Name="CopyGdkConfigH"
+		Value="copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h"
+	/>
+	<UserMacro
+		Name="GtkGenerateGdkDef"
+		Value="
+echo EXPORTS &gt; $(DefDir)\gdk.def&#x0D;&#x0A;
+cl /EP -DGDK_WINDOWING_WIN32 -DALL_FILES -DG_GNUC_CONST= ..\..\..\gdk\gdk.symbols &gt;&gt; $(DefDir)\gdk.def&#x0D;&#x0A;
+		      "
+	/>
+	<UserMacro
+		Name="GtkGenerateGtkDefW64"
+		Value="
+echo EXPORTS &gt; $(DefDir)\gtk.def&#x0D;&#x0A;
+cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -D_WIN64 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gtk\gtk.symbols &gt;&gt; $(DefDir)\gtk.def&#x0D;&#x0A;
+		      "
+	/>
+	<UserMacro
+		Name="GtkGenerateGtkDef"
+		Value="
+echo EXPORTS &gt; $(DefDir)\gtk.def&#x0D;&#x0A;
+cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gtk\gtk.symbols &gt;&gt; $(DefDir)\gtk.def&#x0D;&#x0A;
+		      "
+	/>
+</VisualStudioPropertySheet>

build/win32/vs9/gtk-install.vcproj

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="gtk-install"
+	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE8073FB}"
+	RootNamespace="gtkinstall"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\gtk-install.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			DeleteExtensionsOnClean=""
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="$(GtkDoInstall)"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			InheritedPropertySheets=".\gtk-install.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			DeleteExtensionsOnClean=""
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="$(GtkDoInstall)"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\gtk-install.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			DeleteExtensionsOnClean=""
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="$(GtkDoInstall)"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			InheritedPropertySheets=".\gtk-install.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			DeleteExtensionsOnClean=""
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="$(GtkDoInstall)"
+			/>
+		</Configuration>
+	</Configurations>
+</VisualStudioProject>

build/win32/vs9/gtk-install.vspropsin

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="gtkinstallprops"
+	InheritedPropertySheets=".\gtk-build-defines.vsprops"
+	>
+	<UserMacro
+		Name="GtkDoInstall"
+		Value="
+mkdir $(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-win32$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-win32$(GtkDllSuffix).pdb $(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gtk-win32$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gtk-win32$(GtkDllSuffix).pdb $(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).pdb $(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\gtk-demo.exe $(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\gtk-demo.pdb $(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin&#x0D;&#x0A;
+
+mkdir $(CopyDir)\lib\gtk-$(ApiVersion)\$(GtkHost)\engines&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\gdk-win32-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\gtk-win32-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+
+mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+#include "gdk.headers"
+#include "gdk-win32.headers"
+
+mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+#include "gtk.headers"
+
+mkdir $(CopyDir)\lib\gtk-$(ApiVersion)\include&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\lib\gtk-$(ApiVersion)\include&#x0D;&#x0A;
+
+mkdir $(CopyDir)\include\gail-1.0\libgail-util&#x0D;&#x0A;
+#include "gailutil.headers"
+
+copy $(ConfigurationName)\$(PlatformName)\bin\libwimp.dll $(Outdir)\lib\gtk-$(ApiVersion)\$(GtkHost)\engines&#x0D;&#x0A;
+
+mkdir $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.png $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.gif $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.ui $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.jpg $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.c $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.h $(CopyDir)\share\gtk-$(ApiVersion)\demo&#x0D;&#x0A;
+
+mkdir $(CopyDir)\share\themes\Default\gtk-$(ApiVersion)-key&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrc.key.default $(CopyDir)\share\themes\Default\gtk-$(ApiVersion)-key\gtkrc&#x0D;&#x0A;
+
+mkdir $(CopyDir)\share\themes\Emacs\gtk-$(ApiVersion)-key&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrc.key.emacs $(CopyDir)\share\themes\Emacs\gtk-$(ApiVersion)-key\gtkrc&#x0D;&#x0A;
+
+mkdir $(CopyDir)\share\themes\MS-Windows\gtk-$(ApiVersion)&#x0D;&#x0A;
+copy ..\..\..\modules\engines\ms-windows\Theme\gtk-$(ApiVersion)\gtkrc $(CopyDir)\share\themes\MS-Windows\gtk-$(ApiVersion)&#x0D;&#x0A;
+
+mkdir $(CopyDir)\share\themes\Raleigh\gtk-$(ApiVersion)&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrc.default $(CopyDir)\share\themes\Raleigh\gtk-$(ApiVersion)\gtkrc&#x0D;&#x0A;
+
+if exist $(CopyDir)\share\icons\hicolor $(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force &quot;$(CopyDir)\share\icons\hicolor&quot;&#x0D;&#x0A;
+		      "
+	/>
+</VisualStudioPropertySheet>

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

@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="gtk-update-icon-cache"
+	ProjectGUID="{FAB0AD6F-AEBF-4AF8-A1CC-6890A9090945}"
+	RootNamespace="gtkupdateiconcache"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories=""
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions=""
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="_DEBUG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories=""
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions=""
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Sources"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File RelativePath="..\..\..\gtk\updateiconcache.c" />
+		</Filter>
+		<Filter
+			Name="Headers"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

build/win32/vs9/gtk-version-paths.vsprops

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="gtkversionpathsprops"
+	>
+	<UserMacro
+		Name="VSVer"
+		Value="9"
+	/>
+	<UserMacro
+		Name="GlibEtcInstallRoot"
+		Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
+	/>
+	<UserMacro
+		Name="CopyDir"
+		Value="$(GlibEtcInstallRoot)"
+	/>
+	<UserMacro
+		Name="DefDir"
+		Value="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
+	/>
+	<UserMacro
+		Name="ApiVersion"
+		Value="2.0"
+	/>
+	<UserMacro
+		Name="GtkLibtoolCompatibleDllPrefix"
+		Value="lib"
+	/>
+	<UserMacro
+		Name="GtkLibtoolCompatibleDllSuffix"
+		Value="-$(ApiVersion)-0"
+	/>
+	<UserMacro
+		Name="GtkSeparateVSDllPrefix"
+		Value=""
+	/>
+	<UserMacro
+		Name="GtkSeparateVSDllSuffix"
+		Value="-2-vs$(VSVer)"
+	/>
+	<!-- Change these two to GtkLibtoolCompatibleDllPrefix and
+	GtkLibtoolCompatibleDllSuffix if that is what you want -->
+	<UserMacro
+		Name="GtkDllPrefix"
+		Value="$(GtkSeparateVSDllPrefix)"
+	/>
+	<UserMacro
+		Name="GtkDllSuffix"
+		Value="$(GtkSeparateVSDllSuffix)"
+	/>
+</VisualStudioPropertySheet>

build/win32/vs9/gtk.vcprojin

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

build/win32/vs9/libwimp.vcprojin

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="libwimp"
+	ProjectGUID="{7660FB4E-2AE6-483E-8813-0974CBE6F97F}"
+	RootNamespace="libwimp"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			ConfigurationType="2"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="pangowin32-1.0.lib pango-1.0.lib cairo.lib"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			ConfigurationType="2"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions=""
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="pangowin32-1.0.lib pango-1.0.lib cairo.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="pangowin32-1.0.lib pango-1.0.lib cairo.lib"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions=""
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="pangowin32-1.0.lib pango-1.0.lib cairo.lib"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Sources"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+#include "libwimp.sourcefiles"
+		</Filter>
+		<Filter
+			Name="Headers"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

config.h.meson

@@ -1,281 +0,0 @@
-/* always defined to indicate that i18n is enabled */
-#define ENABLE_NLS 1
-
-/* Use structured logging */
-#define G_LOG_STRUCTURED 1
-
-/* The prefix for our gettext translation domains. */
-#mesondefine GETTEXT_PACKAGE
-
-/* Disable deprecation warnings from glib */
-#mesondefine GLIB_DISABLE_DEPRECATION_WARNINGS
-
-/* Define the location where the catalogs will be installed */
-#mesondefine GTK_LOCALEDIR
-
-/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-#mesondefine HAVE_BIND_TEXTDOMAIN_CODESET
-
-/* Have the cloudproviders library */
-#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 to 1 if you have the `dcgettext' function. */
-#mesondefine HAVE_DCGETTEXT
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#mesondefine HAVE_DLFCN_H
-
-/* Have the ffmpeg library */
-#mesondefine HAVE_FFMPEG
-
-/* 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
-
-/* Define if GStreamer support is available */
-#mesondefine HAVE_GSTREAMER
-
-/* 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 <locale.h> header file. */
-#mesondefine HAVE_LOCALE_H
-
-/* 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 the `mlock` function. */
-#mesondefine HAVE_MLOCK
-
-/* Define to 1 if you have a working `mmap' system call. */
-#mesondefine HAVE_MMAP
-
-/* 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 `sincos' function. */
-#mesondefine HAVE_SINCOS
-
-/* 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
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#mesondefine HAVE_SYS_STAT_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 <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 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 to 1 if you have the `flockfile' function */
-#mesondefine HAVE_FLOCKFILE
-
-/* 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 the sub-directory where libtool stores uninstalled libraries. */
-#mesondefine LT_OBJDIR
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#mesondefine NO_MINUS_C_MINUS_O
-
-/* 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
-
-/* Define to 1 if you have the ANSI C header files. */
-#mesondefine STDC_HEADERS
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
-/* Define to 1 if XInput 2.2 is available */
-#mesondefine XINPUT_2_2
-
-/* Define to 1 if the X Window System is missing or not being used. */
-#mesondefine X_DISPLAY_MISSING
-
-/* 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
-
-/* Define to 1 if linux/memfd.h exists */
-#mesondefine HAVE_LINUX_MEMFD_H
-
-#mesondefine HAVE_LINUX_INPUT_H
-
-#mesondefine HAVE_DEV_EVDEV_INPUT_H
-
-#mesondefine GTK_SYSCONFDIR
-
-#mesondefine GTK_LOCALEDIR
-
-#mesondefine GTK_DATADIR
-
-#mesondefine GTK_LIBDIR
-
-#mesondefine GTK_PRINT_BACKENDS
-
-#mesondefine HAVE_CAIRO_SCRIPT_INTERPRETER
-
-#mesondefine HAVE_HARFBUZZ
-
-#mesondefine HAVE_PANGOFT
-
-#mesondefine ISO_CODES_PREFIX
-
-/* Define if tracker3 is available */
-#mesondefine HAVE_TRACKER3

config.h.win32.in

@@ -0,0 +1,318 @@
+/* config.h.win32.in. Merged from two versions generated by configure for gcc and MSVC.  */
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.in by autoheader.  */
+
+/* always defined to indicate that i18n is enabled */
+#define ENABLE_NLS 1
+
+/* Define if gio can sniff image data */
+/* #undef GDK_PIXBUF_USE_GIO_MIME */
+
+/* The prefix for our gettext translation domains. */
+#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
+
+/* Define if debugging is enabled */
+#define GTK_COMPILED_WITH_DEBUGGING "yes"
+
+/* Define the location where the catalogs will be installed */
+#define GTK_LOCALEDIR "NONE/share/locale"
+
+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+
+/* Is the wctype implementation broken */
+/* #undef HAVE_BROKEN_WCTYPE */
+
+/* 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
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+/* #undef HAVE_DLFCN_H */
+
+/* Define to 1 if you have the `flockfile' function. */
+/* #undef HAVE_FLOCKFILE */
+
+/* Define to 1 if you have the <ftw.h> header file. */
+/* #undef HAVE_FTW_H */
+
+/* Define to 1 if you have the `getc_unlocked' function. */
+/* #undef HAVE_GETC_UNLOCKED */
+
+/* Define to 1 if you have the `getpagesize' function. */
+#ifndef _MSC_VER
+#define HAVE_GETPAGESIZE 1
+#else
+/* #undef HAVE_GETPAGESIZE */
+#endif
+
+/* Define to 1 if you have the `getresuid' function. */
+/* #undef HAVE_GETRESUID */
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#define HAVE_GETTEXT 1
+
+/* 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. */
+#ifndef _MSC_VER
+#define HAVE_INTTYPES_H 1
+#else
+/* #undef HAVE_INTTYPES_H */
+#endif
+
+/* Define to 1 if ipc.h is available */
+/* #undef HAVE_IPC_H */
+
+/* Define if your <locale.h> file defines LC_MESSAGES. */
+/* #undef HAVE_LC_MESSAGES */
+
+/* Define to 1 if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
+
+/* Define to 1 if you have the `localtime_r' function. */
+/* #undef HAVE_LOCALTIME_R */
+
+/* Define to 1 if you have the `lstat' function. */
+/* #undef HAVE_LSTAT */
+
+/* Define to 1 if you have the `mallinfo' function. */
+/* #undef HAVE_MALLINFO */
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `mkstemp' function. */
+/* #undef HAVE_MKSTEMP */
+
+/* Define to 1 if you have a working `mmap' system call. */
+/* #undef HAVE_MMAP */
+
+/* Define to 1 if libpapi available */
+/* #undef HAVE_PAPI */
+
+/* Define to 1 is libjpeg supports progressive JPEG */
+/* #undef HAVE_PROGRESSIVE_JPEG */
+
+/* Define to 1 if you have the <pwd.h> header file. */
+/* #undef HAVE_PWD_H */
+
+/* Have the Xrandr extension library */
+/* #undef HAVE_RANDR */
+
+/* Define to 1 if shm.h is available */
+/* #undef HAVE_SHM_H */
+
+/* Define to 1 if sigsetjmp is available */
+/* #undef HAVE_SIGSETJMP */
+
+/* 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 */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#ifndef _MSC_VER
+#define HAVE_STDINT_H 1
+#else
+#if (_MSC_VER >= 1600) /* VS 2010 ships with stdint.h */
+#define HAVE_STDINT_H 1
+#else
+/* #undef HAVE_STDINT_H */
+#endif
+#endif
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if sys/select.h is available */
+/* #undef HAVE_SYS_SELECT_H */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if sys/sysinfo.h is available */
+/* #undef HAVE_SYS_SYSINFO_H */
+
+/* Define to 1 if sys/systeminfo.h is available */
+/* #undef HAVE_SYS_SYSTEMINFO_H */
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#ifndef _MSC_VER
+#define HAVE_SYS_TIME_H 1
+#else /* _MSC_VER */
+/* #undef HAVE_SYS_TIME_H */
+#endif
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+/* #undef HAVE_SYS_WAIT_H */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#ifndef _MSC_VER
+#define HAVE_UNISTD_H 1
+#else
+/* #undef HAVE_UNISTD_H */
+#endif
+
+/* Have uxtheme.h include file */
+#define HAVE_UXTHEME_H 1
+
+/* Have wchar.h include file */
+#define HAVE_WCHAR_H 1
+
+/* Have wctype.h include file */
+#define HAVE_WCTYPE_H 1
+
+/* Define if we have X11R6 */
+/* #undef HAVE_X11R6 */
+
+/* Have the XCOMPOSITE X extension */
+/* #undef HAVE_XCOMPOSITE */
+
+/* Define to 1 if you have the `XConvertCase' function. */
+/* #undef HAVE_XCONVERTCASE */
+
+/* Have the Xcursor library */
+/* #undef HAVE_XCURSOR */
+
+/* Have the XDAMAGE X extension */
+/* #undef HAVE_XDAMAGE */
+
+/* Have the XFIXES X extension */
+/* #undef HAVE_XFIXES */
+
+/* Define to 1 if XFree Xinerama is available */
+/* #undef HAVE_XFREE_XINERAMA */
+
+/* Define to 1 if xinerama is available */
+/* #undef HAVE_XINERAMA */
+
+/* Define to 1 if you have the `XInternAtoms' function. */
+/* #undef HAVE_XINTERNATOMS */
+
+/* Define to use XKB extension */
+/* #undef HAVE_XKB */
+
+/* Define to 1 if xshm.h is available */
+/* #undef HAVE_XSHM_H */
+
+/* Have the SYNC extension library */
+/* #undef HAVE_XSYNC */
+
+/* Define if _NL_MEASUREMENT_MEASUREMENT is available */
+/* #undef HAVE__NL_MEASUREMENT_MEASUREMENT */
+
+/* Define if _NL_PAPER_HEIGHT is available */
+/* #undef HAVE__NL_PAPER_HEIGHT */
+
+/* Define if _NL_PAPER_WIDTH is available */
+/* #undef HAVE__NL_PAPER_WIDTH */
+
+/* Define if _NL_TIME_FIRST_WEEKDAY is available */
+/* #undef HAVE__NL_TIME_FIRST_WEEKDAY */
+
+/* Define to 1 if you have the `_NSGetEnviron' function. */
+/* #undef HAVE__NSGETENVIRON */
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Define if <X11/extensions/XIproto.h> needed for xReply */
+/* #undef NEED_XIPROTO_H_FOR_XREPLY */
+
+/* Define to 1 if fd_set is not available */
+#define NO_FD_SET 1
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#ifndef _MSC_VER
+/* #undef NO_MINUS_C_MINUS_O */
+#else 
+#define NO_MINUS_C_MINUS_O 1
+#endif
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "gtk+"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "gtk+ @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "gtk+"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@"
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if gmodule works and should be used */
+#define USE_GMODULE 1
+
+/* Whether to load modules via .la files rather than directly */
+/* #undef USE_LA_MODULES */
+
+/* Define to 1 if medialib is available and should be used */
+/* #undef USE_MEDIALIB */
+
+/* Define to 1 if medialib 2.5 is available */
+/* #undef USE_MEDIALIB25 */
+
+/* Define to 1 if XXM is available and should be used */
+#ifndef _MSC_VER
+#  define USE_MMX 1
+#else
+#  undef USE_MMX
+#endif
+
+/* Define to 1 if no XInput should be used */
+/* #undef XINPUT_NONE */
+
+/* Define to 1 if XFree XInput should be used */
+/* #undef XINPUT_XFREE */
+
+/* Define to 1 if the X Window System is missing or not being used. */
+/* #undef X_DISPLAY_MISSING */
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+/* #undef _FILE_OFFSET_BITS */
+
+/* Define for large files, on AIX-style hosts. */
+/* #undef _LARGE_FILES */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#define gid_t int
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#define uid_t int