animatedstyle: don't share styleanimations

Because of our port of css animation and css transition to
progress tracker, we should not think of animated styles as
immutable objects that can map any timestamp to css values.
Rather, timestamps can correspond to different values depending
on the value of GTK_SLOWDOWN over the course of the animation.

To keep animated styles and style animations totally immutable,
we will not share styleanimations between animatedstyles, and
make a new copy of a styleanimation for each timestamp.

Makefile.am

@@ -103,7 +103,14 @@ AM_DISTCHECK_CONFIGURE_FLAGS =		\
 	--enable-introspection  	\
 	--enable-installed-tests
 
-GITIGNORE_TRANSLATION_DIRS = po-properties
-GITIGNOREFILES = po-properties/gtk30-properties.pot
+GITIGNOREFILES = \
+	po-properties/Makefile.in.in \
+	po-properties/Makefile.in \
+	po-properties/Makefile \
+	po-properties/*.gmo \
+	po-properties/*.mo \
+	po-properties/POTFILES \
+	po-properties/stamp-it \
+	po-properties/.intltool-merge-cache
 
 -include $(top_srcdir)/git.mk

README.in

@@ -73,10 +73,286 @@ 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 3.20
+======================
 
-Release notes for releases of GTK+ 3.x are part of the migration
-guide in the GTK+ documentation. See
+* The way theming works in GTK+ has been reworked fundamentally, to
+  implement many more CSS features and make themes more expressive.
+  As a result, custom CSS that is shipped with applications and third-
+  party themes will need adjustments. Widgets now use element names much
+  more than style classes; type names are no longer used in style matching.
+  Every widget now documents the element names it has and the style classes
+  it uses. The GTK+ inspector can also help with finding this information.
 
-https://developer.gnome.org/gtk3/unstable/gtk-migrating-2-to-3.html
+* GTK+ now uses internal subobjects (also known as gadgets) for allocating
+  and drawing widget parts. Applications that subclass GTK+ widgets may see
+  warnings if they override the size_allocate vfunc and don't chain up.
+  The proper way to subclass is to chain up in size_allocate. If you do not
+  want to do that for some reason, you have to override the draw vfunc as
+  well.
+
+* Several fixes for window sizing and window placement with client-side
+  decorations may affect applications that are saving and restoring window
+  sizes. The recommended best practice for this which is known to work with
+  client-side and server-side decorations and with older and newer versions
+  of GTK+ is to use gtk_window_get_size() to save window sizes and
+  gtk_window_set_default_size() to restore it.
+  See https://wiki.gnome.org/HowDoI/SaveWindowState for a detailed example.
+
+* GtkDrawingArea used to implicitly render the theme background before
+  calling the ::draw handler. This is no longer the case. If you rely
+  on having a theme-provided background, call gtk_render_background()
+  from your ::draw handler.
+
+* The GtkFileChooser interface prerequisite changed from GtkWidget
+  to GObject, allowing non-widget implementations of this interface.
+  This is a minor change in ABI, as applications are no longer guaranteed
+  that a GtkFileChooser also supports all GtkWidget methods. However, all
+  previously existing implementations still derive from GtkWidget, so no
+  existing code should break.
+
+* The way in which GtkLevelBar determines the offset to apply was a bit
+  inconsistent in the past; this has been fixed. Applications that are using
+  custom offsets should double-check that their levels look as expected.
+
+Release notes for 3.18
+======================
+
+* The GtkListBox model support that was introduced in 3.16 has been
+  changed to no longer call gtk_widget_show_all on rows created by
+  the create_widget_func. You need to manage the visibility of child
+  widgets yourself in your create_widget_func.
+
+* The alpha component of foreground colors that are applied to
+  GtkCellRendererText is no longer ignored. If you don't want your
+  text to be translucent, use opaque colors.
+
+Release notes for 3.16
+======================
+
+* GTK+ now includes an OpenGL rendering widget. To support GL on various
+  platforms, GTK+ uses libepoxy.
+
+* GTK+ no longer uses gtk-update-icon-cache during its build. The
+  --enable-gtk2-dependency configure option has been removed.
+
+* The introspection annotations for the x and y parameters of
+  GtkMenuPositionFunc have been corrected from 'out' to 'inout'.
+  If you are using such a function from language-bindings, this
+  may require adjustments.
+
+* The lookup order for actions that are activated via keyboard
+  accelerators has been changed to start at the currently focused
+  widget. If your application is making use fo nested action groups
+  via gtk_widget_insert_action_group, you may want to check that
+  this change does not upset your accelerators.
+
+* The GtkScrollable interface has gained a new vfunc, get_border,
+  that is used to position overshoot and undershoot indications that
+  are drawn over the content by GtkScrolledWindow. Unless your scrollable
+  has non-scrolling parts similar to treeview headers, there is no need
+  to implement this vfunc.
+
+* The GtkSearchEntry widget has gained a number of new signals that
+  are emitted when certain key sequences are seen. In particular, it
+  now handles the Escape key and emits ::stop-search. Applications that
+  expect to handle Escape themselves will need to be updated.
+
+Release notes for 3.14
+======================
+
+* A new state, GTK_STATE_FLAG_CHECKED, has been added for checked states
+  of radio and check buttons and menuitems. Applications that are using
+  GTK+ styles without widgets will need adjustments.
+
+* Adwaita is now the default theme on all platforms.
+
+* The icon theme code has become a little pickier about sizes and is not
+  automatically scaling icons beyond the limits defined in the icon theme
+  unless explicitly asked to do so with GTK_ICON_LOOKUP_FORCE_SIZE.
+
+* GTK+ now includes an interactive debugger which can be activated with
+  the keyboard shortcuts Ctrl-Shift-d or Ctrl-Shift-i. If these shortcuts
+  interfere with application keybindings, they can be disabled with the
+  setting org.gtk.Settings.Debug.enable-inspector-keybinding.
+
+* Most widgets have been ported to use the new gesture framework internally
+  for event handling. Traditional event handlers in derived widgets are still
+  being called.
+
+* Using GTK+ under X11 without the X Render extension has been observed
+  to be problematic. This combination is using code paths in cairo and
+  graphics drivers which are rarely tested and likely buggy.
+
+* GtkTextView is now using a pixel-cache internally, and is drawing
+  a background underneath the text. This can cause problems for applications
+  which assumed that they could draw things below and above the text
+  by chaining up in the ::draw implementation of their GtkTextView subclass.
+  As a short-term workaround, you can make the application apply a
+  custom theme to the text view with a transparent background. For
+  a proper fix, use the new ::draw_layer vfunc.
+
+Release notes for 3.12
+======================
+
+* GtkWidget had a hack where if opacity is 0.999 we set up an opacity
+  group when rendering the widget. This is no longer needed in 3.10,
+  and GtkStack doesn't use it anymore. It has been removed in 3.12.
+  GdStack is using it, so applications should be ported from GdStack
+  to GtkStack in 3.12.
+
+* GtkHeaderBar in 3.10 was not ordering its pack-end children in
+  the right way. This has been fixed in 3.12. Applications which
+  pack multiple widgets at the end of a headerbar will have to
+  be updated.
+
+* gtk_text_view_add_child_in_window has changed behaviour a bit.
+  It now always positions the child in buffer coordinates, where
+  it used to inconsistently scroll with the buffer but then go
+  reposition to a window-relative position on redraw.
+
+* A number of container widgets have been made more compliant with
+  the uniform CSS rendering model by making them render backgrounds
+  and borders. This may require some adjustments in applications that
+  were making assumptions about containers never rendering backgrounds.
+
+Release notes for 3.10
+======================
+
+* GDK has been changed to allow only a single screen per display.
+  Only the X11 backend had multiple screens before, and multi-screen
+  setups (not multi-monitor!) are very rare nowadays. If you really
+  need multiple X screens, open them as separate displays.
+
+* The behavior of GtkBox::expand has been changed to never propagate
+  up. Previously, this was happening inconsistently. If you want the
+  expand to propagate, use the GtkWidget h/v expand properties.
+  If you experience sizing problems with widgets in ported code,
+  carefully check the expand and fill flags of your boxes.
+
+* GtkBin no longer provides default implementations for
+  get_height_for_width, subclasses now have to provide their own
+  implementation if they need height-for-width functionality.
+
+* Widget state propagation has been changed. Historically, all of
+  active, prelight, selected, insensitive, inconsistent and backdrop
+  have been propagated to children. This has now been restricted
+  to just the insensitive and backdrop states. This mostly affects
+  theming.
+
+* The way widget drawing happens has changed. Earlier versions handled
+  one expose event per GdkWindow, each with a separate cairo_t. Now we
+  only handle the expose event on the toplevel and reuse the same
+  cairo_t (with the right translation and clipping) for the entire
+  widget hierarchy, recursing down via the GtkWidget::draw signal.
+  Having all rendering in the same call tree allows effects like
+  opacity and offscreen rendering of entire widget sub-hierarchies.
+  Generally this should not require any changes in widgets, but
+  code looking at e.g. the current expose event may see different
+  behavior than before.
+
+* The Gtk+ scrolling implementation has changed. gdk_window_scroll()
+  and gdk_window_move_region() no longer copy the region on the
+  window, but rather invalidate the entire scrolled region. This is
+  slightly slower, but allowed us to implement a offscreen surface
+  scrolling method which better fits modern hardware. Most scrolling
+  widgets in Gtk+ have been converted to use this model for scrolling,
+  but external widgets implementing scrolling using GdkWindow may see
+  some slowdown.
+
+Release notes for 3.8
+=====================
+
+* GtkIconInfo has changed from being a boxed type to a GObject. This
+  is technically an ABI change, but basically all existing code
+  will keep working if its used as a boxed type, and its not
+  possible to instantiate GtkIconInfos outside Gtk, so this is not
+  expected to be a big problem.
+
+Release notes for 3.6
+=====================
+
+* The accessibility bridge code that exports accessible objects
+  on the bus is now used by default; atk-bridge has been converted
+  into a library that GTK+ links against. To void the linking,
+  pass --without-atk-bridge when configuring GTK+.
+
+* GDK threading support has been deprecated. It is recommended to
+  use g_idle_add(), g_main_context_invoke() and similar funtions
+  to make all GTK+ calls from the main thread.
+
+* GTK+ now follows the XDG Base Directory specification for
+  user configuration and data files. In detail,
+  * $XDG_CONFIG_HOME/gtk-3.0/custom-papers is the new location
+    for $HOME/.gtk-custom-papers
+  * $XDG_CONFIG_HOME/gtk-3.0/bookmarks is the new location
+    for $HOME/.gtk-bookmarks
+  * $XDG_DATA_HOME/themes is preferred over $HOME/.themes
+  * $XDG_DATA_HOME/icons is preferred over $HOME/.icons.
+  Existing files from the old location will still be read
+  if the new location does not exist.
+
+* $HOME/.gtk-3.0 is no longer in the default module load path.
+  If you want to load modules from there, add it to the GTK_PATH
+  environment variable.
+
+Release notes for 3.4
+=====================
+
+* Scroll events have been separated from button events, and smooth
+  scrolling has been added with a separate event mask. Widgets now
+  need to have either GDK_SCROLL_MASK or GDK_SMOOTH_SCROLL_MASK in
+  their event mask to receive scroll events. In addition, the
+  GdkScrollDirection enumeration has gained a new member,
+  GDK_SCROLL_SMOOTH, so switch statements will have to be amended
+  to cover this case.
+
+* GTK+ now uses <Primary> instead of <Control> in keyboard accelerators,
+  for improved cross-platform handling. This should not affect
+  applications, unless they parse or create these accelerator
+  manually.
+
+* The tacit assumption that the Alt key corresponds to the MOD1
+  modifier under X11 is now a hard requirement.
+
+* The beagle search backend for the file chooser has been dropped.
+  Tracker is the only supported search backend on Linux now.
+
+* GtkNotebook has been changed to destroy its action widgets when
+  it gets destroyed itself. If your application is using action
+  widgets in notebooks, you may have to adjust your code to take
+  this into account.
+
+* GtkApplication no longer uses the gtk mainloop wrappers, so
+  it is no longer possible to use gtk_main_quit() to stop it.
+
+* The -uninstalled variants of the pkg-config files have been dropped.
+
+* Excessive dependencies have been culled from Requires: lines
+  in .pc files. Dependent modules may have to declare dependencies
+  that there were getting 'for free' in the past.
+
+Release notes for 3.2
+=====================
+
+* The accessible implementations for GTK+ widgets have been integrated
+  into libgtk itself, and the gail module does not exist anymore. This
+  change should not affect applications very much.
+
+Release notes for 3.0
+=====================
+
+* GTK+ 3 is a major new version of GTK+, which is parallel installable
+  with GTK+ 2.x. For information about porting applications from GTK+ 2.x
+  to GTK+ 3, see the file:
+
+  docs/reference/gtk/html/migrating.html
+
+  Or online at:
+
+  http://library.gnome.org/devel/gtk/3.0/migrating.html
+
+* Note that the library sonames in this release have been changed from
+  libgtk-3.0 and libgdk-3.0 to libgtk-3 and libgdk-3, to prevent the
+  library versions from going backwards, compared to the 2.90/91/99
+  releases. Applications will have to be recompiled.

build/Makefile-newvs.am

@@ -9,17 +9,9 @@
 # Author: Fan, Chun-wei
 # November 05, 2012
 
-# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14 and so on)
-# MSVC_VER: Short Version of target Visual Studio (110 for 2012, 120 for 2013, 140 for 2015, 141 for 2017)
-# MSVC_TOOLSET: Use if target MSVC toolsett is not in the form v $(MSVC_VER)0, meaning v$(MSVC_TOOLSET)
-
-if MSVC_BASE_NO_TOOLSET_SET
-MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0
-endif
-
-if MSVC_NO_TOOLSET_SET
-MSVC_TOOLSET = $(MSVC_VER)0
-endif
+# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on)
+# MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on)
+# MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015
 
 %.sln:
 	sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
@@ -33,12 +25,12 @@ endif
 
 %.vcxproj:
 	if test -e $(top_srcdir)/build/win32/vs10/$@; then \
-		sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+		sed 's/v100/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
 	else \
-		sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+		sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
 	fi
 
-%.props: $(top_builddir)/build/win32/vs10/Makefile
+%.props:
 	if test -e $(top_srcdir)/build/win32/vs10/$@; then \
 		sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
 	else \

build/Makefile.am

@@ -1,5 +1,14 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = win32
+SUBDIRS = \
+	win32
+
+EXTRA_DIST +=	\
+	msvcfiles.py	\
+	gen-file-list-gtk.py	\
+	detectenv_msvc.mak	\
+	introspection-msvc.mak	\
+	gtk-introspection-msvc.mak.in	\
+	gtk-introspection-msvc.mak
 
 -include $(top_srcdir)/git.mk

build/Makefile.msvc-introspection

@@ -1,125 +0,0 @@
-# Author: Fan, Chun-wei
-# Common autotools file for constructing the g-ir-scanner and
-# g-ir-compiler command lines for Visual Studio builds.
-
-# This is copied from $(srcroot)/build from the gobject-introspection
-# project, which may be included in projects that support both
-# Visual Studio builds and introspection.
-
-# * Input variables:
-#
-#   MSVC_INTROSPECT_GIRS - List of .gir's that should be built
-#                          in the NMake Makefiles
-#
-# * Simple tutorial
-#
-# Add this to Makefile.am where your library/program is built:
-#   (Either YourLib_1_0_gir_MSVC_LIBS or YourLib_1_0_gir_MSVC_PROGRAM
-#    is required unless --headers-only is specified in
-#    YourLib_1_0_gir__MSVC_SCANNERFLAGS)
-#
-#   include $(top_srcdir)/build/Makefile.msvc-introspection
-#   MSVC_INTROSPECT_GIRS = YourLib-1.0.gir
-#   YourLib_1_0_gir_NAMESPACE = YourLib # This is optional
-#   YourLib_1_0_gir_VERSION = 1.0 # This is optional
-#   YourLib_1_0_gir_MSVC_LIBS = yourlib-1.0
-#   YourLib_1_0_gir_MSVC_FILES = $(libyourlib_1_0_SOURCES)
-#   YourLib_1_0_gir_MSVC_PROGRAM = YourProgram
-#   YourLib_1_0_gir_MSVC_PACKAGES = (Dependent .pc files)
-#   YourLib_1_0_gir_MSVC_INCLUDE_GIRS = (Dependent external .gir's)
-#   YourLiv_1_0_gir_MSVC_EXPORT_PACKAGES = (Packages exported by this .gir)
-
-# Private functions
-
-## Transform the MSVC project filename (no filename extensions) to something which can reference through a variable
-## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0
-_gir_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1))))
-
-# Namespace and Version is either fetched from the gir filename
-# or the _NAMESPACE/_VERSION variable combo
-_gir_namespace_msvc = $(or $($(_gir_name)_NAMESPACE),$(firstword $(subst -, ,$(notdir $(1)))))
-_gir_version_msvc = $(or $($(_gir_name)_VERSION),$(lastword $(subst -, ,$(1:.gir=))))
-_typelib_basename_msvc = $(_gir_namespace_msvc)'-'$(_gir_version_msvc)
-
-# _PROGRAM is an optional variable which needs its own --program argument
-_gir_program_msvc = $(if $($(_gir_name)_MSVC_PROGRAM),--program=$($(_gir_name)_MSVC_PROGRAM))
-
-# Deduce the sub-folder from $(srcroot) where the sources reside in
-_gir_source_path_raw_msvc:=$(subst $(abs_top_srcdir),,$(abs_srcdir))
-_gir_source_path_msvc=$(subst /,\\,$(_gir_source_path_raw_msvc))
-_gir_source_subdir_int_msvc=$(subst \\\\,\\,\\$(_gir_source_path_msvc)\\)
-_gir_source_subdir_msvc=$(subst \\.\\,\\,$(_gir_source_subdir_int_msvc))
-
-_gir_files_raw_msvc=$(subst /,\\,$($(_gir_name)_MSVC_FILES))
-_gir_files_msvc=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_gir_source_path_msvc)\\,\\,$(_gir_files_raw_msvc))))
-
-# Create a list of items for:
-# - Libraries
-# - Packages
-# - GIRs to include
-# - packages to export
-
-_gir_libraries_msvc = $(foreach lib,$($(_gir_name)_MSVC_LIBS),--library=$(lib))
-_gir_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_PACKAGES),--pkg=$(pkg))
-_gir_includes_msvc = $(foreach include,$($(_gir_name)_MSVC_INCLUDE_GIRS),--include=$(include))
-_gir_export_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_EXPORT_PACKAGES),--pkg-export=$(pkg))
-
-#
-# Create NMake Makefile Sections for Building Introspection files
-# from autotools files
-# $(1) - File Name of the .gir that is to be generated
-#
-
-define gir-nmake-builder
-
-# Basic sanity check, to make sure required variables are set
-$(if $($(_gir_name)_MSVC_FILES),,$(error Need to define $(_gir_name)_MSVC_FILES))
-$(if $(or $(findstring --header-only,$($(_gir_name)_MSVC_SCANNERFLAGS)),
-          $($(_gir_name)_MSVC_LIBS),
-          $($(_gir_name)_MSVC_PROGRAM)),,
-    $(error Need to define $(_gir_name)_MSVC_LIBS or $(_gir_name)_MSVC_PROGRAM))
-
-$(top_builddir)/build/win32/$(_gir_name)_list:
-	for F in $(_gir_files_msvc); do \
-		case $$$$F in \
-		*.c|*.cpp|*.cc|*.cxx|*.h|*.hpp|*.hh|*.hxx) \
-			echo '..\..'$(_gir_source_subdir_msvc)$$$$F >>$(top_builddir)/build/win32/$(_gir_name)_list \
-			;; \
-		esac; \
-	done
-
-$(top_builddir)/build/win32/$(1).msvc.introspect:
-	-$(RM) $(top_builddir)/build/win32/$(1).msvc.introspect
-
-# Assemble the Command to Run g-ir-scanner
-	echo $(1)': '$(_gir_name)'_list '$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	@-echo Generating $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	$$$$(PYTHON) $$$$(G_IR_SCANNER)	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--verbose -no-libtool	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--namespace='$(_gir_namespace_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--nsversion='$(_gir_version_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$(_gir_packages_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$(_gir_libraries_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$(_gir_program_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--add-include-path=$$$$(G_IR_INCLUDEDIR)	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$(_gir_includes_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$(_gir_export_packages_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--cflags-begin	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$($(_gir_name)_MSVC_CFLAGS)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--cflags-end	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$($(_gir_name)_MSVC_SCANNERFLAGS)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--filelist='$(_gir_name)'_list	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	-o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect
-
-# Finally Assemble the Command to Compile the generated .gir
-	echo '$(_typelib_basename_msvc).typelib: '$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	@-echo Compiling $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	$$$$(G_IR_COMPILER)	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--includedir=. --debug --verbose	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$(1)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	-o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect
-endef
-
-$(foreach gir,$(MSVC_INTROSPECT_GIRS),$(eval $(call gir-nmake-builder,$(gir))))

build/Makefile.msvcproj

@@ -60,19 +60,10 @@ $(1).sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj
 $(1).vs10.sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj
 $(1).vs10.sourcefiles.filters: $(top_builddir)/build/win32/vs9/$(1).vcproj
 
-$(top_builddir)/build/win32/vs9/$(1).vcproj: Makefile
+$(top_builddir)/build/win32/vs9/$(1).vcproj:
 	-$(RM) $(top_builddir)/build/win32/vs9/$(1).vcproj
 	-$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj
 	-$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj.filters
-	-$(RM) $(top_builddir)/build/win32/vs11/$(1).vcxproj
-	-$(RM) $(top_builddir)/build/win32/vs11/$(1).vcxproj.filters
-	-$(RM) $(top_builddir)/build/win32/vs12/$(1).vcxproj
-	-$(RM) $(top_builddir)/build/win32/vs12/$(1).vcxproj.filters
-	-$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj
-	-$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj.filters
-	-$(RM) $(top_builddir)/build/win32/vs15/$(1).vcxproj
-	-$(RM) $(top_builddir)/build/win32/vs15/$(1).vcxproj.filters
-
 
 	for F in $(_proj_files); do \
 		case $$$$F in \
@@ -96,7 +87,7 @@ $(top_builddir)/build/win32/vs9/$(1).vcproj: Makefile
 
 $(top_builddir)/build/win32/vs10/$(1).vs10.headers: $(top_builddir)/build/win32/vs9/$(1).headers
 
-$(top_builddir)/build/win32/vs9/$(1).headers: Makefile
+$(top_builddir)/build/win32/vs9/$(1).headers:
 	-$(RM) $(top_builddir)/build/win32/vs9/$(1).headers
 	-$(RM) $(top_builddir)/build/win32/vs10/$(1).vs10.headers
 

build/detectenv_msvc.mak

@@ -1,8 +1,3 @@
-# Common NMake Makefile module for checking the build environment
-# This can be copied from $(glib_srcroot)\build\win32 for GNOME items
-# that support MSVC builds and introspection under MSVC, and can be used
-# for building test programs as well.
-
 # Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or
 # VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir)
 !if !defined(VCINSTALLDIR) && !defined(WINDOWSSDKDIR)
@@ -40,10 +35,6 @@ VSVER = 10
 VSVER = 11
 !elseif $(VCVERSION) > 1799 && $(VCVERSION) < 1900
 VSVER = 12
-!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 1910
-VSVER = 14
-!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 2000
-VSVER = 15
 !else
 VSVER = 0
 !endif
@@ -51,24 +42,20 @@ VSVER = 0
 !if "$(VSVER)" == "0"
 MSG = ^
 This NMake Makefile set supports Visual Studio^
-9 (2008) through 14 (2015).  Your Visual Studio^
+9 (2008) through 12 (2013).  Your Visual Studio^
 version is not supported.
 !error $(MSG)
 !endif
 
 VALID_CFGSET = FALSE
-!if "$(CFG)" == "release" || "$(CFG)" == "debug" || "$(CFG)" == "Release" || "$(CFG)" == "Debug"
+!if "$(CFG)" == "release" || "$(CFG)" == "debug"
 VALID_CFGSET = TRUE
 !endif
 
-# We want debugging symbols logged for all builds,
-# using .pdb files for release builds
-CFLAGS_BASE = /Zi
-
-!if "$(CFG)" == "release" || "$(CFG)" == "Release"
-CFLAGS_ADD = /MD /O2 $(CFLAGS_BASE)
+!if "$(CFG)" == "release"
+CFLAGS_ADD = /MD /O2
 !else
-CFLAGS_ADD = /MDd /Od $(CFLAGS_BASE)
+CFLAGS_ADD = /MDd /Od /Zi
 !endif
 
 !if "$(PLAT)" == "x64"

build/gen-file-list-gtk.py

@@ -0,0 +1,100 @@
+#!/usr/bin/python
+# vim: encoding=utf-8
+# Generate the file lists for processing with g-ir-scanner
+import os
+import sys
+import re
+import string
+import subprocess
+import optparse
+
+from msvcfiles import read_vars_from_AM
+
+def gen_gdk_filelist(srcroot, subdir, dest):
+    vars = read_vars_from_AM(os.path.join(srcroot, subdir, 'Makefile.am'),
+                             vars = {},
+                             conds = {},
+                             filters = ['gdk_h_sources', 'gdk_c_sources'])
+
+    vars['gdk_enums'] = 'gdkenumtypes.c gdkenumtypes.h'
+
+    files = vars['gdk_h_sources'].split() + \
+            vars['gdk_c_sources'].split() + \
+            vars['gdk_enums'].split()
+
+    sources = [i for i in files if (i != 'gdkkeysyms-compat.h')]
+
+    with open(dest, 'w') as d:
+        for i in sources:
+            d.write(srcroot + '\\' + subdir + '\\' + i.replace('/', '\\') + '\n')
+
+def gen_gdkwin32_filelist(srcroot, subdir, dest):
+    vars = read_vars_from_AM(os.path.join(srcroot, subdir, 'Makefile.am'),
+                             vars = {},
+                             conds = {'HAVE_INTROSPECTION': True,
+                                      'OS_WIN32': True},
+                             filters = ['w32_introspection_files'])
+
+    files = vars['w32_introspection_files'].split()
+
+    with open(dest, 'w') as d:
+        for i in files:
+            d.write(srcroot + '\\' + subdir + '\\' + i.replace('/', '\\') + '\n')
+
+def gen_gtk_filelist(srcroot, subdir, dest):
+    vars = read_vars_from_AM(os.path.join(srcroot, 'gtk', 'Makefile.am'),
+                             vars = {},
+                             conds = {'USE_WIN32': True,
+                                      'USE_QUARTZ': False,
+                                      'USE_X11': False,
+                                      'USE_EXTERNAL_ICON_CACHE': False},
+                             filters = ['gtkinclude_HEADERS',
+                                        'a11yinclude_HEADERS',
+                                        'deprecatedinclude_HEADERS',
+                                        'gtk_base_c_sources',
+                                        'gtk_clipboard_dnd_c_sources'])
+
+    vars_depr = read_vars_from_AM(os.path.join(srcroot, 'gtk', 'deprecated', 'Makefile.inc'),
+                                  vars = {},
+                                  conds = {},
+                                  filters = ['deprecated_h_sources',
+                                             'deprecated_c_sources'])
+
+    vars_a11y = read_vars_from_AM(os.path.join(srcroot, 'gtk', 'a11y', 'Makefile.inc'),
+                                  vars = {},
+                                  conds = {},
+                                  filters = ['a11y_h_sources',
+                                             'a11y_c_sources'])
+
+    vars['gtk_other_src'] = 'gtkprintoperation-win32.c gtktypebuiltins.h gtktypebuiltins.c'
+
+    files = vars['gtkinclude_HEADERS'].split() + \
+            vars_a11y['a11y_h_sources'].split() + \
+            vars_depr['deprecated_h_sources'].split() + \
+            vars['gtk_base_c_sources'].split() + \
+            vars_a11y['a11y_c_sources'].split() + \
+            vars_depr['deprecated_c_sources'].split() + \
+            vars['gtk_other_src'].split()
+
+    sources = [i for i in files \
+               if not (i.endswith('private.h')) \
+               and i != 'gtktextdisplay.h' \
+               and i != 'gtktextlayout.h' \
+               and i != 'gtkx.h']
+
+    with open(dest, 'w') as d:
+        for i in sources:
+            d.write(srcroot + '\\' + subdir + '\\' + i.replace('/', '\\') + '\n')
+
+def main(argv):
+    srcroot = '..'
+    subdir_gdk = 'gdk'
+    subdir_gtk = 'gtk'
+
+    gen_gdk_filelist(srcroot, subdir_gdk, 'gdk_list')
+    gen_gdkwin32_filelist(srcroot, subdir_gdk, 'gdkwin32_list')
+    gen_gtk_filelist(srcroot, subdir_gtk, 'gtk_list')
+    return 0
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))

build/gtk-introspection-msvc.mak.in

@@ -0,0 +1,101 @@
+# NMake Makefile to build Introspection Files for GTK+
+
+!include detectenv_msvc.mak
+
+APIVERSION = 3.0
+
+CHECK_PACKAGE = gdk-pixbuf-2.0 atk pangocairo gio-2.0
+
+built_install_girs = Gdk-$(APIVERSION).gir GdkWin32-$(APIVERSION).gir Gtk-$(APIVERSION).gir
+built_install_typelibs = Gdk-$(APIVERSION).typelib GdkWin32-$(APIVERSION).typelib Gtk-$(APIVERSION).typelib
+
+!include introspection-msvc.mak
+
+!if "$(BUILD_INTROSPECTION)" == "TRUE"
+all: setgirbuildnev $(built_install_girs) $(built_install_typelibs)
+
+gdk_list gdkwin32_list gtk_list:
+	@-echo Generating Filelist to Introspect for GDK/GTK...
+	$(PYTHON2) gen-file-list-gtk.py
+
+setgirbuildnev:
+	@set CC=$(CC)
+	@set PYTHONPATH=$(BASEDIR)\lib\gobject-introspection
+	@set PATH=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(BASEDIR)\bin;$(PATH)
+	@set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
+	@set LIB=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB)
+
+Gdk-$(APIVERSION).gir: gdk_list
+	@-echo Generating Gdk-$(APIVERSION).gir...
+	$(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gdk	\
+	-I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include	\
+	-I$(BASEDIR)\include\pango-1.0 -I$(BASEDIR)\include\atk-1.0	\
+	-I$(BASEDIR)\include\gdk-pixbuf-2.0 -I$(BASEDIR)\include	\
+	--namespace=Gdk --nsversion=3.0	\
+	--include=Gio-2.0 --include=GdkPixbuf-2.0	\
+	--include=Pango-1.0 --include=cairo-1.0	\
+	--no-libtool --library=gdk-3.0	\
+	--reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) --add-include-path=.	\
+	--pkg-export gdk-3.0 --warn-all --c-include="gdk/gdk.h"	\
+	-DG_LOG_DOMAIN=\"Gdk\" -DGDK_COMPILATION	\
+	--filelist=gdk_list	-o $@
+
+GdkWin32-$(APIVERSION).gir: gdkwin32_list
+	@-echo Generating GdkWin32-$(APIVERSION).gir...
+	$(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gdk	\
+	-I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include	\
+	-I$(BASEDIR)\include\pango-1.0 -I$(BASEDIR)\include\atk-1.0	\
+	-I$(BASEDIR)\include\gdk-pixbuf-2.0 -I$(BASEDIR)\include	\
+	--namespace=GdkWin32 --nsversion=3.0	\
+	--include=Gio-2.0 --include=GdkPixbuf-2.0	\
+	--include=Pango-1.0	--include-uninstalled=./Gdk-$(APIVERSION).gir	\
+	--no-libtool --library=gdk-3.0	\
+	--reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) --add-include-path=.	\
+	--pkg-export gdk-win32-3.0 --warn-all --c-include="gdk/gdkwin32.h"	\
+	-DG_LOG_DOMAIN=\"Gdk\" -DGDK_COMPILATION	\
+	--filelist=gdkwin32_list	-o $@
+
+Gtk-$(APIVERSION).gir: gtk_list
+	$(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gtk -I..\gdk	\
+	-I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include	\
+	-I$(BASEDIR)\include\pango-1.0 -I$(BASEDIR)\include\atk-1.0	\
+	-I$(BASEDIR)\include\gdk-pixbuf-2.0 -I$(BASEDIR)\include	\
+	--namespace=Gtk --nsversion=3.0	\
+	--include=Atk-1.0	\
+	--include-uninstalled=./Gdk-$(APIVERSION).gir	\
+	--no-libtool --library=gtk-3.0 --library=gdk-3.0	\
+	--reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) --add-include-path=.	\
+	--pkg-export gtk+-3.0 --warn-all --c-include="gtk/gtkx.h"	\
+	-DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"/dummy/lib\"	\
+	-DGTK_DATADIR=\"/dummy/share\" -DGTK_DATA_PREFIX=\"/dummy\"	\
+	-DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"@GTK_VERSION@\"	\
+	-DGTK_BINARY_VERSION=\"3.0.0\" -DGTK_HOST=\"i686-pc-vs$(VSVER)\"	\
+	-DGTK_COMPILATION -DGTK_PRINT_BACKENDS=\"file\"	\
+	-DGTK_PRINT_PREVIEW_COMMAND=\"undefined-gtk-print-preview-command\"	\
+	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED	\
+	-DINCLUDE_IM_am_et -DINCLUDE_IM_cedilla -DINCLUDE_IM_cyrillic_translit	\
+	-DINCLUDE_IM_ime -DINCLUDE_IM_inuktitut -DINCLUDE_IM_ipa	\
+	-DINCLUDE_IM_multipress -DINCLUDE_IM_thai -DINCLUDE_IM_ti_er	\
+	-DINCLUDE_IM_ti_et -DINCLUDE_IM_viqr --filelist=gtk_list	\
+	-o $@
+
+$(built_install_typelibs): $(built_install_girs)
+	@-echo Compiling $*.typelib...
+	@-$(G_IR_COMPILER) --includedir=. --debug --verbose $*.gir -o $@
+
+install-introspection: setgirbuildnev $(built_install_girs) $(built_install_typelibs)
+	@-copy *.gir $(G_IR_INCLUDEDIR)
+	@-copy /b *.typelib $(G_IR_TYPELIBDIR)
+
+!else
+all:
+	@-echo $(ERROR_MSG)
+!endif
+
+clean:
+	@-del /f/q *.typelib
+	@-del /f/q *.gir
+	@-del /f/q gtk_list
+	@-del /f/q gdkwin32_list
+	@-del /f/q gdk_list
+	@-del /f/q *.pyc

build/introspection-msvc.mak

@@ -0,0 +1,65 @@
+# Common Utility NMake Makefile Template
+# Used to Generate Introspection files for various Projects
+
+# Can Override with env vars as needed
+# You will need to have built gobject-introspection for this to work.
+# Change or pass in or set the following to suit your environment
+
+BASEDIR = ..\..\vs$(VSVER)\$(PLAT)
+GIR_SUBDIR = share\gir-1.0
+GIR_TYPELIBDIR = lib\girepository-1.0
+G_IR_SCANNER = $(BASEDIR)\bin\g-ir-scanner
+G_IR_COMPILER = $(BASEDIR)\bin\g-ir-compiler.exe
+G_IR_INCLUDEDIR = $(BASEDIR)\$(GIR_SUBDIR)
+G_IR_TYPELIBDIR = $(BASEDIR)\$(GIR_TYPELIBDIR)
+
+# Note: The PYTHON2 must be a Python 2.6.x or 2.7.x Interpretor!
+# Either having python.exe from Python 2.6.x/2.7.x in your PATH will work
+# or passing in PYTHON2=<full path to your Python 2.6.x/2.7.x interpretor> will do
+
+# This is required, and gobject-introspection needs to be built
+# before this can be successfully run.
+PYTHON2=python
+
+# Don't change anything following this line!
+VALID_PKG_CONFIG_PATH = FALSE
+VALID_GCC_INSTPATH = FALSE
+
+MSG_INVALID_PKGCONFIG = You must set or specifiy a valid PKG_CONFIG_PATH
+MSG_INVALID_CFG = You need to specify or set CFG to be release or debug to use this Makefile to build the Introspection Files
+
+ERROR_MSG =
+
+BUILD_INTROSPECTION = TRUE
+
+!if ![pkg-config --print-errors --errors-to-stdout $(CHECK_PACKAGE) > pkgconfig.x]	\
+	&& ![setlocal]	\
+	&& ![set file="pkgconfig.x"]	\
+	&& ![FOR %A IN (%file%) DO @echo PKG_CHECK_SIZE=%~zA > pkgconfig.chksize]	\
+	&& ![del $(ERRNUL) /q/f pkgconfig.x]
+!endif
+
+!include pkgconfig.chksize
+!if "$(PKG_CHECK_SIZE)" == "0"
+VALID_PKG_CONFIG_PATH = TRUE
+!else
+VALID_PKG_CONFIG_PATH = FALSE
+!endif
+
+!if ![del $(ERRNUL) /q/f pkgconfig.chksize]
+!endif
+
+VALID_CFGSET = FALSE
+!if "$(CFG)" == "release" || "$(CFG)" == "debug"
+VALID_CFGSET = TRUE
+!endif
+
+!if "$(VALID_PKG_CONFIG_PATH)" != "TRUE"
+BUILD_INTROSPECTION = FALSE
+ERROR_MSG = $(MSG_INVALID_PKGCONFIG)
+!endif
+
+!if "$(VALID_CFGSET)" != "TRUE"
+BUILD_INTROSPECTION = FALSE
+ERROR_MSG = $(MSG_INVALID_CFG)
+!endif

build/msvcfiles.py

@@ -0,0 +1,261 @@
+#!/usr/bin/python
+# vim: encoding=utf-8
+#expand *.in files
+import os
+import sys
+import re
+import optparse
+
+def parent_dir(path):
+    if not os.path.isabs(path):
+        path = os.path.abspath(path)
+    if os.path.isfile(path):
+        path = os.path.dirname(path)
+    return os.path.split(path)[0]
+
+def check_output_type (btype):
+    print_bad_type = False
+    output_type = -1
+    if (btype is None):
+        output_type = -1
+        print_bad_type = False
+    elif (btype == "vs9"):
+        output_type = 1
+    elif (btype == "vs10"):
+        output_type = 2
+    elif (btype == "nmake-exe"):
+        output_type = 3
+    else:
+        output_type = -1
+        print_bad_type = True
+    if (output_type == -1):
+        if (print_bad_type is True):
+            print ("The entered output build file type '%s' is not valid" % btype)
+        else:
+            print ("Output build file type is not specified.\nUse -t <type> to specify the output build file type.")
+        print ("Valid output build file types are: nmake-exe, vs9 , vs10")
+    return output_type
+
+def read_vars_from_AM(path, vars = {}, conds = {}, filters = None):
+    '''
+    path: path to the Makefile.am
+    vars: predefined variables
+    conds: condition variables for Makefile
+    filters: if None, all variables defined are returned,
+             otherwise, it is a list contains that variables should be returned
+    '''
+    cur_vars = vars.copy()
+    RE_AM_VAR_REF = re.compile(r'\$\((\w+?)\)')
+    RE_AM_VAR = re.compile(r'^\s*(\w+)\s*=(.*)$')
+    RE_AM_INCLUDE = re.compile(r'^\s*include\s+(\w+)')
+    RE_AM_VAR_ADD = re.compile(r'^\s*(\w+)\s*\+=(.*)$')
+    RE_AM_CONTINUING = re.compile(r'\\\s*$')
+    RE_AM_IF = re.compile(r'^\s*if\s+(\w+)')
+    RE_AM_IFNOT = re.compile(r'^\s*if\s!+(\w+)')
+    RE_AM_ELSE = re.compile(r'^\s*else')
+    RE_AM_ENDIF = re.compile(r'^\s*endif')
+    def am_eval(cont):
+        return RE_AM_VAR_REF.sub(lambda x: cur_vars.get(x.group(1), ''), cont)
+    with open(path, 'r') as f:
+        contents = f.readlines()
+    #combine continuing lines
+    i = 0
+    ncont = []
+    while i < len(contents):
+        line = contents[i]
+        if RE_AM_CONTINUING.search(line):
+            line = RE_AM_CONTINUING.sub('', line)
+            j = i + 1
+            while j < len(contents) and RE_AM_CONTINUING.search(contents[j]):
+                line += RE_AM_CONTINUING.sub('', contents[j])
+                j += 1
+            else:
+                if j < len(contents):
+                    line += contents[j]
+            i = j
+        else:
+            i += 1
+        ncont.append(line)
+
+    #include, var define, var evaluation
+    i = -1
+    skip = False
+    oldskip = []
+    while i < len(ncont) - 1:
+        i += 1
+        line = ncont[i]
+        mo = RE_AM_IF.search(line)
+        if mo:
+            oldskip.append(skip)
+            skip = False if mo.group(1) in conds and conds[mo.group(1)] \
+                         else True
+            continue
+        mo = RE_AM_IFNOT.search(line)
+        if mo:
+            oldskip.append(skip)
+            skip = False if mo.group(1) not in conds and conds[mo.group(1)] \
+                         else True
+            continue
+        mo = RE_AM_ELSE.search(line)
+        if mo:
+            skip = not skip
+            continue
+        mo = RE_AM_ENDIF.search(line)
+        if mo:
+            if oldskip:
+                skip = oldskip.pop()
+            continue
+        if not skip:
+            mo = RE_AM_INCLUDE.search(line)
+            if mo:
+                cur_vars.update(read_vars_from_AM(am_eval(mo.group(1)), cur_vars, conds, None))
+                continue
+            mo = RE_AM_VAR.search(line)
+            if mo:
+                cur_vars[mo.group(1)] = am_eval(mo.group(2).strip())
+                continue
+            mo = RE_AM_VAR_ADD.search(line)
+            if mo:
+                try:
+                    cur_vars[mo.group(1)] += ' '
+                except KeyError:
+                    cur_vars[mo.group(1)] = ''
+                cur_vars[mo.group(1)] += am_eval(mo.group(2).strip())
+                continue
+
+    #filter:
+    if filters != None:
+        ret = {}
+        for i in filters:
+            ret[i] = cur_vars.get(i, '')
+        return ret
+    else:
+        return cur_vars
+
+def process_include(src, dest, includes):
+    RE_INCLUDE = re.compile(r'^\s*#include\s+"(.*)"')
+    with open(src, 'r') as s:
+        with open(dest, 'w') as d:
+            for i in s:
+                mo = RE_INCLUDE.search(i)
+                if mo:
+                    target = ''
+                    for j in includes:
+                        #print "searching in ", j
+                        if mo.group(1) in os.listdir(j):
+                            target = os.path.join(j, mo.group(1))
+                            break
+                    if not target:
+                        raise Exception("Couldn't find include file %s" % mo.group(1))
+                    else:
+                        with open(target, 'r') as t:
+                            for inc in t.readlines():
+                                d.write(inc)
+                else:
+                    d.write(i)
+
+#Generate the source files listing that is used
+def generate_src_list (srcroot, srcdir, filters_src, filter_conds, filter_c, mk_am_file):
+    mkfile = ''
+    if mk_am_file is None or mk_am_file == '':
+        mkfile = 'Makefile.am'
+    else:
+        mkfile = mk_am_file
+    vars = read_vars_from_AM(os.path.join(srcdir, mkfile),
+                             vars = {'top_srcdir': srcroot},
+                             conds = filter_conds,
+                             filters = filters_src)
+    files = []
+    for src_filters_item in filters_src:
+        files += vars[src_filters_item].split()
+    if filter_c is True:
+        sources = [i for i in files if i.endswith('.c') ]
+        return sources
+    else:
+        return files
+
+# Generate the Visual Studio 2008 Project Files from the templates
+def gen_vs9_project (projname, srcroot, srcdir_name, sources_list):
+    vs_file_list_dir = os.path.join (srcroot, 'build', 'win32')
+
+    with open (os.path.join (vs_file_list_dir,
+              projname + '.sourcefiles'), 'w') as vs9srclist:
+        for i in sources_list:
+            vs9srclist.write ('\t\t\t<File RelativePath="..\\..\\..\\' + srcdir_name + '\\' + i.replace('/', '\\') + '" />\n')
+
+    process_include (os.path.join(srcroot, 'build', 'win32', 'vs9', projname + '.vcprojin'),
+                     os.path.join(srcroot, 'build', 'win32', 'vs9', projname + '.vcproj'),
+                     includes = [vs_file_list_dir])
+
+    os.unlink(os.path.join(srcroot, 'build', 'win32', projname + '.sourcefiles'))
+
+# Generate the Visual Studio 2010 Project Files from the templates
+def gen_vs10_project (projname, srcroot, srcdir_name, sources_list):
+    vs_file_list_dir = os.path.join (srcroot, 'build', 'win32')
+
+    with open (os.path.join (vs_file_list_dir,
+              projname + '.vs10.sourcefiles'), 'w') as vs10srclist:
+        for j in sources_list:
+            vs10srclist.write ('    <ClCompile Include="..\\..\\..\\' + srcdir_name + '\\' + j.replace('/', '\\') + '" />\n')
+
+    with open (os.path.join (vs_file_list_dir,
+              projname + '.vs10.sourcefiles.filters'), 'w') as vs10srclist_filter:
+        for k in sources_list:
+             vs10srclist_filter.write ('    <ClCompile Include="..\\..\\..\\' + srcdir_name + '\\' + k.replace('/', '\\') + '"><Filter>Source Files</Filter></ClCompile>\n')
+
+    process_include (os.path.join(srcroot, 'build', 'win32', 'vs10', projname + '.vcxprojin'),
+                     os.path.join(srcroot, 'build', 'win32', 'vs10', projname + '.vcxproj'),
+                     includes = [vs_file_list_dir])
+    process_include (os.path.join(srcroot, 'build', 'win32', 'vs10', projname + '.vcxproj.filtersin'),
+                     os.path.join(srcroot, 'build', 'win32', 'vs10', projname + '.vcxproj.filters'),
+                     includes = [vs_file_list_dir])
+
+    os.unlink(os.path.join(srcroot, 'build', 'win32', projname + '.vs10.sourcefiles'))
+    os.unlink(os.path.join(srcroot, 'build', 'win32', projname + '.vs10.sourcefiles.filters'))
+
+def gen_vs_inst_list (projname, srcroot, srcdirs, inst_lists, destdir_names, isVS9):
+    vs_file_list_dir = os.path.join (srcroot, 'build', 'win32')
+    vsver = ''
+    vsprops_line_ending = ''
+    vsprops_file_ext = ''
+    if isVS9 is True:
+        vsver = '9'
+        vsprops_line_ending = '&#x0D;&#x0A;\n'
+        vsprops_file_ext = '.vsprops'
+    else:
+        vsver = '10'
+        vsprops_line_ending = '\n\n'
+        vsprops_file_ext = '.props'
+
+    with open (os.path.join (vs_file_list_dir,
+              projname + '.vs' + vsver + 'instfiles'), 'w') as vsinstlist:
+
+        for file_list, srcdir, dir_name in zip (inst_lists, srcdirs, destdir_names):
+            for i in file_list:
+                vsinstlist.write ('copy ..\\..\\..\\' +
+                                  srcdir + '\\' +
+                                  i.replace ('/', '\\') +
+                                  ' $(CopyDir)\\' +
+                                  dir_name +
+                                  vsprops_line_ending)
+    process_include (os.path.join(srcroot, 'build', 'win32', 'vs' + vsver, projname + '-install' + vsprops_file_ext + 'in'),
+                     os.path.join(srcroot, 'build', 'win32', 'vs' + vsver, projname + '-install' + vsprops_file_ext),
+                     includes = [vs_file_list_dir])
+
+    os.unlink(os.path.join (vs_file_list_dir, projname + '.vs' + vsver + 'instfiles'))
+
+def generate_nmake_makefiles(srcroot, srcdir, base_name, makefile_name, progs_list):
+    file_list_dir = os.path.join (srcroot, 'build', 'win32')
+
+    with open (os.path.join (file_list_dir,
+              base_name + '_progs'), 'w') as proglist:
+        for i in progs_list:
+            proglist.write ('\t' + i + '$(EXEEXT)\t\\\n')
+
+
+    process_include (os.path.join(srcdir, makefile_name + 'in'),
+                    os.path.join(srcdir, makefile_name),
+                    includes = [file_list_dir])
+
+    os.unlink(os.path.join (file_list_dir, base_name + '_progs'))
+

build/win32/Makefile.am

@@ -1,46 +1,12 @@
 include $(top_srcdir)/Makefile.decl
 
-if HAVE_INTROSPECTION
-GENERATED_ITEMS = \
-	introspection.body.mak	\
-	Gdk_3_0_gir_list		\
-	GdkWin32_3_0_gir_list	\
-	Gtk_3_0_gir_list
-
-MSVC_INTROSPECTION_INTERMEDIATE_FILES = Gdk-3.0.gir.msvc.introspect GdkWin32-3.0.gir.msvc.introspect Gtk-3.0.gir.msvc.introspect
-
-introspection.body.mak: $(MSVC_INTROSPECTION_INTERMEDIATE_FILES)
-	-$(RM) introspection.body.mak
-	for F in `ls *.msvc.introspect`; do \
-		case $$F in \
-			*)	cat $(top_builddir)/build/win32/$$F >>introspection.body.mak \
-			;; \
-		esac; \
-	done
-	$(RM) $(MSVC_INTROSPECTION_INTERMEDIATE_FILES)
-
-DISTCLEANFILES = $(GENERATED_ITEMS)
-
-else
-GENERATED_ITEMS =
-DISTCLEANFILES =
-endif
-
 SUBDIRS =	\
 	vs9 	\
 	vs10	\
 	vs11	\
 	vs12	\
-	vs14	\
-	vs15
+	vs14
 
-EXTRA_DIST +=	\
-	detectenv-msvc.mak		\
-	introspection-msvc.mak		\
-	gtk-introspection-msvc.mak	\
-	replace.py			\
-	pc_base.py			\
-	gtkpc.py			\
-	$(GENERATED_ITEMS)
+EXTRA_DIST += replace.py
 
 -include $(top_srcdir)/git.mk

build/win32/gtk-introspection-msvc.mak

@@ -1,43 +0,0 @@
-# NMake Makefile to build Introspection Files for GTK+
-
-!include detectenv-msvc.mak
-
-APIVERSION = 3.0
-
-CHECK_PACKAGE = gdk-pixbuf-2.0 atk pangocairo gio-2.0
-
-built_install_girs = Gdk-$(APIVERSION).gir GdkWin32-$(APIVERSION).gir Gtk-$(APIVERSION).gir
-built_install_typelibs = Gdk-$(APIVERSION).typelib GdkWin32-$(APIVERSION).typelib Gtk-$(APIVERSION).typelib
-
-!include introspection-msvc.mak
-
-!if "$(BUILD_INTROSPECTION)" == "TRUE"
-
-!if "$(PLAT)" == "x64"
-AT_PLAT=x86_64
-!else
-AT_PLAT=i686
-!endif
-
-all: setgirbuildenv $(built_install_girs) $(built_install_typelibs)
-
-setgirbuildenv:
-	@set PYTHONPATH=$(PREFIX)\lib\gobject-introspection
-	@set PATH=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(PREFIX)\bin;$(PATH)
-	@set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
-	@set LIB=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB)
-
-!include introspection.body.mak
-
-install-introspection: all
-	@-copy *.gir "$(G_IR_INCLUDEDIR)"
-	@-copy /b *.typelib "$(G_IR_TYPELIBDIR)"
-
-!else
-all:
-	@-echo $(ERROR_MSG)
-!endif
-
-clean:
-	@-del /f/q *.typelib
-	@-del /f/q *.gir

build/win32/gtkpc.py

@@ -1,97 +0,0 @@
-#!/usr/bin/python
-#
-# Utility script to generate .pc files for GTK+
-# for Visual Studio builds, to be used for
-# building introspection files
-
-# Author: Fan, Chun-wei
-# Date: April 26, 2016
-
-import os
-import sys
-import argparse
-
-from replace import replace_multi, replace
-from pc_base import BasePCItems
-
-def main(argv):
-    base_pc = BasePCItems()
-
-    gdk_parser = argparse.ArgumentParser(description='Setup basic .pc file info')
-    gdk_parser.add_argument('--broadway',
-                              action='store_const',
-                              const=1,
-                              help='GDK with Broadway backend')
-    gdk_parser.add_argument('--host',
-                            required=True,
-                            help='Build type')
-    base_pc.setup(argv, gdk_parser)
-
-    atk_min_ver = '2.15.1'
-    cairo_min_ver = '1.14.0'
-    gdk_pixbuf_min_ver = '2.30.0'
-    gdk_win32_sys_libs = '-lgdi32 -limm32 -lshell32 -lole32 -lwinmm -ldwmapi'
-    glib_min_ver = '2.45.8'
-
-    cairo_backends = 'cairo-win32'
-    gdk_backends = 'win32'
-    gio_package = 'gio-2.0 >= ' + glib_min_ver
-    broadway_extra_libs = ''
-
-    gdk_args = gdk_parser.parse_args()
-    if getattr(gdk_args, 'broadway', None) is 1:
-        # On Visual Studio, we link to zlib1.lib
-        broadway_extra_libs = ' -lzlib1'
-        gdk_backends += ' broadway'
-        cairo_backends += ' cairo'
-
-    pkg_replace_items = {'@GTK_API_VERSION@': '3.0',
-                         '@GDK_BACKENDS@': gdk_backends}
-
-    pkg_required_packages = 'gdk-pixbuf-2.0 >= ' + gdk_pixbuf_min_ver + ' ' + \
-                            'cairo >= ' + cairo_min_ver + ' ' + \
-                            'cairo-gobject >= ' + cairo_min_ver
-
-    gdk_pc_replace_items = {'@GDK_PACKAGES@': gio_package + ' ' + \
-                                              'pangowin32 pangocairo' + ' ' + \
-                                              pkg_required_packages,
-                            '@GDK_PRIVATE_PACKAGES@': gio_package + ' ' + cairo_backends,
-                            '@GDK_EXTRA_LIBS@': gdk_win32_sys_libs + broadway_extra_libs,
-                            '@GDK_EXTRA_CFLAGS@': '',
-                            'gdk-3': 'gdk-3.0'}
-
-    gtk_pc_replace_items = {'@host@': gdk_args.host,
-                            '@GTK_BINARY_VERSION@': '3.0.0',
-                            '@GTK_PACKAGES@': 'atk >= ' + atk_min_ver + ' ' + \
-                                              pkg_required_packages + ' ' + \
-                                              gio_package,
-                            '@GTK_PRIVATE_PACKAGES@': 'atk',
-                            '@GTK_EXTRA_CFLAGS@': '',
-                            '@GTK_EXTRA_LIBS@': '',
-                            '@GTK_EXTRA_CFLAGS@': '',
-                            'gtk-3': 'gtk-3.0'}
-
-    gail_pc_replace_items = {'gailutil-3': 'gailutil-3.0'}
-
-    pkg_replace_items.update(base_pc.base_replace_items)
-    gdk_pc_replace_items.update(pkg_replace_items)
-    gtk_pc_replace_items.update(pkg_replace_items)
-    gail_pc_replace_items.update(base_pc.base_replace_items)
-
-    # Generate gdk-3.0.pc
-    replace_multi(base_pc.top_srcdir + '/gdk-3.0.pc.in',
-                  base_pc.srcdir + '/gdk-3.0.pc',
-                  gdk_pc_replace_items)
-
-    # Generate gtk+-3.0.pc
-    replace_multi(base_pc.top_srcdir + '/gtk+-3.0.pc.in',
-                  base_pc.srcdir + '/gtk+-3.0.pc',
-                  gtk_pc_replace_items)
-
-    # Generate gail-3.0.pc
-    replace_multi(base_pc.top_srcdir + '/gail-3.0.pc.in',
-                  base_pc.srcdir + '/gail-3.0.pc',
-                  gail_pc_replace_items)
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))

build/win32/introspection-msvc.mak

@@ -1,94 +0,0 @@
-# Common NMake Makefile module for checking the build environment is sane
-# for building introspection files under MSVC/NMake.
-# This can be copied from $(gi_srcroot)\build\win32 for GNOME items
-# that support MSVC builds and introspection under MSVC.
-
-# Can override with env vars as needed
-# You will need to have built gobject-introspection for this to work.
-# Change or pass in or set the following to suit your environment
-
-!if "$(PREFIX)" == ""
-PREFIX = ..\..\..\vs$(VSVER)\$(PLAT)
-!endif
-
-!if ![setlocal]		&& \
-    ![set PFX=$(PREFIX)]	&& \
-    ![for %P in (%PFX%) do @echo PREFIX_FULL=%~dpnfP > pfx.x]
-!endif
-!include pfx.x
-
-!if "$(PKG_CONFIG_PATH)" == ""
-PKG_CONFIG_PATH=$(PREFIX_FULL)\lib\pkgconfig
-!else
-PKG_CONFIG_PATH=$(PREFIX_FULL)\lib\pkgconfig;$(PKG_CONFIG_PATH)
-!endif
-
-!if ![del $(ERRNUL) /q/f pfx.x]
-!endif
-
-# Note: The PYTHON must be the Python release series that was used to build
-# the GObject-introspection scanner Python module!
-# Either having python.exe your PATH will work or passing in
-# PYTHON=<full path to your Python interpretor> will do
-
-# This is required, and gobject-introspection needs to be built
-# before this can be successfully run.
-!if "$(PYTHON)" == ""
-PYTHON=python
-!endif
-
-# Path to the pkg-config tool, if not already in the PATH
-!if "$(PKG_CONFIG)" == ""
-PKG_CONFIG=pkg-config
-!endif
-
-# Don't change anything following this line!
-
-GIR_SUBDIR = share\gir-1.0
-GIR_TYPELIBDIR = lib\girepository-1.0
-G_IR_SCANNER = $(PREFIX)\bin\g-ir-scanner
-G_IR_COMPILER = $(PREFIX)\bin\g-ir-compiler.exe
-G_IR_INCLUDEDIR = $(PREFIX)\$(GIR_SUBDIR)
-G_IR_TYPELIBDIR = $(PREFIX)\$(GIR_TYPELIBDIR)
-
-VALID_PKG_CONFIG_PATH = FALSE
-
-MSG_INVALID_PKGCONFIG = You must set or specifiy a valid PKG_CONFIG_PATH
-MSG_INVALID_CFG = You need to specify or set CFG to be release or debug to use this Makefile to build the Introspection Files
-
-ERROR_MSG =
-
-BUILD_INTROSPECTION = TRUE
-
-!if ![set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)]	\
-	&& ![$(PKG_CONFIG) --print-errors --errors-to-stdout $(CHECK_PACKAGE) > pkgconfig.x]	\
-	&& ![setlocal]	\
-	&& ![set file="pkgconfig.x"]	\
-	&& ![FOR %A IN (%file%) DO @echo PKG_CHECK_SIZE=%~zA > pkgconfig.chksize]	\
-	&& ![del $(ERRNUL) /q/f pkgconfig.x]
-!endif
-
-!include pkgconfig.chksize
-!if "$(PKG_CHECK_SIZE)" == "0"
-VALID_PKG_CONFIG_PATH = TRUE
-!else
-VALID_PKG_CONFIG_PATH = FALSE
-!endif
-
-!if ![del $(ERRNUL) /q/f pkgconfig.chksize]
-!endif
-
-VALID_CFGSET = FALSE
-!if "$(CFG)" == "release" || "$(CFG)" == "debug" || "$(CFG)" == "Release" || "$(CFG)" == "Debug"
-VALID_CFGSET = TRUE
-!endif
-
-!if "$(VALID_PKG_CONFIG_PATH)" != "TRUE"
-BUILD_INTROSPECTION = FALSE
-ERROR_MSG = $(MSG_INVALID_PKGCONFIG)
-!endif
-
-!if "$(VALID_CFGSET)" != "TRUE"
-BUILD_INTROSPECTION = FALSE
-ERROR_MSG = $(MSG_INVALID_CFG)
-!endif

build/win32/pc_base.py

@@ -1,124 +0,0 @@
-#!/usr/bin/python
-#
-# Simple utility script to generate the basic info
-# needed in a .pc (pkg-config) file, used especially
-# for introspection purposes
-
-# This can be used in various projects where
-# there is the need to generate .pc files,
-# and is copied from GLib's $(srcroot)/build/win32
-
-# Author: Fan, Chun-wei
-# Date: March 10, 2016
-
-import os
-import sys
-import argparse
-
-class BasePCItems:
-    def __init__(self):
-        self.base_replace_items = {}
-        self.exec_prefix = ''
-        self.includedir = ''
-        self.libdir = ''
-        self.prefix = ''
-        self.srcdir = os.path.dirname(__file__)
-        self.top_srcdir = self.srcdir + '\\..\\..'
-        self.version = ''
-
-    def setup(self, argv, parser=None):
-        if parser is None:
-            parser = argparse.ArgumentParser(description='Setup basic .pc file info')
-        parser.add_argument('--prefix', help='prefix of the installed library',
-                            required=True)
-        parser.add_argument('--exec-prefix',
-                            help='prefix of the installed programs, \
-                                  if different from the prefix')
-        parser.add_argument('--includedir',
-                            help='includedir of the installed library, \
-                                  if different from ${prefix}/include')
-        parser.add_argument('--libdir',
-                            help='libdir of the installed library, \
-                                  if different from ${prefix}/lib')
-        parser.add_argument('--version', help='Version of the package',
-                            required=True)
-        args = parser.parse_args()
-
-        self.version = args.version
-
-        # check whether the prefix and exec_prefix are valid
-        if not os.path.exists(args.prefix):
-            raise SystemExit('Specified prefix \'%s\' is invalid' % args.prefix)
-
-        # use absolute paths for prefix
-        self.prefix = os.path.abspath(args.prefix).replace('\\','/')
-
-        # check and setup the exec_prefix
-        if getattr(args, 'exec_prefix', None) is None:
-            exec_prefix_use_shorthand = True
-            self.exec_prefix = '${prefix}'
-        else:
-            if args.exec_prefix.startswith('${prefix}'):
-                exec_prefix_use_shorthand = True
-                input_exec_prefix = args.prefix + args.exec_prefix[len('${prefix}'):]
-            else:
-                exec_prefix_use_shorthand = False
-                input_exec_prefix = args.exec_prefix
-            if not os.path.exists(input_exec_prefix):
-                raise SystemExit('Specified exec_prefix \'%s\' is invalid' %
-                                  args.exec_prefix)
-            if exec_prefix_use_shorthand is True:
-                self.exec_prefix = args.exec_prefix.replace('\\','/')
-            else:
-                self.exec_prefix = os.path.abspath(input_exec_prefix).replace('\\','/')
-
-        # check and setup the includedir
-        if getattr(args, 'includedir', None) is None:
-            self.includedir = '${prefix}/include'
-        else:
-            if args.includedir.startswith('${prefix}'):
-                includedir_use_shorthand = True
-                input_includedir = args.prefix + args.includedir[len('${prefix}'):]
-            else:
-                if args.includedir.startswith('${exec_prefix}'):
-                    includedir_use_shorthand = True
-                    input_includedir = input_exec_prefix + args.includedir[len('${exec_prefix}'):]
-                else:
-                    includedir_use_shorthand = False
-                    input_includedir = args.includedir
-            if not os.path.exists(input_includedir):
-                raise SystemExit('Specified includedir \'%s\' is invalid' %
-                                  args.includedir)
-            if includedir_use_shorthand is True:
-                self.includedir = args.includedir.replace('\\','/')
-            else:
-                self.includedir = os.path.abspath(input_includedir).replace('\\','/')
-
-        # check and setup the libdir
-        if getattr(args, 'libdir', None) is None:
-            self.libdir = '${prefix}/lib'
-        else:
-            if args.libdir.startswith('${prefix}'):
-                libdir_use_shorthand = True
-                input_libdir = args.prefix + args.libdir[len('${prefix}'):]
-            else:
-                if args.libdir.startswith('${exec_prefix}'):
-                    libdir_use_shorthand = True
-                    input_libdir = input_exec_prefix + args.libdir[len('${exec_prefix}'):]
-                else:
-                    libdir_use_shorthand = False
-                    input_libdir = args.libdir
-            if not os.path.exists(input_libdir):
-                raise SystemExit('Specified libdir \'%s\' is invalid' %
-			                      args.libdir)
-            if libdir_use_shorthand is True:
-                self.libdir = args.libdir.replace('\\','/')
-            else:
-                self.libdir = os.path.abspath(input_libdir).replace('\\','/')
-
-        # setup dictionary for replacing items in *.pc.in
-        self.base_replace_items.update({'@VERSION@': self.version})
-        self.base_replace_items.update({'@prefix@': self.prefix})
-        self.base_replace_items.update({'@exec_prefix@': self.exec_prefix})
-        self.base_replace_items.update({'@libdir@': self.libdir})
-        self.base_replace_items.update({'@includedir@': self.includedir})

build/win32/replace.py

@@ -21,25 +21,12 @@ valid_actions = ['remove-prefix',
                  'replace-str',
                  'remove-str']
 
-def open_file(filename, mode):
-    if sys.version_info[0] < 3:
-        return open(filename, mode=mode)
-    else:
-        return open(filename, mode=mode, encoding='utf-8')
-
-def replace_multi(src, dest, replace_items):
-    with open_file(src, 'r') as s:
-        with open_file(dest, 'w') as d:
-            for line in s:
-                replace_dict = dict((re.escape(key), value) \
-                               for key, value in replace_items.items())
-                replace_pattern = re.compile("|".join(replace_dict.keys()))
-                d.write(replace_pattern.sub(lambda m: \
-                        replace_dict[re.escape(m.group(0))], line))
-
 def replace(src, dest, instring, outstring):
-    replace_item = {instring: outstring}
-    replace_multi(src, dest, replace_item)
+    with open(src, 'r') as s:
+        with open(dest, 'w') as d:
+            for line in s:
+                i = line.replace(instring, outstring)
+                d.write(i)
 
 def check_required_args(args, params):
     for param in params:

build/win32/vs10/Makefile.am

@@ -33,7 +33,6 @@ EXTRA_DIST += \
 	README.txt				\
 	gtk+.sln				\
 	gtk3-prebuild.vcxproj			\
-	gtk3-prebuild.vcxproj.filters		\
 	gdk3-win32.vcxprojin			\
 	gdk3-win32.vcxproj.filtersin		\
 	gdk3-broadway.vcxprojin			\
@@ -61,8 +60,6 @@ EXTRA_DIST += \
 	gailutil-3.vcxprojin			\
 	gailutil-3.vcxproj.filtersin		\
 	gtk3-install.vcxproj			\
-	gtk3-install.vcxproj.filters		\
-	gtk3-introspect.vcxproj			\
 	gtk3-build-defines.props		\
 	gtk3-copy-gdk-broadway.props		\
 	gtk3-gen-srcs.props			\
@@ -75,10 +72,6 @@ DISTCLEANFILES = \
 	$(GENERATED_ITEMS)
 
 gtk3-install.props: $(top_srcdir)/build/win32/vs10/gtk3-install.propsin $(MSVC10_HEADERS_LISTS)
-	-$(RM) $(top_builddir)/build/win32/vs11/gtk3-install.props
-	-$(RM) $(top_builddir)/build/win32/vs12/gtk3-install.props
-	-$(RM) $(top_builddir)/build/win32/vs14/gtk3-install.props
-	-$(RM) $(top_builddir)/build/win32/vs15/gtk3-install.props
 	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk3-install.propsin >$@
 	rm $(MSVC10_HEADERS_LISTS)
 

build/win32/vs10/README.txt

@@ -24,8 +24,8 @@ You will also need a Python 2.6+/3.x interpretor installed on your system,
 which can be obtained from the official installers available from
 http://www.python.org.  Please note that the Python interpretor (python.exe)
 either needs to be in your PATH before attempting the build of GTK+, or it
-can be found in the path specified by PythonDir in gtk-version-paths.props.
-If you happen to change the PythonDir setting in gtk-version-paths.props after
+can be found in the path specified by PythonPath in gtk-version-paths.props.
+If you happen to change the PythonPath setting in gtk-version-paths.props after
 opening gtk+.sln with Visual Studio, you will need to close the gtk+.sln solution,
 delete all the *.sdf, *.suo and *.user files before re-attempting the build.
 
@@ -81,21 +81,6 @@ built DLLs go into <root>\vs10\<PlatformName>\bin, built LIBs into
 project files higher in the stack are supposed to look for them, not
 from a specific GLib source tree.
 
-There is now a "gtk3-introspect" project that is used to build the
-introspection files.  In order for this to work, check that the paths for
-PythonDir (32-bit builds) and PythonDirX64 (x64 builds) are correct for your
-system.  Note that it must be the same Python installation that was used to
-build GObject-Introspection (G-I), and a complete G-I build/installation
-needs to be found in <root>\vs10\<PlatformName>\, with the introspection files
-for ATK, Pango and GDK-Pixbuf.  Note also that this is not built by default,
-so you will need to right-click on the project to build it, which will build
-and "install" the other projects that are normally built, if those were not yet
-built.  The introspection files that are built will be "installed" to
-<root>\vs10\<PlatformName>\share\gir-1.0 (the .gir file(s)) and
-<root>\vs10\<PlatformName>\lib\girepository-1.0 (the .typelib files(s)) upon
-successful build.  for building this in a different configuration, therefore,
-you will need to clean this project specifically and then rebuild.
-
 Please note, as GTK+ uses the Adwaita theme for all platforms by default,
 most icons used are not included with GTK+ (which *are* needed), so please see
 https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack (under the

build/win32/vs10/gdk-3.vcxprojin

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -144,7 +144,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
@@ -167,7 +167,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -187,7 +187,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -209,7 +209,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -234,7 +234,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -257,7 +257,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -277,7 +277,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -299,7 +299,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GdkAdditionalLibs);$(GdkBroadwayAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>

build/win32/vs10/gtk+.sln

@@ -30,8 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-query-settings", "gtk-q
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-install.vcxproj", "{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-introspect", "gtk3-introspect.vcxproj", "{A8092C4E-0A21-4B1D-AC82-16764E418D1F}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -276,14 +274,6 @@ Global
 		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.Build.0 = Release|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug|x64.ActiveCfg = Debug|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release|Win32.ActiveCfg = Release|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release|x64.ActiveCfg = Release|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release_Broadway|x64.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

build/win32/vs10/gtk-3.vcxprojin

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -86,7 +86,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -106,7 +106,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -131,7 +131,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -151,7 +151,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -168,13 +168,13 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateGtkDbusBuiltSources)</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating GTK+ DBus Sources...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateGtkDbusBuiltSourcesX64)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateGtkDbusBuiltSources)</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating GTK+ DBus Sources...</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateGtkDbusBuiltSources)</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating GTK+ DBus Sources...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGtkDbusBuiltSourcesX64)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGtkDbusBuiltSources)</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="..\..\..\gtk\gtk-win32.rc.body">

build/win32/vs10/gtk-builder-tool.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}</ProjectGuid>
-    <RootNamespace>gtkbuildertool</RootNamespace>
+    <RootNamespace>gtkencodesymbolicsvg</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

build/win32/vs10/gtk-query-settings.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{9F22107A-3EF7-4B52-B269-747B65307F36}</ProjectGuid>
-    <RootNamespace>gtkquerysettings</RootNamespace>
+    <RootNamespace>gtkencodesymbolicsvg</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

build/win32/vs10/gtk-update-icon-cache.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{FC98AF16-4C68-42DF-906B-93A6804C198A}</ProjectGuid>
-    <RootNamespace>gtkupdateiconcache</RootNamespace>
+    <RootNamespace>gtkencodesymbolicsvg</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

build/win32/vs10/gtk3-build-defines.props

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
     <Import Project="gtk3-version-paths.props" />
@@ -10,14 +10,6 @@
     <GdkDefines>GDK_COMPILATION;G_LOG_DOMAIN="Gdk"</GdkDefines>
     <GtkIncludedImmodulesDefines>INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr</GtkIncludedImmodulesDefines>
     <GtkDefines>GTK_COMPILATION;G_LOG_DOMAIN="Gtk";GTK_HOST="i686-pc-vs$(VSVer)";GTK_PRINT_BACKENDS="file";GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED;$(GtkIncludedImmodulesDefines);GTK_LIBDIR="$(GtkDummyPrefix)/lib";GTK_DATADIR="$(GtkDummyPrefix)/share";GTK_DATA_PREFIX="$(GtkDummyPrefix)";GTK_SYSCONFDIR="$(GtkDummyPrefix)/etc";MULTIPRESS_CONFDIR="$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)";MULTIPRESS_LOCALEDIR="$(GtkDummyPrefix)/share/locale";GTK_VERSION="$(GtkVersion)/etc";GTK_BINARY_VERSION="$(GtkBinaryVersion)/etc";GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED</GtkDefines>
-    <GtkGdkCommonLibs>imm32.lib</GtkGdkCommonLibs>
-    <GdkAdditionalLibs>winmm.lib;dwmapi.lib;setupapi.lib;$(GtkGdkCommonLibs)</GdkAdditionalLibs>
-    <GdkBroadwayAdditionalLibs>ws2_32.lib</GdkBroadwayAdditionalLibs>
-    <GtkAdditionalLibs>atk-1.0.lib;pangowin32-1.0.lib;winspool.lib;comctl32.lib;$(GtkGdkCommonLibs)</GtkAdditionalLibs>
-    <GtkIntrospectNMakeCmd>cd ..
-set VCInstallDir=$(VCInstallDir)
-nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstallRoot)</GtkIntrospectNMakeCmd>
-    <GtkIntrospectBuiltFiles>$(SolutionDir)\..\Gtk-3.0.gir;$(SolutionDir)\..\Gtk-3.0.typelib</GtkIntrospectBuiltFiles>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtk3builddefinesprops</_PropertySheetDisplayName>
@@ -32,7 +24,7 @@ nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstall
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
-    <Link>
+	<Link>
       <AdditionalDependencies>pangocairo-1.0.lib;cairo.lib;cairo-gobject.lib;pango-1.0.lib;gdk_pixbuf-2.0.lib;gio-2.0.lib;gmodule-2.0.lib;gobject-2.0.lib;glib-2.0.lib;intl.lib;epoxy.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
@@ -56,23 +48,5 @@ nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstall
     <BuildMacro Include="GtkDefines">
       <Value>$(GtkDefines)</Value>
     </BuildMacro>
-    <BuildMacro Include="GtkGdkCommonLibs">
-      <Value>$(GtkGdkCommonLibs)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkAdditionalLibs">
-      <Value>$(GdkAdditionalLibs)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkBroadwayAdditionalLibs">
-      <Value>$(GdkBroadwayAdditionalLibs)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkAdditionalLibs">
-      <Value>$(GtkAdditionalLibs)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkIntrospectNMakeCmd">
-      <Value>$(GtkIntrospectNMakeCmd)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkIntrospectBuiltFiles">
-      <Value>$(GtkIntrospectBuiltFiles)</Value>
-    </BuildMacro>
   </ItemGroup>
 </Project>

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

@@ -25,7 +25,7 @@ if "$(Configuration)" == "Debug_Broadway" goto DoDebug
 
 mkdir .\Release\$(Platform)\bin
 
-copy /b $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll .\Release\$(Platform)\bin\
+copy /b $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll .\Release\$(Platform)\bin\
 
 copy /b $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib .\Release\$(Platform)\bin\
 

build/win32/vs10/gtk3-gen-srcs.props

@@ -4,19 +4,30 @@
     <Import Project="gtk3-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <GenConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</GenConfigH>
+    <GenConfigH>
+copy ..\..\..\config.h.win32 ..\..\..\config.h
+    </GenConfigH>
     <GenGdkConfigHWin32>
 if exist ..\..\..\MSVC_$(Configuration) goto DONE_GDKCONFIG_H
 
 if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h
+
 if exist ..\..\..\GDK_BROADWAY_BUILD del ..\..\..\GDK_BROADWAY_BUILD
+
 if exist ..\..\..\MSVC_$(Configuration)_Broadway del ..\..\..\MSVC_$(Configuration)_Broadway
+
 if exist $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll
+
 if exist $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib del $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib
+
 if "$(Configuration)" == "Release" del ..\..\..\MSVC_Debug
+
 if "$(Configuration)" == "Debug" del ..\..\..\MSVC_Release
+
 copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h
+
 copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\GDK_WIN32ONLY_BUILD
+
 echo $(Configuration) &gt; ..\..\..\MSVC_$(Configuration)
 
 :DONE_GDKCONFIG_H
@@ -24,25 +35,37 @@ echo $(Configuration) &gt; ..\..\..\MSVC_$(Configuration)
     <GenGdkConfigHBroadway>
 if exist ..\..\..\MSVC_$(Configuration)_Broadway goto DONE_GDKCONFIG_H
 
+
 if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h
+
 if exist ..\..\..\GDK_WIN32ONLY_BUILD del ..\..\..\GDK_WIN32ONLY_BUILD
+
 if exist ..\..\..\MSVC_Release del ..\..\..\MSVC_Release
+
 if exist ..\..\..\MSVC_Debug del ..\..\..\MSVC_Debug
 
+
 if "$(Configuration)" == "Release_Broadway" del ..\..\..\MSVC_Debug_Broadway
+
 if "$(Configuration)" == "Debug_Broadway" del ..\..\..\MSVC_Release_Broadway
 
 copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\gdk\gdkconfig.h
+
 copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\GDK_BROADWAY_BUILD
+
 echo $(Configuration) &gt; ..\..\..\MSVC_$(Configuration)_Broadway
 
 :DONE_GDKCONFIG_H
     </GenGdkConfigHBroadway>
-    <GDbusCodeGenCmd>$(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml</GDbusCodeGenCmd>
-    <GenerateGtkDbusBuiltSources>cd ..\..\..\gtk &amp; $(PythonDir)\python $(GDbusCodeGenCmd) &amp; cd $(SolutionDir)</GenerateGtkDbusBuiltSources>
-    <GenerateGtkDbusBuiltSourcesX64>cd ..\..\..\gtk &amp; $(PythonDirX64)\python $(GDbusCodeGenCmd) &amp; cd $(SolutionDir)</GenerateGtkDbusBuiltSourcesX64>
+    <GenerateGtkDbusBuiltSources>
+cd ..\..\..\gtk
+
+$(PythonPath)\python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml
+
+cd $(SolutionDir)
+    </GenerateGtkDbusBuiltSources>
     <CopyGtkWin32RC>copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc</CopyGtkWin32RC>
-    <GenerateGtkWin32Manifest>$(PythonDir)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*</GenerateGtkWin32Manifest>
+    <GenerateGtkWin32Manifest>$(PythonPath)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*</GenerateGtkWin32Manifest>
     <CopyDemosH>copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h</CopyDemosH>
   </PropertyGroup>
   <PropertyGroup>
@@ -58,15 +81,9 @@ echo $(Configuration) &gt; ..\..\..\MSVC_$(Configuration)_Broadway
     <BuildMacro Include="GenGdkConfigHBroadway">
       <Value>$(GenGdkConfigHBroadway)</Value>
     </BuildMacro>
-    <BuildMacro Include="GDbusCodeGenCmd">
-      <Value>$(GDbusCodeGenCmd)</Value>
-    </BuildMacro>
     <BuildMacro Include="GenerateGtkDbusBuiltSources">
       <Value>$(GenerateGtkDbusBuiltSources)</Value>
     </BuildMacro>
-    <BuildMacro Include="GenerateGtkDbusBuiltSourcesX64">
-      <Value>$(GenerateGtkDbusBuiltSourcesX64)</Value>
-    </BuildMacro>
     <BuildMacro Include="CopyGtkWin32RC">
       <Value>$(CopyGtkWin32RC)</Value>
     </BuildMacro>

build/win32/vs10/gtk3-install.propsin

@@ -5,9 +5,12 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
+    <InstalledDlls>$(BinDir)\$(GtkDllPrefix)gdk(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gtk(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gailutil(GtkDllSuffix).dll</InstalledDlls>
+    <InstalledBins>$(BinDir)\gtk3-demo.exe;$(BinDir)\gtk3-demo-application.exe;$(BinDir)\gtk3-icon-browser.exe;$(BinDir)\gtk-encode-symbolic-svg.exe</InstalledBins>
+    <InstalledBroadwayBins>$(BinDir)\broadwayd.exe</InstalledBroadwayBins>
     <GtkDoInstallBin>
 mkdir $(CopyDir)\bin
-mkdir $(CopyDir)\lib\pkgconfig
+mkdir $(CopyDir)\lib
 
 copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll" $(CopyDir)\bin
 copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).pdb" $(CopyDir)\bin
@@ -90,12 +93,6 @@ copy .\Debug\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin
 copy .\Debug\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin
 
 :DONE_BIN
-
-copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig
-copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig\gdk-win32-3.0.pc
-copy "..\gtk+-3.0.pc" $(CopyDir)\lib\pkgconfig
-copy "..\gtk+-3.0.pc" "$(CopyDir)\lib\pkgconfig\gtk+-3.0.pc"
-copy ..\gail-3.0.pc $(CopyDir)\lib\pkgconfig
     </GtkDoInstallBin>
     <GtkDoInstall>
 echo off
@@ -112,31 +109,35 @@ mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
 mkdir $(CopyDir)\include\gail-$(ApiVersion)\libgail-util
 #include "gailutil-3.vs10.headers"
 
-
-for &#37;&#37;s in (16 22 24 32 48 256) do ((mkdir $(CopyDir)\share\icons\hicolor\&#37;&#37;sx&#37;&#37;s\apps) &amp; (copy /b ..\..\..\demos\gtk-demo\data\&#37;&#37;sx&#37;&#37;s\gtk3-demo.png $(CopyDir)\share\icons\hicolor\&#37;&#37;sx&#37;&#37;s\apps))
-
+mkdir $(CopyDir)\share\icons\hicolor\16x16\apps
+copy ..\..\..\demos\gtk-demo\data\16x16\gtk3-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps
+mkdir $(CopyDir)\share\icons\hicolor\22x22\apps
+copy ..\..\..\demos\gtk-demo\data\22x22\gtk3-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps
+mkdir $(CopyDir)\share\icons\hicolor\24x24\apps
+copy ..\..\..\demos\gtk-demo\data\24x24\gtk3-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps
+mkdir $(CopyDir)\share\icons\hicolor\32x32\apps
+copy ..\..\..\demos\gtk-demo\data\32x32\gtk3-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps
+mkdir $(CopyDir)\share\icons\hicolor\48x48\apps
+copy ..\..\..\demos\gtk-demo\data\48x48\gtk3-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps
+mkdir $(CopyDir)\share\icons\hicolor\256x256\apps
+copy ..\..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\hicolor\256x256\apps
 mkdir $(CopyDir)\share\glib-2.0\schemas
+copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
 copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
 copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas
-copy ..\..\..\gtk\org.gtk.Settings.EmojiChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
-copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
 copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas
+
+echo "Compiling gsettings XML Files..."
+$(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
+
+echo "Generating icon cache......"
+$(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor"
     </GtkDoInstall>
     <GtkDoInstallBroadwayHeaders>
 copy ..\..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway
 #include "gdk3-broadway.vs10.headers"
     </GtkDoInstallBroadwayHeaders>
-    <GtkPostInstall>
-echo "Compiling gsettings XML Files..."
-$(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
-
-echo "Generating icon cache......"
-$(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor"
-    </GtkPostInstall>
-    <GenerateGtkPC>$(PythonDir)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer)</GenerateGtkPC>
-    <GenerateGtkPCX64>$(PythonDirX64)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer)</GenerateGtkPCX64>
-    <GtkPCFiles>..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc</GtkPCFiles>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtk3installsprops</_PropertySheetDisplayName>
@@ -163,17 +164,5 @@ $(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir
     <BuildMacro Include="GtkDoInstallBroadwayHeaders">
       <Value>$(GtkDoInstallBroadwayHeaders)</Value>
     </BuildMacro>
-    <BuildMacro Include="GtkPostInstall">
-      <Value>$(GtkPostInstall)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateGtkPC">
-      <Value>$(GenerateGtkPC)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateGtkPCX64">
-      <Value>$(GenerateGtkPCX64)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkPCFiles">
-      <Value>$(GtkPCFiles)</Value>
-    </BuildMacro>
   </ItemGroup>
 </Project>

build/win32/vs10/gtk3-install.vcxproj

@@ -157,63 +157,29 @@
   <ItemGroup>
     <CustomBuild Include="..\..\..\config.h.win32">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">blah;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GtkPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">blah;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">blah;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GtkPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">blah;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">blah;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GtkPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">blah;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">blah;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GtkPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">blah;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\gtkpc.py">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateGtkPC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GenerateGtkPC) --broadway</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateGtkPCX64)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GenerateGtkPCX64) --broadway</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateGtkPC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GenerateGtkPC) --broadway</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGtkPCX64)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GenerateGtkPCX64) --broadway</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GtkPCFiles);%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
@@ -249,7 +215,7 @@
       <Project>{f280bf1a-777a-4fb5-8005-dfbe04621edb}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="gtk-update-icon-cache.vcxproj">
+    <ProjectReference Include="gtk-udpate-icon-cache.vcxproj">
       <Project>{fc98af16-4c68-42df-906b-93a6804c198a}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>

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

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\gtkpc.py"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
-</Project>

build/win32/vs10/gtk3-introspect.vcxproj

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A8092C4E-0A21-4B1D-AC82-16764E418D1F}</ProjectGuid>
-    <RootNamespace>gtk3introspect</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <NMakeBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GtkIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <NMakeBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GtkIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <NMakeBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) install-introspection</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean install-introspection</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GtkIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) install-introspection</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean install-introspection</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GtkIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="gtk3-install.vcxproj">
-      <Project>{23bbf35f-78af-4e8c-983f-7b90448cd7df}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

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

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\..\gdk\gdkconfig.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\..\gdk\gdkconfig.h.win32_broadway"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\..\demos\gtk-demo\demos.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
-</Project>

build/win32/vs10/gtk3-version-paths.props.in

@@ -12,14 +12,7 @@
     <GtkSeparateVSDllSuffix>-vs$(VSVer)</GtkSeparateVSDllSuffix>
     <GtkDllPrefix>$(GtkSeparateVSDllPrefix)</GtkDllPrefix>
     <GtkDllSuffix>$(GtkSeparateVSDllSuffix)</GtkDllSuffix>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '10.0'">c:\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '11.0'">c:\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '12.0'">c:\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '14.0'">c:\python36</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '15.0'">c:\python36</PythonDir>
-    <PythonDirX64>$(PythonDir).x64</PythonDirX64>
-    <IntrospectPythonParam>PYTHON=$(PythonDir)\python.exe</IntrospectPythonParam>
-    <IntrospectPythonParamX64>PYTHON=$(PythonDirX64)\python.exe</IntrospectPythonParamX64>
+    <PythonPath>c:\python27</PythonPath>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtk3versionpathsprops</_PropertySheetDisplayName>
@@ -58,17 +51,8 @@
     <BuildMacro Include="GtkDllSuffix">
       <Value>$(GtkDllSuffix)</Value>
     </BuildMacro>
-    <BuildMacro Include="PythonDir">
-      <Value>$(PythonDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PythonDirX64">
-      <Value>$(PythonDirX64)</Value>
-    </BuildMacro>
-    <BuildMacro Include="IntrospectPythonParam">
-      <Value>$(IntrospectPythonParam)</Value>
-    </BuildMacro>
-    <BuildMacro Include="IntrospectPythonParamX64">
-      <Value>$(IntrospectPythonParamX64)</Value>
+    <BuildMacro Include="PythonPath">
+      <Value>$(PythonPath)</Value>
     </BuildMacro>
   </ItemGroup>
 </Project>

build/win32/vs11/Makefile.am

@@ -4,7 +4,6 @@ EXTRA_DIST +=	\
 	README.txt	\
 	gtk+.sln	\
 	gtk3-prebuild.vcxproj	\
-	gtk3-prebuild.vcxproj.filters	\
 	gdk3-win32.vcxproj	\
 	gdk3-win32.vcxproj.filters	\
 	gdk-3.vcxproj	\
@@ -28,8 +27,6 @@ EXTRA_DIST +=	\
 	gailutil-3.vcxproj	\
 	gailutil-3.vcxproj.filters	\
 	gtk3-install.vcxproj	\
-	gtk3-install.vcxproj.filters	\
-	gtk3-introspect.vcxproj		\
 	broadwayd.vcxproj	\
 	broadwayd.vcxproj.filters	\
 	gdk3-broadway.vcxproj	\

build/win32/vs12/Makefile.am

@@ -4,7 +4,6 @@ EXTRA_DIST +=	\
 	README.txt	\
 	gtk+.sln	\
 	gtk3-prebuild.vcxproj	\
-	gtk3-prebuild.vcxproj.filters	\
 	gdk3-win32.vcxproj	\
 	gdk3-win32.vcxproj.filters	\
 	gdk-3.vcxproj	\
@@ -28,8 +27,6 @@ EXTRA_DIST +=	\
 	gailutil-3.vcxproj	\
 	gailutil-3.vcxproj.filters	\
 	gtk3-install.vcxproj	\
-	gtk3-install.vcxproj.filters	\
-	gtk3-introspect.vcxproj		\
 	broadwayd.vcxproj	\
 	broadwayd.vcxproj.filters	\
 	gdk3-broadway.vcxproj	\

build/win32/vs14/Makefile.am

@@ -4,7 +4,6 @@ EXTRA_DIST +=	\
 	README.txt	\
 	gtk+.sln	\
 	gtk3-prebuild.vcxproj	\
-	gtk3-prebuild.vcxproj.filters	\
 	gdk3-win32.vcxproj	\
 	gdk3-win32.vcxproj.filters	\
 	gdk-3.vcxproj	\
@@ -28,8 +27,6 @@ EXTRA_DIST +=	\
 	gailutil-3.vcxproj	\
 	gailutil-3.vcxproj.filters	\
 	gtk3-install.vcxproj	\
-	gtk3-install.vcxproj.filters	\
-	gtk3-introspect.vcxproj		\
 	broadwayd.vcxproj	\
 	broadwayd.vcxproj.filters	\
 	gdk3-broadway.vcxproj	\

build/win32/vs15/Makefile.am

@@ -1,53 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-EXTRA_DIST +=	\
-	README.txt	\
-	gtk+.sln	\
-	gtk3-prebuild.vcxproj	\
-	gtk3-prebuild.vcxproj.filters	\
-	gdk3-win32.vcxproj	\
-	gdk3-win32.vcxproj.filters	\
-	gdk-3.vcxproj	\
-	gdk-3.vcxproj.filters	\
-	gtk-3.vcxproj	\
-	gtk-3.vcxproj.filters	\
-	gtk-builder-tool.vcxproj		\
-	gtk-builder-tool.vcxproj.filters	\
-	gtk-encode-symbolic-svg.vcxproj	\
-	gtk-encode-symbolic-svg.vcxproj.filters	\
-	gtk-query-settings.vcxproj		\
-	gtk-query-settings.vcxproj.filters	\
-	gtk-update-icon-cache.vcxproj		\
-	gtk-update-icon-cache.vcxproj.filters	\
-	gtk3-demo.vcxproj	\
-	gtk3-demo.vcxproj.filters	\
-	gtk3-demo-application.vcxproj	\
-	gtk3-demo-application.vcxproj.filters	\
-	gtk3-icon-browser.vcxproj	\
-	gtk3-icon-browser.vcxproj.filters	\
-	gailutil-3.vcxproj	\
-	gailutil-3.vcxproj.filters	\
-	gtk3-install.vcxproj	\
-	gtk3-install.vcxproj.filters	\
-	gtk3-introspect.vcxproj		\
-	broadwayd.vcxproj	\
-	broadwayd.vcxproj.filters	\
-	gdk3-broadway.vcxproj	\
-	gdk3-broadway.vcxproj.filters	\
-	gtk3-build-defines.props	\
-	gtk3-copy-gdk-broadway.props	\
-	gtk3-gen-srcs.props	\
-	gtk3-ignore-broadway.props	\
-	gtk3-install.props	\
-	gtk3-version-paths.props
-
-DISTCLEANFILES = $(EXTRA_DIST)
-
-MSVC_VER = 15
-MSVC_VER_LONG = 15
-MSVC_TOOLSET = 141
-MSVC_FORMAT_VER = 12
-
-include $(top_srcdir)/build/Makefile-newvs.am
-
--include $(top_srcdir)/git.mk

build/win32/vs9/Makefile.am

@@ -36,7 +36,6 @@ EXTRA_DIST += \
 	gtk3-icon-browser.vcprojin	\
 	gailutil-3.vcprojin		\
 	gtk3-install.vcproj		\
-	gtk3-introspect.vcproj		\
 	broadwayd.vcprojin		\
 	gdk3-broadway.vcprojin		\
 	gtk3-build-defines.vsprops	\

build/win32/vs9/README.txt

@@ -23,8 +23,8 @@ You will also need a Python 2.6+/3.x interpretor installed on your system,
 which can be obtained from the official installers available from
 http://www.python.org.  Please note that the Python interpretor (python.exe)
 either needs to be in your PATH before attempting the build of GTK+, or it
-can be found in the path specified by PythonDir in gtk-version-paths.vsprops.
-If you happen to change the PythonDir setting in gtk-version-paths.vsprops after
+can be found in the path specified by PythonPath in gtk-version-paths.vsprops.
+If you happen to change the PythonPath setting in gtk-version-paths.vsprops after
 opening gtk+.sln with Visual Studio, you will need to close the gtk+.sln solution,
 delete all the *.ncb, *.suo and *.user files before re-attempting the build.
 
@@ -80,21 +80,6 @@ built DLLs go into <root>\vs9\<PlatformName>\bin, built LIBs into
 project files higher in the stack are supposed to look for them, not
 from a specific GLib source tree.
 
-There is now a "gtk3-introspect" project that is used to build the
-introspection files.  In order for this to work, check that the paths for
-PythonDir (32-bit builds) and PythonDirX64 (x64 builds) are correct for your
-system.  Note that it must be the same Python installation that was used to
-build GObject-Introspection (G-I), and a complete G-I build/installation
-needs to be found in <root>\vs9\<PlatformName>\, with the introspection files
-for ATK, Pango and GDK-Pixbuf.  Note also that this is not built by default,
-so you will need to right-click on the project to build it, which will build
-and "install" the other projects that are normally built, if those were not yet
-built.  The introspection files that are built will be "installed" to
-<root>\vs9\<PlatformName>\share\gir-1.0 (the .gir file(s)) and
-<root>\vs9\<PlatformName>\lib\girepository-1.0 (the .typelib files(s)) upon
-successful build.  for building this in a different configuration, therefore,
-you will need to clean this project specifically and then rebuild.
-
 Please note, as GTK+ uses the Adwaita theme for all platforms by default,
 most icons used are not included with GTK+ (which *are* needed), so please see
 https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack (under the

build/win32/vs9/gdk-3.vcprojin

@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs)"
+				AdditionalDependencies="imm32.lib winmm.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -74,7 +74,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs) $(GdkBroadwayAdditionalLibs)"
+				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -104,7 +104,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs)"
+				AdditionalDependencies="imm32.lib winmm.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -136,7 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs) $(GdkBroadwayAdditionalLibs)"
+				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -170,7 +170,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs)"
+				AdditionalDependencies="imm32.lib winmm.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -202,7 +202,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs) $(GdkBroadwayAdditionalLibs)"
+				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -232,7 +232,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs)"
+				AdditionalDependencies="imm32.lib winmm.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -264,7 +264,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs) $(GdkBroadwayAdditionalLibs)"
+				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib dwmapi.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"

build/win32/vs9/gtk+.sln

@@ -89,11 +89,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-instal
 		{9F22107A-3EF7-4B52-B269-747B65307F36} = {9F22107A-3EF7-4B52-B269-747B65307F36}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-introspect", "gtk3-introspect.vcproj", "{A8092C4E-0A21-4B1D-AC82-16764E418D1F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{23BBF35F-78AF-4E8C-983F-7B90448CD7DF} = {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -330,14 +325,6 @@ Global
 		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.Build.0 = Release|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug|x64.ActiveCfg = Debug|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release|Win32.ActiveCfg = Release|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release|x64.ActiveCfg = Release|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release_Broadway|x64.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

build/win32/vs9/gtk-3.vcprojin

@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GtkAdditionalLibs)"
+				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -72,7 +72,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GtkAdditionalLibs)"
+				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -106,7 +106,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GtkAdditionalLibs)"
+				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -136,7 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(GtkAdditionalLibs)"
+				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -180,14 +180,14 @@
 				<FileConfiguration Name="Debug|x64">
 					<Tool Name="VCCustomBuildTool"
 						Description="Generating GTK+ DBus Sources..."
-						CommandLine="$(GenerateGtkDbusBuiltSourcesX64)"
+						CommandLine="$(GenerateGtkDbusBuiltSources)"
 						Outputs="..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration Name="Release|x64">
 					<Tool Name="VCCustomBuildTool"
 						Description="Generating GTK+ DBus Sources..."
-						CommandLine="$(GenerateGtkDbusBuiltSourcesX64)"
+						CommandLine="$(GenerateGtkDbusBuiltSources)"
 						Outputs="..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h"
 					/>
 				</FileConfiguration>

build/win32/vs9/gtk3-build-defines.vsprops

@@ -43,28 +43,4 @@
 		Name="GtkDefines"
 		Value="GTK_COMPILATION;G_LOG_DOMAIN=\"Gtk\";GTK_HOST=\"i686-pc-vs$(VSVer)\";GTK_PRINT_BACKENDS=\"file\";GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED;$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\"$(GtkDummyPrefix)/lib\";GTK_DATADIR=\"$(GtkDummyPrefix)/share\"GTK_DATA_PREFIX=\"$(GtkDummyPrefix)\";GTK_SYSCONFDIR=\"$(GtkDummyPrefix)/etc\";MULTIPRESS_CONFDIR=\"$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\";MULTIPRESS_LOCALEDIR=\"$(GtkDummyPrefix)/share/locale\";GTK_VERSION=\"$(GtkVersion)/etc\";GTK_BINARY_VERSION=\"$(GtkBinaryVersion)/etc\";GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED"
 	/>
-	<UserMacro
-		Name="GtkGdkCommonLibs"
-		Value="imm32.lib"
-	/>
-	<UserMacro
-		Name="GdkBroadwayAdditionalLibs"
-		Value="ws2_32.lib"
-	/>
-	<UserMacro
-		Name="GdkAdditionalLibs"
-		Value="winmm.lib dwmapi.lib setupapi.lib $(GtkGdkCommonLibs)"
-	/>
-	<UserMacro
-		Name="GtkAdditionalLibs"
-		Value="atk-1.0.lib pangowin32-1.0.lib winspool.lib comctl32.lib $(GtkGdkCommonLibs)"
-	/>
-	<UserMacro
-		Name="GtkIntrospectNMakeCmd"
-		Value="cd ..&#x0D;&#x0A;set VCInstallDir=$(VCInstallDir)&#x0D;&#x0A;nmake -f gtk-introspection-msvc.mak CFG=$(ConfigurationName) PREFIX=$(GlibEtcInstallRoot)"
-	/>
-	<UserMacro
-		Name="GtkIntrospectBuiltFiles"
-		Value="$(SolutionDir)\..\Gtk-3.0.gir;$(SolutionDir)\..\Gtk-3.0.typelib;$(SolutionDir)\..\GdkWin32-3.0.gir;$(SolutionDir)\..\GdkWin32-3.0.typelib;$(SolutionDir)\..\Gdk-3.0.gir;$(SolutionDir)\..\Gdk-3.0.typelib"
-	/>
 </VisualStudioPropertySheet>

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

@@ -17,7 +17,7 @@ if "$(ConfigurationName)" == "Debug_Broadway" goto DoDebug&#
 
 :DoRelease

 mkdir .\Release\$(PlatformName)\bin

-copy /b $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll .\Release\$(PlatformName)\bin\

+copy /b $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll .\Release\$(PlatformName)\bin\

 copy /b $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib .\Release\$(PlatformName)\bin\

 goto END

 

build/win32/vs9/gtk3-gen-srcs.vsprops

@@ -54,17 +54,13 @@ echo $(ConfigurationName) > ..\..\..\MSVC_$(ConfigurationName)_Broadway
 :DONE_GDKCONFIG_H

 		      "
 	/>
-	<UserMacro
-		Name="GDbusCodeGenCmd"
-		Value="$(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml"
-	/>
 	<UserMacro
 		Name="GenerateGtkDbusBuiltSources"
-		Value="cd ..\..\..\gtk &amp; $(PythonDir)\python $(GDbusCodeGenCmd) &amp; cd $(SolutionDir)"
-	/>
-	<UserMacro
-		Name="GenerateGtkDbusBuiltSourcesX64"
-		Value="cd ..\..\..\gtk &amp; $(PythonDirX64)\python $(GDbusCodeGenCmd) &amp; cd $(SolutionDir)"
+		Value="
+cd ..\..\..\gtk&#x0D;&#x0A;
+$(PythonPath)\python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml&#x0D;&#x0A;
+cd $(SolutionDir)&#x0D;&#x0A;
+		      "
 	/>
 	<UserMacro
 		Name="CopyGtkWin32RC"
@@ -72,7 +68,7 @@ echo $(ConfigurationName) &gt; ..\..\..\MSVC_$(ConfigurationName)_Broadway&#x0D;
 	/>
 	<UserMacro
 		Name="GenerateGtkWin32Manifest"
-		Value="$(PythonDir)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*"
+		Value="$(PythonPath)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*"
 	/>
 	<UserMacro
 		Name="CopyDemosH"

build/win32/vs9/gtk3-install.vcproj

@@ -28,8 +28,8 @@
 			DeleteExtensionsOnClean=""
 			>
 			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)"
+				Name="VCPreBuildEventTool"
+				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"
 			/>
 		</Configuration>
 		<Configuration
@@ -41,8 +41,8 @@
 			DeleteExtensionsOnClean=""
 			>
 			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)"
+				Name="VCPreBuildEventTool"
+				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"
 			/>
 		</Configuration>
 		<Configuration
@@ -55,8 +55,8 @@
 			DeleteExtensionsOnClean=""
 			>
 			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)"
+				Name="VCPreBuildEventTool"
+				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"
 			/>
 		</Configuration>
 		<Configuration
@@ -68,8 +68,8 @@
 			DeleteExtensionsOnClean=""
 			>
 			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)"
+				Name="VCPreBuildEventTool"
+				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"
 			/>
 		</Configuration>
 		<Configuration
@@ -83,8 +83,8 @@
 			WholeProgramOptimization="1"
 			>
 			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)"
+				Name="VCPreBuildEventTool"
+				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"
 			/>
 		</Configuration>
 		<Configuration
@@ -97,8 +97,8 @@
 			WholeProgramOptimization="1"
 			>
 			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)"
+				Name="VCPreBuildEventTool"
+				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"
 			/>
 		</Configuration>
 		<Configuration
@@ -112,8 +112,8 @@
 			WholeProgramOptimization="1"
 			>
 			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)"
+				Name="VCPreBuildEventTool"
+				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"
 			/>
 		</Configuration>
 		<Configuration
@@ -126,78 +126,14 @@
 			WholeProgramOptimization="1"
 			>
 			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)"
+				Name="VCPreBuildEventTool"
+				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"
 			/>
 		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File RelativePath="..\..\..\gtkpc.py">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPC)"
-						Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPC)"
-						Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPCX64)"
-						Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPCX64)"
-						Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPC) --broadway"
-						Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPC) --broadway"
-						Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPCX64) --broadway"
-						Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPCX64) --broadway"
-						Outputs="..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>

build/win32/vs9/gtk3-install.vspropsin

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="gtkinstallprops"
-	InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-	>
-	<UserMacro
-		Name="GtkDoInstallBin"
-		Value="
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="gtkinstallprops"
+ InheritedPropertySheets=".\gtk3-build-defines.vsprops"
+ >
+ <UserMacro
+  Name="GtkDoInstallBin"
+  Value="
 mkdir $(CopyDir)\bin&#x0D;&#x0A;
-mkdir $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
+mkdir $(CopyDir)\lib&#x0D;&#x0A;
 
 copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).pdb $(CopyDir)\bin&#x0D;&#x0A;
@@ -90,17 +90,11 @@ copy .\Debug\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin&#x0D;&#x0
 copy .\Debug\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin&#x0D;&#x0A;
 copy .\Debug\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin&#x0D;&#x0A;
 :DONE_BIN&#x0D;&#x0A;
-
-copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig\gdk-win32-3.0.pc&#x0D;&#x0A;
-copy &quot;..\gtk+-3.0.pc&quot; $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy &quot;..\gtk+-3.0.pc&quot; &quot;$(CopyDir)\lib\pkgconfig\gtk+-win32-3.0.pc&quot;&#x0D;&#x0A;
-copy ..\gail-3.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-			  "
-	/>
-	<UserMacro
-		Name="GtkDoInstall"
-		Value="
+                       "
+ />
+ <UserMacro
+  Name="GtkDoInstall"
+  Value="
 echo off&#x0D;&#x0A;
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated&#x0D;&#x0A;
@@ -130,37 +124,24 @@ mkdir $(CopyDir)\share\icons\hicolor\256x256\apps&#x0D;&#x0A;
 copy ..\..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\hicolor\256x256\apps\&#x0D;&#x0A;
 
 mkdir $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
+copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-copy ..\..\..\gtk\org.gtk.Settings.EmojiChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-		      "
-	/>
-	<UserMacro
-		Name="GtkPostInstall"
-		Value="
+
 echo &quot;Compiling gsettings XML Files...&quot;&#x0D;&#x0A;
 $(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 
 echo &quot;Generating icon cache...&quot;&#x0D;&#x0A;
 $(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force &quot;$(CopyDir)\share\icons\hicolor&quot;
-		      "
-	/>
-	<UserMacro
-		Name="GtkDoInstallBroadwayHeaders"
-		Value="
+"
+ />
+ <UserMacro
+  Name="GtkDoInstallBroadwayHeaders"
+  Value="
 copy ..\..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway&#x0D;&#x0A;
 #include "gdk3-broadway.headers"
         "
-	/>
-	<UserMacro
-		Name="GenerateGtkPC"
-		Value="$(PythonDir)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer)"
-	/>
-	<UserMacro
-		Name="GenerateGtkPCX64"
-		Value="$(PythonDirX64)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer)"
-	/>
+ />
 </VisualStudioPropertySheet>

build/win32/vs9/gtk3-introspect.vcproj

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk3-introspect"
-	ProjectGUID="{A8092C4E-0A21-4B1D-AC82-16764E418D1F}"
-	Keyword="MakeFileProj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection"
-				ReBuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection"
-				CleanCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean"
-				Output="$(GtkIntrospectBuiltFiles)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) install-introspection"
-				ReBuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean install-introspection"
-				CleanCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean"
-				Output="$(GtkIntrospectBuiltFiles)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection"
-				ReBuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection"
-				CleanCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean"
-				Output="$(GtkIntrospectBuiltFiles)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) install-introspection"
-				ReBuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean install-introspection"
-				CleanCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean"
-				Output="$(GtkIntrospectBuiltFiles)"
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioProject>

build/win32/vs9/gtk3-version-paths.vsprops.in

@@ -51,19 +51,7 @@
 		Value="$(GtkSeparateVSDllSuffix)"
 	/>
 	<UserMacro
-		Name="PythonDir"
+		Name="PythonPath"
 		Value="c:\python27"
 	/>
-	<UserMacro
-		Name="PythonDirX64"
-		Value="$(PythonDir).x64"
-	/>
-	<UserMacro
-		Name="IntrospectPythonParam"
-		Value="PYTHON=$(PythonDir)\python.exe"
-	/>
-	<UserMacro
-		Name="IntrospectPythonParamX64"
-		Value="PYTHON=$(PythonDirX64)\python.exe"
-	/>
 </VisualStudioPropertySheet>

config.h.win32.in

@@ -50,11 +50,6 @@
 /* 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
 
@@ -110,11 +105,6 @@
 /* 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 */
 

configure.ac

@@ -9,9 +9,9 @@
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [22])
-m4_define([gtk_micro_version], [21])
-m4_define([gtk_interface_age], [21])
+m4_define([gtk_minor_version], [21])
+m4_define([gtk_micro_version], [0])
+m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
@@ -42,8 +42,8 @@ m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
 m4_define([glib_required_major], [2])
-m4_define([glib_required_minor], [49])
-m4_define([glib_required_micro], [4])
+m4_define([glib_required_minor], [45])
+m4_define([glib_required_micro], [8])
 m4_define([glib_required_version],
           [glib_required_major.glib_required_minor.glib_required_micro])
 m4_define([glib_min_required_minor],
@@ -60,11 +60,10 @@ m4_define([cairo_required_version], [1.14.0])
 m4_define([gdk_pixbuf_required_version], [2.30.0])
 m4_define([introspection_required_version], [1.39.0])
 m4_define([wayland_required_version], [1.9.91])
-m4_define([wayland_protocols_required_version], [1.9])
-m4_define([mirclient_required_version], [0.22.0])
+m4_define([wayland_protocols_required_version], [1.0])
+m4_define([mirclient_required_version], [0.11.0])
 m4_define([mircookie_required_version], [0.17.0])
 m4_define([epoxy_required_version], [1.0])
-m4_define([cloudproviders_required_version], [0.2.0])
 GLIB_REQUIRED_VERSION=glib_required_version
 PANGO_REQUIRED_VERSION=pango_required_version
 ATK_REQUIRED_VERSION=atk_required_version
@@ -82,7 +81,7 @@ AC_SUBST(INTROSPECTION_REQUIRED_VERSION)
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}
 
-AM_INIT_AUTOMAKE([1.11 -Wall subdir-objects no-define -Wno-portability tar-ustar no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([1.11 -Wall no-define -Wno-portability tar-ustar no-dist-gzip dist-xz])
 AM_MAINTAINER_MODE([enable])
 
 # Support silent build rules. Disable
@@ -162,13 +161,6 @@ AC_PROG_MKDIR_P
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
-# Define _GNU_SOURCE etc. where appropriate, e.g. for strptime() on glibc
-AC_USE_SYSTEM_EXTENSIONS
-
-# i18n stuff
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.7])
-
 GETTEXT_PACKAGE=gtk30
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
@@ -212,6 +204,9 @@ case $host in
     ;;
 esac
 
+# Define _GNU_SOURCE etc. where appropriate, e.g. for strptime() on glibc
+AC_USE_SYSTEM_EXTENSIONS
+
 dnl
 dnl Check for a working C++ compiler, but do not bail out, if none is found.
 dnl We use this for an automated test for C++ header correctness.
@@ -347,11 +342,6 @@ AC_ARG_ENABLE(mir-backend,
                               [enable the Mir gdk backend])],
 			      [backend_set=yes])
 
-AC_ARG_ENABLE(cloudproviders,
-              [AS_HELP_STRING([--enable-cloudproviders],
-                              [enable libcloudproviders integration])],
-                              [cloudproviders_set=yes])
-
 if test -z "$backend_set"; then
   if test "$platform_win32" = yes; then
     enable_win32_backend=yes
@@ -395,7 +385,7 @@ if test "$enable_win32_backend" = "yes"; then
   backend_immodules="$backend_immodules,ime"
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WIN32"
-  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm -ldwmapi -lsetupapi -lcfgmgr32"
+  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm -ldwmapi"
   AM_CONDITIONAL(USE_WIN32, true)
   PANGO_PACKAGES="pangowin32 pangocairo"
 else
@@ -462,7 +452,7 @@ if test "$enable_wayland_backend" = "yes"; then
   WAYLAND_PACKAGES="$WAYLAND_DEPENDENCIES"
   AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
   AS_IF([test "x$WAYLAND_SCANNER" = "xno"],
-    [AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols])])
+    AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols]))
   AC_SUBST([WAYLAND_SCANNER])
 
   AM_CONDITIONAL(USE_WAYLAND, true)
@@ -470,7 +460,7 @@ else
   AM_CONDITIONAL(USE_WAYLAND, false)
 fi
 
-MIR_DEPENDENCIES="mirclient >= mirclient_required_version mircookie >= mircookie_required_version libcontent-hub-glib"
+MIR_DEPENDENCIES="mirclient >= mirclient_required_version mircookie >= mircookie_required_version"
 if test "$enable_mir_backend" = "maybe" ; then
   PKG_CHECK_EXISTS($MIR_DEPENDENCIES, [have_mir_deps=yes], [have_mir_deps=no])
   AC_MSG_CHECKING([for MIR_DEPENDENCIES])
@@ -590,22 +580,19 @@ PKG_CHECK_MODULES(BASE_DEPENDENCIES,
 
 PKG_CHECK_MODULES(CAIRO_BACKEND, [$cairo_backends])
 
-# Remove this check once cairo_required_version reaches at least 1.16.0
-AS_CASE([$host_os],
-  [mingw*],
-  [
+# Remove this check once cairo_required_version reaches at least 1.14.4
+case $host_os in
+  mingw*)
     PKG_CHECK_MODULES(CAIRO, [cairo >= cairo_required_version])
-    gtk_save_LIBS="$LIBS"
-    LIBS="$CAIRO_LIBS $LIBS"
     AC_CHECK_LIB([cairo], [cairo_win32_surface_create_with_format],
       [AC_MSG_RESULT([found])],
       [AC_MSG_ERROR(
 [cairo_win32_surface_create_with_format is not found in cairo library
-You need a cairo snapshot 1.15.x or 1.16.x release or newer])])
-    LIBS="$gtk_save_LIBS"
-  ],
-  []
-)
+You need cairo version newer than 2015-04-14])])
+    ;;
+  *)
+    ;;
+esac
 
 
 PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
@@ -695,7 +682,46 @@ if test "$gtk_ok" = "yes"; then
 	    [Define if _NL_PAPER_WIDTH is available])
 fi
 
+# i18n stuff
+ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
+AM_GLIB_GNU_GETTEXT
+
+AC_MSG_CHECKING([whether xgettext supports ui files])
+if $ac_cv_path_XGETTEXT --output=- --color=no --language=Glade $srcdir/gtk/ui/gtkfilechooserwidget.ui > /dev/null 2>&1; then
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([no])
+  AC_MSG_ERROR([GNU gettext 0.18.3 or newer is required])
+fi
+
 LIBS="$LIBS $INTLLIBS"
+AC_CONFIG_COMMANDS([po-properties],
+                   [[case "$CONFIG_FILES" in *po-properties/Makefile.in*)
+                       sed -e "/POTFILES =/r po-properties/POTFILES" po-properties/Makefile.in > po-properties/Makefile
+                     esac]],
+                   [[]])
+
+dnl Snippet below is copied from AM_GLIB_GNU_GETTEXT to generate a first
+dnl po-properties/POTFILES during configure; see GNOME #573515.
+dnl
+dnl Generate list of files to be processed by xgettext which will
+dnl be included in po-properties/Makefile.
+test -d po-properties || mkdir po-properties
+if test "x$srcdir" != "x."; then
+  if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+    popropsrcprefix="$srcdir/"
+  else
+    popropsrcprefix="../$srcdir/"
+  fi
+else
+  popropsrcprefix="../"
+fi
+rm -f po-properties/POTFILES
+sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$popropsrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+< $srcdir/po-properties/POTFILES.in > po-properties/POTFILES
+dnl (End of adapted AM_GLIB_GNU_GETTEXT snippet.)
+
+AM_GLIB_DEFINE_LOCALEDIR(GTK_LOCALEDIR)
 
 dnl The DU4 header files don't provide library prototypes unless
 dnl -std1 is given to the native cc.
@@ -730,54 +756,6 @@ case $host in
   ;;
 esac
 
-AS_CASE([$host_os],
-  [mingw*],
-  [
-    AC_CHECK_SIZEOF(
-      [DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY],
-      [],
-      [
-#define _WIN32_WINNT 0x601
-#include <windows.h>
-      ]
-    )
-    AS_IF(
-      [test x$ac_cv_sizeof_DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY = x4],
-      [AC_MSG_RESULT([DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY is OK])],
-      [test x$ac_cv_sizeof_DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY = x0],
-      [AC_MSG_ERROR([DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY is unavailable])],
-      [AC_MSG_RESULT([DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY is not OK])]
-    )
-    AC_MSG_CHECKING([for SetupDiGetDevicePropertyW])
-    gtk_save_LIBS="$LIBS"
-    LIBS="-lsetupapi $LIBS"
-    AC_TRY_LINK(
-      [
-#define _WIN32_WINNT 0x0600
-#include <windows.h>
-#include <devpropdef.h>
-#include <setupapi.h>
-      ],
-      [return SetupDiGetDevicePropertyW(NULL, NULL, NULL, NULL, NULL, 0, NULL, 0);],
-      [have_SetupDiGetDevicePropertyW=yes],
-      [have_SetupDiGetDevicePropertyW=no]
-    )
-    AS_IF(
-      [test x$have_SetupDiGetDevicePropertyW = xyes],
-      [
-       AC_DEFINE(
-         [HAVE_SETUP_DI_GET_DEVICE_PROPERTY_W],
-         [1],
-         [Define to 1 if SetupDiGetDevicePropertyW() is available]
-       )
-      ]
-    )
-    AC_MSG_RESULT([$have_SetupDiGetDevicePropertyW])
-    LIBS="$gtk_save_LIBS"
-  ],
-  []
-)
-
 AC_SUBST(MATH_LIB)
 #
 # see bug 162979
@@ -816,9 +794,6 @@ LIBS="$LIBS $GLIB_LIBS"
 AC_CHECK_FUNCS(bind_textdomain_codeset)
 LIBS=$gtk_save_LIBS
 
-AC_CHECK_HEADERS(linux/memfd.h,
-                 AC_DEFINE(HAVE_LINUX_MEMFD_H, 1,
-                           [Define to 1 if memfd.h is available]))
 AC_CHECK_HEADERS(sys/mman.h,
                  AC_DEFINE(HAVE_SYS_MMAN_H, 1,
                            [Define to 1 if mman.h is available]))
@@ -871,7 +846,7 @@ AC_TYPE_UID_T
 
 # Check for round(), rint(), isnan(), isinf() and nearbyint()
 AC_CHECK_LIB(m,round,,)
-AC_CHECK_FUNCS(round rint nearbyint sincos exp2 log2)
+AC_CHECK_FUNCS(round rint nearbyint sincos)
 AC_CHECK_DECLS([isnan, isinf], [], [], [[#include <math.h>]])
 
 # Checks for gdkspawn
@@ -1347,26 +1322,11 @@ else
         LIBS="$gtk_save_LIBS"
 fi
 
-# Check for libcloudproviders
-
-CLOUDPROVIDER_PACKAGES=""
-if test "x$cloudproviders_set" = "xyes"; then
-  CLOUDPROVIDER_PACKAGES="cloudproviders >= cloudproviders_required_version"
-  if $PKG_CONFIG --exists $CLOUDPROVIDER_PACKAGES ; then
-    AC_DEFINE(HAVE_CLOUDPROVIDERS, [1],
-              [Define if libcloudproviders is available]
-              )
-  else
-    AC_MSG_ERROR([
-*** libcloudproviders not found.])
-  fi
-fi
-
 CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"
 
 GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
-GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES"
+GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version"
 
 PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
 GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB"
@@ -1512,7 +1472,7 @@ else
     CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
     CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
 
-    if test $CUPS_API_MAJOR -lt 1 -o \
+    if test $CUPS_API_MAJOR -gt 1 -o \
             $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 2; then
       AC_MSG_ERROR([CUPS >= 1.2 not found])
     fi
@@ -1836,14 +1796,6 @@ case "$host" in
 esac
 AC_SUBST(GDK_HIDDEN_VISIBILITY_CFLAGS)
 
-##################################################
-# Theming
-##################################################
-
-AC_PATH_PROG([SASSC], [sassc])
-AC_ARG_VAR(SASSC)
-AM_CONDITIONAL([REBUILD_SCSS], [test "x$SASSC" != x])
-
 ##################################################
 # Output commands
 ##################################################
@@ -1914,13 +1866,6 @@ if test "x${enable_Bsymbolic}" = "xyes" ; then
 fi
 AC_SUBST(GTK_LINK_FLAGS)
 
-dnl
-dnl Check whether MSVC toolset is explicitly set
-dnl
-
-AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x])
-AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x])
-
 AC_CONFIG_FILES([
 README
 INSTALL
@@ -1975,6 +1920,7 @@ docs/reference/libgail-util/Makefile
 docs/reference/libgail-util/version.xml
 docs/tools/Makefile
 build/Makefile
+build/gtk-introspection-msvc.mak
 build/win32/Makefile
 build/win32/vs9/Makefile
 build/win32/vs9/gtk3-version-paths.vsprops
@@ -1983,7 +1929,6 @@ build/win32/vs10/gtk3-version-paths.props
 build/win32/vs11/Makefile
 build/win32/vs12/Makefile
 build/win32/vs14/Makefile
-build/win32/vs15/Makefile
 gdk/Makefile
 gdk/broadway/Makefile
 gdk/x11/Makefile

demos/gtk-demo/Makefile.am

@@ -14,7 +14,6 @@ demos_base =					\
 	combobox.c				\
 	css_accordion.c                         \
 	css_basics.c				\
-	css_blendmodes.c			\
 	css_multiplebgs.c			\
 	css_pixbufs.c				\
 	css_shadows.c				\
@@ -27,7 +26,6 @@ demos_base =					\
 	event_axes.c				\
 	expander.c  				\
         filtermodel.c				\
-	fishbowl.c				\
 	foreigndrawing.c			\
 	gestures.c				\
 	glarea.c				\
@@ -64,7 +62,6 @@ demos_base =					\
 	spinbutton.c				\
 	spinner.c				\
 	stack.c					\
-	tabs.c					\
 	textmask.c				\
 	textview.c				\
 	textscroll.c				\
@@ -138,8 +135,6 @@ nodist_gtk3_demo_SOURCES = demos.h
 
 gtk3_demo_SOURCES = 		\
 	$(demos)		\
-	gtkfishbowl.c		\
-	gtkfishbowl.h		\
 	demo_resources.c	\
 	main.c
 

demos/gtk-demo/blendmodes.ui

@@ -1,392 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="3.20"/>
-  <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
-    <property name="resizable">False</property>
-    <property name="title">CSS Blend Modes</property>
-    <property name="default_width">400</property>
-    <property name="default_height">300</property>
-    <child>
-      <object class="GtkGrid">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="border_width">12</property>
-        <property name="row_spacing">12</property>
-        <property name="column_spacing">12</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Blend mode:</property>
-            <property name="xalign">0</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="vexpand">True</property>
-            <property name="shadow_type">in</property>
-            <property name="min_content_width">150</property>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkStackSwitcher">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">center</property>
-            <property name="hexpand">True</property>
-            <property name="stack">stack</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkStack" id="stack">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="hhomogeneous">False</property>
-            <property name="vhomogeneous">False</property>
-            <property name="transition_type">crossfade</property>
-            <child>
-              <object class="GtkGrid">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="hexpand">False</property>
-                <property name="vexpand">True</property>
-                <property name="row_spacing">12</property>
-                <property name="column_spacing">12</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Duck</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Background</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <style>
-                      <class name="duck"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <style>
-                      <class name="gradient"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">
-Blended picture</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">center</property>
-                    <style>
-                      <class name="blend0"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="name">page0</property>
-                <property name="title" translatable="yes">Ducky</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkGrid">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="hexpand">False</property>
-                <property name="vexpand">True</property>
-                <property name="row_spacing">12</property>
-                <property name="column_spacing">12</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Red</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Blue</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <style>
-                      <class name="red"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <style>
-                      <class name="blue"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">
-Blended picture</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">center</property>
-                    <style>
-                      <class name="blend1"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="name">page1</property>
-                <property name="title" translatable="yes">Blends</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkGrid">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">12</property>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <style>
-                      <class name="cyan"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <style>
-                      <class name="magenta"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <style>
-                      <class name="yellow"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">center</property>
-                    <style>
-                      <class name="blend2"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Cyan</property>
-                    <property name="xalign">0</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Magenta</property>
-                    <property name="xalign">0</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Yellow</property>
-                    <property name="xalign">0</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Blended picture</property>
-                    <property name="xalign">0</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="name">page2</property>
-                <property name="title" translatable="yes">CMYK</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
-  </object>
-</interface>

demos/gtk-demo/clipboard.c

@@ -193,7 +193,7 @@ button_press (GtkWidget      *widget,
   gtk_widget_show (item);
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 
-  gtk_menu_popup_at_pointer (GTK_MENU (menu), (GdkEvent *) button);
+  gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 3, button->time);
   return TRUE;
 }
 

demos/gtk-demo/css_accordion.css

@@ -4,7 +4,7 @@
     transition-property: color, background-color, border-color, background-image, padding, border-width;
     transition-duration: 1s;
 
-    font: 20px Cantarell;
+    font: Cantarell 20px;
 }
 
 window {

demos/gtk-demo/css_blendmodes.c

@@ -1,146 +0,0 @@
-/* Theming/CSS Blend Modes
- *
- * You can blend multiple backgrounds using the CSS blend modes available.
- */
-
-#include <gtk/gtk.h>
-
-#define WID(x) ((GtkWidget*) gtk_builder_get_object (builder, x))
-
-/*
- * These are the available blend modes.
- */
-struct {
-  gchar *name;
-  gchar *id;
-} blend_modes[] =
-{
-  { "Color", "color" },
-  { "Color (burn)", "color-burn" },
-  { "Color (dodge)", "color-dodge" },
-  { "Darken", "darken" },
-  { "Difference", "difference" },
-  { "Exclusion", "exclusion" },
-  { "Hard Light", "hard-light" },
-  { "Hue", "hue" },
-  { "Lighten", "lighten" },
-  { "Luminosity", "luminosity" },
-  { "Multiply", "multiply" },
-  { "Normal", "normal" },
-  { "Overlay", "overlay" },
-  { "Saturate", "saturate" },
-  { "Screen", "screen" },
-  { "Soft Light", "soft-light" },
-  { NULL }
-};
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-static void
-update_css_for_blend_mode (GtkCssProvider *provider,
-                           const gchar    *blend_mode)
-{
-  GBytes *bytes;
-  gchar *css;
-
-  bytes = g_resources_lookup_data ("/css_blendmodes/css_blendmodes.css", 0, NULL);
-
-  css = g_strdup_printf ((gchar*) g_bytes_get_data (bytes, NULL),
-                         blend_mode,
-                         blend_mode,
-                         blend_mode);
-
-  gtk_css_provider_load_from_data (provider, css, -1, NULL);
-
-  g_bytes_unref (bytes);
-  g_free (css);
-}
-#pragma GCC diagnostic pop
-
-static void
-row_activated (GtkListBox     *listbox,
-               GtkListBoxRow  *row,
-               GtkCssProvider *provider)
-{
-  const gchar *blend_mode;
-
-  blend_mode = blend_modes[gtk_list_box_row_get_index (row)].id;
-
-  update_css_for_blend_mode (provider, blend_mode);
-}
-
-static void
-setup_listbox (GtkBuilder       *builder,
-               GtkStyleProvider *provider)
-{
-  GtkWidget *normal_row;
-  GtkWidget *listbox;
-  gint i;
-
-  normal_row = NULL;
-  listbox = gtk_list_box_new ();
-  gtk_container_add (GTK_CONTAINER (WID ("scrolledwindow")), listbox);
-
-  g_signal_connect (listbox, "row-activated", G_CALLBACK (row_activated), provider);
-
-  /* Add a row for each blend mode available */
-  for (i = 0; blend_modes[i].name != NULL; i++)
-    {
-      GtkWidget *label;
-      GtkWidget *row;
-
-      row = gtk_list_box_row_new ();
-      label = g_object_new (GTK_TYPE_LABEL,
-                            "label", blend_modes[i].name,
-                            "xalign", 0.0,
-                            NULL);
-
-      gtk_container_add (GTK_CONTAINER (row), label);
-
-      gtk_container_add (GTK_CONTAINER (listbox), row);
-
-      /* The first selected row is "normal" */
-      if (g_strcmp0 (blend_modes[i].id, "normal") == 0)
-        normal_row = row;
-    }
-
-  /* Select the "normal" row */
-  gtk_list_box_select_row (GTK_LIST_BOX (listbox), GTK_LIST_BOX_ROW (normal_row));
-  g_signal_emit_by_name (G_OBJECT (normal_row), "activate");
-
-  gtk_widget_grab_focus (normal_row);
-}
-
-GtkWidget *
-do_css_blendmodes (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkStyleProvider *provider;
-      GtkBuilder *builder;
-
-      builder = gtk_builder_new_from_resource ("/css_blendmodes/blendmodes.ui");
-
-      window = WID ("window");
-      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
-
-      /* Setup the CSS provider for window */
-      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
-
-      gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
-                                                 provider,
-                                                 GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-
-      setup_listbox (builder, provider);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/css_blendmodes.css

@@ -1,77 +0,0 @@
-/*
- * First page.
- */
-image.duck {
-    background-image: url('resource://css_blendmodes/ducky.png');
-    background-size: cover;
-    min-width: 200px;
-    min-height: 200px;
-}
-
-image.gradient {
-    background-image: linear-gradient(to right, red 0%%, green 50%%, blue 100%%);
-    min-width: 200px;
-    min-height: 200px;
-}
-
-/*
- * Second page.
- */
-image.red {
-    background: url('resource://css_blendmodes/blends.png') top center;
-    min-width: 200px;
-    min-height: 200px;
-}
-
-image.blue {
-    background: url('resource://css_blendmodes/blends.png') bottom center;
-    min-width: 200px;
-    min-height: 200px;
-}
-
-/*
- * Third page.
- */
-image.cyan {
-    background: url('resource://css_blendmodes/cmy.jpg') top center;
-    min-width: 200px;
-    min-height: 200px;
-}
-
-image.magenta {
-    background: url('resource://css_blendmodes/cmy.jpg') center center;
-    min-width: 200px;
-    min-height: 200px;
-}
-
-image.yellow {
-    background: url('resource://css_blendmodes/cmy.jpg') bottom center;
-    min-width: 200px;
-    min-height: 200px;
-}
-
-image.blend0 {
-  background-image: url('resource://css_blendmodes/ducky.png'),
-                    linear-gradient(to right, red 0%%, green 50%%, blue 100%%);
-  background-size: cover;
-  background-blend-mode: %s;
-  min-width: 200px;
-  min-height: 200px;
-}
-
-image.blend1 {
-  background: url('resource://css_blendmodes/blends.png') top center,
-              url('resource://css_blendmodes/blends.png') bottom center;
-  background-blend-mode: %s;
-  min-width: 200px;
-  min-height: 200px;
-}
-
-image.blend2 {
-  background: url('resource://css_blendmodes/cmy.jpg') top center,
-              url('resource://css_blendmodes/cmy.jpg') center center,
-              url('resource://css_blendmodes/cmy.jpg') bottom center;
-  background-blend-mode: %s;
-  min-width: 200px;
-  min-height: 200px;
-}

demos/gtk-demo/cssview.css

@@ -1,7 +1,7 @@
 /* Make the text editor has a nice style */
 .view {
   color: #2e3436;
-  font-family: Monospace;
+  font: Monospace;
   background-color: alpha(white, 0.30);
 }
 

demos/gtk-demo/demo.gresource.xml

@@ -20,13 +20,6 @@
     <file>css_basics.css</file>
     <file>reset.css</file>
   </gresource>
-  <gresource prefix="/css_blendmodes">
-    <file>css_blendmodes.css</file>
-    <file>blendmodes.ui</file>
-    <file>blends.png</file>
-    <file>ducky.png</file>
-    <file>cmy.jpg</file>
-  </gresource>
   <gresource prefix="/css_multiplebgs">
     <file>css_multiplebgs.css</file>
     <file>brick.png</file>
@@ -61,7 +54,6 @@
     <file>all_scroll_cursor.png</file>
     <file>cell_cursor.png</file>
     <file>col_resize_cursor.png</file>
-    <file>context_menu_cursor.png</file>
     <file>copy_cursor.png</file>
     <file>crosshair_cursor.png</file>
     <file>default_cursor.png</file>
@@ -94,11 +86,6 @@
     <file>zoom_in_cursor.png</file>
     <file>zoom_out_cursor.png</file>
   </gresource>
-  <gresource prefix="/fishbowl">
-    <file>fishbowl.ui</file>
-    <file>gtkfishbowl.c</file>
-    <file>gtkfishbowl.h</file>
-  </gresource>
   <gresource prefix="/iconview">
     <file preprocess="to-pixdata">gnome-fs-directory.png</file>
     <file preprocess="to-pixdata">gnome-fs-regular.png</file>
@@ -142,7 +129,6 @@
     <file>combobox.c</file>
     <file>css_accordion.c</file>
     <file>css_basics.c</file>
-    <file>css_blendmodes.c</file>
     <file>css_multiplebgs.c</file>
     <file>css_pixbufs.c</file>
     <file>css_shadows.c</file>
@@ -155,7 +141,6 @@
     <file>event_axes.c</file>
     <file>expander.c</file>
     <file>filtermodel.c</file>
-    <file>fishbowl.c</file>
     <file>flowbox.c</file>
     <file>foreigndrawing.c</file>
     <file>font_features.c</file>
@@ -194,7 +179,6 @@
     <file>stack.c</file>
     <file>spinbutton.c</file>
     <file>spinner.c</file>
-    <file>tabs.c</file>
     <file>textview.c</file>
     <file>textscroll.c</file>
     <file>theming_style_classes.c</file>
@@ -215,10 +199,8 @@
     <file>popover.ui</file>
   </gresource>
   <gresource prefix="/glarea">
-    <file>glarea-gl.fs.glsl</file>
-    <file>glarea-gl.vs.glsl</file>
-    <file>glarea-gles.fs.glsl</file>
-    <file>glarea-gles.vs.glsl</file>
+    <file>glarea-fragment.glsl</file>
+    <file>glarea-vertex.glsl</file>
   </gresource>
   <gresource prefix="/font_features">
     <file>font-features.ui</file>

demos/gtk-demo/event_axes.c

@@ -1,12 +1,11 @@
-/* Touch and Drawing Tablets
+/* Event Axes
  *
  * Demonstrates advanced handling of event information from exotic
  * input devices.
  *
- * On one hand, this snippet demonstrates management of drawing tablets,
+ * On one hand, this snippet demonstrates management of input axes,
  * those contain additional information for the pointer other than
- * X/Y coordinates. Tablet pads events are mapped to actions, which
- * are both defined and interpreted by the application.
+ * X/Y coordinates.
  *
  * Input axes are dependent on hardware devices, on linux/unix you
  * can see the device axes through xinput list <device>. Each time
@@ -21,20 +20,18 @@
  * touchpoints can be tracked.
  */
 
-#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
 typedef struct {
   GdkDevice *last_source;
-  GdkDeviceTool *last_tool;
-  gdouble *axes;
+  GHashTable *axes; /* axis label atom -> value */
   GdkRGBA color;
   gdouble x;
   gdouble y;
 } AxesInfo;
 
 typedef struct {
-  GHashTable *pointer_info; /* GdkDevice -> AxesInfo */
+  AxesInfo *pointer_info;
   GHashTable *touch_info; /* GdkEventSequence -> AxesInfo */
 } EventData;
 
@@ -53,30 +50,7 @@ const gchar *colors[] = {
   "burlywood"
 };
 
-static GtkPadActionEntry pad_actions[] = {
-  { GTK_PAD_ACTION_BUTTON, 1, -1, N_("Nuclear strike"), "pad.nuke" },
-  { GTK_PAD_ACTION_BUTTON, 2, -1, N_("Release siberian methane reserves"), "pad.heat" },
-  { GTK_PAD_ACTION_BUTTON, 3, -1, N_("Release solar flare"), "pad.fry" },
-  { GTK_PAD_ACTION_BUTTON, 4, -1, N_("De-stabilize Oort cloud"), "pad.fall" },
-  { GTK_PAD_ACTION_BUTTON, 5, -1, N_("Ignite WR-104"), "pad.burst" },
-  { GTK_PAD_ACTION_BUTTON, 6, -1, N_("Lart whoever asks about this button"), "pad.lart" },
-  { GTK_PAD_ACTION_RING, -1, -1, N_("Earth axial tilt"), "pad.tilt" },
-  { GTK_PAD_ACTION_STRIP, -1, -1, N_("Extent of weak nuclear force"), "pad.dissolve" },
-};
-
-static const gchar *pad_action_results[] = {
-  "☢",
-  "♨",
-  "☼",
-  "☄",
-  "⚡",
-  "💫",
-  "◑",
-  "⚛"
-};
-
 static guint cur_color = 0;
-static guint pad_action_timeout_id = 0;
 
 static AxesInfo *
 axes_info_new (void)
@@ -85,22 +59,51 @@ axes_info_new (void)
 
   info = g_new0 (AxesInfo, 1);
   gdk_rgba_parse (&info->color, colors[cur_color]);
+  info->axes = g_hash_table_new_full (NULL, NULL, NULL,
+                                      (GDestroyNotify) g_free);
 
   cur_color = (cur_color + 1) % G_N_ELEMENTS (colors);
 
   return info;
 }
 
+static void
+axes_info_free (AxesInfo *info)
+{
+  g_hash_table_destroy (info->axes);
+  g_free (info);
+}
+
+static gboolean
+axes_info_lookup (AxesInfo    *info,
+                  const gchar *axis_label,
+                  gdouble     *value)
+{
+  gdouble *val;
+  GdkAtom atom;
+
+  atom = gdk_atom_intern (axis_label, FALSE);
+
+  if (atom == GDK_NONE)
+    return FALSE;
+
+  val = g_hash_table_lookup (info->axes, GDK_ATOM_TO_POINTER (atom));
+
+  if (!val)
+    return FALSE;
+
+  *value = *val;
+  return TRUE;
+}
+
 static EventData *
 event_data_new (void)
 {
   EventData *data;
 
   data = g_new0 (EventData, 1);
-  data->pointer_info = g_hash_table_new_full (NULL, NULL, NULL,
-                                              (GDestroyNotify) g_free);
   data->touch_info = g_hash_table_new_full (NULL, NULL, NULL,
-                                            (GDestroyNotify) g_free);
+                                            (GDestroyNotify) axes_info_free);
 
   return data;
 }
@@ -108,7 +111,8 @@ event_data_new (void)
 static void
 event_data_free (EventData *data)
 {
-  g_hash_table_destroy (data->pointer_info);
+  if (data->pointer_info)
+    axes_info_free (data->pointer_info);
   g_hash_table_destroy (data->touch_info);
   g_free (data);
 }
@@ -119,14 +123,13 @@ update_axes_from_event (GdkEvent  *event,
 {
   GdkDevice *device, *source_device;
   GdkEventSequence *sequence;
-  GdkDeviceTool *tool;
-  gdouble x, y;
+  gdouble x, y, value;
+  GList *l, *axes;
   AxesInfo *info;
 
   device = gdk_event_get_device (event);
   source_device = gdk_event_get_source_device (event);
   sequence = gdk_event_get_event_sequence (event);
-  tool = gdk_event_get_device_tool (event);
 
   if (event->type == GDK_TOUCH_END ||
       event->type == GDK_TOUCH_CANCEL)
@@ -136,19 +139,17 @@ update_axes_from_event (GdkEvent  *event,
     }
   else if (event->type == GDK_LEAVE_NOTIFY)
     {
-      g_hash_table_remove (data->pointer_info, device);
+      if (data->pointer_info)
+        axes_info_free (data->pointer_info);
+      data->pointer_info = NULL;
       return;
     }
 
   if (!sequence)
     {
-      info = g_hash_table_lookup (data->pointer_info, device);
-
-      if (!info)
-        {
-          info = axes_info_new ();
-          g_hash_table_insert (data->pointer_info, device, info);
-        }
+      if (!data->pointer_info)
+        data->pointer_info = axes_info_new ();
+      info = data->pointer_info;
     }
   else
     {
@@ -162,31 +163,41 @@ update_axes_from_event (GdkEvent  *event,
     }
 
   if (info->last_source != source_device)
-    info->last_source = source_device;
-
-  if (info->last_tool != tool)
-    info->last_tool = tool;
-
-  g_clear_pointer (&info->axes, g_free);
+    {
+      g_hash_table_remove_all (info->axes);
+      info->last_source = source_device;
+    }
 
   if (event->type == GDK_TOUCH_BEGIN ||
-      event->type == GDK_TOUCH_UPDATE)
+      event->type == GDK_TOUCH_UPDATE ||
+      event->type == GDK_MOTION_NOTIFY ||
+      event->type == GDK_BUTTON_PRESS ||
+      event->type == GDK_BUTTON_RELEASE)
     {
+      axes = gdk_device_list_axes (device);
+
       if (sequence && event->touch.emulating_pointer)
-        g_hash_table_remove (data->pointer_info, device);
-    }
-  if (event->type == GDK_MOTION_NOTIFY)
-    {
-      info->axes =
-      g_memdup (event->motion.axes,
-                sizeof (gdouble) * gdk_device_get_n_axes (source_device));
-    }
-  else if (event->type == GDK_BUTTON_PRESS ||
-           event->type == GDK_BUTTON_RELEASE)
-    {
-      info->axes =
-      g_memdup (event->button.axes,
-                sizeof (gdouble) * gdk_device_get_n_axes (source_device));
+        {
+          if (data->pointer_info)
+            axes_info_free (data->pointer_info);
+          data->pointer_info = NULL;
+        }
+
+      for (l = axes; l; l = l->next)
+        {
+          gdouble *ptr;
+
+          /* All those event types are compatible wrt axes position in the struct */
+          if (!gdk_device_get_axis_value (device, event->motion.axes,
+                                          l->data, &value))
+            continue;
+
+          ptr = g_new0 (gdouble, 1);
+          *ptr = value;
+          g_hash_table_insert (info->axes, GDK_ATOM_TO_POINTER (l->data), ptr);
+        }
+
+      g_list_free (axes);
     }
 
   if (gdk_event_get_coords (event, &x, &y))
@@ -231,8 +242,7 @@ draw_axes_info (cairo_t       *cr,
                 AxesInfo      *info,
                 GtkAllocation *allocation)
 {
-  gdouble pressure, tilt_x, tilt_y, distance, wheel, rotation, slider;
-  GdkAxisFlags axes = gdk_device_get_axes (info->last_source);
+  gdouble pressure, tilt_x, tilt_y, wheel;
 
   cairo_save (cr);
 
@@ -247,19 +257,10 @@ draw_axes_info (cairo_t       *cr,
 
   cairo_translate (cr, info->x, info->y);
 
-  if (!info->axes)
-    {
-      cairo_restore (cr);
-      return;
-    }
-
-  if (axes & GDK_AXIS_FLAG_PRESSURE)
+  if (axes_info_lookup (info, "Abs Pressure", &pressure))
     {
       cairo_pattern_t *pattern;
 
-      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_PRESSURE,
-                           &pressure);
-
       pattern = cairo_pattern_create_radial (0, 0, 0, 0, 0, 100);
       cairo_pattern_add_color_stop_rgba (pattern, pressure, 1, 0, 0, pressure);
       cairo_pattern_add_color_stop_rgba (pattern, 1, 0, 0, 1, 0);
@@ -272,49 +273,12 @@ draw_axes_info (cairo_t       *cr,
       cairo_pattern_destroy (pattern);
     }
 
-  if (axes & GDK_AXIS_FLAG_XTILT &&
-      axes & GDK_AXIS_FLAG_YTILT)
+  if (axes_info_lookup (info, "Abs Tilt X", &tilt_x) &&
+      axes_info_lookup (info, "Abs Tilt Y", &tilt_y))
+    render_arrow (cr, tilt_x * 100, tilt_y * 100, "Tilt");
+
+  if (axes_info_lookup (info, "Abs Wheel", &wheel))
     {
-      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_XTILT,
-                           &tilt_x);
-      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_YTILT,
-                           &tilt_y);
-
-      render_arrow (cr, tilt_x * 100, tilt_y * 100, "Tilt");
-    }
-
-  if (axes & GDK_AXIS_FLAG_DISTANCE)
-    {
-      double dashes[] = { 5.0, 5.0 };
-      cairo_text_extents_t extents;
-
-      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_DISTANCE,
-                           &distance);
-
-      cairo_save (cr);
-
-      cairo_move_to (cr, distance * 100, 0);
-
-      cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
-      cairo_set_dash (cr, dashes, 2, 0.0);
-      cairo_arc (cr, 0, 0, distance * 100, 0, 2 * G_PI);
-      cairo_stroke (cr);
-
-      cairo_move_to (cr, 0, -distance * 100);
-      cairo_text_extents (cr, "Distance", &extents);
-      cairo_rel_move_to (cr, -extents.width / 2, 0);
-      cairo_show_text (cr, "Distance");
-
-      cairo_move_to (cr, 0, 0);
-
-      cairo_restore (cr);
-    }
-
-  if (axes & GDK_AXIS_FLAG_WHEEL)
-    {
-      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_WHEEL,
-                           &wheel);
-
       cairo_save (cr);
       cairo_set_line_width (cr, 10);
       cairo_set_source_rgba (cr, 0, 0, 0, 0.5);
@@ -325,88 +289,9 @@ draw_axes_info (cairo_t       *cr,
       cairo_restore (cr);
     }
 
-  if (axes & GDK_AXIS_FLAG_ROTATION)
-    {
-      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_ROTATION,
-                           &rotation);
-      rotation *= 2 * G_PI;
-
-      cairo_save (cr);
-      cairo_rotate (cr, - G_PI / 2);
-      cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
-      cairo_set_line_width (cr, 5);
-
-      cairo_new_sub_path (cr);
-      cairo_arc (cr, 0, 0, 100, 0, rotation);
-      cairo_stroke (cr);
-      cairo_restore (cr);
-    }
-
-  if (axes & GDK_AXIS_FLAG_SLIDER)
-    {
-      cairo_pattern_t *pattern, *mask;
-
-      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_SLIDER,
-                           &slider);
-
-      cairo_save (cr);
-
-      cairo_move_to (cr, 0, -10);
-      cairo_rel_line_to (cr, 0, -50);
-      cairo_rel_line_to (cr, 10, 0);
-      cairo_rel_line_to (cr, -5, 50);
-      cairo_close_path (cr);
-
-      cairo_clip_preserve (cr);
-
-      pattern = cairo_pattern_create_linear (0, -10, 0, -60);
-      cairo_pattern_add_color_stop_rgb (pattern, 0, 0, 1, 0);
-      cairo_pattern_add_color_stop_rgb (pattern, 1, 1, 0, 0);
-      cairo_set_source (cr, pattern);
-      cairo_pattern_destroy (pattern);
-
-      mask = cairo_pattern_create_linear (0, -10, 0, -60);
-      cairo_pattern_add_color_stop_rgba (mask, 0, 0, 0, 0, 1);
-      cairo_pattern_add_color_stop_rgba (mask, slider, 0, 0, 0, 1);
-      cairo_pattern_add_color_stop_rgba (mask, slider, 0, 0, 0, 0);
-      cairo_pattern_add_color_stop_rgba (mask, 1, 0, 0, 0, 0);
-      cairo_mask (cr, mask);
-      cairo_pattern_destroy (mask);
-
-      cairo_set_source_rgb (cr, 0, 0, 0);
-      cairo_stroke (cr);
-
-      cairo_restore (cr);
-    }
-
   cairo_restore (cr);
 }
 
-static const gchar *
-tool_type_to_string (GdkDeviceToolType tool_type)
-{
-  switch (tool_type)
-    {
-    case GDK_DEVICE_TOOL_TYPE_PEN:
-      return "Pen";
-    case GDK_DEVICE_TOOL_TYPE_ERASER:
-      return "Eraser";
-    case GDK_DEVICE_TOOL_TYPE_BRUSH:
-      return "Brush";
-    case GDK_DEVICE_TOOL_TYPE_PENCIL:
-      return "Pencil";
-    case GDK_DEVICE_TOOL_TYPE_AIRBRUSH:
-      return "Airbrush";
-    case GDK_DEVICE_TOOL_TYPE_MOUSE:
-      return "Mouse";
-    case GDK_DEVICE_TOOL_TYPE_LENS:
-      return "Lens cursor";
-    case GDK_DEVICE_TOOL_TYPE_UNKNOWN:
-    default:
-      return "Unknown";
-    }
-}
-
 static void
 draw_device_info (GtkWidget        *widget,
                   cairo_t          *cr,
@@ -428,19 +313,6 @@ draw_device_info (GtkWidget        *widget,
     g_string_append_printf (string, "\nSequence: %d",
                             GPOINTER_TO_UINT (sequence));
 
-  if (info->last_tool)
-    {
-      const gchar *tool_type;
-      guint64 serial;
-
-      tool_type = tool_type_to_string (gdk_device_tool_get_tool_type (info->last_tool));
-      serial = gdk_device_tool_get_serial (info->last_tool);
-      g_string_append_printf (string, "\nTool: %s", tool_type);
-
-      if (serial != 0)
-        g_string_append_printf (string, ", Serial: %lx", serial);
-    }
-
   cairo_move_to (cr, 10, *y);
   layout = gtk_widget_create_pango_layout (widget, string->str);
   pango_cairo_show_layout (cr, layout);
@@ -469,7 +341,7 @@ draw_cb (GtkWidget *widget,
 {
   EventData *data = user_data;
   GtkAllocation allocation;
-  AxesInfo *info;
+  AxesInfo *touch_info;
   GHashTableIter iter;
   gpointer key, value;
   gint y = 0;
@@ -477,144 +349,38 @@ draw_cb (GtkWidget *widget,
   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);
-    }
+  if (data->pointer_info)
+    draw_axes_info (cr, data->pointer_info, &allocation);
 
   g_hash_table_iter_init (&iter, data->touch_info);
 
   while (g_hash_table_iter_next (&iter, NULL, &value))
     {
-      info = value;
-      draw_axes_info (cr, info, &allocation);
+      touch_info = value;
+      draw_axes_info (cr, touch_info, &allocation);
     }
 
   /* Draw name, color legend and misc data */
-  g_hash_table_iter_init (&iter, data->pointer_info);
-
-  while (g_hash_table_iter_next (&iter, NULL, &value))
-    {
-      info = value;
-      draw_device_info (widget, cr, NULL, &y, info);
-    }
+  if (data->pointer_info)
+    draw_device_info (widget, cr, NULL, &y, data->pointer_info);
 
   g_hash_table_iter_init (&iter, data->touch_info);
 
   while (g_hash_table_iter_next (&iter, &key, &value))
     {
-      info = value;
-      draw_device_info (widget, cr, key, &y, info);
+      touch_info = value;
+      draw_device_info (widget, cr, key, &y, touch_info);
     }
 
   return FALSE;
 }
 
-static void
-update_label_text (GtkWidget   *label,
-                   const gchar *text)
-{
-  gchar *markup = NULL;
-
-  if (text)
-    markup = g_strdup_printf ("<span font='48.0'>%s</span>", text);
-  gtk_label_set_markup (GTK_LABEL (label), markup);
-  g_free (markup);
-}
-
-static gboolean
-reset_label_text_timeout_cb (gpointer user_data)
-{
-  GtkWidget *label = user_data;
-
-  update_label_text (label, NULL);
-  pad_action_timeout_id = 0;
-  return G_SOURCE_REMOVE;
-}
-
-static void
-update_label_and_timeout (GtkWidget   *label,
-                          const gchar *text)
-{
-  if (pad_action_timeout_id)
-    g_source_remove (pad_action_timeout_id);
-
-  update_label_text (label, text);
-  pad_action_timeout_id = g_timeout_add (200, reset_label_text_timeout_cb, label);
-}
-
-static void
-on_action_activate (GSimpleAction *action,
-                    GVariant      *parameter,
-                    gpointer       user_data)
-{
-  GtkWidget *label = user_data;
-  const gchar *result;
-  gchar *str;
-
-  result = g_object_get_data (G_OBJECT (action), "action-result");
-
-  if (!parameter)
-    update_label_and_timeout (label, result);
-  else
-    {
-      str = g_strdup_printf ("%s %.2f", result, g_variant_get_double (parameter));
-      update_label_and_timeout (label, str);
-      g_free (str);
-    }
-}
-
-static void
-init_pad_controller (GtkWidget *window,
-                     GtkWidget *label)
-{
-  GtkPadController *pad_controller;
-  GSimpleActionGroup *action_group;
-  GSimpleAction *action;
-  gint i;
-
-  action_group = g_simple_action_group_new ();
-  pad_controller = gtk_pad_controller_new (GTK_WINDOW (window),
-                                           G_ACTION_GROUP (action_group),
-                                           NULL);
-
-  for (i = 0; i < G_N_ELEMENTS (pad_actions); i++)
-    {
-      if (pad_actions[i].type == GTK_PAD_ACTION_BUTTON)
-        {
-          action = g_simple_action_new (pad_actions[i].action_name, NULL);
-        }
-      else
-        {
-          action = g_simple_action_new_stateful (pad_actions[i].action_name,
-                                                 G_VARIANT_TYPE_DOUBLE, NULL);
-        }
-
-      g_signal_connect (action, "activate",
-                        G_CALLBACK (on_action_activate), label);
-      g_object_set_data (G_OBJECT (action), "action-result",
-                         (gpointer) pad_action_results[i]);
-      g_action_map_add_action (G_ACTION_MAP (action_group), G_ACTION (action));
-      g_object_unref (action);
-    }
-
-  gtk_pad_controller_set_action_entries (pad_controller, pad_actions,
-                                         G_N_ELEMENTS (pad_actions));
-  g_object_set_data_full (G_OBJECT (window), "pad-controller",
-                          pad_controller, g_object_unref);
-
-  g_object_unref (action_group);
-}
-
 GtkWidget *
 do_event_axes (GtkWidget *toplevel)
 {
   static GtkWidget *window = NULL;
   EventData *event_data;
-  GtkWidget *box, *label;
+  GtkWidget *box;
 
   if (!window)
     {
@@ -627,14 +393,11 @@ do_event_axes (GtkWidget *toplevel)
 
       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);
 
       event_data = event_data_new ();
@@ -645,12 +408,6 @@ do_event_axes (GtkWidget *toplevel)
                         G_CALLBACK (event_cb), event_data);
       g_signal_connect (box, "draw",
                         G_CALLBACK (draw_cb), event_data);
-
-      label = gtk_label_new ("");
-      gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-      gtk_container_add (GTK_CONTAINER (box), label);
-
-      init_pad_controller (window, label);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/filtermodel.c

@@ -6,7 +6,6 @@
  */
 
 #include <gtk/gtk.h>
-#include <stdlib.h>
 
 enum {
   WIDTH_COLUMN,
@@ -84,28 +83,6 @@ visible_func (GtkTreeModel *model,
   return width < 10;
 }
 
-static void
-cell_edited (GtkCellRendererSpin *cell,
-             const char          *path_string,
-             const char          *new_text,
-             GtkListStore        *store)
-{
-  int val;
-  GtkTreePath *path;
-  GtkTreeIter iter;
-  int column;
-
-  path = gtk_tree_path_new_from_string (path_string);
-  gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path);
-  gtk_tree_path_free (path);
-
-  column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (cell), "column"));
-
-  val = atoi (new_text);
-
-  gtk_list_store_set (store, &iter, column, val, -1);
-}
-
 GtkWidget *
 do_filtermodel (GtkWidget *do_widget)
 {
@@ -129,21 +106,15 @@ do_filtermodel (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
-      store = (GtkListStore*)gtk_builder_get_object (builder, "liststore1");
-
       column = (GtkTreeViewColumn*)gtk_builder_get_object (builder, "treeviewcolumn1");
       cell = (GtkCellRenderer*)gtk_builder_get_object (builder, "cellrenderertext1");
       gtk_tree_view_column_set_cell_data_func (column, cell,
                                                format_number, GINT_TO_POINTER (WIDTH_COLUMN), NULL);
-      g_object_set_data (G_OBJECT (cell), "column", GINT_TO_POINTER (WIDTH_COLUMN));
-      g_signal_connect (cell, "edited", G_CALLBACK (cell_edited), store);
 
       column = (GtkTreeViewColumn*)gtk_builder_get_object (builder, "treeviewcolumn2");
       cell = (GtkCellRenderer*)gtk_builder_get_object (builder, "cellrenderertext2");
       gtk_tree_view_column_set_cell_data_func (column, cell,
                                                format_number, GINT_TO_POINTER (HEIGHT_COLUMN), NULL);
-      g_object_set_data (G_OBJECT (cell), "column", GINT_TO_POINTER (HEIGHT_COLUMN));
-      g_signal_connect (cell, "edited", G_CALLBACK (cell_edited), store);
 
       column = (GtkTreeViewColumn*)gtk_builder_get_object (builder, "treeviewcolumn3");
       cell = (GtkCellRenderer*)gtk_builder_get_object (builder, "cellrenderertext3");
@@ -164,6 +135,7 @@ do_filtermodel (GtkWidget *do_widget)
       cell = (GtkCellRenderer*)gtk_builder_get_object (builder, "cellrendererpixbuf1");
       gtk_tree_view_column_add_attribute (column, cell, "visible", SQUARE_COLUMN);
 
+      store = (GtkListStore*)gtk_builder_get_object (builder, "liststore1");
       tree = (GtkWidget*)gtk_builder_get_object (builder, "treeview2");
 
       types[WIDTH_COLUMN] = G_TYPE_INT;

demos/gtk-demo/filtermodel.ui

@@ -24,12 +24,6 @@
       </row>
     </data>
   </object>
-  <object class="GtkAdjustment" id="adj">
-    <property name="lower">5</property>
-    <property name="upper">50</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">5</property>
-  </object>
   <object class="GtkWindow" id="window1">
     <property name="title" translatable="yes">Filter Model</property>
     <child>
@@ -69,10 +63,7 @@
               <object class="GtkTreeViewColumn" id="treeviewcolumn1">
                 <property name="title" translatable="yes">Width</property>
                 <child>
-                  <object class="GtkCellRendererSpin" id="cellrenderertext1">
-                    <property name="editable">1</property>
-                    <property name="adjustment">adj</property>
-                  </object>
+                  <object class="GtkCellRendererText" id="cellrenderertext1"/>
                 </child>
               </object>
             </child>
@@ -80,10 +71,7 @@
               <object class="GtkTreeViewColumn" id="treeviewcolumn2">
                 <property name="title" translatable="yes">Height</property>
                 <child>
-                  <object class="GtkCellRendererSpin" id="cellrenderertext2">
-                    <property name="editable">1</property>
-                    <property name="adjustment">adj</property>
-                  </object>
+                  <object class="GtkCellRendererText" id="cellrenderertext2"/>
                 </child>
               </object>
             </child>

demos/gtk-demo/fishbowl.c

@@ -1,178 +0,0 @@
-/* Benchmark/Fishbowl
- *
- * 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 ("icons - %.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_fishbowl (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"));
-      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/gtk-demo/fishbowl.ui

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.6 -->
-  <object class="GtkWindow" id="window">
-    <property name="title" translatable="yes">Fishbowl</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="">
-        <property name="visible">True</property>
-        <property name="show-close-button">True</property>
-        <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>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="label" bind-source="bowl" bind-property="count">0</property>
-          </object>
-          <packing>
-            <property name="pack_type">end</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToggleButton" id="changes_allow">
-            <property name="active">False</property>
-            <property name="visible" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean">True</property>
-            <property name="relief">none</property>
-            <child>
-              <object class="GtkImage">
-                <property name="icon-name">changes-allow</property>
-                <property name="visible">True</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="pack_type">end</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToggleButton" id="changes_prevent">
-            <property name="active" bind-source="changes_allow" bind-property="active" bind-flags="bidirectional|invert-boolean">True</property>
-            <property name="visible" bind-source="changes_prevent" bind-property="active" bind-flags="invert-boolean">False</property>
-            <property name="relief">none</property>
-            <child>
-              <object class="GtkImage">
-                <property name="icon-name">changes-prevent</property>
-                <property name="visible">True</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="pack_type">end</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkFishbowl" id="bowl">
-        <property name="visible">True</property>
-        <property name="animating">True</property>
-      </object>
-    </child>
-  </object>
-</interface>

demos/gtk-demo/foreigndrawing.c

@@ -836,7 +836,7 @@ draw_spinbutton (GtkWidget *widget,
 
   /* This information is taken from the GtkSpinButton docs, see "CSS nodes" */
   spin_context = get_style (NULL, "spinbutton.horizontal:focus");
-  entry_context = get_style (spin_context, "entry:focus");
+  entry_context = get_style (NULL, "entry:focus");
   up_context = get_style (spin_context, "button.up:focus:active");
   down_context = get_style (spin_context, "button.down:focus");
 

demos/gtk-demo/gestures.c

@@ -13,17 +13,6 @@ static gdouble swipe_x = 0;
 static gdouble swipe_y = 0;
 static gboolean long_pressed = FALSE;
 
-static gboolean
-touchpad_swipe_gesture_begin (GtkGesture       *gesture,
-                              GdkEventSequence *sequence,
-                              GtkWidget        *widget)
-{
-  /* Disallow touchscreen events here */
-  if (sequence != NULL)
-    gtk_gesture_set_state (gesture, GTK_EVENT_SEQUENCE_DENIED);
-  return sequence == NULL;
-}
-
 static void
 swipe_gesture_swept (GtkGestureSwipe *gesture,
                      gdouble          velocity_x,
@@ -172,19 +161,6 @@ do_gestures (GtkWidget *do_widget)
                                                   GTK_PHASE_BUBBLE);
       g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
 
-      /* 3fg swipe for touchpads */
-      gesture = g_object_new (GTK_TYPE_GESTURE_SWIPE,
-                              "widget", drawing_area,
-                              "n-points", 3,
-                              NULL);
-      g_signal_connect (gesture, "begin",
-                        G_CALLBACK (touchpad_swipe_gesture_begin), drawing_area);
-      g_signal_connect (gesture, "swipe",
-                        G_CALLBACK (swipe_gesture_swept), drawing_area);
-      gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
-                                                  GTK_PHASE_BUBBLE);
-      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
-
       /* Long press */
       gesture = gtk_gesture_long_press_new (drawing_area);
       g_signal_connect (gesture, "pressed",

demos/gtk-demo/glarea-gles.fs.glsl

@@ -1,7 +0,0 @@
-precision mediump float;
-
-void main() {
-  float lerpVal = gl_FragCoord.y / 500.0;
-
-  gl_FragColor = mix(vec4(1.0, 0.85, 0.35, 1.0), vec4(0.2, 0.2, 0.2, 1.0), lerpVal);
-}

demos/gtk-demo/glarea-gles.vs.glsl

@@ -1,7 +0,0 @@
-attribute vec4 position;
-
-uniform mat4 mvp;
-
-void main() {
-  gl_Position = mvp * position;
-}

demos/gtk-demo/glarea.c

@@ -93,9 +93,7 @@ create_shader (int         type,
 
 /* Initialize the shaders and link them into a program */
 static void
-init_shaders (const char *vertex_path,
-              const char *fragment_path,
-              GLuint *program_out,
+init_shaders (GLuint *program_out,
               GLuint *mvp_out)
 {
   GLuint vertex, fragment;
@@ -104,7 +102,7 @@ init_shaders (const char *vertex_path,
   int status;
   GBytes *source;
 
-  source = g_resources_lookup_data (vertex_path, 0, NULL);
+  source = g_resources_lookup_data ("/glarea/glarea-vertex.glsl", 0, NULL);
   vertex = create_shader (GL_VERTEX_SHADER, g_bytes_get_data (source, NULL));
   g_bytes_unref (source);
 
@@ -114,7 +112,7 @@ init_shaders (const char *vertex_path,
       return;
     }
 
-  source = g_resources_lookup_data (fragment_path, 0, NULL);
+  source = g_resources_lookup_data ("/glarea/glarea-fragment.glsl", 0, NULL);
   fragment = create_shader (GL_FRAGMENT_SHADER, g_bytes_get_data (source, NULL));
   g_bytes_unref (source);
 
@@ -220,29 +218,13 @@ static GLuint mvp_location;
 static void
 realize (GtkWidget *widget)
 {
-  const char *vertex_path, *fragment_path;
-  GdkGLContext *context;
-
   gtk_gl_area_make_current (GTK_GL_AREA (widget));
 
   if (gtk_gl_area_get_error (GTK_GL_AREA (widget)) != NULL)
     return;
 
-  context = gtk_gl_area_get_context (GTK_GL_AREA (widget));
-
-  if (gdk_gl_context_get_use_es (context))
-    {
-      vertex_path = "/glarea/glarea-gles.vs.glsl";
-      fragment_path = "/glarea/glarea-gles.fs.glsl";
-    }
-  else
-    {
-      vertex_path = "/glarea/glarea-gl.vs.glsl";
-      fragment_path = "/glarea/glarea-gl.fs.glsl";
-    }
-
   init_buffers (&position_buffer, NULL);
-  init_shaders (vertex_path, fragment_path, &program, &mvp_location);
+  init_shaders (&program, &mvp_location);
 }
 
 /* We should tear down the state when unrealizing */
@@ -333,7 +315,7 @@ create_axis_slider (int axis)
   GtkAdjustment *adj;
   const char *text;
 
-  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
 
   switch (axis)
     {

demos/gtk-demo/gtkfishbowl.c

@@ -1,581 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2017 Benjamin Otte <otte@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include "gtkfishbowl.h"
-
-#include "gtk/fallback-c89.c"
-
-typedef struct _GtkFishbowlPrivate       GtkFishbowlPrivate;
-typedef struct _GtkFishbowlChild         GtkFishbowlChild;
-
-struct _GtkFishbowlPrivate
-{
-  GList *children;
-  guint count;
-
-  gint64 last_frame_time;
-  guint tick_id;
-};
-
-struct _GtkFishbowlChild
-{
-  GtkWidget *widget;
-  double x;
-  double y;
-  double dx;
-  double dy;
-};
-
-enum {
-   PROP_0,
-   PROP_ANIMATING,
-   PROP_COUNT,
-   NUM_PROPERTIES
-};
-
-static GParamSpec *props[NUM_PROPERTIES] = { NULL, };
-
-G_DEFINE_TYPE_WITH_PRIVATE (GtkFishbowl, gtk_fishbowl, GTK_TYPE_CONTAINER)
-
-static void
-gtk_fishbowl_init (GtkFishbowl *fishbowl)
-{
-  gtk_widget_set_has_window (GTK_WIDGET (fishbowl), FALSE);
-}
-
-/**
- * gtk_fishbowl_new:
- *
- * Creates a new #GtkFishbowl.
- *
- * Returns: a new #GtkFishbowl.
- */
-GtkWidget*
-gtk_fishbowl_new (void)
-{
-  return g_object_new (GTK_TYPE_FISHBOWL, NULL);
-}
-
-static void
-gtk_widget_measure (GtkWidget      *widget,
-                    GtkOrientation  orientation,
-                    gint            size,
-                    gint           *minimum,
-                    gint           *natural,
-                    gint           *minimum_baseline,
-                    gint           *natural_baseline)
-{
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (size >= -1);
-
-  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    {
-      if (size < 0)
-        gtk_widget_get_preferred_width (widget, minimum, natural);
-      else
-        gtk_widget_get_preferred_width_for_height (widget, size, minimum, natural);
-
-      if (minimum_baseline)
-        *minimum_baseline = -1;
-      if (natural_baseline)
-        *natural_baseline = -1;
-    }
-  else
-    {
-      gtk_widget_get_preferred_height_and_baseline_for_width (widget,
-                                                              size,
-                                                              minimum,
-                                                              natural,
-                                                              minimum_baseline,
-                                                              natural_baseline);
-    }
-}
-
-static void
-gtk_fishbowl_measure (GtkWidget      *widget,
-                      GtkOrientation  orientation,
-                      int             for_size,
-                      int            *minimum,
-                      int            *natural,
-                      int            *minimum_baseline,
-                      int            *natural_baseline)
-{
-  GtkFishbowl *fishbowl = GTK_FISHBOWL (widget);
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-  GtkFishbowlChild *child;
-  GList *children;
-  gint child_min, child_nat;
-
-  *minimum = 0;
-  *natural = 0;
-
-  for (children = priv->children; children; children = children->next)
-    {
-      child = children->data;
-
-      if (!gtk_widget_get_visible (child->widget))
-        continue;
-
-      gtk_widget_measure (child->widget, orientation, -1, &child_min, &child_nat, NULL, NULL);
-
-      *minimum = MAX (*minimum, child_min);
-      *natural = MAX (*natural, child_nat);
-    }
-}
-
-static void
-gtk_fishbowl_get_preferred_width (GtkWidget *widget,
-                                  int       *minimum,
-                                  int       *natural)
-{
-  gtk_fishbowl_measure (widget, GTK_ORIENTATION_HORIZONTAL, -1, minimum, natural, NULL, NULL);
-}
-
-static void
-gtk_fishbowl_get_preferred_height (GtkWidget *widget,
-                                   int       *minimum,
-                                   int       *natural)
-{
-  gtk_fishbowl_measure (widget, GTK_ORIENTATION_VERTICAL, -1, minimum, natural, NULL, NULL);
-}
-
-static void
-gtk_fishbowl_get_preferred_width_for_height (GtkWidget *widget,
-                                             int        for_size,
-                                             int       *minimum,
-                                             int       *natural)
-{
-  gtk_fishbowl_measure (widget, GTK_ORIENTATION_HORIZONTAL, for_size, minimum, natural, NULL, NULL);
-}
-
-static void
-gtk_fishbowl_get_preferred_height_and_baseline_for_width (GtkWidget *widget,
-                                                          int        for_size,
-                                                          int       *minimum,
-                                                          int       *natural,
-                                                          int       *minimum_baseline,
-                                                          int       *natural_baseline)
-{
-  gtk_fishbowl_measure (widget, GTK_ORIENTATION_VERTICAL, for_size, minimum, natural, minimum_baseline, natural_baseline);
-}
-
-static void
-gtk_fishbowl_size_allocate (GtkWidget     *widget,
-                            GtkAllocation *allocation)
-{
-  GtkFishbowl *fishbowl = GTK_FISHBOWL (widget);
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-  GtkFishbowlChild *child;
-  GtkAllocation child_allocation;
-  GtkRequisition child_requisition;
-  GList *children;
-
-  gtk_widget_set_allocation (widget, allocation);
-
-  for (children = priv->children; children; children = children->next)
-    {
-      child = children->data;
-
-      if (!gtk_widget_get_visible (child->widget))
-        continue;
-
-      gtk_widget_get_preferred_size (child->widget, &child_requisition, NULL);
-      child_allocation.x = allocation->x + round (child->x * (allocation->width - child_requisition.width));
-      child_allocation.y = allocation->y + round (child->y * (allocation->height - child_requisition.height));
-      child_allocation.width = child_requisition.width;
-      child_allocation.height = child_requisition.height;
-
-      gtk_widget_size_allocate (child->widget, &child_allocation);
-    }
-}
-
-static double
-new_speed (void)
-{
-  /* 5s to 50s to cross screen seems fair */
-  return g_random_double_range (0.02, 0.2);
-}
-
-static void
-gtk_fishbowl_add (GtkContainer *container,
-                  GtkWidget    *widget)
-{
-  GtkFishbowl *fishbowl = GTK_FISHBOWL (container);
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-  GtkFishbowlChild *child_info;
-
-  g_return_if_fail (GTK_IS_FISHBOWL (fishbowl));
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  child_info = g_new0 (GtkFishbowlChild, 1);
-  child_info->widget = widget;
-  child_info->x = 0;
-  child_info->y = 0;
-  child_info->dx = new_speed ();
-  child_info->dy = new_speed ();
-
-  gtk_widget_set_parent (widget, GTK_WIDGET (fishbowl));
-
-  priv->children = g_list_prepend (priv->children, child_info);
-  priv->count++;
-  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_COUNT]);
-}
-
-static void
-gtk_fishbowl_remove (GtkContainer *container,
-                     GtkWidget    *widget)
-{
-  GtkFishbowl *fishbowl = GTK_FISHBOWL (container);
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-  GtkFishbowlChild *child;
-  GtkWidget *widget_container = GTK_WIDGET (container);
-  GList *children;
-
-  for (children = priv->children; children; children = children->next)
-    {
-      child = children->data;
-
-      if (child->widget == widget)
-        {
-          gboolean was_visible = gtk_widget_get_visible (widget);
-
-          gtk_widget_unparent (widget);
-
-          priv->children = g_list_remove_link (priv->children, children);
-          g_list_free (children);
-          g_free (child);
-
-          if (was_visible && gtk_widget_get_visible (widget_container))
-            gtk_widget_queue_resize (widget_container);
-
-          priv->count--;
-          g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_COUNT]);
-          break;
-        }
-    }
-}
-
-static void
-gtk_fishbowl_forall (GtkContainer *container,
-                     gboolean      include_internals,
-                     GtkCallback   callback,
-                     gpointer      callback_data)
-{
-  GtkFishbowl *fishbowl = GTK_FISHBOWL (container);
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-  GtkFishbowlChild *child;
-  GList *children;
-
-  if (!include_internals)
-    return;
-
-  children = priv->children;
-  while (children)
-    {
-      child = children->data;
-      children = children->next;
-
-      (* callback) (child->widget, callback_data);
-    }
-}
-
-static gboolean
-gtk_fishbowl_draw (GtkWidget *widget,
-                   cairo_t   *cr)
-{
-  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_container_propagate_draw (GTK_CONTAINER (fishbowl),
-                                    child->widget,
-                                    cr);
-    }
-
-  return FALSE;
-}
-
-static void
-gtk_fishbowl_dispose (GObject *object)
-{
-  GtkFishbowl *fishbowl = GTK_FISHBOWL (object);
-
-  gtk_fishbowl_set_animating (fishbowl, FALSE);
-  gtk_fishbowl_set_count (fishbowl, 0);
-
-  G_OBJECT_CLASS (gtk_fishbowl_parent_class)->dispose (object);
-}
-
-static void
-gtk_fishbowl_set_property (GObject         *object,
-                           guint            prop_id,
-                           const GValue    *value,
-                           GParamSpec      *pspec)
-{
-  GtkFishbowl *fishbowl = GTK_FISHBOWL (object);
-
-  switch (prop_id)
-    {
-    case PROP_ANIMATING:
-      gtk_fishbowl_set_animating (fishbowl, g_value_get_boolean (value));
-      break;
-
-    case PROP_COUNT:
-      gtk_fishbowl_set_count (fishbowl, g_value_get_uint (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_fishbowl_get_property (GObject         *object,
-                           guint            prop_id,
-                           GValue          *value,
-                           GParamSpec      *pspec)
-{
-  GtkFishbowl *fishbowl = GTK_FISHBOWL (object);
-
-  switch (prop_id)
-    {
-    case PROP_ANIMATING:
-      g_value_set_boolean (value, gtk_fishbowl_get_animating (fishbowl));
-      break;
-
-    case PROP_COUNT:
-      g_value_set_uint (value, gtk_fishbowl_get_count (fishbowl));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_fishbowl_class_init (GtkFishbowlClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-  GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
-
-  object_class->dispose = gtk_fishbowl_dispose;
-  object_class->set_property = gtk_fishbowl_set_property;
-  object_class->get_property = gtk_fishbowl_get_property;
-
-  widget_class->get_preferred_width = gtk_fishbowl_get_preferred_width;
-  widget_class->get_preferred_height = gtk_fishbowl_get_preferred_height;
-  widget_class->get_preferred_width_for_height = gtk_fishbowl_get_preferred_width_for_height;
-  widget_class->get_preferred_height_and_baseline_for_width = gtk_fishbowl_get_preferred_height_and_baseline_for_width;
-  widget_class->size_allocate = gtk_fishbowl_size_allocate;
-  widget_class->draw = gtk_fishbowl_draw;
-
-  container_class->add = gtk_fishbowl_add;
-  container_class->remove = gtk_fishbowl_remove;
-  container_class->forall = gtk_fishbowl_forall;
-
-  props[PROP_ANIMATING] =
-      g_param_spec_boolean ("animating",
-                            "animating",
-                            "Whether children are moving around",
-                            FALSE,
-                            G_PARAM_READWRITE);
-
-  props[PROP_COUNT] =
-      g_param_spec_uint ("count",
-                         "Count",
-                         "Number of widgets",
-                         0, G_MAXUINT,
-                         0,
-                         G_PARAM_READABLE);
-
-  g_object_class_install_properties (object_class, NUM_PROPERTIES, props);
-}
-
-guint
-gtk_fishbowl_get_count (GtkFishbowl *fishbowl)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  return priv->count;
-}
-
-char **icon_names = NULL;
-gsize n_icon_names = 0;
-
-static void
-init_icon_names (GtkIconTheme *theme)
-{
-  GPtrArray *icons;
-  GList *l, *icon_list;
-
-  if (icon_names)
-    return;
-
-  icon_list = gtk_icon_theme_list_icons (theme, NULL);
-  icons = g_ptr_array_new ();
-
-  for (l = icon_list; l; l = l->next)
-    {
-      if (g_str_has_suffix (l->data, "symbolic"))
-        continue;
-
-      g_ptr_array_add (icons, g_strdup (l->data));
-    }
-
-  n_icon_names = icons->len;
-  g_ptr_array_add (icons, NULL); /* NULL-terminate the array */
-  icon_names = (char **) g_ptr_array_free (icons, FALSE);
-
-  /* don't free strings, we assigned them to the array */
-  g_list_free_full (icon_list, g_free);
-}
-
-static const char *
-get_random_icon_name (GtkIconTheme *theme)
-{
-  init_icon_names (theme);
-
-  return icon_names[g_random_int_range(0, n_icon_names)];
-}
-
-void
-gtk_fishbowl_set_count (GtkFishbowl *fishbowl,
-                        guint        count)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  g_object_freeze_notify (G_OBJECT (fishbowl));
-
-  while (priv->count > count)
-    {
-      gtk_container_remove (GTK_CONTAINER (fishbowl),
-                            ((GtkFishbowlChild *) priv->children->data)->widget);
-    }
-
-  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);
-      gtk_container_add (GTK_CONTAINER (fishbowl), new_widget);
-    }
-
-  g_object_thaw_notify (G_OBJECT (fishbowl));
-}
-
-gboolean
-gtk_fishbowl_get_animating (GtkFishbowl *fishbowl)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  return priv->tick_id != 0;
-}
-
-static gboolean
-gtk_fishbowl_tick (GtkWidget     *widget,
-                   GdkFrameClock *frame_clock,
-                   gpointer       unused)
-{
-  GtkFishbowl *fishbowl = GTK_FISHBOWL (widget);
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-  GtkFishbowlChild *child;
-  GList *l;
-  gint64 frame_time, elapsed;
-
-  frame_time = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget));
-  elapsed = frame_time - priv->last_frame_time;
-  priv->last_frame_time = frame_time;
-
-  /* last frame was 0, so we're just starting to animate */
-  if (elapsed == frame_time)
-    return G_SOURCE_CONTINUE;
-
-  for (l = priv->children; l; l = l->next)
-    {
-      child = l->data;
-
-      child->x += child->dx * ((double) elapsed / G_USEC_PER_SEC);
-      child->y += child->dy * ((double) elapsed / G_USEC_PER_SEC);
-
-      if (child->x <= 0)
-        {
-          child->x = 0;
-          child->dx = new_speed ();
-        }
-      else if (child->x >= 1)
-        {
-          child->x = 1;
-          child->dx =  - new_speed ();
-        }
-
-      if (child->y <= 0)
-        {
-          child->y = 0;
-          child->dy = new_speed ();
-        }
-      else if (child->y >= 1)
-        {
-          child->y = 1;
-          child->dy =  - new_speed ();
-        }
-    }
-
-  gtk_widget_queue_allocate (widget);
-
-  return G_SOURCE_CONTINUE;
-}
-
-void
-gtk_fishbowl_set_animating (GtkFishbowl *fishbowl,
-                            gboolean     animating)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  if (gtk_fishbowl_get_animating (fishbowl) == animating)
-    return;
-
-  if (animating)
-    {
-      priv->tick_id = gtk_widget_add_tick_callback (GTK_WIDGET (fishbowl),
-                                                    gtk_fishbowl_tick,
-                                                    NULL,
-                                                    NULL);
-    }
-  else
-    {
-      priv->last_frame_time = 0;
-      gtk_widget_remove_tick_callback (GTK_WIDGET (fishbowl), priv->tick_id);
-      priv->tick_id = 0;
-    }
-
-  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_ANIMATING]);
-}
-

demos/gtk-demo/gtkfishbowl.h

@@ -1,58 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2017 Benjamin Otte <otte@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GTK_FISHBOWL_H__
-#define __GTK_FISHBOWL_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_FISHBOWL                  (gtk_fishbowl_get_type ())
-#define GTK_FISHBOWL(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FISHBOWL, GtkFishbowl))
-#define GTK_FISHBOWL_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FISHBOWL, GtkFishbowlClass))
-#define GTK_IS_FISHBOWL(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FISHBOWL))
-#define GTK_IS_FISHBOWL_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FISHBOWL))
-#define GTK_FISHBOWL_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FISHBOWL, GtkFishbowlClass))
-
-typedef struct _GtkFishbowl              GtkFishbowl;
-typedef struct _GtkFishbowlClass         GtkFishbowlClass;
-
-struct _GtkFishbowl
-{
-  GtkContainer container;
-};
-
-struct _GtkFishbowlClass
-{
-  GtkContainerClass parent_class;
-};
-
-GType      gtk_fishbowl_get_type          (void) G_GNUC_CONST;
-
-GtkWidget* gtk_fishbowl_new               (void);
-
-guint      gtk_fishbowl_get_count         (GtkFishbowl       *fishbowl);
-void       gtk_fishbowl_set_count         (GtkFishbowl       *fishbowl,
-                                           guint              count);
-gboolean   gtk_fishbowl_get_animating     (GtkFishbowl       *fishbowl);
-void       gtk_fishbowl_set_animating     (GtkFishbowl       *fishbowl,
-                                           gboolean           animating);
-
-G_END_DECLS
-
-#endif /* __GTK_FISHBOWL_H__ */

demos/gtk-demo/links.c

@@ -1,7 +1,7 @@
 /* Links
  *
  * GtkLabel can show hyperlinks. The default action is to call
- * gtk_show_uri_on_window() on their URI, but it is possible to override
+ * gtk_show_uri() on their URI, but it is possible to override
  * this with a custom handler.
  */
 

demos/gtk-demo/main.c

@@ -966,7 +966,7 @@ end_cb (GtkMenuItem *item, GtkWidget *scrollbar)
 static gboolean
 scrollbar_popup (GtkWidget *scrollbar, GtkWidget *menu)
 {
-  gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL);
+  gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time ());
 
   return TRUE;
 }
@@ -1144,33 +1144,6 @@ out:
   return 0;
 }
 
-static void
-print_version (void)
-{
-  g_print ("gtk3-demo %d.%d.%d\n",
-           gtk_get_major_version (),
-           gtk_get_minor_version (),
-           gtk_get_micro_version ());
-}
-
-static int
-local_options (GApplication *app,
-               GVariantDict *options,
-               gpointer      data)
-{
-  gboolean version = FALSE;
-
-  g_variant_dict_lookup (options, "version", "b", &version);
-
-  if (version)
-    {
-      print_version ();
-      return 0;
-    }
-
-  return -1;
-}
-
 int
 main (int argc, char **argv)
 {
@@ -1196,7 +1169,6 @@ main (int argc, char **argv)
                                    app_entries, G_N_ELEMENTS (app_entries),
                                    app);
 
-  g_application_add_main_option (G_APPLICATION (app), "version", 0, 0, G_OPTION_ARG_NONE, "Show program version", NULL);
   g_application_add_main_option (G_APPLICATION (app), "run", 0, 0, G_OPTION_ARG_STRING, "Run an example", "EXAMPLE");
   g_application_add_main_option (G_APPLICATION (app), "list", 0, 0, G_OPTION_ARG_NONE, "List examples", NULL);
   g_application_add_main_option (G_APPLICATION (app), "autoquit", 0, 0, G_OPTION_ARG_NONE, "Quit after a delay", NULL);
@@ -1204,7 +1176,6 @@ main (int argc, char **argv)
   g_signal_connect (app, "startup", G_CALLBACK (startup), NULL);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
   g_signal_connect (app, "command-line", G_CALLBACK (command_line), NULL);
-  g_signal_connect (app, "handle-local-options", G_CALLBACK (local_options), NULL);
 
   g_application_run (G_APPLICATION (app), argc, argv);
 

demos/gtk-demo/markup.c

@@ -28,8 +28,7 @@ source_toggled (GtkToggleButton *button)
       markup = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
 
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-      gtk_text_buffer_get_bounds (buffer, &start, &end);
-      gtk_text_buffer_delete (buffer, &start, &end);
+      gtk_text_buffer_get_start_iter (buffer, &start);
       gtk_text_buffer_insert_markup (buffer, &start, markup, -1);
       g_free (markup);
 
@@ -68,7 +67,6 @@ do_markup (GtkWidget *do_widget)
       g_signal_connect (show_source, "toggled", G_CALLBACK (source_toggled), stack);
 
       header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (header), TRUE);
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), show_source);
       gtk_widget_show_all (header);
       gtk_window_set_titlebar (GTK_WINDOW (window), header);

demos/gtk-demo/modelbutton.ui

@@ -66,7 +66,6 @@
           <object class="GtkModelButton">
             <property name="visible">1</property>
             <property name="action-name">win.color</property>
-            <property name="action-target">'red'</property>
             <property name="text">Red</property>
             <property name="inverted">1</property>
           </object>
@@ -75,7 +74,6 @@
           <object class="GtkModelButton">
             <property name="visible">1</property>
             <property name="action-name">win.color</property>
-            <property name="action-target">'green'</property>
             <property name="text">Green</property>
             <property name="inverted">1</property>
           </object>
@@ -84,7 +82,6 @@
           <object class="GtkModelButton">
             <property name="visible">1</property>
             <property name="action-name">win.color</property>
-            <property name="action-target">'blue'</property>
             <property name="text">Blue</property>
             <property name="inverted">1</property>
           </object>

demos/gtk-demo/pickers.c

@@ -53,7 +53,6 @@ do_pickers (GtkWidget *do_widget)
     gtk_widget_set_hexpand (label, TRUE);
     picker = gtk_file_chooser_button_new ("Pick a File",
                                           GTK_FILE_CHOOSER_ACTION_OPEN);
-    gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (picker), FALSE);
     gtk_grid_attach (GTK_GRID (table), label, 0, 2, 1, 1);
     gtk_grid_attach (GTK_GRID (table), picker, 1, 2, 1, 1);
 

demos/gtk-demo/popover.c

@@ -51,6 +51,13 @@ create_complex_popover (GtkWidget       *parent,
   popover = create_popover (parent, content, GTK_POS_BOTTOM);
   g_object_unref (content);
 
+  gtk_widget_set_size_request (popover, 200, -1);
+  gtk_widget_set_vexpand (popover, TRUE);
+
+  gtk_widget_set_margin_start (popover, 10);
+  gtk_widget_set_margin_end (popover, 10);
+  gtk_widget_set_margin_bottom (popover, 10);
+
   return popover;
 }
 

demos/gtk-demo/popover.ui

@@ -59,7 +59,6 @@
             <property name="visible">1</property>
             <property name="can_focus">1</property>
             <property name="shadow_type">in</property>
-            <property name="max-content-height">100</property>
             <child>
               <object class="GtkTreeView" id="treeview1">
                 <property name="visible">1</property>

demos/gtk-demo/revealer.c

@@ -12,13 +12,10 @@ static guint timeout = 0;
 static void
 change_direction (GtkRevealer *revealer)
 {
-  if (gtk_widget_get_mapped (GTK_WIDGET (revealer)))
-    {
-      gboolean revealed;
+  gboolean revealed;
 
-      revealed = gtk_revealer_get_child_revealed (revealer);
-      gtk_revealer_set_reveal_child (revealer, !revealed);
-    }
+  revealed = gtk_revealer_get_child_revealed (revealer);
+  gtk_revealer_set_reveal_child (revealer, !revealed);
 }
 
 static gboolean

demos/gtk-demo/scale.ui

@@ -4,20 +4,14 @@
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">4</property>
     <property name="value">2</property>
-    <property name="step-increment">0.1</property>
-    <property name="page-increment">1</property>
   </object>
   <object class="GtkAdjustment" id="adjustment2">
     <property name="upper">4</property>
     <property name="value">2</property>
-    <property name="step-increment">0.1</property>
-    <property name="page-increment">1</property>
   </object>
   <object class="GtkAdjustment" id="adjustment3">
     <property name="upper">4</property>
     <property name="value">2</property>
-    <property name="step-increment">0.1</property>
-    <property name="page-increment">1</property>
   </object>
   <object class="GtkWindow" id="window1">
     <property name="title" translatable="yes">Scales</property>

demos/gtk-demo/search_entry.c

@@ -43,11 +43,8 @@ static gboolean
 finish_search (GtkButton *button)
 {
   show_find_button ();
-  if (search_progress_id)
-    {
-      g_source_remove (search_progress_id);
-      search_progress_id = 0;
-    }
+  g_source_remove (search_progress_id);
+  search_progress_id = 0;
   return G_SOURCE_REMOVE;
 }
 
@@ -74,11 +71,7 @@ static void
 stop_search (GtkButton *button,
              gpointer   data)
 {
-  if (finish_search_id)
-    {
-      g_source_remove (finish_search_id);
-      finish_search_id = 0;
-    }
+  g_source_remove (finish_search_id);
   finish_search (button);
 }
 
@@ -157,7 +150,8 @@ icon_press_cb (GtkEntry       *entry,
                gpointer        data)
 {
   if (position == GTK_ENTRY_ICON_PRIMARY)
-    gtk_menu_popup_at_pointer (GTK_MENU (menu), (GdkEvent *) event);
+    gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
+                    event->button, event->time);
 }
 
 static void

demos/gtk-demo/tabs.c

@@ -1,63 +0,0 @@
-/* Text View/Tabs
- *
- * GtkTextView can position text at fixed positions, using tabs.
- */
-
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
-GtkWidget *
-do_tabs (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *view;
-      GtkWidget *sw;
-      GtkTextBuffer *buffer;
-      PangoTabArray *tabs;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_title (GTK_WINDOW (window), "Tabs");
-      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-
-      view = gtk_text_view_new ();
-      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
-      gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 20);
-      gtk_text_view_set_right_margin (GTK_TEXT_VIEW (view), 20);
-
-      tabs = pango_tab_array_new (3, TRUE);
-      pango_tab_array_set_tab (tabs, 0, PANGO_TAB_LEFT, 0);
-      pango_tab_array_set_tab (tabs, 1, PANGO_TAB_LEFT, 150);
-      pango_tab_array_set_tab (tabs, 2, PANGO_TAB_LEFT, 300);
-      gtk_text_view_set_tabs (GTK_TEXT_VIEW (view), tabs);
-      pango_tab_array_free (tabs);
-
-      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-      gtk_text_buffer_set_text (buffer, "one\ttwo\tthree\nfour\tfive\tsix\nseven\teight\tnine", -1);
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_AUTOMATIC);
-      gtk_container_add (GTK_CONTAINER (window), sw);
-      gtk_container_add (GTK_CONTAINER (sw), view);
-
-      gtk_widget_show_all (sw);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/tree_store.c

@@ -289,6 +289,7 @@ add_columns (GtkTreeView *treeview)
   column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
   gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
                                    GTK_TREE_VIEW_COLUMN_FIXED);
+  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
   gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
 
   /* havoc column */
@@ -310,6 +311,7 @@ add_columns (GtkTreeView *treeview)
   column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
   gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
                                    GTK_TREE_VIEW_COLUMN_FIXED);
+  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
   gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
 
   /* tim column */
@@ -332,6 +334,7 @@ add_columns (GtkTreeView *treeview)
   column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
   gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
                                    GTK_TREE_VIEW_COLUMN_FIXED);
+  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
   gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
 
   /* owen column */
@@ -353,6 +356,7 @@ add_columns (GtkTreeView *treeview)
   column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
   gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
                                    GTK_TREE_VIEW_COLUMN_FIXED);
+  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
   gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
 
   /* dave column */
@@ -374,6 +378,7 @@ add_columns (GtkTreeView *treeview)
   column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
   gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
                                    GTK_TREE_VIEW_COLUMN_FIXED);
+  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
   gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
 }
 

demos/icon-browser/Makefile.am

@@ -33,8 +33,7 @@ resources.c: iconbrowser.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourc
 EXTRA_DIST = \
 	menus.ui \
 	iconbrowser.gresource.xml \
-	window.ui \
-	icon.list
+	window.ui
 
 # ------------------- MSVC Build Items ----------------
 MSVCPROJS = gtk3-icon-browser

demos/icon-browser/icon.list

@@ -1,517 +0,0 @@
-[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,6 +3,5 @@
   <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,22 +6,11 @@
 
 typedef struct
 {
-  gchar *id;
-  gchar *name;
-  gchar *description;
+  const gchar *id;
+  const gchar *name;
+  const 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;
@@ -165,7 +154,6 @@ 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,
@@ -184,11 +172,11 @@ add_context (IconBrowserWindow *win,
   GtkWidget *row;
 
   c = g_new (Context, 1);
-  c->id = g_strdup (id);
-  c->name = g_strdup (name);
-  c->description = g_strdup (description);
+  c->id = id;
+  c->name = name;
+  c->description = description;
 
-  g_hash_table_insert (win->contexts, c->id, c);
+  g_hash_table_insert (win->contexts, (gpointer)id, c);
 
   row = gtk_label_new (name);
   g_object_set_data (G_OBJECT (row), "context", c);
@@ -225,50 +213,475 @@ selected_context_changed (GtkListBox *list, IconBrowserWindow *win)
 static void
 populate (IconBrowserWindow *win)
 {
-  GFile *file;
-  GKeyFile *kf;
-  char *data;
-  gsize length;
-  char **groups;
-  int i;
+  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");
 
-  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, "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");
 
-  kf = g_key_file_new ();
-  g_key_file_load_from_data (kf, data, length, G_KEY_FILE_NONE, 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");
 
-  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, "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");
 
-      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, "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");
 
-      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, "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");
 
-          if (strcmp (key, "Name") == 0 || strcmp (key, "Description") == 0)
-            continue;
+  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");
 
-          value = g_key_file_get_string (kf, context, key, NULL);
+  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");
 
-          add_icon (win, key, value, context);
-        }
-      g_strfreev (keys);
-    }
-  g_strfreev (groups);
+  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"); 
 }
 
 static gboolean
@@ -281,16 +694,6 @@ 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,
@@ -345,7 +748,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);
 }
@@ -418,7 +821,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, context_free);
+  win->contexts = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_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));
@@ -463,7 +866,6 @@ 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/window.ui

@@ -8,8 +8,8 @@
   </object>
   <template class="IconBrowserWindow" parent="GtkApplicationWindow">
     <property name="title" translatable="yes">Icon Browser</property>
-    <property name="default-width">1024</property>
-    <property name="default-height">768</property>
+    <property name="default-width">600</property>
+    <property name="default-height">800</property>
     <signal name="key-press-event" handler="key_press_event_cb"/>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header">
@@ -109,7 +109,7 @@
                       <object class="GtkCellRendererPixbuf" id="cell">
                         <property name="xpad">10</property>
                         <property name="ypad">10</property>
-                        <property name="stock-size">6</property>
+                        <property name="stock-size">5</property>
                         <property name="follow-state">True</property>
                       </object>
                     </child>
@@ -320,21 +320,6 @@
                 <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/widget-factory/widget-factory.c

@@ -1625,28 +1625,6 @@ reset_icon_size (GtkWidget *iv)
   gtk_widget_queue_resize (iv);
 }
 
-static gchar *
-scale_format_value_blank (GtkScale *scale, gdouble value)
-{
-  return g_strdup (" ");
-}
-
-static gchar *
-scale_format_value (GtkScale *scale, gdouble value)
-{
-  return g_strdup_printf ("%0.*f", 1, value);
-}
-
-static void
-adjustment3_value_changed (GtkAdjustment *adj, GtkProgressBar *pbar)
-{
-  double fraction;
-
-  fraction = gtk_adjustment_get_value (adj) / (gtk_adjustment_get_upper (adj) - gtk_adjustment_get_lower (adj));
-
-  gtk_progress_bar_set_fraction (pbar, fraction);
-}
-
 static void
 activate (GApplication *app)
 {
@@ -1712,8 +1690,6 @@ activate (GApplication *app)
   gtk_builder_add_callback_symbol (builder, "increase_icon_size", (GCallback)increase_icon_size);
   gtk_builder_add_callback_symbol (builder, "decrease_icon_size", (GCallback)decrease_icon_size);
   gtk_builder_add_callback_symbol (builder, "reset_icon_size", (GCallback)reset_icon_size);
-  gtk_builder_add_callback_symbol (builder, "scale_format_value", (GCallback)scale_format_value);
-  gtk_builder_add_callback_symbol (builder, "scale_format_value_blank", (GCallback)scale_format_value_blank);
 
   gtk_builder_connect_signals (builder, NULL);
 
@@ -1920,44 +1896,11 @@ activate (GApplication *app)
   widget2 = (GtkWidget *)gtk_builder_get_object (builder, "decrease_button");
   g_object_set_data (G_OBJECT (widget), "decrease_button", widget2);
 
-  adj = (GtkAdjustment *)gtk_builder_get_object (builder, "adjustment3");
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "progressbar1");
-  widget2 = (GtkWidget *)gtk_builder_get_object (builder, "progressbar2");
-  g_signal_connect (adj, "value-changed", G_CALLBACK (adjustment3_value_changed), widget);
-  g_signal_connect (adj, "value-changed", G_CALLBACK (adjustment3_value_changed), widget2);
-
   gtk_widget_show_all (GTK_WIDGET (window));
 
   g_object_unref (builder);
 }
 
-static void
-print_version (void)
-{
-  g_print ("gtk3-widget-factory %d.%d.%d\n",
-           gtk_get_major_version (),
-           gtk_get_minor_version (),
-           gtk_get_micro_version ());
-}
-
-static int
-local_options (GApplication *app,
-               GVariantDict *options,
-               gpointer      data)
-{
-  gboolean version = FALSE;
-
-  g_variant_dict_lookup (options, "version", "b", &version);
-
-  if (version)
-    {
-      print_version ();
-      return 0;
-    }
-
-  return -1;
-}
-
 int
 main (int argc, char *argv[])
 {
@@ -1985,9 +1928,6 @@ main (int argc, char *argv[])
 
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
 
-  g_application_add_main_option (G_APPLICATION (app), "version", 0, 0, G_OPTION_ARG_NONE, "Show program version", NULL);
-
-  g_signal_connect (app, "handle-local-options", G_CALLBACK (local_options), NULL);
   status = g_application_run (G_APPLICATION (app), argc, argv);
   g_object_unref (app);
 

demos/widget-factory/widget-factory.css

@@ -1,3 +1,8 @@
+.circular-button {
+  border-radius: 20px;
+  -gtk-outline-radius: 20px;
+}
+
 .small-button {
   padding: 0;
   outline-width: 0;

demos/widget-factory/widget-factory.ui

@@ -103,9 +103,8 @@
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment3">
-    <property name="lower">0</property>
     <property name="upper">4</property>
-    <property name="value">2</property>
+    <property name="value">1</property>
     <property name="step_increment">1</property>
     <property name="page_increment">1</property>
   </object>
@@ -496,7 +495,6 @@ 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>
@@ -1243,9 +1241,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="adjustment">adjustment1</property>
                                     <property name="restrict_to_fill_level">0</property>
                                     <property name="fill_level">75</property>
-                                    <property name="draw_value">1</property>
-                                    <property name="digits">-1</property>
-                                    <signal name="format-value" handler="scale_format_value"/>
+                                    <property name="draw_value">0</property>
                                   </object>
                                 </child>
                                 <child>
@@ -1258,9 +1254,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="adjustment">adjustment1</property>
                                     <property name="restrict_to_fill_level">0</property>
                                     <property name="fill_level">75</property>
-                                    <property name="draw_value">1</property>
-                                    <property name="digits">-1</property>
-                                    <signal name="format-value" handler="scale_format_value_blank"/>
+                                    <property name="draw_value">0</property>
                                   </object>
                                   <packing>
                                     <property name="position">1</property>
@@ -3109,7 +3103,7 @@ microphone-sensitivity-medium-symbolic</property>
                                 <property name="visible">1</property>
                                 <style>
                                   <class name="image-button"/>
-                                  <class name="circular"/>
+                                  <class name="circular-button"/>
                                 </style>
                                 <child>
                                   <object class="GtkImage">
@@ -3725,7 +3719,6 @@ microphone-sensitivity-medium-symbolic</property>
                           <object class="GtkEntry">
                             <property name="visible">1</property>
                             <property name="can_focus">1</property>
-                            <property name="show_emoji_icon">1</property>
                             <property name="placeholder_text" translatable="yes">Age…</property>
                           </object>
                           <packing>
@@ -3752,7 +3745,6 @@ microphone-sensitivity-medium-symbolic</property>
                             <property name="visible">1</property>
                             <property name="valign">center</property>
                             <property name="popover">notebook_info_popover</property>
-                            <property name="relief">none</property>
                             <child>
                               <object class="GtkImage">
                                 <property name="visible">1</property>
@@ -3763,6 +3755,7 @@ microphone-sensitivity-medium-symbolic</property>
                             <style>
                               <class name="image-button"/>
                               <class name="circular"/>
+                              <class name="flat"/>
                             </style>
                           </object>
                         </child>
@@ -4098,6 +4091,7 @@ bad things might happen.</property>
     </action-widgets>
   </object>
   <object class="GtkPopover" id="open_popover">
+    <property name="visible">1</property>
     <child>
       <object class="GtkGrid">
         <property name="visible">1</property>
@@ -4132,10 +4126,8 @@ bad things might happen.</property>
             <property name="valign">start</property>
             <property name="visible">1</property>
             <property name="shadow-type">in</property>
+            <property name="hscrollbar-policy">never</property>
             <property name="min-content-height">70</property>
-            <property name="max-content-height">120</property>
-            <property name="min-content-width">100</property>
-            <property name="max-content-width">100</property>
             <child>
               <object class="GtkTextView" id="open_popover_textview">
                 <property name="visible">1</property>