css: add shorthand text-decoration property

Note that for now we take into account only text-decoration-line and text-decoration-color
css: support text-decoration-color
2015-07-05 23:31:20 +02:00 · 2015-07-05 23:31:20 +02:00 · 2015-07-05 23:31:20 +02:00 · 2015-07-05 23:31:19 +02:00 · 2015-07-05 23:31:19 +02:00 · 2015-07-05 23:31:19 +02:00
716 changed files with 94655 additions and 72197 deletions
--- a/300
+++ b/300
@@ -1,3 +1,303 @@
+Overview of Changes in GTK+ 3.17.4
+==================================
+
+* GtkStack animates size changes
+
+* GtkListBox and GtkFlowBox support positional css selectors
+  like :first-child, :last-child and :nth-child
+
+* GtkPlacesSidebar has been rewritten to use GtkListBox
+
+* Touch selection in GtkTextView and GtkEntry has been greatly
+  improved
+
+* There's now a way to have output-only windows, and this is
+  used by GtkOverlay for pass-through overlays
+
+* Bug fixes:
+ 724506 Do not animate and notify during destroy
+ 725441 Print Dialog: Add support for PPD-less printing on IPP printers...
+ 745957 GTK+/Quartz >= 3.14.8: Symbol not found: _gtk_drag_cancel (MyPa...
+ 747793 Implement part of bookmarks mockups
+ 748951 popup menus are being displayed at wrong position
+ 749650 Slider tick marks affect vertical positioning
+ 749717 wayland: Position popups relative to the parent surface
+ 749737 DnD breaks button-released events. (Setting a widget as DnD sou...
+ 750058 bad options for the keybindings in css instructions generate a ...
+ 750068 "Recent" shortcut is missing from the left pane in the file cho...
+ 750338 gtkrevealer: add css padding support
+ 750343 CSD enabled unconditionally for windows with titlebar
+ 750384 GtkDialog can not be moved when gtk_dialog_run from GtkListBox ...
+ 750396 make text selection widgets feel more interactive
+ 750424 GtkPlug has extra space around window
+ 750477 GtkFileChooserButton's label isn't xalign=0'ed
+ 750489 gtk settings c910 warning unexpected annotation element type co...
+ 750505 Main grid overlaps GtkPopover
+ 750568 Add support for windows that are transparent wrt input
+ 750605 icontheme: don't modify symbolic SVG dimensions when recoloring
+ 750631 GtkAssistant: Allow to set a page with no padding
+ 750690 Recent Chooser Widget doesn't expand
+ 750692 Touch text selection: magnifier can't be seen, obscures drag ha...
+ 750718 Improve documentation for deprecated properties
+ 750741 Popover spawned from within another popover gets stacked behind...
+ 750883 HighContrast: add suitable touch selection handle assets
+ 750888 Fix return value error in _gtk_text_handle_set_direction
+ 750892 testfontchooserdialog.c requires pangoft2
+ 750993 non-modal popovers within modal popovers are non interactive
+ 751018 Widget: GtkMenuButton+GtkPopover gtk_toggle_button_set_active()...
+ 751050 Moving the mouse while a stepper is activated causes the scroll...
+ 751082 GtkTreeView draw performance is bad when contents are not large...
+ 751084 Wrong padding/spacing in the new bookmark sidebar in RTL
+ 751098 wayland: Always request transient commit when mapping subsurface
+ 751099 Fix return value error in gdk_window_set_pass_through
+ 751169 Improve search performance
+ 751341 GtkWindow: fix default empty window size with CSD
+
+* Translation updates:
+ Catalan
+ German
+ Greek
+ Hebrew
+ Hungarian
+ Occitan
+ Spanish
+ Tajik
+
+
+Overview of Changes in GTK+ 3.17.3
+==================================
+
+* Respin to fix the tarball
+
+Overview of Changes in GTK+ 3.17.2
+==================================
+
+* GtkFontChooser:
+ - Allow custom font maps, to support application-specific fonts
+ - Improve the 'no search results' page
+
+* GtkFileChooser:
+ - Change simple search engine to search breadth-first
+ - Make the simple search engine use GIO, so it works on
+   remote shares too
+ - Merge results from the tracker and simple search engines
+ - Add a 'no search results' page
+
+* GtkPlacesSidebar:
+ - Use a popover for renaming bookmarks
+
+* GtkPopover:
+ - Add support for default widgets
+
+* GtkScrolledWindow:
+ - Support kinetic scrolling on touchpads
+
+* GtkBuilder:
+ - Improve error reporting
+ - gtk-builder-tool can validate templates
+ - gtk-builder-tool can enumerate named objects
+
+* gtk3-demo:
+ - New cursors demo
+ - New page setup demo
+ - Builder demo ported away from GtkUIManager
+
+* GDK:
+ - Make css cursor names work across backends
+
+* Windows:
+ - Require Vista or newer
+ - Support RGBA windows
+ - Support css cursor names
+ - Support animated cursors
+ - Add cursor theme support. To take advantage of this, you will need
+   a new adwaita-icon-theme with Windows cursors.
+
+* Wayland:
+ - Remove assumptions on ordering of globals in startup
+ - Improve DND support in various places
+ - Support css cursor names
+
+* X11:
+ - Support XRANDR 1.5 monitor objects
+ - Support css cursor names
+
+* OS X:
+ - Support css cursor names
+
+* Bugs fixed:
+ 619493 Mark two functions from GtkAdjustment's public API deprecated
+ 693738 gtk print dialog shows "Getting printer information failed"...
+ 719683 Escaping issue "Failed to set text from markup due to error...
+ 719819 Wayland backend depends on ordering of globals in the displ...
+ 727316 W32: GDK does not support per-pixel alpha-blended windows
+ 744086 configure.ac: Pull gio-unix dependency for all unix builds
+ 746916 File chooser search does not work over remote network shares
+ 747150 hint for vertical writing mode to input method
+ 747634 gdk_set_program_class() breaks --class
+ 747664 GtkEntry:activates-default should work inside of popovers
+ 748234 Useless "Gtk-WARNING **: No object called:" warning message...
+ 748615 GtkWindow: Get the correct shadow width even before window ...
+ 748640 Documentation misses out example source files when not buil...
+ 748771 Add API to attach custom PangoFontMap to a font dialog inst...
+ 748782 fontchooser should reload list of families/styles on theme ...
+ 748783 Remove PANGO_ENABLE_BACKEND from gtksettings.c
+ 748784 GtkProgressBar text cannot be superimposed on the progress bar
+ 748833 Define GdkRectangle structure just for introspection parsing
+ 749009 notify test fails without a session bus
+ 749012 GtkStack: Don't emit notify::visible-child during destruction
+ 749021 GtkStackSwitcher: Don't emit notify::visible-child when set...
+ 749178 quartz: Support css cursor names
+ 749425 Memory leak in GtkWindow
+ 749451 Windows have no border
+ 749593 Miscellaneous test fixes
+ 749679 Avoid device position queries during DnD
+ 749770 Implement kinetic scrolling for libinput-managed devices
+ 748763 warnings when starting drag from GtkEntries
+ 749893 Crash when trying to drag a tab from a populated GtkNotebook...
+
+* Translation updates:
+ Catalan
+ Czech
+ French
+ German
+ Hebrew
+ Hungarian
+ Norwegian bokmål
+ Occitan
+ Polish
+ Russian
+ Slovak
+
+
+Overview of Changes in GTK+ 3.17.1
+==================================
+
+* Themes:
+ - Many HighContrast theme improvements
+ - Stronger entry focus in Adwaita
+ - Improve client-side decorations without a compositor
+
+* Scrolling:
+ - Support horizontal wheel scrolling with Shift
+ - Make indicators pop up reliably
+ - Detect more trackpoints
+ - Handle pens, erasers and similar devices
+
+* GtkTextView:
+ - Support underline and strikethrough color
+
+* GtkFileChooser:
+ - Open location entry more easily
+ - Ensure a directory is loaded
+ - Use a popover for new folder names
+
+* GtkBuilder:
+ - Improve error messages
+ - Add a gtk-builder-tool utility for ui file validation
+
+* Inspector:
+ - Show accessible name and description
+ - Add a tab for CSS nodes
+
+* Wayland:
+ - DND and clipboard fixes
+ - Support attached modal dialogs with mutter
+
+* Windows:
+ - Drop XP support
+ - Support horizontal mouse wheel scrolling
+
+* Bugs fixed:
+ 132197 Horizontal Scrolling Using Modifier Key and Scroll Wheel
+ 402168 Add underline-color and strikethrough-color to GtkTextTag properties
+ 671362 Fixes for GtkRadioMenuItem
+ 723394 const parameter to GtkPopover gtk_popover_set_pointing_to
+ 734741 GtkScale's fill-level starts at the very left if show-fill-level is set
+ 737175 most horizontal sliders are inverted when scrolled with mouse wheel
+ 741849 Add GdkScreen->is_composited() for GDK-Win32
+ 745721 wayland: Add support for gtk_window_set_modal
+ 746149 “Close tab” buttons change the tab high on hover when using HighContrast
+ 746188 [HighContrast] insensitive ModelButtons are not drawn insensitive
+ 746202 Provide a stronger focus indication for entries
+ 746301 Opening "Sound" panel generates pixman error
+ 746358 [HighContrast] insensitive active backdrop GtkSwitches should probably...
+ 746368 [HighContrast] the “selected color” mark is always black, even for black
+ 746369 [HighContrast] “no date selection” (white on white)
+ 746370 GtkExpander doesn't show it is expanded when using HighContrast theme
+ 746386 clipboard crash when other client becomes the selection owner
+ 746435 wayland: Use g_get_prgname as the xdg surface application id
+ 746468 gtkcairoblur is slow
+ 746493 [HighContrast] Labels’, RadioButtons’ and CheckButton’s texts are not...
+ 746586 crtical warnings in a11y if focus widget is destroyed
+ 746602 Invalid writes through dangling weak pointers in DND code cause crashes
+ 746668 Some legacy GL calls are still made by X11 backend
+ 746688 GtkProgressBar doesn't respect its style properties
+ 746706 Serious accessible event spewage from Gtk+ table cells
+ 746712 Range ignores the "inverted" property
+ 746746 gtk3-demo 'OpenGL Area' crashes on systems with old OpenGL version
+ 746784 GtkBooleanCellAccessible emits state-changed:checked signals instead...
+ 746817 GtkRadioButton keynav uses wrong succession
+ 746821 W32: Maximized window is obscured by the taskbar
+ 746862 popover clears shadow of underlying widgets
+ 746893 gtk_list_box_bind_model is not introspectable
+ 746904 make it possible to disable libcanberra
+ 746925 [HighContrast] Backdrop active (sensitive) GtkSwitch should look more...
+ 746961 new scroll bar "hides" after click+drag+release while mouse is still...
+ 747096 small cleanup in textbuffer clipoard handling
+ 747121 gtklabel.c: add note about set-markup property in gtk_set_markup()
+ 747133 overshoot animation is stopped on libinput-managed touchpads
+ 747288 [HighContrast] Insensitive backdrop ListBoxRow have an unnecessary border
+ 747305 x11/gl: Use after free in glx_pixmap_get()
+ 747406 Fix indicator proximity checks
+ 747407 Make indicators pop out when needed
+ 747469 CSD: can't open window menu using right click after moving window
+ 747471 [wayland] gdk_screen_get_monitor_geometry() returns invalid geometry
+ 747524 System tray icons fail to redraw correctly on Xfce (without display...
+ 747539 popover: Remove signal handlers in dispose
+ 747553 Popovers inside local plugs don't get size_allocate() called
+ 747560 Redefinition of typedef GtkCssNode
+ 747604 Fix build of gtk/inspector/css-node-tree.c
+ 747608 Scrollbar hiding / unhiding does not work with a stylus
+ 747689 [HighContrast] Selected ListBoxRow’s Label is white on white
+ 747805 Split Headerbar unmaximize
+ 747808 window: fix initial shadow width for maximized/fullscreen windows
+ 747827 firefox scrollbars broken
+ 748013 Adwaita: keyboard navigation outline on first/last button in dialog...
+ 748014 W32: Tilting mousewheel left/right does not scroll horizontally
+ 748061 GtkMessageDialog: Minor documentation update
+ 748156 Code cleanup after xp drop
+ 748341 GdkOffscreenWindow should not segfault on gdk_window_beep()
+ 748346 build: Avoid xgettext crash on MSYS2
+ 748500 GtkSearchEntry docs incorrectly link to themselves
+ 748509 FTBFS: ui/dialog6.ui is not present
+
+* Translation updates:
+ Arabic
+ Basque
+ Brazilian Portuguese
+ Breton
+ Bulgarian
+ Catalan
+ Czech
+ Danish
+ Dutch
+ German
+ Greek
+ Hebrew
+ Hungarian
+ Icelandic
+ Italian
+ Korean
+ Norwegian bokmål
+ Russian
+ Serbian
+ Slovenian
+ Swedish
+ Turkish
+ Ukrainian
+
+
 Overview of Changes in GTK+ 3.15.12
 ===================================

--- a/build/Makefile-newvs.am
+++ b/build/Makefile-newvs.am
@@ -9,29 +9,29 @@

 MSVC_FORMAT_VER=$(shell echo $$(expr $(MSVC_VER) + 1))

-$(MSVC_SLN).sln: $(top_srcdir)/build/win32/vs10/$(MSVC_SLN).sln create_vcxproj copy_filters create_props
-	cat $(top_srcdir)/build/win32/vs10/$(MSVC_SLN).sln | sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' | sed 's/2010/$(MSVC_VER_LONG)/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$(MSVC_SLN).sln
+$(MSVC_SLN).sln: $(top_srcdir)/build/win32/vs10/$(MSVC_SLN).sln
+	cat $< | sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' | sed 's/2010/$(MSVC_VER_LONG)/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@

 README.txt: $(top_srcdir)/build/win32/vs10/README.txt
-	cat $(top_srcdir)/build/win32/vs10/README.txt | sed 's/vs10/vs$(MSVC_VER)/g' | sed 's/VS10/VS$(MSVC_VER)/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/README.txt
+	cat $< | sed 's/vs10/vs$(MSVC_VER)/g' | sed 's/VS10/VS$(MSVC_VER)/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@

-create_vcxproj:
-	for F in `(cd $(top_builddir)/build/win32/vs10 && ls *.vcxproj)`; do \
-		case $$F in \
-			*)	cat $(top_builddir)/build/win32/vs10/$$F | sed 's/v100/v$(MSVC_VER)0/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$$F \
-			;; \
-		esac; \
-	done
-
-create_props:
-	for F in `(cd $(top_builddir)/build/win32/vs10 && ls *.props)`; do \
-		case $$F in \
-			*)	cat $(top_builddir)/build/win32/vs10/$$F | sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$$F \
-			;; \
-		esac; \
-	done
-
-copy_filters:
-	cp  $(top_srcdir)/build/win32/vs10/*.vcxproj.filters $(top_builddir)/build/win32/vs$(MSVC_VER)/
+%.vcxproj:
+	if test -e $(top_srcdir)/build/win32/vs10/$@; then \
+		sed 's/v100/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+	else \
+		sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+	fi

+%.props:
+	if test -e $(top_srcdir)/build/win32/vs10/$@; then \
+		sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+	else \
+		sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+	fi

+%.vcxproj.filters:
+	if test -e $(top_srcdir)/build/win32/vs10/$@; then \
+		cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+	else \
+		cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+	fi
--- a/build/win32/vs10/gdk.vcxprojin
+++ b/build/win32/vs10/gdk.vcxprojin
@@ -144,7 +144,7 @@
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
@@ -167,7 +167,7 @@
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
@@ -187,7 +187,7 @@
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
@@ -209,7 +209,7 @@
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
@@ -234,7 +234,7 @@
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
@@ -257,7 +257,7 @@
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
@@ -277,7 +277,7 @@
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
@@ -299,7 +299,7 @@
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
--- a/build/win32/vs10/gtk-gen-srcs.props
+++ b/build/win32/vs10/gtk-gen-srcs.props
@@ -65,6 +65,7 @@ $(PythonPath)\python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix
 cd $(SolutionDir)
    </GenerateGtkDbusBuiltSources>
    <GenerateGtkWin32RC>$(PythonPath)\python ..\process-in-win32.py --gtkwin32rc --gtk3manifest</GenerateGtkWin32RC>
+    <CopyDemosH>copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h</CopyDemosH>
  </PropertyGroup>
  <PropertyGroup>
    <_PropertySheetDisplayName>gtkgensrcsprops</_PropertySheetDisplayName>
@@ -85,5 +86,8 @@ cd $(SolutionDir)
    <BuildMacro Include="GenerateGtkWin32RC">
      <Value>$(GenerateGtkWin32RC)</Value>
    </BuildMacro>
+    <BuildMacro Include="CopyDemosH">
+      <Value>$(CopyDemosH)</Value>
+    </BuildMacro>
  </ItemGroup>
 </Project>
--- a/build/win32/vs10/gtk-install.props
+++ b/build/win32/vs10/gtk-install.props
@@ -292,7 +292,7 @@ copy ..\..\..\gtk\gtkseparatormenuitem.h $(CopyDir)\include\gtk-3.0\gtk\gtksepar
 copy ..\..\..\gtk\gtkseparatortoolitem.h $(CopyDir)\include\gtk-3.0\gtk\gtkseparatortoolitem.h
 copy ..\..\..\gtk\gtksettings.h $(CopyDir)\include\gtk-3.0\gtk\gtksettings.h
 copy ..\..\..\gtk\gtkshow.h $(CopyDir)\include\gtk-3.0\gtk\gtkshow.h
-copy ..\..\..\gtk\gtksidebar.h $(CopyDir)\include\gtk-3.0\gtk\gtksidebar.h
+copy ..\..\..\gtk\gtkstacksidebar.h $(CopyDir)\include\gtk-3.0\gtk\gtkstacksidebar.h
 copy ..\..\..\gtk\gtksizegroup.h $(CopyDir)\include\gtk-3.0\gtk\gtksizegroup.h
 copy ..\..\..\gtk\gtksizerequest.h $(CopyDir)\include\gtk-3.0\gtk\gtksizerequest.h
 copy ..\..\..\gtk\gtksocket.h $(CopyDir)\include\gtk-3.0\gtk\gtksocket.h
--- a/build/win32/vs10/gtk-prebuild.vcxproj
+++ b/build/win32/vs10/gtk-prebuild.vcxproj
@@ -209,6 +209,32 @@
      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GenGdkConfigHBroadway)</Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs)</Outputs>
    </CustomBuild>
+    <CustomBuild Include="..\..\..\demos\gtk-demo\demos.h.win32">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying demos.h from demos.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyDemosH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Copying demos.h from demos.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(CopyDemosH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying demos.h from demos.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyDemosH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Copying demos.h from demos.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(CopyDemosH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying demos.h from demos.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyDemosH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Copying demos.h from demos.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(CopyDemosH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying demos.h from demos.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyDemosH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Copying demos.h from demos.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(CopyDemosH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">..\..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
+    </CustomBuild>
  </ItemGroup>
  <ItemGroup>
  </ItemGroup>
--- a/build/win32/vs10/gtk3-demo.vcxproj
+++ b/build/win32/vs10/gtk3-demo.vcxproj
@@ -182,6 +182,7 @@
    <ClCompile Include="..\..\..\demos\gtk-demo\css_multiplebgs.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\css_pixbufs.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\css_shadows.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\cursors.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\dialog.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\drawingarea.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\editable_cells.c" />
--- a/build/win32/vs10/gtk3-demo.vcxproj.filters
+++ b/build/win32/vs10/gtk3-demo.vcxproj.filters
@@ -24,6 +24,7 @@
    <ClCompile Include="..\..\..\demos\gtk-demo\css_multiplebgs.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\css_pixbufs.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\css_shadows.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\cursors.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\dialog.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\drawingarea.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\editable_cells.c"><Filter>Source Files</Filter></ClCompile>
--- a/build/win32/vs9/gdk.vcprojin
+++ b/build/win32/vs9/gdk.vcprojin
@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="imm32.lib winmm.lib"
+				AdditionalDependencies="imm32.lib winmm.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -74,7 +74,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib"
+				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -104,7 +104,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="imm32.lib winmm.lib"
+				AdditionalDependencies="imm32.lib winmm.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -136,7 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib"
+				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -170,7 +170,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="imm32.lib winmm.lib"
+				AdditionalDependencies="imm32.lib winmm.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -202,7 +202,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib"
+				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -232,7 +232,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="imm32.lib winmm.lib"
+				AdditionalDependencies="imm32.lib winmm.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -264,7 +264,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib"
+				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
--- a/build/win32/vs9/gtk-gen-srcs.vsprops
+++ b/build/win32/vs9/gtk-gen-srcs.vsprops
@@ -66,4 +66,8 @@ cd $(SolutionDir)&#x0D;&#x0A;
 		Name="GenerateGtkWin32RC"
 		Value="$(PythonPath)\python ..\process-in-win32.py --gtkwin32rc --gtk3manifest"
 	/>
+	<UserMacro
+		Name="CopyDemosH"
+		Value="copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h"
+	/>
 </VisualStudioPropertySheet>
--- a/build/win32/vs9/gtk-install.vsprops
+++ b/build/win32/vs9/gtk-install.vsprops
@@ -288,7 +288,7 @@ copy ..\..\..\gtk\gtkseparatormenuitem.h $(CopyDir)\include\gtk-3.0\gtk\gtksepar
 copy ..\..\..\gtk\gtkseparatortoolitem.h $(CopyDir)\include\gtk-3.0\gtk\gtkseparatortoolitem.h&#x0D;&#x0A;
 copy ..\..\..\gtk\gtksettings.h $(CopyDir)\include\gtk-3.0\gtk\gtksettings.h&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkshow.h $(CopyDir)\include\gtk-3.0\gtk\gtkshow.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksidebar.h $(CopyDir)\include\gtk-3.0\gtk\gtksidebar.h&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstacksidebar.h $(CopyDir)\include\gtk-3.0\gtk\gtkstacksidebar.h&#x0D;&#x0A;
 copy ..\..\..\gtk\gtksizegroup.h $(CopyDir)\include\gtk-3.0\gtk\gtksizegroup.h&#x0D;&#x0A;
 copy ..\..\..\gtk\gtksizerequest.h $(CopyDir)\include\gtk-3.0\gtk\gtksizerequest.h&#x0D;&#x0A;
 copy ..\..\..\gtk\gtksocket.h $(CopyDir)\include\gtk-3.0\gtk\gtksocket.h&#x0D;&#x0A;
--- a/build/win32/vs9/gtk-prebuild.vcproj
+++ b/build/win32/vs9/gtk-prebuild.vcproj
@@ -217,6 +217,64 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File RelativePath="..\..\..\demos\gtk-demo\demos.h.win32">
+				<FileConfiguration Name="Debug|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Copying demos.h from demos.h.win32..."
+						CommandLine="$(CopyDemosH)"
+						Outputs="..\..\..\demos\gtk-demo\demos.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_Broadway|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Copying demos.h from demos.h.win32..."
+						CommandLine="$(CopyDemosH)"
+						Outputs="..\..\..\demos\gtk-demo\demos.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Copying demos.h from demos.h.win32..."
+						CommandLine="$(CopyDemosH)"
+						Outputs="..\..\..\demos\gtk-demo\demos.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_Broadway|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Copying demos.h from demos.h.win32..."
+						CommandLine="$(CopyDemosH)"
+						Outputs="..\..\..\demos\gtk-demo\demos.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Copying demos.h from demos.h.win32..."
+						CommandLine="$(CopyDemosH)"
+						Outputs="..\..\..\demos\gtk-demo\demos.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_Broadway|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Copying demos.h from demos.h.win32..."
+						CommandLine="$(CopyDemosH)"
+						Outputs="..\..\..\demos\gtk-demo\demos.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Copying demos.h from demos.h.win32..."
+						CommandLine="$(CopyDemosH)"
+						Outputs="..\..\..\demos\gtk-demo\demos.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_Broadway|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Copying demos.h from demos.h.win32..."
+						CommandLine="$(CopyDemosH)"
+						Outputs="..\..\..\demos\gtk-demo\demos.h"
+					/>
+				</FileConfiguration>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
--- a/build/win32/vs9/gtk3-demo.vcproj
+++ b/build/win32/vs9/gtk3-demo.vcproj
@@ -173,6 +173,7 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\css_multiplebgs.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\css_pixbufs.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\css_shadows.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\cursors.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\dialog.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\drawingarea.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\editable_cells.c" />
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@

 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [17])
-m4_define([gtk_micro_version], [0])
+m4_define([gtk_micro_version], [4])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
          [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -42,7 +42,7 @@ m4_define([gtk_binary_version], [3.0.0])

 # required versions of other packages
 m4_define([glib_required_version], [2.43.4])
-m4_define([pango_required_version], [1.36.7])
+m4_define([pango_required_version], [1.37.1])
 m4_define([atk_required_version], [2.15.1])
 m4_define([cairo_required_version], [1.14.0])
 m4_define([gdk_pixbuf_required_version], [2.30.0])
@@ -348,8 +348,7 @@ backend_immodules=
 have_gio_unix=no
 GDK_BACKENDS=
 GDK_EXTRA_LIBS=
-# expoxy.pc has Cflags: -I${includedir}, but pkg-config swallows that :-(
-GDK_EXTRA_CFLAGS="-I${prefix}/include"
+GDK_EXTRA_CFLAGS=
 GDK_WINDOWING=
 PANGO_PACKAGES="pango pangocairo"

@@ -359,9 +358,6 @@ if test "$enable_x11_backend" = "yes"; then
  # backend names are identical.
  cairo_backends="$cairo_backends cairo-xlib"
  GDK_BACKENDS="$GDK_BACKENDS x11"
-  # Pull in gio-unix for GDesktopAppInfo usage, see at least
-  # gdkapplaunchcontext-x11.c
-  have_gio_unix=yes
  backend_immodules="$backend_immodules,xim"
  GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_X11"
@@ -375,7 +371,7 @@ if test "$enable_win32_backend" = "yes"; then
  backend_immodules="$backend_immodules,ime"
  GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WIN32"
-  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm"
+  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm -ldwmapi"
  AM_CONDITIONAL(USE_WIN32, true)
  PANGO_PACKAGES="pangowin32 pangocairo"
 else
@@ -395,9 +391,6 @@ if test "x$enable_quartz_backend" = xyes; then
  if test "x$quartz_relocation" = xyes; then
    AC_DEFINE([QUARTZ_RELOCATION], [1], [Use NSBundle functions to determine load paths for libraries, translations, etc.])
  fi
-  # Pull in gio-unix for GDesktopAppInfo usage, see at least
-  # gdkapplaunchcontext-x11.c
-  have_gio_unix=yes
 else
  AM_CONDITIONAL(USE_QUARTZ, false)
 fi
@@ -412,9 +405,6 @@ if test "x$enable_broadway_backend" = xyes; then
  GDK_BACKENDS="$GDK_BACKENDS broadway"
  cairo_backends="$cairo_backends cairo"
  backend_immodules="$backend_immodules,broadway"
-  if test "$os_win32" != "yes"; then
-    have_gio_unix=yes
-  fi
  GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_BROADWAY"
  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lz"
@@ -442,7 +432,6 @@ if test "$enable_wayland_backend" = "yes"; then
  # For the cairo image backend
  cairo_backends="$cairo_backends cairo"
  GDK_BACKENDS="$GDK_BACKENDS wayland"
-  have_gio_unix=yes
  GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WAYLAND"
  WAYLAND_PACKAGES="$WAYLAND_DEPENDENCIES"
@@ -575,6 +564,21 @@ PKG_CHECK_MODULES(BASE_DEPENDENCIES,

 PKG_CHECK_MODULES(CAIRO_BACKEND, [$cairo_backends])

+# Remove this check once cairo_required_version reaches at least 1.14.4
+case $host_os in
+  mingw*)
+    PKG_CHECK_MODULES(CAIRO, [cairo >= cairo_required_version])
+    AC_CHECK_LIB([cairo], [cairo_win32_surface_create_with_format],
+      [AC_MSG_RESULT([found])],
+      [AC_MSG_ERROR(
+[cairo_win32_surface_create_with_format is not found in cairo library
+You need cairo version newer than 2015-04-14])])
+    ;;
+  *)
+    ;;
+esac
+
+
 PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])

 dnl ******************************************************
@@ -667,7 +671,7 @@ ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
 AM_GLIB_GNU_GETTEXT

 AC_MSG_CHECKING([whether xgettext supports ui files])
-if $ac_cv_path_XGETTEXT --output=- --language=Glade $srcdir/gtk/ui/gtkfilechooserwidget.ui > /dev/null 2>&1; then
+if $ac_cv_path_XGETTEXT --output=- --color=no --language=Glade $srcdir/gtk/ui/gtkfilechooserwidget.ui > /dev/null 2>&1; then
  AC_MSG_RESULT([yes])
 else
  AC_MSG_RESULT([no])
@@ -1180,6 +1184,9 @@ if test "x$enable_x11_backend" = xyes; then
    if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
      AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])

+      if $PKG_CONFIG --exists "xrandr >= 1.5.0" ; then
+        AC_DEFINE(HAVE_RANDR15, 1, [Have the Xrandr 1.5 extension library])
+      fi
      X_PACKAGES="$X_PACKAGES xrandr"
      X_EXTENSIONS="$X_EXTENSIONS XRANDR"
    elif test x"$enable_xrandr" = xyes; then
@@ -1258,6 +1265,11 @@ else
 fi

 # Check for gio-unix
+if test "$os_win32" != "yes"; then
+  # Pull in gio-unix for gtk-launch usage, see at least
+  # gtk-launch.c
+  have_gio_unix=yes
+fi
 if test "$have_gio_unix" = "yes"; then
  GDK_GIO_PACKAGE="gio-unix-2.0 >= glib_required_version"
  AC_DEFINE([HAVE_GIO_UNIX], [1],
@@ -1726,7 +1738,7 @@ if test "$enable_man" != no; then
  dnl check for DocBook XSL stylesheets in the local catalog
  JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
     [DocBook XSL Stylesheets], [have_docbook_style=yes],[have_docbook_style=no])
-  if test "$have_docbook_dtd" != yes; then
+  if test "$have_docbook_style" != yes; then
    if test "$enable_man" = yes ; then
      AC_MSG_ERROR([DocBook XSL Stylesheets are required for --enable-man])
    fi
@@ -1896,6 +1908,7 @@ testsuite/css/parser/Makefile
 testsuite/gdk/Makefile
 testsuite/gtk/Makefile
 testsuite/reftests/Makefile
+testsuite/tools/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/gdk/Makefile
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl

 ## These should be in the order you want them to appear in the
 ## demo app, which means alphabetized by demo title, not filename
-demos =						\
+demos_base =					\
 	application.c				\
 	assistant.c				\
 	builder.c				\
@@ -17,6 +17,7 @@ demos =						\
 	css_multiplebgs.c			\
 	css_pixbufs.c				\
 	css_shadows.c				\
+	cursors.c				\
 	dialog.c				\
 	drawingarea.c				\
 	editable_cells.c			\
@@ -24,6 +25,7 @@ demos =						\
 	entry_completion.c			\
 	event_axes.c				\
 	expander.c  				\
+	font_features.c				\
 	gestures.c				\
 	glarea.c				\
 	headerbar.c				\
@@ -51,8 +53,10 @@ demos =						\
 	search_entry2.c				\
 	sidebar.c				\
 	sizegroup.c				\
+	spinbutton.c				\
 	spinner.c				\
 	stack.c					\
+	textmask.c				\
 	textview.c				\
 	textscroll.c				\
 	theming_style_classes.c			\
@@ -60,6 +64,12 @@ demos =						\
 	transparent.c				\
 	tree_store.c

+if OS_UNIX
+demos = $(demos_base) pagesetup.c
+else
+demos = $(demos_base)
+endif
+
 AM_CPPFLAGS = \
 	-I$(top_srcdir) 			\
 	-I$(top_builddir)/gdk			\
@@ -89,8 +99,9 @@ EXTRA_DIST += 				\
 	data/source.svg			\
 	data/symbolic-source.svg	\
 	demo.gresource.xml		\
-	$(RESOURCES)			\
-	org.gtk.Demo.gschema.xml
+	$(resource_files)		\
+	org.gtk.Demo.gschema.xml	\
+	demos.h.win32

 gsettings_SCHEMAS = \
 	org.gtk.Demo.gschema.xml
@@ -100,11 +111,15 @@ gsettings_SCHEMAS = \
 demos.h: $(demos) geninclude.pl
 	 $(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h

+demos.h.win32: $(demos_base) geninclude.pl
+	 $(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos_base)) > demos.h.win32
+
+nodist_gtk3_demo_SOURCES = demos.h
+
 gtk3_demo_SOURCES = 		\
 	$(demos)		\
 	demo_resources.c	\
-	main.c			\
-	demos.h
+	main.c

 gtk3_demo_DEPENDENCIES = $(DEPS)
 gtk3_demo_LDADD = $(LDADDS)
@@ -116,45 +131,10 @@ gtk3_demo_application_SOURCES = \

 gtk3_demo_application_LDADD = $(LDADDS)

-demo_resources.c: demo.gresource.xml $(RESOURCES)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/demo.gresource.xml
+resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/demo.gresource.xml)

-RESOURCES =				\
-	$(demos)			\
-	main.ui				\
-	application.ui			\
-	demo.ui				\
-	menus.ui			\
-	stack.ui			\
-	revealer.ui			\
-	theming.ui			\
-	listbox.ui			\
-	popover.ui			\
-	alphatest.png			\
-	apple-red.png			\
-	brick.png			\
-	brick2.png			\
-	background.jpg			\
-	floppybuddy.gif			\
-	glarea-fragment.glsl		\
-	glarea-vertex.glsl		\
-	gnome-applets.png		\
-	gnome-calendar.png		\
-	gnome-foot.png			\
-	gnome-fs-directory.png		\
-	gnome-fs-regular.png		\
-	gnome-gimp.png			\
-	gnome-gmush.png			\
-	gnome-gsame.png			\
-	gnu-keys.png			\
-	messages.txt			\
-	css_accordion.css		\
-	css_basics.css			\
-	css_multiplebgs.css		\
-	css_pixbufs.css			\
-	css_shadows.css			\
-	cssview.css			\
-	reset.css
+demo_resources.c: demo.gresource.xml $(resource_files)
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/demo.gresource.xml

 iconthemedir = $(datadir)/icons/hicolor

@@ -173,7 +153,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.sy
 dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png
 dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png

-update_icon_cache = gtk-update-icon-cache --ignore-theme-index --force
+update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache --ignore-theme-index --force

 install-data-hook: install-update-icon-cache
 uninstall-hook: uninstall-update-icon-cache
@@ -186,6 +166,6 @@ uninstall-update-icon-cache:
 	$(AM_V_at)$(POST_UNINSTALL)
 	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"

-DISTCLEANFILES = demos.h
+DISTCLEANFILES = demos.h demos.h.win32

 -include $(top_srcdir)/git.mk
--- a/demos/gtk-demo/alias_cursor.png
+++ b/demos/gtk-demo/alias_cursor.png
--- a/demos/gtk-demo/all_scroll_cursor.png
+++ b/demos/gtk-demo/all_scroll_cursor.png
--- a/demos/gtk-demo/assistant.c
+++ b/demos/gtk-demo/assistant.c
@@ -168,7 +168,7 @@ do_assistant (GtkWidget *do_widget)
    {
      assistant = gtk_assistant_new ();

-         gtk_window_set_default_size (GTK_WINDOW (assistant), -1, 300);
+      gtk_window_set_default_size (GTK_WINDOW (assistant), -1, 300);

      gtk_window_set_screen (GTK_WINDOW (assistant),
                             gtk_widget_get_screen (do_widget));
--- a/demos/gtk-demo/builder.c
+++ b/demos/gtk-demo/builder.c
@@ -2,52 +2,63 @@
 *
 * Demonstrates an interface loaded from a XML description.
 */
-#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>

-static GtkBuilder *builder;
-
-G_MODULE_EXPORT void
-quit_activate (GtkAction *action)
+static void
+quit_activate (GSimpleAction *action,
+               GVariant      *parameter,
+               gpointer       user_data)
 {
-  GtkWidget *window;
+  GtkWidget *window = user_data;

-  window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
  gtk_widget_destroy (window);
 }

-G_MODULE_EXPORT void
-about_activate (GtkAction *action)
+static void
+about_activate (GSimpleAction *action,
+                GVariant      *parameter,
+                gpointer       user_data)
 {
+  GtkWidget *window = user_data;
+  GtkBuilder *builder;
  GtkWidget *about_dlg;

+  builder = g_object_get_data (G_OBJECT (window), "builder");
  about_dlg = GTK_WIDGET (gtk_builder_get_object (builder, "aboutdialog1"));
  gtk_dialog_run (GTK_DIALOG (about_dlg));
  gtk_widget_hide (about_dlg);
 }

-G_MODULE_EXPORT void
-help_activate (GtkAction *action)
+static void
+help_activate (GSimpleAction *action,
+               GVariant      *parameter,
+               gpointer       user_data)
 {
  g_print ("Help not available\n");
 }

+static GActionEntry win_entries[] = {
+  { "quit", quit_activate, NULL, NULL, NULL },
+  { "about", about_activate, NULL, NULL, NULL },
+  { "help", help_activate, NULL, NULL, NULL }
+};
+
 GtkWidget *
 do_builder (GtkWidget *do_widget)
 {
  static GtkWidget *window = NULL;
-  GError *err = NULL;
  GtkWidget *toolbar;
+  GActionGroup *actions;
+  GtkAccelGroup *accel_group;
+  GtkWidget *item;

  if (!window)
    {
-      builder = gtk_builder_new ();
-      gtk_builder_add_from_resource (builder, "/builder/demo.ui", &err);
-      if (err)
-        {
-          g_error ("ERROR: %s\n", err->message);
-          return NULL;
-        }
+      GtkBuilder *builder;
+
+      builder = gtk_builder_new_from_resource ("/builder/demo.ui");
+
      gtk_builder_connect_signals (builder, NULL);
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
      gtk_window_set_screen (GTK_WINDOW (window),
@@ -57,18 +68,57 @@ do_builder (GtkWidget *do_widget)
      toolbar = GTK_WIDGET (gtk_builder_get_object (builder, "toolbar1"));
      gtk_style_context_add_class (gtk_widget_get_style_context (toolbar),
                                   "primary-toolbar");
+      actions = (GActionGroup*)g_simple_action_group_new ();
+      g_action_map_add_action_entries (G_ACTION_MAP (actions),
+                                       win_entries, G_N_ELEMENTS (win_entries),
+                                       window);
+      gtk_widget_insert_action_group (window, "win", actions);
+      accel_group = gtk_accel_group_new ();
+      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "new_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_n, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "open_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_o, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "save_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_s, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "quit_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_q, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "copy_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_c, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "cut_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_x, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "paste_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_v, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "help_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_F1, 0, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "about_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_F7, 0, GTK_ACCEL_VISIBLE);
+
+      g_object_set_data_full (G_OBJECT(window), "builder", builder, g_object_unref);
    }

  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
+    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/button_box.c
+++ b/demos/gtk-demo/button_box.c
@@ -129,14 +129,9 @@ do_button_box (GtkWidget *do_widget)
  }

  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
+    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/cell_cursor.png
+++ b/demos/gtk-demo/cell_cursor.png
--- a/demos/gtk-demo/changedisplay.c
+++ b/demos/gtk-demo/changedisplay.c
@@ -2,7 +2,7 @@
 *
 * Demonstrates migrating a window between different displays.
 * A display is a mouse and keyboard with some number of
- * associated monitors. The neat thing about having multiple 
+ * associated monitors. The neat thing about having multiple
 * displays is that they can be on a completely separate
 * computers, as long as there is a network connection to the
 * computer where the application is running.
@@ -26,9 +26,6 @@
 *  - Using GtkDialog
 */
 #include <string.h>
-
-#undef GDK_DISABLE_DEPRECATED
-
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

@@ -245,7 +242,7 @@ open_display_cb (GtkWidget         *button,
          if (!result)
            {
              gchar *error_msg =
-                g_strdup_printf  ("Can't open display :\n\t%s\nplease try another one\n",
+                g_strdup_printf  ("Can't open display:\n\t%s\nplease try another one\n",
                                  new_screen_name);
              gtk_label_set_text (GTK_LABEL (dialog_label), error_msg);
              g_free (error_msg);
@@ -526,12 +523,12 @@ do_changedisplay (GtkWidget *do_widget)

      info = g_new0 (ChangeDisplayInfo, 1);

-      info->window = gtk_dialog_new_with_buttons ("Change Screen or display",
-                                            GTK_WINDOW (do_widget),
-                                            0,
-                                            _("_Close"),  GTK_RESPONSE_CLOSE,
-                                            "Change",         GTK_RESPONSE_OK,
-                                            NULL);
+      info->window = gtk_dialog_new_with_buttons ("Change Display",
+                                                  GTK_WINDOW (do_widget),
+                                                  0,
+                                                  "Close", GTK_RESPONSE_CLOSE,
+                                                  "Change", GTK_RESPONSE_OK,
+                                                  NULL);

      gtk_window_set_default_size (GTK_WINDOW (info->window), 300, 400);

--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -13,8 +13,6 @@
 #include <gtk/gtk.h>
 #include <string.h>

-static GtkWidget *window = NULL;
-
 void
 copy_button_clicked (GtkWidget *button,
                     gpointer   user_data)
@@ -107,12 +105,12 @@ drag_begin (GtkWidget      *widget,
 }

 void
-drag_data_get  (GtkWidget        *widget,
-                GdkDragContext   *context,
-                GtkSelectionData *selection_data,
-                guint             info,
-                guint             time,
-                gpointer          data)
+drag_data_get (GtkWidget        *widget,
+               GdkDragContext   *context,
+               GtkSelectionData *selection_data,
+               guint             info,
+               guint             time,
+               gpointer          data)
 {
  GdkPixbuf *pixbuf;

@@ -202,6 +200,8 @@ button_press (GtkWidget      *widget,
 GtkWidget *
 do_clipboard (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
+
  if (!window)
    {
      GtkWidget *vbox, *hbox;
@@ -213,7 +213,7 @@ do_clipboard (GtkWidget *do_widget)
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
                             gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Clipboard demo");
+      gtk_window_set_title (GTK_WINDOW (window), "Clipboard");

      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);
@@ -325,10 +325,7 @@ do_clipboard (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/col_resize_cursor.png
+++ b/demos/gtk-demo/col_resize_cursor.png
--- a/demos/gtk-demo/colorsel.c
+++ b/demos/gtk-demo/colorsel.c
@@ -32,9 +32,7 @@ response_cb (GtkDialog *dialog,
             gpointer   user_data)
 {
  if (response_id == GTK_RESPONSE_OK)
-    {
-      gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (dialog), &color);
-    }
+    gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (dialog), &color);

  gtk_widget_destroy (GTK_WIDGET (dialog));
 }
@@ -49,10 +47,8 @@ change_color_callback (GtkWidget *button,
  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog), &color);

-  g_signal_connect (dialog,
-                    "response",
-                    G_CALLBACK (response_cb),
-                    NULL);
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (response_cb), NULL);

  gtk_widget_show_all (dialog);
 }
@@ -88,7 +84,6 @@ do_colorsel (GtkWidget *do_widget)
       * Create the color swatch area
       */

-
      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
@@ -113,14 +108,9 @@ do_colorsel (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
+    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/combobox.c
+++ b/demos/gtk-demo/combobox.c
@@ -318,11 +318,10 @@ do_combobox (GtkWidget *do_widget)
    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
    gtk_window_set_screen (GTK_WINDOW (window),
                           gtk_widget_get_screen (do_widget));
-    gtk_window_set_title (GTK_WINDOW (window), "Combo boxes");
+    gtk_window_set_title (GTK_WINDOW (window), "Combo Boxes");

    g_signal_connect (window, "destroy",
-                      G_CALLBACK (gtk_widget_destroyed),
-                      &window);
+                      G_CALLBACK (gtk_widget_destroyed), &window);

    gtk_container_set_border_width (GTK_CONTAINER (window), 10);

@@ -400,8 +399,7 @@ do_combobox (GtkWidget *do_widget)
    gtk_tree_path_free (path);
    gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &iter);

-    /* A GtkComboBoxEntry with validation.
-     */
+    /* A GtkComboBoxEntry with validation */
    frame = gtk_frame_new ("Editable");
    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);

@@ -441,14 +439,9 @@ do_combobox (GtkWidget *do_widget)
  }

  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
+    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/copy_cursor.png
+++ b/demos/gtk-demo/copy_cursor.png
--- a/demos/gtk-demo/crosshair_cursor.png
+++ b/demos/gtk-demo/crosshair_cursor.png
--- a/demos/gtk-demo/css_accordion.c
+++ b/demos/gtk-demo/css_accordion.c
@@ -6,8 +6,6 @@

 #include <gtk/gtk.h>

-static GtkWidget *window = NULL;
-
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
@@ -19,20 +17,20 @@ apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 GtkWidget *
 do_css_accordion (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
+
  if (!window)
    {
      GtkWidget *container, *child;
      GtkStyleProvider *provider;
-      GBytes *bytes;
-      gsize data_size;
-      const guint8 *data;

      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_title (GTK_WINDOW (window), "CSS Accordion");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 600, 300);
      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);
-      
+
      container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
      gtk_widget_set_halign (container, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (container, GTK_ALIGN_CENTER);
@@ -57,11 +55,7 @@ do_css_accordion (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (container), child);

      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
-      bytes = g_resources_lookup_data ("/css_accordion/css_accordion.css", 0, NULL);
-      data = g_bytes_get_data (bytes, &data_size);
-
-      gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (provider), (gchar *)data, data_size, NULL);
-      g_bytes_unref (bytes);
+      gtk_css_provider_load_from_resource (GTK_CSS_PROVIDER (provider), "/css_accordion/css_accordion.css");

      apply_css (window, provider);
    }
@@ -69,10 +63,7 @@ do_css_accordion (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/css_basics.c
+++ b/demos/gtk-demo/css_basics.c
@@ -7,8 +7,6 @@

 #include <gtk/gtk.h>

-static GtkWidget *window = NULL;
-
 static void
 show_parsing_error (GtkCssProvider *provider,
                    GtkCssSection  *section,
@@ -34,7 +32,7 @@ show_parsing_error (GtkCssProvider *provider,

  gtk_text_buffer_apply_tag_by_name (buffer, tag_name, &start, &end);
 }
-                    
+
 static void
 css_text_changed (GtkTextBuffer  *buffer,
                  GtkCssProvider *provider)
@@ -64,14 +62,17 @@ apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 GtkWidget *
 do_css_basics (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
+
  if (!window)
    {
      GtkWidget *container, *child;
      GtkStyleProvider *provider;
      GtkTextBuffer *text;
      GBytes *bytes;
-      
+
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_title (GTK_WINDOW (window), "CSS Basics");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
      g_signal_connect (window, "destroy",
@@ -88,15 +89,13 @@ do_css_basics (GtkWidget *do_widget)
                                  NULL);

      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
-      
+
      container = gtk_scrolled_window_new (NULL, NULL);
      gtk_container_add (GTK_CONTAINER (window), container);
      child = gtk_text_view_new_with_buffer (text);
      gtk_container_add (GTK_CONTAINER (container), child);
-      g_signal_connect (text,
-                        "changed",
-                        G_CALLBACK (css_text_changed),
-                        provider);
+      g_signal_connect (text, "changed",
+                        G_CALLBACK (css_text_changed), provider);

      bytes = g_resources_lookup_data ("/css_basics/css_basics.css", 0, NULL);
      gtk_text_buffer_set_text (text, g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes));
@@ -113,10 +112,7 @@ do_css_basics (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/css_multiplebgs.c
+++ b/demos/gtk-demo/css_multiplebgs.c
@@ -7,8 +7,6 @@

 #include <gtk/gtk.h>

-static GtkWidget *window = NULL;
-
 static void
 show_parsing_error (GtkCssProvider *provider,
                    GtkCssSection  *section,
@@ -34,7 +32,7 @@ show_parsing_error (GtkCssProvider *provider,

  gtk_text_buffer_apply_tag_by_name (buffer, tag_name, &start, &end);
 }
-                    
+
 static void
 css_text_changed (GtkTextBuffer  *buffer,
                  GtkCssProvider *provider)
@@ -82,6 +80,8 @@ apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 GtkWidget *
 do_css_multiplebgs (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
+
  if (!window)
    {
      GtkWidget *paned, *container, *child;
@@ -90,6 +90,7 @@ do_css_multiplebgs (GtkWidget *do_widget)
      GBytes *bytes;

      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_title (GTK_WINDOW (window), "Multiple Backgrounds");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
      g_signal_connect (window, "destroy",
@@ -162,10 +163,7 @@ do_css_multiplebgs (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/css_pixbufs.c
+++ b/demos/gtk-demo/css_pixbufs.c
@@ -6,8 +6,6 @@

 #include <gtk/gtk.h>

-static GtkWidget *window = NULL;
-
 static void
 show_parsing_error (GtkCssProvider *provider,
                    GtkCssSection  *section,
@@ -33,7 +31,7 @@ show_parsing_error (GtkCssProvider *provider,

  gtk_text_buffer_apply_tag_by_name (buffer, tag_name, &start, &end);
 }
-                    
+
 static void
 css_text_changed (GtkTextBuffer  *buffer,
                  GtkCssProvider *provider)
@@ -63,14 +61,17 @@ apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 GtkWidget *
 do_css_pixbufs (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
+
  if (!window)
    {
      GtkWidget *paned, *container, *child;
      GtkStyleProvider *provider;
      GtkTextBuffer *text;
      GBytes *bytes;
-      
+
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_title (GTK_WINDOW (window), "Animated Backgrounds");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
      g_signal_connect (window, "destroy",
@@ -94,15 +95,13 @@ do_css_pixbufs (GtkWidget *do_widget)
                                  NULL);

      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
-      
+
      container = gtk_scrolled_window_new (NULL, NULL);
      gtk_container_add (GTK_CONTAINER (paned), container);
      child = gtk_text_view_new_with_buffer (text);
      gtk_container_add (GTK_CONTAINER (container), child);
-      g_signal_connect (text,
-                        "changed",
-                        G_CALLBACK (css_text_changed),
-                        provider);
+      g_signal_connect (text, "changed",
+                        G_CALLBACK (css_text_changed), provider);

      bytes = g_resources_lookup_data ("/css_pixbufs/gtk.css", 0, NULL);
      gtk_text_buffer_set_text (text, g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes));
@@ -119,10 +118,7 @@ do_css_pixbufs (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/css_shadows.c
+++ b/demos/gtk-demo/css_shadows.c
@@ -5,8 +5,6 @@

 #include <gtk/gtk.h>

-static GtkWidget *window = NULL;
-
 static void
 show_parsing_error (GtkCssProvider *provider,
                    GtkCssSection  *section,
@@ -32,7 +30,7 @@ show_parsing_error (GtkCssProvider *provider,

  gtk_text_buffer_apply_tag_by_name (buffer, tag_name, &start, &end);
 }
-                    
+
 static void
 css_text_changed (GtkTextBuffer  *buffer,
                  GtkCssProvider *provider)
@@ -86,14 +84,17 @@ create_toolbar (void)
 GtkWidget *
 do_css_shadows (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
+
  if (!window)
    {
      GtkWidget *paned, *container, *child;
      GtkStyleProvider *provider;
      GtkTextBuffer *text;
      GBytes *bytes;
-      
+
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_title (GTK_WINDOW (window), "Shadows");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
      g_signal_connect (window, "destroy",
@@ -116,15 +117,13 @@ do_css_shadows (GtkWidget *do_widget)
                                  NULL);

      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
-      
+
      container = gtk_scrolled_window_new (NULL, NULL);
      gtk_container_add (GTK_CONTAINER (paned), container);
      child = gtk_text_view_new_with_buffer (text);
      gtk_container_add (GTK_CONTAINER (container), child);
-      g_signal_connect (text,
-                        "changed",
-                        G_CALLBACK (css_text_changed),
-                        provider);
+      g_signal_connect (text, "changed",
+                        G_CALLBACK (css_text_changed), provider);

      bytes = g_resources_lookup_data ("/css_shadows/gtk.css", 0, NULL);
      gtk_text_buffer_set_text (text, g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes));
@@ -141,10 +140,7 @@ do_css_shadows (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/cursors.c
+++ b/demos/gtk-demo/cursors.c
@@ -0,0 +1,161 @@
+/* Cursors
+ *
+ * Demonstrates a useful set of available cursors.
+ */
+#include <gtk/gtk.h>
+
+static void
+set_cursor (GtkWidget *button, gpointer data)
+{
+  GtkWidget *toplevel;
+  GdkCursor *cursor = data;
+  GdkWindow *window;
+
+  toplevel = gtk_widget_get_toplevel (button);
+  window = gtk_widget_get_window (toplevel);
+  gdk_window_set_cursor (window, cursor);
+}
+
+static GtkWidget *
+add_section (GtkWidget   *box,
+             const gchar *heading)
+{
+  GtkWidget *label;
+  GtkWidget *section;
+
+  label = gtk_label_new (heading);
+  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+  gtk_widget_set_margin_top (label, 10);
+  gtk_widget_set_margin_bottom (label, 10);
+  gtk_box_pack_start (GTK_BOX (box), label, FALSE, TRUE, 0);
+  section = gtk_flow_box_new ();
+  gtk_widget_set_halign (section, GTK_ALIGN_START);
+  gtk_flow_box_set_selection_mode (GTK_FLOW_BOX (section), GTK_SELECTION_NONE);
+  gtk_flow_box_set_min_children_per_line (GTK_FLOW_BOX (section), 2);
+  gtk_flow_box_set_max_children_per_line (GTK_FLOW_BOX (section), 20);
+  gtk_box_pack_start (GTK_BOX (box), section, FALSE, TRUE, 0);
+
+  return section;
+}
+
+static void
+add_button (GtkWidget   *section,
+            const gchar *css_name)
+{
+  GtkWidget *image, *button;
+  GdkDisplay *display;
+  GdkCursor *cursor;
+
+  display = gtk_widget_get_display (section);
+  cursor = gdk_cursor_new_from_name (display, css_name);
+  if (cursor == NULL)
+    image = gtk_image_new_from_icon_name ("image-missing", GTK_ICON_SIZE_MENU);
+  else
+    {
+      gchar *path;
+
+      path = g_strdup_printf ("/cursors/%s_cursor.png", css_name);
+      g_strdelimit (path, "-", '_');
+      image = gtk_image_new_from_resource (path);
+      g_free (path);
+    }
+  gtk_widget_set_size_request (image, 32, 32);
+  button = gtk_button_new ();
+  gtk_container_add (GTK_CONTAINER (button), image);
+  gtk_style_context_add_class (gtk_widget_get_style_context (button), "image-button");
+  g_signal_connect (button, "clicked", G_CALLBACK (set_cursor), cursor);
+
+  gtk_widget_set_tooltip_text (button, css_name);
+  gtk_container_add (GTK_CONTAINER (section), button);
+}
+
+GtkWidget *
+do_cursors (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+
+  if (!window)
+    {
+      GtkWidget *sw;
+      GtkWidget *box;
+      GtkWidget *section;
+
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "Cursors");
+      gtk_window_set_default_size (GTK_WINDOW (window), 500, 500);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed),
+                        &window);
+
+      sw = gtk_scrolled_window_new (NULL, NULL);
+      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+                                      GTK_POLICY_NEVER,
+                                      GTK_POLICY_AUTOMATIC);
+      gtk_container_add (GTK_CONTAINER (window), sw);
+      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      g_object_set (box,
+                    "margin-start", 20,
+                    "margin-end", 20,
+                    "margin-bottom", 10,
+                    NULL);
+      gtk_container_add (GTK_CONTAINER (sw), box);
+
+      section = add_section (box, "General");
+      add_button (section, "default");
+      add_button (section, "none");
+
+      section = add_section (box, "Link & Status");
+      add_button (section, "context-menu");
+      add_button (section, "help");
+      add_button (section, "pointer");
+      add_button (section, "progress");
+      add_button (section, "wait");
+
+      section = add_section (box, "Selection");
+      add_button (section, "cell");
+      add_button (section, "crosshair");
+      add_button (section, "text");
+      add_button (section, "vertical-text");
+
+      section = add_section (box, "Drag & Drop");
+      add_button (section, "alias");
+      add_button (section, "copy");
+      add_button (section, "move");
+      add_button (section, "no-drop");
+      add_button (section, "not-allowed");
+      add_button (section, "grab");
+      add_button (section, "grabbing");
+
+      section = add_section (box, "Resize & Scrolling");
+      add_button (section, "all-scroll");
+      add_button (section, "col-resize");
+      add_button (section, "row-resize");
+      add_button (section, "n-resize");
+      add_button (section, "e-resize");
+      add_button (section, "s-resize");
+      add_button (section, "w-resize");
+      add_button (section, "ne-resize");
+      add_button (section, "nw-resize");
+      add_button (section, "se-resize");
+      add_button (section, "sw-resize");
+      add_button (section, "ew-resize");
+      add_button (section, "ns-resize");
+      add_button (section, "nesw-resize");
+      add_button (section, "nwse-resize");
+
+      section = add_section (box, "Zoom");
+      add_button (section, "zoom-in");
+      add_button (section, "zoom-out");
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show_all (window);
+  else
+    gtk_widget_destroy (window);
+
+
+  return window;
+}
--- a/demos/gtk-demo/default_cursor.png
+++ b/demos/gtk-demo/default_cursor.png
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -47,6 +47,43 @@
    <file>cssview.css</file>
    <file>reset.css</file>
  </gresource>
+  <gresource prefix="/cursors">
+    <file>alias_cursor.png</file>
+    <file>all_scroll_cursor.png</file>
+    <file>cell_cursor.png</file>
+    <file>col_resize_cursor.png</file>
+    <file>copy_cursor.png</file>
+    <file>crosshair_cursor.png</file>
+    <file>default_cursor.png</file>
+    <file>e_resize_cursor.png</file>
+    <file>ew_resize_cursor.png</file>
+    <file>grabbing_cursor.png</file>
+    <file>grab_cursor.png</file>
+    <file>hand_cursor.png</file>
+    <file>help_cursor.png</file>
+    <file>move_cursor.png</file>
+    <file>ne_resize_cursor.png</file>
+    <file>nesw_resize_cursor.png</file>
+    <file>no_drop_cursor.png</file>
+    <file>none_cursor.png</file>
+    <file>not_allowed_cursor.png</file>
+    <file>n_resize_cursor.png</file>
+    <file>ns_resize_cursor.png</file>
+    <file>nw_resize_cursor.png</file>
+    <file>nwse_resize_cursor.png</file>
+    <file>pointer_cursor.png</file>
+    <file>progress_cursor.png</file>
+    <file>row_resize_cursor.png</file>
+    <file>se_resize_cursor.png</file>
+    <file>s_resize_cursor.png</file>
+    <file>sw_resize_cursor.png</file>
+    <file>text_cursor.png</file>
+    <file>vertical_text_cursor.png</file>
+    <file>wait_cursor.png</file>
+    <file>w_resize_cursor.png</file>
+    <file>zoom_in_cursor.png</file>
+    <file>zoom_out_cursor.png</file>
+  </gresource>
  <gresource prefix="/iconview">
    <file preprocess="to-pixdata">gnome-fs-directory.png</file>
    <file preprocess="to-pixdata">gnome-fs-regular.png</file>
@@ -86,6 +123,7 @@
    <file>css_multiplebgs.c</file>
    <file>css_pixbufs.c</file>
    <file>css_shadows.c</file>
+    <file>cursors.c</file>
    <file>dialog.c</file>
    <file>drawingarea.c</file>
    <file>editable_cells.c</file>
@@ -94,6 +132,7 @@
    <file>event_axes.c</file>
    <file>expander.c</file>
    <file>flowbox.c</file>
+    <file>font_features.c</file>
    <file>gestures.c</file>
    <file>glarea.c</file>
    <file>headerbar.c</file>
@@ -109,6 +148,7 @@
    <file>offscreen_window.c</file>
    <file>offscreen_window2.c</file>
    <file>overlay.c</file>
+    <file>pagesetup.c</file>
    <file>panes.c</file>
    <file>pickers.c</file>
    <file>pixbufs.c</file>
@@ -121,6 +161,7 @@
    <file>sizegroup.c</file>
    <file>sidebar.c</file>
    <file>stack.c</file>
+    <file>spinbutton.c</file>
    <file>spinner.c</file>
    <file>textview.c</file>
    <file>textscroll.c</file>
@@ -128,6 +169,7 @@
    <file>toolpalette.c</file>
    <file>transparent.c</file>
    <file>tree_store.c</file>
+    <file>textmask.c</file>
  </gresource>
  <gresource prefix="/textview">
    <file>floppybuddy.gif</file>
@@ -144,4 +186,10 @@
    <file>glarea-fragment.glsl</file>
    <file>glarea-vertex.glsl</file>
  </gresource>
+  <gresource prefix="/font-features">
+    <file>font-features.ui</file>
+  </gresource>
+  <gresource prefix="/spinbutton">
+    <file>spinbutton.ui</file>
+  </gresource>
 </gresources>
--- a/demos/gtk-demo/demo.ui
+++ b/demos/gtk-demo/demo.ui
@@ -1,264 +1,302 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<?xml version="1.0" standalone="no"?>
+<!--*- mode: xml -*-->
 <interface>
-    <object class="GtkListStore" id="liststore1">
-      <columns>
-        <column type="gchararray"/>
-        <column type="gchararray"/>
-        <column type="gint"/>
-        <column type="gchararray"/>
-      </columns>
-      <data>
-        <row>
-          <col id="0" translatable="yes">John</col>
-          <col id="1" translatable="yes">Doe</col>
-          <col id="2">25</col>
-          <col id="3" translatable="yes">This is the John Doe row</col>
-        </row>
-        <row>
-          <col id="0" translatable="yes">Mary</col>
-          <col id="1" translatable="yes">Unknown</col>
-          <col id="2">50</col>
-          <col id="3" translatable="yes">This is the Mary Unknown row</col>
-        </row>
-      </data>
-    </object>
-    <object class="GtkUIManager" id="uimanager">
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <column type="gchararray"/>
+      <column type="gchararray"/>
+      <column type="gint"/>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">John</col>
+        <col id="1" translatable="yes">Doe</col>
+        <col id="2">25</col>
+        <col id="3" translatable="yes">This is the John Doe row</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Mary</col>
+        <col id="1" translatable="yes">Unknown</col>
+        <col id="2">50</col>
+        <col id="3" translatable="yes">This is the Mary Unknown row</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkAboutDialog" id="aboutdialog1">
+    <property name="program-name" translatable="yes">Builder demo</property>
+    <property name="logo-icon-name" translatable="yes">gtk3-demo</property>
+    <accessibility>
+      <relation target="window1" type="subwindow-of"/>
+    </accessibility>
+  </object>
+  <object class="GtkWindow" id="window1">
+    <property name="default_height">250</property>
+    <property name="default_width">440</property>
+    <property name="title" translatable="yes">Builder</property>
+    <child>
+      <object class="GtkVBox" id="vbox1">
+        <property name="visible">True</property>
        <child>
-            <object class="GtkActionGroup" id="DefaultActions">
-                <child>
-                    <object class="GtkAction" id="Copy">
-                        <property name="name">Copy</property>
-                        <property name="tooltip" translatable="yes">Copy selected object into the clipboard</property>
-                        <property name="stock_id">gtk-copy</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="Cut">
-                        <property name="name">Cut</property>
-                        <property name="tooltip" translatable="yes">Cut selected object into the clipboard</property>
-                        <property name="stock_id">gtk-cut</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="EditMenu">
-                        <property name="name">EditMenu</property>
-                        <property name="label" translatable="yes">_Edit</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="FileMenu">
-                        <property name="name">FileMenu</property>
-                        <property name="label" translatable="yes">_File</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="New">
-                        <property name="name">New</property>
-                        <property name="tooltip" translatable="yes">Create a new file</property>
-                        <property name="stock_id">gtk-new</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="Open">
-                        <property name="name">Open</property>
-                        <property name="tooltip" translatable="yes">Open a file</property>
-                        <property name="stock_id">gtk-open</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="Paste">
-                        <property name="name">Paste</property>
-                        <property name="tooltip" translatable="yes">Paste object from the Clipboard</property>
-                        <property name="stock_id">gtk-paste</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="Quit">
-                        <property name="name">Quit</property>
-                        <property name="tooltip" translatable="yes">Quit the program</property>
-                        <property name="stock_id">gtk-quit</property>
-                        <signal handler="quit_activate" name="activate"/>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="Save">
-                        <property name="name">Save</property>
-                        <property name="is_important">True</property>
-                        <property name="tooltip" translatable="yes">Save a file</property>
-                        <property name="stock_id">gtk-save</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="SaveAs">
-                        <property name="name">SaveAs</property>
-                        <property name="tooltip" translatable="yes">Save with a different name</property>
-                        <property name="stock_id">gtk-save-as</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="HelpMenu">
-                        <property name="name">HelpMenu</property>
-                        <property name="label" translatable="yes">_Help</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkAction" id="About">
-                        <property name="name">About</property>
-                        <property name="stock_id">gtk-about</property>
-                        <signal handler="about_activate" name="activate"/>
-                    </object>
-                    <accelerator key="F7"/>
-                </child>
-                <child>
-                    <object class="GtkAction" id="Help">
-                        <property name="name">Help</property>
-                        <property name="stock_id">gtk-help</property>
-                        <signal handler="help_activate" name="activate"/>
-                    </object>
-                </child>
-            </object>
-        </child>
-        <ui>
-          <menubar name="menubar1">
-            <menu action="FileMenu" name="FileMenu">
-              <menuitem action="New" name="New"/>
-              <menuitem action="Open" name="Open"/>
-              <menuitem action="Save" name="Save"/>
-              <menuitem action="SaveAs" name="SaveAs"/>
-              <separator/>
-              <menuitem action="Quit" name="Quit"/>
-            </menu>
-            <menu action="EditMenu">
-              <menuitem action="Copy" name="Copy"/>
-              <menuitem action="Cut" name="Cut"/>
-              <menuitem action="Paste" name="Paste"/>
-            </menu>
-            <menu action="HelpMenu" name="HelpMenu">
-              <menuitem action="Help" name="Help"/>
-              <menuitem action="About" name="About"/>
-            </menu>
-          </menubar>
-          <toolbar name="toolbar1">
-            <toolitem action="New" name="New"/>
-            <toolitem action="Open" name="Open"/>
-            <toolitem action="Save" name="Save"/>
-            <separator/>
-            <toolitem action="Copy" name="Copy"/>
-            <toolitem action="Cut" name="Cut"/>
-            <toolitem action="Paste" name="Paste"/>
-          </toolbar>
-        </ui>
-    </object>
-    <object class="GtkAboutDialog" id="aboutdialog1">
-        <property name="program-name" translatable="yes">GtkBuilder demo</property>
-        <property name="logo-icon-name" translatable="yes">gtk3-demo</property>
-         <accessibility>
-	     <relation target="window1" type="subwindow-of"/>
-	 </accessibility>
-    </object>
-    <object class="GtkWindow" id="window1">
-        <property name="default_height">250</property>
-        <property name="default_width">440</property>
-        <property name="title">GtkBuilder demo</property>
-        <child>
-            <object class="GtkVBox" id="vbox1">
+          <object class="GtkMenuBar" id="menubar1">
+            <property name="visible">True</property>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="a11y-menubar">
+                <property name="AtkObject::accessible-name">The menubar</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem">
                <property name="visible">True</property>
-                <child>
-                    <object constructor="uimanager" class="GtkMenuBar" id="menubar1">
+                <property name="label" translatable="yes">_File</property>
+                <property name="use-underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu">
+                    <child>
+                      <object class="GtkMenuItem" id="new_item">
                        <property name="visible">True</property>
-	            	<child internal-child="accessible">
-	            	    <object class="AtkObject" id="a11y-menubar">
-	            	        <property name="AtkObject::accessible-name">The menubar</property>
-	            	    </object>
-	            	</child>
-	            </object>
-                    <packing>
-                        <property name="expand">False</property>
-                    </packing>
-                </child>
-                <child>
-                    <object constructor="uimanager" class="GtkToolbar" id="toolbar1">
+                        <property name="label" translatable="yes">_New</property>
+                        <property name="use-underline">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="open_item">
                        <property name="visible">True</property>
-	            	<child internal-child="accessible">
-	            	    <object class="AtkObject" id="a11y-toolbar">
-	            	        <property name="AtkObject::accessible-name">The toolbar</property>
-	            	    </object>
-	            	</child>
-                    </object>
-                    <packing>
-                        <property name="expand">False</property>
-                        <property name="position">1</property>
-                    </packing>
+                        <property name="label" translatable="yes">_Open</property>
+                        <property name="use-underline">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="save_item">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Save</property>
+                        <property name="use-underline">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="save_as_item">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Save _As</property>
+                        <property name="use-underline">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem">
+                        <property name="visible">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="quit_item">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Quit</property>
+                        <property name="use-underline">True</property>
+                        <property name="action-name">win.quit</property>
+                      </object>
+                    </child>
+                  </object>
                </child>
-                <child>
-                    <object class="GtkScrolledWindow" id="scrolledwindow1">
-                      <property name="hscrollbar_policy">automatic</property>
-                      <property name="shadow_type">in</property>
-                      <property name="visible">True</property>
-                      <property name="vscrollbar_policy">automatic</property>
-                      <child>
-                        <object class="GtkTreeView" id="treeview1">
-                          <property name="visible">True</property>
-                          <property name="model">liststore1</property>
-                          <property name="tooltip-column">3</property>
-	            	  <child internal-child="accessible">
-	            	      <object class="AtkObject" id="a11y-treeview">
-	            	          <property name="AtkObject::accessible-name">Name list</property>
-                                  <property name="AtkObject::accessible-description">
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Edit</property>
+                <property name="use-underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu">
+                    <child>
+                      <object class="GtkMenuItem" id="copy_item">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Copy</property>
+                        <property name="use-underline">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="cut_item">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Cut</property>
+                        <property name="use-underline">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="paste_item">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Paste</property>
+                        <property name="use-underline">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Help</property>
+                <property name="use-underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu">
+                    <child>
+                      <object class="GtkMenuItem" id="help_item">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Help</property>
+                        <property name="use-underline">True</property>
+                        <property name="action-name">win.help</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="about_item">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_About</property>
+                        <property name="use-underline">True</property>
+                        <property name="action-name">win.about</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToolbar" id="toolbar1">
+            <property name="visible">True</property>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="a11y-toolbar">
+                <property name="AtkObject::accessible-name">The toolbar</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToolButton">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">New</property>
+                <property name="tooltip-text" translatable="yes">Create a new file</property>
+                <property name="icon-name">document-new</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToolButton">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Open</property>
+                <property name="tooltip-text" translatable="yes">Open a file</property>
+                <property name="icon-name">document-open</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToolButton">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Save</property>
+                <property name="tooltip-text" translatable="yes">Save a file</property>
+                <property name="icon-name">document-save</property>
+                <property name="is-important">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkSeparatorToolItem">
+                <property name="visible">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToolButton">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Copy</property>
+                <property name="tooltip-text" translatable="yes">Copy selected object into the clipboard</property>
+                <property name="icon-name">edit-copy</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToolButton">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Cut</property>
+                <property name="tooltip-text" translatable="yes">Cut selected object into the clipboard</property>
+                <property name="icon-name">edit-cut</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToolButton">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Paste</property>
+                <property name="tooltip-text" translatable="yes">Paste object from the clipboard</property>
+                <property name="icon-name">edit-paste</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+            <property name="expand">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow1">
+            <property name="shadow_type">in</property>
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkTreeView" id="treeview1">
+                <property name="visible">True</property>
+                <property name="model">liststore1</property>
+                <property name="tooltip-column">3</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="a11y-treeview">
+                    <property name="AtkObject::accessible-name">Name list</property>
+                    <property name="AtkObject::accessible-description">
                                    A list of person with name, surname and age columns
                                  </property>
-	            	      </object>
-	            	  </child>
-                          <child>
-                            <object class="GtkTreeViewColumn" id="column1">
-                              <property name="title">Name</property>
-                              <child>
-                                <object class="GtkCellRendererText" id="renderer1"/>
-                                <attributes>
-                                  <attribute name="text">0</attribute>
-                                </attributes>
-                              </child>
-                            </object>
-                          </child>
-                          <child>
-                            <object class="GtkTreeViewColumn" id="column2">
-                              <property name="title">Surname</property>
-                              <child>
-                                <object class="GtkCellRendererText" id="renderer2"/>
-                                <attributes>
-                                  <attribute name="text">1</attribute>
-                                </attributes>
-                              </child>
-                            </object>
-                          </child>
-                          <child>
-                            <object class="GtkTreeViewColumn" id="column3">
-                              <property name="title">Age</property>
-                              <child>
-                                <object class="GtkCellRendererText" id="renderer3"/>
-                                <attributes>
-                                  <attribute name="text">2</attribute>
-                                </attributes>
-                              </child>
-                            </object>
-                          </child>
-                        </object>
-                      </child>
-                    </object>
-                    <packing>
-                        <property name="position">2</property>
-                    </packing>
+                  </object>
                </child>
                <child>
-                    <object class="GtkStatusbar" id="statusbar1">
-                        <property name="visible">True</property>
-                    </object>
-                    <packing>
-                        <property name="expand">False</property>
-                        <property name="position">3</property>
-                    </packing>
+                  <object class="GtkTreeViewColumn" id="column1">
+                    <property name="title">Name</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="renderer1"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
                </child>
-            </object>
+                <child>
+                  <object class="GtkTreeViewColumn" id="column2">
+                    <property name="title">Surname</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="renderer2"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="column3">
+                    <property name="title">Age</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="renderer3"/>
+                      <attributes>
+                        <attribute name="text">2</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="position">2</property>
+            <property name="expand">True</property>
+          </packing>
        </child>
-    </object>
+        <child>
+          <object class="GtkStatusbar" id="statusbar1">
+            <property name="visible">True</property>
+          </object>
+          <packing>
+            <property name="position">3</property>
+            <property name="expand">False</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
 </interface>
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -1,4 +1,4 @@
-/* Dialog and Message Boxes
+/* Dialogs and Message Boxes
 *
 * Dialog widgets are used to pop up a transient window for user feedback.
 */
@@ -109,9 +109,11 @@ do_dialog (GtkWidget *do_widget)
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
                             gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Dialogs");
+      gtk_window_set_title (GTK_WINDOW (window), "Dialogs and Message Boxes");
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

      frame = gtk_frame_new ("Dialogs");
@@ -163,14 +165,9 @@ do_dialog (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
+    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -212,7 +212,8 @@ do_drawingarea (GtkWidget *do_widget)
                             gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Drawing Area");

-      g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (close_window), NULL);

      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

--- a/demos/gtk-demo/e_resize_cursor.png
+++ b/demos/gtk-demo/e_resize_cursor.png
--- a/demos/gtk-demo/editable_cells.c
+++ b/demos/gtk-demo/editable_cells.c
@@ -14,8 +14,6 @@
 #include <string.h>
 #include <stdlib.h>

-static GtkWidget *window = NULL;
-
 typedef struct
 {
  gint   number;
@@ -335,6 +333,8 @@ add_columns (GtkTreeView  *treeview,
 GtkWidget *
 do_editable_cells (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
+
  if (!window)
    {
      GtkWidget *vbox;
@@ -345,11 +345,10 @@ do_editable_cells (GtkWidget *do_widget)
      GtkTreeModel *items_model;
      GtkTreeModel *numbers_model;

-      /* create window, etc */
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
                             gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Shopping list");
+      gtk_window_set_title (GTK_WINDOW (window), "Editable Cells");
      gtk_container_set_border_width (GTK_CONTAINER (window), 5);
      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);
@@ -406,10 +405,7 @@ do_editable_cells (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/entry_buffer.c
+++ b/demos/gtk-demo/entry_buffer.c
@@ -1,62 +1,55 @@
 /* Entry/Entry Buffer
 *
 * GtkEntryBuffer provides the text content in a GtkEntry.
- *
+ * Applications can provide their own buffer implementation,
+ * e.g. to provide secure handling for passwords in memory.
 */

 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

-static GtkWidget *window = NULL;
-
 GtkWidget *
 do_entry_buffer (GtkWidget *do_widget)
 {
-  GtkWidget *content_area;
+  static GtkWidget *window = NULL;
  GtkWidget *vbox;
  GtkWidget *label;
  GtkWidget *entry;
  GtkEntryBuffer *buffer;

  if (!window)
-  {
-    window = gtk_dialog_new_with_buttons ("GtkEntryBuffer",
-                                          GTK_WINDOW (do_widget),
-                                          0,
-                                          _("_Close"),
-                                          GTK_RESPONSE_NONE,
-                                          NULL);
-    gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+    {
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "Entry Buffer");
+      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

-    g_signal_connect (window, "response",
-                      G_CALLBACK (gtk_widget_destroy), NULL);
-    g_signal_connect (window, "destroy",
-                      G_CALLBACK (gtk_widget_destroyed), &window);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);

-    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+      label = gtk_label_new (NULL);
+      gtk_label_set_markup (GTK_LABEL (label),
+                            "Entries share a buffer. Typing in one is reflected in the other.");
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);

-    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+      /* Create a buffer */
+      buffer = gtk_entry_buffer_new (NULL, 0);

-    label = gtk_label_new (NULL);
-    gtk_label_set_markup (GTK_LABEL (label), "Entries share a buffer. Typing in one is reflected in the other.");
-    gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+      /* Create our first entry */
+      entry = gtk_entry_new_with_buffer (buffer);
+      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);

-    /* Create a buffer */
-    buffer = gtk_entry_buffer_new (NULL, 0);
+      /* Create the second entry */
+      entry = gtk_entry_new_with_buffer (buffer);
+      gtk_entry_set_visibility (GTK_ENTRY (entry), FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);

-    /* Create our first entry */
-    entry = gtk_entry_new_with_buffer (buffer);
-    gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
-
-    /* Create the second entry */
-    entry = gtk_entry_new_with_buffer (buffer);
-    gtk_entry_set_visibility (GTK_ENTRY (entry), FALSE);
-    gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
-
-    g_object_unref (buffer);
-  }
+      g_object_unref (buffer);
+    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show_all (window);
--- a/demos/gtk-demo/entry_completion.c
+++ b/demos/gtk-demo/entry_completion.c
@@ -8,8 +8,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

-static GtkWidget *window = NULL;
-
 /* Creates a tree model containing the completions */
 GtkTreeModel *
 create_completion_model (void)
@@ -38,7 +36,7 @@ create_completion_model (void)
 GtkWidget *
 do_entry_completion (GtkWidget *do_widget)
 {
-  GtkWidget *content_area;
+  static GtkWidget *window = NULL;
  GtkWidget *vbox;
  GtkWidget *label;
  GtkWidget *entry;
@@ -47,23 +45,17 @@ do_entry_completion (GtkWidget *do_widget)

  if (!window)
    {
-      window = gtk_dialog_new_with_buttons ("GtkEntryCompletion",
-                                            GTK_WINDOW (do_widget),
-                                            0,
-                                            _("_Close"),
-                                            GTK_RESPONSE_NONE,
-                                            NULL);
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "Entry Completion");
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);

-      g_signal_connect (window, "response",
-                        G_CALLBACK (gtk_widget_destroy), NULL);
      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);

-      content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+      gtk_container_add (GTK_CONTAINER (window), vbox);
      gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);

      label = gtk_label_new (NULL);
--- a/demos/gtk-demo/event_axes.c
+++ b/demos/gtk-demo/event_axes.c
@@ -384,6 +384,7 @@ do_event_axes (GtkWidget *toplevel)
  if (!window)
    {
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_title (GTK_WINDOW (window), "Event Axes");
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);

      g_signal_connect (window, "destroy",
@@ -411,10 +412,7 @@ do_event_axes (GtkWidget *toplevel)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/ew_resize_cursor.png
+++ b/demos/gtk-demo/ew_resize_cursor.png
--- a/demos/gtk-demo/expander.c
+++ b/demos/gtk-demo/expander.c
@@ -3,6 +3,8 @@
 * GtkExpander allows to provide additional content that is initially hidden.
 * This is also known as "disclosure triangle".
 *
+ * This example also shows how to make the window resizable only if the expander
+ * is expanded.
 */

 #include <glib/gi18n.h>
@@ -10,45 +12,85 @@

 static GtkWidget *window = NULL;

+static void
+response_cb (GtkDialog *dialog, gint response_id)
+{
+  gtk_widget_destroy (window);
+  window = NULL;
+}
+
+static void
+expander_cb (GtkExpander *expander, GParamSpec *pspec, GtkWindow *dialog)
+{
+  gtk_window_set_resizable (dialog, gtk_expander_get_expanded (expander));
+}
+
+static void
+do_not_expand (GtkWidget *child, gpointer data)
+{
+  gtk_container_child_set (GTK_CONTAINER (gtk_widget_get_parent (child)), child,
+                           "expand", FALSE, "fill", FALSE, NULL);
+}

 GtkWidget *
 do_expander (GtkWidget *do_widget)
 {
-  GtkWidget *content_area;
-  GtkWidget *vbox;
-  GtkWidget *label;
+  GtkWidget *toplevel;
+  GtkWidget *area;
+  GtkWidget *box;
  GtkWidget *expander;
+  GtkWidget *sw;
+  GtkWidget *tv;
+  GtkTextBuffer *buffer;

  if (!window)
-  {
-    window = gtk_dialog_new_with_buttons ("GtkExpander",
-                                          GTK_WINDOW (do_widget),
-                                          0,
-                                          _("_Close"),
-                                          GTK_RESPONSE_NONE,
-                                          NULL);
-    gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+    {
+      toplevel = gtk_widget_get_toplevel (do_widget);
+      window = gtk_message_dialog_new_with_markup (GTK_WINDOW (toplevel),
+                                                   0,
+                                                   GTK_MESSAGE_ERROR,
+                                                   GTK_BUTTONS_CLOSE,
+                                                   "<big><b>%s</b></big>",
+                                                   "Something went wrong");
+      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (window),
+                                                "Here are some more details "
+                                                "but not the full story.");

-    g_signal_connect (window, "response",
-                      G_CALLBACK (gtk_widget_destroy), NULL);
-    g_signal_connect (window, "destroy",
-                      G_CALLBACK (gtk_widget_destroyed), &window);
+      area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (window));
+      box = gtk_widget_get_parent (area);
+      gtk_container_child_set (GTK_CONTAINER (gtk_widget_get_parent (box)), box,
+                               "expand", TRUE, "fill", TRUE, NULL);
+      gtk_container_foreach (GTK_CONTAINER (area), do_not_expand, NULL);

-    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+      expander = gtk_expander_new ("Details:");
+      sw = gtk_scrolled_window_new (NULL, NULL);
+      gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (sw), 100);
+      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
+      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+                                      GTK_POLICY_NEVER,
+                                      GTK_POLICY_AUTOMATIC);

-    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+      tv = gtk_text_view_new ();
+      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tv));
+      gtk_text_view_set_editable (GTK_TEXT_VIEW (tv), FALSE);
+      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (tv), GTK_WRAP_WORD);
+      gtk_text_buffer_set_text (GTK_TEXT_BUFFER (buffer),
+                                "Finally, the full story with all details. "
+                                "And all the inside information, including "
+                                "error codes, etc etc. Pages of information, "
+                                "you might have to scroll down to read it all, "
+                                "or even resize the window - it works !\n"
+                                "A second paragraph will contain even more "
+                                "innuendo, just to make you scroll down or "
+                                "resize the window. Do it already !", -1);
+      gtk_container_add (GTK_CONTAINER (sw), tv);
+      gtk_container_add (GTK_CONTAINER (expander), sw);
+      gtk_box_pack_end (GTK_BOX (area), expander, TRUE, TRUE, 0);
+      gtk_widget_show_all (expander);
+      g_signal_connect (expander, "notify::expanded",
+                        G_CALLBACK (expander_cb), window);

-    label = gtk_label_new ("Expander demo. Click on the triangle for details.");
-    gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
-    /* Create the expander */
-    expander = gtk_expander_new ("Details");
-    gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE, 0);
-
-    label = gtk_label_new ("Details can be shown or hidden.");
-    gtk_container_add (GTK_CONTAINER (expander), label);
+      g_signal_connect (window, "response", G_CALLBACK (response_cb), NULL);
  }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/flowbox.c
+++ b/demos/gtk-demo/flowbox.c
@@ -10,8 +10,6 @@
 #include <stdlib.h>
 #include <string.h>

-static GtkWidget *window = NULL;
-
 static gboolean
 draw_color (GtkWidget  *drawingarea,
            cairo_t    *cr,
@@ -46,6 +44,7 @@ color_swatch_new (const gchar *color)
 GtkWidget *
 do_flowbox (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
  GtkWidget *scrolled, *flowbox;
  const gchar *colors[] = {
    "AliceBlue",
@@ -726,8 +725,7 @@ do_flowbox (GtkWidget *do_widget)
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);

      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed),
-                        &window);
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      scrolled = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
@@ -740,9 +738,7 @@ do_flowbox (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (window), scrolled);

      for (i = 0; colors[i]; i++)
-        {
-          gtk_container_add (GTK_CONTAINER (flowbox), color_swatch_new (colors[i]));
-        }
+        gtk_container_add (GTK_CONTAINER (flowbox), color_swatch_new (colors[i]));

      gtk_widget_show_all (scrolled);
    }
--- a/demos/gtk-demo/font-features.ui
+++ b/demos/gtk-demo/font-features.ui
--- a/demos/gtk-demo/font_features.c
+++ b/demos/gtk-demo/font_features.c
@@ -0,0 +1,202 @@
+/* Pango/Font Features
+ *
+ * This demonstrates support for OpenType font features with
+ * Pango attributes. The attributes can be used manually or
+ * via Pango markup.
+ */
+
+#include <gtk/gtk.h>
+
+static GtkWidget *label;
+static GtkWidget *settings;
+static GtkWidget *font;
+static GtkWidget *resetbutton;
+static GtkWidget *numcasedefault;
+static GtkWidget *numspacedefault;
+static GtkWidget *fractiondefault;
+static GtkWidget *stack;
+static GtkWidget *entry;
+
+static GtkWidget *toggle[24];
+
+static void
+update (void)
+{
+  GString *s;
+  char *font_desc;
+  char *font_settings;
+  const char *text;
+  gboolean has_feature;
+  int i;
+
+  text = gtk_entry_get_text (GTK_ENTRY (entry));
+
+  font_desc = gtk_font_chooser_get_font (GTK_FONT_CHOOSER (font));
+
+  s = g_string_new ("");
+
+  has_feature = FALSE;
+  for (i = 0; i < 24; i++)
+    {
+      if (!gtk_widget_is_sensitive (toggle[i]))
+        continue;
+
+      if (GTK_IS_RADIO_BUTTON (toggle[i]))
+        {
+          if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle[i])))
+            {
+              if (has_feature)
+                g_string_append (s, ", ");
+              g_string_append (s, gtk_buildable_get_name (GTK_BUILDABLE (toggle[i])));
+              g_string_append (s, " 1");
+              has_feature = TRUE;
+            }
+        }
+      else
+        {
+          if (has_feature)
+            g_string_append (s, ", ");
+          g_string_append (s, gtk_buildable_get_name (GTK_BUILDABLE (toggle[i])));
+          if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle[i])))
+            g_string_append (s, " 1");
+          else
+            g_string_append (s, " 0");
+          has_feature = TRUE;
+        }
+    }
+
+  font_settings = g_string_free (s, FALSE);
+
+  gtk_label_set_text (GTK_LABEL (settings), font_settings);
+
+  s = g_string_new ("");
+  g_string_append_printf (s, "<span font_desc='%s' font_features='%s'>%s</span>", font_desc, font_settings, text);
+
+  gtk_label_set_markup (GTK_LABEL (label), s->str);
+
+  g_string_free (s, TRUE);
+
+  g_free (font_desc);
+  g_free (font_settings);
+}
+
+static void
+reset (void)
+{
+  int i;
+
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (numcasedefault), TRUE);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (numspacedefault), TRUE);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fractiondefault), TRUE);
+  for (i = 0; i < 24; i++)
+    {
+      if (!GTK_IS_RADIO_BUTTON (toggle[i]))
+        {
+          gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle[i]), FALSE);
+          gtk_widget_set_sensitive (toggle[i], FALSE);
+        }
+    }
+}
+
+static char *text;
+
+static void
+switch_to_entry (void)
+{
+  text = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
+  gtk_stack_set_visible_child_name (GTK_STACK (stack), "entry");
+}
+
+static void
+switch_to_label (void)
+{
+  g_free (text);
+  text = NULL;
+  gtk_stack_set_visible_child_name (GTK_STACK (stack), "label");
+  update ();
+}
+
+static gboolean
+entry_key_press (GtkEntry *entry, GdkEventKey *event)
+{
+  if (event->keyval == GDK_KEY_Escape)
+    {
+      gtk_entry_set_text (GTK_ENTRY (entry), text);
+      switch_to_label ();
+      return GDK_EVENT_STOP;
+    }
+
+  return GDK_EVENT_PROPAGATE;
+}
+
+GtkWidget *
+do_font_features (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+
+  if (!window)
+    {
+      GtkBuilder *builder;
+      int i;
+
+      builder = gtk_builder_new_from_resource ("/font-features/font-features.ui");
+
+      gtk_builder_add_callback_symbol (builder, "update", update);
+      gtk_builder_add_callback_symbol (builder, "reset", reset);
+      gtk_builder_add_callback_symbol (builder, "switch_to_entry", switch_to_entry);
+      gtk_builder_add_callback_symbol (builder, "switch_to_label", switch_to_label);
+      gtk_builder_add_callback_symbol (builder, "entry_key_press", G_CALLBACK (entry_key_press));
+      gtk_builder_connect_signals (builder, NULL);
+
+      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
+      label = GTK_WIDGET (gtk_builder_get_object (builder, "label"));
+      settings = GTK_WIDGET (gtk_builder_get_object (builder, "settings"));
+      resetbutton = GTK_WIDGET (gtk_builder_get_object (builder, "reset"));
+      font = GTK_WIDGET (gtk_builder_get_object (builder, "font"));
+      numcasedefault = GTK_WIDGET (gtk_builder_get_object (builder, "numcasedefault"));
+      numspacedefault = GTK_WIDGET (gtk_builder_get_object (builder, "numspacedefault"));
+      fractiondefault = GTK_WIDGET (gtk_builder_get_object (builder, "fractiondefault"));
+      stack = GTK_WIDGET (gtk_builder_get_object (builder, "stack"));
+      entry = GTK_WIDGET (gtk_builder_get_object (builder, "entry"));
+
+      i = 0;
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "kern"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "liga"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "dlig"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "hlig"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "clig"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "smcp"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "c2sc"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "lnum"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "onum"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "pnum"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "tnum"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "frac"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "afrc"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "zero"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "nalt"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "swsh"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "calt"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "hist"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "salt"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "ss01"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "ss02"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "ss03"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "ss04"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "ss05"));
+
+      update ();
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      g_object_unref (builder);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_window_present (GTK_WINDOW (window));
+  else
+    gtk_widget_destroy (window);
+
+  return window;
+}
--- a/demos/gtk-demo/gestures.c
+++ b/demos/gtk-demo/gestures.c
@@ -7,7 +7,6 @@

 #include <gtk/gtk.h>

-static GtkWidget *window = NULL;
 static GtkGesture *rotate = NULL;
 static GtkGesture *zoom = NULL;
 static gdouble swipe_x = 0;
@@ -132,6 +131,7 @@ drawing_area_draw (GtkWidget *widget,
 GtkWidget *
 do_gestures (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
  GtkWidget *drawing_area;
  GtkGesture *gesture;

@@ -139,7 +139,7 @@ do_gestures (GtkWidget *do_widget)
    {
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
-      gtk_window_set_title (GTK_WINDOW (window), "Gestures demo");
+      gtk_window_set_title (GTK_WINDOW (window), "Gestures");
      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);

@@ -190,10 +190,7 @@ do_gestures (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/glarea.c
+++ b/demos/gtk-demo/glarea.c
@@ -373,7 +373,7 @@ create_glarea_window (GtkWidget *do_widget)

  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
  gtk_window_set_screen (GTK_WINDOW (window), gtk_widget_get_screen (do_widget));
-  gtk_window_set_title (GTK_WINDOW (window), "GtkGLArea - Golden Triangle");
+  gtk_window_set_title (GTK_WINDOW (window), "OpenGL Area");
  gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
  gtk_container_set_border_width (GTK_CONTAINER (window), 12);
  g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
--- a/demos/gtk-demo/grab_cursor.png
+++ b/demos/gtk-demo/grab_cursor.png
--- a/demos/gtk-demo/grabbing_cursor.png
+++ b/demos/gtk-demo/grabbing_cursor.png
--- a/demos/gtk-demo/gtk3-demo.desktop
+++ b/demos/gtk-demo/gtk3-demo.desktop
@@ -6,5 +6,5 @@ Icon=gtk3-demo
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GTK;
+Categories=Development;GTK;
 NoDisplay=true
--- a/demos/gtk-demo/hand_cursor.png
+++ b/demos/gtk-demo/hand_cursor.png
--- a/demos/gtk-demo/headerbar.c
+++ b/demos/gtk-demo/headerbar.c
@@ -58,14 +58,9 @@ do_headerbar (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
+    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/help_cursor.png
+++ b/demos/gtk-demo/help_cursor.png
--- a/demos/gtk-demo/hypertext.c
+++ b/demos/gtk-demo/hypertext.c
@@ -128,7 +128,7 @@ key_press_event (GtkWidget *text_view,
  return FALSE;
 }

-/* Links can also be activated by clicking.
+/* Links can also be activated by clicking or tapping.
 */
 static gboolean
 event_after (GtkWidget *text_view,
@@ -136,15 +136,30 @@ event_after (GtkWidget *text_view,
 {
  GtkTextIter start, end, iter;
  GtkTextBuffer *buffer;
-  GdkEventButton *event;
+  gdouble ex, ey;
  gint x, y;

-  if (ev->type != GDK_BUTTON_RELEASE)
-    return FALSE;
+  if (ev->type == GDK_BUTTON_RELEASE)
+    {
+      GdkEventButton *event;

-  event = (GdkEventButton *)ev;
+      event = (GdkEventButton *)ev;
+      if (event->button != GDK_BUTTON_PRIMARY)
+        return FALSE;

-  if (event->button != GDK_BUTTON_PRIMARY)
+      ex = event->x;
+      ey = event->y;
+    }
+  else if (ev->type == GDK_TOUCH_END)
+    {
+      GdkEventTouch *event;
+
+      event = (GdkEventTouch *)ev;
+
+      ex = event->x;
+      ey = event->y;
+    }
+  else
    return FALSE;

  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
@@ -156,13 +171,13 @@ event_after (GtkWidget *text_view,

  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
                                         GTK_TEXT_WINDOW_WIDGET,
-                                         event->x, event->y, &x, &y);
+                                         ex, ey, &x, &y);

  gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW (text_view), &iter, x, y);

  follow_if_link (text_view, &iter);

-  return FALSE;
+  return TRUE;
 }

 static gboolean hovering_over_link = FALSE;
@@ -243,15 +258,14 @@ do_hypertext (GtkWidget *do_widget)
      regular_cursor = gdk_cursor_new_for_display (gtk_widget_get_display (do_widget), GDK_XTERM);

      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_title (GTK_WINDOW (window), "Hypertext");
      gtk_window_set_screen (GTK_WINDOW (window),
                             gtk_widget_get_screen (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window),
-                                   450, 450);
+      gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);

      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);

-      gtk_window_set_title (GTK_WINDOW (window), "Hypertext");
      gtk_container_set_border_width (GTK_CONTAINER (window), 0);

      view = gtk_text_view_new ();
@@ -278,14 +292,9 @@ do_hypertext (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show (window);
-    }
+    gtk_widget_show (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/iconview.c
+++ b/demos/gtk-demo/iconview.c
@@ -255,7 +255,7 @@ do_iconview (GtkWidget *do_widget)

      gtk_window_set_screen (GTK_WINDOW (window),
                             gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "GtkIconView demo");
+      gtk_window_set_title (GTK_WINDOW (window), "Icon View Basics");

      g_signal_connect (window, "destroy",
                        G_CALLBACK (close_window), NULL);
@@ -328,10 +328,7 @@ do_iconview (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/iconview_edit.c
+++ b/demos/gtk-demo/iconview_edit.c
@@ -8,8 +8,6 @@
 #include <gtk/gtk.h>
 #include <string.h>

-static GtkWidget *window = NULL;
-
 enum
 {
  COL_TEXT,
@@ -100,6 +98,8 @@ edited (GtkCellRendererText *cell,
 GtkWidget *
 do_iconview_edit (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
+
  if (!window)
    {
      GtkWidget *icon_view;
@@ -152,10 +152,7 @@ do_iconview_edit (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -436,14 +436,9 @@ do_images (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
+    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/infobar.c
+++ b/demos/gtk-demo/infobar.c
@@ -1,4 +1,4 @@
-/* Info bar
+/* Info Bars
 *
 * Info bar widgets are used to report important messages to the user.
 */
@@ -6,14 +6,13 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

-static GtkWidget *window = NULL;
-
 static void
 on_bar_response (GtkInfoBar *info_bar,
                 gint        response_id,
                 gpointer    user_data)
 {
  GtkWidget *dialog;
+  GtkWidget *window;

  if (response_id == GTK_RESPONSE_CLOSE)
    {
@@ -21,6 +20,7 @@ on_bar_response (GtkInfoBar *info_bar,
      return;
    }

+  window = gtk_widget_get_toplevel (GTK_WIDGET (info_bar));
  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                   GTK_MESSAGE_INFO,
@@ -40,6 +40,7 @@ on_bar_response (GtkInfoBar *info_bar,
 GtkWidget *
 do_infobar (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
  GtkWidget *frame;
  GtkWidget *bar;
  GtkWidget *vbox;
@@ -67,6 +68,8 @@ do_infobar (GtkWidget *do_widget)
      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE, 0);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_INFO);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_INFO");
+      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_xalign (GTK_LABEL (label), 0);
      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE, 0);

      button = gtk_toggle_button_new_with_label ("Message");
@@ -77,6 +80,8 @@ do_infobar (GtkWidget *do_widget)
      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE, 0);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_WARNING);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_WARNING");
+      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_xalign (GTK_LABEL (label), 0);
      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE, 0);

      button = gtk_toggle_button_new_with_label ("Warning");
@@ -88,7 +93,9 @@ do_infobar (GtkWidget *do_widget)
      g_signal_connect (bar, "response", G_CALLBACK (on_bar_response), window);
      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE, 0);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_QUESTION);
-      label = gtk_label_new ("This is\nan info bar with message type\nGTK_MESSAGE_QUESTION");
+      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_QUESTION");
+      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_xalign (GTK_LABEL (label), 0);
      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE, 0);

      button = gtk_toggle_button_new_with_label ("Question");
@@ -99,6 +106,8 @@ do_infobar (GtkWidget *do_widget)
      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE, 0);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_ERROR);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_ERROR");
+      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_xalign (GTK_LABEL (label), 0);
      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE, 0);

      button = gtk_toggle_button_new_with_label ("Error");
@@ -109,6 +118,8 @@ do_infobar (GtkWidget *do_widget)
      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE, 0);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_OTHER);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_OTHER");
+      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_xalign (GTK_LABEL (label), 0);
      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE, 0);

      button = gtk_toggle_button_new_with_label ("Other");
@@ -131,14 +142,9 @@ do_infobar (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
+    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/links.c
+++ b/demos/gtk-demo/links.c
@@ -44,11 +44,10 @@ activate_link (GtkWidget   *label,
  return FALSE;
 }

-static GtkWidget *window = NULL;
-
 GtkWidget *
 do_links (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
  GtkWidget *label;

  if (!window)
@@ -78,14 +77,9 @@ do_links (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show (window);
-    }
+    gtk_widget_show (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -258,7 +258,7 @@ do_list_store (GtkWidget *do_widget)
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
                             gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "GtkListStore demo");
+      gtk_window_set_title (GTK_WINDOW (window), "List Store");

      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);
--- a/demos/gtk-demo/menus.c
+++ b/demos/gtk-demo/menus.c
@@ -18,10 +18,6 @@
 * A GtkMenuItem can have a submenu, which is simply a GtkMenu to pop
 * up when the menu item is selected. Typically, all menu items in a menu bar
 * have submenus.
- *
- * GtkUIManager provides a higher-level interface for creating menu bars
- * and menus; while you can construct menus manually, most people don't
- * do that. There's a separate demo for GtkUIManager.
 */

 #include <gtk/gtk.h>
@@ -30,7 +26,7 @@
 #include <stdio.h>

 static GtkWidget *
-create_menu (gint     depth)
+create_menu (gint depth)
 {
  GtkWidget *menu;
  GtkRadioMenuItem *last_item;
@@ -120,6 +116,7 @@ do_menus (GtkWidget *do_widget)
      gtk_widget_show (box1);

      menubar = gtk_menu_bar_new ();
+      gtk_widget_set_hexpand (menubar, TRUE);
      gtk_box_pack_start (GTK_BOX (box1), menubar, FALSE, TRUE, 0);
      gtk_widget_show (menubar);

@@ -161,14 +158,9 @@ do_menus (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show (window);
-    }
+    gtk_widget_show (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/move_cursor.png
+++ b/demos/gtk-demo/move_cursor.png
--- a/demos/gtk-demo/n_resize_cursor.png
+++ b/demos/gtk-demo/n_resize_cursor.png
--- a/demos/gtk-demo/ne_resize_cursor.png
+++ b/demos/gtk-demo/ne_resize_cursor.png
--- a/demos/gtk-demo/nesw_resize_cursor.png
+++ b/demos/gtk-demo/nesw_resize_cursor.png
--- a/demos/gtk-demo/no_drop_cursor.png
+++ b/demos/gtk-demo/no_drop_cursor.png
--- a/demos/gtk-demo/none_cursor.png
+++ b/demos/gtk-demo/none_cursor.png
--- a/demos/gtk-demo/not_allowed_cursor.png
+++ b/demos/gtk-demo/not_allowed_cursor.png
--- a/demos/gtk-demo/ns_resize_cursor.png
+++ b/demos/gtk-demo/ns_resize_cursor.png
--- a/demos/gtk-demo/nw_resize_cursor.png
+++ b/demos/gtk-demo/nw_resize_cursor.png
--- a/demos/gtk-demo/nwse_resize_cursor.png
+++ b/demos/gtk-demo/nwse_resize_cursor.png
--- a/demos/gtk-demo/offscreen_window.c
+++ b/demos/gtk-demo/offscreen_window.c
@@ -565,11 +565,11 @@ scale_changed (GtkRange      *range,
  gtk_rotated_bin_set_angle (bin, gtk_range_get_value (range));
 }

-static GtkWidget *window = NULL;
-
 GtkWidget *
 do_offscreen_window (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
+
  if (!window)
    {
      GtkWidget *bin, *vbox, *scale, *button;
@@ -577,7 +577,7 @@ do_offscreen_window (GtkWidget *do_widget)
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
                             gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Rotated widget");
+      gtk_window_set_title (GTK_WINDOW (window), "Rotated Button");

      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);
@@ -603,10 +603,7 @@ do_offscreen_window (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/offscreen_window2.c
+++ b/demos/gtk-demo/offscreen_window2.c
@@ -468,11 +468,11 @@ gtk_mirror_bin_draw (GtkWidget *widget,

 /*** ***/

-static GtkWidget *window = NULL;
-
 GtkWidget *
 do_offscreen_window2 (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
+
  if (!window)
    {
      GtkWidget *bin, *vbox;
@@ -516,10 +516,7 @@ do_offscreen_window2 (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/overlay.c
+++ b/demos/gtk-demo/overlay.c
@@ -1,10 +1,20 @@
 /* Overlay
 *
- * Stack widgets in static positions over a main widget
+ * Shows widgets in static positions over a main widget.
+ *
+ * The overlayed widgets can be interactive controls such
+ * as the entry in this example, or just decorative, like
+ * the big blue label.
 */

 #include <gtk/gtk.h>

+static void
+do_number (GtkButton *button, GtkEntry *entry)
+{
+  gtk_entry_set_text (entry, gtk_button_get_label (button));
+}
+
 GtkWidget *
 do_overlay (GtkWidget *do_widget)
 {
@@ -12,170 +22,64 @@ do_overlay (GtkWidget *do_widget)

  if (!window)
    {
-      GtkWidget *view;
-      GtkWidget *sw;
      GtkWidget *overlay;
-      GtkWidget *entry;
+      GtkWidget *grid;
+      GtkWidget *button;
+      GtkWidget *vbox;
      GtkWidget *label;
+      GtkWidget *entry;
+      int i, j;
+      char *text;

      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window),
-                                   450, 450);
+      gtk_window_set_default_size (GTK_WINDOW (window), 500, 510);
+      gtk_window_set_title (GTK_WINDOW (window), "Overlay");
+
+      overlay = gtk_overlay_new ();
+      grid = gtk_grid_new ();
+      gtk_container_add (GTK_CONTAINER (overlay), grid);
+
+      entry = gtk_entry_new ();
+
+      for (j = 0; j < 5; j++)
+        {
+          for (i = 0; i < 5; i++)
+            {
+              text = g_strdup_printf ("%d", 5*j + i);
+              button = gtk_button_new_with_label (text);
+              g_free (text);
+              gtk_widget_set_hexpand (button, TRUE);
+              gtk_widget_set_vexpand (button, TRUE);
+              g_signal_connect (button, "clicked", G_CALLBACK (do_number), entry);
+              gtk_grid_attach (GTK_GRID (grid), button, i, j, 1, 1);
+            }
+        }
+
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), vbox);
+      gtk_overlay_set_overlay_pass_through (GTK_OVERLAY (overlay), vbox, TRUE);
+      gtk_widget_set_halign (vbox, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (vbox, GTK_ALIGN_CENTER);
+
+      label = gtk_label_new ("<span foreground='blue' weight='ultrabold' font='40'>Numbers</span>");
+      gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 8);
+
+      gtk_entry_set_placeholder_text (GTK_ENTRY (entry), "Your Lucky Number");
+      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 8);
+
+      gtk_container_add (GTK_CONTAINER (window), overlay);

      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);

-      gtk_window_set_title (GTK_WINDOW (window), "Overlay");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-
-      view = gtk_text_view_new ();
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_AUTOMATIC);
-      gtk_container_add (GTK_CONTAINER (sw), view);
-
-      overlay = gtk_overlay_new ();
-      gtk_container_add (GTK_CONTAINER (overlay), sw);
-      gtk_container_add (GTK_CONTAINER (window), overlay);
-
-      entry = gtk_entry_new ();
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
-      gtk_widget_set_halign (entry, GTK_ALIGN_END);
-      gtk_widget_set_valign (entry, GTK_ALIGN_END);
-
-      label = gtk_label_new ("Hello world");
-      gtk_widget_set_halign (label, GTK_ALIGN_END);
-      gtk_widget_set_valign (label, GTK_ALIGN_END);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
-      gtk_widget_set_margin_start (label, 20);
-      gtk_widget_set_margin_end (label, 20);
-      gtk_widget_set_margin_top (label, 5);
-      gtk_widget_set_margin_bottom (label, 5);
-
-      entry = gtk_entry_new ();
-      gtk_widget_set_halign (entry, GTK_ALIGN_START);
-      gtk_widget_set_valign (entry, GTK_ALIGN_END);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
-
-      label = gtk_label_new ("Hello world");
-      gtk_widget_set_halign (label, GTK_ALIGN_START);
-      gtk_widget_set_valign (label, GTK_ALIGN_END);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
-      gtk_widget_set_margin_start (label, 20);
-      gtk_widget_set_margin_end (label, 20);
-      gtk_widget_set_margin_top (label, 5);
-      gtk_widget_set_margin_bottom (label, 5);
-
-      entry = gtk_entry_new ();
-      gtk_widget_set_halign (entry, GTK_ALIGN_END);
-      gtk_widget_set_valign (entry, GTK_ALIGN_START);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
-
-      label = gtk_label_new ("Hello world");
-      gtk_widget_set_halign (label, GTK_ALIGN_END);
-      gtk_widget_set_valign (label, GTK_ALIGN_START);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
-      gtk_widget_set_margin_start (label, 20);
-      gtk_widget_set_margin_end (label, 20);
-      gtk_widget_set_margin_top (label, 5);
-      gtk_widget_set_margin_bottom (label, 5);
-
-      entry = gtk_entry_new ();
-      gtk_widget_set_halign (entry, GTK_ALIGN_START);
-      gtk_widget_set_valign (entry, GTK_ALIGN_START);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
-
-      label = gtk_label_new ("Hello world");
-      gtk_widget_set_halign (label, GTK_ALIGN_START);
-      gtk_widget_set_valign (label, GTK_ALIGN_START);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
-      gtk_widget_set_margin_start (label, 20);
-      gtk_widget_set_margin_end (label, 20);
-      gtk_widget_set_margin_top (label, 5);
-      gtk_widget_set_margin_bottom (label, 5);
-
-      entry = gtk_entry_new ();
-      gtk_widget_set_halign (entry, GTK_ALIGN_END);
-      gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
-
-      label = gtk_label_new ("Hello world");
-      gtk_widget_set_halign (label, GTK_ALIGN_END);
-      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
-      gtk_widget_set_margin_start (label, 20);
-      gtk_widget_set_margin_end (label, 20);
-      gtk_widget_set_margin_top (label, 5);
-      gtk_widget_set_margin_bottom (label, 5);
-
-      entry = gtk_entry_new ();
-      gtk_widget_set_halign (entry, GTK_ALIGN_START);
-      gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
-
-      label = gtk_label_new ("Hello world");
-      gtk_widget_set_halign (label, GTK_ALIGN_START);
-      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
-      gtk_widget_set_margin_start (label, 20);
-      gtk_widget_set_margin_end (label, 20);
-      gtk_widget_set_margin_top (label, 5);
-      gtk_widget_set_margin_bottom (label, 5);
-
-      entry = gtk_entry_new ();
-      gtk_widget_set_halign (entry, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (entry, GTK_ALIGN_START);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
-
-      label = gtk_label_new ("Hello world");
-      gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (label, GTK_ALIGN_START);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
-      gtk_widget_set_margin_start (label, 20);
-      gtk_widget_set_margin_end (label, 20);
-      gtk_widget_set_margin_top (label, 5);
-      gtk_widget_set_margin_bottom (label, 5);
-
-      entry = gtk_entry_new ();
-      gtk_widget_set_halign (entry, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (entry, GTK_ALIGN_END);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
-
-      label = gtk_label_new ("Hello world");
-      gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (label, GTK_ALIGN_END);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
-      gtk_widget_set_margin_start (label, 10);
-      gtk_widget_set_margin_end (label, 10);
-      gtk_widget_set_margin_top (label, 5);
-      gtk_widget_set_margin_bottom (label, 5);
-
-      entry = gtk_entry_new ();
-      gtk_widget_set_halign (entry, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
-
-      label = gtk_label_new ("Hello world");
-      gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
-
      gtk_widget_show_all (overlay);
    }

  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show (window);
-    }
+    gtk_widget_show (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/pagesetup.c
+++ b/demos/gtk-demo/pagesetup.c
@@ -0,0 +1,35 @@
+/* Printing/Page Setup
+ *
+ * GtkPageSetupUnixDialog can be used if page setup is needed
+ * independent of a full printing dialog.
+ */
+
+#include <math.h>
+#include <gtk/gtk.h>
+#include <gtk/gtkunixprint.h>
+
+static void
+done_cb (GtkDialog *dialog, gint response, gpointer data)
+{
+  gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+GtkWidget *
+do_pagesetup (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+
+  if (!window)
+    {
+      window = gtk_page_setup_unix_dialog_new ("Page Setup", GTK_WINDOW (do_widget));
+      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
+      g_signal_connect (window, "response", G_CALLBACK (done_cb), NULL);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_widget_destroy (window);
+
+  return window;
+}
--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -1,14 +1,14 @@
 /* Paned Widgets
 *
- * The GtkHPaned and GtkVPaned Widgets divide their content
- * area into two panes with a divider in between that the
- * user can adjust. A separate child is placed into each
- * pane.
+ * The GtkPaned Widget divides its content area into two panes
+ * with a divider in between that the user can adjust. A separate
+ * child is placed into each pane. GtkPaned widgets can be split
+ * horizontally or vertially.
 *
 * There are a number of options that can be set for each pane.
- * This test contains both a horizontal (HPaned) and a vertical
- * (VPaned) widget, and allows you to adjust the options for
- * each side of each widget.
+ * This test contains both a horizontal and a vertical GtkPaned
+ * widget, and allows you to adjust the options for each side of
+ * each widget.
 */

 #include <gtk/gtk.h>
@@ -141,7 +141,7 @@ do_panes (GtkWidget *do_widget)
      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);

-      gtk_window_set_title (GTK_WINDOW (window), "Panes");
+      gtk_window_set_title (GTK_WINDOW (window), "Paned Widgets");
      gtk_container_set_border_width (GTK_CONTAINER (window), 0);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
@@ -192,14 +192,9 @@ do_panes (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show (window);
-    }
+    gtk_widget_show (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/pickers.c
+++ b/demos/gtk-demo/pickers.c
@@ -20,8 +20,7 @@ do_pickers (GtkWidget *do_widget)
    gtk_window_set_title (GTK_WINDOW (window), "Pickers");

    g_signal_connect (window, "destroy",
-                      G_CALLBACK (gtk_widget_destroyed),
-                      &window);
+                      G_CALLBACK (gtk_widget_destroyed), &window);

    gtk_container_set_border_width (GTK_CONTAINER (window), 10);

@@ -76,14 +75,9 @@ do_pickers (GtkWidget *do_widget)
  }

  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
+    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/pixbufs.c
+++ b/demos/gtk-demo/pixbufs.c
@@ -183,7 +183,6 @@ do_pixbufs (GtkWidget *do_widget)
      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);

-
      error = NULL;
      if (!load_pixbufs (&error))
        {
@@ -221,13 +220,10 @@ do_pixbufs (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
+    gtk_widget_show_all (window);
  else
    {
      gtk_widget_destroy (window);
-      window = NULL;
      g_object_unref (frame);
    }

--- a/demos/gtk-demo/pointer_cursor.png
+++ b/demos/gtk-demo/pointer_cursor.png
--- a/demos/gtk-demo/popover.c
+++ b/demos/gtk-demo/popover.c
@@ -176,10 +176,7 @@ do_popover (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/printing.c
+++ b/demos/gtk-demo/printing.c
@@ -1,4 +1,4 @@
-/* Printing
+/* Printing/Printing
 *
 * GtkPrintOperation offers a simple API to support printing
 * in a cross-platform way.
--- a/demos/gtk-demo/progress_cursor.png
+++ b/demos/gtk-demo/progress_cursor.png
--- a/demos/gtk-demo/revealer.c
+++ b/demos/gtk-demo/revealer.c
@@ -6,8 +6,8 @@

 #include <gtk/gtk.h>

-static GtkBuilder *builder;
 static gint count = 0;
+static guint timeout = 0;

 static void
 change_direction (GtkRevealer *revealer)
@@ -18,14 +18,15 @@ change_direction (GtkRevealer *revealer)
  gtk_revealer_set_reveal_child (revealer, !revealed);
 }

-static guint timeout = 0;
-
 static gboolean
 reveal_one (gpointer data)
 {
+  GtkWidget *window = data;
+  GtkBuilder *builder;
  gchar *name;
  GtkRevealer *revealer;

+  builder = GTK_BUILDER (g_object_get_data (G_OBJECT (window), "builder"));
  name = g_strdup_printf ("revealer%d", count);
  revealer = (GtkRevealer *)gtk_builder_get_object (builder, name);

@@ -44,53 +45,45 @@ reveal_one (gpointer data)
    return TRUE;
 }

+static GtkWidget *window = NULL;
+
 static void
-response_cb (GtkWidget *dialog,
-             gint       response_id,
-             gpointer   data)
+on_destroy (gpointer data)
 {
+  window = NULL;
  if (timeout != 0)
    {
      g_source_remove (timeout);
      timeout = 0;
    }
-  gtk_widget_destroy (dialog);
 }

 GtkWidget *
 do_revealer (GtkWidget *do_widget)
 {
-  static GtkWidget *window = NULL;
-  GError *err = NULL;
-
  if (!window)
    {
-      builder = gtk_builder_new ();
-      gtk_builder_add_from_resource (builder, "/revealer/revealer.ui", &err);
-      if (err)
-        {
-          g_error ("ERROR: %s\n", err->message);
-          return NULL;
-        }
+      GtkBuilder *builder;
+
+      builder = gtk_builder_new_from_resource ("/revealer/revealer.ui");
      gtk_builder_connect_signals (builder, NULL);
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "dialog1"));
+      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
      gtk_window_set_screen (GTK_WINDOW (window),
                             gtk_widget_get_screen (do_widget));
      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-      g_signal_connect (window, "response", G_CALLBACK (response_cb), NULL);
+                        G_CALLBACK (on_destroy), NULL);
+      g_object_set_data_full (G_OBJECT (window), "builder", builder, g_object_unref);
    }

  if (!gtk_widget_get_visible (window))
    {
      count = 0;
-      timeout = g_timeout_add (690, reveal_one, NULL);
+      timeout = g_timeout_add (690, reveal_one, window);
      gtk_widget_show_all (window);
    }
  else
    {
      gtk_widget_destroy (window);
-      window = NULL;
    }


--- a/demos/gtk-demo/revealer.ui
+++ b/demos/gtk-demo/revealer.ui
@@ -1,223 +1,177 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <!-- interface-requires gtk+ 3.6 -->
-  <object class="GtkDialog" id="dialog1">
-    <property name="can_focus">False</property>
+  <object class="GtkWindow" id="window">
    <property name="border_width">5</property>
-    <property name="type_hint">dialog</property>
    <property name="default_width">300</property>
    <property name="default_height">300</property>
    <property name="title">Revealer</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox1">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+    <child>
+      <object class="GtkGrid">
+        <property name="visible">True</property>
+        <property name="halign">center</property>
+        <property name="valign">center</property>
+        <child>
+          <object class="GtkRevealer" id="revealer0">
+            <property name="visible">True</property>
+            <property name="transition-duration">2000</property>
+            <property name="transition-type">crossfade</property>
            <child>
-              <object class="GtkButton" id="button1">
-                <property name="label" translatable="yes">_Close</property>
+              <object class="GtkImage">
                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
+                <property name="icon-name">face-cool-symbolic</property>
+                <property name="icon-size">6</property>
              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
            </child>
          </object>
          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
+            <property name="left-attach">2</property>
+            <property name="top-attach">2</property>
          </packing>
        </child>
        <child>
-          <object class="GtkGrid" id="grid1">
+          <object class="GtkRevealer" id="revealer1">
            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
+            <property name="transition-duration">2000</property>
+            <property name="transition-type">slide-up</property>
            <child>
-              <object class="GtkRevealer" id="revealer0">
+              <object class="GtkImage">
                <property name="visible">True</property>
-                <property name="transition-duration">2000</property>
-                <property name="transition-type">crossfade</property>
-                <child>
-                  <object class="GtkImage" id="image0">
-                    <property name="visible">True</property>
-                    <property name="icon-name">face-cool-symbolic</property>
-                    <property name="icon-size">6</property>
-                  </object>
-                </child>
+                <property name="icon-name">face-cool-symbolic</property>
+                <property name="icon-size">6</property>
              </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRevealer" id="revealer1">
-                <property name="visible">True</property>
-                <property name="transition-duration">2000</property>
-                <property name="transition-type">slide-up</property>
-                <child>
-                  <object class="GtkImage" id="image1">
-                    <property name="visible">True</property>
-                    <property name="icon-name">face-cool-symbolic</property>
-                    <property name="icon-size">6</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRevealer" id="revealer2">
-                <property name="visible">True</property>
-                <property name="transition-duration">2000</property>
-                <property name="transition-type">slide-right</property>
-                <child>
-                  <object class="GtkImage" id="image2">
-                    <property name="visible">True</property>
-                    <property name="icon-name">face-cool-symbolic</property>
-                    <property name="icon-size">6</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left-attach">3</property>
-                <property name="top-attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRevealer" id="revealer3">
-                <property name="visible">True</property>
-                <property name="transition-duration">2000</property>
-                <property name="transition-type">slide-down</property>
-                <child>
-                  <object class="GtkImage" id="image3">
-                    <property name="visible">True</property>
-                    <property name="icon-name">face-cool-symbolic</property>
-                    <property name="icon-size">6</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">3</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRevealer" id="revealer4">
-                <property name="visible">True</property>
-                <property name="transition-duration">2000</property>
-                <property name="transition-type">slide-left</property>
-                <child>
-                  <object class="GtkImage" id="image4">
-                    <property name="visible">True</property>
-                    <property name="icon-name">face-cool-symbolic</property>
-                    <property name="icon-size">6</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRevealer" id="revealer5">
-                <property name="visible">True</property>
-                <property name="transition-duration">2000</property>
-                <property name="transition-type">slide-up</property>
-                <child>
-                  <object class="GtkImage" id="image5">
-                    <property name="visible">True</property>
-                    <property name="icon-name">face-cool-symbolic</property>
-                    <property name="icon-size">6</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRevealer" id="revealer6">
-                <property name="visible">True</property>
-                <property name="transition-duration">2000</property>
-                <property name="transition-type">slide-right</property>
-                <child>
-                  <object class="GtkImage" id="image6">
-                    <property name="visible">True</property>
-                    <property name="icon-name">face-cool-symbolic</property>
-                    <property name="icon-size">6</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left-attach">4</property>
-                <property name="top-attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRevealer" id="revealer7">
-                <property name="visible">True</property>
-                <property name="transition-duration">2000</property>
-                <property name="transition-type">slide-down</property>
-                <child>
-                  <object class="GtkImage" id="image7">
-                    <property name="visible">True</property>
-                    <property name="icon-name">face-cool-symbolic</property>
-                    <property name="icon-size">6</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">4</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRevealer" id="revealer8">
-                <property name="visible">True</property>
-                <property name="transition-duration">2000</property>
-                <property name="transition-type">slide-left</property>
-                <child>
-                  <object class="GtkImage" id="image8">
-                    <property name="visible">True</property>
-                    <property name="icon-name">face-cool-symbolic</property>
-                    <property name="icon-size">6</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">2</property>
-              </packing>
            </child>
          </object>
          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="left-attach">2</property>
+            <property name="top-attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkRevealer" id="revealer2">
+            <property name="visible">True</property>
+            <property name="transition-duration">2000</property>
+            <property name="transition-type">slide-right</property>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="icon-name">face-cool-symbolic</property>
+                <property name="icon-size">6</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="left-attach">3</property>
+            <property name="top-attach">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkRevealer" id="revealer3">
+            <property name="visible">True</property>
+            <property name="transition-duration">2000</property>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="icon-name">face-cool-symbolic</property>
+                <property name="icon-size">6</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="left-attach">2</property>
+            <property name="top-attach">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkRevealer" id="revealer4">
+            <property name="visible">True</property>
+            <property name="transition-duration">2000</property>
+            <property name="transition-type">slide-left</property>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="icon-name">face-cool-symbolic</property>
+                <property name="icon-size">6</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkRevealer" id="revealer5">
+            <property name="visible">True</property>
+            <property name="transition-duration">2000</property>
+            <property name="transition-type">slide-up</property>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="icon-name">face-cool-symbolic</property>
+                <property name="icon-size">6</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="left-attach">2</property>
+            <property name="top-attach">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkRevealer" id="revealer6">
+            <property name="visible">True</property>
+            <property name="transition-duration">2000</property>
+            <property name="transition-type">slide-right</property>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="icon-name">face-cool-symbolic</property>
+                <property name="icon-size">6</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="left-attach">4</property>
+            <property name="top-attach">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkRevealer" id="revealer7">
+            <property name="visible">True</property>
+            <property name="transition-duration">2000</property>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="icon-name">face-cool-symbolic</property>
+                <property name="icon-size">6</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="left-attach">2</property>
+            <property name="top-attach">4</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkRevealer" id="revealer8">
+            <property name="visible">True</property>
+            <property name="transition-duration">2000</property>
+            <property name="transition-type">slide-left</property>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="icon-name">face-cool-symbolic</property>
+                <property name="icon-size">6</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">2</property>
          </packing>
        </child>
      </object>
    </child>
-    <action-widgets>
-      <action-widget response="0">button1</action-widget>
-    </action-widgets>
  </object>
 </interface>
--- a/demos/gtk-demo/rotated_text.c
+++ b/demos/gtk-demo/rotated_text.c
@@ -1,4 +1,4 @@
-/* Rotated Text
+/* Pango/Rotated Text
 *
 * This demo shows how to use PangoCairo to draw rotated and transformed
 * text.  The right pane shows a rotated GtkLabel widget.
@@ -11,8 +11,6 @@
 #include <gtk/gtk.h>
 #include <string.h>

-static GtkWidget *window = NULL;
-
 #define HEART "♥"
 const char text[] = "I ♥ GTK+";

@@ -173,6 +171,8 @@ rotated_text_draw (GtkWidget *widget,
 GtkWidget *
 do_rotated_text (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
+
  if (!window)
    {
      GtkWidget *box;
@@ -186,7 +186,8 @@ do_rotated_text (GtkWidget *do_widget)
                             gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Rotated Text");
      gtk_window_set_default_size (GTK_WINDOW (window), 4 * RADIUS, 2 * RADIUS);
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
      gtk_box_set_homogeneous (GTK_BOX (box), TRUE);
@@ -218,14 +219,9 @@ do_rotated_text (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
+    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/row_resize_cursor.png
+++ b/demos/gtk-demo/row_resize_cursor.png
--- a/demos/gtk-demo/s_resize_cursor.png
+++ b/demos/gtk-demo/s_resize_cursor.png
--- a/demos/gtk-demo/se_resize_cursor.png
+++ b/demos/gtk-demo/se_resize_cursor.png
--- a/demos/gtk-demo/search_entry.c
+++ b/demos/gtk-demo/search_entry.c
@@ -167,7 +167,7 @@ activate_cb (GtkEntry  *entry,
 }

 static void
-search_entry_destroyed (GtkWidget  *widget)
+search_entry_destroyed (GtkWidget *widget)
 {
  if (finish_search_id != 0)
    g_source_remove (finish_search_id);
@@ -210,34 +210,24 @@ entry_populate_popup (GtkEntry *entry,
 GtkWidget *
 do_search_entry (GtkWidget *do_widget)
 {
-  GtkWidget *content_area;
  GtkWidget *vbox;
  GtkWidget *hbox;
  GtkWidget *label;
  GtkWidget *entry;
-  GtkWidget *button;
  GtkWidget *find_button;
  GtkWidget *cancel_button;

  if (!window)
    {
-      window = gtk_dialog_new_with_buttons ("Search Entry",
-                                            GTK_WINDOW (do_widget),
-                                            0,
-                                            _("_Close"),
-                                            GTK_RESPONSE_NONE,
-                                            NULL);
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window), gtk_widget_get_screen (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "Search Entry");
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-
-      g_signal_connect (window, "response",
-                        G_CALLBACK (gtk_widget_destroy), NULL);
      g_signal_connect (window, "destroy",
                        G_CALLBACK (search_entry_destroyed), &window);

-      content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+      gtk_container_add (GTK_CONTAINER (window), vbox);
      gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);

      label = gtk_label_new (NULL);
@@ -284,12 +274,9 @@ do_search_entry (GtkWidget *do_widget)
      gtk_menu_attach_to_widget (GTK_MENU (menu), entry, NULL);

      /* add accessible alternatives for icon functionality */
+      g_object_set (entry, "populate-all", TRUE, NULL);
      g_signal_connect (entry, "populate-popup",
                        G_CALLBACK (entry_populate_popup), NULL);
-
-      /* Give the focus to the close button */
-      button = gtk_dialog_get_widget_for_response (GTK_DIALOG (window), GTK_RESPONSE_NONE);
-      gtk_widget_grab_focus (button);
    }

  if (!gtk_widget_get_visible (window))
@@ -298,7 +285,6 @@ do_search_entry (GtkWidget *do_widget)
    {
      gtk_widget_destroy (menu);
      gtk_widget_destroy (window);
-      window = NULL;
    }

  return window;
--- a/demos/gtk-demo/search_entry2.c
+++ b/demos/gtk-demo/search_entry2.c
@@ -8,14 +8,6 @@

 #include <gtk/gtk.h>

-static GtkWidget *window = NULL;
-
-static void
-search_entry_destroyed (GtkWidget  *widget)
-{
-  window = NULL;
-}
-
 static void
 search_changed_cb (GtkSearchEntry *entry,
                   GtkLabel       *result_label)
@@ -73,6 +65,7 @@ stop_search (GtkSearchEntry *entry,
 GtkWidget *
 do_search_entry2 (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
  GtkWidget *vbox;
  GtkWidget *hbox;
  GtkWidget *label;
@@ -84,13 +77,13 @@ do_search_entry2 (GtkWidget *do_widget)
  if (!window)
    {
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_title (GTK_WINDOW (window), "Search Entry #2");
+      gtk_window_set_title (GTK_WINDOW (window), "Delayed Search Entry");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
      gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
      gtk_widget_set_size_request (window, 200, -1);

      g_signal_connect (window, "destroy",
-                        G_CALLBACK (search_entry_destroyed), &window);
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
      gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -164,10 +157,7 @@ do_search_entry2 (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/sidebar.c
+++ b/demos/gtk-demo/sidebar.c
@@ -9,11 +9,10 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

-static GtkWidget *window = NULL;
-
 GtkWidget *
 do_sidebar (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
  GtkWidget *sidebar;
  GtkWidget *stack;
  GtkWidget *box;
@@ -43,7 +42,7 @@ do_sidebar (GtkWidget *do_widget)
      header = gtk_header_bar_new ();
      gtk_header_bar_set_show_close_button (GTK_HEADER_BAR(header), TRUE);
      gtk_window_set_titlebar (GTK_WINDOW(window), header);
-      gtk_window_set_title (GTK_WINDOW(window), "Stack Sidebar demo");
+      gtk_window_set_title (GTK_WINDOW(window), "Stack Sidebar");

      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);
--- a/demos/gtk-demo/sizegroup.c
+++ b/demos/gtk-demo/sizegroup.c
@@ -16,8 +16,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

-static GtkWidget *window = NULL;
-
 /* Convenience function to create a combo box holding a number of strings
 */
 GtkWidget *
@@ -48,12 +46,14 @@ add_row (GtkGrid      *table,

  label = gtk_label_new_with_mnemonic (label_text);
  gtk_widget_set_halign (label, GTK_ALIGN_START);
-  gtk_widget_set_valign (label, GTK_ALIGN_END);
+  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
  gtk_widget_set_hexpand (label, TRUE);
  gtk_grid_attach (table, label, 0, row, 1, 1);

  combo_box = create_combo_box (options);
  gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo_box);
+  gtk_widget_set_halign (combo_box, GTK_ALIGN_END);
+  gtk_widget_set_valign (combo_box, GTK_ALIGN_BASELINE);
  gtk_size_group_add_widget (size_group, combo_box);
  gtk_grid_attach (table, combo_box, 1, row, 1, 1);
 }
@@ -79,7 +79,7 @@ toggle_grouping (GtkToggleButton *check_button,
 GtkWidget *
 do_sizegroup (GtkWidget *do_widget)
 {
-  GtkWidget *content_area;
+  static GtkWidget *window = NULL;
  GtkWidget *table;
  GtkWidget *frame;
  GtkWidget *vbox;
@@ -95,28 +95,20 @@ do_sizegroup (GtkWidget *do_widget)
  };

  static const char *end_options[] = {
-    "Square", "Round", "Arrow", NULL
+    "Square", "Round", "Double Arrow", NULL
  };

  if (!window)
    {
-      window = gtk_dialog_new_with_buttons ("GtkSizeGroup",
-                                            GTK_WINDOW (do_widget),
-                                            0,
-                                            _("_Close"),
-                                            GTK_RESPONSE_NONE,
-                                            NULL);
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window), gtk_widget_get_screen (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "Size Groups");
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-
-      g_signal_connect (window, "response",
-                        G_CALLBACK (gtk_widget_destroy), NULL);
      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);

-      content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+      gtk_container_add (GTK_CONTAINER (window), vbox);
      gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);

      size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
--- a/demos/gtk-demo/spinbutton.c
+++ b/demos/gtk-demo/spinbutton.c
@@ -0,0 +1,253 @@
+/* Spin Button
+ *
+ * GtkSpinButton provides convenient ways to input data
+ * that can be seen as a value in a range. The examples
+ * here show that this does not necessarily mean numeric
+ * values, and it can include custom formatting.
+ */
+
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+#include <math.h>
+#include <stdlib.h>
+
+static gint
+hex_spin_input (GtkSpinButton *spin_button,
+                gdouble       *new_val)
+{
+  const gchar *buf;
+  gchar *err;
+  gdouble res;
+
+  buf = gtk_entry_get_text (GTK_ENTRY (spin_button));
+  res = strtol (buf, &err, 16);
+  *new_val = res;
+  if (*err)
+    return GTK_INPUT_ERROR;
+  else
+    return TRUE;
+}
+
+static gint
+hex_spin_output (GtkSpinButton *spin_button)
+{
+  GtkAdjustment *adjustment;
+  gchar *buf;
+  gint val;
+
+  adjustment = gtk_spin_button_get_adjustment (spin_button);
+  val = (gint) gtk_adjustment_get_value (adjustment);
+  if (fabs (val) < 1e-5)
+    buf = g_strdup ("0x00");
+  else
+    buf = g_strdup_printf ("0x%.2X", val);
+  if (strcmp (buf, gtk_entry_get_text (GTK_ENTRY (spin_button))))
+    gtk_entry_set_text (GTK_ENTRY (spin_button), buf);
+  g_free (buf);
+
+  return TRUE;
+}
+
+static gint
+time_spin_input (GtkSpinButton *spin_button,
+                 gdouble       *new_val)
+{
+  const gchar *text;
+  gchar **str;
+  gboolean found = FALSE;
+  gint hours;
+  gint minutes;
+  gchar *endh;
+  gchar *endm;
+
+  text = gtk_entry_get_text (GTK_ENTRY (spin_button));
+  str = g_strsplit (text, ":", 2);
+
+  if (g_strv_length (str) == 2)
+    {
+      hours = strtol (str[0], &endh, 10);
+      minutes = strtol (str[1], &endm, 10);
+      if (!*endh && !*endm &&
+          0 <= hours && hours < 24 &&
+          0 <= minutes && minutes < 60)
+        {
+          *new_val = hours * 60 + minutes;
+          found = TRUE;
+        }
+    }
+
+  g_strfreev (str);
+
+  if (!found)
+    {
+      *new_val = 0.0;
+      return GTK_INPUT_ERROR;
+    }
+
+  return TRUE;
+}
+
+static gint
+time_spin_output (GtkSpinButton *spin_button)
+{
+  GtkAdjustment *adjustment;
+  gchar *buf;
+  gdouble hours;
+  gdouble minutes;
+
+  adjustment = gtk_spin_button_get_adjustment (spin_button);
+  hours = gtk_adjustment_get_value (adjustment) / 60.0;
+  minutes = (hours - floor (hours)) * 60.0;
+  buf = g_strdup_printf ("%02.0f:%02.0f", floor (hours), floor (minutes + 0.5));
+  if (strcmp (buf, gtk_entry_get_text (GTK_ENTRY (spin_button))))
+    gtk_entry_set_text (GTK_ENTRY (spin_button), buf);
+  g_free (buf);
+
+  return TRUE;
+}
+
+static gchar *month[12] = {
+  "January",
+  "February",
+  "March",
+  "April",
+  "May",
+  "June",
+  "July",
+  "August",
+  "September",
+  "October",
+  "November",
+  "December"
+};
+
+static gint
+month_spin_input (GtkSpinButton *spin_button,
+                  gdouble       *new_val)
+{
+  gint i;
+  gchar *tmp1, *tmp2;
+  gboolean found = FALSE;
+
+  for (i = 1; i <= 12; i++)
+    {
+      tmp1 = g_ascii_strup (month[i - 1], -1);
+      tmp2 = g_ascii_strup (gtk_entry_get_text (GTK_ENTRY (spin_button)), -1);
+      if (strstr (tmp1, tmp2) == tmp1)
+        found = TRUE;
+      g_free (tmp1);
+      g_free (tmp2);
+      if (found)
+        break;
+    }
+  if (!found)
+    {
+      *new_val = 0.0;
+      return GTK_INPUT_ERROR;
+    }
+  *new_val = (gdouble) i;
+
+  return TRUE;
+}
+
+static gint
+month_spin_output (GtkSpinButton *spin_button)
+{
+  GtkAdjustment *adjustment;
+  gdouble value;
+  gint i;
+
+  adjustment = gtk_spin_button_get_adjustment (spin_button);
+  value = gtk_adjustment_get_value (adjustment);
+  for (i = 1; i <= 12; i++)
+    if (fabs (value - (double)i) < 1e-5)
+      {
+        if (strcmp (month[i-1], gtk_entry_get_text (GTK_ENTRY (spin_button))))
+          gtk_entry_set_text (GTK_ENTRY (spin_button), month[i-1]);
+      }
+
+  return TRUE;
+}
+
+static gboolean
+value_to_label (GBinding     *binding,
+                const GValue *from,
+                GValue       *to,
+                gpointer      user_data)
+{
+  g_value_take_string (to, g_strdup_printf ("%g", g_value_get_double (from)));
+  return TRUE;
+}
+
+GtkWidget *
+do_spinbutton (GtkWidget *do_widget)
+{
+  static GtkWidget *window;
+
+  if (!window)
+  {
+    GtkBuilder *builder;
+    GtkAdjustment *adj;
+    GtkWidget *label;
+
+    builder = gtk_builder_new_from_resource ("/spinbutton/spinbutton.ui");
+    gtk_builder_add_callback_symbols (builder,
+                                      "hex_spin_input", G_CALLBACK (hex_spin_input),
+                                      "hex_spin_output", G_CALLBACK (hex_spin_output),
+                                      "time_spin_input", G_CALLBACK (time_spin_input),
+                                      "time_spin_output", G_CALLBACK (time_spin_output),
+                                      "month_spin_input", G_CALLBACK (month_spin_input),
+                                      "month_spin_output", G_CALLBACK (month_spin_output),
+                                      NULL);
+    gtk_builder_connect_signals (builder, NULL);
+    window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
+    gtk_window_set_screen (GTK_WINDOW (window),
+                           gtk_widget_get_screen (do_widget));
+    gtk_window_set_title (GTK_WINDOW (window), "Spin Buttons");
+    gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+    g_signal_connect (window, "destroy",
+                      G_CALLBACK (gtk_widget_destroyed), &window);
+
+    adj = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "basic_adjustment"));
+    label = GTK_WIDGET (gtk_builder_get_object (builder, "basic_label"));
+    g_object_bind_property_full (adj, "value",
+                                 label, "label",
+                                 G_BINDING_SYNC_CREATE,
+                                 value_to_label,
+                                 NULL,
+                                 NULL, NULL);
+    adj = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "hex_adjustment"));
+    label = GTK_WIDGET (gtk_builder_get_object (builder, "hex_label"));
+    g_object_bind_property_full (adj, "value",
+                                 label, "label",
+                                 G_BINDING_SYNC_CREATE,
+                                 value_to_label,
+                                 NULL,
+                                 NULL, NULL);
+    adj = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "time_adjustment"));
+    label = GTK_WIDGET (gtk_builder_get_object (builder, "time_label"));
+    g_object_bind_property_full (adj, "value",
+                                 label, "label",
+                                 G_BINDING_SYNC_CREATE,
+                                 value_to_label,
+                                 NULL,
+                                 NULL, NULL);
+    adj = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "month_adjustment"));
+    label = GTK_WIDGET (gtk_builder_get_object (builder, "month_label"));
+    g_object_bind_property_full (adj, "value",
+                                 label, "label",
+                                 G_BINDING_SYNC_CREATE,
+                                 value_to_label,
+                                 NULL,
+                                 NULL, NULL);
+
+    g_object_unref (builder);
+  }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show_all (window);
+  else
+    gtk_widget_destroy (window);
+
+  return window;
+}
--- a/demos/gtk-demo/spinbutton.ui
+++ b/demos/gtk-demo/spinbutton.ui
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkAdjustment" id="basic_adjustment">
+    <property name="lower">-10000</property>
+    <property name="upper">10000</property>
+    <property name="value">0</property>
+    <property name="step_increment">0.5</property>
+    <property name="page_increment">100</property>
+    <property name="page_size">0</property>
+  </object>
+  <object class="GtkAdjustment" id="hex_adjustment">
+    <property name="lower">0</property>
+    <property name="upper">255</property>
+    <property name="value">0</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">16</property>
+    <property name="page_size">0</property>
+  </object>
+  <object class="GtkAdjustment" id="time_adjustment">
+    <property name="lower">0</property>
+    <property name="upper">1410</property>
+    <property name="value">0</property>
+    <property name="step_increment">30</property>
+    <property name="page_increment">60</property>
+    <property name="page_size">0</property>
+  </object>
+  <object class="GtkAdjustment" id="month_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">12</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">5</property>
+    <property name="page_size">0</property>
+  </object>
+  <object class="GtkWindow" id="window">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Spin Button</property>
+    <child>
+      <object class="GtkGrid">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin">20</property>
+        <property name="row-spacing">10</property>
+        <property name="column-spacing">10</property>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="label">_Numeric</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">basic_spin</property>
+            <property name="xalign">1</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkSpinButton" id="basic_spin">
+            <property name="visible">True</property>
+            <property name="halign">start</property>
+            <property name="width_chars">5</property>
+            <property name="adjustment">basic_adjustment</property>
+            <property name="climb_rate">1</property>
+            <property name="digits">2</property>
+            <property name="numeric">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="basic_label">
+            <property name="visible">True</property>
+            <property name="width_chars">10</property>
+            <property name="xalign">1</property>
+          </object>
+          <packing>
+            <property name="left_attach">2</property>
+            <property name="top_attach">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="label">_Hexadecimal</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">hex_spin</property>
+            <property name="xalign">1</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkSpinButton" id="hex_spin">
+            <property name="visible">True</property>
+            <property name="halign">start</property>
+            <property name="width_chars">4</property>
+            <property name="adjustment">hex_adjustment</property>
+            <signal name="input" handler="hex_spin_input"/>
+            <signal name="output" handler="hex_spin_output"/>
+            <property name="wrap">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="hex_label">
+            <property name="visible">True</property>
+            <property name="width_chars">10</property>
+            <property name="xalign">1</property>
+          </object>
+          <packing>
+            <property name="left_attach">2</property>
+            <property name="top_attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="label">_Time</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">time_spin</property>
+            <property name="xalign">1</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkSpinButton" id="time_spin">
+            <property name="visible">True</property>
+            <property name="halign">start</property>
+            <property name="width_chars">5</property>
+            <property name="adjustment">time_adjustment</property>
+            <signal name="input" handler="time_spin_input"/>
+            <signal name="output" handler="time_spin_output"/>
+            <property name="wrap">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="time_label">
+            <property name="visible">True</property>
+            <property name="width_chars">10</property>
+            <property name="xalign">1</property>
+          </object>
+          <packing>
+            <property name="left_attach">2</property>
+            <property name="top_attach">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="label">_Month</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">month_spin</property>
+            <property name="xalign">1</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkSpinButton" id="month_spin">
+            <property name="visible">True</property>
+            <property name="halign">start</property>
+            <property name="width_chars">9</property>
+            <signal name="input" handler="month_spin_input"/>
+            <signal name="output" handler="month_spin_output"/>
+            <property name="adjustment">month_adjustment</property>
+            <property name="wrap">True</property>
+            <property name="update_policy">if-valid</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="month_label">
+            <property name="visible">True</property>
+            <property name="width_chars">10</property>
+            <property name="xalign">1</property>
+          </object>
+          <packing>
+            <property name="left_attach">2</property>
+            <property name="top_attach">3</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
--- a/demos/gtk-demo/spinner.c
+++ b/demos/gtk-demo/spinner.c
@@ -7,7 +7,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

-static GtkWidget *window = NULL;
 static GtkWidget *spinner_sensitive = NULL;
 static GtkWidget *spinner_unsensitive = NULL;

@@ -28,6 +27,7 @@ on_stop_clicked (GtkButton *button, gpointer user_data)
 GtkWidget *
 do_spinner (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
  GtkWidget *content_area;
  GtkWidget *vbox;
  GtkWidget *hbox;
@@ -36,7 +36,7 @@ do_spinner (GtkWidget *do_widget)

  if (!window)
  {
-    window = gtk_dialog_new_with_buttons ("GtkSpinner",
+    window = gtk_dialog_new_with_buttons ("Spinner",
                                          GTK_WINDOW (do_widget),
                                          0,
                                          _("_Close"),
--- a/demos/gtk-demo/stack.c
+++ b/demos/gtk-demo/stack.c
@@ -8,40 +8,30 @@

 #include <gtk/gtk.h>

-static GtkBuilder *builder;
-
 GtkWidget *
 do_stack (GtkWidget *do_widget)
 {
  static GtkWidget *window = NULL;
-  GError *err = NULL;

  if (!window)
    {
-      builder = gtk_builder_new ();
-      gtk_builder_add_from_resource (builder, "/stack/stack.ui", &err);
-      if (err)
-        {
-          g_error ("ERROR: %s\n", err->message);
-          return NULL;
-        }
+      GtkBuilder *builder;
+
+      builder = gtk_builder_new_from_resource ("/stack/stack.ui");
      gtk_builder_connect_signals (builder, NULL);
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
      gtk_window_set_screen (GTK_WINDOW (window),
                             gtk_widget_get_screen (do_widget));
      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      g_object_unref (builder);
    }

  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
+    gtk_widget_show_all (window);
  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
+    gtk_widget_destroy (window);


  return window;
--- a/Show More
+++ b/Show More