Merge branch 'gtkbuilder-gbinding' into gtkbuilder-gbinding-transform

...otherwise they don't make it into the release tarballs.

https://bugzilla.gnome.org/show_bug.cgi?id=657653

Makefile.am

@@ -1,7 +1,7 @@
 ## Makefile.am for GTK+
 include $(top_srcdir)/Makefile.decl
 
-SRC_SUBDIRS = gdk gtk modules demos tests perf examples
+SRC_SUBDIRS = gdk gtk libgail-util modules demos tests perf examples
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
@@ -145,6 +145,7 @@ DISTCHECK_CONFIGURE_FLAGS =		\
 		--enable-gtk-doc 	\
 		--enable-man 		\
 		--disable-rebuilds 	\
+		--disable-maintainer-mode \
 		--enable-introspection
 
 GITIGNOREFILES = \

NEWS

@@ -1,3 +1,160 @@
+Overview of Changes in GTK+ 3.1.14
+==================================
+
+* GtkTreeView:
+ - The GtkTreeModelFilter and GtkTreeModelSort implementations
+   have been improved and a comprehensive test suite has been added.
+
+* GtkFileChooser:
+ - The selected file(s) can now be copied to the clipboard
+
+* Bugs fixed:
+ 656851 Allow use of GVariant in GtkListStore
+ 344858 gtk_menu_item_new_with_label() created widget with refcount 2
+ 349502 option to copy full path in "Save AS"/"Open file" dialogs
+ 621076 GtkTreeModelFilter does not emit all signals in some situations
+ 634136 GtkTable::children accessor
+ 649588 crash when sending a notification: "Gdk-CRITICAL **: gdk_visual_...
+ 650762 gtk_misc_set_alignment replacement with the new API functions
+ 651827 Crash in check_application()
+ 656986 GtkSwitch is unusable when added to primary toolbar.
+ 657146 Missing files in POTFILEs.in
+ 657260 Gtk should use AtkWindow and remove that hack on GailUtil
+ 657359 Crash when specifying data length in gtk_css_provider_load_...
+ 657384 missing accessors for GdkEvent structures
+
+* Translation updates:
+ Galician
+ German
+ Gujarati
+ Indonesian
+ Norwegian bokmål
+ Persian
+ Russian
+ Serbian
+ Spanish
+ Swedish
+ Traditional Chinese
+ Uighur
+
+
+Overview of Changes in GTK+ 3.1.12
+==================================
+
+* GtkFontChooserDialog: A newly designed font selection dialog
+  that is intended to replace GtkFontSelectionDialog
+
+* Drawing of focus rectangles is now optional; it can be turned
+  off altogether, or until actual keyboard interaction happens,
+  with the gtk-visible-focus setting.
+
+* OS X: Fixes for 10.7 (Lion)
+
+* Bugs fixed:
+ 407885 A new GtkFontSelectionDialog
+ 508601 Copying from GTK+ applications causes crash
+ 599664 The print dialog should not block while looking for an...
+ 645258 Add gtk_text_iter_assign API
+ 649567 hide focus rectangles when not keynavigating
+ 652991 Remove local copy of introspection.m4
+ 653817 Would like GtkGrid methods to insert rows/columns
+ 653964 Installing MinGW32 build misses gdk/win32 headers
+ 655074 Fix crash with undecorated windows on MacOS Lion
+ 655122 Crash when resizing window on MacOS Lion
+ 655173 small memory leak in GtkStyleProperty
+ 655495 Make X11-specific functions introspectable
+ 655496 X11-specific objects methods are introspected as static functions
+ 655545 condition can never be true in gtk_tree_view_real_set_cursor
+ 655822 Removal of GSettings key causes crash on upgrades
+ 656098 Tweak GtkAppChooser's short description
+ 656421 3.1.10: G_DISABLE_DEPRECATED detection breaks compilation
+
+* Translation updates
+ Brazilian Portuguese
+ Bulgarian
+ Russian
+ Spanish
+ Swedish
+ Traditional Chinese
+
+
+Overview of Changes in GTK+ 3.1.10
+==================================
+
+* Assorted file chooser improvements/redesign:
+ - Remove the expander in Save mode
+ - Move the path bar up in Save mode
+ - Remember the last opened directory
+ - Start in recently-used mode when no folder is set
+ - Update recent-files when confirming in the file chooser
+
+* Accessibility:
+ - Gail has been merged into GTK+ and is no longer a module
+ - A testsuite for a11y functionality has been added
+
+* Theming:
+ - Icon view cells can now have a border
+
+* GtkMountOperation can now show processes on OpenBSD
+
+* Gdk input devices now expose their XInput2 device ID
+  via gdk_x11_device_get_id()
+
+* Bugs fixed:
+ 653450 gtkfilechooser crashes when adding favorite
+ 653705 GtkAssistant doesn't notice destroyed pages
+ 653947 Crash in gdk/x11/gdkdevicemanager-xi2.c:get_event_window
+ 654125 gdkoffscreenwindow set any impl handlers to null...
+ 654179 iconview: make it possible for selected cells to render...
+ 654428 focusable labels are emitting inappropriate object:text-sel...
+ 654678 Message dialog's primary text font increases on every call...
+ 654695 Memory corruption in gtk_theming_engine_register_property()
+ 654720 void return issues cause compile issues for GTK 3.1.8
+ 655009 Clamp border radius following CSS specs
+ 654266 No longer possible to set empty text on a GtkProgressBar
+
+* Translation updates:
+ Galician
+ German
+ Hebrew
+ Latvian
+ Lithuanian
+ Norwegian bokmål
+ Persian
+ Polish
+ Slovenian
+ Spanish
+ Uighur
+
+
+Overview of Changes in GTK+ 3.1.8
+=================================
+
+* Theming improvements:
+  - Multiple colors are now supported
+  - Support CSS font properties like font-size, font-family, etc
+  - nth-child works for toolbars too
+
+* Bug fixes:
+ 652506 Improve GtkAssistant button labels
+ 652618 themingengine: shrink the background size to the padding-box
+ 652769 Reordering/removing hidden children in GtkBox results in 100% CPU
+ 653053 Avoid GApplication being released twice...
+ 653191 uninitialized variable in completion_match_func
+ 653333 Assigned value is garbage or undefined in gtktoolpalette.c:565
+ 653512 GtkEntryCompletion: Use a PAGE_STEP macro instead of a magic number
+ 653785 GtkStyleContext ignores style classes when getting style properties
+
+* Translation updates:
+ Belarusian
+ Dutch
+ Galician
+ Hebrew
+ Norwegian bokmål
+ Persian
+ Slovenian
+ Spanish
+
 Overview of Changes in GTK+ 3.1.6
 =================================
 

README.in

@@ -27,6 +27,13 @@ Installation
 See the file 'INSTALL'
 
 
+Release notes for 3.2
+=====================
+
+* The accessible implementations for GTK+ widgets have been integrated
+  into libgtk itself, and the gail module does not exist anymore. This
+  change should not affect applications very much.
+
 Release notes for 3.0
 =====================
 

autogen.sh

@@ -7,6 +7,8 @@ test -n "$srcdir" || srcdir=.
 olddir=`pwd`
 cd "$srcdir"
 
+mkdir -p m4
+
 GTKDOCIZE=`which gtkdocize`
 if test -z $GTKDOCIZE; then
         echo "*** No GTK-Doc found, please install it ***"

build/win32/vs10/Makefile.am

@@ -14,6 +14,12 @@ EXTRA_DIST += \
 	gtk.vcxprojin \
 	gtk.vcxproj.filters \
 	gtk.vcxproj.filtersin \
-	gtk-demo.vcxproj \
-	gtk-demo.vcxproj.filters \
+	gtk3-demo.vcxproj \
+	gtk3-demo.vcxproj.filters \
+	libgail.vcxproj \
+	libgail.vcxproj.filters \
+	libgail.vcxprojin \
+	libgail.vcxproj.filtersin \
+	gailutil.vcxproj \
+	gailutil.vcxproj.filters \
 	install.vcxproj

build/win32/vs10/README.txt

@@ -1,90 +1,80 @@
-Note that all this is rather experimental.
-
-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
-.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
-(with Cairo-GObject support, meaning Cairo 1.10.x or later), zlib, libpng,
-gettext-runtime, fontconfig*, freetype*, 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,
-Cairo, 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**
-(2.x stable/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)
-
-Unzip the binaries obtained from ftp.gnome.org in <root>\vs10\<PlatformName>,
-and build the following, if not already done so: 
-
-Note: put the resulting zlib, libpng, pcre and Cairo files as follows:
- .dll files: <root>\vs10\<PlatformName>\bin
- .lib files: <root>\vs10\<PlatformName>\lib
- .h files: <root>\vs10\<PlatformName>\include
-
-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
--(for GDK-Pixbuf, if not using GDI+) IJG JPEG
--(for GDK-Pixbuf, if not using GDI+) libtiff
- [libtiff requires zlib and IJG JPEG]
--(for GDK-Pixbuf, if not using GDI+) 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)
--GLib ***
--Cairo (inclusive of Cairo-GObject)
--ATK-2.x** ***
--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-3.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 optional
- as those are not compulsory components for building and running GTK+
- itself, but note that they are needed for people running and building
- GIMP or those who need complex script support via fontconfig.  They
- are referred to by components in Cairo and Pango mainly.
- Decide whether you need fontconfig support prior to building Cairo
- and Pango.
- 
-**Regarding ATK-2.x: prior to compiling ATK-2.x, please open atkprops
-  in VS under "Properties Manager" view (it is under any one of the
-  build configurations, right-click on atkprops and select "Properties").
-  Navigate to "User Macros", and edit the following fields:
-  AtkApiVersion -> 2.0
-  AtkLibToolCompatibleDllSuffix -> -2.0-0
-  AtkSeperateVS10DLLSuffix -> -2-vs10
-  Sorry this change did not make it upstream prior to ATK-2.0.0 release-
-  this will be in the subsequent releases of ATK-2.x and was committed
-  upstream.
-
-***:Put the sources of the packages marked with *** in <root>\<package-
-    source-tree>, and build with VS10 from there.
-
---Tor Lillqvist <tml@iki.fi>
---Updated by Chun-wei Fan <fanc999@yahoo.com.tw>
+Note that all this is rather experimental.
+
+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.filtersin 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
+(with Cairo-GObject support, meaning Cairo 1.10.x or later), zlib, libpng,
+gettext-runtime, fontconfig*, freetype*, 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,
+Cairo, 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
+(stable/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)
+
+Unzip the binaries obtained from ftp.gnome.org in <root>\vs10\<PlatformName>,
+and build the following, if not already done so: 
+
+Note: put the resulting zlib, libpng, pcre and Cairo files as follows:
+ .dll files: <root>\vs10\<PlatformName>\bin
+ .lib files: <root>\vs10\<PlatformName>\lib
+ .h files: <root>\vs10\<PlatformName>\include
+
+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
+-(for GDK-Pixbuf, if not using GDI+) IJG JPEG
+-(for GDK-Pixbuf, if not using GDI+) libtiff
+ [libtiff requires zlib and IJG JPEG]
+-(for GDK-Pixbuf, if not using GDI+) 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)
+-GLib **
+-Cairo (inclusive of Cairo-GObject)
+-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-3.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 optional
+ as those are not compulsory components for building and running GTK+
+ itself, but note that they are needed for people running and building
+ GIMP or those who need complex script support via fontconfig.  They
+ are referred to by components in Cairo and Pango mainly.
+ Decide whether you need fontconfig support prior to building Cairo
+ and Pango.
+
+**:Put the sources of the packages marked with ** in <root>\<package-
+    source-tree>, and build with VS10 from there.
+
+--Tor Lillqvist <tml@iki.fi>
+--Updated by Chun-wei Fan <fanc999@yahoo.com.tw>

build/win32/vs10/gailutil.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>{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}</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>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </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+.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+.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+.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+.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <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'">true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\libgail-util\gailmisc.c" />
+    <ClCompile Include="..\..\..\libgail-util\gailtextutil.c" />
+  </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/gailutil.vcxproj.filters

@@ -0,0 +1,25 @@
+<?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>
+    <ClCompile Include="..\..\..\libgail-util\gailmisc.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libgail-util\gailtextutil.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

build/win32/vs10/gdk-win32.vcxproj

@@ -61,13 +61,12 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -92,7 +91,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

build/win32/vs10/gdk.vcxprojin

@@ -61,7 +61,6 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
@@ -71,7 +70,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -116,7 +115,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

build/win32/vs10/gtk+.props

@@ -3,7 +3,7 @@
   <PropertyGroup Label="UserMacros">
     <GlibEtcInstallRoot>..\..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
-    <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj</DefDir>
+    <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>
     <GtkApiVersion>3.0</GtkApiVersion>
     <GtkBinaryVersion>2.10.0</GtkBinaryVersion>
     <GtkDummyPrefix>\"/dummy\"</GtkDummyPrefix>
@@ -102,6 +102,23 @@ copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
 copy ..\..\..\gdk\gdkwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
 
 
+mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
+
+copy ..\..\..\gdk\win32\gdkwin32cursor.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
+
+copy ..\..\..\gdk\win32\gdkwin32display.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
+
+copy ..\..\..\gdk\win32\gdkwin32displaymanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
+
+copy ..\..\..\gdk\win32\gdkwin32dnd.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
+
+copy ..\..\..\gdk\win32\gdkwin32keys.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
+
+copy ..\..\..\gdk\win32\gdkwin32screen.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
+
+copy ..\..\..\gdk\win32\gdkwin32window.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
+
+
 mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtk.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -302,6 +319,8 @@ copy ..\..\..\gtk\gtklinkbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkliststore.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
+copy ..\..\..\gtk\gtklockbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkmain.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkmenu.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -330,6 +349,8 @@ copy ..\..\..\gtk\gtkoffscreenwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\g
 
 copy ..\..\..\gtk\gtkorientable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkoverlay.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkpagesetup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -523,11 +544,22 @@ copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 copy ..\..\..\gtk\gtkwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 
+mkdir $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util
+
+copy ..\..\..\libgail-util\gail-util.h $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util
+
+copy ..\..\..\libgail-util\gailmisc.h $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util
+
+copy ..\..\..\libgail-util\gailtextutil.h $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util
+
+
 copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\include\gtk-3.0\gdk
 
 
 copy $(Configuration)\$(Platform)\bin\*-$(GtkApiVersion).lib $(CopyDir)\lib
 
+copy $(Configuration)\$(Platform)\bin\gailutil.lib $(CopyDir)\lib
+
 
 mkdir $(CopyDir)\share\glib-2.0\schemas
 
@@ -549,19 +581,18 @@ $(CopyDir)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
     <GtkDllSuffix>$(GtkSeparateVS10DllSuffix)</GtkDllSuffix>
   </PropertyGroup>
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <_PropertySheetDisplayName>gtk+props</_PropertySheetDisplayName>
     <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
-    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\</IntDir>
+    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_DEPRECATED;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>
     </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>
+      <AdditionalDependencies>pangocairo-1.0.lib;cairo.lib;cairo-gobject.lib;pango-1.0.lib;gdk_pixbuf-2.0.lib;gio-2.0.lib;gmodule-2.0.lib;gobject-2.0.lib;glib-2.0.lib;intl.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PreBuildEvent>

build/win32/vs10/gtk+.sln

@@ -1,65 +1,85 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 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}") = "install", "install.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
-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-0C16FE7073FB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C++ Express 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}") = "gtk3-demo", "gtk3-demo.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgail", "libgail.vcxproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcxproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
+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
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.Build.0 = Debug|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|x64.ActiveCfg = Debug|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|x64.Build.0 = Debug|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|Win32.ActiveCfg = Release|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|Win32.Build.0 = Release|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.ActiveCfg = Release|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.Build.0 = Release|x64
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|Win32.ActiveCfg = Debug|Win32
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|Win32.Build.0 = Debug|Win32
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|x64.ActiveCfg = Debug|x64
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|x64.Build.0 = Debug|x64
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|Win32.ActiveCfg = Release|Win32
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|Win32.Build.0 = Release|Win32
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|x64.ActiveCfg = Release|x64
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

build/win32/vs10/gtk.vcxprojin

@@ -61,7 +61,6 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
@@ -71,7 +70,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -81,7 +80,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
@@ -101,7 +100,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
@@ -116,7 +115,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -126,7 +125,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
@@ -146,7 +145,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
@@ -199,6 +198,10 @@
       <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="libgail.vcxproj">
+      <Project>{f756b0db-40a1-4e9f-be1f-8f02cb86ea46}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

build/win32/vs10/gtk3-demo.vcxproj

@@ -189,6 +189,7 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\menus.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window2.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\overlay.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\panes.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\pickers.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\pixbufs.c" />

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

@@ -86,6 +86,9 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window2.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\overlay.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\panes.c">
       <Filter>Source Files</Filter>
     </ClCompile>

build/win32/vs10/install.vcxproj

@@ -63,7 +63,6 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
@@ -106,6 +105,10 @@
       <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f5}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="gailutil.vcxproj">
+      <Project>{29e3e814-1ba3-4ad7-a3a7-3669cb80a942}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

build/win32/vs10/libgail.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 "libgail.vs10.sourcefiles.filters"
+  </ItemGroup>
+</Project>

build/win32/vs10/libgail.vcxprojin

@@ -0,0 +1,126 @@
+<?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>{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}</ProjectGuid>
+    <RootNamespace>libgail</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </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+.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+.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+.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+.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+#include "libgail.vs10.sourcefiles"
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

build/win32/vs9/Makefile.am

@@ -9,5 +9,8 @@ EXTRA_DIST += \
 	gdk.vcprojin \
 	gtk.vcproj \
 	gtk.vcprojin \
-	gtk-demo.vcproj \
+	gtk3-demo.vcproj \
+	libgail.vcproj \
+	libgail.vcprojin \
+	gailutil.vcproj \
 	install.vcproj

build/win32/vs9/README.txt

@@ -7,7 +7,7 @@ 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 (2.x)** and GLib.  External dependencies are at least Cairo
+ATK and GLib.  External dependencies are at least Cairo
 (with Cairo-GObject support, meaning Cairo 1.10.x or later), zlib, libpng,
 gettext-runtime, fontconfig*, freetype*, expat*.  See the 
 build/win32/vs9/README.txt file in glib for details where to unpack them.
@@ -20,8 +20,8 @@ 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**
-(2.x stable/unstable) and GDK-Pixbuf (unstable), and should be in the next
+$(srcroot)/build/vs9 in the case of GLib (stable/unstable), ATK
+(stable/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: 
@@ -48,11 +48,11 @@ The recommended build order for these dependencies:
 -(for GDK-Pixbuf, if not using GDI+) 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)
--GLib ***
+-GLib **
 -Cairo (inclusive of Cairo-GObject)
--ATK-2.x** ***
--Pango***
--GDK-Pixbuf***
+-ATK**
+-Pango**
+-GDK-Pixbuf**
 (note the last 3 dependencies are not interdependent, so the last 3
  dependencies can be built in any order)
 
@@ -72,18 +72,7 @@ from a specific GLib source tree.
  Decide whether you need fontconfig support prior to building Cairo
  and Pango.
 
-**Regarding ATK-2.x: prior to compiling ATK-2.x, please open atkprops
-  in VS under "Properties Manager" view (it is under any one of the
-  build configurations, right-click on atkprops and select "Properties").
-  Navigate to "User Macros", and edit the following fields:
-  AtkApiVersion -> 2.0
-  AtkLibToolCompatibleDllSuffix -> -2.0-0
-  AtkSeperateVS9DLLSuffix -> -2-vs9
-  Sorry this change did not make it upstream prior to ATK-2.0.0 release-
-  this will be in the subsequent releases of ATK-2.x and was committed
-  upstream.
-
-***:Put the sources of the packages marked with *** in <root>\<package-
+**:Put the sources of the packages marked with ** in <root>\<package-
     source-tree>, and build with VS9 from there.
 
 --Tor Lillqvist <tml@iki.fi>

build/win32/vs9/gailutil.vcproj

@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="gailutil"
+	ProjectGUID="{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}"
+	RootNamespace="gailutil"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				AdditionalDependencies="atk-1.0.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				GenerateDebugInformation="true"
+				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
+				ImportLibrary="$(TargetDir)$(ProjectName).lib"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="atk-1.0.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="$(TargetDir)$(ProjectName).lib"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				AdditionalDependencies="atk-1.0.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				GenerateDebugInformation="true"
+				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
+				ImportLibrary="$(TargetDir)$(ProjectName).lib"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="atk-1.0.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(TargetDir)$(ProjectName).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}"
+			>
+			<File RelativePath="..\..\..\libgail-util\gailmisc.c" />
+			<File RelativePath="..\..\..\libgail-util\gailtextutil.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/gdk-win32.vcproj

@@ -32,7 +32,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="2"
@@ -73,7 +73,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"

build/win32/vs9/gdk.vcprojin

@@ -32,7 +32,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="2"
@@ -97,7 +97,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"

build/win32/vs9/gtk+.sln

@@ -10,9 +10,18 @@ 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}
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46} = {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-demo", "gtk-demo.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgail", "libgail.vcproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
@@ -23,6 +32,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj",
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942} = {29E3E814-1BA3-4AD7-A3A7-3669CB80A942}
 	EndProjectSection
 EndProject
 Global
@@ -73,6 +83,22 @@ Global
 		{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
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.Build.0 = Debug|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|x64.ActiveCfg = Debug|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|x64.Build.0 = Debug|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|Win32.ActiveCfg = Release|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|Win32.Build.0 = Release|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.ActiveCfg = Release|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.Build.0 = Release|x64
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|Win32.ActiveCfg = Debug|Win32
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|Win32.Build.0 = Debug|Win32
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|x64.ActiveCfg = Debug|x64
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|x64.Build.0 = Debug|x64
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|Win32.ActiveCfg = Release|Win32
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|Win32.Build.0 = Release|Win32
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|x64.ActiveCfg = Release|x64
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

build/win32/vs9/gtk+.vsprops

@@ -4,17 +4,17 @@
 	Version="8.00"
 	Name="gtk+props"
 	OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
-	IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
+	IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)\"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"
+		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"
 		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES"
 		ForcedIncludeFiles="msvc_recommended_pragmas.h"
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="gdk_pixbuf-2.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
+		AdditionalDependencies="gdk_pixbuf-2.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib cairo.lib gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
 		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
 	/>
 	<Tool
@@ -105,6 +105,15 @@ copy ..\..\..\gdk\gdkvisual.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#
 copy ..\..\..\gdk\win32\gdkwin32.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 
+mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32cursor.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32display.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32displaymanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32dnd.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32keys.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32screen.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32window.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+
 mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtk.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkaboutdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -205,6 +214,7 @@ copy ..\..\..\gtk\gtklabel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x
 copy ..\..\..\gtk\gtklayout.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtklinkbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkliststore.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklockbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkmain.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkmenu.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkmenubar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -219,6 +229,7 @@ copy ..\..\..\gtk\gtknotebook.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;
 copy ..\..\..\gtk\gtknumerableicon.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkoffscreenwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkorientable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkoverlay.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkpagesetup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkpapersize.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -316,9 +327,15 @@ copy ..\..\..\gtk\gtkwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#
 copy ..\..\..\gtk\gtkwidgetpath.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 
+mkdir $(OutDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
+copy ..\..\..\libgail-util\gail-util.h $(OutDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
+copy ..\..\..\libgail-util\gailmisc.h $(OutDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
+copy ..\..\..\libgail-util\gailtextutil.h $(OutDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
+
 copy ..\..\..\gdk\gdkconfig.h $(OutDir)\include\gtk-3.0\gdk&#x0D;&#x0A;
 
 copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\gailutil.lib $(OutDir)\lib&#x0D;&#x0A;
 
 mkdir $(OutDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(OutDir)\share\glib-2.0\schemas&#x0D;&#x0A;

build/win32/vs9/gtk.vcprojin

@@ -32,7 +32,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="_DEBUG;$(GtkDefines)"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="2"
@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				AdditionalDependencies="atk-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"
@@ -72,7 +72,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				AdditionalDependencies="atk-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"
@@ -97,7 +97,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;$(GtkDefines)"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -107,7 +107,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				AdditionalDependencies="atk-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"
@@ -137,7 +137,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				AdditionalDependencies="atk-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"

build/win32/vs9/gtk3-demo.vcproj

@@ -1,212 +1,213 @@
-<?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+.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="$(GtkPrefixDefine)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				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+.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="$(GtkPrefixDefine)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				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}"
-			>
-			<File RelativePath="..\..\..\demos\gtk-demo\appwindow.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\assistant.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\builder.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\button_box.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\changedisplay.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\clipboard.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\colorsel.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\combobox.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\dialog.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\drawingarea.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\editable_cells.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\entry_buffer.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\entry_completion.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\expander.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\hypertext.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\iconview.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\iconview_edit.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\images.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\infobar.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\links.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\list_store.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\main.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\menus.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\offscreen_window.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\offscreen_window2.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\panes.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\pickers.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\pixbufs.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\printing.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\rotated_text.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\search_entry.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\sizegroup.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\spinner.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\stock_browser.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\textscroll.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\textview.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\toolpalette.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\tree_store.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\ui_manager.c" />
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="gtk3-demo"
+	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
+	RootNamespace="gtk3demo"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions="$(GtkPrefixDefine)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				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+.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions="$(GtkPrefixDefine)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				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}"
+			>
+			<File RelativePath="..\..\..\demos\gtk-demo\appwindow.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\assistant.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\builder.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\button_box.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\changedisplay.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\clipboard.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\colorsel.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\combobox.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\dialog.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\drawingarea.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\editable_cells.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\entry_buffer.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\entry_completion.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\expander.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\hypertext.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\iconview.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\iconview_edit.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\images.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\infobar.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\links.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\list_store.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\main.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\menus.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\overlay.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\offscreen_window.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\offscreen_window2.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\panes.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\pickers.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\pixbufs.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\printing.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\rotated_text.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\search_entry.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\sizegroup.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\spinner.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\stock_browser.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\textscroll.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\textview.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\toolpalette.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\tree_store.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\ui_manager.c" />
+		</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/libgail.vcprojin

@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="libgail"
+	ProjectGUID="{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
+	RootNamespace="libgail"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="$(GtkDefines)"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="$(GtkDefines)"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+		</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 "libgail.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.win32.in

@@ -112,11 +112,15 @@
 /* Have the Xrandr extension library */
 /* #undef HAVE_RANDR */
 
-/* Define to 1 if shm.h is available */
-/* #undef HAVE_SHM_H */
+/* Define to 1 if rint() is available */
+#ifndef _MSC_VER
+#define HAVE_RINT 1
+#endif
 
-/* Define to 1 if sigsetjmp is available */
-/* #undef HAVE_SIGSETJMP */
+/* Define to 1 if round() is available */
+#ifndef _MSC_VER
+#define HAVE_ROUND 1
+#endif
 
 /* Have the sockaddr_un.sun_len member */
 /* #undef HAVE_SOCKADDR_UN_SUN_LEN */
@@ -128,6 +132,9 @@
 #ifndef _MSC_VER
 #define HAVE_STDINT_H 1
 #else
+#if (_MSC_VER >= 1600) /* VS 2010+ ships with stdint.h */
+#define HAVE_STDINT_H 1
+#endif
 /* #undef HAVE_STDINT_H */
 #endif
 
@@ -135,7 +142,9 @@
 #define HAVE_STDLIB_H 1
 
 /* Define to 1 if you have the <strings.h> header file. */
+#ifndef _MSC_VER
 #define HAVE_STRINGS_H 1
+#endif
 
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1

configure.ac

@@ -10,7 +10,7 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [1])
-m4_define([gtk_micro_version], [5])
+m4_define([gtk_micro_version], [15])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -39,11 +39,11 @@ AC_CONFIG_AUX_DIR([build-aux])
 m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.29.4])
-m4_define([pango_required_version], [1.24.0])
-m4_define([atk_required_version], [1.30])
+m4_define([glib_required_version], [2.29.14])
+m4_define([pango_required_version], [1.29.0])
+m4_define([atk_required_version], [2.1.5])
 m4_define([cairo_required_version], [1.10.0])
-m4_define([gdk_pixbuf_required_version], [2.22.0])
+m4_define([gdk_pixbuf_required_version], [2.23.5])
 m4_define([introspection_required_version], [0.10.1])
 GLIB_REQUIRED_VERSION=glib_required_version
 PANGO_REQUIRED_VERSION=pango_required_version
@@ -62,13 +62,13 @@ AC_SUBST(INTROSPECTION_REQUIRED_VERSION)
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}
 
-AM_INIT_AUTOMAKE([1.10 no-define -Wno-portability dist-bzip2])
+AM_INIT_AUTOMAKE([1.11 no-define -Wno-portability tar-ustar no-dist-gzip dist-xz])
 AM_MAINTAINER_MODE([enable])
 
-# Support silent build rules, requires at least automake-1.11. Disable
+# Support silent build rules. Disable
 # by either passing --disable-silent-rules to configure or passing V=1
 # to make
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_SILENT_RULES([yes])
 
 #
 # For each of the libraries we build, we define the following
@@ -165,6 +165,9 @@ case $host in
   *-*-linux*)
     os_linux=yes
     ;;
+  *-*-openbsd*)
+    os_openbsd=yes
+    ;;
 esac
 
 dnl
@@ -380,7 +383,7 @@ if test "x$enable_wayland_backend" == "xyes"; then
   GIO_PACKAGE=gio-unix-2.0
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WAYLAND"
-  WAYLAND_PACKAGES="wayland-client xkbcommon wayland-egl"
+  WAYLAND_PACKAGES="wayland-client xkbcommon wayland-egl egl"
   AM_CONDITIONAL(USE_WAYLAND, true)
 else
   AM_CONDITIONAL(USE_WAYLAND, false)
@@ -750,6 +753,18 @@ if test $gtk_uxtheme_h = yes; then
 fi
 AC_MSG_RESULT($gtk_uxtheme_h)
 
+# Check for round()
+AC_CHECK_LIB(m,round,have_round=yes,have_round=no)
+if test $have_round = yes; then
+    AC_DEFINE(HAVE_ROUND, 1, [Define to 1 if round() is available])
+fi
+
+# Check for rint()
+AC_CHECK_LIB(m,rint,have_rint=yes,have_rint=no)
+if test $have_rint = yes; then
+    AC_DEFINE(HAVE_RINT, 1, [Define to 1 if rint() is available])
+fi
+
 # Checks for gdkspawn
 AC_CHECK_HEADERS(crt_externs.h)
 AC_CHECK_FUNCS(_NSGetEnviron)
@@ -1248,7 +1263,7 @@ LDFLAGS="$saved_ldflags"
 
 GDK_PACKAGES="$PANGO_PACKAGES $GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES gdk-pixbuf-2.0 $cairo_backends cairo-gobject"
 
-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES`"
+GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES` $MATH_LIB"
 GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
 #
 # If we aren't writing explicit dependencies, then don't put the extra libraries we need
@@ -1300,8 +1315,12 @@ if test "x$enable_x11_backend" = xyes; then
   GTK_PACKAGES="$GTK_PACKAGES pangoft2"
 fi
 GTK_EXTRA_LIBS=
+if test x"$os_openbsd" = xyes; then
+  GTK_EXTRA_LIBS="$GTK_EXTRA_LIBS -lkvm"
+fi
+
 GTK_EXTRA_CFLAGS=
-GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS"
+GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $MATH_LIB"
 GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES $GTK_PACKAGES` $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
 
 if test x"$os_win32" = xyes; then
@@ -1708,6 +1727,7 @@ demos/gtk-demo/geninclude.pl
 demos/pixbuf-demo/Makefile
 examples/Makefile
 tests/Makefile
+tests/a11y/Makefile
 tests/css/Makefile
 tests/css/parser/Makefile
 tests/reftests/Makefile
@@ -1737,12 +1757,10 @@ gtk/Makefile
 gtk/makefile.msc
 gtk/gtkversion.h
 gtk/gtk-win32.rc
+gtk/a11y/Makefile
 gtk/tests/Makefile
+libgail-util/Makefile
 modules/Makefile
-modules/other/Makefile
-modules/other/gail/Makefile
-modules/other/gail/libgail-util/Makefile
-modules/other/gail/tests/Makefile
 modules/engines/Makefile
 modules/engines/pixbuf/Makefile
 modules/engines/ms-windows/Makefile

demos/gtk-demo/Makefile.am

@@ -46,7 +46,7 @@ demos =						\
 	tree_store.c				\
 	ui_manager.c
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-DDEMOCODEDIR="\"$(democodedir)\""	\
 	-I$(top_srcdir) 			\
 	-I$(top_builddir)/gdk			\
@@ -73,7 +73,7 @@ EXTRA_DIST += 		\
 	demo.ui
 
 demos.h: @REBUILD@ $(demos) geninclude.pl
-	(here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
+	$(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
 
 gtk3_demo_SOURCES = 		\
 	$(demos)		\

demos/gtk-demo/changedisplay.c

@@ -397,7 +397,8 @@ left_align_button_new (const char *label)
   GtkWidget *button = gtk_button_new_with_mnemonic (label);
   GtkWidget *child = gtk_bin_get_child (GTK_BIN (button));
 
-  gtk_misc_set_alignment (GTK_MISC (child), 0., 0.5);
+  gtk_widget_set_halign (child, GTK_ALIGN_START);
+  gtk_widget_set_valign (child, GTK_ALIGN_CENTER);
 
   return button;
 }

demos/gtk-demo/colorsel.c

@@ -67,7 +67,6 @@ do_colorsel (GtkWidget *do_widget)
 {
   GtkWidget *vbox;
   GtkWidget *button;
-  GtkWidget *alignment;
 
   if (!window)
     {

demos/gtk-demo/main.c

@@ -45,7 +45,7 @@ get_democodedir (void)
       if (result == NULL)
 	result = "unknown-location";
 
-      result = g_strconcat (result, "\\share\\gtk-2.0\\demo", NULL);
+      result = g_strconcat (result, "\\share\\gtk-3.0\\demo", NULL);
     }
 
   return result;

demos/gtk-demo/pickers.c

@@ -33,33 +33,38 @@ do_pickers (GtkWidget *do_widget)
     gtk_container_set_border_width (GTK_CONTAINER (table), 10);
 
     label = gtk_label_new ("Color:");
-    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    gtk_widget_set_halign (label, GTK_ALIGN_START);
+    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
     picker = gtk_color_button_new ();
     gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
     gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 0, 1);
 
     label = gtk_label_new ("Font:");
-    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    gtk_widget_set_halign (label, GTK_ALIGN_START);
+    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
     picker = gtk_font_button_new ();
     gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
     gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 1, 2);
 
     label = gtk_label_new ("File:");
-    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    gtk_widget_set_halign (label, GTK_ALIGN_START);
+    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
     picker = gtk_file_chooser_button_new ("Pick a File",
                                           GTK_FILE_CHOOSER_ACTION_OPEN);
     gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
     gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 2, 3);
 
     label = gtk_label_new ("Folder:");
-    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    gtk_widget_set_halign (label, GTK_ALIGN_START);
+    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
     picker = gtk_file_chooser_button_new ("Pick a Folder",
                                           GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
     gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
     gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 3, 4);
 
     label = gtk_label_new ("Mail:");
-    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    gtk_widget_set_halign (label, GTK_ALIGN_START);
+    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
     picker = gtk_app_chooser_button_new ("x-scheme-handler/mailto");
     gtk_app_chooser_button_set_show_dialog_item (GTK_APP_CHOOSER_BUTTON (picker), TRUE);
     gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 4, 5);

demos/gtk-demo/sizegroup.c

@@ -46,7 +46,8 @@ add_row (GtkTable     *table,
   GtkWidget *label;
 
   label = gtk_label_new_with_mnemonic (label_text);
-  gtk_misc_set_alignment (GTK_MISC (label), 0, 1);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
+  gtk_widget_set_valign (label, GTK_ALIGN_END);
   gtk_table_attach (GTK_TABLE (table), label,
 		    0, 1,                  row, row + 1,
 		    GTK_EXPAND | GTK_FILL, 0,

demos/gtk-demo/ui_manager.c

@@ -205,7 +205,8 @@ do_ui_manager (GtkWidget *do_widget)
 
       label = gtk_label_new ("Type\n<alt>\nto start");
       gtk_widget_set_size_request (label, 200, 200);
-      gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (box1), label, TRUE, TRUE, 0);
 
 

demos/pixbuf-demo/Makefile.am

@@ -1,7 +1,7 @@
 ## Makefile.am for gtk+/demos
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = 				\
+AM_CPPFLAGS = 				\
 	-I$(top_srcdir) 		\
 	-I$(top_builddir)/gdk		\
 	-DGDK_DISABLE_DEPRECATED	\

docs/Makefile.am

@@ -8,7 +8,6 @@ EXTRA_DIST += \
 	developers.txt			\
 	dnd_internals.txt		\
 	focus_tracking.txt		\
-	generation.txt			\
 	gtkdocs_fix			\
 	make-todo			\
 	refcounting.txt			\

docs/generation.txt

@@ -1,177 +0,0 @@
-Overview:
-========
-
-This file describes the way that autogeneration
-works within the GTK+ source code.
-
-The following files in the gdk/ subdirectory
-are autogenerated:
-
-  gdkkeysyms.h
-  gdkcursors.h 
-
-The following files in the gtk/ subdirectory 
-are autogenerated:
-
- gtk.defs
-   Description of GTK+ types (and some functions) in a lisp-style
-   format.
- gtktypebuiltins.h
-   Header file including declarations for internal types  
- gtktypebuiltins_vars.c
-   Variables for type values for internal types.
- gtktypebuiltins_ids.c
-   Arrays holding information about each internal type.
- gtktypebuiltins_evals.c
-   Arrays holding mapping between enumeration values
-   and strings.
-
- gtkmarshal.c
- gtkmarshal.h
-   Autogenerated signal marshallers
-
-GDK
-===
-
-gdkkeysyms.h and gdkcursors.h are generated from
-the corresponding header files
-
-  X11/cursorfont.h
-  X11/keysymdef.h
-
-by some simple sed scripts. These are not actually
-run automatically because we want all the keysyms
-even on systems with a limited set.
-So the Gdk rule to generate both files (X-derived-headers)
-only needs to be rerun for every new release of the X Window
-System.
-
-GTK+ - type definitions
-=======================
-
-The type definitions are generated from several sources:
-
- gtk-boxed.defs - definitions for boxed types
- GTK+ header files
- GDK header files
-
-The makeenums.pl script does a heuristic parse of 
-the header files and extracts all enumerations declarations.
-It also recognizes a number of pseudo-comments in the
-header files:
-
-Two of these apply to individual enumeration values:
-
-  /*< skip >*/
-
- This enumeration value should be skipped.
-  
-  /*< nick=NICK >*/
-
- The nickname for this value should NICK instead of the
- normally guessed value. For instance:
-
-  typedef enum {
-    GTK_TARGET_SAME_APP = 1 << 0,    /*< nick=same-app >*/
-    GTK_TARGET_SAME_WIDGET = 1 << 1  /*< nick=same-widget >*/
-  } GtkTargetFlags;
-
- makes the nicks "same-app" and "same-widget", instead of
- "app" and "widget" that would normally be used.
-
-The other two apply to entire enumeration declarations.
- 
-  /*< prefix=PREFIX >*/
-
-  Specifies the prefix to be removed from the enumeration
-  values to generate nicknames.
-
-  /*< flags >*/
-
- Specifies that this enumeration is used as a bitfield.
- (makenums.pl normally guesses this from the presence of values
-  with << operators). For instance:
-
-  typedef enum                    /*< flags >*/
-  {
-    GDK_IM_PREEDIT_AREA      = 0x0001, 
-    GDK_IM_PREEDIT_CALLBACKS = 0x0002, 
-    [ ... ]
- } GdkIMStyle;
-
-makeenums.pl can be run into two modes:
-
- 1) Generate the gtktypebuiltins_eval.c file (this
-    contains arrays holding the mapping of 
-    string <=> enumeration value)
-
- 2) Generate the enumeration portion of gtk.defs.
-
-The enumeration portion is added to the boxed type 
-declarations in gtk-boxed.defs to create gtk.defs.
-
-The makeetypes.awk program takes the gtk.defs file, and
-from that generates various files depending on the
-third parameter passed to it:
-
- macros: gtktypebuiltins.h
- variables: gtktypebuiltins_vars.c
- entries: gtktypebuiltins_ids.c
-
-GTK+ - marshallers
-==================
-
-The files gtkmarshal.c and gtkmarshal.h include declarations
-and definitions for the marshallers needed inside of
-GTK+. The marshallers to be generated are listed in
-the file gtkmashal.list, which is processed
-by genmarshal.pl.
-
-The format of this file is a list of lines:
-
-  <retval-type>:<arg1-type>,<arg2-type>,<arg3-type>
- 
-e.g.:
-
-  BOOL:POINTER,STRING,STRING,POINTER
-
-A marshaller is generated for each line in the file.
-The possible types are:
-
- NONE
- BOOL
- CHAR
- INT
- UINT
- LONG
- ULONG
- FLOAT
- DOUBLE
- STRING
- ENUM
- FLAGS
- BOXED
- POINTER
- OBJECT
- FOREIGN    (gpointer data, GtkDestroyNotify notify)
- C_CALLBACK (GtkFunction func, gpointer func_data)
- SIGNAL     (GtkSignalFunc f, gpointer data)
- ARGS       (gint n_args, GtkArg *args)
- CALLBACK   (GtkCallBackMarshal marshall,
-             gpointer data,
-	     GtkDestroyNotify Notify)
-
-Some of these types map to multiple return values - these
-are marked above with the return types in parentheses.
-
-NOTES
-=====
-
-When autogenerating GTK+ files, the autogenerated
-files are often rebuild resulting in the same result.
-
-To prevent unnecessary rebuilds of the entire directory, some files
-that multiple other source files depend on are not actually written
-to directly.  Instead, an intermediate file is written, which
-is then compared to the old file, and only if it is different
-is it copied into the final location.

docs/reference/gdk/Makefile.am

@@ -37,7 +37,7 @@ EXTRA_HFILES=			\
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES = 			\
+AM_CPPFLAGS = 			\
 	-I$(top_srcdir)		\
 	-I$(top_builddir)	\
 	-I$(top_builddir)/gdk	\

docs/reference/gdk/gdk-docs.sgml

@@ -57,6 +57,10 @@
     <title>Index of new symbols in 3.0</title>
     <xi:include href="xml/api-index-3.0.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-3-2" role="3.2">
+    <title>Index of new symbols in 3.2</title>
+    <xi:include href="xml/api-index-3.2.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 

docs/reference/gdk/gdk3-sections.txt

@@ -761,11 +761,16 @@ gdk_event_put
 gdk_event_new
 gdk_event_copy
 gdk_event_free
-gdk_event_get_time
-gdk_event_get_state
 gdk_event_get_axis
+gdk_event_get_button
+gdk_event_get_click_count
 gdk_event_get_coords
+gdk_event_get_keycode
+gdk_event_get_keyval
 gdk_event_get_root_coords
+gdk_event_get_scroll_direction
+gdk_event_get_state
+gdk_event_get_time
 gdk_event_request_motions
 gdk_events_get_angle
 gdk_events_get_center
@@ -928,6 +933,8 @@ GDK_POINTER_TO_XID
 GDK_XID_TO_POINTER
 gdk_x11_lookup_xdisplay
 gdk_x11_get_server_time
+gdk_x11_device_get_id
+gdk_x11_device_manager_lookup
 gdk_x11_display_get_user_time
 gdk_x11_display_broadcast_startup_message
 gdk_x11_display_get_startup_notification_id

docs/reference/gdk/tmpl/.gitignore

@@ -1,23 +0,0 @@
-cairo_interaction.sgml
-colors.sgml
-cursors.sgml
-dnd.sgml
-drawing.sgml
-events.sgml
-event_structs.sgml
-gdkapplaunchcontext.sgml
-gdkdisplay.sgml
-gdkdisplaymanager.sgml
-gdkscreen.sgml
-gdktesting.sgml
-general.sgml
-keys.sgml
-pango_interaction.sgml
-properties.sgml
-pixbufs.sgml
-regions.sgml
-selections.sgml
-threads.sgml
-visuals.sgml
-windows.sgml
-x_interaction.sgml

docs/reference/gtk/Makefile.am

@@ -94,7 +94,7 @@ IGNORE_HFILES=				\
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) 	\
 	-I$(top_builddir) 	\
 	-I$(top_builddir)/gdk	\

docs/reference/gtk/gtk-docs.sgml

@@ -219,6 +219,8 @@
       <xi:include href="xml/gtkfilechooserwidget.xml" />
       <xi:include href="xml/gtkfilefilter.xml" />
       <xi:include href="xml/gtkfontbutton.xml" />
+      <xi:include href="xml/gtkfontchooser.xml" />
+      <xi:include href="xml/gtkfontchooserdlg.xml" />
       <xi:include href="xml/gtkfontsel.xml" />
       <xi:include href="xml/gtkfontseldlg.xml" />
     </chapter>

docs/reference/gtk/gtk3-sections.txt

@@ -354,6 +354,7 @@ gtk_assistant_get_nth_page
 gtk_assistant_prepend_page
 gtk_assistant_append_page
 gtk_assistant_insert_page
+gtk_assistant_remove_page
 GtkAssistantPageFunc
 gtk_assistant_set_forward_page_func
 GtkAssistantPageType
@@ -1475,6 +1476,62 @@ GtkFontSelectionDialogPrivate
 gtk_font_selection_dialog_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gtkfontchooser</FILE>
+<TITLE>GtkFontChooser</TITLE>
+GtkFontChooser
+gtk_font_chooser_new
+gtk_font_chooser_get_family
+gtk_font_chooser_get_face
+gtk_font_chooser_get_size
+gtk_font_chooser_get_font_name
+gtk_font_chooser_set_font_name
+gtk_font_chooser_get_preview_text
+gtk_font_chooser_set_preview_text
+gtk_font_chooser_get_show_preview_entry
+gtk_font_chooser_set_show_preview_entry
+GtkFontFilterFunc
+gtk_font_chooser_set_filter_func
+
+<SUBSECTION Standard>
+GtkFontChooserClass
+GTK_TYPE_FONT_CHOOSER
+GTK_FONT_CHOOSER
+GTK_FONT_CHOOSER_CLASS
+GTK_IS_FONT_CHOOSER
+GTK_IS_FONT_CHOOSER_CLASS
+GTK_FONT_CHOOSER_GET_CLASS
+
+<SUBSECTION Private>
+GtkFontChooserPrivate
+gtk_font_chooser_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkfontchooserdlg</FILE>
+<TITLE>GtkFontChooserDialog</TITLE>
+GtkFontChooserDialog
+gtk_font_chooser_dialog_new
+gtk_font_chooser_dialog_get_font_chooser
+gtk_font_chooser_dialog_get_font_name
+gtk_font_chooser_dialog_set_font_name
+gtk_font_chooser_dialog_get_preview_text
+gtk_font_chooser_dialog_set_preview_text
+
+<SUBSECTION Standard>
+GtkFontChooserDialogClass
+GTK_TYPE_FONT_CHOOSER_DIALOG
+GTK_FONT_CHOOSER_DIALOG
+GTK_FONT_CHOOSER_DIALOG_CLASS
+GTK_IS_FONT_CHOOSER_DIALOG
+GTK_IS_FONT_CHOOSER_DIALOG_CLASS
+GTK_FONT_CHOOSER_DIALOG_GET_CLASS
+
+<SUBSECTION Private>
+GtkFontChooserDialogPrivate
+gtk_font_chooser_dialog_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkframe</FILE>
 <TITLE>GtkFrame</TITLE>
@@ -5050,6 +5107,8 @@ gtk_widget_style_get
 gtk_widget_style_get_property
 gtk_widget_style_get_valist
 gtk_widget_style_attach
+gtk_widget_class_set_accessible_type
+gtk_widget_class_set_accessible_role
 gtk_widget_get_accessible
 gtk_widget_child_focus
 gtk_widget_child_notify
@@ -5108,6 +5167,7 @@ gtk_widget_unset_state_flags
 gtk_widget_get_state_flags
 gtk_widget_has_default
 gtk_widget_has_focus
+gtk_widget_has_visible_focus
 gtk_widget_has_grab
 gtk_widget_has_rc_style
 gtk_widget_is_drawable
@@ -5290,6 +5350,8 @@ gtk_window_get_opacity
 gtk_window_set_opacity
 gtk_window_get_mnemonics_visible
 gtk_window_set_mnemonics_visible
+gtk_window_get_focus_visible
+gtk_window_set_focus_visible
 gtk_window_set_has_resize_grip
 gtk_window_get_has_resize_grip
 gtk_window_resize_grip_is_visible
@@ -5527,6 +5589,7 @@ GTK_STYLE_CLASS_BACKGROUND
 GTK_STYLE_CLASS_BUTTON
 GTK_STYLE_CLASS_CALENDAR
 GTK_STYLE_CLASS_CELL
+GTK_STYLE_CLASS_COMBOBOX_ENTRY
 GTK_STYLE_CLASS_CHECK
 GTK_STYLE_CLASS_DEFAULT
 GTK_STYLE_CLASS_ENTRY
@@ -5547,18 +5610,23 @@ GTK_STYLE_CLASS_PROGRESSBAR
 GTK_STYLE_CLASS_SPINNER
 GTK_STYLE_CLASS_TOOLBAR
 GTK_STYLE_CLASS_PRIMARY_TOOLBAR
+GTK_STYLE_CLASS_INLINE_TOOLBAR
 GTK_STYLE_CLASS_PANE_SEPARATOR
 GTK_STYLE_CLASS_SEPARATOR
+GTK_STYLE_CLASS_SIDEBAR
 GTK_STYLE_CLASS_DND
 GTK_STYLE_CLASS_ERROR
 GTK_STYLE_CLASS_EXPANDER
 GTK_STYLE_CLASS_FRAME
 GTK_STYLE_CLASS_HIGHLIGHT
+GTK_STYLE_CLASS_IMAGE
 GTK_STYLE_CLASS_INFO
 GTK_STYLE_CLASS_MARK
 GTK_STYLE_CLASS_NOTEBOOK
 GTK_STYLE_CLASS_QUESTION
 GTK_STYLE_CLASS_SCALE
+GTK_STYLE_CLASS_SCALE_HAS_MARKS_ABOVE
+GTK_STYLE_CLASS_SCALE_HAS_MARKS_BELOW
 GTK_STYLE_CLASS_SPINBUTTON
 GTK_STYLE_CLASS_VIEW
 GTK_STYLE_CLASS_WARNING
@@ -5671,6 +5739,19 @@ gtk_css_provider_new
 gtk_css_provider_to_string
 GTK_CSS_PROVIDER_ERROR
 GtkCssProviderError
+<SUBSECTION>
+GtkCssSection
+GtkCssSectionType
+gtk_css_section_get_end_line
+gtk_css_section_get_end_position
+gtk_css_section_get_file
+gtk_css_section_get_parent
+gtk_css_section_get_section_type
+gtk_css_section_get_start_line
+gtk_css_section_get_start_position
+gtk_css_section_get_type
+gtk_css_section_ref
+gtk_css_section_unref
 <SUBSECTION Standard>
 GTK_TYPE_CSS_PROVIDER
 GTK_CSS_PROVIDER
@@ -5681,6 +5762,7 @@ GTK_IS_CSS_PROVIDER_CLASS
 <SUBSECTION Private>
 gtk_css_provider_get_type
 gtk_css_provider_error_quark
+gtk_css_section_get_type
 </SECTION>
 
 <SECTION>
@@ -5719,6 +5801,7 @@ GTK_THEMING_ENGINE_GET_CLASS
 GTK_IS_THEMING_ENGINE
 GTK_IS_THEMING_ENGINE_CLASS
 <SUBSECTION Private>
+GtkThemingEnginePrivate
 GTK_TYPE_THEMING_ENGINE
 gtk_theming_engine_get_type
 </SECTION>
@@ -6905,6 +6988,10 @@ GtkGrid
 gtk_grid_new
 gtk_grid_attach
 gtk_grid_attach_next_to
+gtk_grid_get_child_at
+gtk_grid_insert_row
+gtk_grid_insert_column
+gtk_grid_insert_next_to
 gtk_grid_set_row_homogeneous
 gtk_grid_get_row_homogeneous
 gtk_grid_set_row_spacing
@@ -7086,11 +7173,6 @@ GtkLockButtonPrivate
 GtkOverlay
 
 gtk_overlay_new
-gtk_overlay_set_relative_widget
-gtk_overlay_get_relative_widget
-gtk_overlay_add
-gtk_overlay_set_offset
-gtk_overlay_get_offset
 
 <SUBSECTION Standard>
 GTK_TYPE_OVERLAY

docs/reference/gtk/migrating-2to3.xml

@@ -704,8 +704,8 @@ cairo_arc (cr, 1.5, 1.5, 1.5, 0, 2 * M_PI);
 cairo_fill (cr);
 cairo_destroy (cr);
 
-pixbuf = gdk_pixbuf_get_from_surface (NULL, s,
-                                      0, 0, 0, 0,
+pixbuf = gdk_pixbuf_get_from_surface (s,
+                                      0, 0,
                                       3, 3);
 
 cairo_surface_destroy (s);

docs/reference/gtk/tmpl/.gitignore

@@ -1,146 +0,0 @@
-gtkaccelmap.sgml
-gtkactiongroup.sgml
-gtkaboutdialog.sgml
-gtkadjustment.sgml
-gtkbbox.sgml
-gtkbindings.sgml
-gtkbox.sgml
-gtkbuilder.sgml
-gtkbutton.sgml
-gtkcalendar.sgml
-gtkcelleditable.sgml
-gtkcelllayout.sgml
-gtkcellrenderer.sgml
-gtkcellrendereraccel.sgml
-gtkcellrenderercombo.sgml
-gtkcellrendererpixbuf.sgml
-gtkcellrendererprogress.sgml
-gtkcellrendererspin.sgml
-gtkcellrenderertext.sgml
-gtkcellrenderertoggle.sgml
-gtkcellview.sgml
-gtkcheckbutton.sgml
-gtkcheckmenuitem.sgml
-gtkclipboard.sgml
-gtkcolorbutton.sgml
-gtkcolorsel.sgml
-gtkcolorseldlg.sgml
-gtkcombobox.sgml
-gtkcomboboxentry.sgml
-gtkcontainer.sgml
-gtkdialog.sgml
-gtkdnd.sgml
-gtkdrawingarea.sgml
-gtkeditable.sgml
-gtkentry.sgml
-gtkentrybuffer.sgml
-gtkenum.sgml
-gtkeventbox.sgml
-gtkexpander.sgml
-gtkfeatures.sgml
-gtkfixed.sgml
-gtkfilechooserbutton.sgml
-gtkfilechooserdialog.sgml
-gtkfilechooserwidget.sgml
-gtkfilefilter.sgml
-gtkfontbutton.sgml
-gtkfontsel.sgml
-gtkfontseldlg.sgml
-gtkframe.sgml
-gtkhandlebox.sgml
-gtkhbbox.sgml
-gtkhbox.sgml
-gtkhpaned.sgml
-gtkhscale.sgml
-gtkhscrollbar.sgml
-gtkhseparator.sgml
-gtkhsv.c
-gtkiconfactory.sgml
-gtkicontheme.sgml
-gtkiconview.sgml
-gtkimagemenuitem.sgml
-gtkimcontext.sgml
-gtkimcontextsimple.sgml
-gtkimmulticontext.sgml
-gtkinvisible.sgml
-gtkitemfactory.sgml
-gtklabel.sgml
-gtklayout.sgml
-gtklinkbutton.sgml
-gtkliststore.sgml
-gtkmain.sgml
-gtkmenu.sgml
-gtkmenubar.sgml
-gtkmenuitem.sgml
-gtkmenushell.sgml
-gtkmenutoolbutton.sgml
-gtkmessagedialog.sgml
-gtkmisc.sgml
-gtknotebook.sgml
-gtkobject.sgml
-gtkorientable.sgml
-gtkpagesetup.sgml
-gtkpagesetupunixdialog.sgml
-gtkpaned.sgml
-gtkpapersize.sgml
-gtkprintcontext.sgml
-gtkprinter.sgml
-gtkprintjob.sgml
-gtkprintoperation.sgml
-gtkprintsettings.sgml
-gtkprintunixdialog.sgml
-gtkprogressbar.sgml
-gtkradioaction.sgml
-gtkradiobutton.sgml
-gtkradiomenuitem.sgml
-gtkradiotoolbutton.sgml
-gtkrange.sgml
-gtkrc.sgml
-gtkrecentaction.sgml
-gtkrecentchooser.sgml
-gtkrecentchooserdialog.sgml
-gtkrecentchoosermenu.sgml
-gtkrecentchooserwidget.sgml
-gtkrecentmanager.sgml
-gtkscale.sgml
-gtkscalebutton.sgml
-gtkscrollbar.sgml
-gtkscrolledwindow.sgml
-gtkselection.sgml
-gtkseparator.sgml
-gtkseparatormenuitem.sgml
-gtkseparatortoolitem.sgml
-gtksettings.sgml
-gtksizegroup.sgml
-gtkstatusbar.sgml
-gtkstatusicon.sgml
-gtkstyle.sgml
-gtktable.sgml
-gtktearoffmenuitem.sgml
-gtktesting.sgml
-gtktextbuffer.sgml
-gtktextiter.sgml
-gtktextmark.sgml
-gtktexttag.sgml
-gtktexttagtable.sgml
-gtktextview.sgml
-gtktoggleaction.sgml
-gtktogglebutton.sgml
-gtktoggletoolbutton.sgml
-gtktoolbar.sgml
-gtktoolbutton.sgml
-gtktoolitem.sgml
-gtktooltip.sgml
-gtktreednd.sgml
-gtktreemodel.sgml
-gtktreemodelfilter.sgml
-gtktreemodelsort.sgml
-gtktreeselection.sgml
-gtktreesortable.sgml
-gtktreestore.sgml
-gtktreeview.sgml
-gtktreeviewcolumn.sgml
-gtktypeutils.sgml
-gtkuimanager.sgml
-gtkwindow.sgml
-gtkwindowgroup.sgml

docs/reference/libgail-util/Makefile.am

@@ -9,20 +9,20 @@ DOC_MODULE=gail-libgail-util3
 DOC_MAIN_SGML_FILE=gail-libgail-util-docs.sgml
 
 # The directory containing the source code (if it contains documentation).
-DOC_SOURCE_DIR=../../../modules/other/gail/libgail-util
+DOC_SOURCE_DIR=../../../libgail-util
 
 # Used for dependencies
-HFILE_GLOB = $(top_srcdir)/modules/other/gail/libgail-util/*.h
-CFILE_GLOB = $(top_srcdir)/modules/other/gail/libgail-util/*.c
+HFILE_GLOB = $(top_srcdir)/libgail-util/*.h
+CFILE_GLOB = $(top_srcdir)/libgail-util/*.c
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES =                      \
+AM_CPPFLAGS =                   \
         -I$(top_srcdir)         \
         -I$(top_builddir)       \
         $(DEP_CFLAGS)
 
-GTKDOC_LIBS = $(top_builddir)/modules/other/gail/libgail-util/libgailutil.la
+GTKDOC_LIBS = $(top_builddir)/libgail-util/libgailutil.la
 
 # gtkdoc-mkdb related varaibles
 MKDB_OPTIONS =

docs/tools/Makefile.am

@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)			\
 	-I$(top_builddir)/gdk		\
 	-I$(top_srcdir)/gdk		\

examples/Makefile.am

@@ -35,7 +35,7 @@ OLD_EXAMPLES = \
 		tictactoe \
 		wheelbarrow
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/gdk			\
 	-I$(top_builddir)/gdk			\

gdk/Makefile.am

@@ -25,14 +25,13 @@ EXTRA_DIST += 			\
 	gdk.def			\
 	gdkmarshalers.list	\
 	gdkwindowimpl.h		\
-	makeenums.pl		\
 	makefile.msc		\
 	gdk.symbols		\
 	gdkenumtypes.c.template	\
 	gdkenumtypes.h.template	\
 	abicheck.sh
 
-INCLUDES = 				\
+AM_CPPFLAGS = 				\
 	-DG_LOG_DOMAIN=\"Gdk\"		\
 	-DGDK_COMPILATION		\
 	-I$(top_srcdir)			\
@@ -195,7 +194,7 @@ Gdk_3_0_gir_SCANNERFLAGS = 	\
 Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
 Gdk_3_0_gir_LIBS = libgdk-3.la
 Gdk_3_0_gir_FILES = $(introspection_files)
-Gdk_3_0_gir_CFLAGS = $(INCLUDES)
+Gdk_3_0_gir_CFLAGS = $(AM_CPPFLAGS)
 Gdk_3_0_gir_EXPORT_PACKAGES = gdk-3.0
 INTROSPECTION_GIRS += Gdk-3.0.gir
 
@@ -248,7 +247,7 @@ GdkX11_3_0_gir_SCANNERFLAGS = 		\
 GdkX11_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
 GdkX11_3_0_gir_LIBS = libgdk-3.la
 GdkX11_3_0_gir_FILES = $(x11_introspection_files)
-GdkX11_3_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk
+GdkX11_3_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk
 GdkX11_3_0_gir_EXPORT_PACKAGES = gdk-x11-3.0
 INTROSPECTION_GIRS += GdkX11-3.0.gir
 

gdk/broadway/Makefile.am

@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl
 libgdkincludedir = $(includedir)/gtk-3.0/gdk
 libgdkbroadwayincludedir = $(includedir)/gtk-3.0/gdk/broadway
 
-INCLUDES =			\
+AM_CPPFLAGS =			\
 	-DG_LOG_DOMAIN=\"Gdk\"	\
 	-DGDK_COMPILATION	\
 	-I$(top_srcdir)		\

gdk/gdk.symbols

@@ -156,10 +156,15 @@ gdk_event_copy
 gdk_event_free
 gdk_event_get
 gdk_event_get_axis
+gdk_event_get_button
+gdk_event_get_click_count
 gdk_event_get_coords
 gdk_event_get_device
+gdk_event_get_keycode
+gdk_event_get_keyval
 gdk_event_get_root_coords
 gdk_event_get_screen
+gdk_event_get_scroll_direction
 gdk_event_get_source_device
 gdk_event_get_state
 gdk_event_get_time
@@ -513,7 +518,9 @@ gdk_x11_cursor_get_type
 gdk_x11_cursor_get_xcursor
 gdk_x11_cursor_get_xdisplay
 gdk_x11_device_core_get_type
+gdk_x11_device_get_id
 gdk_x11_device_manager_core_get_type
+gdk_x11_device_manager_lookup
 gdk_x11_device_manager_xi2_get_type
 gdk_x11_device_manager_xi_get_type
 gdk_x11_device_xi2_get_type

gdk/gdkevents.c

@@ -949,6 +949,192 @@ gdk_event_get_root_coords (const GdkEvent *event,
   return fetched;
 }
 
+/**
+ * gdk_event_get_button:
+ * @event: a #GdkEvent
+ * @button: (out): location to store mouse button number
+ *
+ * Extract the button number from an event.
+ *
+ * Return value: %TRUE if the event delivered a button number
+ *
+ * Since: 3.2
+ **/
+gboolean
+gdk_event_get_button (const GdkEvent *event,
+                      guint *button)
+{
+  gboolean fetched = TRUE;
+  guint number = 0;
+
+  g_return_val_if_fail (event != NULL, FALSE);
+  
+  switch (event->type)
+    {
+    case GDK_BUTTON_PRESS:
+    case GDK_2BUTTON_PRESS:
+    case GDK_3BUTTON_PRESS:
+    case GDK_BUTTON_RELEASE:
+      number = event->button.button;
+      break;
+    default:
+      fetched = FALSE;
+      break;
+    }
+
+  if (button)
+    *button = number;
+
+  return fetched;
+}
+
+/**
+ * gdk_event_get_click_count:
+ * @event: a #GdkEvent
+ * @click_count: (out): location to store click count
+ *
+ * Extracts the click count from an event.
+ *
+ * Return value: %TRUE if the event delivered a click count
+ *
+ * Since: 3.2
+ */
+gboolean
+gdk_event_get_click_count (const GdkEvent *event,
+                           guint *click_count)
+{
+  gboolean fetched = TRUE;
+  guint number = 0;
+
+  g_return_val_if_fail (event != NULL, FALSE);
+
+  switch (event->type)
+    {
+    case GDK_BUTTON_PRESS:
+    case GDK_BUTTON_RELEASE:
+      number = 1;
+      break;
+    case GDK_2BUTTON_PRESS:
+      number = 2;
+      break;
+    case GDK_3BUTTON_PRESS:
+      number = 3;
+      break;
+    default:
+      fetched = FALSE;
+      break;
+    }
+
+  if (click_count)
+    *click_count = number;
+
+  return fetched;
+}
+
+/**
+ * gdk_event_get_keyval:
+ * @event: a #GdkEvent
+ * @keyval: (out): location to store the keyval
+ *
+ * Extracts the keyval from an event.
+ *
+ * Return value: %TRUE if the event delivered a key symbol
+ *
+ * Since: 3.2
+ */
+gboolean
+gdk_event_get_keyval (const GdkEvent *event,
+                      guint *keyval)
+{
+  gboolean fetched = TRUE;
+  guint number = 0;
+
+  switch (event->type)
+    {
+    case GDK_KEY_PRESS:
+    case GDK_KEY_RELEASE:
+      number = event->key.keyval;
+      break;
+    default:
+      fetched = FALSE;
+      break;
+    }
+
+  if (keyval)
+    *keyval = number;
+
+  return fetched;
+}
+
+/**
+ * gdk_event_get_keycode:
+ * @event: a #GdkEvent
+ * @keycode: (out): location to store the keycode
+ *
+ * Extracts the hardware keycode from an event.
+ *
+ * Return value: %TRUE if the event delivered a hardware keycode
+ *
+ * Since: 3.2
+ */
+gboolean
+gdk_event_get_keycode (const GdkEvent *event,
+                       guint16 *keycode)
+{
+  gboolean fetched = TRUE;
+  guint16 number = 0;
+
+  switch (event->type)
+    {
+    case GDK_KEY_PRESS:
+    case GDK_KEY_RELEASE:
+      number = event->key.hardware_keycode;
+      break;
+    default:
+      fetched = FALSE;
+      break;
+    }
+
+  if (keycode)
+    *keycode = number;
+
+  return fetched;
+}
+
+/**
+ * gdk_event_get_scroll_direction:
+ * @event: a #GdkEvent
+ * @direction: (out): location to store the scroll direction
+ *
+ * Extracts the scroll direction from an event.
+ *
+ * Return value: %TRUE if the event delivered a scroll direction
+ *
+ * Since: 3.2
+ */
+gboolean
+gdk_event_get_scroll_direction (const GdkEvent *event,
+                                GdkScrollDirection *direction)
+{
+  gboolean fetched = TRUE;
+  GdkScrollDirection dir = 0;
+
+  switch (event->type)
+    {
+    case GDK_SCROLL:
+      dir = event->scroll.direction;
+      break;
+    default:
+      fetched = FALSE;
+      break;
+    }
+
+  if (direction)
+    *direction = dir;
+
+  return fetched;
+}
+
 /**
  * gdk_event_get_axis:
  * @event: a #GdkEvent

gdk/gdkevents.h

@@ -1054,9 +1054,19 @@ gboolean  gdk_event_get_state           (const GdkEvent  *event,
 gboolean  gdk_event_get_coords		(const GdkEvent  *event,
 					 gdouble	 *x_win,
 					 gdouble	 *y_win);
-gboolean  gdk_event_get_root_coords	(const GdkEvent  *event,
-					 gdouble	 *x_root,
-					 gdouble	 *y_root);
+gboolean  gdk_event_get_root_coords	(const GdkEvent *event,
+					 gdouble	*x_root,
+					 gdouble	*y_root);
+gboolean  gdk_event_get_button          (const GdkEvent *event,
+                                         guint          *button);
+gboolean  gdk_event_get_click_count     (const GdkEvent *event,
+                                         guint          *click_count);
+gboolean  gdk_event_get_keyval          (const GdkEvent *event,
+                                         guint          *keyval);
+gboolean  gdk_event_get_keycode         (const GdkEvent *event,
+                                         guint16        *keycode);
+gboolean gdk_event_get_scroll_direction (const GdkEvent *event,
+                                         GdkScrollDirection *direction);
 gboolean  gdk_event_get_axis            (const GdkEvent  *event,
                                          GdkAxisUse       axis_use,
                                          gdouble         *value);

gdk/gdkoffscreenwindow.c

@@ -690,6 +690,12 @@ gdk_offscreen_window_set_string (GdkWindow *window,
 {
 }
 
+static void
+gdk_offscreen_window_set_list (GdkWindow *window,
+                               GList *list)
+{
+}
+
 static void
 gdk_offscreen_window_set_wmfunctions (GdkWindow	    *window,
 				      GdkWMFunction  functions)
@@ -763,8 +769,8 @@ gdk_offscreen_window_class_init (GdkOffscreenWindowClass *klass)
   impl_class->set_override_redirect = NULL;
   impl_class->set_accept_focus = NULL;
   impl_class->set_focus_on_map = gdk_offscreen_window_set_boolean;
-  impl_class->set_icon_list = NULL;
-  impl_class->set_icon_name = NULL;
+  impl_class->set_icon_list = gdk_offscreen_window_set_list;
+  impl_class->set_icon_name = gdk_offscreen_window_set_string;
   impl_class->iconify = gdk_offscreen_window_do_nothing;
   impl_class->deiconify = gdk_offscreen_window_do_nothing;
   impl_class->stick = gdk_offscreen_window_do_nothing;

gdk/gdkwindow.c

@@ -2043,7 +2043,7 @@ gdk_window_destroy (GdkWindow *window)
 /**
  * gdk_window_set_user_data:
  * @window: a #GdkWindow
- * @user_data: (allow-none): user data
+ * @user_data: (allow-none) (type GObject.Object): user data
  *
  * For most purposes this function is deprecated in favor of
  * g_object_set_data(). However, for historical reasons GTK+ stores
@@ -2408,9 +2408,6 @@ gdk_window_peek_children (GdkWindow *window)
  * doing. Pass %NULL for @window to get all events for all windows,
  * instead of events for a specific window.
  *
- * See gdk_display_add_client_message_filter() if you are interested
- * in X ClientMessage events.
- *
  * If you are interested in X GenericEvents, bear in mind that
  * XGetEventData() has been already called on the event, and
  * XFreeEventData() must not be called within @function.
@@ -10705,7 +10702,7 @@ gdk_drag_begin_for_device (GdkWindow     *window,
 void
 gdk_test_render_sync (GdkWindow *window)
 {
-  return GDK_WINDOW_IMPL_GET_CLASS (window->impl)->sync_rendering (window);
+  GDK_WINDOW_IMPL_GET_CLASS (window->impl)->sync_rendering (window);
 }
 
 /**

gdk/makeenums.pl

@@ -1,279 +0,0 @@
-#!/usr/bin/perl -w
-
-# Information about the current enumeration
-
-my $flags;			# Is enumeration a bitmask
-my $seenbitshift;			# Have we seen bitshift operators?
-my $prefix;			# Prefix for this enumeration
-my $enumname;			# Name for this enumeration
-my $firstenum = 1;		# Is this the first enumeration in file?
-my @entries;			# [ $name, $val ] for each entry
-
-sub parse_options {
-    my $opts = shift;
-    my @opts;
-
-    for $opt (split /\s*,\s*/, $opts) {
-	my ($key,$val) = $opt =~ /\s*(\w+)(?:=(\S+))?/;
-	defined $val or $val = 1;
-	push @opts, $key, $val;
-    }
-    @opts;
-}
-sub parse_entries {
-    my $file = shift;
-
-    while (<$file>) {
-	# Read lines until we have no open comments
-	while (m@/\*
-	       ([^*]|\*(?!/))*$
-	       @x) {
-	    my $new;
-	    defined ($new = <$file>) || die "Unmatched comment";
-	    $_ .= $new;
-	}
-	# Now strip comments
-	s@/\*(?!<)
-	    ([^*]+|\*(?!/))*
-	   \*/@@gx;
-	
-	s@\n@ @;
-	
-	next if m@^\s*$@;
-
-	# Handle include files
-	if (/^\#include\s*<([^>]*)>/ ) {
-            my $file= "../$1";
-	    open NEWFILE, $file or die "Cannot open include file $file: $!\n";
-	    
-	    if (parse_entries (\*NEWFILE)) {
-		return 1;
-	    } else {
-		next;
-	    }
-	}
-	
-	if (/^\s*\}\s*(\w+)/) {
-	    $enumname = $1;
-	    return 1;
-	}
-
-	if (m@^\s*
-              (\w+)\s*		         # name
-              (?:=(                      # value
-                   (?:[^,/]|/(?!\*))*
-                  ))?,?\s*
-              (?:/\*<		         # options 
-                (([^*]|\*(?!/))*)
-               >\*/)?
-              \s*$
-             @x) {
-	    my ($name, $value, $options) = ($1,$2,$3);
-
-	    if (!defined $flags && defined $value && $value =~ /<</) {
-		$seenbitshift = 1;
-	    }
-	    if (defined $options) {
-		my %options = parse_options($options);
-		if (!defined $options{skip}) {
-		    push @entries, [ $name, $options{nick} ];
-		}
-	    } else {
-		push @entries, [ $name ];
-	    }
-	} else {
-	    print STDERR "Can't understand: $_\n";
-	}
-    }
-    return 0;
-}
-
-
-my $gen_arrays = 0;
-my $gen_defs = 0;
-my $gen_includes = 0;
-my $gen_cfile = 0;
-
-# Parse arguments
-
-if (@ARGV) {
-    if ($ARGV[0] eq "arrays") {
-	shift @ARGV;
-	$gen_arrays = 1;
-    } elsif ($ARGV[0] eq "defs") {
-	shift @ARGV;
-	$gen_defs = 1;
-    } elsif ($ARGV[0] eq "include") {
-	shift @ARGV;
-	$gen_includes = 1;
-    } elsif ($ARGV[0] eq "cfile") {
-	shift @ARGV;
-	$gen_cfile = 1;
-    }
-}
-
-if ($gen_defs) {
-    print ";; generated by makeenums.pl  ; -*- scheme -*-\n\n";
-} else {
-    print "/* Generated by makeenums.pl */\n\n";
-}
-
-if ($gen_includes) {
-  print "#ifndef __GDK_ENUM_TYPES_H__\n";
-  print "#define __GDK_ENUM_TYPES_H__\n";
-}
-
-if ($gen_cfile) {
-  print "#include \"gdk.h\"\n";
-}
-
-ENUMERATION:
-while (<>) {
-    if (eof) {
-	close (ARGV);		# reset line numbering
-	$firstenum = 1;		# Flag to print filename at next enum
-    }
-
-    if (m@^\s*typedef\s+enum\s*
-           ({)?\s*
-           (?:/\*<
-             (([^*]|\*(?!/))*)
-            >\*/)?
-         @x) {
-      print "\n";
-	if (defined $2) {
-	    my %options = parse_options($2);
-	    $prefix = $options{prefix};
-	    $flags = $options{flags};
-	} else {
-	    $prefix = undef;
-	    $flags = undef;
-	}
-	# Didn't have trailing '{' look on next lines
-	if (!defined $1) {
-	    while (<>) {
-		if (s/^\s*\{//) {
-		    last;
-		}
-	    }
-	}
-
-	$seenbitshift = 0;
-	@entries = ();
-
-	# Now parse the entries
-	parse_entries (\*ARGV);
-
-	# figure out if this was a flags or enums enumeration
-
-	if (!defined $flags) {
-	    $flags = $seenbitshift;
-	}
-
-	# Autogenerate a prefix
-
-	if (!defined $prefix) {
-	    for (@entries) {
-		my $name = $_->[0];
-		if (defined $prefix) {
-		    my $tmp = ~ ($name ^ $prefix);
-		    ($tmp) = $tmp =~ /(^\xff*)/;
-		    $prefix = $prefix & $tmp;
-		} else {
-		    $prefix = $name;
-		}
-	    }
-	    # Trim so that it ends in an underscore
-	    $prefix =~ s/_[^_]*$/_/;
-	}
-	
-	for $entry (@entries) {
-	    my ($name,$nick) = @{$entry};
-            if (!defined $nick) {
- 	        ($nick = $name) =~ s/^$prefix//;
-	        $nick =~ tr/_/-/;
-	        $nick = lc($nick);
-	        @{$entry} = ($name, $nick);
-            }
-	}
-
-	# Spit out the output
-
-        my $valuename = $enumname;
-        $valuename =~ s/([^A-Z])([A-Z])/$1_$2/g;
-        $valuename =~ s/([A-Z][A-Z])([A-Z][0-9a-z])/$1_$2/g;
-        $valuename = lc($valuename);
-
-        my $typemacro = $enumname;
-        $typemacro =~ s/([^A-Z])([A-Z])/$1_$2/g;
-        $typemacro =~ s/([A-Z][A-Z])([A-Z][0-9a-z])/$1_$2/g;
-        $typemacro = uc($valuename);
-        $typemacro =~ s/GDK_/GDK_TYPE_/g;
-
-	if ($gen_defs) {
-	    if ($firstenum) {
-		print qq(\n; enumerations from "$ARGV"\n);
-		$firstenum = 0;
-	    }
-
-	    print "\n(define-".($flags ? "flags" : "enum")." $enumname";
-
-	    for (@entries) {
-		my ($name,$nick) = @{$_};
-		print "\n   ($nick $name)";
-	    }
-	    print ")\n";
-
-	} elsif ($gen_arrays) {
-
-	    print "static const GtkEnumValue _${valuename}_values[] = {\n";
-	    for (@entries) {
-		my ($name,$nick) = @{$_};
-		print qq(  { $name, "$name", "$nick" },\n);
-	    }
-	    print "  { 0, NULL, NULL }\n";
-	    print "};\n";
-	} elsif ($gen_includes) {
-            print "GType ${valuename}_get_type (void);\n";
-            print "#define ${typemacro} ${valuename}_get_type ()\n";
-          } elsif ($gen_cfile) {
-            print (<<EOF);
-GType
-${valuename}_get_type (void)
-{
-  static GType etype = 0;
-  if (etype == 0)
-    {
-EOF
-            if ($flags) {
-              print "      static const GFlagsValue values[] = {\n";
-            } else {
-              print "      static const GEnumValue values[] = {\n";
-            }
-            for (@entries) {
-              my ($name,$nick) = @{$_};
-              print qq(        { $name, "$name", "$nick" },\n);
-            }
-	    print "        { 0, NULL, NULL }\n";
-	    print "      };\n";
-
-            if ($flags) {
-              print "      etype = g_flags_register_static (\"$enumname\", values);\n";
-            } else {
-              print "      etype = g_enum_register_static (\"$enumname\", values);\n";
-            }
-
-            print (<<EOF);
-    }
-  return etype;
-}
-EOF
-          }
-        print "\n";
-      }
-  }
-
-
-if ($gen_includes) {
-  print "#endif /* __GDK_ENUMS_H__ */\n";
-}

gdk/quartz/Makefile.am

@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 libgdkincludedir = $(includedir)/gtk-3.0/gdk
 libgdkquartzincludedir = $(includedir)/gtk-3.0/gdk/quartz
 
-INCLUDES = 				\
+AM_CPPFLAGS = 				\
 	-DG_LOG_DOMAIN=\"Gdk\"		\
 	-DGDK_COMPILATION		\
 	-I$(top_srcdir)			\

gdk/quartz/gdkdevice-core-quartz.c

@@ -214,7 +214,8 @@ gdk_quartz_device_core_query_state_helper (GdkWindow       *window,
   toplevel = gdk_window_get_effective_toplevel (window);
 
   if (mask)
-    *mask = _gdk_quartz_events_get_current_event_mask ();
+    *mask = _gdk_quartz_events_get_current_keyboard_modifiers () |
+        _gdk_quartz_events_get_current_mouse_modifiers ();
 
   /* Get the y coordinate, needs to be flipped. */
   if (window == _gdk_root)
@@ -358,7 +359,8 @@ gdk_quartz_device_core_window_at_position (GdkDevice       *device,
     *win_y = found_window ? y_tmp : -1;
 
   if (mask)
-    *mask = _gdk_quartz_events_get_current_event_mask ();
+    *mask = _gdk_quartz_events_get_current_keyboard_modifiers () |
+        _gdk_quartz_events_get_current_mouse_modifiers ();
 
   return found_window;
 }

gdk/quartz/gdkevents-quartz.c

@@ -33,12 +33,14 @@
 
 #include "gdkscreen.h"
 #include "gdkkeysyms.h"
+#include "gdkquartz.h"
 #include "gdkquartzdisplay.h"
 #include "gdkprivate-quartz.h"
 #include "gdkquartzdevicemanager-core.h"
 
 #define GRIP_WIDTH 15
 #define GRIP_HEIGHT 15
+#define GDK_LION_RESIZE 5
 
 #define WINDOW_IS_TOPLEVEL(window)		     \
   (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD &&   \
@@ -49,8 +51,8 @@
 static GdkWindow   *current_keyboard_window;
 
 /* This is the event mask and button state from the last event */
-static GdkEventMask current_event_mask;
-static int          current_button_state;
+static GdkModifierType current_keyboard_modifiers;
+static GdkModifierType current_button_state;
 
 static void append_event                        (GdkEvent  *event,
                                                  gboolean   windowing);
@@ -647,30 +649,6 @@ find_toplevel_for_mouse_event (NSEvent    *nsevent,
 
           toplevel_impl = (GdkWindowImplQuartz *)toplevel->impl;
 
-          if ([toplevel_impl->toplevel showsResizeIndicator])
-            {
-              NSRect frame;
-
-              /* If the resize indicator is visible and the event
-               * is in the lower right 15x15 corner, we leave these
-               * events to Cocoa as to be handled as resize events.
-               * Applications may have widgets in this area.  These
-               * will most likely be larger than 15x15 and for
-               * scroll bars there are also other means to move
-               * the scroll bar.  Since the resize indicator is
-               * the only way of resizing windows on Mac OS, it
-               * is too important to not make functional.
-               */
-              frame = [toplevel_impl->view bounds];
-              if (x_tmp > frame.size.width - GRIP_WIDTH
-                  && x_tmp < frame.size.width
-                  && y_tmp > frame.size.height - GRIP_HEIGHT
-                  && y_tmp < frame.size.height)
-                {
-                  return NULL;
-                }
-            }
-
           *x = x_tmp;
           *y = y_tmp;
         }
@@ -1058,10 +1036,71 @@ synthesize_crossing_event (GdkWindow *window,
   return FALSE;
 }
 
-GdkEventMask 
-_gdk_quartz_events_get_current_event_mask (void)
+GdkModifierType
+_gdk_quartz_events_get_current_keyboard_modifiers (void)
 {
-  return current_event_mask;
+  return current_keyboard_modifiers;
+}
+
+GdkModifierType
+_gdk_quartz_events_get_current_mouse_modifiers (void)
+{
+  return current_button_state;
+}
+
+/* Detect window resizing */
+
+static gboolean
+test_resize (NSEvent *event, GdkWindow *toplevel, gint x, gint y)
+{
+  GdkWindowImplQuartz *toplevel_impl;
+  gboolean lion;
+  /* Resizing only begins if an NSLeftMouseButton event is received in
+   * the resizing area. Handle anything else.
+   */
+  if ([event type] != NSLeftMouseDown)
+      return FALSE;
+
+  toplevel_impl = (GdkWindowImplQuartz *)toplevel->impl;
+  if ([toplevel_impl->toplevel showsResizeIndicator])
+    {
+      NSRect frame;
+
+      /* If the resize indicator is visible and the event
+       * is in the lower right 15x15 corner, we leave these
+       * events to Cocoa as to be handled as resize events.
+       * Applications may have widgets in this area.  These
+       * will most likely be larger than 15x15 and for
+       * scroll bars there are also other means to move
+       * the scroll bar.  Since the resize indicator is
+       * the only way of resizing windows on Mac OS, it
+       * is too important to not make functional.
+       */
+      frame = [toplevel_impl->view bounds];
+      if (x > frame.size.width - GRIP_WIDTH
+	  && x < frame.size.width
+	  && y > frame.size.height - GRIP_HEIGHT
+	  && y < frame.size.height)
+	{
+	  return TRUE;
+	}
+     }
+  /* If we're on Lion and within 5 pixels of an edge,
+   * then assume that the user wants to resize, and
+   * return NULL to let Quartz get on with it. We check
+   * the selector isRestorable to see if we're on 10.7.
+   * This extra check is in case the user starts
+   * dragging before GDK recognizes the grab.
+   */
+
+  lion = gdk_quartz_osx_version() >= GDK_OSX_LION;
+  if (lion && (x < GDK_LION_RESIZE ||
+	       x > toplevel->width - GDK_LION_RESIZE ||
+	       y > toplevel->height - GDK_LION_RESIZE))
+    {
+      return TRUE;
+    }
+  return FALSE;
 }
 
 static gboolean
@@ -1147,6 +1186,9 @@ gdk_event_translate (GdkEvent *event,
   window = find_window_for_ns_event (nsevent, &x, &y, &x_root, &y_root);
   if (!window)
     return FALSE;
+  /* Quartz handles resizing on its own, so we want to stay out of the way. */
+  if (test_resize(nsevent, window, x, y))
+    return FALSE;
 
   /* Apply any window filters. */
   if (GDK_IS_WINDOW (window))
@@ -1196,7 +1238,7 @@ gdk_event_translate (GdkEvent *event,
         }
     }
 
-  current_event_mask = get_event_mask_from_ns_event (nsevent);
+  current_keyboard_modifiers = get_keyboard_modifiers_from_ns_event (nsevent);
 
   return_val = TRUE;
 

gdk/quartz/gdkglobals-quartz.c

@@ -21,7 +21,24 @@
 #include "config.h"
 #include "gdktypes.h"
 #include "gdkprivate.h"
+#include "gdkquartz.h"
 
 GdkDisplay *_gdk_display = NULL;
 GdkScreen *_gdk_screen = NULL;
 GdkWindow *_gdk_root = NULL;
+
+GdkOSXVersion
+gdk_quartz_osx_version (void)
+{
+  gint minor;
+  OSErr err = Gestalt(gestaltSystemVersionMinor, &minor);
+  g_return_val_if_fail(err == noErr, GDK_OSX_UNSUPPORTED);
+
+  if (minor < GDK_OSX_MIN)
+      return GDK_OSX_UNSUPPORTED;
+  else if (minor > GDK_OSX_CURRENT)
+      return GDK_OSX_NEW;
+  else
+      return minor;
+
+}

gdk/quartz/gdkprivate-quartz.h

@@ -62,7 +62,9 @@ typedef enum {
 void         _gdk_quartz_events_update_focus_window    (GdkWindow *new_window,
                                                         gboolean   got_focus);
 void         _gdk_quartz_events_send_map_event         (GdkWindow *window);
-GdkEventMask _gdk_quartz_events_get_current_event_mask (void);
+
+GdkModifierType _gdk_quartz_events_get_current_keyboard_modifiers (void);
+GdkModifierType _gdk_quartz_events_get_current_mouse_modifiers    (void);
 
 void         _gdk_quartz_events_send_enter_notify_event (GdkWindow *window);
 

gdk/quartz/gdkquartz.h

@@ -1,3 +1,4 @@
+
 /* gdkquartz.h
  *
  * Copyright (C) 2005-2007 Imendio AB
@@ -41,6 +42,20 @@ typedef unsigned int NSUInteger;
 typedef float CGFloat;
 #endif
 
+typedef enum
+{
+  GDK_OSX_UNSUPPORTED = 0,
+  GDK_OSX_MIN = 4,
+  GDK_OSX_TIGER = 4,
+  GDK_OSX_LEOPARD = 5,
+  GDK_OSX_SNOW_LEOPARD = 6,
+  GDK_OSX_LION = 7,
+  GDK_OSX_CURRENT = 7,
+  GDK_OSX_NEW = 99
+} GdkOSXVersion;
+
+GdkOSXVersion gdk_quartz_osx_version (void);
+
 G_END_DECLS
 
 #define __GDKQUARTZ_H_INSIDE__

gdk/quartz/gdkselection-quartz.c

@@ -121,10 +121,8 @@ make_list (const gchar  *text,
     }
 
   if (list)
-    *list = g_new (gchar *, n_strings + 1);
+    *list = g_new0 (gchar *, n_strings + 1);
 
-  (*list)[n_strings] = NULL;
-  
   i = n_strings;
   tmp_list = strings;
   while (tmp_list)

gdk/quartz/gdkwindow-quartz.c

@@ -1836,7 +1836,8 @@ gdk_window_quartz_get_device_state_helper (GdkWindow       *window,
   
   toplevel = gdk_window_get_toplevel (window);
 
-  *mask = _gdk_quartz_events_get_current_event_mask ();
+  *mask = _gdk_quartz_events_get_current_keyboard_modifiers () |
+      _gdk_quartz_events_get_current_mouse_modifiers ();
 
   /* Get the y coordinate, needs to be flipped. */
   if (window == _gdk_root)
@@ -2559,10 +2560,6 @@ gdk_quartz_window_set_decorations (GdkWindow       *window,
 
   old_mask = [impl->toplevel styleMask];
 
-  /* Note, there doesn't seem to be a way to change this without
-   * recreating the toplevel. There might be bad side-effects of doing
-   * that, but it seems alright.
-   */
   if (old_mask != new_mask)
     {
       NSRect rect;
@@ -2586,15 +2583,26 @@ gdk_quartz_window_set_decorations (GdkWindow       *window,
           rect = [NSWindow contentRectForFrameRect:rect styleMask:old_mask];
         }
 
-      impl->toplevel = [impl->toplevel initWithContentRect:rect
-                                                 styleMask:new_mask
-                                                   backing:NSBackingStoreBuffered
-                                                     defer:NO];
+      /* Note, before OS 10.6 there doesn't seem to be a way to change this without
+       * recreating the toplevel. There might be bad side-effects of doing
+       * that, but it seems alright.
+       */
+      if ([impl->toplevel respondsToSelector:@selector(setStyleMask:)])
+        {
+          [impl->toplevel setStyleMask:new_mask];
+        }
+      else
+        {
+          [impl->toplevel release];
+          impl->toplevel = [[GdkQuartzNSWindow alloc] initWithContentRect:rect
+                                                                styleMask:new_mask
+                                                                  backing:NSBackingStoreBuffered
+                                                                    defer:NO];
+          [impl->toplevel setHasShadow: window_type_hint_to_shadow (impl->type_hint)];
+          [impl->toplevel setLevel: window_type_hint_to_level (impl->type_hint)];
+          [impl->toplevel setContentView:old_view];
+        }
 
-      [impl->toplevel setHasShadow: window_type_hint_to_shadow (impl->type_hint)];
-      [impl->toplevel setLevel: window_type_hint_to_level (impl->type_hint)];
-
-      [impl->toplevel setContentView:old_view];
       [impl->toplevel setFrame:rect display:YES];
 
       /* Invalidate the window shadow for non-opaque views that have shadow

gdk/wayland/Makefile.am

@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 libgdkincludedir = $(includedir)/gtk-3.0/gdk
 
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-DG_LOG_DOMAIN=\"Gdk\"			\
 	-DGDK_COMPILATION			\
 	-I$(top_srcdir)				\

gdk/wayland/gdkcursor-wayland.c

@@ -224,7 +224,7 @@ create_cursor(GdkDisplayWayland *display, GdkPixbuf *pixbuf, int x, int y)
   else
     memset (cursor->map, 0, 4);
 
-  visual = wl_display_get_premultiplied_argb_visual(display->wl_display);
+  visual = display->premultiplied_argb_visual;
   cursor->buffer = wl_shm_create_buffer(display->shm,
 					fd,
 					cursor->width,

gdk/wayland/gdkdisplay-wayland.c

@@ -124,17 +124,53 @@ static const struct wl_shell_listener shell_listener = {
 
 static void
 output_handle_geometry(void *data,
-		       struct wl_output *output,
-		       int32_t x, int32_t y, int32_t width, int32_t height)
+		       struct wl_output *wl_output,
+		       int x, int y, int physical_width, int physical_height,
+		       int subpixel, const char *make, const char *model)
 {
   /*
     g_signal_emit_by_name (screen, "monitors-changed");
     g_signal_emit_by_name (screen, "size-changed");
   */
 }
+static void
+display_handle_mode(void *data,
+                   struct wl_output *wl_output,
+                   uint32_t flags,
+                   int width,
+                   int height,
+                   int refresh)
+{
+}
+
+static void
+compositor_handle_visual(void *data,
+			 struct wl_compositor *compositor,
+			 uint32_t id, uint32_t token)
+{
+	GdkDisplayWayland *d = data;
+
+	switch (token) {
+	case WL_COMPOSITOR_VISUAL_ARGB32:
+		d->argb_visual = wl_visual_create(d->wl_display, id, 1);
+		break;
+	case WL_COMPOSITOR_VISUAL_PREMULTIPLIED_ARGB32:
+		d->premultiplied_argb_visual =
+			wl_visual_create(d->wl_display, id, 1);
+		break;
+	case WL_COMPOSITOR_VISUAL_XRGB32:
+		d->rgb_visual = wl_visual_create(d->wl_display, id, 1);
+		break;
+	}
+}
+
+static const struct wl_compositor_listener compositor_listener = {
+	compositor_handle_visual,
+};
 
 static const struct wl_output_listener output_listener = {
 	output_handle_geometry,
+	display_handle_mode
 };
 
 static void
@@ -147,6 +183,8 @@ gdk_display_handle_global(struct wl_display *display, uint32_t id,
 
   if (strcmp(interface, "wl_compositor") == 0) {
     display_wayland->compositor = wl_compositor_create(display, id, 1);
+    wl_compositor_add_listener(display_wayland->compositor,
+					   &compositor_listener, display_wayland);
   } else if (strcmp(interface, "wl_shm") == 0) {
     display_wayland->shm = wl_shm_create(display, id, 1);
   } else if (strcmp(interface, "wl_shell") == 0) {

gdk/wayland/gdkdisplay-wayland.h

@@ -71,6 +71,7 @@ struct _GdkDisplayWayland
 
   /* Wayland fields below */
   struct wl_display *wl_display;
+  struct wl_visual *argb_visual, *premultiplied_argb_visual, *rgb_visual;
   struct wl_compositor *compositor;
   struct wl_shm *shm;
   struct wl_shell *shell;

gdk/wayland/gdkscreen-wayland.c

@@ -482,15 +482,14 @@ _gdk_wayland_screen_new (GdkDisplay *display)
   screen_wayland->width = 8192;
   screen_wayland->height = 8192;
 
-  visual = wl_display_get_argb_visual(display_wayland->wl_display);
+  visual = display_wayland->argb_visual;
   screen_wayland->argb_visual = gdk_wayland_visual_new (screen, visual);
 
-  visual =
-    wl_display_get_premultiplied_argb_visual(display_wayland->wl_display);
+  visual = display_wayland->premultiplied_argb_visual;
   screen_wayland->premultiplied_argb_visual =
     gdk_wayland_visual_new (screen, visual);
 
-  visual = wl_display_get_rgb_visual(display_wayland->wl_display);
+  visual = display_wayland->rgb_visual;
   screen_wayland->rgb_visual = gdk_wayland_visual_new (screen, visual);
 
   screen_wayland->root_window =

gdk/wayland/gdkwindow-wayland.c

@@ -392,7 +392,7 @@ gdk_wayland_create_cairo_surface (GdkDisplayWayland *display,
   data = g_new (GdkWaylandCairoSurfaceData, 1);
   data->display = display;
   data->buffer = NULL;
-  visual = wl_display_get_premultiplied_argb_visual(display->wl_display);
+  visual = display->premultiplied_argb_visual;
   data->width = width;
   data->height = height;
   data->pixmap = wl_egl_pixmap_create(width, height, visual, 0);
@@ -400,9 +400,11 @@ gdk_wayland_create_cairo_surface (GdkDisplayWayland *display,
     display->create_image(display->egl_display, NULL, EGL_NATIVE_PIXMAP_KHR,
 			  (EGLClientBuffer) data->pixmap, NULL);
 
+  cairo_device_acquire(display->cairo_device);
   glGenTextures(1, &data->texture);
   glBindTexture(GL_TEXTURE_2D, data->texture);
   display->image_target_texture_2d(GL_TEXTURE_2D, data->image);
+  cairo_device_release(display->cairo_device);
 
   surface = cairo_gl_surface_create_for_texture(display->cairo_device,
 						CAIRO_CONTENT_COLOR_ALPHA,
@@ -450,6 +452,8 @@ gdk_wayland_window_map (GdkWindow *window)
 {
   GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
   GdkWindowImplWayland *parent;
+  GdkDisplayWayland *display_wayland =
+		GDK_DISPLAY_WAYLAND (gdk_window_get_display (impl->wrapper));
 
   if (!impl->mapped)
     {
@@ -462,11 +466,11 @@ gdk_wayland_window_map (GdkWindow *window)
 		  window->y);
 
 	  parent = GDK_WINDOW_IMPL_WAYLAND (impl->transient_for->impl);
-	  wl_surface_map_transient (impl->surface, parent->surface,
+	  wl_shell_set_transient (display_wayland->shell, impl->surface, parent->surface,
 				    window->x, window->y, 0);
 	}
       else
-	wl_surface_map_toplevel (impl->surface);
+      wl_shell_set_toplevel (display_wayland->shell, impl->surface);
       impl->mapped = TRUE;
     }
 }

gdk/win32/Makefile.am

@@ -2,8 +2,9 @@
 include $(top_srcdir)/Makefile.decl
 
 libgdkincludedir = $(includedir)/gtk-3.0/gdk
+libgdkwin32includedir = $(includedir)/gtk-3.0/gdk/win32
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Gdk\"	\
 	-DINSIDE_GDK_WIN32	\
 	-I$(top_srcdir)		\
@@ -65,4 +66,13 @@ libgdk_win32_la_SOURCES = \
 libgdkinclude_HEADERS =		\
 	gdkwin32.h
 
+libgdkwin32include_HEADERS =	\
+	gdkwin32cursor.h	\
+	gdkwin32display.h	\
+	gdkwin32displaymanager.h\
+	gdkwin32dnd.h		\
+	gdkwin32keys.h		\
+	gdkwin32screen.h	\
+	gdkwin32window.h
+
 -include $(top_srcdir)/git.mk

gdk/x11/Makefile.am

@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl
 libgdkincludedir = $(includedir)/gtk-3.0/gdk
 libgdkx11includedir = $(includedir)/gtk-3.0/gdk/x11
 
-INCLUDES = 			\
+AM_CPPFLAGS = 			\
 	-DG_LOG_DOMAIN=\"Gdk\"	\
 	-DGDK_COMPILATION	\
 	-I$(top_srcdir)		\
@@ -66,9 +66,11 @@ libgdkinclude_HEADERS = 	\
 libgdkx11include_HEADERS = 	\
 	gdkx11applaunchcontext.h \
 	gdkx11cursor.h		\
+	gdkx11device.h		\
 	gdkx11device-core.h	\
 	gdkx11device-xi.h	\
 	gdkx11device-xi2.h	\
+	gdkx11devicemanager.h   \
 	gdkx11devicemanager-core.h \
 	gdkx11devicemanager-xi.h \
 	gdkx11devicemanager-xi2.h \

gdk/x11/gdkcursor-x11.c

@@ -285,12 +285,12 @@ _gdk_x11_display_get_cursor_for_type (GdkDisplay    *display,
 }
 
 /**
- * gdk_x11_cursor_get_xdisplay: (skip)
- * @cursor: a #GdkCursor.
+ * gdk_x11_cursor_get_xdisplay:
+ * @cursor: (type GdkX11Cursor): a #GdkCursor.
  * 
  * Returns the display of a #GdkCursor.
  * 
- * Return value: an Xlib <type>Display*</type>.
+ * Return value: (transfer none): an Xlib <type>Display*</type>.
  **/
 Display *
 gdk_x11_cursor_get_xdisplay (GdkCursor *cursor)
@@ -301,8 +301,8 @@ gdk_x11_cursor_get_xdisplay (GdkCursor *cursor)
 }
 
 /**
- * gdk_x11_cursor_get_xcursor: (skip)
- * @cursor: a #GdkCursor.
+ * gdk_x11_cursor_get_xcursor:
+ * @cursor: (type GdkX11Cursor): a #GdkCursor.
  * 
  * Returns the X cursor belonging to a #GdkCursor.
  * 
@@ -435,7 +435,7 @@ update_cursor (gpointer data,
 
 /**
  * gdk_x11_display_set_cursor_theme:
- * @display: a #GdkDisplay
+ * @display: (type GdkX11Display): a #GdkDisplay
  * @theme: the name of the cursor theme to use, or %NULL to unset
  *         a previously set value
  * @size: the cursor size to use, or 0 to keep the previous size

gdk/x11/gdkdevice-xi2.c

@@ -750,6 +750,14 @@ _gdk_x11_device_xi2_translate_state (XIModifierState *mods_state,
   return state;
 }
 
+gint
+_gdk_x11_device_xi2_get_id (GdkX11DeviceXI2 *device)
+{
+  g_return_val_if_fail (GDK_IS_X11_DEVICE_XI2 (device), 0);
+
+  return device->device_id;
+}
+
 #else /* XINPUT_2 */
 
 static void

gdk/x11/gdkdevicemanager-x11.c

@@ -20,6 +20,7 @@
 #include "config.h"
 
 #include "gdkx11devicemanager-core.h"
+#include "gdkdevicemanagerprivate-core.h"
 #ifdef XINPUT_XFREE
 #include "gdkx11devicemanager-xi.h"
 #ifdef XINPUT_2
@@ -29,6 +30,12 @@
 #include "gdkinternals.h"
 #include "gdkprivate-x11.h"
 
+/* Defines for VCP/VCK, to be used too
+ * for the core protocol device manager
+ */
+#define VIRTUAL_CORE_POINTER_ID 2
+#define VIRTUAL_CORE_KEYBOARD_ID 3
+
 GdkDeviceManager *
 _gdk_x11_device_manager_new (GdkDisplay *display)
 {
@@ -83,3 +90,81 @@ _gdk_x11_device_manager_new (GdkDisplay *display)
                        "display", display,
                        NULL);
 }
+
+/**
+ * gdk_x11_device_manager_lookup:
+ * @device_manager: a #GdkDeviceManager
+ * @device_id: a device ID, as understood by the XInput2 protocol
+ *
+ * Returns the #GdkDevice that wraps the given device ID.
+ *
+ * Returns: (transfer none): (allow-none): The #GdkDevice wrapping the device ID,
+ *          or %NULL if the given ID doesn't currently represent a device.
+ **/
+GdkDevice *
+gdk_x11_device_manager_lookup (GdkDeviceManager *device_manager,
+			       gint              device_id)
+{
+  GdkDevice *device = NULL;
+
+  g_return_val_if_fail (GDK_IS_DEVICE_MANAGER (device_manager), NULL);
+
+#ifdef XINPUT_2
+  if (GDK_IS_X11_DEVICE_MANAGER_XI2 (device_manager))
+    device = _gdk_x11_device_manager_xi2_lookup (GDK_X11_DEVICE_MANAGER_XI2 (device_manager),
+                                                 device_id);
+  else
+#endif /* XINPUT_2 */
+    if (GDK_IS_X11_DEVICE_MANAGER_CORE (device_manager))
+      {
+        /* It is a core/xi1 device manager, we only map
+         * IDs 2 and 3, matching XI2's Virtual Core Pointer
+         * and Keyboard.
+         */
+        if (device_id == VIRTUAL_CORE_POINTER_ID)
+          device = GDK_X11_DEVICE_MANAGER_CORE (device_manager)->core_pointer;
+        else if (device_id == VIRTUAL_CORE_KEYBOARD_ID)
+          device = GDK_X11_DEVICE_MANAGER_CORE (device_manager)->core_keyboard;
+      }
+
+  return device;
+}
+
+/**
+ * gdk_x11_device_get_id:
+ * @device: a #GdkDevice
+ *
+ * Returns the device ID as seen by XInput2.
+ *
+ * <note>
+ *   If gdk_disable_multidevice() has been called, this function
+ *   will respectively return 2/3 for the core pointer and keyboard,
+ *   (matching the IDs for the Virtual Core Pointer and Keyboard in
+ *   XInput 2), but calling this function on any slave devices (i.e.
+ *   those managed via XInput 1.x), will return 0.
+ * </note>
+ *
+ * Returns: the XInput2 device ID.
+ **/
+gint
+gdk_x11_device_get_id (GdkDevice *device)
+{
+  gint device_id = 0;
+
+  g_return_val_if_fail (GDK_IS_DEVICE (device), 0);
+
+#ifdef XINPUT_2
+  if (GDK_IS_X11_DEVICE_XI2 (device))
+    device_id = _gdk_x11_device_xi2_get_id (GDK_X11_DEVICE_XI2 (device));
+  else
+#endif /* XINPUT_2 */
+    if (GDK_IS_X11_DEVICE_CORE (device))
+      {
+        if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
+          device_id = VIRTUAL_CORE_KEYBOARD_ID;
+        else
+          device_id = VIRTUAL_CORE_POINTER_ID;
+      }
+
+  return device_id;
+}

gdk/x11/gdkdevicemanager-xi2.c

@@ -168,7 +168,7 @@ translate_valuator_class (GdkDisplay          *display,
       initialized = TRUE;
     }
 
-  for (i = GDK_AXIS_IGNORE; i <= GDK_AXIS_LAST; i++)
+  for (i = GDK_AXIS_IGNORE; i < GDK_AXIS_LAST; i++)
     {
       if (label_atoms[i] == info->label)
         {
@@ -1025,6 +1025,9 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
 
   ev = (XIEvent *) cookie->data;
 
+  if (!ev)
+    return FALSE;
+
   window = get_event_window (translator, ev);
 
   if (window && GDK_WINDOW_DESTROYED (window))
@@ -1292,6 +1295,7 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
 
         return_val = FALSE;
       }
+      break;
     default:
       return_val = FALSE;
       break;
@@ -1391,3 +1395,11 @@ gdk_x11_device_manager_xi2_event_translator_init (GdkEventTranslatorIface *iface
 }
 
 #endif /* XINPUT_2 */
+
+GdkDevice *
+_gdk_x11_device_manager_xi2_lookup (GdkX11DeviceManagerXI2 *device_manager_xi2,
+                                    gint                    device_id)
+{
+  return g_hash_table_lookup (device_manager_xi2->id_table,
+                              GINT_TO_POINTER (device_id));
+}

gdk/x11/gdkdisplay-x11.c

@@ -1635,7 +1635,7 @@ gdk_x11_display_get_default_group (GdkDisplay *display)
 
 /**
  * gdk_x11_display_grab:
- * @display: a #GdkDisplay 
+ * @display: (type GdkX11Display): a #GdkDisplay 
  * 
  * Call XGrabServer() on @display. 
  * To ungrab the display again, use gdk_x11_display_ungrab(). 
@@ -1660,7 +1660,7 @@ gdk_x11_display_grab (GdkDisplay *display)
 
 /**
  * gdk_x11_display_ungrab:
- * @display: a #GdkDisplay
+ * @display: (type GdkX11Display): a #GdkDisplay
  * 
  * Ungrab @display after it has been grabbed with 
  * gdk_x11_display_grab(). 
@@ -1843,9 +1843,9 @@ _gdk_x11_display_screen_for_xrootwin (GdkDisplay *display,
 }
 
 /**
- * gdk_x11_display_get_xdisplay: (skip)
- * @display: a #GdkDisplay
- * @returns: an X display.
+ * gdk_x11_display_get_xdisplay:
+ * @display: (type GdkX11Display): a #GdkDisplay
+ * @returns: (transfer none): an X display.
  *
  * Returns the X display of a #GdkDisplay.
  *
@@ -1975,7 +1975,7 @@ broadcast_xmessage (GdkDisplay *display,
 
 /**
  * gdk_x11_display_broadcast_startup_message:
- * @display: a #GdkDisplay
+ * @display: (type GdkX11Display): a #GdkDisplay
  * @message_type: startup notification message type ("new", "change",
  * or "remove")
  * @...: a list of key/value pairs (as strings), terminated by a
@@ -2148,7 +2148,7 @@ gdk_x11_display_store_clipboard (GdkDisplay    *display,
 
 /**
  * gdk_x11_display_get_user_time:
- * @display: a #GdkDisplay
+ * @display: (type GdkX11Display): a #GdkDisplay
  *
  * Returns the timestamp of the last user interaction on 
  * @display. The timestamp is taken from events caused
@@ -2180,7 +2180,7 @@ gdk_x11_display_supports_input_shapes (GdkDisplay *display)
 
 /**
  * gdk_x11_display_get_startup_notification_id:
- * @display: a #GdkDisplay
+ * @display: (type GdkX11Display): a #GdkDisplay
  *
  * Gets the startup notification ID for a display.
  * 
@@ -2196,7 +2196,7 @@ gdk_x11_display_get_startup_notification_id (GdkDisplay *display)
 
 /**
  * gdk_x11_display_set_startup_notification_id:
- * @display: a #GdkDisplay
+ * @display: (type GdkX11Display): a #GdkDisplay
  * @startup_id: the startup notification ID (must be valid utf8)
  *
  * Sets the startup notification ID for a display.
@@ -2412,7 +2412,7 @@ delete_outdated_error_traps (GdkX11Display *display_x11)
 
 /**
  * gdk_x11_display_error_trap_push:
- * @display: a #GdkDisplay
+ * @display: (type GdkX11Display): a #GdkDisplay
  *
  * Begins a range of X requests on @display for which X error events
  * will be ignored. Unignored errors (when no trap is pushed) will abort
@@ -2517,7 +2517,7 @@ gdk_x11_display_error_trap_pop_internal (GdkDisplay *display,
 
 /**
  * gdk_x11_display_error_trap_pop:
- * @display: the display
+ * @display: (type GdkX11Display): the display
  *
  * Pops the error trap pushed by gdk_x11_display_error_trap_push().
  * Will XSync() if necessary and will always block until
@@ -2544,7 +2544,7 @@ gdk_x11_display_error_trap_pop (GdkDisplay *display)
 
 /**
  * gdk_x11_display_error_trap_pop_ignored:
- * @display: the display
+ * @display: (type GdkX11Display): the display
  *
  * Pops the error trap pushed by gdk_x11_display_error_trap_push().
  * Does not block to see if an error occurred; merely records the

gdk/x11/gdkkeys-x11.c

@@ -232,7 +232,7 @@ get_xkb (GdkX11Keymap *keymap_x11)
   keymap_x11->current_serial = display_x11->keymap_serial;
 
   if (keymap_x11->num_lock_mask == 0)
-    keymap_x11->num_lock_mask = XkbKeysymToModifiers (KEYMAP_XDISPLAY (GDK_KEYMAP (keymap_x11)), XK_Num_Lock);
+    keymap_x11->num_lock_mask = XkbKeysymToModifiers (KEYMAP_XDISPLAY (GDK_KEYMAP (keymap_x11)), GDK_KEY_Num_Lock);
 
   return keymap_x11->xkb_desc;
 }
@@ -881,6 +881,8 @@ gdk_x11_keymap_get_entries_for_keyval (GdkKeymap     *keymap,
 
               ++i;
             }
+
+          ++keycode;
         }
     }
 

gdk/x11/gdkmain-x11.c

@@ -442,7 +442,7 @@ gdk_x11_get_default_screen (void)
 }
 
 /**
- * gdk_x11_get_default_root_xwindow: (skip)
+ * gdk_x11_get_default_root_xwindow:
  * 
  * Gets the root window of the default screen 
  * (see gdk_x11_get_default_screen()).  
@@ -456,13 +456,13 @@ gdk_x11_get_default_root_xwindow (void)
 }
 
 /**
- * gdk_x11_get_default_xdisplay: (skip)
+ * gdk_x11_get_default_xdisplay:
  * 
  * Gets the default GTK+ display.
  * 
- * Return value: the Xlib <type>Display*</type> for the display
- * specified in the <option>--display</option> command line option 
- * or the <envar>DISPLAY</envar> environment variable.
+ * Return value: (transfer none): the Xlib <type>Display*</type> for
+ * the display specified in the <option>--display</option> command
+ * line option or the <envar>DISPLAY</envar> environment variable.
  **/
 Display *
 gdk_x11_get_default_xdisplay (void)

gdk/x11/gdkprivate-x11.h

@@ -252,6 +252,11 @@ guchar * _gdk_x11_device_xi2_translate_event_mask (GdkEventMask     event_mask,
 guint    _gdk_x11_device_xi2_translate_state      (XIModifierState *mods_state,
                                                    XIButtonState   *buttons_state,
                                                    XIGroupState    *group_state);
+gint     _gdk_x11_device_xi2_get_id               (GdkX11DeviceXI2 *device);
+
+GdkDevice * _gdk_x11_device_manager_xi2_lookup    (GdkX11DeviceManagerXI2 *device_manager_xi2,
+                                                   gint                    device_id);
+
 #endif
 
 void     _gdk_x11_event_translate_keyboard_string (GdkEventKey *event);

gdk/x11/gdkproperty-x11.c

@@ -207,7 +207,7 @@ lookup_cached_xatom (GdkDisplay *display,
 }
 
 /**
- * gdk_x11_atom_to_xatom_for_display: (skip)
+ * gdk_x11_atom_to_xatom_for_display:
  * @display: A #GdkDisplay
  * @atom: A #GdkAtom, or %GDK_NONE
  *
@@ -298,7 +298,7 @@ _gdk_x11_precache_atoms (GdkDisplay          *display,
 }
 
 /**
- * gdk_x11_atom_to_xatom: (skip)
+ * gdk_x11_atom_to_xatom:
  * @atom: A #GdkAtom 
  * 
  * Converts from a #GdkAtom to the X atom for the default GDK display
@@ -313,14 +313,14 @@ gdk_x11_atom_to_xatom (GdkAtom atom)
 }
 
 /**
- * gdk_x11_xatom_to_atom_for_display: (skip)
+ * gdk_x11_xatom_to_atom_for_display:
  * @display: A #GdkDisplay
  * @xatom: an X atom 
  * 
  * Convert from an X atom for a #GdkDisplay to the corresponding
  * #GdkAtom.
  * 
- * Return value: the corresponding #GdkAtom.
+ * Return value: (transfer none): the corresponding #GdkAtom.
  *
  * Since: 2.2
  **/
@@ -373,13 +373,13 @@ gdk_x11_xatom_to_atom_for_display (GdkDisplay *display,
 }
 
 /**
- * gdk_x11_xatom_to_atom: (skip)
+ * gdk_x11_xatom_to_atom:
  * @xatom: an X atom for the default GDK display
  * 
  * Convert from an X atom for the default display to the corresponding
  * #GdkAtom.
  * 
- * Return value: the corresponding G#dkAtom.
+ * Return value: (transfer none): the corresponding G#dkAtom.
  **/
 GdkAtom
 gdk_x11_xatom_to_atom (Atom xatom)
@@ -450,7 +450,7 @@ _gdk_x11_display_manager_get_atom_name (GdkDisplayManager *manager,
 }
 
 /**
- * gdk_x11_get_xatom_by_name_for_display: (skip)
+ * gdk_x11_get_xatom_by_name_for_display:
  * @display: a #GdkDisplay
  * @atom_name: a string
  * 
@@ -472,7 +472,7 @@ gdk_x11_get_xatom_by_name_for_display (GdkDisplay  *display,
 }
 
 /**
- * gdk_x11_get_xatom_by_name: (skip)
+ * gdk_x11_get_xatom_by_name:
  * @atom_name: a string
  * 
  * Returns the X atom for GDK's default display corresponding to @atom_name.

gdk/x11/gdkscreen-x11.c

@@ -265,8 +265,8 @@ gdk_x11_screen_get_monitor_plug_name (GdkScreen *screen,
 }
 
 /**
- * gdk_x11_screen_get_monitor_output: (skip)
- * @screen: a #GdkScreen
+ * gdk_x11_screen_get_monitor_output:
+ * @screen: (type GdkX11Screen): a #GdkScreen
  * @monitor_num: number of the monitor, between 0 and gdk_screen_get_n_monitors (screen)
  *
  * Gets the XID of the specified output/monitor.
@@ -319,7 +319,7 @@ gdk_x11_screen_get_rgba_visual (GdkScreen *screen)
 
 /**
  * gdk_x11_screen_get_xscreen:
- * @screen: a #GdkScreen.
+ * @screen: (type GdkX11Screen): a #GdkScreen.
  * @returns: (transfer none): an Xlib <type>Screen*</type>
  *
  * Returns the screen of a #GdkScreen.
@@ -334,7 +334,7 @@ gdk_x11_screen_get_xscreen (GdkScreen *screen)
 
 /**
  * gdk_x11_screen_get_screen_number:
- * @screen: a #GdkScreen.
+ * @screen: (type GdkX11Screen): a #GdkScreen.
  * @returns: the position of @screen among the screens of
  *   its display.
  *
@@ -1275,7 +1275,7 @@ fetch_net_wm_check_window (GdkScreen *screen)
 
 /**
  * gdk_x11_screen_supports_net_wm_hint:
- * @screen: the relevant #GdkScreen.
+ * @screen: (type GdkX11Screen): the relevant #GdkScreen.
  * @property: a property atom.
  *
  * This function is specific to the X11 backend of GDK, and indicates
@@ -1510,7 +1510,7 @@ _gdk_x11_screen_init_events (GdkScreen *screen)
 
 /**
  * gdk_x11_screen_get_window_manager_name:
- * @screen: a #GdkScreen
+ * @screen: (type GdkX11Screen): a #GdkScreen
  *
  * Returns the name of the window manager for @screen.
  *

gdk/x11/gdkselection-x11.c

@@ -333,7 +333,7 @@ _gdk_x11_display_send_selection_notify (GdkDisplay       *display,
 
 /**
  * gdk_x11_display_text_property_to_text_list:
- * @display: The #GdkDisplay where the encoding is defined
+ * @display: (type GdkX11Display): The #GdkDisplay where the encoding is defined
  * @encoding: an atom representing the encoding. The most
  *    common values for this are STRING, or COMPOUND_TEXT.
  *    This is value used as the type for the property
@@ -574,7 +574,7 @@ _gdk_x11_display_text_property_to_utf8_list (GdkDisplay    *display,
 
 /**
  * gdk_x11_display_string_to_compound_text:
- * @display: the #GdkDisplay where the encoding is defined
+ * @display: (type GdkX11Display): the #GdkDisplay where the encoding is defined
  * @str: a nul-terminated string
  * @encoding: (out) (transfer none): location to store the encoding atom
  *     (to be used as the type for the property)
@@ -695,7 +695,7 @@ _gdk_x11_display_utf8_to_string_target (GdkDisplay  *display,
 
 /**
  * gdk_x11_display_utf8_to_compound_text:
- * @display: a #GdkDisplay
+ * @display: (type GdkX11Display): a #GdkDisplay
  * @str: a UTF-8 string
  * @encoding: (out): location to store resulting encoding
  * @format: (out): location to store format of the result

gdk/x11/gdksettings.c

@@ -80,7 +80,8 @@ static const char gdk_settings_names[] =
   "Net/EnableInputFeedbackSounds\0" "gtk-enable-input-feedback-sounds\0"
   "Net/EnableEventSounds\0"   "gtk-enable-event-sounds\0"
   "Gtk/CursorBlinkTimeout\0"  "gtk-cursor-blink-timeout\0"
-  "Gtk/AutoMnemonics\0"       "gtk-auto-mnemonics\0";
+  "Gtk/AutoMnemonics\0"       "gtk-auto-mnemonics\0"
+  "Gtk/VisibleFocus\0"        "gtk-visible-focus\0";
 
 
 static const struct
@@ -133,5 +134,6 @@ static const struct
   { 1573, 1603 },
   { 1636, 1658 },
   { 1682, 1705 },
-  { 1730, 1748 }
+  { 1730, 1748 },
+  { 1767, 1784 }
 };

gdk/x11/gdkvisual-x11.c

@@ -457,7 +457,7 @@ _gdk_x11_screen_list_visuals (GdkScreen *screen)
 
 /**
  * gdk_x11_screen_lookup_visual:
- * @screen: a #GdkScreen.
+ * @screen: (type GdkX11Screen): a #GdkScreen.
  * @xvisualid: an X Visual ID.
  *
  * Looks up the #GdkVisual for a particular screen and X Visual ID.
@@ -564,12 +564,12 @@ _gdk_visual_get_x11_colormap (GdkVisual *visual)
 }
 
 /**
- * gdk_x11_visual_get_xvisual: (skip)
+ * gdk_x11_visual_get_xvisual:
  * @visual: a #GdkVisual.
  *
  * Returns the X visual belonging to a #GdkVisual.
  *
- * Return value: an Xlib <type>Visual*</type>.
+ * Return value: (transfer none): an Xlib <type>Visual*</type>.
  **/
 Visual *
 gdk_x11_visual_get_xvisual (GdkVisual *visual)

gdk/x11/gdkwindow-x11.c

@@ -1699,7 +1699,7 @@ gdk_window_x11_lower (GdkWindow *window)
 
 /**
  * gdk_x11_window_move_to_current_desktop:
- * @window: a #GdkWindow
+ * @window: (type GdkX11Window): a #GdkWindow
  * 
  * Moves the window to the correct workspace when running under a 
  * window manager that supports multiple workspaces, as described
@@ -3023,7 +3023,7 @@ gdk_x11_window_set_focus_on_map (GdkWindow *window,
 
 /**
  * gdk_x11_window_set_user_time:
- * @window: A toplevel #GdkWindow
+ * @window: (type GdkX11Window): A toplevel #GdkWindow
  * @timestamp: An XServer timestamp to which the property should be set
  *
  * The application can use this call to update the _NET_WM_USER_TIME
@@ -3088,7 +3088,7 @@ gdk_x11_window_set_user_time (GdkWindow *window,
 
 /**
  * gdk_x11_window_set_theme_variant:
- * @window: a #GdkWindow
+ * @window: (type GdkX11Window): a #GdkWindow
  * @variant: the theme variant to export
  *
  * GTK+ applications can request a dark theme variant. In order to
@@ -4701,9 +4701,10 @@ timestamp_predicate (Display *display,
 
 /**
  * gdk_x11_get_server_time:
- * @window: a #GdkWindow, used for communication with the server.
- *          The window must have GDK_PROPERTY_CHANGE_MASK in its
- *          events mask or a hang will result.
+ * @window: (type GdkX11Window): a #GdkWindow, used for communication
+ *          with the server.  The window must have
+ *          GDK_PROPERTY_CHANGE_MASK in its events mask or a hang will
+ *          result.
  *
  * Routine to get the current X server time stamp.
  *
@@ -4738,8 +4739,8 @@ gdk_x11_get_server_time (GdkWindow *window)
 }
 
 /**
- * gdk_x11_window_get_xid: (skip)
- * @window: a native #GdkWindow.
+ * gdk_x11_window_get_xid:
+ * @window: (type GdkX11Window): a native #GdkWindow.
  * 
  * Returns the X resource (window) belonging to a #GdkWindow.
  * 

gdk/x11/gdkx.h

@@ -36,9 +36,11 @@
 
 #include <gdk/x11/gdkx11applaunchcontext.h>
 #include <gdk/x11/gdkx11cursor.h>
+#include <gdk/x11/gdkx11device.h>
 #include <gdk/x11/gdkx11device-core.h>
 #include <gdk/x11/gdkx11device-xi.h>
 #include <gdk/x11/gdkx11device-xi2.h>
+#include <gdk/x11/gdkx11devicemanager.h>
 #include <gdk/x11/gdkx11devicemanager-core.h>
 #include <gdk/x11/gdkx11devicemanager-xi.h>
 #include <gdk/x11/gdkx11devicemanager-xi2.h>

gdk/x11/gdkx11device.h

@@ -1,5 +1,5 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2011 Red Hat, Inc.
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 2011 Carlos Garnacho
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -12,20 +12,24 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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.
  */
 
-#ifndef __GTK_ACCESSIBLE_PRIVATE_H__
-#define __GTK_ACCESSIBLE_PRIVATE_H__
+#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdkx.h> can be included directly."
+#endif
 
-#include "gtkaccessible.h"
+#ifndef __GDK_X11_DEVICE_H__
+#define __GDK_X11_DEVICE_H__
+
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
-void     _gtk_accessible_set_factory_type (GType widget_type,
-                                           GType factory_type);
+gint  gdk_x11_device_get_id  (GdkDevice *device);
 
 G_END_DECLS
 
-#endif  /* __GTK_ACCESSIBLE_PRIVATE_H__ */
+#endif /* __GDK_X11_DEVICE_H__ */

gdk/x11/gdkx11devicemanager.h

@@ -0,0 +1,39 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 2011 Carlos Garnacho
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdkx.h> can be included directly."
+#endif
+
+#ifndef __GDK_X11_DEVICE_MANAGER_H__
+#define __GDK_X11_DEVICE_MANAGER_H__
+
+#include <gdk/gdk.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+G_BEGIN_DECLS
+
+GdkDevice * gdk_x11_device_manager_lookup (GdkDeviceManager *device_manager,
+                                           gint              device_id);
+
+G_END_DECLS
+
+#endif /* __GDK_X11_DEVICE_MANAGER_H__ */

gdk/x11/gdkxid.c

@@ -81,7 +81,8 @@ _gdk_x11_display_remove_window (GdkDisplay *display,
 
 /**
  * gdk_x11_window_lookup_for_display:
- * @display: the #GdkDisplay corresponding to the window handle
+ * @display: (type GdkX11Window): the #GdkDisplay corresponding to the
+ *           window handle
  * @window: an XLib <type>Window</type>
  *
  * Looks up the #GdkWindow that wraps the given native window handle.

gtk+.doap

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
          xmlns:foaf="http://xmlns.com/foaf/0.1/"
@@ -5,6 +6,7 @@
          xmlns="http://usefulinc.com/ns/doap#">
 
   <name xml:lang="en">Gtk+</name>
+  <shortname>gtk+</shortname>
   <shortdesc xml:lang="en">Multi-platform toolkit</shortdesc>
   <description xml:lang="en">GTK+ is a multi-platform toolkit for creating graphical user
 interfaces. Offering a complete set of widgets, GTK+ is suitable for
@@ -21,6 +23,9 @@ 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.</description>
   <homepage rdf:resource="http://www.gtk+.org/" />
+  <license rdf:resource="http://usefulinc.com/doap/licenses/lgpl" />
+  <bug-database rdf:resource="http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B" />
+  <download-page rdf:resource="http://download.gnome.org/sources/gtk+/" />
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gtk-list" />
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gtk-app-devel-list" />
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gtk-devel-list" />
@@ -29,6 +34,15 @@ any license fees or royalties.</description>
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gtk-perl-list" />
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/language-bindings" />
 
+  <programming-language>C</programming-language>
+
+  <repository>
+    <GitRepository>
+        <browse rdf:resource="http://git.gnome.org/browse/gtk+/"/>
+      <location rdf:resource="git://git.gnome.org/gtk+"/>
+    </GitRepository>
+  </repository>
+
   <maintainer>
     <foaf:Person>
       <foaf:name>Matthias Clasen</foaf:name>
@@ -43,4 +57,5 @@ any license fees or royalties.</description>
       <gnome:userid>timj</gnome:userid>
     </foaf:Person>
   </maintainer>
+
 </Project>

gtk/Makefile.am

@@ -16,7 +16,7 @@ else
 GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
 endif
 
-SUBDIRS = . tests
+SUBDIRS = a11y . tests
 
 if HAVE_PAPI_CUPS
 GTK_PRINT_BACKENDS=file,papi,cups
@@ -32,7 +32,7 @@ endif
 endif
 endif
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"Gtk\"				\
 	-DGTK_LIBDIR=\"$(libdir)\"			\
 	-DGTK_DATADIR=\"$(datadir)\"			\
@@ -99,7 +99,7 @@ endif
 # This places the generated .def file in srcdir, since it is expected to be there.
 # (The one from a tarball is)
 gtk.def: gtk.symbols
-	$(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DG_OS_WIN32 - <$(srcdir)/gtk.symbols | $(SED) -e '/^$$/d' -e 's/^/	/' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gtk.def
+	$(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DG_OS_WIN32 - <$(srcdir)/gtk.symbols | $(SED) -e '/^$$/d' -e 's/^/	/') > $(srcdir)/gtk.def
 
 TESTS_ENVIRONMENT = srcdir="$(srcdir)" gtk_all_c_sources="$(gtk_all_c_sources)"
 if OS_LINUX
@@ -109,8 +109,11 @@ endif
 libgtkincludedir = $(includedir)/gtk-3.0/gtk
 libadd = \
 	$(top_builddir)/gdk/libgdk-3.la	\
+	$(top_builddir)/gtk/a11y/libgail.la \
 	$(GTK_DEP_LIBS)
-deps =
+deps = \
+	$(top_builddir)/gdk/libgdk-3.la	\
+	$(top_builddir)/gtk/a11y/libgail.la
 
 # libtool stuff: set version and export symbols for resolving
 # since automake doesn't support conditionalized libsomething_la_LDFLAGS
@@ -196,6 +199,7 @@ gtk_public_h_sources = 		\
 	gtkcomboboxtext.h	\
 	gtkcontainer.h		\
 	gtkcssprovider.h	\
+	gtkcsssection.h 	\
 	gtkdebug.h		\
 	gtkdialog.h		\
 	gtkdnd.h		\
@@ -215,6 +219,8 @@ gtk_public_h_sources = 		\
 	gtkfixed.h		\
 	gtkfontbutton.h		\
 	gtkfontsel.h		\
+	gtkfontchooser.h        \
+	gtkfontchooserdialog.h  \
 	gtkframe.h		\
 	gtkgradient.h		\
 	gtkgrid.h		\
@@ -377,7 +383,6 @@ endif
 # GTK+ header files that don't get installed
 gtk_private_h_sources =		\
 	gtkaccelgroupprivate.h	\
-	gtkaccessibleprivate.h	\
 	gtkanimationdescription.h \
 	gtkappchooserprivate.h	\
 	gtkappchoosermodule.h	\
@@ -390,6 +395,7 @@ gtk_private_h_sources =		\
 	gtkcontainerprivate.h   \
 	gtkcssparserprivate.h	\
 	gtkcssproviderprivate.h	\
+	gtkcsssectionprivate.h 	\
 	gtkcssselectorprivate.h	\
 	gtkcsstypesprivate.h	\
 	gtkcustompaperunixdialog.h \
@@ -522,6 +528,7 @@ gtk_base_c_sources = 		\
 	gtkcontainer.c		\
 	gtkcssparser.c		\
 	gtkcssprovider.c	\
+	gtkcsssection.c 	\
 	gtkcssselector.c	\
 	gtkcsstypes.c		\
 	gtkdialog.c		\
@@ -546,6 +553,8 @@ gtk_base_c_sources = 		\
 	gtkfixed.c		\
 	gtkfontbutton.c		\
 	gtkfontsel.c		\
+	gtkfontchooser.c        \
+	gtkfontchooserdialog.c  \
 	gtkframe.c		\
 	gtkgradient.c		\
 	gtkgrid.c		\
@@ -837,7 +846,8 @@ gtk_extra_sources =				\
 	gtkstatusicon-quartz.c			\
 	gtk.symbols				\
 	gtkversion.h.in				\
-	gtkmarshalers.list
+	gtkmarshalers.list			\
+	fallback-c89.c
 
 #
 # setup GTK+ sources and their dependencies
@@ -855,7 +865,7 @@ EXTRA_DIST += $(STOCK_ICONS)
 gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc xgen-gtfsrc.c xgen-gtf
 CLEANFILES = $(gen_sources)
 
-BUILT_SOURCES = $(gtk_built_sources)
+BUILT_SOURCES = $(gtk_built_sources) stamp-icons
 
 # all autogenerated files need to be generated in the srcdir,
 # so old versions get remade and are not confused with newer
@@ -891,7 +901,7 @@ gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.c.template
 
 gtktypefuncs.c: @REBUILD@ stamp-gtktypebuiltins.h $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
 	$(AM_V_GEN) echo '#include <gtk/gtkx.h>' > xgen-gtfsrc.c && \
-	  ${CPP} $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
+	  ${CPP} $(DEFS) $(AM_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
 	  $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
 	  sort | uniq | \
 	  $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; }' > xgen-gtf \
@@ -1005,17 +1015,24 @@ introspection_files = \
     gtktypebuiltins.h \
     gtktypebuiltins.c
 
+if USE_X11
+introspection_files += \
+    gtksocket.c \
+    gtkplug.c
+endif
+
 Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.la $(top_builddir)/gdk/Gdk-3.0.gir Makefile
 Gtk_3_0_gir_SCANNERFLAGS = 			\
 	--add-include-path=$(top_builddir)/gdk	\
 	--include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
+Gtk_3_0_gir_INCLUDES = Atk-1.0
 if USE_X11
 Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
+Gtk_3_0_gir_INCLUDES += xlib-2.0
 endif
 Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h"
-Gtk_3_0_gir_INCLUDES = Atk-1.0
 Gtk_3_0_gir_CFLAGS = \
-		$(INCLUDES) \
+		$(AM_CPPFLAGS) \
 		-UGDK_DISABLE_DEPRECATED \
 		-UGTK_DISABLE_DEPRECATED \
 		-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API

gtk/a11y/Makefile.am

@@ -0,0 +1,161 @@
+include $(top_srcdir)/Makefile.decl
+
+noinst_LTLIBRARIES = libgail.la
+
+gail_c_sources =			\
+	gail.c				\
+	gtkarrowaccessible.c		\
+	gtkbooleancellaccessible.c	\
+	gtkboxaccessible.c		\
+	gtkbuttonaccessible.c		\
+	gtkcellaccessible.c		\
+	gtkcellaccessibleparent.c	\
+	gtkcheckmenuitemaccessible.c	\
+	gtkcomboboxaccessible.c		\
+	gtkcontaineraccessible.c	\
+	gtkcontainercellaccessible.c	\
+	gtkentryaccessible.c		\
+	gtkexpanderaccessible.c		\
+	gtkframeaccessible.c		\
+	gtkimageaccessible.c		\
+	gtkimagecellaccessible.c	\
+	gtklabelaccessible.c		\
+	gtklinkbuttonaccessible.c	\
+	gtkmenuaccessible.c		\
+	gtkmenushellaccessible.c	\
+	gtkmenuitemaccessible.c		\
+	gtknotebookaccessible.c		\
+	gtknotebookpageaccessible.c	\
+	gtkpanedaccessible.c		\
+	gtkprogressbaraccessible.c	\
+	gtkradiobuttonaccessible.c	\
+	gtkradiomenuitemaccessible.c	\
+	gtkrangeaccessible.c		\
+	gtkrenderercellaccessible.c	\
+	gtkscaleaccessible.c		\
+	gtkscalebuttonaccessible.c	\
+	gtkscrollbaraccessible.c	\
+	gtkscrolledwindowaccessible.c	\
+	gtkspinbuttonaccessible.c	\
+	gtkspinneraccessible.c		\
+	gtkstatusbaraccessible.c	\
+	gtkswitchaccessible.c		\
+	gtktextcellaccessible.c		\
+	gtktextviewaccessible.c		\
+	gtktogglebuttonaccessible.c	\
+	gtktoplevelaccessible.c		\
+	gtktreeviewaccessible.c		\
+	gtkwidgetaccessible.c		\
+	gtkwindowaccessible.c		\
+	gailutil.c			\
+	gailmisc.c
+
+gail_private_h_sources =		\
+	gtkarrowaccessible.h		\
+	gtkbooleancellaccessible.h	\
+	gtkboxaccessible.h		\
+	gtkbuttonaccessible.h		\
+	gtkcellaccessible.h		\
+	gtkcellaccessibleparent.h	\
+	gtkcheckmenuitemaccessible.h	\
+	gtkcomboboxaccessible.h		\
+	gtkcontaineraccessible.h	\
+	gtkcontainercellaccessible.h	\
+	gtkentryaccessible.h		\
+	gtkexpanderaccessible.h		\
+	gtkframeaccessible.h		\
+	gtkimageaccessible.h		\
+	gtkimagecellaccessible.h	\
+	gtklabelaccessible.h		\
+	gtklinkbuttonaccessible.h	\
+	gtkmenuaccessible.h		\
+	gtkmenushellaccessible.h	\
+	gtkmenuitemaccessible.h		\
+	gtknotebookaccessible.h		\
+	gtknotebookpageaccessible.h	\
+	gtkpanedaccessible.h		\
+	gtkprogressbaraccessible.h	\
+	gtkradiobuttonaccessible.h	\
+	gtkradiomenuitemaccessible.h	\
+	gtkrangeaccessible.h		\
+	gtkrenderercellaccessible.h	\
+	gtkscaleaccessible.h		\
+	gtkscalebuttonaccessible.h	\
+	gtkscrollbaraccessible.h	\
+	gtkscrolledwindowaccessible.h	\
+	gtkspinbuttonaccessible.h	\
+	gtkspinneraccessible.h		\
+	gtkstatusbaraccessible.h	\
+	gtkswitchaccessible.h		\
+	gtktextcellaccessible.h		\
+	gtktextviewaccessible.h		\
+	gtktogglebuttonaccessible.h	\
+	gtktoplevelaccessible.h		\
+	gtktreeviewaccessible.h		\
+	gtkwidgetaccessible.h		\
+	gtkwindowaccessible.h		\
+	gailutil.h			\
+	gailmisc.h
+
+libgail_la_SOURCES = 			\
+	$(gail_c_sources)		\
+	$(gail_private_h_sources)
+
+libgail_la_CPPFLAGS = \
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/gdk		\
+	-I$(top_builddir)/gdk		\
+	-I$(top_srcdir)/gtk		\
+	-I$(top_builddir)/gtk		\
+	-DGTK_VERSION=\"$(GTK_VERSION)\"\
+	-DGTK_COMPILATION		\
+	-DGDK_DISABLE_DEPRECATED	\
+	-DGTK_DISABLE_DEPRECATED	\
+	$(AM_CPPFLAGS)
+
+libgail_la_CFLAGS = \
+	$(GTK_DEP_CFLAGS)	\
+	$(GTK_DEBUG_FLAGS)	\
+	$(AM_CFLAGS)
+
+libgail_la_LIBADD =  \
+	$(GTK_DEP_LIBS)		\
+	$(INTLLIBS)
+
+libgail_la_LDFLAGS =    \
+        $(LDFLAGS)
+		
+dist-hook: ../../build/win32/vs9/libgail.vcproj ../../build/win32/vs10/libgail.vcxproj ../../build/win32/vs10/libgail.vcxproj.filters
+
+../../build/win32/vs9/libgail.vcproj: ../../build/win32/vs9/libgail.vcprojin
+	for F in $(libgail_la_SOURCES); do \
+		case $$F in \
+		*.c) echo '   <File RelativePath="..\..\..\gtk\a11y\'$$F'" />' \
+		     ;; \
+		esac; \
+	done >libgail.sourcefiles
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/libgail.vcprojin >$@
+	rm libgail.sourcefiles
+	
+../../build/win32/vs10/libgail.vcxproj: ../../build/win32/vs10/libgail.vcxprojin
+	for F in $(libgail_la_SOURCES); do \
+		case $$F in \
+		*.c) echo '   <ClCompile Include="..\..\..\gtk\a11y\'$$F'" />' \
+		     ;; \
+		esac; \
+	done >libgail.vs10.sourcefiles
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/libgail.vcxprojin >$@
+	rm libgail.vs10.sourcefiles
+
+../../build/win32/vs10/libgail.vcxproj.filters: ../../build/win32/vs10/libgail.vcxproj.filtersin
+	for F in $(libgail_la_SOURCES); do \
+		case $$F in \
+		*.c) echo '   <ClCompile Include="..\..\..\gtk\a11y\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
+		     ;; \
+		esac; \
+	done >libgail.vs10.sourcefiles.filters
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/libgail.vcxproj.filtersin >$@
+	rm libgail.vs10.sourcefiles.filters
+
+
+-include $(top_srcdir)/git.mk

gtk/a11y/gail.c

@@ -23,11 +23,9 @@
 #include <stdlib.h>
 
 #include <gtk/gtkx.h>
-#include "gail.h"
-#include "gailfactory.h"
+#include "gailutil.h"
+#include "gailmisc.h"
 
-#define GNOME_ACCESSIBILITY_ENV "GNOME_ACCESSIBILITY"
-#define NO_GAIL_ENV "NO_GAIL"
 
 static gboolean gail_focus_watcher      (GSignalInvocationHint *ihint,
                                          guint                  n_param_values,
@@ -45,8 +43,6 @@ static gboolean gail_switch_page_watcher(GSignalInvocationHint *ihint,
                                          guint                  n_param_values,
                                          const GValue          *param_values,
                                          gpointer               data);
-static AtkObject* gail_get_accessible_for_widget (GtkWidget    *widget,
-                                                  gboolean     *transient);
 static void     gail_finish_select       (GtkWidget            *widget);
 static void     gail_map_cb              (GtkWidget            *widget);
 static void     gail_map_submenu_cb      (GtkWidget            *widget);
@@ -62,7 +58,7 @@ static void     gail_set_focus_widget (GtkWidget *focus_widget,
 static void     gail_set_focus_object (AtkObject *focus_obj,
                                        AtkObject *obj);
 
-GtkWidget* focus_widget = NULL;
+GtkWidget* _focus_widget = NULL;
 static GtkWidget* next_focus_widget = NULL;
 static gboolean was_deselect = FALSE;
 static GtkWidget* subsequent_focus_widget = NULL;
@@ -71,53 +67,11 @@ static guint focus_notify_handler = 0;
 static guint focus_tracker_id = 0;
 static GQuark quark_focus_object = 0;
 
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_WIDGET, GailWidget, gail_widget, GTK_TYPE_WIDGET)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_CONTAINER, GailContainer, gail_container, GTK_TYPE_CONTAINER)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_BUTTON, GailButton, gail_button, GTK_TYPE_BUTTON)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_LINK_BUTTON, GailLinkButton, gail_link_button, GTK_TYPE_LINK_BUTTON)
-GAIL_IMPLEMENT_FACTORY_WITH_FUNC (GAIL_TYPE_MENU_ITEM, GailMenuItem, gail_menu_item, gail_menu_item_new)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_TOGGLE_BUTTON, GailToggleButton, gail_toggle_button, GTK_TYPE_TOGGLE_BUTTON)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_IMAGE, GailImage, gail_image, GTK_TYPE_IMAGE)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_TEXT_VIEW, GailTextView, gail_text_view, GTK_TYPE_TEXT_VIEW)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_COMBO_BOX, GailComboBox, gail_combo_box, GTK_TYPE_COMBO_BOX)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_ENTRY, GailEntry, gail_entry, GTK_TYPE_ENTRY)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_MENU_SHELL, GailMenuShell, gail_menu_shell, GTK_TYPE_MENU_SHELL)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_MENU, GailMenu, gail_menu, GTK_TYPE_MENU)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_WINDOW, GailWindow, gail_window, GTK_TYPE_BIN)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_RANGE, GailRange, gail_range, GTK_TYPE_RANGE)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_SCALE, GailScale, gail_scale, GTK_TYPE_SCALE)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_SCALE_BUTTON, GailScaleButton, gail_scale_button, GTK_TYPE_SCALE_BUTTON)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_LABEL, GailLabel, gail_label, GTK_TYPE_LABEL)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_STATUSBAR, GailStatusbar, gail_statusbar, GTK_TYPE_STATUSBAR)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_NOTEBOOK, GailNotebook, gail_notebook, GTK_TYPE_NOTEBOOK)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_CALENDAR, GailCalendar, gail_calendar, GTK_TYPE_CALENDAR)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_PROGRESS_BAR, GailProgressBar, gail_progress_bar, GTK_TYPE_PROGRESS_BAR)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_SPIN_BUTTON, GailSpinButton, gail_spin_button, GTK_TYPE_SPIN_BUTTON)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_TREE_VIEW, GailTreeView, gail_tree_view, GTK_TYPE_TREE_VIEW)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_FRAME, GailFrame, gail_frame, GTK_TYPE_FRAME)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_RADIO_BUTTON, GailRadioButton, gail_radio_button, GTK_TYPE_RADIO_BUTTON)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_ARROW, GailArrow, gail_arrow, GTK_TYPE_ARROW)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_SEPARATOR, GailSeparator, gail_separator, GTK_TYPE_SEPARATOR)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_BOX, GailBox, gail_box, GTK_TYPE_BOX)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_SCROLLED_WINDOW, GailScrolledWindow, gail_scrolled_window, GTK_TYPE_SCROLLED_WINDOW)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_PANED, GailPaned, gail_paned, GTK_TYPE_PANED)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_SCROLLBAR, GailScrollbar, gail_scrollbar, GTK_TYPE_SCROLLBAR)
-GAIL_IMPLEMENT_FACTORY_WITH_FUNC (GAIL_TYPE_CHECK_MENU_ITEM, GailCheckMenuItem, gail_check_menu_item, gail_check_menu_item_new)
-GAIL_IMPLEMENT_FACTORY_WITH_FUNC (GAIL_TYPE_RADIO_MENU_ITEM, GailRadioMenuItem, gail_radio_menu_item, gail_radio_menu_item_new)
-GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_EXPANDER, GailExpander, gail_expander, GTK_TYPE_EXPANDER)
-GAIL_IMPLEMENT_FACTORY_WITH_FUNC_DUMMY (GAIL_TYPE_RENDERER_CELL, GailRendererCell, gail_renderer_cell, GTK_TYPE_CELL_RENDERER, gail_renderer_cell_new)
-GAIL_IMPLEMENT_FACTORY_WITH_FUNC_DUMMY (GAIL_TYPE_BOOLEAN_CELL, GailBooleanCell, gail_boolean_cell, GTK_TYPE_CELL_RENDERER_TOGGLE, gail_boolean_cell_new)
-GAIL_IMPLEMENT_FACTORY_WITH_FUNC_DUMMY (GAIL_TYPE_IMAGE_CELL, GailImageCell, gail_image_cell, GTK_TYPE_CELL_RENDERER_PIXBUF, gail_image_cell_new)
-GAIL_IMPLEMENT_FACTORY_WITH_FUNC_DUMMY (GAIL_TYPE_TEXT_CELL, GailTextCell, gail_text_cell, GTK_TYPE_CELL_RENDERER_TEXT, gail_text_cell_new)
-
 static AtkObject*
 gail_get_accessible_for_widget (GtkWidget *widget,
                                 gboolean  *transient)
 {
   AtkObject *obj = NULL;
-  GType gnome_canvas;
-
-  gnome_canvas = g_type_from_name ("GnomeCanvas");
 
   *transient = FALSE;
   if (!widget)
@@ -139,25 +93,6 @@ gail_get_accessible_for_widget (GtkWidget *widget,
           g_object_unref (obj);
         }
     }
-  else if (G_TYPE_CHECK_INSTANCE_TYPE ((widget), gnome_canvas))
-    {
-      GObject *focused_item;
-      GValue value = {0, };
-
-      g_value_init (&value, G_TYPE_OBJECT);
-      g_object_get_property (G_OBJECT (widget), "focused_item", &value);
-      focused_item = g_value_get_object (&value);
-
-      if (focused_item)
-        {
-          AtkObject *tmp;
-
-          obj = atk_gobject_accessible_for_object (G_OBJECT (focused_item));
-          tmp = g_object_get_qdata (G_OBJECT (obj), quark_focus_object);
-          if (tmp != NULL)
-            obj = tmp;
-        }
-    }
   else if (GTK_IS_TOGGLE_BUTTON (widget))
     {
       GtkWidget *other_widget = gtk_widget_get_parent (widget);
@@ -293,7 +228,7 @@ gail_focus_watcher (GSignalInvocationHint *ihint,
     {
       if (event->type == GDK_MOTION_NOTIFY && gtk_widget_has_focus (widget))
         {
-          if (widget == focus_widget)
+          if (widget == _focus_widget)
             {
               return TRUE;
             }
@@ -403,12 +338,12 @@ gail_finish_select (GtkWidget *widget)
    * If previously focused widget is not a GtkMenuItem or a GtkMenu,
    * keep track of it so we can return to it after menubar is deactivated
    */
-  if (focus_widget && 
-      !GTK_IS_MENU_ITEM (focus_widget) && 
-      !GTK_IS_MENU (focus_widget))
+  if (_focus_widget && 
+      !GTK_IS_MENU_ITEM (_focus_widget) && 
+      !GTK_IS_MENU (_focus_widget))
     {
       void *vp_focus_before_menu = &focus_before_menu;
-      focus_before_menu = focus_widget;
+      focus_before_menu = _focus_widget;
       g_object_add_weak_pointer (G_OBJECT (focus_before_menu), vp_focus_before_menu);
 
     } 
@@ -540,35 +475,35 @@ gail_focus_notify (GtkWidget *widget)
   AtkObject *atk_obj;
   gboolean transient;
 
-  if (widget != focus_widget)
+  if (widget != _focus_widget)
     {
-      if (focus_widget)
+      if (_focus_widget)
         {
-          void *vp_focus_widget = &focus_widget;
-          g_object_remove_weak_pointer (G_OBJECT (focus_widget), vp_focus_widget);
+          void *vp_focus_widget = &_focus_widget;
+          g_object_remove_weak_pointer (G_OBJECT (_focus_widget), vp_focus_widget);
         }
-      focus_widget = widget;
-      if (focus_widget)
+      _focus_widget = widget;
+      if (_focus_widget)
         {
-          void *vp_focus_widget = &focus_widget;
-          g_object_add_weak_pointer (G_OBJECT (focus_widget), vp_focus_widget);
+          void *vp_focus_widget = &_focus_widget;
+          g_object_add_weak_pointer (G_OBJECT (_focus_widget), vp_focus_widget);
           /*
            * The UI may not have been updated yet; e.g. in gtkhtml2
            * html_view_layout() is called in a idle handler
            */
-          if (focus_widget == focus_before_menu)
+          if (_focus_widget == focus_before_menu)
             {
               void *vp_focus_before_menu = &focus_before_menu;
               g_object_remove_weak_pointer (G_OBJECT (focus_before_menu), vp_focus_before_menu);
               focus_before_menu = NULL;
             }
         }
-      gail_focus_notify_when_idle (focus_widget);
+      gail_focus_notify_when_idle (_focus_widget);
     }
   else
     {
-      if (focus_widget)
-        atk_obj  = gail_get_accessible_for_widget (focus_widget, &transient);
+      if (_focus_widget)
+        atk_obj  = gail_get_accessible_for_widget (_focus_widget, &transient);
       else
         atk_obj = NULL;
       /*
@@ -849,140 +784,21 @@ gail_set_focus_object (AtkObject *focus_obj,
     }
 }
 
-/*
- *   These exported symbols are hooked by gnome-program
- * to provide automatic module initialization and shutdown.
- */
-extern void gnome_accessibility_module_init     (void);
-extern void gnome_accessibility_module_shutdown (void);
-
-static int gail_initialized = FALSE;
-
-static void
-gail_accessibility_module_init (void)
+void
+_gtk_accessibility_init (void)
 {
-  const char *env_a_t_support;
-  gboolean a_t_support = FALSE;
+  static int initialized = FALSE;
 
-  if (gail_initialized)
-    {
-      return;
-    }
-  gail_initialized = TRUE;
+  if (initialized)
+    return;
+
+  initialized = TRUE;
   quark_focus_object = g_quark_from_static_string ("gail-focus-object");
-  
-  env_a_t_support = g_getenv (GNOME_ACCESSIBILITY_ENV);
-
-  if (env_a_t_support)
-    a_t_support = atoi (env_a_t_support);
-  if (a_t_support)
-    fprintf (stderr, "GTK Accessibility Module initialized\n");
-
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_WIDGET, gail_widget);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_CONTAINER, gail_container);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_BUTTON, gail_button);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_LINK_BUTTON, gail_link_button);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_MENU_ITEM, gail_menu_item);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_TOGGLE_BUTTON, gail_toggle_button);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_IMAGE, gail_image);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_TEXT_VIEW, gail_text_view);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_COMBO_BOX, gail_combo_box);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_ENTRY, gail_entry);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_MENU_BAR, gail_menu_shell);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_MENU, gail_menu);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_WINDOW, gail_window);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_RANGE, gail_range);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_SCALE, gail_scale);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_SCALE_BUTTON, gail_scale_button);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_LABEL, gail_label);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_STATUSBAR, gail_statusbar);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_NOTEBOOK, gail_notebook);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_CALENDAR, gail_calendar);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_PROGRESS_BAR, gail_progress_bar);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_SPIN_BUTTON, gail_spin_button);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_TREE_VIEW, gail_tree_view);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_FRAME, gail_frame);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_CELL_RENDERER_TEXT, gail_text_cell);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_CELL_RENDERER_TOGGLE, gail_boolean_cell);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_CELL_RENDERER_PIXBUF, gail_image_cell);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_CELL_RENDERER, gail_renderer_cell);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_RADIO_BUTTON, gail_radio_button);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_ARROW, gail_arrow);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_SEPARATOR, gail_separator);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_BOX, gail_box);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_SCROLLED_WINDOW, gail_scrolled_window);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_PANED, gail_paned);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_SCROLLBAR, gail_scrollbar);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_CHECK_MENU_ITEM, gail_check_menu_item);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_RADIO_MENU_ITEM, gail_radio_menu_item);
-  GAIL_WIDGET_SET_FACTORY (GTK_TYPE_EXPANDER, gail_expander);
 
   atk_focus_tracker_init (gail_focus_tracker_init);
   focus_tracker_id = atk_add_focus_tracker (gail_focus_tracker);
 
-  /* Initialize the GailUtility class */
-  g_type_class_unref (g_type_class_ref (GAIL_TYPE_UTIL));
-  g_type_class_unref (g_type_class_ref (GAIL_TYPE_MISC));
+  _gail_util_install ();
+
+  atk_misc_instance = g_object_new (GAIL_TYPE_MISC, NULL);
 }
-
-/**
- * gnome_accessibility_module_init:
- * @void: 
- * 
- *   This method is invoked by name from libgnome's
- * gnome-program.c to activate accessibility support.
- **/
-void
-gnome_accessibility_module_init (void)
-{
-  gail_accessibility_module_init ();
-}
-
-/**
- * gnome_accessibility_module_shutdown:
- * @void: 
- * 
- *   This method is invoked by name from libgnome's
- * gnome-program.c to de-activate accessibility support.
- **/
-void
-gnome_accessibility_module_shutdown (void)
-{
-  if (!gail_initialized)
-    {
-      return;
-    }
-  gail_initialized = FALSE;
-  atk_remove_focus_tracker (focus_tracker_id);
-
-  fprintf (stderr, "GTK Accessibility Module shutdown\n");
-
-  /* FIXME: de-register the factory types so we can unload ? */
-}
-
-int
-gtk_module_init (gint *argc, char** argv[])
-{
-  const char* env_no_gail;
-  gboolean no_gail = FALSE;
-
-  env_no_gail = g_getenv (NO_GAIL_ENV);
-  if (env_no_gail)
-      no_gail = atoi (env_no_gail);
-
-  if (no_gail)
-      return 0;
-
-  gail_accessibility_module_init ();
-
-  return 0;
-}
-
-const char *
-g_module_check_init (GModule *module)
-{
-  g_module_make_resident (module);
-
-  return NULL;
-}
- 

gtk/a11y/gailmisc.c

@@ -1,5 +1,5 @@
 /* GAIL - The GNOME Accessibility Implementation Library
- * Copyright 2001 Sun Microsystems Inc.
+ * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,33 +20,33 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
-#include "gailcalendar.h"
+#include "gailmisc.h"
 
-static void         gail_calendar_class_init          (GailCalendarClass *klass);
-static void         gail_calendar_init                (GailCalendar      *calendar);
-static void         gail_calendar_initialize          (AtkObject         *accessible,
-                                                       gpointer           data);
 
-G_DEFINE_TYPE (GailCalendar, gail_calendar, GAIL_TYPE_WIDGET)
+G_DEFINE_TYPE (GailMisc, _gail_misc, ATK_TYPE_MISC)
 
 static void
-gail_calendar_class_init (GailCalendarClass *klass)
+gail_misc_threads_enter (AtkMisc *misc)
 {
-  AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
-
-  atk_object_class->initialize = gail_calendar_initialize;
+  GDK_THREADS_ENTER ();
 }
 
 static void
-gail_calendar_init (GailCalendar *calendar)
+gail_misc_threads_leave (AtkMisc *misc)
 {
+  GDK_THREADS_LEAVE ();
 }
 
 static void
-gail_calendar_initialize (AtkObject *accessible,
-                          gpointer  data)
+_gail_misc_class_init (GailMiscClass *klass)
 {
-  ATK_OBJECT_CLASS (gail_calendar_parent_class)->initialize (accessible, data);
+  AtkMiscClass *misc_class = ATK_MISC_CLASS (klass);
 
-  accessible->role = ATK_ROLE_CALENDAR;
+  misc_class->threads_enter = gail_misc_threads_enter;
+  misc_class->threads_leave = gail_misc_threads_leave;
+}
+
+static void
+_gail_misc_init (GailMisc *misc)
+{
 }