Adwaita: Include sources in dist

These things are necessary to work on the Adwaita theme,
so include them in the tarball.

Makefile.am

@@ -1,7 +1,7 @@
 ## Makefile.am for GTK+
 include $(top_srcdir)/Makefile.decl
 
-SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples
+SRC_SUBDIRS = util gdk gtk libgail-util modules demos tests testsuite examples
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}

NEWS

@@ -1,3 +1,111 @@
+Overview of Changes in GTK+ 3.13.1 to 3.13.2
+============================================
+
+* Interactive debugging support. The GtkInspector
+  window can be triggered with the Ctrl-Shift-I
+  or Ctrl-Shift-D keyboard shortcuts, or via the
+  GTK_DEBUG environment variable.
+
+* Gesture support has landed. New classes include
+  GtkGestureLongPress, GtkGestureMultiPress, GtkGestureSwipe,
+  GtkGesturePan, GtkGestureRotate, GtkGestureZoom. Many GTK+
+  widgets already use gestures internally. Gestures also
+  show up in GtkInspector.
+  The gesture-related APIs are still subject to change.
+
+* GTK+ widgets can now draw outside their allocation,
+  by setting a clip with gtk_widget_set_clip().
+  The clip-related APIs are still subject to change.
+
+* GtkStack has added a few more transition types
+
+* GtkProgressBar is now narrower
+
+* CSS
+ - Support outline-radius in CSS
+ - Implement 'unset' and 'all'
+ - Support -gtk-icontheme
+ - Support -gtk-icon-source
+ - Add -gtk-icon-transform, supporting the 2D
+   parts of CSS transforms
+ - Support -gtk-icon-style
+
+* Theme
+ - Use outlines to render focus rings
+ - Use icons to render spinners, expanders and arrows
+ - GtkIconTheme can force symbolic or regular
+   icon variants
+ - GtkIconTheme will automatically load rtl
+   icon variants
+
+* Win32:
+ - Theme improvements
+
+* Wayland:
+ - Update to the latest xdg-shell protocol
+
+* Deprecations:
+ GdkColor
+ GtkMisc
+ GtkArrow
+ focus-line-width style property
+ GtkNumerableIcon
+ GtkButton::x/yalign
+ gtk_widget_reparent
+ gtk_widget_region_intersect
+ gtk_container_set_reallocate_redraws
+
+* Bugs fixed:
+ 525206 Remove superfluous non-NULL tests for the GtkScrolledWindow scrollbars
+ 614717 gtk_text_buffer_create_tag fails to return error on duplicate tag
+ 636695 GdkColor should be deprecated
+ 645966 gtk-demo leaks a GtkSizeGroup
+ 698396 GtkTreeStore crashes when reordering 0 elements
+ 708037 Allow live updates on widgets implementing GtkColorChooser
+ 720330 Gtk-CRITICAL **: gtk_entry_completion_set_model: assertion 'GTK_IS_E...
+ 721069 gtk_win32_embed_widget_show infinite recursion
+ 726676 More GtkStack transition counterparts of OVER_UP_DOWN
+ 727147 Search bar is too narrow
+ 727994 Gtk Popover closes on click
+ 728135 gtk_widget_set_visible's nothing-changed-check
+ 728284 [treeview] Graphics artifact when scrolling with hover-selection
+ 729346 W32: App-notification has no theme, shows up transparent
+ 729353 W32: horizontal-buttons get "selected" background when focused
+ 729451 Removing accels with application_set_accels_for_action
+ 729461 Introspection issue with GtkApplication
+ 729473 FileChooser: typos in gtk_file_chooser_set_local_only ()
+ 729475 FileChooser: typo in gtk_set_create_folders()
+ 729496 Crash with latest gtk+ from master in gtk_combo_box_get_preferred_width
+ 729564 Deprecate GtkArrow
+ 729594 Don't stretch switches in Widget Factory
+ 729598 Populate page 2 of the Widget Factory
+ 729607 GtkAboutDialog: gtk aborts when trying to show an about dialog
+ 729670 cairo surface leaked for each cursor created from pixmap
+ 729817 GtkCellLayout: allow finding attributes at runtime
+ 729834 gdk: missing (nullable) annotations on return values
+ 729915 Popopver does not follow relative widget to find action groups
+ 729983 gdk: assorted introspection and documentation syntax fixes
+ 730007 GtkInspector: add a setting to disable C-S-i
+ 730008 make gtk_set_interactive_debugging available for apps
+ 730035 GtkFileFilter contains refs to GtkRecentFilter which are probably typos
+ 730043 Add an alternative to Ctrl-Shift-I
+ 730095 Add a private call API to export internals to modules
+ 730142 placessidebar: use proper canonicalization when checking if home
+ 730183 RFC: silence harmless critical
+ 730306 Gtk+ >= 3.0 fails to load modules from settings.ini files
+ 730526 Fix the edit-clear icons in RTL 
+ 730353 Horizontal and vertical scrolling
+ 700030 GdkEventSequence not accessible from introspected bindings
+ 641836 Capture/bubble event handling
+ 119906 Add event when Double Click timeout expires
+
+* Translation updates:
+ Belarusian
+ Hebrew
+ Russian
+ Spanish 
+  
+
 Overview of Changes in GTK+ 3.12.0 to 3.13.1
 ============================================
 

build/gen-file-list-gtk.py

@@ -14,7 +14,7 @@ def gen_gdk_filelist(srcroot, subdir, dest):
     vars = read_vars_from_AM(os.path.join(srcroot, subdir, 'Makefile.am'),
                              vars = {},
                              conds = {},
-                             filters = ['gdk_public_h_sources', 'gdk_c_sources'])
+                             filters = ['gdk_h_sources', 'gdk_c_sources'])
 
     vars['gdk_enums'] = 'gdkenumtypes.c gdkenumtypes.h'
 
@@ -49,6 +49,7 @@ def gen_gtk_filelist(srcroot, subdir, dest):
                                       'USE_X11': False,
                                       'USE_EXTERNAL_ICON_CACHE': False},
                              filters = ['gtkinclude_HEADERS',
+                                        'a11yinclude_HEADERS',
                                         'deprecatedinclude_HEADERS',
                                         'gtk_base_c_sources',
                                         'gtk_clipboard_dnd_c_sources'])
@@ -56,6 +57,7 @@ def gen_gtk_filelist(srcroot, subdir, dest):
     vars['gtk_other_src'] = 'gtkprintoperation-win32.c gtktypebuiltins.h gtktypebuiltins.c'
 
     files = vars['gtkinclude_HEADERS'].split() + \
+            vars['a11yinclude_HEADERS'].split() + \
             vars['deprecatedinclude_HEADERS'].split() + \
             vars['gtk_base_c_sources'].split() + \
 			vars['gtk_clipboard_dnd_c_sources'].split() + \

build/win32/vs10/Makefile.am

@@ -18,12 +18,10 @@ EXTRA_DIST +=	\
 	gtk3-demo.vcxproj.filters	\
 	gtk3-demo-application.vcxproj	\
 	gtk3-demo-application.vcxproj.filters	\
-	gtka11y.vcxproj	\
-	gtka11y.vcxproj.filters	\
-	gtka11y.vcxprojin	\
-	gtka11y.vcxproj.filtersin	\
 	gtk-inspector.vcxproj	\
+	gtk-inspector.vcxprojin	\
 	gtk-inspector.vcxproj.filters	\
+	gtk-inspector.vcxproj.filtersin	\
 	gailutil.vcxproj	\
 	gailutil.vcxproj.filters	\
 	install.vcxproj	\

build/win32/vs10/gtk+.sln

@@ -10,8 +10,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broadwayd", "broadwayd.vcxp
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.vcxproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-inspector", "gtk-inspector.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
@@ -108,22 +106,6 @@ Global
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.Build.0 = Release_Broadway|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
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|Win32.Build.0 = Debug|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|x64.Build.0 = Debug|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|Win32.Build.0 = Release|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|x64.ActiveCfg = Release|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|x64.Build.0 = Release|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.Build.0 = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.ActiveCfg = Debug|x64

build/win32/vs10/gtk-inspector.vcxproj

@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}</ProjectGuid>
-    <RootNamespace>gtkinspector</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\gtk\inspector\actions.c" />
-    <ClCompile Include="..\..\..\gtk\inspector\button-path.c" />
-    <ClCompile Include="..\..\..\gtk\inspector\classes-list.c" />
-    <ClCompile Include="..\..\..\gtk\inspector\css-editor.c" />
-    <ClCompile Include="..\..\..\gtk\inspector\data-list.c" />
-    <ClCompile Include="..\..\..\gtk\inspector\general.c" />
-    <ClCompile Include="..\..\..\gtk\inspector\init.c" />
-    <ClCompile Include="..\..\..\gtk\inspector\inspect-button.c" />
-    <ClCompile Include="..\..\..\gtk\inspector\object-hierarchy.c" />
-    <ClCompile Include="..\..\..\gtk\inspector\prop-list.c" />
-    <ClCompile Include="..\..\..\gtk\inspector\property-cell-renderer.c" />
-    <ClCompile Include="..\..\..\gtk\inspector\python-hooks.c" />
-    <ClCompile Include="..\..\..\gtk\inspector\python-shell.c" />
-    <ClCompile Include="..\..\..\gtk\inspector\resource-list.c" />
-    <ClCompile Include="..\..\..\gtk\inspector\resources.c" />
-    <ClCompile Include="..\..\..\gtk\inspector\signals-list.c" />
-    <ClCompile Include="..\..\..\gtk\inspector\visual.c" />
-    <ClCompile Include="..\..\..\gtk\inspector\widget-tree.c" />
-    <ClCompile Include="..\..\..\gtk\inspector\window.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gtk-prebuild.vcxproj">
-      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

build/win32/vs10/gtk-inspector.vcxproj.filters

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\gtk\inspector\actions.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\gtk\inspector\button-path.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\gtk\inspector\classes-list.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\gtk\inspector\css-editor.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\gtk\inspector\data-list.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\gtk\inspector\general.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\gtk\inspector\init.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\gtk\inspector\inspect-button.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\gtk\inspector\object-hierarchy.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\gtk\inspector\prop-list.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\gtk\inspector\property-cell-renderer.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\gtk\inspector\python-hooks.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\gtk\inspector\python-shell.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\gtk\inspector\resource-list.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\gtk\inspector\resources.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\gtk\inspector\signals-list.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\gtk\inspector\visual.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\gtk\inspector\widget-tree.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\gtk\inspector\window.c"><Filter>Source Files</Filter></ClCompile>
-  </ItemGroup>
-</Project>

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

@@ -1,20 +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">
+    <Filter Include="Header Files">
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
     <Filter Include="Resource Files">
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-#include "gtka11y.vs10.sourcefiles.filters"
+#include "libgtk-inspector.vs10.sourcefiles.filters"
   </ItemGroup>
 </Project>

build/win32/vs10/gtk-inspector.vcxprojin

@@ -19,8 +19,8 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}</ProjectGuid>
-    <RootNamespace>gtka11y</RootNamespace>
+    <ProjectGuid>{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}</ProjectGuid>
+    <RootNamespace>gtkinspector</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -69,8 +69,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -80,11 +80,22 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -94,24 +105,10 @@
       <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>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -120,7 +117,7 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-#include "gtka11y.vs10.sourcefiles"
+#include "libgtk-inspector.vs10.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gtk-prebuild.vcxproj">

build/win32/vs10/gtk-install.props

@@ -4,6 +4,10 @@
     <Import Project="gtk-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
+    <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
+    <InstalledDlls>$(BinDir)\$(GtkDllPrefix)gdk(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gtk(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gailutil(GtkDllSuffix).dll</InstalledDlls>
+    <InstalledBins>$(BinDir)\gtk3-demo.exe;$(BinDir)\gtk3-demo-application.exe</InstalledBins>
+    <InstalledBroadwayBins>$(BinDir)\broadwayd.exe</InstalledBroadwayBins>
     <GtkDoInstallBin>
 mkdir $(CopyDir)\bin
 
@@ -15,22 +19,22 @@ if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_BIN
 if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_BIN
 
 
-copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin
+copy $(BinDir)\*.dll $(CopyDir)\bin
 
-copy $(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib
+copy $(BinDir)\*-$(ApiVersion).lib $(CopyDir)\lib
 
-copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin
+copy $(BinDir)\*.exe $(CopyDir)\bin
 
 goto DONE_BIN
 
 
 :DO_BROADWAY_BIN
 
-copy $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll $(CopyDir)\bin
+copy $(BinDir)\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll $(CopyDir)\bin
 
-copy $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib
+copy $(BinDir)\gdk-$(ApiVersion).lib $(CopyDir)\lib
 
-copy $(Configuration)\$(Platform)\bin\broadwayd.exe $(CopyDir)\bin
+copy $(BinDir)\broadwayd.exe $(CopyDir)\bin
 
 
 if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin
@@ -64,6 +68,8 @@ mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk
 
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32
 
+mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated
+
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
@@ -154,6 +160,8 @@ copy ..\..\..\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
 
 copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
 
+copy ..\..\..\gdk\deprecated\gdkcolor.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated
+
 copy ..\..\..\gtk\a11y\gtkarrowaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
 
 copy ..\..\..\gtk\a11y\gtkbooleancellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
@@ -276,8 +284,6 @@ copy ..\..\..\gtk\gtkactionbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkadjustment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkalignment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkappchooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkappchooserbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -290,8 +296,6 @@ copy ..\..\..\gtk\gtkapplication.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkapplicationwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkarrow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkaspectframe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkassistant.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -390,6 +394,8 @@ copy ..\..\..\gtk\gtkenums.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkeventbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkeventcontroller.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkexpander.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkfilechooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -416,6 +422,24 @@ copy ..\..\..\gtk\gtkfontchooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gt
 
 copy ..\..\..\gtk\gtkframe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkgesture.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkgesturedrag.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkgesturelongpress.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkgesturemultipress.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkgesturepan.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkgesturerotate.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkgesturesingle.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkgestureswipe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkgesturezoom.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkgrid.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkheaderbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -470,16 +494,12 @@ copy ..\..\..\gtk\gtkmenutoolbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkmessagedialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkmisc.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkmodules.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkmountoperation.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtknotebook.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
-copy ..\..\..\gtk\gtknumerableicon.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkoffscreenwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkorientable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -654,6 +674,8 @@ copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkwindowgroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
 copy ..\..\..\gtk\gtktextlayout.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -666,6 +688,10 @@ copy ..\..\..\gtk\deprecated\gtkaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gt
 
 copy ..\..\..\gtk\deprecated\gtkactiongroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
 
+copy ..\..\..\gtk\deprecated\gtkalignment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtkarrow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
+
 copy ..\..\..\gtk\deprecated\gtkcolorsel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
 
 copy ..\..\..\gtk\deprecated\gtkcolorseldialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
@@ -694,6 +720,10 @@ copy ..\..\..\gtk\deprecated\gtkiconfactory.h $(CopyDir)\include\gtk-$(ApiVersio
 
 copy ..\..\..\gtk\deprecated\gtkimagemenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
 
+copy ..\..\..\gtk\deprecated\gtkmisc.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtknumerableicon.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
+
 copy ..\..\..\gtk\deprecated\gtkradioaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
 
 copy ..\..\..\gtk\deprecated\gtkrc.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
@@ -800,6 +830,18 @@ copy ..\..\..\gdk\broadway\gdkbroadwayvisual.h $(CopyDir)\include\gtk-$(ApiVersi
     <_PropertySheetDisplayName>gtkinstallsprops</_PropertySheetDisplayName>
   </PropertyGroup>
   <ItemGroup>
+    <BuildMacro Include="BinDir">
+      <Value>$(BinDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="InstalledDlls">
+      <Value>$(InstalledDlls)</Value>
+    </BuildMacro>
+    <BuildMacro Include="InstalledBins">
+      <Value>$(InstalledBins)</Value>
+    </BuildMacro>
+    <BuildMacro Include="InstalledBroadwayBins">
+      <Value>$(InstalledBroadwayBins)</Value>
+    </BuildMacro>
     <BuildMacro Include="GtkDoInstallBin">
       <Value>$(GtkDoInstallBin)</Value>
     </BuildMacro>

build/win32/vs10/gtk3-demo.vcxproj

@@ -189,6 +189,7 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\entry_completion.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\event_axes.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\expander.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\gestures.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\headerbar.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\hypertext.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\iconview.c" />

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

@@ -31,6 +31,7 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\entry_completion.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\event_axes.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\expander.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\gestures.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\headerbar.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\hypertext.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\iconview.c"><Filter>Source Files</Filter></ClCompile>

build/win32/vs10/install.vcxproj

@@ -139,45 +139,49 @@
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" />
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">
-    <PreBuildEvent>
-      <Command>$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">
-    <PreBuildEvent>
-      <Command>$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">
-    <PreBuildEvent>
-      <Command>$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">
-    <PreBuildEvent>
-      <Command>$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\config.h.win32">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk.vcxproj">
       <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>

build/win32/vs9/Makefile.am

@@ -11,9 +11,8 @@ EXTRA_DIST +=	\
 	gtk.vcprojin	\
 	gtk3-demo.vcproj	\
 	gtk3-demo-application.vcproj	\
-	gtka11y.vcproj	\
-	gtka11y.vcprojin	\
 	gtk-inspector.vcproj	\
+	gtk-inspector.vcprojin	\
 	gailutil.vcproj	\
 	install.vcproj	\
 	broadwayd.vcproj	\

build/win32/vs9/gtk+.sln

@@ -23,11 +23,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcproj", "{FC5AA
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.vcproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-inspector", "gtk-inspector.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}
@@ -36,7 +31,6 @@ 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}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}
 	EndProjectSection
 EndProject
@@ -176,22 +170,6 @@ Global
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release_Broadway|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
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|Win32.Build.0 = Debug|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|x64.Build.0 = Debug|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|Win32.Build.0 = Release|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|x64.ActiveCfg = Release|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|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

build/win32/vs9/gtk-inspector.vcproj

@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk-inspector"
-	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}"
-	RootNamespace="gtkinspector"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk-build-defines.vsprops"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk-build-defines.vsprops"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="$(GtkDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk-build-defines.vsprops"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk-build-defines.vsprops"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="$(GtkDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\gtk\inspector\actions.c" />
-			<File RelativePath="..\..\..\gtk\inspector\button-path.c" />
-			<File RelativePath="..\..\..\gtk\inspector\classes-list.c" />
-			<File RelativePath="..\..\..\gtk\inspector\css-editor.c" />
-			<File RelativePath="..\..\..\gtk\inspector\data-list.c" />
-			<File RelativePath="..\..\..\gtk\inspector\general.c" />
-			<File RelativePath="..\..\..\gtk\inspector\init.c" />
-			<File RelativePath="..\..\..\gtk\inspector\inspect-button.c" />
-			<File RelativePath="..\..\..\gtk\inspector\object-hierarchy.c" />
-			<File RelativePath="..\..\..\gtk\inspector\prop-list.c" />
-			<File RelativePath="..\..\..\gtk\inspector\property-cell-renderer.c" />
-			<File RelativePath="..\..\..\gtk\inspector\python-hooks.c" />
-			<File RelativePath="..\..\..\gtk\inspector\python-shell.c" />
-			<File RelativePath="..\..\..\gtk\inspector\resource-list.c" />
-			<File RelativePath="..\..\..\gtk\inspector\resources.c" />
-			<File RelativePath="..\..\..\gtk\inspector\signals-list.c" />
-			<File RelativePath="..\..\..\gtk\inspector\visual.c" />
-			<File RelativePath="..\..\..\gtk\inspector\widget-tree.c" />
-			<File RelativePath="..\..\..\gtk\inspector\window.c" />
-		</Filter>
-	</Files>
-</VisualStudioProject>

build/win32/vs9/gtk-inspector.vcprojin

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="big5"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="gtka11y"
-	ProjectGUID="{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
-	RootNamespace="gtka11y"
+	Name="gtk-inspector"
+	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}"
+	RootNamespace="gtkinspector"
 	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
+	TargetFrameworkVersion="0"
 	>
 	<Platforms>
 		<Platform
@@ -31,8 +31,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
-				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -41,28 +41,6 @@
 				DebugInformationFormat="4"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk-build-defines.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-build-defines.vsprops"
@@ -75,12 +53,31 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="$(GtkDefines)"
-				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -98,8 +95,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="$(GtkDefines)"
-				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -111,25 +108,23 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "gtka11y.sourcefiles"
-		</Filter>
-		<Filter
-			Name="Headers"
+			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+#include "libgtk-inspector.sourcefiles"
+		</Filter>
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>

build/win32/vs9/gtk-install.vsprops

@@ -45,6 +45,7 @@ echo off

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

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

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

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

 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y

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

@@ -61,7 +62,6 @@ copy ..\..\..\gdk\win32\gdkwin32window.h $(CopyDir)\include\gtk-$(ApiVersion)\gd
 copy ..\..\..\gdk\gdk.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

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

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

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

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

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

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

@@ -91,6 +91,7 @@ copy ..\..\..\gdk\gdkwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
&#x0
 copy ..\..\..\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

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

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

+copy ..\..\..\gdk\deprecated\gdkcolor.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated

 copy ..\..\..\gtk\a11y\gtkarrowaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y

 copy ..\..\..\gtk\a11y\gtkbooleancellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y

 copy ..\..\..\gtk\a11y\gtkbuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y

@@ -152,14 +153,12 @@ copy ..\..\..\gtk\gtkaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 copy ..\..\..\gtk\gtkactionable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkactionbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkadjustment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtkalignment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkappchooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkappchooserbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkappchooserdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkappchooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkapplication.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkapplicationwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtkarrow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkaspectframe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkassistant.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkbbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

@@ -209,6 +208,7 @@ copy ..\..\..\gtk\gtkentrybuffer.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D
 copy ..\..\..\gtk\gtkentrycompletion.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkenums.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkeventbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtkeventcontroller.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkexpander.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkfilechooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkfilechooserbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

@@ -222,6 +222,15 @@ copy ..\..\..\gtk\gtkfontchooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D
 copy ..\..\..\gtk\gtkfontchooserdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkfontchooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkframe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtkgesture.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtkgesturedrag.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtkgesturelongpress.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtkgesturemultipress.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtkgesturepan.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtkgesturerotate.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtkgesturesingle.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtkgestureswipe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtkgesturezoom.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkgrid.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkheaderbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkicontheme.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

@@ -249,11 +258,9 @@ copy ..\..\..\gtk\gtkmenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
&#
 copy ..\..\..\gtk\gtkmenushell.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkmenutoolbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkmessagedialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtkmisc.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkmodules.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkmountoperation.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtknotebook.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtknumerableicon.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkoffscreenwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkorientable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkoverlay.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

@@ -341,12 +348,15 @@ copy ..\..\..\gtk\gtkvolumebutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0
 copy ..\..\..\gtk\gtkwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtkwindowgroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtktextlayout.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkversion.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\deprecated\gtkactivatable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkactiongroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

+copy ..\..\..\gtk\deprecated\gtkalignment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

+copy ..\..\..\gtk\deprecated\gtkarrow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkcolorsel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkcolorseldialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkfontsel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

@@ -361,6 +371,8 @@ copy ..\..\..\gtk\deprecated\gtkhseparator.h $(CopyDir)\include\gtk-$(ApiVersion
 copy ..\..\..\gtk\deprecated\gtkhsv.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkiconfactory.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkimagemenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

+copy ..\..\..\gtk\deprecated\gtkmisc.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

+copy ..\..\..\gtk\deprecated\gtknumerableicon.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkradioaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkrc.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkrecentaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated


build/win32/vs9/gtk3-demo.vcproj

@@ -180,6 +180,7 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\entry_completion.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\event_axes.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\expander.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\gestures.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\headerbar.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\hypertext.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\iconview.c" />

configure.ac

@@ -10,7 +10,7 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [13])
-m4_define([gtk_micro_version], [1])
+m4_define([gtk_micro_version], [3])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -41,9 +41,9 @@ AC_CANONICAL_HOST
 m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.39.5])
+m4_define([glib_required_version], [2.41.0])
 m4_define([pango_required_version], [1.32.4])
-m4_define([atk_required_version], [2.7.5])
+m4_define([atk_required_version], [2.12.0])
 m4_define([cairo_required_version], [1.12.0])
 m4_define([gdk_pixbuf_required_version], [2.27.1])
 m4_define([introspection_required_version], [1.39.0])
@@ -1886,9 +1886,9 @@ gtk/Makefile
 gtk/makefile.msc
 gtk/gtkversion.h
 gtk/gtk-win32.rc
-gtk/a11y/Makefile
 gtk/inspector/Makefile
 gtk/native/Makefile
+util/Makefile
 libgail-util/Makefile
 modules/Makefile
 modules/input/Makefile

demos/gtk-demo/Makefile.am

@@ -24,6 +24,7 @@ demos =						\
 	entry_completion.c			\
 	event_axes.c				\
 	expander.c  				\
+	gestures.c				\
 	headerbar.c				\
 	hypertext.c				\
 	iconview.c				\

demos/gtk-demo/colorsel.c

@@ -42,7 +42,7 @@ response_cb (GtkDialog *dialog,
       gtk_widget_override_background_color (da, 0, &color);
     }
 
-  gtk_widget_hide (GTK_WIDGET (dialog));
+  gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
 static void

demos/gtk-demo/demo.gresource.xml

@@ -94,6 +94,7 @@
     <file>event_axes.c</file>
     <file>expander.c</file>
     <file>flowbox.c</file>
+    <file>gestures.c</file>
     <file>headerbar.c</file>
     <file>hypertext.c</file>
     <file>iconview.c</file>

demos/gtk-demo/gestures.c

@@ -0,0 +1,199 @@
+/* Gestures
+ *
+ * Perform gestures on touchscreens and other input devices. This
+ * demo reacts to long presses and swipes from all devices, plus
+ * multi-touch rotate and zoom gestures.
+ */
+
+#include <gtk/gtk.h>
+
+static GtkWidget *window = NULL;
+static GtkGesture *rotate = NULL;
+static GtkGesture *zoom = NULL;
+static gdouble swipe_x = 0;
+static gdouble swipe_y = 0;
+static gboolean long_pressed = FALSE;
+
+static void
+swipe_gesture_swept (GtkGestureSwipe *gesture,
+                     gdouble          velocity_x,
+                     gdouble          velocity_y,
+                     GtkWidget       *widget)
+{
+  swipe_x = velocity_x / 10;
+  swipe_y = velocity_y / 10;
+  gtk_widget_queue_draw (widget);
+}
+
+static void
+long_press_gesture_pressed (GtkGestureLongPress *gesture,
+                            gdouble              x,
+                            gdouble              y,
+                            GtkWidget           *widget)
+{
+  long_pressed = TRUE;
+  gtk_widget_queue_draw (widget);
+}
+
+static void
+long_press_gesture_end (GtkGesture       *gesture,
+                        GdkEventSequence *sequence,
+                        GtkWidget        *widget)
+{
+  long_pressed = FALSE;
+  gtk_widget_queue_draw (widget);
+}
+
+static void
+rotation_angle_changed (GtkGestureRotate *gesture,
+                        gdouble           angle,
+                        gdouble           delta,
+                        GtkWidget        *widget)
+{
+  gtk_widget_queue_draw (widget);
+}
+
+static void
+zoom_scale_changed (GtkGestureZoom *gesture,
+                    gdouble         scale,
+                    GtkWidget      *widget)
+{
+  gtk_widget_queue_draw (widget);
+}
+
+static gboolean
+drawing_area_draw (GtkWidget *widget,
+                   cairo_t   *cr)
+{
+  GtkAllocation allocation;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  if (swipe_x != 0 || swipe_y != 0)
+    {
+      cairo_save (cr);
+      cairo_set_line_width (cr, 6);
+      cairo_move_to (cr, allocation.width / 2,
+                     allocation.height / 2);
+      cairo_rel_line_to (cr, swipe_x, swipe_y);
+      cairo_set_source_rgba (cr, 1, 0, 0, 0.5);
+      cairo_stroke (cr);
+      cairo_restore (cr);
+    }
+
+  if (gtk_gesture_is_recognized (rotate) || gtk_gesture_is_recognized (zoom))
+    {
+      cairo_pattern_t *pat;
+      cairo_matrix_t matrix;
+      gdouble angle, scale;
+
+      cairo_matrix_init_translate (&matrix,
+                                   allocation.width / 2,
+                                   allocation.height / 2);
+
+      cairo_save (cr);
+
+      angle = gtk_gesture_rotate_get_angle_delta (GTK_GESTURE_ROTATE (rotate));
+      cairo_matrix_rotate (&matrix, angle);
+
+      scale = gtk_gesture_zoom_get_scale_delta (GTK_GESTURE_ZOOM (zoom));
+      cairo_matrix_scale (&matrix, scale, scale);
+
+      cairo_set_matrix (cr, &matrix);
+      cairo_rectangle (cr, -100, -100, 200, 200);
+
+      pat = cairo_pattern_create_linear (-100, 0, 200, 0);
+      cairo_pattern_add_color_stop_rgb (pat, 0, 0, 0, 1);
+      cairo_pattern_add_color_stop_rgb (pat, 1, 1, 0, 0);
+      cairo_set_source (cr, pat);
+      cairo_fill (cr);
+
+      cairo_restore (cr);
+
+      cairo_pattern_destroy (pat);
+    }
+
+  if (long_pressed)
+    {
+      cairo_save (cr);
+      cairo_arc (cr, allocation.width / 2,
+                 allocation.height / 2,
+                 50, 0, 2 * G_PI);
+
+      cairo_set_source_rgba (cr, 0, 1, 0, 0.5);
+      cairo_stroke (cr);
+
+      cairo_restore (cr);
+    }
+
+  return TRUE;
+}
+
+GtkWidget *
+do_gestures (GtkWidget *do_widget)
+{
+  GtkWidget *drawing_area;
+  GtkGesture *gesture;
+
+  if (!window)
+    {
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
+      gtk_window_set_title (GTK_WINDOW (window), "Gestures demo");
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      drawing_area = gtk_drawing_area_new ();
+      gtk_container_add (GTK_CONTAINER (window), drawing_area);
+      gtk_widget_add_events (drawing_area,
+                             GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
+                             GDK_POINTER_MOTION_MASK | GDK_TOUCH_MASK);
+
+      g_signal_connect (drawing_area, "draw",
+                        G_CALLBACK (drawing_area_draw), NULL);
+
+      /* Swipe */
+      gesture = gtk_gesture_swipe_new (drawing_area);
+      g_signal_connect (gesture, "swipe",
+                        G_CALLBACK (swipe_gesture_swept), drawing_area);
+      gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
+                                                  GTK_PHASE_BUBBLE);
+      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
+
+      /* Long press */
+      gesture = gtk_gesture_long_press_new (drawing_area);
+      g_signal_connect (gesture, "pressed",
+                        G_CALLBACK (long_press_gesture_pressed), drawing_area);
+      g_signal_connect (gesture, "end",
+                        G_CALLBACK (long_press_gesture_end), drawing_area);
+      gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
+                                                  GTK_PHASE_BUBBLE);
+      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
+
+      /* Rotate */
+      rotate = gesture = gtk_gesture_rotate_new (drawing_area);
+      g_signal_connect (gesture, "angle-changed",
+                        G_CALLBACK (rotation_angle_changed), drawing_area);
+      gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
+                                                  GTK_PHASE_BUBBLE);
+      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
+
+      /* Zoom */
+      zoom = gesture = gtk_gesture_zoom_new (drawing_area);
+      g_signal_connect (gesture, "scale-changed",
+                        G_CALLBACK (zoom_scale_changed), drawing_area);
+      gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
+                                                  GTK_PHASE_BUBBLE);
+      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show_all (window);
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}

demos/gtk-demo/headerbar.c

@@ -47,7 +47,7 @@ do_headerbar (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-start-symbolic", GTK_ICON_SIZE_BUTTON));
       gtk_container_add (GTK_CONTAINER (box), button);
       button = gtk_button_new ();
-      gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-start-symbolic", GTK_ICON_SIZE_BUTTON));
+      gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-end-symbolic", GTK_ICON_SIZE_BUTTON));
       gtk_container_add (GTK_CONTAINER (box), button);
 
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), box);

demos/gtk-demo/main.c

@@ -471,6 +471,9 @@ fontify (GtkTextBuffer *source_buffer)
   gchar *start_ptr, *end_ptr;
   gchar *tag;
 
+  gtk_text_buffer_get_bounds (source_buffer, &start_iter, &tmp_iter);
+  gtk_text_buffer_apply_tag_by_name (source_buffer, "source", &start_iter, &tmp_iter);
+
   state = STATE_NORMAL;
 
   gtk_text_buffer_get_iter_at_offset (source_buffer, &start_iter, 0);
@@ -626,6 +629,9 @@ load_file (const gchar *demoname,
                               NULL);
 
   source_buffer = gtk_text_buffer_new (NULL);
+  gtk_text_buffer_create_tag (source_buffer, "source",
+                              "font", "monospace",
+                              NULL);
   gtk_text_buffer_create_tag (source_buffer, "comment",
                               "foreground", "DodgerBlue",
                               NULL);

demos/gtk-demo/transparent.c

@@ -189,9 +189,10 @@ do_transparent (GtkWidget *do_widget)
       GtkWidget *view;
       GtkWidget *sw;
       GtkWidget *overlay;
-      GtkWidget *align;
       GtkWidget *entry;
       GdkRGBA transparent = {0, 0, 0, 0};
+      GtkCssProvider *provider;
+      gchar *css;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
@@ -219,17 +220,20 @@ do_transparent (GtkWidget *do_widget)
 
       gtk_widget_override_background_color (overlay, 0, &transparent);
 
-      align = gtk_alignment_new (0.0, 0.0, 0.0, 0.0);
-      gtk_alignment_set_padding (GTK_ALIGNMENT (align),
-				 0, SHADOW_OFFSET_Y, 0, SHADOW_OFFSET_X);
-      g_signal_connect (align, "draw", G_CALLBACK (draw_callback), NULL);
-      
       entry = gtk_entry_new ();
-      gtk_container_add (GTK_CONTAINER (align), entry);
+      provider = gtk_css_provider_new ();
+      css = g_strdup_printf ("* { border-width: 0px %dpx %dpx 0px; }",
+                             SHADOW_OFFSET_X, SHADOW_OFFSET_Y);
+      gtk_css_provider_load_from_data (provider, css, -1, NULL);
+      g_free (css);
+      gtk_style_context_add_provider (gtk_widget_get_style_context (entry),
+                                      GTK_STYLE_PROVIDER (provider),
+                                      GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+      g_signal_connect (entry, "draw", G_CALLBACK (draw_callback), NULL);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
+      gtk_widget_set_halign (entry, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (entry, GTK_ALIGN_START);
       
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), align);
-      gtk_widget_set_halign (align, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (align, GTK_ALIGN_START);
 
       gtk_widget_show_all (overlay);
     }

demos/widget-factory/widget-factory.c

@@ -269,12 +269,25 @@ info_bar_response (GtkWidget *infobar, gint response_id)
     gtk_widget_hide (infobar);
 }
 
+static void
+show_dialog (GtkWidget *button, GtkWidget *dialog)
+{
+  gtk_widget_show (dialog);
+}
+
+static void
+close_dialog (GtkWidget *dialog)
+{
+  gtk_widget_hide (dialog);
+}
+
 static void
 activate (GApplication *app)
 {
   GtkBuilder *builder;
   GtkWindow *window;
   GtkWidget *widget;
+  GtkWidget *dialog;
   GtkAdjustment *adj;
   static GActionEntry win_entries[] = {
     { "dark", NULL, NULL, "false", change_theme_state },
@@ -282,9 +295,12 @@ activate (GApplication *app)
     { "search", activate_search, NULL, NULL, NULL },
     { "delete", activate_delete, NULL, NULL, NULL }
   };
+  GError *error = NULL;
 
   builder = gtk_builder_new ();
-  gtk_builder_add_from_resource (builder, "/ui/widget-factory.ui", NULL);
+  gtk_builder_add_from_resource (builder, "/ui/widget-factory.ui", &error);
+  if (error)
+    g_print ("error: %s\n", error->message);
   gtk_builder_add_callback_symbol (builder, "on_entry_icon_release", (GCallback)on_entry_icon_release);
   gtk_builder_connect_signals (builder, NULL);
 
@@ -320,6 +336,21 @@ activate (GApplication *app)
   g_signal_connect (widget, "response", G_CALLBACK (info_bar_response), NULL); 
   g_object_set_data (G_OBJECT (window), "infobar", widget);
 
+  dialog = (GtkWidget *)gtk_builder_get_object (builder, "info_dialog");
+  g_signal_connect (dialog, "response", G_CALLBACK (close_dialog), NULL);
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "info_dialog_button");
+  g_signal_connect (widget, "clicked", G_CALLBACK (show_dialog), dialog);
+
+  dialog = (GtkWidget *)gtk_builder_get_object (builder, "action_dialog");
+  g_signal_connect (dialog, "response", G_CALLBACK (close_dialog), NULL);
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "action_dialog_button");
+  g_signal_connect (widget, "clicked", G_CALLBACK (show_dialog), dialog);
+
+  dialog = (GtkWidget *)gtk_builder_get_object (builder, "preference_dialog");
+  g_signal_connect (dialog, "response", G_CALLBACK (close_dialog), NULL);
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "preference_dialog_button");
+  g_signal_connect (widget, "clicked", G_CALLBACK (show_dialog), dialog);
+
   gtk_widget_show_all (GTK_WIDGET (window));
 
   g_object_unref (builder);

demos/widget-factory/widget-factory.ui

@@ -2465,23 +2465,26 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                                     <child>
                                       <object class="GtkToolButton">
                                         <property name="visible">True</property>
-                                        <property name="label">New</property>
+                                        <property name="label" translatable="yes">New</property>
                                         <property name="icon-name">document-new</property>
+                                        <property name="tooltip-text" translatable="yes">Create a new document</property>
                                       </object>
                                     </child>
                                     <child>
                                       <object class="GtkToolButton">
                                         <property name="visible">True</property>
-                                        <property name="label">Save</property>
+                                        <property name="label" translatable="yes">Save</property>
                                         <property name="icon-name">document-save</property>
+                                        <property name="tooltip-text" translatable="yes">Save the current document</property>
                                       </object>
                                     </child>
                                     <child>
                                       <object class="GtkToolButton">
                                         <property name="visible">True</property>
-                                        <property name="label">Search</property>
+                                        <property name="label" translatable="yes">Search</property>
                                         <property name="icon-name">search</property>
                                         <property name="action-name">win.search</property>
+                                        <property name="tooltip-text" translatable="yes">Search for it</property>
                                       </object>
                                     </child>
                                   </object>
@@ -2688,11 +2691,29 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                               <object class="GtkLabel" id="label19">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">expander</property>
+                                <property name="label" translatable="yes">Expander</property>
                               </object>
                             </child>
                           </object>
                         </child>
+                        <child>
+                          <object class="GtkButton" id="info_dialog_button">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Inform</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="action_dialog_button">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Act</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="preference_dialog_button">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Configure</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
@@ -2708,6 +2729,84 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
       </object>
     </child>
   </object>
+  <object class="GtkMessageDialog" id="info_dialog">
+    <property name="transient-for">window</property>
+    <property name="modal">True</property>
+    <property name="text" translatable="yes">Do something?</property>
+    <property name="secondary-text" translatable="yes">If you do something,
+bad things might happen.</property>
+    <signal name="delete-event" handler="gtk_widget_hide_on_delete"/>
+    <child type="action">
+      <object class="GtkButton" id="cancel_info_dialog">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">Cancel</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="doit_info_dialog">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">Do It</property>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="cancel">cancel_info_dialog</action-widget>
+      <action-widget response="ok">doit_info_dialog</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="action_dialog">
+    <property name="transient-for">window</property>
+    <property name="modal">True</property>
+    <property name="use-header-bar">1</property>
+    <property name="title" translatable="yes">Action</property>
+    <signal name="delete-event" handler="gtk_widget_hide_on_delete"/>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="margin">20</property>
+            <property name="label" translatable="yes">Bla bla bla</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="cancel_action_dialog">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">Cancel</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="act_action_dialog">
+        <property name="visible">True</property>
+        <property name="can-default">True</property>
+        <property name="has-default">True</property>
+        <property name="label" translatable="yes">Action</property>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="cancel">cancel_action_dialog</action-widget>
+      <action-widget response="ok" default="true">act_action_dialog</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkDialog" id="preference_dialog">
+    <property name="transient-for">window</property>
+    <property name="modal">True</property>
+    <property name="use-header-bar">1</property>
+    <property name="title" translatable="yes">Properties</property>
+    <signal name="delete-event" handler="gtk_widget_hide_on_delete"/>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="margin">20</property>
+            <property name="label" translatable="yes">Bla bla bla</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
   <object class="GtkSizeGroup">
     <property name="mode">vertical</property>
     <widgets>

docs/reference/gdk/gdk-docs.sgml

@@ -26,7 +26,6 @@
     <xi:include href="xml/gdkdevice.xml" />
     <xi:include href="xml/regions.xml" />
     <xi:include href="xml/pixbufs.xml" />
-    <xi:include href="xml/colors.xml" />
     <xi:include href="xml/rgba_colors.xml" />
     <xi:include href="xml/visuals.xml" />
     <xi:include href="xml/cursors.xml" />
@@ -48,6 +47,11 @@
     <xi:include href="xml/gdktestutils.xml" />
   </reference>
 
+  <reference>
+    <title>Deprecated</title>
+    <xi:include href="xml/colors.xml" />
+  </reference>
+
   <index id="api-index-full">
     <title>Index of all symbols</title>
     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>

docs/reference/gdk/gdk3-sections.txt

@@ -389,6 +389,7 @@ gdk_window_begin_resize_drag
 gdk_window_begin_resize_drag_for_device
 gdk_window_begin_move_drag
 gdk_window_begin_move_drag_for_device
+gdk_window_show_window_menu
 gdk_window_constrain_size
 gdk_window_beep
 gdk_window_get_scale_factor

docs/reference/gtk/Makefile.am

@@ -157,6 +157,7 @@ content_files =					\
 	gtk-update-icon-cache.xml		\
 	gtk-launch.xml				\
 	broadwayd.xml				\
+	input-handling.xml			\
 	visual_index.xml			\
 	getting_started.xml			\
 	overview.xml
@@ -299,6 +300,7 @@ HTML_IMAGES = \
 	$(top_srcdir)/gtk/stock-icons/24/gtk-page-setup.png		\
 	$(srcdir)/images/aboutdialog.png				\
 	$(srcdir)/images/accel-label.png				\
+	$(srcdir)/images/action-bar.png					\
 	$(srcdir)/images/appchooserbutton.png				\
 	$(srcdir)/images/appchooserdialog.png				\
 	$(srcdir)/images/assistant.png					\
@@ -347,6 +349,7 @@ HTML_IMAGES = \
 	$(srcdir)/images/scales.png					\
 	$(srcdir)/images/scrollbar.png					\
 	$(srcdir)/images/scrolledwindow.png				\
+	$(srcdir)/images/search-bar.png					\
 	$(srcdir)/images/search-entry.png				\
 	$(srcdir)/images/separator.png					\
 	$(srcdir)/images/spinbutton.png					\

docs/reference/gtk/compiling.sgml

@@ -90,13 +90,6 @@ GDK_PIXBUF_DISABLE_DEPRECATED and G_DISABLE_DEPRECATED for GDK, GdkPixbuf and
 GLib.
 </para>
 
-<para>
-If you want to make sure that your program doesn't use any functions which
-may be problematic in a multihead setting, you can define the preprocessor
-symbol GDK_MULTIHEAD_SAFE by using the command line option
-<literal>-DGTK_MULTIHEAD_SAFE=1</literal>.
-</para>
-
 <para>
 Similarly, if you want to make sure that your program doesn't use any
 functions which may be problematic in a multidevice setting, you can

docs/reference/gtk/gtk-docs.sgml

@@ -287,6 +287,20 @@
       <xi:include href="xml/gtkappchooserwidget.xml" />
     </chapter>
 
+    <chapter id="Gestures">
+      <title>Gestures</title>
+      <xi:include href="xml/gtkeventcontroller.xml" />
+      <xi:include href="xml/gtkgesture.xml" />
+      <xi:include href="xml/gtkgesturesingle.xml" />
+      <xi:include href="xml/gtkgesturedrag.xml" />
+      <xi:include href="xml/gtkgesturelongpress.xml" />
+      <xi:include href="xml/gtkgesturemultipress.xml" />
+      <xi:include href="xml/gtkgesturepan.xml" />
+      <xi:include href="xml/gtkgestureswipe.xml" />
+      <xi:include href="xml/gtkgesturerotate.xml" />
+      <xi:include href="xml/gtkgesturezoom.xml" />
+    </chapter>
+
     <chapter id="DeprecatedObjects">
       <title>Deprecated</title>
       <xi:include href="xml/gtksymboliccolor.xml" />

docs/reference/gtk/gtk3-sections.txt

@@ -2615,6 +2615,8 @@ gtk_places_sidebar_get_show_connect_to_server
 gtk_places_sidebar_set_show_connect_to_server
 gtk_places_sidebar_get_local_only
 gtk_places_sidebar_set_local_only
+gtk_places_sidebar_get_show_enter_location
+gtk_places_sidebar_set_show_enter_location
 <SUBSECTION Standard>
 GTK_PLACES_SIDEBAR
 GTK_IS_PLACES_SIDEBAR
@@ -3244,6 +3246,8 @@ gtk_settings_set_property_value
 gtk_settings_set_string_property
 gtk_settings_set_long_property
 gtk_settings_set_double_property
+GtkIMPreeditStyle
+GtkIMStatusStyle
 <SUBSECTION Standard>
 GtkSettingsClass
 GTK_IS_SETTINGS
@@ -5475,6 +5479,8 @@ gtk_widget_get_allocated_height
 gtk_widget_get_allocation
 gtk_widget_set_allocation
 gtk_widget_get_allocated_baseline
+gtk_widget_get_clip
+gtk_widget_set_clip
 gtk_widget_get_app_paintable
 gtk_widget_get_can_default
 gtk_widget_set_can_default
@@ -5485,6 +5491,7 @@ gtk_widget_get_has_window
 gtk_widget_set_has_window
 gtk_widget_get_sensitive
 gtk_widget_is_sensitive
+GtkStateType
 gtk_widget_get_state
 gtk_widget_get_visible
 gtk_widget_is_visible
@@ -5950,65 +5957,76 @@ GTK_STYLE_PROPERTY_BORDER_COLOR
 GTK_STYLE_PROPERTY_BACKGROUND_IMAGE
 GtkBorderStyle
 <SUBSECTION>
+GTK_STYLE_CLASS_ACCELERATOR
+GTK_STYLE_CLASS_ARROW
 GTK_STYLE_CLASS_BACKGROUND
+GTK_STYLE_CLASS_BOTTOM
 GTK_STYLE_CLASS_BUTTON
 GTK_STYLE_CLASS_CALENDAR
 GTK_STYLE_CLASS_CELL
 GTK_STYLE_CLASS_COMBOBOX_ENTRY
 GTK_STYLE_CLASS_CHECK
+GTK_STYLE_CLASS_CSD
+GTK_STYLE_CLASS_CURSOR_HANDLE
 GTK_STYLE_CLASS_DEFAULT
-GTK_STYLE_CLASS_ENTRY
-GTK_STYLE_CLASS_HEADER
-GTK_STYLE_CLASS_MENU
-GTK_STYLE_CLASS_RADIO
-GTK_STYLE_CLASS_RUBBERBAND
-GTK_STYLE_CLASS_SCROLLBAR
-GTK_STYLE_CLASS_SCROLLBARS_JUNCTION
-GTK_STYLE_CLASS_SLIDER
-GTK_STYLE_CLASS_TOOLTIP
-GTK_STYLE_CLASS_TROUGH
-GTK_STYLE_CLASS_ACCELERATOR
-GTK_STYLE_CLASS_DOCK
-GTK_STYLE_CLASS_GRIP
-GTK_STYLE_CLASS_MENUBAR
-GTK_STYLE_CLASS_MENUITEM
-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_DESTRUCTIVE_ACTION
+GTK_STYLE_CLASS_DIM_LABEL
 GTK_STYLE_CLASS_DND
+GTK_STYLE_CLASS_DOCK
+GTK_STYLE_CLASS_ENTRY
 GTK_STYLE_CLASS_ERROR
 GTK_STYLE_CLASS_EXPANDER
 GTK_STYLE_CLASS_FRAME
+GTK_STYLE_CLASS_GRIP
+GTK_STYLE_CLASS_HEADER
 GTK_STYLE_CLASS_HIGHLIGHT
+GTK_STYLE_CLASS_HORIZONTAL
 GTK_STYLE_CLASS_IMAGE
 GTK_STYLE_CLASS_INFO
+GTK_STYLE_CLASS_INLINE_TOOLBAR
+GTK_STYLE_CLASS_INSERTION_CURSOR
+GTK_STYLE_CLASS_LEFT
+GTK_STYLE_CLASS_LEVEL_BAR
+GTK_STYLE_CLASS_LINKED
+GTK_STYLE_CLASS_LIST
+GTK_STYLE_CLASS_LIST_ROW
 GTK_STYLE_CLASS_MARK
+GTK_STYLE_CLASS_MENU
+GTK_STYLE_CLASS_MENUBAR
+GTK_STYLE_CLASS_MENUITEM
+GTK_STYLE_CLASS_MESSAGE_DIALOG
+GTK_STYLE_CLASS_NEEDS_ATTENTION
 GTK_STYLE_CLASS_NOTEBOOK
+GTK_STYLE_CLASS_OSD
+GTK_STYLE_CLASS_PANE_SEPARATOR
+GTK_STYLE_CLASS_POPUP
+GTK_STYLE_CLASS_PRIMARY_TOOLBAR
+GTK_STYLE_CLASS_PROGRESSBAR
+GTK_STYLE_CLASS_PULSE
 GTK_STYLE_CLASS_QUESTION
+GTK_STYLE_CLASS_RADIO
+GTK_STYLE_CLASS_RAISED
+GTK_STYLE_CLASS_RIGHT
+GTK_STYLE_CLASS_RUBBERBAND
 GTK_STYLE_CLASS_SCALE
 GTK_STYLE_CLASS_SCALE_HAS_MARKS_ABOVE
 GTK_STYLE_CLASS_SCALE_HAS_MARKS_BELOW
+GTK_STYLE_CLASS_SCROLLBAR
+GTK_STYLE_CLASS_SCROLLBARS_JUNCTION
+GTK_STYLE_CLASS_SEPARATOR
+GTK_STYLE_CLASS_SIDEBAR
+GTK_STYLE_CLASS_SLIDER
 GTK_STYLE_CLASS_SPINBUTTON
+GTK_STYLE_CLASS_SPINNER
+GTK_STYLE_CLASS_SUGGESTED_ACTION
+GTK_STYLE_CLASS_TITLEBAR
+GTK_STYLE_CLASS_TOOLBAR
+GTK_STYLE_CLASS_TOOLTIP
+GTK_STYLE_CLASS_TOP
+GTK_STYLE_CLASS_TROUGH
+GTK_STYLE_CLASS_VERTICAL
 GTK_STYLE_CLASS_VIEW
 GTK_STYLE_CLASS_WARNING
-GTK_STYLE_CLASS_HORIZONTAL
-GTK_STYLE_CLASS_VERTICAL
-GTK_STYLE_CLASS_TOP
-GTK_STYLE_CLASS_BOTTOM
-GTK_STYLE_CLASS_LEFT
-GTK_STYLE_CLASS_RIGHT
-GTK_STYLE_CLASS_LINKED
-GTK_STYLE_CLASS_ARROW
-GTK_STYLE_CLASS_OSD
-GTK_STYLE_CLASS_LEVEL_BAR
-GTK_STYLE_CLASS_CURSOR_HANDLE
-GTK_STYLE_CLASS_INSERTION_CURSOR
-GTK_STYLE_CLASS_TITLEBAR
 GTK_STYLE_REGION_COLUMN
 GTK_STYLE_REGION_COLUMN_HEADER
 GTK_STYLE_REGION_ROW
@@ -6525,8 +6543,6 @@ gtk_binding_set_add_path
 GtkBaselinePosition
 GtkDeleteType
 GtkDirectionType
-GtkIMPreeditStyle
-GtkIMStatusStyle
 GtkJustification
 GtkMovementStep
 GtkOrientation
@@ -6537,7 +6553,6 @@ GtkScrollStep
 GtkScrollType
 GtkSelectionMode
 GtkShadowType
-GtkStateType
 GtkStateFlags
 GtkToolbarStyle
 GtkSortType
@@ -7799,6 +7814,8 @@ GtkStackTransitionType
 gtk_stack_set_transition_type
 gtk_stack_get_transition_type
 gtk_stack_get_transition_running
+<SUBSECTION Private>
+gtk_stack_get_type
 </SECTION>
 
 <SECTION>
@@ -7808,6 +7825,8 @@ GtkStackSwitcher
 gtk_stack_switcher_new
 gtk_stack_switcher_set_stack
 gtk_stack_switcher_get_stack
+<SUBSECTION Private>
+gtk_stack_switcher_get_type
 </SECTION>
 
 <SECTION>
@@ -7824,6 +7843,8 @@ gtk_revealer_set_transition_duration
 GtkRevealerTransitionType
 gtk_revealer_get_transition_type
 gtk_revealer_set_transition_type
+<SUBSECTION Private>
+gtk_revealer_get_type
 </SECTION>
 
 <SECTION>
@@ -7891,3 +7912,228 @@ gtk_popover_get_position
 gtk_popover_set_modal
 gtk_popover_get_modal
 </SECTION>
+
+<SECTION>
+<FILE>gtkeventcontroller</FILE>
+<TITLE>GtkEventController</TITLE>
+GtkEventController
+GtkPropagationPhase
+gtk_event_controller_get_propagation_phase
+gtk_event_controller_set_propagation_phase
+gtk_event_controller_handle_event
+gtk_event_controller_get_widget
+gtk_event_controller_reset
+
+<SUBSECTION Standard>
+GTK_TYPE_EVENT_CONTROLLER
+GTK_EVENT_CONTROLLER
+GTK_EVENT_CONTROLLER_CLASS
+GTK_IS_EVENT_CONTROLLER
+GTK_EVENT_CONTROLLER_GET_CLASS
+
+<SUBSECTION Private>
+GtkEventControllerPriv
+gtk_event_controller_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkgesture</FILE>
+<TITLE>GtkGesture</TITLE>
+GtkGesture
+gtk_gesture_get_device
+gtk_gesture_get_window
+gtk_gesture_set_window
+gtk_gesture_is_active
+gtk_gesture_is_recognized
+GtkEventSequenceState
+gtk_gesture_get_sequence_state
+gtk_gesture_set_sequence_state
+gtk_gesture_set_state
+gtk_gesture_get_sequences
+gtk_gesture_handles_sequence
+
+<SUBSECTION>
+gtk_gesture_get_last_updated_sequence
+gtk_gesture_get_last_event
+gtk_gesture_get_point
+gtk_gesture_get_bounding_box
+gtk_gesture_get_bounding_box_center
+
+<SUBSECTION>
+gtk_gesture_group
+gtk_gesture_ungroup
+gtk_gesture_get_group
+gtk_gesture_is_grouped_with
+
+<SUBSECTION Standard>
+GTK_TYPE_GESTURE
+GTK_GESTURE
+GTK_GESTURE_CLASS
+GTK_IS_GESTURE
+GTK_IS_GESTURE_CLASS
+GTK_GESTURE_GET_CLASS
+
+<SUBSECTION Private>
+gtk_gesture_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkgesturesingle</FILE>
+<TITLE>GtkGestureSingle</TITLE>
+GtkGestureSingle
+gtk_gesture_single_get_exclusive
+gtk_gesture_single_set_exclusive
+gtk_gesture_single_get_touch_only
+gtk_gesture_single_set_touch_only
+gtk_gesture_single_get_button
+gtk_gesture_single_set_button
+gtk_gesture_single_get_current_button
+gtk_gesture_single_get_current_sequence
+
+<SUBSECTION Standard>
+GTK_TYPE_GESTURE_SINGLE
+GTK_GESTURE_SINGLE
+GTK_GESTURE_SINGLE_CLASS
+GTK_IS_GESTURE_SINGLE
+GTK_IS_GESTURE_SINGLE_CLASS
+GTK_GESTURE_SINGLE_GET_CLASS
+
+<SUBSECTION Private>
+gtk_gesture_single_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkgesturedrag</FILE>
+<TITLE>GtkGestureDrag</TITLE>
+GtkGestureDrag
+gtk_gesture_drag_new
+gtk_gesture_drag_get_start_point
+gtk_gesture_drag_get_offset
+
+<SUBSECTION Standard>
+GTK_TYPE_GESTURE_DRAG
+GTK_GESTURE_DRAG
+GTK_GESTURE_DRAG_CLASS
+GTK_IS_GESTURE_DRAG
+GTK_IS_GESTURE_DRAG_CLASS
+GTK_GESTURE_DRAG_GET_CLASS
+
+<SUBSECTION Private>
+gtk_gesture_drag_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkgesturelongpress</FILE>
+<TITLE>GtkGestureLongPress</TITLE>
+GtkGestureLongPress
+gtk_gesture_long_press_new
+
+<SUBSECTION Standard>
+GTK_TYPE_GESTURE_LONG_PRESS
+GTK_GESTURE_LONG_PRESS
+GTK_GESTURE_LONG_PRESS_CLASS
+GTK_IS_GESTURE_LONG_PRESS
+GTK_IS_GESTURE_LONG_PRESS_CLASS
+GTK_GESTURE_LONG_PRESS_GET_CLASS
+
+<SUBSECTION Private>
+gtk_gesture_long_press_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkgesturemultipress</FILE>
+<TITLE>GtkGestureMultiPress</TITLE>
+GtkGestureMultiPress
+gtk_gesture_multi_press_new
+gtk_gesture_multi_press_set_area
+gtk_gesture_multi_press_get_area
+
+<SUBSECTION Standard>
+GTK_TYPE_GESTURE_MULTI_PRESS
+GTK_GESTURE_MULTI_PRESS
+GTK_GESTURE_MULTI_PRESS_CLASS
+GTK_IS_GESTURE_MULTI_PRESS
+GTK_IS_GESTURE_MULTI_PRESS_CLASS
+GTK_GESTURE_MULTI_PRESS_GET_CLASS
+
+<SUBSECTION Private>
+gtk_gesture_multi_press_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkgesturepan</FILE>
+<TITLE>GtkGesturePan</TITLE>
+GtkGesturePan
+GtkPanDirection
+gtk_gesture_pan_new
+gtk_gesture_pan_get_orientation
+gtk_gesture_pan_set_orientation
+
+<SUBSECTION Standard>
+GTK_TYPE_GESTURE_PAN
+GTK_GESTURE_PAN
+GTK_GESTURE_PAN_CLASS
+GTK_IS_GESTURE_PAN
+GTK_IS_GESTURE_PAN_CLASS
+GTK_GESTURE_PAN_GET_CLASS
+
+<SUBSECTION Private>
+gtk_gesture_pan_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkgestureswipe</FILE>
+<TITLE>GtkGestureSwipe</TITLE>
+GtkGestureSwipe
+gtk_gesture_swipe_new
+gtk_gesture_swipe_get_velocity
+
+<SUBSECTION Standard>
+GTK_TYPE_GESTURE_SWIPE
+GTK_GESTURE_SWIPE
+GTK_GESTURE_SWIPE_CLASS
+GTK_IS_GESTURE_SWIPE
+GTK_IS_GESTURE_SWIPE_CLASS
+GTK_GESTURE_SWIPE_GET_CLASS
+
+<SUBSECTION Private>
+gtk_gesture_swipe_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkgesturerotate</FILE>
+<TITLE>GtkGestureRotate</TITLE>
+GtkGestureRotate
+gtk_gesture_rotate_new
+gtk_gesture_rotate_get_angle_delta
+
+<SUBSECTION Standard>
+GTK_TYPE_GESTURE_ROTATE
+GTK_GESTURE_ROTATE
+GTK_GESTURE_ROTATE_CLASS
+GTK_IS_GESTURE_ROTATE
+GTK_IS_GESTURE_ROTATE_CLASS
+GTK_GESTURE_ROTATE_GET_CLASS
+
+<SUBSECTION Private>
+gtk_gesture_rotate_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkgesturezoom</FILE>
+<TITLE>GtkGestureZoom</TITLE>
+GtkGestureZoom
+gtk_gesture_zoom_new
+gtk_gesture_zoom_get_scale_delta
+
+<SUBSECTION Standard>
+GTK_TYPE_GESTURE_ZOOM
+GTK_GESTURE_ZOOM
+GTK_GESTURE_ZOOM_CLASS
+GTK_IS_GESTURE_ZOOM
+GTK_IS_GESTURE_ZOOM_CLASS
+GTK_GESTURE_ZOOM_GET_CLASS
+
+<SUBSECTION Private>
+gtk_gesture_zoom_get_type
+</SECTION>

docs/reference/gtk/gtk3.types.in

@@ -7,6 +7,7 @@ gtk_accel_label_get_type
 gtk_accel_map_get_type
 gtk_accessible_get_type
 gtk_actionable_get_type
+gtk_action_bar_get_type
 gtk_action_get_type
 gtk_action_group_get_type
 gtk_activatable_get_type
@@ -63,6 +64,7 @@ gtk_entry_buffer_get_type
 gtk_entry_completion_get_type
 gtk_entry_get_type
 gtk_event_box_get_type
+gtk_event_controller_get_type
 gtk_expander_get_type
 gtk_file_chooser_button_get_type
 gtk_file_chooser_dialog_get_type
@@ -79,6 +81,15 @@ gtk_font_chooser_widget_get_type
 gtk_font_selection_dialog_get_type
 gtk_font_selection_get_type
 gtk_frame_get_type
+gtk_gesture_get_type
+gtk_gesture_drag_get_type
+gtk_gesture_long_press_get_type
+gtk_gesture_multi_press_get_type
+gtk_gesture_pan_get_type
+gtk_gesture_rotate_get_type
+gtk_gesture_single_get_type
+gtk_gesture_swipe_get_type
+gtk_gesture_zoom_get_type
 gtk_grid_get_type
 gtk_handle_box_get_type
 gtk_hbox_get_type

docs/reference/gtk/input-handling.xml

@@ -72,6 +72,14 @@
        <member>GdkEventTouch</member>
      </simplelist>
     </para>
+    <para>
+      Additionally, GDK/GTK synthesizes other signals to let know whether
+      grabs (system-wide or in-app) are taking input away:
+      <simplelist>
+	<member>GdkEventGrabBroken</member>
+	<member>GtkWidget::grab-notify</member>
+      </simplelist>
+    </para>
     <para>
       When GTK+ is initialized, it sets up an event handler function with
       gdk_event_handler_set(), which receives all of these input events
@@ -82,8 +90,116 @@
   <refsect2>
     <title>Event propagation</title>
 
-    <!-- capture/bubble, event handler chain, event controllers -->
-    <!-- grabs -->
+    <para>
+      When GTK+ receives an event, it determines the target widget that
+      it is directed to. Unless grabs are involved, this is done by finding
+      the widget to which the window of the event belongs.
+    </para>
+
+    <para>
+      The event is then propagated from the toplevel window down to the 
+      target widget. In this phase, which is known as the “capture” phase,
+      gestures that are attached with GTK_PHASE_CAPTURE get a chance
+      to react to the event.
+    </para>
+
+    <para>
+      After the “capture” phase, the widget that was intended to be the
+      destination of the event will let run gestures attached to it with
+      GTK_PHASE_TARGET. This is known as the “target” phase, and does only
+      happen on that widget.
+    </para>
+
+    <para>
+      Next, the appropriate event signal is emitted for the event in question,
+      e.g. “motion-notify-event”. Handling these signals was the primary
+      way to handle input in GTK+ widgets before gestures were introduced.
+      The signals are emitted from the target widget up to the toplevel,
+      until a signal handler indicates that it has handled the event, by
+      returning GDK_EVENT_STOP.
+    </para>
+
+    <para>
+      The default handlers for the event signals send the event
+      to gestures that are attached with GTK_PHASE_BUBBLE. Therefore,
+      gestures in the “bubble” phase are only used if the widget does
+      not have its own event handlers, or takes care to chain up to the
+      default GtkWidget handlers.
+    </para>
+
+    <para>
+      Anytime during the propagation phase, a widget may indicate that a
+      received event was consumed and propagation should therefore be stopped.
+      In traditional event handlers, this is hinted by returning GDK_EVENT_STOP,
+      if gestures are used, this may happen when the widget tells the gesture
+      to claim the event touch sequence (or the pointer events) for its own. See the
+      "gesture states" section below to know more of the latter.
+    </para>
+  </refsect2>
+
+  <refsect2>
+    <title>Touch events</title>
+
+    <para>
+      Touch events are emitted as events of type GDK_TOUCH_BEGIN, GDK_TOUCH_UPDATE or
+      GDK_TOUCH_END, those events contain an “event sequence” that univocally identifies
+      the physical touch until it is lifted from the device.
+    </para>
+
+    <para>
+      On some windowing platforms, multitouch devices perform pointer emulation, this works
+      by granting a “pointer emulating” hint to one of the currently interacting touch
+      sequences, which will be reported on every GdkEventTouch event from that sequence. By
+      default, if a widget didn't request touch events by setting GDK_TOUCH_MASK on its
+      event mask and didn't override GtkWidget::touch-event, GTK+ will transform these
+      “pointer emulating” events into semantically similar GdkEventButton and GdkEventMotion
+      events. Depending on GDK_TOUCH_MASK being in the event mask or not, non-pointer-emulating
+      sequences could still trigger gestures or just get filtered out, regardless of the widget
+      not handling those directly.
+    </para>
+
+    <para>
+      If the widget sets GDK_TOUCH_MASK on its event mask and doesn't chain up on
+      GtkWidget::touch-event, only touch events will be received, and no pointer emulation
+      will be performed.
+    </para>
+  </refsect2>
+
+  <refsect2>
+    <title>Grabs</title>
+
+    <para>
+      Grabs are a method to claim all input events from a device, they happen
+      either implicitly on pointer and touch devices, or explicitly. Implicit grabs
+      happen on user interaction, when a GdkEventButtonPress happens, all events from
+      then on, until after the corresponding GdkEventButtonRelease, will be reported
+      to the widget that got the first event. Likewise, on touch events, every
+      GdkEventSequence will deliver only events to the widget that received its
+      GDK_TOUCH_BEGIN event.
+    </para>
+
+    <para>
+      Explicit grabs happen programatically (both activation and deactivation),
+      and can be either system-wide (GDK grabs) or application-wide (GTK grabs).
+      On the windowing platforms that support it, GDK grabs will prevent any
+      interaction with any other application/window/widget than the grabbing one,
+      whereas GTK grabs will be effective only within the application (across all
+      its windows), still allowing for interaction with other applications.
+    </para>
+
+    <para>
+      But one important aspect of grabs is that they may potentially happen at any
+      point somewhere else, even while the pointer/touch device is already grabbed.
+      This makes it necessary for widgets to handle the cancellation of any ongoing
+      interaction. Depending on whether a GTK or GDK grab is causing this, the
+      widget will respectively receive a GtkWidget::grab-notify signal, or a
+      GdkEventGrabBroken event.
+    </para>
+
+    <para>
+      On gestures, these signals are handled automatically, causing the gesture
+      to cancel all tracked pointer/touch events, and signal the end of recognition.
+    </para>
   </refsect2>
 
   <refsect2>
@@ -94,9 +210,77 @@
   </refsect2>
 
   <refsect2>
-    <title>Gestures</title>
+    <title>Event controllers and gestures</title>
 
-    <!-- touch sequences, states, anything else -->
+    <para>
+      Event controllers are standalone objects that can perform specific actions
+      upon received GdkEvents. These are tied to a GtkWidget, and can be told of
+      the event propagation phase at which they will manage the events.
+    </para>
+
+    <para>
+      Gestures are a set of specific controllers that are prepared to handle pointer
+      and/or touch events, each gestures implementation attempts to recognize specific
+      actions out the received events, notifying of the state/progress accordingly to
+      let the widget react to those. On multi-touch gestures, every interacting touch
+      sequence will be tracked independently.
+    </para>
+
+    <para>
+      Being gestures “simple” units, it is not uncommon to tie several together to
+      perform higher level actions, grouped gestures handle the same event sequences
+      simultaneously, and those sequences share a same state across all grouped
+      gestures. Some examples of grouping may be:
+
+      <simplelist>
+	<member>
+	  A “drag” and a “swipe” gestures may want grouping. The former will report
+	  events as the dragging happens, the latter will tell the swipe X/Y velocities
+	  only after gesture has finished.
+	</member>
+	<member>
+	  Grouping a “drag” gesture with a “pan” gesture will only effectively allow
+	  dragging in the panning orientation, as both gestures share state.
+	</member>
+	<member>
+	  If “press” and “long press” are wanted simultaneously, those would need grouping.
+	</member>
+      </simplelist>
+    </para>
+  </refsect2>
+
+  <refsect2>
+    <title>Gesture states</title>
+    <para>
+      Gestures have a notion of “state” for each individual touch sequence. When events
+      from a touch sequence are first received, the touch sequence will have “none” state,
+      this means the touch sequence is being handled by the gesture to possibly trigger
+      actions, but the event propagation will not be stopped.
+    </para>
+
+    <para>
+      When the gesture enters recognition, or at a later point in time, the widget may
+      choose to claim the touch sequences (individually or as a group), hence stopping
+      event propagation after the event is run through every gesture in that widget and
+      propagation phase. Anytime this happens, the touch sequences are cancelled downwards
+      the propagation chain, to let these know that no further events will be sent.
+    </para>
+
+    <para>
+      Alternatively, or at a later point in time, the widget may choose to deny the touch
+      sequences, thus letting those go through again in event propagation. When this happens
+      in the capture phase, and if there are no other claiming gestures in the widget,
+      a GDK_TOUCH_BEGIN/GDK_BUTTON_PRESS event will be emulated and
+      propagated downwards, in order to preserve consistency.
+    </para>
+
+    <para>
+      Grouped gestures always share the same state for a given touch sequence, so setting
+      the state on one does transfer the state to the others. They also are mutually exclusive,
+      within a widget there may be only one gesture group claiming a given sequence. If
+      another gesture group claims later that same sequence, the first group will deny the
+      sequence.
+    </para>
   </refsect2>
 
   </refsect1>

docs/reference/gtk/question_index.sgml

@@ -415,7 +415,7 @@ How do I use GTK+ with other non-C languages?
 
 <answer>
 <para>
-See the <ulink url="http://www.gtk.org/bindings.html">list of language
+See the <ulink url="http://www.gtk.org/language-bindings.php">list of language
 bindings</ulink> on <ulink
 url="http://www.gtk.org">http://www.gtk.org</ulink>.
 </para>

docs/reference/gtk/running.sgml

@@ -162,10 +162,6 @@ additional environment variables.
       <term>keybindings</term>
       <listitem><para>Keybindings</para></listitem>
     </varlistentry>
-    <varlistentry>
-      <term>multihead</term>
-      <listitem><para>Working on multiple displays</para></listitem>
-    </varlistentry>
     <varlistentry>
       <term>modules</term>
       <listitem><para>Loading of modules</para></listitem>
@@ -395,10 +391,6 @@ nevertheless.
       <term>nograbs</term>
       <listitem><para>Turn off all pointer and keyboard grabs</para></listitem>
     </varlistentry>
-    <varlistentry>
-      <term>multihead</term>
-      <listitem><para>Information related to multiple screens</para></listitem>
-    </varlistentry>
     <varlistentry>
       <term>xinerama</term>
       <listitem><para>Simulate a multi-monitor setup</para></listitem>
@@ -532,19 +524,27 @@ nevertheless.
   <inlinegraphic fileref="inspector.png" format="PNG"></inlinegraphic>
 
   <para>
-    GTK+ includes an interactive debugger which lets you explore the
-    widget tree of any GTK+ application at runtime, as well as tweak
-    the theme and trigger visual debugging aids.
+    GTK+ includes an interactive debugger, called the GTK+ Inspector, which
+    lets you explore the widget tree of any GTK+ application at runtime, as
+    well as tweak the theme and trigger visual debugging aids. You can
+    easily try out changes at runtime before putting them into the code.
   </para>
   <para>
-    To enable the debugger, you can use the Control-Shift-I or
+    Note that the GTK+ inspector can only show GTK+ internals. It can not
+    understand the application-specific logic of a GTK+ application. Also,
+    the fact that the GTK+ inspector is running in the application process
+    limits what it can do. It is meant as a complement to full-blown debuggers
+    and system tracing facilities such as DTrace, not as a replacement.
+  </para>
+  <para>
+    To enable the GTK+ inspector, you can use the Control-Shift-I or
     Control-Shift-D keyboard shortcuts, or set the
     <envar>GTK_DEBUG=interactive</envar> environment variable.
   </para>
   <para>
-    In some situations, it may be inappropriate to give users access
-    to the interactive debugger. The keyboard shortcuts can be disabled
-    with the `enable-inspector-keybinding` key in the `org.gtk.Settings.Debug`
+    In some situations, it may be inappropriate to give users access to the
+    GTK+ inspector. The keyboard shortcuts can be disabled with the
+    `enable-inspector-keybinding` key in the `org.gtk.Settings.Debug`
     GSettings schema.
   </para>
  

docs/reference/gtk/visual_index.xml

@@ -123,6 +123,12 @@
     <link linkend="GtkHeaderBar">
       <inlinegraphic fileref="headerbar.png" format="PNG"></inlinegraphic>
     </link>
+    <link linkend="GtkSearchBar">
+      <inlinegraphic fileref="search-bar.png" format="PNG"></inlinegraphic>
+    </link>
+    <link linkend="GtkActionBar">
+      <inlinegraphic fileref="action-bar.png" format="PNG"></inlinegraphic>
+    </link>
     <link linkend="GtkListBox">
       <inlinegraphic fileref="list-box.png" format="PNG"></inlinegraphic>
     </link>

docs/tools/widgets.c

@@ -395,6 +395,73 @@ create_info_bar (void)
 
   return info;
 }
+
+static WidgetInfo *
+create_search_bar (void)
+{
+  GtkWidget *widget;
+  GtkWidget *entry;
+  WidgetInfo *info;
+  GtkWidget *view;
+  GtkWidget *box;
+
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  widget = gtk_search_bar_new ();
+
+  entry = gtk_search_entry_new ();
+  gtk_entry_set_text (GTK_ENTRY (entry), "Search Bar");
+  gtk_container_add (GTK_CONTAINER (widget), entry);
+  gtk_widget_show (entry);
+
+  gtk_search_bar_set_show_close_button (GTK_SEARCH_BAR (widget), TRUE);
+  gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (widget), TRUE);
+
+  gtk_container_add (GTK_CONTAINER (box), widget);
+
+  view = gtk_text_view_new ();
+  gtk_widget_show (view);
+  gtk_box_pack_start (GTK_BOX (box), view, TRUE, TRUE, 0);
+
+  info = new_widget_info ("search-bar", box, SMALL);
+  gtk_container_set_border_width (GTK_CONTAINER (info->window), 0);
+
+  return info;
+}
+
+static WidgetInfo *
+create_action_bar (void)
+{
+  GtkWidget *widget;
+  GtkWidget *button;
+  WidgetInfo *info;
+  GtkWidget *view;
+  GtkWidget *box;
+
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  view = gtk_text_view_new ();
+  gtk_widget_show (view);
+  gtk_box_pack_start (GTK_BOX (box), view, TRUE, TRUE, 0);
+
+  widget = gtk_action_bar_new ();
+
+  button = gtk_button_new_from_icon_name ("object-select-symbolic", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (button);
+  gtk_container_add (GTK_CONTAINER (widget), button);
+  button = gtk_button_new_from_icon_name ("call-start-symbolic", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (button);
+  gtk_container_add (GTK_CONTAINER (widget), button);
+  g_object_set (gtk_widget_get_parent (button), "margin", 6, "spacing", 6, NULL);
+
+  gtk_widget_show (widget);
+
+  gtk_container_add (GTK_CONTAINER (box), widget);
+
+  info = new_widget_info ("action-bar", box, SMALL);
+  gtk_container_set_border_width (GTK_CONTAINER (info->window), 0);
+
+  return info;
+}
+
 static WidgetInfo *
 create_recent_chooser_dialog (void)
 {
@@ -1409,6 +1476,8 @@ get_all_widgets (void)
 {
   GList *retval = NULL;
 
+  retval = g_list_prepend (retval, create_search_bar ());
+  retval = g_list_prepend (retval, create_action_bar ());
   retval = g_list_prepend (retval, create_list_box());
   retval = g_list_prepend (retval, create_flow_box());
   retval = g_list_prepend (retval, create_headerbar ());

gdk/Makefile.am

@@ -426,7 +426,7 @@ stamp-gc-h: $(top_builddir)/config.status
 dist-hook: ../build/win32/vs9/gdk.vcproj ../build/win32/vs10/gdk.vcxproj ../build/win32/vs10/gdk.vcxproj.filters
 
 ../build/win32/vs9/gdk.vcproj: ../build/win32/vs9/gdk.vcprojin
-	for F in $(libgdk_3_la_SOURCES); do \
+	for F in `echo $(libgdk_3_la_SOURCES) | tr '/' '\\'`; do \
 		case $$F in \
 		*.c) echo '   <File RelativePath="..\..\..\gdk\'$$F'" />' \
 		     ;; \
@@ -436,7 +436,7 @@ dist-hook: ../build/win32/vs9/gdk.vcproj ../build/win32/vs10/gdk.vcxproj ../buil
 	rm libgdk.sourcefiles
 
 ../build/win32/vs10/gdk.vcxproj: ../build/win32/vs10/gdk.vcxprojin
-	for F in $(libgdk_3_la_SOURCES); do \
+	for F in `echo $(libgdk_3_la_SOURCES) | tr '/' '\\'`; do \
 		case $$F in \
 		*.c) echo '   <ClCompile Include="..\..\..\gdk\'$$F'" />' \
 		     ;; \
@@ -446,7 +446,7 @@ dist-hook: ../build/win32/vs9/gdk.vcproj ../build/win32/vs10/gdk.vcxproj ../buil
 	rm libgdk.vs10.sourcefiles
 
 ../build/win32/vs10/gdk.vcxproj.filters: ../build/win32/vs10/gdk.vcxproj.filtersin
-	for F in $(libgdk_3_la_SOURCES); do \
+	for F in `echo $(libgdk_3_la_SOURCES) | tr '/' '\\'`; do \
 		case $$F in \
 		*.c) echo '   <ClCompile Include="..\..\..\gdk\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
 		     ;; \

gdk/gdkcursor.h

@@ -219,10 +219,8 @@ GType      gdk_cursor_get_type           (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GdkCursor* gdk_cursor_new_for_display	 (GdkDisplay      *display,
 					  GdkCursorType    cursor_type);
-#ifndef GDK_MULTIHEAD_SAFE
 GDK_AVAILABLE_IN_ALL
 GdkCursor* gdk_cursor_new		 (GdkCursorType	   cursor_type);
-#endif
 GDK_AVAILABLE_IN_ALL
 GdkCursor* gdk_cursor_new_from_pixbuf	 (GdkDisplay      *display,
 					  GdkPixbuf       *pixbuf,

gdk/gdkdevice.c

@@ -190,7 +190,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                                                       GDK_TYPE_INPUT_SOURCE,
                                                       GDK_SOURCE_MOUSE,
                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
-                                                      G_PARAM_STATIC_STRINGS));
+                                                      G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY));
   /**
    * GdkDevice:input-mode:
    *
@@ -205,7 +205,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                                                       P_("Input mode for the device"),
                                                       GDK_TYPE_INPUT_MODE,
                                                       GDK_MODE_DISABLED,
-                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY));
   /**
    * GdkDevice:has-cursor:
    *

gdk/gdkdisplayprivate.h

@@ -31,17 +31,7 @@ G_BEGIN_DECLS
 
 typedef struct _GdkDisplayClass GdkDisplayClass;
 
-/* Tracks information about the keyboard grab on this display */
-typedef struct
-{
-  GdkWindow *window;
-  GdkWindow *native_window;
-  gulong serial;
-  gboolean owner_events;
-  guint32 time;
-} GdkKeyboardGrabInfo;
-
-/* Tracks information about the pointer grab on this display */
+/* Tracks information about the device grab on this display */
 typedef struct
 {
   GdkWindow *window;

gdk/gdkevents.c

@@ -479,11 +479,7 @@ gdk_event_put (const GdkEvent *event)
   if (event->any.window)
     display = gdk_window_get_display (event->any.window);
   else
-    {
-      GDK_NOTE (MULTIHEAD,
-		g_message ("Falling back to default display for gdk_event_put()"));
-      display = gdk_display_get_default ();
-    }
+    display = gdk_display_get_default ();
 
   gdk_display_put_event (display, event);
 }
@@ -1952,7 +1948,7 @@ gdk_event_get_screen (const GdkEvent *event)
  * %GDK_TOUCH_END or %GDK_TOUCH_CANCEL, returns the #GdkEventSequence
  * to which the event belongs. Otherwise, return %NULL.
  *
- * Returns: the event sequence that the event belongs to
+ * Returns: (transfer none): the event sequence that the event belongs to
  *
  * Since: 3.4
  */
@@ -2209,6 +2205,22 @@ G_DEFINE_BOXED_TYPE (GdkEvent, gdk_event,
                      gdk_event_copy,
                      gdk_event_free)
 
+static GdkEventSequence *
+gdk_event_sequence_copy (GdkEventSequence *sequence)
+{
+  return sequence;
+}
+
+static void
+gdk_event_sequence_free (GdkEventSequence *sequence)
+{
+  /* Nothing to free here */
+}
+
+G_DEFINE_BOXED_TYPE (GdkEventSequence, gdk_event_sequence,
+                     gdk_event_sequence_copy,
+                     gdk_event_sequence_free)
+
 /**
  * gdk_setting_get:
  * @name: the name of the setting.

gdk/gdkevents.h

@@ -50,6 +50,7 @@ G_BEGIN_DECLS
 
 
 #define GDK_TYPE_EVENT          (gdk_event_get_type ())
+#define GDK_TYPE_EVENT_SEQUENCE (gdk_event_sequence_get_type ())
 
 /**
  * GDK_PRIORITY_EVENTS:
@@ -1193,6 +1194,9 @@ union _GdkEvent
 GDK_AVAILABLE_IN_ALL
 GType     gdk_event_get_type            (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_3_14
+GType     gdk_event_sequence_get_type   (void) G_GNUC_CONST;
+
 GDK_AVAILABLE_IN_ALL
 gboolean  gdk_events_pending	 	(void);
 GDK_AVAILABLE_IN_ALL
@@ -1301,14 +1305,10 @@ void	  gdk_set_show_events		(gboolean	 show_events);
 GDK_AVAILABLE_IN_ALL
 gboolean  gdk_get_show_events		(void);
 
-#ifndef GDK_MULTIHEAD_SAFE
-
 GDK_AVAILABLE_IN_ALL
 gboolean gdk_setting_get                (const gchar    *name,
                                          GValue         *value);
 
-#endif /* GDK_MULTIHEAD_SAFE */
-
 G_END_DECLS
 
 #endif /* __GDK_EVENTS_H__ */

gdk/gdkkeys.h

@@ -80,10 +80,8 @@ struct _GdkKeymapKey
 GDK_AVAILABLE_IN_ALL
 GType gdk_keymap_get_type (void) G_GNUC_CONST;
 
-#ifndef GDK_MULTIHEAD_SAFE
 GDK_AVAILABLE_IN_ALL
 GdkKeymap* gdk_keymap_get_default     (void);
-#endif
 GDK_AVAILABLE_IN_ALL
 GdkKeymap* gdk_keymap_get_for_display (GdkDisplay *display);
 

gdk/gdkmain.h

@@ -95,8 +95,6 @@ GdkGrabStatus gdk_keyboard_grab      (GdkWindow    *window,
                                       guint32       time_);
 #endif /* GDK_MULTIDEVICE_SAFE */
 
-#ifndef GDK_MULTIHEAD_SAFE
-
 #ifndef GDK_MULTIDEVICE_SAFE
 GDK_DEPRECATED_IN_3_0_FOR(gdk_device_ungrab)
 void          gdk_pointer_ungrab     (guint32       time_);
@@ -122,8 +120,6 @@ void gdk_set_double_click_time (guint msec);
 GDK_AVAILABLE_IN_ALL
 void gdk_beep (void);
 
-#endif /* GDK_MULTIHEAD_SAFE */
-
 GDK_AVAILABLE_IN_ALL
 void gdk_flush (void);
 

gdk/gdkoffscreenwindow.c

@@ -735,7 +735,7 @@ gdk_offscreen_window_class_init (GdkOffscreenWindowClass *klass)
   impl_class->focus = NULL;
   impl_class->set_type_hint = NULL;
   impl_class->get_type_hint = NULL;
-  impl_class->set_modal_hint = NULL;
+  impl_class->set_modal_hint = gdk_offscreen_window_set_boolean;
   impl_class->set_skip_taskbar_hint = gdk_offscreen_window_set_boolean;
   impl_class->set_skip_pager_hint = gdk_offscreen_window_set_boolean;
   impl_class->set_urgency_hint = gdk_offscreen_window_set_boolean;
@@ -746,7 +746,7 @@ gdk_offscreen_window_class_init (GdkOffscreenWindowClass *klass)
   impl_class->set_transient_for = gdk_offscreen_window_set_transient_for;
   impl_class->get_frame_extents = gdk_offscreen_window_get_frame_extents;
   impl_class->set_override_redirect = NULL;
-  impl_class->set_accept_focus = NULL;
+  impl_class->set_accept_focus = gdk_offscreen_window_set_boolean;
   impl_class->set_focus_on_map = gdk_offscreen_window_set_boolean;
   impl_class->set_icon_list = gdk_offscreen_window_set_list;
   impl_class->set_icon_name = gdk_offscreen_window_set_string;

gdk/gdkpango.h

@@ -31,10 +31,8 @@ G_BEGIN_DECLS
 
 GDK_AVAILABLE_IN_ALL
 PangoContext *gdk_pango_context_get_for_screen (GdkScreen    *screen);
-#ifndef GDK_MULTIHEAD_SAFE
 GDK_AVAILABLE_IN_ALL
 PangoContext *gdk_pango_context_get            (void);
-#endif
 
 
 /* Get a clip region to draw only part of a layout or

gdk/gdkselection.h

@@ -152,7 +152,6 @@ G_BEGIN_DECLS
 /* Selections
  */
 
-#ifndef GDK_MULTIHEAD_SAFE
 GDK_AVAILABLE_IN_ALL
 gboolean   gdk_selection_owner_set (GdkWindow	 *owner,
 				    GdkAtom	  selection,
@@ -160,8 +159,6 @@ gboolean   gdk_selection_owner_set (GdkWindow	 *owner,
 				    gboolean      send_event);
 GDK_AVAILABLE_IN_ALL
 GdkWindow* gdk_selection_owner_get (GdkAtom	  selection);
-#endif/* GDK_MULTIHEAD_SAFE */
-
 GDK_AVAILABLE_IN_ALL
 gboolean   gdk_selection_owner_set_for_display (GdkDisplay *display,
 						GdkWindow  *owner,

gdk/gdkvisual.h

@@ -82,7 +82,6 @@ typedef enum
 GDK_AVAILABLE_IN_ALL
 GType         gdk_visual_get_type            (void) G_GNUC_CONST;
 
-#ifndef GDK_MULTIHEAD_SAFE
 GDK_AVAILABLE_IN_ALL
 gint          gdk_visual_get_best_depth      (void);
 GDK_AVAILABLE_IN_ALL
@@ -108,7 +107,6 @@ void gdk_query_visual_types (GdkVisualType  **visual_types,
 
 GDK_AVAILABLE_IN_ALL
 GList* gdk_list_visuals (void);
-#endif
 
 GDK_AVAILABLE_IN_ALL
 GdkScreen    *gdk_visual_get_screen (GdkVisual *visual);

gdk/gdkwindow.c

@@ -1243,9 +1243,6 @@ gdk_window_new (GdkWindow     *parent,
 
   if (!parent)
     {
-      GDK_NOTE (MULTIHEAD,
-		g_warning ("gdk_window_new(): no parent specified reverting to parent = default root window"));
-
       screen = gdk_screen_get_default ();
       parent = gdk_screen_get_root_window (screen);
     }
@@ -6034,12 +6031,7 @@ gdk_window_get_geometry (GdkWindow *window,
   GdkWindowImplClass *impl_class;
 
   if (!window)
-    {
-      GDK_NOTE (MULTIHEAD,
-		g_message ("gdk_window_get_geometry(): Window needs "
-			   "to be non-NULL to be multi head safe"));
-      window = gdk_screen_get_root_window ((gdk_screen_get_default ()));
-    }
+    window = gdk_screen_get_root_window ((gdk_screen_get_default ()));
 
   g_return_if_fail (GDK_IS_WINDOW (window));
 
@@ -6891,6 +6883,7 @@ update_cursor (GdkDisplay *display,
   /* Find the first window with the cursor actually set, as
      the cursor is inherited from the parent */
   while (cursor_window->cursor == NULL &&
+         !g_hash_table_contains (cursor_window->device_cursor, device) &&
 	 (parent = get_event_parent (cursor_window)) != NULL &&
 	 parent->window_type != GDK_WINDOW_ROOT)
     cursor_window = parent;

gdk/wayland/Makefile.am

@@ -44,7 +44,9 @@ libgdk_wayland_la_SOURCES =			\
 	gdkselection-wayland.c			\
 	gdkwindow-wayland.c			\
 	gdkwayland.h				\
-	gdkprivate-wayland.h
+	gdkprivate-wayland.h			\
+	wm-button-layout-translation.c		\
+	wm-button-layout-translation.h
 
 libgdkinclude_HEADERS =				\
 	gdkwayland.h

gdk/wayland/gdkdevice-wayland.c

@@ -1129,7 +1129,7 @@ deliver_key_event (GdkWaylandDeviceData *device,
   event->key.window = device->keyboard_focus ? g_object_ref (device->keyboard_focus) : NULL;
   gdk_event_set_device (event, device->master_keyboard);
   gdk_event_set_source_device (event, device->keyboard);
-  event->button.time = time_;
+  event->key.time = time_;
   event->key.state = device->modifiers;
   event->key.group = 0;
   event->key.hardware_keycode = key;
@@ -1289,7 +1289,7 @@ _create_touch_event (GdkWaylandDeviceData *device,
   event->touch.time = time;
   event->touch.state = device->modifiers;
   gdk_event_set_screen (event, display->screen);
-  event->touch.sequence = GUINT_TO_POINTER (touch->id);
+  event->touch.sequence = GUINT_TO_POINTER (touch->id + 1);
 
   if (touch->initial_touch)
     {

gdk/wayland/gdkscreen-wayland.c

@@ -29,6 +29,8 @@
 #include "gdkwayland.h"
 #include "gdkprivate-wayland.h"
 
+#include "wm-button-layout-translation.h"
+
 typedef struct _GdkWaylandScreen      GdkWaylandScreen;
 typedef struct _GdkWaylandScreenClass GdkWaylandScreenClass;
 
@@ -480,6 +482,9 @@ update_xft_settings (GdkScreen *screen)
     }
 }
 
+#define WM_SETTINGS_SCHEMA "org.gnome.desktop.wm.preferences"
+#define CLASSIC_WM_SETTINGS_SCHEMA "org.gnome.shell.extensions.classic-overrides"
+
 typedef struct _TranslationEntry TranslationEntry;
 struct _TranslationEntry {
   const gchar *schema;
@@ -511,6 +516,8 @@ static TranslationEntry translations[] = {
   { "org.gnome.desktop.sound", "input-feedback-sounds", "gtk-enable-input-feedback-sounds", G_TYPE_BOOLEAN, { . b = FALSE } },
   { "org.gnome.desktop.privacy", "recent-files-max-age", "gtk-recent-files-max-age", G_TYPE_INT, { .i = 30 } },
   { "org.gnome.desktop.privacy", "remember-recent-files",    "gtk-recent-files-enabled", G_TYPE_BOOLEAN, { .b = TRUE } },
+  { WM_SETTINGS_SCHEMA, "button-layout",    "gtk-decoration-layout", G_TYPE_STRING, { .s = "menu:close" } },
+  { CLASSIC_WM_SETTINGS_SCHEMA, "button-layout",   "gtk-decoration-layout", G_TYPE_STRING, { .s = "menu:close" } },
   { "org.gnome.settings-daemon.plugins.xsettings", "antialiasing", "gtk-xft-antialias", G_TYPE_NONE, { .i = 0 } },
   { "org.gnome.settings-daemon.plugins.xsettings", "hinting", "gtk-xft-hinting", G_TYPE_NONE, { .i = 0 } },
   { "org.gnome.settings-daemon.plugins.xsettings", "hinting", "gtk-xft-hintstyle", G_TYPE_NONE, { .i = 0 } },
@@ -681,6 +688,41 @@ set_value_from_entry (GdkScreen        *screen,
     }
 }
 
+static void
+set_decoration_layout_from_entry (GdkScreen        *screen,
+                                  TranslationEntry *entry,
+                                  GValue           *value)
+{
+  GdkWaylandScreen *screen_wayland = GDK_WAYLAND_SCREEN (screen);
+  GSettings *settings = NULL;
+  const char *session;
+
+  /* Hack: until we get session-dependent defaults in GSettings,
+   *       swap out the usual schema for the "classic" one when
+   *       running in classic mode
+   */
+  session = g_getenv ("XDG_CURRENT_DESKTOP");
+  if (session && strstr (session, "GNOME-Classic"))
+    settings = (GSettings *)g_hash_table_lookup (screen_wayland->settings, CLASSIC_WM_SETTINGS_SCHEMA);
+
+  if (settings == NULL)
+    settings = (GSettings *)g_hash_table_lookup (screen_wayland->settings, WM_SETTINGS_SCHEMA);
+
+  if (settings)
+    {
+      gchar *s = g_settings_get_string (settings, entry->key);
+
+      translate_wm_button_layout_to_gtk (s);
+      g_value_set_string (value, s);
+
+      g_free (s);
+    }
+  else
+    {
+      g_value_set_static_string (value, entry->fallback.s);
+    }
+}
+
 static gboolean
 set_capability_setting (GdkScreen                 *screen,
 			GValue                    *value,
@@ -705,7 +747,10 @@ gdk_wayland_screen_get_setting (GdkScreen   *screen,
   entry = find_translation_entry_by_setting (name);
   if (entry != NULL)
     {
-      set_value_from_entry (screen, entry, value);
+      if (strcmp (name, "gtk-decoration-layout") == 0)
+        set_decoration_layout_from_entry (screen, entry, value);
+      else
+        set_value_from_entry (screen, entry, value);
       return TRUE;
    }
 

gdk/wayland/gdkwindow-wayland.c

@@ -47,14 +47,6 @@
    GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN && \
    GDK_WINDOW_TYPE (window) != GDK_WINDOW_OFFSCREEN)
 
-/* Return whether time1 is considered later than time2 as far as xserver
- * time is concerned.  Accounts for wraparound.
- */
-#define XSERVER_TIME_IS_LATER(time1, time2)                        \
-  ( (( time1 > time2 ) && ( time1 - time2 < ((guint32)-1)/2 )) ||  \
-    (( time1 < time2 ) && ( time2 - time1 > ((guint32)-1)/2 ))     \
-  )
-
 typedef struct _GdkWaylandWindow GdkWaylandWindow;
 typedef struct _GdkWaylandWindowClass GdkWaylandWindowClass;
 
@@ -1934,6 +1926,40 @@ gdk_wayland_window_set_shadow_width (GdkWindow *window,
   gdk_wayland_window_sync_margin (window);
 }
 
+static gboolean
+gdk_wayland_window_show_window_menu (GdkWindow *window,
+                                     GdkEvent  *event)
+{
+  GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
+  GdkEventButton *event_button = (GdkEventButton *) event;
+  struct wl_seat *seat;
+  double x, y;
+  GdkWaylandDeviceData *device;
+
+  switch (event->type)
+    {
+    case GDK_BUTTON_PRESS:
+    case GDK_BUTTON_RELEASE:
+      break;
+    default:
+      return FALSE;
+    }
+
+  if (!impl->xdg_surface)
+    return FALSE;
+
+  seat = gdk_wayland_device_get_wl_seat (event_button->device);
+  device = wl_seat_get_user_data (seat);
+
+  gdk_event_get_coords (event, &x, &y);
+
+  xdg_surface_show_window_menu (impl->xdg_surface,
+                                seat,
+                                _gdk_wayland_device_get_button_press_serial (device),
+                                x, y);
+  return TRUE;
+}
+
 static void
 _gdk_window_impl_wayland_class_init (GdkWindowImplWaylandClass *klass)
 {
@@ -2023,6 +2049,7 @@ _gdk_window_impl_wayland_class_init (GdkWindowImplWaylandClass *klass)
   impl_class->get_scale_factor = gdk_wayland_window_get_scale_factor;
   impl_class->set_opaque_region = gdk_wayland_window_set_opaque_region;
   impl_class->set_shadow_width = gdk_wayland_window_set_shadow_width;
+  impl_class->show_window_menu = gdk_wayland_window_show_window_menu;
 }
 
 void

gdk/wayland/protocol/xdg-shell.xml

@@ -198,6 +198,26 @@
       <arg name="app_id" type="string"/>
     </request>
 
+    <request name="show_window_menu">
+      <description summary="show the window menu">
+        Clients implementing client-side decorations might want to show
+        a context menu when right-clicking on the decorations, giving the
+        user a menu that they can use to maximize or minimize the window.
+
+        This request asks the compositor to pop up such a window menu at
+        the given position, relative to the parent surface. There are
+        no guarantees as to what the window menu contains.
+
+        Your surface must have focus on the seat passed in to pop up the
+        window menu.
+      </description>
+
+      <arg name="seat" type="object" interface="wl_seat" summary="the seat to pop the window up on"/>
+      <arg name="serial" type="uint" summary="serial of the event to pop up the window for"/>
+      <arg name="x" type="int" summary="the x position to pop up the window menu at"/>
+      <arg name="y" type="int" summary="the y position to pop up the window menu at"/>
+    </request>
+
     <request name="move">
       <description summary="start an interactive move">
 	Start a pointer-driven move of the surface.

gdk/wayland/wm-button-layout-translation.c

@@ -0,0 +1,88 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2014 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author:  Florian Müllner <fmuellner@gnome.org>
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <glib.h>
+
+#include "wm-button-layout-translation.h"
+
+static void
+translate_buttons (char *layout, int *len_p)
+{
+  char *strp = layout, *button;
+  int len = 0;
+
+  if (!layout || !*layout)
+    goto out;
+
+  while ((button = strsep (&strp, ",")))
+    {
+      char *gtkbutton;
+
+      if (strcmp (button, "menu") == 0)
+        gtkbutton = "icon";
+      else if (strcmp (button, "appmenu") == 0)
+        gtkbutton = "menu";
+      else if (strcmp (button, "minimize") == 0)
+        gtkbutton = "minimize";
+      else if (strcmp (button, "maximize") == 0)
+        gtkbutton = "maximize";
+      else if  (strcmp (button, "close") == 0)
+        gtkbutton = "close";
+      else
+        continue;
+
+      if (len)
+        layout[len++] = ',';
+
+      strcpy (layout + len, gtkbutton);
+      len += strlen (gtkbutton);
+    }
+  layout[len] = '\0';
+
+out:
+  if (len_p)
+    *len_p = len;
+}
+
+void
+translate_wm_button_layout_to_gtk (char *layout)
+{
+  char *strp = layout, *left_buttons, *right_buttons;
+  int left_len, right_len = 0;
+
+  left_buttons = strsep (&strp, ":");
+  right_buttons = strp;
+
+  translate_buttons (left_buttons, &left_len);
+  memmove (layout, left_buttons, left_len);
+
+  if (strp == NULL)
+    goto out; /* no ":" in layout */
+
+  layout[left_len++] = ':';
+
+  translate_buttons (right_buttons, &right_len);
+  memmove (layout + left_len, right_buttons, right_len);
+
+out:
+  layout[left_len + right_len] = '\0';
+}

gdk/wayland/wm-button-layout-translation.h

@@ -0,0 +1,26 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2014 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author:  Florian Müllner <fmuellner@gnome.org>
+ */
+
+#ifndef __WM_BUTTON_LAYOUT_TRANSLATION__
+#define __WM_BUTTON_LAYOUT_TRANSLATION__
+
+void translate_wm_button_layout_to_gtk (char *layout);
+
+#endif

gdk/x11/gdkproperty-x11.c

@@ -469,8 +469,6 @@ _gdk_x11_window_get_property (GdkWindow   *window,
     {
       GdkScreen *screen = gdk_screen_get_default ();
       window = gdk_screen_get_root_window (screen);
-      
-      GDK_NOTE (MULTIHEAD, g_message ("gdk_property_get(): window is NULL\n"));
     }
   else if (!GDK_WINDOW_IS_X11 (window))
     return FALSE;
@@ -607,8 +605,6 @@ _gdk_x11_window_change_property (GdkWindow    *window,
       
       screen = gdk_screen_get_default ();
       window = gdk_screen_get_root_window (screen);
-      
-      GDK_NOTE (MULTIHEAD, g_message ("gdk_property_change(): window is NULL\n"));
     }
   else if (!GDK_WINDOW_IS_X11 (window))
     return;
@@ -658,9 +654,6 @@ _gdk_x11_window_delete_property (GdkWindow *window,
     {
       GdkScreen *screen = gdk_screen_get_default ();
       window = gdk_screen_get_root_window (screen);
-      
-      GDK_NOTE (MULTIHEAD, 
-		g_message ("gdk_property_delete(): window is NULL\n"));
     }
   else if (!GDK_WINDOW_IS_X11 (window))
     return;

gdk/x11/gdkx11property.h

@@ -49,7 +49,6 @@ Atom                  gdk_x11_get_xatom_by_name_for_display (GdkDisplay  *displa
 GDK_AVAILABLE_IN_ALL
 const gchar *         gdk_x11_get_xatom_name_for_display (GdkDisplay  *display,
                                                           Atom         xatom);
-#ifndef GDK_MULTIHEAD_SAFE
 GDK_AVAILABLE_IN_ALL
 Atom                  gdk_x11_atom_to_xatom     (GdkAtom      atom);
 GDK_AVAILABLE_IN_ALL
@@ -58,7 +57,6 @@ GDK_AVAILABLE_IN_ALL
 Atom                  gdk_x11_get_xatom_by_name (const gchar *atom_name);
 GDK_AVAILABLE_IN_ALL
 const gchar *         gdk_x11_get_xatom_name    (Atom         xatom);
-#endif
 
 G_END_DECLS
 

gdk/x11/gdkx11screen.h

@@ -61,10 +61,8 @@ int      gdk_x11_screen_get_screen_number (GdkScreen   *screen);
 GDK_AVAILABLE_IN_ALL
 const char* gdk_x11_screen_get_window_manager_name (GdkScreen *screen);
 
-#ifndef GDK_MULTIHEAD_SAFE
 GDK_AVAILABLE_IN_ALL
 gint     gdk_x11_get_default_screen       (void);
-#endif
 
 /**
  * GDK_SCREEN_XDISPLAY:

gdk/x11/gdkx11utils.h

@@ -36,21 +36,17 @@
 
 G_BEGIN_DECLS
 
-#ifndef GDK_MULTIHEAD_SAFE
 GDK_AVAILABLE_IN_ALL
 Window   gdk_x11_get_default_root_xwindow (void);
 GDK_AVAILABLE_IN_ALL
 Display *gdk_x11_get_default_xdisplay     (void);
-#endif
 
-#ifndef GDK_MULTIHEAD_SAFE
 /**
  * GDK_ROOT_WINDOW:
  *
  * Obtains the Xlib window id of the root window of the current screen.
  */
 #define GDK_ROOT_WINDOW()             (gdk_x11_get_default_root_xwindow ())
-#endif
 
 /**
  * GDK_XID_TO_POINTER:
@@ -71,12 +67,10 @@ Display *gdk_x11_get_default_xdisplay     (void);
  */
 #define GDK_POINTER_TO_XID(pointer) GPOINTER_TO_UINT(pointer)
 
-#ifndef GDK_MULTIHEAD_SAFE
 GDK_AVAILABLE_IN_ALL
 void          gdk_x11_grab_server    (void);
 GDK_AVAILABLE_IN_ALL
 void          gdk_x11_ungrab_server  (void);
-#endif
 
 G_END_DECLS
 

gtk/Makefile.am

@@ -18,7 +18,7 @@ else
 GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
 endif
 
-SUBDIRS = a11y inspector native .
+SUBDIRS = inspector native .
 
 if HAVE_CLOUDPRINT
 if HAVE_PAPI_CUPS
@@ -116,13 +116,11 @@ endif
 libgtkincludedir = $(includedir)/gtk-3.0/gtk
 libadd = \
 	$(top_builddir)/gdk/libgdk-3.la	\
-	$(top_builddir)/gtk/a11y/libgtka11y.la \
 	$(top_builddir)/gtk/inspector/libgtkinspector.la \
 	$(GMODULE_LIBS) \
 	$(GTK_DEP_LIBS)
 deps = \
 	$(top_builddir)/gdk/libgdk-3.la	\
-	$(top_builddir)/gtk/a11y/libgtka11y.la \
 	$(top_builddir)/gtk/inspector/libgtkinspector.la
 
 # libtool stuff: set version and export symbols for resolving
@@ -155,10 +153,63 @@ endif
 # GTK+ header files for public installation (non-generated, or generated
 # by configure)
 
+a11y_h_sources =				\
+	a11y/gtkarrowaccessible.h		\
+	a11y/gtkbooleancellaccessible.h		\
+	a11y/gtkbuttonaccessible.h		\
+	a11y/gtkcellaccessible.h		\
+	a11y/gtkcellaccessibleparent.h		\
+	a11y/gtkcheckmenuitemaccessible.h	\
+	a11y/gtkcomboboxaccessible.h		\
+	a11y/gtkcontaineraccessible.h		\
+	a11y/gtkcontainercellaccessible.h	\
+	a11y/gtkentryaccessible.h		\
+	a11y/gtkexpanderaccessible.h		\
+	a11y/gtkflowboxaccessible.h		\
+	a11y/gtkflowboxchildaccessible.h	\
+	a11y/gtkframeaccessible.h		\
+	a11y/gtkiconviewaccessible.h		\
+	a11y/gtkimageaccessible.h		\
+	a11y/gtkimagecellaccessible.h		\
+	a11y/gtklabelaccessible.h		\
+	a11y/gtklevelbaraccessible.h 		\
+	a11y/gtklinkbuttonaccessible.h		\
+	a11y/gtklistboxaccessible.h		\
+	a11y/gtklistboxrowaccessible.h		\
+	a11y/gtklockbuttonaccessible.h		\
+	a11y/gtkmenuaccessible.h		\
+	a11y/gtkmenubuttonaccessible.h		\
+	a11y/gtkmenuitemaccessible.h		\
+	a11y/gtkmenushellaccessible.h		\
+	a11y/gtknotebookaccessible.h		\
+	a11y/gtknotebookpageaccessible.h	\
+	a11y/gtkpanedaccessible.h		\
+	a11y/gtkpopoveraccessible.h		\
+	a11y/gtkprogressbaraccessible.h		\
+	a11y/gtkradiobuttonaccessible.h		\
+	a11y/gtkradiomenuitemaccessible.h	\
+	a11y/gtkrangeaccessible.h		\
+	a11y/gtkrenderercellaccessible.h	\
+	a11y/gtkscaleaccessible.h		\
+	a11y/gtkscalebuttonaccessible.h		\
+	a11y/gtkscrolledwindowaccessible.h	\
+	a11y/gtkspinbuttonaccessible.h		\
+	a11y/gtkspinneraccessible.h		\
+	a11y/gtkstatusbaraccessible.h		\
+	a11y/gtkswitchaccessible.h		\
+	a11y/gtktextcellaccessible.h		\
+	a11y/gtktextviewaccessible.h		\
+	a11y/gtktogglebuttonaccessible.h	\
+	a11y/gtktoplevelaccessible.h		\
+	a11y/gtktreeviewaccessible.h		\
+	a11y/gtkwidgetaccessible.h		\
+	a11y/gtkwindowaccessible.h
+
 deprecated_h_sources = 			\
 	deprecated/gtkactivatable.h	\
 	deprecated/gtkaction.h		\
 	deprecated/gtkactiongroup.h	\
+	deprecated/gtkalignment.h	\
 	deprecated/gtkarrow.h		\
 	deprecated/gtkcolorsel.h	\
 	deprecated/gtkcolorseldialog.h	\
@@ -193,6 +244,22 @@ deprecated_h_sources = 			\
 	deprecated/gtkvseparator.h	\
 	deprecated/gtkvpaned.h
 
+a11y_private_h_sources =			\
+	a11y/gtkaccessibility.h			\
+	a11y/gtkaccessibilitymisc.h		\
+	a11y/gtkaccessibilityutil.h		\
+	a11y/gtkcellaccessibleprivate.h		\
+	a11y/gtkcolorswatchaccessibleprivate.h	\
+	a11y/gtkcontaineraccessibleprivate.h	\
+	a11y/gtkiconviewaccessibleprivate.h	\
+	a11y/gtklabelaccessibleprivate.h	\
+	a11y/gtkflowboxaccessibleprivate.h	\
+	a11y/gtklistboxaccessibleprivate.h	\
+	a11y/gtklockbuttonaccessibleprivate.h	\
+	a11y/gtktextviewaccessibleprivate.h	\
+	a11y/gtktreeviewaccessibleprivate.h	\
+	a11y/gtkwidgetaccessibleprivate.h
+
 deprecated_private_h_sources =			\
 	deprecated/gtkgradientprivate.h		\
 	deprecated/gtknumerableiconprivate.h	\
@@ -210,7 +277,6 @@ gtk_public_h_sources = 		\
 	gtkactionable.h		\
 	gtkactionbar.h		\
 	gtkadjustment.h		\
-	gtkalignment.h		\
 	gtkappchooser.h		\
 	gtkappchooserbutton.h	\
 	gtkappchooserdialog.h	\
@@ -266,6 +332,7 @@ gtk_public_h_sources = 		\
 	gtkentrycompletion.h	\
 	gtkenums.h		\
 	gtkeventbox.h		\
+	gtkeventcontroller.h	\
 	gtkexpander.h		\
 	gtkfilechooser.h	\
 	gtkfilechooserbutton.h	\
@@ -279,6 +346,15 @@ gtk_public_h_sources = 		\
 	gtkfontchooserdialog.h  \
 	gtkfontchooserwidget.h	\
 	gtkframe.h		\
+	gtkgesture.h		\
+	gtkgesturedrag.h	\
+	gtkgesturelongpress.h	\
+	gtkgesturemultipress.h	\
+	gtkgesturepan.h		\
+	gtkgesturerotate.h	\
+	gtkgesturesingle.h	\
+	gtkgestureswipe.h	\
+	gtkgesturezoom.h	\
 	gtkgrid.h		\
 	gtkheaderbar.h		\
 	gtkicontheme.h		\
@@ -395,7 +471,8 @@ gtk_public_h_sources = 		\
 	gtkvolumebutton.h	\
 	gtkwidget.h		\
 	gtkwidgetpath.h		\
-	gtkwindow.h
+	gtkwindow.h		\
+	gtkwindowgroup.h
 
 if OS_UNIX
 gtk_unix_print_public_h_sources = 	\
@@ -444,6 +521,7 @@ gtk_private_h_sources =		\
 	gtkcolorplaneprivate.h	\
 	gtkcolorscaleprivate.h	\
 	gtkcolorchooserprivate.h	\
+	gtkcomboboxprivate.h	\
 	gtkcontainerprivate.h   \
 	gtkcssanimationprivate.h	\
 	gtkcssarrayvalueprivate.h	\
@@ -493,6 +571,7 @@ gtk_private_h_sources =		\
 	gtkcustompaperunixdialog.h \
 	gtkdialogprivate.h 	\
 	gtkentryprivate.h	\
+	gtkeventcontrollerprivate.h	\
 	gtkfilechooserembed.h	\
 	gtkfilechooserentry.h	\
 	gtkfilechooserprivate.h	\
@@ -501,6 +580,15 @@ gtk_private_h_sources =		\
 	gtkfilesystemmodel.h	\
 	gtkfontchooserprivate.h	\
 	gtkfontchooserutils.h	\
+	gtkgestureprivate.h	\
+	gtkgesturedragprivate.h	\
+	gtkgesturelongpressprivate.h	\
+	gtkgesturemultipressprivate.h	\
+	gtkgesturepanprivate.h	\
+	gtkgesturerotateprivate.h	\
+	gtkgesturesingleprivate.h	\
+	gtkgestureswipeprivate.h	\
+	gtkgesturezoomprivate.h	\
 	gtkheaderbarprivate.h	\
 	gtkhslaprivate.h	\
 	gtkiconcache.h		\
@@ -511,6 +599,7 @@ gtk_private_h_sources =		\
 	gtkimcontextsimpleseqs.h \
 	gtkintl.h		\
 	gtkkeyhash.h		\
+	gtkkineticscrolling.h	\
 	gtklabelprivate.h	\
 	gtklockbuttonprivate.h	\
 	gtkmagnifierprivate.h	\
@@ -530,7 +619,6 @@ gtk_private_h_sources =		\
 	gtkorientableprivate.h	\
 	gtkpango.h		\
 	gtkpathbar.h		\
-	gtkpressandholdprivate.h \
 	gtkprintoperation-private.h \
 	gtkprintutils.h		\
 	gtkprivate.h		\
@@ -581,11 +669,68 @@ gtk_private_h_sources =		\
 	$(gtk_private_type_h_sources) \
 	$(gtk_clipboard_dnd_h_sources)
 
+a11y_c_sources =				\
+	a11y/gtkaccessibility.c			\
+	a11y/gtkaccessibilitymisc.c 		\
+	a11y/gtkaccessibilityutil.c		\
+	a11y/gtkarrowaccessible.c		\
+	a11y/gtkbooleancellaccessible.c		\
+	a11y/gtkbuttonaccessible.c		\
+	a11y/gtkcellaccessible.c		\
+	a11y/gtkcellaccessibleparent.c		\
+	a11y/gtkcheckmenuitemaccessible.c	\
+	a11y/gtkcolorswatchaccessible.c		\
+	a11y/gtkcomboboxaccessible.c		\
+	a11y/gtkcontaineraccessible.c		\
+	a11y/gtkcontainercellaccessible.c	\
+	a11y/gtkentryaccessible.c		\
+	a11y/gtkexpanderaccessible.c		\
+	a11y/gtkflowboxaccessible.c		\
+	a11y/gtkflowboxchildaccessible.c	\
+	a11y/gtkframeaccessible.c		\
+	a11y/gtkiconviewaccessible.c		\
+	a11y/gtkimageaccessible.c		\
+	a11y/gtkimagecellaccessible.c		\
+	a11y/gtklabelaccessible.c		\
+	a11y/gtklevelbaraccessible.c		\
+	a11y/gtklinkbuttonaccessible.c		\
+	a11y/gtklistboxaccessible.c		\
+	a11y/gtklistboxrowaccessible.c		\
+	a11y/gtklockbuttonaccessible.c		\
+	a11y/gtkmenuaccessible.c		\
+	a11y/gtkmenubuttonaccessible.c		\
+	a11y/gtkmenushellaccessible.c		\
+	a11y/gtkmenuitemaccessible.c		\
+	a11y/gtknotebookaccessible.c		\
+	a11y/gtknotebookpageaccessible.c	\
+	a11y/gtkpanedaccessible.c		\
+	a11y/gtkpopoveraccessible.c		\
+	a11y/gtkprogressbaraccessible.c		\
+	a11y/gtkradiobuttonaccessible.c		\
+	a11y/gtkradiomenuitemaccessible.c	\
+	a11y/gtkrangeaccessible.c		\
+	a11y/gtkrenderercellaccessible.c	\
+	a11y/gtkscaleaccessible.c		\
+	a11y/gtkscalebuttonaccessible.c		\
+	a11y/gtkscrolledwindowaccessible.c	\
+	a11y/gtkspinbuttonaccessible.c		\
+	a11y/gtkspinneraccessible.c		\
+	a11y/gtkstatusbaraccessible.c		\
+	a11y/gtkswitchaccessible.c		\
+	a11y/gtktextcellaccessible.c		\
+	a11y/gtktextviewaccessible.c		\
+	a11y/gtktogglebuttonaccessible.c	\
+	a11y/gtktoplevelaccessible.c		\
+	a11y/gtktreeviewaccessible.c		\
+	a11y/gtkwidgetaccessible.c		\
+	a11y/gtkwindowaccessible.c
+
 # GTK+ C sources to build the library from
 deprecated_c_sources = 			\
 	deprecated/gtkactivatable.c	\
 	deprecated/gtkaction.c		\
 	deprecated/gtkactiongroup.c	\
+	deprecated/gtkalignment.c	\
 	deprecated/gtkarrow.c		\
 	deprecated/gtkcolorsel.c	\
 	deprecated/gtkcolorseldialog.c	\
@@ -621,6 +766,7 @@ deprecated_c_sources = 			\
 	deprecated/gtkvpaned.c
 
 gtk_base_c_sources = 		\
+	$(a11y_c_sources)	\
 	$(deprecated_c_sources)	\
 	gtkactionmuxer.c	\
 	gtkactionobserver.c	\
@@ -640,7 +786,6 @@ gtk_base_c_sources = 		\
 	gtkactionbar.c		\
 	gtkactionhelper.c	\
 	gtkadjustment.c		\
-	gtkalignment.c		\
 	gtkallocatedbitmask.c	\
 	gtkappchooser.c		\
 	gtkappchooserwidget.c	\
@@ -750,6 +895,7 @@ gtk_base_c_sources = 		\
 	gtkentrybuffer.c	\
 	gtkentrycompletion.c	\
 	gtkeventbox.c		\
+	gtkeventcontroller.c	\
 	gtkexpander.c		\
 	gtkfilechooser.c	\
 	gtkfilechooserbutton.c	\
@@ -770,6 +916,15 @@ gtk_base_c_sources = 		\
 	gtkfontchooserwidget.c	\
 	gtkframe.c		\
 	gtkgladecatalog.c	\
+	gtkgesture.c		\
+	gtkgesturedrag.c	\
+	gtkgesturelongpress.c	\
+	gtkgesturemultipress.c	\
+	gtkgesturepan.c		\
+	gtkgesturerotate.c	\
+	gtkgesturesingle.c	\
+	gtkgestureswipe.c	\
+	gtkgesturezoom.c	\
 	gtkgrid.c		\
 	gtkheaderbar.c		\
 	gtkhsla.c		\
@@ -786,6 +941,7 @@ gtk_base_c_sources = 		\
 	gtkinfobar.c		\
 	gtkinvisible.c		\
 	gtkkeyhash.c		\
+	gtkkineticscrolling.c	\
 	gtklabel.c		\
 	gtklayout.c		\
 	gtklevelbar.c		\
@@ -822,7 +978,6 @@ gtk_base_c_sources = 		\
 	gtkpapersize.c		\
 	gtkpathbar.c		\
 	gtkplacessidebar.c	\
-	gtkpressandhold.c	\
 	gtkprintcontext.c	\
 	gtkprintoperation.c	\
 	gtkprintoperationpreview.c \
@@ -924,6 +1079,7 @@ gtk_base_c_sources = 		\
 	gtkwidget.c		\
 	gtkwidgetpath.c		\
 	gtkwindow.c		\
+	gtkwindowgroup.c	\
 	gtkwin32theme.c		\
 	$(gtk_clipboard_dnd_c_sources)
 
@@ -1046,6 +1202,7 @@ gtk_private_h_sources += $(gtk_use_quartz_private_h_sources)
 endif
 
 gtk_all_private_h_sources = \
+	$(a11y_private_h_sources) \
 	$(deprecated_private_h_sources) \
 	$(gtk_private_h_sources) \
 	$(gtk_use_x11_private_h_sources) \
@@ -1169,9 +1326,9 @@ COMPOSITE_TEMPLATES =				\
 
 template_headers = $(COMPOSITE_TEMPLATES:.ui=.ui.h)
 
-%.ui.h: %.ui extract-strings$(BUILD_EXEEXT)
+%.ui.h: %.ui
 	$(AM_V_GEN) mkdir -p $(dir $@) \
-	&& ./extract-strings$(BUILD_EXEEXT) $< > $@
+	&& $(top_builddir)/util/extract-strings$(BUILD_EXEEXT) $< > $@
 
 #
 # rules to generate built sources
@@ -1205,19 +1362,64 @@ gtkmarshalers.c: gtkmarshalers.list
 
 gtktypebuiltins.h: stamp-gtktypebuiltins.h
 	@true
-stamp-gtktypebuiltins.h: $(gtk_public_h_sources) $(deprecated_h_sources) gtktypebuiltins.h.template
+stamp-gtktypebuiltins.h: $(gtk_public_h_sources) $(a11y_h_sources) $(deprecated_h_sources) gtktypebuiltins.h.template
 	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.h.template \
-		$(gtk_public_h_sources) $(deprecated_h_sources) ) > xgen-gtbh \
+		$(gtk_public_h_sources) $(a11y_h_sources) $(deprecated_h_sources) ) > xgen-gtbh \
 	&& (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h ) \
 	&& rm -f xgen-gtbh \
 	&& echo timestamp > $(@F)
-gtktypebuiltins.c: $(gtk_public_h_sources) $(deprecated_h_sources) gtktypebuiltins.c.template
+gtktypebuiltins.c: $(gtk_public_h_sources) $(a11y_h_sources) $(deprecated_h_sources) gtktypebuiltins.c.template
 	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.c.template \
-		$(gtk_public_h_sources) $(deprecated_h_sources) ) > xgen-gtbc \
+		$(gtk_public_h_sources) $(a11y_h_sources) $(deprecated_h_sources) ) > xgen-gtbc \
 	&& cp xgen-gtbc gtktypebuiltins.c  \
 	&& rm -f xgen-gtbc
 
+gtk.gresource.xml: Makefile.am
+	$(AM_V_GEN) echo -e "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@; \
+	echo -e "<gresources>" >> $@; \
+	echo -e "  <gresource prefix=\"/org/gtk/libgtk\">" >> $@; \
+	for f in $(srcdir)/resources/theme/Raleigh/*.css; do \
+	  n=`basename $$f`; \
+	  echo -e "    <file alias=\"theme/Raleigh.css\">theme/Raleigh/$$n</file>" >> $@; \
+	done; \
+        echo -e "    <file alias=\"theme/Adwaita.css\">theme/Adwaita/gtk.css</file>" >> $@; \
+        echo -e "    <file alias=\"theme/Adwaita-dark.css\">theme/Adwaita/gtk-dark.css</file>" >> $@; \
+        for f in $(srcdir)/resources/theme/Adwaita/assets/*; do \
+          n=`basename $$f`; \
+          echo -e "    <file preprocess=\"to-pixdata\">theme/Adwaita/assets/$$n</file>" >> $@; \
+        done; \
+	if test "$(win32_theme)" = "yes"; then \
+	  for f in $(srcdir)/resources/theme/win32/*.css; do \
+	    n=`basename $$f`; \
+	    echo -e "    <file alias=\"theme/$$n\">theme/win32/$$n</file>" >> $@; \
+	  done; \
+	fi; \
+	for f in $(srcdir)/resources/cursor/*.png; do \
+	  n=`basename $$f`; \
+	  echo -e "    <file>cursor/$$n</file>" >> $@; \
+	done; \
+	for f in $(srcdir)/resources/ui/*.ui; do \
+	  n=`basename $$f`; \
+	  echo -e "    <file compressed=\"true\">ui/$$n</file>" >> $@; \
+	done; \
+	echo -e "  </gresource>" >> $@; \
+	echo -e "</gresources>" >> $@;
+
+adwaita_sources = \
+	resources/theme/Adwaita/assets.svg \
+	resources/theme/Adwaita/_colors.scss \
+	resources/theme/Adwaita/_common.scss \
+	resources/theme/Adwaita/_drawing.scss \
+	resources/theme/Adwaita/gtk.scss \
+	resources/theme/Adwaita/gtk-dark.scss \
+	resources/theme/Adwaita/parse-sass.sh \
+	resources/theme/Adwaita/render-assets.sh \
+	resources/theme/Adwaita/render-borders.sh \
+	resources/theme/Adwaita/assets.txt \
+	resources/theme/Adwaita/borders.txt
+
 resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/resources --generate-dependencies $(srcdir)/gtk.gresource.xml)
+
 gtkresources.h: gtk.gresource.xml
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/gtk.gresource.xml \
 		--target=$@ --sourcedir=$(srcdir)/resources --c-name _gtk --generate-header --manual-register
@@ -1240,7 +1442,7 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources)  gtkprivatetypebuiltins.
 	&& rm -f xgen-gptbc
 
 
-gtktypefuncs.c: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_srcdir)/gtk/*.h $(top_srcdir)/gtk/deprecated/*.h $(top_srcdir)/gdk/*.h Makefile
+gtktypefuncs.c: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_srcdir)/gtk/*.h $(top_srcdir)/gtk/a11y/*.h $(top_srcdir)/gtk/deprecated/*.h $(top_srcdir)/gdk/*.h Makefile
 	$(AM_V_GEN) echo '#include <gtk/gtkx.h>' > xgen-gtfsrc.c && \
 	  echo 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS' > xgen-gtf && \
 	  ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
@@ -1256,6 +1458,9 @@ lib_LTLIBRARIES = libgtk-3.la
 gtkincludedir = $(includedir)/gtk-3.0/gtk
 gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h
 
+a11yincludedir = $(includedir)/gtk-3.0/gtk/a11y
+a11yinclude_HEADERS= $(a11y_h_sources)
+
 deprecatedincludedir = $(includedir)/gtk-3.0/gtk/deprecated
 deprecatedinclude_HEADERS= $(deprecated_h_sources)
 
@@ -1269,6 +1474,7 @@ libgtk_3_la_LIBADD = $(libadd)
 libgtk_3_la_DEPENDENCIES = $(deps)
 
 if USE_WIN32
+win32_theme=yes
 libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
 libgtk_3_la_LDFLAGS += -Wl,-luuid
 libgtk_3_la_DEPENDENCIES += $(gtk_def) $(gtk_win32_res) $(deps)
@@ -1359,7 +1565,7 @@ if HAVE_INTROSPECTION
 # introspection. Rather than copy the annotations over from the
 # regular files, exclude the quartz ones:
 introspection_files = \
-    $(filter-out %private.h gtktextdisplay.h gtktextlayout.h, $(gtkinclude_HEADERS) $(deprecatedinclude_HEADERS)) \
+    $(filter-out %private.h gtktextdisplay.h gtktextlayout.h, $(gtkinclude_HEADERS) $(a11yinclude_HEADERS) $(deprecatedinclude_HEADERS)) \
     $(filter-out  gtkclipboard-quartz.c gtkdnd-quartz.c, \
     $(gtk_base_c_sources)) \
     gtkprintoperation-unix.c \
@@ -1461,17 +1667,6 @@ endif
 gtk_launch_LDADD = $(LDADDS)
 gtk_launch_SOURCES = gtk-launch.c
 
-# The extract_strings tool is a build utility that runs on the build system.
-extract_strings_sources = extract-strings.c
-extract_strings_cppflags =
-extract_strings_cflags = $(GLIB_CFLAGS_FOR_BUILD)
-extract_strings_ldadd = $(GLIB_LIBS_FOR_BUILD)
-extract-strings$(BUILD_EXEEXT): $(extract_strings_sources)
-	@rm -f extract-strings$(BUILD_EXEEXT)
-	$(AM_V_CCLD)$(CC_FOR_BUILD) $(extract_strings_cppflags) $(CPPFLAGS_FOR_BUILD) $(extract_strings_cflags) $(CFLAGS_FOR_BUILD) $^ $(LDFLAGS_FOR_BUILD) $(extract_strings_ldadd) $(LIBS_FOR_BUILD) -o $@
-EXTRA_DIST += $(extract_strings_sources)
-DISTCLEANFILES += extract-strings
-
 .PHONY: files test test-debug
 
 files:
@@ -1802,6 +1997,7 @@ gsettings_SCHEMAS = \
 
 EXTRA_DIST +=                   \
 	$(resource_files)	\
+	$(adwaita_sources)	\
 	$(STOCK_ICONS)		\
 	$(GENERATED_ICONS)	\
 	$(gsettings_SCHEMAS)	\

gtk/a11y/Makefile.am

@@ -1,190 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-noinst_LTLIBRARIES = libgtka11y.la
-
-gtka11y_c_sources =			\
-	gtkaccessibility.c		\
-	gtkaccessibilitymisc.c 		\
-	gtkaccessibilityutil.c		\
-	gtkarrowaccessible.c		\
-	gtkbooleancellaccessible.c	\
-	gtkbuttonaccessible.c		\
-	gtkcellaccessible.c		\
-	gtkcellaccessibleparent.c	\
-	gtkcheckmenuitemaccessible.c	\
-	gtkcolorswatchaccessible.c	\
-	gtkcomboboxaccessible.c		\
-	gtkcontaineraccessible.c	\
-	gtkcontainercellaccessible.c	\
-	gtkentryaccessible.c		\
-	gtkexpanderaccessible.c		\
-	gtkflowboxaccessible.c		\
-	gtkflowboxchildaccessible.c	\
-	gtkframeaccessible.c		\
-	gtkiconviewaccessible.c		\
-	gtkimageaccessible.c		\
-	gtkimagecellaccessible.c	\
-	gtklabelaccessible.c		\
-	gtklevelbaraccessible.c 	\
-	gtklinkbuttonaccessible.c	\
-	gtklistboxaccessible.c		\
-	gtklistboxrowaccessible.c	\
-	gtklockbuttonaccessible.c	\
-	gtkmenuaccessible.c		\
-	gtkmenubuttonaccessible.c	\
-	gtkmenushellaccessible.c	\
-	gtkmenuitemaccessible.c		\
-	gtknotebookaccessible.c		\
-	gtknotebookpageaccessible.c	\
-	gtkpanedaccessible.c		\
-	gtkpopoveraccessible.c		\
-	gtkprogressbaraccessible.c	\
-	gtkradiobuttonaccessible.c	\
-	gtkradiomenuitemaccessible.c	\
-	gtkrangeaccessible.c		\
-	gtkrenderercellaccessible.c	\
-	gtkscaleaccessible.c		\
-	gtkscalebuttonaccessible.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
-
-gtka11yincludedir = $(includedir)/gtk-3.0/gtk/a11y
-gtka11yinclude_HEADERS =		\
-	gtkarrowaccessible.h		\
-	gtkbooleancellaccessible.h	\
-	gtkbuttonaccessible.h		\
-	gtkcellaccessible.h		\
-	gtkcellaccessibleparent.h	\
-	gtkcheckmenuitemaccessible.h	\
-	gtkcomboboxaccessible.h		\
-	gtkcontaineraccessible.h	\
-	gtkcontainercellaccessible.h	\
-	gtkentryaccessible.h		\
-	gtkexpanderaccessible.h		\
-	gtkflowboxaccessible.h		\
-	gtkflowboxchildaccessible.h	\
-	gtkframeaccessible.h		\
-	gtkiconviewaccessible.h		\
-	gtkimageaccessible.h		\
-	gtkimagecellaccessible.h	\
-	gtklabelaccessible.h		\
-	gtklevelbaraccessible.h 	\
-	gtklinkbuttonaccessible.h	\
-	gtklistboxaccessible.h		\
-	gtklistboxrowaccessible.h	\
-	gtklockbuttonaccessible.h	\
-	gtkmenuaccessible.h		\
-	gtkmenubuttonaccessible.h	\
-	gtkmenuitemaccessible.h		\
-	gtkmenushellaccessible.h	\
-	gtknotebookaccessible.h		\
-	gtknotebookpageaccessible.h	\
-	gtkpanedaccessible.h		\
-	gtkpopoveraccessible.h		\
-	gtkprogressbaraccessible.h	\
-	gtkradiobuttonaccessible.h	\
-	gtkradiomenuitemaccessible.h	\
-	gtkrangeaccessible.h		\
-	gtkrenderercellaccessible.h	\
-	gtkscaleaccessible.h		\
-	gtkscalebuttonaccessible.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
-
-gtka11y_private_h_sources =		\
-	gtkaccessibility.h		\
-	gtkaccessibilitymisc.h		\
-	gtkaccessibilityutil.h		\
-	gtkcellaccessibleprivate.h	\
-	gtkcolorswatchaccessibleprivate.h \
-	gtkcontaineraccessibleprivate.h	\
-	gtkiconviewaccessibleprivate.h	\
-	gtklabelaccessibleprivate.h 	\
-	gtkflowboxaccessibleprivate.h 	\
-	gtklistboxaccessibleprivate.h	\
-	gtklockbuttonaccessibleprivate.h \
-	gtktextviewaccessibleprivate.h  \
-	gtktreeviewaccessibleprivate.h	\
-	gtkwidgetaccessibleprivate.h
-
-libgtka11y_la_SOURCES = 		\
-	$(gtka11y_c_sources)		\
-	$(gtka11y_private_h_sources)
-
-libgtka11y_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		\
-	$(AM_CPPFLAGS)
-
-libgtka11y_la_CFLAGS = 			\
-	$(GDK_HIDDEN_VISIBILITY_CFLAGS) \
-	$(GTK_DEP_CFLAGS)		\
-	$(GTK_DEBUG_FLAGS)		\
-	$(AM_CFLAGS)
-
-libgtka11y_la_LIBADD =  		\
-	$(GTK_DEP_LIBS)			\
-	$(INTLLIBS)
-
-libgtka11y_la_LDFLAGS =    		\
-        $(LDFLAGS)
-
-dist-hook: $(top_builddir)/build/win32/vs9/gtka11y.vcproj $(top_builddir)/build/win32/vs10/gtka11y.vcxproj $(top_builddir)/build/win32/vs10/gtka11y.vcxproj.filters
-
-$(top_builddir)/build/win32/vs9/gtka11y.vcproj: $(top_srcdir)/build/win32/vs9/gtka11y.vcprojin
-	for F in $(gtka11y_c_sources); do \
-		case $$F in \
-		*.c) echo '   <File RelativePath="..\..\..\gtk\a11y\'$$F'" />' \
-		     ;; \
-		esac; \
-	done >gtka11y.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtka11y.vcprojin >$@
-	rm gtka11y.sourcefiles
-
-$(top_builddir)/build/win32/vs10/gtka11y.vcxproj: $(top_srcdir)/build/win32/vs10/gtka11y.vcxprojin
-	for F in $(gtka11y_c_sources); do \
-		case $$F in \
-		*.c) echo '   <ClCompile Include="..\..\..\gtk\a11y\'$$F'" />' \
-		     ;; \
-		esac; \
-	done >gtka11y.vs10.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtka11y.vcxprojin >$@
-	rm gtka11y.vs10.sourcefiles
-
-$(top_builddir)/build/win32/vs10/gtka11y.vcxproj.filters: $(top_srcdir)/build/win32/vs10/gtka11y.vcxproj.filtersin
-	for F in $(gtka11y_c_sources); do \
-		case $$F in \
-		*.c) echo '   <ClCompile Include="..\..\..\gtk\a11y\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
-		     ;; \
-		esac; \
-	done >gtka11y.vs10.sourcefiles.filters
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtka11y.vcxproj.filtersin >$@
-	rm gtka11y.vs10.sourcefiles.filters
-
-
--include $(top_srcdir)/git.mk

gtk/a11y/gtkbuttonaccessible.c

@@ -122,8 +122,10 @@ get_label_from_button (GtkWidget *button)
   GtkWidget *child;
 
   child = gtk_bin_get_child (GTK_BIN (button));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   if (GTK_IS_ALIGNMENT (child))
     child = gtk_bin_get_child (GTK_BIN (child));
+G_GNUC_END_IGNORE_DEPRECATIONS
 
   if (GTK_IS_CONTAINER (child))
     child = find_label_child (GTK_CONTAINER (child));

gtk/a11y/gtkcontainercellaccessible.c

@@ -162,6 +162,14 @@ gtk_container_cell_accessible_remove_child (GtkContainerCellAccessible *containe
   g_object_unref (child);
 }
 
+/**
+ * gtk_container_cell_accessible_get_children:
+ * @container: the container
+ *
+ * Get a list of children.
+ *
+ * Returns: (transfer none) (element-type Gtk.CellAccessible)
+ */
 GList *
 gtk_container_cell_accessible_get_children (GtkContainerCellAccessible *container)
 {

gtk/a11y/gtkentryaccessible.c

@@ -456,7 +456,7 @@ gtk_entry_accessible_initialize (AtkObject *obj,
   gtk_entry_accessible->priv->selection_bound = start_pos;
 
   /* Set up signal callbacks */
-  g_signal_connect (entry, "insert-text", G_CALLBACK (insert_text_cb), NULL);
+  g_signal_connect_after (entry, "insert-text", G_CALLBACK (insert_text_cb), NULL);
   g_signal_connect (entry, "delete-text", G_CALLBACK (delete_text_cb), NULL);
 
   if (gtk_entry_get_visibility (entry))
@@ -1378,11 +1378,6 @@ atk_editable_text_interface_init (AtkEditableTextIface *iface)
   iface->set_run_attributes = NULL;
 }
 
-/* We connect to GtkEditable::insert-text, since it carries
- * the information we need. But we delay emitting our own
- * text_changed::insert signal until the entry has update
- * all its internal state and emits GtkEntry::changed.
- */
 static void
 insert_text_cb (GtkEditable *editable,
                 gchar       *new_text,
@@ -1390,16 +1385,18 @@ insert_text_cb (GtkEditable *editable,
                 gint        *position)
 {
   GtkEntryAccessible *accessible;
+  gint length;
 
   if (new_text_length == 0)
     return;
 
   accessible = GTK_ENTRY_ACCESSIBLE (gtk_widget_get_accessible (GTK_WIDGET (editable)));
+  length = g_utf8_strlen (new_text, new_text_length);
 
   g_signal_emit_by_name (accessible,
                          "text-changed::insert",
-                         *position,
-                          g_utf8_strlen (new_text, new_text_length));
+                         *position - length,
+                          length);
 }
 
 /* We connect to GtkEditable::delete-text, since it carries

gtk/a11y/gtktoplevelaccessible.c

@@ -298,6 +298,12 @@ gtk_toplevel_accessible_init (GtkToplevelAccessible *toplevel)
                               hide_event_watcher, toplevel, (GDestroyNotify) NULL);
 }
 
+/**
+ * gtk_toplevel_accessible_get_children:
+ *
+ * Returns: (transfer none) (element-type Gtk.Window): List of
+ *   children.
+ */
 GList *
 gtk_toplevel_accessible_get_children (GtkToplevelAccessible *accessible)
 {

gtk/a11y/gtkwidgetaccessible.c

@@ -281,7 +281,7 @@ gtk_widget_accessible_ref_relation_set (AtkObject *obj)
               GtkWidget *temp_widget;
 
               temp_widget = gtk_widget_get_parent (widget);
-
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
               if (GTK_IS_ALIGNMENT (temp_widget))
                 {
                   temp_widget = gtk_widget_get_parent (temp_widget);
@@ -292,6 +292,7 @@ gtk_widget_accessible_ref_relation_set (AtkObject *obj)
                         label = find_label (gtk_widget_get_parent (temp_widget));
                     }
                 }
+G_GNUC_END_IGNORE_DEPRECATIONS
             }
           else if (GTK_IS_COMBO_BOX (widget))
             /*

gtk/deprecated/gtkactiongroup.c

@@ -1154,7 +1154,7 @@ shared_data_unref (gpointer data)
  * @entries: (array length=n_entries): an array of action descriptions
  * @n_entries: the number of entries
  * @user_data: data to pass to the action callbacks
- * @destroy: destroy notification callback for @user_data
+ * @destroy: (nullable): destroy notification callback for @user_data
  *
  * This variant of gtk_action_group_add_actions() adds a #GDestroyNotify
  * callback for @user_data. 
@@ -1265,7 +1265,7 @@ gtk_action_group_add_toggle_actions (GtkActionGroup             *action_group,
  * @entries: (array length=n_entries): an array of toggle action descriptions
  * @n_entries: the number of entries
  * @user_data: data to pass to the action callbacks
- * @destroy: destroy notification callback for @user_data
+ * @destroy: (nullable): destroy notification callback for @user_data
  *
  * This variant of gtk_action_group_add_toggle_actions() adds a 
  * #GDestroyNotify callback for @user_data. 

gtk/deprecated/gtkalignment.c

@@ -52,6 +52,9 @@
 #include "gtkintl.h"
 
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
+
 struct _GtkAlignmentPrivate
 {
   gfloat        xalign;
@@ -150,7 +153,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
                                                       0.0,
                                                       1.0,
 						      0.5,
-                                                      GTK_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE|G_PARAM_DEPRECATED));
   g_object_class_install_property (gobject_class,
                                    PROP_XSCALE,
                                    g_param_spec_float("xscale",
@@ -159,7 +162,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
                                                       0.0,
                                                       1.0,
                                                       1.0,
-                                                      GTK_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE|G_PARAM_DEPRECATED));
   g_object_class_install_property (gobject_class,
                                    PROP_YSCALE,
                                    g_param_spec_float("yscale",
@@ -168,7 +171,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
                                                       0.0,
                                                       1.0,
                                                       1.0,
-                                                      GTK_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE|G_PARAM_DEPRECATED));
 
 
 /**
@@ -186,7 +189,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
                                                       0,
                                                       G_MAXINT,
                                                       0,
-                                                      GTK_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE|G_PARAM_DEPRECATED));
 
 /**
  * GtkAlignment:bottom-padding:
@@ -203,7 +206,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
                                                       0,
                                                       G_MAXINT,
                                                       0,
-                                                      GTK_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE|G_PARAM_DEPRECATED));
 
 /**
  * GtkAlignment:left-padding:
@@ -220,7 +223,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
                                                       0,
                                                       G_MAXINT,
                                                       0,
-                                                      GTK_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE|G_PARAM_DEPRECATED));
 
 /**
  * GtkAlignment:right-padding:
@@ -237,7 +240,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
                                                       0,
                                                       G_MAXINT,
                                                       0,
-                                                      GTK_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE|G_PARAM_DEPRECATED));
 }
 
 static void
@@ -279,7 +282,9 @@ gtk_alignment_init (GtkAlignment *alignment)
  *
  * Creates a new #GtkAlignment.
  *
- * Returns: the new #GtkAlignment.
+ * Returns: the new #GtkAlignment
+ *
+ * Deprecated: 3.14: Use #GtkWidget alignment and margin properties
  */
 GtkWidget*
 gtk_alignment_new (gfloat xalign,
@@ -438,6 +443,8 @@ gtk_alignment_get_property (GObject         *object,
  *  unused space, from 0 to 1. The values are similar to @xscale.
  *
  * Sets the #GtkAlignment values.
+ *
+ * Deprecated: 3.14: Use #GtkWidget alignment and margin properties
  */
 void
 gtk_alignment_set (GtkAlignment *alignment,
@@ -744,6 +751,8 @@ gtk_alignment_get_preferred_height_and_baseline_for_width (GtkWidget           *
  * padding on the left.
  *
  * Since: 2.4
+ *
+ * Deprecated: 3.14: Use #GtkWidget alignment and margin properties
  */
 void
 gtk_alignment_set_padding (GtkAlignment    *alignment,
@@ -808,6 +817,8 @@ gtk_alignment_set_padding (GtkAlignment    *alignment,
  * See gtk_alignment_set_padding ().
  *
  * Since: 2.4
+ *
+ * Deprecated: 3.14: Use #GtkWidget alignment and margin properties
  */
 void
 gtk_alignment_get_padding (GtkAlignment    *alignment,

gtk/deprecated/gtkalignment.h

@@ -73,28 +73,28 @@ struct _GtkAlignmentClass
 };
 
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 GType      gtk_alignment_get_type   (void) G_GNUC_CONST;
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 GtkWidget* gtk_alignment_new        (gfloat             xalign,
 				     gfloat             yalign,
 				     gfloat             xscale,
 				     gfloat             yscale);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 void       gtk_alignment_set        (GtkAlignment      *alignment,
 				     gfloat             xalign,
 				     gfloat             yalign,
 				     gfloat             xscale,
 				     gfloat             yscale);
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 void       gtk_alignment_set_padding (GtkAlignment      *alignment,
 				      guint              padding_top,
 				      guint              padding_bottom,
 				      guint              padding_left,
 				      guint              padding_right);
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 void       gtk_alignment_get_padding (GtkAlignment      *alignment,
 				      guint             *padding_top,
 				      guint             *padding_bottom,

gtk/deprecated/gtkcolorsel.c

@@ -36,7 +36,7 @@
 #include "gtkadjustment.h"
 #include "gtkorientable.h"
 #include "gtkhsv.h"
-#include "gtkwindow.h"
+#include "gtkwindowgroup.h"
 #include "gtkselection.h"
 #include "gtkcolorutils.h"
 #include "gtkdnd.h"

gtk/deprecated/gtkcolorsel.h

@@ -47,16 +47,24 @@ typedef struct _GtkColorSelection       GtkColorSelection;
 typedef struct _GtkColorSelectionPrivate  GtkColorSelectionPrivate;
 typedef struct _GtkColorSelectionClass  GtkColorSelectionClass;
 
+/**
+ * GtkColorSelectionChangePaletteFunc:
+ * @colors: (array length=n_colors): Array of colors
+ * @n_colors: Number of colors in the array
+ *
+ * Deprecated: 3.4
+ */
 typedef void (* GtkColorSelectionChangePaletteFunc) (const GdkColor    *colors,
                                                      gint               n_colors);
 
 /**
  * GtkColorSelectionChangePaletteWithScreenFunc:
  * @screen:
- * @colors:
- * @n_colors:
+ * @colors: (array length=n_colors): Array of colors
+ * @n_colors: Number of colors in the array
  *
  * Since: 2.2
+ * Deprecated: 3.4
  */
 typedef void (* GtkColorSelectionChangePaletteWithScreenFunc) (GdkScreen         *screen,
 							       const GdkColor    *colors,
@@ -66,7 +74,7 @@ struct _GtkColorSelection
 {
   GtkBox parent_instance;
 
-  /* < private_data > */
+  /*< private >*/
   GtkColorSelectionPrivate *private_data;
 };
 

gtk/deprecated/gtkhscale.c

@@ -68,7 +68,8 @@ gtk_hscale_init (GtkHScale *hscale)
 
 /**
  * gtk_hscale_new:
- * @adjustment: the #GtkAdjustment which sets the range of the scale.
+ * @adjustment: (nullable): the #GtkAdjustment which sets the range of
+ * the scale.
  *
  * Creates a new #GtkHScale.
  *

gtk/deprecated/gtkrc.c

@@ -349,7 +349,7 @@
  *
  *          Sets the color used for the background of widgets displaying
  *          editable text. This color is used for the background
- *          of, among others, #GtkText, #GtkEntry, #GtkList, and #GtkCList.
+ *          of, among others, #GtkTextView, #GtkEntry.
  *
  * * `text[state] =
  *       color`
@@ -1409,11 +1409,12 @@ gtk_rc_get_style (GtkWidget *widget)
  *                             G_OBJECT_TYPE (widget));
  * ]|
  *
- * Returns: (transfer none): A style created by matching with the
- *     supplied paths, or %NULL if nothing matching was specified and the
- *     default style should be used. The returned value is owned by GTK+
- *     as part of an internal cache, so you must call g_object_ref() on
- *     the returned value if you want to keep a reference to it.
+ * Returns: (nullable) (transfer none): A style created by matching
+ *     with the supplied paths, or %NULL if nothing matching was
+ *     specified and the default style should be used. The returned
+ *     value is owned by GTK+ as part of an internal cache, so you
+ *     must call g_object_ref() on the returned value if you want to
+ *     keep a reference to it.
  *
  * Deprecated:3.0: Use #GtkStyleContext instead
  **/

gtk/deprecated/gtkrecentaction.c

@@ -521,28 +521,60 @@ gtk_recent_action_set_property (GObject      *gobject,
   switch (prop_id)
     {
     case PROP_SHOW_NUMBERS:
-      priv->show_numbers = g_value_get_boolean (value);
+      if (priv->show_numbers != g_value_get_boolean (value))
+        {
+          priv->show_numbers = g_value_get_boolean (value);
+          g_object_notify_by_pspec (gobject, pspec);
+        }
       break;
     case GTK_RECENT_CHOOSER_PROP_SHOW_PRIVATE:
-      priv->show_private = g_value_get_boolean (value);
+      if (priv->show_private != g_value_get_boolean (value))
+        {
+          priv->show_private = g_value_get_boolean (value);
+          g_object_notify_by_pspec (gobject, pspec);
+        }
       break;
     case GTK_RECENT_CHOOSER_PROP_SHOW_NOT_FOUND:
-      priv->show_not_found = g_value_get_boolean (value);
+      if (priv->show_not_found != g_value_get_boolean (value))
+        {
+          priv->show_not_found = g_value_get_boolean (value);
+          g_object_notify_by_pspec (gobject, pspec);
+        }
       break;
     case GTK_RECENT_CHOOSER_PROP_SHOW_TIPS:
-      priv->show_tips = g_value_get_boolean (value);
+      if (priv->show_tips != g_value_get_boolean (value))
+        {
+          priv->show_tips = g_value_get_boolean (value);
+          g_object_notify_by_pspec (gobject, pspec);
+        }
       break;
     case GTK_RECENT_CHOOSER_PROP_SHOW_ICONS:
-      priv->show_icons = g_value_get_boolean (value);
+      if (priv->show_icons != g_value_get_boolean (value))
+        {
+          priv->show_icons = g_value_get_boolean (value);
+          g_object_notify_by_pspec (gobject, pspec);
+        }
       break;
     case GTK_RECENT_CHOOSER_PROP_LIMIT:
-      priv->limit = g_value_get_int (value);
+      if (priv->limit != g_value_get_int (value))
+        {
+          priv->limit = g_value_get_int (value);
+          g_object_notify_by_pspec (gobject, pspec);
+        }
       break;
     case GTK_RECENT_CHOOSER_PROP_LOCAL_ONLY:
-      priv->local_only = g_value_get_boolean (value);
+      if (priv->local_only != g_value_get_boolean (value))
+        {
+          priv->local_only = g_value_get_boolean (value);
+          g_object_notify_by_pspec (gobject, pspec);
+        }
       break;
     case GTK_RECENT_CHOOSER_PROP_SORT_TYPE:
-      priv->sort_type = g_value_get_enum (value);
+      if (priv->sort_type != g_value_get_enum (value))
+        {
+          priv->sort_type = g_value_get_enum (value);
+          g_object_notify_by_pspec (gobject, pspec);
+        }
       break;
     case GTK_RECENT_CHOOSER_PROP_FILTER:
       set_current_filter (action, g_value_get_object (value));
@@ -645,7 +677,7 @@ gtk_recent_action_class_init (GtkRecentActionClass *klass)
                                                          P_("Show Numbers"),
                                                          P_("Whether the items should be displayed with a number"),
                                                          FALSE,
-                                                         G_PARAM_READWRITE));
+                                                         G_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
 
 }
 

gtk/deprecated/gtkstock.h

@@ -38,7 +38,8 @@ G_BEGIN_DECLS
  * GtkTranslateFunc:
  * @path: The id of the message. In #GtkActionGroup this will be a label
  *   or tooltip from a #GtkActionEntry.
- * @func_data: user data passed in when registering the function
+ * @func_data: (closure): user data passed in when registering the
+ *   function
  *
  * The function used to translate messages in e.g. #GtkIconFactory
  * and #GtkActionGroup.

gtk/deprecated/gtkstyle.c

@@ -1118,7 +1118,7 @@ gtk_style_real_init_from_rc (GtkStyle   *style,
  * @style: a #GtkStyle
  * @widget_type: the #GType of a descendant of #GtkWidget
  * @property_name: the name of the style property to get
- * @value: a #GValue where the value of the property being
+ * @value: (out): a #GValue where the value of the property being
  *     queried will be stored
  *
  * Queries the value of a style property corresponding to a
@@ -1153,7 +1153,7 @@ gtk_style_get_style_property (GtkStyle     *style,
   priv = GTK_STYLE_GET_PRIVATE (style);
   peek_value = _gtk_style_context_peek_style_property (priv->context,
                                                        widget_type,
-                                                       0, pspec);
+                                                       pspec);
 
   if (G_VALUE_TYPE (value) == G_PARAM_SPEC_VALUE_TYPE (pspec))
     g_value_copy (peek_value, value);
@@ -1214,7 +1214,7 @@ gtk_style_get_valist (GtkStyle    *style,
         }
 
       peek_value = _gtk_style_context_peek_style_property (priv->context, widget_type,
-                                                           0, pspec);
+                                                           pspec);
       G_VALUE_LCOPY (peek_value, var_args, 0, &error);
       if (error)
         {
@@ -4077,7 +4077,7 @@ gtk_widget_get_default_style (void)
  *
  * Since: 2.20
  *
- * Deprecated: 3.0. This step is unnecessary with #GtkStyleContext.
+ * Deprecated: 3.0: This step is unnecessary with #GtkStyleContext.
  **/
 void
 gtk_widget_style_attach (GtkWidget *widget)
@@ -4498,12 +4498,12 @@ gtk_widget_modify_base (GtkWidget      *widget,
 /**
  * gtk_widget_modify_cursor:
  * @widget: a #GtkWidget
- * @primary: the color to use for primary cursor (does not need to be
- *     allocated), or %NULL to undo the effect of previous calls to
- *     of gtk_widget_modify_cursor().
- * @secondary: the color to use for secondary cursor (does not need to be
- *     allocated), or %NULL to undo the effect of previous calls to
- *     of gtk_widget_modify_cursor().
+ * @primary: (nullable): the color to use for primary cursor (does not
+ *     need to be allocated), or %NULL to undo the effect of previous
+ *     calls to of gtk_widget_modify_cursor().
+ * @secondary: (nullable): the color to use for secondary cursor (does
+ *     not need to be allocated), or %NULL to undo the effect of
+ *     previous calls to of gtk_widget_modify_cursor().
  *
  * Sets the cursor color to use in a widget, overriding the #GtkWidget
  * cursor-color and secondary-cursor-color
@@ -4514,7 +4514,7 @@ gtk_widget_modify_base (GtkWidget      *widget,
  *
  * Since: 2.12
  *
- * Deprecated: 3.0. Use gtk_widget_override_cursor() instead.
+ * Deprecated: 3.0: Use gtk_widget_override_cursor() instead.
  */
 void
 gtk_widget_modify_cursor (GtkWidget      *widget,
@@ -4663,11 +4663,11 @@ gtk_widget_path (GtkWidget *widget,
 /**
  * gtk_widget_class_path:
  * @widget: a #GtkWidget
- * @path_length: (out) (allow-none): location to store the length of the
+ * @path_length: (out) (optional): location to store the length of the
  *     class path, or %NULL
- * @path: (out) (allow-none): location to store the class path as an
+ * @path: (out) (optional): location to store the class path as an
  *     allocated string, or %NULL
- * @path_reversed: (out) (allow-none): location to store the reverse
+ * @path_reversed: (out) (optional): location to store the reverse
  *     class path as an allocated string, or %NULL
  *
  * Same as gtk_widget_path(), but always uses the name of a widget’s type,

gtk/gtk.gresource.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gtk/libgtk">
-    <file alias="theme/Raleigh.css">theme/gtk-default.css</file>
-    <file>theme/gtk-win32.css</file>
-    <file>theme/gtk-win32-xp.css</file>
-    <file>theme/gtk-win32-base.css</file>
-    <file>theme/gtk-win32-classic.css</file>
-    <file alias="cursor/dnd-ask.png">cursor/cursor_dnd_ask.png</file>
-    <file alias="cursor/dnd-link.png">cursor/cursor_dnd_link.png</file>
-    <file alias="cursor/dnd-none.png">cursor/cursor_dnd_none.png</file>
-    <file alias="cursor/dnd-move.png">cursor/cursor_dnd_move.png</file>
-    <file alias="cursor/dnd-copy.png">cursor/cursor_dnd_copy.png</file>
-    <file compressed="true">ui/gtkaboutdialog.ui</file>
-    <file compressed="true">ui/gtkactionbar.ui</file>
-    <file compressed="true">ui/gtkappchooserdialog.ui</file>
-    <file compressed="true">ui/gtkappchooserwidget.ui</file>
-    <file compressed="true">ui/gtkassistant.ui</file>
-    <file compressed="true">ui/gtkcolorchooserdialog.ui</file>
-    <file compressed="true">ui/gtkcoloreditor.ui</file>
-    <file compressed="true">ui/gtkdialog.ui</file>
-    <file compressed="true">ui/gtkfilechooserbutton.ui</file>
-    <file compressed="true">ui/gtkfilechooserwidget.ui</file>
-    <file compressed="true">ui/gtkfilechooserdialog.ui</file>
-    <file compressed="true">ui/gtkfontbutton.ui</file>
-    <file compressed="true">ui/gtkfontchooserdialog.ui</file>
-    <file compressed="true">ui/gtkfontchooserwidget.ui</file>
-    <file compressed="true">ui/gtkinfobar.ui</file>
-    <file compressed="true">ui/gtklockbutton.ui</file>
-    <file compressed="true">ui/gtkmessagedialog.ui</file>
-    <file compressed="true">ui/gtkpagesetupunixdialog.ui</file>
-    <file compressed="true">ui/gtkpathbar.ui</file>
-    <file compressed="true">ui/gtkprintunixdialog.ui</file>
-    <file compressed="true">ui/gtkrecentchooserdefault.ui</file>
-    <file compressed="true">ui/gtksearchbar.ui</file>
-    <file compressed="true">ui/gtkscalebutton.ui</file>
-    <file compressed="true">ui/gtkstatusbar.ui</file>
-    <file compressed="true">ui/gtkvolumebutton.ui</file>
-    <file compressed="true">ui/gtkapplication-quartz.ui</file>
-  </gresource>
-</gresources>

gtk/gtk.h

@@ -36,7 +36,6 @@
 #include <gtk/gtkactionable.h>
 #include <gtk/gtkactionbar.h>
 #include <gtk/gtkadjustment.h>
-#include <gtk/gtkalignment.h>
 #include <gtk/gtkappchooser.h>
 #include <gtk/gtkappchooserdialog.h>
 #include <gtk/gtkappchooserwidget.h>
@@ -92,6 +91,7 @@
 #include <gtk/gtkentrycompletion.h>
 #include <gtk/gtkenums.h>
 #include <gtk/gtkeventbox.h>
+#include <gtk/gtkeventcontroller.h>
 #include <gtk/gtkexpander.h>
 #include <gtk/gtkfixed.h>
 #include <gtk/gtkfilechooser.h>
@@ -105,6 +105,15 @@
 #include <gtk/gtkfontchooserdialog.h>
 #include <gtk/gtkfontchooserwidget.h>
 #include <gtk/gtkframe.h>
+#include <gtk/gtkgesture.h>
+#include <gtk/gtkgesturedrag.h>
+#include <gtk/gtkgesturelongpress.h>
+#include <gtk/gtkgesturemultipress.h>
+#include <gtk/gtkgesturepan.h>
+#include <gtk/gtkgesturerotate.h>
+#include <gtk/gtkgesturesingle.h>
+#include <gtk/gtkgestureswipe.h>
+#include <gtk/gtkgesturezoom.h>
 #include <gtk/gtkgrid.h>
 #include <gtk/gtkheaderbar.h>
 #include <gtk/gtkicontheme.h>
@@ -220,12 +229,14 @@
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkwidgetpath.h>
 #include <gtk/gtkwindow.h>
+#include <gtk/gtkwindowgroup.h>
 
 #ifndef GTK_DISABLE_DEPRECATED
 #include <gtk/deprecated/gtkarrow.h>
 #include <gtk/deprecated/gtkactivatable.h>
 #include <gtk/deprecated/gtkaction.h>
 #include <gtk/deprecated/gtkactiongroup.h>
+#include <gtk/deprecated/gtkalignment.h>
 #include <gtk/deprecated/gtkcolorsel.h>
 #include <gtk/deprecated/gtkcolorseldialog.h>
 #include <gtk/deprecated/gtkfontsel.h>

gtk/gtkaboutdialog.c

@@ -197,7 +197,8 @@ enum
   PROP_LOGO,
   PROP_LOGO_ICON_NAME,
   PROP_WRAP_LICENSE,
-  PROP_LICENSE_TYPE
+  PROP_LICENSE_TYPE,
+  LAST_PROP
 };
 
 static void                 gtk_about_dialog_finalize       (GObject            *object);
@@ -239,13 +240,13 @@ static gboolean             text_view_visibility_notify_event(GtkWidget
 							      GdkEventVisibility *event,
 							      GtkAboutDialog     *about);
 
-
 enum {
   ACTIVATE_LINK,
   LAST_SIGNAL
 };
 
 static guint signals[LAST_SIGNAL] = { 0 };
+static GParamSpec *props[LAST_PROP] = { NULL, };
 
 G_DEFINE_TYPE_WITH_PRIVATE (GtkAboutDialog, gtk_about_dialog, GTK_TYPE_DIALOG)
 
@@ -358,13 +359,12 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
    *
    * Since: 2.12
    */
-  g_object_class_install_property (object_class,
-                                   PROP_NAME,
-                                   g_param_spec_string ("program-name",
-                                                        P_("Program name"),
-                                                        P_("The name of the program. If this is not set, it defaults to g_get_application_name()"),
-                                                        NULL,
-                                                        GTK_PARAM_READWRITE));
+  props[PROP_NAME] =
+    g_param_spec_string ("program-name",
+                         P_("Program name"),
+                         P_("The name of the program. If this is not set, it defaults to g_get_application_name()"),
+                         NULL,
+                         GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
 
   /**
    * GtkAboutDialog:version:
@@ -373,13 +373,12 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
    *
    * Since: 2.6
    */
-  g_object_class_install_property (object_class,
-                                   PROP_VERSION,
-                                   g_param_spec_string ("version",
-                                                        P_("Program version"),
-                                                        P_("The version of the program"),
-                                                        NULL,
-                                                        GTK_PARAM_READWRITE));
+  props[PROP_VERSION] =
+    g_param_spec_string ("version",
+                         P_("Program version"),
+                         P_("The version of the program"),
+                         NULL,
+                         GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
 
   /**
    * GtkAboutDialog:copyright:
@@ -388,13 +387,12 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
    *
    * Since: 2.6
    */
-  g_object_class_install_property (object_class,
-                                   PROP_COPYRIGHT,
-                                   g_param_spec_string ("copyright",
-                                                        P_("Copyright string"),
-                                                        P_("Copyright information for the program"),
-                                                        NULL,
-                                                        GTK_PARAM_READWRITE));
+  props[PROP_COPYRIGHT] =
+    g_param_spec_string ("copyright",
+                         P_("Copyright string"),
+                         P_("Copyright information for the program"),
+                         NULL,
+                         GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
         
 
   /**
@@ -406,13 +404,12 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
    *
    * Since: 2.6
    */
-  g_object_class_install_property (object_class,
-                                   PROP_COMMENTS,
-                                   g_param_spec_string ("comments",
-                                                        P_("Comments string"),
-                                                        P_("Comments about the program"),
-                                                        NULL,
-                                                        GTK_PARAM_READWRITE));
+  props[PROP_COMMENTS] =
+    g_param_spec_string ("comments",
+                         P_("Comments string"),
+                         P_("Comments about the program"),
+                         NULL,
+                         GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
 
   /**
    * GtkAboutDialog:license:
@@ -428,13 +425,12 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
    *
    * Since: 2.6
    */
-  g_object_class_install_property (object_class,
-                                   PROP_LICENSE,
-                                   g_param_spec_string ("license",
-                                                        _("License"),
-                                                        _("The license of the program"),
-                                                        NULL,
-                                                        GTK_PARAM_READWRITE));
+  props[PROP_LICENSE] =
+    g_param_spec_string ("license",
+                         _("License"),
+                         _("The license of the program"),
+                         NULL,
+                         GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
 
   /**
    * GtkAboutDialog:license-type:
@@ -457,14 +453,13 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
    *
    * Since: 3.0
    */
-  g_object_class_install_property (object_class,
-                                   PROP_LICENSE_TYPE,
-                                   g_param_spec_enum ("license-type",
-                                                      P_("License Type"),
-                                                      P_("The license type of the program"),
-                                                      GTK_TYPE_LICENSE,
-                                                      GTK_LICENSE_UNKNOWN,
-                                                      GTK_PARAM_READWRITE));
+  props[PROP_LICENSE_TYPE] =
+    g_param_spec_enum ("license-type",
+                       P_("License Type"),
+                       P_("The license type of the program"),
+                       GTK_TYPE_LICENSE,
+                       GTK_LICENSE_UNKNOWN,
+                       GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
 
   /**
    * GtkAboutDialog:website:
@@ -474,13 +469,12 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
    *
    * Since: 2.6
    */
-  g_object_class_install_property (object_class,
-                                   PROP_WEBSITE,
-                                   g_param_spec_string ("website",
-                                                        P_("Website URL"),
-                                                        P_("The URL for the link to the website of the program"),
-                                                        NULL,
-                                                        GTK_PARAM_READWRITE));
+  props[PROP_WEBSITE] =
+    g_param_spec_string ("website",
+                         P_("Website URL"),
+                         P_("The URL for the link to the website of the program"),
+                         NULL,
+                         GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
 
   /**
    * GtkAboutDialog:website-label:
@@ -489,13 +483,12 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
    *
    * Since: 2.6
    */
-  g_object_class_install_property (object_class,
-                                   PROP_WEBSITE_LABEL,
-                                   g_param_spec_string ("website-label",
-                                                        P_("Website label"),
-                                                        P_("The label for the link to the website of the program"),
-                                                        NULL,
-                                                        GTK_PARAM_READWRITE));
+  props[PROP_WEBSITE_LABEL] =
+    g_param_spec_string ("website-label",
+                         P_("Website label"),
+                         P_("The label for the link to the website of the program"),
+                         NULL,
+                         GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
 
   /**
    * GtkAboutDialog:authors:
@@ -506,13 +499,12 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
    *
    * Since: 2.6
    */
-  g_object_class_install_property (object_class,
-                                   PROP_AUTHORS,
-                                   g_param_spec_boxed ("authors",
-                                                       P_("Authors"),
-                                                       P_("List of authors of the program"),
-                                                       G_TYPE_STRV,
-                                                       GTK_PARAM_READWRITE));
+  props[PROP_AUTHORS] =
+    g_param_spec_boxed ("authors",
+                        P_("Authors"),
+                        P_("List of authors of the program"),
+                        G_TYPE_STRV,
+                        GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
 
   /**
    * GtkAboutDialog:documenters:
@@ -523,13 +515,12 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
    *
    * Since: 2.6
    */
-  g_object_class_install_property (object_class,
-                                   PROP_DOCUMENTERS,
-                                   g_param_spec_boxed ("documenters",
-                                                       P_("Documenters"),
-                                                       P_("List of people documenting the program"),
-                                                       G_TYPE_STRV,
-                                                       GTK_PARAM_READWRITE));
+  props[PROP_DOCUMENTERS] =
+    g_param_spec_boxed ("documenters",
+                        P_("Documenters"),
+                        P_("List of people documenting the program"),
+                        G_TYPE_STRV,
+                        GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
 
   /**
    * GtkAboutDialog:artists:
@@ -540,14 +531,12 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
    *
    * Since: 2.6
    */
-  g_object_class_install_property (object_class,
-                                   PROP_ARTISTS,
-                                   g_param_spec_boxed ("artists",
-                                                       P_("Artists"),
-                                                       P_("List of people who have contributed artwork to the program"),
-                                                       G_TYPE_STRV,
-                                                       GTK_PARAM_READWRITE));
-
+  props[PROP_ARTISTS] =
+    g_param_spec_boxed ("artists",
+                        P_("Artists"),
+                        P_("List of people who have contributed artwork to the program"),
+                        G_TYPE_STRV,
+                        GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
 
   /**
    * GtkAboutDialog:translator-credits:
@@ -558,14 +547,13 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
    *
    * Since: 2.6
    */
-  g_object_class_install_property (object_class,
-                                   PROP_TRANSLATOR_CREDITS,
-                                   g_param_spec_string ("translator-credits",
-                                                        P_("Translator credits"),
-                                                        P_("Credits to the translators. This string should be marked as translatable"),
-                                                        NULL,
-                                                        GTK_PARAM_READWRITE));
-        
+  props[PROP_TRANSLATOR_CREDITS] =
+    g_param_spec_string ("translator-credits",
+                         P_("Translator credits"),
+                         P_("Credits to the translators. This string should be marked as translatable"),
+                         NULL,
+                         GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
+
   /**
    * GtkAboutDialog:logo:
    *
@@ -574,13 +562,12 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
    *
    * Since: 2.6
    */
-  g_object_class_install_property (object_class,
-                                   PROP_LOGO,
-                                   g_param_spec_object ("logo",
-                                                        P_("Logo"),
-                                                        P_("A logo for the about box. If this is not set, it defaults to gtk_window_get_default_icon_list()"),
-                                                        GDK_TYPE_PIXBUF,
-                                                        GTK_PARAM_READWRITE));
+  props[PROP_LOGO] =
+    g_param_spec_object ("logo",
+                         P_("Logo"),
+                         P_("A logo for the about box. If this is not set, it defaults to gtk_window_get_default_icon_list()"),
+                         GDK_TYPE_PIXBUF,
+                         GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
 
   /**
    * GtkAboutDialog:logo-icon-name:
@@ -590,13 +577,13 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
    *
    * Since: 2.6
    */
-  g_object_class_install_property (object_class,
-                                   PROP_LOGO_ICON_NAME,
-                                   g_param_spec_string ("logo-icon-name",
-                                                        P_("Logo Icon Name"),
-                                                        P_("A named icon to use as the logo for the about box."),
-                                                        "image-missing",
-                                                        GTK_PARAM_READWRITE));
+  props[PROP_LOGO_ICON_NAME] =
+    g_param_spec_string ("logo-icon-name",
+                         P_("Logo Icon Name"),
+                         P_("A named icon to use as the logo for the about box."),
+                         "image-missing",
+                         GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
+
   /**
    * GtkAboutDialog:wrap-license:
    *
@@ -604,13 +591,14 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
    *
    * Since: 2.8
    */
-  g_object_class_install_property (object_class,
-                                   PROP_WRAP_LICENSE,
-                                   g_param_spec_boolean ("wrap-license",
-                                                         P_("Wrap license"),
-                                                         P_("Whether to wrap the license text."),
-                                                         FALSE,
-                                                         GTK_PARAM_READWRITE));
+  props[PROP_WRAP_LICENSE] =
+    g_param_spec_boolean ("wrap-license",
+                          P_("Wrap license"),
+                          P_("Whether to wrap the license text."),
+                          FALSE,
+                          GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
+
+  g_object_class_install_properties (object_class, LAST_PROP, props);
 
   /* Bind class to template
    */
@@ -791,7 +779,6 @@ gtk_about_dialog_set_property (GObject      *object,
                                GParamSpec   *pspec)
 {
   GtkAboutDialog *about = GTK_ABOUT_DIALOG (object);
-  GtkAboutDialogPrivate *priv = about->priv;
 
   switch (prop_id)
     {
@@ -838,7 +825,7 @@ gtk_about_dialog_set_property (GObject      *object,
       gtk_about_dialog_set_logo_icon_name (about, g_value_get_string (value));
       break;
     case PROP_WRAP_LICENSE:
-      priv->wrap_license = g_value_get_boolean (value);
+      gtk_about_dialog_set_wrap_license (about, g_value_get_boolean (value));
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1073,7 +1060,7 @@ gtk_about_dialog_set_program_name (GtkAboutDialog *about,
 
   update_name_version (about);
 
-  g_object_notify (G_OBJECT (about), "program-name");
+  g_object_notify_by_pspec (G_OBJECT (about), props[PROP_NAME]);
 }
 
 
@@ -1122,7 +1109,7 @@ gtk_about_dialog_set_version (GtkAboutDialog *about,
 
   update_name_version (about);
 
-  g_object_notify (G_OBJECT (about), "version");
+  g_object_notify_by_pspec (G_OBJECT (about), props[PROP_VERSION]);
 }
 
 /**
@@ -1181,7 +1168,7 @@ gtk_about_dialog_set_copyright (GtkAboutDialog *about,
   else
     gtk_widget_hide (priv->copyright_label);
 
-  g_object_notify (G_OBJECT (about), "copyright");
+  g_object_notify_by_pspec (G_OBJECT (about), props[PROP_COPYRIGHT]);
 }
 
 /**
@@ -1238,7 +1225,7 @@ gtk_about_dialog_set_comments (GtkAboutDialog *about,
     }
   g_free (tmp);
 
-  g_object_notify (G_OBJECT (about), "comments");
+  g_object_notify_by_pspec (G_OBJECT (about), props[PROP_COMMENTS]);
 }
 
 /**
@@ -1299,8 +1286,8 @@ gtk_about_dialog_set_license (GtkAboutDialog *about,
 
   update_license_button_visibility (about);
 
-  g_object_notify (G_OBJECT (about), "license");
-  g_object_notify (G_OBJECT (about), "license-type");
+  g_object_notify_by_pspec (G_OBJECT (about), props[PROP_LICENSE]);
+  g_object_notify_by_pspec (G_OBJECT (about), props[PROP_LICENSE_TYPE]);
 }
 
 /**
@@ -1348,7 +1335,7 @@ gtk_about_dialog_set_wrap_license (GtkAboutDialog *about,
     {
        priv->wrap_license = wrap_license;
 
-       g_object_notify (G_OBJECT (about), "wrap-license");
+       g_object_notify_by_pspec (G_OBJECT (about), props[PROP_WRAP_LICENSE]);
     }
 }
 
@@ -1401,7 +1388,7 @@ gtk_about_dialog_set_website (GtkAboutDialog *about,
 
   update_website (about);
 
-  g_object_notify (G_OBJECT (about), "website");
+  g_object_notify_by_pspec (G_OBJECT (about), props[PROP_WEBSITE]);
 }
 
 /**
@@ -1453,7 +1440,7 @@ gtk_about_dialog_set_website_label (GtkAboutDialog *about,
 
   update_website (about);
 
-  g_object_notify (G_OBJECT (about), "website-label");
+  g_object_notify_by_pspec (G_OBJECT (about), props[PROP_WEBSITE_LABEL]);
 }
 
 /**
@@ -1508,7 +1495,7 @@ gtk_about_dialog_set_authors (GtkAboutDialog  *about,
 
   update_credits_button_visibility (about);
 
-  g_object_notify (G_OBJECT (about), "authors");
+  g_object_notify_by_pspec (G_OBJECT (about), props[PROP_AUTHORS]);
 }
 
 /**
@@ -1563,7 +1550,7 @@ gtk_about_dialog_set_documenters (GtkAboutDialog *about,
 
   update_credits_button_visibility (about);
 
-  g_object_notify (G_OBJECT (about), "documenters");
+  g_object_notify_by_pspec (G_OBJECT (about), props[PROP_DOCUMENTERS]);
 }
 
 /**
@@ -1618,7 +1605,7 @@ gtk_about_dialog_set_artists (GtkAboutDialog *about,
 
   update_credits_button_visibility (about);
 
-  g_object_notify (G_OBJECT (about), "artists");
+  g_object_notify_by_pspec (G_OBJECT (about), props[PROP_ARTISTS]);
 }
 
 /**
@@ -1681,7 +1668,7 @@ gtk_about_dialog_set_translator_credits (GtkAboutDialog *about,
 
   update_credits_button_visibility (about);
 
-  g_object_notify (G_OBJECT (about), "translator-credits");
+  g_object_notify_by_pspec (G_OBJECT (about), props[PROP_TRANSLATOR_CREDITS]);
 }
 
 /**
@@ -1735,7 +1722,7 @@ gtk_about_dialog_set_logo (GtkAboutDialog *about,
   g_object_freeze_notify (G_OBJECT (about));
 
   if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) == GTK_IMAGE_ICON_NAME)
-    g_object_notify (G_OBJECT (about), "logo-icon-name");
+    g_object_notify_by_pspec (G_OBJECT (about), props[PROP_LOGO_ICON_NAME]);
 
   if (logo != NULL)
     gtk_image_set_from_pixbuf (GTK_IMAGE (priv->logo_image), logo);
@@ -1752,7 +1739,7 @@ gtk_about_dialog_set_logo (GtkAboutDialog *about,
         }
     }
 
-  g_object_notify (G_OBJECT (about), "logo");
+  g_object_notify_by_pspec (G_OBJECT (about), props[PROP_LOGO]);
 
   g_object_thaw_notify (G_OBJECT (about));
 }
@@ -1810,7 +1797,7 @@ gtk_about_dialog_set_logo_icon_name (GtkAboutDialog *about,
   g_object_freeze_notify (G_OBJECT (about));
 
   if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) == GTK_IMAGE_PIXBUF)
-    g_object_notify (G_OBJECT (about), "logo");
+    g_object_notify_by_pspec (G_OBJECT (about), props[PROP_LOGO]);
 
   if (icon_name)
     {
@@ -1854,7 +1841,7 @@ gtk_about_dialog_set_logo_icon_name (GtkAboutDialog *about,
       gtk_image_clear (GTK_IMAGE (priv->logo_image));
     }
 
-  g_object_notify (G_OBJECT (about), "logo-icon-name");
+  g_object_notify_by_pspec (G_OBJECT (about), props[PROP_LOGO_ICON_NAME]);
 
   g_object_thaw_notify (G_OBJECT (about));
 }
@@ -2454,7 +2441,7 @@ gtk_about_dialog_set_license_type (GtkAboutDialog *about,
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
   g_return_if_fail (license_type >= GTK_LICENSE_UNKNOWN &&
-                    license_type <= GTK_LICENSE_ARTISTIC);
+                    license_type <= GTK_LICENSE_LGPL_3_0_ONLY);
 
   priv = about->priv;
 
@@ -2492,15 +2479,15 @@ gtk_about_dialog_set_license_type (GtkAboutDialog *about,
 
           update_license_button_visibility (about);
 
-          g_object_notify (G_OBJECT (about), "wrap-license");
-          g_object_notify (G_OBJECT (about), "license");
+          g_object_notify_by_pspec (G_OBJECT (about), props[PROP_WRAP_LICENSE]);
+          g_object_notify_by_pspec (G_OBJECT (about), props[PROP_LICENSE]);
         }
       else
         {
           gtk_widget_show (priv->license_label);
         }
 
-      g_object_notify (G_OBJECT (about), "license-type");
+      g_object_notify_by_pspec (G_OBJECT (about), props[PROP_LICENSE_TYPE]);
 
       g_object_thaw_notify (G_OBJECT (about));
     }

gtk/gtkaccellabel.c

@@ -94,7 +94,8 @@
 enum {
   PROP_0,
   PROP_ACCEL_CLOSURE,
-  PROP_ACCEL_WIDGET
+  PROP_ACCEL_WIDGET,
+  LAST_PROP
 };
 
 struct _GtkAccelLabelPrivate
@@ -110,6 +111,8 @@ struct _GtkAccelLabelPrivate
   GdkModifierType accel_mods;
 };
 
+GParamSpec *props[LAST_PROP] = { NULL, };
+
 static void         gtk_accel_label_set_property (GObject            *object,
 						  guint               prop_id,
 						  const GValue       *value,
@@ -183,20 +186,21 @@ gtk_accel_label_class_init (GtkAccelLabelClass *class)
 
 #endif /* GDK_WINDOWING_QUARTZ */
 
-  g_object_class_install_property (gobject_class,
-                                   PROP_ACCEL_CLOSURE,
-                                   g_param_spec_boxed ("accel-closure",
-						       P_("Accelerator Closure"),
-						       P_("The closure to be monitored for accelerator changes"),
-						       G_TYPE_CLOSURE,
-						       GTK_PARAM_READWRITE));
-  g_object_class_install_property (gobject_class,
-                                   PROP_ACCEL_WIDGET,
-                                   g_param_spec_object ("accel-widget",
-                                                        P_("Accelerator Widget"),
-                                                        P_("The widget to be monitored for accelerator changes"),
-                                                        GTK_TYPE_WIDGET,
-                                                        GTK_PARAM_READWRITE));
+  props[PROP_ACCEL_CLOSURE] =
+    g_param_spec_boxed ("accel-closure",
+                        P_("Accelerator Closure"),
+                        P_("The closure to be monitored for accelerator changes"),
+                        G_TYPE_CLOSURE,
+                        GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
+
+  props[PROP_ACCEL_WIDGET] =
+    g_param_spec_object ("accel-widget",
+                         P_("Accelerator Widget"),
+                         P_("The widget to be monitored for accelerator changes"),
+                         GTK_TYPE_WIDGET,
+                         GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
+
+  g_object_class_install_properties (gobject_class, LAST_PROP, props);
 }
 
 static void
@@ -397,7 +401,6 @@ gtk_accel_label_draw (GtkWidget *widget,
 
       gint x;
       gint y;
-      gint xpad;
 
       context = gtk_widget_get_style_context (widget);
       label_layout = gtk_label_get_layout (GTK_LABEL (accel_label));
@@ -427,14 +430,10 @@ gtk_accel_label_draw (GtkWidget *widget,
 
       cairo_restore (cr);
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-      gtk_misc_get_padding (GTK_MISC (widget), &xpad, NULL);
-G_GNUC_END_IGNORE_DEPRECATIONS
-
       if (direction == GTK_TEXT_DIR_RTL)
-        x = xpad;
+        x = 0;
       else
-        x = gtk_widget_get_allocated_width (widget) - xpad - ac_width;
+        x = gtk_widget_get_allocated_width (widget) - ac_width;
 
       gtk_label_get_layout_offsets (GTK_LABEL (accel_label), NULL, &y);
 
@@ -490,7 +489,7 @@ accel_widget_weak_ref_cb (GtkAccelLabel *accel_label,
                                         refetch_widget_accel_closure,
                                         accel_label);
   accel_label->priv->accel_widget = NULL;
-  g_object_notify (G_OBJECT (accel_label), "accel-widget");
+  g_object_notify_by_pspec (G_OBJECT (accel_label), props[PROP_ACCEL_WIDGET]);
 }
 
 /**
@@ -529,7 +528,7 @@ gtk_accel_label_set_accel_widget (GtkAccelLabel *accel_label,
                                    accel_label, G_CONNECT_SWAPPED);
           refetch_widget_accel_closure (accel_label);
         }
-      g_object_notify (G_OBJECT (accel_label), "accel-widget");
+      g_object_notify_by_pspec (G_OBJECT (accel_label), props[PROP_ACCEL_WIDGET]);
     }
 }
 
@@ -592,7 +591,7 @@ gtk_accel_label_set_accel_closure (GtkAccelLabel *accel_label,
 				   accel_label, 0);
 	}
       gtk_accel_label_reset (accel_label);
-      g_object_notify (G_OBJECT (accel_label), "accel-closure");
+      g_object_notify_by_pspec (G_OBJECT (accel_label), props[PROP_ACCEL_CLOSURE]);
     }
 }
 

gtk/gtkactionable.c

@@ -37,10 +37,11 @@
  * and #GtkActionable:action-target. There are also some convenience APIs
  * for setting these properties.
  *
- * This interface is presently only meaningful if used on a widget that
- * is (or will be) located inside of a #GtkApplicationWindow and can
- * only be used to associate the widget with actions on that window, or
- * its associated #GtkApplication.
+ * The action will be looked up in action groups that are found among
+ * the widgets ancestors. Most commonly, these will be the actions with
+ * the "win" or "app" prefix that are associated with the #GtkApplicationWindow
+ * or "GtkApplication, but other action groups that are added with
+ * gtk_widget_insert_action_group() will be consulted as well.
  *
  * Since: 3.4
  **/

gtk/gtkappchooserbutton.c

@@ -332,7 +332,8 @@ gtk_app_chooser_button_populate (GtkAppChooserButton *self)
 
   if (self->priv->show_default_item)
     {
-      default_app = g_app_info_get_default_for_type (self->priv->content_type, FALSE);
+      if (self->priv->content_type)
+        default_app = g_app_info_get_default_for_type (self->priv->content_type, FALSE);
 
       if (default_app != NULL)
         {
@@ -615,7 +616,7 @@ gtk_app_chooser_button_class_init (GtkAppChooserButtonClass *klass)
                           P_("Include an 'Other…' item"),
                           P_("Whether the combobox should include an item that triggers a GtkAppChooserDialog"),
                           FALSE,
-                          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
+                          G_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_STATIC_STRINGS|G_PARAM_EXPLICIT_NOTIFY);
   g_object_class_install_property (oclass, PROP_SHOW_DIALOG_ITEM, pspec);
 
   /**
@@ -632,7 +633,7 @@ gtk_app_chooser_button_class_init (GtkAppChooserButtonClass *klass)
                           P_("Show default item"),
                           P_("Whether the combobox should show the default application on top"),
                           FALSE,
-                          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
+                          G_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_STATIC_STRINGS|G_PARAM_EXPLICIT_NOTIFY);
   g_object_class_install_property (oclass, PROP_SHOW_DEFAULT_ITEM, pspec);
 
 
@@ -646,7 +647,7 @@ gtk_app_chooser_button_class_init (GtkAppChooserButtonClass *klass)
                                P_("Heading"),
                                P_("The text to show at the top of the dialog"),
                                NULL,
-                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS|G_PARAM_EXPLICIT_NOTIFY);
   g_object_class_install_property (oclass, PROP_HEADING, pspec);
 
 

gtk/gtkappchooserwidget.c

@@ -966,7 +966,7 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass)
                                 P_("Show default app"),
                                 P_("Whether the widget should show the default application"),
                                 FALSE,
-                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
+                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY);
   g_object_class_install_property (gobject_class, PROP_SHOW_DEFAULT, pspec);
 
   /**
@@ -981,7 +981,7 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass)
                                 P_("Show recommended apps"),
                                 P_("Whether the widget should show recommended applications"),
                                 TRUE,
-                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
+                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY);
   g_object_class_install_property (gobject_class, PROP_SHOW_RECOMMENDED, pspec);
 
   /**
@@ -996,7 +996,7 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass)
                                 P_("Show fallback apps"),
                                 P_("Whether the widget should show fallback applications"),
                                 FALSE,
-                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
+                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY);
   g_object_class_install_property (gobject_class, PROP_SHOW_FALLBACK, pspec);
 
   /**
@@ -1009,7 +1009,7 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass)
                                 P_("Show other apps"),
                                 P_("Whether the widget should show other applications"),
                                 FALSE,
-                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
+                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY);
   g_object_class_install_property (gobject_class, PROP_SHOW_OTHER, pspec);
 
   /**
@@ -1023,7 +1023,7 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass)
                                 P_("Show all apps"),
                                 P_("Whether the widget should show all applications"),
                                 FALSE,
-                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
+                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY);
   g_object_class_install_property (gobject_class, PROP_SHOW_ALL, pspec);
 
   /**
@@ -1038,7 +1038,7 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass)
                                P_("Widget's default text"),
                                P_("The default text appearing when there are no applications"),
                                NULL,
-                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY);
   g_object_class_install_property (gobject_class, PROP_DEFAULT_TEXT, pspec);
 
   /**

gtk/gtkapplication.c

@@ -522,6 +522,8 @@ gtk_application_shutdown (GApplication *g_application)
   gtk_application_impl_shutdown (application->priv->impl);
   g_clear_object (&application->priv->impl);
 
+  gtk_action_muxer_remove (application->priv->muxer, "app");
+
   /* Keep this section in sync with gtk_main() */
 
   /* Try storing all clipboard data we have */
@@ -767,6 +769,7 @@ gtk_application_finalize (GObject *object)
 
   g_clear_object (&application->priv->app_menu);
   g_clear_object (&application->priv->menubar);
+  g_clear_object (&application->priv->muxer);
 
   accels_finalize (&application->priv->accels);
 

gtk/gtkapplicationwindow.c

@@ -298,9 +298,10 @@ gtk_application_window_update_shell_shows_app_menu (GtkApplicationWindow *window
       /* the shell does not show it, so make sure we show it */
       if (g_menu_model_get_n_items (G_MENU_MODEL (window->priv->app_menu_section)) == 0)
         {
-          GMenuModel *app_menu;
+          GMenuModel *app_menu = NULL;
 
-          app_menu = gtk_application_get_app_menu (gtk_window_get_application (GTK_WINDOW (window)));
+          if (gtk_window_get_application (GTK_WINDOW (window)) != NULL)
+            app_menu = gtk_application_get_app_menu (gtk_window_get_application (GTK_WINDOW (window)));
 
           if (app_menu != NULL)
             {
@@ -347,9 +348,10 @@ gtk_application_window_update_shell_shows_menubar (GtkApplicationWindow *window,
       /* the shell does not show it, so make sure we show it */
       if (g_menu_model_get_n_items (G_MENU_MODEL (window->priv->menubar_section)) == 0)
         {
-          GMenuModel *menubar;
+          GMenuModel *menubar = NULL;
 
-          menubar = gtk_application_get_menubar (gtk_window_get_application (GTK_WINDOW (window)));
+          if (gtk_window_get_application (GTK_WINDOW (window)) != NULL)
+            menubar = gtk_application_get_menubar (gtk_window_get_application (GTK_WINDOW (window)));
 
           if (menubar != NULL)
             g_menu_append_section (window->priv->menubar_section, NULL, menubar);
@@ -844,7 +846,7 @@ gtk_application_window_class_init (GtkApplicationWindowClass *class)
                           P_("Show a menubar"),
                           P_("TRUE if the window should show a "
                              "menubar at the top of the window"),
-                          TRUE, G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE);
+                          TRUE, G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
   g_object_class_install_properties (object_class, N_PROPS, gtk_application_window_properties);
 }
 

gtk/gtkaspectframe.c

@@ -107,28 +107,28 @@ gtk_aspect_frame_class_init (GtkAspectFrameClass *class)
                                                        P_("Horizontal Alignment"),
                                                        P_("X alignment of the child"),
                                                        0.0, 1.0, 0.5,
-                                                       GTK_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
   g_object_class_install_property (gobject_class,
                                    PROP_YALIGN,
                                    g_param_spec_float ("yalign",
                                                        P_("Vertical Alignment"),
                                                        P_("Y alignment of the child"),
                                                        0.0, 1.0, 0.5,
-                                                       GTK_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
   g_object_class_install_property (gobject_class,
                                    PROP_RATIO,
                                    g_param_spec_float ("ratio",
                                                        P_("Ratio"),
                                                        P_("Aspect ratio if obey_child is FALSE"),
                                                        MIN_RATIO, MAX_RATIO, 1.0,
-                                                       GTK_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
   g_object_class_install_property (gobject_class,
                                    PROP_OBEY_CHILD,
                                    g_param_spec_boolean ("obey-child",
                                                          P_("Obey child"),
                                                          P_("Force aspect ratio to match that of the frame's child"),
                                                          TRUE,
-                                                         GTK_PARAM_READWRITE));
+                                                         GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
 }
 
 static void

gtk/gtkassistant.c

@@ -1760,15 +1760,8 @@ gtk_assistant_insert_page (GtkAssistant *assistant,
   page_info->current_title = gtk_label_new (NULL);
   gtk_widget_set_no_show_all (page_info->current_title, TRUE);
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  /* Note: we need to use misc alignment here as long as GtkLabel
-   * pays attention to it. GtkWiget::halign is ineffective, since
-   * all the labels are getting the same size anyway, due to the
-   * size group.
-   */
-  gtk_misc_set_alignment (GTK_MISC (page_info->regular_title), 0, 0.5);
-  gtk_misc_set_alignment (GTK_MISC (page_info->current_title), 0, 0.5);
-G_GNUC_END_IGNORE_DEPRECATIONS
+  gtk_widget_set_halign (page_info->regular_title, GTK_ALIGN_START);
+  gtk_widget_set_halign (page_info->current_title, GTK_ALIGN_START);
 
   gtk_widget_show (page_info->regular_title);
   gtk_widget_hide (page_info->current_title);

gtk/gtkbbox.c

@@ -209,7 +209,7 @@ gtk_button_box_class_init (GtkButtonBoxClass *class)
                                                       P_("How to lay out the buttons in the box. Possible values are: spread, edge, start and end"),
                                                       GTK_TYPE_BUTTON_BOX_STYLE,
                                                       DEFAULT_LAYOUT_STYLE,
-                                                      GTK_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
 
   gtk_container_class_install_child_property (container_class,
                                               CHILD_PROP_SECONDARY,

gtk/gtkbindings.h

@@ -126,7 +126,7 @@ struct _GtkBindingArg
  * @next: implementation detail
  * @signal_name: the action signal to be emitted
  * @n_args: number of arguments specified for the signal
- * @args: the arguments specified for the signal
+ * @args: (array length=n_args): the arguments specified for the signal
  *
  * A GtkBindingSignal stores the necessary information to
  * activate a widget in response to a key press via a signal

gtk/gtkbox.c

@@ -90,10 +90,13 @@
 
 enum {
   PROP_0,
-  PROP_ORIENTATION,
   PROP_SPACING,
   PROP_HOMOGENEOUS,
-  PROP_BASELINE_POSITION
+  PROP_BASELINE_POSITION,
+
+  /* orientable */
+  PROP_ORIENTATION,
+  LAST_PROP = PROP_ORIENTATION
 };
 
 enum {
@@ -121,6 +124,8 @@ struct _GtkBoxPrivate
   guint           baseline_pos   : 2;
 };
 
+static GParamSpec *props[LAST_PROP] = { NULL, };
+
 /*
  * GtkBoxChild:
  * @widget: the child widget, packed into the GtkBox.
@@ -246,32 +251,29 @@ gtk_box_class_init (GtkBoxClass *class)
                                     PROP_ORIENTATION,
                                     "orientation");
 
-  g_object_class_install_property (object_class,
-                                   PROP_SPACING,
-                                   g_param_spec_int ("spacing",
-                                                     P_("Spacing"),
-                                                     P_("The amount of space between children"),
-                                                     0,
-                                                     G_MAXINT,
-                                                     0,
-                                                     GTK_PARAM_READWRITE));
+  props[PROP_SPACING] =
+    g_param_spec_int ("spacing",
+                      P_("Spacing"),
+                      P_("The amount of space between children"),
+                      0, G_MAXINT, 0,
+                      GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
 
-  g_object_class_install_property (object_class,
-                                   PROP_HOMOGENEOUS,
-                                   g_param_spec_boolean ("homogeneous",
-							 P_("Homogeneous"),
-							 P_("Whether the children should all be the same size"),
-							 FALSE,
-							 GTK_PARAM_READWRITE));
+  props[PROP_HOMOGENEOUS] =
+    g_param_spec_boolean ("homogeneous",
+                          P_("Homogeneous"),
+                          P_("Whether the children should all be the same size"),
+                          FALSE,
+                          GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
 
-  g_object_class_install_property (object_class,
-                                   PROP_BASELINE_POSITION,
-                                   g_param_spec_enum ("baseline-position",
-                                                     P_("Baseline position"),
-                                                     P_("The position of the baseline aligned widgets if extra space is available"),
-                                                     GTK_TYPE_BASELINE_POSITION,
-                                                     GTK_BASELINE_POSITION_CENTER,
-                                                     GTK_PARAM_READWRITE));
+  props[PROP_BASELINE_POSITION] =
+    g_param_spec_enum ("baseline-position",
+                       P_("Baseline position"),
+                       P_("The position of the baseline aligned widgets if extra space is available"),
+                       GTK_TYPE_BASELINE_POSITION,
+                       GTK_BASELINE_POSITION_CENTER,
+                       GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
+
+  g_object_class_install_properties (object_class, LAST_PROP, props);
 
   /**
    * GtkBox:expand:
@@ -372,9 +374,16 @@ gtk_box_set_property (GObject      *object,
   switch (prop_id)
     {
     case PROP_ORIENTATION:
-      private->orientation = g_value_get_enum (value);
-      _gtk_orientable_set_style_classes (GTK_ORIENTABLE (box));
-      gtk_widget_queue_resize (GTK_WIDGET (box));
+      {
+        GtkOrientation orientation = g_value_get_enum (value);
+        if (private->orientation != orientation)
+          {
+            private->orientation = orientation;
+            _gtk_orientable_set_style_classes (GTK_ORIENTABLE (box));
+            gtk_widget_queue_resize (GTK_WIDGET (box));
+            g_object_notify (object, "orientation");
+          }
+      }
       break;
     case PROP_SPACING:
       gtk_box_set_spacing (box, g_value_get_int (value));
@@ -791,6 +800,8 @@ gtk_box_size_allocate_no_center (GtkWidget     *widget,
 	  i++;
 	}
     }
+
+  _gtk_widget_set_simple_clip (widget);
 }
 
 static void
@@ -1158,6 +1169,8 @@ gtk_box_size_allocate_with_center (GtkWidget     *widget,
       child_allocation.height = center_size;
     }
   gtk_widget_size_allocate_with_baseline (priv->center->widget, &child_allocation, baseline);
+
+  _gtk_widget_set_simple_clip (widget);
 }
 
 static void
@@ -2098,10 +2111,12 @@ gtk_box_set_homogeneous (GtkBox  *box,
 
   private = box->priv;
 
-  if ((homogeneous ? TRUE : FALSE) != private->homogeneous)
+  homogeneous = homogeneous != FALSE;
+
+  if (private->homogeneous != homogeneous)
     {
-      private->homogeneous = homogeneous ? TRUE : FALSE;
-      g_object_notify (G_OBJECT (box), "homogeneous");
+      private->homogeneous = homogeneous;
+      g_object_notify_by_pspec (G_OBJECT (box), props[PROP_HOMOGENEOUS]);
       gtk_widget_queue_resize (GTK_WIDGET (box));
     }
 }
@@ -2141,12 +2156,12 @@ gtk_box_set_spacing (GtkBox *box,
 
   private = box->priv;
 
-  if (spacing != private->spacing)
+  if (private->spacing != spacing)
     {
       private->spacing = spacing;
       _gtk_box_set_spacing_set (box, TRUE);
 
-      g_object_notify (G_OBJECT (box), "spacing");
+      g_object_notify_by_pspec (G_OBJECT (box), props[PROP_SPACING]);
 
       gtk_widget_queue_resize (GTK_WIDGET (box));
     }
@@ -2192,11 +2207,11 @@ gtk_box_set_baseline_position (GtkBox             *box,
 
   private = box->priv;
 
-  if (position != private->baseline_pos)
+  if (private->baseline_pos != position)
     {
       private->baseline_pos = position;
 
-      g_object_notify (G_OBJECT (box), "baseline-position");
+      g_object_notify_by_pspec (G_OBJECT (box), props[PROP_BASELINE_POSITION]);
 
       gtk_widget_queue_resize (GTK_WIDGET (box));
     }
@@ -2213,7 +2228,7 @@ gtk_box_set_baseline_position (GtkBox             *box,
  * Since: 3.10
  **/
 GtkBaselinePosition
-gtk_box_get_baseline_position (GtkBox         *box)
+gtk_box_get_baseline_position (GtkBox *box)
 {
   g_return_val_if_fail (GTK_IS_BOX (box), GTK_BASELINE_POSITION_CENTER);
 

gtk/gtkbuilder.c

@@ -1547,7 +1547,7 @@ gtk_builder_expose_object (GtkBuilder    *builder,
 typedef struct {
   GModule *module;
   gpointer data;
-} connect_args;
+} ConnectArgs;
 
 static void
 gtk_builder_connect_signals_default (GtkBuilder    *builder,
@@ -1559,7 +1559,7 @@ gtk_builder_connect_signals_default (GtkBuilder    *builder,
 				     gpointer       user_data)
 {
   GCallback func;
-  connect_args *args = (connect_args*)user_data;
+  ConnectArgs *args = (ConnectArgs*) user_data;
 
   func = gtk_builder_lookup_callback_symbol (builder, handler_name);
 
@@ -1618,23 +1618,20 @@ void
 gtk_builder_connect_signals (GtkBuilder *builder,
 			     gpointer    user_data)
 {
-  connect_args *args;
+  ConnectArgs args;
   
   g_return_if_fail (GTK_IS_BUILDER (builder));
   
-  args = g_slice_new0 (connect_args);
-  args->data = user_data;
+  args.data = user_data;
 
   if (g_module_supported ())
-    args->module = g_module_open (NULL, G_MODULE_BIND_LAZY);
+    args.module = g_module_open (NULL, G_MODULE_BIND_LAZY);
   
   gtk_builder_connect_signals_full (builder,
                                     gtk_builder_connect_signals_default,
-                                    args);
-  if (args->module)
-    g_module_close (args->module);
-
-  g_slice_free (connect_args, args);
+                                    &args);
+  if (args.module)
+    g_module_close (args.module);
 }
 
 /**
@@ -1643,7 +1640,7 @@ gtk_builder_connect_signals (GtkBuilder *builder,
  * @object: object to connect a signal to
  * @signal_name: name of the signal
  * @handler_name: name of the handler
- * @connect_object: a #GObject, if non-%NULL, use g_signal_connect_object()
+ * @connect_object: (nullable): a #GObject, if non-%NULL, use g_signal_connect_object()
  * @flags: #GConnectFlags to use
  * @user_data: user data
  *
@@ -2275,10 +2272,17 @@ GType
 gtk_builder_get_type_from_name (GtkBuilder  *builder, 
                                 const gchar *type_name)
 {
+  GType type;
+
   g_return_val_if_fail (GTK_IS_BUILDER (builder), G_TYPE_INVALID);
   g_return_val_if_fail (type_name != NULL, G_TYPE_INVALID);
 
-  return GTK_BUILDER_GET_CLASS (builder)->get_type_from_name (builder, type_name);
+  type = GTK_BUILDER_GET_CLASS (builder)->get_type_from_name (builder, type_name);
+
+  if (G_TYPE_IS_CLASSED (type))
+    g_type_class_unref (g_type_class_ref (type));
+
+  return type;
 }
 
 GQuark

gtk/gtkbutton.c

@@ -42,7 +42,7 @@
 #include "gtkbuttonprivate.h"
 
 #include <string.h>
-#include "gtkalignment.h"
+#include "deprecated/gtkalignment.h"
 #include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
@@ -59,7 +59,7 @@
 #include "gtkapplicationprivate.h"
 #include "gtkactionhelper.h"
 
-static const GtkBorder default_default_border = { 1, 1, 1, 1 };
+static const GtkBorder default_default_border = { 0, 0, 0, 0 };
 static const GtkBorder default_default_outside_border = { 0, 0, 0, 0 };
 
 /* Time out before giving up on getting a key release when animating
@@ -89,13 +89,16 @@ enum {
   PROP_XALIGN,
   PROP_YALIGN,
   PROP_IMAGE_POSITION,
+  PROP_ALWAYS_SHOW_IMAGE,
+
+  /* actionable properties */
   PROP_ACTION_NAME,
   PROP_ACTION_TARGET,
-  PROP_ALWAYS_SHOW_IMAGE,
 
   /* activatable properties */
   PROP_ACTIVATABLE_RELATED_ACTION,
-  PROP_ACTIVATABLE_USE_ACTION_APPEARANCE
+  PROP_ACTIVATABLE_USE_ACTION_APPEARANCE,
+  LAST_PROP = PROP_ACTION_NAME
 };
 
 
@@ -119,12 +122,6 @@ static void gtk_button_style_updated (GtkWidget * widget);
 static void gtk_button_size_allocate (GtkWidget * widget,
 				      GtkAllocation * allocation);
 static gint gtk_button_draw (GtkWidget * widget, cairo_t *cr);
-static gint gtk_button_button_press (GtkWidget * widget,
-				     GdkEventButton * event);
-static gint gtk_button_button_release (GtkWidget * widget,
-				       GdkEventButton * event);
-static gboolean gtk_button_touch (GtkWidget     *widget,
-                                  GdkEventTouch *event);
 static gint gtk_button_grab_broken (GtkWidget * widget,
 				    GdkEventGrabBroken * event);
 static gint gtk_button_key_release (GtkWidget * widget, GdkEventKey * event);
@@ -185,6 +182,7 @@ static void gtk_button_get_preferred_height_and_baseline_for_width (GtkWidget *w
 								    gint      *minimum_baseline,
 								    gint      *natural_baseline);
   
+static GParamSpec *props[LAST_PROP] = { NULL, };
 static guint button_signals[LAST_SIGNAL] = { 0 };
 
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
@@ -225,9 +223,6 @@ gtk_button_class_init (GtkButtonClass *klass)
   widget_class->style_updated = gtk_button_style_updated;
   widget_class->size_allocate = gtk_button_size_allocate;
   widget_class->draw = gtk_button_draw;
-  widget_class->button_press_event = gtk_button_button_press;
-  widget_class->button_release_event = gtk_button_button_release;
-  widget_class->touch_event = gtk_button_touch;
   widget_class->grab_broken_event = gtk_button_grab_broken;
   widget_class->key_release_event = gtk_button_key_release;
   widget_class->enter_notify_event = gtk_button_enter_notify;
@@ -246,51 +241,46 @@ gtk_button_class_init (GtkButtonClass *klass)
   klass->leave = gtk_button_update_state;
   klass->activate = gtk_real_button_activate;
 
-  g_object_class_install_property (gobject_class,
-                                   PROP_LABEL,
-                                   g_param_spec_string ("label",
-                                                        P_("Label"),
-                                                        P_("Text of the label widget inside the button, if the button contains a label widget"),
-                                                        NULL,
-                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+  props[PROP_LABEL] =
+    g_param_spec_string ("label",
+                         P_("Label"),
+                         P_("Text of the label widget inside the button, if the button contains a label widget"),
+                         NULL,
+                         GTK_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_EXPLICIT_NOTIFY);
   
-  g_object_class_install_property (gobject_class,
-                                   PROP_USE_UNDERLINE,
-                                   g_param_spec_boolean ("use-underline",
-							 P_("Use underline"),
-							 P_("If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"),
-                                                        FALSE,
-                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+  props[PROP_USE_UNDERLINE] =
+    g_param_spec_boolean ("use-underline",
+                          P_("Use underline"),
+                          P_("If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"),
+                          FALSE,
+                          GTK_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_EXPLICIT_NOTIFY);
   
   /**
    * GtkButton:use-stock:
    *
    * Deprecated: 3.10
    */
-  g_object_class_install_property (gobject_class,
-                                   PROP_USE_STOCK,
-                                   g_param_spec_boolean ("use-stock",
-							 P_("Use stock"),
-							 P_("If set, the label is used to pick a stock item instead of being displayed"),
-                                                        FALSE,
-                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED));
+  props[PROP_USE_STOCK] =
+    g_param_spec_boolean ("use-stock",
+                          P_("Use stock"),
+                          P_("If set, the label is used to pick a stock item instead of being displayed"),
+                          FALSE,
+                          GTK_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_EXPLICIT_NOTIFY|G_PARAM_DEPRECATED);
   
-  g_object_class_install_property (gobject_class,
-                                   PROP_FOCUS_ON_CLICK,
-                                   g_param_spec_boolean ("focus-on-click",
-							 P_("Focus on click"),
-							 P_("Whether the button grabs focus when it is clicked with the mouse"),
-							 TRUE,
-							 GTK_PARAM_READWRITE));
+  props[PROP_FOCUS_ON_CLICK] =
+    g_param_spec_boolean ("focus-on-click",
+                          P_("Focus on click"),
+                          P_("Whether the button grabs focus when it is clicked with the mouse"),
+                          TRUE,
+                          GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
   
-  g_object_class_install_property (gobject_class,
-                                   PROP_RELIEF,
-                                   g_param_spec_enum ("relief",
-                                                      P_("Border relief"),
-                                                      P_("The border relief style"),
-                                                      GTK_TYPE_RELIEF_STYLE,
-                                                      GTK_RELIEF_NORMAL,
-                                                      GTK_PARAM_READWRITE));
+  props[PROP_RELIEF] =
+    g_param_spec_enum ("relief",
+                       P_("Border relief"),
+                       P_("The border relief style"),
+                       GTK_TYPE_RELIEF_STYLE,
+                       GTK_RELIEF_NORMAL,
+                       GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
   
   /**
    * GtkButton:xalign:
@@ -304,15 +294,12 @@ gtk_button_class_init (GtkButtonClass *klass)
    * Deprecated: 3.14: Access the child widget directly if you need to control
    * its alignment.
    */
-  g_object_class_install_property (gobject_class,
-                                   PROP_XALIGN,
-                                   g_param_spec_float ("xalign",
-                                                       P_("Horizontal alignment for child"),
-                                                       P_("Horizontal position of child in available space. 0.0 is left aligned, 1.0 is right aligned"),
-                                                       0.0,
-                                                       1.0,
-                                                       0.5,
-                                                       GTK_PARAM_READWRITE|G_PARAM_DEPRECATED));
+  props[PROP_XALIGN] =
+    g_param_spec_float ("xalign",
+                        P_("Horizontal alignment for child"),
+                        P_("Horizontal position of child in available space. 0.0 is left aligned, 1.0 is right aligned"),
+                        0.0, 1.0, 0.5,
+                        GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY|G_PARAM_DEPRECATED);
 
   /**
    * GtkButton:yalign:
@@ -326,15 +313,12 @@ gtk_button_class_init (GtkButtonClass *klass)
    * Deprecated: 3.14: Access the child widget directly if you need to control
    * its alignment.
    */
-  g_object_class_install_property (gobject_class,
-                                   PROP_YALIGN,
-                                   g_param_spec_float ("yalign",
-                                                       P_("Vertical alignment for child"),
-                                                       P_("Vertical position of child in available space. 0.0 is top aligned, 1.0 is bottom aligned"),
-                                                       0.0,
-                                                       1.0,
-                                                       0.5,
-                                                       GTK_PARAM_READWRITE|G_PARAM_DEPRECATED));
+  props[PROP_YALIGN] =
+    g_param_spec_float ("yalign",
+                        P_("Vertical alignment for child"),
+                        P_("Vertical position of child in available space. 0.0 is top aligned, 1.0 is bottom aligned"),
+                        0.0, 1.0, 0.5,
+                        GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY|G_PARAM_DEPRECATED);
 
   /**
    * GtkButton:image:
@@ -343,13 +327,12 @@ gtk_button_class_init (GtkButtonClass *klass)
    *
    * Since: 2.6
    */
-  g_object_class_install_property (gobject_class,
-                                   PROP_IMAGE,
-                                   g_param_spec_object ("image",
-                                                        P_("Image widget"),
-                                                        P_("Child widget to appear next to the button text"),
-                                                        GTK_TYPE_WIDGET,
-                                                        GTK_PARAM_READWRITE));
+  props[PROP_IMAGE] =
+    g_param_spec_object ("image",
+                         P_("Image widget"),
+                         P_("Child widget to appear next to the button text"),
+                         GTK_TYPE_WIDGET,
+                         GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
 
   /**
    * GtkButton:image-position:
@@ -358,14 +341,13 @@ gtk_button_class_init (GtkButtonClass *klass)
    *
    * Since: 2.10
    */
-  g_object_class_install_property (gobject_class,
-                                   PROP_IMAGE_POSITION,
-                                   g_param_spec_enum ("image-position",
-                                            P_("Image position"),
-                                                      P_("The position of the image relative to the text"),
-                                                      GTK_TYPE_POSITION_TYPE,
-                                                      GTK_POS_LEFT,
-                                                      GTK_PARAM_READWRITE));
+  props[PROP_IMAGE_POSITION] =
+    g_param_spec_enum ("image-position",
+                       P_("Image position"),
+                       P_("The position of the image relative to the text"),
+                       GTK_TYPE_POSITION_TYPE,
+                       GTK_POS_LEFT,
+                       GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
 
   /**
    * GtkButton:always-show-image:
@@ -378,13 +360,14 @@ gtk_button_class_init (GtkButtonClass *klass)
    *
    * Since: 3.6
    */
-  g_object_class_install_property (gobject_class,
-                                   PROP_ALWAYS_SHOW_IMAGE,
-                                   g_param_spec_boolean ("always-show-image",
-                                                         P_("Always show image"),
-                                                         P_("Whether the image will always be shown"),
-                                                         FALSE,
-                                                         GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+  props[PROP_ALWAYS_SHOW_IMAGE] =
+     g_param_spec_boolean ("always-show-image",
+                           P_("Always show image"),
+                           P_("Whether the image will always be shown"),
+                           FALSE,
+                           GTK_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_EXPLICIT_NOTIFY);
+
+  g_object_class_install_properties (gobject_class, LAST_PROP, props);
 
   g_object_class_override_property (gobject_class, PROP_ACTION_NAME, "action-name");
   g_object_class_override_property (gobject_class, PROP_ACTION_TARGET, "action-target");
@@ -502,6 +485,8 @@ gtk_button_class_init (GtkButtonClass *klass)
    * The "default-border" style property defines the extra space to add
    * around a button that can become the default widget of its window.
    * For more information about default widgets, see gtk_widget_grab_default().
+   *
+   * Deprecated: 3.14: use CSS margins and padding instead.
    */
 
   gtk_widget_class_install_style_property (widget_class,
@@ -509,7 +494,7 @@ gtk_button_class_init (GtkButtonClass *klass)
 							       P_("Default Spacing"),
 							       P_("Extra space to add for GTK_CAN_DEFAULT buttons"),
 							       GTK_TYPE_BORDER,
-							       GTK_PARAM_READABLE));
+							       GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
 
   /**
    * GtkButton:default-outside-border:
@@ -518,13 +503,15 @@ gtk_button_class_init (GtkButtonClass *klass)
    * space to add around a button that can become the default widget of its
    * window. Extra outside space is always drawn outside the button border.
    * For more information about default widgets, see gtk_widget_grab_default().
+   *
+   * Deprecated: 3.14: use CSS margins and padding instead.
    */
   gtk_widget_class_install_style_property (widget_class,
 					   g_param_spec_boxed ("default-outside-border",
 							       P_("Default Outside Spacing"),
 							       P_("Extra space to add for GTK_CAN_DEFAULT buttons that is always drawn outside the border"),
 							       GTK_TYPE_BORDER,
-							       GTK_PARAM_READABLE));
+							       GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
   gtk_widget_class_install_style_property (widget_class,
 					   g_param_spec_int ("child-displacement-x",
 							     P_("Child X Displacement"),
@@ -593,6 +580,35 @@ gtk_button_class_init (GtkButtonClass *klass)
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_BUTTON_ACCESSIBLE);
 }
 
+static void
+multipress_pressed_cb (GtkGestureMultiPress *gesture,
+                       guint                 n_press,
+                       gdouble               x,
+                       gdouble               y,
+                       GtkWidget            *widget)
+{
+  GtkButton *button = GTK_BUTTON (widget);
+  GtkButtonPrivate *priv = button->priv;
+
+  if (priv->focus_on_click && !gtk_widget_has_focus (widget))
+    gtk_widget_grab_focus (widget);
+
+  g_signal_emit (button, button_signals[PRESSED], 0);
+  gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
+}
+
+static void
+multipress_released_cb (GtkGestureMultiPress *gesture,
+                        guint                 n_press,
+                        gdouble               x,
+                        gdouble               y,
+                        GtkWidget            *widget)
+{
+  GtkButton *button = GTK_BUTTON (widget);
+
+  g_signal_emit (button, button_signals[RELEASED], 0);
+}
+
 static void
 gtk_button_init (GtkButton *button)
 {
@@ -627,6 +643,14 @@ gtk_button_init (GtkButton *button)
 
   context = gtk_widget_get_style_context (GTK_WIDGET (button));
   gtk_style_context_add_class (context, GTK_STYLE_CLASS_BUTTON);
+
+  priv->gesture = gtk_gesture_multi_press_new (GTK_WIDGET (button));
+  gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (priv->gesture), FALSE);
+  gtk_gesture_single_set_exclusive (GTK_GESTURE_SINGLE (priv->gesture), TRUE);
+  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->gesture), GDK_BUTTON_PRIMARY);
+  g_signal_connect (priv->gesture, "pressed", G_CALLBACK (multipress_pressed_cb), button);
+  g_signal_connect (priv->gesture, "released", G_CALLBACK (multipress_released_cb), button);
+  gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->gesture), GTK_PHASE_BUBBLE);
 }
 
 static void
@@ -641,6 +665,8 @@ gtk_button_destroy (GtkWidget *widget)
       priv->label_text = NULL;
     }
 
+  g_clear_object (&priv->gesture);
+
   GTK_WIDGET_CLASS (gtk_button_parent_class)->destroy (widget);
 }
 
@@ -1482,7 +1508,7 @@ gtk_button_set_relief (GtkButton *button,
   if (newrelief != priv->relief)
     {
        priv->relief = newrelief;
-       g_object_notify (G_OBJECT (button), "relief");
+       g_object_notify_by_pspec (G_OBJECT (button), props[PROP_RELIEF]);
        gtk_widget_queue_draw (GTK_WIDGET (button));
     }
 }
@@ -1761,6 +1787,8 @@ gtk_button_size_allocate (GtkWidget     *widget,
 
       gtk_widget_size_allocate_with_baseline (child, &child_allocation, baseline);
     }
+
+  _gtk_widget_set_simple_clip (widget);
 }
 
 static gboolean
@@ -1849,75 +1877,6 @@ gtk_button_draw (GtkWidget *widget,
   return FALSE;
 }
 
-static gboolean
-gtk_button_button_press (GtkWidget      *widget,
-			 GdkEventButton *event)
-{
-  GtkButton *button;
-  GtkButtonPrivate *priv;
-
-  if (event->type == GDK_BUTTON_PRESS)
-    {
-      button = GTK_BUTTON (widget);
-      priv = button->priv;
-
-      if (priv->focus_on_click && !gtk_widget_has_focus (widget))
-	gtk_widget_grab_focus (widget);
-
-      if (event->button == GDK_BUTTON_PRIMARY)
-        {
-          g_signal_emit (button, button_signals[PRESSED], 0);
-          return GDK_EVENT_STOP;
-        }
-    }
-  else if (event->type == GDK_2BUTTON_PRESS)
-    {
-      return GDK_EVENT_STOP;
-    }
-
-  return GDK_EVENT_PROPAGATE;
-}
-
-static gboolean
-gtk_button_button_release (GtkWidget      *widget,
-			   GdkEventButton *event)
-{
-  GtkButton *button;
-
-  if (event->button == GDK_BUTTON_PRIMARY)
-    {
-      button = GTK_BUTTON (widget);
-      g_signal_emit (button, button_signals[RELEASED], 0);
-      return GDK_EVENT_STOP;
-    }
-
-  return GDK_EVENT_PROPAGATE;
-}
-
-static gboolean
-gtk_button_touch (GtkWidget     *widget,
-                  GdkEventTouch *event)
-{
-  GtkButton *button = GTK_BUTTON (widget);
-  GtkButtonPrivate *priv = button->priv;
-
-  if (event->type == GDK_TOUCH_BEGIN)
-    {
-      if (priv->focus_on_click && !gtk_widget_has_focus (widget))
-        gtk_widget_grab_focus (widget);
-
-      g_signal_emit (button, button_signals[PRESSED], 0);
-      return GDK_EVENT_STOP;
-    }
-  else if (event->type == GDK_TOUCH_END)
-    {
-      g_signal_emit (button, button_signals[RELEASED], 0);
-      return GDK_EVENT_STOP;
-    }
-
-  return GDK_EVENT_PROPAGATE;
-}
-
 static void
 gtk_button_do_release (GtkButton *button,
                        gboolean   emit_clicked)
@@ -2277,7 +2236,7 @@ gtk_button_set_label (GtkButton   *button,
 
   gtk_button_construct_child (button);
   
-  g_object_notify (G_OBJECT (button), "label");
+  g_object_notify_by_pspec (G_OBJECT (button), props[PROP_LABEL]);
 }
 
 /**
@@ -2327,7 +2286,7 @@ gtk_button_set_use_underline (GtkButton *button,
 
       gtk_button_construct_child (button);
       
-      g_object_notify (G_OBJECT (button), "use-underline");
+      g_object_notify_by_pspec (G_OBJECT (button), props[PROP_USE_UNDERLINE]);
     }
 }
 
@@ -2377,7 +2336,7 @@ gtk_button_set_use_stock (GtkButton *button,
 
       gtk_button_construct_child (button);
       
-      g_object_notify (G_OBJECT (button), "use-stock");
+      g_object_notify_by_pspec (G_OBJECT (button), props[PROP_USE_STOCK]);
     }
 }
 
@@ -2429,7 +2388,7 @@ gtk_button_set_focus_on_click (GtkButton *button,
     {
       priv->focus_on_click = focus_on_click;
       
-      g_object_notify (G_OBJECT (button), "focus-on-click");
+      g_object_notify_by_pspec (G_OBJECT (button), props[PROP_FOCUS_ON_CLICK]);
     }
 }
 
@@ -2487,8 +2446,8 @@ gtk_button_set_alignment (GtkButton *button,
   maybe_set_alignment (button, gtk_bin_get_child (GTK_BIN (button)));
 
   g_object_freeze_notify (G_OBJECT (button));
-  g_object_notify (G_OBJECT (button), "xalign");
-  g_object_notify (G_OBJECT (button), "yalign");
+  g_object_notify_by_pspec (G_OBJECT (button), props[PROP_XALIGN]);
+  g_object_notify_by_pspec (G_OBJECT (button), props[PROP_YALIGN]);
   g_object_thaw_notify (G_OBJECT (button));
 }
 
@@ -2711,7 +2670,7 @@ gtk_button_set_image (GtkButton *button,
 
   gtk_button_construct_child (button);
 
-  g_object_notify (G_OBJECT (button), "image");
+  g_object_notify_by_pspec (G_OBJECT (button), props[PROP_IMAGE]);
 }
 
 /**
@@ -2761,7 +2720,7 @@ gtk_button_set_image_position (GtkButton       *button,
 
       gtk_button_construct_child (button);
 
-      g_object_notify (G_OBJECT (button), "image-position");
+      g_object_notify_by_pspec (G_OBJECT (button), props[PROP_IMAGE_POSITION]);
     }
 }
 
@@ -2819,7 +2778,7 @@ gtk_button_set_always_show_image (GtkButton *button,
             gtk_widget_hide (priv->image);
         }
 
-      g_object_notify (G_OBJECT (button), "always-show-image");
+      g_object_notify_by_pspec (G_OBJECT (button), props[PROP_ALWAYS_SHOW_IMAGE]);
     }
 }