Per-glyph instance for color text as well

Doesn't quite work yet

CONTRIBUTING.md

@@ -0,0 +1,40 @@
+If you want to hack on the GTK+ project, you'll need to have the development
+tools appropriate for your operating system, including:
+
+	- Python (2.7 or 3.x)
+	- Meson
+	- Ninja
+	- Gettext (19.7 or newer)
+	- a C99 compatible compiler
+
+Up-to-date instructions about developing GNOME applications and libraries
+can be found here:
+
+        https://developer.gnome.org
+
+Information about using git with GNOME can be found here:
+
+        https://wiki.gnome.org/Git
+
+In order to get Git GTK+ installed on your system, you need to have the
+required versions of all the GTK+ dependencies; typically, this means a
+recent version of GLib, Cairo, Pango, and ATK.
+
+**Note**: if you plan to push changes to back to the master repository and
+have a GNOME account, you want to use the following instead:
+
+```sh
+$ git clone ssh://<username>@git.gnome.org/git/gtk+
+```
+
+To compile the Git version of GTK+ on your system, you will need to
+configure your build using Meson:
+
+```sh
+$ meson _builddir .
+```
+
+For information about submitting patches and pushing changes to Git, see the
+`README.md` and `README.commits` files. In particular, don't, under any
+circumstances, push anything to Git before reading and understanding
+`README.commmits`.

HACKING

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

INSTALL.in

@@ -1,42 +0,0 @@
-Prerequisites
-=============
-
-GTK+ requires the following packages:
-
- - The GLib, Pango, GdkPixbuf, ATK and cairo libraries, available at
-   the same location as GTK+. GTK+ @GTK_VERSION@ requires at least
-   GLib @GLIB_REQUIRED_VERSION@, Pango @PANGO_REQUIRED_VERSION@,
-   GdkPixbuf @GDK_PIXBUF_REQUIRED_VERSION@, ATK @ATK_REQUIRED_VERSION@
-   and cairo @CAIRO_REQUIRED_VERSION@.
-
- - libepoxy, for cross-platform OpenGL support.
-   It can be found here: https://github.com/anholt/libepoxy
-
- - Each GDK backend has its own backend-specific requirements. For
-   the X11 backend, X11 R6 and XInput version 2 (as well as a number
-   of other extensions) are required. The Wayland backend requires
-   (obviously) the Wayland libraries.
-
- - gobject-introspection @INTROSPECTION_REQUIRED_VERSION@ or newer.
-
-Simple install procedure
-========================
-
-  % tar xf gtk+-@GTK_VERSION@.tar.xz          # unpack the sources
-  % cd gtk+-@GTK_VERSION@                     # change to the toplevel directory
-  % ./configure                        # run the `configure' script
-  % make                               # build GTK+
-  [ Become root if necessary ]
-  % make install                       # install GTK+
-
-The Details
-===========
-
-Complete information about installing GTK+ and related libraries
-can be found in the file:
-
- docs/reference/gtk/html/gtk-building.html
-
-Or online at:
-
- http://library.gnome.org/devel/gtk/stable/gtk-building.html

MAINTAINERS

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

Makefile.am

@@ -1,97 +0,0 @@
-## Makefile.am for GTK+
-include $(top_srcdir)/Makefile.decl
-
-SRC_SUBDIRS = gdk gsk gtk modules demos tests testsuite examples
-SUBDIRS = po po-properties $(SRC_SUBDIRS) docs win32
-
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
-EXTRA_DIST +=			\
-	autogen.sh		\
-	HACKING			\
-	README			\
-	README.in		\
-	INSTALL			\
-	INSTALL.in		\
-	NEWS.pre-1-0		\
-	README.commits		\
-	README.win32		\
-	config.h.win32		\
-	makefile.msc		\
-	gtk-zip.sh.in		\
-	sanitize-la.sh		\
-	po/README.translators	\
-	po/po2tbl.sed.in	\
-	make-pot
-
-MAINTAINERCLEANFILES = \
-	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
-	$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
-	$(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
-	$(srcdir)/m4/gtk-doc.m4 \
-	$(srcdir)/INSTALL \
-	$(srcdir)/README \
-	$(srcdir)/gtk-doc.make \
-	$(srcdir)/ChangeLog
-
-
-## Copy .pc files to target-specific names
-gtk+-x11-4.0.pc gtk+-win32-4.0.pc gtk+-quartz-4.0.pc gtk+-broadway-4.0.pc gtk+-wayland-4.0.pc gtk+-mir-4.0.pc: gtk+-4.0.pc
-	rm -f $@ && \
-	cp gtk+-4.0.pc $@
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gtk+-4.0.pc gail-4.0.pc
-pkgconfig_DATA += ${GDK_BACKENDS:%=gtk+-%-4.0.pc}
-
-if OS_UNIX
-pkgconfig_DATA += gtk+-unix-print-4.0.pc
-endif
-
-DISTCLEANFILES = \
-	gtk+-unix-print-4.0.pc		\
-	gtk+-4.0.pc			\
-	gtk+-x11-4.0.pc			\
-	gtk+-win32-4.0.pc		\
-	gtk+-quartz-4.0.pc		\
-	gtk+-broadway-4.0.pc		\
-	gtk+-wayland-4.0.pc		\
-	gtk+-mir-4.0.pc			\
-	gail-4.0.pc			\
-	config.lt
-
-distclean-local:
-	if test "$(srcdir)" = "."; then :; else \
-		rm -f ChangeLog; \
-	fi
-
-ChangeLog:
-	$(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
-	  (GIT_DIR=$(top_srcdir)/.git $(top_builddir)/build-aux/missing git log GTK_2_16_0^^.. --stat) | fmt --split-only > $@.tmp \
-	  && mv -f $@.tmp $@ \
-	  || ($(RM) $@.tmp; \
-	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
-	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
-	else \
-	  test -f $@ || \
-	  (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
-	  echo A git checkout and git-log is required to generate this file >> $@); \
-	fi
-
-.PHONY: ChangeLog
-
-uninstall-local:
-	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-4.0.pc
-
-AM_DISTCHECK_CONFIGURE_FLAGS =		\
-	--enable-gtk-doc 		\
-	--disable-doc-cross-references  \
-	--enable-man 			\
-	--disable-maintainer-mode 	\
-	--enable-introspection  	\
-	--enable-installed-tests
-
-GITIGNORE_TRANSLATION_DIRS = po-properties
-GITIGNOREFILES = po-properties/gtk40-properties.pot
-
--include $(top_srcdir)/git.mk

Makefile.decl

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

NEWS

@@ -1,3 +1,163 @@
+Overview of Changes in GTK+ 3.91.2
+==================================
+
+* All widgets are drawing CSS backgrounds and borders
+
+* All gadgets have been replaced by widgets
+
+* GtkSpinButton no longer derives from GtkEntry
+
+* GtkScrollbar no longer derives from GtkRange
+
+* GtkAccelLabel no longer derives from GtkLabel
+
+* All remaining style properties have been removed
+
+* A new 'widget bowl' demo has been added in gtk4-demo
+
+* GtkEventBox has been removed. It is no longer needed
+
+* Add support for entering emoji by name using Ctrl-Shift-e
+
+* Wayland:
+ - Support Wacom tablet wheel scrolling
+ - Support the shortcut inhibitor protocol
+
+* Bugs fixed:
+ 776903 Label with hyperlinks cannot be opened with touch on wayland
+ 776909 gtk_adjustment_clamp_page: Conditional jump or move depends on unin...
+ 777333 In a GNOME Wayland session, gnome-terminal windows cannot be moved ...
+ 777515 gtk3-icon-browser doesn't list document-edit-symbolic icon
+ 778188 TE crashes on multiple repeated BELL chars
+ 780938 No icon tooltip shown in GtkEntry
+ 781246 Return value of gtk_widget_get_parent_window should be marked (nullable)
+ 783343 wayland: RFC - add shortcut inhibitor support
+ 783906 gtk_accelerator_get_label broken
+ 784016 Crash in gnome-terminal due to calling a GdkDisplayClass vfunc on a ...
+ 784624 process-stop-symbolic hardcoded as app menu fallback
+ 785280 GtkCenterBox: No G_BEGIN_DECLS and G_END_DECLS in gtkcenterbox.h
+ 785318 GtkActionBar: g_object_class_install_properties() is not called
+ 785375 Cursors for Wacom tablets are not always updated correctly under Wayland
+ 785423 Missing nullable annotation for gtk_bin_get_child
+ 785672 Entry: Setting icon tooltip to empty disables tooltip on whole widget
+ 785793 gsk_color_matrix_node_draw leaking cairo_pattern_t
+
+* Translation updates:
+ Croatian
+ Czech
+ Friulian
+ Indonesian
+ Punjabi
+ Slovenian
+ Spanish
+
+
+Overview of Changes in GTK+ 3.91.1
+==================================
+
+* Redo event delivery and focus handling and grabs, and stop using
+  subwindows for widgets. API changes due to this include:
+  - a new GtkWidget::pick vfunc
+  - drop event mask apis
+  - drop windows from gestures
+
+* The prelight state is now automatically set on widgets
+
+* New widget: GtkCenterBox. This widget provides the center child
+  functionality that used to be part of GtkBox
+
+* Wayland
+ - Improve the key repeat implementation
+ - Set vid/pid on tablet devices
+
+* OS X:
+ - Add native file chooser support
+
+* Bugs fixed:
+ 745289 wayland: do not use g_error() on connection errors
+ 759308 Instant apply in printing dialog (number of copies)
+ 766517 GtkAboutDialog should use https:// license URLs
+ 770513 MainToolbar in full-screen mode has rounded corners, which show video pix...
+ 772281 Quartz backend: gtk_clipboard_get_selection not implemented
+ 773299 Ensure GTK+-4.x builds and works on Windows (MSVC in particular)
+ 775636 "New folder" creation popover warnings about trailing spaces flashes in...
+ 781285 Key repeat cancel under Wayland should depend on which key is repeating
+ 781583 gtk_image_new_from_resource does not work
+ 781935 Add nullable return annotation to gtk_notebook_get_tab_label
+ 781945 SIGSEGV dragging window on Wayland when toplevel window set_transient_for...
+ 782040 Wacom pen calibration application responds to mouse input
+ 782283 Wayland: Crash when dismissing a menu when a tooltip is visible
+ 783047 Many apps crash in gdk_event_source_prepare when logging out of GNOME
+ 783347 gtkfilechoosernativewin32: Fix support for non-ASCII paths
+ 783397 Remove unused code in gtktextdisplay.c
+ 783445 Incomplete documentation of gtk_widget_insert_after/before()
+ 783587 Crash when NULL is passed to GtkActionHelper to unset action-name
+ 784323 Quartz backend: gtk_clipboard_get_default not implemented
+ 784723 macOS: native file chooser dialog
+ 784888 gtkapplication: Mark gtk_application_get_active_window() as nullable
+
+* Translation updates:
+ Catalan
+ Czech
+ Friulian
+ Hebrew
+ Kazakh
+ Norwegian bokmål
+ Spanish
+
+
+Overview of Changes in GTK+ 3.91.0
+==================================
+
+* Initial support for OS X has been merged
+
+* Initial support for building with meson has been added
+
+* New API:
+ - gtk_widget_insert_before/after
+
+* Removed API:
+ - GtkBox has lost its expand and fill child properties, use
+   the general align property for it
+ - GtkLabel has lost its angle property, it will be replaced by general
+   widget transformation support in the future
+ - GtkWindow has lost its hide-titlebar-when-maximized property
+ - GtkBox has lost its center child support
+ - The compat keysym definitions have been removed
+
+* Bugs fixed:
+ 769881 Preliminary Meson build files
+ 771269 Open in new tab / window doesn't work on unmounted file systems
+ 778301 GtkTooltip doesn't clear source ID in all circumstances
+ 778853 propagate-natural-width/height request too much with !overlay-scrolling...
+ 779078 Adwaita: last treeview header button adds border on hover
+ 779184 Gtk+4 (3.89.4) with Quartz backend: all apps segfault
+ 780041 Optionally depend on sassc to generate the theme CSS
+ 780301 wayland: Fix harmless clang warnings
+ 780734 flowbox: don’t try to focus or draw NULL widgets
+ 780878 docs: Point links to correct versions
+ 780944 Please add a specific CSS class for appmenu button in GtkHeaderBar
+ 781162 Make GtkPlacesView monitor network
+ 781195 Fix testsuite for GtkPlacesView
+ 781214 define entry-tag in Adwaita.
+ 781422 translate_wm_button_layout_to_gtk() is licensed under the GPL
+ 781622 gtkplacesview.ui: Update helper label to include IPv6 addresses
+ 781737 Drag icon is always postioned in the top left corner
+ 781767 Wayland: increase key delivery verbosity
+ 781992 GtkMenuButton with no popover retains prelight state when no longer sel...
+ 782109 wayland: memory leak when exporting handle
+ 782202 linkbutton: Fix memory leak
+
+* Translation updates:
+ Croatian
+ Greek
+ Hungarian
+ Indonesian
+ Polish
+ Russian
+ Slovenian
+
+
 Overview of Changes in GTK+ 3.90.0
 ==================================
 

README.in

@@ -1,82 +0,0 @@
-General Information
-===================
-
-This is GTK+ version @GTK_VERSION@. GTK+ is a multi-platform toolkit for
-creating graphical user interfaces. Offering a complete set of widgets,
-GTK+ is suitable for projects ranging from small one-off projects to
-complete application suites.
-
-GTK+ is free software and part of the GNU Project. However, the
-licensing terms for GTK+, the GNU LGPL, allow it to be used by all
-developers, including those developing proprietary software, without any
-license fees or royalties.
-
-The official download locations are:
-  ftp://ftp.gtk.org/pub/gtk
-  http://download.gnome.org/sources/gtk+
-
-The official web site is:
-  http://www.gtk.org/
-
-Information about mailing lists can be found at
-  http://www.gtk.org/mailing-lists.php
-
-
-Installation
-============
-
-See the file 'INSTALL'
-
-
-How to report bugs
-==================
-
-Bugs should be reported to the GNOME bug tracking system.
-(http://bugzilla.gnome.org, product glib.) You will need
-to create an account for yourself.
-
-In the bug report please include:
-
-* Information about your system. For instance:
-
-   - What operating system and version
-   - For Linux, what version of the C library
-
-  And anything else you think is relevant.
-
-* How to reproduce the bug.
-
-  If you can reproduce it with one of the test programs that are built
-  in the tests/ subdirectory, that will be most convenient.  Otherwise,
-  please include a short test program that exhibits the behavior.
-  As a last resort, you can also provide a pointer to a larger piece
-  of software that can be downloaded.
-
-* If the bug was a crash, the exact text that was printed out
-  when the crash occurred.
-
-* Further information such as stack traces may be useful, but
-  is not necessary.
-
-
-Patches
-=======
-
-Patches should also be submitted to bugzilla.gnome.org. If the
-patch fixes an existing bug, add the patch as an attachment
-to that bug report.
-
-Otherwise, enter a new bug report that describes the patch,
-and attach the patch to that bug report.
-
-Patches should be in unified diff form. (The -up option to GNU diff)
-Even better are git-formatted patches. (Use git format-patch)
-
-
-Release notes
-=============
-
-Release notes for releases of GTK+ 3.x are part of the migration
-guide in the GTK+ documentation. See
-
-https://developer.gnome.org/gtk3/unstable/gtk-migrating-2-to-3.html

README.md

@@ -0,0 +1,170 @@
+GTK+ — The GTK toolkit
+======================
+
+General information
+-------------------
+
+GTK+ is a multi-platform toolkit for creating graphical user interfaces.
+Offering a complete set of widgets, GTK+ is suitable for projects ranging
+from small one-off projects to complete application suites.
+
+GTK+ is free software and part of the GNU Project. However, the
+licensing terms for GTK+, the GNU LGPL, allow it to be used by all
+developers, including those developing proprietary software, without any
+license fees or royalties.
+
+The official download location
+
+  - https://download.gnome.org/sources/gtk+
+
+The official web site
+
+  - https://www.gtk.org
+
+The official developers blog
+
+  - https://blog.gtk.org
+
+Information about mailing lists can be found at
+
+  - http://www.gtk.org/mailing-lists.php
+
+Building and installing
+-----------------------
+
+In order to build GTK+ you will need:
+
+  - a C99 compatible compiler
+  - Python 3
+  - [Meson](http://mesonbuild.com)
+  - [Ninja](https://ninja-build.org)
+
+You will also need various dependencies, based on the platform you are
+building for:
+
+  - [GLib](https://download.gnome.org/sources/glib)
+  - [GdkPixbuf](https://download.gnome.org/sources/gdk-pixbuf)
+  - [GObject-Introspection](https://download.gnome.org/sources/gobject-introspection)
+  - [Cairo](https://www.cairographics.org)
+  - [Pango](https://download.gnome.org/sources/pango)
+  - [Epoxy](https://github.com/anholt/libepoxy)
+  - [Graphene](https://github.com/ebassi/graphene)
+  - [ATK](https://download.gnome.org/sources/atk)
+  - [Xkb-common](https://github.com/xkbcommon/libxkbcommon)
+
+If you are building the X11 backend, you will also need:
+
+  - Xlib, and the following X extensions:
+    - xrandr
+    - xrender
+    - xi
+    - xext
+    - xfixes (optional)
+    - xcursor (optional)
+    - xdamage (optional)
+    - xcomposite (optional)
+  - [atk-bridge-2.0](https://download.gnome.org/sources/at-spi2-atk)
+
+If you are building the Wayland backend, you will also need:
+
+  - Wayland-client
+  - Wayland-protocols
+  - Wayland-cursor
+  - Wayland-EGL
+
+Once you have all the necessary dependencies, you can build GTK+ by using
+Meson:
+
+```sh
+$ meson _build .
+$ cd _build
+$ ninja
+```
+
+You can run the test suite using:
+
+```sh
+$ meson test
+```
+
+And, finally, you can install GTK+ using:
+
+```
+$ sudo ninja install
+```
+
+Complete information about installing GTK+ and related libraries
+can be found in the file:
+
+```
+docs/reference/gtk/html/gtk-building.html
+```
+
+Or [online](https://developer.gnome.org/gtk4/stable/gtk-building.html)
+
+How to report bugs
+------------------
+
+Bugs should be reported to the GNOME [bug tracking system](https://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2b).
+You will need an account for yourself.
+
+In the bug report please include:
+
+* Information about your system. For instance:
+
+   - which version of GTK+ you are using
+   - what operating system and version
+   - for Linux, which distribution
+   - if you built GTK+, the list of options used to configure the build
+
+  And anything else you think is relevant.
+
+* How to reproduce the bug.
+
+  If you can reproduce it with one of the test programs that are built
+  in the tests/ subdirectory, that will be most convenient.  Otherwise,
+  please include a short test program that exhibits the behavior.
+  As a last resort, you can also provide a pointer to a larger piece
+  of software that can be downloaded.
+
+* If the bug was a crash, the exact text that was printed out
+  when the crash occurred.
+
+* Further information such as stack traces may be useful, but
+  is not necessary.
+
+
+Contributing
+------------
+
+Patches should also be submitted to the bug tracking system. If the patch
+fixes an existing bug, add the patch as an attachment to that bug report;
+otherwise, enter a new bug report that describes the patch, and attach the
+patch to that bug report.
+
+Patches should be in Git-formatted form. You should use `git format-patch`
+to generate them. We recommend using [git-bz](http://git.fishsoup.net/man/git-bz.html).
+
+For more information on the recommended workflow, please read
+[this wiki page](https://wiki.gnome.org/Git/WorkingWithPatches).
+
+Please, follow the `CODING_STYLE` document in order to conform to GTK+'s
+coding style when submitting a code contribution.
+
+Release notes
+-------------
+
+The release notes for GTK+ are part of the migration guide in the API
+reference. See:
+
+ - [3.x release notes](https://developer.gnome.org/gtk3/unstable/gtk-migrating-2-to-3.html)
+ - [4.x release notes](https://developer.gnome.org/gtk4/unstable/gtk-migrating-3-to-4.html)
+
+Licensing terms
+---------------
+
+GTK+ is released under the terms of the GNU Lesser General Public License,
+version 2.1 or, at your option, any later version, as published by the Free
+Software Foundation.
+
+Please, see the `COPYING` file for further information.

README.win32

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

acinclude.m4

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

autogen.sh

@@ -1,46 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-test -n "$srcdir" || srcdir=`dirname "$0"`
-test -n "$srcdir" || srcdir=.
-
-olddir=`pwd`
-cd "$srcdir"
-
-mkdir -p m4
-
-GTKDOCIZE=`which gtkdocize`
-if test -z $GTKDOCIZE; then
-        echo "*** No GTK-Doc found, please install it ***"
-        exit 1
-else
-        gtkdocize || exit $?
-fi
-
-PKGCONFIG=`which pkg-config`
-if test -z "$PKGCONFIG"; then
-        echo "*** pkg-config not found, please install it ***"
-        exit 1
-fi
-
-pkg-config --print-errors gobject-introspection-1.0
-if [ $? != 0 ]; then
-	echo "You probably need to install 'libgirepository1.0-dev'"
-	exit 1
-fi
-
-# README and INSTALL are required by automake, but may be deleted by clean
-# up rules. to get automake to work, simply touch these here, they will be
-# regenerated from their corresponding *.in files by ./configure anyway.
-touch README INSTALL
-
-AUTORECONF=`which autoreconf`
-if test -z $AUTORECONF; then
-        echo "*** No autoreconf found, please install it ***"
-        exit 1
-else
-        autoreconf --force --install --verbose || exit $?
-fi
-
-cd "$olddir"
-test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"

build-aux/meson/post-install.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+gtk_api_version=$1
+gtk_abi_version=$2
+gtk_libdir=$3
+gtk_datadir=$4
+
+# Package managers set this so we don't need to run
+if [ -z "$DESTDIR" ]; then
+  echo Compiling GSettings schemas...
+  glib-compile-schemas ${gtk_datadir}/glib-2.0/schemas
+
+  echo Updating desktop database...
+  update-desktop-database -q ${gtk_datadir}/applications
+
+  echo Updating icon cache...
+  gtk-update-icon-cache -q -t -f ${gtk_datadir}/icons/hicolor
+
+  echo Updating input method modules cache...
+  gtk4-query-immodules > ${gtk_libdir}/gtk-${gtk_api_version}/${gtk_abi_version}/immodules.cache
+fi

config.h.meson

@@ -0,0 +1,291 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* always defined to indicate that i18n is enabled */
+#define ENABLE_NLS 1
+
+/* The prefix for our gettext translation domains. */
+#mesondefine GETTEXT_PACKAGE
+
+/* Disable deprecation warnings from glib */
+#mesondefine GLIB_DISABLE_DEPRECATION_WARNINGS
+
+/* Define the location where the catalogs will be installed */
+#mesondefine GTK_LOCALEDIR
+
+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
+#mesondefine HAVE_BIND_TEXTDOMAIN_CODESET
+
+/* Have the cloudproviders library */
+#mesondefine HAVE_CLOUDPROVIDERS
+
+/* define if we have colord */
+#mesondefine HAVE_COLORD
+
+/* Define to 1 if you have the <crt_externs.h> header file. */
+#mesondefine HAVE_CRT_EXTERNS_H
+
+/* Define to 1 if CUPS 1.6 API is available */
+#mesondefine HAVE_CUPS_API_1_6
+
+/* Define to 1 if you have the `dcgettext' function. */
+#mesondefine HAVE_DCGETTEXT
+
+/* Define to 1 if you have the declaration of `isinf', and to 0 if you don't.
+   */
+#mesondefine HAVE_DECL_ISINF
+
+/* Define to 1 if you have the declaration of `isnan', and to 0 if you don't.
+   */
+#mesondefine HAVE_DECL_ISNAN
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#mesondefine HAVE_DLFCN_H
+
+/* Define to 1 if you have the <ftw.h> header file. */
+#mesondefine HAVE_FTW_H
+
+/* Define to 1 if you have the `getpagesize' function. */
+#mesondefine HAVE_GETPAGESIZE
+
+/* Define to 1 if you have the `getresuid' function. */
+#mesondefine HAVE_GETRESUID
+
+/* Define if gio-unix is available */
+#mesondefine HAVE_GIO_UNIX
+
+/* Define to 1 if you have the `httpGetAuthString' function. */
+#mesondefine HAVE_HTTPGETAUTHSTRING
+
+/* Define if cups http_t authstring field is accessible */
+#mesondefine HAVE_HTTP_AUTHSTRING
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#mesondefine HAVE_INTTYPES_H
+
+/* Define to 1 if the system has the type `IPrintDialogCallback'. */
+#mesondefine HAVE_IPRINTDIALOGCALLBACK
+
+/* Define to 1 if you have the <locale.h> header file. */
+#mesondefine HAVE_LOCALE_H
+
+/* Define to 1 if you have the `lstat' function. */
+#mesondefine HAVE_LSTAT
+
+/* Define to 1 if you have the `mallinfo' function. */
+#mesondefine HAVE_MALLINFO
+
+/* Define to 1 if you have the <memory.h> header file. */
+#mesondefine HAVE_MEMORY_H
+
+/* Define to 1 if you have the `mkstemp' function. */
+#mesondefine HAVE_MKSTEMP
+
+/* Define to 1 if you have a working `mmap' system call. */
+#mesondefine HAVE_MMAP
+
+/* Define to 1 if you have the `nearbyint' function. */
+#mesondefine HAVE_NEARBYINT
+
+/* Define to 1 if you have the `posix_fallocate' function. */
+#mesondefine HAVE_POSIX_FALLOCATE
+
+/* Have the Xrandr extension library */
+#mesondefine HAVE_RANDR
+
+/* Have the Xrandr 1.5 extension library */
+#mesondefine HAVE_RANDR15
+
+/* Define to 1 if you have the `rint' function. */
+#mesondefine HAVE_RINT
+
+/* Define to 1 if you have the `round' function. */
+#mesondefine HAVE_ROUND
+
+/* Define to 1 if you have the `sincos' function. */
+#mesondefine HAVE_SINCOS
+
+/* Define to 1 if you have the `log2` function */
+#mesondefine HAVE_LOG2
+
+/* Define to 1 if you ahve the `exp2` function */
+#mesondefine HAVE_EXP2
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#mesondefine HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#mesondefine HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#mesondefine HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#mesondefine HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#mesondefine HAVE_SYS_MMAN_H
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#mesondefine HAVE_SYS_PARAM_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#mesondefine HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#mesondefine HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#mesondefine HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#mesondefine HAVE_UNISTD_H
+
+/* Have the XCOMPOSITE X extension */
+#mesondefine HAVE_XCOMPOSITE
+
+/* Have the Xcursor library */
+#mesondefine HAVE_XCURSOR
+
+/* Have the XDAMAGE X extension */
+#mesondefine HAVE_XDAMAGE
+
+/* Have the XFIXES X extension */
+#mesondefine HAVE_XFIXES
+
+/* Define to 1 if XFree Xinerama is available */
+#mesondefine HAVE_XFREE_XINERAMA
+
+/* Have XGenericEvent */
+#mesondefine HAVE_XGENERICEVENTS
+
+/* Define to use XKB extension */
+#mesondefine HAVE_XKB
+
+/* Have the SYNC extension library */
+#mesondefine HAVE_XSYNC
+
+/* Define to 1 if you have the `_lock_file' function */
+#mesondefine HAVE__LOCK_FILE
+
+/* Define to 1 if you have the `flockfile' function */
+#mesondefine HAVE_FLOCKFILE
+
+/* Define if _NL_MEASUREMENT_MEASUREMENT is available */
+#mesondefine HAVE__NL_MEASUREMENT_MEASUREMENT
+
+/* Define if _NL_PAPER_HEIGHT is available */
+#mesondefine HAVE__NL_PAPER_HEIGHT
+
+/* Define if _NL_PAPER_WIDTH is available */
+#mesondefine HAVE__NL_PAPER_WIDTH
+
+/* Define if _NL_TIME_FIRST_WEEKDAY is available */
+#mesondefine HAVE__NL_TIME_FIRST_WEEKDAY
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#mesondefine LT_OBJDIR
+
+/* Define if <X11/extensions/XIproto.h> needed for xReply */
+#mesondefine NEED_XIPROTO_H_FOR_XREPLY
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#mesondefine NO_MINUS_C_MINUS_O
+
+/* Define to the address where bug reports for this package should be sent. */
+#mesondefine PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#mesondefine PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#mesondefine PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#mesondefine PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#mesondefine PACKAGE_URL
+
+/* Define to the version of this package. */
+#mesondefine PACKAGE_VERSION
+
+/* Use NSBundle functions to determine load paths for libraries, translations,
+   etc. */
+#mesondefine QUARTZ_RELOCATION
+
+/* Define to 1 if you have the ANSI C header files. */
+#mesondefine STDC_HEADERS
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Define to 1 if XInput 2.0 is available */
+#mesondefine XINPUT_2
+
+/* Define to 1 if XInput 2.2 is available */
+#mesondefine XINPUT_2_2
+
+/* Define to 1 if the X Window System is missing or not being used. */
+#mesondefine X_DISPLAY_MISSING
+
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#mesondefine _FILE_OFFSET_BITS
+
+/* defines how to decorate public symbols while building */
+#mesondefine _GDK_EXTERN
+
+/* Define for large files, on AIX-style hosts. */
+#mesondefine _LARGE_FILES
+
+/* Define to 1 if on MINIX. */
+#mesondefine _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#mesondefine _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#mesondefine _POSIX_SOURCE
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#mesondefine gid_t
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#mesondefine uid_t
+
+/* Define to 1 if linux/memfd.h exists */
+#mesondefine HAVE_LINUX_MEMFD_H
+
+#mesondefine GTK_SYSCONFDIR
+
+#mesondefine GTK_LOCALEDIR
+
+#mesondefine GTK_DATADIR
+
+#mesondefine GTK_LIBDIR
+
+#mesondefine GTK_PRINT_BACKENDS

config.h.win32.in

@@ -1,337 +0,0 @@
-/* config.h.win32.in. Merged from two versions generated by configure for gcc and MSVC.  */
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* always defined to indicate that i18n is enabled */
-#define ENABLE_NLS 1
-
-/* define to enable packagekit */
-/* #undef ENABLE_PACKAGEKIT */
-
-/* The prefix for our gettext translation domains. */
-#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
-
-/* Disable deprecation warnings from glib */
-/* #undef GLIB_DISABLE_DEPRECATION_WARNINGS */
-
-/* Define if debugging is enabled */
-#define GTK_COMPILED_WITH_DEBUGGING "yes"
-
-/* Define the location where the catalogs will be installed */
-#define GTK_LOCALEDIR "NONE/share/locale"
-
-/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-#define HAVE_BIND_TEXTDOMAIN_CODESET 1
-
-/* define if we have colord */
-/* #undef HAVE_COLORD */
-
-/* Define to 1 if you have the <crt_externs.h> header file. */
-/* #undef HAVE_CRT_EXTERNS_H */
-
-/* Define to 1 if CUPS 1.2 API is available */
-/* #undef HAVE_CUPS_API_1_2 */
-
-/* Define to 1 if you have the `dcgettext' function. */
-#define HAVE_DCGETTEXT 1
-
-/* Define to 1 if you have the declaration of `isinf', and to 0 if you don't.
-   */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-#define HAVE_DECL_ISINF 1
-#endif
-
-/* Define to 1 if you have the declaration of `isnan', and to 0 if you don't.
-   */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-#define HAVE_DECL_ISNAN 1
-#endif
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if you have the `exp2' function. */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-#define HAVE_EXP2 1
-#endif
-
-/* Define to 1 if you have the `flockfile' function. */
-#undef HAVE_FLOCKFILE
-
-/* Define to 1 if you have the <ftw.h> header file. */
-/* #undef HAVE_FTW_H */
-
-/* Define to 1 if you have the `getpagesize' function. */
-#ifndef _MSC_VER
-#define HAVE_GETPAGESIZE 1
-#else
-/* #undef HAVE_GETPAGESIZE */
-#endif
-
-/* Define to 1 if you have the `getresuid' function. */
-/* #undef HAVE_GETRESUID */
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#define HAVE_GETTEXT 1
-
-/* Define if gio-unix is available */
-/* #undef HAVE_GIO_UNIX */
-
-/* Have GNU ftw */
-/* #undef HAVE_GNU_FTW */
-
-/* Define to 1 if you have the `httpGetAuthString' function. */
-/* #undef HAVE_HTTPGETAUTHSTRING */
-
-/* Define if cups http_t authstring field is accessible */
-/* #undef HAVE_HTTP_AUTHSTRING */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-#define HAVE_INTTYPES_H 1
-#else
-/* #undef HAVE_INTTYPES_H */
-#endif
-
-/* Define to 1 if the system has the type `IPrintDialogCallback'. */
-#define HAVE_IPRINTDIALOGCALLBACK 1
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-/* #undef HAVE_LC_MESSAGES */
-
-/* Define to 1 if you have the `m' library (-lm). */
-#ifndef _MSC_VER
-#define HAVE_LIBM 1
-#endif
-
-/* Define to 1 if you have the <locale.h> header file. */
-#define HAVE_LOCALE_H 1
-
-/* Define to 1 if you have the `localtime_r' function. */
-/* #undef HAVE_LOCALTIME_R */
-
-/* Define to 1 if you have the `log2' function. */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-#define HAVE_LOG2 1
-#endif
-
-/* Define to 1 if you have the `lstat' function. */
-/* #undef HAVE_LSTAT */
-
-/* Define to 1 if you have the `mallinfo' function. */
-/* #undef HAVE_MALLINFO */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mkstemp' function. */
-/* #undef HAVE_MKSTEMP */
-
-/* Define to 1 if you have a working `mmap' system call. */
-/* #undef HAVE_MMAP */
-
-/* Define to 1 if nearbyint() is available */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-#define HAVE_NEARBYINT 1
-#endif
-
-/* Define to 1 if libpapi available */
-/* #undef HAVE_PAPI */
-
-/* Define to 1 if you have the <pwd.h> header file. */
-/* #undef HAVE_PWD_H */
-
-/* Have the Xrandr extension library */
-/* #undef HAVE_RANDR */
-
-/* Define to 1 if rint() is available */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-#define HAVE_RINT 1
-#endif
-
-/* Define to 1 if round() is available */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-#define HAVE_ROUND 1
-#endif
-
-/* Define to 1 if sincos() is available */
-/* #undef HAVE_SINCOS */
-
-/* Have the sockaddr_un.sun_len member */
-/* #undef HAVE_SOCKADDR_UN_SUN_LEN */
-
-/* Define to 1 if solaris xinerama is available */
-/* #undef HAVE_SOLARIS_XINERAMA */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_STDINT_H 1
-#else
-#if (_MSC_VER >= 1600) /* VS 2010+ ships with stdint.h */
-#define HAVE_STDINT_H 1
-#endif
-/* #undef HAVE_STDINT_H */
-#endif
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_STRINGS_H 1
-#endif
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-/* #undef HAVE_SYS_MMAN_H */
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-/* #undef HAVE_SYS_PARAM_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if sys/sysinfo.h is available */
-/* #undef HAVE_SYS_SYSINFO_H */
-
-/* Define to 1 if sys/systeminfo.h is available */
-/* #undef HAVE_SYS_SYSTEMINFO_H */
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_SYS_TIME_H 1
-#else /* _MSC_VER */
-/* #undef HAVE_SYS_TIME_H */
-#endif
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_UNISTD_H 1
-#else
-/* #undef HAVE_UNISTD_H */
-#endif
-
-/* Have the XCOMPOSITE X extension */
-/* #undef HAVE_XCOMPOSITE */
-
-/* Have the Xcursor library */
-/* #undef HAVE_XCURSOR */
-
-/* Have the XDAMAGE X extension */
-/* #undef HAVE_XDAMAGE */
-
-/* Have the XFIXES X extension */
-/* #undef HAVE_XFIXES */
-
-/* Define to 1 if XFree Xinerama is available */
-/* #undef HAVE_XFREE_XINERAMA */
-
-/* Have XGenericEvent */
-/* #undef HAVE_XGENERICEVENTS */
-
-/* Define to 1 if xinerama is available */
-/* #undef HAVE_XINERAMA */
-
-/* Define to use XKB extension */
-/* #undef HAVE_XKB */
-
-/* Have the SYNC extension library */
-/* #undef HAVE_XSYNC */
-
-/* Define to 1 if you have the `_lock_file' function. */
-#define HAVE__LOCK_FILE
-
-/* Define if _NL_MEASUREMENT_MEASUREMENT is available */
-/* #undef HAVE__NL_MEASUREMENT_MEASUREMENT */
-
-/* Define if _NL_PAPER_HEIGHT is available */
-/* #undef HAVE__NL_PAPER_HEIGHT */
-
-/* Define if _NL_PAPER_WIDTH is available */
-/* #undef HAVE__NL_PAPER_WIDTH */
-
-/* Define if _NL_TIME_FIRST_WEEKDAY is available */
-/* #undef HAVE__NL_TIME_FIRST_WEEKDAY */
-
-/* Define to 1 if you have the `_NSGetEnviron' function. */
-/* #undef HAVE__NSGETENVIRON */
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Define if <X11/extensions/XIproto.h> needed for xReply */
-/* #undef NEED_XIPROTO_H_FOR_XREPLY */
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#ifndef _MSC_VER
-/* #undef NO_MINUS_C_MINUS_O */
-#else 
-#define NO_MINUS_C_MINUS_O 1
-#endif
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "gtk+"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "gtk+ @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "gtk+"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@"
-
-/* Use NSBundle functions to determine load paths for libraries, translations,
-   etc. */
-/* #undef QUARTZ_RELOCATION */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if gmodule works and should be used */
-#define USE_GMODULE 1
-
-/* Define to 1 if XInput 2.0 is available */
-/* #undef XINPUT_2 */
-
-/* Define to 1 if XInput 2.2 is available */
-/* #undef XINPUT_2_2 */
-
-/* Define to 1 if the X Window System is missing or not being used. */
-/* #undef X_DISPLAY_MISSING */
-
-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-/* # define _DARWIN_USE_64_BIT_INODE 1 */
-#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-/* #undef _FILE_OFFSET_BITS */
-
-/* defines how to decorate public symbols while building */
-#ifdef _MSC_VER
-#define _GDK_EXTERN __declspec (dllexport) extern
-#else
-#define _GDK_EXTERN __attribute__((visibility("default")))  __declspec (dllexport) extern
-#endif
-
-/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#define gid_t int
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#define uid_t int

demos/Makefile.am

@@ -1,6 +0,0 @@
-## Makefile.am for gtk+/demos
-include $(top_srcdir)/Makefile.decl
-
-SUBDIRS = gtk-demo widget-factory icon-browser
-
--include $(top_srcdir)/git.mk

demos/gtk-demo/Makefile.am

@@ -1,205 +0,0 @@
-## Makefile.am for gtk+/demos
-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_base =					\
-	application_demo.c			\
-	assistant.c				\
-	builder.c				\
-	button_box.c				\
-	changedisplay.c				\
-	clipboard.c				\
-	colorsel.c				\
-	combobox.c				\
-	css_accordion.c                         \
-	css_basics.c				\
-	css_blendmodes.c			\
-	css_multiplebgs.c			\
-	css_pixbufs.c				\
-	css_shadows.c				\
-	cursors.c				\
-	dialog.c				\
-	drawingarea.c				\
-	editable_cells.c			\
-	entry_buffer.c				\
-	entry_completion.c			\
-	event_axes.c				\
-	expander.c  				\
-        filtermodel.c				\
-	fishbowl.c				\
-	foreigndrawing.c			\
-	gestures.c				\
-	glarea.c				\
-	headerbar.c				\
-	hypertext.c				\
-	iconview.c				\
-	iconview_edit.c				\
-	images.c				\
-	infobar.c				\
-	links.c					\
-	listbox.c				\
-	flowbox.c				\
-	list_store.c				\
-	markup.c				\
-	menus.c					\
-	modelbutton.c				\
-	overlay.c				\
-	overlay2.c				\
-	panes.c					\
-	pickers.c				\
-	pixbufs.c				\
-	popover.c				\
-	printing.c				\
-	revealer.c				\
-	rotated_text.c				\
-	scale.c					\
-	search_entry.c				\
-	search_entry2.c				\
-	shortcuts.c				\
-	sidebar.c				\
-	sizegroup.c				\
-	spinbutton.c				\
-	spinner.c				\
-	stack.c					\
-	tabs.c					\
-	textmask.c				\
-	textview.c				\
-	textscroll.c				\
-	theming_style_classes.c			\
-	toolpalette.c				\
-	transparent.c				\
-	tree_store.c
-
-demos_opt =
-
-if BUILD_FONT_DEMO
-demos_opt += font_features.c
-endif
-
-if OS_UNIX
-demos_opt += pagesetup.c
-endif
-
-demos = $(demos_base) $(demos_opt)
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) 			\
-	-I$(top_builddir)/gdk			\
-	-DGDK_DISABLE_DEPRECATED		\
-	-DGTK_DISABLE_DEPRECATED 		\
-	$(GTK_DEBUG_FLAGS)			\
-	$(GTK_DEP_CFLAGS)
-
-DEPS = \
-	$(top_builddir)/gtk/libgtk-4.la
-
-LDADDS = \
-	$(top_builddir)/gtk/libgtk-4.la		\
-	$(GTK_DEP_LIBS)				\
-	$(GDK_DEP_LIBS)				\
-	-lm
-
-if BUILD_FONT_DEMO
-AM_CPPFLAGS += $(FONTDEMO_CFLAGS)
-LDADDS += $(FONTDEMO_LIBS)
-endif
-
-bin_PROGRAMS = gtk4-demo gtk4-demo-application
-
-desktopdir = $(datadir)/applications
-dist_desktop_DATA = gtk4-demo.desktop
-
-BUILT_SOURCES = demos.h demo_resources.c
-
-EXTRA_DIST += 				\
-	data/source.svg			\
-	data/symbolic-source.svg	\
-	demo.gresource.xml		\
-	$(resource_files)		\
-	org.gtk.Demo.gschema.xml	\
-	demos.h.win32
-
-gsettings_SCHEMAS = \
-	org.gtk.Demo.gschema.xml
-
-@GSETTINGS_RULES@
-
-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_gtk4_demo_SOURCES = demos.h
-
-gtk4_demo_SOURCES = 		\
-	$(demos)		\
-	gtkfishbowl.c		\
-	gtkfishbowl.h		\
-	demo_resources.c	\
-	main.c
-
-gtk4_demo_DEPENDENCIES = $(DEPS)
-gtk4_demo_LDADD = $(LDADDS)
-gtk4_demo_LDFLAGS = -export-dynamic
-
-gtk4_demo_application_SOURCES = \
-	application.c 		\
-	demo_resources.c
-
-gtk4_demo_application_LDADD = $(LDADDS)
-
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/demo.gresource.xml)
-
-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
-
-appsicon16dir = $(iconthemedir)/16x16/apps
-appsicon22dir = $(iconthemedir)/22x22/apps
-appsicon24dir = $(iconthemedir)/24x24/apps
-appsicon32dir = $(iconthemedir)/32x32/apps
-appsicon48dir = $(iconthemedir)/48x48/apps
-appsicon256dir = $(iconthemedir)/256x256/apps
-appsiconscalabledir = $(iconthemedir)/scalable/apps
-
-dist_appsicon16_DATA = data/16x16/gtk4-demo.png data/16x16/gtk4-demo-symbolic.symbolic.png
-dist_appsicon22_DATA = data/22x22/gtk4-demo.png data/22x22/gtk4-demo-symbolic.symbolic.png
-dist_appsicon24_DATA = data/24x24/gtk4-demo.png data/24x24/gtk4-demo-symbolic.symbolic.png
-dist_appsicon32_DATA = data/32x32/gtk4-demo.png data/32x32/gtk4-demo-symbolic.symbolic.png
-dist_appsicon48_DATA = data/48x48/gtk4-demo.png data/48x48/gtk4-demo-symbolic.symbolic.png
-dist_appsicon256_DATA = data/256x256/gtk4-demo.png data/256x256/gtk4-demo-symbolic.symbolic.png
-
-update_icon_cache = $(top_builddir)/gtk/gtk4-update-icon-cache$(EXEEXT) --ignore-theme-index --force
-
-install-data-hook: install-update-icon-cache
-uninstall-hook: uninstall-update-icon-cache
-
-install-update-icon-cache:
-	$(AM_V_at)$(POST_INSTALL)
-	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
-
-uninstall-update-icon-cache:
-	$(AM_V_at)$(POST_UNINSTALL)
-	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
-
-# ------------------- MSVC Build Items ----------------
-MSVCPROJS = gtk4-demo gtk4-demo-application
-
-gtk4_demo_FILES = $(gtk4_demo_SOURCES)
-gtk4_demo_EXCLUDES = font_features.c|pagesetup.c
-
-gtk4_demo_application_FILES = $(gtk4_demo_application_SOURCES)
-gtk4_demo_application_EXCLUDES = dummy
-
-include $(top_srcdir)/win32/Makefile.msvcproj
-
-dist-hook: \
-	$(top_builddir)/win32/vs12/gtk4-demo.vcxproj	\
-	$(top_builddir)/win32/vs12/gtk4-demo-application.vcxproj
-
-DISTCLEANFILES = demos.h demos.h.win32
-
--include $(top_srcdir)/git.mk

demos/gtk-demo/application.c

@@ -291,19 +291,6 @@ change_theme_state (GSimpleAction *action,
   g_simple_action_set_state (action, state);
 }
 
-static void
-change_titlebar_state (GSimpleAction *action,
-                       GVariant      *state,
-                       gpointer       user_data)
-{
-  GtkWindow *window = user_data;
-
-  gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (window),
-                                               g_variant_get_boolean (state));
-
-  g_simple_action_set_state (action, state);
-}
-
 static void
 change_radio_state (GSimpleAction *action,
                     GVariant      *state,
@@ -322,7 +309,6 @@ static GActionEntry app_entries[] = {
 };
 
 static GActionEntry win_entries[] = {
-  { "titlebar", activate_toggle, NULL, "false", change_titlebar_state },
   { "shape", activate_radio, "s", "'oval'", change_radio_state },
   { "bold", activate_toggle, NULL, "false", NULL },
   { "about", activate_about, NULL, NULL, NULL },
@@ -469,12 +455,15 @@ demo_application_window_constructed (GObject *object)
 }
 
 static void
-demo_application_window_size_allocate (GtkWidget     *widget,
-                                       GtkAllocation *allocation)
+demo_application_window_size_allocate (GtkWidget           *widget,
+                                       const GtkAllocation *allocation,
+                                       int                  baseline,
+                                       GtkAllocation       *out_clip)
 {
   DemoApplicationWindow *window = (DemoApplicationWindow *)widget;
 
-  GTK_WIDGET_CLASS (demo_application_window_parent_class)->size_allocate (widget, allocation);
+  GTK_WIDGET_CLASS (demo_application_window_parent_class)->size_allocate (widget, allocation,
+                                                                          baseline, out_clip);
 
   if (!window->maximized && !window->fullscreen)
     gtk_window_get_size (GTK_WINDOW (window), &window->width, &window->height);

demos/gtk-demo/assistant.c

@@ -96,12 +96,12 @@ create_page1 (GtkWidget *assistant)
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 
   label = gtk_label_new ("You must fill out this entry to continue:");
-  gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), label);
 
   entry = gtk_entry_new ();
   gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
   gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), entry);
   g_signal_connect (G_OBJECT (entry), "changed",
                     G_CALLBACK (on_entry_changed), assistant);
 
@@ -119,7 +119,7 @@ create_page2 (GtkWidget *assistant)
 
   checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "
                                                  "even if you do not check this");
-  gtk_box_pack_start (GTK_BOX (box), checkbutton, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), checkbutton);
 
   gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);
   gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE);

demos/gtk-demo/button_box.c

@@ -70,64 +70,52 @@ do_button_box (GtkWidget *do_widget)
     frame_horz = gtk_frame_new ("Horizontal Button Boxes");
     gtk_widget_set_margin_top (frame_horz, 10);
     gtk_widget_set_margin_bottom (frame_horz, 10);
-    gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE);
+    gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz);
 
     vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
     g_object_set (vbox, "margin", 10, NULL);
     gtk_container_add (GTK_CONTAINER (frame_horz), vbox);
 
     gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Spread", 40, GTK_BUTTONBOX_SPREAD),
-                        TRUE, TRUE);
+                        create_bbox (TRUE, "Spread", 40, GTK_BUTTONBOX_SPREAD));
 
     gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Edge", 40, GTK_BUTTONBOX_EDGE),
-                        TRUE, TRUE);
+                        create_bbox (TRUE, "Edge", 40, GTK_BUTTONBOX_EDGE));
 
     gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Start", 40, GTK_BUTTONBOX_START),
-                        TRUE, TRUE);
+                        create_bbox (TRUE, "Start", 40, GTK_BUTTONBOX_START));
 
     gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END),
-                        TRUE, TRUE);
+                        create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END));
 
     gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Center", 40, GTK_BUTTONBOX_CENTER),
-                        TRUE, TRUE);
+                        create_bbox (TRUE, "Center", 40, GTK_BUTTONBOX_CENTER));
 
     gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Expand", 0, GTK_BUTTONBOX_EXPAND),
-                        TRUE, TRUE);
+                        create_bbox (TRUE, "Expand", 0, GTK_BUTTONBOX_EXPAND));
 
     frame_vert = gtk_frame_new ("Vertical Button Boxes");
-    gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE);
+    gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert);
 
     hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
     g_object_set (hbox, "margin", 10, NULL);
     gtk_container_add (GTK_CONTAINER (frame_vert), hbox);
 
     gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Spread", 10, GTK_BUTTONBOX_SPREAD),
-                        TRUE, TRUE);
+                        create_bbox (FALSE, "Spread", 10, GTK_BUTTONBOX_SPREAD));
 
     gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Edge", 10, GTK_BUTTONBOX_EDGE),
-                        TRUE, TRUE);
+                        create_bbox (FALSE, "Edge", 10, GTK_BUTTONBOX_EDGE));
 
     gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Start", 10, GTK_BUTTONBOX_START),
-                        TRUE, TRUE);
+                        create_bbox (FALSE, "Start", 10, GTK_BUTTONBOX_START));
 
     gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "End", 10, GTK_BUTTONBOX_END),
-                        TRUE, TRUE);
+                        create_bbox (FALSE, "End", 10, GTK_BUTTONBOX_END));
     gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Center", 10, GTK_BUTTONBOX_CENTER),
-                        TRUE, TRUE);
+                        create_bbox (FALSE, "Center", 10, GTK_BUTTONBOX_CENTER));
     gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Expand", 0, GTK_BUTTONBOX_EXPAND),
-                        TRUE, TRUE);
+                        create_bbox (FALSE, "Expand", 0, GTK_BUTTONBOX_EXPAND));
   }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/changedisplay.c

@@ -312,7 +312,7 @@ create_frame (ChangeDisplayInfo *info,
                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrollwin),
                                        GTK_SHADOW_IN);
-  gtk_box_pack_start (GTK_BOX (hbox), scrollwin, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), scrollwin);
 
   *tree_view = gtk_tree_view_new ();
   gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (*tree_view), FALSE);
@@ -322,7 +322,7 @@ create_frame (ChangeDisplayInfo *info,
   gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
 
   *button_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-  gtk_box_pack_start (GTK_BOX (hbox), *button_vbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), *button_vbox);
 
   if (!info->size_group)
     info->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
@@ -362,11 +362,11 @@ create_display_frame (ChangeDisplayInfo *info)
 
   button = left_align_button_new ("_Open...");
   g_signal_connect (button, "clicked",  G_CALLBACK (open_display_cb), info);
-  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (button_vbox), button);
 
   button = left_align_button_new ("_Close");
   g_signal_connect (button, "clicked",  G_CALLBACK (close_display_cb), info);
-  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (button_vbox), button);
 
   info->display_model = (GtkTreeModel *)gtk_list_store_new (DISPLAY_NUM_COLUMNS,
                                                             G_TYPE_STRING,
@@ -539,10 +539,10 @@ do_changedisplay (GtkWidget *do_widget)
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
       g_object_set (vbox, "margin", 8, NULL);
-      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (content_area), vbox);
 
       frame = create_display_frame (info);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);
 
       initialize_displays (info);
 

demos/gtk-demo/clipboard.c

@@ -207,7 +207,7 @@ do_clipboard (GtkWidget *do_widget)
       GtkWidget *vbox, *hbox;
       GtkWidget *label;
       GtkWidget *entry, *button;
-      GtkWidget *ebox, *image;
+      GtkWidget *image;
       GtkClipboard *clipboard;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -225,96 +225,92 @@ do_clipboard (GtkWidget *do_widget)
 
       label = gtk_label_new ("\"Copy\" will copy the text\nin the entry to the clipboard");
 
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
       g_object_set (hbox, "margin", 8, NULL);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);
 
       /* Create the first entry */
       entry = gtk_entry_new ();
-      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), entry);
 
       /* Create the button */
       button = gtk_button_new_with_mnemonic (_("_Copy"));
-      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), button);
       g_signal_connect (button, "clicked",
                         G_CALLBACK (copy_button_clicked), entry);
 
       label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
       g_object_set (hbox, "margin", 8, NULL);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);
 
       /* Create the second entry */
       entry = gtk_entry_new ();
-      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), entry);
 
       /* Create the button */
       button = gtk_button_new_with_mnemonic (_("_Paste"));
-      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), button);
       g_signal_connect (button, "clicked",
                         G_CALLBACK (paste_button_clicked), entry);
 
       label = gtk_label_new ("Images can be transferred via the clipboard, too");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
       g_object_set (hbox, "margin", 8, NULL);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);
 
       /* Create the first image */
       image = gtk_image_new_from_icon_name ("dialog-warning",
                                             GTK_ICON_SIZE_BUTTON);
-      ebox = gtk_event_box_new ();
-      gtk_container_add (GTK_CONTAINER (ebox), image);
-      gtk_container_add (GTK_CONTAINER (hbox), ebox);
+      gtk_container_add (GTK_CONTAINER (hbox), image);
 
-      /* make ebox a drag source */
-      gtk_drag_source_set (ebox, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY);
-      gtk_drag_source_add_image_targets (ebox);
-      g_signal_connect (ebox, "drag-begin",
+      /* make image a drag source */
+      gtk_drag_source_set (image, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY);
+      gtk_drag_source_add_image_targets (image);
+      g_signal_connect (image, "drag-begin",
                         G_CALLBACK (drag_begin), image);
-      g_signal_connect (ebox, "drag-data-get",
+      g_signal_connect (image, "drag-data-get",
                         G_CALLBACK (drag_data_get), image);
 
-      /* accept drops on ebox */
-      gtk_drag_dest_set (ebox, GTK_DEST_DEFAULT_ALL,
+      /* accept drops on image */
+      gtk_drag_dest_set (image, GTK_DEST_DEFAULT_ALL,
                          NULL, 0, GDK_ACTION_COPY);
-      gtk_drag_dest_add_image_targets (ebox);
-      g_signal_connect (ebox, "drag-data-received",
+      gtk_drag_dest_add_image_targets (image);
+      g_signal_connect (image, "drag-data-received",
                         G_CALLBACK (drag_data_received), image);
 
-      /* context menu on ebox */
-      g_signal_connect (ebox, "button-press-event",
+      /* context menu on image */
+      g_signal_connect (image, "button-press-event",
                         G_CALLBACK (button_press), image);
 
       /* Create the second image */
       image = gtk_image_new_from_icon_name ("process-stop",
                                             GTK_ICON_SIZE_BUTTON);
-      ebox = gtk_event_box_new ();
-      gtk_container_add (GTK_CONTAINER (ebox), image);
-      gtk_container_add (GTK_CONTAINER (hbox), ebox);
+      gtk_container_add (GTK_CONTAINER (hbox), image);
 
-      /* make ebox a drag source */
-      gtk_drag_source_set (ebox, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY);
-      gtk_drag_source_add_image_targets (ebox);
-      g_signal_connect (ebox, "drag-begin",
+      /* make image a drag source */
+      gtk_drag_source_set (image, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY);
+      gtk_drag_source_add_image_targets (image);
+      g_signal_connect (image, "drag-begin",
                         G_CALLBACK (drag_begin), image);
-      g_signal_connect (ebox, "drag-data-get",
+      g_signal_connect (image, "drag-data-get",
                         G_CALLBACK (drag_data_get), image);
 
-      /* accept drops on ebox */
-      gtk_drag_dest_set (ebox, GTK_DEST_DEFAULT_ALL,
+      /* accept drops on image */
+      gtk_drag_dest_set (image, GTK_DEST_DEFAULT_ALL,
                          NULL, 0, GDK_ACTION_COPY);
-      gtk_drag_dest_add_image_targets (ebox);
-      g_signal_connect (ebox, "drag-data-received",
+      gtk_drag_dest_add_image_targets (image);
+      g_signal_connect (image, "drag-data-received",
                         G_CALLBACK (drag_data_received), image);
 
-      /* context menu on ebox */
-      g_signal_connect (ebox, "button-press-event",
+      /* context menu on image */
+      g_signal_connect (image, "button-press-event",
                         G_CALLBACK (button_press), image);
 
       /* tell the clipboard manager to make the data persistent */

demos/gtk-demo/colorsel.c

@@ -87,7 +87,7 @@ do_colorsel (GtkWidget *do_widget)
 
       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);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);
 
       da = gtk_drawing_area_new ();
       gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 200);
@@ -100,7 +100,7 @@ do_colorsel (GtkWidget *do_widget)
       gtk_widget_set_halign (button, GTK_ALIGN_END);
       gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
 
-      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), button);
 
       g_signal_connect (button, "clicked",
                         G_CALLBACK (change_color_callback), NULL);

demos/gtk-demo/combobox.c

@@ -326,7 +326,7 @@ do_combobox (GtkWidget *do_widget)
      *  insensitive rows
      */
     frame = gtk_frame_new ("Items with icons");
-    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+    gtk_box_pack_start (GTK_BOX (vbox), frame);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     g_object_set (box, "margin", 5, NULL);
@@ -367,7 +367,7 @@ do_combobox (GtkWidget *do_widget)
     /* A combobox demonstrating trees.
      */
     frame = gtk_frame_new ("Where are we ?");
-    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+    gtk_box_pack_start (GTK_BOX (vbox), frame);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     g_object_set (box, "margin", 5, NULL);
@@ -395,7 +395,7 @@ do_combobox (GtkWidget *do_widget)
 
     /* A GtkComboBoxEntry with validation */
     frame = gtk_frame_new ("Editable");
-    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+    gtk_box_pack_start (GTK_BOX (vbox), frame);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     g_object_set (box, "margin", 5, NULL);
@@ -413,7 +413,7 @@ do_combobox (GtkWidget *do_widget)
 
     /* A combobox with string IDs */
     frame = gtk_frame_new ("String IDs");
-    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+    gtk_box_pack_start (GTK_BOX (vbox), frame);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     g_object_set (box, "margin", 5, NULL);

demos/gtk-demo/css_multiplebgs.c

@@ -92,10 +92,6 @@ do_css_multiplebgs (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       container = gtk_overlay_new ();
-      gtk_widget_add_events (container,
-                             GDK_ENTER_NOTIFY_MASK |
-                             GDK_LEAVE_NOTIFY_MASK |
-                             GDK_POINTER_MOTION_MASK);
       gtk_container_add (GTK_CONTAINER (window), container);
 
       child = gtk_drawing_area_new ();
@@ -106,10 +102,6 @@ do_css_multiplebgs (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (container), child);
 
       child = gtk_button_new ();
-      gtk_widget_add_events (child,
-                             GDK_ENTER_NOTIFY_MASK |
-                             GDK_LEAVE_NOTIFY_MASK |
-                             GDK_POINTER_MOTION_MASK);
       gtk_overlay_add_overlay (GTK_OVERLAY (container), child);
       gtk_widget_set_name (child, "bricks-button");
       gtk_widget_set_halign (child, GTK_ALIGN_CENTER);

demos/gtk-demo/cursors.c

@@ -27,13 +27,13 @@ add_section (GtkWidget   *box,
   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);
+  gtk_box_pack_start (GTK_BOX (box), label);
   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);
+  gtk_box_pack_start (GTK_BOX (box), section);
 
   return section;
 }

demos/gtk-demo/demo.gresource.xml

@@ -156,6 +156,7 @@
     <file>expander.c</file>
     <file>filtermodel.c</file>
     <file>fishbowl.c</file>
+    <file>widgetbowl.c</file>
     <file>flowbox.c</file>
     <file>foreigndrawing.c</file>
     <file>font_features.c</file>

demos/gtk-demo/demo.ui

@@ -159,9 +159,6 @@
               </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar1">
@@ -227,7 +224,6 @@
             </child>
           </object>
           <packing>
-            <property name="expand">0</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -235,6 +231,7 @@
           <object class="GtkScrolledWindow" id="scrolledwindow1">
             <property name="shadow_type">in</property>
             <property name="visible">1</property>
+            <property name="expand">1</property>
             <child>
               <object class="GtkTreeView" id="treeview1">
                 <property name="visible">1</property>
@@ -286,7 +283,6 @@
           </object>
           <packing>
             <property name="position">2</property>
-            <property name="expand">1</property>
           </packing>
         </child>
         <child>
@@ -295,7 +291,6 @@
           </object>
           <packing>
             <property name="position">3</property>
-            <property name="expand">0</property>
           </packing>
         </child>
       </object>

demos/gtk-demo/dialog.c

@@ -56,15 +56,15 @@ interactive_dialog_clicked (GtkButton *button,
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-  gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (content_area), hbox);
 
   image = gtk_image_new_from_icon_name ("dialog-question", GTK_ICON_SIZE_DIALOG);
-  gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), image);
 
   table = gtk_grid_new ();
   gtk_grid_set_row_spacing (GTK_GRID (table), 4);
   gtk_grid_set_column_spacing (GTK_GRID (table), 4);
-  gtk_box_pack_start (GTK_BOX (hbox), table, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), table);
   label = gtk_label_new_with_mnemonic ("_Entry 1");
   gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
   local_entry1 = gtk_entry_new ();
@@ -122,30 +122,29 @@ do_dialog (GtkWidget *do_widget)
 
       /* Standard message dialog */
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);
       button = gtk_button_new_with_mnemonic ("_Message Dialog");
       g_signal_connect (button, "clicked",
                         G_CALLBACK (message_dialog_clicked), NULL);
-      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), button);
 
-      gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
-                          FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
 
       /* Interactive dialog*/
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);
       vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
       button = gtk_button_new_with_mnemonic ("_Interactive Dialog");
       g_signal_connect (button, "clicked",
                         G_CALLBACK (interactive_dialog_clicked), NULL);
-      gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE);
-      gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), vbox2);
+      gtk_box_pack_start (GTK_BOX (vbox2), button);
 
       table = gtk_grid_new ();
       gtk_grid_set_row_spacing (GTK_GRID (table), 4);
       gtk_grid_set_column_spacing (GTK_GRID (table), 4);
-      gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), table);
 
       label = gtk_label_new_with_mnemonic ("_Entry 1");
       gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);

demos/gtk-demo/drawingarea.c

@@ -221,11 +221,11 @@ do_drawingarea (GtkWidget *do_widget)
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Checkerboard pattern</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);
 
       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);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);
 
       da = gtk_drawing_area_new ();
       gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
@@ -240,11 +240,11 @@ do_drawingarea (GtkWidget *do_widget)
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Scribble area</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);
 
       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);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);
 
       da = gtk_drawing_area_new ();
       gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
@@ -263,17 +263,6 @@ do_drawingarea (GtkWidget *do_widget)
                         G_CALLBACK (scribble_motion_notify_event), NULL);
       g_signal_connect (da, "button-press-event",
                         G_CALLBACK (scribble_button_press_event), NULL);
-
-
-      /* Ask to receive events the drawing area doesn't normally
-       * subscribe to
-       */
-      gtk_widget_set_events (da, gtk_widget_get_events (da)
-                             | GDK_LEAVE_NOTIFY_MASK
-                             | GDK_BUTTON_PRESS_MASK
-                             | GDK_POINTER_MOTION_MASK
-                             | GDK_POINTER_MOTION_HINT_MASK);
-
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/editable_cells.c

@@ -357,8 +357,7 @@ do_editable_cells (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       gtk_box_pack_start (GTK_BOX (vbox),
-                          gtk_label_new ("Shopping list (you can edit the cells!)"),
-                          FALSE, FALSE);
+                          gtk_label_new ("Shopping list (you can edit the cells!)"));
 
       sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
@@ -366,7 +365,7 @@ do_editable_cells (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), sw);
 
       /* create models */
       items_model = create_items_model ();
@@ -387,17 +386,17 @@ do_editable_cells (GtkWidget *do_widget)
       /* some buttons */
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
       gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);
 
       button = gtk_button_new_with_label ("Add item");
       g_signal_connect (button, "clicked",
                         G_CALLBACK (add_item), treeview);
-      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), button);
 
       button = gtk_button_new_with_label ("Remove item");
       g_signal_connect (button, "clicked",
                         G_CALLBACK (remove_item), treeview);
-      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), button);
 
       gtk_window_set_default_size (GTK_WINDOW (window), 320, 200);
     }

demos/gtk-demo/entry_buffer.c

@@ -34,19 +34,19 @@ do_entry_buffer (GtkWidget *do_widget)
       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);
+      gtk_box_pack_start (GTK_BOX (vbox), label);
 
       /* Create a buffer */
       buffer = gtk_entry_buffer_new (NULL, 0);
 
       /* Create our first entry */
       entry = gtk_entry_new_with_buffer (buffer);
-      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), entry);
 
       /* 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);
+      gtk_box_pack_start (GTK_BOX (vbox), entry);
 
       g_object_unref (buffer);
     }

demos/gtk-demo/entry_completion.c

@@ -60,11 +60,11 @@ do_entry_completion (GtkWidget *do_widget)
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example.");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);
 
       /* Create our entry */
       entry = gtk_entry_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), entry);
 
       /* Create the completion object */
       completion = gtk_entry_completion_new ();

demos/gtk-demo/event_axes.c

@@ -140,6 +140,9 @@ update_axes_from_event (GdkEvent  *event,
       return;
     }
 
+  if (!source_device)
+    return;
+
   if (!sequence)
     {
       info = g_hash_table_lookup (data->pointer_info, device);
@@ -229,7 +232,8 @@ render_arrow (cairo_t     *cr,
 static void
 draw_axes_info (cairo_t       *cr,
                 AxesInfo      *info,
-                GtkAllocation *allocation)
+                int            width,
+                int            height)
 {
   gdouble pressure, tilt_x, tilt_y, distance, wheel, rotation, slider;
   GdkAxisFlags axes = gdk_device_get_axes (info->last_source);
@@ -240,9 +244,9 @@ draw_axes_info (cairo_t       *cr,
   gdk_cairo_set_source_rgba (cr, &info->color);
 
   cairo_move_to (cr, 0, info->y);
-  cairo_line_to (cr, allocation->width, info->y);
+  cairo_line_to (cr, width, info->y);
   cairo_move_to (cr, info->x, 0);
-  cairo_line_to (cr, info->x, allocation->height);
+  cairo_line_to (cr, info->x, height);
   cairo_stroke (cr);
 
   cairo_translate (cr, info->x, info->y);
@@ -462,27 +466,27 @@ draw_device_info (GtkWidget        *widget,
   g_string_free (string, TRUE);
 }
 
-static gboolean
-draw_cb (GtkWidget *widget,
-         cairo_t   *cr,
-         gpointer   user_data)
+static void
+draw_cb (GtkDrawingArea *da,
+         cairo_t        *cr,
+         int             width,
+         int             height,
+         gpointer        user_data)
 {
+  GtkWidget *widget = GTK_WIDGET (da);
   EventData *data = user_data;
-  GtkAllocation allocation;
   AxesInfo *info;
   GHashTableIter iter;
   gpointer key, value;
   gint y = 0;
 
-  gtk_widget_get_allocation (widget, &allocation);
-
   /* Draw Abs info */
   g_hash_table_iter_init (&iter, data->pointer_info);
 
   while (g_hash_table_iter_next (&iter, NULL, &value))
     {
       info = value;
-      draw_axes_info (cr, info, &allocation);
+      draw_axes_info (cr, info, width, height);
     }
 
   g_hash_table_iter_init (&iter, data->touch_info);
@@ -490,7 +494,7 @@ draw_cb (GtkWidget *widget,
   while (g_hash_table_iter_next (&iter, NULL, &value))
     {
       info = value;
-      draw_axes_info (cr, info, &allocation);
+      draw_axes_info (cr, info, width, height);
     }
 
   /* Draw name, color legend and misc data */
@@ -509,8 +513,6 @@ draw_cb (GtkWidget *widget,
       info = value;
       draw_device_info (widget, cr, key, &y, info);
     }
-
-  return FALSE;
 }
 
 static void
@@ -614,43 +616,45 @@ do_event_axes (GtkWidget *toplevel)
 {
   static GtkWidget *window = NULL;
   EventData *event_data;
-  GtkWidget *box, *label;
+  GtkWidget *label;
+  GtkWidget *overlay;
+  GtkWidget *da;
 
   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);
+      gtk_window_set_title (GTK_WINDOW (window), "Touch and Drawing Tablets");
 
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
-      box = gtk_event_box_new ();
-      gtk_container_add (GTK_CONTAINER (window), box);
-      gtk_widget_set_support_multidevice (box, TRUE);
-      gtk_widget_add_events (box,
-			     GDK_POINTER_MOTION_MASK |
-			     GDK_BUTTON_PRESS_MASK |
-			     GDK_BUTTON_RELEASE_MASK |
-			     GDK_SMOOTH_SCROLL_MASK |
-			     GDK_ENTER_NOTIFY_MASK |
-			     GDK_LEAVE_NOTIFY_MASK |
-			     GDK_TOUCH_MASK);
+      gtk_widget_set_support_multidevice (window, TRUE);
 
       event_data = event_data_new ();
-      g_object_set_data_full (G_OBJECT (box), "gtk-demo-event-data",
+      g_object_set_data_full (G_OBJECT (window), "gtk-demo-event-data",
                               event_data, (GDestroyNotify) event_data_free);
 
-      g_signal_connect (box, "event",
+      da = gtk_drawing_area_new ();
+      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 400);
+      gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 400);
+      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), draw_cb, event_data, NULL);
+      gtk_widget_set_can_focus (da, TRUE);
+      gtk_widget_grab_focus (da);
+
+      g_signal_connect (da, "event",
                         G_CALLBACK (event_cb), event_data);
-      g_signal_connect (box, "draw",
-                        G_CALLBACK (draw_cb), event_data);
 
       label = gtk_label_new ("");
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_START);
       gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-      gtk_container_add (GTK_CONTAINER (box), label);
 
-      init_pad_controller (window, label);
+      overlay = gtk_overlay_new ();
+      gtk_container_add (GTK_CONTAINER (window), overlay);
+      gtk_container_add (GTK_CONTAINER (overlay), da);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
+
+      init_pad_controller (da, label);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/expander.c

@@ -25,19 +25,11 @@ 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 *toplevel;
   GtkWidget *area;
-  GtkWidget *box;
   GtkWidget *expander;
   GtkWidget *sw;
   GtkWidget *tv;
@@ -57,10 +49,6 @@ do_expander (GtkWidget *do_widget)
                                                 "but not the full story.");
 
       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);
 
       expander = gtk_expander_new ("Details:");
       sw = gtk_scrolled_window_new (NULL, NULL);
@@ -85,7 +73,7 @@ do_expander (GtkWidget *do_widget)
                                 "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);
+      gtk_box_pack_end (GTK_BOX (area), expander);
       g_signal_connect (expander, "notify::expanded",
                         G_CALLBACK (expander_cb), window);
 

demos/gtk-demo/fishbowl.c

@@ -157,6 +157,7 @@ do_fishbowl (GtkWidget *do_widget)
       gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       bowl = GTK_WIDGET (gtk_builder_get_object (builder, "bowl"));
+      gtk_fishbowl_set_use_icons (GTK_FISHBOWL (bowl), TRUE);
       info_label = GTK_WIDGET (gtk_builder_get_object (builder, "info_label"));
       allow_changes = GTK_WIDGET (gtk_builder_get_object (builder, "changes_allow"));
       gtk_window_set_screen (GTK_WINDOW (window),

demos/gtk-demo/fishbowl.ui

@@ -10,7 +10,6 @@
         <child>
           <object class="GtkLabel" id="info_label">
             <property name="visible">True</property>
-            <property name="label">icons - 0 fps</property>
           </object>
           <packing>
             <property name="pack_type">end</property>

demos/gtk-demo/font-features.ui

@@ -1601,18 +1601,13 @@
                 <property name="margin_top">20</property>
                 <property name="margin_bottom">20</property>
                 <child>
-                  <object class="GtkEventBox">
+                  <object class="GtkLabel" id="label">
                     <property name="visible">1</property>
+                    <property name="wrap">1</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0</property>
+                    <property name="valign">start</property>
                     <signal name="button-press-event" handler="switch_to_entry"/>
-                    <child>
-                      <object class="GtkLabel" id="label">
-                        <property name="visible">1</property>
-                        <property name="wrap">1</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0</property>
-                        <property name="valign">start</property>
-                      </object>
-                    </child>
                   </object>
                   <packing>
                     <property name="name">label</property>
@@ -1647,15 +1642,13 @@
                 <property name="valign">end</property>
                 <property name="width-chars">50</property>
                 <property name="max-width-chars">50</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
               </object>
-              <packing>
-                <property name="expand">1</property>
-              </packing>
             </child>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
           </object>
-          <packing>
-            <property name="expand">1</property>
-          </packing>
         </child>
       </object>
     </child>

demos/gtk-demo/geninclude.py

@@ -0,0 +1,108 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import sys
+import re
+import os
+from collections import *
+
+out_file = sys.argv[1]
+in_files = sys.argv[2:]
+
+
+file_output = """
+typedef GtkWidget *(*GDoDemoFunc) (GtkWidget *do_widget);
+
+typedef struct _Demo Demo;
+
+struct _Demo
+{
+  gchar *name;
+  gchar *title;
+  gchar *filename;
+  GDoDemoFunc func;
+  Demo *children;
+};
+
+"""
+
+# Demo = namedtuple('Demo', ['name', 'title', 'file', 'func'])
+
+demos = []
+
+for demo_file in in_files:
+    filename =  demo_file[demo_file.rfind('/')+1:]
+    demo_name = filename.replace(".c", "")
+    with open(demo_file, 'r') as f:
+        title = f.readline().replace("/*", "").strip()
+
+
+    file_output += "GtkWidget *do_" + demo_name + " (GtkWidget *do_widget);\n"
+    # demos += Demo(name = demo_name,
+                  # title = title,
+                  # file = demo_file,
+                  # func = "do_" + title)
+    demos.append((demo_name, title, filename, "do_" + demo_name, -1))
+
+# Generate a List of "Parent names"
+parents = []
+parent_ids = []
+parent_index = 0
+for demo in demos:
+    if "/" in demo[1]:
+        slash_index = demo[1].index('/')
+        parent_name = demo[1][:slash_index]
+        do_break = False
+
+        # Check for duplicates
+        if not parent_name in parents:
+            parents.append(parent_name)
+            parent_ids.append(parent_index)
+            demos.append(("NULL", parent_name, "NULL", "NULL", parent_index))
+
+        parent_index = parent_index + 1
+
+
+# For every child with a parent, generate a list of child demos
+i = 0
+for parent in parents:
+    id = parent_ids[i]
+    file_output += "\nDemo child" + str(id) + "[] = {\n"
+    # iterate over all demos and check if the name starts with the given parent name
+    for child in demos:
+        if child[1].startswith(parent + "/"):
+            title = child[1][child[1].rfind('/') + 1:]
+            file_output += "  { \"" + child[0] + "\", \"" + title + "\", \"" + child[2] + "\", " + child[3] + ", NULL },\n"
+
+
+    file_output += "  { NULL }\n};\n"
+    i = i + 1
+
+
+# Sort demos by title
+demos = sorted(demos, key=lambda x: x[1])
+
+file_output += "\nDemo gtk_demos[] = {\n"
+for demo in demos:
+    # Do not generate one of these for demos with a parent demo
+    if "/" not in demo[1]:
+        child_array = "NULL"
+        name = demo[0];
+        title = demo[1];
+        file = demo[2]
+        if name != "NULL":
+            name = "\"" + name + "\""
+        if title != "NULL":
+            title = "\"" + title + "\""
+        if file != "NULL":
+            file = "\"" + file + "\""
+
+        if demo[4] != -1:
+            child_array = "child" + str(demo[4])
+        file_output += "  { " + name + ", " + title + ", " + file + ", " + demo[3] + ", " + child_array + " },\n"
+
+file_output += "  { NULL }\n};\n"
+
+ofile = open(out_file, "w")
+ofile.write(file_output)
+ofile.close()

demos/gtk-demo/gestures.c

@@ -151,9 +151,6 @@ do_gestures (GtkWidget *do_widget)
 
       drawing_area = gtk_drawing_area_new ();
       gtk_container_add (GTK_CONTAINER (window), drawing_area);
-      gtk_widget_add_events (drawing_area,
-                             GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
-                             GDK_POINTER_MOTION_MASK | GDK_TOUCH_MASK);
 
       gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (drawing_area),
                                       drawing_area_draw,

demos/gtk-demo/gtkfishbowl.c

@@ -29,6 +29,8 @@ struct _GtkFishbowlPrivate
 
   gint64 last_frame_time;
   guint tick_id;
+
+  guint use_icons: 1;
 };
 
 struct _GtkFishbowlChild
@@ -70,6 +72,15 @@ gtk_fishbowl_new (void)
   return g_object_new (GTK_TYPE_FISHBOWL, NULL);
 }
 
+void
+gtk_fishbowl_set_use_icons (GtkFishbowl *fishbowl,
+                            gboolean     use_icons)
+{
+  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
+
+  priv->use_icons = use_icons;
+}
+
 static void
 gtk_fishbowl_measure (GtkWidget      *widget,
                       GtkOrientation  orientation,
@@ -103,8 +114,10 @@ gtk_fishbowl_measure (GtkWidget      *widget,
 }
 
 static void
-gtk_fishbowl_size_allocate (GtkWidget     *widget,
-                            GtkAllocation *allocation)
+gtk_fishbowl_size_allocate (GtkWidget           *widget,
+                            const GtkAllocation *allocation,
+                            int                  baseline,
+                            GtkAllocation       *out_clip)
 {
   GtkFishbowl *fishbowl = GTK_FISHBOWL (widget);
   GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
@@ -113,10 +126,10 @@ gtk_fishbowl_size_allocate (GtkWidget     *widget,
   GtkRequisition child_requisition;
   GList *children;
 
-  gtk_widget_set_allocation (widget, allocation);
-
   for (children = priv->children; children; children = children->next)
     {
+      GtkAllocation child_clip;
+
       child = children->data;
 
       if (!gtk_widget_get_visible (child->widget))
@@ -128,7 +141,7 @@ gtk_fishbowl_size_allocate (GtkWidget     *widget,
       child_allocation.width = child_requisition.width;
       child_allocation.height = child_requisition.height;
 
-      gtk_widget_size_allocate (child->widget, &child_allocation);
+      gtk_widget_size_allocate (child->widget, &child_allocation, -1, &child_clip);
     }
 }
 
@@ -200,7 +213,6 @@ gtk_fishbowl_remove (GtkContainer *container,
 
 static void
 gtk_fishbowl_forall (GtkContainer *container,
-                     gboolean      include_internals,
                      GtkCallback   callback,
                      gpointer      callback_data)
 {
@@ -209,9 +221,6 @@ gtk_fishbowl_forall (GtkContainer *container,
   GtkFishbowlChild *child;
   GList *children;
 
-  if (!include_internals)
-    return;
-
   children = priv->children;
   while (children)
     {
@@ -222,27 +231,6 @@ gtk_fishbowl_forall (GtkContainer *container,
     }
 }
 
-static void 
-gtk_fishbowl_snapshot (GtkWidget   *widget,
-                       GtkSnapshot *snapshot)
-{
-  GtkFishbowl *fishbowl = GTK_FISHBOWL (widget);
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-  GtkFishbowlChild *child;
-  GList *list;
-
-  for (list = priv->children;
-       list;
-       list = list->next)
-    {
-      child = list->data;
-
-      gtk_widget_snapshot_child (widget,
-                                 child->widget,
-                                 snapshot);
-    }
-}
-
 static void
 gtk_fishbowl_dispose (GObject *object)
 {
@@ -315,7 +303,6 @@ gtk_fishbowl_class_init (GtkFishbowlClass *klass)
 
   widget_class->measure = gtk_fishbowl_measure;
   widget_class->size_allocate = gtk_fishbowl_size_allocate;
-  widget_class->snapshot = gtk_fishbowl_snapshot;
 
   container_class->add = gtk_fishbowl_add;
   container_class->remove = gtk_fishbowl_remove;
@@ -386,6 +373,25 @@ get_random_icon_name (GtkIconTheme *theme)
   return icon_names[g_random_int_range(0, n_icon_names)];
 }
 
+static GType
+get_random_widget_type ()
+{
+  GType types[] = {
+    GTK_TYPE_SWITCH,
+    GTK_TYPE_BUTTON,
+    GTK_TYPE_ENTRY,
+    GTK_TYPE_SPIN_BUTTON,
+    GTK_TYPE_FONT_BUTTON,
+    GTK_TYPE_SCROLLBAR,
+    GTK_TYPE_SCALE,
+    GTK_TYPE_LEVEL_BAR,
+    GTK_TYPE_PROGRESS_BAR,
+    GTK_TYPE_RADIO_BUTTON,
+    GTK_TYPE_CHECK_BUTTON
+  };
+  return types[g_random_int_range (0, G_N_ELEMENTS (types))];
+}
+
 void
 gtk_fishbowl_set_count (GtkFishbowl *fishbowl,
                         guint        count)
@@ -403,10 +409,13 @@ gtk_fishbowl_set_count (GtkFishbowl *fishbowl,
   while (priv->count < count)
     {
       GtkWidget *new_widget;
-        
-      new_widget = gtk_image_new_from_icon_name (get_random_icon_name (gtk_icon_theme_get_default ()),
-                                                 GTK_ICON_SIZE_DIALOG);
-      gtk_widget_show (new_widget);
+
+      if (priv->use_icons)
+        new_widget = gtk_image_new_from_icon_name (get_random_icon_name (gtk_icon_theme_get_default ()),
+                                                   GTK_ICON_SIZE_DIALOG);
+      else
+        new_widget = g_object_new (get_random_widget_type (), NULL);
+
       gtk_container_add (GTK_CONTAINER (fishbowl), new_widget);
     }
 

demos/gtk-demo/gtkfishbowl.h

@@ -46,6 +46,9 @@ GType      gtk_fishbowl_get_type          (void) G_GNUC_CONST;
 
 GtkWidget* gtk_fishbowl_new               (void);
 
+void       gtk_fishbowl_set_use_icons     (GtkFishbowl       *fishbowl,
+                                           gboolean           use_icons);
+
 guint      gtk_fishbowl_get_count         (GtkFishbowl       *fishbowl);
 void       gtk_fishbowl_set_count         (GtkFishbowl       *fishbowl,
                                            guint              count);

demos/gtk-demo/iconview.c

@@ -266,7 +266,7 @@ do_iconview (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       tool_bar = gtk_toolbar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), tool_bar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), tool_bar);
 
       up_button = gtk_tool_button_new (NULL, NULL);
       gtk_tool_button_set_label (GTK_TOOL_BUTTON (up_button), _("_Up"));
@@ -290,8 +290,9 @@ do_iconview (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
+      gtk_widget_set_vexpand (sw, TRUE);
 
-      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), sw);
 
       /* Create the store and fill it with the contents of '/' */
       parent = g_strdup ("/");

demos/gtk-demo/images.c

@@ -354,13 +354,13 @@ do_images (GtkWidget *do_widget)
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Image loaded from a file</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);
 
       image = gtk_image_new_from_icon_name ("gtk3-demo", GTK_ICON_SIZE_DIALOG);
 
@@ -372,13 +372,13 @@ do_images (GtkWidget *do_widget)
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Animation loaded from a file</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);
 
       image = gtk_image_new_from_resource ("/images/floppybuddy.gif");
 
@@ -389,13 +389,13 @@ do_images (GtkWidget *do_widget)
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Symbolic themed icon</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);
 
       gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic");
       image = gtk_image_new_from_gicon (gicon, GTK_ICON_SIZE_DIALOG);
@@ -408,13 +408,13 @@ do_images (GtkWidget *do_widget)
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Progressive image loading</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);
 
       /* Create an empty image for now; the progressive loader
        * will create the pixbuf and fill it in.
@@ -426,7 +426,7 @@ do_images (GtkWidget *do_widget)
 
       /* Sensitivity control */
       button = gtk_toggle_button_new_with_mnemonic ("_Insensitive");
-      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), button);
 
       g_signal_connect (button, "toggled",
                         G_CALLBACK (toggle_sensitivity_callback),

demos/gtk-demo/infobar.c

@@ -65,24 +65,24 @@ do_infobar (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), bar);
       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);
+      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
 
       button = gtk_toggle_button_new_with_label ("Message");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
       gtk_container_add (GTK_CONTAINER (actions), button);
 
       bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), bar);
       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);
+      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
 
       button = gtk_toggle_button_new_with_label ("Warning");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
@@ -91,24 +91,24 @@ do_infobar (GtkWidget *do_widget)
       bar = gtk_info_bar_new_with_buttons (_("_OK"), GTK_RESPONSE_OK, NULL);
       gtk_info_bar_set_show_close_button (GTK_INFO_BAR (bar), TRUE);
       g_signal_connect (bar, "response", G_CALLBACK (on_bar_response), window);
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_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);
+      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
 
       button = gtk_toggle_button_new_with_label ("Question");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
       gtk_container_add (GTK_CONTAINER (actions), button);
 
       bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), bar);
       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);
+      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
 
       button = gtk_toggle_button_new_with_label ("Error");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
@@ -116,12 +116,12 @@ do_infobar (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (actions), button);
 
       bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), bar);
       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);
+      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
 
       button = gtk_toggle_button_new_with_label ("Other");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
@@ -130,7 +130,7 @@ do_infobar (GtkWidget *do_widget)
       frame = gtk_frame_new ("Info bars");
       gtk_widget_set_margin_top (frame, 8);
       gtk_widget_set_margin_bottom (frame, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);
 
       vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       g_object_set (vbox2, "margin", 8, NULL);
@@ -138,9 +138,9 @@ do_infobar (GtkWidget *do_widget)
 
       /* Standard message dialog */
       label = gtk_label_new ("An example of different info bars");
-      gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox2), label);
 
-      gtk_box_pack_start (GTK_BOX (vbox2), actions, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox2), actions);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/list_store.c

@@ -268,7 +268,7 @@ do_list_store (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though).");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);
 
       sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
@@ -276,7 +276,7 @@ do_list_store (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_NEVER,
                                       GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), sw);
 
       /* create tree model */
       model = create_model ();

demos/gtk-demo/listbox.c

@@ -359,10 +359,11 @@ do_listbox (GtkWidget *do_widget)
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
       gtk_container_add (GTK_CONTAINER (window), vbox);
       label = gtk_label_new ("Messages from Gtk+ and friends");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);
       scrolled = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE);
+      gtk_widget_set_vexpand (scrolled, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), scrolled);
       listbox = gtk_list_box_new ();
       gtk_container_add (GTK_CONTAINER (scrolled), listbox);
 

demos/gtk-demo/listbox.ui

@@ -90,7 +90,6 @@
                 </style>
               </object>
               <packing>
-                <property name="fill">0</property>
                 <property name="pack_type">end</property>
                 <property name="position">2</property>
               </packing>

demos/gtk-demo/main.ui

@@ -97,6 +97,7 @@
             <property name="scrollable">1</property>
             <property name="enable_popup">1</property>
             <property name="show_border">0</property>
+            <property name="expand">1</property>
             <child>
               <object class="GtkScrolledWindow">
                 <property name="visible">1</property>
@@ -166,7 +167,6 @@
             </child>
           </object>
           <packing>
-            <property name="expand">1</property>
             <property name="position">1</property>
           </packing>
         </child>

demos/gtk-demo/makefile.msc.in

@@ -1,91 +0,0 @@
-## Makefile for building the gtk test apps with Microsoft C
-## Use: nmake -f makefile.msc
-
-## There is no install target, you have to decide where and 
-## how to install for yourself.
-
-TOP = ..\..\..
-!INCLUDE $(TOP)/glib/build/win32/make.msc
-
-!IFNDEF PERL
-PERL = perl
-!ENDIF
-
-################################################################
-
-# Possibly override versions from build/win32/module.defs
-GTK_VER = 2.0
-GDK_PIXBUF_VER = 2.0
-
-GDK_LIBS = ../../gdk/gdk-win32-$(GTK_VER).lib
-GTK_LIBS = ../../gtk/gtk-win32-$(GTK_VER).lib
-GDK_PIXBUF_LIBS = ../../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib
-
-INCLUDES = -FImsvc_recommended_pragmas.h -I . -I ../.. -I ../../gdk -I ../../gdk-pixbuf -I ../../gtk
-DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS) $(CAIRO_CFLAGS)
-LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
-DEFINES = -DG_LOG_DOMAIN=\"GtkDemo\" -DGTK_VERSION=\"$(GTK_VER)\" \
-	-DDEMOCODEDIR=\".\"
-
-TOUCH = copy makefile.msc+nul
-
-all :	\
-	demos.h \
-	gtk-demo.exe
-
-## These should be in the order you want them to appear in the 
-## demo app, which means alphabetized by demo title, not filename
-DEMOS = \
-	button_box.c	\
-	clipboard.c	\
-	colorsel.c	\
-	dialog.c		\
-	drawingarea.c	\
-	editable_cells.c	\
-	entry_completion.c	\
-	expander.c	\
-	hypertext.c	\
-	iconview.c	\
-	images.c		\
-	list_store.c	\
-	menus.c		\
-	panes.c		\
-	pixbufs.c		\
-	rotated_text.c	\
-	sizegroup.c	\
-	textview.c	\
-	tree_store.c	\
-	ui_manager.c	\
-
-
-demos.h: $(DEMOS) geninclude.pl
-	$(PERL) geninclude.pl $(DEMOS) > demos.h
-
-OBJECTS = \
-	button_box.obj	\
-	changedisplay.obj	\
-	clipboard.obj	\
-	colorsel.obj	\
-	dialog.obj	\
-	drawingarea.obj	\
-	editable_cells.obj	\
-	entry_completion.obj	\
-	expander.obj	\
-	hypertext.obj	\
-	iconview.obj	\
-	images.obj	\
-	list_store.obj	\
-	menus.obj		\
-	panes.obj		\
-	pixbufs.obj	\
-	rotated_text.obj \
-	sizegroup.obj	\
-	textview.obj	\
-	tree_store.obj	\
-	ui_manager.obj	\
-	main.obj \
-
-gtk-demo.exe : demos.h $(OBJECTS)
-	$(CC) $(CFLAGS) -Fegtk-demo.exe $(OBJECTS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) \
-	$(CAIRO_LIBS) $(PANGOCAIRO_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
-

demos/gtk-demo/menus.c

@@ -115,7 +115,7 @@ do_menus (GtkWidget *do_widget)
 
       menubar = gtk_menu_bar_new ();
       gtk_widget_set_hexpand (menubar, TRUE);
-      gtk_box_pack_start (GTK_BOX (box1), menubar, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), menubar);
       gtk_widget_show (menubar);
 
       menu = create_menu (2);
@@ -136,19 +136,19 @@ do_menus (GtkWidget *do_widget)
       gtk_widget_show (menuitem);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2);
       gtk_widget_show (box2);
 
       button = gtk_button_new_with_label ("Flip");
       g_signal_connect (button, "clicked",
                         G_CALLBACK (change_orientation), menubar);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button);
       gtk_widget_show (button);
 
       button = gtk_button_new_with_label ("Close");
       g_signal_connect_swapped (button, "clicked",
                                 G_CALLBACK(gtk_widget_destroy), window);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button);
       gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
       gtk_widget_show (button);

demos/gtk-demo/menus.ui

@@ -38,10 +38,6 @@
           <attribute name="label" translatable="yes">_Prefer Dark Theme</attribute>
           <attribute name="action">app.dark</attribute>
         </item>
-        <item>
-          <attribute name="label" translatable="yes">_Hide Titlebar when maximized</attribute>
-          <attribute name="action">win.titlebar</attribute>
-        </item>
         <submenu>
           <attribute name="label" translatable="yes">_Color</attribute>
           <section>

demos/gtk-demo/meson.build

@@ -0,0 +1,127 @@
+# These should be in the order you want them to appear in the
+# demo app, which means alphabetized by demo title, not filename
+demos = files([
+  'application_demo.c',
+  'assistant.c',
+  'builder.c',
+  'button_box.c',
+  'changedisplay.c',
+  'clipboard.c',
+  'colorsel.c',
+  'combobox.c',
+  'css_accordion.c',
+  'css_basics.c',
+  'css_blendmodes.c',
+  'css_multiplebgs.c',
+  'css_pixbufs.c',
+  'css_shadows.c',
+  'cursors.c',
+  'dialog.c',
+  'drawingarea.c',
+  'editable_cells.c',
+  'entry_buffer.c',
+  'entry_completion.c',
+  'event_axes.c',
+  'expander.c',
+  'filtermodel.c',
+  'fishbowl.c',
+  'widgetbowl.c',
+  'foreigndrawing.c',
+  'gestures.c',
+  'glarea.c',
+  'headerbar.c',
+  'hypertext.c',
+  'iconview.c',
+  'iconview_edit.c',
+  'images.c',
+  'infobar.c',
+  'links.c',
+  'listbox.c',
+  'flowbox.c',
+  'list_store.c',
+  'markup.c',
+  'menus.c',
+  'modelbutton.c',
+  'overlay.c',
+  'overlay2.c',
+  'panes.c',
+  'pickers.c',
+  'pixbufs.c',
+  'popover.c',
+  'printing.c',
+  'revealer.c',
+  'rotated_text.c',
+  'scale.c',
+  'search_entry.c',
+  'search_entry2.c',
+  'shortcuts.c',
+  'sidebar.c',
+  'sizegroup.c',
+  'spinbutton.c',
+  'spinner.c',
+  'stack.c',
+  'tabs.c',
+  'textmask.c',
+  'textview.c',
+  'textscroll.c',
+  'theming_style_classes.c',
+  'toolpalette.c',
+  'transparent.c',
+  'tree_store.c',
+])
+
+gtkdemo_deps = [ libgtk_dep, ]
+
+if harfbuzz_dep.found() and pangoft_dep.found()
+  demos += files('font_features.c')
+  gtkdemo_deps += [ harfbuzz_dep, ]
+endif
+
+if os_unix
+  demos += files('pagesetup.c')
+endif
+
+gtkdemo_args = [ '-DGDK_DISABLE_DEPRECATED', '-DGTK_DISABLE_DEPRECATED', ]
+
+demos_h = custom_target('gtk4 demo header',
+                        output: 'demos.h',
+                        input: demos,
+                        command: [ find_program('geninclude.py'), '@OUTPUT@', '@INPUT@' ])
+
+gtkdemo_resources = gnome.compile_resources('gtkdemo_resources',
+                                            'demo.gresource.xml',
+                                            source_dir: '.')
+
+executable('gtk4-demo',
+           'main.c', 'gtkfishbowl.c', demos, demos_h, gtkdemo_resources,
+           c_args: gtkdemo_args,
+           dependencies: gtkdemo_deps,
+           include_directories: confinc,
+           gui_app: true,
+           install: true)
+
+executable('gtk4-demo-application',
+           'application.c', gtkdemo_resources,
+           c_args: gtkdemo_args,
+           dependencies: gtkdemo_deps,
+           include_directories: confinc,
+           gui_app: true,
+           install: true)
+
+# icons
+icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
+
+foreach icon_size: [ '16x16', '22x22', '24x24', '32x32', '48x48', '256x256', ]
+  gtk_demo_icons_dir = join_paths(icontheme_dir, '@0@/apps'.format(icon_size))
+  install_data('data/@0@/gtk4-demo.png'.format(icon_size),
+               install_dir: gtk_demo_icons_dir)
+  install_data('data/@0@/gtk4-demo-symbolic.symbolic.png'.format(icon_size),
+               install_dir: gtk_demo_icons_dir)
+endforeach
+
+# desktop file
+install_data('gtk4-demo.desktop', install_dir: gtk_applicationsdir)
+
+# GSettings
+install_data('org.gtk.Demo.gschema.xml', install_dir: gtk_schemasdir)
+gnome.compile_schemas()

demos/gtk-demo/overlay.c

@@ -65,12 +65,12 @@ do_overlay (GtkWidget *do_widget)
       gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
       gtk_widget_set_margin_top (label, 8);
       gtk_widget_set_margin_bottom (label, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);
 
       gtk_entry_set_placeholder_text (GTK_ENTRY (entry), "Your Lucky Number");
       gtk_widget_set_margin_top (entry, 8);
       gtk_widget_set_margin_bottom (entry, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), entry);
 
       gtk_container_add (GTK_CONTAINER (window), overlay);
 

demos/gtk-demo/panes.c

@@ -148,7 +148,7 @@ do_panes (GtkWidget *do_widget)
 
       vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
       g_object_set (vpaned, "margin", 5, NULL);
-      gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), vpaned);
 
       hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_paned_add1 (GTK_PANED (vpaned), hpaned);
@@ -177,15 +177,13 @@ do_panes (GtkWidget *do_widget)
                           create_pane_options (GTK_PANED (hpaned),
                                                "Horizontal",
                                                "Left",
-                                               "Right"),
-                          FALSE, FALSE);
+                                               "Right"));
 
       gtk_box_pack_start (GTK_BOX (vbox),
                           create_pane_options (GTK_PANED (vpaned),
                                                "Vertical",
                                                "Top",
-                                               "Bottom"),
-                          FALSE, FALSE);
+                                               "Bottom"));
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/popover.c

@@ -55,8 +55,10 @@ create_complex_popover (GtkWidget       *parent,
 }
 
 static void
-entry_size_allocate_cb (GtkEntry      *entry,
-                        GtkAllocation *allocation,
+entry_size_allocate_cb (GtkEntry            *entry,
+                        const GtkAllocation *allocation,
+                        int                  baseline,
+                        GtkAllocation       *out_clip,
                         gpointer       user_data)
 {
   GtkEntryIconPosition popover_pos;
@@ -131,6 +133,7 @@ do_popover (GtkWidget *do_widget)
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_title (GTK_WINDOW (window), "Popovers");
       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 24);
       g_object_set (box, "margin", 24, NULL);
       gtk_container_add (GTK_CONTAINER (window), box);

demos/gtk-demo/rotated_text.c

@@ -204,8 +204,6 @@ do_rotated_text (GtkWidget *do_widget)
       label = gtk_label_new (text);
       gtk_container_add (GTK_CONTAINER (box), label);
 
-      gtk_label_set_angle (GTK_LABEL (label), 45);
-
       /* Set up fancy stuff on the label */
       layout = gtk_label_get_layout (GTK_LABEL (label));
       pango_cairo_context_set_shape_renderer (pango_layout_get_context (layout),

demos/gtk-demo/search_entry.c

@@ -241,20 +241,20 @@ do_search_entry (GtkWidget *do_widget)
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label), "Search entry demo");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);
 
       /* Create our entry */
       entry = gtk_search_entry_new ();
-      gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), entry);
 
       /* Create the find and cancel buttons */
       notebook = gtk_notebook_new ();
       gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
       gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE);
-      gtk_box_pack_start (GTK_BOX (hbox), notebook, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), notebook);
 
       find_button = gtk_button_new_with_label ("Find");
       g_signal_connect (find_button, "clicked",

demos/gtk-demo/search_entry2.c

@@ -91,12 +91,12 @@ do_search_entry2 (GtkWidget *do_widget)
       entry = gtk_search_entry_new ();
       container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
       gtk_widget_set_halign (container, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (container), entry, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (container), entry);
       searchbar = gtk_search_bar_new ();
       gtk_search_bar_connect_entry (GTK_SEARCH_BAR (searchbar), GTK_ENTRY (entry));
       gtk_search_bar_set_show_close_button (GTK_SEARCH_BAR (searchbar), FALSE);
       gtk_container_add (GTK_CONTAINER (searchbar), container);
-      gtk_box_pack_start (GTK_BOX (vbox), searchbar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), searchbar);
 
       /* Hook the search bar to key presses */
       g_signal_connect (window, "key-press-event",
@@ -104,26 +104,26 @@ do_search_entry2 (GtkWidget *do_widget)
 
       /* Help */
       label = gtk_label_new ("Start Typing to search");
-      gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);
 
       /* Toggle button */
       button = gtk_toggle_button_new_with_label ("Search");
       g_object_bind_property (button, "active",
                               searchbar, "search-mode-enabled",
                               G_BINDING_BIDIRECTIONAL);
-      gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), button);
 
       /* Result */
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);
 
       label = gtk_label_new ("Result:");
       gtk_label_set_xalign (GTK_LABEL (label), 0.0);
       gtk_widget_set_margin_start (label, 6);
-      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), label);
 
       label = gtk_label_new ("");
-      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), label);
 
       g_signal_connect (entry, "search-changed",
                         G_CALLBACK (search_changed_cb), label);
@@ -131,15 +131,15 @@ do_search_entry2 (GtkWidget *do_widget)
                         G_CALLBACK (changed_cb), label);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);
 
       label = gtk_label_new ("Signal:");
       gtk_label_set_xalign (GTK_LABEL (label), 0.0);
       gtk_widget_set_margin_start (label, 6);
-      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), label);
 
       label = gtk_label_new ("");
-      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), label);
 
       g_signal_connect (entry, "search-changed",
                         G_CALLBACK (search_changed), label);

demos/gtk-demo/sidebar.c

@@ -49,7 +49,7 @@ do_sidebar (GtkWidget *do_widget)
 
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       sidebar = gtk_stack_sidebar_new ();
-      gtk_box_pack_start (GTK_BOX (box), sidebar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), sidebar);
 
       stack = gtk_stack_new ();
       gtk_stack_set_transition_type (GTK_STACK (stack), GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN);
@@ -57,9 +57,9 @@ do_sidebar (GtkWidget *do_widget)
 
       /* Separator between sidebar and stack */
       widget = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
-      gtk_box_pack_start (GTK_BOX(box), widget, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX(box), widget);
 
-      gtk_box_pack_start (GTK_BOX (box), stack, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box), stack);
 
       for (i=0; (c = *(pages+i)) != NULL; i++ )
         {

demos/gtk-demo/sizegroup.c

@@ -116,7 +116,7 @@ do_sizegroup (GtkWidget *do_widget)
 
       /* Create one frame holding color options */
       frame = gtk_frame_new ("Color Options");
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);
 
       table = gtk_grid_new ();
       g_object_set (table, "margin", 5, NULL);
@@ -129,7 +129,7 @@ do_sizegroup (GtkWidget *do_widget)
 
       /* And another frame holding line style options */
       frame = gtk_frame_new ("Line Options");
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);
 
       table = gtk_grid_new ();
       g_object_set (table, "margin", 5, NULL);
@@ -142,7 +142,7 @@ do_sizegroup (GtkWidget *do_widget)
 
       /* And a check button to turn grouping on and off */
       check_button = gtk_check_button_new_with_mnemonic ("_Enable grouping");
-      gtk_box_pack_start (GTK_BOX (vbox), check_button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), check_button);
 
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
       g_signal_connect (check_button, "toggled",

demos/gtk-demo/spinbutton.c

@@ -19,7 +19,7 @@ hex_spin_input (GtkSpinButton *spin_button,
   gchar *err;
   gdouble res;
 
-  buf = gtk_entry_get_text (GTK_ENTRY (spin_button));
+  buf = gtk_spin_button_get_text (spin_button);
   res = strtol (buf, &err, 16);
   *new_val = res;
   if (*err)
@@ -41,8 +41,8 @@ hex_spin_output (GtkSpinButton *spin_button)
     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);
+  if (strcmp (buf, gtk_spin_button_get_text (spin_button)))
+    gtk_spin_button_set_text (spin_button, buf);
   g_free (buf);
 
   return TRUE;
@@ -60,7 +60,7 @@ time_spin_input (GtkSpinButton *spin_button,
   gchar *endh;
   gchar *endm;
 
-  text = gtk_entry_get_text (GTK_ENTRY (spin_button));
+  text = gtk_spin_button_get_text (spin_button);
   str = g_strsplit (text, ":", 2);
 
   if (g_strv_length (str) == 2)
@@ -99,8 +99,8 @@ time_spin_output (GtkSpinButton *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);
+  if (strcmp (buf, gtk_spin_button_get_text (spin_button)))
+    gtk_spin_button_set_text (spin_button, buf);
   g_free (buf);
 
   return TRUE;
@@ -132,7 +132,7 @@ month_spin_input (GtkSpinButton *spin_button,
   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);
+      tmp2 = g_ascii_strup (gtk_spin_button_get_text (spin_button), -1);
       if (strstr (tmp1, tmp2) == tmp1)
         found = TRUE;
       g_free (tmp1);
@@ -162,8 +162,8 @@ month_spin_output (GtkSpinButton *spin_button)
   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]);
+        if (strcmp (month[i-1], gtk_spin_button_get_text (spin_button)))
+          gtk_spin_button_set_text (spin_button, month[i-1]);
       }
 
   return TRUE;

demos/gtk-demo/spinner.c

@@ -53,7 +53,7 @@ do_spinner (GtkWidget *do_widget)
 
     vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
     g_object_set (vbox, "margin", 5, NULL);
-    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE);
+    gtk_box_pack_start (GTK_BOX (content_area), vbox);
 
     /* Sensitive */
     hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);

demos/gtk-demo/textscroll.c

@@ -157,7 +157,7 @@ create_text_view (GtkWidget *hbox,
   guint timeout;
 
   swindow = gtk_scrolled_window_new (NULL, NULL);
-  gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), swindow);
   textview = gtk_text_view_new ();
   gtk_container_add (GTK_CONTAINER (swindow), textview);
 

demos/gtk-demo/theming.ui

@@ -252,10 +252,9 @@
             <property name="visible">1</property>
             <property name="label">Plain</property>
             <property name="halign">end</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
           </object>
-          <packing>
-            <property name="expand">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton">

demos/gtk-demo/toolpalette.c

@@ -473,7 +473,7 @@ do_toolpalette (GtkWidget *do_widget)
                                       "text", 0,
                                       NULL);
       gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_orientation), &iter);
-      gtk_box_pack_start (GTK_BOX (box), combo_orientation, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), combo_orientation);
 
       /* Style combo box: */
       style_model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
@@ -512,11 +512,11 @@ do_toolpalette (GtkWidget *do_widget)
                                       "text", 0,
                                       NULL);
       gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_style), &iter);
-      gtk_box_pack_start (GTK_BOX (box), combo_style, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), combo_style);
 
       /* Add hbox */
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-      gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box), hbox);
 
       /* Add and fill the ToolPalette: */
       palette = gtk_tool_palette_new ();
@@ -526,6 +526,7 @@ do_toolpalette (GtkWidget *do_widget)
       load_special_items (GTK_TOOL_PALETTE (palette));
 
       palette_scroller = gtk_scrolled_window_new (NULL, NULL);
+      gtk_widget_set_vexpand (palette_scroller, TRUE);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (palette_scroller),
                                       GTK_POLICY_NEVER,
                                       GTK_POLICY_AUTOMATIC);
@@ -548,7 +549,7 @@ do_toolpalette (GtkWidget *do_widget)
 
       notebook = gtk_notebook_new ();
       g_object_set (notebook, "margin", 6, NULL);
-      gtk_box_pack_end (GTK_BOX(hbox), notebook, FALSE, FALSE);
+      gtk_box_pack_end (GTK_BOX(hbox), notebook);
 
       /* ===== DnD for tool items ===== */
 

demos/gtk-demo/tree_store.c

@@ -402,8 +402,7 @@ do_tree_store (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       gtk_box_pack_start (GTK_BOX (vbox),
-                          gtk_label_new ("Jonathan's Holiday Card Planning Sheet"),
-                          FALSE, FALSE);
+                          gtk_label_new ("Jonathan's Holiday Card Planning Sheet"));
 
       sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
@@ -411,7 +410,7 @@ do_tree_store (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), sw);
 
       /* create model */
       model = create_model ();

demos/gtk-demo/widgetbowl.c

@@ -0,0 +1,179 @@
+/* Benchmark/Widgetbowl
+ *
+ * This demo models the fishbowl demos seen on the web in a GTK way.
+ * It's also a neat little tool to see how fast your computer (or
+ * your GTK version) is.
+ */
+
+#include <gtk/gtk.h>
+
+#include "gtkfishbowl.h"
+
+GtkWidget *allow_changes;
+
+#define N_STATS 5
+
+#define STATS_UPDATE_TIME G_USEC_PER_SEC
+
+typedef struct _Stats Stats;
+struct _Stats {
+  gint64 last_stats;
+  gint64 last_frame;
+  gint last_suggestion;
+  guint frame_counter_max;
+
+  guint stats_index;
+  guint frame_counter[N_STATS];
+  guint item_counter[N_STATS];
+};
+
+static Stats *
+get_stats (GtkWidget *widget)
+{
+  static GQuark stats_quark = 0;
+  Stats *stats;
+
+  if (G_UNLIKELY (stats_quark == 0))
+    stats_quark = g_quark_from_static_string ("stats");
+
+  stats = g_object_get_qdata (G_OBJECT (widget), stats_quark);
+  if (stats == NULL)
+    {
+      stats = g_new0 (Stats, 1);
+      g_object_set_qdata_full (G_OBJECT (widget), stats_quark, stats, g_free);
+      stats->last_frame = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget));
+      stats->last_stats = stats->last_frame;
+    }
+
+  return stats;
+}
+
+static void
+do_stats (GtkWidget *widget,
+          GtkWidget *info_label,
+          gint      *suggested_change)
+{
+  Stats *stats;
+  gint64 frame_time;
+
+  stats = get_stats (widget);
+  frame_time = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget));
+
+  if (stats->last_stats + STATS_UPDATE_TIME < frame_time)
+    {
+      char *new_label;
+      guint i, n_frames;
+
+      n_frames = 0;
+      for (i = 0; i < N_STATS; i++)
+        {
+          n_frames += stats->frame_counter[i];
+        }
+      
+      new_label = g_strdup_printf ("widgets - %.1f fps",
+                                   (double) G_USEC_PER_SEC * n_frames
+                                       / (N_STATS * STATS_UPDATE_TIME));
+      gtk_label_set_label (GTK_LABEL (info_label), new_label);
+      g_free (new_label);
+
+      if (stats->frame_counter[stats->stats_index] >= 19 * stats->frame_counter_max / 20)
+        {
+          if (stats->last_suggestion > 0)
+            stats->last_suggestion *= 2;
+          else
+            stats->last_suggestion = 1;
+        }
+      else
+        {
+          if (stats->last_suggestion < 0)
+            stats->last_suggestion--;
+          else
+            stats->last_suggestion = -1;
+          stats->last_suggestion = MAX (stats->last_suggestion, 1 - (int) stats->item_counter[stats->stats_index]);
+        }
+
+      stats->stats_index = (stats->stats_index + 1) % N_STATS;
+      stats->frame_counter[stats->stats_index] = 0;
+      stats->item_counter[stats->stats_index] = stats->item_counter[(stats->stats_index + N_STATS - 1) % N_STATS];
+      stats->last_stats = frame_time;
+      
+      if (suggested_change)
+        *suggested_change = stats->last_suggestion;
+      else
+        stats->last_suggestion = 0;
+    }
+  else
+    {
+      if (suggested_change)
+        *suggested_change = 0;
+    }
+
+  stats->last_frame = frame_time;
+  stats->frame_counter[stats->stats_index]++;
+  stats->frame_counter_max = MAX (stats->frame_counter_max, stats->frame_counter[stats->stats_index]);
+}
+
+static void
+stats_update (GtkWidget *widget)
+{
+  Stats *stats;
+
+  stats = get_stats (widget);
+
+  stats->item_counter[stats->stats_index] = gtk_fishbowl_get_count (GTK_FISHBOWL (widget));
+}
+
+static gboolean
+move_fish (GtkWidget     *bowl,
+           GdkFrameClock *frame_clock,
+           gpointer       info_label)
+{
+  gint suggested_change = 0;
+  
+  do_stats (bowl,
+            info_label,
+            !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (allow_changes)) ? &suggested_change : NULL);
+
+  gtk_fishbowl_set_count (GTK_FISHBOWL (bowl),
+                          gtk_fishbowl_get_count (GTK_FISHBOWL (bowl)) + suggested_change);
+  stats_update (bowl);
+
+  return G_SOURCE_CONTINUE;
+}
+
+GtkWidget *
+do_widgetbowl (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+
+  if (!window)
+    {
+      GtkBuilder *builder;
+      GtkWidget *bowl, *info_label;
+
+      g_type_ensure (GTK_TYPE_FISHBOWL);
+
+      builder = gtk_builder_new_from_resource ("/fishbowl/fishbowl.ui");
+      gtk_builder_connect_signals (builder, NULL);
+      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
+      bowl = GTK_WIDGET (gtk_builder_get_object (builder, "bowl"));
+      gtk_fishbowl_set_use_icons (GTK_FISHBOWL (bowl), FALSE);
+      info_label = GTK_WIDGET (gtk_builder_get_object (builder, "info_label"));
+      allow_changes = GTK_WIDGET (gtk_builder_get_object (builder, "changes_allow"));
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      gtk_widget_realize (window);
+      gtk_widget_add_tick_callback (bowl, move_fish, info_label, NULL);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_widget_destroy (window);
+
+
+  return window;
+}

demos/icon-browser/Makefile.am

@@ -1,47 +0,0 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/gdk		\
-	-I$(top_builddir)/gdk		\
-	$(GTK_DEBUG_FLAGS)		\
-	$(GTK_DEP_CFLAGS)
-
-LDADD = \
-        $(top_builddir)/gtk/libgtk-4.la \
-        $(GTK_DEP_LIBS)
-
-
-bin_PROGRAMS = gtk4-icon-browser
-
-desktopdir = $(datadir)/applications
-dist_desktop_DATA = gtk4-icon-browser.desktop
-
-gtk4_icon_browser_SOURCES = \
-	main.c \
-	iconbrowserapp.c iconbrowserapp.h \
-	iconbrowserwin.c iconbrowserwin.h \
-	iconstore.c iconstore.h \
-	resources.c
-
-BUILT_SOURCES = \
-	resources.c
-
-resources.c: iconbrowser.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/iconbrowser.gresource.xml)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/iconbrowser.gresource.xml \
-		--target=$@ --sourcedir=$(srcdir) --generate-source
-
-EXTRA_DIST = \
-	menus.ui \
-	iconbrowser.gresource.xml \
-	window.ui
-
-# ------------------- MSVC Build Items ----------------
-MSVCPROJS = gtk4-icon-browser
-
-gtk4_icon_browser_FILES = $(gtk4_icon_browser_SOURCES)
-gtk4_icon_browser_EXCLUDES = dummy
-
-include $(top_srcdir)/win32/Makefile.msvcproj
-
-dist-hook: $(top_builddir)/win32/vs12/gtk4-icon-browser.vcxproj
-
--include $(top_srcdir)/git.mk

demos/icon-browser/icon.list

@@ -0,0 +1,517 @@
+[volume]
+Name=Volume
+Description=Icons related to audio input and output volume
+
+audio-volume-high=The icon used to indicate high audio volume
+audio-volume-low=The icon used to indicate low audio volume
+audio-volume-medium=The icon used to indicate medium audio volume
+audio-volume-muted=The icon used to indicate the muted state for audio playback
+microphone-sensitivity-high=The icon used to indicate high microphone sensitivity
+microphone-sensitivity-low=The icon used to indicate low microphone sensitivity
+microphone-sensitivity-medium=The icon used to indicate medium microphone sensitivity
+microphone-sensitivity-muted=The icon used to indicate that a microphone is muted
+
+[multimedia]
+Name=Multimedia
+Description=Icons related to playback of media
+
+media-playlist-repeat=The icon for the repeat mode of a media player
+media-playlist-repeat-song=The icon for repeating a song in a media player
+media-playlist-shuffle=The icon for the shuffle mode of a media player
+media-playlist-consecutive=The icon for consecutive mode of a media player
+media-skip-backward=The icon for the skip backward action of a media player
+media-seek-backward=The icon for the seek backward action of a media player
+media-playback-start=The icon for the start playback action of a media player
+media-seek-forward=The icon for the seek forward action of a media player
+media-skip-forward=The icon for the skip forward action of a media player
+media-playback-stop=The icon for the stop action of a media player
+media-playback-pause=The icon for the pause action of a media player
+media-eject=The icon for the eject action of a media player or file manager
+media-record=The icon for the record action of a media application
+media-view-subtitles=The icon used to show subtitles in a media player
+
+[network]
+Name=Network
+Description=Icons related to network status");
+
+network-transmit-receive=The icon used data is being both transmitted and received simultaneously, while the computing device is connected to a network
+network-transmit=The icon used when data is being transmitted, while the computing device is connected to a network
+network-receive=The icon used when data is being received, while the computing device is connected to a network
+network-idle=The icon used when no data is being transmitted or received, while the computing device is connected to a network
+network-error=The icon used when an error occurs trying to intialize the network connection of the computing device
+network-offline=The icon used when the computing device is disconnected from the network
+
+[weather]
+Name=Weather
+Description=Icons about weather conditions
+
+weather-clear=The icon used while the weather for a region is “clear skies”
+weather-clear-night=The icon used while the weather for a region is “clear skies” during the night
+weather-few-clouds=The icon used while the weather for a region is “partly cloudy”
+weather-few-clouds-night=The icon used while the weather for a region is “partly cloudy” during the night
+weather-fog=The icon used while the weather for a region is “foggy”
+weather-overcast=The icon used while the weather for a region is “overcast”
+weather-severe-alert=The icon used while a sever weather alert is in effect for a region
+weather-showers=The icon used while rain showers are occurring in a region
+weather-showers-scattered=The icon used while scattered rain showers are occurring in a region
+weather-snow=The icon used while snow showers are occurring in a region
+weather-storm=The icon used while storms are occurring in a region
+weather-windy=The icon used while the weather is windy
+
+[navigation]
+Name=Navigation
+Description=Icons for navigation in the user interface of a program
+
+go-first=The icon for the go to the first item in a list
+go-previous=The icon for the go to the previous item in a list
+go-next=The icon for the go to the next item in a list
+go-last=The icon for the go to the last item in a list
+go-bottom=The icon for the go to bottom of a list
+go-down=The icon for the go down in a list
+go-up=The icon for the go up in a list
+go-top=The icon for the go to the top of a list
+go-home=The icon for the go to home location
+go-jump=The icon for the jump to action
+
+[editing]
+Name=Editing
+Description=Icons related to editing a document
+format-indent-less=The icon for the decrease indent formatting action
+format-indent-more=The icon for the increase indent formatting action
+format-justify-center=The icon for the center justification formatting action
+format-justify-fill=The icon for the fill justification formatting action
+format-justify-left=The icon for the left justification formatting action
+format-justify-right=The icon for the right justification action
+format-text-direction-ltr=The icon for the left-to-right text formatting action
+format-text-direction-rtl=The icon for the right-to-left formatting action
+format-text-bold=The icon for the bold text formatting action
+format-text-italic=The icon for the italic text formatting action
+format-text-underline=The icon for the underlined text formatting action
+format-text-strikethrough=The icon for the strikethrough text formatting action
+edit-clear=The icon for the clear action
+edit-clear-all=
+edit-copy=The icon for the copy action
+edit-cut=The icon for the cut action
+edit-delete=The icon for the delete action
+edit-find-replace=The icon for the find and replace action
+edit-paste=The icon for the paste action
+edit-redo=The icon for the redo action
+edit-select-all=The icon for the select all action
+edit-select=
+edit-undo=The icon for the undo action
+error-correct=
+document-properties=The icon for the action to view the properties of a document in an application
+document-new=The icon used for the action to create a new document
+document-open=The icon used for the action to open a document
+document-open-recent=The icon used for the action to open a document that was recently opened
+document-save=The icon for the save action. Should be an arrow pointing down and toward a hard disk
+document-save-as=The icon for the save as action
+document-send=The icon for the send action. Should be an arrow pointing up and away from a hard disk
+document-page-setup=The icon for the page setup action of a document editor
+document-edit=The icon for the action to edit a document
+object-flip-horizontal=The icon for the action to flip an object horizontally
+object-flip-vertical=The icon for the action to flip an object vertically
+object-rotate-left=The icon for the rotate left action performed on an object
+object-rotate-right=The icon for the rotate rigt action performed on an object
+insert-image=The icon for the insert image action of an application
+insert-link=The icon for the insert link action of an application
+insert-object=The icon for the insert object action of an application
+insert-text=The icon for the insert text action of an application
+accessories-text-editor=The icon used for the desktop's text editing accessory program
+
+[view]
+Name=View Controls
+Description=Icons for view controls in a user interface
+
+view-list=The icon used for “List“ view mode
+view-grid=The icon used for “Grid“ view mode (as opposed to “List“)
+view-fullscreen=The icon used for the “Fullscreen” item in the application's “View” menu
+view-restore=The icon used by an application for leaving the fullscreen view, and returning to a normal windowed view
+zoom-fit-best=The icon used for the “Best Fit” item in the application's “View” menu
+zoom-in=The icon used for the “Zoom in” item in the application's “View” menu
+zoom-out=The icon used for the “Zoom Out” item in the application's “View” menu
+zoom-original=The icon used for the “Original Size” item in the application's “View” menu
+view-continuous=The icon used for a continuous view mode
+view-paged=The icon used for a paged view mode (as opposed to continuous)
+view-dual=The icon used for a side-by-side view of paginated content
+view-wrapped=The icon used to indicate a wrap-around to the beginning
+view-pin=The icon used for 'pin a view'
+
+[calendar]
+Name=Calendar, Tasks and Alarms
+Description=Icons related to calendars, tasks and alarms
+
+task-due=The icon used when a task is due soon
+task-past-due=The icon used when a task that was due, has been left incomplete
+appointment-soon=The icon used when an appointment will occur soon
+appointment-missed=The icon used when an appointment was missed
+alarm=The icon used for alarms when a task or appointment is due
+
+[communication]
+Name=Communication
+Description=Icons related email, phone calls, IM and other forms of communication
+
+mail-unread=The icon used for an electronic mail that is unread
+mail-read=The icon used for an electronic mail that is read
+mail-replied=The icon used for an electronic mail that has been replied to
+mail-attachment=The icon used for an electronic mail that contains attachments
+mail-mark-important=The icon for the mark as important action of an electronic mail application
+mail-send=The icon for the send action of an electronic mail application
+mail-send-receive=The icon for the send and receive action of an electronic mail application
+call-start=The icon used for initiating or accepting a call
+call-stop=The icon used for stopping a current call
+call-missed=The icon used to show a missed call
+user-available=The icon used when a user on a chat network is available to initiate a conversation with
+user-offline=The icon used when a user on a chat network is not available
+user-idle=The icon used when a user on a chat network has not been an active participant in any chats on the network, for an extended period of time
+user-invisible=The icon used when a user is on a chat network, but is invisible to others
+user-busy=The icon used when a user is on a chat network, and has marked himself as busy
+user-away=The icon used when a user on a chat network is away from their keyboard and the chat program
+user-status-pending=The icon used when the current user status on a chat network is not known
+
+[devices]
+Name=Devices and Media
+Description=Icons for devices and media
+
+audio-input-microphone=The icon used for the microphone audio input device
+camera-web=The fallback icon for web cameras
+camera-photo=The icon used for a digital still camera devices
+input-keyboard=The icon used for the keyboard input device
+printer=The icon used for a printer device
+video-display=The icon used for the monitor that video gets displayed to
+computer=The icon used for the computing device as a whole
+media-optical=The icon used for physical optical media such as CD and DVD
+phone=The icon used for phone devices which support connectivity to the PC, such as VoIP, cellular, or possibly landline phones
+input-dialpad=The icon used for dialpad input devices
+input-touchpad=The icon used for touchpad input devices
+scanner=The icon used for a scanner device
+audio-card=The icon used for the audio rendering device
+input-gaming=The icon used for the gaming input device
+input-mouse=The icon used for the mousing input device
+multimedia-player=The icon used for generic multimedia playing devices
+audio-headphones=The icon used for headphones
+audio-headset=The icon used for headsets
+display-projector=The icon used for projectors
+media-removable=The icon used for generic removable media
+printer-network=The icon used for printers which are connected via the network
+audio-speakers=The icon used for speakers
+camera-video=The fallback icon for video cameras
+drive-optical=The icon used for optical media drives such as CD and DVD
+drive-removable-media=The icon used for removable media drives
+input-tablet=The icon used for graphics tablet input devices
+network-wireless=The icon used for wireless network connections
+network-wired=The icon used for wired network connections
+media-floppy=The icon used for physical floppy disk media
+media-flash=The fallback icon used for flash media, such as memory stick and SD
+
+[contenttypes]
+Name=Content Types
+Description=Icons for different types of data, such as audio or image files
+
+application-certificate=
+application-rss+xml=
+application-x-appliance=
+audio-x-generic=The icon used for generic audio file types
+folder=The standard folder icon used to represent directories on local filesystems, mail folders, and other hierarchical groups
+text-x-generic=The icon used for generic text file types
+video-x-generic=The icon used for generic video file types
+x-office-calendar=The icon used for generic calendar file types
+
+[emotes]
+Name=Emotes
+Description=Icons for emotions that are expressed through text chat applications such as :-) or :-P in IRC or instant messengers
+
+face-angel=The icon used for the 0:-) emote
+face-angry=The icon used for the X-( emote
+face-cool=The icon used for the B-) emote
+face-crying=The icon used for the :'( emote
+face-devilish=The icon used for the >:-) emote
+face-embarrassed=The icon used for the :-[ emote
+face-kiss=The icon used for the :-* emote
+face-laugh=The icon used for the :-)) emote
+face-monkey=The icon used for the :-(|) emote
+face-plain=The icon used for the :-| emote
+face-raspberry=The icon used for the :-P emote
+face-sad=The icon used for the :-( emote
+face-shutmouth=The 'shut mouth' emote
+face-sick=The icon used for the :-& emote
+face-smile=The icon used for the :-) emote
+face-smile-big=The icon used for the :-D emote
+face-smirk=The icon used for the :-! emote
+face-surprise=The icon used for the :-0 emote
+face-tired=The icon used for the |-) emote
+face-uncertain=The icon used for the :-/ emote
+face-wink=The icon used for the ;-) emote
+face-worried=The icon used for the :-S emote
+face-yawn=
+
+[general]
+Name=General
+Description=Generally useful icons that don't fit in a particular category
+
+edit-find=The icon for generic search actions
+content-loading=The icon used to indicate that content is loading
+open-menu=The icon used for a menu button in the header bar
+view-more=The icon used for a  “View More“ action
+tab-new=The icon used for a “New Tab“ action
+bookmark-new=The icon used for creating a new bookmark
+mark-location=The icon used to mark a location on a map
+find-location=The icon used for a  “Search location“ action
+send-to=The icon used for a  “Send to“ action
+object-select=The icon used for generic selection actions
+window-close=The icon used for actions that close a view, such as window or tab close button
+view-refresh=The icon used for the “Refresh” item in the application's “View” menu
+process-stop=The icon used for the “Stop” action in applications with actions that may take a while to process, such as web page loading in a browser
+action-unavailable=The icon used to indicate that an action is currently unavailable, such as “Pause“ when no media is playing
+document-print=The icon for the print action of an application
+printer-printing=The icon used while a print job is successfully being spooled to a printing device
+printer-warning=The icon used when a recoverable problem occurs while attempting to printing
+printer-error=The icon used when an error occurs while attempting to print
+dialog-information=The icon used when a dialog is opened to give information to the user that may be pertinent to the requested action
+dialog-question=The icon used when a dialog is opened to ask a simple question of the user
+dialog-warning=The icon used when a dialog is opened to warn the user of impending issues with the requested action
+dialog-password=The icon used when a dialog requesting the authentication credentials for a user is opened
+dialog-error=The icon used when a dialog is opened to explain an error condition to the user
+list-add=The icon for the add to list action
+list-remove=The icon for the remove from list action
+non-starred=The icon used to indicate that an object is not 'starred'
+semi-starred=The icon used to indicate that an object has is 'half-starred'
+starred=The icon used to indicate that an object is 'starred'
+star-new=The used for the “New Star“ action
+security-low=The icon used to indicate that the security level of a connection is presumed to be insecure, either by using weak encryption, or by using a certificate that the could not be automatically verified, and which the user has not chosent to trust
+security-medium=The icon used to indicate that the security level of a connection is presumed to be secure, using strong encryption, and a certificate that could not be automatically verified, but which the user has chosen to trust
+security-high=The icon used to indicate that the security level of a connection is known to be secure, using strong encryption and a valid certificate
+user-trash=The icon for the user's “Trash” place in the file system
+user-trash-full=The icon for the user's “Trash” in the file system, when there are items in the “Trash” waiting for disposal or recovery
+emblem-system=The icon used as an emblem for directories that contain system libraries, settings, and data
+avatar-default=The generic avatar icon, which is used to represent a user that doesn't have a personalized avatar
+emblem-synchronizing=The icon used as an emblem to indicate that a a synchronizing operation is in process
+emblem-shared=The icon used as an emblem for files and directories that are shared to other users
+folder-download=The icon representing the location in the file system where downloaded files are stored
+help-browser=The icon used for the desktop's help browsing application
+
+[other]
+Name=Other
+Description=Icons which have may be too specialized and not of general interest
+
+changes-allow=
+changes-prevent=
+view-sort-ascending=The icon used for the “Sort Ascending” item in the application's “View” menu, or in a button for changing the sort method for a list
+view-sort-descending=The icon used for the “Sort Descending” item in the application's “View” menu, or in a button for changing the sort method for a list
+document-revert=The icon for the action of reverting to a previous version of a document
+address-book-new=The icon used for the action to create a new address book
+application-exit=The icon used for exiting an application. Typically this is seen in the application's menus as File->Quit
+appointment-new=The icon used for the action to create a new appointment in a calendaring application
+contact-new=The icon used for the action to create a new contact in an address book application
+document-print-preview=The icon for the print preview action of an application
+folder-new=The icon for creating a new folder
+help-about=The icon for the About item in the Help menu
+help-contents=The icon for Contents item in the Help menu
+help-faq=The icon for the FAQ item in the Help menu
+list-remove-all=
+mail-forward=The icon for the forward action of an electronic mail application
+mail-mark-junk=The icon for the mark as junk action of an electronic mail application
+mail-mark-notjunk=The icon for the mark as not junk action of an electronic mail application
+mail-mark-read=The icon for the mark as read action of an electronic mail application
+mail-mark-unread=The icon for the mark as unread action of an electronic mail application
+mail-message-new=The icon for the compose new mail action of an electronic mail application
+mail-reply-all=The icon for the reply to all action of an electronic mail application
+mail-reply-sender=The icon for the reply to sender action of an electronic mail application
+pan-down=
+pan-end=
+pan-start=
+pan-up=
+system-lock-screen=The icon used for the “Lock Screen” item in the desktop's panel application
+system-log-out=The icon used for the “Log Out” item in the desktop's panel application
+system-run=The icon used for the “Run Application...” item in the desktop's panel application
+system-search=The icon used for the “Search” item in the desktop's panel application
+system-reboot=The icon used for the “Reboot” item in the desktop's panel application
+system-shutdown=The icon used for the “Shutdown” item in the desktop's panel application
+tools-check-spelling=The icon used for the “Check Spelling” item in the application's “Tools” menu
+window-maximize=
+window-minimize=
+window-restore=
+window-new=The icon used for the “New Window” item in the application's “Windows” menu
+accessories-calculator=The icon used for the desktop's calculator accessory program
+accessories-character-map=The icon used for the desktop's international and extended text character accessory program
+accessories-dictionary=The icon used for the desktop's dictionary accessory program
+multimedia-volume-control=The icon used for the desktop's hardware volume control application
+preferences-desktop-accessibility=The icon used for the desktop's accessibility preferences
+preferences-desktop-display=
+preferences-desktop-font=The icon used for the desktop's font preferences
+preferences-desktop-keyboard=The icon used for the desktop's keyboard preferences
+preferences-desktop-keyboard-shortcuts=
+preferences-desktop-locale=The icon used for the desktop's locale preferences
+preferences-desktop-remote-desktop=
+preferences-desktop-multimedia=The icon used for the desktop's multimedia preferences
+preferences-desktop-screensaver=The icon used for the desktop's screen saving preferences
+preferences-desktop-theme=The icon used for the desktop's theme preferences
+preferences-desktop-wallpaper=The icon used for the desktop's wallpaper preferences
+preferences-system-privacy=
+preferences-system-windows=
+system-file-manager=The icon used for the desktop's file management application
+system-software-install=The icon used for the desktop's software installer application
+system-software-update=The icon used for the desktop's software updating application
+system-users=
+user-info=
+utilities-system-monitor=The icon used for the desktop's system resource monitor application
+utilities-terminal=The icon used for the desktop's terminal emulation application.
+application-x-addon=
+application-x-executable=The icon used for executable file types
+font-x-generic=The icon used for generic font file types
+image-x-generic=The icon used for generic image file types
+package-x-generic=The icon used for generic package file types
+text-html=The icon used for HTML text file types
+text-x-generic-template=The icon used for generic text templates
+text-x-preview=
+text-x-script=The icon used for script file types, such as shell scripts
+x-office-address-book=The icon used for generic address book file types
+x-office-document=The icon used for generic document and letter file types
+x-office-document-template=
+x-office-presentation=The icon used for generic presentation file types
+x-office-presentation-template=
+x-office-spreadsheet=The icon used for generic spreadsheet file types
+x-office-spreadsheet-template=
+x-package-repository=
+applications-accessories=The icon for the “Accessories” sub-menu of the Programs menu
+applications-development=The icon for the “Programming” sub-menu of the Programs menu
+applications-engineering=The icon for the “Engineering” sub-menu of the Programs menu
+applications-games=The icon for the “Games” sub-menu of the Programs menu
+applications-graphics=The icon for the “Graphics” sub-menu of the Programs menu
+applications-internet=The icon for the “Internet” sub-menu of the Programs menu
+applications-multimedia=The icon for the “Multimedia” sub-menu of the Programs menu
+applications-office=The icon for the “Office” sub-menu of the Programs menu
+applications-other=The icon for the “Other” sub-menu of the Programs menu
+applications-science=The icon for the “Science” sub-menu of the Programs menu
+applications-system=The icon for the “System Tools” sub-menu of the Programs menu
+applications-utilities=The icon for the “Utilities” sub-menu of the Programs menu
+preferences-desktop=The icon for the “Desktop Preferences” category
+preferences-desktop-peripherals=The icon for the “Peripherals” sub-category of the “Desktop Preferences” category
+preferences-desktop-personal=The icon for the “Personal” sub-category of the “Desktop Preferences” category
+preferences-other=The icon for the “Other” preferences category
+preferences-system=The icon for the “System Preferences” category
+preferences-system-network=The icon for the “Network” sub-category of the “System Preferences” category
+system-help=The icon for the “Help” system category
+battery=The icon used for the system battery device
+computer-apple-ipad=
+colorimeter-colorhug=
+drive-harddisk=The icon used for hard disk drives
+drive-harddisk-ieee1394=
+drive-harddisk-system=
+drive-multidisk=
+media-optical-bd=
+media-optical-cd-audio=
+media-optical-dvd=
+media-tape=The icon used for generic physical tape media
+media-zip=
+modem=The icon used for modem devices
+multimedia-player-apple-ipod-touch=
+network-vpn=
+pda=This is the fallback icon for Personal Digial Assistant devices. Primary use of this icon is for PDA devices connected to the PC. Connection medium is not an important aspect of the icon. The metaphor for this fallback icon should be a generic PDA device icon
+phone-apple-iphone=
+uninterruptible-power-supply=
+emblem-default=The icon used as an emblem to specify the default selection of a printer for example
+emblem-documents=The icon used as an emblem for the directory where a user's documents are stored
+emblem-downloads=The icon used as an emblem for the directory where a user's downloads from the internet are stored
+emblem-favorite=The icon used as an emblem for files and directories that the user marks as favorites
+emblem-generic=
+emblem-important=The icon used as an emblem for files and directories that are marked as important by the user
+emblem-mail=The icon used as an emblem to specify the directory where the user's electronic mail is stored
+emblem-new=
+emblem-ok=
+emblem-package=
+emblem-photos=The icon used as an emblem to specify the directory where the user stores photographs
+emblem-readonly=The icon used as an emblem for files and directories which can not be written to by the user
+emblem-symbolic-link=The icon used as an emblem for files and direcotires that are links to other files or directories on the filesystem
+emblem-synchronized=The icon used as an emblem for files or directories that are configured to be synchronized to another device
+emblem-unreadable=The icon used as an emblem for files and directories that are inaccessible.
+emblem-urgent=
+emblem-videos=
+emblem-web=
+folder-documents=
+folder-download=
+folder-music=
+folder-pictures=
+folder-documents=
+folder-publicshare=
+folder-remote=The icon used for normal directories on a remote filesystem
+folder-saved-search=
+folder-templates=
+folder-videos=
+network-server=The icon used for individual host machines under the “Network Servers” place in the file manager
+network-workgroup=The icon for the “Network Servers” place in the desktop's file manager, and workgroups within the network
+start-here=The icon used by the desktop's main menu for accessing places, applications, and other features
+user-bookmarks=The icon for the user's special “Bookmarks” place
+user-desktop=The icon for the special “Desktop” directory of the user
+user-home=The icon for the special “Home” directory of the user
+airplane-mode=
+battery-caution-charging=
+battery-caution=The icon used when the battery is below 40%
+battery-empty-charging=
+battery-empty=
+battery-full-charged=
+battery-full-charging=
+battery-full=
+battery-good-charging=
+battery-good=
+battery-low-charging=
+battery-low=The icon used when the battery is below 20%
+battery-missing=
+bluetooth-active=
+bluetooth-disabled=
+channel-insecure=
+channel-secure=
+computer-fail=
+display-brightness=
+keyboard-brightness=
+folder-drag-accept=The icon used for a folder while an object is being dragged onto it, that is of a type that the directory can contain
+folder-open=The icon used for folders, while their contents are being displayed within the same window. This icon would normally be shown in a tree or list view, next to the main view of a folder's contents
+folder-visiting=The icon used for folders, while their contents are being displayed in another window. This icon would typically be used when using multiple windows to navigate the hierarchy, such as in Nautilus's spatial mode
+image-loading=The icon used when another image is being loaded, such as thumnails for larger images in the file manager
+image-missing=The icon used when another image could not be loaded
+mail-signed=The icon used for an electronic mail that contains a signature
+mail-signed-verified=The icon used for an electronic mail that contains a signature which has also been verified by the security system
+network-cellular-3g=
+network-cellular-4g=
+network-cellular-edge=
+network-cellular-gprs=
+network-cellular-umts=
+network-cellular-acquiring=
+network-cellular-connected=
+network-cellular-no-route=
+network-cellular-offline=
+network-cellular-signal-excellent=
+network-cellular-signal-good=
+network-cellular-signal-ok=
+network-cellular-signal-weak=
+network-cellular-signal-none=
+network-vpn-acquiring=
+network-vpn=
+network-wired-acquiring=
+network-wired-disconnected=
+network-wired-no-route=
+network-wired-offline=
+network-wireless-acquiring=
+network-wireless-connected=
+network-wireless-encrypted=
+network-wireless-hotspot=
+network-wireless-no-route=
+network-wireless-offline=
+network-wireless-signal-excellent=
+network-wireless-signal-good=
+network-wireless-signal-ok=
+network-wireless-signal-weak=
+network-wireless-signal-none=
+rotation-allowed=
+rotation-locked=
+software-update-available=The icon used when an update is available for software installed on the computing device, through the system software update program
+software-update-urgent=The icon used when an urgent update is available through the system software update program
+sync-error=The icon used when an error occurs while attempting to synchronize data from the computing device, to another device
+sync-synchronizing=The icon used while data is successfully synchronizing to another device
+touchpad-disabled=
+trophy-bronze=
+trophy-silver=
+trophy-gold=
+night-light=
+daytime-sunrise=
+daytime-sunset=

demos/icon-browser/iconbrowser.gresource.xml

@@ -3,5 +3,6 @@
   <gresource prefix="/org/gtk/iconbrowser/gtk">
     <file preprocess="xml-stripblanks">window.ui</file>
     <file preprocess="xml-stripblanks">menus.ui</file>
+    <file>icon.list</file>
   </gresource>
 </gresources>

demos/icon-browser/iconbrowserwin.c

@@ -6,11 +6,22 @@
 
 typedef struct
 {
-  const gchar *id;
-  const gchar *name;
-  const gchar *description;
+  gchar *id;
+  gchar *name;
+  gchar *description;
 } Context;
 
+static void
+context_free (gpointer data)
+{
+  Context *context = data;
+
+  g_free (context->id);
+  g_free (context->name);
+  g_free (context->description);
+  g_free (context);
+}
+
 struct _IconBrowserWindow
 {
   GtkApplicationWindow parent;
@@ -81,7 +92,7 @@ set_image (GtkWidget *image, const gchar *name, gint size)
   gtk_image_set_from_icon_name (GTK_IMAGE (image), name, 1);
   gtk_image_set_pixel_size (GTK_IMAGE (image), size);
   pixbuf = get_icon (image, name, size);
-  gtk_drag_source_set_icon_pixbuf (gtk_widget_get_parent (image), pixbuf);
+  gtk_drag_source_set_icon_pixbuf (image, pixbuf);
   g_object_unref (pixbuf);
 }
 
@@ -154,6 +165,7 @@ add_icon (IconBrowserWindow *win,
       g_free (symbolic_name);
       symbolic_name = NULL;
     }
+
   gtk_list_store_insert_with_values (win->store, NULL, -1,
                                      ICON_STORE_NAME_COLUMN, regular_name,
                                      ICON_STORE_SYMBOLIC_NAME_COLUMN, symbolic_name,
@@ -172,11 +184,11 @@ add_context (IconBrowserWindow *win,
   GtkWidget *row;
 
   c = g_new (Context, 1);
-  c->id = id;
-  c->name = name;
-  c->description = description;
+  c->id = g_strdup (id);
+  c->name = g_strdup (name);
+  c->description = g_strdup (description);
 
-  g_hash_table_insert (win->contexts, (gpointer)id, c);
+  g_hash_table_insert (win->contexts, c->id, c);
 
   row = gtk_label_new (name);
   g_object_set_data (G_OBJECT (row), "context", c);
@@ -213,475 +225,50 @@ selected_context_changed (GtkListBox *list, IconBrowserWindow *win)
 static void
 populate (IconBrowserWindow *win)
 {
-  add_context (win, "volume", "Volume", "Icons related to audio input and output volume");
-  add_icon (win, "audio-volume-high", "The icon used to indicate high audio volume", "volume");
-  add_icon (win, "audio-volume-low", "The icon used to indicate low audio volume", "volume");
-  add_icon (win, "audio-volume-medium", "The icon used to indicate medium audio volume", "volume");
-  add_icon (win, "audio-volume-muted", "The icon used to indicate the muted state for audio playback", "volume");
-  add_icon (win, "microphone-sensitivity-high", "The icon used to indicate high microphone sensitivity", "volume");
-  add_icon (win, "microphone-sensitivity-low", "The icon used to indicate low microphone sensitivity", "volume");
-  add_icon (win, "microphone-sensitivity-medium", "The icon used to indicate medium microphone sensitivity", "volume");
-  add_icon (win, "microphone-sensitivity-muted", "The icon used to indicate that a microphone is muted", "volume");
+  GFile *file;
+  GKeyFile *kf;
+  char *data;
+  gsize length;
+  char **groups;
+  int i;
 
-  add_context (win, "multimedia", "Multimedia", "Icons related to playback of media");
-  add_icon (win, "media-playlist-repeat", "The icon for the repeat mode of a media player", "multimedia");
-  add_icon (win, "media-playlist-repeat-song", "The icon for repeating a song in a media player", "multimedia");
-  add_icon (win, "media-playlist-shuffle", "The icon for the shuffle mode of a media player", "multimedia");
-  add_icon (win, "media-playlist-consecutive", "The icon for consecutive mode of a media player", "multimedia");
-  add_icon (win, "media-skip-backward", "The icon for the skip backward action of a media player", "multimedia");
-  add_icon (win, "media-seek-backward", "The icon for the seek backward action of a media player", "multimedia");
-  add_icon (win, "media-playback-start", "The icon for the start playback action of a media player", "multimedia");
-  add_icon (win, "media-seek-forward", "The icon for the seek forward action of a media player", "multimedia");
-  add_icon (win, "media-skip-forward", "The icon for the skip forward action of a media player", "multimedia");
-  add_icon (win, "media-playback-stop", "The icon for the stop action of a media player", "multimedia");
-  add_icon (win, "media-playback-pause", "The icon for the pause action of a media player", "multimedia");
-  add_icon (win, "media-eject", "The icon for the eject action of a media player or file manager", "multimedia");
-  add_icon (win, "media-record", "The icon for the record action of a media application", "multimedia");
-  add_icon (win, "media-view-subtitles", "The icon used to show subtitles in a media player", "multimedia");
+  file = g_file_new_for_uri ("resource:/org/gtk/iconbrowser/gtk/icon.list");
+  g_file_load_contents (file, NULL, &data, &length, NULL, NULL);
 
-  add_context (win, "network", "Network", "Icons related to network status");
-  add_icon (win, "network-transmit-receive", "The icon used data is being both transmitted and received simultaneously, while the computing device is connected to a network", "network");
-  add_icon (win, "network-transmit", "The icon used when data is being transmitted, while the computing device is connected to a network", "network");
-  add_icon (win, "network-receive", "The icon used when data is being received, while the computing device is connected to a network", "network");
-  add_icon (win, "network-idle", "The icon used when no data is being transmitted or received, while the computing device is connected to a network", "network");
- add_icon (win, "network-error", "The icon used when an error occurs trying to intialize the network connection of the computing device", "network");
-  add_icon (win, "network-offline", "The icon used when the computing device is disconnected from the network", "network");
+  kf = g_key_file_new ();
+  g_key_file_load_from_data (kf, data, length, G_KEY_FILE_NONE, NULL);
 
-  add_context (win, "weather", "Weather", "Icons about weather conditions");
-  add_icon (win, "weather-clear", "The icon used while the weather for a region is “clear skies”", "weather");
-  add_icon (win, "weather-clear-night", "The icon used while the weather for a region is “clear skies” during the night", "weather");
-  add_icon (win, "weather-few-clouds", "The icon used while the weather for a region is “partly cloudy”", "weather");
-  add_icon (win, "weather-few-clouds-night", "The icon used while the weather for a region is “partly cloudy” during the night", "weather");
-  add_icon (win, "weather-fog", "The icon used while the weather for a region is “foggy”", "weather");
-  add_icon (win, "weather-overcast", "The icon used while the weather for a region is “overcast”", "weather");
-  add_icon (win, "weather-severe-alert", "The icon used while a sever weather alert is in effect for a region", "weather");
-  add_icon (win, "weather-showers", "The icon used while rain showers are occurring in a region", "weather");
-  add_icon (win, "weather-showers-scattered", "The icon used while scattered rain showers are occurring in a region", "weather");
-  add_icon (win, "weather-snow", "The icon used while snow showers are occurring in a region", "weather");
-  add_icon (win, "weather-storm", "The icon used while storms are occurring in a region", "weather");
+  groups = g_key_file_get_groups (kf, &length);
+  for (i = 0; i < length; i++)
+    {
+      const char *context;
+      const char *name;
+      const char *description;
+      char **keys;
+      gsize len;
+      int j;
 
-  add_context (win, "navigation", "Navigation", "Icons for navigation in the user interface of a program");
-  add_icon (win, "go-first", "The icon for the go to the first item in a list", "navigation");
-  add_icon (win, "go-previous", "The icon for the go to the previous item in a list", "navigation");
-  add_icon (win, "go-next", "The icon for the go to the next item in a list", "navigation");
-  add_icon (win, "go-last", "The icon for the go to the last item in a list", "navigation");
-  add_icon (win, "go-bottom", "The icon for the go to bottom of a list", "navigation");
-  add_icon (win, "go-down", "The icon for the go down in a list", "navigation");
-  add_icon (win, "go-up", "The icon for the go up in a list", "navigation");
-  add_icon (win, "go-top", "The icon for the go to the top of a list", "navigation");
-  add_icon (win, "go-home", "The icon for the go to home location", "navigation");
-  add_icon (win, "go-jump", "The icon for the jump to action", "navigation");
+      context = groups[i];
+      name = g_key_file_get_string (kf, context, "Name", NULL);
+      description = g_key_file_get_string (kf, context, "Description", NULL);
+      add_context (win, context, name, description);
 
-  add_context (win, "editing", "Editing", "Icons related to editing a document");
-  add_icon (win, "format-indent-less", "The icon for the decrease indent formatting action", "editing");
-  add_icon (win, "format-indent-more", "The icon for the increase indent formatting action", "editing");
-  add_icon (win, "format-justify-center", "The icon for the center justification formatting action", "editing");
-  add_icon (win, "format-justify-fill", "The icon for the fill justification formatting action", "editing");
-  add_icon (win, "format-justify-left", "The icon for the left justification formatting action", "editing");
-  add_icon (win, "format-justify-right", "The icon for the right justification action", "editing");
-  add_icon (win, "format-text-direction-ltr", "The icon for the left-to-right text formatting action", "editing");
-  add_icon (win, "format-text-direction-rtl", "The icon for the right-to-left formatting action", "editing");
-  add_icon (win, "format-text-bold", "The icon for the bold text formatting action", "editing");
-  add_icon (win, "format-text-italic", "The icon for the italic text formatting action", "editing");
-  add_icon (win, "format-text-underline", "The icon for the underlined text formatting action", "editing");
-  add_icon (win, "format-text-strikethrough", "The icon for the strikethrough text formatting action", "editing");
-  add_icon (win, "edit-clear", "The icon for the clear action", "editing");
-  add_icon (win, "edit-clear-all", "", "editing");
-  add_icon (win, "edit-copy", "The icon for the copy action", "editing");
-  add_icon (win, "edit-cut", "The icon for the cut action", "editing");
-  add_icon (win, "edit-delete", "The icon for the delete action", "editing");
-  add_icon (win, "edit-find-replace", "The icon for the find and replace action", "editing");
-  add_icon (win, "edit-paste", "The icon for the paste action", "editing");
-  add_icon (win, "edit-redo", "The icon for the redo action", "editing");
-  add_icon (win, "edit-select-all", "The icon for the select all action", "editing");
-  add_icon (win, "edit-select", "", "editing");
-  add_icon (win, "edit-undo", "The icon for the undo action", "editing");
-  add_icon (win, "document-properties", "The icon for the action to view the properties of a document in an application", "editing");
-  add_icon (win, "document-new", "The icon used for the action to create a new document", "editing");
-  add_icon (win, "document-open", "The icon used for the action to open a document", "editing");
-  add_icon (win, "document-open-recent", "The icon used for the action to open a document that was recently opened", "editing");
-  add_icon (win, "document-save", "The icon for the save action. Should be an arrow pointing down and toward a hard disk", "editing");
-  add_icon (win, "document-save-as", "The icon for the save as action", "editing");
-  add_icon (win, "document-send", "The icon for the send action. Should be an arrow pointing up and away from a hard disk", "editing");
-  add_icon (win, "document-page-setup", "The icon for the page setup action of a document editor", "editing");
-  add_icon (win, "changes-allow", "", "other");
-  add_icon (win, "changes-prevent", "", "other");
-  add_icon (win, "object-flip-horizontal", "The icon for the action to flip an object horizontally", "editing");
-  add_icon (win, "object-flip-vertical", "The icon for the action to flip an object vertically", "editing");
-  add_icon (win, "object-rotate-left", "The icon for the rotate left action performed on an object", "editing");
-  add_icon (win, "object-rotate-right", "The icon for the rotate rigt action performed on an object", "editing");
-  add_icon (win, "insert-image", "The icon for the insert image action of an application", "editing");
-  add_icon (win, "insert-link", "The icon for the insert link action of an application", "editing");
-  add_icon (win, "insert-object", "The icon for the insert object action of an application", "editing");
-  add_icon (win, "insert-text", "The icon for the insert text action of an application", "editing");
-  add_icon (win, "accessories-text-editor", "The icon used for the desktop's text editing accessory program", "editing");
+      keys = g_key_file_get_keys (kf, context, &len, NULL);
+      for (j = 0; j < len; j++)
+        {
+          const char *key = keys[j];
+          const char *value;
 
-  add_context (win, "view", "View Controls", "Icons for view controls in a user interface");
-  add_icon (win, "view-list", "The icon used for “List“ view mode", "view");
-  add_icon (win, "view-grid", "The icon used for “Grid“ view mode (as opposed to “List“)", "view");
-  add_icon (win, "view-fullscreen", "The icon used for the “Fullscreen” item in the application's “View” menu", "view");
-  add_icon (win, "view-restore", "The icon used by an application for leaving the fullscreen view, and returning to a normal windowed view", "view");
-  add_icon (win, "zoom-fit-best", "The icon used for the “Best Fit” item in the application's “View” menu", "view");
-  add_icon (win, "zoom-in", "The icon used for the “Zoom in” item in the application's “View” menu", "view");
-  add_icon (win, "zoom-out", "The icon used for the “Zoom Out” item in the application's “View” menu ", "view");
-  add_icon (win, "zoom-original", "The icon used for the “Original Size” item in the application's “View” menu", "view");
-  add_icon (win, "view-continuous", "The icon used for a continuous view mode", "view");
-  add_icon (win, "view-paged", "The icon used for a paged view mode (as opposed to continuous)", "view");
-  add_icon (win, "view-dual", "The icon used for a side-by-side view of paginated content", "view");
-  add_icon (win, "view-wrapped", "The icon used to indicate a wrap-around to the beginning", "view");
+          if (strcmp (key, "Name") == 0 || strcmp (key, "Description") == 0)
+            continue;
 
-  add_context (win, "calendar", "Calendar, Tasks and Alarms", "Icons related to calendars, tasks and alarms");
-  add_icon (win, "task-due", "The icon used when a task is due soon", "calendar");
-  add_icon (win, "task-past-due", "The icon used when a task that was due, has been left incomplete", "calendar");
-  add_icon (win, "appointment-soon", "The icon used when an appointment will occur soon", "calendar");
-  add_icon (win, "appointment-missed", "The icon used when an appointment was missed", "calendar");
-  add_icon (win, "alarm", "The icon used for alarms when a task or appointment is due", "calendar");
+          value = g_key_file_get_string (kf, context, key, NULL);
 
-  add_context (win, "communication", "Communication", "Icons related email, phone calls, IM and other forms of communication");
-  add_icon (win, "mail-unread", "The icon used for an electronic mail that is unread", "communication");
-  add_icon (win, "mail-read", "The icon used for an electronic mail that is read", "communication");
-  add_icon (win, "mail-replied", "The icon used for an electronic mail that has been replied to", "communication");
-  add_icon (win, "mail-attachment", "The icon used for an electronic mail that contains attachments", "communication");
-  add_icon (win, "mail-mark-important", "The icon for the mark as important action of an electronic mail application", "communication");
-  add_icon (win, "mail-send", "The icon for the send action of an electronic mail application", "communication");
-  add_icon (win, "mail-send-receive", "The icon for the send and receive action of an electronic mail application", "communication");
-  add_icon (win, "call-start", "The icon used for initiating or accepting a call", "communication");
-  add_icon (win, "call-stop", "The icon used for stopping a current call", "communication");
-  add_icon (win, "call-missed", "The icon used to show a missed call", "communication");
-  add_icon (win, "user-available", "The icon used when a user on a chat network is available to initiate a conversation with", "communication");
-  add_icon (win, "user-offline", "The icon used when a user on a chat network is not available", "communication");
-  add_icon (win, "user-idle", "The icon used when a user on a chat network has not been an active participant in any chats on the network, for an extended period of time", "communication");
-  add_icon (win, "user-invisible", "The icon used when a user is on a chat network, but is invisible to others", "communication");
-  add_icon (win, "user-busy", "The icon used when a user is on a chat network, and has marked himself as busy", "communication");
-  add_icon (win, "user-away", "The icon used when a user on a chat network is away from their keyboard and the chat program", "communication");
-  add_icon (win, "user-status-pending", "The icon used when the current user status on a chat network is not known", "communication");
-
-  add_context (win, "devices", "Devices and Media", "Icons for devices and media");
-  add_icon (win, "audio-input-microphone", "The icon used for the microphone audio input device", "devices");
-  add_icon (win, "camera-web", "The fallback icon for web cameras", "devices");
-  add_icon (win, "camera-photo", "The icon used for a digital still camera devices", "devices");
-  add_icon (win, "input-keyboard", "The icon used for the keyboard input device", "devices");
-  add_icon (win, "printer", "The icon used for a printer device", "devices");
-  add_icon (win, "video-display", "The icon used for the monitor that video gets displayed to", "devices");
-  add_icon (win, "computer", "The icon used for the computing device as a whole", "devices");
-  add_icon (win, "media-optical", "The icon used for physical optical media such as CD and DVD", "devices");
-  add_icon (win, "phone", "The icon used for phone devices which support connectivity to the PC, such as VoIP, cellular, or possibly landline phones", "devices");
-  add_icon (win, "input-dialpad", "The icon used for dialpad input devices", "devices");
-  add_icon (win, "input-touchpad", "The icon used for touchpad input devices", "devices");
-  add_icon (win, "scanner", "The icon used for a scanner device", "devices");
-  add_icon (win, "audio-card", "The icon used for the audio rendering device", "devices");
-  add_icon (win, "input-gaming", "The icon used for the gaming input device", "devices");
-  add_icon (win, "input-mouse", "The icon used for the mousing input device", "devices");
-  add_icon (win, "multimedia-player", "The icon used for generic multimedia playing devices", "devices");
-  add_icon (win, "audio-headphones", "The icon used for headphones", "devices");
-  add_icon (win, "audio-headset", "The icon used for headsets", "devices");
-  add_icon (win, "display-projector", "The icon used for projectors", "devices");
-  add_icon (win, "media-removable", "The icon used for generic removable media", "devices");
-  add_icon (win, "printer-network", "The icon used for printers which are connected via the network", "devices");
-  add_icon (win, "audio-speakers", "The icon used for speakers", "devices");
-  add_icon (win, "camera-video", "The fallback icon for video cameras", "devices");
-  add_icon (win, "drive-optical", "The icon used for optical media drives such as CD and DVD", "devices");
-  add_icon (win, "drive-removable-media", "The icon used for removable media drives", "devices");
-  add_icon (win, "input-tablet", "The icon used for graphics tablet input devices", "devices");
-  add_icon (win, "network-wireless", "The icon used for wireless network connections", "devices");
-  add_icon (win, "network-wired", "The icon used for wired network connections", "devices");
-  add_icon (win, "media-floppy", "The icon used for physical floppy disk media", "devices");
-  add_icon (win, "media-flash", "The fallback icon used for flash media, such as memory stick and SD", "devices");
-
-  add_context (win, "contenttypes", "Content Types", "Icons for different types of data, such as audio or image files");
-  add_icon (win, "application-certificate", "", "contenttypes"); 
-  add_icon (win, "application-rss+xml", "", "contenttypes"); 
-  add_icon (win, "application-x-appliance", "", "contenttypes"); 
-  add_icon (win, "audio-x-generic", "The icon used for generic audio file types", "contenttypes");
-  add_icon (win, "folder", "The standard folder icon used to represent directories on local filesystems, mail folders, and other hierarchical groups", "contenttypes");
-  add_icon (win, "text-x-generic", "The icon used for generic text file types", "contenttypes");
-  add_icon (win, "video-x-generic", "The icon used for generic video file types", "contenttypes");
-  add_icon (win, "x-office-calendar", "The icon used for generic calendar file types", "contenttypes");
-
-  add_context (win, "emotes", "Emotes", "Icons for emotions that are expressed through text chat applications such as :-) or :-P in IRC or instant messengers");
-  add_icon (win, "face-angel", "The icon used for the 0:-) emote", "emotes");
-  add_icon (win, "face-angry", "The icon used for the X-( emote", "emotes");
-  add_icon (win, "face-cool", "The icon used for the B-) emote", "emotes");
-  add_icon (win, "face-crying", "The icon used for the :'( emote", "emotes");
-  add_icon (win, "face-devilish", "The icon used for the >:-) emote", "emotes");
-  add_icon (win, "face-embarrassed", "The icon used for the :-[ emote", "emotes");
-  add_icon (win, "face-kiss", "The icon used for the :-* emote", "emotes");
-  add_icon (win, "face-laugh", "The icon used for the :-)) emote", "emotes");
-  add_icon (win, "face-monkey", "The icon used for the :-(|) emote", "emotes");
-  add_icon (win, "face-plain", "The icon used for the :-| emote", "emotes");
-  add_icon (win, "face-raspberry", "The icon used for the :-P emote", "emotes");
-  add_icon (win, "face-sad", "The icon used for the :-( emote", "emotes");
-  add_icon (win, "face-shutmouth", "The 'shut mouth' emote", "emotes"); 
-  add_icon (win, "face-sick", "The icon used for the :-& emote", "emotes");
-  add_icon (win, "face-smile", "The icon used for the :-) emote", "emotes");
-  add_icon (win, "face-smile-big", "The icon used for the :-D emote", "emotes");
-  add_icon (win, "face-smirk", "The icon used for the :-! emote", "emotes");
-  add_icon (win, "face-surprise", "The icon used for the :-0 emote", "emotes");
-  add_icon (win, "face-tired", "The icon used for the |-) emote", "emotes");
-  add_icon (win, "face-uncertain", "The icon used for the :-/ emote", "emotes");
-  add_icon (win, "face-wink", "The icon used for the ;-) emote", "emotes");
-  add_icon (win, "face-worried", "The icon used for the :-S emote", "emotes");
-  add_icon (win, "face-yawn", "", "emotes"); 
-
-  add_context (win, "general", "General", "Generally useful icons that don't fit in a particular category");
-  add_icon (win, "edit-find", "The icon for generic search actions", "general");
-  add_icon (win, "content-loading", "The icon used to indicate that content is loading", "general"); 
-  add_icon (win, "open-menu", "The icon used for a menu button in the header bar", "general"); 
-  add_icon (win, "view-more", "The icon used for a  “View More“ action", "general"); 
-  add_icon (win, "tab-new", "The icon used for a “New Tab“ action", "general"); 
-  add_icon (win, "bookmark-new", "The icon used for creating a new bookmark", "general"); 
-  add_icon (win, "mark-location", "The icon used to mark a location on a map", "general"); 
-  add_icon (win, "find-location", "The icon used for a  “Search location“ action", "general"); 
-  add_icon (win, "send-to", "The icon used for a  “Send to“ action", "general"); 
-  add_icon (win, "object-select", "The icon used for generic selection actions", "general"); 
-  add_icon (win, "window-close", "The icon used for actions that close a view, such as window or tab close button", "general");
-  add_icon (win, "view-refresh", "The icon used for the “Refresh” item in the application's “View” menu", "general");
-  add_icon (win, "process-stop", "The icon used for the “Stop” action in applications with actions that may take a while to process, such as web page loading in a browser", "general");
-  add_icon (win, "action-unavailable", "The icon used to indicate that an action is currently unavailable, such as “Pause“ when no media is playing", "general"); 
-  add_icon (win, "document-print", "The icon for the print action of an application", "general");
-  add_icon (win, "printer-printing", "The icon used while a print job is successfully being spooled to a printing device", "general");
-  add_icon (win, "printer-warning", "The icon used when a recoverable problem occurs while attempting to printing", "general"); 
-  add_icon (win, "printer-error", "The icon used when an error occurs while attempting to print", "general");
-  add_icon (win, "dialog-information", "The icon used when a dialog is opened to give information to the user that may be pertinent to the requested action", "general");
-  add_icon (win, "dialog-question", "The icon used when a dialog is opened to ask a simple question of the user", "general");
-  add_icon (win, "dialog-warning", "The icon used when a dialog is opened to warn the user of impending issues with the requested action", "general");
-  add_icon (win, "dialog-password", "The icon used when a dialog requesting the authentication credentials for a user is opened", "general");
-  add_icon (win, "dialog-error", "The icon used when a dialog is opened to explain an error condition to the user", "general");
-  add_icon (win, "list-add", "The icon for the add to list action", "general");
-  add_icon (win, "list-remove", "The icon for the remove from list action", "general");
-  add_icon (win, "non-starred", "The icon used to indicate that an object is not 'starred'", "general"); 
-  add_icon (win, "semi-starred", "The icon used to indicate that an object has is 'half-starred'", "general"); 
-  add_icon (win, "starred", "The icon used to indicate that an object is 'starred'", "general"); 
-  add_icon (win, "star-new", "The used for the “New Star“ action", "general"); 
-  add_icon (win, "security-low", "The icon used to indicate that the security level of a connection is presumed to be insecure, either by using weak encryption, or by using a certificate that the could not be automatically verified, and which the user has not chosent to trust", "general");
-  add_icon (win, "security-medium", "The icon used to indicate that the security level of a connection is presumed to be secure, using strong encryption, and a certificate that could not be automatically verified, but which the user has chosen to trust", "general");
-  add_icon (win, "security-high", "The icon used to indicate that the security level of a connection is known to be secure, using strong encryption and a valid certificate", "general");
-  add_icon (win, "user-trash", "The icon for the user's “Trash” place in the file system", "other");
-  add_icon (win, "user-trash-full", "The icon for the user's “Trash” in the file system, when there are items in the “Trash” waiting for disposal or recovery", "general");
-  add_icon (win, "emblem-system", "The icon used as an emblem for directories that contain system libraries, settings, and data", "general");
-  add_icon (win, "avatar-default", "The generic avatar icon, which is used to represent a user that doesn't have a personalized avatar", "general"); 
-  add_icon (win, "emblem-synchronizing", "The icon used as an emblem to indicate that a a synchronizing operation is in process", "general"); 
-  add_icon (win, "emblem-shared", "The icon used as an emblem for files and directories that are shared to other users", "general");
-  add_icon (win, "folder-download", "The icon representing the location in the file system where downloaded files are stored", "general"); 
-  add_icon (win, "help-browser", "The icon used for the desktop's help browsing application", "general");
-
-  add_context (win, "other", "Other", "Icons which have may be too specialized and not of general interest");
-  add_icon (win, "view-sort-ascending", "The icon used for the “Sort Ascending” item in the application's “View” menu, or in a button for changing the sort method for a list", "other");
-  add_icon (win, "view-sort-descending", "The icon used for the “Sort Descending” item in the application's “View” menu, or in a button for changing the sort method for a list", "other");
-  add_icon (win, "document-revert", "The icon for the action of reverting to a previous version of a document", "other");
-  add_icon (win, "address-book-new", "The icon used for the action to create a new address book", "other");
-  add_icon (win, "application-exit", "The icon used for exiting an application. Typically this is seen in the application's menus as File->Quit", "other");
-  add_icon (win, "appointment-new", "The icon used for the action to create a new appointment in a calendaring application", "other");
-  add_icon (win, "contact-new", "The icon used for the action to create a new contact in an address book application", "other");
-  add_icon (win, "document-print-preview", "The icon for the print preview action of an application", "other");
-  add_icon (win, "folder-new", "The icon for creating a new folder", "other");
-  add_icon (win, "help-about", "The icon for the About item in the Help menu", "other");
-  add_icon (win, "help-contents", "The icon for Contents item in the Help menu", "other");
-  add_icon (win, "help-faq", "The icon for the FAQ item in the Help menu", "other");
-  add_icon (win, "list-remove-all", "", "other");
-  add_icon (win, "mail-forward", "The icon for the forward action of an electronic mail application", "other");
-  add_icon (win, "mail-mark-junk", "The icon for the mark as junk action of an electronic mail application", "other");
-  add_icon (win, "mail-mark-notjunk", "The icon for the mark as not junk action of an electronic mail application", "other");
-  add_icon (win, "mail-mark-read", "The icon for the mark as read action of an electronic mail application", "other");
-  add_icon (win, "mail-mark-unread", "The icon for the mark as unread action of an electronic mail application", "other");
-  add_icon (win, "mail-message-new", "The icon for the compose new mail action of an electronic mail application", "other");
-  add_icon (win, "mail-reply-all", "The icon for the reply to all action of an electronic mail application", "other");
-  add_icon (win, "mail-reply-sender", "The icon for the reply to sender action of an electronic mail application", "other");
-  add_icon (win, "pan-down", "", "other"); 
-  add_icon (win, "pan-end", "", "other"); 
-  add_icon (win, "pan-start", "", "other"); 
-  add_icon (win, "pan-up", "", "other"); 
-  add_icon (win, "system-lock-screen", "The icon used for the “Lock Screen” item in the desktop's panel application", "other");
-  add_icon (win, "system-log-out", "The icon used for the “Log Out” item in the desktop's panel application", "other");
-  add_icon (win, "system-run", "The icon used for the “Run Application...” item in the desktop's panel application", "other");
-  add_icon (win, "system-search", "The icon used for the “Search” item in the desktop's panel application", "other");
-  add_icon (win, "system-reboot", "The icon used for the “Reboot” item in the desktop's panel application", "other");
-  add_icon (win, "system-shutdown", "The icon used for the “Shutdown” item in the desktop's panel application", "other");
-  add_icon (win, "tools-check-spelling", "The icon used for the “Check Spelling” item in the application's “Tools” menu", "other");
-  add_icon (win, "window-maximize", "", "other"); 
-  add_icon (win, "window-minimize", "", "other"); 
-  add_icon (win, "window-restore", "", "other"); 
-  add_icon (win, "window-new", "The icon used for the “New Window” item in the application's “Windows” menu", "other");
-  add_icon (win, "accessories-calculator", "The icon used for the desktop's calculator accessory program", "other"); 
-  add_icon (win, "accessories-character-map", "The icon used for the desktop's international and extended text character accessory program", "other");
-  add_icon (win, "accessories-dictionary", "The icon used for the desktop's dictionary accessory program", "other");
-  add_icon (win, "multimedia-volume-control", "The icon used for the desktop's hardware volume control application", "other");
-  add_icon (win, "preferences-desktop-accessibility", "The icon used for the desktop's accessibility preferences", "other");
-  add_icon (win, "preferences-desktop-display", "", "other"); 
-  add_icon (win, "preferences-desktop-font", "The icon used for the desktop's font preferences", "other");
-  add_icon (win, "preferences-desktop-keyboard", "The icon used for the desktop's keyboard preferences", "other");
-  add_icon (win, "preferences-desktop-keyboard-shortcuts", "", "other"); 
-  add_icon (win, "preferences-desktop-locale", "The icon used for the desktop's locale preferences", "other");
-  add_icon (win, "preferences-desktop-remote-desktop", "", "other"); 
-  add_icon (win, "preferences-desktop-multimedia", "The icon used for the desktop's multimedia preferences", "other");
-  add_icon (win, "preferences-desktop-screensaver", "The icon used for the desktop's screen saving preferences", "other");
-  add_icon (win, "preferences-desktop-theme", "The icon used for the desktop's theme preferences", "other");
-  add_icon (win, "preferences-desktop-wallpaper", "The icon used for the desktop's wallpaper preferences", "other");
-  add_icon (win, "preferences-system-privacy", "", "other"); 
-  add_icon (win, "preferences-system-windows", "", "other"); 
-  add_icon (win, "system-file-manager", "The icon used for the desktop's file management application", "other");
-  add_icon (win, "system-software-install", "The icon used for the desktop's software installer application", "other");
-  add_icon (win, "system-software-update", "The icon used for the desktop's software updating application", "other");
-  add_icon (win, "system-users", "", "other"); 
-  add_icon (win, "user-info", "", "other"); 
-  add_icon (win, "utilities-system-monitor", "The icon used for the desktop's system resource monitor application", "other");
-  add_icon (win, "utilities-terminal", "The icon used for the desktop's terminal emulation application. ", "other");
-  add_icon (win, "application-x-addon", "", "other");
-  add_icon (win, "application-x-executable", "The icon used for executable file types", "other");
-  add_icon (win, "font-x-generic", "The icon used for generic font file types", "other");
-  add_icon (win, "image-x-generic", "The icon used for generic image file types", "other");
-  add_icon (win, "package-x-generic", "The icon used for generic package file types", "other");
-  add_icon (win, "text-html", "The icon used for HTML text file types", "other");
-  add_icon (win, "text-x-generic-template", "The icon used for generic text templates", "other");
-  add_icon (win, "text-x-preview", "", "other"); 
-  add_icon (win, "text-x-script", "The icon used for script file types, such as shell scripts", "other");
-  add_icon (win, "x-office-address-book", "The icon used for generic address book file types", "other");
-  add_icon (win, "x-office-document", "The icon used for generic document and letter file types", "other");
-  add_icon (win, "x-office-document-template", "", "other"); 
-  add_icon (win, "x-office-presentation", "The icon used for generic presentation file types", "other");
-  add_icon (win, "x-office-presentation-template", "", "other"); 
-  add_icon (win, "x-office-spreadsheet", "The icon used for generic spreadsheet file types", "other");
-  add_icon (win, "x-office-spreadsheet-template", "", "other"); 
-  add_icon (win, "x-package-repository", "", "other"); 
-  add_icon (win, "applications-accessories", "The icon for the “Accessories” sub-menu of the Programs menu", "other");
-  add_icon (win, "applications-development", "The icon for the “Programming” sub-menu of the Programs menu", "other");
-  add_icon (win, "applications-engineering", "The icon for the “Engineering” sub-menu of the Programs menu", "other");
-  add_icon (win, "applications-games", "The icon for the “Games” sub-menu of the Programs menu", "other");
-  add_icon (win, "applications-graphics", "The icon for the “Graphics” sub-menu of the Programs menu", "other");
-  add_icon (win, "applications-internet", "The icon for the “Internet” sub-menu of the Programs menu", "other");
-  add_icon (win, "applications-multimedia", "The icon for the “Multimedia” sub-menu of the Programs menu", "other");
-  add_icon (win, "applications-office", "The icon for the “Office” sub-menu of the Programs menu", "other");
-  add_icon (win, "applications-other", "The icon for the “Other” sub-menu of the Programs menu", "other");
-  add_icon (win, "applications-science", "The icon for the “Science” sub-menu of the Programs menu", "other");
-  add_icon (win, "applications-system", "The icon for the “System Tools” sub-menu of the Programs menu", "other");
-  add_icon (win, "applications-utilities", "The icon for the “Utilities” sub-menu of the Programs menu", "other");
-  add_icon (win, "preferences-desktop", "The icon for the “Desktop Preferences” category", "other");
-  add_icon (win, "preferences-desktop-peripherals", "The icon for the “Peripherals” sub-category of the “Desktop Preferences” category", "other");
-  add_icon (win, "preferences-desktop-personal", "The icon for the “Personal” sub-category of the “Desktop Preferences” category", "other");
-  add_icon (win, "preferences-other", "The icon for the “Other” preferences category", "other");
-  add_icon (win, "preferences-system", "The icon for the “System Preferences” category", "other");
-  add_icon (win, "preferences-system-network", "The icon for the “Network” sub-category of the “System Preferences” category", "other");
-  add_icon (win, "system-help", "The icon for the “Help” system category", "other");
-  add_icon (win, "battery", "The icon used for the system battery device", "other");
-  add_icon (win, "computer-apple-ipad", "", "other"); 
-  add_icon (win, "colorimeter-colorhug", "", "other"); 
-  add_icon (win, "drive-harddisk", "The icon used for hard disk drives", "other");
-  add_icon (win, "drive-harddisk-ieee1394", "", "other"); 
-  add_icon (win, "drive-harddisk-system", "", "other"); 
-  add_icon (win, "drive-multidisk", "", "other"); 
-  add_icon (win, "media-optical-bd", "", "other"); 
-  add_icon (win, "media-optical-cd-audio", "", "other"); 
-  add_icon (win, "media-optical-dvd", "", "other"); 
-  add_icon (win, "media-tape", "The icon used for generic physical tape media", "other");
-  add_icon (win, "media-zip", "", "other"); 
-  add_icon (win, "modem", "The icon used for modem devices", "other");
-  add_icon (win, "multimedia-player-apple-ipod-touch", "", "other"); 
-  add_icon (win, "network-vpn", "", "other"); 
-  add_icon (win, "pda", "This is the fallback icon for Personal Digial Assistant devices. Primary use of this icon is for PDA devices connected to the PC. Connection medium is not an important aspect of the icon. The metaphor for this fallback icon should be a generic PDA device icon", "other");
-  add_icon (win, "phone-apple-iphone", "", "other"); 
-  add_icon (win, "uninterruptible-power-supply", "", "other"); 
-  add_icon (win, "emblem-default", "The icon used as an emblem to specify the default selection of a printer for example", "other");
-  add_icon (win, "emblem-documents", "The icon used as an emblem for the directory where a user's documents are stored", "other");
-  add_icon (win, "emblem-downloads", "The icon used as an emblem for the directory where a user's downloads from the internet are stored", "other");
-  add_icon (win, "emblem-favorite", "The icon used as an emblem for files and directories that the user marks as favorites", "other");
-  add_icon (win, "emblem-generic", "", "other"); 
-  add_icon (win, "emblem-important", "The icon used as an emblem for files and directories that are marked as important by the user", "other");
-  add_icon (win, "emblem-mail", "The icon used as an emblem to specify the directory where the user's electronic mail is stored", "other");
-  add_icon (win, "emblem-new", "", "other"); 
-  add_icon (win, "emblem-ok", "", "other"); 
-  add_icon (win, "emblem-package", "", "other"); 
-  add_icon (win, "emblem-photos", "The icon used as an emblem to specify the directory where the user stores photographs", "other");
-  add_icon (win, "emblem-readonly", "The icon used as an emblem for files and directories which can not be written to by the user", "other");
-  add_icon (win, "emblem-symbolic-link", "The icon used as an emblem for files and direcotires that are links to other files or directories on the filesystem", "other");
-  add_icon (win, "emblem-synchronized", "The icon used as an emblem for files or directories that are configured to be synchronized to another device", "other");
-  add_icon (win, "emblem-unreadable", "The icon used as an emblem for files and directories that are inaccessible. ", "other");
-  add_icon (win, "emblem-urgent", "", "other"); 
-  add_icon (win, "emblem-videos", "", "other"); 
-  add_icon (win, "emblem-web", "", "other"); 
-  add_icon (win, "folder-documents", "", "other"); 
-  add_icon (win, "folder-download", "", "other"); 
-  add_icon (win, "folder-music", "", "other"); 
-  add_icon (win, "folder-pictures", "", "other"); 
-  add_icon (win, "folder-documents", "", "other"); 
-  add_icon (win, "folder-publicshare", "", "other"); 
-  add_icon (win, "folder-remote", "The icon used for normal directories on a remote filesystem", "other");
-  add_icon (win, "folder-saved-search", "", "other"); 
-  add_icon (win, "folder-templates", "", "other"); 
-  add_icon (win, "folder-videos", "", "other"); 
-  add_icon (win, "network-server", "The icon used for individual host machines under the “Network Servers” place in the file manager", "other");
-  add_icon (win, "network-workgroup", "The icon for the “Network Servers” place in the desktop's file manager, and workgroups within the network", "other");
-  add_icon (win, "start-here", "The icon used by the desktop's main menu for accessing places, applications, and other features", "other");
-  add_icon (win, "user-bookmarks", "The icon for the user's special “Bookmarks” place", "other");
-  add_icon (win, "user-desktop", "The icon for the special “Desktop” directory of the user", "other");
-  add_icon (win, "user-home", "The icon for the special “Home” directory of the user", "other");
-  add_icon (win, "airplane-mode", "", "other"); 
-  add_icon (win, "battery-caution-charging", "", "other"); 
-  add_icon (win, "battery-caution", "The icon used when the battery is below 40%", "other");
-  add_icon (win, "battery-empty-charging", "", "other"); 
-  add_icon (win, "battery-empty", "", "other"); 
-  add_icon (win, "battery-full-charged", "", "other"); 
-  add_icon (win, "battery-full-charging", "", "other"); 
-  add_icon (win, "battery-full", "", "other"); 
-  add_icon (win, "battery-good-charging", "", "other"); 
-  add_icon (win, "battery-good", "", "other"); 
-  add_icon (win, "battery-low-charging", "", "other"); 
-  add_icon (win, "battery-low", "The icon used when the battery is below 20%", "other");
-  add_icon (win, "battery-missing", "", "other"); 
-  add_icon (win, "bluetooth-active", "", "other"); 
-  add_icon (win, "bluetooth-disabled", "", "other"); 
-  add_icon (win, "channel-insecure", "", "other"); 
-  add_icon (win, "channel-secure", "", "other"); 
-  add_icon (win, "computer-fail", "", "other"); 
-  add_icon (win, "display-brightness", "", "other"); 
-  add_icon (win, "keyboard-brightness", "", "other"); 
-  add_icon (win, "folder-drag-accept", "The icon used for a folder while an object is being dragged onto it, that is of a type that the directory can contain", "other");
-  add_icon (win, "folder-open", "The icon used for folders, while their contents are being displayed within the same window. This icon would normally be shown in a tree or list view, next to the main view of a folder's contents", "other");
-  add_icon (win, "folder-visiting", "The icon used for folders, while their contents are being displayed in another window. This icon would typically be used when using multiple windows to navigate the hierarchy, such as in Nautilus's spatial mode", "other");
-  add_icon (win, "image-loading", "The icon used when another image is being loaded, such as thumnails for larger images in the file manager", "other");
-  add_icon (win, "image-missing", "The icon used when another image could not be loaded", "other");
-  add_icon (win, "mail-signed", "The icon used for an electronic mail that contains a signature", "other");
-  add_icon (win, "mail-signed-verified", "The icon used for an electronic mail that contains a signature which has also been verified by the security system", "other");
-  add_icon (win, "network-cellular-3g", "", "other"); 
-  add_icon (win, "network-cellular-4g", "", "other"); 
-  add_icon (win, "network-cellular-edge", "", "other"); 
-  add_icon (win, "network-cellular-gprs", "", "other"); 
-  add_icon (win, "network-cellular-umts", "", "other"); 
-  add_icon (win, "network-cellular-acquiring", "", "other"); 
-  add_icon (win, "network-cellular-connected", "", "other"); 
-  add_icon (win, "network-cellular-no-route", "", "other"); 
-  add_icon (win, "network-cellular-offline", "", "other"); 
-  add_icon (win, "network-cellular-signal-excellent", "", "other"); 
-  add_icon (win, "network-cellular-signal-good", "", "other"); 
-  add_icon (win, "network-cellular-signal-ok", "", "other"); 
-  add_icon (win, "network-cellular-signal-weak", "", "other"); 
-  add_icon (win, "network-cellular-signal-none", "", "other"); 
-  add_icon (win, "network-vpn-acquiring", "", "other"); 
-  add_icon (win, "network-vpn", "", "other"); 
-  add_icon (win, "network-wired-acquiring", "", "other"); 
-  add_icon (win, "network-wired-disconnected", "", "other"); 
-  add_icon (win, "network-wired-no-route", "", "other"); 
-  add_icon (win, "network-wired-offline", "", "other"); 
-  add_icon (win, "network-wireless-acquiring", "", "other"); 
-  add_icon (win, "network-wireless-connected", "", "other"); 
-  add_icon (win, "network-wireless-encrypted", "", "other"); 
-  add_icon (win, "network-wireless-hotspot", "", "other"); 
-  add_icon (win, "network-wireless-no-route", "", "other"); 
-  add_icon (win, "network-wireless-offline", "", "other"); 
-  add_icon (win, "network-wireless-signal-excellent", "", "other"); 
-  add_icon (win, "network-wireless-signal-good", "", "other"); 
-  add_icon (win, "network-wireless-signal-ok", "", "other"); 
-  add_icon (win, "network-wireless-signal-weak", "", "other"); 
-  add_icon (win, "network-wireless-signal-none", "", "other"); 
-  add_icon (win, "rotation-allowed", "", "other"); 
-  add_icon (win, "rotation-locked", "", "other"); 
-  add_icon (win, "software-update-available", "The icon used when an update is available for software installed on the computing device, through the system software update program", "other");
-  add_icon (win, "software-update-urgent", "The icon used when an urgent update is available through the system software update program", "other");
-  add_icon (win, "sync-error", "The icon used when an error occurs while attempting to synchronize data from the computing device, to another device", "other");
-  add_icon (win, "sync-synchronizing", "The icon used while data is successfully synchronizing to another device", "other");
-  add_icon (win, "touchpad-disabled", "", "other"); 
-  add_icon (win, "trophy-bronze", "", "other"); 
-  add_icon (win, "trophy-silver", "", "other"); 
-  add_icon (win, "trophy-gold", "", "other"); 
+          add_icon (win, key, value, context);
+        }
+      g_strfreev (keys);
+    }
+  g_strfreev (groups);
 }
 
 static gboolean
@@ -694,6 +281,16 @@ key_press_event_cb (GtkWidget *widget,
   return gtk_search_bar_handle_event (GTK_SEARCH_BAR (win->searchbar), event);
 }
 
+static void
+copy_to_clipboard (GtkButton         *button,
+                   IconBrowserWindow *win)
+{
+  GtkClipboard *clipboard;
+
+  clipboard = gtk_clipboard_get_default (gdk_display_get_default ());
+  gtk_clipboard_set_text (clipboard, gtk_window_get_title (GTK_WINDOW (win->details)), -1);
+}
+
 static gboolean
 icon_visible_func (GtkTreeModel *model,
                    GtkTreeIter  *iter,
@@ -748,7 +345,7 @@ symbolic_toggled (GtkToggleButton *toggle, IconBrowserWindow *win)
 
   gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (win->list), win->cell, "icon-name", column, NULL);
   gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (win->list), win->text_cell, "text", column, NULL);
-  
+
   gtk_tree_model_filter_refilter (win->filter_model);
   gtk_widget_queue_draw (win->list);
 }
@@ -786,12 +383,9 @@ get_image_data (GtkWidget        *widget,
 static void
 setup_image_dnd (GtkWidget *image)
 {
-  GtkWidget *parent;
-
-  parent = gtk_widget_get_parent (image);
-  gtk_drag_source_set (parent, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY);
-  gtk_drag_source_add_image_targets (parent);
-  g_signal_connect (parent, "drag-data-get", G_CALLBACK (get_image_data), NULL);
+  gtk_drag_source_set (image, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY);
+  gtk_drag_source_add_image_targets (image);
+  g_signal_connect (image, "drag-data-get", G_CALLBACK (get_image_data), NULL);
 }
 
 static void
@@ -821,7 +415,7 @@ icon_browser_window_init (IconBrowserWindow *win)
   setup_image_dnd (win->image4);
   setup_image_dnd (win->image5);
 
-  win->contexts = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_free);
+  win->contexts = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, context_free);
 
   gtk_tree_model_filter_set_visible_func (win->filter_model, icon_visible_func, win, NULL);
   gtk_window_set_transient_for (GTK_WINDOW (win->details), GTK_WINDOW (win));
@@ -866,6 +460,7 @@ icon_browser_window_class_init (IconBrowserWindowClass *class)
   gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), selected_context_changed);
   gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), symbolic_toggled);
   gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), key_press_event_cb);
+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), copy_to_clipboard);
 }
 
 IconBrowserWindow *

demos/icon-browser/meson.build

@@ -0,0 +1,19 @@
+iconbrowser_sources = [
+  'main.c',
+  'iconbrowserapp.c',
+  'iconbrowserwin.c',
+  'iconstore.c'
+]
+
+iconbrowser_resources = gnome.compile_resources('iconbrowser_resources',
+                                                'iconbrowser.gresource.xml',
+                                                source_dir: '.')
+
+executable('gtk4-icon-browser',
+           iconbrowser_sources, iconbrowser_resources,
+           dependencies: libgtk_dep,
+           include_directories: confinc,
+           gui_app: true,
+           install: true)
+
+install_data('gtk4-icon-browser.desktop', install_dir: gtk_applicationsdir)

demos/icon-browser/window.ui

@@ -110,7 +110,7 @@
                       <object class="GtkCellRendererPixbuf" id="cell">
                         <property name="xpad">10</property>
                         <property name="ypad">10</property>
-                        <property name="stock-size">5</property>
+                        <property name="stock-size">6</property>
                       </object>
                     </child>
                     <child>
@@ -151,15 +151,10 @@
             <property name="row-spacing">18</property>
             <property name="column-spacing">18</property>
             <child>
-              <object class="GtkEventBox">
+              <object class="GtkImage" id="image1">
                 <property name="visible">True</property>
-                <child>
-                  <object class="GtkImage" id="image1">
-                    <property name="visible">True</property>
-                    <property name="halign">center</property>
-                    <property name="valign">end</property>
-                  </object>
-                </child>
+                <property name="halign">center</property>
+                <property name="valign">end</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -167,15 +162,10 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox">
+              <object class="GtkImage" id="image2">
                 <property name="visible">True</property>
-                <child>
-                  <object class="GtkImage" id="image2">
-                    <property name="visible">True</property>
-                    <property name="halign">center</property>
-                    <property name="valign">end</property>
-                  </object>
-                </child>
+                <property name="halign">center</property>
+                <property name="valign">end</property>
               </object>
               <packing>
                 <property name="left-attach">1</property>
@@ -183,15 +173,10 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox">
+              <object class="GtkImage" id="image3">
                 <property name="visible">True</property>
-                <child>
-                  <object class="GtkImage" id="image3">
-                    <property name="visible">True</property>
-                    <property name="halign">center</property>
-                    <property name="valign">end</property>
-                  </object>
-                </child>
+                <property name="halign">center</property>
+                <property name="valign">end</property>
               </object>
               <packing>
                 <property name="left-attach">2</property>
@@ -199,15 +184,10 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox">
+              <object class="GtkImage" id="image4">
                 <property name="visible">True</property>
-                <child>
-                  <object class="GtkImage" id="image4">
-                    <property name="visible">True</property>
-                    <property name="halign">center</property>
-                    <property name="valign">end</property>
-                  </object>
-                </child>
+                <property name="halign">center</property>
+                <property name="valign">end</property>
               </object>
               <packing>
                 <property name="left-attach">3</property>
@@ -215,15 +195,10 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox">
+              <object class="GtkImage" id="image5">
                 <property name="visible">True</property>
-                <child>
-                  <object class="GtkImage" id="image5">
-                    <property name="visible">True</property>
-                    <property name="halign">center</property>
-                    <property name="valign">end</property>
-                  </object>
-                </child>
+                <property name="halign">center</property>
+                <property name="valign">end</property>
               </object>
               <packing>
                 <property name="left-attach">4</property>
@@ -320,6 +295,21 @@
                 <property name="width">5</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkButton">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Copy to Clipboard</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="margin">20</property>
+                <signal name="clicked" handler="copy_to_clipboard"/>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">4</property>
+                <property name="width">5</property>
+              </packing>
+            </child>
           </object>
         </child>
       </object>

demos/meson.build

@@ -0,0 +1,3 @@
+subdir('gtk-demo')
+subdir('icon-browser')
+subdir('widget-factory')

demos/widget-factory/Makefile.am

@@ -1,71 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-bin_PROGRAMS = gtk4-widget-factory
-
-desktopdir = $(datadir)/applications
-dist_desktop_DATA = gtk4-widget-factory.desktop
-
-gtk4_widget_factory_SOURCES = 		\
-	widget-factory.c		\
-	widget_factory_resources.c
-
-BUILT_SOURCES = 			\
-	widget_factory_resources.c
-
-gtk4_widget_factory_DEPENDENCIES = 	\
-	$(top_builddir)/gtk/libgtk-4.la
-
-gtk4_widget_factory_CPPFLAGS = 		\
-	-I$(top_srcdir)			\
-	$(GTK_DEBUG_FLAGS)		\
-	$(GTK_DEP_CFLAGS)		\
-	$(NULL)
-
-gtk4_widget_factory_LDADD = 		\
-	$(top_builddir)/gtk/libgtk-4.la \
-	$(GTK_DEP_LIBS)			\
-	$(NULL)
-
-widget_factory_resources.c: widget-factory.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/widget-factory.gresource.xml)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
-
-
-iconthemedir = $(datadir)/icons/hicolor
-
-appsicon16dir = $(iconthemedir)/16x16/apps
-appsicon22dir = $(iconthemedir)/22x22/apps
-appsicon24dir = $(iconthemedir)/24x24/apps
-appsicon32dir = $(iconthemedir)/32x32/apps
-appsicon48dir = $(iconthemedir)/48x48/apps
-appsicon256dir = $(iconthemedir)/256x256/apps
-
-dist_appsicon16_DATA = data/16x16/gtk4-widget-factory.png data/16x16/gtk4-widget-factory-symbolic.symbolic.png
-dist_appsicon22_DATA = data/22x22/gtk4-widget-factory.png data/22x22/gtk4-widget-factory-symbolic.symbolic.png
-dist_appsicon24_DATA = data/24x24/gtk4-widget-factory.png data/24x24/gtk4-widget-factory-symbolic.symbolic.png
-dist_appsicon32_DATA = data/32x32/gtk4-widget-factory.png data/32x32/gtk4-widget-factory-symbolic.symbolic.png
-dist_appsicon48_DATA = data/48x48/gtk4-widget-factory.png data/48x48/gtk4-widget-factory-symbolic.symbolic.png
-dist_appsicon256_DATA = data/256x256/gtk4-widget-factory.png data/256x256/gtk4-widget-factory-symbolic.symbolic.png
-
-update_icon_cache = $(top_builddir)/gtk/gtk4-update-icon-cache$(EXEEXT) --ignore-theme-index --force
-
-install-data-hook: install-update-icon-cache
-uninstall-hook: uninstall-update-icon-cache
-
-install-update-icon-cache:
-	$(AM_V_at)$(POST_INSTALL)
-	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
-
-uninstall-update-icon-cache:
-	$(AM_V_at)$(POST_UNINSTALL)
-	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
-
-EXTRA_DIST += 				\
-	widget-factory.ui 		\
-	widget-factory.css		\
-	menus.ui 			\
-	help-overlay.ui			\
-	widget-factory.gresource.xml	\
-	data/source.svg			\
-	data/symbolic-source.svg
-
--include $(top_srcdir)/git.mk

demos/widget-factory/meson.build

@@ -0,0 +1,26 @@
+# demos/widget-factory
+
+widgetfactory_resources = gnome.compile_resources('widgetfactory_resources',
+                                                  'widget-factory.gresource.xml',
+                                                  source_dir: '.')
+
+executable('gtk4-widget-factory',
+           'widget-factory.c', widgetfactory_resources,
+           dependencies: libgtk_dep,
+           include_directories: confinc,
+           gui_app: true,
+           install: true)
+
+# desktop file
+install_data('gtk4-widget-factory.desktop', install_dir: gtk_applicationsdir)
+
+# icons
+icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
+
+foreach icon_size : ['16x16', '22x22', '24x24', '32x32', '48x48', '256x256', ]
+  icons_dir = join_paths(icontheme_dir, '@0@/apps'.format(icon_size))
+  install_data('data/@0@/gtk4-widget-factory.png'.format(icon_size),
+               install_dir: icons_dir)
+  install_data('data/@0@/gtk4-widget-factory-symbolic.symbolic.png'.format(icon_size),
+               install_dir: icons_dir)
+endforeach

demos/widget-factory/widget-factory.c

@@ -800,10 +800,11 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget)
                 "use-markup", TRUE,
                 "halign", GTK_ALIGN_START,
                 "valign", GTK_ALIGN_CENTER,
+                "hexpand", TRUE,
                 "margin", 6,
                 "xalign", 0.0,
                 NULL);
-  gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (row), label);
   gdk_rgba_parse (&rgba, color);
   swatch = g_object_new (g_type_from_name ("GtkColorSwatch"),
                          "rgba", &rgba,
@@ -815,7 +816,7 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget)
                          NULL);
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (box), swatch);
-  gtk_box_pack_start (GTK_BOX (row), box, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (row), box);
   gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1);
   row = gtk_widget_get_parent (row);
   gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
@@ -911,9 +912,10 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser)
                     "halign", GTK_ALIGN_START,
                     "valign", GTK_ALIGN_CENTER,
                     "margin", 6,
+                    "hexpand", TRUE,
                     "xalign", 0.0,
                     NULL);
-      gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (row), label);
       gdk_rgba_parse (&rgba, colors[i].color);
       swatch = g_object_new (g_type_from_name ("GtkColorSwatch"),
                              "rgba", &rgba,
@@ -925,7 +927,7 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser)
                              NULL);
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_container_add (GTK_CONTAINER (box), swatch);
-      gtk_box_pack_start (GTK_BOX (row), box, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (row), box);
       gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1);
       row = gtk_widget_get_parent (row);
       gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);

demos/widget-factory/widget-factory.ui

@@ -450,9 +450,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               <item>Jet McQuack</item>
                             </items>
                           </object>
-                          <packing>
-                            <property name="fill">0</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkComboBoxText" id="comboboxtext2">
@@ -466,7 +463,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                           </object>
                           <packing>
-                            <property name="fill">0</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -476,10 +472,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="invisible_char">•</property>
                             <property name="placeholder-text" translatable="yes">Click icon to change mode</property>
                             <property name="secondary_icon_name">view-refresh-symbolic</property>
+                            <property name="secondary_icon_tooltip_text">Change mode</property>
                             <signal name="icon-release" handler="on_entry_icon_release" swapped="no"/>
                           </object>
                           <packing>
-                            <property name="fill">0</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
@@ -491,12 +487,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="text" translatable="yes">entry</property>
                           </object>
                           <packing>
-                            <property name="fill">0</property>
                             <property name="position">3</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="box223">
+                            <property name="hexpand">0</property>
                             <style>
                               <class name="linked"/>
                             </style>
@@ -505,10 +501,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="can_focus">1</property>
                                 <property name="invisible_char">•</property>
                                 <property name="text" translatable="yes">entry</property>
+                                <property name="hexpand">1</property>
                               </object>
-                              <packing>
-                                <property name="expand">1</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkButton" id="button224">
@@ -516,7 +510,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="icon-name">window-close-symbolic</property>
                               </object>
                               <packing>
-                                <property name="fill">0</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -527,6 +520,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkBox">
+                            <property name="hexpand">0</property>
                             <style>
                               <class name="linked"/>
                             </style>
@@ -534,6 +528,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               <object class="GtkComboBox">
                                 <property name="model">lrmodel</property>
                                 <property name="active">0</property>
+                                <property name="hexpand">1</property>
                                 <child>
                                   <object class="GtkCellRendererText"/>
                                   <attributes>
@@ -541,14 +536,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </attributes>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">1</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkComboBox">
                                 <property name="model">lrmodel</property>
                                 <property name="active">1</property>
+                                <property name="hexpand">1</property>
                                 <child>
                                   <object class="GtkCellRendererText"/>
                                   <attributes>
@@ -556,14 +549,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </attributes>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">1</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkComboBox">
                                 <property name="model">lrmodel</property>
                                 <property name="active">2</property>
+                                <property name="hexpand">1</property>
                                 <child>
                                   <object class="GtkCellRendererText"/>
                                   <attributes>
@@ -571,9 +562,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </attributes>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">1</property>
-                              </packing>
                             </child>
                           </object>
                         </child>
@@ -597,33 +585,26 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child>
                               <object class="GtkSpinButton" id="spinbutton1">
                                 <property name="can_focus">1</property>
-                                <property name="invisible_char">•</property>
                                 <property name="width-chars">2</property>
                                 <property name="max-width-chars">2</property>
                                 <property name="adjustment">adjustment2</property>
                               </object>
                               <packing>
-                                <property name="fill">0</property>
                                 <property name="position">2</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkSpinButton" id="spinbutton2">
+                                <object class="GtkSpinButton" id="spinbutton2">
                                 <property name="can_focus">1</property>
-                                <property name="invisible_char">•</property>
                                 <property name="sensitive">0</property>
                                 <property name="width-chars">2</property>
                                 <property name="max-width-chars">2</property>
                               </object>
                               <packing>
-                                <property name="fill">0</property>
                                 <property name="position">3</property>
                               </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="fill">0</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkGrid" id="grid1">
@@ -809,14 +790,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="fill">0</property>
-                          </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="fill">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkSeparator" id="separator1">
@@ -836,9 +811,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="can_focus">1</property>
                             <property name="receives_default">1</property>
                           </object>
-                          <packing>
-                            <property name="fill">0</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkToggleButton" id="togglebutton2">
@@ -848,7 +820,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="receives_default">1</property>
                           </object>
                           <packing>
-                            <property name="fill">0</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -860,7 +831,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="active">1</property>
                           </object>
                           <packing>
-                            <property name="fill">0</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
@@ -873,7 +843,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="active">1</property>
                           </object>
                           <packing>
-                            <property name="fill">0</property>
                             <property name="position">3</property>
                           </packing>
                         </child>
@@ -905,7 +874,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                           </object>
                           <packing>
-                            <property name="fill">0</property>
                             <property name="position">6</property>
                           </packing>
                         </child>
@@ -915,7 +883,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="receives_default">1</property>
                           </object>
                           <packing>
-                            <property name="fill">0</property>
                             <property name="position">6</property>
                           </packing>
                         </child>
@@ -970,7 +937,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                       </object>
                       <packing>
-                        <property name="fill">0</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
@@ -986,17 +952,15 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                       <object class="GtkBox" id="box20">
                         <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
+                        <property name="hexpand">1</property>
                         <child>
-                          <object class="GtkBox" id="box21">
+                            <object class="GtkBox" id="box21">
                             <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkProgressBar" id="progressbar1">
                                 <property name="fraction">0.5</property>
                               </object>
-                              <packing>
-                                <property name="fill">0</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkProgressBar" id="progressbar2">
@@ -1004,7 +968,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="inverted">1</property>
                               </object>
                               <packing>
-                                <property name="fill">0</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -1014,7 +977,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="show_text">1</property>
                               </object>
                               <packing>
-                                <property name="fill">0</property>
                                 <property name="position">2</property>
                               </packing>
                             </child>
@@ -1042,9 +1004,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="fill">0</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="box27">
@@ -1076,13 +1035,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </packing>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">1</property>
-                              </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="fill">0</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -1113,10 +1068,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               <object class="GtkBox" id="box28">
                                 <property name="vexpand">1</property>
                                 <property name="spacing">6</property>
+                                <property name="homogeneous">1</property>
                                 <child>
                                   <object class="GtkProgressBar" id="progressbar5">
                                     <property name="orientation">vertical</property>
                                     <property name="fraction">0.5</property>
+                                    <property name="halign">end</property>
                                   </object>
                                 </child>
                                 <child>
@@ -1124,20 +1081,19 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="orientation">vertical</property>
                                     <property name="fraction">0.5</property>
                                     <property name="inverted">1</property>
+                                    <property name="halign">start</property>
                                   </object>
                                   <packing>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="fill">0</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkBox" id="box23">
                                 <property name="vexpand">1</property>
                                 <property name="spacing">6</property>
+                                <property name="homogeneous">1</property>
                                 <child>
                                   <object class="GtkScale" id="scale3">
                                     <property name="height_request">100</property>
@@ -1148,6 +1104,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="fill_level">75</property>
                                     <property name="draw_value">1</property>
                                     <property name="digits">-1</property>
+                                    <property name="halign">end</property>
                                     <signal name="format-value" handler="scale_format_value"/>
                                   </object>
                                 </child>
@@ -1162,6 +1119,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="fill_level">75</property>
                                     <property name="draw_value">1</property>
                                     <property name="digits">-1</property>
+                                    <property name="halign">start</property>
                                     <signal name="format-value" handler="scale_format_value_blank"/>
                                   </object>
                                   <packing>
@@ -1170,13 +1128,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 </child>
                               </object>
                               <packing>
-                                <property name="fill">0</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">1</property>
                             <property name="position">3</property>
                           </packing>
                         </child>
@@ -1198,6 +1154,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         <property name="orientation">vertical</property>
                         <property name="homogeneous">1</property>
                         <property name="spacing">6</property>
+                        <property name="hexpand">1</property>
                         <child>
                           <object class="GtkFrame" id="frame1">
                             <property name="shadow_type">in</property>
@@ -1208,9 +1165,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               </object>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">1</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkFrame" id="frame2">
@@ -1223,7 +1177,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">1</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -1237,7 +1190,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">1</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
@@ -1252,13 +1204,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">1</property>
                             <property name="position">3</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">1</property>
                         <property name="position">6</property>
                       </packing>
                     </child>
@@ -1274,12 +1224,14 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                       <object class="GtkBox" id="box4">
                         <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
+                        <property name="hexpand">1</property>
                         <child>
                           <object class="GtkScrolledWindow" id="scrolledwindow1">
                             <property name="width_request">150</property>
                             <property name="can_focus">1</property>
                             <property name="vscrollbar_policy">always</property>
                             <property name="shadow_type">in</property>
+                            <property name="vexpand">1</property>
                             <child>
                               <object class="GtkTreeView" id="treeview1">
                                 <property name="can_focus">1</property>
@@ -1350,14 +1302,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               </object>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">1</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkScrolledWindow" id="scrolledwindow2">
                             <property name="can_focus">1</property>
                             <property name="shadow_type">in</property>
+                            <property name="vexpand">1</property>
                             <child>
                               <object class="GtkTextView" id="textview1">
                                 <property name="can_focus">1</property>
@@ -1370,13 +1320,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">1</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">1</property>
                         <property name="position">8</property>
                       </packing>
                     </child>
@@ -1618,7 +1566,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">1</property>
                     <property name="position">4</property>
                   </packing>
                 </child>
@@ -1810,9 +1757,15 @@ microphone-sensitivity-medium-symbolic</property>
                             <property name="shadow-type">in</property>
                             <property name="hscrollbar-policy">never</property>
                             <property name="min-content-height">200</property>
+                            <property name="hexpand">0</property>
                             <child>
                               <object class="GtkListBox" id="listbox">
                                 <property name="selection-mode">none</property>
+                                <child type="placeholder">
+                                  <object class="GtkLabel">
+                                    <property name="label">No rows found</property>
+                                  </object>
+                                </child>
                                 <child>
                                   <object class="GtkListBoxRow" id="listboxrow1">
                                     <property name="activatable">0</property>
@@ -1825,10 +1778,8 @@ microphone-sensitivity-medium-symbolic</property>
                                             <property name="halign">start</property>
                                             <property name="valign">center</property>
                                             <property name="margin">6</property>
+                                            <property name="hexpand">1</property>
                                           </object>
-                                          <packing>
-                                            <property name="expand">1</property>
-                                          </packing>
                                         </child>
                                         <child>
                                           <object class="GtkSwitch" id="listboxrow1switch">
@@ -1855,10 +1806,8 @@ microphone-sensitivity-medium-symbolic</property>
                                             <property name="halign">start</property>
                                             <property name="valign">center</property>
                                             <property name="margin">6</property>
+                                            <property name="hexpand">1</property>
                                           </object>
-                                          <packing>
-                                            <property name="expand">1</property>
-                                          </packing>
                                         </child>
                                         <child>
                                           <object class="GtkScale">
@@ -1887,10 +1836,8 @@ microphone-sensitivity-medium-symbolic</property>
                                             <property name="halign">start</property>
                                             <property name="valign">center</property>
                                             <property name="margin">6</property>
+                                            <property name="hexpand">1</property>
                                           </object>
-                                          <packing>
-                                            <property name="expand">1</property>
-                                          </packing>
                                         </child>
                                         <child>
                                           <object class="GtkImage" id="listboxrow3image">
@@ -1919,10 +1866,8 @@ microphone-sensitivity-medium-symbolic</property>
                                             <property name="halign">start</property>
                                             <property name="valign">center</property>
                                             <property name="margin">6</property>
+                                            <property name="hexpand">1</property>
                                           </object>
-                                          <packing>
-                                            <property name="expand">1</property>
-                                          </packing>
                                         </child>
                                         <child>
                                           <object class="GtkImage">
@@ -1952,10 +1897,8 @@ microphone-sensitivity-medium-symbolic</property>
                                             <property name="halign">start</property>
                                             <property name="valign">center</property>
                                             <property name="margin">6</property>
+                                            <property name="hexpand">1</property>
                                           </object>
-                                          <packing>
-                                            <property name="expand">1</property>
-                                          </packing>
                                         </child>
                                         <child>
                                           <object class="GtkButton" id="listboxrow5button">
@@ -1983,10 +1926,8 @@ microphone-sensitivity-medium-symbolic</property>
                                             <property name="halign">start</property>
                                             <property name="valign">center</property>
                                             <property name="margin">6</property>
+                                            <property name="hexpand">1</property>
                                           </object>
-                                          <packing>
-                                            <property name="expand">1</property>
-                                          </packing>
                                         </child>
                                         <child>
                                           <object class="GtkCheckButton">
@@ -2346,7 +2287,7 @@ microphone-sensitivity-medium-symbolic</property>
                                 </child>
                                 <child>
                                   <object class="GtkStatusbar" id="statusbar">
-                                    <property name="visible">0</property>
+                                    <property name="visible">1</property>
                                   </object>
                                 </child>
                               </object>
@@ -2411,9 +2352,6 @@ microphone-sensitivity-medium-symbolic</property>
                               </object>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">1</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -2556,6 +2494,7 @@ microphone-sensitivity-medium-symbolic</property>
                             <property name="height-request">300</property>
                             <property name="halign">start</property>
                             <property name="shadow-type">in</property>
+                            <property name="hexpand">0</property>
                             <child>
                               <object class="GtkTreeView" id="charletree">
                                 <property name="enable-grid-lines">vertical</property>
@@ -2627,6 +2566,7 @@ microphone-sensitivity-medium-symbolic</property>
                           <object class="GtkListBox" id="munsell">
                             <property name="selection-mode">multiple</property>
                             <property name="activate-on-single-click">0</property>
+                            <property name="hexpand">0</property>
                           </object>
                         </child>
                       </object>
@@ -2946,6 +2886,7 @@ microphone-sensitivity-medium-symbolic</property>
                       <object class="GtkFrame">
                         <child>
                           <object class="GtkBox">
+                            <property name="hexpand">0</property>
                             <child>
                               <object class="GtkToolbar">
                                 <property name="orientation">vertical</property>
@@ -2975,14 +2916,12 @@ microphone-sensitivity-medium-symbolic</property>
                             </child>
                             <child>
                               <object class="GtkScrolledWindow">
+                                <property name="hexpand">1</property>
                                 <child>
                                   <object class="GtkTextView" id="tooltextview">
                                   </object>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">1</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkBox">
@@ -3020,9 +2959,6 @@ microphone-sensitivity-medium-symbolic</property>
                                     <property name="valign">end</property>
                                     <property name="icon-name">edit-delete-symbolic</property>
                                   </object>
-                                  <packing>
-                                    <property name="expand">1</property>
-                                  </packing>
                                 </child>
                               </object>
                             </child>
@@ -3109,9 +3045,11 @@ microphone-sensitivity-medium-symbolic</property>
                                     </child>
                                     <child type="tab">
                                       <object class="GtkBox">
-                                        <child type="center">
+                                        <child>
                                           <object class="GtkLabel">
                                             <property name="label" translatable="yes">Page 1</property>
+                                            <property name="halign">center</property>
+                                            <property name="hexpand">1</property>
                                           </object>
                                         </child>
                                         <child>
@@ -3140,9 +3078,11 @@ microphone-sensitivity-medium-symbolic</property>
                                     </child>
                                     <child type="tab">
                                       <object class="GtkBox">
-                                        <child type="center">
+                                        <child>
                                           <object class="GtkLabel">
                                             <property name="label" translatable="yes">Page 2</property>
+                                            <property name="halign">center</property>
+                                            <property name="hexpand">1</property>
                                           </object>
                                         </child>
                                         <child>
@@ -3208,6 +3148,7 @@ microphone-sensitivity-medium-symbolic</property>
                         <child>
                           <object class="GtkEntry">
                             <property name="can_focus">1</property>
+                            <property name="show_emoji_icon">1</property>
                             <property name="placeholder_text" translatable="yes">Age…</property>
                           </object>
                           <packing>
@@ -3232,9 +3173,9 @@ microphone-sensitivity-medium-symbolic</property>
                             <property name="valign">center</property>
                             <property name="popover">notebook_info_popover</property>
                             <property name="icon-name">emblem-important-symbolic</property>
+                            <property name="relief">none</property>
                             <style>
                               <class name="circular"/>
-                              <class name="flat"/>
                             </style>
                           </object>
                         </child>

docs/Makefile.am

@@ -1,20 +0,0 @@
-## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
-
-SUBDIRS = reference tools
-
-EXTRA_DIST += \
-	CODING-STYLE			\
-	developers.txt			\
-	dnd_internals.txt		\
-	focus_tracking.txt		\
-	RELEASE-HOWTO			\
-	sizing-test.txt			\
-	styles.txt			\
-	text_widget_internals.txt	\
-	tree-column-sizing.png		\
-	tree-column-sizing.txt		\
-	widget_geometry.txt		\
-	widget_system.txt
-
--include $(top_srcdir)/git.mk

docs/RELEASE-HOWTO

@@ -1,108 +0,0 @@
-How to do a GTK+ release?
-=========================
-
-Make sure you have suitable versions of autoconf and libtool.
-Also make sure you have the following packages installed with all their
-dependencies:
-* gtk-doc
-* docbook-utils
-Without those packages make distcheck will *not* pass.
-Make sure that gtk-doc is the latest released version.
-
-
- 0) Go back to a pristine working directory. With git, this works:
-
-    git clean -f -x
-
- 1) autogen and build it, make sure to enable docs by specifying
-    --enable-gtk-doc --enable-man
-
- 2) Update NEWS based on the content of git log; follow the format
-    of prior entries. This includes finding noteworthy new features,
-    collecting summaries for all the fixed bugs that are referenced
-    and collecting all updated translations.
-    Also collect the names of all contributors that are mentioned.
-    We don't discriminate between bug reporters, patch writers,
-    committers, etc. Anybody who is mentioned in ChangeLog gets
-    credits, but only real names, not email addresses or nicknames.
-
- 3) Update the pot files and commit the changes:
-
-    make -C po gtk40.pot
-    make -C po-properties gtk40-properties.pot
-
- 4) In particular, if this is a major, stable, release, verify that
-    README.in contains the relevant release notes and that the
-    required versions of dependencies in INSTALL.in are in sync
-    with configure.ac.
-
- 5) Verify that the version in configure.ac has been bumped after the last
-    release. (Note that this is critical, a slip-up here will cause the
-    soname to change).
-
- 6) Make sure that make check is happy (If you don't do it here, make distcheck
-    will also catch it, but it is kind of disheartening to see make distcheck
-    fail due to an extraneous symbol after watching it build the docs for an
-    hour...).
-    Typical problems to expect here (depending on whether this is a devel
-    snapshot or a stable release):
-    * forgotten source files
-    * new symbols missing from .symbols files
-    * symbols that are exported by should be private (static or _-prefixed)
-    * symbols that cause PLT entries. This is either caused by using a function
-      in the same library function without including the header or by using a
-      function from a different library, which is not yet allowed by the filter
-      in pltcheck.sh
-
- 7) If this is a devel release, make sure that the docs for new symbols
-    are in good shape. Look at the -unused.txt files and add stuff found
-    there to the corresponding -sections.txt file. Look at the
-    -undocumented.txt files and see if there is anything in there that
-    should be documented. If it is, this may be due to typos in the doc
-    comments in the source. Make sure that all new symbols have proper
-    Since: tags, and that there is an index in the main -docs.sgml for
-    the next stable version.
-
- 8) make distcheck
-
- 9) Fix broken stuff found by 8), commit changes: git commit -a, repeat.
-
-10) Once distcheck succeeds, verify that the tree is clean: git diff should
-    come up empty.
-
-10) Now you've got the tarball. Check that the tarball size looks
-    reasonable compared to previous releases. If the size goes down
-    a lot, likely the docs went missing for some reason. Or the translations.
-    If the size goes up by a lot, something else may be wrong.
-
-11) Tag the release. The git command for doing that looks like
-
-    git tag -m "GTK+ 2.12.10" 2.12.10
-
-12) Push the tagged commit upstream. The git command for doing that is
-
-    git push origin refs/tags/2.12.10
-
-13) Bump the version number in configure.ac and commit and push this change
-
-14) Upload the tarball to master.gnome.org and run install-module to transfer
-    it to download.gnome.org. If you don't have an account on master.gnome.org,
-    find someone who can do it for you. The command for this looks like
-
-      scp gtk+-2.12.10.tar.xz matthiasc@master.gnome.org:
-      ssh matthiasc@master.gnome.org ftpadmin install gtk+-2.12.10.tar.xz
-
-15) Upload the tarball and checksum to ftp.gtk.org and put them in the right
-    directory below /ftp/pub. Pay attention to correct ownership, and don't
-    forget to update the LATEST file in the directory.
-
-16) Go to the gnome-announce list archives, find the last announce message,
-    create a new message in the same form, replacing version numbers,
-    commentary at the top about "what this release is about" and the
-    summary of changes.
-
-17) Send it to gnome-announce-list, gtk-list, gtk-app-devel-list and
-    gtk-devel-list. Set reply-to to desktop-devel-list.
-
-18) Add a link to the release announcement to www.gtk.org which lives
-    in the gtk-web git module.

docs/RELEASE-HOWTO.md

@@ -0,0 +1,126 @@
+How to do a GTK+ release?
+=========================
+
+## Before we begin
+
+Make sure you have suitable versions of Meson and Ninja.
+
+Also make sure you have the following packages installed with all their
+dependencies:
+
+  * gtk-doc
+  * docbook-utils
+
+Without those packages make distcheck will *not* pass.
+
+Make sure that gtk-doc is the latest released version.
+
+## Release check list
+
+  0. Save all your work, then move to the branch from which you want
+     to release. Go back to a pristine working directory. With Git,
+     this works:
+
+```sh
+$ git clean -dfx
+```
+
+  1. Build using the common sequence:
+
+```sh
+$ meson _build .
+$ ninja -C _build
+```
+
+  2. Update NEWS based on the content of git log; follow the format of prior
+     entries. This includes finding noteworthy new features, collecting
+     summaries for all the fixed bugs that are referenced and collecting all
+     updated translations. Also collect the names of all contributors that
+     are mentioned. We don't discriminate between bug reporters, patch
+     writers, committers, etc. Anybody who is mentioned in the commit log
+     gets a credit, but only real names, not email addresses or nicknames.
+
+  3. Update the pot files and commit the changes:
+
+```sh
+$ ninja -C _build gtk40-pot
+$ ninja -C _build gtk40-properties-pot
+```
+
+  4. If this is a major, stable, release, verify that the release notes
+     in the API reference contain the relevant items.
+
+  5. Verify that the version in `meson.build` has been bumped after the last
+     release. **Note**: this is critical, a slip-up here will cause the soname
+     to change.
+
+  6. Make sure that `meson test` is happy (`ninja dist` will also run the test
+     suite, but it's better to catch issues before committing and tagging
+     the release). Typical problems to expect here (depending on whether this
+     is a devel  snapshot or a stable release):
+
+    * forgotten source files
+    * new symbols missing the `GDK_AVAILABLE_IN_` annotation
+    * wrong introspection annotations
+    * missing documentation
+
+  7. If this is a devel release, make sure that the docs for new symbols are
+     in good shape. Look at the -unused.txt files and add stuff found there
+     to the corresponding `-sections.txt` file. Look at the `-undocumented.txt`
+     files and see if there is anything in there that should be documented.
+     If it is, this may be due to typos in the doc comments in the source.
+     Make sure that all new symbols have proper Since: tags, and that there
+     is an index in the main `-docs.xml` for the next stable version.
+
+  8. Run `ninja dist` to generate the tarball.
+
+  9. Fix broken stuff found by 8), commit changes, repeat.
+
+  10. Once `dist` succeeds, verify that the tree is clean and all the changes
+     needed to make the release have been committed: `git diff` should come
+     up empty. The last commit must be the commit that bumps up the version
+     of the release in the `meson.build` file. Use `git rebase` if you had to
+     add more commits after the version bump and `dist` successfully passing.
+     If you change the history, remember to rebuild the tarball.
+
+  11. Now you've got the tarball. Check that the tarball size looks reasonable
+    compared to previous releases. If the size goes down a lot, likely the
+    docs went missing for some reason. Or the translations. If the size goes
+    up by a lot, something else may be wrong.
+
+  12. Tag the release. The git command for doing that looks like:
+
+```sh
+$ git tag -m "GTK+ 4.2.0" 4.2.0
+```
+
+  13. Bump the version number in `meson.build` and commit the change.
+
+  14. Push the changes upstream, and push the tag as well. The git command for
+    doing that is:
+
+```sh
+$ git push origin
+$ git push origin 4.2.0
+```
+
+  15. Upload the tarball to `master.gnome.org` and run `ftpadmin install` to
+    transfer it to `download.gnome.org`. If you don't have an account on
+    `master.gnome.org`, find someone who can do it for you. The command for
+    this looks like:
+
+```sh
+$ scp gtk+-4.2.0.tar.xz matthiasc@master.gnome.org:
+$ ssh matthiasc@master.gnome.org ftpadmin install gtk+-4.2.0.tar.xz
+```
+
+  16. Go to the gnome-announce list archives, find the last announce message,
+    create a new message in the same form, replacing version numbers,
+    commentary at the top about "what this release is about" and the
+    summary of changes.
+
+  17. Send it to gnome-announce-list, gtk-list, gtk-app-devel-list and
+    gtk-devel-list. Set reply-to to desktop-devel-list.
+
+  18. Add a link to the release announcement to www.gtk.org which lives
+    in the gtk-web git module.

docs/reference/Makefile.am

@@ -1,8 +0,0 @@
-## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
-
-SUBDIRS = gdk gsk gtk
-
-GITIGNOREFILES = */*.1
-
--include $(top_srcdir)/git.mk

docs/reference/gdk/Makefile.am

@@ -1,213 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-AUTOMAKE_OPTIONS = 1.6
-
-# The name of the module.
-DOC_MODULE=gdk4
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=gdk-docs.sgml
-
-# Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards=GDK_DISABLE_DEPRECATED \
-             --ignore-decorators=G_GNUC_WARN_UNUSED_RESULT
-
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=$(top_srcdir)/gdk $(top_srcdir)/gdk/x11
-
-# Used for dependencies
-HFILE_GLOB=$(top_srcdir)/gdk/*.h $(top_srcdir)/gdk/x11/gdkx.h
-CFILE_GLOB=$(top_srcdir)/gdk/*.c
-
-# Header files to ignore when scanning
-IGNORE_HFILES= 			\
-	gdkintl.h		\
-	gdkmarshalers.h		\
-	gdkkeysyms.h		\
-	gdkinternals.h		\
-	gdkprivate.h		\
-	gdk-private.h		\
-	gdkapplaunchcontextprivate.h \
-	gdkcursorprivate.h	\
-	gdkdevicemanagerprivate.h \
-	gdkdeviceprivate.h	\
-	gdkdisplaymanagerprivate.h \
-	gdkdisplayprivate.h	\
-	gdkdndprivate.h		\
-	gdkdrawcontextprivate.h	\
-	gdkframeclockprivate.h	\
-	gdkglcontextprivate.h	\
-	gdkkeysprivate.h	\
-	gdkmonitorprivate.h	\
-	gdkscreenprivate.h	\
-	gdkseatdefaultprivate.h	\
-	gdkseatprivate.h	\
-	gdkvisualprivate.h	\
-	gdkvulkancontextprivate.h \
-	keyname-table.h		\
-	win32			\
-	x11			\
-	quartz			\
-	broadway		\
-	wayland
-
-# Extra files to add when scanning
-EXTRA_HFILES=			\
-	$(top_srcdir)/gdk/x11/gdkx.h
-
-# CFLAGS and LDFLAGS for compiling scan program. Only needed
-# if $(DOC_MODULE).types is non-empty.
-AM_CPPFLAGS = 			\
-	-I$(top_srcdir)		\
-	-I$(top_builddir)	\
-	-I$(top_builddir)/gdk	\
-	$(GTK_DEBUG_FLAGS)	\
-	$(GDK_DEP_CFLAGS)
-
-GTKDOC_LIBS = $(top_builddir)/gtk/libgtk-4.la $(GDK_DEP_LIBS)
-
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--output-format=xml --name-space=gdk
-
-# Extra SGML files that are included by DOC_MAIN_SGML_FILE
-content_files = 		\
-	version.xml
-
-# Images to copy into HTML directory
-HTML_IMAGES = 				\
-	images/rotated-text.png		\
-	images/X_cursor.png		\
-	images/arrow.png		\
-	images/based_arrow_down.png	\
-	images/based_arrow_up.png	\
-	images/boat.png			\
-	images/bogosity.png		\
-	images/bottom_left_corner.png	\
-	images/bottom_right_corner.png	\
-	images/bottom_side.png		\
-	images/bottom_tee.png		\
-	images/box_spiral.png		\
-	images/center_ptr.png		\
-	images/circle.png		\
-	images/clock.png		\
-	images/coffee_mug.png		\
-	images/cross.png		\
-	images/cross_reverse.png	\
-	images/crosshair.png		\
-	images/diamond_cross.png	\
-	images/dot.png			\
-	images/dotbox.png		\
-	images/double_arrow.png		\
-	images/draft_large.png		\
-	images/draft_small.png		\
-	images/draped_box.png		\
-	images/exchange.png		\
-	images/fleur.png		\
-	images/gobbler.png		\
-	images/gumby.png		\
-	images/hand1.png		\
-	images/hand2.png		\
-	images/heart.png		\
-	images/icon.png			\
-	images/iron_cross.png		\
-	images/left_ptr.png		\
-	images/left_side.png		\
-	images/left_tee.png		\
-	images/leftbutton.png		\
-	images/ll_angle.png		\
-	images/lr_angle.png		\
-	images/man.png			\
-	images/middlebutton.png		\
-	images/mouse.png		\
-	images/pencil.png		\
-	images/pirate.png		\
-	images/plus.png			\
-	images/question_arrow.png	\
-	images/right_ptr.png		\
-	images/right_side.png		\
-	images/right_tee.png		\
-	images/rightbutton.png		\
-	images/rtl_logo.png		\
-	images/sailboat.png		\
-	images/sb_down_arrow.png	\
-	images/sb_h_double_arrow.png	\
-	images/sb_left_arrow.png	\
-	images/sb_right_arrow.png	\
-	images/sb_up_arrow.png		\
-	images/sb_v_double_arrow.png	\
-	images/shuttle.png		\
-	images/sizing.png		\
-	images/spider.png		\
-	images/spraycan.png		\
-	images/star.png			\
-	images/target.png		\
-	images/tcross.png		\
-	images/top_left_arrow.png	\
-	images/top_left_corner.png	\
-	images/top_right_corner.png	\
-	images/top_side.png		\
-	images/top_tee.png		\
-	images/trek.png			\
-	images/ul_angle.png		\
-	images/umbrella.png		\
-	images/ur_angle.png		\
-	images/watch.png		\
-	images/xterm.png		\
-	images/alias_cursor.png		\
-	images/all_scroll_cursor.png	\
-	images/cell_cursor.png		\
-	images/col_resize_cursor.png	\
-	images/copy_cursor.png		\
-	images/crosshair_cursor.png	\
-	images/default_cursor.png	\
-	images/e_resize_cursor.png	\
-	images/ew_resize_cursor.png	\
-	images/grabbing_cursor.png	\
-	images/grab_cursor.png		\
-	images/hand_cursor.png		\
-	images/context_menu_cursor.png	\
-	images/help_cursor.png		\
-	images/move_cursor.png		\
-	images/ne_resize_cursor.png	\
-	images/nesw_resize_cursor.png	\
-	images/no_drop_cursor.png	\
-	images/not_allowed_cursor.png	\
-	images/n_resize_cursor.png	\
-	images/ns_resize_cursor.png	\
-	images/nw_resize_cursor.png	\
-	images/nwse_resize_cursor.png	\
-	images/pointer_cursor.png	\
-	images/progress_cursor.png	\
-	images/row_resize_cursor.png	\
-	images/se_resize_cursor.png	\
-	images/s_resize_cursor.png	\
-	images/sw_resize_cursor.png	\
-	images/text_cursor.png		\
-	images/vertical_text_cursor.png	\
-	images/wait_cursor.png		\
-	images/w_resize_cursor.png	\
-	images/X_cursor.png		\
-	images/zoom_in_cursor.png	\
-	images/zoom_out_cursor.png
-
-if ENABLE_DOC_CROSS_REFERENCES
-# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS= \
-	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
-	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
-	--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
-endif
-
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-EXTRA_DIST += version.xml.in
-
-if ENABLE_GTK_DOC
-TESTS_ENVIRONMENT = cd $(srcdir) && \
-  DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
-  SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
-#TESTS = $(GTKDOC_CHECK)
-endif
-
--include $(top_srcdir)/git.mk

docs/reference/gdk/gdk4-docs.xml

@@ -8,11 +8,11 @@
   <bookinfo>
     <title>GDK 4 Reference Manual</title>
     <releaseinfo>
-      This document is for the GDK 3 library, version &version;
+      This document is for the GDK 4 library, version &version;.
       The latest versions can be found online at
-      <ulink role="online-location" url="http://developer.gnome.org/gdk3/">http://developer.gnome.org/gdk3/</ulink>.
-      If you are looking for the older GDK 2 series of libraries,
-      see <ulink role="online-location" url="http://developer.gnome.org/gdk2/">http://developer.gnome.org/gdk2/</ulink>.
+      <ulink role="online-location" url="https://developer.gnome.org/gdk4/">https://developer.gnome.org/gdk4/</ulink>.
+      If you are looking for the older GDK 3 series of libraries,
+      see <ulink role="online-location" url="https://developer.gnome.org/gdk3/">https://developer.gnome.org/gdk3/</ulink>.
     </releaseinfo>
   </bookinfo>
 

docs/reference/gdk/gdk4-sections.txt

@@ -4,9 +4,6 @@
 <SECTION>
 <TITLE>General</TITLE>
 <FILE>general</FILE>
-gdk_init
-gdk_init_check
-gdk_parse_args
 gdk_get_display_arg_name
 gdk_notify_startup_complete
 gdk_notify_startup_complete_with_id
@@ -266,7 +263,6 @@ gdk_window_new_toplevel
 gdk_window_new_popup
 gdk_window_new_temp
 gdk_window_new_child
-gdk_window_new_input
 gdk_window_destroy
 gdk_window_get_window_type
 gdk_window_get_display
@@ -534,6 +530,7 @@ GdkRectangle
 gdk_rectangle_intersect
 gdk_rectangle_union
 gdk_rectangle_equal
+gdk_rectangle_contains_point
 
 <SUBSECTION Private>
 gdk_rectangle_get_type
@@ -1082,12 +1079,6 @@ GDK_X11_DISPLAY_CLASS
 GDK_IS_X11_DISPLAY
 GDK_IS_X11_DISPLAY_CLASS
 GDK_X11_DISPLAY_GET_CLASS
-GDK_TYPE_X11_DISPLAY_MANAGER
-GDK_X11_DISPLAY_MANAGER
-GDK_X11_DISPLAY_MANAGER_CLASS
-GDK_IS_X11_DISPLAY_MANAGER
-GDK_IS_X11_DISPLAY_MANAGER_CLASS
-GDK_X11_DISPLAY_MANAGER_GET_CLASS
 GDK_TYPE_X11_DRAG_CONTEXT
 GDK_X11_DRAG_CONTEXT
 GDK_X11_DRAG_CONTEXT_CLASS

docs/reference/gdk/gdk4.types

@@ -1,5 +1,3 @@
-#include <gdk/gdk.h>
-
 gdk_app_launch_context_get_type
 gdk_cursor_get_type
 gdk_device_get_type

docs/reference/gdk/meson.build

@@ -0,0 +1,172 @@
+private_headers = [
+  'gdkintl.h',
+  'gdkmarshalers.h',
+  'gdkkeysyms.h',
+  'gdkinternals.h',
+  'gdkprivate.h',
+  'gdk-private.h',
+  'gdkapplaunchcontextprivate.h',
+  'gdkcursorprivate.h',
+  'gdkdevicemanagerprivate.h',
+  'gdkdeviceprivate.h',
+  'gdkdisplaymanagerprivate.h',
+  'gdkdisplayprivate.h',
+  'gdkdndprivate.h',
+  'gdkdrawcontextprivate.h',
+  'gdkframeclockprivate.h',
+  'gdkglcontextprivate.h',
+  'gdkkeysprivate.h',
+  'gdkmonitorprivate.h',
+  'gdkscreenprivate.h',
+  'gdkseatdefaultprivate.h',
+  'gdkseatprivate.h',
+  'gdkvisualprivate.h',
+  'gdkvulkancontextprivate.h',
+  'keyname-table.h',
+  'win32',
+  'x11',
+  'quartz',
+  'broadway',
+  'wayland',
+]
+
+images = [
+  'images/rotated-text.png',
+  'images/X_cursor.png',
+  'images/arrow.png',
+  'images/based_arrow_down.png',
+  'images/based_arrow_up.png',
+  'images/boat.png',
+  'images/bogosity.png',
+  'images/bottom_left_corner.png',
+  'images/bottom_right_corner.png',
+  'images/bottom_side.png',
+  'images/bottom_tee.png',
+  'images/box_spiral.png',
+  'images/center_ptr.png',
+  'images/circle.png',
+  'images/clock.png',
+  'images/coffee_mug.png',
+  'images/cross.png',
+  'images/cross_reverse.png',
+  'images/crosshair.png',
+  'images/diamond_cross.png',
+  'images/dot.png',
+  'images/dotbox.png',
+  'images/double_arrow.png',
+  'images/draft_large.png',
+  'images/draft_small.png',
+  'images/draped_box.png',
+  'images/exchange.png',
+  'images/fleur.png',
+  'images/gobbler.png',
+  'images/gumby.png',
+  'images/hand1.png',
+  'images/hand2.png',
+  'images/heart.png',
+  'images/icon.png',
+  'images/iron_cross.png',
+  'images/left_ptr.png',
+  'images/left_side.png',
+  'images/left_tee.png',
+  'images/leftbutton.png',
+  'images/ll_angle.png',
+  'images/lr_angle.png',
+  'images/man.png',
+  'images/middlebutton.png',
+  'images/mouse.png',
+  'images/pencil.png',
+  'images/pirate.png',
+  'images/plus.png',
+  'images/question_arrow.png',
+  'images/right_ptr.png',
+  'images/right_side.png',
+  'images/right_tee.png',
+  'images/rightbutton.png',
+  'images/rtl_logo.png',
+  'images/sailboat.png',
+  'images/sb_down_arrow.png',
+  'images/sb_h_double_arrow.png',
+  'images/sb_left_arrow.png',
+  'images/sb_right_arrow.png',
+  'images/sb_up_arrow.png',
+  'images/sb_v_double_arrow.png',
+  'images/shuttle.png',
+  'images/sizing.png',
+  'images/spider.png',
+  'images/spraycan.png',
+  'images/star.png',
+  'images/target.png',
+  'images/tcross.png',
+  'images/top_left_arrow.png',
+  'images/top_left_corner.png',
+  'images/top_right_corner.png',
+  'images/top_side.png',
+  'images/top_tee.png',
+  'images/trek.png',
+  'images/ul_angle.png',
+  'images/umbrella.png',
+  'images/ur_angle.png',
+  'images/watch.png',
+  'images/xterm.png',
+  'images/alias_cursor.png',
+  'images/all_scroll_cursor.png',
+  'images/cell_cursor.png',
+  'images/col_resize_cursor.png',
+  'images/copy_cursor.png',
+  'images/crosshair_cursor.png',
+  'images/default_cursor.png',
+  'images/e_resize_cursor.png',
+  'images/ew_resize_cursor.png',
+  'images/grabbing_cursor.png',
+  'images/grab_cursor.png',
+  'images/hand_cursor.png',
+  'images/context_menu_cursor.png',
+  'images/help_cursor.png',
+  'images/move_cursor.png',
+  'images/ne_resize_cursor.png',
+  'images/nesw_resize_cursor.png',
+  'images/no_drop_cursor.png',
+  'images/not_allowed_cursor.png',
+  'images/n_resize_cursor.png',
+  'images/ns_resize_cursor.png',
+  'images/nw_resize_cursor.png',
+  'images/nwse_resize_cursor.png',
+  'images/pointer_cursor.png',
+  'images/progress_cursor.png',
+  'images/row_resize_cursor.png',
+  'images/se_resize_cursor.png',
+  'images/s_resize_cursor.png',
+  'images/sw_resize_cursor.png',
+  'images/text_cursor.png',
+  'images/vertical_text_cursor.png',
+  'images/wait_cursor.png',
+  'images/w_resize_cursor.png',
+  'images/X_cursor.png',
+  'images/zoom_in_cursor.png',
+  'images/zoom_out_cursor.png',
+]
+
+configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
+
+gnome.gtkdoc('gdk4',
+             main_xml: 'gdk4-docs.xml',
+             src_dir: [
+	       join_paths(meson.source_root(), 'gdk'),
+	       join_paths(meson.build_root(), 'gdk'),
+	     ],
+             dependencies: libgtk_dep,
+             gobject_typesfile: join_paths(meson.source_root(), 'docs/reference/gdk/gdk4.types'),
+             scan_args: [
+               '--ignore-decorators=_GDK_EXTERN|G_GNUC_WARN_UNUSED_RESULT',
+               '--ignore-headers=' + ' '.join(private_headers),
+             ],
+             fixxref_args: [
+               '--html-dir=@0@'.format(docpath),
+               '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
+               '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
+               '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')),
+               '--extra-dir=@0@'.format(cairo_docpath),
+             ],
+             html_assets: images,
+             install: true)

docs/reference/gsk/Makefile.am

@@ -1,63 +0,0 @@
-## Process this file with automake to produce Makefile.in
-DOC_MODULE = gsk4
-DOC_MAIN_SGML_FILE = gsk-docs.xml
-
-SCAN_OPTIONS = --deprecated-guards=GDK_DISABLE_DEPRECATED \
-               --ignore-decorators=G_GNUC_WARN_UNUSED_RESULT
-
-DOC_SOURCE_DIR = $(top_srcdir)/gsk
-
-HFILE_GLOB = $(top_srcdir)/gsk/*.h
-CFILE_GLOB = $(top_srcdir)/gsk/*.c
-
-IGNORE_HFILES =				\
-	gskcairorendererprivate.h	\
-	gskdebugprivate.h		\
-	gskdriverprivate.h		\
-	gskprofilerprivate.h		\
-	gskglrendererprivate.h		\
-	gskprivate.h			\
-	gskprofilerprivate.h		\
-	gskrendererprivate.h		\
-	gskrendernodeprivate.h		\
-	gskshaderbiulderprivate.h
-
-EXTRA_HFILES =
-
-AM_CPPFLAGS = 			\
-	-I$(top_srcdir)		\
-	-I$(top_builddir)	\
-	-I$(top_builddir)/gsk	\
-	$(GTK_DEBUG_FLAGS)	\
-	$(GDK_DEP_CFLAGS)
-
-GTKDOC_LIBS = $(top_builddir)/gtk/libgtk-4.la $(GDK_DEP_LIBS)
-
-MKDB_OPTIONS=--output-format=xml --name-space=gsk
-
-content_files = 		\
-	version.xml
-
-HTML_IMAGES =
-
-if ENABLE_DOC_CROSS_REFERENCES
-# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS= \
-	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
-	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
-	--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
-endif
-
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-EXTRA_DIST += version.xml.in
-
-if ENABLE_GTK_DOC
-TESTS_ENVIRONMENT = cd $(srcdir) && \
-  DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
-  SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
-#TESTS = $(GTKDOC_CHECK)
-endif
-
--include $(top_srcdir)/git.mk

docs/reference/gsk/gsk4-docs.xml

@@ -10,7 +10,7 @@
     <releaseinfo>
       This document is for the GSK 4 library, version &version;
       The latest versions can be found online at
-      <ulink role="online-location" url="http://developer.gnome.org/gdk3/">http://developer.gnome.org/gsk4/</ulink>.
+      <ulink role="online-location" url="https://developer.gnome.org/gsk4/">https://developer.gnome.org/gsk4/</ulink>.
     </releaseinfo>
   </bookinfo>
 

docs/reference/gsk/meson.build

@@ -0,0 +1,60 @@
+private_headers = [
+  'gskcairoblurprivate.h',
+  'gskcairorendererprivate.h',
+  'gskdebugprivate.h',
+  'gskgldriverprivate.h',
+  'gskglprofilerprivate.h',
+  'gskglrendererprivate.h',
+  'gskprivate.h',
+  'gskprofilerprivate.h',
+  'gskrendererprivate.h',
+  'gskrendernodeprivate.h',
+  'gskroundedrectprivate.h',
+  'gskshaderbuilderprivate.h',
+  'gsktextureprivate.h',
+  'gskvulkanblendpipelineprivate.h',
+  'gskvulkanborderpipelineprivate.h',
+  'gskvulkanboxshadowpipelineprivate.h',
+  'gskvulkanbufferprivate.h',
+  'gskvulkanclipprivate.h',
+  'gskvulkancolorpipelineprivate.h',
+  'gskvulkancommandpoolprivate.h',
+  'gskvulkaneffectpipelineprivate.h',
+  'gskvulkanimageprivate.h',
+  'gskvulkanlineargradientpipelineprivate.h',
+  'gskvulkanmemoryprivate.h',
+  'gskvulkanpipelineprivate.h',
+  'gskvulkanpushconstantsprivate.h',
+  'gskvulkanrendererprivate.h',
+  'gskvulkanrenderpassprivate.h',
+  'gskvulkanrenderprivate.h',
+  'gskvulkanshaderprivate.h',
+]
+
+images = [
+]
+
+configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
+
+gnome.gtkdoc('gsk4',
+             main_xml: 'gsk4-docs.xml',
+             src_dir: [
+	       join_paths(meson.source_root(), 'gsk'),
+	       join_paths(meson.build_root(), 'gsk'),
+	     ],
+             dependencies: libgtk_dep,
+             gobject_typesfile: join_paths(meson.source_root(), 'docs/reference/gsk/gsk4.types'),
+             scan_args: [
+               '--ignore-decorators=_GDK_EXTERN',
+               '--ignore-headers=' + ' '.join(private_headers),
+             ],
+             fixxref_args: [
+               '--html-dir=@0@'.format(docpath),
+               '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
+               '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
+               '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')),
+               '--extra-dir=@0@'.format(cairo_docpath),
+	       '--extra-dir=../gdk',
+             ],
+             html_assets: images,
+             install: true)

docs/reference/gtk/Makefile.am

@@ -1,577 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-AUTOMAKE_OPTIONS = 1.6
-
-# The name of the module.
-DOC_MODULE=gtk4
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=gtk-docs.sgml
-
-# Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED"
-
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=$(top_srcdir)/gtk
-
-# Used for dependencies
-HFILE_GLOB=$(top_srcdir)/gtk/*.h
-CFILE_GLOB=$(top_srcdir)/gtk/*.c
-
-# Header files to ignore when scanning
-IGNORE_HFILES = \
-	inspector			\
-	a11y				\
-	gtkaccelgroupprivate.h		\
-	gtkaccelmapprivate.h		\
-	gtkadjustmentprivate.h		\
-	gtkallocatedbitmaskprivate.h	\
-	gtkappchooserprivate.h		\
-	gtkapplicationaccelsprivate.h	\
-	gtkapplicationprivate.h		\
-	gtkbindingsprivate.h		\
-	gtkbitmaskprivate.h		\
-	gtkboxgadgetprivate.h	        \
-	gtkboxprivate.h		        \
-	gtkbuilderprivate.h		\
-	gtkbuiltiniconprivate.h		\
-	gtkbuttonprivate.h		\
-	gtkcellareaboxcontextprivate.h	\
-	gtkcheckbuttonprivate.h		\
-	gtkclipboardprivate.h		\
-	gtkcolorchooserprivate.h	\
-	gtkcoloreditorprivate.h		\
-	gtkcolorplaneprivate.h		\
-	gtkcolorscaleprivate.h		\
-	gtkcolorswatchprivate.h		\
-	gtkcolorutils.h			\
-	gtkcomboboxprivate.h		\
-	gtkcomposetable.h		\
-	gtkcontainerprivate.h		\
-	gtkcssanimatedstyleprivate.h	\
-	gtkcssanimationprivate.h	\
-	gtkcssarrayvalueprivate.h	\
-	gtkcssbgsizevalueprivate.h	\
-	gtkcssbordervalueprivate.h	\
-	gtkcsscalcvalueprivate.h	\
-	gtkcsscolorvalueprivate.h	\
-	gtkcsscornervalueprivate.h	\
-	gtkcsscustomgadgetprivate.h	\
-	gtkcsscustompropertyprivate.h	\
-	gtkcssdimensionvalueprivate.h	\
-	gtkcsseasevalueprivate.h	\
-	gtkcssenginevalueprivate.h	\
-	gtkcssenumvalueprivate.h	\
-	gtkcssgadgetprivate.h		\
-	gtkcssiconthemevalueprivate.h	\
-	gtkcssimagebuiltinprivate.h	\
-	gtkcssimagecrossfadeprivate.h	\
-	gtkcssimagefallbackprivate.h	\
-	gtkcssimagegradientprivate.h	\
-	gtkcssimageiconthemeprivate.h	\
-	gtkcssimagelinearprivate.h	\
-	gtkcssimageradialprivate.h	\
-	gtkcssimageprivate.h		\
-	gtkcssimagerecolorprivate.h	\
-	gtkcssimagescaledprivate.h	\
-	gtkcssimagesurfaceprivate.h	\
-	gtkcssimageurlprivate.h		\
-	gtkcssimagevalueprivate.h	\
-	gtkcssimagewin32private.h	\
-	gtkcssinheritvalueprivate.h	\
-	gtkcssinitialvalueprivate.h	\
-	gtkcsskeyframesprivate.h	\
-	gtkcsslookupprivate.h		\
-	gtkcssmatcherprivate.h		\
-	gtkcssnodeprivate.h		\
-	gtkcssnodestylecacheprivate.h	\
-	gtkcssnodedeclarationprivate.h	\
-	gtkcssnumbervalueprivate.h	\
-	gtkcsspalettevalueprivate.h	\
-	gtkcsspathnodeprivate.h		\
-	gtkcssparserprivate.h		\
-	gtkcsspositionvalueprivate.h	\
-	gtkcssproviderprivate.h		\
-	gtkcssrepeatvalueprivate.h	\
-	gtkcssrgbavalueprivate.h	\
-	gtkcsssectionprivate.h		\
-	gtkcssselectorprivate.h		\
-	gtkcssshadowsvalueprivate.h	\
-	gtkcssshadowvalueprivate.h	\
-	gtkcssshorthandpropertyprivate.h\
-	gtkcssstaticstyleprivate.h	\
-	gtkcssstringvalueprivate.h	\
-	gtkcssstylechangeprivate.h	\
-	gtkcssstylefuncsprivate.h	\
-	gtkcssstyleprivate.h		\
-	gtkcssstylepropertyprivate.h	\
-	gtkcsstransformvalueprivate.h	\
-	gtkcsstransientnodeprivate.h	\
-	gtkcsstransitionprivate.h	\
-	gtkcsstypedvalueprivate.h	\
-	gtkcsstypesprivate.h		\
-	gtkcssunsetvalueprivate.h	\
-	gtkcssvalueprivate.h		\
-	gtkcsswidgetnodeprivate.h	\
-	gtkcsswin32sizevalueprivate.h	\
-	gtkdebugupdatesprivate.h	\
-	gtkdialogprivate.h		\
-	gtkdndprivate.h			\
-	gtkentryprivate.h		\
-	gtkeventcontrollerprivate.h	\
-	gtkfilechoosernativeprivate.h	\
-	gtkfilechooserprivate.h		\
-	gtkfilechooserwidgetprivate.h	\
-	gtkfontchooserprivate.h		\
-	gtkgesturedragprivate.h		\
-	gtkgesturelongpressprivate.h	\
-	gtkgesturemultipressprivate.h	\
-	gtkgesturepanprivate.h		\
-	gtkgestureprivate.h		\
-	gtkgesturerotateprivate.h	\
-	gtkgesturesingleprivate.h	\
-	gtkgestureswipeprivate.h	\
-	gtkgesturezoomprivate.h		\
-	gtkheaderbarprivate.h		\
-	gtkhslaprivate.h		\
-	gtkiconprivate.h		\
-	gtkiconhelperprivate.h		\
-	gtkiconthemeprivate.h		\
-	gtkiconviewprivate.h		\
-	gtkimagedefinitionprivate.h	\
-	gtkimageprivate.h		\
-	gtkimcontextsimpleprivate.h	\
-	gtkimmoduleprivate.h		\
-	gtklabelprivate.h		\
-	gtklockbuttonprivate.h		\
-	gtkmagnifierprivate.h		\
-	gtkmenubuttonprivate.h		\
-	gtkmenuitemprivate.h		\
-	gtkmenuprivate.h		\
-	gtkmenushellprivate.h		\
-	gtkmodulesprivate.h		\
-	gtkmountoperationprivate.h	\
-	gtkorientableprivate.h		\
-	gtkpixelcacheprivate.h		\
-	gtkplacessidebarprivate.h	\
-	gtkplacesviewprivate.h		\
-	gtkplacesviewrowprivate.h	\
-	gtkpopoverprivate.h		\
-	gtkprinter-private.h		\
-	gtkprintoperation-private.h	\
-	gtkprivate.h		        \
-	gtkprogresstrackerprivate.h     \
-	gtkrangeprivate.h		\
-	gtkrecentchooserprivate.h	\
-	gtkrenderbackgroundprivate.h	\
-	gtkrenderborderprivate.h	\
-	gtkrendericonprivate.h		\
-	gtkroundedboxprivate.h		\
-	gtkscaleprivate.h		\
-	gtksearchengine.h		\
-	gtksearchenginemodel.h		\
-	gtksearchenginequartz.h		\
-	gtksearchenginesimple.h		\
-	gtksearchenginetracker.h	\
-	gtksearchentryprivate.h		\
-	gtkselectionprivate.h		\
-	gtksettingsprivate.h		\
-	gtkshortcutsshortcutprivate.h	\
-	gtkshortcutswindowprivate.h	\
-	gtksidebarrowprivate.h		\
-	gtksizegroup-private.h		\
-	gtksizerequestcacheprivate.h	\
-	gtksnapshotprivate.h		\
-	gtkstyleanimationprivate.h	\
-	gtkstylecascadeprivate.h	\
-	gtkstylecontextprivate.h	\
-	gtkstylepropertyprivate.h	\
-	gtkstyleproviderprivate.h	\
-	gtktextattributes.h		\
-	gtktextattributesprivate.h	\
-	gtktextchildprivate.h		\
-	gtktexthandleprivate.h		\
-	gtktextiterprivate.h		\
-	gtktextmarkprivate.h		\
-	gtktexttagprivate.h		\
-	gtktextviewprivate.h		\
-	gtktogglebuttonprivate.h	\
-	gtktoolbarprivate.h		\
-	gtktoolpaletteprivate.h		\
-	gtktooltipprivate.h		\
-	gtktooltipwindowprivate.h	\
-	gtkutilsprivate.h		\
-	gtktreeprivate.h		\
-	gtkwidgetprivate.h		\
-	gtkwin32themeprivate.h		\
-	gtkwindowprivate.h		\
-	fnmatch.h			\
-	gtkactionmuxer.h		\
-	gtkactionobserver.h		\
-	gtkactionobservable.h		\
-	gtk9slice.h			\
-	gtkanimationdescription.h	\
-	gtkbitmaskprivateimpl.h		\
-	gtkbookmarksmanager.h		\
-	gtkdbusgenerated.c		\
-	gtkdbusgenerated.h		\
-	gtkdebug.h			\
-	gtkactionhelper.h		\
-	gtkdndcursors.h			\
-	gtkfilechooserdefault.h		\
-	gtkfilechooserembed.h		\
-	gtkfilechooserentry.h		\
-	gtkfilechoosersettings.h	\
-	gtkfilechooserutils.h		\
-	gtkfilesystem.h			\
-	gtkfilesystemmodel.h		\
-	gtkfilesystemunix.h		\
-	gtkfilesystemwin32.h		\
-	gtkfontchooserutils.h		\
-	gtkiconcache.h			\
-        gtkiconcachevalidator.h         \
-	gtkiconthemeparser.h		\
-	gtkintl.h			\
-	gtkkeyhash.h			\
-	gtkkineticscrolling.h		\
-	gtkmarshal.h			\
-	gtkmnemonichash.h		\
-	gtkmenutracker.h		\
-	gtkmenutrackeritem.h		\
-	gtkmenusectionbox.h		\
-	gtkmodelmenu.h			\
-	gtkmodelmenuitem.h		\
-	gtkmodifierstyle.h		\
-	gtkpathbar.h			\
-	gtkprintbackend.h		\
-	gtkprinteroption.h		\
-	gtkprinteroptionset.h		\
-	gtkprinteroptionwidget.h	\
-	gtkprinter-private.h		\
-	gtkprintoperation-portal.h	\
-	gtkprint-win32.h		\
-	gtkprintutils.h			\
-	gtkprivate.h			\
-	gtkprivatetypebuiltins.h	\
-	gtkquery.h			\
-	gtkrbtree.h			\
-	gtkrecentchooserdefault.h	\
-	gtkrecentchooserutils.h		\
-	gtksearchengine.h		\
-	gtksearchenginetracker.h	\
-	gtksearchenginesimple.h		\
-	gtksearchenginequartz.h		\
-	gtksequence.h			\
-	gtktextbtree.h			\
-	gtktextbufferserialize.h	\
-	gtktextdisplay.h		\
-	gtktextlayout.h			\
-	gtktextsegment.h		\
-	gtktexttypes.h			\
-	gtktextutil.h			\
-	gtktimeline.h			\
-	gtkthemes.h			\
-	gtktrashmonitor.h		\
-	gtktrayicon.h			\
-	gtktreedatalist.h		\
-	gtktreemenu.h			\
-	gtktypebuiltins.h		\
-	gtkwidgetpathprivate.h		\
-	gtkwindow-decorate.h		\
-	gtkwin32drawprivate.h		\
-	gtkwin32themeprivate.h		\
-	xdgmime				\
-	xembed.h
-
-# CFLAGS and LDFLAGS for compiling scan program. Only needed
-# if $(DOC_MODULE).types is non-empty.
-AM_CPPFLAGS = \
-	-I$(top_srcdir) 	\
-	-I$(top_builddir) 	\
-	-I$(top_builddir)/gdk	\
-	-DGTK_ENABLE_BROKEN	\
-	-Wno-deprecated-declarations \
-	$(GTK_DEBUG_FLAGS)	\
-	$(GTK_DEP_CFLAGS)
-
-CPPFLAGS += \
-	-UGTK_DISABLE_SINGLE_INCLUDES
-
-GTKDOC_LIBS = \
-	$(top_builddir)/gtk/libgtk-4.la	\
-	$(GTK_DEP_LIBS)
-
-
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--output-format=xml --name-space=gtk
-
-MKHTML_OPTIONS="--path=\"$(abs_srcdir):$(top_srcdir)/examples\""
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
-content_files =					\
-	broadway.xml				\
-	building.sgml				\
-	compiling.sgml				\
-	css-overview.xml			\
-	css-properties.xml			\
-	drawing-model.xml			\
-	getting_started.xml			\
-	glossary.xml				\
-	gtk4-broadwayd.xml			\
-	gtk4-demo-application.xml		\
-	gtk4-demo.xml				\
-	gtk4-icon-browser.xml			\
-	gtk4-widget-factory.xml			\
-	gtk4-builder-tool.xml			\
-	gtk4-encode-symbolic-svg.xml		\
-	gtk4-launch.xml				\
-	gtk4-query-immodules.xml		\
-	gtk4-query-settings.xml			\
-	gtk4-update-icon-cache.xml		\
-	input-handling.xml			\
-	migrating-2to4.xml			\
-	migrating-3to4.xml			\
-	mir.xml					\
-	osx.sgml				\
-	overview.xml 				\
-	question_index.sgml			\
-	resources.sgml				\
-	running.sgml				\
-	text_widget.sgml			\
-	tree_widget.sgml			\
-	version.xml				\
-	visual_index.xml			\
-	wayland.xml				\
-	windows.sgml				\
-	x11.sgml
-
-expand_content_files = 				\
-	compiling.sgml				\
-	drawing-model.xml			\
-	getting_started.xml			\
-	glossary.xml				\
-	input-handling.xml			\
-	migrating-2to4.xml			\
-	migrating-3to4.xml			\
-	question_index.sgml			\
-	text_widget.sgml			\
-	tree_widget.sgml
-
-# Images to copy into HTML directory
-HTML_IMAGES = \
-	$(srcdir)/images/aboutdialog.png				\
-	$(srcdir)/images/accel-label.png				\
-	$(srcdir)/images/action-bar.png					\
-	$(srcdir)/images/appchooserbutton.png				\
-	$(srcdir)/images/appchooserdialog.png				\
-	$(srcdir)/images/assistant.png					\
-	$(srcdir)/images/box-packing.png				\
-	$(srcdir)/images/box-expand.png					\
-	$(srcdir)/images/button.png					\
-	$(srcdir)/images/check-button.png				\
-	$(srcdir)/images/color-button.png				\
-	$(srcdir)/images/colorchooser.png				\
-	$(srcdir)/images/combo-box.png					\
-	$(srcdir)/images/combo-box-entry.png				\
-	$(srcdir)/images/combo-box-text.png				\
-	$(srcdir)/images/entry.png					\
-	$(srcdir)/images/figure-hierarchical-drawing.png		\
-	$(srcdir)/images/figure-windowed-label.png			\
-	$(srcdir)/images/file-button.png				\
-	$(srcdir)/images/filechooser.png				\
-	$(srcdir)/images/font-button.png				\
-	$(srcdir)/images/fontchooser.png				\
-	$(srcdir)/images/frame.png					\
-	$(srcdir)/images/glarea.png					\
-	$(srcdir)/images/headerbar.png					\
-	$(srcdir)/images/icon-view.png					\
-	$(srcdir)/images/image.png					\
-	$(srcdir)/images/info-bar.png					\
-	$(srcdir)/images/label.png					\
-	$(srcdir)/images/levelbar.png					\
-	$(srcdir)/images/link-button.png				\
-	$(srcdir)/images/list-and-tree.png				\
-	$(srcdir)/images/lock-button.png				\
-	$(srcdir)/images/lockbutton.png	        			\
-	$(srcdir)/images/lockbutton-locked.png				\
-	$(srcdir)/images/lockbutton-unlocked.png			\
-	$(srcdir)/images/lockbutton-sorry.png				\
-	$(srcdir)/images/menubar.png					\
-	$(srcdir)/images/menu-button.png				\
-	$(srcdir)/images/messagedialog.png				\
-	$(srcdir)/images/multiline-text.png				\
-	$(srcdir)/images/notebook.png					\
-	$(srcdir)/images/panes.png					\
-	$(srcdir)/images/pagesetupdialog.png				\
-	$(srcdir)/images/placessidebar.png				\
-	$(srcdir)/images/popup-anchors.png				\
-	$(srcdir)/images/popup-flip.png					\
-	$(srcdir)/images/popup-slide.png				\
-	$(srcdir)/images/printdialog.png				\
-	$(srcdir)/images/progressbar.png				\
-	$(srcdir)/images/radio-group.png				\
-	$(srcdir)/images/recentchooserdialog.png			\
-	$(srcdir)/images/scales.png					\
-	$(srcdir)/images/scrollbar.png					\
-	$(srcdir)/images/scrolledwindow.png				\
-	$(srcdir)/images/search-bar.png					\
-	$(srcdir)/images/search-entry.png				\
-	$(srcdir)/images/separator.png					\
-	$(srcdir)/images/sidebar.png					\
-	$(srcdir)/images/spinbutton.png					\
-	$(srcdir)/images/spinner.png					\
-	$(srcdir)/images/stack.png					\
-	$(srcdir)/images/stackswitcher.png				\
-	$(srcdir)/images/statusbar.png					\
-	$(srcdir)/images/toggle-button.png				\
-	$(srcdir)/images/toolbar.png					\
-	$(srcdir)/images/toolpalette.png				\
-	$(srcdir)/images/tree-view-coordinates.png			\
-	$(srcdir)/images/volumebutton.png				\
-	$(srcdir)/images/window.png					\
-	$(srcdir)/images/layout-btlr.png				\
-	$(srcdir)/images/layout-btrl.png				\
-	$(srcdir)/images/layout-lrbt.png				\
-	$(srcdir)/images/layout-lrtb.png				\
-	$(srcdir)/images/layout-rlbt.png				\
-	$(srcdir)/images/layout-rltb.png				\
-	$(srcdir)/images/layout-tblr.png				\
-	$(srcdir)/images/layout-tbrl.png				\
-	$(srcdir)/images/widget-hvalign.png				\
-	$(srcdir)/images/window-default.png				\
-	$(srcdir)/images/hello-world.png				\
-	$(srcdir)/images/grid-packing.png				\
-	$(srcdir)/images/drawing.png					\
-	$(srcdir)/images/switch.png					\
-	$(srcdir)/images/linear.png					\
-	$(srcdir)/images/ease.png					\
-	$(srcdir)/images/ease-in-out.png				\
-	$(srcdir)/images/ease-in.png					\
-	$(srcdir)/images/ease-out.png					\
-	$(srcdir)/images/gradient1.png					\
-	$(srcdir)/images/gradient2.png					\
-	$(srcdir)/images/gradient3.png					\
-	$(srcdir)/images/gradient4.png					\
-	$(srcdir)/images/border1.png					\
-	$(srcdir)/images/border2.png					\
-	$(srcdir)/images/border3.png					\
-	$(srcdir)/images/slices.png					\
-	$(srcdir)/images/checks.png					\
-	$(srcdir)/images/options.png					\
-	$(srcdir)/images/arrows.png					\
-	$(srcdir)/images/expanders.png					\
-	$(srcdir)/images/background.png					\
-	$(srcdir)/images/frames.png					\
-	$(srcdir)/images/frame-gap.png					\
-	$(srcdir)/images/sliders.png					\
-	$(srcdir)/images/focus.png					\
-	$(srcdir)/images/handles.png					\
-	$(srcdir)/images/extensions.png					\
-	$(srcdir)/images/bloatpad-osx.png				\
-	$(srcdir)/images/bloatpad-gnome.png				\
-	$(srcdir)/images/bloatpad-xfce.png				\
-	$(srcdir)/images/down-center.png				\
-	$(srcdir)/images/down-end.png					\
-	$(srcdir)/images/down-start.png					\
-	$(srcdir)/images/left-center.png				\
-	$(srcdir)/images/left-end.png					\
-	$(srcdir)/images/left-start.png					\
-	$(srcdir)/images/right-center.png				\
-	$(srcdir)/images/right-end.png					\
-	$(srcdir)/images/right-start.png				\
-	$(srcdir)/images/up-center.png					\
-	$(srcdir)/images/up-end.png					\
-	$(srcdir)/images/up-start.png					\
-	$(srcdir)/images/list-box.png					\
-	$(srcdir)/images/getting-started-app1.png			\
-	$(srcdir)/images/getting-started-app2.png			\
-	$(srcdir)/images/getting-started-app3.png			\
-	$(srcdir)/images/getting-started-app4.png			\
-	$(srcdir)/images/getting-started-app6.png			\
-	$(srcdir)/images/getting-started-app7.png			\
-	$(srcdir)/images/getting-started-app8.png			\
-	$(srcdir)/images/getting-started-app9.png			\
-	$(srcdir)/images/getting-started-app10.png			\
-	$(srcdir)/images/exampleapp.png					\
-	$(srcdir)/images/flow-box.png					\
-	$(srcdir)/images/inspector.png					\
-	$(srcdir)/images/gedit-shortcuts.png				\
-	$(srcdir)/images/clocks-shortcuts.png				\
-	$(srcdir)/images/builder-shortcuts.png
-
-if ENABLE_DOC_CROSS_REFERENCES
-# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=--extra-dir=../gdk/html \
-	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
-	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
-	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gio \
-	--extra-dir=$(ATK_PREFIX)/share/gtk-doc/html/atk \
-	--extra-dir=$(PANGO_PREFIX)/share/gtk-doc/html/pango \
-	--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
-endif
-
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-EXTRA_DIST += version.xml.in gtk4.types.in
-
-########################################################################
-
-man_MANS = 				\
-	gtk4-broadwayd.1		\
-	gtk4-builder-tool.1 		\
-	gtk4-demo.1			\
-	gtk4-demo-application.1		\
-	gtk4-encode-symbolic-svg.1	\
-	gtk4-icon-browser.1		\
-	gtk4-launch.1			\
-	gtk4-query-immodules.1		\
-	gtk4-query-settings.1		\
-	gtk4-update-icon-cache.1	\
-	gtk4-widget-factory.1
-
-if ENABLE_MAN
-
-XSLTPROC_FLAGS = \
-        --nonet \
-        --stringparam man.output.quietly 1 \
-        --stringparam funcsynopsis.style ansi \
-        --stringparam man.th.extra1.suppress 1 \
-        --stringparam man.authors.section.enabled 0 \
-        --stringparam man.copyright.section.enabled 0
-
-.xml.1:
-	$(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-
-dist-local-check-mans-enabled:
-	if grep "Man generation disabled" $(man_MANS) >/dev/null; then $(RM) $(man_MANS); fi
-
-else
-
-$(man_MANS):
-	echo Man generation disabled.  Creating dummy $@.  Configure with --enable-man to enable it.
-	echo Man generation disabled.  Remove this file, configure with --enable-man, and rebuild > $@
-
-dist-local-check-mans-enabled:
-	echo "*** --enable-man must be used in order to make dist"
-	false
-
-endif
-
-MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES)
-
-EXTRA_DIST += $(man_MANS)
-
-if ENABLE_GTK_DOC
-TESTS_ENVIRONMENT = cd $(srcdir) && \
-  DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
-  SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
-#TESTS = $(GTKDOC_CHECK)
-endif
-
-dist-hook-local: dist-local-check-mans-enabled all-local
-
-gtk-docs-clean: clean
-	cd $(srcdir) && rm -rf xml html
-
--include $(top_srcdir)/git.mk

docs/reference/gtk/building.sgml

@@ -16,14 +16,7 @@ How to compile GTK+ itself
 </refpurpose>
 </refnamediv>
   <refsect1 id="overview">
-    <title>Building GTK+ on UNIX-like systems</title>
-    <para>
-      This chapter covers building and installing GTK+ on UNIX and
-      UNIX-like systems such as Linux. Compiling GTK+ on Microsoft
-      Windows is different in detail and somewhat more difficult to
-      get going since the necessary tools aren't included with
-      the operating system.
-    </para>
+    <title>Building GTK+</title>
     <para>
       Before we get into the details of how to compile GTK+, we should
       mention that in many cases, binary packages of GTK+ prebuilt for
@@ -35,64 +28,51 @@ How to compile GTK+ itself
       already.
     </para>
     <para>
-      On UNIX-like systems GTK+ uses the standard GNU build system,
-      using <application>autoconf</application> for package
-      configuration and resolving portability issues,
-      <application>automake</application> for building makefiles that
-      comply with the GNU Coding Standards, and
-      <application>libtool</application> for building shared libraries
-      on multiple platforms.
+      In order to build GTK+, you will need <application>meson</application>
+      installed on your system. On Linux, and other UNIX-like operating
+      systems, you will also need <application>ninja</application>. This
+      guide does not cover how to install these two requirements, but you
+      can refer to the <ulink url="http://mesonbuild.com">Meson website</ulink>
+      for more information. The <ulink url="https://ninja-build.org">Ninja</ulink>
+      build tool is also usable on various operating systems, so we will
+      refer to it in the examples.
     </para>
     <para>
-      If you are building GTK+ from the distributed source packages,
-      then you won't need these tools installed; the necessary pieces
-      of the tools are already included in the source packages. But
-      it's useful to know a bit about how packages that use these
-      tools work. A source package is distributed as a
-      <literal>tar.bz2</literal> or <literal>tar.xz</literal> file
-      which you unpack into a directory full of the source files as follows:
+      If you are building GTK+ from a source distribution or from a Git
+      clone, you will need to use <application>meson</application> to
+      configure the project. The most commonly useful argument is the
+      <systemitem>--prefix</systemitem> one, which determines where the
+      files will go once installed. To install GTK+ under a prefix
+      like <filename>/opt/gtk</filename> you would run Meson as:
     </para>
-    <programlisting>
-      tar xvfj gtk+-3.2.0.tar.bz2
-      tar xvfJ gtk+-3.2.0.tar.xz
-    </programlisting>
+    <informalexample>
+      <programlisting>
+        meson --prefix /opt/gtk builddir
+      </programlisting>
+    </informalexample>
     <para>
-      In the toplevel directory that is created, there will be
-      a shell script called <filename>configure</filename> which
-      you then run to take the template makefiles called
-      <filename>Makefile.in</filename> in the package and create
-      makefiles customized for your operating system.
-      The <filename>configure</filename> script can be passed
-      various command line arguments to determine how the package
-      is built and installed. The most commonly useful argument is
-      the <systemitem>--prefix</systemitem> argument which
-      determines where the package is installed. To install a package
-      in <filename>/opt/gtk</filename> you would run configure as:
+      Meson will create the <filename>builddir</filename> directory and
+      place all the build artefacts there.
     </para>
-    <programlisting>
-      ./configure --prefix=/opt/gtk
-    </programlisting>
     <para>
-      A full list of options can be found by running
-      <filename>configure</filename> with the
-      <systemitem>--help</systemitem> argument. In general, the defaults are
-      right and should be trusted. After you've run
-      <filename>configure</filename>, you then run the
-      <command>make</command> command to build the package and install
-      it.
+      You can get a list of all available options for the build by
+      running <application>meson configure</application>.
     </para>
-    <programlisting>
-      make
-      make install
-    </programlisting>
+    <para>
+      After Meson successfully configured the build directory, you then
+      can run the build, using Ninja:
+    </para>
+    <informalexample>
+      <programlisting>
+        cd builddir
+        ninja
+        ninja install
+      </programlisting>
+    </informalexample>
     <para>
       If you don't have permission to write to the directory you are
       installing in, you may have to change to root temporarily before
-      running <literal>make install</literal>. Also, if you are
-      installing in a system directory, on some systems (such as
-      Linux), you will need to run <command>ldconfig</command> after
-      <literal>make install</literal> so that the newly installed
-      libraries will be found.
+      running <literal>ninja install</literal>.
     </para>
     <para>
       Several environment variables are useful to pass to set before
@@ -131,35 +111,21 @@ How to compile GTK+ itself
     <para>
       Before you can compile the GTK+ widget toolkit, you need to have
       various other tools and libraries installed on your
-      system. The two tools needed during the build process (as
-      differentiated from the tools used in when creating GTK+
-      mentioned above such as <application>autoconf</application>)
-      are <command>pkg-config</command> and GNU make.
+      system. Dependencies of GTK+ have their own build systems, so
+      you will need to refer to their own installation instructions.
+    </para>
+    <para>
+      A particular important tool used by GTK+ to find its dependencies
+      is <application>pkg-config</application>.
+    </para>
+    <para>
+      <ulink url="https://www.freedesktop.org/wiki/Software/pkg-config/">pkg-config</ulink>
+      is a tool for tracking the compilation flags needed for
+      libraries that are used by the GTK+ libraries. (For each
+      library, a small <literal>.pc</literal> text file is installed
+      in a standard location that contains the compilation flags
+      needed for that library along with version number information.)
     </para>
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink
-          url="http://pkg-config.freedesktop.org">pkg-config</ulink>
-          is a tool for tracking the compilation flags needed for
-          libraries that are used by the GTK+ libraries. (For each
-          library, a small <literal>.pc</literal> text file is installed
-          in a standard location that contains the compilation flags
-          needed for that library along with version number information.)
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          The GTK+ makefiles will mostly work with different versions
-          of <command>make</command>, however, there tends to be
-          a few incompatibilities, so the GTK+ team recommends
-          installing <ulink url="http://www.gnu.org/software/make">GNU
-            make</ulink> if you don't already have it on your system
-          and using it. (It may be called <command>gmake</command>
-          rather than <command>make</command>.)
-        </para>
-      </listitem>
-    </itemizedlist>
     <para>
       Some of the libraries that GTK+ depends on are maintained by
       by the GTK+ team: GLib, GdkPixbuf, Pango, ATK and GObject Introspection.
@@ -171,24 +137,21 @@ How to compile GTK+ itself
           The GLib library provides core non-graphical functionality
           such as high level data types, Unicode manipulation, and
           an object and type system to C programs. It is available
-          from the <ulink url="http://ftp.gtk.org/pub/glib/">GTK+
-          FTP site</ulink> or
-          <ulink url="http://download.gnome.org/sources/glib/">here</ulink>.
+          from  <ulink url="https://download.gnome.org/sources/glib/">here</ulink>.
         </para>
       </listitem>
       <listitem>
         <para>
-          The <ulink url="http://git.gnome.org/browse/gdk-pixbuf/">GdkPixbuf library</ulink>
+          The <ulink url="https://git.gnome.org/browse/gdk-pixbuf/">GdkPixbuf library</ulink>
           provides facilities for loading images in a variety of file formats.
-          It is available
-          <ulink url="http://download.gnome.org/sources/gdk-pixbuf/">here</ulink>.
+          It is available <ulink url="https://download.gnome.org/sources/gdk-pixbuf/">here</ulink>.
         </para>
       </listitem>
       <listitem>
         <para>
           <ulink url="http://www.pango.org">Pango</ulink> is a library
           for internationalized text handling. It is available
-          <ulink url="http://download.gnome.org/sources/pango/">here</ulink>.
+          <ulink url="https://download.gnome.org/sources/pango/">here</ulink>.
         </para>
       </listitem>
       <listitem>
@@ -197,7 +160,7 @@ How to compile GTK+ itself
           interfaces allowing accessibility technologies such as
           screen readers to interact with a graphical user interface.
           It is available
-          <ulink url="http://download.gnome.org/sources/atk/">here</ulink>.
+          <ulink url="https://download.gnome.org/sources/atk/">here</ulink>.
         </para>
       </listitem>
       <listitem>
@@ -205,7 +168,7 @@ How to compile GTK+ itself
           <ulink url="https://wiki.gnome.org/Projects/GObjectIntrospection">Gobject Introspection</ulink>
           is a framework for making introspection data available to
           language bindings. It is available
-          <ulink url="http://download.gnome.org/sources/gobject-introspection/">here</ulink>.
+          <ulink url="https://download.gnome.org/sources/gobject-introspection/">here</ulink>.
         </para>
       </listitem>
     </itemizedlist>
@@ -213,7 +176,7 @@ How to compile GTK+ itself
       <title>External dependencies</title>
       <listitem>
         <para>
-          The <ulink url="http://www.gnu.org/software/libiconv/">GNU
+          The <ulink url="https://www.gnu.org/software/libiconv/">GNU
           libiconv library</ulink> is needed to build GLib if your
           system doesn't have the <function>iconv()</function>
           function for doing conversion between character
@@ -224,7 +187,7 @@ How to compile GTK+ itself
       <listitem>
         <para>
           The libintl library from the <ulink
-          url="http://www.gnu.org/software/gettext/">GNU gettext
+          url="https://www.gnu.org/software/gettext/">GNU gettext
           package</ulink> is needed if your system doesn't have the
           <function>gettext()</function> functionality for handling
           message translation databases.
@@ -241,35 +204,42 @@ How to compile GTK+ itself
       </listitem>
       <listitem>
         <para>
-          The <ulink url="http://www.fontconfig.org">fontconfig</ulink>
+          The <ulink url="https://www.freedesktop.org/wiki/Software/fontconfig/">fontconfig</ulink>
           library provides Pango with a standard way of locating
           fonts and matching them against font names.
         </para>
       </listitem>
       <listitem>
         <para>
-          <ulink url="http://www.cairographics.org">Cairo</ulink>
+          <ulink url="https://www.cairographics.org">Cairo</ulink>
           is a graphics library that supports vector graphics and image
-          compositing. Both Pango and GTK+ use cairo for all of their
-          drawing.
+          compositing. Both Pango and GTK+ use Cairo for drawing.
         </para>
       </listitem>
       <listitem>
         <para>
           <ulink url="https://github.com/anholt/libepoxy">libepoxy</ulink>
           is a library that abstracts the differences between different
-          OpenGL libraries. GTK+ uses it for cross-platform GL support.
+          OpenGL libraries. GTK+ uses it for cross-platform GL support
+          and for its own drawing.
         </para>
       </listitem>
       <listitem>
         <para>
-          The <ulink url="http://wayland.freedesktop.org">Wayland</ulink> libraries
+          <ulink url="https://github.com/anholt/libepoxy">Graphene</ulink>
+          is a library that provides vector and matrix types for 2D and
+          3D transformations. GTK+ uses it internally for drawing.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          The <ulink url="https://wayland.freedesktop.org">Wayland</ulink> libraries
           are needed to build GTK+ with the Wayland backend.
         </para>
       </listitem>
       <listitem>
         <para>
-          The <ulink url="http://www.freedesktop.org/wiki/Software/shared-mime-info">shared-mime-info</ulink>
+          The <ulink url="https://www.freedesktop.org/wiki/Software/shared-mime-info">shared-mime-info</ulink>
           package is not a hard dependency of GTK+, but it contains definitions
           for mime types that are used by GIO and, indirectly, by GTK+.
           gdk-pixbuf will use GIO for mime type detection if possible. For this
@@ -284,35 +254,32 @@ How to compile GTK+ itself
     <title>Building and testing GTK+</title>
     <para>
       First make sure that you have the necessary external
-      dependencies installed: <command>pkg-config</command>, GNU make,
+      dependencies installed: <command>pkg-config</command>, Meson, Ninja,
       the JPEG, PNG, and TIFF libraries, FreeType, and, if necessary,
       libiconv and libintl. To get detailed information about building
       these packages, see the documentation provided with the
-      individual packages.
-      On a Linux system, it's quite likely you'll have all of these
-      installed already except for <command>pkg-config</command>.
+      individual packages. On any average Linux system, it's quite likely
+      you'll have all of these installed already, or they will be easily
+      accessible through your operating system package repositories.
     </para>
     <para>
       Then build and install the GTK+ libraries in the order:
-      GLib, Pango, ATK, then GTK+. For each library, follow the
-      steps of <literal>configure</literal>, <literal>make</literal>,
-      <literal>make install</literal> mentioned above. If you're
-      lucky, this will all go smoothly, and you'll be ready to
-      <link linkend="gtk-compiling">start compiling your own GTK+
-      applications</link>. You can test your GTK+ installation
-      by running the <command>gtk3-demo</command> program that
+      GLib, Cairo, Pango, ATK, then GTK+. For each library, follow the
+      instructions they provide, and make sure to share common settings
+      between them and the GTK+ build; if you are using a separate prefix
+      for GTK+, for instance, you will need to use the same prefix for all
+      its dependencies you build. If you're lucky, this will all go smoothly,
+      and you'll be ready to <link linkend="gtk-compiling">start compiling
+      your own GTK+ applications</link>. You can test your GTK+ installation
+      by running the <command>gtk4-demo</command> program that
       GTK+ installs.
     </para>
     <para>
-      If one of the <filename>configure</filename> scripts fails or running
-      <command>make</command> fails, look closely at the error
-      messages printed; these will often provide useful information
-      as to what went wrong. When <filename>configure</filename>
-      fails, extra information, such as errors that a test compilation
-      ran into, is found in the file <filename>config.log</filename>.
-      Looking at the last couple of hundred lines in this file will
-      frequently make clear what went wrong. If all else fails, you
-      can ask for help on the gtk-list mailing list.
+      If one of the projects you're configuring or building fails, look
+      closely at the error messages printed; these will often provide useful
+      information as to what went wrong. Every build system has its own
+      log that can help you understand the issue you're encountering. If all
+      else fails, you can ask for help on the gtk-list mailing list.
       See <xref linkend="gtk-resources"/> for more information.
     </para>
   </refsect1>
@@ -320,129 +287,128 @@ How to compile GTK+ itself
       <title>Extra Configuration Options</title>
 
       <para>
-        In addition to the normal options, the
-        <command>configure</command> script for the GTK+ library
-        supports a number of additional arguments. (Command line
-        arguments for the other GTK+ libraries are described in
-        the documentation distributed with the those libraries.)
+        In addition to the normal options provided by Meson, GTK+ defines
+        various arguments that modify what should be built.
 
         <cmdsynopsis>
-          <command>configure</command>
+          <command>meson</command>
           <sbr/>
           <group>
-            <arg choice="plain">--disable-modules</arg>
-            <arg choice="plain">--enable-modules</arg>
+            <arg choice="plain">-Ddisable-modules=true</arg>
+            <arg choice="plain">-Ddisable-modules=false</arg>
           </group>
           <sbr/>
           <group>
-            <arg>--with-included-immodules=MODULE1,MODULE2,...</arg>
+            <arg choice="plain">-Dwith-included-immodules=MODULE1,MODULE2,...</arg>
+            <arg choice="plain">-Dwith-included-immodules=all</arg>
+            <arg choice="plain">-Dwith-included-immodules=none</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--enable-debug=[no/minimum/yes]</arg>
+            <arg choice="plain">-Ddocumentation=true</arg>
+            <arg choice="plain">-Ddocumentation=false</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--disable-Bsymbolic</arg>
-            <arg choice="plain">--enable-Bsymbolic</arg>
+            <arg choice="plain">-Dman-pages=true</arg>
+            <arg choice="plain">-Dman-pages=false</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--disable-xkb</arg>
-            <arg choice="plain">--enable-xkb</arg>
+            <arg choice="plain">-Denable-cups-print-backend=yes</arg>
+            <arg choice="plain">-Denable-cups-print-backend=no</arg>
+            <arg choice="plain">-Denable-cups-print-backend=auto</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--disable-xinerama</arg>
-            <arg choice="plain">--enable-xinerama</arg>
+            <arg choice="plain">-Denable-papi-print-backend=yes</arg>
+            <arg choice="plain">-Denable-papi-print-backend=no</arg>
+            <arg choice="plain">-Denable-papi-print-backend=auto</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--disable-gtk-doc</arg>
-            <arg choice="plain">--enable-gtk-doc</arg>
+            <arg choice="plain">-Denable-cloudprint-print-backend=yes</arg>
+            <arg choice="plain">-Denable-cloudprint-print-backend=no</arg>
+            <arg choice="plain">-Denable-cloudprint-print-backend=auto</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--disable-cups</arg>
-            <arg choice="plain">--enable-cups</arg>
+            <arg choice="plain">-Denable-test-print-backend=yes</arg>
+            <arg choice="plain">-Denable-test-print-backend=no</arg>
+            <arg choice="plain">-Denable-test-print-backend=auto</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--disable-papi</arg>
-            <arg choice="plain">--enable-papi</arg>
+            <arg choice="plain">-Denable-colord=yes</arg>
+            <arg choice="plain">-Denable-colord=no</arg>
+            <arg choice="plain">-Denable-colord=auto</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--enable-xinput</arg>
-            <arg choice="plain">--disable-xinput</arg>
+            <arg choice="plain">-Denable-vulkan=yes</arg>
+            <arg choice="plain">-Denable-vulkan=no</arg>
+            <arg choice="plain">-Denable-vulkan=auto</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--enable-packagekit</arg>
-            <arg choice="plain">--disable-packagekit</arg>
+            <arg choice="plain">-Denable-x11-backend=true</arg>
+            <arg choice="plain">-Denable-x11-backend=false</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--enable-x11-backend</arg>
-            <arg choice="plain">--disable-x11-backend</arg>
+            <arg choice="plain">-Denable-xinerama=true</arg>
+            <arg choice="plain">-Denable-xinerama=false</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--enable-win32-backend</arg>
-            <arg choice="plain">--disable-win32-backend</arg>
+            <arg choice="plain">-Denable-win32-backend=true</arg>
+            <arg choice="plain">-Denable-win32-backend=false</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--enable-quartz-backend</arg>
-            <arg choice="plain">--disable-quartz-backend</arg>
+            <arg choice="plain">-Denable-quartz-backend=true</arg>
+            <arg choice="plain">-Denable-quartz-backend=false</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--enable-broadway-backend</arg>
-            <arg choice="plain">--disable-broadway-backend</arg>
+            <arg choice="plain">-Denable-broadway-backend=true</arg>
+            <arg choice="plain">-Denable-broadway-backend=false</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--enable-wayland-backend</arg>
-            <arg choice="plain">--disable-wayland-backend</arg>
+            <arg choice="plain">-Denable-wayland-backend=true</arg>
+            <arg choice="plain">-Denable-wayland-backend=false</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--enable-mir-backend</arg>
-            <arg choice="plain">--disable-mir-backend</arg>
+            <arg choice="plain">-Denable-mir-backend=true</arg>
+            <arg choice="plain">-Denable-mir-backend=false</arg>
           </group>
-          <sbr/>
           <group>
-            <arg choice="plain">--enable-introspection=[no/auto/yes]</arg>
-          </group>
-          <sbr/>
-          <group>
-            <arg choice="plain">--enable-installed-tests</arg>
-            <arg choice="plain">--disable-installed-tests</arg>
+            <arg choice="plain">-Dintrospection=true</arg>
+            <arg choice="plain">-Dintrospection=false</arg>
           </group>
         </cmdsynopsis>
       </para>
 
       <formalpara>
-        <title><systemitem>--disable-modules</systemitem> and
-          <systemitem>--enable-modules</systemitem></title>
+        <title><systemitem>disable-modules</systemitem></title>
 
         <para>
           Normally GTK+ will try to build the input method modules
           as little shared libraries that are loaded on demand.
-          The <systemitem>--disable-modules</systemitem> argument
+          The <systemitem>disable-modules</systemitem> option
           indicates that they should all be built statically
           into the GTK+ library instead. This is useful for
           people who need to produce statically-linked binaries.
-          If neither <systemitem>--disable-modules</systemitem> nor
-          <systemitem>--enable-modules</systemitem> is specified,
+          If <systemitem>disable-modules</systemitem> is not specified,
           then the <command>configure</command> script will try to
           auto-detect whether shared modules work on your system.
         </para>
       </formalpara>
 
       <formalpara>
-        <title><systemitem>--with-included-immodules</systemitem></title>
+        <title><systemitem>with-included-immodules</systemitem></title>
 
         <para>
          This option allows you to specify which input method modules you
@@ -452,101 +418,18 @@ How to compile GTK+ itself
       </formalpara>
 
       <formalpara>
-        <title><systemitem>--enable-debug</systemitem></title>
+        <title><systemitem>enable-xinerama</systemitem></title>
 
         <para>
-         Turns on various amounts of debugging support. Setting this to
-         'no' disables g_assert(), g_return_if_fail(), g_return_val_if_fail()           and all cast checks between different object types. Setting it
-         to 'minimum' disables only cast checks. Setting it to 'yes' enables
-         <link linkend="GTK-Debug-Options">runtime debugging</link>.
-         The default is 'minimum'.
-         Note that 'no' is fast, but dangerous as it tends to destabilize
-         even mostly bug-free software by changing the effect of many bugs
-         from simple warnings into fatal crashes. Thus
-         <option>--enable-debug=no</option> should <emphasis>not</emphasis>
-         be used for stable releases of GTK+.
+          By default GTK+ will try to link against the Xinerama libraries
+          if they are found. This options can be used to explicitly control
+          whether Xinerama should be used.
         </para>
       </formalpara>
 
       <formalpara>
-        <title><systemitem>--disable-Bsymbolic</systemitem> and
-          <systemitem>--enable-Bsymbolic</systemitem></title>
-        <para>
-          The option <systemitem>--disable-Bsymbolic</systemitem>
-          turns off the use of the -Bsymbolic-functions linker flag.
-          This is only necessary if you want to override GTK+ functions
-          by using <envar>LD_PRELOAD</envar>.
-        </para>
-      </formalpara>
-
-      <formalpara>
-        <title><systemitem>--enable-explicit-deps</systemitem> and
-          <systemitem>--disable-explicit-deps</systemitem></title>
-        <para>
-          If <systemitem>--enable-explicit-deps</systemitem> is
-          specified then GTK+ will write the full set of libraries
-          that GTK+ depends upon into its <literal>.pc</literal> files to be used when
-          programs depending on GTK+ are linked. Otherwise, GTK+
-          only will include the GTK+ libraries themselves, and
-          will depend on system library dependency facilities to
-          bring in the other libraries.
-          By default GTK+ will disable explicit dependencies unless
-          it detects that they are needed on the system. (If you
-          specify <systemitem>--enable-static</systemitem> to force
-          building of static libraries, then explicit dependencies
-          will be written since library dependencies don't work
-          for static libraries.) Specifying
-          <systemitem>--enable-explicit-deps</systemitem> or
-          <systemitem>--enable-static</systemitem> can cause
-          compatibility
-          problems when libraries that GTK+ depends upon change
-          their versions, and should be avoided if possible.
-        </para>
-      </formalpara>
-
-      <formalpara>
-        <title><systemitem>--disable-xkb</systemitem> and
-          <systemitem>--enable-xkb</systemitem></title>
-
-        <para>
-          By default the <command>configure</command> script will try
-          to auto-detect whether the XKB extension is supported by
-          the X libraries GTK+ is linked with.
-          These options can be used to explicitly control whether
-          GTK+ will support the XKB extension.
-        </para>
-      </formalpara>
-
-      <formalpara>
-        <title><systemitem>--disable-xinerama</systemitem> and
-          <systemitem>--enable-xinerama</systemitem></title>
-
-        <para>
-          By default the <command>configure</command> script will try
-          to link against the Xinerama libraries if they are found.
-          These options can be used to explicitly control whether
-          Xinerama should be used.
-        </para>
-      </formalpara>
-
-      <formalpara>
-        <title><systemitem>--disable-xinput</systemitem> and
-           <systemitem>--enable-xinput</systemitem></title>
-        <para>
-          Controls whether GTK+ is built with support for the XInput
-          or XInput2 extension. These extensions provide an extended
-          interface to input devices such as graphics tablets.
-          When this support is compiled in, specially written
-          GTK+ programs can get access to subpixel positions,
-          multiple simultaneous input devices, and extra "axes"
-          provided by the device such as pressure and tilt
-          information.
-        </para>
-      </formalpara>
-
-      <formalpara>
-        <title><systemitem>--disable-gtk-doc</systemitem> and
-          <systemitem>--enable-gtk-doc</systemitem></title>
+        <title><systemitem>enable-documentation</systemitem> and
+          <systemitem>enable-man-pages</systemitem></title>
 
         <para>
           The <application>gtk-doc</application> package is
@@ -557,93 +440,73 @@ How to compile GTK+ itself
           <application>gtk-doc</application> installed and
           are modifying GTK+, you may want to enable
           <application>gtk-doc</application> support by passing
-          in <systemitem>--enable-gtk-doc</systemitem>. If not
-          enabled, pre-generated HTML files distributed with GTK+
-          will be installed.
+          in <systemitem>enable-documentation</systemitem>.
+        </para>
+        <para>
+          Additionally, some tools provided by GTK+ have their own
+          manual pages generated using a similar set of dependencies;
+          if you have <application>xsltproc</application> then you
+          can generate manual pages by passing <systemitem>enable-man-pages</systemitem>
+          when configuring the build.
         </para>
       </formalpara>
 
       <formalpara>
-        <title><systemitem>--disable-cups</systemitem> and
-          <systemitem>--enable-cups</systemitem></title>
+        <title><systemitem>enable-cups-print-backend</systemitem>,
+          <systemitem>enable-papi-print-backend</systemitem>,
+          <systemitem>enable-cloudprint-print-backend</systemitem>, and
+          <systemitem>enable-test-print-backend</systemitem></title>
 
         <para>
-          By default the <command>configure</command> script will try
-          to build the cups print backend if the cups libraries are found.
-          These options can be used to explicitly control whether
-          the cups print backend should be built.
+          By default, GTK+ will try to build various print backends if
+          their dependencies are found. These options can be used to
+          explicitly control whether each print backend should be built
+          or not.
         </para>
       </formalpara>
 
       <formalpara>
-        <title><systemitem>--disable-papi</systemitem> and
-          <systemitem>--enable-papi</systemitem></title>
+        <title><systemitem>enable-x11-backend</systemitem>,
+          <systemitem>enable-win32-backend</systemitem>,
+          <systemitem>enable-quartz-backend</systemitem>,
+          <systemitem>enable-broadway-backend</systemitem>,
+          <systemitem>enable-wayland-backend</systemitem>, and
+          <systemitem>enable-mir-backend</systemitem></title>
 
         <para>
-          By default the <command>configure</command> script will try
-          to build the papi print backend if the papi libraries are found.
-          These options can be used to explicitly control whether
-          the papi print backend should be built.
+          Enable specific backends for GDK.  If none of these options
+          are given, the Wayland backend will be enabled by default,
+          if the platform is Linux; the X11 backend will also be enabled
+          by default, unless the platform is Windows, in which case the
+          default is win32, or the platform is macOS, in which case the
+          default is quartz. If any backend is explicitly enabled or disabled,
+          no other platform will be enabled automatically.
         </para>
       </formalpara>
 
       <formalpara>
-        <title><systemitem>--disable-packagekit</systemitem> and
-           <systemitem>--enable-packagekit</systemitem></title>
+        <title><systemitem>introspection</systemitem></title>
+
         <para>
-          By default the <command>configure</command> script will try
-          to build the PackageKit support for the open-with dialog if
-          the PackageKit libraries are found.
-          These options can be used to explicitly control whether
-          PackageKit support should be built.
+          Allows to disable building introspection support. This is option
+          is mainly useful for shortening turnaround times on developer
+          systems. Installed builds of GTK+ should always have introspection
+          support.
         </para>
       </formalpara>
 
       <formalpara>
-        <title><systemitem>--enable-x11-backend</systemitem>,
-          <systemitem>--disable-x11-backend</systemitem>,
-          <systemitem>--enable-win32-backend</systemitem>,
-          <systemitem>--disable-win32-backend</systemitem>,
-          <systemitem>--enable-quartz-backend</systemitem>,
-          <systemitem>--disable-quartz-backend</systemitem>,
-          <systemitem>--enable-broadway-backend</systemitem>,
-          <systemitem>--disable-broadway-backend</systemitem>,
-          <systemitem>--enable-wayland-backend</systemitem>,
-          <systemitem>--disable-wayland-backend</systemitem>
-          <systemitem>--enable-mir-backend</systemitem>, and
-          <systemitem>--disable-mir-backend</systemitem></title>
+        <title><systemitem>build-tests</systemitem>
+          <systemitem>demos</systemitem></title>
 
         <para>
-          Enables specific backends for GDK.  If none of these options
-          are given, the x11 backend will be enabled by default,
-          unless the platform is Windows, in which case the default is
-          win32.  If any backend is explicitly enabled or disabled, no
-          other platform will be enabled automatically.  Other
-          supported backends are the quartz backend for OS X.
+          By default, GTK+ will build quite a few tests and demos.
+          While these are useful on a developer system, they are not
+          needed when GTK+ is built e.g. for a flatpak runtime. These
+          options allow to disable building tests and demos.
         </para>
       </formalpara>
 
-      <formalpara>
-        <title><systemitem>--enable-introspection</systemitem></title>
-
-        <para>
-          Build with or without introspection support.
-          The default is 'auto'.
-        </para>
-      </formalpara>
-
-      <formalpara>
-        <title><systemitem>--enable-installed-tests</systemitem> or
-           <systemitem>--disable-installed-tests</systemitem></title>
-
-        <para>
-          Whether to install tests on the system. If enabled, tests
-          and their data are installed in <filename>${libexecdir}/gtk+/installed-tests</filename>.
-          Metadata for the tests is installed in <filename>${prefix}/share/installed-tests/gtk+</filename>.
-          To run the installed tests, gnome-desktop-testing-runner
-          can be used.
-        </para>
-      </formalpara>
     </refsect1>
 
 </refentry>

docs/reference/gtk/css-overview.xml

@@ -46,7 +46,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
 
   <para>
     We loosely follow the CSS
-    <ulink url="http://www.w3.org/TR/css-values/#value-defs">value definition</ulink>
+    <ulink url="https://www.w3.org/TR/css-values/#value-defs">value definition</ulink>
     specification in the formatting of syntax productions.
     <simplelist>
       <member>Nonterminals are enclosed in angle backets (〈〉), all other strings that are not listed here are literals</member>
@@ -123,7 +123,7 @@ scale[.fine-tune]
       <programlisting><![CDATA[
 button, entry {
   color: #ff00ea;
-  font: Comic Sans 12
+  font: 12px "Comic Sans"
 }
 ]]></programlisting>
     </example>
@@ -154,7 +154,7 @@ button, entry {
 
     <para>
       To learn more about the @import rule, you can read the
-      <ulink url="http://www.w3.org/TR/css3-cascade/#at-import">Cascading</ulink>
+      <ulink url="https://www.w3.org/TR/css3-cascade/#at-import">Cascading</ulink>
       module of the CSS specification.
     </para>
 
@@ -216,7 +216,7 @@ notebook > entry {
       <title>Theme any widget within a GtkBox</title>
       <programlisting><![CDATA[
 box * {
-  font: Sans 20
+  font: 20px Sans
 }
 ]]></programlisting>
     </example>
@@ -225,7 +225,7 @@ box * {
       <title>Theme a label named title-label</title>
       <programlisting><![CDATA[
 label#title-label {
-  font: Sans 15
+  font: 15px Sans
 }
 ]]></programlisting>
     </example>
@@ -329,7 +329,7 @@ label:focus {
     </example>
 
     <example>
-      <title>Theme inconsistent checkbuttons</title>
+      <title>Theme indeterminate checkbuttons</title>
       <programlisting><![CDATA[
 checkbutton:indeterminate {
   background-color: #20395a;
@@ -360,87 +360,87 @@ checkbutton:indeterminate {
           <row>
             <entry>*</entry>
             <entry>any node</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#universal-selector">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#universal-selector">CSS</ulink></entry>
             <entry></entry>
           </row>
           <row>
             <entry>E</entry>
             <entry>any node with name E</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#type-selectors">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#type-selectors">CSS</ulink></entry>
             <entry></entry>
           </row>
           <row>
             <entry>E.class</entry>
             <entry>any E node with the given style class</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#class-html">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#class-html">CSS</ulink></entry>
             <entry></entry>
           </row>
           <row>
             <entry>E#id</entry>
             <entry>any E node with the given ID</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#id-selectors">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#id-selectors">CSS</ulink></entry>
             <entry>GTK+ uses the widget name as ID</entry>
           </row>
           <row>
             <entry>E:nth‑child(〈nth‑child〉)</entry>
             <entry>any E node which is the n-th child of its parent node</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
             <entry></entry>
           </row>
           <row>
             <entry>E:nth‑last‑child(〈nth‑child〉)</entry>
             <entry>any E node which is the n-th child of its parent node, counting from the end</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
             <entry></entry>
           </row>
           <row>
             <entry>E:first‑child</entry>
             <entry>any E node which is the first child of its parent node</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
             <entry></entry>
           </row>
           <row>
             <entry>E:last‑child</entry>
             <entry>any E node which is the last child of its parent node</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
             <entry></entry>
           </row>
           <row>
             <entry>E:only‑child</entry>
             <entry>any E node which is the only child of its parent node</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
             <entry>Equivalent to E:first-child:last-child</entry>
           </row>
           <row>
             <entry>E:link, E:visited</entry>
             <entry>any E node which represents a hyperlink, not yet visited (:link) or already visited (:visited)</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#link">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#link">CSS</ulink></entry>
             <entry>Corresponds to GTK_STATE_FLAG_LINK and GTK_STATE_FLAGS_VISITED</entry>
           </row>
           <row>
             <entry>E:active, E:hover, E:focus</entry>
             <entry>any E node which is part of a widget with the corresponding state</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#useraction-pseudos">CSS</ulink></entry>
-            <entry>Corresponds to GTK_STATE_FLAG_ACTIVE, GTK_STATE_FLAG_PRELIGHT and GTK_STATE_FLAGS_FOCUSED; GTK+ also allows E:prelight and E:focused</entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#useraction-pseudos">CSS</ulink></entry>
+            <entry>Correspond to GTK_STATE_FLAG_ACTIVE, GTK_STATE_FLAG_PRELIGHT and GTK_STATE_FLAGS_FOCUSED respectively</entry>
           </row>
           <row>
             <entry>E:disabled</entry>
-            <entry>any E node which is part of a widget with is disabled</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#UIstates">CSS</ulink></entry>
-            <entry>Corresponds to GTK_STATE_FLAG_INSENSITIVE; GTK+ also allows E:insensitive</entry>
+            <entry>any E node which is part of a widget which is disabled</entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#UIstates">CSS</ulink></entry>
+            <entry>Corresponds to GTK_STATE_FLAG_INSENSITIVE</entry>
           </row>
           <row>
             <entry>E:checked</entry>
             <entry>any E node which is part of a widget (e.g. radio- or checkbuttons) which is checked</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#UIstates">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#UIstates">CSS</ulink></entry>
             <entry>Corresponds to GTK_STATE_FLAG_CHECKED</entry>
           </row>
           <row>
             <entry>E:indeterminate</entry>
-            <entry>any E node which is part of a widget (e.g. radio- or checkbuttons) which is in an inconsistent state</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#indeterminate">CSS3</ulink>,
+            <entry>any E node which is part of a widget (e.g. radio- or checkbuttons) which is in an indeterminate state</entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#indeterminate">CSS3</ulink>,
                    <ulink url="https://drafts.csswg.org/selectors/#indeterminate">CSS4</ulink></entry>
-            <entry>Corresponds to GTK_STATE_FLAG_INCONSISTENT; GTK+ also allows E:inconsistent</entry>
+            <entry>Corresponds to GTK_STATE_FLAG_INCONSISTENT</entry>
           </row>
           <row>
             <entry>E:backdrop, E:selected</entry>
@@ -451,7 +451,7 @@ checkbutton:indeterminate {
           <row>
             <entry>E:not(〈selector〉)</entry>
             <entry>any E node which does not match the simple selector 〈selector〉</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#negation">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#negation">CSS</ulink></entry>
             <entry></entry>
           </row>
           <row>
@@ -469,25 +469,25 @@ checkbutton:indeterminate {
           <row>
             <entry>E F</entry>
             <entry>any F node which is a descendent of an E node</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#descendent-combinators">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#descendent-combinators">CSS</ulink></entry>
             <entry></entry>
           </row>
           <row>
             <entry>E > F</entry>
             <entry>any F node which is a child of an E node</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#child-combinators">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#child-combinators">CSS</ulink></entry>
             <entry></entry>
           </row>
           <row>
             <entry>E ~ F</entry>
             <entry>any F node which is preceded by an E node</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#general-sibling-combinators">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#general-sibling-combinators">CSS</ulink></entry>
             <entry></entry>
           </row>
           <row>
             <entry>E + F</entry>
             <entry>any F node which is immediately preceded by an E node</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#adjacent-sibling-combinators">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#adjacent-sibling-combinators">CSS</ulink></entry>
             <entry></entry>
           </row>
         </tbody>
@@ -499,7 +499,7 @@ checkbutton:indeterminate {
 
     <para>
       To learn more about selectors in CSS, read the
-      <ulink url="http://www.w3.org/TR/css3-selectors/">Selectors</ulink>
+      <ulink url="https://www.w3.org/TR/css3-selectors/">Selectors</ulink>
       module of the CSS specification.
     </para>
 
@@ -532,7 +532,7 @@ checkbutton:indeterminate {
 
     <para>
       For a list of valid color names and for more background on colors in
-      CSS, see the <ulink url="http://www.w3.org/TR/css3-color/#svg-color">Color</ulink>
+      CSS, see the <ulink url="https://www.w3.org/TR/css3-color/#svg-color">Color</ulink>
       module of the CSS specification.
     </para>
 
@@ -654,7 +654,7 @@ button {
     <para>
       A crossfade lets you specify an image as an intermediate between two
       images. Crossfades are specified in the draft of the level 4
-      <ulink url="http://www.w3.org/TR/css4-images">Image</ulink>
+      <ulink url="https://www.w3.org/TR/css4-images">Image</ulink>
       module of the CSS specification.
     </para>
 
@@ -734,7 +734,7 @@ label {
       To learn more about gradients in CSS, including details of how color stops
       are placed on the gradient line and keywords for specifying radial sizes,
       you can read the
-      <ulink url="http://www.w3.org/TR/css3-images/#gradients">Image</ulink>
+      <ulink url="https://www.w3.org/TR/css3-images/#gradients">Image</ulink>
       module of the CSS specification.
     </para>
 

docs/reference/gtk/css-properties.xml

@@ -94,7 +94,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
       The calc() notation adds considerable expressive power. There are limits
       on what types can be combined in such an expression (e.g. it does not make
       sense to add a number and a time). For the full details, see the
-      <ulink url="http://www.w3.org/TR/css3-values/#calc-notation">CSS3 Values and
+      <ulink url="https://www.w3.org/TR/css3-values/#calc-notation">CSS3 Values and
       Units</ulink> spec.
     </para>
 
@@ -134,8 +134,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>rgba(1,1,1,1)</code></entry>
               <entry>✓</entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-color">CSS2</ulink>,
-                    <ulink url="http://www.w3.org/TR/css3-color/#foreground">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-color">CSS2</ulink>,
+                    <ulink url="https://www.w3.org/TR/css3-color/#foreground">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -144,7 +144,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>1</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-color/#opacity">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-color/#opacity">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -193,8 +193,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry>gtk-font-name setting</entry>
               <entry>✓</entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#propdef-font-family">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-fonts/#font-family-prop">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#propdef-font-family">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-fonts/#font-family-prop">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -203,8 +203,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry>gtk-font-name setting</entry>
               <entry>✓</entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#font-size-props">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-fonts/#font-size-prop">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#font-size-props">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-fonts/#font-size-prop">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -213,8 +213,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>normal</code></entry>
               <entry>✓</entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#propdef-font-style">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-fonts/#font-style-prop">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#propdef-font-style">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-fonts/#font-style-prop">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -223,8 +223,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>normal</code></entry>
               <entry>✓</entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#propdef-font-variant">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-fonts/#descdef-font-variant">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#propdef-font-variant">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-fonts/#descdef-font-variant">CSS3</ulink></entry>
               <entry>only CSS2 values supported</entry>
             </row>
             <row>
@@ -233,8 +233,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>normal</code></entry>
               <entry>✓</entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#propdef-font-weight">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-fonts/#font-weight-prop">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#propdef-font-weight">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-fonts/#font-weight-prop">CSS3</ulink></entry>
               <entry>normal is synonymous with 400, bold with 700</entry>
             </row>
             <row>
@@ -243,7 +243,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>normal</code></entry>
               <entry>✓</entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-fonts/#font-stretch-prop">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-fonts/#font-stretch-prop">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -266,8 +266,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry>font</entry>
               <entry><code>[ 〈font-style〉 || 〈font-variant〉 || 〈font-weight〉 || 〈font-stretch〉 ]? 〈font-size〉 〈font-family〉</code></entry>
               <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#font-shorthand">CSS2</ulink>,
-<ulink url="http://www.w3.org/TR/css3-fonts/#font-prop">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#font-shorthand">CSS2</ulink>,
+<ulink url="https://www.w3.org/TR/css3-fonts/#font-prop">CSS3</ulink></entry>
               <entry>CSS allows line-height, etc</entry>
             </row>
           </tbody>
@@ -299,7 +299,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>currentColor</code></entry>
               <entry>✓</entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-ui/#caret-color">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-ui/#caret-color">CSS3</ulink></entry>
               <entry>CSS allows an auto value</entry>
             </row>
             <row>
@@ -335,7 +335,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0px</code></entry>
               <entry>✓</entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-text/#letter-spacing">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-text/#letter-spacing">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -344,8 +344,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>none</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/text.html#propdef-text-decoration">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css-text-decor-3/#text-decoration-line-property">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/text.html#propdef-text-decoration">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css-text-decor-3/#text-decoration-line-property">CSS3</ulink></entry>
               <entry>CSS allows overline</entry>
             </row>
             <row>
@@ -354,7 +354,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>currentColor</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/css-text-decor-3/#text-decoration-color-property">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css-text-decor-3/#text-decoration-color-property">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -363,7 +363,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>solid</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css-text-decor-3/#text-decoration-style-property">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css-text-decor-3/#text-decoration-style-property">CSS3</ulink></entry>
               <entry>CSS allows dashed and dotted</entry>
             </row>
             <row>
@@ -372,7 +372,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>none</code></entry>
               <entry>✓</entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/css-text-decor-3/#text-shadow-property">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css-text-decor-3/#text-shadow-property">CSS3</ulink></entry>
               <entry></entry>
             </row>
           </tbody>
@@ -386,7 +386,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry>text‑decoration</entry>
               <entry><code>〈text-decoration-line〉 || 〈text-decoration-style〉 || 〈text-decoration-color〉</code></entry>
               <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/css-text-decor-3/#text-decoration-property">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css-text-decor-3/#text-decoration-property">CSS3</ulink></entry>
               <entry></entry>
             </row>
           </tbody>
@@ -527,8 +527,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0px</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#propdef-min-width">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#min-width">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#propdef-min-width">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#min-width">CSS3</ulink></entry>
               <entry>CSS allows percentages</entry>
             </row>
             <row>
@@ -537,8 +537,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0px</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#propdef-min-height">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#min-height">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#propdef-min-height">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#min-height">CSS3</ulink></entry>
               <entry>CSS allows percentages</entry>
             </row>
             <row>
@@ -547,8 +547,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0px</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-margin-top">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#margin-top">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-margin-top">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#margin-top">CSS3</ulink></entry>
               <entry>CSS allows percentages or auto</entry>
             </row>
             <row>
@@ -557,8 +557,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0px</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-margin-right">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#margin-right">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-margin-right">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#margin-right">CSS3</ulink></entry>
               <entry>CSS allows percentages or auto</entry>
             </row>
             <row>
@@ -567,8 +567,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0px</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-margin-bottom">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#margin-bottom">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-margin-bottom">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#margin-bottom">CSS3</ulink></entry>
               <entry>CSS allows percentages or auto</entry>
             </row>
             <row>
@@ -577,8 +577,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0px</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-margin-left">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#margin-left">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-margin-left">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#margin-left">CSS3</ulink></entry>
               <entry>CSS allows percentages or auto</entry>
             </row>
             <row>
@@ -587,8 +587,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0px</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-padding-top">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#padding-top">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-padding-top">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#padding-top">CSS3</ulink></entry>
               <entry>CSS allows percentages</entry>
             </row>
             <row>
@@ -597,8 +597,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0px</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-padding-right">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#padding-right">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-padding-right">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#padding-right">CSS3</ulink></entry>
               <entry>CSS allows percentages</entry>
             </row>
             <row>
@@ -607,8 +607,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0px</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-padding-bottom">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#padding-bottom">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-padding-bottom">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#padding-bottom">CSS3</ulink></entry>
               <entry>CSS allows percentages</entry>
             </row>
             <row>
@@ -617,8 +617,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0px</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-padding-left">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#padding-left">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-padding-left">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#padding-left">CSS3</ulink></entry>
               <entry>CSS allows percentages</entry>
             </row>
           </tbody>
@@ -632,16 +632,16 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry>margin</entry>
               <entry><code>〈length〉{1,4}</code></entry>
               <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-margin">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#margin">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-margin">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#margin">CSS3</ulink></entry>
               <entry>a 'four sides' shorthand</entry>
             </row>
             <row>
               <entry>padding</entry>
               <entry><code>〈length〉{1,4}</code></entry>
               <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-padding">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#padding">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-padding">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#padding">CSS3</ulink></entry>
               <entry>a 'four sides' shorthand</entry>
             </row>
           </tbody>
@@ -663,8 +663,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0px</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top-width">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-width">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top-width">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-width">CSS3</ulink></entry>
               <entry>CSS allows other values</entry>
             </row>
             <row>
@@ -673,8 +673,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0px</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right-width">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/css3-background/#the-border-width">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right-width">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/css3-background/#the-border-width">CSS3</ulink></entry>
               <entry>CSS allows other values</entry>
             </row>
             <row>
@@ -683,8 +683,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0px</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom-width">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-width">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom-width">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-width">CSS3</ulink></entry>
               <entry>CSS allows other values</entry>
             </row>
             <row>
@@ -693,8 +693,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0px</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right-width">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-width">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right-width">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-width">CSS3</ulink></entry>
               <entry>CSS allows other values</entry>
             </row>
             <row>
@@ -703,8 +703,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>none</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top-style">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-style">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top-style">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-style">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -713,8 +713,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>none</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right-style">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-style">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right-style">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-style">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -723,8 +723,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>none</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom-style">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-style">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom-style">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-style">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -733,8 +733,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>none</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-left-style">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-style">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-left-style">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-style">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -743,8 +743,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top-right-radius">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-radius">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top-right-radius">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-radius">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -753,8 +753,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom-right-radius">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-radius">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom-right-radius">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-radius">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -763,8 +763,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom-left-radius">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-radius">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom-left-radius">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-radius">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -773,8 +773,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top-left-radius">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-radius">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top-left-radius">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-radius">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -783,8 +783,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>currentColor</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top-color">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-color">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top-color">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-color">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -793,8 +793,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>currentColor</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right-color">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-color">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right-color">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-color">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -803,8 +803,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>currentColor</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom-color">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-color">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom-color">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-color">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -813,8 +813,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>currentColor</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-left-color">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-color">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-left-color">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-color">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -823,7 +823,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>none</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-background/#the-border-image-source">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-background/#the-border-image-source">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -832,7 +832,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>stretch</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR//css3-background/#the-border-image-repeat">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR//css3-background/#the-border-image-repeat">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -841,7 +841,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>100%</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR//css3-background/#the-border-image-slice">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR//css3-background/#the-border-image-slice">CSS3</ulink></entry>
               <entry>a 'four sides' shorthand</entry>
             </row>
             <row>
@@ -850,7 +850,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>1</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR//css3-background/#the-border-image-width">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR//css3-background/#the-border-image-width">CSS3</ulink></entry>
               <entry>a 'four sides' shorthand</entry>
             </row>
 
@@ -865,77 +865,77 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry>border‑width</entry>
               <entry><code>〈length〉{1,4}</code></entry>
               <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-width">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-width">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-width">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-width">CSS3</ulink></entry>
               <entry>a 'four sides' shorthand</entry>
             </row>
             <row>
               <entry>border‑style</entry>
               <entry><code>〈border style〉{1,4}</code></entry>
               <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-style">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-style">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-style">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-style">CSS3</ulink></entry>
               <entry>a 'four sides' shorthand</entry>
             </row>
             <row>
               <entry>border‑color</entry>
               <entry><code>〈color〉{1,4}</code></entry>
               <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-background/#border-color">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-background/#border-color">CSS3</ulink></entry>
               <entry>a 'four sides' shorthand</entry>
             </row>
             <row>
               <entry>border‑top</entry>
               <entry><code>〈length〉 || 〈border style〉 || 〈color〉</code></entry>
               <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#border-top">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#border-top">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
               <entry>border‑left</entry>
               <entry><code>〈length〉 || 〈border style〉 || 〈color〉</code></entry>
               <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-left">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#border-left">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-left">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#border-left">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
               <entry>border‑bottom</entry>
               <entry><code>〈length〉 || 〈border style〉 || 〈color〉</code></entry>
               <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#border-bottom">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#border-bottom">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
               <entry>border‑right</entry>
               <entry><code>〈length〉 || 〈border style〉 || 〈color〉</code></entry>
               <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#border-right">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#border-right">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
               <entry>border</entry>
               <entry><code>〈length〉 || 〈border style〉 || 〈color〉</code></entry>
               <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#border">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#border">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
               <entry>border‑radius</entry>
               <entry><code>[ 〈length〉 | 〈percentage〉 ]{1,4} [ / [ 〈length〉 | 〈percentage> ]{1,4} ]?</code></entry>
               <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-background/#border-radius">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-background/#border-radius">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
               <entry>border‑image</entry>
               <entry><code>〈border-image-source〉 || 〈border-image-slice〉 [ / 〈border-image-width〉 | / 〈border-image-width〉? / 〈border-image-outset〉 ]? || 〈border-image-repeat〉</code></entry>
               <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-background/#border-image">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-background/#border-image">CSS3</ulink></entry>
               <entry></entry>
             </row>
           </tbody>
@@ -961,8 +961,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>none</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/ui.html#propdef-outline-style">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-ui/#outline-style">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/ui.html#propdef-outline-style">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-ui/#outline-style">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -971,8 +971,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0px</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/ui.html#propdef-outline-width">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-ui/#outline-width">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/ui.html#propdef-outline-width">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-ui/#outline-width">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -981,8 +981,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>currentColor</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/ui.html#propdef-outline-color">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-ui/#outline-color">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/ui.html#propdef-outline-color">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-ui/#outline-color">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -991,7 +991,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0px</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-ui/#outline-offset">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-ui/#outline-offset">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -1041,8 +1041,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry>outline</entry>
               <entry><code>〈outline-color〉 || 〈outline-style〉 || 〈outline-width〉</code></entry>
               <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/ui.html#propdef-outline">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-ui/#propdef-outline">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/ui.html#propdef-outline">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-ui/#propdef-outline">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -1075,8 +1075,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>rgba(0,0,0,0)</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background-color">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#background-color">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background-color">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#background-color">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -1085,7 +1085,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>border-box</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-background/#background-clip">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-background/#background-clip">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -1094,7 +1094,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>padding-box</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-background/#background-origin">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-background/#background-origin">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -1103,7 +1103,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>auto</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-background/#background-size">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-background/#background-size">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -1112,8 +1112,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background-position">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#background-position">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background-position">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#background-position">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -1122,8 +1122,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>repeat</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background-repeat">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#background-repeat">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background-repeat">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#background-repeat">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -1132,8 +1132,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>none</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background-image">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#background-image">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background-image">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#background-image">CSS3</ulink></entry>
               <entry>not supported: urls without quotes, colors in crossfades</entry>
             </row>
             <row>
@@ -1151,7 +1151,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>none</code></entry>
               <entry></entry>
               <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-background/#box-shadow">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-background/#box-shadow">CSS3</ulink></entry>
               <entry></entry>
             </row>
           </tbody>
@@ -1165,8 +1165,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><para>background</para></entry>
               <entry><code>[ 〈bg-layer〉 , ]* 〈final-bg-layer〉</code></entry>
               <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#background">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#background">CSS3</ulink></entry>
               <entry></entry>
             </row>
           </tbody>
@@ -1208,7 +1208,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>all</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-transitions/#transition-property">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-transitions/#transition-property">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -1217,7 +1217,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0s</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-transitions/#transition-duration">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-transitions/#transition-duration">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -1226,7 +1226,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>ease</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-transitions/#transition-timing-function">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-transitions/#transition-timing-function">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -1235,7 +1235,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0s</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-transitions/#transition-delay">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-transitions/#transition-delay">CSS3</ulink></entry>
               <entry></entry>
             </row>
           </tbody>
@@ -1249,7 +1249,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry>transition</entry>
               <entry><code>〈single-transition〉 [ , 〈single-transition〉 ]*</code></entry>
               <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-transitions/#transition">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-transitions/#transition">CSS3</ulink></entry>
               <entry></entry>
             </row>
           </tbody>
@@ -1277,7 +1277,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>none</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-animations/#animation-name">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-animations/#animation-name">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -1286,7 +1286,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0s</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-animations/#animation-duration">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-animations/#animation-duration">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -1295,7 +1295,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>ease</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-animations/#animation-timing-function">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-animations/#animation-timing-function">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -1304,7 +1304,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>1</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-animations/#animation-iteration-count">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-animations/#animation-iteration-count">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -1313,7 +1313,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>normal</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-animations/#animation-direction">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-animations/#animation-direction">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -1322,7 +1322,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>running</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-animations/#animation-play-state">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-animations/#animation-play-state">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -1331,7 +1331,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>0s</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-animations/#animation-delay">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-animations/#animation-delay">CSS3</ulink></entry>
               <entry></entry>
             </row>
             <row>
@@ -1340,7 +1340,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry><code>none</code></entry>
               <entry></entry>
               <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-animations/#animation-fill-mode">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-animations/#animation-fill-mode">CSS3</ulink></entry>
               <entry></entry>
             </row>
           </tbody>
@@ -1354,7 +1354,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry>animation</entry>
               <entry><code>〈single‑animation〉 [ , 〈single‑animation〉]*</code></entry>
               <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-animations/#animation">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-animations/#animation">CSS3</ulink></entry>
               <entry></entry>
             </row>
           </tbody>

docs/reference/gtk/drawing-model.xml

@@ -342,81 +342,6 @@ my_widget_init (MyWidget *widget)
     </refsect2>
   </refsect1>
 
-  <refsect1 id="app-paintable-widgets">
-    <title>App-paintable widgets</title>
-
-    <para>
-      Generally, applications use the pre-defined widgets in GTK+ and
-      they do not draw extra things on top of them (the exception
-      being <classname>GtkDrawingArea</classname>).  However,
-      applications may sometimes find it convenient to draw directly
-      on certain widgets like toplevel windows or event boxes.  When
-      this is the case, GTK+ needs to be told not to overwrite your
-      drawing afterwards, when the window gets to drawing its default
-      contents.
-    </para>
-
-    <para>
-      <classname>GtkWindow</classname> and
-      <classname>GtkEventBox</classname> are the two widgets that allow
-      turning off drawing of default contents by calling
-      <function>gtk_widget_set_app_paintable()</function>. If you call
-      this function, they will not draw their contents and let you do
-      it instead.
-    </para>
-
-    <para>
-      Since the #GtkWidget::draw signal runs user-connected handlers
-      <emphasis>before</emphasis> the widget's default handler, what
-      usually happens is this:
-    </para>
-
-    <orderedlist>
-      <listitem>
-	<para>
-	  Your own draw handler gets run.  It paints something
-	  on the window or the event box.
-	</para>
-      </listitem>
-
-      <listitem>
-	<para>
-	  The widget's default draw handler gets run.  If
-          <function>gtk_widget_set_app_paintable()</function> has not
-          been called to turn off widget drawing (this
-	  is the default), <emphasis>your drawing will be
-            overwritten</emphasis>.  An app paintable widget will not
-          draw its default contents however and preserve your drawing
-          instead.
-	</para>
-      </listitem>
-
-      <listitem>
-	<para>
-	  The draw handler for the parent class gets run.
-	  Since both <classname>GtkWindow</classname> and
-	  <classname>GtkEventBox</classname> are descendants of
-	  <classname>GtkContainer</classname>, their no-window
-	  children will be asked to draw themselves recursively, as
-	  described in <xref linkend="hierarchical-drawing"/>.
-	</para>
-      </listitem>
-    </orderedlist>
-
-    <formalpara>
-      <title>Summary of app-paintable widgets</title>
-
-      <para>
-        Call <function>gtk_widget_set_app_paintable()</function> if you
-	intend to draw your own content directly on a
-	<classname>GtkWindow</classname> and
-	<classname>GtkEventBox</classname>.  You seldom need to draw
-	on top of other widgets, and
-	<classname>GtkDrawingArea</classname> ignores this flag, as it
-	<emphasis>is</emphasis> intended to be drawn on.
-      </para>
-    </formalpara>
-  </refsect1>
 </refentry>
 
 <!--

docs/reference/gtk/getting_started.xml

@@ -256,7 +256,7 @@
 
     <example>
       <title>Packing buttons with GtkBuilder</title>
-      <para>Create a new file with the following content named example-4.c.</para>
+      <para>Create a new file with the following content named example-3.c.</para>
       <programlisting><xi:include href="../../../../examples/builder.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       <para>Create a new file with the following content named builder.ui.</para>
       <programlisting><xi:include href="../../../../examples/builder.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
@@ -264,7 +264,7 @@
     <para>
       You can compile the program above with GCC using:
       <literallayout>
-        <literal>gcc `pkg-config --cflags gtk+-3.0` -o example-4 example-4.c `pkg-config --libs gtk+-3.0`</literal>
+        <literal>gcc `pkg-config --cflags gtk+-3.0` -o example-3 example-3.c `pkg-config --libs gtk+-3.0`</literal>
       </literallayout>
     </para>
 
@@ -1072,13 +1072,13 @@ example_app_window_init (ExampleAppWindow *win)
 
     <example id="gtk-getting-started-drawing">
       <title>Drawing in response to input</title>
-      <para>Create a new file with the following content named example-3.c.</para>
+      <para>Create a new file with the following content named example-4.c.</para>
       <programlisting><xi:include href="../../../../examples/drawing.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
     </example>
     <para>
       You can compile the program above with GCC using:
       <literallayout>
-        <literal>gcc `pkg-config --cflags gtk+-3.0` -o example-3 example-3.c `pkg-config --libs gtk+-3.0`</literal>
+        <literal>gcc `pkg-config --cflags gtk+-3.0` -o example-4 example-4.c `pkg-config --libs gtk+-3.0`</literal>
       </literallayout>
     </para>
   </section>

docs/reference/gtk/gtk4-docs.xml

@@ -12,9 +12,9 @@
     <releaseinfo>
       This document is for the GTK+ 4 library, version &version;.
       The latest versions can be found online at
-      <ulink role="online-location" url="http://developer.gnome.org/gtk4/">http://developer.gnome.org/gtk4/</ulink>.
+      <ulink role="online-location" url="https://developer.gnome.org/gtk4/">https://developer.gnome.org/gtk4/</ulink>.
       If you are looking for the older GTK+ 3 series of libraries,
-      see <ulink role="online-location" url="http://developer.gnome.org/gtk3/">http://developer.gnome.org/gtk3/</ulink>.
+      see <ulink role="online-location" url="https://developer.gnome.org/gtk3/">https://developer.gnome.org/gtk3/</ulink>.
     </releaseinfo>
   </bookinfo>
 
@@ -68,6 +68,7 @@
     <chapter id="LayoutContainers">
       <title>Layout Containers</title>
       <xi:include href="xml/gtkbox.xml" />
+      <xi:include href="xml/gtkcenterbox.xml" />
       <xi:include href="xml/gtkgrid.xml" />
       <xi:include href="xml/gtkrevealer.xml" />
       <xi:include href="xml/gtklistbox.xml" />
@@ -252,7 +253,6 @@
       <xi:include href="xml/gtkcalendar.xml" />
       <xi:include href="xml/gtkdrawingarea.xml" />
       <xi:include href="xml/gtkglarea.xml" />
-      <xi:include href="xml/gtkeventbox.xml" />
       <xi:include href="xml/gtkimcontextsimple.xml" />
       <xi:include href="xml/gtkimmulticontext.xml" />
       <xi:include href="xml/gtksizegroup.xml" />