button: Implement clip

This allows all widgets that implement clip to use box shadows.

NEWS

@@ -1,3 +1,109 @@
+Overview of Changes in GTK+ 3.12.0 to 3.13.1
+============================================
+
+* GtkListBox can now do multi-selection 
+
+* GtkSwitch has a way to delay state changes
+
+* GtkMenuButton is using a popover for menu models by default
+
+* GtkPopover can have horizontal sections
+
+* GtkFileChooser received some design improvements
+
+* GtkBuilder
+ - Supports property binding
+ - Supports dialog actions
+
+* Client-side decorations
+ - The requirement for _GTK_FRAME_EXTENTS has been dropped
+   to avoid 'double headers' with most window managers
+ - Drawing of DND highlights around the entire window works
+
+* Windows backend:
+ - *Many* theme improvements
+ - Add popover theming
+ - Enable introspection
+
+* Wayland backend
+ - Updates for xdg_shell protocol changes
+ - Touch support
+
+* Broadway backend
+ - Now builds on OpenBSD
+
+* Bugs fixed:
+ 495105 Open recent file keyboard shortcuts do not work correctly
+ 654417 Add <binding> element to GtkBuilder syntax
+ 686170 gdk/win32: VK_SNAPSHOT maps to GDK_Print
+ 712752 GtkClipboard: add _get_default and _get_primary
+ 722058 GtkTreeModelFilter bug
+ 722211 improve the file chooser design
+ 722817 Add gobject-introspection for GdkWin32
+ 723963 Use popover for the fallback app menu in the headerbar
+ 725648 Switches should always indicate the current state
+ 726179 Trivial Fix: size-allocate signal has missing documentation
+ 726271 Items not highlighted while mouse-hovered
+ 726298 gtk-font-name isn't correctly handled on Windows
+ 726475 After looking at Aisleriot solitare, I get rendering glitches...
+ 726592 W32: problems with CSDed windows
+ 726859 Assertion/crash if gtk_radio_menu_item_set_group() is called twice
+ 726870 all: Name more idles and timeouts
+ 726871 treeview: Lower the duration of validation iterations
+ 726996 Label-for/Labelled-by AtkRelations missing for containers in t...
+ 727009 redefinition of GtkPrinterCloudprint: cloudprint fails to build
+ 727022 W32: Both inc- and dec-buttons on GtkSpinbutton are "inc"
+ 727035 W32: Combobox button is drawn with two arrows
+ 727036 W32: Combobox dropdown color is button-gray instead of window-white
+ 727037 W32: Menu items look thin, while submenu arrows are huge
+ 727075 W32: Combobox (with an entry) is gigantic
+ 727078 W32: GtkPopover is transparent and non-interactable
+ 727080 W32: Window re-size grip looks UGLY.
+ 727210 W32: Prelight doesn't apply to check/radio marks
+ 727211 W32: Selection background color applies to check/radio marks
+ 727213 W32: Notebook widget is not styled correctly
+ 727244 W32: Items selected in listbox have correct background color, ...
+ 727245 W32: No .dim-label style
+ 727313 a11y: do not use deprecated a11y functions.
+ 727322 docs: Remove '\' escape character from literals
+ 727391 W32: scrollbar sliders have no "active" and "insensitive" styles
+ 727410 W32: tooltips are not themed
+ 727414 Redundant text in titlebar
+ 727487 Color picker check marks not cleared properly
+ 727643 Segfault in gtk-3.12.0
+ 727644 SEGV in gtk_window_propagate_key_event()
+ 727662 GtkVolumeButton displays "missing image" icons
+ 727908 Various GtkTextView improvements (doc, unit tests)
+ 727973 W32: focused button is visibly smaller
+ 728023 Warning when passing NULL window to inhibit
+ 728054 entry: consider ascent and descent when requesting height
+ 728073 Allow defining an invisible resize area for GtkPaned's handle
+ 728140 Illegal parameter passed to g_variant_new in gtk_application_im...
+ 728165 gtk_target_list_new argument should be (allow-none)
+ 728183 Drag and drop (GdkFrameClock) does not work for hidden widgets
+ 728272 make broadway backend build on OpenBSD
+ 728426 Implement the wl_touch interface
+ 728745 win32: add more clipboard data checks to avoid crash
+ 728806 W32: Check- and radio-buttons have a selection rectangle on act...
+ 728807 W32: Checkbutton focus rectangle becomes almost white on prelight
+ 728808 W32: Checkboxes on modelbuttons are drawn like buttons themselves
+ 728810 W32: Modelbuttons look like buttons
+ 728846 GtkDialog: Support adding action widgets in ui files
+ 728992 GtkLockButton crash if clicked and permission is NULL
+ 729013 Use OUTPUT_SCALE instead of xft-dpi on wayland 
+ 729095 redraw problems when resizing popovers
+ 729097 size allocation problem in popovers 
+
+* Translation updates:
+ Basque
+ Catalan
+ German
+ Greek
+ Hebrew
+ Russian
+ Slovenian
+
+
 Overview of Changes in GTK+ 3.11.9 to 3.12.0
 ============================================
 

build/gen-file-list-gtk.py

@@ -28,10 +28,23 @@ def gen_gdk_filelist(srcroot, subdir, dest):
         for i in sources:
             d.write(srcroot + '\\' + subdir + '\\' + i.replace('/', '\\') + '\n')
 
-def gen_filelist_gtk(srcroot, subdir, dest):
+def gen_gdkwin32_filelist(srcroot, subdir, dest):
+    vars = read_vars_from_AM(os.path.join(srcroot, subdir, 'Makefile.am'),
+                             vars = {},
+                             conds = {'HAVE_INTROSPECTION': True,
+                                      'OS_WIN32': True},
+                             filters = ['w32_introspection_files'])
+
+    files = vars['w32_introspection_files'].split()
+
+    with open(dest, 'w') as d:
+        for i in files:
+            d.write(srcroot + '\\' + subdir + '\\' + i.replace('/', '\\') + '\n')
+
+def gen_gtk_filelist(srcroot, subdir, dest):
     vars = read_vars_from_AM(os.path.join(srcroot, 'gtk', 'Makefile.am'),
                              vars = {},
-                             conds = {'USE_WIN32':True,
+                             conds = {'USE_WIN32': True,
                                       'USE_QUARTZ': False,
                                       'USE_X11': False,
                                       'USE_EXTERNAL_ICON_CACHE': False},
@@ -60,7 +73,8 @@ def main(argv):
     subdir_gtk = 'gtk'
 
     gen_gdk_filelist(srcroot, subdir_gdk, 'gdk_list')
-    gen_filelist_gtk(srcroot, subdir_gtk, 'gtk_list')
+    gen_gdkwin32_filelist(srcroot, subdir_gdk, 'gdkwin32_list')
+    gen_gtk_filelist(srcroot, subdir_gtk, 'gtk_list')
     return 0
 
 if __name__ == '__main__':

build/gtk-introspection-msvc.mak

@@ -6,6 +6,9 @@ APIVERSION = 3.0
 
 CHECK_PACKAGE = gdk-pixbuf-2.0 atk pangocairo gio-2.0
 
+built_install_girs = Gdk-$(APIVERSION).gir GdkWin32-$(APIVERSION).gir Gtk-$(APIVERSION).gir
+built_install_typelibs = Gdk-$(APIVERSION).typelib GdkWin32-$(APIVERSION).typelib Gtk-$(APIVERSION).typelib
+
 !if "$(PLAT)" == "x64"
 TIME_T_DEFINE = -Dtime_t=long long
 !else
@@ -15,9 +18,9 @@ TIME_T_DEFINE = -Dtime_t=long
 !include introspection-msvc.mak
 
 !if "$(BUILD_INTROSPECTION)" == "TRUE"
-all: setgirbuildnev Gdk-$(APIVERSION).gir Gdk-$(APIVERSION).typelib Gtk-$(APIVERSION).gir Gtk-$(APIVERSION).typelib
+all: setgirbuildnev $(built_install_girs) $(built_install_typelibs)
 
-gdk_list gtk_list:
+gdk_list gdkwin32_list gtk_list:
 	@-echo Generating Filelist to Introspect for GDK/GTK...
 	$(PYTHON2) gen-file-list-gtk.py
 
@@ -28,6 +31,10 @@ setgirbuildnev:
 	@set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
 	@set LIB=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB)
 
+win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib: win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib
+	@-echo Copying win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib from win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib...
+	@-copy /b win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib
+
 Gdk-$(APIVERSION).gir: gdk_list
 	@-echo Generating Gdk-$(APIVERSION).gir...
 	$(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gdk	\
@@ -41,7 +48,22 @@ Gdk-$(APIVERSION).gir: gdk_list
 	--reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) --add-include-path=.	\
 	--pkg-export gdk-3.0 --warn-all --c-include="gdk/gdk.h"	\
 	-DG_LOG_DOMAIN=\"Gdk\" -DGDK_COMPILATION	\
-	--filelist=gdk_list	-o Gdk-3.0.gir
+	--filelist=gdk_list	-o $@
+
+GdkWin32-$(APIVERSION).gir: gdkwin32_list win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib
+	@-echo Generating GdkWin32-$(APIVERSION).gir...
+	$(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gdk	\
+	-I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include	\
+	-I$(BASEDIR)\include\pango-1.0 -I$(BASEDIR)\include\atk-1.0	\
+	-I$(BASEDIR)\include\gdk-pixbuf-2.0 -I$(BASEDIR)\include	\
+	$(TIME_T_DEFINE) --namespace=GdkWin32 --nsversion=3.0	\
+	--include=Gio-2.0 --include=GdkPixbuf-2.0	\
+	--include=Pango-1.0	--include-uninstalled=./Gdk-$(APIVERSION).gir	\
+	--no-libtool --library=gdk-3.0	\
+	--reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) --add-include-path=.	\
+	--pkg-export gdk-win32-3.0 --warn-all --c-include="gdk/gdkwin32.h"	\
+	-DG_LOG_DOMAIN=\"Gdk\" -DGDK_COMPILATION	\
+	--filelist=gdkwin32_list	-o $@
 
 Gtk-$(APIVERSION).gir: gtk_list
 	$(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gtk -I..\gdk	\
@@ -56,7 +78,7 @@ Gtk-$(APIVERSION).gir: gtk_list
 	--pkg-export gtk+-3.0 --warn-all --c-include="gtk/gtkx.h"	\
 	-DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"/dummy/lib\"	\
 	$(TIME_T_DEFINE) -DGTK_DATADIR=\"/dummy/share\" -DGTK_DATA_PREFIX=\"/dummy\"	\
-	-DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"3.11.8\"	\
+	-DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"3.12.0\"	\
 	-DGTK_BINARY_VERSION=\"3.0.0\" -DGTK_HOST=\"i686-pc-vs$(VSVER)\"	\
 	-DGTK_COMPILATION -DGTK_PRINT_BACKENDS=\"file\"	\
 	-DGTK_PRINT_PREVIEW_COMMAND=\"undefined-gtk-print-preview-command\"	\
@@ -65,21 +87,15 @@ Gtk-$(APIVERSION).gir: gtk_list
 	-DINCLUDE_IM_ime -DINCLUDE_IM_inuktitut -DINCLUDE_IM_ipa	\
 	-DINCLUDE_IM_multipress -DINCLUDE_IM_thai -DINCLUDE_IM_ti_er	\
 	-DINCLUDE_IM_ti_et -DINCLUDE_IM_viqr --filelist=gtk_list	\
-	-o Gtk-3.0.gir
+	-o $@
 
-Gdk-$(APIVERSION).typelib: Gdk-$(APIVERSION).gir
-	@-echo Compiling Gdk-$(APIVERSION).typelib...
-	$(G_IR_COMPILER) --includedir=. --debug --verbose Gdk-$(APIVERSION).gir -o Gdk-$(APIVERSION).typelib
+$(built_install_typelibs): $(built_install_girs)
+	@-echo Compiling $*.typelib...
+	@-$(G_IR_COMPILER) --includedir=. --debug --verbose $*.gir -o $@
 
-Gtk-$(APIVERSION).typelib: Gtk-$(APIVERSION).gir Gdk-$(APIVERSION).typelib
-	@-echo Compiling Gtk-$(APIVERSION).typelib...
-	$(G_IR_COMPILER) --includedir=. --debug --verbose Gtk-$(APIVERSION).gir -o Gtk-$(APIVERSION).typelib
-
-install-introspection: setgirbuildnev Gdk-$(APIVERSION).gir Gdk-$(APIVERSION).typelib Gtk-$(APIVERSION).gir Gtk-$(APIVERSION).typelib
-	@-copy Gdk-$(APIVERSION).gir $(G_IR_INCLUDEDIR)
-	@-copy /b Gdk-$(APIVERSION).typelib $(G_IR_TYPELIBDIR)
-	@-copy Gtk-$(APIVERSION).gir $(G_IR_INCLUDEDIR)
-	@-copy /b Gtk-$(APIVERSION).typelib $(G_IR_TYPELIBDIR)
+install-introspection: setgirbuildnev $(built_install_girs) $(built_install_typelibs)
+	@-copy *.gir $(G_IR_INCLUDEDIR)
+	@-copy /b *.typelib $(G_IR_TYPELIBDIR)
 
 !else
 all:
@@ -87,10 +103,10 @@ all:
 !endif
 
 clean:
-	@-del /f/q Gtk-$(APIVERSION).typelib
-	@-del /f/q Gtk-$(APIVERSION).gir
-	@-del /f/q Gdk-$(APIVERSION).typelib
-	@-del /f/q Gdk-$(APIVERSION).gir
+	@-del /f/q *.typelib
+	@-del /f/q *.gir
+	@-del /f/q win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib
 	@-del /f/q gtk_list
+	@-del /f/q gdkwin32_list
 	@-del /f/q gdk_list
 	@-del /f/q *.pyc

build/win32/vs10/Makefile.am

@@ -22,6 +22,8 @@ EXTRA_DIST +=	\
 	gtka11y.vcxproj.filters	\
 	gtka11y.vcxprojin	\
 	gtka11y.vcxproj.filtersin	\
+	gtk-inspector.vcxproj	\
+	gtk-inspector.vcxproj.filters	\
 	gailutil.vcxproj	\
 	gailutil.vcxproj.filters	\
 	install.vcxproj	\

build/win32/vs10/gtk+.sln

@@ -12,6 +12,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcxproj", "{FC5A
 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}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
@@ -122,6 +124,22 @@ Global
 		{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
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.Build.0 = Release|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.Build.0 = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.ActiveCfg = Debug|x64

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

@@ -7,6 +7,9 @@
     <_PropertySheetDisplayName>gtkcopygdkbroadwayprops</_PropertySheetDisplayName>
   </PropertyGroup>
   <ItemDefinitionGroup>
+    <Link>
+      <AdditionalOptions>/EXPORT:gdk_win32_display_manager_get_type</AdditionalOptions>
+    </Link
     <PostBuildEvent>
       <Command>
 if "$(Configuration)" == "Release" goto END

build/win32/vs10/gtk-ignore-broadway.props

@@ -12,6 +12,7 @@
     </ProjectReference>
     <Link>
       <AdditionalDependencies>$(OutDir)\gdk-win32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>/EXPORT:gdk_win32_display_manager_get_type</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
 </Project>

build/win32/vs10/gtk-inspector.vcxproj

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

@@ -0,0 +1,38 @@
+<?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-install.props

@@ -214,6 +214,8 @@ copy ..\..\..\gtk\a11y\gtknotebookpageaccessible.h $(CopyDir)\include\gtk-$(ApiV
 
 copy ..\..\..\gtk\a11y\gtkpanedaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
 
+copy ..\..\..\gtk\a11y\gtkpopoveraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
+
 copy ..\..\..\gtk\a11y\gtkprogressbaraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
 
 copy ..\..\..\gtk\a11y\gtkradiobuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
@@ -770,6 +772,8 @@ copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib
 
 copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
 
+copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas
+
 copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas
 
 

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

@@ -3,7 +3,6 @@
   <PropertyGroup Label="UserMacros">
     <VSVer>10</VSVer>
     <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
-    <GlibEtcInstallRootFromBuildWin32>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRootFromBuildWin32>
     <CopyDir>..\..\..\..\vs$(VSVer)\$(Platform)</CopyDir>
     <ApiVersion>3.0</ApiVersion>
     <GtkLibtoolCompatibleDllPrefix>lib</GtkLibtoolCompatibleDllPrefix>
@@ -24,9 +23,6 @@
     <BuildMacro Include="GlibEtcInstallRoot">
       <Value>$(GlibEtcInstallRoot)</Value>
     </BuildMacro>
-    <BuildMacro Include="GlibEtcInstallRootFromBuildWin32">
-      <Value>$(GlibEtcInstallRootFromBuildWin32)</Value>
-    </BuildMacro>
     <BuildMacro Include="CopyDir">
       <Value>$(CopyDir)</Value>
     </BuildMacro>
@@ -55,4 +51,4 @@
       <Value>$(PythonPath)</Value>
     </BuildMacro>
   </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/gtk.vcxprojin

@@ -204,6 +204,10 @@
       <Project>{f756b0db-40a1-4e9f-be1f-8f02cb86ea46}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="gtk-inspector.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073fd}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

build/win32/vs9/Makefile.am

@@ -13,6 +13,7 @@ EXTRA_DIST +=	\
 	gtk3-demo-application.vcproj	\
 	gtka11y.vcproj	\
 	gtka11y.vcprojin	\
+	gtk-inspector.vcproj	\
 	gailutil.vcproj	\
 	install.vcproj	\
 	broadwayd.vcproj	\

build/win32/vs9/gtk+.sln

@@ -28,10 +28,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.vcproj",
 		{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}
+	EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
 		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46} = {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
@@ -138,6 +144,22 @@ 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
+		{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
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.Build.0 = Release|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.Build.0 = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.ActiveCfg = Debug|x64

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

@@ -5,6 +5,10 @@
 	Name="gtkcopygdkbroadwayprops"
 	InheritedPropertySheets=".\gtk-build-defines.vsprops"
 	>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalOptions="/EXPORT:gdk_win32_display_manager_get_type"
+	/>
 	<Tool
 		Name="VCPostBuildEventTool"
 		CommandLine="

build/win32/vs9/gtk-ignore-broadway.vsprops

@@ -9,5 +9,6 @@
 		Name="VCLinkerTool"
 		LinkLibraryDependencies="false"
 		AdditionalDependencies="$(OutDir)\gdk-win32.lib"
+		AdditionalOptions="/EXPORT:gdk_win32_display_manager_get_type"
 	/>
 </VisualStudioPropertySheet>

build/win32/vs9/gtk-inspector.vcproj

@@ -0,0 +1,148 @@
+<?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-install.vsprops

@@ -121,6 +121,7 @@ copy ..\..\..\gtk\a11y\gtkmenushellaccessible.h $(CopyDir)\include\gtk-$(ApiVers
 copy ..\..\..\gtk\a11y\gtknotebookaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y

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

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

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

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

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

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

@@ -403,6 +404,7 @@ copy ..\..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\h
 mkdir $(CopyDir)\share\glib-2.0\schemas

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

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

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

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

 
 echo "Compiling gsettings XML Files..."


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

@@ -12,10 +12,6 @@
 		Name="GlibEtcInstallRoot"
 		Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
 	/>
-	<UserMacro
-		Name="GlibEtcInstallRootFromBuildWin32"
-		Value="..\..\..\vs$(VSVer)\$(PlatformName)"
-	/>
 	<UserMacro
 		Name="CopyDir"
 		Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
@@ -54,4 +50,4 @@
 		Name="PythonPath"
 		Value="c:\python27"
 	/>
-</VisualStudioPropertySheet>
+</VisualStudioPropertySheet>

configure.ac

@@ -9,8 +9,8 @@
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [12])
-m4_define([gtk_micro_version], [0])
+m4_define([gtk_minor_version], [13])
+m4_define([gtk_micro_version], [1])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -397,6 +397,11 @@ else
 fi
 AC_SUBST(DISABLE_ON_QUARTZ)
 
+AC_CHECK_LIB([rt], [shm_open], [SHM_LIBS="-lrt"], [SHM_LIBS=""])
+AC_SUBST(SHM_LIBS)
+
+AC_CHECK_FUNCS(posix_fallocate)
+
 if test "x$enable_broadway_backend" = xyes; then
   GDK_BACKENDS="$GDK_BACKENDS broadway"
   cairo_backends="$cairo_backends cairo"
@@ -1882,11 +1887,10 @@ gtk/makefile.msc
 gtk/gtkversion.h
 gtk/gtk-win32.rc
 gtk/a11y/Makefile
+gtk/inspector/Makefile
 gtk/native/Makefile
 libgail-util/Makefile
 modules/Makefile
-modules/engines/Makefile
-modules/engines/pixbuf/Makefile
 modules/input/Makefile
 modules/printbackends/Makefile
 modules/printbackends/cups/Makefile

demos/gtk-demo/headerbar.c

@@ -44,10 +44,10 @@ do_headerbar (GtkWidget *do_widget)
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_style_context_add_class (gtk_widget_get_style_context (box), "linked");
       button = gtk_button_new ();
-      gtk_container_add (GTK_CONTAINER (button), gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_NONE));
+      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_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE));
+      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);
 
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), box);

demos/gtk-demo/iconview_edit.c

@@ -52,20 +52,24 @@ set_cell_color (GtkCellLayout   *cell_layout,
                 gpointer         data)
 {
   gchar *text;
-  GdkColor color;
+  GdkRGBA color;
   guint32 pixel = 0;
   GdkPixbuf *pixbuf;
 
   gtk_tree_model_get (tree_model, iter, COL_TEXT, &text, -1);
-  if (gdk_color_parse (text, &color))
+  if (!text)
+    return;
+
+  if (gdk_rgba_parse (&color, text))
     pixel =
-      (color.red   >> 8) << 24 |
-      (color.green >> 8) << 16 |
-      (color.blue  >> 8) << 8;
+      ((gint)(color.red * 255)) << 24 |
+      ((gint)(color.green * 255)) << 16 |
+      ((gint)(color.blue  * 255)) << 8 |
+      ((gint)(color.alpha * 255));
 
   g_free (text);
 
-  pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 24, 24);
+  pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, 24, 24);
   gdk_pixbuf_fill (pixbuf, pixel);
 
   g_object_set (cell, "pixbuf", pixbuf, NULL);

demos/gtk-demo/images.c

@@ -50,18 +50,21 @@ progressive_updated_callback (GdkPixbufLoader *loader,
                               gpointer     data)
 {
   GtkWidget *image;
+  GdkPixbuf *pixbuf;
 
   image = GTK_WIDGET (data);
 
   /* We know the pixbuf inside the GtkImage has changed, but the image
-   * itself doesn't know this; so queue a redraw.  If we wanted to be
-   * really efficient, we could use a drawing area or something
-   * instead of a GtkImage, so we could control the exact position of
-   * the pixbuf on the display, then we could queue a draw for only
-   * the updated area of the image.
+   * itself doesn't know this; so give it a hint by setting the pixbuf
+   * again. Queuing a redraw used to be sufficient, but nowadays GtkImage
+   * uses GtkIconHelper which caches the pixbuf state and will just redraw
+   * from the cache.
    */
 
-  gtk_widget_queue_draw (image);
+  pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (image));
+  g_object_ref (pixbuf);
+  gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
+  g_object_unref (pixbuf);
 }
 
 static gint
@@ -270,6 +273,7 @@ start_progressive_loading (GtkWidget *image)
   load_timeout = gdk_threads_add_timeout (150,
                                 progressive_timeout,
                                 image);
+  g_source_set_name_by_id (load_timeout, "[gtk+] progressive_timeout");
 }
 
 static void

demos/gtk-demo/links.c

@@ -33,6 +33,7 @@ activate_link (GtkWidget   *label,
                  "The term <i>keynav</i> is a shorthand for "
                  "keyboard navigation and refers to the process of using "
                  "a program (exclusively) via keyboard input.");
+      gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
 
       gtk_window_present (GTK_WINDOW (dialog));
       g_signal_connect (dialog, "response", G_CALLBACK (response_cb), NULL);

demos/gtk-demo/main.c

@@ -1015,8 +1015,6 @@ main (int argc, char **argv)
     }
   /* -- End of hack -- */
 
-  gtk_init (&argc, &argv);
-
   app = gtk_application_new ("org.gtk.Demo", 0);
 
   g_action_map_add_action_entries (G_ACTION_MAP (app),

demos/gtk-demo/main.ui

@@ -128,8 +128,8 @@
                   <object class="GtkTextView" id="info-textview">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="margin_left">20</property>
-                    <property name="margin_right">20</property>
+                    <property name="margin_start">20</property>
+                    <property name="margin_end">20</property>
                     <property name="margin_top">20</property>
                     <property name="margin_bottom">20</property>
                     <property name="pixels_above_lines">2</property>
@@ -165,9 +165,8 @@
                   <object class="GtkTextView" id="source-textview">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="margin_left">20</property>
+                    <property name="margin_start">20</property>
                     <property name="margin_end">20</property>
-                    <property name="margin_right">20</property>
                     <property name="margin_top">20</property>
                     <property name="margin_bottom">20</property>
                     <property name="editable">False</property>

demos/gtk-demo/revealer.c

@@ -18,6 +18,8 @@ change_direction (GtkRevealer *revealer)
   gtk_revealer_set_reveal_child (revealer, !revealed);
 }
 
+static guint timeout = 0;
+
 static gboolean
 reveal_one (gpointer data)
 {
@@ -33,11 +35,15 @@ reveal_one (gpointer data)
                     G_CALLBACK (change_direction), NULL);
   count++;
 
-  return count < 9;
+  if (count >= 9)
+    {
+      timeout = 0;
+      return FALSE;
+    }
+  else
+    return TRUE;
 }
 
-static guint timeout = 0;
-
 static void
 response_cb (GtkWidget *dialog,
              gint       response_id,

demos/gtk-demo/sizegroup.c

@@ -120,6 +120,7 @@ do_sizegroup (GtkWidget *do_widget)
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
       size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+      g_object_set_data_full (G_OBJECT (window), "size-group", size_group, g_object_unref);
 
       /* Create one frame holding color options */
       frame = gtk_frame_new ("Color Options");

demos/gtk-demo/toolpalette.c

@@ -656,6 +656,9 @@ load_icon_items (GtkToolPalette *palette)
       GtkWidget *group = gtk_tool_item_group_new (context);
       gtk_container_add (GTK_CONTAINER (palette), group);
 
+      if (g_strcmp0 (context, "Animations") == 0)
+        continue;
+
       g_message ("Got context '%s'", context);
       icon_names = gtk_icon_theme_list_icons (icon_theme, context);
       icon_names = g_list_sort (icon_names, (GCompareFunc) strcmp);
@@ -665,6 +668,9 @@ load_icon_items (GtkToolPalette *palette)
           GtkToolItem *item;
           gchar *id = ll->data;
 
+          if (g_strcmp0 (id, "emblem-desktop") == 0)
+            continue;
+
           g_message ("Got id '%s'", id);
 
           item = gtk_tool_button_new (NULL, NULL);

demos/widget-factory/widget-factory.c

@@ -23,18 +23,6 @@
 #include "config.h"
 #include <gtk/gtk.h>
 
-static void
-activate_toggle (GSimpleAction *action,
-                 GVariant      *parameter,
-                 gpointer       user_data)
-{
-  GVariant *state;
-
-  state = g_action_get_state (G_ACTION (action));
-  g_action_change_state (G_ACTION (action), g_variant_new_boolean (!g_variant_get_boolean (state)));
-  g_variant_unref (state);
-}
-
 static void
 change_theme_state (GSimpleAction *action,
                     GVariant      *state,
@@ -50,6 +38,44 @@ change_theme_state (GSimpleAction *action,
   g_simple_action_set_state (action, state);
 }
 
+static void
+change_toolbar_state (GSimpleAction *action,
+                      GVariant      *state,
+                      gpointer       user_data)
+{
+  GtkWidget *window = user_data;
+  GtkWidget *toolbar;
+
+  toolbar = GTK_WIDGET (g_object_get_data (G_OBJECT (window), "toolbar"));
+  gtk_widget_set_visible (toolbar, g_variant_get_boolean (state));
+
+  g_simple_action_set_state (action, state);
+}
+
+static void
+activate_search (GSimpleAction *action,
+                 GVariant      *parameter,
+                 gpointer       user_data)
+{
+  GtkWidget *window = user_data;
+  GtkWidget *searchbar;
+
+  searchbar = GTK_WIDGET (g_object_get_data (G_OBJECT (window), "searchbar"));
+  gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (searchbar), TRUE);
+}
+
+static void
+activate_delete (GSimpleAction *action,
+                 GVariant      *parameter,
+                 gpointer       user_data)
+{
+  GtkWidget *window = user_data;
+  GtkWidget *infobar;
+
+  infobar = GTK_WIDGET (g_object_get_data (G_OBJECT (window), "infobar"));
+  gtk_widget_show (infobar);
+}
+
 static void
 activate_about (GSimpleAction *action,
                 GVariant      *parameter,
@@ -220,6 +246,29 @@ startup (GApplication *app)
   g_object_unref (builder);
 }
 
+static void
+update_header (GtkListBoxRow *row,
+               GtkListBoxRow *before,
+               gpointer       data)
+{
+  if (before != NULL &&
+      gtk_list_box_row_get_header (row) == NULL)
+    {
+      GtkWidget *separator;
+
+      separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+      gtk_widget_show (separator);
+      gtk_list_box_row_set_header (row, separator);
+    }
+}
+
+static void
+info_bar_response (GtkWidget *infobar, gint response_id)
+{
+  if (response_id == GTK_RESPONSE_CLOSE)
+    gtk_widget_hide (infobar);
+}
+
 static void
 activate (GApplication *app)
 {
@@ -228,7 +277,10 @@ activate (GApplication *app)
   GtkWidget *widget;
   GtkAdjustment *adj;
   static GActionEntry win_entries[] = {
-    { "dark", activate_toggle, NULL, "false", change_theme_state }
+    { "dark", NULL, NULL, "false", change_theme_state },
+    { "toolbar", NULL, NULL, "true", change_toolbar_state },
+    { "search", activate_search, NULL, NULL, NULL },
+    { "delete", activate_delete, NULL, NULL, NULL }
   };
 
   builder = gtk_builder_new ();
@@ -255,6 +307,19 @@ activate (GApplication *app)
   adj = (GtkAdjustment *) gtk_builder_get_object (builder, "adjustment2");
   g_signal_connect (adj, "value-changed", G_CALLBACK (spin_value_changed), widget);
 
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "listbox");
+  gtk_list_box_set_header_func (GTK_LIST_BOX (widget), update_header, NULL, NULL);
+
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "toolbar");
+  g_object_set_data (G_OBJECT (window), "toolbar", widget);
+
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "searchbar");
+  g_object_set_data (G_OBJECT (window), "searchbar", widget);
+
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "infobar");
+  g_signal_connect (widget, "response", G_CALLBACK (info_bar_response), NULL); 
+  g_object_set_data (G_OBJECT (window), "infobar", widget);
+
   gtk_widget_show_all (GTK_WIDGET (window));
 
   g_object_unref (builder);
@@ -267,9 +332,16 @@ main (int argc, char *argv[])
   static GActionEntry app_entries[] = {
     { "about", activate_about, NULL, NULL, NULL },
     { "quit", activate_quit, NULL, NULL, NULL },
-  };
 
-  gtk_init (&argc, &argv);
+    { "main", NULL, "s", "'steak'", NULL },
+    { "wine", NULL, NULL, "false", NULL },
+    { "beer", NULL, NULL, "false", NULL },
+    { "water", NULL, NULL, "true", NULL },
+    { "dessert", NULL, "s", "'bars'", NULL },
+    { "pay", NULL, "s", NULL, NULL }
+
+  };
+  gint status;
 
   app = gtk_application_new ("org.gtk.WidgetFactory", 0);
 
@@ -280,7 +352,8 @@ main (int argc, char *argv[])
   g_signal_connect (app, "startup", G_CALLBACK (startup), NULL);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
 
-  g_application_run (G_APPLICATION (app), argc, argv);
+  status = g_application_run (G_APPLICATION (app), argc, argv);
+  g_object_unref (app);
 
-  return 0;
+  return status;
 }

docs/reference/gdk/gdk-docs.sgml

@@ -84,6 +84,10 @@
     <title>Index of new symbols in 3.12</title>
     <xi:include href="xml/api-index-3.12.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-3-14" role="3.14">
+    <title>Index of new symbols in 3.14</title>
+    <xi:include href="xml/api-index-3.14.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 

docs/reference/gdk/gdk3-sections.txt

@@ -58,6 +58,11 @@ GDK_WINDOWING_WAYLAND
 GDK_VERSION_3_0
 GDK_VERSION_3_2
 GDK_VERSION_3_4
+GDK_VERSION_3_6
+GDK_VERSION_3_8
+GDK_VERSION_3_10
+GDK_VERSION_3_12
+GDK_VERSION_3_14
 GDK_VERSION_MIN_REQUIRED
 GDK_VERSION_MAX_ALLOWED
 GDK_DISABLE_DEPRECATION_WARNINGS

docs/reference/gtk/Makefile.am

@@ -151,6 +151,8 @@ content_files =					\
 	tree_widget.sgml			\
 	windows.sgml				\
 	x11.sgml				\
+	gtk3-demo.xml				\
+	gtk3-widget-factory.xml			\
 	gtk-query-immodules-3.0.xml		\
 	gtk-update-icon-cache.xml		\
 	gtk-launch.xml				\
@@ -424,7 +426,8 @@ HTML_IMAGES = \
 	$(srcdir)/images/getting-started-app9.png			\
 	$(srcdir)/images/getting-started-app10.png			\
 	$(srcdir)/images/exampleapp.png					\
-	$(srcdir)/images/flow-box.png
+	$(srcdir)/images/flow-box.png					\
+	$(srcdir)/images/inspector.png
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=../gdk/html \
@@ -446,6 +449,8 @@ man_MANS = 				\
 	gtk-query-immodules-3.0.1	\
 	gtk-update-icon-cache.1		\
 	gtk-launch.1			\
+	gtk3-demo.1			\
+	gtk3-widget-factory.1		\
 	broadwayd.1
 
 if ENABLE_MAN

docs/reference/gtk/getting_started.xml

@@ -605,12 +605,16 @@ example_app_startup (GApplication *app)
 {
   GtkBuilder *builder;
   GMenuModel *app_menu;
+  const gchar *quit_accels[2] = { "<Ctrl>Q", NULL };
 
   G_APPLICATION_CLASS (example_app_parent_class)->startup (app);
 
   g_action_map_add_action_entries (G_ACTION_MAP (app),
                                    app_entries, G_N_ELEMENTS (app_entries),
                                    app);
+  gtk_application_set_accels_for_action (GTK_APPLICATION (app),
+                                         "app.quit",
+                                         quit_accels);
 
   builder = gtk_builder_new_from_resource ("/org/gtk/exampleapp/app-menu.ui");
   app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"));
@@ -633,7 +637,7 @@ example_app_class_init (ExampleAppClass *class)
       <para>Our preferences menu item does not do anything yet,
       but the Quit menu item is fully functional. Note that it
       can also be activated by the usual Ctrl-Q shortcut. The
-      shortcut was specified in the ui file.
+      shortcut was added with gtk_application_set_accels_for_action().
       </para>
 
       <para>The application menu looks like this:</para>
@@ -982,9 +986,8 @@ example_app_window_init (ExampleAppWindow *win)
         <programlisting><xi:include href="../../../../examples/application10/window.ui" parse="text"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
-      <para>A small extra refinement that we have added here is to allow
-      the header bar to provide a fallback application menu, by setting
-      the show-fallback-app-menu property to TRUE. Here is how the
+      <para>A small extra bonus of using a header bar is that we get
+      a fallback application menu for free. Here is how the
       application now looks, if this fallback is used.</para>
 
       <informalfigure>

docs/reference/gtk/gtk-docs.sgml

@@ -25,6 +25,7 @@
     <xi:include href="resources.sgml" />
     <xi:include href="xml/question_index.sgml" />
     <xi:include href="drawing-model.xml" />
+    <xi:include href="input-handling.xml" />
   </part>
 
 
@@ -240,7 +241,6 @@
     <chapter id="MiscObjects">
       <title>Miscellaneous</title>
       <xi:include href="xml/gtkadjustment.xml" />
-      <xi:include href="xml/gtkarrow.xml" />
       <xi:include href="xml/gtkcalendar.xml" />
       <xi:include href="xml/gtkdrawingarea.xml" />
       <xi:include href="xml/gtkeventbox.xml" />
@@ -259,7 +259,6 @@
       <xi:include href="xml/gtkcontainer.xml" />
       <xi:include href="xml/gtkbin.xml" />
       <xi:include href="xml/gtkmenushell.xml" />
-      <xi:include href="xml/gtkmisc.xml" />
       <xi:include href="xml/gtkrange.xml" />
       <xi:include href="xml/gtkimcontext.xml" />
     </chapter>
@@ -321,7 +320,11 @@
       <xi:include href="xml/gtkrecentaction.xml" />
       <xi:include href="xml/gtkactivatable.xml" />
       <xi:include href="xml/gtkimagemenuitem.xml" />
+      <xi:include href="xml/gtkmisc.xml" />
       <xi:include href="xml/gtkstock.xml" />
+      <xi:include href="xml/gtkiconfactory.xml" />
+      <xi:include href="xml/gtknumerableicon.xml" />
+      <xi:include href="xml/gtkarrow.xml" />
     </chapter>
 
   </part>
@@ -351,8 +354,6 @@
     <xi:include href="xml/gtkthemingengine.xml" />
     <xi:include href="xml/gtkwidgetpath.xml" />
     <xi:include href="xml/gtkicontheme.xml" />
-    <xi:include href="xml/gtkiconfactory.xml" />
-    <xi:include href="xml/gtknumerableicon.xml" />
   </part>
 
   <part id="migrating">
@@ -378,6 +379,8 @@
 
   <part>
     <title>GTK+ Tools</title>
+    <xi:include href="gtk3-demo.xml" />
+    <xi:include href="gtk3-widget-factory.xml" />
     <xi:include href="gtk-query-immodules-3.0.xml" />
     <xi:include href="gtk-update-icon-cache.xml" />
     <xi:include href="gtk-launch.xml" />
@@ -434,6 +437,10 @@
     <title>Index of new symbols in 3.12</title>
     <xi:include href="xml/api-index-3.12.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-3-14" role="3.14">
+    <title>Index of new symbols in 3.14</title>
+    <xi:include href="xml/api-index-3.14.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 

docs/reference/gtk/gtk3-demo.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gtk3-demo">
+
+<refentryinfo>
+  <title>gtk3-demo</title>
+  <productname>GTK+</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Matthias</firstname>
+      <surname>Clasen</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>gtk3-demo</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="manual">User Commands</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+  <refname>gtk3-demo</refname>
+  <refpurpose>Demonstrate GTK+ widgets</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gtk3-demo</command>
+<arg choice="opt">--help</arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+<command>gtk3-demo</command> is a collection of examples.
+Its purpose is to demonstrate many GTK+ widgets in a form
+that is useful to application developers.
+</para>
+<para>
+The application shows the source code for each example, as well as
+other used resources, such as ui files and icons.
+</para>
+</refsect1>
+
+<refsect1><title>Options</title>
+  <para>The following options are understood:</para>
+  <variablelist>
+    <varlistentry>
+    <term><option>-h</option>, <option>--help</option></term>
+      <listitem><para>Show help options</para></listitem>
+    </varlistentry>
+  </variablelist>
+</refsect1>
+
+</refentry>

docs/reference/gtk/gtk3-sections.txt

@@ -57,6 +57,7 @@ gtk_about_dialog_get_type
 GtkAccelGroup
 GtkAccelGroupClass
 gtk_accel_group_new
+GtkAccelFlags
 gtk_accel_group_connect
 gtk_accel_group_connect_by_path
 GtkAccelGroupActivate
@@ -444,6 +445,7 @@ gtk_button_box_new
 gtk_button_box_get_layout
 gtk_button_box_get_child_secondary
 gtk_button_box_get_child_non_homogeneous
+GtkButtonBoxStyle
 gtk_button_box_set_layout
 gtk_button_box_set_child_secondary
 gtk_button_box_set_child_non_homogeneous
@@ -523,7 +525,13 @@ gtk_list_box_new
 gtk_list_box_prepend
 gtk_list_box_insert
 gtk_list_box_select_row
+gtk_list_box_unselect_row
+gtk_list_box_select_all
+gtk_list_box_unselect_all
 gtk_list_box_get_selected_row
+GtkListBoxForeachFunc
+gtk_list_box_selected_foreach
+gtk_list_box_get_selected_rows
 
 gtk_list_box_set_selection_mode
 gtk_list_box_get_selection_mode
@@ -545,6 +553,7 @@ gtk_list_box_drag_unhighlight_row
 
 gtk_list_box_row_new
 gtk_list_box_row_changed
+gtk_list_box_row_is_selected
 gtk_list_box_row_get_header
 gtk_list_box_row_get_type
 gtk_list_box_row_set_header
@@ -974,6 +983,7 @@ GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID
 gtk_container_add
 gtk_container_remove
 gtk_container_add_with_properties
+GtkResizeMode
 gtk_container_get_resize_mode
 gtk_container_set_resize_mode
 gtk_container_check_resize
@@ -2175,6 +2185,7 @@ gtk_link_button_get_type
 <FILE>gtkmenu</FILE>
 <TITLE>GtkMenu</TITLE>
 GtkMenu
+GtkArrowPlacement
 gtk_menu_new
 gtk_menu_new_from_model
 gtk_menu_set_screen
@@ -2252,6 +2263,7 @@ gtk_menu_button_set_menu_model
 gtk_menu_button_get_menu_model
 gtk_menu_button_set_use_popover
 gtk_menu_button_get_use_popover
+GtkArrowType
 gtk_menu_button_set_direction
 gtk_menu_button_get_direction
 gtk_menu_button_set_align_widget
@@ -3108,8 +3120,10 @@ gtk_scrolled_window_get_hadjustment
 gtk_scrolled_window_get_vadjustment
 gtk_scrolled_window_get_hscrollbar
 gtk_scrolled_window_get_vscrollbar
+GtkPolicyType
 gtk_scrolled_window_set_policy
 gtk_scrolled_window_add_with_viewport
+GtkCornerType
 gtk_scrolled_window_set_placement
 gtk_scrolled_window_unset_placement
 gtk_scrolled_window_set_shadow_type
@@ -3466,6 +3480,7 @@ GtkTable
 gtk_table_new
 gtk_table_resize
 gtk_table_get_size
+GtkAttachOptions
 gtk_table_attach
 gtk_table_attach_defaults
 gtk_table_set_row_spacing
@@ -5460,6 +5475,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
@@ -5587,6 +5604,7 @@ gtk_requisition_get_type
 <TITLE>GtkWindow</TITLE>
 GtkWindow
 GtkWindowClass
+GtkWindowType
 gtk_window_new
 gtk_window_set_title
 gtk_window_set_wmclass
@@ -5602,6 +5620,7 @@ gtk_window_set_default_geometry
 gtk_window_set_geometry_hints
 gtk_window_set_gravity
 gtk_window_get_gravity
+GtkWindowPosition
 gtk_window_set_position
 gtk_window_set_transient_for
 gtk_window_set_attached_to
@@ -5703,6 +5722,7 @@ gtk_window_get_application
 gtk_window_set_application
 gtk_window_set_has_user_ref_count
 gtk_window_set_titlebar
+gtk_window_set_interactive_debugging
 
 <SUBSECTION Standard>
 GTK_WINDOW
@@ -5930,6 +5950,7 @@ GTK_STYLE_PROPERTY_BORDER_RADIUS
 GTK_STYLE_PROPERTY_BORDER_STYLE
 GTK_STYLE_PROPERTY_BORDER_COLOR
 GTK_STYLE_PROPERTY_BACKGROUND_IMAGE
+GtkBorderStyle
 <SUBSECTION>
 GTK_STYLE_CLASS_BACKGROUND
 GTK_STYLE_CLASS_BUTTON
@@ -6001,6 +6022,7 @@ gtk_style_context_add_provider
 gtk_style_context_add_provider_for_screen
 gtk_style_context_get
 gtk_style_context_get_direction
+GtkJunctionSides
 gtk_style_context_get_junction_sides
 gtk_style_context_get_parent
 gtk_style_context_get_path
@@ -6043,6 +6065,7 @@ gtk_style_context_add_class
 gtk_style_context_remove_class
 gtk_style_context_has_class
 gtk_style_context_list_classes
+GtkRegionFlags
 gtk_style_context_add_region
 gtk_style_context_remove_region
 gtk_style_context_has_region
@@ -6219,6 +6242,7 @@ gtk_gradient_get_type
 GTK_STYLE_ATTACHED
 GtkStyle
 GtkStyleClass
+GtkExpanderStyle
 gtk_style_new
 gtk_style_copy
 gtk_style_attach
@@ -6277,6 +6301,8 @@ GtkRcStyle
 GtkRcStyleClass
 GtkRcFlags
 GtkRcTokenType
+GtkPathPriorityType
+GtkPathType
 gtk_rc_scanner_new
 gtk_rc_get_style
 gtk_rc_get_style_by_paths
@@ -6311,6 +6337,7 @@ GTK_RC_STYLE_GET_CLASS
 <SUBSECTION Private>
 gtk_rc_style_get_type
 GtkRcContext
+GTK_PATH_PRIO_MASK
 </SECTION>
 
 <SECTION>
@@ -6431,6 +6458,7 @@ gtk_clipboard_get_type
 <TITLE>Drag and Drop</TITLE>
 GtkDestDefaults
 GtkTargetFlags
+GtkDragResult
 <SUBSECTION Destination Side>
 gtk_drag_dest_set
 gtk_drag_dest_set_proxy
@@ -6496,28 +6524,17 @@ gtk_binding_set_add_path
 <SECTION>
 <FILE>gtkenums</FILE>
 <TITLE>Standard Enumerations</TITLE>
-GtkAccelFlags
-GtkArrowPlacement
-GtkArrowType
-GtkAttachOptions
 GtkBaselinePosition
-GtkButtonBoxStyle
-GtkCornerType
 GtkDeleteType
 GtkDirectionType
-GtkExpanderStyle
 GtkIMPreeditStyle
 GtkIMStatusStyle
 GtkJustification
 GtkMovementStep
 GtkOrientation
 GtkPackType
-GtkPathPriorityType
-GtkPathType
-GtkPolicyType
 GtkPositionType
 GtkReliefStyle
-GtkResizeMode
 GtkScrollStep
 GtkScrollType
 GtkSelectionMode
@@ -6525,16 +6542,8 @@ GtkShadowType
 GtkStateType
 GtkStateFlags
 GtkToolbarStyle
-GtkWindowPosition
-GtkWindowType
 GtkSortType
-GtkDragResult
-GtkJunctionSides
-GtkBorderStyle
-GtkRegionFlags
 
-<SUBSECTION Private>
-GTK_PATH_PRIO_MASK
 </SECTION>
 
 <SECTION>
@@ -7487,6 +7496,8 @@ GtkSwitchClass
 gtk_switch_new
 gtk_switch_set_active
 gtk_switch_get_active
+gtk_switch_set_state
+gtk_switch_get_state
 
 <SUBSECTION Standard>
 GTK_TYPE_SWITCH

docs/reference/gtk/gtk3-widget-factory.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gtk3-widget-factory">
+
+<refentryinfo>
+  <title>gtk3-widget-factory</title>
+  <productname>GTK+</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Matthias</firstname>
+      <surname>Clasen</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>gtk3-widget-factory</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="manual">User Commands</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+  <refname>gtk3-widget-factory</refname>
+  <refpurpose>Demonstrate GTK+ widgets</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gtk3-widget-factory</command>
+<arg choice="opt">--help</arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+<command>gtk3-widget-factory</command> is a collection of examples.
+Its purpose is to demonstrate many GTK+ widgets in a form
+that is useful to GTK+ theme developers.
+</para>
+<para>
+The application shows widgets in different, typical combinations
+and states.
+</para>
+</refsect1>
+
+<refsect1><title>Options</title>
+  <para>The following options are understood:</para>
+  <variablelist>
+    <varlistentry>
+    <term><option>-h</option>, <option>--help</option></term>
+      <listitem><para>Show help options</para></listitem>
+    </varlistentry>
+  </variablelist>
+</refsect1>
+
+</refentry>

docs/reference/gtk/input-handling.xml

@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="chap-input-handling">
+<refmeta>
+<refentrytitle>The GTK+ Input Handling Model</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>GTK Library</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+<refname>The GTK+ Input Handling Model</refname>
+<refpurpose>
+    GTK+ input handling in detail
+</refpurpose>
+</refnamediv>
+
+
+  <refsect1 id="input-overview">
+    <title>Overview of GTK+ input handling</title>
+
+  <para>
+   This chapter describes in detail how GTK+ handles input. If you are interested
+   in what happens to translate a key press or mouse motion of the users into a
+   change of a GTK+ widget, you should read this chapter. This knowledge will also
+   be useful if you decide to implement your own widgets.
+  </para>
+
+  <refsect2>
+    <title>Devices and events</title>
+
+    <!-- input devices: master/slave, keyboard/pointer/touch -->
+    <para>
+     The most basic input devices that every computer user has interacted with are
+     keyboards and mice; beyond these, GTK+ supports touchpads, touchscreens and
+     more exotic input devices such as graphics tablets. Inside GTK+, every such
+     input device is represented by a #GdkDevice object.
+    </para>
+
+    <para>
+     To simplify dealing with the variability between these input devices, GTK+
+     has a concept of master and slave devices. The concrete physical devices that
+     have many different characteristics (mice may have 2 or 3 or 8 buttons,
+     keyboards have different layouts and may or may not have a separate number
+     block, etc) are represented as slave devices. Each slave device is
+     associated with a virtual master device. Master devices always come in
+     pointer/keyboard pairs - you can think of such a pair as a 'seat'.
+    </para>
+    <para>
+     GTK+ widgets generally deal with the master devices, and thus can be used
+     with any pointing device or keyboard.
+    </para>
+
+    <!-- input events: button, touch, key, motion, etc -->
+    <para>
+     When a user interacts with an input device (e.g. moves a mouse or presses
+     a key on the keyboard), GTK+ receives events from the windowing system.
+     These are typically directed at a specific window - for pointer events,
+     the window under the pointer (grabs complicate this), for keyboard events,
+     the window with the keyboard focus.
+    </para>
+    <para>
+     GDK translates these raw windowing system events into #GdkEvents.
+     Typical input events are:
+     <simplelist>
+       <member>GdkEventButton</member>
+       <member>GdkEventMotion</member>
+       <member>GdkEventCrossing</member>
+       <member>GdkEventKey</member>
+       <member>GdkEventFocus</member>
+       <member>GdkEventTouch</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
+      (as well as others, for instance window management related events).
+    </para>
+  </refsect2>
+
+  <refsect2>
+    <title>Event propagation</title>
+
+    <!-- capture/bubble, event handler chain, event controllers -->
+    <!-- grabs -->
+  </refsect2>
+
+  <refsect2>
+    <title>Keyboard input</title>
+
+    <!-- focus, tab, directional navigation -->
+    <!-- mnemonics, accelerators, bindings -->
+  </refsect2>
+
+  <refsect2>
+    <title>Gestures</title>
+
+    <!-- touch sequences, states, anything else -->
+  </refsect2>
+
+  </refsect1>
+</refentry>

docs/reference/gtk/running.sgml

@@ -194,10 +194,27 @@ additional environment variables.
       <term>no-css-cache</term>
       <listitem><para>Bypass caching for CSS style properties.</para></listitem>
     </varlistentry>
+    <varlistentry>
+      <term>baselines</term>
+      <listitem><para>Baselines.</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>pixel-cache</term>
+      <listitem><para>Pixel cache.</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>no-pixel-cache</term>
+      <listitem><para>Disable the pixel cache.</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>interactive</term>
+      <listitem><para>Open the <link linkend="interactive-debugging">interactive debugger</link>.</para></listitem>
+    </varlistentry>
 
   </variablelist>
   The special value <literal>all</literal> can be used to turn on all
-  debug options.
+  debug options. The special value <literal>help</literal> can be used
+  to obtain a list of all supported debug options.
   </para>
 </formalpara>
 
@@ -509,6 +526,30 @@ nevertheless.
 
 </refsect2>
 
+<refsect2 id="interactive-debugging">
+<title>Interactive debugging</title>
+
+  <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.
+  </para>
+  <para>
+    To enable the debugger, 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`
+    GSettings schema.
+  </para>
+ 
+</refsect2>
+
 </refsect1>
 
 </refentry>

examples/application10/app-menu.ui

@@ -12,7 +12,6 @@
       <item>
         <attribute name="label" translatable="yes">_Quit</attribute>
         <attribute name="action">app.quit</attribute>
-        <attribute name="accel"><![CDATA[<Ctrl>Q]]></attribute>
       </item>
     </section>
   </menu>

examples/application10/exampleapp.c

@@ -53,12 +53,16 @@ example_app_startup (GApplication *app)
 {
   GtkBuilder *builder;
   GMenuModel *app_menu;
+  const gchar *quit_accels[2] = { "<Ctrl>Q", NULL };
 
   G_APPLICATION_CLASS (example_app_parent_class)->startup (app);
 
   g_action_map_add_action_entries (G_ACTION_MAP (app),
                                    app_entries, G_N_ELEMENTS (app_entries),
                                    app);
+  gtk_application_set_accels_for_action (GTK_APPLICATION (app),
+                                         "app.quit",
+                                         quit_accels);
 
   builder = gtk_builder_new_from_resource ("/org/gtk/exampleapp/app-menu.ui");
   app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"));

examples/application10/exampleappprefs.c

@@ -25,12 +25,6 @@ struct _ExampleAppPrefsPrivate
 
 G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
 
-static void
-preferences_closed (GtkWidget *button)
-{
-  gtk_widget_destroy (gtk_widget_get_toplevel (button));
-}
-
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
@@ -68,12 +62,10 @@ example_app_prefs_class_init (ExampleAppPrefsClass *class)
                                                "/org/gtk/exampleapp/prefs.ui");
   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
-
-  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), preferences_closed);
 }
 
 ExampleAppPrefs *
 example_app_prefs_new (ExampleAppWindow *win)
 {
-  return g_object_new (EXAMPLE_APP_PREFS_TYPE, "transient-for", win, NULL);
+  return g_object_new (EXAMPLE_APP_PREFS_TYPE, "transient-for", win, "use-header-bar", TRUE, NULL);
 }

examples/application10/prefs.ui

@@ -64,19 +64,6 @@
             </child>
           </object>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="action_area">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkButton" id="close">
-                <signal name="clicked" handler="preferences_closed"/>
-                <property name="visible">True</property>
-                <property name="label">_Close</property>
-                <property name="use-underline">True</property>
-              </object>
-            </child>
-          </object>
-        </child>
       </object>
     </child>
   </template>

examples/application10/window.ui

@@ -9,7 +9,6 @@
           <object class="GtkHeaderBar" id="header">
             <property name="visible">True</property>
             <property name="show-close-button">True</property>
-            <property name="show-fallback-app-menu">True</property>
             <child>
               <object class="GtkLabel" id="lines_label">
                 <property name="visible">False</property>
@@ -30,6 +29,7 @@
             <child type="title">
               <object class="GtkStackSwitcher" id="tabs">
                 <property name="visible">True</property>
+                <property name="margin">6</property>
                 <property name="stack">stack</property>
               </object>
             </child>
@@ -37,6 +37,9 @@
               <object class="GtkToggleButton" id="search">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
+                <style>
+                  <class name="image-button"/>
+                </style>
                 <child>
                   <object class="GtkImage" id="search-icon">
                     <property name="visible">True</property>
@@ -52,6 +55,10 @@
             <child>
               <object class="GtkMenuButton" id="gears">
                 <property name="visible">True</property>
+                <property name="use-popover">True</property>
+                <style>
+                  <class name="image-button"/>
+                </style>
                 <child>
                   <object class="GtkImage" id="gears-icon">
                     <property name="visible">True</property>

examples/application2/window.ui

@@ -15,6 +15,7 @@
             <child type="title">
               <object class="GtkStackSwitcher" id="tabs">
                 <property name="visible">True</property>
+                <property name="margin">6</property>
                 <property name="stack">stack</property>
               </object>
             </child>

examples/application3/window.ui

@@ -15,6 +15,7 @@
             <child type="title">
               <object class="GtkStackSwitcher" id="tabs">
                 <property name="visible">True</property>
+                <property name="margin">6</property>
                 <property name="stack">stack</property>
               </object>
             </child>

examples/application4/app-menu.ui

@@ -12,7 +12,6 @@
       <item>
         <attribute name="label" translatable="yes">_Quit</attribute>
         <attribute name="action">app.quit</attribute>
-        <attribute name="accel"><![CDATA[<Ctrl>Q]]></attribute>
       </item>
     </section>
   </menu>

examples/application4/exampleapp.c

@@ -46,12 +46,16 @@ example_app_startup (GApplication *app)
 {
   GtkBuilder *builder;
   GMenuModel *app_menu;
+  const gchar *quit_accels[2] = { "<Ctrl>Q", NULL };
 
   G_APPLICATION_CLASS (example_app_parent_class)->startup (app);
 
   g_action_map_add_action_entries (G_ACTION_MAP (app),
                                    app_entries, G_N_ELEMENTS (app_entries),
                                    app);
+  gtk_application_set_accels_for_action (GTK_APPLICATION (app),
+                                         "app.quit",
+                                         quit_accels);
 
   builder = gtk_builder_new_from_resource ("/org/gtk/exampleapp/app-menu.ui");
   app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"));

examples/application4/window.ui

@@ -15,6 +15,7 @@
             <child type="title">
               <object class="GtkStackSwitcher" id="tabs">
                 <property name="visible">True</property>
+                <property name="margin">6</property>
                 <property name="stack">stack</property>
               </object>
             </child>

examples/application5/app-menu.ui

@@ -12,7 +12,6 @@
       <item>
         <attribute name="label" translatable="yes">_Quit</attribute>
         <attribute name="action">app.quit</attribute>
-        <attribute name="accel"><![CDATA[<Ctrl>Q]]></attribute>
       </item>
     </section>
   </menu>

examples/application5/exampleapp.c

@@ -46,12 +46,16 @@ example_app_startup (GApplication *app)
 {
   GtkBuilder *builder;
   GMenuModel *app_menu;
+  const gchar *quit_accels[2] = { "<Ctrl>Q", NULL };
 
   G_APPLICATION_CLASS (example_app_parent_class)->startup (app);
 
   g_action_map_add_action_entries (G_ACTION_MAP (app),
                                    app_entries, G_N_ELEMENTS (app_entries),
                                    app);
+  gtk_application_set_accels_for_action (GTK_APPLICATION (app),
+                                         "app.quit",
+                                         quit_accels);
 
   builder = gtk_builder_new_from_resource ("/org/gtk/exampleapp/app-menu.ui");
   app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"));

examples/application5/window.ui

@@ -15,6 +15,7 @@
             <child type="title">
               <object class="GtkStackSwitcher" id="tabs">
                 <property name="visible">True</property>
+                <property name="margin">6</property>
                 <property name="stack">stack</property>
               </object>
             </child>

examples/application6/app-menu.ui

@@ -12,7 +12,6 @@
       <item>
         <attribute name="label" translatable="yes">_Quit</attribute>
         <attribute name="action">app.quit</attribute>
-        <attribute name="accel"><![CDATA[<Ctrl>Q]]></attribute>
       </item>
     </section>
   </menu>

examples/application6/exampleapp.c

@@ -4,12 +4,14 @@
 #include "exampleappwin.h"
 #include "exampleappprefs.h"
 
-struct ExampleApp {
-        GtkApplication parent;
+struct ExampleApp
+{
+  GtkApplication parent;
 };
 
-struct ExampleAppClass {
-        GtkApplicationClass parent_class;
+struct ExampleAppClass
+{
+  GtkApplicationClass parent_class;
 };
 
 G_DEFINE_TYPE(ExampleApp, example_app, GTK_TYPE_APPLICATION);
@@ -24,12 +26,12 @@ preferences_activated (GSimpleAction *action,
                        GVariant      *parameter,
                        gpointer       app)
 {
-        ExampleAppPrefs *prefs;
-        GtkWindow *win;
+  ExampleAppPrefs *prefs;
+  GtkWindow *win;
 
-        win = gtk_application_get_active_window (GTK_APPLICATION (app));
-        prefs = example_app_prefs_new (EXAMPLE_APP_WINDOW (win));
-        gtk_window_present (GTK_WINDOW (prefs));
+  win = gtk_application_get_active_window (GTK_APPLICATION (app));
+  prefs = example_app_prefs_new (EXAMPLE_APP_WINDOW (win));
+  gtk_window_present (GTK_WINDOW (prefs));
 }
 
 static void
@@ -40,36 +42,41 @@ quit_activated (GSimpleAction *action,
   g_application_quit (G_APPLICATION (app));
 }
 
-static GActionEntry app_entries[] = {
-        { "preferences", preferences_activated, NULL, NULL, NULL },
-        { "quit", quit_activated, NULL, NULL, NULL }
+static GActionEntry app_entries[] =
+{
+  { "preferences", preferences_activated, NULL, NULL, NULL },
+  { "quit", quit_activated, NULL, NULL, NULL }
 };
 
 static void
 example_app_startup (GApplication *app)
 {
-        GtkBuilder *builder;
-        GMenuModel *app_menu;
+  GtkBuilder *builder;
+  GMenuModel *app_menu;
+  const gchar *quit_accels[2] = { "<Ctrl>Q", NULL };
 
-        G_APPLICATION_CLASS (example_app_parent_class)->startup (app);
+  G_APPLICATION_CLASS (example_app_parent_class)->startup (app);
 
-        g_action_map_add_action_entries (G_ACTION_MAP (app),
-                                         app_entries, G_N_ELEMENTS (app_entries),
-                                         app);
+  g_action_map_add_action_entries (G_ACTION_MAP (app),
+                                   app_entries, G_N_ELEMENTS (app_entries),
+                                   app);
+  gtk_application_set_accels_for_action (GTK_APPLICATION (app),
+                                         "app.quit",
+                                         quit_accels);
 
-        builder = gtk_builder_new_from_resource ("/org/gtk/exampleapp/app-menu.ui");
-        app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"));
-        gtk_application_set_app_menu (GTK_APPLICATION (app), app_menu);
-        g_object_unref (builder);
+  builder = gtk_builder_new_from_resource ("/org/gtk/exampleapp/app-menu.ui");
+  app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"));
+  gtk_application_set_app_menu (GTK_APPLICATION (app), app_menu);
+  g_object_unref (builder);
 }
 
 static void
 example_app_activate (GApplication *app)
 {
-        ExampleAppWindow *win;
+  ExampleAppWindow *win;
 
-        win = example_app_window_new (EXAMPLE_APP (app));
-        gtk_window_present (GTK_WINDOW (win));
+  win = example_app_window_new (EXAMPLE_APP (app));
+  gtk_window_present (GTK_WINDOW (win));
 }
 
 static void
@@ -78,35 +85,35 @@ example_app_open (GApplication  *app,
                   gint           n_files,
                   const gchar   *hint)
 {
-        GList *windows;
-        ExampleAppWindow *win;
-        int i;
+  GList *windows;
+  ExampleAppWindow *win;
+  int i;
 
-        windows = gtk_application_get_windows (GTK_APPLICATION (app));
-        if (windows)
-                win = EXAMPLE_APP_WINDOW (windows->data);
-        else
-                win = example_app_window_new (EXAMPLE_APP (app));
+  windows = gtk_application_get_windows (GTK_APPLICATION (app));
+  if (windows)
+    win = EXAMPLE_APP_WINDOW (windows->data);
+  else
+    win = example_app_window_new (EXAMPLE_APP (app));
 
-        for (i = 0; i < n_files; i++)
-                example_app_window_open (win, files[i]);
+  for (i = 0; i < n_files; i++)
+    example_app_window_open (win, files[i]);
 
-        gtk_window_present (GTK_WINDOW (win));
+  gtk_window_present (GTK_WINDOW (win));
 }
 
 static void
 example_app_class_init (ExampleAppClass *class)
 {
-        G_APPLICATION_CLASS (class)->startup = example_app_startup;
-        G_APPLICATION_CLASS (class)->activate = example_app_activate;
-        G_APPLICATION_CLASS (class)->open = example_app_open;
+  G_APPLICATION_CLASS (class)->startup = example_app_startup;
+  G_APPLICATION_CLASS (class)->activate = example_app_activate;
+  G_APPLICATION_CLASS (class)->open = example_app_open;
 }
 
 ExampleApp *
 example_app_new (void)
 {
-        return g_object_new (EXAMPLE_APP_TYPE,
-                             "application-id", "org.gtk.exampleapp",
-                             "flags", G_APPLICATION_HANDLES_OPEN,
-                             NULL);
+  return g_object_new (EXAMPLE_APP_TYPE,
+                       "application-id", "org.gtk.exampleapp",
+                       "flags", G_APPLICATION_HANDLES_OPEN,
+                       NULL);
 }

examples/application6/exampleappprefs.c

@@ -25,12 +25,6 @@ struct _ExampleAppPrefsPrivate
 
 G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
 
-static void
-preferences_closed (GtkWidget *button)
-{
-  gtk_widget_destroy (gtk_widget_get_toplevel (button));
-}
-
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
@@ -68,12 +62,10 @@ example_app_prefs_class_init (ExampleAppPrefsClass *class)
                                                "/org/gtk/exampleapp/prefs.ui");
   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
-
-  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), preferences_closed);
 }
 
 ExampleAppPrefs *
 example_app_prefs_new (ExampleAppWindow *win)
 {
-  return g_object_new (EXAMPLE_APP_PREFS_TYPE, "transient-for", win, NULL);
+  return g_object_new (EXAMPLE_APP_PREFS_TYPE, "transient-for", win, "use-header-bar", TRUE, NULL);
 }

examples/application6/exampleappwin.c

@@ -2,19 +2,22 @@
 #include "exampleappwin.h"
 #include <gtk/gtk.h>
 
-struct ExampleAppWindow {
-        GtkApplicationWindow parent;
+struct ExampleAppWindow
+{
+  GtkApplicationWindow parent;
 };
 
-struct ExampleAppWindowClass {
-        GtkApplicationWindowClass parent_class;
+struct ExampleAppWindowClass
+{
+  GtkApplicationWindowClass parent_class;
 };
 
 typedef struct ExampleAppWindowPrivate ExampleAppWindowPrivate;
 
-struct ExampleAppWindowPrivate {
-        GSettings *settings;
-        GtkWidget *stack;
+struct ExampleAppWindowPrivate
+{
+  GSettings *settings;
+  GtkWidget *stack;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW);
@@ -22,87 +25,88 @@ G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppWindow, example_app_window, GTK_TYPE_APPLIC
 static void
 example_app_window_init (ExampleAppWindow *win)
 {
-        ExampleAppWindowPrivate *priv;
+  ExampleAppWindowPrivate *priv;
 
-        priv = example_app_window_get_instance_private (win);
-        gtk_widget_init_template (GTK_WIDGET (win));
-        priv->settings = g_settings_new ("org.gtk.exampleapp");
+  priv = example_app_window_get_instance_private (win);
+  gtk_widget_init_template (GTK_WIDGET (win));
+  priv->settings = g_settings_new ("org.gtk.exampleapp");
 
-        g_settings_bind (priv->settings, "transition",
-                         priv->stack, "transition-type",
-                         G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (priv->settings, "transition",
+                   priv->stack, "transition-type",
+                   G_SETTINGS_BIND_DEFAULT);
 }
 
 static void
 example_app_window_dispose (GObject *object)
 {
-        ExampleAppWindow *win;
-        ExampleAppWindowPrivate *priv;
+  ExampleAppWindow *win;
+  ExampleAppWindowPrivate *priv;
 
-        win = EXAMPLE_APP_WINDOW (object);
-        priv = example_app_window_get_instance_private (win);
+  win = EXAMPLE_APP_WINDOW (object);
+  priv = example_app_window_get_instance_private (win);
 
-        g_clear_object (&priv->settings);
+  g_clear_object (&priv->settings);
 
-        G_OBJECT_CLASS (example_app_window_parent_class)->dispose (object);
+  G_OBJECT_CLASS (example_app_window_parent_class)->dispose (object);
 }
 
 static void
 example_app_window_class_init (ExampleAppWindowClass *class)
 {
-        G_OBJECT_CLASS (class)->dispose = example_app_window_dispose;
+  G_OBJECT_CLASS (class)->dispose = example_app_window_dispose;
 
-        gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
-                                                     "/org/gtk/exampleapp/window.ui");
-        gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
+  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
+                                               "/org/gtk/exampleapp/window.ui");
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
 }
 
 ExampleAppWindow *
 example_app_window_new (ExampleApp *app)
 {
-        return g_object_new (EXAMPLE_APP_WINDOW_TYPE, "application", app, NULL);
+  return g_object_new (EXAMPLE_APP_WINDOW_TYPE, "application", app, NULL);
 }
 
 void
 example_app_window_open (ExampleAppWindow *win,
                          GFile            *file)
 {
-        ExampleAppWindowPrivate *priv;
-        gchar *basename;
-        GtkWidget *scrolled, *view;
-        gchar *contents;
-        gsize length;
-        GtkTextBuffer *buffer;
-        GtkTextTag *tag;
-        GtkTextIter start_iter, end_iter;
+  ExampleAppWindowPrivate *priv;
+  gchar *basename;
+  GtkWidget *scrolled, *view;
+  gchar *contents;
+  gsize length;
+  GtkTextBuffer *buffer;
+  GtkTextTag *tag;
+  GtkTextIter start_iter, end_iter;
 
-        priv = example_app_window_get_instance_private (win);
-        basename = g_file_get_basename (file);
+  priv = example_app_window_get_instance_private (win);
+  basename = g_file_get_basename (file);
 
-        scrolled = gtk_scrolled_window_new (NULL, NULL);
-        gtk_widget_show (scrolled);
-        gtk_widget_set_hexpand (scrolled, TRUE);
-        gtk_widget_set_vexpand (scrolled, TRUE);
-        view = gtk_text_view_new ();
-        gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
-        gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
-        gtk_widget_show (view);
-        gtk_container_add (GTK_CONTAINER (scrolled), view);
-        gtk_stack_add_titled (GTK_STACK (priv->stack), scrolled, basename, basename);
+  scrolled = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_show (scrolled);
+  gtk_widget_set_hexpand (scrolled, TRUE);
+  gtk_widget_set_vexpand (scrolled, TRUE);
+  view = gtk_text_view_new ();
+  gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
+  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
+  gtk_widget_show (view);
+  gtk_container_add (GTK_CONTAINER (scrolled), view);
+  gtk_stack_add_titled (GTK_STACK (priv->stack), scrolled, basename, basename);
 
-        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
+  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
-        if (g_file_load_contents (file, NULL, &contents, &length, NULL, NULL)) {
-                gtk_text_buffer_set_text (buffer, contents, length);
-                g_free (contents);
-        }
+  if (g_file_load_contents (file, NULL, &contents, &length, NULL, NULL))
+    {
+      gtk_text_buffer_set_text (buffer, contents, length);
+      g_free (contents);
+    }
 
-        tag = gtk_text_buffer_create_tag (buffer, NULL, NULL);
-        g_settings_bind (priv->settings, "font", tag, "font", G_SETTINGS_BIND_DEFAULT);
+  tag = gtk_text_buffer_create_tag (buffer, NULL, NULL);
+  g_settings_bind (priv->settings, "font", tag, "font", G_SETTINGS_BIND_DEFAULT);
 
-        gtk_text_buffer_get_start_iter (buffer, &start_iter);
-        gtk_text_buffer_get_end_iter (buffer, &end_iter);
-        gtk_text_buffer_apply_tag (buffer, tag, &start_iter, &end_iter);
+  gtk_text_buffer_get_start_iter (buffer, &start_iter);
+  gtk_text_buffer_get_end_iter (buffer, &end_iter);
+  gtk_text_buffer_apply_tag (buffer, tag, &start_iter, &end_iter);
 
-        g_free (basename);
+  g_free (basename);
 }

examples/application6/main.c

@@ -4,12 +4,12 @@
 int
 main (int argc, char *argv[])
 {
-        /* Since this example is running uninstalled,
-         * we have to help it find its schema. This
-         * is *not* necessary in properly installed
-         * application.
-         */
-        g_setenv ("GSETTINGS_SCHEMA_DIR", ".", FALSE);
+  /* Since this example is running uninstalled,
+   * we have to help it find its schema. This
+   * is *not* necessary in properly installed
+   * application.
+   */
+  g_setenv ("GSETTINGS_SCHEMA_DIR", ".", FALSE);
 
-        return g_application_run (G_APPLICATION (example_app_new ()), argc, argv);
+  return g_application_run (G_APPLICATION (example_app_new ()), argc, argv);
 }

examples/application6/prefs.ui

@@ -64,19 +64,6 @@
             </child>
           </object>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="action_area">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkButton" id="close">
-                <signal name="clicked" handler="preferences_closed"/>
-                <property name="visible">True</property>
-                <property name="label">_Close</property>
-                <property name="use-underline">True</property>
-              </object>
-            </child>
-          </object>
-        </child>
       </object>
     </child>
   </template>

examples/application6/window.ui

@@ -15,6 +15,7 @@
             <child type="title">
               <object class="GtkStackSwitcher" id="tabs">
                 <property name="visible">True</property>
+                <property name="margin">6</property>
                 <property name="stack">stack</property>
               </object>
             </child>

examples/application7/app-menu.ui

@@ -12,7 +12,6 @@
       <item>
         <attribute name="label" translatable="yes">_Quit</attribute>
         <attribute name="action">app.quit</attribute>
-        <attribute name="accel"><![CDATA[<Ctrl>Q]]></attribute>
       </item>
     </section>
   </menu>

examples/application7/exampleapp.c

@@ -53,12 +53,16 @@ example_app_startup (GApplication *app)
 {
   GtkBuilder *builder;
   GMenuModel *app_menu;
+  const gchar *quit_accels[2] = { "<Ctrl>Q", NULL };
 
   G_APPLICATION_CLASS (example_app_parent_class)->startup (app);
 
   g_action_map_add_action_entries (G_ACTION_MAP (app),
                                    app_entries, G_N_ELEMENTS (app_entries),
                                    app);
+  gtk_application_set_accels_for_action (GTK_APPLICATION (app),
+                                         "app.quit",
+                                         quit_accels);
 
   builder = gtk_builder_new_from_resource ("/org/gtk/exampleapp/app-menu.ui");
   app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"));

examples/application7/exampleappprefs.c

@@ -25,12 +25,6 @@ struct _ExampleAppPrefsPrivate
 
 G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
 
-static void
-preferences_closed (GtkWidget *button)
-{
-  gtk_widget_destroy (gtk_widget_get_toplevel (button));
-}
-
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
@@ -68,12 +62,10 @@ example_app_prefs_class_init (ExampleAppPrefsClass *class)
                                                "/org/gtk/exampleapp/prefs.ui");
   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
-
-  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), preferences_closed);
 }
 
 ExampleAppPrefs *
 example_app_prefs_new (ExampleAppWindow *win)
 {
-  return g_object_new (EXAMPLE_APP_PREFS_TYPE, "transient-for", win, NULL);
+  return g_object_new (EXAMPLE_APP_PREFS_TYPE, "transient-for", win, "use-header-bar", TRUE, NULL);
 }

examples/application7/prefs.ui

@@ -64,19 +64,6 @@
             </child>
           </object>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="action_area">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkButton" id="close">
-                <signal name="clicked" handler="preferences_closed"/>
-                <property name="visible">True</property>
-                <property name="label">_Close</property>
-                <property name="use-underline">True</property>
-              </object>
-            </child>
-          </object>
-        </child>
       </object>
     </child>
   </template>

examples/application7/window.ui

@@ -15,6 +15,7 @@
             <child type="title">
               <object class="GtkStackSwitcher" id="tabs">
                 <property name="visible">True</property>
+                <property name="margin">6</property>
                 <property name="stack">stack</property>
               </object>
             </child>
@@ -22,6 +23,9 @@
               <object class="GtkToggleButton" id="search">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
+                <style>
+                  <class name="image-button"/>
+                </style>
                 <child>
                   <object class="GtkImage" id="search-icon">
                     <property name="visible">True</property>

examples/application8/app-menu.ui

@@ -12,7 +12,6 @@
       <item>
         <attribute name="label" translatable="yes">_Quit</attribute>
         <attribute name="action">app.quit</attribute>
-        <attribute name="accel"><![CDATA[<Ctrl>Q]]></attribute>
       </item>
     </section>
   </menu>

examples/application8/exampleapp.c

@@ -53,12 +53,16 @@ example_app_startup (GApplication *app)
 {
   GtkBuilder *builder;
   GMenuModel *app_menu;
+  const gchar *quit_accels[2] = { "<Ctrl>Q", NULL };
 
   G_APPLICATION_CLASS (example_app_parent_class)->startup (app);
 
   g_action_map_add_action_entries (G_ACTION_MAP (app),
                                    app_entries, G_N_ELEMENTS (app_entries),
                                    app);
+  gtk_application_set_accels_for_action (GTK_APPLICATION (app),
+                                         "app.quit",
+                                         quit_accels);
 
   builder = gtk_builder_new_from_resource ("/org/gtk/exampleapp/app-menu.ui");
   app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"));

examples/application8/exampleappprefs.c

@@ -25,12 +25,6 @@ struct _ExampleAppPrefsPrivate
 
 G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
 
-static void
-preferences_closed (GtkWidget *button)
-{
-  gtk_widget_destroy (gtk_widget_get_toplevel (button));
-}
-
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
@@ -68,12 +62,10 @@ example_app_prefs_class_init (ExampleAppPrefsClass *class)
                                                "/org/gtk/exampleapp/prefs.ui");
   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
-
-  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), preferences_closed);
 }
 
 ExampleAppPrefs *
 example_app_prefs_new (ExampleAppWindow *win)
 {
-  return g_object_new (EXAMPLE_APP_PREFS_TYPE, "transient-for", win, NULL);
+  return g_object_new (EXAMPLE_APP_PREFS_TYPE, "transient-for", win, "use-header-bar", TRUE, NULL);
 }

examples/application8/prefs.ui

@@ -64,19 +64,6 @@
             </child>
           </object>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="action_area">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkButton" id="close">
-                <signal name="clicked" handler="preferences_closed"/>
-                <property name="visible">True</property>
-                <property name="label">_Close</property>
-                <property name="use-underline">True</property>
-              </object>
-            </child>
-          </object>
-        </child>
       </object>
     </child>
   </template>

examples/application8/window.ui

@@ -15,6 +15,7 @@
             <child type="title">
               <object class="GtkStackSwitcher" id="tabs">
                 <property name="visible">True</property>
+                <property name="margin">6</property>
                 <property name="stack">stack</property>
               </object>
             </child>
@@ -22,6 +23,9 @@
               <object class="GtkToggleButton" id="search">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
+                <style>
+                  <class name="image-button"/>
+                </style>
                 <child>
                   <object class="GtkImage" id="search-icon">
                     <property name="visible">True</property>
@@ -37,6 +41,10 @@
             <child>
               <object class="GtkMenuButton" id="gears">
                 <property name="visible">True</property>
+                <property name="use-popover">True</property>
+                <style>
+                  <class name="image-button"/>
+                </style>
                 <child>
                   <object class="GtkImage" id="gears-icon">
                     <property name="visible">True</property>

examples/application9/app-menu.ui

@@ -12,7 +12,6 @@
       <item>
         <attribute name="label" translatable="yes">_Quit</attribute>
         <attribute name="action">app.quit</attribute>
-        <attribute name="accel"><![CDATA[<Ctrl>Q]]></attribute>
       </item>
     </section>
   </menu>

examples/application9/exampleapp.c

@@ -53,12 +53,16 @@ example_app_startup (GApplication *app)
 {
   GtkBuilder *builder;
   GMenuModel *app_menu;
+  const gchar *quit_accels[2] = { "<Ctrl>Q", NULL };
 
   G_APPLICATION_CLASS (example_app_parent_class)->startup (app);
 
   g_action_map_add_action_entries (G_ACTION_MAP (app),
                                    app_entries, G_N_ELEMENTS (app_entries),
                                    app);
+  gtk_application_set_accels_for_action (GTK_APPLICATION (app),
+                                         "app.quit",
+                                         quit_accels);
 
   builder = gtk_builder_new_from_resource ("/org/gtk/exampleapp/app-menu.ui");
   app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"));

examples/application9/exampleappprefs.c

@@ -25,12 +25,6 @@ struct _ExampleAppPrefsPrivate
 
 G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
 
-static void
-preferences_closed (GtkWidget *button)
-{
-  gtk_widget_destroy (gtk_widget_get_toplevel (button));
-}
-
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
@@ -68,12 +62,10 @@ example_app_prefs_class_init (ExampleAppPrefsClass *class)
                                                "/org/gtk/exampleapp/prefs.ui");
   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
-
-  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), preferences_closed);
 }
 
 ExampleAppPrefs *
 example_app_prefs_new (ExampleAppWindow *win)
 {
-  return g_object_new (EXAMPLE_APP_PREFS_TYPE, "transient-for", win, NULL);
+  return g_object_new (EXAMPLE_APP_PREFS_TYPE, "transient-for", win, "use-header-bar", TRUE, NULL);
 }

examples/application9/prefs.ui

@@ -64,19 +64,6 @@
             </child>
           </object>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="action_area">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkButton" id="close">
-                <signal name="clicked" handler="preferences_closed"/>
-                <property name="visible">True</property>
-                <property name="label">_Close</property>
-                <property name="use-underline">True</property>
-              </object>
-            </child>
-          </object>
-        </child>
       </object>
     </child>
   </template>

examples/application9/window.ui

@@ -32,6 +32,7 @@
             <child type="title">
               <object class="GtkStackSwitcher" id="tabs">
                 <property name="visible">True</property>
+                <property name="margin">6</property>
                 <property name="stack">stack</property>
               </object>
             </child>
@@ -39,6 +40,9 @@
               <object class="GtkToggleButton" id="search">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
+                <style>
+                  <class name="image-button"/>
+                </style>
                 <child>
                   <object class="GtkImage" id="search-icon">
                     <property name="visible">True</property>
@@ -54,6 +58,10 @@
             <child>
               <object class="GtkMenuButton" id="gears">
                 <property name="visible">True</property>
+                <property name="use-popover">True</property>
+                <style>
+                  <class name="image-button"/>
+                </style>
                 <child>
                   <object class="GtkImage" id="gears-icon">
                     <property name="visible">True</property>

examples/bloatpad.c

@@ -508,6 +508,7 @@ static void
 bloat_pad_startup (GApplication *application)
 {
   BloatPad *bloatpad = (BloatPad*) application;
+  GtkApplication *app = GTK_APPLICATION (application);
   GtkBuilder *builder;
   GMenu *menu;
   GMenuItem *item;
@@ -517,6 +518,19 @@ bloat_pad_startup (GApplication *application)
   GFile *file;
   gchar *data;
   gsize size;
+  gint i;
+  struct {
+    const gchar *action_and_target;
+    const gchar *accelerators[2];
+  } accels[] = {
+    { "app.new", { "<Primary>n", NULL } },
+    { "app.quit", { "<Primary>q", NULL } },
+    { "win.copy", { "<Primary>c", NULL } },
+    { "win.paste", { "<Primary>p", NULL } },
+    { "win.justify::left", { "<Primary>l", NULL } },
+    { "win.justify::center", { "<Primary>m", NULL } },
+    { "win.justify::right", { "<Primary>r", NULL } }
+  };
 
   G_APPLICATION_CLASS (bloat_pad_parent_class)
     ->startup (application);
@@ -606,15 +620,10 @@ bloat_pad_startup (GApplication *application)
                                "    </submenu>"
                                "  </menu>"
                                "</interface>", -1, NULL);
-  gtk_application_set_app_menu (GTK_APPLICATION (application), G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu")));
-  gtk_application_set_menubar (GTK_APPLICATION (application), G_MENU_MODEL (gtk_builder_get_object (builder, "menubar")));
-  gtk_application_add_accelerator (GTK_APPLICATION (application), "<Primary>n", "app.new", NULL);
-  gtk_application_add_accelerator (GTK_APPLICATION (application), "<Primary>q", "app.quit", NULL);
-  gtk_application_add_accelerator (GTK_APPLICATION (application), "<Primary>c", "win.copy", NULL);
-  gtk_application_add_accelerator (GTK_APPLICATION (application), "<Primary>p", "win.paste", NULL);
-  gtk_application_add_accelerator (GTK_APPLICATION (application), "<Primary>l", "win.justify", g_variant_new_string ("left"));
-  gtk_application_add_accelerator (GTK_APPLICATION (application), "<Primary>m", "win.justify", g_variant_new_string ("center"));
-  gtk_application_add_accelerator (GTK_APPLICATION (application), "<Primary>r", "win.justify", g_variant_new_string ("right"));
+  gtk_application_set_app_menu (app, G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu")));
+  gtk_application_set_menubar (app, G_MENU_MODEL (gtk_builder_get_object (builder, "menubar")));
+  for (i = 0; i < G_N_ELEMENTS (accels); i++)
+    gtk_application_set_accels_for_action (app, accels[i].action_and_target, accels[i].accelerators);
 
   menu = G_MENU (gtk_builder_get_object (builder, "icon-menu"));
 
@@ -743,11 +752,12 @@ main (int argc, char **argv)
 {
   BloatPad *bloat_pad;
   int status;
+  const gchar *accels[] = { "F11", NULL };
 
   bloat_pad = bloat_pad_new ();
 
-  gtk_application_add_accelerator (GTK_APPLICATION (bloat_pad),
-                                   "F11", "win.fullscreen", NULL);
+  gtk_application_set_accels_for_action (GTK_APPLICATION (bloat_pad),
+                                         "win.fullscreen", accels);
 
   status = g_application_run (G_APPLICATION (bloat_pad), argc, argv);
 

examples/plugman.c

@@ -476,10 +476,11 @@ main (int argc, char **argv)
 {
   PlugMan *plug_man;
   int status;
+  const gchar *accels[] = { "F11", NULL };
 
   plug_man = plug_man_new ();
-  gtk_application_add_accelerator (GTK_APPLICATION (plug_man),
-                                   "F11", "win.fullscreen", NULL);
+  gtk_application_set_accels_for_action (GTK_APPLICATION (plug_man),
+                                         "win.fullscreen", accels);
   status = g_application_run (G_APPLICATION (plug_man), argc, argv);
   g_object_unref (plug_man);
 

gdk/Makefile.am

@@ -2,6 +2,8 @@
 include $(top_srcdir)/Makefile.decl
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ENV = \
+   CC="$(CC)"
 INTROSPECTION_SCANNER_ARGS = \
 	--add-include-path=../gdk \
 	--warn-all
@@ -60,11 +62,11 @@ LDADD = 					\
 #
 # GDK header files for public installation (non-generated)
 #
+#
 gdk_public_h_sources = 				\
 	gdk.h					\
 	gdkapplaunchcontext.h			\
 	gdkcairo.h				\
-	gdkcolor.h				\
 	gdkcursor.h				\
 	gdkdevice.h				\
 	gdkdevicemanager.h			\
@@ -92,6 +94,13 @@ gdk_public_h_sources = 				\
 	gdkvisual.h				\
 	gdkwindow.h
 
+deprecated_h_sources =				\
+	deprecated/gdkcolor.h
+
+gdk_h_sources =					\
+	$(gdk_public_h_sources)			\
+	$(deprecated_h_sources)
+
 gdk_private_headers = 				\
 	gdkapplaunchcontextprivate.h		\
 	gdkcursorprivate.h			\
@@ -109,11 +118,14 @@ gdk_private_headers = 				\
 	gdkvisualprivate.h			\
 	gdkx.h
 
+deprecated_c_sources =				\
+	deprecated/gdkcolor.c
+
 gdk_c_sources = 				\
+	$(deprecated_c_sources)			\
 	gdk.c					\
 	gdkapplaunchcontext.c			\
 	gdkcairo.c				\
-	gdkcolor.c				\
 	gdkcursor.c				\
 	gdkdeprecated.c				\
 	gdkdevice.c				\
@@ -155,6 +167,9 @@ gdkincludedir = $(includedir)/gtk-3.0/gdk
 gdkinclude_HEADERS = $(gdk_public_h_sources) gdkenumtypes.h gdkversionmacros.h
 nodist_gdkinclude_HEADERS = gdkconfig.h
 
+deprecatedincludedir = $(includedir)/gtk-3.0/gdk/deprecated
+deprecatedinclude_HEADERS = $(deprecated_h_sources)
+
 common_sources = 		\
 	$(gdk_private_headers)	\
 	$(gdk_c_sources)	\
@@ -194,7 +209,7 @@ endif
 if HAVE_INTROSPECTION
 
 introspection_files = 		\
-	$(filter-out gdkkeysyms-compat.h, $(gdk_public_h_sources))	\
+	$(filter-out gdkkeysyms-compat.h, $(gdk_h_sources))	\
 	$(gdk_c_sources)	\
         gdkenumtypes.c		\
         gdkenumtypes.h
@@ -208,7 +223,9 @@ Gdk_3_0_gir_FILES = $(introspection_files)
 Gdk_3_0_gir_CFLAGS = $(AM_CPPFLAGS)
 Gdk_3_0_gir_EXPORT_PACKAGES = gdk-3.0
 INTROSPECTION_GIRS += Gdk-3.0.gir
-
+if OS_WIN32
+Gdk_3_0_gir_CFLAGS += -I$(srcdir)/win32 -I$(srcdir)
+endif
 if USE_X11
 x11_introspection_files = 		\
 	x11/gdkapplaunchcontext-x11.c	\
@@ -271,6 +288,53 @@ INTROSPECTION_GIRS += GdkX11-3.0.gir
 
 endif # USE_X11
 
+if OS_WIN32
+w32_introspection_files =		\
+	win32/gdkcursor-win32.c		\
+	win32/gdkdevicemanager-win32.c	\
+	win32/gdkdevice-virtual.c	\
+	win32/gdkdevice-win32.c		\
+	win32/gdkdevice-wintab.c	\
+	win32/gdkdisplaymanager-win32.c	\
+	win32/gdkdisplay-win32.c	\
+	win32/gdkdnd-win32.c		\
+	win32/gdkevents-win32.c		\
+	win32/gdkgeometry-win32.c	\
+	win32/gdkglobals-win32.c	\
+	win32/gdkinput.c		\
+	win32/gdkkeys-win32.c		\
+	win32/gdkmain-win32.c		\
+	win32/gdkproperty-win32.c	\
+	win32/gdkscreen-win32.c		\
+	win32/gdkselection-win32.c	\
+	win32/gdktestutils-win32.c	\
+	win32/gdkvisual-win32.c		\
+	win32/gdkwin32.h		\
+	win32/gdkwin32cursor.h		\
+	win32/gdkwin32display.h		\
+	win32/gdkwin32displaymanager.h	\
+	win32/gdkwin32dnd.h		\
+	win32/gdkwin32id.c		\
+	win32/gdkwin32keys.h		\
+	win32/gdkwin32misc.h		\
+	win32/gdkwin32screen.h		\
+	win32/gdkwin32window.h		\
+	win32/gdkwindow-win32.c
+
+
+GdkWin32-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
+GdkWin32_3_0_gir_SCANNERFLAGS = \
+	--identifier-prefix=Gdk		\
+	--c-include="gdk/gdkwin32.h"	\
+	--include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
+GdkWin32_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
+GdkWin32_3_0_gir_LIBS = libgdk-3.la
+GdkWin32_3_0_gir_FILES = $(w32_introspection_files)
+GdkWin32_3_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk -I$(srcdir)/win32 -I$(srcdir)
+INTROSPECTION_GIRS += GdkWin32-3.0.gir
+
+endif # OS_WIN32
+
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
 
@@ -327,15 +391,15 @@ BUILT_SOURCES = \
 
 gdkenumtypes.h: stamp-gdkenumtypes.h
 	@true
-stamp-gdkenumtypes.h: $(gdk_public_h_sources) gdkenumtypes.h.template
+stamp-gdkenumtypes.h: $(gdk_h_sources) gdkenumtypes.h.template
 	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.h.template \
-		$(gdk_public_h_sources) ) >> xgen-geth \
+		$(gdk_h_sources) ) >> xgen-geth \
 	&& (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth gdkenumtypes.h ) \
 	&& rm -f xgen-geth \
 	&& echo timestamp > $(@F)
-gdkenumtypes.c: $(gdk_public_h_sources) gdkenumtypes.c.template
+gdkenumtypes.c: $(gdk_h_sources) gdkenumtypes.c.template
 	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.c.template \
-		$(gdk_public_h_sources) ) > xgen-getc \
+		$(gdk_h_sources) ) > xgen-getc \
 	&& cp xgen-getc gdkenumtypes.c  \
 	&& rm -f xgen-getc
 

gdk/broadway/Makefile.am

@@ -1,5 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
+NULL =
 
 libgdkincludedir = $(includedir)/gtk-3.0/gdk
 libgdkbroadwayincludedir = $(includedir)/gtk-3.0/gdk/broadway
@@ -75,7 +76,8 @@ libgdk_broadway_la_SOURCES =		\
 
 if OS_UNIX
 libgdk_broadway_la_LIBADD = \
-	-lrt
+	$(SHM_LIBS)         \
+	$(NULL)
 endif
 
 broadwayd_SOURCES = \
@@ -91,7 +93,7 @@ broadwayd_SOURCES = \
 if OS_WIN32
 broadwayd_LDADD = $(GDK_DEP_LIBS) -lws2_32
 else
-broadwayd_LDADD = $(GDK_DEP_LIBS) -lrt
+broadwayd_LDADD = $(GDK_DEP_LIBS) @SHM_LIBS@
 endif
 
 MAINTAINERCLEANFILES = $(broadway_built_sources)

gdk/broadway/gdkbroadway-server.c

@@ -540,12 +540,14 @@ map_named_shm (char *name, gsize size)
   res = ftruncate (fd, size);
   g_assert (res != -1);
 
+#ifdef HAVE_POSIX_FALLOCATE
   res = posix_fallocate (fd, 0, size);
   if (res != 0)
     {
       shm_unlink (name);
       g_error ("Not enough shared memory for window surface");
     }
+#endif
   
   ptr = mmap(0, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
 

gdk/broadway/gdkwindow-broadway.c

@@ -132,7 +132,10 @@ static void
 queue_flush (GdkWindow *window)
 {
   if (flush_id == 0)
-    flush_id = gdk_threads_add_idle (flush_idle, NULL);
+    {
+      flush_id = gdk_threads_add_idle (flush_idle, NULL);
+      g_source_set_name_by_id (flush_id, "[gtk+] flush_idle");
+    }
 }
 
 static void

gdk/deprecated/gdkcolor.c

@@ -31,6 +31,8 @@
 
 #include <time.h>
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 /**
  * SECTION:colors
  * @Short_description: Manipulation of colors
@@ -39,7 +41,8 @@
  * A #GdkColor represents a color.
  *
  * When working with cairo, it is often more convenient
- * to use a #GdkRGBA instead.
+ * to use a #GdkRGBA instead, and #GdkColor has been
+ * deprecated in favor of #GdkRGBA.
  */
 
 
@@ -52,6 +55,8 @@
  * The result must be freed using gdk_color_free().
  *
  * Returns: a copy of @color
+ *
+ * Deprecated: 3.14: Use #GdkRGBA
  */
 GdkColor*
 gdk_color_copy (const GdkColor *color)
@@ -70,6 +75,8 @@ gdk_color_copy (const GdkColor *color)
  * @color: a #GdkColor
  *
  * Frees a #GdkColor created with gdk_color_copy().
+ *
+ * Deprecated: 3.14: Use #GdkRGBA
  */
 void
 gdk_color_free (GdkColor *color)
@@ -87,6 +94,8 @@ gdk_color_free (GdkColor *color)
  * table that stores #GdkColors.
  *
  * Returns: The hash function applied to @color
+ *
+ * Deprecated: 3.14: Use #GdkRGBA
  */
 guint
 gdk_color_hash (const GdkColor *color)
@@ -105,6 +114,8 @@ gdk_color_hash (const GdkColor *color)
  * Compares two colors.
  *
  * Returns: %TRUE if the two colors compare equal
+ *
+ * Deprecated: 3.14: Use #GdkRGBA
  */
 gboolean
 gdk_color_equal (const GdkColor *colora,
@@ -139,6 +150,8 @@ G_DEFINE_BOXED_TYPE (GdkColor, gdk_color,
  * and “\#ffffffffffff”).
  *
  * Returns: %TRUE if the parsing succeeded
+ *
+ * Deprecated: 3.14: Use #GdkRGBA
  */
 gboolean
 gdk_color_parse (const gchar *spec,
@@ -163,7 +176,7 @@ gdk_color_parse (const gchar *spec,
  * @color: a #GdkColor
  *
  * Returns a textual specification of @color in the hexadecimal
- * form `\#rrrrggggbbbb`, where `r`, `g` and `b` are hex digits
+ * form “\#rrrrggggbbbb” where “r”, “g” and “b” are hex digits
  * representing the red, green and blue components respectively.
  *
  * The returned string can be parsed by gdk_color_parse().
@@ -171,6 +184,8 @@ gdk_color_parse (const gchar *spec,
  * Returns: a newly-allocated text string
  *
  * Since: 2.12
+ *
+ * Deprecated: 3.14: Use #GdkRGBA
  */
 gchar *
 gdk_color_to_string (const GdkColor *color)

gdk/deprecated/gdkcolor.h

@@ -59,24 +59,24 @@ struct _GdkColor
 
 #define GDK_TYPE_COLOR (gdk_color_get_type ())
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 GType     gdk_color_get_type (void) G_GNUC_CONST;
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 GdkColor *gdk_color_copy      (const GdkColor *color);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 void      gdk_color_free      (GdkColor       *color);
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 guint     gdk_color_hash      (const GdkColor *color);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 gboolean  gdk_color_equal     (const GdkColor *colora,
                                const GdkColor *colorb);
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 gboolean  gdk_color_parse     (const gchar    *spec,
                                GdkColor       *color);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 gchar *   gdk_color_to_string (const GdkColor *color);
 
 

gdk/gdk.c

@@ -24,8 +24,6 @@
 
 #include "config.h"
 
-#define GDK_DISABLE_DEPRECATION_WARNINGS 1
-
 #include "gdkversionmacros.h"
 #include "gdkmain.h"
 
@@ -359,8 +357,9 @@ gdk_get_display (void)
  * Gets the display name specified in the command line arguments passed
  * to gdk_init() or gdk_parse_args(), if any.
  *
- * Returns: the display name, if specified explicitly, otherwise %NULL
- *   this string is owned by GTK+ and must not be modified or freed.
+ * Returns: (nullable): the display name, if specified explicitly,
+ *   otherwise %NULL this string is owned by GTK+ and must not be
+ *   modified or freed.
  *
  * Since: 2.2
  */
@@ -382,8 +381,8 @@ gdk_get_display_arg_name (void)
  * display has previously been set, simply returns that. An internal
  * function that should not be used by applications.
  *
- * Returns: (transfer none): the default display, if it could be
- *   opened, otherwise %NULL.
+ * Returns: (nullable) (transfer none): the default display, if it
+ *   could be opened, otherwise %NULL.
  **/
 GdkDisplay *
 gdk_display_open_default_libgtk_only (void)

gdk/gdk.h

@@ -31,7 +31,6 @@
 #include <gdk/gdkversionmacros.h>
 #include <gdk/gdkapplaunchcontext.h>
 #include <gdk/gdkcairo.h>
-#include <gdk/gdkcolor.h>
 #include <gdk/gdkcursor.h>
 #include <gdk/gdkdevice.h>
 #include <gdk/gdkdevicemanager.h>
@@ -58,6 +57,10 @@
 #include <gdk/gdkvisual.h>
 #include <gdk/gdkwindow.h>
 
+#ifndef GDK_DISABLE_DEPRECATED
+#include <gdk/deprecated/gdkcolor.h>
+#endif
+
 #undef __GDK_H_INSIDE__
 
 #endif /* __GDK_H__ */

gdk/gdkcairo.h

@@ -23,7 +23,7 @@
 #endif
 
 #include <gdk/gdkversionmacros.h>
-#include <gdk/gdkcolor.h>
+#include <gdk/deprecated/gdkcolor.h>
 #include <gdk/gdkrgba.h>
 #include <gdk/gdkpixbuf.h>
 #include <pango/pangocairo.h>

gdk/gdkcursor.c

@@ -264,8 +264,8 @@ gdk_cursor_new_for_display (GdkDisplay    *display,
  * Creates a new cursor by looking up @name in the current cursor
  * theme.
  *
- * Returns: a new #GdkCursor, or %NULL if there is no cursor with
- *   the given name
+ * Returns: (nullable): a new #GdkCursor, or %NULL if there is no
+ *   cursor with the given name
  *
  * Since: 2.8
  */
@@ -318,6 +318,7 @@ gdk_cursor_new_from_pixbuf (GdkDisplay *display,
   const char *option;
   char *end;
   gint64 value;
+  GdkCursor *cursor;
  
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
   g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
@@ -346,7 +347,11 @@ gdk_cursor_new_from_pixbuf (GdkDisplay *display,
 
   surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, 1, NULL);
   
-  return GDK_DISPLAY_GET_CLASS (display)->get_cursor_for_surface (display, surface, x, y);
+  cursor = GDK_DISPLAY_GET_CLASS (display)->get_cursor_for_surface (display, surface, x, y);
+
+  cairo_surface_destroy (surface);
+
+  return cursor;
 }
 
 /**
@@ -418,7 +423,8 @@ gdk_cursor_get_display (GdkCursor *cursor)
  * on the cursor, GDK may not be able to obtain the image data. In this 
  * case, %NULL is returned.
  *
- * Returns: (transfer full): a #GdkPixbuf representing @cursor, or %NULL
+ * Returns: (nullable) (transfer full): a #GdkPixbuf representing
+ *   @cursor, or %NULL
  *
  * Since: 2.8
  */
@@ -473,8 +479,10 @@ gdk_cursor_get_image (GdkCursor *cursor)
 /**
  * gdk_cursor_get_surface:
  * @cursor: a #GdkCursor
- * @x_hot: Location to store the hotspot x position, or %NULL
- * @y_hot: Location to store the hotspot y position, or %NULL
+ * @x_hot: (optional) (out): Location to store the hotspot x position,
+ *   or %NULL
+ * @y_hot: (optional) (out): Location to store the hotspot y position,
+ *   or %NULL
  *
  * Returns a cairo image surface with the image used to display the cursor.
  *
@@ -482,7 +490,8 @@ gdk_cursor_get_image (GdkCursor *cursor)
  * on the cursor, GDK may not be able to obtain the image data. In this
  * case, %NULL is returned.
  *
- * Returns: (transfer full): a #cairo_surface_t representing @cursor, or %NULL
+ * Returns: (nullable) (transfer full): a #cairo_surface_t
+ *   representing @cursor, or %NULL
  *
  * Since: 3.10
  */

gdk/gdkdevice.c

@@ -383,9 +383,9 @@ gdk_device_get_property (GObject    *object,
  * gdk_device_get_state: (skip)
  * @device: a #GdkDevice.
  * @window: a #GdkWindow.
- * @axes: an array of doubles to store the values of the axes of @device in,
- * or %NULL.
- * @mask: location to store the modifiers, or %NULL.
+ * @axes: (nullable) (array): an array of doubles to store the values of
+ * the axes of @device in, or %NULL.
+ * @mask: (optional) (out): location to store the modifiers, or %NULL.
  *
  * Gets the current state of a pointer device relative to @window. As a slave
  * device’s coordinates are those of its master pointer, this
@@ -505,7 +505,8 @@ gdk_device_get_position (GdkDevice        *device,
  * function may not be called on devices of type %GDK_DEVICE_TYPE_SLAVE,
  * unless there is an ongoing grab on them, see gdk_device_grab().
  *
- * Returns: (transfer none): the #GdkWindow under the device position, or %NULL.
+ * Returns: (nullable) (transfer none): the #GdkWindow under the
+ *   device position, or %NULL.
  *
  * Since: 3.0
  **/
@@ -554,7 +555,8 @@ gdk_device_get_window_at_position_double (GdkDevice  *device,
  * function may not be called on devices of type %GDK_DEVICE_TYPE_SLAVE,
  * unless there is an ongoing grab on them, see gdk_device_grab().
  *
- * Returns: (transfer none): the #GdkWindow under the device position, or %NULL.
+ * Returns: (nullable) (transfer none): the #GdkWindow under the
+ * device position, or %NULL.
  *
  * Since: 3.0
  **/
@@ -583,8 +585,11 @@ gdk_device_get_window_at_position (GdkDevice  *device,
  * @window: the window with respect to which which the event coordinates will be reported
  * @start: starting timestamp for range of events to return
  * @stop: ending timestamp for the range of events to return
- * @events: (array length=n_events) (out) (transfer full): location to store a newly-allocated array of #GdkTimeCoord, or %NULL
- * @n_events: location to store the length of @events, or %NULL
+ * @events: (array length=n_events) (out) (transfer full) (optional):
+ *   location to store a newly-allocated array of #GdkTimeCoord, or
+ *   %NULL
+ * @n_events: (out) (optional): location to store the length of
+ *   @events, or %NULL
  *
  * Obtains the motion history for a pointer device; given a starting and
  * ending timestamp, return all events in the motion history for
@@ -644,7 +649,7 @@ _gdk_device_allocate_history (GdkDevice *device,
 
 /**
  * gdk_device_free_history: (skip)
- * @events: an array of #GdkTimeCoord.
+ * @events: (array length=n_events): an array of #GdkTimeCoord.
  * @n_events: the length of the array.
  *
  * Frees an array of #GdkTimeCoord that was returned by gdk_device_get_history().
@@ -941,7 +946,8 @@ gdk_device_get_display (GdkDevice *device)
  * If @device is of type %GDK_DEVICE_TYPE_FLOATING, %NULL will be
  * returned, as there is no associated device.
  *
- * Returns: (transfer none): The associated device, or %NULL
+ * Returns: (nullable) (transfer none): The associated device, or
+ *   %NULL
  *
  * Since: 3.0
  **/
@@ -1001,10 +1007,10 @@ _gdk_device_set_associated_device (GdkDevice *device,
  * the list of slave devices attached to it, otherwise it will return
  * %NULL
  *
- * Returns: (transfer container) (element-type GdkDevice): the list of
- *          slave devices, or %NULL. The list must be freed with
- *          g_list_free(), the contents of the list are owned by GTK+
- *          and should not be freed.
+ * Returns: (nullable) (transfer container) (element-type GdkDevice):
+ *          the list of slave devices, or %NULL. The list must be
+ *          freed with g_list_free(), the contents of the list are
+ *          owned by GTK+ and should not be freed.
  **/
 GList *
 gdk_device_list_slave_devices (GdkDevice *device)
@@ -1117,7 +1123,7 @@ gdk_device_list_axes (GdkDevice *device)
  * @device: a pointer #GdkDevice.
  * @axes: (array): pointer to an array of axes
  * @axis_label: #GdkAtom with the axis label.
- * @value: location to store the found value.
+ * @value: (out): location to store the found value.
  *
  * Interprets an array of double as axis values for a given device,
  * and locates the value in the array for a given axis label, as returned

gdk/gdkdevicemanager.c

@@ -284,9 +284,9 @@ gdk_device_manager_get_property (GObject      *object,
  *
  * Gets the #GdkDisplay associated to @device_manager.
  *
- * Returns: (transfer none): the #GdkDisplay to which @device_manager is
- *          associated to, or #NULL. This memory is owned by GDK and
- *          must not be freed or unreferenced.
+ * Returns: (nullable) (transfer none): the #GdkDisplay to which
+ *          @device_manager is associated to, or #NULL. This memory is
+ *          owned by GDK and must not be freed or unreferenced.
  *
  * Since: 3.0
  **/