xxx clip

cssshadowvalue: Convert the current point into a translate
Pango uses the current point to determine where to paint the text, which is considerably inconvenient since it doesn't work well with translations. To make this simpler for us, turn the current point into a translation, which lets us merge the three different pieces of context setup into just one.
2014-09-03 13:02:48 -07:00 · 2014-09-03 13:02:47 -07:00 · 2014-09-03 13:02:47 -07:00 · 2014-09-03 13:02:47 -07:00 · 2014-09-03 13:02:47 -07:00 · 2014-09-03 13:02:47 -07:00
1464 changed files with 198701 additions and 290071 deletions
@@ -17,7 +17,7 @@ can be found here:

 Information about using git with GNOME can be found here:

-        https://wiki.gnome.org/Git
+        http://live.gnome.org/Git

 In order to get GIT GTK+ installed on your system, you need to have
 the most recent GIT versions of GLib, Pango, and ATK installed as well.
@@ -9,21 +9,17 @@ GTK+ requires the following packages:
   GdkPixbuf @GDK_PIXBUF_REQUIRED_VERSION@, ATK @ATK_REQUIRED_VERSION@
   and cairo @CAIRO_REQUIRED_VERSION@.

- - libepoxy, for cross-platform OpenGL support.
-   It can be found here: https://github.com/anholt/libepoxy
-
 - Each GDK backend has its own backend-specific requirements. For
   the X11 backend, X11 R6 and XInput version 2 (as well as a number
-   of other extensions) are required. The Wayland backend requires
-   (obviously) the Wayland libraries.
+   of other extensions) are required.

 - gobject-introspection @INTROSPECTION_REQUIRED_VERSION@ or newer.

 Simple install procedure
 ========================

-  % tar xf gtk+-@GTK_VERSION@.tar.xz          # unpack the sources
-  % cd gtk+-@GTK_VERSION@                     # change to the toplevel directory
+  % tar xf gtk+-@GTK_VERSION@.tar.xz   # unpack the sources
+  % cd gtk+-@GTK_VERSION@              # change to the toplevel directory
  % ./configure                        # run the `configure' script
  % make                               # build GTK+
  [ Become root if necessary ]
@@ -1,7 +1,7 @@
 ## Makefile.am for GTK+
 include $(top_srcdir)/Makefile.decl

-SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples
+SRC_SUBDIRS = util gdk gtk libgail-util modules demos tests testsuite examples
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build

 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
@@ -9,20 +9,16 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 EXTRA_DIST +=			\
 	autogen.sh		\
 	HACKING			\
-	README			\
-	README.in		\
-	INSTALL			\
-	INSTALL.in		\
+	makecopyright		\
 	NEWS.pre-1-0		\
-	README.commits		\
+	README.commits	\
 	README.win32		\
 	config.h.win32		\
-	makefile.msc		\
+	makefile.msc	\
 	gtk-zip.sh.in		\
 	sanitize-la.sh		\
 	po/README.translators	\
-	po/po2tbl.sed.in	\
-	make-pot
+	po/po2tbl.sed.in

 MAINTAINERCLEANFILES = \
 	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
@@ -31,21 +27,24 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/m4/gtk-doc.m4 \
 	$(srcdir)/INSTALL \
 	$(srcdir)/README \
+	$(srcdir)/omf.make \
+	$(srcdir)/xmldocs.make \
 	$(srcdir)/gtk-doc.make \
 	$(srcdir)/ChangeLog


 ## Copy .pc files to target-specific names
-gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc gtk+-broadway-3.0.pc gtk+-wayland-3.0.pc gtk+-mir-3.0.pc: gtk+-3.0.pc
+gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc gtk+-broadway-3.0.pc gtk+-wayland-3.0.pc: gtk+-3.0.pc
 	rm -f $@ && \
 	cp gtk+-3.0.pc $@

-gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc gdk-wayland-3.0.pc gdk-mir-3.0.pc: gdk-3.0.pc
+gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc gdk-wayland-3.0.pc: gdk-3.0.pc
 	rm -f $@ && \
 	cp gdk-3.0.pc $@

 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gdk-3.0.pc gtk+-3.0.pc gail-3.0.pc
+
 pkgconfig_DATA += ${GDK_BACKENDS:%=gtk+-%-3.0.pc}
 pkgconfig_DATA += ${GDK_BACKENDS:%=gdk-%-3.0.pc}

@@ -61,14 +60,12 @@ DISTCLEANFILES = \
 	gtk+-quartz-3.0.pc		\
 	gtk+-broadway-3.0.pc		\
 	gtk+-wayland-3.0.pc		\
-	gtk+-mir-3.0.pc			\
 	gdk-3.0.pc			\
 	gdk-x11-3.0.pc			\
 	gdk-win32-3.0.pc		\
 	gdk-quartz-3.0.pc		\
 	gdk-broadway-3.0.pc		\
 	gdk-wayland-3.0.pc		\
-	gdk-mir-3.0.pc			\
 	gail-3.0.pc			\
 	config.lt

@@ -79,7 +76,7 @@ distclean-local:

 ChangeLog:
 	$(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
-	  (GIT_DIR=$(top_srcdir)/.git $(top_builddir)/build-aux/missing git log GTK_2_16_0^^.. --stat) | fmt --split-only > $@.tmp \
+	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log GTK_2_16_0^^.. --stat) | fmt --split-only > $@.tmp \
 	  && mv -f $@.tmp $@ \
 	  || ($(RM) $@.tmp; \
 	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
@@ -90,14 +87,43 @@ ChangeLog:
 	  echo A git checkout and git-log is required to generate this file >> $@); \
 	fi

-.PHONY: ChangeLog
-
 uninstall-local:
 	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc

+dist-hook:
+	if test -f $(srcdir)/INSTALL.in && test -f $(srcdir)/README.in ; then \
+	     CONFIG_FILES="INSTALL:$(srcdir)/INSTALL.in README:$(srcdir)/README.in" \
+	     CONFIG_HEADERS= \
+	     $(SHELL) config.status \
+	     && cp INSTALL README $(distdir) ; \
+	fi
+
+.PHONY: files release sanity snapshot ChangeLog
+
+files:
+	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
+	  echo $$p; \
+	done
+	@for subdir in $(SUBDIRS); do \
+	  files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \
+	  for file in $$files; do \
+	    echo $$subdir/$$file; \
+	  done; \
+	done
+
+release:
+	rm -rf .deps */.deps
+	$(MAKE) distcheck
+
+sanity:
+	./sanity_check $(VERSION)
+
+
+snapshot:
+	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+
 DISTCHECK_CONFIGURE_FLAGS =		\
 	--enable-gtk-doc 		\
-	--disable-doc-cross-references  \
 	--enable-man 			\
 	--disable-maintainer-mode 	\
 	--enable-introspection  	\
@@ -26,10 +26,6 @@ SKIP_GDKTARGET = \
 	echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target."
 endif

-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 XVFB_START = \
 	${XVFB} -help 2>/dev/null 1>&2 \
 	&& XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \
@@ -1,892 +1,3 @@
-Overview of Changes in GTK+ 3.15.12
-===================================
-
-* GtkMenuButton:
- - Improve accessible names
-
-* GtkCellRendererPixbuf:
- - Always follow state changes, the ::follow-state property
-   is now ignored. This is necessary to make HighContrast
-   and symbolic icons remain visible e.g. in selected rows.
-
-* GtkEntry:
- - Rework the size allocation code to be less arcane. This
-   changed the semantics of the get_frame_size() vfunc. GtkEntry
-   subclasses that override this vfunc may need adjustment.
-
-* Wayland:
- - Support hi-dpi cursors
-
-* Bugs fixed:
- 745829 crash when double-clicking close button while popover...
- 746141 wayland: Support HiDPI pointer cursors
- 746192 Insensitive backdrop ToolButtons are not drawn correctly
- 746201 Sidebar icons are black on black in HighContrast theme
- 746202 use insensitive color for unfocused selected items
- 746205 gemfile: needs add source rubygems.org
- 746282 pixman warnings after recent changes
- 746301 Opening "Sound" panel generates pixman error
-
-* Translation updates:
- Bosnian
- Bulgarian
- Catalan
- Danish
- Punjabi
- Slovenian
- Swedish
- Vietnamese
-
-
-Overview of Changes in GTK+ 3.15.11
-===================================
-
-* Go back to requiring GTK_FRAME_EXTENTS support for CSD,
-  to fix shadow problems in KDE.
-
-* Bug fixes:
- 535929 Fix warnings from xReply test in configure.in
- 577862 FileFilter name not set
- 669008 Kerberos authentication popup
- 712760 Clang static analysis fixes
- 739070 Undefined reference to get_xkb() when building with --disable-xkb
- 744288 gdk_gl_context_set_required_version() handles version requests...
- 744589 nautilus bookmarks changing places randomly
- 745065 GtkPrintOperation dialog creation fails when GTK is locally loaded
- 745463 Search suggestions are not shown in Clocks / Weather
- 745479 Tracker search in file chooser causes a crash
- 745562 gedit titlebar is no longer draggable
- 745578 sincos is not portable
- 745622 Selected text not highlighted in GtkInfoBar
- 745721 wayland: Add support for gtk_window_set_modal
- 745918 add padding to textview in CSS section of GtkInspector
- 745969 CSD windows cannot be moved immediately after being resized
- 746013 Invalid write of size 8
-        Print dialog: Fix icons in HighContrast
-        Fix selected menu items in HighContrast
-        App chooser: Fix icons in HighContrast
-
-* Translation updates:
- French
- Galician
- Kazakh
- Korean
- Lithuanian
- Polish
- Slovak
- Swedish
-
-
-Overview of Changes in GTK+ 3.15.10
-===================================
-
-* GtkFileChooser:
- - Don't start search too eagerly
- - Use fts with tracker
- - Make tracker queries more similar to nautilus
-
-GtkWindow:
- - Improve window dragging on header bars
-
-* Printing:
- - Make avahi-browsed printers work
- - Set printer state correctly
-
-* Wayland
- - Exit cleanly if the compositor goes away
- - Don't ignore early maximization/fullscreening
- - Make subsurface popovers work under Weston
-
-* GL
- - Port GdkGears example to modern OpenGL
-
-* Bugs fixed:
- 741511 Critical message: NULL is passed to g_object_unref() in spi_...
- 743323 avahi-discovered CUPS printers don't work
- 743427 subsurface-using popovers don't work on Weston
- 744879 Another core dump when clicking the Back button
- 745225 eventcontroller: Don't crash if the widget is destroyed first
- 745263 The Open button in the new file chooser is too low/thin
- 745289 wayland: do not use g_error() on connection errors
- 745303 Wayland: Initial setup window is not maximised
- 745344 overlay scrollbar fail
- 745400 fix a couple of issues in gdkglcontext-win32
- 703610 Problems with UC-Logic WA60 tablet
- 729366 Changes to folder name are not shown when creating new fol...
- 745315 Overshoot deceleration causes WebKitGTK1 web view to jump ...
-
-* Translation updates
- Afrikaans
- Czech
- French
- Greek
- Hebrew
- Hungarian
- Kazakh
- Lithuanian
- Polish
- Slovak
- Spanish
- Vietnamese
-
-
-Overview of Changes in GTK+ 3.15.9
-==================================
-
-* GtkScrolledWindow
- - Avoid 'jumping' when zoom scrolling kicks in
- - Make zoom scrolling less easy to trigger
- - Make steppers use smooth autoscrolling
-
-* Input methods can now be turned off entirely, which
-  can be useful to free up the Ctrl-Shift-u shortcut
-
-* Add some DND support to gtk3-icon-browser
-
-* Bugs fixed:
- 696505 Segfault on Windows x64: gtkstatusicon.c tries to put 64-bit...
- 744942 quartz: Avoid segfaulting when calling gdk_window_ensure_native
- 744991 Fix loading of GResource SVGs
- 745052 Icon theme code assumes directories with mtime 0 don't exist
- 745076 Various DPI and OpenGL related fixes in the Wayland backend
-        Fix crash and miscalculation in css bitmask manipulation
-        Fix a crash due to too large surfaces
-
-* Translation updates
- Chinese (Taiwan)
- Hebrew
- Hungarian
- Galician
- Greek
- Slovak
- Spanish
-
-
-Overview of Changes in GTK+ 3.15.8
-==================================
-
-* CSS
- - Support animated font weight changes
-
-* GtkScrolledWindow:
- - Ensure indicators appear in the correct place
-
-* Wayland:
- - DND fixes
-
-* GtkPopover:
- - has a map/unmap animation now
-
-* Bugs fixed:
- 743647 image-missing is missing from libgtk's resources
- 744054 Clarify documentation for event propagation a...
- 744683 Tooltips should have ATK_ROLE_TOOL_TIP (like ...
-
-* Translation updates
- Galician
- Hebrew
- Hungarian
- Italian
- Norwegian bokmål
- Punjabi
- Slovenian
- Spanish
-
-
-Overview of Changes in GTK+ 3.15.7
-==================================
-
-* GtkListBox now supports models with gtk_list_box_bind_model
-
-* GtkNotebook has a new function to support tab dnd
-
-* GtkSidebar was renamed to GtkStackSidebar to better convey what it does
-
-* GtkFileChooser now has a location column for search
-
-* GdkGLProfile has been removed
-
-* Bugs
- 695945 implement minimize / maximize functionality
- 708320 listbox: Update the cursor row when the row's child gets focus
- 741946 OpenGL context should allow for GL attribute selection
- 743350 main: Make gtk_get_option_group() available to bindings
- 744148 gtk: x: fix compilation without x11 backend
- 744172 Wayland: Clients won't work on compositors that support wl_seat < 4
- 744204 File chooser in gedit try to open directory instead of navigatin...
- 744394 GtkGLArea documentation does not reflect changes in the api
- 744400 Add specific CSS class for the close/minimize/maximize button
- 744407 Can't support core 3.2 gl context on llvmpipe
- 744455 wayland: Update to xdg-shell unstable v5
-
-* Translation updates:
- Hungarian
- Norwegian bokmål
- Slovenian
- Spanish
- Turkish
-
-
-Overview of Changes in GTK+ 3.15.5
-==================================
-
-* GTK+ types now support the GLib g_autoptr() facility for
-  automatic cleanup of automatic variables. GTK+ itself does
-  not use g_autoptr() internally.
-
-* GtkSearchEntry has gained ::next-match, ::previous-match
-  and ::stop-search signals and a gtk_search_entry_handle_event()
-  function, which help in providing a richer search experience
-  and make search entries usable outside of GtkSearchBar.
-
-* GtkFileChooser:
- - The search has been reintegrated in the UI, there is now
-   a toggle button on the header bar to go to search mode,
-   in addition to the Alt-S shortcut.
- - The file chooser button now accepts files by drag-and-drop properly.
-
-* GtkScrolledWindow has gained a new ::edge-reached signal, which
-  triggers when the edge of the scrollable area is reached.
-
-* CSS:
- - Performance improvements
-
-* OpenGL:
- - It is now possible to specify the required GL version, as well
-   as some other options (debug, forward compatible) when creating
-   a GdkGLContext
- - Support for the OpenGL legacy profile has been dropped. Most examples
-   have been updated, with the exception of gdkgears, which will be fixed
-   in the next snapshot
- - Use shader version 1.50
-
-* Mir backend: Many improvements
-
-* Bugs fixed:
- 712752 GtkClipboard: add _get_default and _get_primary
- 725164 [crash] update_current_folder_get_info_cb at gtkfilechooserwidget.c
- 732051 Crash can result if a child widget is destroyed while its tab is...
- 735316 Default font antialiasing results in wrong behavior on OS X
- 740336 Wrong (white) background colour in notes grid
- 740613 XConvertSelection crashes Gtk+ apps
- 742636 Freeze if window closed while resume-events pending
- 742953 GdkGLContext will not create a core context
- 743146 Crash in gdk_gl_texture_from_surface() when a GtkGLArea is packe...
- 743193 Fix transfer annotation for tree_model parameter of gtk_tree_get...
- 743229 clipboard: support selection notification on wayland
- 743257 Popover not dismissed on clicking the header bar
- 743286 Mention that the path returned by gtk_tree_row_reference_get_pat...
- 743330 Wintab initialization glitches
- 743341 GtkImage does not correctly reflect icon theme changes.
- 743393 DND icons don't work in the inspector
- 743422 valgrind: Conditional jump or move depends on uninitialised valu...
- 743451 Drag and drop on GtkFileChooserButton doesn't work
- 743592 crash on link click in about dialogue
- 743593 GtkWidget's va_marshaller for "event-after" signal is incorrect
- 743633 gdkscreen-wayland: Don't leak wl_output objects
- 743638 getting-started: Update example-0.c to use GtkApplication
- 743647 image-missing is missing from libgtk's resources
- 743659 All folders hidden after returning from search mode in GtkFileCh...
- 743660 Pressing Ctrl should not start a search in the file chooser
- 743680 getting-started: update Basics section to correspond to example-...
- 613833 Unnecessary queue_resize() for GtkImage
- 741946 OpenGL context should allow for GL attribute selection
- 742566 Bitfield structure members used for booleans
- 742848 scrolledwindow: should emit edge-overshot when scrollbar reaches end
- 743395 Regression in gnome-terminal starting with gtk commit 27285f1 ' ...
- 743640 add __attribute__((cleanup)) support
- 743770 Memory leak in plugman example
- 743894 don't trigger interactive overlay scrollbar when drag-selecting
- 743917 Gtk modules must be compatible with both gtk 2 and 3
- 743975 Better deprecation information for GtkStatusIcon
- 744203 gdkgl shaders use depricated GLSL version
- 744212 gdk_gl_context_set_required_version() interprets requests for 4...
-
-* Translation updates:
- Hebrew
- Hungarian
- Icelandic
- Lithuanian
- Norwegian bokmål
- Russian
- Slovak
- Spanish
-
-
-Overview of Changes in GTK+ 3.15.4
-==================================
-
-* GtkTextView
- - Allow to customize multi-click behaviors, using the new
-   ::extend-selection signal
- - Selection can now be extended by scrolling
- - Better behavior and appearance for text selection with touch
-
-* GtkApplication:
- - Use app menu fallback with ssh connections
- - Provide a mechanism to hide unnecessary app menu items
-   on OS X, so a single menu file can be used across platforms
-
-* GtkCalendar:
- - Show other months in a different color under Adwaita again
- - Ensure we always show a bit of the other month on both ends
-
-* GtkScrolledWindow
- - Make overlay scrollbars more dynamic
-
-* GtkFileChooser:
- - Make bookmark DND insert at the right location
- - Make '~' and '/' work in recent mode
- - Make Ctrl-L work in recent mode
- - Re-integrate search
-
-* CSS:
- - Introduce immutable style nodes
- - Performance improvements
- - Reduced memory consumption
-
-* GtkInspector:
- - Add a magnifier for the selected widget
- - Show more display information
- - Show memory address of objects
-
-* Wayland:
- - Use subsurfaces for popovers, so popovers can extend beyond the
-   window boundaries
- - Prefer the Wayland backend over X11 if both are available
-
-* GL:
- - Fix interaction with hi-dpi
- - Add OpenGL support to the Windows backend
-
-* Bugs:
- 111503 Customization of text selection bounds on double click
- 301835 should the calendar start on the 1st of month?
- 477454 libgtk crashed in gtk_notebook_button_release
- 671802 no menu fallback with ssh -X or sudo
- 671895 gtk_print_context_get_hard_margins needs to take into account page...
- 674537 GtkMenuPositionFunc: x and y should be "inout"
- 705582 gtk_recent_manager_init fails to check settings==NULL
- 710612 [PATCH] Allow to extend selection with mouse scrollwheel
- 738338 quartz: NSWindow NULL check in get_scale_factor
- 738891 Use GDK_WINDOW_SUBSURFACE for popovers
- 739038 gtk_recent_manager_set_filename: assertion failed: (priv->filename...
- 740758 Add getters for device vendor/product IDs
- 740795 GDK: Add OpenGL Support for Windows
- 741259 gtkmodelmenuitem: force icon scaling
- 741569 Minor theme bug: square progress bars
- 741610 Finish up support for macos menubar
- 741652 Leaking menus when attaching to a button
- 741702 Right margin not respected with RTL text in non-wrapping mode only
- 741827 typo in testsuite/reftests/Makefile.am causes build failure on Min...
- 741897 documentation fix
- 741969 GTK_STOCK_COPY
- 742010 GtkLabel eats thumb-button clicks
- 742170 cut/copy/paste binding entries are registered 2x
- 742181 "show images in menus" causes weird padding outside GNOME
- 742243 GtkScrolledWindow draws overshoot at the wrong position
- 742311 On cellrenderertext, notify for "size" and "size-points" propertie...
- 742343 Hide scrollbar in GtkFileChooser if appropriate
- 742518 object overview should include the pointer to the object in memory
- 742631 Left padding on File Chooser List
- 742653 gtkfilechooserwidget: When using an extra widget, show or hide the...
- 742664 Portabilitiy issues with GTK-Inspector 32-bit and non-gnome3 desktop
- 742702 GtkTreeView separator has wrong color if not active
- 742704 GtkComboBox: Separators not visible with Adwaita
- 742727 nautilus adding bookmark by dragging appear always at top
- 742764 Fix check for 'y' padding in gtk_cell_renderer_set_padding()
- 742771 Properly ignore BadWindow and BadDrawable in get_child_info_handler()
- 742774 Properly check result of g_utf8_get_char_validated()
- 742778 Fix accessible_class->widget_set initialization
- 742785 Fix event->button.y_root when using mouse buttons and dnd canceled
- 742786 Fix save_hot_y init in gtk_drag_get_icon()
- 742940 Adjust annotations of gtk_status_icon_position_menu to match GtkMe...
- 742980 cannot start broadway on FreeBSD
- 743037 Typo in gdk_window_get_root_coords documentation
- 743101 commit 77b876fa breaks zathura
- 743117 / and ~ Don't work in filechooser's recent mode
- 743157 gtk3-demo editable cells treeview problem
- 742646 DnD images not shown
-
-* Translation updates:
- Basque
- British English
- Czech
- Galician
- German
- Greek
- Hebrew
- Hungarian
- Icelandic
- Lithuanian
- Russian
- Spanish
- Vietnamese
-
-
-Overview of Changes in GTK+ 3.15.3
-==================================
-
-* GtkTextView:
- - Font fallback and letter spacing can be controlled with tags now
- - Pango markup can be inserted in text buffers
-
-* GtkEntry now has API to grab focus without selecting the contents
-
-* GtkWindow now starts from the focused widget when looking for
-  actions that are activated by accelerators
-
-* GtkScrolledWindow draws an indication where an edge if hiding
-  some content that can be scrolled in
-
-* GtkStack has gained GtkNotebook-like focus handling
-
-* Theming:
- - Support :not() in CSS
- - GtkRange now supports :hover for the whole widget
- - The HighContrast theme has caught up with some never GTK+ features
- - Avoid excessive shadow redraws
-
-* Build:
- - gtk3-update-icon-cache is no longer used at build time, and the
-   --enable-gtk2-dependency configure option has been removed
- - The examples that are used in the documentation can now be built
-   standalone
-
-* Inspector:
- - Allow extension with loadable modules, the first use for this
-   is gjs-inspector, which adds a JavaScript prompt
- - Allow testing cursor theme changes
-
-* Bugs fixed:
-  59390 load Pango Markup into GtkTextBuffer
- 364566 Text editing widgets should support keypad Insert/Delete...
- 461249 gtk_icon_theme_list_contexts() documentation: What is a ...
- 674537 GtkMenuPositionFunc: x and y should be "inout"
- 708857 Half-maximized CSD apps don't get a drop shadow drawn
- 710793 GtkDialog destroy event allocation size== 1, 1
- 721939 Editable cells demo: Add new row at cursor
- 722781 Foreach call on sort model fails with sort function
- 729927 impossible to create a directory if the contents of the ...
- 730232 print dialog clips off left page size label on A4 landsc...
- 730364 Add HTTPS or secure connection support with certificates...
- 735122 GtkApplication: fix global menubar on Mac OS
- 735838 Provide a way to focus an entry without selecting its co...
- 739453 Home and Desktop do not link to correct place in PlacesS...
- 739729 Bookmarks in sidebar sometimes randomly change their order
- 739977 Don't wait for ENTER to initiate search
- 740162 Problem linking gtk-query-immodules-3.0
- 740287 GtkWindow's hide-titlebar-when-maximized no longer does ...
- 740358 Postbuild checks complains about 64-bit portability
- 740374 Is enum GtkCssProviderError really deprecated?
- 740438 Stop emitting state-change signals for ATK_STATE_ARMED
- 740447 support symbolic Application icons for high contrast theme
- 740537 Cannot build example application
- 740605 Fix Build In gdkgl.c (Avoid GCCism In Pointer Arithmetic)
- 740612 Cups secret service auth_info lookup fails to read auth_...
- 740613 XConvertSelection crashes Gtk+ apps
- 740642 Fix different height for buttons with Hebrew character
- 740682 gtkapplication: Use actions from focused widget to activ...
- 740742 Don't scale before translation
- 740770 Missing style when the GtkCellRenderer:sensitive propert...
- 740812 Gtk-CRITICAL **: gtk_widget_is_ancestor: assertion 'GTK_...
- 740851 widget-factory: Add a row separator to the tree view
- 740857 HighContrast: in-app notifications lack padding
- 740860 HighContrast: vertical linking
- 740862 HighContrast: wide pane splitter
- 740863 HighContrast: separators
- 740876 HighContrast: scrolled window overshoot
- 740896 GtkPlacesSidebar: add support for unmount notifications
- 740904 Adwaita: tree lines are broken
- 740954 Please consider adding a font fallback property
- 740983 Allow plugins for Gtk Inspector
- 741027 Gtk Icon Browser | Add separator instead of shadow
- 741041 Add standalone Makefiles for the application examples
- 741117 Improve marks of GtkScale
- 741130 Entry completion with multiple cells can size wrong on f...
- 741185 GtkNotebook Raleigh theme doesn't highlight the active tab
- 741249 gtk_menu_tracker_section_find_model returns FALSE
- 741250 gtk_places_sidebar_list_shortcuts returns FALSE
- 741251 gtk_widget_get_frame_clock returns 0
- 741252 tests/variable.h header guard typo
- 741254 Improper headers guards
- 741314 No border / shadow underneath items dragged onto listvie...
- 741375 Windows: GTK+ programs stop running due to changes in CS...
- 741386 allow applications to retrieve GActionGroups available t...
-
-* Translation updates:
- Hebrew
- Swedish
- Turkish
- Vietnamese
-
-
-Overview of Changes in GTK+ 3.15.2
-==================================
-
-* GtkPopoverMenu: A GtkPopover subclass that makes it easy
-  to manually build menu-like popovers which can include
-  arbitrary controls.
-
-* GtkModelButton: A button widget that is optimized for
-  use inside popovers with a GAction as 'model'.
-
-* GL support:
- - Try harder to pick good visuals
- - Rework the way GL rendering is done in GtkGLArea
- - Support input events in GtkGLArea
- - Use shaders
- - The GDK_GL environment variable can be used for debugging
-
-* Inspector:
- - Make picking widgets work in Wayland
- - Rework search in all pages
- - Improve space use
- - Support GL information and debug flags
- - Shield the inspector window from more debug settings
- - Hide empty tabs
-
-* Theming:
- - Include the HighContrast theme
- - Add borders to menus in non-composited environments
- - Load themes from versioned directories like
-   .../themes/Emerald/gtk-3-14/.
-
-* Wayland:
- - Make window opacity work
- - Propagate clipboard owner changes
-
-* Mir:
- - Improved event handling
- - Support cursors
- - Enable CSD
- - Better monitor support
- - Add OpenGL support
-
-* Deprecations:
- - gdk_cursor_new
- - gdk_device_grab_info_libgtk_only
- - gdk_display_open_default_libgtk_only
- - gdk_add_option_entries_libgtk_only
- - gdk_pre_parse_libgtk_only
-
-* Bugs fixed:
- 687963 Extend warning "Icon '%s' not present in theme" to mention...
- 734140 Gnome apps spam stderr with warnings if Gnome Session Manager...
- 737891 mounting LUKS partition from nautilus takes very long
- 738321 GtkMenu has unnecessary scroll buttons
- 738648 gdk_window_get_content() causes creation/destruction of back...
- 738670 GL Context on NVIDIA
- 738800 Menu border missing in Adwaita when no compositor is running
- 738887 "Cannot commit NULL buffer to xdg_surface" error too pervasive
- 739474 radiobutton: don't consider hidden buttons in the group for focus
- 739750 Fix handling of windows with sizes that aren't a multiple of...
- 739781 Make global GDK libgtk_only functions more private
- 739885 gtk3-3.14.5 - fail to link - undefined reference to `GTK_IS_PLUG'
- 739977 Don't wait for ENTER to initiate search
- 740011 overscroll overlay is opaque in unfocused mode sidebars
- 740346 Mir backend needs support for GdkGLContext 
-
-* Translation updates:
- Greek
- Hebrew
- Kazakh
- Norwegian bokmål
- Spanish
- Swedish
-
-
-Overview of Changes in GTK+ 3.15.1
-==================================
-
-* An experimental mir backend has been added.
-  Use --enable-mir-backend to build it.
-
-* Inspector:
- - Show more information
- - Use a separate display connection
-
-* Deprecations:
- - GtkStyleProperties
-
-* Bugs fixed:
- 707695 GtkLevelBar Colour CSS
- 737561 quartz: gtk+ 3.14.0 fails to build on 10.6.8, 'NSFullScreen...
- 738650 fix separator with iconic section and more
- 738886 Out of bounds access in MyEnhancedXkbTranslateKeyCode
- 738955 Client-side decoration window menus appear at wrong positio...
- 738982 Add support for ATK_STATE_HAS_TOOLTIP
- 739001 Fix Build of broadwayd on Visual Studio
- 739005 gtkstatusicon.c won't build with both X11 and Quartz backen...
- 739111 GtkFontChooserDialog fixes
- 739150 Dragging bookmark crashes nautilus
-
-Translation updates:
- Czech
- Hungarian
- Serbian
- Spanish
-
-
-Overview of Changes in GTK+ 3.15.0
-==================================
-
-* GDK supports rendering windows using OpenGL; currently
-  this is implemented for X11 and Wayland using libepoxy
-
-* GtkGLArea: A new widget for rendering with OpenGL
-
-* GtkSidebar: A new switcher for GtkStack that looks like
-  a sidebar
-
-* Better typography: In many places, we now use proper Unicode
-  characters for dashes, quotes, multiplication signs and the
-  like, instead of ASCII approximations
-
-* Theming:
- - Context menus use the default font instead of inheriting from
-   the widget they are attached to
- - Theming engines are no longer used
- - Backdrop style has been fine-tuned to make the difference to
-   the active window more evident without affecting readability
-
-* Inspector:
- - Show nested tree models
- - Add a checkbox to disable the warning dialog
- - Rearrange the UI to gain space
- - Show object counts
-
-* GtkTextView has a monospace property
-
-* GtkPaned has a wide-handle property
-
-* GtkPrintUnixDialog
- - Has improved appearance without headerbars
- - Better rendering of sheet icons
- - No more missing icons
-
-* GtkScrolledWindow
- - A new policy, GTK_POLICY_EXTERNAL, which allows scrolling
-   without showing a scrollbar
- - Scroll events can now overshoot as well
- - The new signal ::edge-overshot is emitted when the scrolled
-   window is fully overshot
- - Scrollbars will be overlayed as narrow indicators when
-   there is no mouse
-
-* Deprecations:
- - gdk_window_set_static_gravities
- - gdk_window_set_composited
- - gtk_style_context_get_background_color
- - gtk_style_context_get_border_color
- - gtk_settings_set_string/long/double_property
- - gtk_settings_install_property
-
-* Bugs fixed:
- 119189 Add OpenGL support to GTK+
- 154709 don't use the cursor for preview
- 582799 GtkContainer should parse a list of widgets for a focus chain
- 671138 About dialog contains scary warranty disclaimer in copyright...
- 672946 Add gtk_css_provider_load_resource_from_file
- 681185 Document precedence between tooltip-markup and tooltip-text
- 724096 search-bar: don't show the widget until we're ready to reveal
- 725441 Print Dialog: Add support for PPD-less printing on IPP print...
- 730730 scrolling is broken when sharing adjustments
- 730893 Dialogs use headerbars even when DialogsUseHeader is unset
- 733157 Remove redundant checks for NULL
- 735192 Use better typography for paper names
- 735293 No vertical stack switcher component available (Sidebar)
- 735841 EmptyBoxes: instructions_label's alignment is off
- 737670 GtkCalendar days cannot be selected if vertical size is grea...
- 737679 Bookmarks are visually duplicated in sidebar
- 737777 Applications crash randomly while printing with a password-s...
- 737929 Long tooltips extend too far horizontally without wrapping
- 737952 Documentation missing for GtkTextView's new draw-layer funct...
- 737981 Strange frame in GtkScrolledWindow
- 737983 gtkplacessidebar: Open $HOME after unmounting or ejecting
- 737985 Unnecessary "GtkScrolledWindow .frame"
- 737986 Transparent icon background rendered black on XFCE
- 738083 GtkMenuButton is not disabled even if corresponding GAction is
- 738111 GtkListBox should allow for setting "placeholder" via GtkBui...
- 738158 Flat context menu button
- 738272 inspector: Add a tab for object counts
- 738533 Show overshoot on scroll events
- 738534 Add ::edge-hit signal
- 738591 Can't select file after showing header context menu
- 738636 GtkStackSwitcher focus overlap border
- 738670 GL Context on NVIDIA
- 738860 GtkPaned: Add a "wide-handle" property
- 738873 wayland backend aborts entire program if XDG_RUNTIME_DIR unset
- 738912 wayland: Don't try to create a subsurface again 
-
-* Translation updates
- Czech
- French
- German
- Hebrew
- Indonesian
- Italian
- Kazakh
- Korean
- Persian
- Polish
- Scottish Gaelic
- Spanish
-
-
-Overview of Changes in GTK+ 3.14.0 to 3.14.1
-============================================
-
-* Bugs fixed:
- 635258 Possible type to symbol translation bug
- 654051 Special GtkToolbar style when in fullscreen mode to respect...
- 708206 GtkBuilder throws GVariantParse errors instead of the GtkBu...
- 719936 GtkFontButton: Make sure the dialog isn't destroyed on dele...
- 729782 Window "disappears" when middle clicking client side decora...
- 734879 gdk_test_simulate_key() has no implementation on win32
- 735054 gtkapplication-quartz-menu unconditionally uses 10.7 features
- 735338 The inspector sometimes doesn't show up
- 735749 gnome-software: Can't switch between screenshots
- 736193 changing a GtkPopover's relative widget seems to forcibly d...
- 736338 GTK+ reftests can't be built on W32
- 736557 inspector: Show hidden windows in the inspector
- 736702 GtkWindow event special logic ignores subclass handlers
- 736830 GtkVolumeButton reaction inverted on scrolling action when ...
- 736971 GtkSettings: Add a private getter for the source
- 737251 drop down menus are always scrollable in full screen mode
- 737297 Gtk buttons don't work with touch anymore
- 737363 testgtk.c fails to compile when building for Wayland
- 737386 dark adwaita's -GtkWidget-link-color is unreadable on gray ...
- 737439 Plug memory leak in gtk_test_find_label()
- 737517 no border around progress bar 
-
-* Translation updates:
- Brazilian Portuguese
- Czech
- French
- Galician
- German
- Greek
- Hebrew
- Hindi
- Hungarian
- Indonesian
- Kannada
- Latvian
- Polish
- Russian
- Scottish Gaelic
- Serbian
- Spanish
- Tamil
- Telugu
-
-
-Overview of Changes in GTK+ 3.13.9 to 3.14.0
-============================================
-
-* GtkMisc::xalign has been undeprecated for now, it is still needed
-
-* GtkIconView
- - Always draw cell background
- - Fix handling of prelight items
-
-* GtkWindow
- - Fix growing nautilus windows
-
-* Bugs fixed:
- 736338 GTK+ reftests can't be built on W32
- 736622 Better mark GtkAlignment as deprecated
- 736927 Reference documentation refers to GTK 2
- 737000 Some icon themes broken on 3.13.92
- 737026 gtkinspector crashes app when selecting 'cancel' on initial prompt
- 737027 gtkinspector doesn't run if custom GSETTINGS_SCHEMA_DIR specified 
-
-* Translation updates:
- Bengali (India)
- Catalan
- Catalan (Valencian)
- Danish
- German
- Greek
- Hebrew
- Hindi
- Hungarian
- Marathi
- Russian
- Slovak
- Swedish
-
-
-Overview of Changes in GTK+ 3.13.8 to 3.13.9
-============================================
-
-* Adwaita:
- - Use sass functions more
- - Theme .app-notification instead of .app-notification.frame
- - Lots of button fine-tuning
- - Avoid double background rendering in tooltips
-
-* Inspector:
- - Show widget allocations
- - Show hidden windows
- - Fix initial state of dark switch
-
-* Bug fixes:
- 328449 selecting selectable ellipsized GtkLabel labels is (slightly) broken
- 528800 Widget Gallery has non-intuitive Image for GtkTreeView
- 579625 Cancel button on Gtk.Assistant should have Esc as accelerator
- 668258 Topic ellipsis acts as a link when omitted text contains a link
- 698031 Cannot link libgdk (-lrt required)
- 732916 treeview: column drop target visualization broken
- 735240 Labels in list rows don't get their dim-label class applied until...
- 735953 GtkPlacesSidebar blocks on g_file_query_info()
- 735959 osd progressbar gap
- 735965 rubberband selection broken
- 736004 touch support for icon activation
- 736056 GtkFontChooserButton's contents are not baseline aligned
- 736064 Openbox title bar strange behaviour
- 736121 gdk smooth scroll event unit inconsistencies between backends
- 736131 tooltip: Fix warning with GtkCellRendererAccel
- 736155 gtk_window_draw draws background twice and breaks with translucent...
- 736173 a program clashes when drag-and-drop items in a GtkRecentChooserWidget
- 736178 gtk_tree_view_scroll_to_cell() only works the first time
- 736191 Inspector could show widget allocation
- 736201 g_object_weak_unref assertion failures when closing the inspector
- 736203 [regression] GtkCellRendererAccel doesn't work in modal dialogues
- 736205 GtkMenuButton with popover breaks with GtkApplicationWindow's buil...
- 736250 Need to sort gtk_compose_seqs_compact[] table in the descending order
- 736269 GTK crashes when gdk_window_get_root_coords() is called on a forei...
- 736307 GtkStackSwitcher doesn't like removing children from stack
- 736512 Segfault in GtkPlacesSidebar when used with Nautilus
- 736535 Vertical alignment of text labels is off
- 736557 inspector: Show hidden windows in the inspector 
-
-* Translation updates:
- Assamese
- Brazilian Portuguese
- Czech
- Finnish
- French
- Galician
- German
- Greek
- Gujarati
- Hebrew
- Indonesian
- Kannada
- Korean
- Latvian
- Lithuanian
- Korean
- Polish
- Punjabi
- Russian
- Spanish
- Swedish
- Traditional Chinese
-
-
 Overview of Changes in GTK+ 3.13.7 to 3.13.8
 ============================================

@@ -1248,7 +359,7 @@ Overview of Changes in GTK+ 3.13.2 to 3.13.3

 * Bugs fixed:
 721895	Remove GtkIconCache
- 729820	GMenuModel submenu-action set 'false' before item activation
+729820	GMenuModel submenu-action set 'false' before item activation
 730615	a11y private library not included in GIR
 730745	Port annotations from Vala
 730767	Tab that's being dragged is not updated
@@ -73,37 +73,6 @@ 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 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 signal 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
 ======================

@@ -130,14 +99,6 @@ Release notes for 3.14
  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
 ======================

@@ -166,7 +166,7 @@ Please refer to the following GNOME Live! page for a more detailed ouline
 on the process of building the GTK+ stack and its dependencies with Visual
 C++:

-https://wiki.gnome.org/Projects/GTK+/Win32/MSVCCompilationOfGTKStack
+https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack

 Alternative 1 also generates Microsoft import libraries (.lib), if you
 have lib.exe available. It might also work for cross-compilation from
@@ -20,11 +20,13 @@ EXTRA_DIST +=	\
 	gtk3-demo.vcxproj.filters	\
 	gtk3-demo-application.vcxproj	\
 	gtk3-demo-application.vcxproj.filters	\
-	gtk3-icon-browser.vcxproj	\
-	gtk3-icon-browser.vcxproj.filters	\
+	gtk-inspector.vcxproj	\
+	gtk-inspector.vcxprojin	\
+	gtk-inspector.vcxproj.filters	\
+	gtk-inspector.vcxproj.filtersin	\
 	gailutil.vcxproj	\
 	gailutil.vcxproj.filters	\
-	gtk-install.vcxproj	\
+	install.vcxproj	\
 	broadwayd.vcxproj	\
 	broadwayd.vcxproj.filters	\
 	gdk-broadway.vcxproj	\
@@ -5,7 +5,7 @@ the use of the library.
 A more detailed outline for instructions on building the GTK+ with Visual
 C++ can be found in the following GNOME Live! page:

-https://wiki.gnome.org/Projects/GTK+/Win32/MSVCCompilationOfGTKStack
+https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack

 This VS10 solution and the projects it includes are intented to be used
 in a GTK+ source tree unpacked from a tarball. In a git checkout you
@@ -59,9 +59,9 @@ The recommended build order for these dependencies:
 as described in the README.txt file in the build/win32/vs10 folder)
 -zlib
 -libpng
-(for GDK-Pixbuf, if not using GDI+) IJG JPEG or libjpeg-turbo
+-(for GDK-Pixbuf, if not using GDI+) IJG JPEG
 -(for GDK-Pixbuf, if not using GDI+) libtiff
- [libtiff requires zlib and IJG JPEG or libjpeg-turbo]
+ [libtiff requires zlib and IJG JPEG]
 -(for GDK-Pixbuf, if not using GDI+) jasper [jpeg-2000 library]
 -(optional for GLib) PCRE (version 8.12 or later, use of CMake to
  build PCRE is recommended-see build/win32/vs10/README.txt of GLib)
@@ -81,11 +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.

-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
-GTK+ section) on how to get those icons set up for use with GTK+.
-
 *About the dependencies marked with *: These dependencies are optional
 as those are not compulsory components for building and running GTK+
 itself, but note that they are needed for people running and building
@@ -75,7 +75,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;..\crypt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -95,7 +95,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;..\crypt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -120,7 +120,7 @@
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;..\crypt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -143,7 +143,7 @@
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;..\crypt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -163,8 +163,8 @@
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
+    <ClCompile Include="..\crypt\crypt3.c" />
    <ClCompile Include="..\..\..\gdk\broadway\broadwayd.c" />
-    <ClCompile Include="..\..\..\gdk\broadway\broadway-buffer.c" />
    <ClCompile Include="..\..\..\gdk\broadway\broadway-output.c" />
    <ClCompile Include="..\..\..\gdk\broadway\broadway-server.c" />
  </ItemGroup>
@@ -15,8 +15,8 @@
    </Filter>
  </ItemGroup>
  <ItemGroup>
+    <ClCompile Include="..\crypt\crypt3.c"><Filter>Sources</Filter></ClCompile>
    <ClCompile Include="..\..\..\gdk\broadway\broadwayd.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\..\gdk\broadway\broadway-buffer.c"><Filter>Sources</Filter></ClCompile>
    <ClCompile Include="..\..\..\gdk\broadway\broadway-output.c"><Filter>Sources</Filter></ClCompile>
    <ClCompile Include="..\..\..\gdk\broadway\broadway-server.c"><Filter>Sources</Filter></ClCompile>
  </ItemGroup>
@@ -89,7 +89,6 @@
      <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
      <SubSystem>Windows</SubSystem>
@@ -114,7 +113,6 @@
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
@@ -137,7 +135,6 @@
      <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
      <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
      <SubSystem>Windows</SubSystem>
@@ -161,7 +158,6 @@
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -126,7 +126,6 @@
    <ClCompile Include="..\..\..\gdk\win32\gdkdnd-win32.c" />
    <ClCompile Include="..\..\..\gdk\win32\gdkevents-win32.c" />
    <ClCompile Include="..\..\..\gdk\win32\gdkgeometry-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkglcontext-win32.c" />
    <ClCompile Include="..\..\..\gdk\win32\gdkglobals-win32.c" />
    <ClCompile Include="..\..\..\gdk\win32\gdkinput.c" />
    <ClCompile Include="..\..\..\gdk\win32\gdkkeys-win32.c" />
@@ -24,7 +24,6 @@
    <ClCompile Include="..\..\..\gdk\win32\gdkdnd-win32.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\gdk\win32\gdkevents-win32.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\gdk\win32\gdkgeometry-win32.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\gdk\win32\gdkglcontext-win32.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\gdk\win32\gdkglobals-win32.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\gdk\win32\gdkinput.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\gdk\win32\gdkkeys-win32.c"><Filter>Source Files</Filter></ClCompile>
@@ -147,7 +147,6 @@
      <AdditionalDependencies>imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
@@ -170,7 +169,6 @@
      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
@@ -190,7 +188,6 @@
      <AdditionalDependencies>imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -212,7 +209,6 @@
      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -237,7 +233,6 @@
      <AdditionalDependencies>imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
@@ -260,7 +255,6 @@
      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
@@ -280,7 +274,6 @@
      <AdditionalDependencies>imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -302,7 +295,6 @@
      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -10,19 +10,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broadwayd", "broadwayd.vcxp
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-inspector", "gtk-inspector.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo-application", "gtk3-demo-application.vcxproj", "{3281202A-CD26-4C67-B892-EB34BDBC612F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-icon-browser", "gtk3-icon-browser.vcxproj", "{3281202A-CD26-4C67-B892-EB34BDBC612E}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-encode-symbolic-svg", "gtk-encode-symbolic-svg.vcxproj", "{3281202A-CD26-4C67-B892-EB34BDBC6131}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcxproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-install", "gtk-install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B15}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -108,6 +108,22 @@ Global
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.Build.0 = Release_Broadway|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.Build.0 = Release|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.Build.0 = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.ActiveCfg = Debug|x64
@@ -156,22 +172,22 @@ Global
 		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release_Broadway|x64.Build.0 = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|Win32.Build.0 = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|x64.ActiveCfg = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|x64.Build.0 = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release|Win32.ActiveCfg = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release|Win32.Build.0 = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release|x64.ActiveCfg = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release|x64.Build.0 = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release_Broadway|x64.Build.0 = Release_Broadway|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_Broadway|x64.Build.0 = Release_Broadway|x64
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|Win32.Build.0 = Debug|Win32
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|x64.ActiveCfg = Debug|x64
@@ -188,22 +204,6 @@ Global
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|x64.Build.0 = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Debug|Win32.Build.0 = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Debug|x64.ActiveCfg = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Debug|x64.Build.0 = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Release|Win32.ActiveCfg = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Release|Win32.Build.0 = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Release|x64.ActiveCfg = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Release|x64.Build.0 = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Debug_Broadway|Win32.Build.0 = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Debug_Broadway|x64.Build.0 = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Release_Broadway|Win32.Build.0 = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Release_Broadway|x64.ActiveCfg = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Release_Broadway|x64.Build.0 = Release|x64
 		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|Win32.Build.0 = Debug|Win32
 		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|x64.ActiveCfg = Debug|x64
@@ -9,7 +9,7 @@
    <GtkPrefixDefine>GTK_PREFIX=\"$(GtkDummyPrefix)\"</GtkPrefixDefine>
    <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>
+    <GtkDefines>GTK_COMPILATION;G_LOG_DOMAIN="Gtk";GTK_HOST="i686-pc-vs$(VSVer)";GTK_PRINT_BACKENDS="file";GTK_PRINT_PREVIEW_COMMAND="undefined-gtk-print-preview-command";$(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>
  </PropertyGroup>
  <PropertyGroup>
    <_PropertySheetDisplayName>gtkbuilddefinesprops</_PropertySheetDisplayName>
@@ -21,11 +21,9 @@
      <AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
 	<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>
+      <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;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
@@ -9,7 +9,7 @@
  <ItemDefinitionGroup>
    <Link>
      <AdditionalOptions>/EXPORT:gdk_win32_display_manager_get_type</AdditionalOptions>
-    </Link>
+    </Link
    <PostBuildEvent>
      <Command>
 if "$(Configuration)" == "Release" goto END
@@ -33,7 +33,7 @@ echo $(Configuration) &gt; ..\..\..\MSVC_$(Configuration)
 :DONE_GDKCONFIG_H
    </GenGdkConfigHWin32>
    <GenGdkConfigHBroadway>
-if exist ..\..\..\MSVC_$(Configuration)_Broadway goto DONE_GDKCONFIG_H
+if exist ..\..\..\MSVC_$(Configuration) goto DONE_GDKCONFIG_H


 if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h
@@ -53,7 +53,7 @@ copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\gdk\gdkconfig.h

 copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\GDK_BROADWAY_BUILD

-echo $(Configuration) &gt; ..\..\..\MSVC_$(Configuration)_Broadway
+echo $(Configuration) &gt; ..\..\..\MSVC_$(Configuration)

 :DONE_GDKCONFIG_H
    </GenGdkConfigHBroadway>
@@ -1,24 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
+    <Filter Include="Header Files">
      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
    </Filter>
    <Filter Include="Resource Files">
      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
    </Filter>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="..\..\..\demos\icon-browser\iconbrowserapp.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\icon-browser\iconbrowserwin.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\icon-browser\iconstore.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\icon-browser\main.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\icon-browser\resources.c"><Filter>Sources</Filter></ClCompile>
+#include "libgtk-inspector.vs10.sourcefiles.filters"
  </ItemGroup>
 </Project>
@@ -19,30 +19,30 @@
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{3281202A-CD26-4C67-B892-EB34BDBC612E}</ProjectGuid>
-    <RootNamespace>gtk3iconbrowser</RootNamespace>
+    <ProjectGuid>{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}</ProjectGuid>
+    <RootNamespace>gtkinspector</RootNamespace>
    <Keyword>Win32Proj</Keyword>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <PlatformToolset>v100</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v100</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <PlatformToolset>v100</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v100</PlatformToolset>
  </PropertyGroup>
@@ -66,17 +66,11 @@
    <Import Project="gtk-build-defines.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -85,41 +79,23 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>false</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -128,54 +104,28 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>false</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
-    <ClCompile Include="..\..\..\demos\icon-browser\iconbrowserapp.c" />
-    <ClCompile Include="..\..\..\demos\icon-browser\iconbrowserwin.c" />
-    <ClCompile Include="..\..\..\demos\icon-browser\iconstore.c" />
-    <ClCompile Include="..\..\..\demos\icon-browser\main.c" />
-    <ClCompile Include="..\..\..\demos\icon-browser\resources.c" />
+#include "libgtk-inspector.vs10.sourcefiles"
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="gdk.vcxproj">
-      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gtk.vcxproj">
-      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f5}</Project>
+    <ProjectReference Include="gtk-prebuild.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073ff}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
@@ -89,7 +89,6 @@
      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
@@ -109,7 +108,6 @@
      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -134,7 +132,6 @@
      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
@@ -154,7 +151,6 @@
      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -221,6 +217,10 @@
      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
+    <ProjectReference Include="gtk-inspector.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073fd}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
@@ -190,7 +190,6 @@
    <ClCompile Include="..\..\..\demos\gtk-demo\event_axes.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\expander.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\gestures.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\glarea.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\headerbar.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\hypertext.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\iconview.c" />
@@ -214,7 +213,6 @@
    <ClCompile Include="..\..\..\demos\gtk-demo\rotated_text.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\search_entry.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\search_entry2.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\sidebar.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\sizegroup.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\spinner.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\stack.c" />
@@ -32,7 +32,6 @@
    <ClCompile Include="..\..\..\demos\gtk-demo\event_axes.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\expander.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\gestures.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\glarea.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\headerbar.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\hypertext.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\iconview.c"><Filter>Source Files</Filter></ClCompile>
@@ -56,7 +55,6 @@
    <ClCompile Include="..\..\..\demos\gtk-demo\rotated_text.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\search_entry.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\search_entry2.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\sidebar.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\sizegroup.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\spinner.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\stack.c"><Filter>Source Files</Filter></ClCompile>
@@ -35,8 +35,8 @@
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2093D218-190E-4194-9421-3BA7CBF33B15}</ProjectGuid>
-    <RootNamespace>gtkinstall</RootNamespace>
+    <ProjectGuid>{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}</ProjectGuid>
+    <RootNamespace>install</RootNamespace>
    <Keyword>Win32Proj</Keyword>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -203,10 +203,6 @@
      <Project>{3281202a-cd26-4c67-b892-eb34bdbc612f}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
-    <ProjectReference Include="gtk3-icon-browser.vcxproj">
-      <Project>{3281202a-cd26-4c67-b892-eb34bdbc612e}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
    <ProjectReference Include="broadwayd.vcxproj">
      <Project>{3281202a-cd26-4c67-b892-eb34bdbc6130}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -219,4 +215,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
@@ -16,11 +16,11 @@ EXTRA_DIST +=	\
 	gtk3-demo.vcxproj.filters	\
 	gtk3-demo-application.vcxproj	\
 	gtk3-demo-application.vcxproj.filters	\
-	gtk3-icon-browser.vcxproj	\
-	gtk3-icon-browser.vcxproj.filters	\
+	gtk-inspector.vcxproj	\
+	gtk-inspector.vcxproj.filters	\
 	gailutil.vcxproj	\
 	gailutil.vcxproj.filters	\
-	gtk-install.vcxproj	\
+	install.vcxproj	\
 	broadwayd.vcxproj	\
 	broadwayd.vcxproj.filters	\
 	gdk-broadway.vcxproj	\
@@ -16,11 +16,11 @@ EXTRA_DIST +=	\
 	gtk3-demo.vcxproj.filters	\
 	gtk3-demo-application.vcxproj	\
 	gtk3-demo-application.vcxproj.filters	\
-	gtk3-icon-browser.vcxproj	\
-	gtk3-icon-browser.vcxproj.filters	\
+	gtk-inspector.vcxproj	\
+	gtk-inspector.vcxproj.filters	\
 	gailutil.vcxproj	\
 	gailutil.vcxproj.filters	\
-	gtk-install.vcxproj	\
+	install.vcxproj	\
 	broadwayd.vcxproj	\
 	broadwayd.vcxproj.filters	\
 	gdk-broadway.vcxproj	\
@@ -12,9 +12,10 @@ EXTRA_DIST +=	\
 	gtk-encode-symbolic-svg.vcproj	\
 	gtk3-demo.vcproj	\
 	gtk3-demo-application.vcproj	\
-	gtk3-icon-browser.vcproj	\
+	gtk-inspector.vcproj	\
+	gtk-inspector.vcprojin	\
 	gailutil.vcproj	\
-	gtk-install.vcproj	\
+	install.vcproj	\
 	broadwayd.vcproj	\
 	gdk-broadway.vcproj	\
 	gtk-build-defines.vsprops	\
@@ -5,7 +5,7 @@ the use of the library.
 A more detailed outline for instructions on building the GTK+ with Visual
 C++ can be found in the following GNOME Live! page:

-https://wiki.gnome.org/Projects/GTK+/Win32/MSVCCompilationOfGTKStack
+https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack

 This VS9 solution and the projects it includes are intented to be used
 in a GTK+ source tree unpacked from a tarball. In a git checkout you
@@ -58,9 +58,9 @@ The recommended build order for these dependencies:
 as described in the README.txt file in the build/win32/vs9 folder)
 -zlib
 -libpng
-(for GDK-Pixbuf, if not using GDI+) IJG JPEG or libjpeg-turbo
+-(for GDK-Pixbuf, if not using GDI+) IJG JPEG
 -(for GDK-Pixbuf, if not using GDI+) libtiff
- [libtiff requires zlib and IJG JPEG or libjpeg-turbo]
+ [libtiff requires zlib and IJG JPEG]
 -(for GDK-Pixbuf, if not using GDI+) jasper [jpeg-2000 library])
 -(optional for GLib) PCRE (version 8.12 or later, use of CMake to
  build PCRE is recommended-see build/win32/vs9/README.txt of GLib)
@@ -80,11 +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.

-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
-GTK+ section) on how to get those icons set up for use with GTK+.
-
 *About the dependencies marked with *: These dependencies are optional
 as those are not compulsory components for building and running GTK+
 itself, but note that they are needed for people running and building
@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway;..\crypt"
 				PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -62,7 +62,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway;..\crypt"
 				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="$(GdkDefines)"
 				RuntimeLibrary="2"
@@ -95,7 +95,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway;..\crypt"
 				PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -127,7 +127,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway;..\crypt"
 				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="$(GdkDefines)"
 				RuntimeLibrary="2"
@@ -157,8 +157,8 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 		</Filter>
+			<File RelativePath="..\crypt\crypt3.c" />
 			<File RelativePath="..\..\..\gdk\broadway\broadwayd.c" />
-			<File RelativePath="..\..\..\gdk\broadway\broadway-buffer.c" />
 			<File RelativePath="..\..\..\gdk\broadway\broadway-output.c" />
 			<File RelativePath="..\..\..\gdk\broadway\broadway-server.c" />
 		<Filter
@@ -133,7 +133,6 @@
 			<File RelativePath="..\..\..\gdk\win32\gdkdnd-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkevents-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkgeometry-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkglcontext-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkglobals-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkinput.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkkeys-win32.c" />
@@ -23,9 +23,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcproj", "{FC5AA
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-inspector", "gtk-inspector.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}
+	EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
@@ -45,26 +51,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-encode-symbolic-svg", "
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-icon-browser", "gtk3-icon-browser.vcproj", "{3281202A-CD26-4C67-B892-EB34BDBC612E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-install", "gtk-install.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B15}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}
 		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942} = {29E3E814-1BA3-4AD7-A3A7-3669CB80A942}
 		{3281202A-CD26-4C67-B892-EB34BDBC612F} = {3281202A-CD26-4C67-B892-EB34BDBC612F}
-		{3281202A-CD26-4C67-B892-EB34BDBC612E} = {3281202A-CD26-4C67-B892-EB34BDBC612E}
 		{3281202A-CD26-4C67-B892-EB34BDBC6130} = {3281202A-CD26-4C67-B892-EB34BDBC6130}
 		{3281202A-CD26-4C67-B892-EB34BDBC6131} = {3281202A-CD26-4C67-B892-EB34BDBC6131}
 	EndProjectSection
@@ -145,6 +144,22 @@ Global
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.Build.0 = Release_Broadway|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.Build.0 = Release|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.Build.0 = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.ActiveCfg = Debug|x64
@@ -161,22 +176,22 @@ Global
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release_Broadway|x64.Build.0 = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|Win32.Build.0 = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|x64.ActiveCfg = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|x64.Build.0 = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release|Win32.ActiveCfg = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release|Win32.Build.0 = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release|x64.ActiveCfg = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release|x64.Build.0 = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release_Broadway|x64.Build.0 = Release_Broadway|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_Broadway|x64.Build.0 = Release_Broadway|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|Win32.Build.0 = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|x64.ActiveCfg = Debug|x64
@@ -225,22 +240,6 @@ Global
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|x64.Build.0 = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Debug|Win32.Build.0 = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Debug|x64.ActiveCfg = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Debug|x64.Build.0 = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Release|Win32.ActiveCfg = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Release|Win32.Build.0 = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Release|x64.ActiveCfg = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Release|x64.Build.0 = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Debug_Broadway|Win32.Build.0 = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Debug_Broadway|x64.Build.0 = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Release_Broadway|Win32.Build.0 = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Release_Broadway|x64.ActiveCfg = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612E}.Release_Broadway|x64.Build.0 = Release|x64
 		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|Win32.Build.0 = Debug|Win32
 		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|x64.ActiveCfg = Debug|x64
@@ -12,11 +12,10 @@
 		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"
 		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES"
 		ForcedIncludeFiles="msvc_recommended_pragmas.h"
-		AdditionalOptions="/MP"
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="gdk_pixbuf-2.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib cairo.lib gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib epoxy.lib"
+		AdditionalDependencies="gdk_pixbuf-2.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib cairo.lib gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
 		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
 	/>
 	<UserMacro
@@ -41,6 +40,6 @@
 	/>
 	<UserMacro
 		Name="GtkDefines"
-		Value="GTK_COMPILATION;G_LOG_DOMAIN=\&quot;Gtk\&quot;;GTK_HOST=\&quot;i686-pc-vs$(VSVer)\&quot;;GTK_PRINT_BACKENDS=\&quot;file\&quot;;GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED;$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot;;GTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot;GTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;;GTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot;;MULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\&quot;;MULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot;;GTK_VERSION=\&quot;$(GtkVersion)/etc\&quot;;GTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)/etc\&quot;;GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED"
+		Value="GTK_COMPILATION;G_LOG_DOMAIN=\&quot;Gtk\&quot;;GTK_HOST=\&quot;i686-pc-vs$(VSVer)\&quot;;GTK_PRINT_BACKENDS=\&quot;file\&quot;;GTK_PRINT_PREVIEW_COMMAND=\&quot;undefined-gtk-print-preview-command\&quot;;$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot;;GTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot;GTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;;GTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot;;MULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\&quot;;MULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot;;GTK_VERSION=\&quot;$(GtkVersion)/etc\&quot;;GTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)/etc\&quot;;GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED"
 	/>
 </VisualStudioPropertySheet>
@@ -36,7 +36,7 @@ echo $(ConfigurationName) &gt; ..\..\..\MSVC_$(ConfigurationName)&#x0D;&#x0A;
 	<UserMacro
 		Name="GenGdkConfigHBroadway"
 		Value="
-if exist ..\..\..\MSVC_$(ConfigurationName)_Broadway goto DONE_GDKCONFIG_H&#x0D;&#x0A;
+if exist ..\..\..\MSVC_$(ConfigurationName) goto DONE_GDKCONFIG_H&#x0D;&#x0A;

 if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
 if exist ..\..\..\GDK_WIN32ONLY_BUILD del ..\..\..\GDK_WIN32ONLY_BUILD&#x0D;&#x0A;
@@ -50,7 +50,7 @@ if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; del ..\..\..\M
 copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\GDK_BROADWAY_BUILD&#x0D;&#x0A;

-echo $(ConfigurationName) &gt; ..\..\..\MSVC_$(ConfigurationName)_Broadway&#x0D;&#x0A;
+echo $(ConfigurationName) &gt; ..\..\..\MSVC_$(ConfigurationName)&#x0D;&#x0A;
 :DONE_GDKCONFIG_H&#x0D;&#x0A;
 		      "
 	/>
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="gtk3-icon-browser"
-	ProjectGUID="{3281202A-CD26-4C67-B892-EB34BDBC612E}"
-	RootNamespace="gtk3iconbrowser"
+	Name="gtk-inspector"
+	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}"
+	RootNamespace="gtkinspector"
 	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
+	TargetFrameworkVersion="0"
 	>
 	<Platforms>
 		<Platform
@@ -22,7 +22,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			InheritedPropertySheets=".\gtk-build-defines.vsprops"
-			ConfigurationType="1"
+			ConfigurationType="4"
 			CharacterSet="2"
 			>
 			<Tool
@@ -31,8 +31,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\demos\icon-browser"
-				PreprocessorDefinitions="_DEBUG"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -40,19 +40,11 @@
 				WarningLevel="3"
 				DebugInformationFormat="4"
 			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			InheritedPropertySheets=".\gtk-build-defines.vsprops"
-			ConfigurationType="1"
+			ConfigurationType="4"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
@@ -61,42 +53,28 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\demos\icon-browser"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions="$(GtkDefines)"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="1"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
 			InheritedPropertySheets=".\gtk-build-defines.vsprops"
-			ConfigurationType="1"
+			ConfigurationType="4"
 			CharacterSet="2"
 			>
 			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
+				Name="VCPreBuildEventTool"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\demos\icon-browser"
-				PreprocessorDefinitions="_DEBUG"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -104,77 +82,49 @@
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
 			InheritedPropertySheets=".\gtk-build-defines.vsprops"
-			ConfigurationType="1"
+			ConfigurationType="4"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
 			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
+				Name="VCPreBuildEventTool"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\demos\icon-browser"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions="$(GtkDefines)"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="1"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
 		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
 		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\demos\icon-browser\iconbrowserapp.c" />
-			<File RelativePath="..\..\..\demos\icon-browser\iconbrowserwin.c" />
-			<File RelativePath="..\..\..\demos\icon-browser\iconstore.c" />
-			<File RelativePath="..\..\..\demos\icon-browser\main.c" />
-			<File RelativePath="..\..\..\demos\icon-browser\resources.c" />
-		</Filter>
-		<Filter
-			Name="Headers"
+			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+#include "libgtk-inspector.sourcefiles"
+		</Filter>
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
@@ -1,469 +1,437 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="gtkinstallprops"
- InheritedPropertySheets=".\gtk-build-defines.vsprops"
- >
- <UserMacro
-  Name="GtkDoInstallBin"
-  Value="
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="gtkinstallprops"
+	InheritedPropertySheets=".\gtk-build-defines.vsprops"
+	>
+	<UserMacro
+		Name="GtkDoInstallBin"
+		Value="
 mkdir $(CopyDir)\bin&#x0D;&#x0A;
 mkdir $(CopyDir)\lib&#x0D;&#x0A;

-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-
 if &quot;$(ConfigurationName)&quot; == &quot;Release_Broadway&quot; goto DO_BROADWAY_BIN&#x0D;&#x0A;
 if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; goto DO_BROADWAY_BIN&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-demo.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-demo.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-demo-application.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-demo-application.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-icon-browser.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin&#x0D;&#x0A;
+
+copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin&#x0D;&#x0A;
 goto DONE_BIN&#x0D;&#x0A;

 :DO_BROADWAY_BIN&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\broadwayd.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\broadwayd.pdb $(CopyDir)\bin&#x0D;&#x0A;

-if &quot;$(ConfigurationName)&quot; == &quot;Release_Broadway&quot; goto DO_BROADWAY_RELEASE&#x0D;&#x0A;
-if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; goto DO_BROADWAY_DEBUG&#x0D;&#x0A;
-:DO_BROADWAY_RELEASE&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk3-demo.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk3-demo.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk3-demo-application.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk3-demo-application.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk3-icon-browser.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin&#x0D;&#x0A;
-goto DONE_BIN&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Release_Broadway&quot; copy .\Release\$(PlatformName)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Release_Broadway&quot; copy .\Release\$(PlatformName)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Release_Broadway&quot; copy .\Release\$(PlatformName)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Release_Broadway&quot; copy .\Release\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Release_Broadway&quot; copy .\Release\$(PlatformName)\bin\*.exe $(CopyDir)\bin&#x0D;&#x0A;

-:DO_BROADWAY_DEBUG&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk3-demo.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk3-demo.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk3-demo-application.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk3-demo-application.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk3-icon-browser.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; copy .\Debug\$(PlatformName)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; copy .\Debug\$(PlatformName)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; copy .\Debug\$(PlatformName)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; copy .\Debug\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; copy .\Debug\$(PlatformName)\bin\*.exe $(CopyDir)\bin&#x0D;&#x0A;
 :DONE_BIN&#x0D;&#x0A;
-                       "
- />
- <UserMacro
-  Name="GtkDoInstall"
-  Value="
+		                     "
+	/>
+	<UserMacro
+		Name="GtkDoInstall"
+		Value="
 echo off&#x0D;&#x0A;
+
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated&#x0D;&#x0A;
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+
 copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdk.h $(CopyDir)\include\gtk-3.0\gdk\gdk.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdk-autocleanup.h $(CopyDir)\include\gtk-3.0\gdk\gdk-autocleanup.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkapplaunchcontext.h $(CopyDir)\include\gtk-3.0\gdk\gdkapplaunchcontext.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkcairo.h $(CopyDir)\include\gtk-3.0\gdk\gdkcairo.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkcursor.h $(CopyDir)\include\gtk-3.0\gdk\gdkcursor.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdevice.h $(CopyDir)\include\gtk-3.0\gdk\gdkdevice.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdevicemanager.h $(CopyDir)\include\gtk-3.0\gdk\gdkdevicemanager.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdisplay.h $(CopyDir)\include\gtk-3.0\gdk\gdkdisplay.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdisplaymanager.h $(CopyDir)\include\gtk-3.0\gdk\gdkdisplaymanager.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdnd.h $(CopyDir)\include\gtk-3.0\gdk\gdkdnd.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkevents.h $(CopyDir)\include\gtk-3.0\gdk\gdkevents.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkframetimings.h $(CopyDir)\include\gtk-3.0\gdk\gdkframetimings.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkglcontext.h $(CopyDir)\include\gtk-3.0\gdk\gdkglcontext.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkkeys.h $(CopyDir)\include\gtk-3.0\gdk\gdkkeys.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkkeysyms.h $(CopyDir)\include\gtk-3.0\gdk\gdkkeysyms.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkkeysyms-compat.h $(CopyDir)\include\gtk-3.0\gdk\gdkkeysyms-compat.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkmain.h $(CopyDir)\include\gtk-3.0\gdk\gdkmain.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkpango.h $(CopyDir)\include\gtk-3.0\gdk\gdkpango.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkframeclock.h $(CopyDir)\include\gtk-3.0\gdk\gdkframeclock.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkpixbuf.h $(CopyDir)\include\gtk-3.0\gdk\gdkpixbuf.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkprivate.h $(CopyDir)\include\gtk-3.0\gdk\gdkprivate.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkproperty.h $(CopyDir)\include\gtk-3.0\gdk\gdkproperty.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkrectangle.h $(CopyDir)\include\gtk-3.0\gdk\gdkrectangle.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkrgba.h $(CopyDir)\include\gtk-3.0\gdk\gdkrgba.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkscreen.h $(CopyDir)\include\gtk-3.0\gdk\gdkscreen.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkselection.h $(CopyDir)\include\gtk-3.0\gdk\gdkselection.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdktestutils.h $(CopyDir)\include\gtk-3.0\gdk\gdktestutils.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkthreads.h $(CopyDir)\include\gtk-3.0\gdk\gdkthreads.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdktypes.h $(CopyDir)\include\gtk-3.0\gdk\gdktypes.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkvisual.h $(CopyDir)\include\gtk-3.0\gdk\gdkvisual.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkwindow.h $(CopyDir)\include\gtk-3.0\gdk\gdkwindow.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-3.0\gdk\gdkenumtypes.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-3.0\gdk\gdkversionmacros.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\include\gtk-3.0\gdk\gdkconfig.h&#x0D;&#x0A;
-copy ..\..\..\gdk\deprecated\gdkcolor.h $(CopyDir)\include\gtk-3.0\gdk\deprecated\gdkcolor.h&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32cursor.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkwin32cursor.h&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32display.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkwin32display.h&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32displaymanager.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkwin32displaymanager.h&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32dnd.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkwin32dnd.h&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32glcontext.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkwin32glcontext.h&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32keys.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkwin32keys.h&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32misc.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkwin32misc.h&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32screen.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkwin32screen.h&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32window.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkwin32window.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtk.h $(CopyDir)\include\gtk-3.0\gtk\gtk.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtk-autocleanups.h $(CopyDir)\include\gtk-3.0\gtk\gtk-autocleanups.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkx.h $(CopyDir)\include\gtk-3.0\gtk\gtkx.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkx-autocleanups.h $(CopyDir)\include\gtk-3.0\gtk\gtkx-autocleanups.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtk-a11y.h $(CopyDir)\include\gtk-3.0\gtk\gtk-a11y.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaboutdialog.h $(CopyDir)\include\gtk-3.0\gtk\gtkaboutdialog.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccelgroup.h $(CopyDir)\include\gtk-3.0\gtk\gtkaccelgroup.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccellabel.h $(CopyDir)\include\gtk-3.0\gtk\gtkaccellabel.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccelmap.h $(CopyDir)\include\gtk-3.0\gtk\gtkaccelmap.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccessible.h $(CopyDir)\include\gtk-3.0\gtk\gtkaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkactionable.h $(CopyDir)\include\gtk-3.0\gtk\gtkactionable.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkactionbar.h $(CopyDir)\include\gtk-3.0\gtk\gtkactionbar.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkadjustment.h $(CopyDir)\include\gtk-3.0\gtk\gtkadjustment.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkappchooser.h $(CopyDir)\include\gtk-3.0\gtk\gtkappchooser.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkappchooserbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkappchooserbutton.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkappchooserdialog.h $(CopyDir)\include\gtk-3.0\gtk\gtkappchooserdialog.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkappchooserwidget.h $(CopyDir)\include\gtk-3.0\gtk\gtkappchooserwidget.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkapplication.h $(CopyDir)\include\gtk-3.0\gtk\gtkapplication.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkapplicationwindow.h $(CopyDir)\include\gtk-3.0\gtk\gtkapplicationwindow.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaspectframe.h $(CopyDir)\include\gtk-3.0\gtk\gtkaspectframe.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkassistant.h $(CopyDir)\include\gtk-3.0\gtk\gtkassistant.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbbox.h $(CopyDir)\include\gtk-3.0\gtk\gtkbbox.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbin.h $(CopyDir)\include\gtk-3.0\gtk\gtkbin.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbindings.h $(CopyDir)\include\gtk-3.0\gtk\gtkbindings.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkborder.h $(CopyDir)\include\gtk-3.0\gtk\gtkborder.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbox.h $(CopyDir)\include\gtk-3.0\gtk\gtkbox.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbuilder.h $(CopyDir)\include\gtk-3.0\gtk\gtkbuilder.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbuildable.h $(CopyDir)\include\gtk-3.0\gtk\gtkbuildable.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkbutton.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcalendar.h $(CopyDir)\include\gtk-3.0\gtk\gtkcalendar.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellarea.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellarea.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellareacontext.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellareacontext.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellareabox.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellareabox.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcelleditable.h $(CopyDir)\include\gtk-3.0\gtk\gtkcelleditable.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcelllayout.h $(CopyDir)\include\gtk-3.0\gtk\gtkcelllayout.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderer.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellrenderer.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendereraccel.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellrendereraccel.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderercombo.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellrenderercombo.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererpixbuf.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellrendererpixbuf.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererprogress.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellrendererprogress.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererspin.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellrendererspin.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererspinner.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellrendererspinner.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderertext.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellrenderertext.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderertoggle.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellrenderertoggle.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellview.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellview.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcheckbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkcheckbutton.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcheckmenuitem.h $(CopyDir)\include\gtk-3.0\gtk\gtkcheckmenuitem.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkclipboard.h $(CopyDir)\include\gtk-3.0\gtk\gtkclipboard.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkcolorbutton.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorchooser.h $(CopyDir)\include\gtk-3.0\gtk\gtkcolorchooser.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorchooserwidget.h $(CopyDir)\include\gtk-3.0\gtk\gtkcolorchooserwidget.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorchooserdialog.h $(CopyDir)\include\gtk-3.0\gtk\gtkcolorchooserdialog.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorutils.h $(CopyDir)\include\gtk-3.0\gtk\gtkcolorutils.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcombobox.h $(CopyDir)\include\gtk-3.0\gtk\gtkcombobox.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcomboboxtext.h $(CopyDir)\include\gtk-3.0\gtk\gtkcomboboxtext.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcontainer.h $(CopyDir)\include\gtk-3.0\gtk\gtkcontainer.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcssprovider.h $(CopyDir)\include\gtk-3.0\gtk\gtkcssprovider.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcsssection.h $(CopyDir)\include\gtk-3.0\gtk\gtkcsssection.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdebug.h $(CopyDir)\include\gtk-3.0\gtk\gtkdebug.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdialog.h $(CopyDir)\include\gtk-3.0\gtk\gtkdialog.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdnd.h $(CopyDir)\include\gtk-3.0\gtk\gtkdnd.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdrawingarea.h $(CopyDir)\include\gtk-3.0\gtk\gtkdrawingarea.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkeditable.h $(CopyDir)\include\gtk-3.0\gtk\gtkeditable.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkentry.h $(CopyDir)\include\gtk-3.0\gtk\gtkentry.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkentrybuffer.h $(CopyDir)\include\gtk-3.0\gtk\gtkentrybuffer.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkentrycompletion.h $(CopyDir)\include\gtk-3.0\gtk\gtkentrycompletion.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkenums.h $(CopyDir)\include\gtk-3.0\gtk\gtkenums.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkeventbox.h $(CopyDir)\include\gtk-3.0\gtk\gtkeventbox.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkeventcontroller.h $(CopyDir)\include\gtk-3.0\gtk\gtkeventcontroller.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkexpander.h $(CopyDir)\include\gtk-3.0\gtk\gtkexpander.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooser.h $(CopyDir)\include\gtk-3.0\gtk\gtkfilechooser.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooserbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkfilechooserbutton.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooserdialog.h $(CopyDir)\include\gtk-3.0\gtk\gtkfilechooserdialog.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooserwidget.h $(CopyDir)\include\gtk-3.0\gtk\gtkfilechooserwidget.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilefilter.h $(CopyDir)\include\gtk-3.0\gtk\gtkfilefilter.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfixed.h $(CopyDir)\include\gtk-3.0\gtk\gtkfixed.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkflowbox.h $(CopyDir)\include\gtk-3.0\gtk\gtkflowbox.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfontbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkfontbutton.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfontchooser.h $(CopyDir)\include\gtk-3.0\gtk\gtkfontchooser.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfontchooserdialog.h $(CopyDir)\include\gtk-3.0\gtk\gtkfontchooserdialog.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfontchooserwidget.h $(CopyDir)\include\gtk-3.0\gtk\gtkfontchooserwidget.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkframe.h $(CopyDir)\include\gtk-3.0\gtk\gtkframe.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkgesture.h $(CopyDir)\include\gtk-3.0\gtk\gtkgesture.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkgesturedrag.h $(CopyDir)\include\gtk-3.0\gtk\gtkgesturedrag.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkgesturelongpress.h $(CopyDir)\include\gtk-3.0\gtk\gtkgesturelongpress.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkgesturemultipress.h $(CopyDir)\include\gtk-3.0\gtk\gtkgesturemultipress.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkgesturepan.h $(CopyDir)\include\gtk-3.0\gtk\gtkgesturepan.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkgesturerotate.h $(CopyDir)\include\gtk-3.0\gtk\gtkgesturerotate.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkgesturesingle.h $(CopyDir)\include\gtk-3.0\gtk\gtkgesturesingle.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkgestureswipe.h $(CopyDir)\include\gtk-3.0\gtk\gtkgestureswipe.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkgesturezoom.h $(CopyDir)\include\gtk-3.0\gtk\gtkgesturezoom.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkglarea.h $(CopyDir)\include\gtk-3.0\gtk\gtkglarea.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkgrid.h $(CopyDir)\include\gtk-3.0\gtk\gtkgrid.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkheaderbar.h $(CopyDir)\include\gtk-3.0\gtk\gtkheaderbar.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkicontheme.h $(CopyDir)\include\gtk-3.0\gtk\gtkicontheme.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkiconview.h $(CopyDir)\include\gtk-3.0\gtk\gtkiconview.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimage.h $(CopyDir)\include\gtk-3.0\gtk\gtkimage.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimcontext.h $(CopyDir)\include\gtk-3.0\gtk\gtkimcontext.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimcontextinfo.h $(CopyDir)\include\gtk-3.0\gtk\gtkimcontextinfo.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimcontextsimple.h $(CopyDir)\include\gtk-3.0\gtk\gtkimcontextsimple.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimmodule.h $(CopyDir)\include\gtk-3.0\gtk\gtkimmodule.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimmulticontext.h $(CopyDir)\include\gtk-3.0\gtk\gtkimmulticontext.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkinfobar.h $(CopyDir)\include\gtk-3.0\gtk\gtkinfobar.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkinvisible.h $(CopyDir)\include\gtk-3.0\gtk\gtkinvisible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklabel.h $(CopyDir)\include\gtk-3.0\gtk\gtklabel.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklayout.h $(CopyDir)\include\gtk-3.0\gtk\gtklayout.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklevelbar.h $(CopyDir)\include\gtk-3.0\gtk\gtklevelbar.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklinkbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtklinkbutton.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklistbox.h $(CopyDir)\include\gtk-3.0\gtk\gtklistbox.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkliststore.h $(CopyDir)\include\gtk-3.0\gtk\gtkliststore.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklockbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtklockbutton.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmain.h $(CopyDir)\include\gtk-3.0\gtk\gtkmain.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenu.h $(CopyDir)\include\gtk-3.0\gtk\gtkmenu.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenubar.h $(CopyDir)\include\gtk-3.0\gtk\gtkmenubar.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenubutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkmenubutton.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenuitem.h $(CopyDir)\include\gtk-3.0\gtk\gtkmenuitem.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenushell.h $(CopyDir)\include\gtk-3.0\gtk\gtkmenushell.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenutoolbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkmenutoolbutton.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmessagedialog.h $(CopyDir)\include\gtk-3.0\gtk\gtkmessagedialog.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmodelbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkmodelbutton.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmodules.h $(CopyDir)\include\gtk-3.0\gtk\gtkmodules.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmountoperation.h $(CopyDir)\include\gtk-3.0\gtk\gtkmountoperation.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtknotebook.h $(CopyDir)\include\gtk-3.0\gtk\gtknotebook.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkoffscreenwindow.h $(CopyDir)\include\gtk-3.0\gtk\gtkoffscreenwindow.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkorientable.h $(CopyDir)\include\gtk-3.0\gtk\gtkorientable.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkoverlay.h $(CopyDir)\include\gtk-3.0\gtk\gtkoverlay.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpagesetup.h $(CopyDir)\include\gtk-3.0\gtk\gtkpagesetup.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpaned.h $(CopyDir)\include\gtk-3.0\gtk\gtkpaned.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpapersize.h $(CopyDir)\include\gtk-3.0\gtk\gtkpapersize.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkplacessidebar.h $(CopyDir)\include\gtk-3.0\gtk\gtkplacessidebar.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkplug.h $(CopyDir)\include\gtk-3.0\gtk\gtkplug.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpopover.h $(CopyDir)\include\gtk-3.0\gtk\gtkpopover.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpopovermenu.h $(CopyDir)\include\gtk-3.0\gtk\gtkpopovermenu.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintcontext.h $(CopyDir)\include\gtk-3.0\gtk\gtkprintcontext.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintoperation.h $(CopyDir)\include\gtk-3.0\gtk\gtkprintoperation.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintoperationpreview.h $(CopyDir)\include\gtk-3.0\gtk\gtkprintoperationpreview.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintsettings.h $(CopyDir)\include\gtk-3.0\gtk\gtkprintsettings.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprogressbar.h $(CopyDir)\include\gtk-3.0\gtk\gtkprogressbar.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradiobutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkradiobutton.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradiomenuitem.h $(CopyDir)\include\gtk-3.0\gtk\gtkradiomenuitem.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradiotoolbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkradiotoolbutton.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrange.h $(CopyDir)\include\gtk-3.0\gtk\gtkrange.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchooser.h $(CopyDir)\include\gtk-3.0\gtk\gtkrecentchooser.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchooserdialog.h $(CopyDir)\include\gtk-3.0\gtk\gtkrecentchooserdialog.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchoosermenu.h $(CopyDir)\include\gtk-3.0\gtk\gtkrecentchoosermenu.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchooserwidget.h $(CopyDir)\include\gtk-3.0\gtk\gtkrecentchooserwidget.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentfilter.h $(CopyDir)\include\gtk-3.0\gtk\gtkrecentfilter.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentmanager.h $(CopyDir)\include\gtk-3.0\gtk\gtkrecentmanager.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrender.h  $(CopyDir)\include\gtk-3.0\gtk\gtkrender.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrevealer.h $(CopyDir)\include\gtk-3.0\gtk\gtkrevealer.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscale.h $(CopyDir)\include\gtk-3.0\gtk\gtkscale.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscalebutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkscalebutton.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscrollable.h $(CopyDir)\include\gtk-3.0\gtk\gtkscrollable.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscrollbar.h $(CopyDir)\include\gtk-3.0\gtk\gtkscrollbar.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscrolledwindow.h $(CopyDir)\include\gtk-3.0\gtk\gtkscrolledwindow.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksearchbar.h $(CopyDir)\include\gtk-3.0\gtk\gtksearchbar.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksearchentry.h $(CopyDir)\include\gtk-3.0\gtk\gtksearchentry.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkselection.h $(CopyDir)\include\gtk-3.0\gtk\gtkselection.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkseparator.h $(CopyDir)\include\gtk-3.0\gtk\gtkseparator.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkseparatormenuitem.h $(CopyDir)\include\gtk-3.0\gtk\gtkseparatormenuitem.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkseparatortoolitem.h $(CopyDir)\include\gtk-3.0\gtk\gtkseparatortoolitem.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksettings.h $(CopyDir)\include\gtk-3.0\gtk\gtksettings.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkshow.h $(CopyDir)\include\gtk-3.0\gtk\gtkshow.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksidebar.h $(CopyDir)\include\gtk-3.0\gtk\gtksidebar.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksizegroup.h $(CopyDir)\include\gtk-3.0\gtk\gtksizegroup.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksizerequest.h $(CopyDir)\include\gtk-3.0\gtk\gtksizerequest.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksocket.h $(CopyDir)\include\gtk-3.0\gtk\gtksocket.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkspinbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkspinbutton.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkspinner.h $(CopyDir)\include\gtk-3.0\gtk\gtkspinner.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstack.h $(CopyDir)\include\gtk-3.0\gtk\gtkstack.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstackswitcher.h $(CopyDir)\include\gtk-3.0\gtk\gtkstackswitcher.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstatusbar.h $(CopyDir)\include\gtk-3.0\gtk\gtkstatusbar.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstylecontext.h $(CopyDir)\include\gtk-3.0\gtk\gtkstylecontext.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstyleprovider.h $(CopyDir)\include\gtk-3.0\gtk\gtkstyleprovider.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkswitch.h $(CopyDir)\include\gtk-3.0\gtk\gtkswitch.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktestutils.h $(CopyDir)\include\gtk-3.0\gtk\gtktestutils.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextattributes.h $(CopyDir)\include\gtk-3.0\gtk\gtktextattributes.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextbuffer.h $(CopyDir)\include\gtk-3.0\gtk\gtktextbuffer.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextbufferrichtext.h $(CopyDir)\include\gtk-3.0\gtk\gtktextbufferrichtext.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextchild.h $(CopyDir)\include\gtk-3.0\gtk\gtktextchild.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextdisplay.h $(CopyDir)\include\gtk-3.0\gtk\gtktextdisplay.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextiter.h $(CopyDir)\include\gtk-3.0\gtk\gtktextiter.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextmark.h $(CopyDir)\include\gtk-3.0\gtk\gtktextmark.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktexttag.h $(CopyDir)\include\gtk-3.0\gtk\gtktexttag.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktexttagtable.h $(CopyDir)\include\gtk-3.0\gtk\gtktexttagtable.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextview.h $(CopyDir)\include\gtk-3.0\gtk\gtktextview.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktogglebutton.h $(CopyDir)\include\gtk-3.0\gtk\gtktogglebutton.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoggletoolbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtktoggletoolbutton.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolbar.h $(CopyDir)\include\gtk-3.0\gtk\gtktoolbar.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtktoolbutton.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolitem.h $(CopyDir)\include\gtk-3.0\gtk\gtktoolitem.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolitemgroup.h $(CopyDir)\include\gtk-3.0\gtk\gtktoolitemgroup.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolpalette.h $(CopyDir)\include\gtk-3.0\gtk\gtktoolpalette.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolshell.h $(CopyDir)\include\gtk-3.0\gtk\gtktoolshell.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktooltip.h $(CopyDir)\include\gtk-3.0\gtk\gtktooltip.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreednd.h $(CopyDir)\include\gtk-3.0\gtk\gtktreednd.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreemodel.h $(CopyDir)\include\gtk-3.0\gtk\gtktreemodel.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreemodelfilter.h $(CopyDir)\include\gtk-3.0\gtk\gtktreemodelfilter.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreemodelsort.h $(CopyDir)\include\gtk-3.0\gtk\gtktreemodelsort.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreeselection.h $(CopyDir)\include\gtk-3.0\gtk\gtktreeselection.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreesortable.h $(CopyDir)\include\gtk-3.0\gtk\gtktreesortable.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreestore.h $(CopyDir)\include\gtk-3.0\gtk\gtktreestore.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreeview.h $(CopyDir)\include\gtk-3.0\gtk\gtktreeview.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreeviewcolumn.h $(CopyDir)\include\gtk-3.0\gtk\gtktreeviewcolumn.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktypes.h $(CopyDir)\include\gtk-3.0\gtk\gtktypes.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkviewport.h $(CopyDir)\include\gtk-3.0\gtk\gtkviewport.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvolumebutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkvolumebutton.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkwidget.h $(CopyDir)\include\gtk-3.0\gtk\gtkwidget.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-3.0\gtk\gtkwidgetpath.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkwindow.h $(CopyDir)\include\gtk-3.0\gtk\gtkwindow.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkwindowgroup.h $(CopyDir)\include\gtk-3.0\gtk\gtkwindowgroup.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextlayout.h $(CopyDir)\include\gtk-3.0\gtk\gtktextlayout.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-3.0\gtk\gtktypebuiltins.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkversion.h $(CopyDir)\include\gtk-3.0\gtk\gtkversion.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtk-a11y-autocleanups.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtk-a11y-autocleanups.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkarrowaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkarrowaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkbooleancellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkbooleancellaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkbuttonaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkbuttonaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkcellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkcellaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkcellaccessibleparent.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkcellaccessibleparent.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkcheckmenuitemaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkcheckmenuitemaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkcomboboxaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkcomboboxaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkcontaineraccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkcontaineraccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkcontainercellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkcontainercellaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkentryaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkentryaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkexpanderaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkexpanderaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkflowboxaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkflowboxaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkflowboxchildaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkflowboxchildaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkframeaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkframeaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkiconviewaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkiconviewaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkimageaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkimageaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkimagecellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkimagecellaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtklabelaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtklabelaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtklevelbaraccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtklevelbaraccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtklinkbuttonaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtklinkbuttonaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtklistboxaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtklistboxaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtklistboxrowaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtklistboxrowaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtklockbuttonaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtklockbuttonaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkmenuaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkmenuaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkmenubuttonaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkmenubuttonaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkmenuitemaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkmenuitemaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkmenushellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkmenushellaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtknotebookaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtknotebookaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtknotebookpageaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtknotebookpageaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkpanedaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkpanedaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkpopoveraccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkpopoveraccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkprogressbaraccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkprogressbaraccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkradiobuttonaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkradiobuttonaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkradiomenuitemaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkradiomenuitemaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkrangeaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkrangeaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkrenderercellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkrenderercellaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkscaleaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkscaleaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkscalebuttonaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkscalebuttonaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkscrolledwindowaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkscrolledwindowaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkspinbuttonaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkspinbuttonaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkspinneraccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkspinneraccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkstatusbaraccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkstatusbaraccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkswitchaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkswitchaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtktextcellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtktextcellaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtktextviewaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtktextviewaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtktogglebuttonaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtktogglebuttonaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtktoplevelaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtktoplevelaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtktreeviewaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtktreeviewaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkwidgetaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkwidgetaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkwindowaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkwindowaccessible.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkactivatable.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkactivatable.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkaction.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkaction.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkactiongroup.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkactiongroup.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkalignment.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkalignment.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkarrow.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkarrow.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkcolorsel.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkcolorsel.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkcolorseldialog.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkcolorseldialog.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkfontsel.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkfontsel.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkgradient.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkgradient.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhandlebox.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkhandlebox.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhbbox.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkhbbox.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhbox.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkhbox.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhpaned.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkhpaned.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhscale.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkhscale.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhscrollbar.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkhscrollbar.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhseparator.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkhseparator.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhsv.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkhsv.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkiconfactory.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkiconfactory.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkimagemenuitem.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkimagemenuitem.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkmisc.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkmisc.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtknumerableicon.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtknumerableicon.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkradioaction.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkradioaction.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkrc.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkrc.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkrecentaction.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkrecentaction.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkstatusicon.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkstatusicon.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkstock.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkstock.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkstyle.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkstyle.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkstyleproperties.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkstyleproperties.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtksymboliccolor.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtksymboliccolor.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtktable.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtktable.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtktearoffmenuitem.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtktearoffmenuitem.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkthemingengine.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkthemingengine.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtktoggleaction.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtktoggleaction.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkuimanager.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkuimanager.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvbbox.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkvbbox.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvbox.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkvbox.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvscale.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkvscale.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvscrollbar.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkvscrollbar.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvseparator.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkvseparator.h&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvpaned.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkvpaned.h&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32cursor.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32display.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32displaymanager.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32dnd.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32keys.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32misc.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32screen.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32window.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\gdk.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkapplaunchcontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkcairo.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkcursor.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkdevice.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkdevicemanager.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkdisplay.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkdisplaymanager.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkdnd.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkevents.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkframetimings.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkkeys.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkkeysyms.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkkeysyms-compat.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkmain.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkpango.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkframeclock.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkpixbuf.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkprivate.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkproperty.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkrectangle.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkrgba.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkscreen.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkselection.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdktestutils.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkthreads.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdktypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkvisual.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\deprecated\gdkcolor.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkarrowaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkbooleancellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkbuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkcellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkcellaccessibleparent.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkcheckmenuitemaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkcomboboxaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkcontaineraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkcontainercellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkentryaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkexpanderaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkflowboxaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkflowboxchildaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkframeaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkiconviewaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkimageaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkimagecellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtklabelaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtklevelbaraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtklinkbuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtklistboxaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtklistboxrowaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtklockbuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkmenuaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkmenubuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkmenuitemaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkmenushellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtknotebookaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtknotebookpageaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkpanedaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkpopoveraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkprogressbaraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkradiobuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkradiomenuitemaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkrangeaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkrenderercellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkscaleaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkscalebuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkscrolledwindowaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkspinbuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkspinneraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkstatusbaraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkswitchaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtktextcellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtktextviewaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtktogglebuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtktoplevelaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtktreeviewaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkwidgetaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\a11y\gtkwindowaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
+copy ..\..\..\gtk\gtk.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkx.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtk-a11y.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaboutdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaccelgroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaccellabel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaccelmap.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkactionable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkactionbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkadjustment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkappchooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkappchooserbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkappchooserdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkappchooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkapplication.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkapplicationwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaspectframe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkassistant.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbin.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbindings.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkborder.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbuilder.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbuildable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcalendar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellarea.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellareacontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellareabox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcelleditable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcelllayout.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrenderer.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendereraccel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrenderercombo.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendererpixbuf.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendererprogress.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendererspin.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendererspinner.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrenderertext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrenderertoggle.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellview.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcheckbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcheckmenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkclipboard.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcolorbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcolorchooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcolorchooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcolorchooserdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcolorutils.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcombobox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcomboboxtext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcontainer.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcssprovider.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcsssection.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkdebug.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkdnd.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkdrawingarea.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkeditable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkentry.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkentrybuffer.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkentrycompletion.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkenums.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkeventbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkeventcontroller.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkexpander.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfilechooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfilechooserbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfilechooserdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfilechooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfilefilter.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfixed.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkflowbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfontbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfontchooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfontchooserdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfontchooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkframe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkgesture.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkgesturedrag.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkgesturelongpress.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkgesturemultipress.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkgesturepan.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkgesturerotate.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkgesturesingle.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkgestureswipe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkgesturezoom.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkgrid.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkheaderbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkicontheme.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkiconview.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimage.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimcontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimcontextinfo.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimcontextsimple.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimmodule.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimmulticontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkinfobar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkinvisible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklabel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklayout.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklevelbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklinkbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklistbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkliststore.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklockbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmain.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenu.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenubar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenubutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenushell.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenutoolbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmessagedialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmodules.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmountoperation.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtknotebook.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkoffscreenwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkorientable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkoverlay.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkpagesetup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkpaned.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkpapersize.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkplacessidebar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkplug.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkpopover.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprintcontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprintoperation.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprintoperationpreview.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprintsettings.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprogressbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkradiobutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkradiomenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkradiotoolbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrange.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentchooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentchooserdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentchoosermenu.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentchooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentfilter.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentmanager.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrevealer.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkscale.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkscalebutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkscrollable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkscrollbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkscrolledwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksearchbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksearchentry.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkselection.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkseparator.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkseparatormenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkseparatortoolitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksettings.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkshow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksizegroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksizerequest.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksocket.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkspinbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkspinner.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstack.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstackswitcher.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstatusbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstatusicon.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstylecontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstyleproperties.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstyleprovider.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkswitch.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktestutils.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextattributes.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextbuffer.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextbufferrichtext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextchild.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextdisplay.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextiter.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextmark.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktexttag.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktexttagtable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextview.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkthemingengine.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktogglebutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoggletoolbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolitemgroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolpalette.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolshell.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktooltip.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreednd.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreemodel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreemodelfilter.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreemodelsort.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreeselection.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreesortable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreestore.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreeview.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreeviewcolumn.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkviewport.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkvolumebutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkwindowgroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextlayout.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkversion.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkactivatable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkactiongroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkalignment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkarrow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkcolorsel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkcolorseldialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkfontsel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkgradient.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhandlebox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhbbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhpaned.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhscale.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhscrollbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhseparator.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhsv.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkiconfactory.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkimagemenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkmisc.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtknumerableicon.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkradioaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkrc.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkrecentaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkstock.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkstyle.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtksymboliccolor.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtktable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtktearoffmenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtktoggleaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkuimanager.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkvbbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkvbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkvscale.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkvscrollbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkvseparator.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkvpaned.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+
 mkdir $(CopyDir)\include\gail-$(ApiVersion)\libgail-util&#x0D;&#x0A;
 copy ..\..\..\libgail-util\gail-util.h $(CopyDir)\include\gail-$(ApiVersion)\libgail-util&#x0D;&#x0A;
 copy ..\..\..\libgail-util\gailmisc.h $(CopyDir)\include\gail-$(ApiVersion)\libgail-util&#x0D;&#x0A;
 copy ..\..\..\libgail-util\gailtextutil.h $(CopyDir)\include\gail-$(ApiVersion)\libgail-util&#x0D;&#x0A;
+
 mkdir $(CopyDir)\share\icons\hicolor\16x16\apps&#x0D;&#x0A;
 copy ..\..\..\demos\gtk-demo\data\16x16\gtk3-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps\&#x0D;&#x0A;
+
 mkdir $(CopyDir)\share\icons\hicolor\22x22\apps&#x0D;&#x0A;
 copy ..\..\..\demos\gtk-demo\data\22x22\gtk3-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps\&#x0D;&#x0A;
+
 mkdir $(CopyDir)\share\icons\hicolor\24x24\apps&#x0D;&#x0A;
 copy ..\..\..\demos\gtk-demo\data\24x24\gtk3-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps\&#x0D;&#x0A;
+
 mkdir $(CopyDir)\share\icons\hicolor\32x32\apps&#x0D;&#x0A;
 copy ..\..\..\demos\gtk-demo\data\32x32\gtk3-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps\&#x0D;&#x0A;
+
 mkdir $(CopyDir)\share\icons\hicolor\48x48\apps&#x0D;&#x0A;
 copy ..\..\..\demos\gtk-demo\data\48x48\gtk3-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps\&#x0D;&#x0A;
+
 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 ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
+
 echo &quot;Compiling gsettings XML Files...&quot;&#x0D;&#x0A;
 $(CopyDir)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 "
- />
- <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;
-copy ..\..\..\gdk\broadway\gdkbroadwaycursor.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway&#x0D;&#x0A;
-copy ..\..\..\gdk\broadway\gdkbroadwaydisplay.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway&#x0D;&#x0A;
-copy ..\..\..\gdk\broadway\gdkbroadwayvisual.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway&#x0D;&#x0A;
 copy ..\..\..\gdk\broadway\gdkbroadwaywindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway&#x0D;&#x0A;
-        "
- />
+copy ..\..\..\gdk\broadway\gdkbroadwaycursor.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway&#x0D;&#x0A;
+copy ..\..\..\gdk\broadway\gdkbroadwayvisual.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway&#x0D;&#x0A;
+		      "
+	/>
 </VisualStudioPropertySheet>
@@ -181,7 +181,6 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\event_axes.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\expander.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\gestures.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\glarea.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\headerbar.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\hypertext.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\iconview.c" />
@@ -205,7 +204,6 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\rotated_text.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\search_entry.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\search_entry2.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\sidebar.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\sizegroup.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\spinner.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\stack.c" />
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="gtk-install"
-	ProjectGUID="{2093D218-190E-4194-9421-3BA7CBF33B15}"
-	RootNamespace="gtkinstall"
+	Name="install"
+	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
+	RootNamespace="install"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
@@ -23,6 +23,9 @@
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1

+/* Define to 1 if you have the `cairo_surface_set_device_scale' function. */
+/* #undef HAVE_CAIRO_SURFACE_SET_DEVICE_SCALE */
+
 /* define if we have colord */
 /* #undef HAVE_COLORD */

@@ -141,9 +144,6 @@
 #define HAVE_ROUND 1
 #endif

-/* Define to 1 if sincos() is available */
-/* #undef HAVE_SINCOS */
-
 /* Have the sockaddr_un.sun_len member */
 /* #undef HAVE_SOCKADDR_UN_SUN_LEN */

@@ -9,8 +9,8 @@
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.

 m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [17])
-m4_define([gtk_micro_version], [0])
+m4_define([gtk_minor_version], [13])
+m4_define([gtk_micro_version], [9])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
          [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -41,15 +41,13 @@ AC_CANONICAL_HOST
 m4_define([gtk_binary_version], [3.0.0])

 # required versions of other packages
-m4_define([glib_required_version], [2.43.4])
-m4_define([pango_required_version], [1.36.7])
-m4_define([atk_required_version], [2.15.1])
-m4_define([cairo_required_version], [1.14.0])
+m4_define([glib_required_version], [2.41.2])
+m4_define([pango_required_version], [1.32.4])
+m4_define([atk_required_version], [2.12.0])
+m4_define([cairo_required_version], [1.12.0])
 m4_define([gdk_pixbuf_required_version], [2.30.0])
 m4_define([introspection_required_version], [1.39.0])
 m4_define([wayland_required_version], [1.5.91])
-m4_define([mirclient_required_version], [0.11.0])
-m4_define([epoxy_required_version], [1.0])
 GLIB_REQUIRED_VERSION=glib_required_version
 PANGO_REQUIRED_VERSION=pango_required_version
 ATK_REQUIRED_VERSION=atk_required_version
@@ -147,6 +145,7 @@ AC_PROG_MKDIR_P
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET

+
 GETTEXT_PACKAGE=gtk30
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
@@ -278,6 +277,13 @@ AC_ARG_ENABLE(installed_tests,
              [enable_installed_tests=no])
 AM_CONDITIONAL(BUILDOPT_INSTALL_TESTS, test x$enable_installed_tests = xyes)

+AC_ARG_ENABLE(gtk2-dependency,
+              [AS_HELP_STRING([--enable-gtk2-dependency],
+                              [Do not build gtk-update-icon-cache and other shared tools])],,
+              [enable_gtk2_dependency=no])
+
+AM_CONDITIONAL(BUILD_ICON_CACHE, [test "x$enable_gtk2_dependency" = xno])
+
 AC_ARG_ENABLE(xkb,
              [AS_HELP_STRING([--enable-xkb],
                              [support XKB extension [default=maybe]])],,
@@ -323,10 +329,6 @@ AC_ARG_ENABLE(wayland-backend,
              [AS_HELP_STRING([--enable-wayland-backend],
                              [enable the wayland gdk backend])],
 			      [backend_set=yes])
-AC_ARG_ENABLE(mir-backend,
-              [AS_HELP_STRING([--enable-mir-backend],
-                              [enable the Mir gdk backend])],
-			      [backend_set=yes])

 if test -z "$backend_set"; then
  if test "$platform_win32" = yes; then
@@ -334,7 +336,6 @@ if test -z "$backend_set"; then
  else
    enable_x11_backend=yes
    enable_wayland_backend=maybe
-    enable_mir_backend=no
  fi
 fi

@@ -348,8 +349,7 @@ backend_immodules=
 have_gio_unix=no
 GDK_BACKENDS=
 GDK_EXTRA_LIBS=
-# expoxy.pc has Cflags: -I${includedir}, but pkg-config swallows that :-(
-GDK_EXTRA_CFLAGS="-I${prefix}/include"
+GDK_EXTRA_CFLAGS=
 GDK_WINDOWING=
 PANGO_PACKAGES="pango pangocairo"

@@ -398,6 +398,7 @@ if test "x$enable_quartz_backend" = xyes; then
  # Pull in gio-unix for GDesktopAppInfo usage, see at least
  # gdkapplaunchcontext-x11.c
  have_gio_unix=yes
+
 else
  AM_CONDITIONAL(USE_QUARTZ, false)
 fi
@@ -425,7 +426,7 @@ fi

 PKG_PROG_PKG_CONFIG

-WAYLAND_DEPENDENCIES="wayland-client >= wayland_required_version xkbcommon >= 0.2.0 wayland-cursor >= wayland_required_version wayland-egl"
+WAYLAND_DEPENDENCIES="wayland-client >= wayland_required_version xkbcommon >= 0.2.0 wayland-cursor >= wayland_required_version"
 if test "$enable_wayland_backend" = "maybe" ; then
  AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
  PKG_CHECK_EXISTS($WAYLAND_DEPENDENCIES, [have_wayland_deps=yes], [have_wayland_deps=no])
@@ -456,30 +457,6 @@ else
  AM_CONDITIONAL(USE_WAYLAND, false)
 fi

-MIR_DEPENDENCIES="mirclient >= mirclient_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])
-  if test "$have_mir_deps" = "no" ; then
-    enable_mir_backend=no
-  else
-    enable_mir_backend=yes
-  fi
-  AC_MSG_RESULT($enable_mir_backend)
-fi
-
-if test "$enable_mir_backend" = "yes"; then
-  cairo_backends="$cairo_backends cairo"
-  GDK_BACKENDS="$GDK_BACKENDS mir"
-  GDK_WINDOWING="$GDK_WINDOWING
-#define GDK_WINDOWING_MIR"
-  MIR_PACKAGES="$MIR_DEPENDENCIES"
-
-  AM_CONDITIONAL(USE_MIR, true)
-else
-  AM_CONDITIONAL(USE_MIR, false)
-fi
-
 # strip leading space
 GDK_BACKENDS=${GDK_BACKENDS#* }

@@ -500,6 +477,11 @@ else
  fi
 fi

+
+AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}",
+                   [Define if debugging is enabled])
+
+
 # Build time sanity check...
 AM_SANITY_CHECK

@@ -665,15 +647,6 @@ 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=- --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*)
@@ -826,7 +799,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)
+AC_CHECK_FUNCS(round rint nearbyint)
 AC_CHECK_DECLS([isnan, isinf], [], [], [[#include <math.h>]])

 # Checks for gdkspawn
@@ -960,6 +933,44 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling

 AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)

+AS_IF([test "x$enable_gtk2_dependency" = xyes],
+      [AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
+       if test x$GTK_UPDATE_ICON_CACHE = xno; then
+         AC_MSG_ERROR([
+*** --enable-gtk2-dependency has been set but no existing
+*** `gtk-update-icon-cache` has been found in the path.])
+       fi],
+
+      [test "x$cross_compiling" = xyes],
+      [# If no GTK+2 dependency and cross compiling, we need to find a host gdk-pixbuf.
+       # pkg.m4 blocks all variable starting with PKG, so allow this one
+       m4_pattern_allow([PKG_CONFIG_FOR_BUILD])
+
+       AS_IF([test x$PKG_CONFIG_FOR_BUILD = x],
+             [AC_MSG_ERROR([You must define PKG_CONFIG_FOR_BUILD when cross compiling])])
+
+       AC_MSG_CHECKING([for native gdk-pixbuf])
+       AS_IF([AC_RUN_LOG([$PKG_CONFIG_FOR_BUILD --exists --print-errors gdk-pixbuf-2.0])],
+             [AC_MSG_RESULT([yes])],
+             [AC_MSG_ERROR([native gdk-pixbuf not found])])
+
+       NATIVE_GDKPIXBUF_CFLAGS=`$PKG_CONFIG_FOR_BUILD --cflags gdk-pixbuf-2.0`
+       NATIVE_GDKPIXBUF_LIBS=`$PKG_CONFIG_FOR_BUILD --libs gdk-pixbuf-2.0`
+       # This is the native gtk-update-icon-cache which will be used at
+       # build time, NOT the one installed on the target host.
+       GTK_UPDATE_ICON_CACHE="`cd $builddir && pwd`/gtk/native/native-update-icon-cache$BUILD_EXEEXT"
+       AC_SUBST(NATIVE_GDKPIXBUF_CFLAGS)
+       AC_SUBST(NATIVE_GDKPIXBUF_LIBS)
+       AC_SUBST(GTK_UPDATE_ICON_CACHE)],
+
+      [# In native compiling case, the gtk-update-icon-cache installed
+       # is the same as the one used during build.
+       GTK_UPDATE_ICON_CACHE="\$(abs_top_builddir)/gtk/gtk-update-icon-cache$EXEEXT"
+       AC_SUBST(GTK_UPDATE_ICON_CACHE)]
+)
+
+AM_CONDITIONAL(USE_EXTERNAL_ICON_CACHE, [test "x$enable_gtk2_dependency" = xyes])
+
 ########################################
 # Windowing system checks
 ########################################
@@ -1031,16 +1042,22 @@ if test "x$enable_x11_backend" = xyes; then
  AC_CHECK_FUNC(XextFindDisplay, :,
                AC_MSG_ERROR([*** libX11 and libXext not found. Check 'config.log' for more details.]))

-  # Check if <X11/extensions/XIproto.h> is needed for xReply.
+  # Check for xReply

-  AC_CHECK_TYPE([xReply], ,
-                [AC_CHECK_TYPE([xReply],
-                               [AC_DEFINE([NEED_XIPROTO_H_FOR_XREPLY], 1,
-                                          [Define if <X11/extensions/XIproto.h> needed for xReply])],
-                               [AC_MSG_ERROR([xReply type unavailable. X11 is too old])],
-                               [[#include <X11/extensions/XIproto.h>
-                                 #include <X11/Xlibint.h>]])],
-                [[#include <X11/Xlibint.h>]])
+  AC_MSG_CHECKING([if <X11/extensions/XIproto.h> is needed for xReply])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlibint.h>]],
+                                     [[xReply *rep = NULL;
+                                       rep = rep;]])],
+                    [AC_MSG_RESULT([no])],
+                    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/extensions/XIproto.h>
+                                                          #include <X11/Xlibint.h>]],
+                                                        [[xReply *rep = NULL;
+                                                          rep = rep;]])],
+                                       [AC_MSG_RESULT([yes])
+                                        AC_DEFINE([NEED_XIPROTO_H_FOR_XREPLY], [1],
+                                                  [Define if <X11/extensions/XIproto.h> needed for xReply])],
+                                       [AC_MSG_RESULT([unknown])
+                                        AC_MSG_ERROR([xReply type unavailable. X11 is too old])])])

  # Check for XKB support.

@@ -1294,11 +1311,22 @@ else
        LIBS="$gtk_save_LIBS"
 fi

+# Check for cairo_set_device_scale, as we don't want to depend hard on
+# this until there is a stable release with it
+CAIRO_CFLAGS=`$PKG_CONFIG --cflags cairo`
+CAIRO_LIBS=`$PKG_CONFIG --libs cairo`
+CFLAGS="$CFLAGS $CAIRO_CFLAGS"
+gtk_save_LIBS="$LIBS"
+LIBS="$CAIRO_LIBS $LIBS"
+AC_CHECK_FUNCS(cairo_surface_set_device_scale)
+LIBS="$gtk_save_LIBS"
+
+
 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"
+GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $cairo_backends"
 if test "x$enable_x11_backend" = xyes; then
  GDK_PRIVATE_PACKAGES="$GDK_PRIVATE_PACKAGES pangoft2"
 fi
@@ -1335,7 +1363,7 @@ fi
 PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)

 GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"
-GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version"
+GTK_PRIVATE_PACKAGES="$ATK_PACKAGES"
 if test "x$enable_x11_backend" = xyes; then
  GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
 fi
@@ -1458,7 +1486,6 @@ else

    PRINT_BACKENDS="$PRINT_BACKENDS cups"
    AM_CONDITIONAL(HAVE_CUPS, true)
-    have_cups=yes

    gtk_save_cflags="$CFLAGS"
    CFLAGS="$CUPS_CFLAGS"
@@ -1518,9 +1545,8 @@ else
  PKG_CHECK_MODULES(JSON_GLIB, [json-glib-1.0], have_json_glib=yes, have_json_glib=no)
  if test "x$have_rest" = "xyes" -a "x$have_json_glib" = "xyes"; then
    PRINT_BACKENDS="$PRINT_BACKENDS cloudprint"
-    have_cloudprint=yes
  fi
-  AM_CONDITIONAL(HAVE_CLOUDPRINT, test "x$have_cloudprint" = "xyes")
+  AM_CONDITIONAL(HAVE_CLOUDPRINT, test "x$have_rest" = "xyes" -a "x$have_json_glib" = "xyes")
 fi

 if test "x$enable_cloudprint" = "xyes" -a "x$have_rest" = "xno"; then
@@ -1535,6 +1561,8 @@ if test "x$enable_cloudprint" = "xyes" -a "x$have_json_glib" = "xno"; then
 ])
 fi

+AM_CONDITIONAL(HAVE_PAPI_CUPS, test "x$have_papi" = "xyes" -a "x$CUPS_CONFIG" != "xno")
+
 gtk_save_cppflags="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS"

@@ -1554,6 +1582,7 @@ fi

 CPPFLAGS="$gtk_save_cppflags"

+
 AC_ARG_ENABLE(test-print-backend,
              [AS_HELP_STRING([--enable-test-print-backend],
                              [build test print backend])],,
@@ -1567,21 +1596,6 @@ if test "$os_win32" = "yes"; then
  AC_CHECK_TYPES([IPrintDialogCallback],[],[],[[#include <windows.h>]])
 fi

-GTK_PRINT_BACKENDS="file"
-if test "$have_papi" = "yes"; then
-  GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,papi"
-fi
-if test "$have_cups" = "yes"; then
-  GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,cups"
-fi
-if test "$have_papi" != "yes" -a "$have_cups" != "yes"; then
-  GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,lpr"
-fi
-if test "$have_cloudprint" = "yes"; then
-  GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,cloudprint"
-fi
-AC_SUBST(GTK_PRINT_BACKENDS)
-
 ################################################################
 # Strip -export-dynamic from the link lines of various libraries
 ################################################################
@@ -1656,16 +1670,6 @@ if test "$have_colord" = "yes"; then
 fi
 AM_CONDITIONAL(HAVE_COLORD, test "x$have_colord" = "xyes")

-##################################################
-# Check for libcanberra (only used in examples)
-##################################################
-
-PKG_CHECK_MODULES(LIBCANBERRA, libcanberra-gtk3,
-                  have_libcanberra=yes, have_libcanberra=no)
-if test "$have_libcanberra" = "yes"; then
-        AC_DEFINE(HAVE_LIBCANBERRA, 1, [define if we have libcanberra])
-fi
-
 ##################################################
 # Checks for gtk-doc and docbook-tools
 ##################################################
@@ -1720,16 +1724,6 @@ else
  AC_MSG_RESULT([no])
 fi

-AC_ARG_ENABLE(doc-cross-references,
-              AC_HELP_STRING([--disable-doc-cross-references],
-                             [cross reference symbols from other libraries @<:@default=yes@:>@]),
-              enable_doc_cross_references=$enableval,
-              enable_doc_cross_references=yes)
-
-AM_CONDITIONAL(ENABLE_DOC_CROSS_REFERENCES, test x$enable_doc_cross_references != xno)
-
-
-
 ##################################################
 # Visibility handling
 ##################################################
@@ -1834,8 +1828,6 @@ fi
 AC_SUBST(GTK_LINK_FLAGS)

 AC_CONFIG_FILES([
-README
-INSTALL
 config.h.win32
 gtk-zip.sh
 Makefile
@@ -1901,13 +1893,15 @@ gdk/win32/rc/Makefile
 gdk/win32/rc/gdk.rc
 gdk/quartz/Makefile
 gdk/wayland/Makefile
-gdk/mir/Makefile
 gdk/gdkversionmacros.h
 gtk/Makefile
 gtk/makefile.msc
 gtk/gtkversion.h
 gtk/gtk-win32.rc
 gtk/libgtk3.manifest
+gtk/inspector/Makefile
+gtk/native/Makefile
+util/Makefile
 libgail-util/Makefile
 modules/Makefile
 modules/input/Makefile
@@ -25,7 +25,6 @@ demos =						\
 	event_axes.c				\
 	expander.c  				\
 	gestures.c				\
-	glarea.c				\
 	headerbar.c				\
 	hypertext.c				\
 	iconview.c				\
@@ -49,7 +48,6 @@ demos =						\
 	rotated_text.c				\
 	search_entry.c				\
 	search_entry2.c				\
-	sidebar.c				\
 	sizegroup.c				\
 	spinner.c				\
 	stack.c					\
@@ -72,10 +70,9 @@ DEPS = \
 	$(top_builddir)/gtk/libgtk-3.la

 LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.la		\
-	$(top_builddir)/gdk/libgdk-3.la		\
+	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gdk/libgdk-3.la	\
 	$(GTK_DEP_LIBS)				\
-	$(GDK_DEP_LIBS)				\
 	-lm

 bin_PROGRAMS = gtk3-demo gtk3-demo-application
@@ -86,8 +83,7 @@ dist_desktop_DATA = gtk3-demo.desktop
 BUILT_SOURCES = demos.h demo_resources.c

 EXTRA_DIST += 				\
-	data/source.svg			\
-	data/symbolic-source.svg	\
+	$(IMAGEFILES)			\
 	demo.gresource.xml		\
 	$(RESOURCES)			\
 	org.gtk.Demo.gschema.xml
@@ -119,42 +115,39 @@ gtk3_demo_application_LDADD = $(LDADDS)
 demo_resources.c: demo.gresource.xml $(RESOURCES)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/demo.gresource.xml

-RESOURCES =				\
-	$(demos)			\
-	main.ui				\
-	application.ui			\
-	demo.ui				\
-	menus.ui			\
-	stack.ui			\
-	revealer.ui			\
-	theming.ui			\
-	listbox.ui			\
-	popover.ui			\
-	alphatest.png			\
-	apple-red.png			\
-	brick.png			\
-	brick2.png			\
-	background.jpg			\
-	floppybuddy.gif			\
-	glarea-fragment.glsl		\
-	glarea-vertex.glsl		\
-	gnome-applets.png		\
-	gnome-calendar.png		\
-	gnome-foot.png			\
-	gnome-fs-directory.png		\
-	gnome-fs-regular.png		\
-	gnome-gimp.png			\
-	gnome-gmush.png			\
-	gnome-gsame.png			\
-	gnu-keys.png			\
-	messages.txt			\
-	css_accordion.css		\
-	css_basics.css			\
-	css_multiplebgs.css		\
-	css_pixbufs.css			\
-	css_shadows.css			\
-	cssview.css			\
-	reset.css
+RESOURCES=	$(demos)			\
+		main.ui				\
+		application.ui			\
+		demo.ui				\
+		menus.ui			\
+		stack.ui			\
+		revealer.ui			\
+		theming.ui			\
+		listbox.ui			\
+		popover.ui			\
+		alphatest.png			\
+		apple-red.png			\
+		brick.png			\
+		brick2.png			\
+		background.jpg			\
+		floppybuddy.gif			\
+		gnome-applets.png		\
+		gnome-calendar.png		\
+		gnome-foot.png			\
+		gnome-fs-directory.png		\
+		gnome-fs-regular.png		\
+		gnome-gimp.png			\
+		gnome-gmush.png			\
+		gnome-gsame.png			\
+		gnu-keys.png			\
+		messages.txt			\
+		css_accordion.css		\
+		css_basics.css			\
+		css_multiplebgs.css		\
+		css_pixbufs.css			\
+		css_shadows.css			\
+		cssview.css			\
+		reset.css

 iconthemedir = $(datadir)/icons/hicolor

@@ -164,16 +157,15 @@ appsicon24dir = $(iconthemedir)/24x24/apps
 appsicon32dir = $(iconthemedir)/32x32/apps
 appsicon48dir = $(iconthemedir)/48x48/apps
 appsicon256dir = $(iconthemedir)/256x256/apps
-appsiconscalabledir = $(iconthemedir)/scalable/apps

-dist_appsicon16_DATA = data/16x16/gtk3-demo.png data/16x16/gtk3-demo-symbolic.symbolic.png
-dist_appsicon22_DATA = data/22x22/gtk3-demo.png data/22x22/gtk3-demo-symbolic.symbolic.png
-dist_appsicon24_DATA = data/24x24/gtk3-demo.png data/24x24/gtk3-demo-symbolic.symbolic.png
-dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.symbolic.png
-dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png
-dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png
+dist_appsicon16_DATA = data/16x16/gtk3-demo.png
+dist_appsicon22_DATA = data/22x22/gtk3-demo.png
+dist_appsicon24_DATA = data/24x24/gtk3-demo.png
+dist_appsicon32_DATA = data/32x32/gtk3-demo.png
+dist_appsicon48_DATA = data/48x48/gtk3-demo.png
+dist_appsicon256_DATA = data/256x256/gtk3-demo.png

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

 install-data-hook: install-update-icon-cache
 uninstall-hook: uninstall-update-icon-cache
@@ -20,7 +20,12 @@ draw_callback (GtkWidget *widget,
               cairo_t   *cr,
               gpointer   data)
 {
-  gdk_cairo_set_source_rgba (cr, &color);
+  GtkStyleContext *context;
+  GdkRGBA rgba;
+
+  context = gtk_widget_get_style_context (widget);
+  gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &rgba);
+  gdk_cairo_set_source_rgba (cr, &rgba);
  cairo_paint (cr);

  return TRUE;
@@ -34,6 +39,7 @@ response_cb (GtkDialog *dialog,
  if (response_id == GTK_RESPONSE_OK)
    {
      gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (dialog), &color);
+      gtk_widget_override_background_color (da, 0, &color);
    }

  gtk_widget_destroy (GTK_WIDGET (dialog));
@@ -99,6 +105,8 @@ do_colorsel (GtkWidget *do_widget)

      /* set a minimum size */
      gtk_widget_set_size_request (da, 200, 200);
+      /* set the color */
+      gtk_widget_override_background_color (da, 0, &color);

      gtk_container_add (GTK_CONTAINER (frame), da);

@@ -259,21 +259,18 @@ G_DEFINE_TYPE_WITH_CODE (MaskEntry, mask_entry, GTK_TYPE_ENTRY,
 static void
 mask_entry_set_background (MaskEntry *entry)
 {
+  static const GdkRGBA error_color = { 1.0, 0.9, 0.9, 1.0 };
+
  if (entry->mask)
    {
      if (!g_regex_match_simple (entry->mask, gtk_entry_get_text (GTK_ENTRY (entry)), 0, 0))
        {
-          PangoAttrList *attrs;
-
-          attrs = pango_attr_list_new ();
-          pango_attr_list_insert (attrs, pango_attr_foreground_new (65535, 32767, 32767));
-          gtk_entry_set_attributes (GTK_ENTRY (entry), attrs);
-          pango_attr_list_unref (attrs);
+          gtk_widget_override_color (GTK_WIDGET (entry), 0, &error_color);
          return;
        }
    }

-  gtk_entry_set_attributes (GTK_ENTRY (entry), NULL);
+  gtk_widget_override_color (GTK_WIDGET (entry), 0, NULL);
 }


@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='gtk3-demo-symbolic.svg' height='16.000015' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' inkscape:version='0.48.5 r10040' version='1.1' width='16' xmlns='http://www.w3.org/2000/svg'>
-  <metadata id='metadata90'>
-    <rdf:RDF>
-      <cc:Work rdf:about=''>
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
-        <dc:title>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='-12.5126' inkscape:cy='-0.73412416' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#555753' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1375' inkscape:window-maximized='1' inkscape:window-width='2560' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='5.6568542'>
-    <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='-182.99998px' originy='-251.99998px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
-  </sodipodi:namedview>
-  <title id='title9167'>Gnome Symbolic Icon Theme</title>
-  <defs id='defs7386'>
-    <linearGradient id='linearGradient7212' osb:paint='solid'>
-      <stop id='stop7214' offset='0' style='stop-color:#000000;stop-opacity:1;'/>
-    </linearGradient>
-  </defs>
-  <g inkscape:groupmode='layer' id='layer9' inkscape:label='apps' style='display:inline' transform='translate(-424.00018,35)'>
-    
-    <rect height='8.0000048' id='rect7866' style='opacity:0.3;color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new' transform='matrix(0.83205029,0.5547002,0,1,0,0)' width='7.2111053' x='510.78668' y='-314.33347'/>
-    <rect height='8.0000086' id='rect7868' style='opacity:0.5;color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new' transform='matrix(-0.86824295,0.49613928,0,1,0,0)' width='8.0622425' x='-505.61908' y='219.8575'/>
-    <path inkscape:connector-curvature='0' d='m 431.53145,-28 -5.875,-3.65625 6.8125,-3.34375 6.03125,3 z' id='path7870' sodipodi:nodetypes='ccccc' style='color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new'/>
-  </g>
-</svg>
@@ -95,7 +95,6 @@
    <file>expander.c</file>
    <file>flowbox.c</file>
    <file>gestures.c</file>
-    <file>glarea.c</file>
    <file>headerbar.c</file>
    <file>hypertext.c</file>
    <file>iconview.c</file>
@@ -119,7 +118,6 @@
    <file>search_entry.c</file>
    <file>search_entry2.c</file>
    <file>sizegroup.c</file>
-    <file>sidebar.c</file>
    <file>stack.c</file>
    <file>spinner.c</file>
    <file>textview.c</file>
@@ -140,8 +138,4 @@
  <gresource prefix="/popover">
    <file>popover.ui</file>
  </gresource>
-  <gresource prefix="/glarea">
-    <file>glarea-fragment.glsl</file>
-    <file>glarea-vertex.glsl</file>
-  </gresource>
 </gresources>
@@ -142,11 +142,8 @@ static void
 add_item (GtkWidget *button, gpointer data)
 {
  Item foo;
-  GtkTreeIter current, iter;
-  GtkTreePath *path;
-  GtkTreeModel *model;
-  GtkTreeViewColumn *column;
-  GtkTreeView *treeview = (GtkTreeView *)data;
+  GtkTreeIter iter;
+  GtkTreeModel *model = (GtkTreeModel *)data;

  g_return_if_fail (articles != NULL);

@@ -155,33 +152,12 @@ add_item (GtkWidget *button, gpointer data)
  foo.yummy = 50;
  g_array_append_vals (articles, &foo, 1);

-  /* Insert a new row below the current one */
-  gtk_tree_view_get_cursor (treeview, &path, NULL);
-  model = gtk_tree_view_get_model (treeview);
-  if (path)
-    {
-      gtk_tree_model_get_iter (model, &current, path);
-      gtk_tree_path_free (path);
-      gtk_list_store_insert_after (GTK_LIST_STORE (model), &iter, &current);
-    }
-  else
-    {
-      gtk_list_store_insert (GTK_LIST_STORE (model), &iter, -1);
-    }
-
-  /* Set the data for the new row */
+  gtk_list_store_append (GTK_LIST_STORE (model), &iter);
  gtk_list_store_set (GTK_LIST_STORE (model), &iter,
                      COLUMN_ITEM_NUMBER, foo.number,
                      COLUMN_ITEM_PRODUCT, foo.product,
                      COLUMN_ITEM_YUMMY, foo.yummy,
                      -1);
-
-  /* Move focus to the new row */
-  path = gtk_tree_model_get_path (model, &iter);
-  column = gtk_tree_view_get_column (treeview, 0);
-  gtk_tree_view_set_cursor (treeview, path, column, FALSE);
-
-  gtk_tree_path_free (path);
 }

 static void
@@ -392,7 +368,7 @@ do_editable_cells (GtkWidget *do_widget)

      button = gtk_button_new_with_label ("Add item");
      g_signal_connect (button, "clicked",
-                        G_CALLBACK (add_item), treeview);
+                        G_CALLBACK (add_item), items_model);
      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);

      button = gtk_button_new_with_label ("Remove item");
@@ -12,31 +12,18 @@

 static GtkWidget *window = NULL;

-static gboolean
-draw_color (GtkWidget  *drawingarea,
-            cairo_t    *cr,
-            const char *color_name)
-{
-  GdkRGBA rgba;
-
-  if (gdk_rgba_parse (&rgba, color_name))
-    {
-      gdk_cairo_set_source_rgba (cr, &rgba);
-      cairo_paint (cr);
-    }
-
-  return FALSE;
-}
-
 static GtkWidget *
 color_swatch_new (const gchar *color)
 {
  GtkWidget *button, *area;
+  GdkRGBA rgba;
+
+  gdk_rgba_parse (&rgba, color);

  button = gtk_button_new ();
  area = gtk_drawing_area_new ();
-  g_signal_connect (area, "draw", G_CALLBACK (draw_color), (gpointer) color);
  gtk_widget_set_size_request (area, 24, 24);
+  gtk_widget_override_background_color (area, 0, &rgba);
  gtk_container_add (GTK_CONTAINER (button), area);
  gtk_widget_show_all (button);

@@ -1,9 +0,0 @@
-#version 330
-
-out vec4 outputColor;
-
-void main() {
-  float lerpVal = gl_FragCoord.y / 500.0f;
-
-  outputColor = mix(vec4(1.0f, 0.85f, 0.35f, 1.0f), vec4(0.2f, 0.2f, 0.2f, 1.0f), lerpVal);
-}
@@ -1,8 +0,0 @@
-#version 330
-
-layout(location = 0) in vec4 position;
-uniform mat4 mvp;
-
-void main() {
-  gl_Position = mvp * position;
-}
@@ -1,417 +0,0 @@
-/* OpenGL Area
- *
- * GtkGLArea is a widget that allows custom drawing using OpenGL calls.
- */
-
-#include <math.h>
-#include <gtk/gtk.h>
-#include <epoxy/gl.h>
-
-static GtkWidget *demo_window = NULL;
-
-/* the GtkGLArea widget */
-static GtkWidget *gl_area = NULL;
-
-enum {
-  X_AXIS,
-  Y_AXIS,
-  Z_AXIS,
-
-  N_AXIS
-};
-
-/* Rotation angles on each axis */
-static float rotation_angles[N_AXIS] = { 0.0 };
-
-/* The object we are drawing */
-static const GLfloat vertex_data[] = {
-  0.f,   0.5f,   0.f, 1.f,
-  0.5f, -0.366f, 0.f, 1.f,
- -0.5f, -0.366f, 0.f, 1.f,
-};
-
-/* Initialize the GL buffers */
-static void
-init_buffers (GLuint *vao_out,
-              GLuint *buffer_out)
-{
-  GLuint vao, buffer;
-
-  /* We only use one VAO, so we always keep it bound */
-  glGenVertexArrays (1, &vao);
-  glBindVertexArray (vao);
-
-  /* This is the buffer that holds the vertices */
-  glGenBuffers (1, &buffer);
-  glBindBuffer (GL_ARRAY_BUFFER, buffer);
-  glBufferData (GL_ARRAY_BUFFER, sizeof (vertex_data), vertex_data, GL_STATIC_DRAW);
-  glBindBuffer (GL_ARRAY_BUFFER, 0);
-
-  if (vao_out != NULL)
-    *vao_out = vao;
-
-  if (buffer_out != NULL)
-    *buffer_out = buffer;
-}
-
-/* Create and compile a shader */
-static GLuint
-create_shader (int         type,
-               const char *src)
-{
-  GLuint shader;
-  int status;
-
-  shader = glCreateShader (type);
-  glShaderSource (shader, 1, &src, NULL);
-  glCompileShader (shader);
-
-  glGetShaderiv (shader, GL_COMPILE_STATUS, &status);
-  if (status == GL_FALSE)
-    {
-      int log_len;
-      char *buffer;
-
-      glGetShaderiv (shader, GL_INFO_LOG_LENGTH, &log_len);
-
-      buffer = g_malloc (log_len + 1);
-      glGetShaderInfoLog (shader, log_len, NULL, buffer);
-
-      g_warning ("Compile failure in %s shader:\n%s\n",
-                 type == GL_VERTEX_SHADER ? "vertex" : "fragment",
-                 buffer);
-
-      g_free (buffer);
-
-      glDeleteShader (shader);
-
-      return 0;
-    }
-
-  return shader;
-}
-
-/* Initialize the shaders and link them into a program */
-static void
-init_shaders (GLuint *program_out,
-              GLuint *mvp_out)
-{
-  GLuint vertex, fragment;
-  GLuint program = 0;
-  GLuint mvp = 0;
-  int status;
-  GBytes *source;
-
-  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);
-
-  if (vertex == 0)
-    {
-      *program_out = 0;
-      return;
-    }
-
-  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);
-
-  if (fragment == 0)
-    {
-      glDeleteShader (vertex);
-      *program_out = 0;
-      return;
-    }
-
-  program = glCreateProgram ();
-  glAttachShader (program, vertex);
-  glAttachShader (program, fragment);
-
-  glLinkProgram (program);
-
-  glGetProgramiv (program, GL_LINK_STATUS, &status);
-  if (status == GL_FALSE)
-    {
-      int log_len;
-      char *buffer;
-
-      glGetProgramiv (program, GL_INFO_LOG_LENGTH, &log_len);
-
-      buffer = g_malloc (log_len + 1);
-      glGetProgramInfoLog (program, log_len, NULL, buffer);
-
-      g_warning ("Linking failure:\n%s\n", buffer);
-
-      g_free (buffer);
-
-      glDeleteProgram (program);
-      program = 0;
-
-      goto out;
-    }
-
-  /* Get the location of the "mvp" uniform */
-  mvp = glGetUniformLocation (program, "mvp");
-
-  glDetachShader (program, vertex);
-  glDetachShader (program, fragment);
-
-out:
-  glDeleteShader (vertex);
-  glDeleteShader (fragment);
-
-  if (program_out != NULL)
-    *program_out = program;
-
-  if (mvp_out != NULL)
-    *mvp_out = mvp;
-}
-
-static void
-compute_mvp (float *res,
-             float  phi,
-             float  theta,
-             float  psi)
-{
-  float x = phi * (G_PI / 180.f);
-  float y = theta * (G_PI / 180.f);
-  float z = psi * (G_PI / 180.f);
-  float c1 = cosf (x), s1 = sinf (x);
-  float c2 = cosf (y), s2 = sinf (y);
-  float c3 = cosf (z), s3 = sinf (z);
-  float c3c2 = c3 * c2;
-  float s3c1 = s3 * c1;
-  float c3s2s1 = c3 * s2 * s1;
-  float s3s1 = s3 * s1;
-  float c3s2c1 = c3 * s2 * c1;
-  float s3c2 = s3 * c2;
-  float c3c1 = c3 * c1;
-  float s3s2s1 = s3 * s2 * s1;
-  float c3s1 = c3 * s1;
-  float s3s2c1 = s3 * s2 * c1;
-  float c2s1 = c2 * s1;
-  float c2c1 = c2 * c1;
-
-  /* initialize to the identity matrix */
-  res[0] = 1.f; res[4] = 0.f;  res[8] = 0.f; res[12] = 0.f;
-  res[1] = 0.f; res[5] = 1.f;  res[9] = 0.f; res[13] = 0.f;
-  res[2] = 0.f; res[6] = 0.f; res[10] = 1.f; res[14] = 0.f;
-  res[3] = 0.f; res[7] = 0.f; res[11] = 0.f; res[15] = 1.f;
-
-  /* apply all three rotations using the three matrices:
-   *
-   * ⎡  c3 s3 0 ⎤ ⎡ c2  0 -s2 ⎤ ⎡ 1   0  0 ⎤
-   * ⎢ -s3 c3 0 ⎥ ⎢  0  1   0 ⎥ ⎢ 0  c1 s1 ⎥
-   * ⎣   0  0 1 ⎦ ⎣ s2  0  c2 ⎦ ⎣ 0 -s1 c1 ⎦
-   */
-  res[0] = c3c2;  res[4] = s3c1 + c3s2s1;  res[8] = s3s1 - c3s2c1; res[12] = 0.f;
-  res[1] = -s3c2; res[5] = c3c1 - s3s2s1;  res[9] = c3s1 + s3s2c1; res[13] = 0.f;
-  res[2] = s2;    res[6] = -c2s1;         res[10] = c2c1;          res[14] = 0.f;
-  res[3] = 0.f;   res[7] = 0.f;           res[11] = 0.f;           res[15] = 1.f;
-}
-
-static GLuint position_buffer;
-static GLuint program;
-static GLuint mvp_location;
-
-/* We need to set up our state when we realize the GtkGLArea widget */
-static void
-realize (GtkWidget *widget)
-{
-  gtk_gl_area_make_current (GTK_GL_AREA (widget));
-
-  init_buffers (&position_buffer, NULL);
-  init_shaders (&program, &mvp_location);
-}
-
-/* We should tear down the state when unrealizing */
-static void
-unrealize (GtkWidget *widget)
-{
-  gtk_gl_area_make_current (GTK_GL_AREA (widget));
-
-  glDeleteBuffers (1, &position_buffer);
-  glDeleteProgram (program);
-}
-
-static void
-draw_triangle (void)
-{
-  float mvp[16];
-
-  /* Compute the model view projection matrix using the
-   * rotation angles specified through the GtkRange widgets
-   */
-  compute_mvp (mvp,
-               rotation_angles[X_AXIS],
-               rotation_angles[Y_AXIS],
-               rotation_angles[Z_AXIS]);
-
-  /* Use our shaders */
-  glUseProgram (program);
-
-  /* Update the "mvp" matrix we use in the shader */
-  glUniformMatrix4fv (mvp_location, 1, GL_FALSE, &mvp[0]);
-
-  /* Use the vertices in our buffer */
-  glBindBuffer (GL_ARRAY_BUFFER, position_buffer);
-  glEnableVertexAttribArray (0);
-  glVertexAttribPointer (0, 4, GL_FLOAT, GL_FALSE, 0, 0);
-
-  /* Draw the three vertices as a triangle */
-  glDrawArrays (GL_TRIANGLES, 0, 3);
-
-  /* We finished using the buffers and program */
-  glDisableVertexAttribArray (0);
-  glBindBuffer (GL_ARRAY_BUFFER, 0);
-  glUseProgram (0);
-}
-
-static gboolean
-render (GtkGLArea    *area,
-        GdkGLContext *context)
-{
-  /* Clear the viewport */
-  glClearColor (0.5, 0.5, 0.5, 1.0);
-  glClear (GL_COLOR_BUFFER_BIT);
-
-  /* Draw our object */
-  draw_triangle ();
-
-  /* Flush the contents of the pipeline */
-  glFlush ();
-
-  return TRUE;
-}
-
-static void
-on_axis_value_change (GtkAdjustment *adjustment,
-                      gpointer       data)
-{
-  int axis = GPOINTER_TO_INT (data);
-
-  g_assert (axis >= 0 && axis < N_AXIS);
-
-  /* Update the rotation angle */
-  rotation_angles[axis] = gtk_adjustment_get_value (adjustment);
-
-  /* Update the contents of the GL drawing area */
-  gtk_widget_queue_draw (gl_area);
-}
-
-static GtkWidget *
-create_axis_slider (int axis)
-{
-  GtkWidget *box, *label, *slider;
-  GtkAdjustment *adj;
-  const char *text;
-
-  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
-
-  switch (axis)
-    {
-    case X_AXIS:
-      text = "X axis";
-      break;
-
-    case Y_AXIS:
-      text = "Y axis";
-      break;
-
-    case Z_AXIS:
-      text = "Z axis";
-      break;
-
-    default:
-      g_assert_not_reached ();
-    }
-
-  label = gtk_label_new (text);
-  gtk_container_add (GTK_CONTAINER (box), label);
-  gtk_widget_show (label);
-
-  adj = gtk_adjustment_new (0.0, 0.0, 360.0, 1.0, 12.0, 0.0);
-  g_signal_connect (adj, "value-changed",
-                    G_CALLBACK (on_axis_value_change),
-                    GINT_TO_POINTER (axis));
-  slider = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adj);
-  gtk_container_add (GTK_CONTAINER (box), slider);
-  gtk_widget_set_hexpand (slider, TRUE);
-  gtk_widget_show (slider);
-
-  gtk_widget_show (box);
-
-  return box;
-}
-
-static void
-close_window (GtkWidget *widget)
-{
-  /* Reset the state */
-  demo_window = NULL;
-  gl_area = NULL;
-
-  rotation_angles[X_AXIS] = 0.0;
-  rotation_angles[Y_AXIS] = 0.0;
-  rotation_angles[Z_AXIS] = 0.0;
-}
-
-GtkWidget *
-create_glarea_window (GtkWidget *do_widget)
-{
-  GtkWidget *window, *box, *button, *controls;
-  int i;
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_screen (GTK_WINDOW (window), gtk_widget_get_screen (do_widget));
-  gtk_window_set_title (GTK_WINDOW (window), "GtkGLArea - Golden Triangle");
-  gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
-  gtk_container_set_border_width (GTK_CONTAINER (window), 12);
-  g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
-  gtk_box_set_spacing (GTK_BOX (box), 6);
-  gtk_container_add (GTK_CONTAINER (window), box);
-
-  gl_area = gtk_gl_area_new ();
-  gtk_widget_set_hexpand (gl_area, TRUE);
-  gtk_widget_set_vexpand (gl_area, TRUE);
-  gtk_container_add (GTK_CONTAINER (box), gl_area);
-
-  /* We need to initialize and free GL resources, so we use
-   * the realize and unrealize signals on the widget
-   */
-  g_signal_connect (gl_area, "realize", G_CALLBACK (realize), NULL);
-  g_signal_connect (gl_area, "unrealize", G_CALLBACK (unrealize), NULL);
-
-  /* The main "draw" call for GtkGLArea */
-  g_signal_connect (gl_area, "render", G_CALLBACK (render), NULL);
-
-  controls = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
-  gtk_container_add (GTK_CONTAINER (box), controls);
-  gtk_widget_set_hexpand (controls, TRUE);
-
-  for (i = 0; i < N_AXIS; i++)
-    gtk_container_add (GTK_CONTAINER (controls), create_axis_slider (i));
-
-  button = gtk_button_new_with_label ("Quit");
-  gtk_widget_set_hexpand (button, TRUE);
-  gtk_container_add (GTK_CONTAINER (box), button);
-  g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window);
-
-  return window;
-}
-
-GtkWidget*
-do_glarea (GtkWidget *do_widget)
-{
-  if (demo_window == NULL)
-    demo_window = create_glarea_window (do_widget);
-
-  if (!gtk_widget_get_visible (demo_window))
-    gtk_widget_show_all (demo_window);
-  else
-    gtk_widget_destroy (demo_window);
-
-  return demo_window;
-}
@@ -239,8 +239,8 @@ do_hypertext (GtkWidget *do_widget)
      GtkWidget *sw;
      GtkTextBuffer *buffer;

-      hand_cursor = gdk_cursor_new_for_display (gtk_widget_get_display (do_widget), GDK_HAND2);
-      regular_cursor = gdk_cursor_new_for_display (gtk_widget_get_display (do_widget), GDK_XTERM);
+      hand_cursor = gdk_cursor_new (GDK_HAND2);
+      regular_cursor = gdk_cursor_new (GDK_XTERM);

      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
@@ -218,6 +218,7 @@ add_columns (GtkTreeView *treeview)

  /* column for symbolic icon */
  renderer = gtk_cell_renderer_pixbuf_new ();
+  g_object_set (G_OBJECT (renderer), "follow-state", TRUE, NULL);
  column = gtk_tree_view_column_new_with_attributes ("Symbolic icon",
                                                     renderer,
                                                     "icon-name",
@@ -543,7 +543,7 @@ add_data_tab (const gchar *demoname)
           * not an image. Let's try something else then.
           */
          g_object_ref_sink (widget);
-          g_object_unref (widget);
+          gtk_widget_destroy (widget);

          bytes = g_resources_lookup_data (resource_name, 0, NULL);
          g_assert (bytes);
@@ -772,53 +772,19 @@ load_file (const gchar *demoname,
        case 3:
          /* Reading program body */
          gtk_text_buffer_insert (source_buffer, &start, p, -1);
-          if (lines[i+1] != NULL)
-            gtk_text_buffer_insert (source_buffer, &start, "\n", 1);
+          gtk_text_buffer_insert (source_buffer, &start, "\n", 1);
          break;
        }
    }

-  g_strfreev (lines);
-
  fontify (source_buffer);

-  gtk_text_buffer_create_tag (source_buffer, "top-margin",
-                              "pixels-above-lines", 20,
-                              NULL);
-  gtk_text_buffer_get_start_iter (source_buffer, &start);
-  end = start;
-  gtk_text_iter_forward_word_end (&end);
-  gtk_text_buffer_apply_tag_by_name (source_buffer, "top-margin", &start, &end);
-
-  gtk_text_buffer_create_tag (source_buffer, "bottom-margin",
-                              "pixels-below-lines", 20,
-                              NULL);
-  gtk_text_buffer_get_end_iter (source_buffer, &end);
-  start = end;
-  gtk_text_iter_backward_word_start (&start);
-  gtk_text_buffer_apply_tag_by_name (source_buffer, "bottom-margin", &start, &end);
-
-  gtk_text_view_set_buffer (GTK_TEXT_VIEW (source_view), source_buffer);
-  g_object_unref (source_buffer);
-
-  gtk_text_buffer_create_tag (info_buffer, "top-margin",
-                              "pixels-above-lines", 20,
-                              NULL);
-  gtk_text_buffer_get_start_iter (info_buffer, &start);
-  end = start;
-  gtk_text_iter_forward_word_end (&end);
-  gtk_text_buffer_apply_tag_by_name (info_buffer, "top-margin", &start, &end);
-
-  gtk_text_buffer_create_tag (info_buffer, "bottom-margin",
-                              "pixels-below-lines", 20,
-                              NULL);
-  gtk_text_buffer_get_end_iter (info_buffer, &end);
-  start = end;
-  gtk_text_iter_backward_word_start (&start);
-  gtk_text_buffer_apply_tag_by_name (info_buffer, "bottom-margin", &start, &end);
+  g_strfreev (lines);

  gtk_text_view_set_buffer (GTK_TEXT_VIEW (info_view), info_buffer);
  g_object_unref (info_buffer);
+  gtk_text_view_set_buffer (GTK_TEXT_VIEW (source_view), source_buffer);
+  g_object_unref (source_buffer);
 }

 static void
@@ -855,6 +821,7 @@ create_text (GtkWidget **view,
 {
  GtkWidget *scrolled_window;
  GtkWidget *text_view;
+  PangoFontDescription *font_desc;

  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
@@ -864,10 +831,7 @@ create_text (GtkWidget **view,
                                       GTK_SHADOW_NONE);

  *view = text_view = gtk_text_view_new ();
-  g_object_set (text_view,
-                "left-margin", 20,
-                "right-margin", 20,
-                NULL);
+  g_object_set (text_view, "margin", 20, NULL);

  gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE);
  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (text_view), FALSE);
@@ -876,15 +840,22 @@ create_text (GtkWidget **view,

  if (is_source)
    {
-      gtk_text_view_set_monospace (GTK_TEXT_VIEW (text_view), TRUE);
-      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_NONE);
+      font_desc = pango_font_description_from_string ("monospace");
+      gtk_widget_override_font (text_view, font_desc);
+      pango_font_description_free (font_desc);
+
+      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view),
+                                   GTK_WRAP_NONE);
    }
  else
    {
      /* Make it a bit nicer for text. */
-      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_WORD);
-      gtk_text_view_set_pixels_above_lines (GTK_TEXT_VIEW (text_view), 2);
-      gtk_text_view_set_pixels_below_lines (GTK_TEXT_VIEW (text_view), 2);
+      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view),
+                                   GTK_WRAP_WORD);
+      gtk_text_view_set_pixels_above_lines (GTK_TEXT_VIEW (text_view),
+                                            2);
+      gtk_text_view_set_pixels_below_lines (GTK_TEXT_VIEW (text_view),
+                                            2);
    }

  return scrolled_window;
@@ -945,10 +916,9 @@ startup (GApplication *app)
 {
  GtkBuilder *builder;
  GMenuModel *appmenu;
-  gchar *ids[] = { "appmenu", NULL };

  builder = gtk_builder_new ();
-  gtk_builder_add_objects_from_resource (builder, "/ui/main.ui", ids, NULL);
+  gtk_builder_add_from_resource (builder, "/ui/main.ui", NULL);

  appmenu = (GMenuModel *)gtk_builder_get_object (builder, "appmenu");

@@ -70,41 +70,36 @@
        <property name="can_focus">False</property>
        <property name="border_width">0</property>
        <child>
-          <object class="GtkFrame">
+          <object class="GtkScrolledWindow" id="scrolledwindow">
+            <property name="width_request">120</property>
            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">never</property>
+            <property name="shadow_type">none</property>
+            <property name="min_content_width">150</property>
+            <style>
+              <class name="sidebar"/>
+            </style>
            <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow">
-                <property name="width_request">120</property>
+              <object class="GtkTreeView" id="treeview">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">never</property>
-                <property name="shadow_type">none</property>
-                <property name="min_content_width">150</property>
-                <style>
-                  <class name="sidebar"/>
-                </style>
+                <property name="model">treestore</property>
+                <property name="headers_visible">False</property>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection" id="treeview-selection">
+                    <property name="mode">browse</property>
+                  </object>
+                </child>
                <child>
-                  <object class="GtkTreeView" id="treeview">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="model">treestore</property>
-                    <property name="headers_visible">False</property>
-                    <child internal-child="selection">
-                      <object class="GtkTreeSelection" id="treeview-selection">
-                        <property name="mode">browse</property>
-                      </object>
-                    </child>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+                    <property name="title" translatable="yes">column</property>
                    <child>
-                      <object class="GtkTreeViewColumn" id="treeviewcolumn1">
-                        <property name="title" translatable="yes">column</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="cellrenderertext1"/>
-                          <attributes>
-                            <attribute name="style">4</attribute>
-                            <attribute name="text">1</attribute>
-                          </attributes>
-                        </child>
-                      </object>
+                      <object class="GtkCellRendererText" id="cellrenderertext1"/>
+                      <attributes>
+                        <attribute name="style">4</attribute>
+                        <attribute name="text">1</attribute>
+                      </attributes>
                    </child>
                  </object>
                </child>
@@ -133,8 +128,10 @@
                  <object class="GtkTextView" id="info-textview">
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
-                    <property name="left-margin">20</property>
-                    <property name="right-margin">20</property>
+                    <property name="margin_start">20</property>
+                    <property name="margin_end">20</property>
+                    <property name="margin_top">20</property>
+                    <property name="margin_bottom">20</property>
                    <property name="pixels_above_lines">2</property>
                    <property name="pixels_below_lines">2</property>
                    <property name="editable">False</property>
@@ -168,8 +165,10 @@
                  <object class="GtkTextView" id="source-textview">
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
-                    <property name="left-margin">20</property>
-                    <property name="right-margin">20</property>
+                    <property name="margin_start">20</property>
+                    <property name="margin_end">20</property>
+                    <property name="margin_top">20</property>
+                    <property name="margin_bottom">20</property>
                    <property name="editable">False</property>
                    <property name="cursor_visible">False</property>
                  </object>
@@ -33,7 +33,8 @@ static GtkWidget *
 create_menu (gint     depth)
 {
  GtkWidget *menu;
-  GtkRadioMenuItem *last_item;
+  GtkWidget *menuitem;
+  GSList *group;
  char buf[32];
  int i, j;

@@ -41,24 +42,20 @@ create_menu (gint     depth)
    return NULL;

  menu = gtk_menu_new ();
-  last_item = NULL;
+  group = NULL;

  for (i = 0, j = 1; i < 5; i++, j++)
    {
-      GtkWidget *menu_item;
-
      sprintf (buf, "item %2d - %d", depth, j);
+      menuitem = gtk_radio_menu_item_new_with_label (group, buf);
+      group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));

-      menu_item = gtk_radio_menu_item_new_with_label_from_widget (NULL, buf);
-      gtk_radio_menu_item_join_group (GTK_RADIO_MENU_ITEM (menu_item), last_item);
-      last_item = GTK_RADIO_MENU_ITEM (menu_item);
-
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-      gtk_widget_show (menu_item);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+      gtk_widget_show (menuitem);
      if (i == 3)
-        gtk_widget_set_sensitive (menu_item, FALSE);
+        gtk_widget_set_sensitive (menuitem, FALSE);

-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), create_menu (depth - 1));
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (depth - 1));
    }

  return menu;
@@ -573,6 +573,7 @@ do_offscreen_window (GtkWidget *do_widget)
  if (!window)
    {
      GtkWidget *bin, *vbox, *scale, *button;
+      GdkRGBA black;

      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
@@ -582,6 +583,8 @@ do_offscreen_window (GtkWidget *do_widget)
      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);

+      gdk_rgba_parse (&black, "black");
+      gtk_widget_override_background_color (window, 0, &black);
      gtk_container_set_border_width (GTK_CONTAINER (window), 10);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
@@ -181,6 +181,8 @@ do_rotated_text (GtkWidget *do_widget)
      PangoLayout *layout;
      PangoAttrList *attrs;

+      const GdkRGBA white = { 1.0, 1.0, 1.0, 1.0 };
+
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
                             gtk_widget_get_screen (do_widget));
@@ -193,15 +195,18 @@ do_rotated_text (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (window), box);

      /* Add a drawing area */
+
      drawing_area = gtk_drawing_area_new ();
      gtk_container_add (GTK_CONTAINER (box), drawing_area);
-      gtk_style_context_add_class (gtk_widget_get_style_context (drawing_area),
-                                   GTK_STYLE_CLASS_VIEW);
+
+      /* This overrides the background color from the theme */
+      gtk_widget_override_background_color (drawing_area, 0, &white);

      g_signal_connect (drawing_area, "draw",
                        G_CALLBACK (rotated_text_draw), NULL);

      /* And a label */
+
      label = gtk_label_new (text);
      gtk_container_add (GTK_CONTAINER (box), label);

@@ -42,34 +42,6 @@ window_key_press_event_cb (GtkWidget    *widget,
  return gtk_search_bar_handle_event (bar, event);
 }

-static void
-search_changed (GtkSearchEntry *entry,
-                GtkLabel       *label)
-{
-  gtk_label_set_text (label, "search-changed");
-}
-
-static void
-next_match (GtkSearchEntry *entry,
-            GtkLabel       *label)
-{
-  gtk_label_set_text (label, "next-match");
-}
-
-static void
-previous_match (GtkSearchEntry *entry,
-                GtkLabel       *label)
-{
-  gtk_label_set_text (label, "previous-match");
-}
-
-static void
-stop_search (GtkSearchEntry *entry,
-             GtkLabel       *label)
-{
-  gtk_label_set_text (label, "stop-search");
-}
-
 GtkWidget *
 do_search_entry2 (GtkWidget *do_widget)
 {
@@ -127,8 +99,6 @@ do_search_entry2 (GtkWidget *do_widget)
      gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);

      label = gtk_label_new ("Result:");
-      gtk_label_set_xalign (GTK_LABEL (label), 0.0);
-      gtk_widget_set_margin_start (label, 6);
      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);

      label = gtk_label_new ("");
@@ -138,27 +108,6 @@ do_search_entry2 (GtkWidget *do_widget)
                        G_CALLBACK (search_changed_cb), label);
      g_signal_connect (entry, "changed",
                        G_CALLBACK (changed_cb), label);
-
-      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
-      gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
-
-      label = gtk_label_new ("Signal:");
-      gtk_label_set_xalign (GTK_LABEL (label), 0.0);
-      gtk_widget_set_margin_start (label, 6);
-      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
-
-      label = gtk_label_new ("");
-      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
-
-      g_signal_connect (entry, "search-changed",
-                        G_CALLBACK (search_changed), label);
-      g_signal_connect (entry, "next-match",
-                        G_CALLBACK (next_match), label);
-      g_signal_connect (entry, "previous-match",
-                        G_CALLBACK (previous_match), label);
-      g_signal_connect (entry, "stop-search",
-                        G_CALLBACK (stop_search), label);
    }

  if (!gtk_widget_get_visible (window))
@@ -1,89 +0,0 @@
-/* Stack Sidebar
- *
- * GtkStackSidebar provides an automatic sidebar widget to control
- * navigation of a GtkStack object. This widget automatically updates it
- * content based on what is presently available in the GtkStack object,
- * and using the "title" child property to set the display labels.
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_sidebar (GtkWidget *do_widget)
-{
-  GtkWidget *sidebar;
-  GtkWidget *stack;
-  GtkWidget *box;
-  GtkWidget *widget;
-  GtkWidget *header;
-  const gchar* pages[] = {
-    "Welcome to GTK+",
-    "GtkStackSidebar Widget",
-    "Automatic navigation",
-    "Consistent appearance",
-    "Scrolling",
-    "Page 6",
-    "Page 7",
-    "Page 8",
-    "Page 9",
-    NULL
-  };
-  const gchar *c = NULL;
-  guint i;
-
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
-      gtk_widget_set_size_request (window, 500, 350);
-
-      header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_close_button (GTK_HEADER_BAR(header), TRUE);
-      gtk_window_set_titlebar (GTK_WINDOW(window), header);
-      gtk_window_set_title (GTK_WINDOW(window), "Stack Sidebar demo");
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      sidebar = gtk_stack_sidebar_new ();
-      gtk_box_pack_start (GTK_BOX (box), sidebar, FALSE, FALSE, 0);
-
-      stack = gtk_stack_new ();
-      gtk_stack_set_transition_type (GTK_STACK (stack), GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN);
-      gtk_stack_sidebar_set_stack (GTK_STACK_SIDEBAR (sidebar), GTK_STACK (stack));
-
-      /* Separator between sidebar and stack */
-      widget = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
-      gtk_box_pack_start (GTK_BOX(box), widget, FALSE, FALSE, 0);
-
-      gtk_box_pack_start (GTK_BOX (box), stack, TRUE, TRUE, 0);
-
-      for (i=0; (c = *(pages+i)) != NULL; i++ )
-        {
-          if (i == 0)
-            {
-              widget = gtk_image_new_from_icon_name ("help-about", GTK_ICON_SIZE_MENU);
-              gtk_image_set_pixel_size (GTK_IMAGE (widget), 256);
-            }
-          else
-            {
-              widget = gtk_label_new (c);
-            }
-          gtk_stack_add_named (GTK_STACK (stack), widget, c);
-          gtk_container_child_set (GTK_CONTAINER (stack), widget, "title", c, NULL);
-        }
-
-       gtk_container_add (GTK_CONTAINER (window), box);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
@@ -539,18 +539,26 @@ recursive_attach_view (int                 depth,
                       GtkTextView        *view,
                       GtkTextChildAnchor *anchor)
 {
-  GtkWidget *child_view, *frame;
+  GtkWidget *child_view;
+  GtkWidget *event_box;
+  GdkRGBA color;

  if (depth > 4)
    return;

  child_view = gtk_text_view_new_with_buffer (gtk_text_view_get_buffer (view));

-  /* Frame is to add a black border around each child view */
-  frame = gtk_frame_new (NULL);
-  gtk_container_add (GTK_CONTAINER (frame), child_view);
+  /* Event box is to add a black border around each child view */
+  event_box = gtk_event_box_new ();
+  gdk_rgba_parse (&color, "black");
+  gtk_widget_override_background_color (event_box, 0, &color);

-  gtk_text_view_add_child_at_anchor (view, frame, anchor);
+  gtk_widget_set_halign (child_view, GTK_ALIGN_FILL);
+  gtk_widget_set_valign (child_view, GTK_ALIGN_FILL);
+
+  gtk_container_add (GTK_CONTAINER (event_box), child_view);
+
+  gtk_text_view_add_child_at_anchor (view, event_box, anchor);

  recursive_attach_view (depth + 1, GTK_TEXT_VIEW (child_view), anchor);
 }
@@ -190,6 +190,7 @@ do_transparent (GtkWidget *do_widget)
      GtkWidget *sw;
      GtkWidget *overlay;
      GtkWidget *entry;
+      GdkRGBA transparent = {0, 0, 0, 0};
      GtkCssProvider *provider;
      gchar *css;

@@ -217,6 +218,8 @@ do_transparent (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (overlay), sw);
      gtk_container_add (GTK_CONTAINER (window), overlay);

+      gtk_widget_override_background_color (overlay, 0, &transparent);
+
      entry = gtk_entry_new ();
      provider = gtk_css_provider_new ();
      css = g_strdup_printf ("* { border-width: 0px %dpx %dpx 0px; }",
@@ -20,7 +20,6 @@ gtk3_icon_browser_SOURCES = \
 	main.c \
 	iconbrowserapp.c iconbrowserapp.h \
 	iconbrowserwin.c iconbrowserwin.h \
-	iconstore.c iconstore.h \
 	resources.c

 BUILT_SOURCES = \
@@ -31,7 +30,6 @@ resources.c: iconbrowser.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourc
 		--target=$@ --sourcedir=$(srcdir) --generate-source

 EXTRA_DIST = \
-	app-menu.ui \
 	iconbrowser.gresource.xml \
 	window.ui

@@ -1,7 +1,5 @@
-#include <string.h>
 #include "iconbrowserapp.h"
 #include "iconbrowserwin.h"
-#include "iconstore.h"
 #include <gtk/gtk.h>

 typedef struct
@@ -43,10 +41,17 @@ struct _IconBrowserWindowClass
  GtkApplicationWindowClass parent_class;
 };

+enum {
+  NAME_COLUMN,
+  SYMBOLIC_NAME_COLUMN,
+  DESCRIPTION_COLUMN,
+  CONTEXT_COLUMN
+};
+
 G_DEFINE_TYPE(IconBrowserWindow, icon_browser_window, GTK_TYPE_APPLICATION_WINDOW);

 static void
-search_text_changed (GtkEntry *entry, IconBrowserWindow *win)
+search_text_changed (GtkEntry *entry)
 {
  const gchar *text;

@@ -54,35 +59,18 @@ search_text_changed (GtkEntry *entry, IconBrowserWindow *win)

  if (text[0] == '\0')
    return;
-
-  gtk_tree_model_filter_refilter (win->filter_model);
-}
-
-static GdkPixbuf *
-get_icon (GtkWidget *image, const gchar *name, gint size)
-{
-  GtkIconInfo *info;
-  GtkStyleContext *context;
-  GdkPixbuf *pixbuf;
-
-  context = gtk_widget_get_style_context (image);
-  info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (), name, size, 0);
-  pixbuf = gtk_icon_info_load_symbolic_for_context (info, context, NULL, NULL);
-  g_object_unref (info);
-
-  return pixbuf;
 }

 static void
 set_image (GtkWidget *image, const gchar *name, gint size)
 {
-  GdkPixbuf *pixbuf;
-
  gtk_image_set_from_icon_name (GTK_IMAGE (image), name, 1);
  gtk_image_set_pixel_size (GTK_IMAGE (image), size);
-  pixbuf = get_icon (image, name, size);
-  gtk_drag_source_set_icon_pixbuf (gtk_widget_get_parent (image), pixbuf);
-  g_object_unref (pixbuf);
+}
+
+static void
+selection_changed (GtkIconView *icon_view, IconBrowserWindow *win)
+{
 }

 static void
@@ -96,14 +84,14 @@ item_activated (GtkIconView *icon_view, GtkTreePath *path, IconBrowserWindow *wi
  gtk_tree_model_get_iter (GTK_TREE_MODEL (win->filter_model), &iter, path);

  if (win->symbolic)
-    column = ICON_STORE_SYMBOLIC_NAME_COLUMN;
+    column = SYMBOLIC_NAME_COLUMN;
  else
-    column = ICON_STORE_NAME_COLUMN;
+    column = NAME_COLUMN;
  gtk_tree_model_get (GTK_TREE_MODEL (win->filter_model), &iter,
                      column, &name,
-                      ICON_STORE_DESCRIPTION_COLUMN, &description,
+                      DESCRIPTION_COLUMN, &description,
                      -1);
-
+      
  if (name == NULL || !gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), name))
    {
      g_free (description);
@@ -155,10 +143,10 @@ add_icon (IconBrowserWindow *win,
      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,
-                                     ICON_STORE_DESCRIPTION_COLUMN, description,
-                                     ICON_STORE_CONTEXT_COLUMN, context,
+                                     NAME_COLUMN, regular_name,
+                                     SYMBOLIC_NAME_COLUMN, symbolic_name,
+                                     DESCRIPTION_COLUMN, description,
+                                     CONTEXT_COLUMN, context,
                                     -1);
 }

@@ -203,8 +191,6 @@ selected_context_changed (GtkListBox *list, IconBrowserWindow *win)
  if (row == NULL)
    return;

-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (win->search), FALSE);
-
  label = gtk_bin_get_child (GTK_BIN (row));
  win->current_context = g_object_get_data (G_OBJECT (label), "context");
  gtk_tree_model_filter_refilter (win->filter_model);
@@ -685,13 +671,11 @@ populate (IconBrowserWindow *win)
 }

 static gboolean
-key_press_event_cb (GtkWidget *widget,
-                    GdkEvent  *event,
-                    gpointer   data)
+key_press_event_cb (GtkWidget    *widget,
+                    GdkEvent     *event,
+                    GtkSearchBar *bar)
 {
-  IconBrowserWindow *win = data;
-
-  return gtk_search_bar_handle_event (GTK_SEARCH_BAR (win->searchbar), event);
+  return gtk_search_bar_handle_event (bar, event);
 }

 static gboolean
@@ -703,28 +687,19 @@ icon_visible_func (GtkTreeModel *model,
  gchar *context;
  gchar *name;
  gint column;
-  gboolean search;
-  const gchar *search_text;
  gboolean visible;

-  search = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (win->search));
-  search_text = gtk_entry_get_text (GTK_ENTRY (win->searchentry));
-
  if (win->symbolic)
-    column = ICON_STORE_SYMBOLIC_NAME_COLUMN;
+    column = SYMBOLIC_NAME_COLUMN;
  else
-    column = ICON_STORE_NAME_COLUMN;
+    column = NAME_COLUMN;

  gtk_tree_model_get (model, iter,
                      column, &name,
-                      ICON_STORE_CONTEXT_COLUMN, &context,
+                      CONTEXT_COLUMN, &context,
                      -1);
-  if (!name)
-    visible = FALSE;
-  else if (search)
-    visible = strstr (name, search_text) != NULL;
-  else
-    visible = win->current_context != NULL && g_strcmp0 (context, win->current_context->id) == 0;
+
+  visible = name != NULL && win->current_context != NULL && g_strcmp0 (context, win->current_context->id) == 0;

  g_free (name);
  g_free (context);
@@ -740,11 +715,9 @@ symbolic_toggled (GtkToggleButton *toggle, IconBrowserWindow *win)
  win->symbolic = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle));

  if (win->symbolic)
-    column = ICON_STORE_SYMBOLIC_NAME_COLUMN;
+    column = SYMBOLIC_NAME_COLUMN;
  else
-    column = ICON_STORE_NAME_COLUMN;
-
-  icon_store_set_text_column (ICON_STORE (win->store), column);
+    column = NAME_COLUMN;

  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);
@@ -753,82 +726,23 @@ symbolic_toggled (GtkToggleButton *toggle, IconBrowserWindow *win)
  gtk_widget_queue_draw (win->list);
 }

-static void
-search_mode_toggled (GObject *searchbar, GParamSpec *pspec, IconBrowserWindow *win)
-{
-  if (gtk_search_bar_get_search_mode (GTK_SEARCH_BAR (searchbar)))
-    gtk_list_box_unselect_all (GTK_LIST_BOX (win->context_list));
-}
-
-static void
-get_image_data (GtkWidget        *widget,
-                GdkDragContext   *context,
-                GtkSelectionData *selection,
-                guint             target_info,
-                guint             time,
-                gpointer          data)
-{
-  GtkWidget *image;
-  const gchar *name;
-  gint size;
-  GdkPixbuf *pixbuf;
-
-  image = gtk_bin_get_child (GTK_BIN (widget));
-
-  gtk_image_get_icon_name (GTK_IMAGE (image), &name, NULL);
-  size = gtk_image_get_pixel_size (GTK_IMAGE (image));
-
-  pixbuf = get_icon (image, name, size);
-  gtk_selection_data_set_pixbuf (selection, pixbuf);
-  g_object_unref (pixbuf);
-}
-
-static void
-setup_image_dnd (GtkWidget *image)
-{
-  GtkWidget *parent;
-
-  parent = gtk_widget_get_parent (image);
-  gtk_drag_source_set (parent, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY);
-  gtk_drag_source_add_image_targets (parent);
-  g_signal_connect (parent, "drag-data-get", G_CALLBACK (get_image_data), NULL);
-}
-
 static void
 icon_browser_window_init (IconBrowserWindow *win)
 {
-  GtkTargetList *list;
-  GtkTargetEntry *targets;
-  gint n_targets;
-
  gtk_widget_init_template (GTK_WIDGET (win));

-  list = gtk_target_list_new (NULL, 0);
-  gtk_target_list_add_text_targets (list, 0);
-  targets = gtk_target_table_new_from_list (list, &n_targets);
-  gtk_target_list_unref (list);
-
-  gtk_icon_view_enable_model_drag_source (GTK_ICON_VIEW (win->list),
-                                          GDK_BUTTON1_MASK,
-                                          targets, n_targets,
-                                          GDK_ACTION_COPY);
-
-  gtk_target_table_free (targets, n_targets);
-
-  setup_image_dnd (win->image1);
-  setup_image_dnd (win->image2);
-  setup_image_dnd (win->image3);
-  setup_image_dnd (win->image4);
-  setup_image_dnd (win->image5);
-
  win->contexts = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_free);

+  g_object_bind_property (win->search, "active",
+                          win->searchbar, "search-mode-enabled",
+                          G_BINDING_BIDIRECTIONAL);
+
+//  gtk_tree_view_set_search_entry (GTK_TREE_VIEW (win->list), GTK_ENTRY (win->searchentry));
+  g_signal_connect (win, "key-press-event", G_CALLBACK (key_press_event_cb), win->searchbar);
+
  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));

-  g_signal_connect (win->searchbar, "notify::search-mode-enabled",
-                    G_CALLBACK (search_mode_toggled), win);
-
  symbolic_toggled (GTK_TOGGLE_BUTTON (win->symbolic_radio), win);

  populate (win);
@@ -837,8 +751,6 @@ icon_browser_window_init (IconBrowserWindow *win)
 static void
 icon_browser_window_class_init (IconBrowserWindowClass *class)
 {
-  g_type_ensure (ICON_STORE_TYPE);
-
  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
                                               "/org/gtk/iconbrowser/window.ui");

@@ -862,10 +774,10 @@ icon_browser_window_class_init (IconBrowserWindowClass *class)
  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, description);

  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), search_text_changed);
+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), selection_changed);
  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), item_activated);
  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);
 }

 IconBrowserWindow *
@@ -1,91 +0,0 @@
-#include "iconstore.h"
-#include <gtk/gtk.h>
-
-struct _IconStore
-{
-  GtkListStore parent;
-
-  gint text_column;
-};
-
-struct _IconStoreClass
-{
-  GtkListStoreClass parent_class;
-};
-
-static void icon_store_drag_source_init (GtkTreeDragSourceIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (IconStore, icon_store, GTK_TYPE_LIST_STORE,
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_SOURCE,
-                                                icon_store_drag_source_init))
-
-
-static void
-icon_store_init (IconStore *store)
-{
-  GType types[4] = { G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING };
-
-  gtk_list_store_set_column_types (GTK_LIST_STORE (store), 4, types);
-
-  store->text_column = ICON_STORE_NAME_COLUMN;
-}
-
-static void
-icon_store_class_init (IconStoreClass *class)
-{
-}
-
-static gboolean
-row_draggable (GtkTreeDragSource *drag_source,
-               GtkTreePath       *path)
-{
-  return TRUE;
-}
-
-static gboolean
-drag_data_delete (GtkTreeDragSource *drag_source,
-                  GtkTreePath       *path)
-{
-  GtkTreeIter iter;
-
-  if (gtk_tree_model_get_iter (GTK_TREE_MODEL (drag_source), &iter, path))
-    return gtk_list_store_remove (GTK_LIST_STORE (drag_source), &iter);
-  return FALSE;
-}
-
-static gboolean
-drag_data_get (GtkTreeDragSource *drag_source,
-               GtkTreePath       *path,
-               GtkSelectionData  *selection)
-{
-  GtkTreeIter iter;
-  gchar *text;
-
-  if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (drag_source), &iter, path))
-    return FALSE;
-
-  gtk_tree_model_get (GTK_TREE_MODEL (drag_source), &iter,
-                      ICON_STORE (drag_source)->text_column, &text,
-                      -1);
-
-  gtk_selection_data_set_text (selection, text, -1);
-
-  g_free (text);
-
-  return TRUE;
-}
-
-
-static void
-icon_store_drag_source_init (GtkTreeDragSourceIface *iface)
-{
-  iface->row_draggable = row_draggable;
-  iface->drag_data_delete = drag_data_delete;
-  iface->drag_data_get = drag_data_get;
-}
-
-void
-icon_store_set_text_column (IconStore *store, gint text_column)
-{
-  store->text_column = text_column;
-}
@@ -1,26 +0,0 @@
-#ifndef __ICON_STORE_H
-#define __ICON_STORE_H
-
-#include <gtk/gtk.h>
-
-
-#define ICON_STORE_TYPE (icon_store_get_type ())
-#define ICON_STORE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ICON_STORE_TYPE, IconStore))
-
-
-typedef struct _IconStore       IconStore;
-typedef struct _IconStoreClass  IconStoreClass;
-
-enum {
-  ICON_STORE_NAME_COLUMN,
-  ICON_STORE_SYMBOLIC_NAME_COLUMN,
-  ICON_STORE_DESCRIPTION_COLUMN,
-  ICON_STORE_CONTEXT_COLUMN
-};
-
-GType   icon_store_get_type     (void);
-
-void    icon_store_set_text_column (IconStore *store,
-                                    gint       column);
-
-#endif /* __ICON_STORE_H */
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <!-- interface-requires gtk+ 3.8 -->
-  <object class="IconStore" id="store">
+  <object class="GtkListStore" id="store">
+    <columns>
+      <column type="gchararray"/>
+      <column type="gchararray"/>
+      <column type="gchararray"/>
+      <column type="gchararray"/>
+    </columns>
  </object>
  <object class="GtkTreeModelFilter" id="filter_model">
    <property name="child_model">store</property>
@@ -10,7 +16,6 @@
    <property name="title" translatable="yes">Icon Browser</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">
        <property name="visible">True</property>
@@ -42,7 +47,7 @@
        </child>
        <child>
          <object class="GtkToggleButton" id="search">
-            <property name="visible">True</property>
+            <property name="visible">False</property>
            <style>
              <class name="image-button"/>
            </style>
@@ -71,11 +76,6 @@
            <signal name="selected-rows-changed" handler="selected_context_changed"/>
          </object>
        </child>
-        <child>
-          <object class="GtkVSeparator">
-            <property name="visible">True</property>
-          </object>
-        </child>
        <child>
          <object class="GtkBox" id="content_box">
            <property name="visible">True</property>
@@ -83,11 +83,10 @@
            <child>
              <object class="GtkSearchBar" id="searchbar">
                <property name="visible">True</property>
-                <property name="search-mode-enabled" bind-source="search" bind-property="active" bind-flags="bidirectional"/>
                <child>
                  <object class="GtkSearchEntry" id="searchentry">
-                    <property name="visible">True</property>
                    <signal name="search-changed" handler="search_text_changed"/>
+                    <property name="visible">True</property>
                  </object>
                </child>
              </object>
@@ -98,12 +97,12 @@
                <property name="expand">True</property>
                <property name="hscrollbar-policy">never</property>
                <property name="vscrollbar-policy">automatic</property>
+                <property name="shadow-type">in</property>
                <child>
                  <object class="GtkIconView" id="list">
                    <property name="visible">True</property>
                    <property name="model">filter_model</property>
-                    <property name="selection-mode">none</property>
-                    <property name="activate-on-single-click">True</property>
+                    <signal name="selection_changed" handler="selection_changed"/>
                    <signal name="item_activated" handler="item_activated"/>
                    <child>
                      <object class="GtkCellRendererPixbuf" id="cell">
@@ -151,17 +150,12 @@
            <property name="row-spacing">10</property>
            <property name="column-spacing">10</property>
            <child>
-              <object class="GtkEventBox">
+              <object class="GtkImage" id="image1">
                <property name="visible">True</property>
-                <child>
-                  <object class="GtkImage" id="image1">
-                    <property name="visible">True</property>
-                    <property name="xpad">4</property>
-                    <property name="ypad">4</property>
-                    <property name="halign">center</property>
-                    <property name="valign">end</property>
-                  </object>
-                </child>
+                <property name="xpad">4</property>
+                <property name="ypad">4</property>
+                <property name="halign">center</property>
+                <property name="valign">end</property>
              </object>
              <packing>
                <property name="left-attach">0</property>
@@ -169,17 +163,12 @@
              </packing>
            </child>
            <child>
-              <object class="GtkEventBox">
+              <object class="GtkImage" id="image2">
                <property name="visible">True</property>
-                <child>
-                  <object class="GtkImage" id="image2">
-                    <property name="visible">True</property>
-                    <property name="xpad">4</property>
-                    <property name="ypad">4</property>
-                    <property name="halign">center</property>
-                    <property name="valign">end</property>
-                  </object>
-                </child>
+                <property name="xpad">4</property>
+                <property name="ypad">4</property>
+                <property name="halign">center</property>
+                <property name="valign">end</property>
              </object>
              <packing>
                <property name="left-attach">1</property>
@@ -187,17 +176,12 @@
              </packing>
            </child>
            <child>
-              <object class="GtkEventBox">
+              <object class="GtkImage" id="image3">
                <property name="visible">True</property>
-                <child>
-                  <object class="GtkImage" id="image3">
-                    <property name="visible">True</property>
-                    <property name="xpad">4</property>
-                    <property name="ypad">4</property>
-                    <property name="halign">center</property>
-                    <property name="valign">end</property>
-                  </object>
-                </child>
+                <property name="xpad">4</property>
+                <property name="ypad">4</property>
+                <property name="halign">center</property>
+                <property name="valign">end</property>
              </object>
              <packing>
                <property name="left-attach">2</property>
@@ -205,17 +189,12 @@
              </packing>
            </child>
            <child>
-              <object class="GtkEventBox">
+              <object class="GtkImage" id="image4">
                <property name="visible">True</property>
-                <child>
-                  <object class="GtkImage" id="image4">
-                    <property name="visible">True</property>
-                    <property name="xpad">4</property>
-                    <property name="ypad">4</property>
-                    <property name="halign">center</property>
-                    <property name="valign">end</property>
-                  </object>
-                </child>
+                <property name="xpad">4</property>
+                <property name="ypad">4</property>
+                <property name="halign">center</property>
+                <property name="valign">end</property>
              </object>
              <packing>
                <property name="left-attach">3</property>
@@ -223,17 +202,12 @@
              </packing>
            </child>
            <child>
-              <object class="GtkEventBox">
+              <object class="GtkImage" id="image5">
                <property name="visible">True</property>
-                <child>
-                  <object class="GtkImage" id="image5">
-                    <property name="visible">True</property>
-                    <property name="xpad">4</property>
-                    <property name="ypad">4</property>
-                    <property name="halign">center</property>
-                    <property name="valign">end</property>
-                  </object>
-                </child>
+                <property name="xpad">4</property>
+                <property name="ypad">4</property>
+                <property name="halign">center</property>
+                <property name="valign">end</property>
              </object>
              <packing>
                <property name="left-attach">4</property>
@@ -5,27 +5,25 @@ bin_PROGRAMS = gtk3-widget-factory
 desktopdir = $(datadir)/applications
 dist_desktop_DATA = gtk3-widget-factory.desktop

-gtk3_widget_factory_SOURCES = 		\
-	widget-factory.c		\
+gtk3_widget_factory_SOURCES = \
+	widget-factory.c	\
 	widget_factory_resources.c

-BUILT_SOURCES = 			\
+BUILT_SOURCES = \
 	widget_factory_resources.c

-gtk3_widget_factory_DEPENDENCIES = 	\
+gtk3_widget_factory_DEPENDENCIES = \
 	$(top_builddir)/gtk/libgtk-3.la

-gtk3_widget_factory_CPPFLAGS = 		\
+gtk3_widget_factory_CPPFLAGS = \
 	-I$(top_srcdir)			\
 	$(GTK_DEBUG_FLAGS)		\
-	$(GTK_DEP_CFLAGS)		\
-	$(LIBCANBERRA_CFLAGS)
+	$(GTK_DEP_CFLAGS)

-gtk3_widget_factory_LDADD = 		\
+gtk3_widget_factory_LDADD = \
 	$(top_builddir)/gdk/libgdk-3.la \
 	$(top_builddir)/gtk/libgtk-3.la \
-	$(GTK_DEP_LIBS)			\
-	$(LIBCANBERRA_LIBS)
+	$(GTK_DEP_LIBS)

 widget_factory_resources.c: widget-factory.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/widget-factory.gresource.xml)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
@@ -40,14 +38,14 @@ appsicon32dir = $(iconthemedir)/32x32/apps
 appsicon48dir = $(iconthemedir)/48x48/apps
 appsicon256dir = $(iconthemedir)/256x256/apps

-dist_appsicon16_DATA = data/16x16/gtk3-widget-factory.png data/16x16/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon22_DATA = data/22x22/gtk3-widget-factory.png data/22x22/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon24_DATA = data/24x24/gtk3-widget-factory.png data/24x24/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png
+dist_appsicon16_DATA = data/16x16/gtk3-widget-factory.png
+dist_appsicon22_DATA = data/22x22/gtk3-widget-factory.png
+dist_appsicon24_DATA = data/24x24/gtk3-widget-factory.png
+dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png
+dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png
+dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png

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

 install-data-hook: install-update-icon-cache
 uninstall-hook: uninstall-update-icon-cache
@@ -60,12 +58,9 @@ uninstall-update-icon-cache:
 	$(AM_V_at)$(POST_UNINSTALL)
 	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"

-EXTRA_DIST += 				\
-	widget-factory.ui 		\
-	widget-factory.css		\
-	menus.ui 			\
-	widget-factory.gresource.xml	\
-	data/source.svg			\
-	data/symbolic-source.svg
+EXTRA_DIST += \
+	widget-factory.ui \
+	menus.ui \
+	widget-factory.gresource.xml

 -include $(top_srcdir)/git.mk
@@ -1,32 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='gtk3-widget-factory-symbolic.svg' height='16.03125' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' inkscape:version='0.48.5 r10040' version='1.1' width='16' xmlns='http://www.w3.org/2000/svg'>
-  <metadata id='metadata90'>
-    <rdf:RDF>
-      <cc:Work rdf:about=''>
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
-        <dc:title>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='15.183262' inkscape:cy='0.30876' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#555753' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1375' inkscape:window-maximized='1' inkscape:window-width='2560' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='16'>
-    <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='-203px' originy='-251.96875px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
-  </sodipodi:namedview>
-  <title id='title9167'>Gnome Symbolic Icon Theme</title>
-  <defs id='defs7386'>
-    <linearGradient id='linearGradient7212' osb:paint='solid'>
-      <stop id='stop7214' offset='0' style='stop-color:#000000;stop-opacity:1;'/>
-    </linearGradient>
-  </defs>
-  <g inkscape:groupmode='layer' id='layer9' inkscape:label='apps' style='display:inline' transform='translate(-444.0002,35)'>
-    
-    <path inkscape:connector-curvature='0' d='m 446.21875,-34 c -0.64785,0 -1.1875,0.539653 -1.1875,1.1875 l 0,4.625 c 0,0.647847 0.53965,1.1875 1.1875,1.1875 l 11.65625,0 c 0.64785,0 1.15625,-0.539653 1.15625,-1.1875 l 0,-4.625 c 0,-0.647847 -0.5084,-1.1875 -1.15625,-1.1875 l -11.65625,0 z m 0,1 11.65625,0 c 0.11114,0 0.15625,0.07636 0.15625,0.1875 l 0,4.625 c 0,0.111144 -0.0451,0.1875 -0.15625,0.1875 l -11.65625,0 c -0.11114,0 -0.1875,-0.07636 -0.1875,-0.1875 l 0,-4.625 c 0,-0.111144 0.0764,-0.1875 0.1875,-0.1875 z' id='rect7030' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans'/>
-    <path inkscape:connector-curvature='0' d='m 454.0002,-32 0,1 0,0.0312 1.53125,1.375 1.46875,-1.4062 0,-1 -0.75781,0 -0.73828,0.74609 L 454.77754,-32 z' id='path7800' sodipodi:nodetypes='cccccccccc' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans'/>
-    <path inkscape:connector-curvature='0' d='m 446.21875,-26 c -0.64785,0 -1.1875,0.539653 -1.1875,1.1875 l 0,4.65625 c 0,0.647847 0.53965,1.1875 1.1875,1.1875 l 11.65625,0 c 0.64785,0 1.15625,-0.539653 1.15625,-1.1875 l 0,-4.65625 c 0,-0.647847 -0.5084,-1.1875 -1.15625,-1.1875 l -11.65625,0 z m 0,1 11.65625,0 c 0.11114,0 0.15625,0.07636 0.15625,0.1875 l 0,4.65625 c 0,0.111144 -0.0451,0.1875 -0.15625,0.1875 l -11.65625,0 c -0.11114,0 -0.1875,-0.07636 -0.1875,-0.1875 l 0,-4.65625 c 0,-0.111144 0.0764,-0.1875 0.1875,-0.1875 z' id='rect7811' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans'/>
-    <rect height='2' id='rect7813' rx='0' ry='0' style='color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new' width='8' x='448.00021' y='-24'/>
-    <rect height='1' id='rect7815' rx='0' ry='0' style='opacity:0.3;color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new' width='12.860504' x='445.53082' y='-29'/>
-    <rect height='1' id='rect7817' rx='0' ry='0' style='opacity:0.3;color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new' width='12.860504' x='445.53085' y='-20.96875'/>
-  </g>
-</svg>
@@ -19,12 +19,7 @@
 */

 #include "config.h"
-
-#include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#ifdef HAVE_LIBCANBERRA
-#include <canberra-gtk.h>
-#endif

 static void
 change_theme_state (GSimpleAction *action,
@@ -159,12 +154,6 @@ spin_value_reset (GtkWidget *button, GtkAdjustment *adjustment)
 static gint pulse_time = 250;
 static gint pulse_entry_mode = 0;

-static void
-remove_pulse (gpointer pulse_id)
-{
-  g_source_remove (GPOINTER_TO_UINT (pulse_id));
-}
-
 static gboolean
 pulse_it (GtkWidget *widget)
 {
@@ -176,7 +165,7 @@ pulse_it (GtkWidget *widget)
    gtk_progress_bar_pulse (GTK_PROGRESS_BAR (widget));

  pulse_id = g_timeout_add (pulse_time, (GSourceFunc)pulse_it, widget);
-  g_object_set_data_full (G_OBJECT (widget), "pulse_id", GUINT_TO_POINTER (pulse_id), remove_pulse);
+  g_object_set_data (G_OBJECT (widget), "pulse_id", GUINT_TO_POINTER (pulse_id));

  return G_SOURCE_REMOVE;
 }
@@ -196,14 +185,18 @@ update_pulse_time (GtkAdjustment *adjustment, GtkWidget *widget)

  if (value == 100)
    {
-      g_object_set_data (G_OBJECT (widget), "pulse_id", NULL);
+      if (pulse_id != 0)
+        {
+          g_source_remove (pulse_id);
+          g_object_set_data (G_OBJECT (widget), "pulse_id", NULL);
+        }
    }
  else if (value < 100)
    {
      if (pulse_id == 0 && (GTK_IS_PROGRESS_BAR (widget) || pulse_entry_mode % 3 == 2))
        {
          pulse_id = g_timeout_add (pulse_time, (GSourceFunc)pulse_it, widget);
-          g_object_set_data_full (G_OBJECT (widget), "pulse_id", GUINT_TO_POINTER (pulse_id), remove_pulse);
+          g_object_set_data (G_OBJECT (widget), "pulse_id", GUINT_TO_POINTER (pulse_id));
        }
    }
 }
@@ -214,6 +207,8 @@ on_entry_icon_release (GtkEntry            *entry,
                       GdkEvent            *event,
                       gpointer             user_data)
 {
+  guint pulse_id;
+
  if (icon_pos != GTK_ENTRY_ICON_SECONDARY)
    return;

@@ -221,7 +216,12 @@ on_entry_icon_release (GtkEntry            *entry,

  if (pulse_entry_mode % 3 == 0)
    {
-      g_object_set_data (G_OBJECT (entry), "pulse_id", NULL);
+      pulse_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (entry), "pulse_id"));
+      if (pulse_id != 0)
+        {
+          g_source_remove (pulse_id);
+          g_object_set_data (G_OBJECT (entry), "pulse_id", NULL);
+        }
      gtk_entry_set_progress_fraction (entry, 0);
    }
  else if (pulse_entry_mode % 3 == 1)
@@ -234,144 +234,7 @@ on_entry_icon_release (GtkEntry            *entry,
          pulse_it (GTK_WIDGET (entry));
        }
    }
-}

-#define EPSILON (1e-10)
-
-static gboolean
-on_scale_button_query_tooltip (GtkWidget  *button,
-                               gint        x,
-                               gint        y,
-                               gboolean    keyboard_mode,
-                               GtkTooltip *tooltip,
-                               gpointer    user_data)
-{
-  GtkScaleButton *scale_button = GTK_SCALE_BUTTON (button);
-  GtkAdjustment *adjustment;
-  gdouble val;
-  gchar *str;
-  AtkImage *image;
-
-  image = ATK_IMAGE (gtk_widget_get_accessible (button));
-
-  adjustment = gtk_scale_button_get_adjustment (scale_button);
-  val = gtk_scale_button_get_value (scale_button);
-
-  if (val < (gtk_adjustment_get_lower (adjustment) + EPSILON))
-    {
-      str = g_strdup (_("Muted"));
-    }
-  else if (val >= (gtk_adjustment_get_upper (adjustment) - EPSILON))
-    {
-      str = g_strdup (_("Full Volume"));
-    }
-  else
-    {
-      gint percent;
-
-      percent = (gint) (100. * val / (gtk_adjustment_get_upper (adjustment) - gtk_adjustment_get_lower (adjustment)) + .5);
-
-      str = g_strdup_printf (C_("volume percentage", "%d %%"), percent);
-    }
-
-  gtk_tooltip_set_text (tooltip, str);
-  atk_image_set_image_description (image, str);
-  g_free (str);
-
-  return TRUE;
-}
-
-static void
-on_scale_button_value_changed (GtkScaleButton *button,
-                               gdouble         value,
-                               gpointer        user_data)
-{
-  gtk_widget_trigger_tooltip_query (GTK_WIDGET (button));
-}
-
-static void
-on_record_button_toggled (GtkToggleButton *button,
-                          gpointer         user_data)
-{
-  GtkStyleContext *context;
-
-  context = gtk_widget_get_style_context (GTK_WIDGET (button));
-  if (gtk_toggle_button_get_active (button))
-    gtk_style_context_remove_class (context, "destructive-action");
-  else
-    gtk_style_context_add_class (context, "destructive-action");
-}
-
-static void
-on_page_combo_changed (GtkComboBox *combo,
-                       gpointer     user_data)
-{
-  GtkWidget *from;
-  GtkWidget *to;
-  GtkWidget *print;
-
-  from = GTK_WIDGET (g_object_get_data (G_OBJECT (combo), "range_from_spin"));
-  to = GTK_WIDGET (g_object_get_data (G_OBJECT (combo), "range_to_spin"));
-  print = GTK_WIDGET (g_object_get_data (G_OBJECT (combo), "print_button"));
-
-  switch (gtk_combo_box_get_active (combo))
-    {
-    case 0: /* Range */
-      gtk_widget_set_sensitive (from, TRUE);
-      gtk_widget_set_sensitive (to, TRUE);
-      gtk_widget_set_sensitive (print, TRUE);
-      break;
-    case 1: /* All */
-      gtk_widget_set_sensitive (from, FALSE);
-      gtk_widget_set_sensitive (to, FALSE);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (from), 1);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (to), 99);
-      gtk_widget_set_sensitive (print, TRUE);
-      break;
-    case 2: /* Current */
-      gtk_widget_set_sensitive (from, FALSE);
-      gtk_widget_set_sensitive (to, FALSE);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (from), 7);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (to), 7);
-      gtk_widget_set_sensitive (print, TRUE);
-      break;
-    case 4:
-      gtk_widget_set_sensitive (from, FALSE);
-      gtk_widget_set_sensitive (to, FALSE);
-      gtk_widget_set_sensitive (print, FALSE);
-      break;
-    default:;
-    }
-}
-
-static void
-on_range_from_changed (GtkSpinButton *from)
-{
-  GtkSpinButton *to;
-  gint v1, v2;
-
-  to = GTK_SPIN_BUTTON (g_object_get_data (G_OBJECT (from), "range_to_spin"));
-
-  v1 = gtk_spin_button_get_value_as_int (from);
-  v2 = gtk_spin_button_get_value_as_int (to);
-
-  if (v1 > v2)
-    gtk_spin_button_set_value (to, v1);
-}
-
-static void
-on_range_to_changed (GtkSpinButton *to)
-{
-  GtkSpinButton *from;
-  gint v1, v2;
-
-  from = GTK_SPIN_BUTTON (g_object_get_data (G_OBJECT (to), "range_from_spin"));
-
-  v1 = gtk_spin_button_get_value_as_int (from);
-  v2 = gtk_spin_button_get_value_as_int (to);
-
-  if (v1 > v2)
-    gtk_spin_button_set_value (from, v2);
 }

 static void
@@ -552,24 +415,6 @@ populate_model (GtkTreeStore *store)
  gtk_tree_store_set (store, &iter,
                      0, "Gisele of Aquitaine",
                      -1);
-  gtk_tree_store_append (store, &iter, NULL);
-  gtk_tree_store_set (store, &iter, 3, TRUE, -1);
-  gtk_tree_store_append (store, &iter, NULL);
-  gtk_tree_store_set (store, &iter,
-                      0, "Attila the Hun",
-                      1, "ca. 390",
-                      2, "453",
-                      -1);
-}
-
-static gboolean
-row_separator_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
-{
-  gboolean is_sep;
-
-  gtk_tree_model_get (model, iter, 3, &is_sep, -1);
-
-  return is_sep;
 }

 static void
@@ -601,82 +446,6 @@ update_title_header (GtkListBoxRow *row,
    }
 }

-static void
-overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget)
-{
-  GtkWidget *box, *row, *label, *swatch;
-  GdkRGBA rgba;
-  const gchar *color;
-  gchar *text;
-  GtkWidget *silver;
-  GtkWidget *gold;
-
-  silver = GTK_WIDGET (g_object_get_data (G_OBJECT (widget), "Silver"));
-  gold = GTK_WIDGET (g_object_get_data (G_OBJECT (widget), "Gold"));
-
-  if (pos == GTK_POS_TOP)
-    {
-      if (silver)
-        {
-          gtk_container_remove (GTK_CONTAINER (widget), silver);
-          g_object_set_data (G_OBJECT (widget), "Silver", NULL);
-        }
-      if (gold)
-        {
-          gtk_container_remove (GTK_CONTAINER (widget), gold);
-          g_object_set_data (G_OBJECT (widget), "Gold", NULL);
-        }
-
-#ifdef HAVE_LIBCANBERRA
-      if (silver || gold)
-        ca_gtk_play_for_widget (widget, 0, "event.id", "message", NULL); 
-#endif
-
-      return;
-    }
-
-
-  if (gold)
-    return;
-  else if (silver)
-    color = "Gold";
-  else
-    color = "Silver";
-
-  row = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 20);
-  text = g_strconcat ("<b>", color, "</b>", NULL);
-  label = gtk_label_new (text);
-  g_free (text);
-  g_object_set (label,
-                "use-markup", TRUE,
-                "halign", GTK_ALIGN_START,
-                "valign", GTK_ALIGN_CENTER,
-                "margin", 6,
-                "xalign", 0.0,
-                NULL);
-  gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE, 0);
-  gdk_rgba_parse (&rgba, color);
-  swatch = g_object_new (g_type_from_name ("GtkColorSwatch"),
-                         "rgba", &rgba,
-                         "selectable", FALSE,
-                         "halign", GTK_ALIGN_END,
-                         "valign", GTK_ALIGN_CENTER,
-                         "margin", 6,
-                         "height-request", 24,
-                         NULL);
-  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_container_add (GTK_CONTAINER (box), swatch);
-  gtk_box_pack_start (GTK_BOX (row), box, FALSE, FALSE, 0);
-  gtk_widget_show_all (row);
-  gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1);
-  row = gtk_widget_get_parent (row);
-  gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
-  g_object_set_data (G_OBJECT (widget), color, row);
-#ifdef HAVE_LIBCANBERRA
-  ca_gtk_play_for_widget (widget, 0, "event.id", "complete", NULL); 
-#endif
-}
-
 static void
 populate_colors (GtkWidget *widget)
 {
@@ -724,11 +493,10 @@ populate_colors (GtkWidget *widget)
  };
  gint i;
  GtkWidget *row, *box, *label, *swatch;
-  GtkWidget *sw;
  GdkRGBA rgba;

  gtk_list_box_set_header_func (GTK_LIST_BOX (widget), update_title_header, NULL, NULL);
-
+                             
  for (i = 0; i < G_N_ELEMENTS (colors); i++)
    {
      row = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 20);
@@ -761,9 +529,6 @@ populate_colors (GtkWidget *widget)
    }

  gtk_list_box_invalidate_headers (GTK_LIST_BOX (widget));
-
-  sw = gtk_widget_get_ancestor (widget, GTK_TYPE_SCROLLED_WINDOW);
-  g_signal_connect (sw, "edge-overshot", G_CALLBACK (overshot), widget);
 }

 typedef struct {
@@ -784,7 +549,7 @@ background_loaded_cb (GObject      *source,
  pixbuf = gdk_pixbuf_new_from_stream_finish (res, &error);
  if (error)
    {
-      g_warning ("Error loading '%s': %s", bd->filename, error->message);
+      g_warning ("%s", error->message);
      g_error_free (error);
      return;
    }
@@ -1023,107 +788,6 @@ toggle_selection_mode (GtkSwitch  *sw,
  gtk_list_box_set_activate_on_single_click (listbox, !gtk_switch_get_active (sw));
 }

-static void
-handle_insert (GtkWidget *button, GtkWidget *textview)
-{
-  GtkTextBuffer *buffer;
-  const gchar *id;
-  const gchar *text;
-
-  id = gtk_buildable_get_name (GTK_BUILDABLE (button));
-
-  if (strcmp (id, "toolbutton1") == 0)
-    text = "⌘";
-  else if (strcmp (id, "toolbutton2") == 0)
-    text = "⚽";
-  else if (strcmp (id, "toolbutton3") == 0)
-    text = "⤢";
-  else if (strcmp (id, "toolbutton4") == 0)
-    text = "☆";
-  else
-    text = "";
-
-  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
-  gtk_text_buffer_insert_at_cursor (buffer, text, -1);
-}
-
-static void
-handle_cutcopypaste (GtkWidget *button, GtkWidget *textview)
-{
-  GtkTextBuffer *buffer;
-  GtkClipboard *clipboard;
-  const gchar *id;
-
-  clipboard = gtk_widget_get_clipboard (textview, GDK_SELECTION_CLIPBOARD);
-  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
-  id = gtk_buildable_get_name (GTK_BUILDABLE (button));
-
-  if (strcmp (id, "cutbutton") == 0)
-    gtk_text_buffer_cut_clipboard (buffer, clipboard, TRUE);
-  else if (strcmp (id, "copybutton") == 0)
-    gtk_text_buffer_copy_clipboard (buffer, clipboard);
-  else if (strcmp (id, "pastebutton") == 0)
-    gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, TRUE);
-  else if (strcmp (id, "deletebutton") == 0)
-    gtk_text_buffer_delete_selection (buffer, TRUE, TRUE);
-}
-
-static void
-clipboard_owner_change (GtkClipboard *clipboard, GdkEvent *event, GtkWidget *button)
-{
-  const gchar *id;
-  gboolean has_text;
-
-  id = gtk_buildable_get_name (GTK_BUILDABLE (button));
-  has_text = gtk_clipboard_wait_is_text_available (clipboard);
-
-  if (strcmp (id, "pastebutton") == 0)
-    gtk_widget_set_sensitive (button, has_text);
-}
-
-static void
-textbuffer_notify_selection (GObject *object, GParamSpec *pspec, GtkWidget *button)
-{
-  const gchar *id;
-  gboolean has_selection;
-
-  id = gtk_buildable_get_name (GTK_BUILDABLE (button));
-  has_selection = gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER (object));
-
-  if (strcmp (id, "cutbutton") == 0 ||
-      strcmp (id, "copybutton") == 0 ||
-      strcmp (id, "deletebutton") == 0)
-    gtk_widget_set_sensitive (button, has_selection);
-}
-
-static gboolean
-osd_frame_button_press (GtkWidget *frame, GdkEventButton *event, gpointer data)
-{
-  GtkWidget *osd;
-  gboolean visible;
-
-  osd = g_object_get_data (G_OBJECT (frame), "osd");
-  visible = gtk_widget_get_visible (osd);
-  gtk_widget_set_visible (osd, !visible);
-
-  return GDK_EVENT_STOP;
-}
-
-static gboolean
-page_combo_separator_func (GtkTreeModel *model,
-                           GtkTreeIter  *iter,
-                           gpointer      data)
-{
-  gchar *text;
-  gboolean res;
-
-  gtk_tree_model_get (model, iter, 0, &text, -1);
-  res = g_strcmp0 (text, "-") == 0;
-  g_free (text);
-
-  return res;
-}
-
 static void
 activate (GApplication *app)
 {
@@ -1131,12 +795,9 @@ activate (GApplication *app)
  GtkWindow *window;
  GtkWidget *widget;
  GtkWidget *widget2;
-  GtkWidget *widget3;
-  GtkWidget *widget4;
  GtkWidget *stack;
  GtkWidget *dialog;
  GtkAdjustment *adj;
-  GtkCssProvider *provider;
  static GActionEntry win_entries[] = {
    { "dark", NULL, NULL, "false", change_theme_state },
    { "search", activate_search, NULL, NULL, NULL },
@@ -1156,23 +817,8 @@ activate (GApplication *app)

  g_type_ensure (my_text_view_get_type ());

-  provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_resource (provider, "/org/gtk/WidgetFactory/widget-factory.css");
-  gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
-                                             GTK_STYLE_PROVIDER (provider),
-                                             GTK_STYLE_PROVIDER_PRIORITY_USER);
-  g_object_unref (provider);
-
  builder = gtk_builder_new_from_resource ("/org/gtk/WidgetFactory/widget-factory.ui");
  gtk_builder_add_callback_symbol (builder, "on_entry_icon_release", (GCallback)on_entry_icon_release);
-  gtk_builder_add_callback_symbol (builder, "on_scale_button_value_changed", (GCallback)on_scale_button_value_changed);
-  gtk_builder_add_callback_symbol (builder, "on_scale_button_query_tooltip", (GCallback)on_scale_button_query_tooltip);
-  gtk_builder_add_callback_symbol (builder, "on_record_button_toggled", (GCallback)on_record_button_toggled);
-  gtk_builder_add_callback_symbol (builder, "on_page_combo_changed", (GCallback)on_page_combo_changed);
-  gtk_builder_add_callback_symbol (builder, "on_range_from_changed", (GCallback)on_range_from_changed);
-  gtk_builder_add_callback_symbol (builder, "on_range_to_changed", (GCallback)on_range_to_changed);
-  gtk_builder_add_callback_symbol (builder, "osd_frame_button_press", (GCallback)osd_frame_button_press);
-
  gtk_builder_connect_signals (builder, NULL);

  window = (GtkWindow *)gtk_builder_get_object (builder, "window");
@@ -1274,59 +920,16 @@ activate (GApplication *app)

  widget = (GtkWidget *)gtk_builder_get_object (builder, "charletree");
  populate_model ((GtkTreeStore *)gtk_tree_view_get_model (GTK_TREE_VIEW (widget)));
-  gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (widget), row_separator_func, NULL, NULL);
  gtk_tree_view_expand_all (GTK_TREE_VIEW (widget));

  populate_colors ((GtkWidget *)gtk_builder_get_object (builder, "munsell"));

-  widget = (GtkWidget *)gtk_builder_get_object (builder, "page_combo");
-  gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (widget), page_combo_separator_func, NULL, NULL);
-  widget2 = (GtkWidget *)gtk_builder_get_object (builder, "range_from_spin");
-  widget3 = (GtkWidget *)gtk_builder_get_object (builder, "range_to_spin");
-  widget4 = (GtkWidget *)gtk_builder_get_object (builder, "print_button");
-  g_object_set_data (G_OBJECT (widget), "range_from_spin", widget2);
-  g_object_set_data (G_OBJECT (widget3), "range_from_spin", widget2);
-  g_object_set_data (G_OBJECT (widget), "range_to_spin", widget3);
-  g_object_set_data (G_OBJECT (widget2), "range_to_spin", widget3);
-  g_object_set_data (G_OBJECT (widget), "print_button", widget4);
-
  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "quitmenuitem")));
  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "deletemenuitem")));
  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "searchmenuitem")));
  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "darkmenuitem")));
  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "aboutmenuitem")));

-  widget2 = (GtkWidget *)gtk_builder_get_object (builder, "tooltextview");
-
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "toolbutton1");
-  g_signal_connect (widget, "clicked", G_CALLBACK (handle_insert), widget2);
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "toolbutton2");
-  g_signal_connect (widget, "clicked", G_CALLBACK (handle_insert), widget2);
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "toolbutton3");
-  g_signal_connect (widget, "clicked", G_CALLBACK (handle_insert), widget2);
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "toolbutton4");
-  g_signal_connect (widget, "clicked", G_CALLBACK (handle_insert), widget2);
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "cutbutton");
-  g_signal_connect (widget, "clicked", G_CALLBACK (handle_cutcopypaste), widget2);
-  g_signal_connect (gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget2)), "notify::has-selection",
-                    G_CALLBACK (textbuffer_notify_selection), widget);
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "copybutton");
-  g_signal_connect (widget, "clicked", G_CALLBACK (handle_cutcopypaste), widget2);
-  g_signal_connect (gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget2)), "notify::has-selection",
-                    G_CALLBACK (textbuffer_notify_selection), widget);
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "deletebutton");
-  g_signal_connect (widget, "clicked", G_CALLBACK (handle_cutcopypaste), widget2);
-  g_signal_connect (gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget2)), "notify::has-selection",
-                    G_CALLBACK (textbuffer_notify_selection), widget);
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "pastebutton");
-  g_signal_connect (widget, "clicked", G_CALLBACK (handle_cutcopypaste), widget2);
-  g_signal_connect (gtk_widget_get_clipboard (widget2, GDK_SELECTION_CLIPBOARD), "owner-change",
-                    G_CALLBACK (clipboard_owner_change), widget);
-
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "osd_frame");
-  widget2 = (GtkWidget *)gtk_builder_get_object (builder, "totem_like_osd");
-  g_object_set_data (G_OBJECT (widget), "osd", widget2);
-
  gtk_widget_show_all (GTK_WIDGET (window));

  g_object_unref (builder);
@@ -1336,7 +939,6 @@ int
 main (int argc, char *argv[])
 {
  GtkApplication *app;
-  GAction *action;
  static GActionEntry app_entries[] = {
    { "about", activate_about, NULL, NULL, NULL },
    { "quit", activate_quit, NULL, NULL, NULL },
@@ -1354,8 +956,6 @@ main (int argc, char *argv[])
  g_action_map_add_action_entries (G_ACTION_MAP (app),
                                   app_entries, G_N_ELEMENTS (app_entries),
                                   app);
-  action = g_action_map_lookup_action (G_ACTION_MAP (app), "wine");
-  g_simple_action_set_enabled (G_SIMPLE_ACTION (action), FALSE);

  g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);

@@ -1,9 +0,0 @@
-.circular-button {
-  border-radius: 20px;
-  outline-radius: 20px;
-}
-
-.small-button {
-  padding: 0;
-  outline-width: 0;
-}
@@ -3,9 +3,6 @@
  <gresource prefix="/org/gtk/WidgetFactory">
    <file preprocess="xml-stripblanks">widget-factory.ui</file>
  </gresource>
-  <gresource prefix="/org/gtk/WidgetFactory">
-    <file>widget-factory.css</file>
-  </gresource>
  <gresource prefix="/org/gtk/WidgetFactory/gtk">
    <file preprocess="xml-stripblanks">menus.ui</file>
  </gresource>
@@ -8,6 +8,8 @@ EXTRA_DIST += \
 	developers.txt			\
 	dnd_internals.txt		\
 	focus_tracking.txt		\
+	gtkdocs_fix			\
+	make-todo			\
 	RELEASE-HOWTO			\
 	sizing-test.txt			\
 	styles.txt			\
@@ -49,10 +49,10 @@ Make sure that gtk-doc is the latest released version.
    * forgotten source files
    * new symbols missing from .symbols files
    * symbols that are exported by should be private (static or _-prefixed)
-    * symbols that cause PLT entries. This is either caused by using a function
-      in the same library function without including the header or by using a
-      function from a different library, which is not yet allowed by the filter
-      in pltcheck.sh
+    * symbols that cause PLT entries. This is either caused by using
+      a in the same library function without including the header or by
+      using a function from a different library, which is not yet allowed
+      by the filter in pltcheck.sh

 7) If this is a devel release, make sure that the docs for new symbols
    are in good shape. Look at the -unused.txt files and add stuff found
@@ -0,0 +1,11 @@
+#!/usr/bin/perl
+
+# Stupid script to fix look of html files created with sgml2html...
+
+foreach (@ARGV) {
+    print "Fixing... $_\n";
+    system("mv $_ $_.orig");
+    system("sed -e 's/<BODY>/<BODY BGCOLOR=\"#FFFFFF\">/g' -e 's/<HR>/<HR NOSHADE>/g' $_.orig > $_");
+    unlink("$_.orig");
+}
+
@@ -0,0 +1,350 @@
+#!/usr/bin/python
+
+import xmllib;
+import sys;
+import string
+import re
+
+def html_subst(s):
+    if s.group(1) != None:
+        return s.group(0)
+    elif s.group(2) != None:
+        return '<a href="' + s.group(0) + '">' + s.group(0) + '</a>'
+    elif s.group(3) != None:
+        return '<a href="mailto:' + s.group(0) + '">' + s.group(0) + '</a>'
+        
+def htmlify(str): 
+    return re.sub ("(<[^>]*>)|(http://[~.:/\w-]+)|([\w._!-]+@[\w_-]+).[\w_-]+", html_subst, str)
+
+def bug_subst(s):
+    if s.group(1) != None:
+        return s.group(0)
+    else:
+        n = s.group(2)
+        return '<a href="http://bugs.gnome.org/db/%s/%s.html">#%s</a>' % (n[0:2], n, n)
+
+def bugify(str):
+    str =  re.sub ("(<[^>]*>)|#(\d+)", bug_subst, str)
+    return htmlify(str)
+
+def make_id(str):
+    return re.sub ("[^a-z]","-", string.lower(str))
+
+class ParseError (Exception):
+    pass
+
+class Entry:
+    def __init__(self):
+        self.description = None
+        self.title = None
+        self.url = None
+        self.contact = None
+        self.bugs = None
+
+    def set_size(self, size):
+        size = string.lower(size)
+        if size == "small":
+            self.size = "Small"
+        elif size == "medium":
+            self.size = "Medium"
+        elif size == "big":
+            self.size = "Big"
+        else:
+            raise ParseError, 'size must be "small", "medium", or "big"'
+
+    def output(self):
+        if self.size == "Big":
+            bgcolor = "#88bb88"
+        elif self.size == "Medium":
+            bgcolor = "#b4d4b4"
+        else:
+            bgcolor = "#d0e0d0"
+        
+        print '''<table cellspacing="0" cellpadding="2" width="97%%" border="0" bgcolor="#000000">
+        <tbody><tr><td colspan=2>
+        <table cellspacing="0" cellpadding="5" width="100%%" border="0" bgcolor="#ffffff">
+        <tbody>
+   	  <tr bgcolor="%s">
+	     <td align="left"><font size="+1">%s</font></font></td>
+	     <td align="left" width="20%%"><b>Size</b>: %s</td>
+	     <td align="center" width="20%%"><b>Status</b>: %s</td>
+	     <td align="right" width="20%%"><b>Target Version</b>: %s</td>
+	  </tr>
+	  <tr>
+  	     <td colspan=4>
+             %s
+             <table cellspacing="0" cellpadding="0">
+               <tbody>''' % (bgcolor, self.title, self.size, self.status, self.target, htmlify(self.description))
+
+        if self.url != None:
+            print '''<tr><td width="0"><b>More Info</b>:</td>
+		     <td>%s</td>
+                     </tr>''' % htmlify (self.url)
+
+        if self.bugs != None:
+            print '''<tr><td width="0"><b>Bug Reports</b>:</td>
+		     <td>%s</td>
+                     </tr>''' % bugify (self.bugs)
+
+        if self.contact != None:
+            print '''<tr><td width="0"><b>Contact</b>:</td>
+		     <td>%s</td>
+                     </tr>''' % htmlify (self.contact)
+
+        print '''</tbody>
+             </table>
+	     </td>
+	 </tr>
+	</tbody></table>
+        </td></tr></tbody></table>
+'''
+
+class Section:
+    def __init__(self):
+        self.title = None
+        self.entries = []
+
+    def output(self):
+
+        print '<h2><a name="%s">%s</a></h2>' % (make_id(self.title), self.title)
+        
+        first = 1
+        for entry in self.entries:
+            if not first:
+                print "<br>"
+            first = 0
+            entry.output()
+
+class TodoParser (xmllib.XMLParser):
+    def __init__(self):
+        xmllib.XMLParser.__init__(self)
+        
+        self.in_todo = 0
+        self.in_data = 0
+        self.data = ""
+        self.section = None
+        self.entry = None
+        self.logourl = None
+        self.title = None
+        self.sections = []
+
+        self.entitydefs = {}
+
+    def start_todo(self,attributes):
+        if self.in_todo:
+            raise ParseError, "<todo> tags may not be nested"
+        if attributes.has_key ("logourl"):
+            self.logourl = attributes["logourl"]
+        self.in_todo = 1
+
+    def end_todo(self):
+        self.in_todo = 0
+
+    def start_section(self,attributes):
+        if self.section:
+            raise ParseError, "<section> tags may not be nested"
+        
+        self.section = Section()
+
+    def end_section(self):
+        if self.section.title == None:
+            raise ParseError, "<section> requires <title>"
+            
+        self.sections.append(self.section)
+        self.section = None
+
+    def start_title(self,attributes):
+        if not self.in_todo:
+            raise ParseError, "<title> tag must be in <todo>, <section> or <entry>"
+        if self.in_data:
+            raise ParseError, "Unexpected <title> tag in content"
+        self.in_data = 1
+    
+    def end_title(self):
+        self.in_data = 0
+        if self.entry:
+            self.entry.title = self.data
+        elif self.section:
+            self.section.title = self.data
+        else:
+            self.title = self.data
+        self.data = ""
+            
+    def start_description(self,attributes):
+        if not self.entry:
+            raise ParseError, "<description> tag must be in <entry>"
+        if self.in_data:
+            raise ParseError, "Unexpected <description> tag in content"
+        self.in_data = 1
+    
+    def end_description(self):
+        self.in_data = 0
+        self.entry.description = self.data
+        self.data = ""
+            
+    def start_url(self,attributes):
+        if not self.entry:
+            raise ParseError, "<url> tag must be in <entry>"
+        if self.in_data:
+            raise ParseError, "Unexpected <url> tag in content"
+        self.in_data = 1
+    
+    def end_url(self):
+        self.in_data = 0
+        self.entry.url = self.data
+        self.data = ""
+            
+    def start_contact(self,attributes):
+        if not self.entry:
+            raise ParseError, "<contact> tag must be in <entry>"
+        if self.in_data:
+            raise ParseError, "Unexpected <contact> tag in content"
+        self.in_data = 1
+    
+    def end_contact(self):
+        self.in_data = 0
+        self.entry.contact = self.data
+        self.data = ""
+            
+    def start_bugs(self,attributes):
+        if not self.entry:
+            raise ParseError, "<bugs> tag must be in <bugs>"
+        if self.in_data:
+            raise ParseError, "Unexpected <bugs> tag in content"
+        self.in_data = 1
+    
+    def end_bugs(self):
+        self.in_data = 0
+        self.entry.bugs = self.data
+        self.data = ""
+            
+    def start_entry(self,attributes):
+        if not self.section:
+            raise ParseError, "<entry> tag must be in <section>"
+        if self.entry:
+            raise ParseError, "<entry> tags may not be nested"
+
+        self.entry = Entry()
+
+        if not attributes.has_key("size"):
+            raise ParseError, '"size" attribute required for entry'
+        self.entry.set_size(attributes["size"])
+
+        if not attributes.has_key("status"):
+            raise ParseError, '"status" attribute (completion percentage) required for entry'
+        self.entry.status=attributes["status"]
+
+        if not attributes.has_key("target"):
+            raise ParseError, '"target" attribute (target version) required for entry'
+        self.entry.target=attributes["target"]
+
+    def end_entry(self):
+        if self.entry.title == None:
+            raise ParseError, "<entry> requires <title>"
+            
+        if self.entry.description == None:
+            raise ParseError, "<entry> requires <description>"
+            
+        self.section.entries.append(self.entry)
+        self.entry = None
+
+    def handle_data(self,data):
+        if self.in_data:
+            self.data = self.data + data
+        
+    def unknown_starttag(self,tag,attributes):
+        if not self.in_data:
+            raise ParseError, "Unexpected start tag: " + tag
+        else:
+            self.data = self.data + "<" + tag
+            for (key,val) in attributes.items():
+                self.data = self.data + ' %s="%s"' % (key,val)
+            self.data = self.data + ">"
+
+    def unknown_endtag(self,tag):
+        if not self.in_data:
+            raise ParseError, "Unexpected end tag: " + tag
+        else:
+            self.data = self.data + "</%s>" % tag
+
+    def syntax_error(self, err):
+        if re.match("reference to unknown entity", err):
+            pass
+        else:
+            xmllib.XMLParser.syntax_error (self, err)
+            
+    def unknown_entityref(self,ref):
+        if not self.in_data:
+            raise ParseError, "Unknown entity &" + ref + ";"
+        else:
+            self.data = self.data + "&" + ref + ";"
+
+file = open(sys.argv[1])
+parser = TodoParser()
+
+lineno = 1
+while 1:
+    line = file.readline()
+    if line == "":
+        break
+
+    try:
+        parser.feed(line)
+    except ParseError, err:
+        sys.stderr.write("Parse error at line " + `lineno` + ": " + err.__str__() + "\n")
+        sys.exit(1)
+    except RuntimeError, err:
+        sys.stderr.write(err.__str__() + "\n")
+        sys.exit(1)
+
+    lineno = lineno + 1
+
+parser.close()
+if parser.title == None:
+    sys.stderr.write ("<todo> Document must have a <title>\n")
+    sys.exit (1)
+
+print '''<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<title>%s</title>
+</head>
+<body bgcolor="#ffffff">
+<table width="100%%" cellspacing="0" cellpadding="0" border="0">
+  <tbody>
+    <tr valign="top">
+      <td>
+        <h1>%s</h1>''' % (parser.title, parser.title)
+
+
+for section in parser.sections:
+    ntasks = len(section.entries)
+    id = make_id (section.title)
+    if ntasks == 1:
+        print '<a href="#%s">%s</a> (1 item)<br>' % (id,section.title)
+    else:
+        print '<a href="#%s">%s</a> (%d items)<br>' % (id,section.title,ntasks)
+
+print '''
+      </td>'''
+if parser.logourl != None:
+    print '''      <td align="right">
+       <img src="%s" alt="Logo"></img>
+      </td>''' % parser.logourl
+print '''
+    </tr>
+  </tbody>
+</table>
+''' 
+
+first = 1
+for section in parser.sections:
+    if not first:
+        print "<br><br>"
+    first = 0
+    section.output()
+
+print '''</body>
+</html>'''
+    
+
@@ -0,0 +1,7 @@
+Damon Chaplin <damon@karuna.freeserve.co.uk> and others.
+
+See:
+
+ http://www.gtk.org/rdp/status.html
+
+for a complete list.
@@ -0,0 +1,30 @@
+This work may be reproduced and distributed in whole or in part, in
+any medium, physical or electronic, so as long as this copyright
+notice remains intact and unchanged on all copies.  Commercial
+redistribution is permitted and encouraged, but you may not
+redistribute, in whole or in part, under terms more restrictive than
+those under which you received it. If you redistribute a modified or
+translated version of this work, you must also make the source code to
+the modified or translated version available in electronic form
+without charge.  However, mere aggregation as part of a larger work
+shall not count as a modification for this purpose.
+
+All code examples in this work are placed into the public domain,
+and may be used, modified and redistributed without restriction.
+
+BECAUSE THIS WORK IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE WORK, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE WORK "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  SHOULD THE WORK PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY REPAIR OR CORRECTION.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE WORK AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+WORK, EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGES.
@@ -0,0 +1,62 @@
+This package contains the reference documentation
+for GTK+. For more information about GTK+
+see:
+
+ http://www.gtk.org
+
+For information about contributing to the
+GLib/GTK+ reference documentation project, see:
+
+ http://www.gtk.org/rdp/
+
+The GTK+ reference documentation is freely redistributable,
+see the file COPYING for details.
+
+
+REQUIREMENTS
+============
+
+To build the documentation, you must have the gtk-doc
+package installed. To rebuild the template files,
+you must have the current version of the GTK+
+header files installed.
+
+
+BUILD
+=====
+
+First, run configure to generate the makefiles for this
+module. There is one option specific to this package
+
+  --with-html-dir=DIR   top of installed HTML documentation tree
+
+
+The Makefiles in the gdk/ and gtk/ subdirs each define three targets:
+
+ templates:
+  
+  Scan the headers and merge the results with the current 
+  template files
+
+ sgml:
+
+  Generate SGML files using the DocBook DTD from
+  the template files
+
+ html:
+
+  Generate HTML from the SGML files.
+
+To build the documentation, do:
+
+ make sgml
+ make html
+
+You should only run the 'make templates' step if you
+need to regenerate the templates for a more recent
+version of the GTK+ sources.
+
+INSTALLATION
+============
+
+ make install
@@ -0,0 +1,39 @@
+Before making any changes to this module, please
+contact:
+
+  Damon Chaplin <damon@karuna.freeserve.co.uk>
+
+This will ensure that duplicate work does not occur,
+and also make sure we know who has written what
+parts of the documentation. See 
+
+ http://www.gtk.org/rdp/
+
+for more information.
+
+By contributing work to the Reference Documentation
+Project, you agree that it will be covered under the
+license terms described in the file COPYING
+included in this directory.
+
+
+Other notes:
+
+- Do not run 'make templates' unless you have
+  the latest cvs version of the gtk-1-2
+  branch of GTK+ and the latest CVS version
+  of gtk-doc.
+
+  (This is very important. Otherwise, the template
+  files may be come corrupted.)
+
+  Make sure that gtk-config --prefix points
+  to the correct version of GTK+.
+
+- As always, ChangeLog entries should be made for
+  each commit. These can be really brief
+  "documented GHashTable"; but if you are editing
+  something someone else wrote, please be specific.
+  (Or better, send the changes to them for their
+  approval, first)
+
@@ -28,7 +28,6 @@ IGNORE_HFILES= 			\
 	gdkprivate.h		\
 	gdk*private.h		\
 	keyname-table.h		\
-	wayland/xdg-shell-client-protocol.h \
 	win32			\
 	x11			\
 	quartz
@@ -136,13 +135,12 @@ HTML_IMAGES = 				\
 	images/watch.png		\
 	images/xterm.png

-if ENABLE_DOC_CROSS_REFERENCES
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS= \
 	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
 	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
 	--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
-endif
+

 include $(top_srcdir)/gtk-doc.make

@@ -32,7 +32,6 @@
    <xi:include href="xml/windows.xml" />
    <xi:include href="xml/gdkframeclock.xml" />
    <xi:include href="xml/gdkframetimings.xml" />
-    <xi:include href="xml/gdkglcontext.xml" />
    <xi:include href="xml/events.xml" />
    <xi:include href="xml/event_structs.xml" />
    <xi:include href="xml/keys.xml" />
@@ -93,10 +92,6 @@
    <title>Index of new symbols in 3.14</title>
    <xi:include href="xml/api-index-3.14.xml"><xi:fallback /></xi:include>
  </index>
-  <index id="api-index-3-16" role="3.16">
-    <title>Index of new symbols in 3.16</title>
-    <xi:include href="xml/api-index-3.16.xml"><xi:fallback /></xi:include>
-  </index>

  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>

@@ -394,8 +394,6 @@ gdk_window_constrain_size
 gdk_window_beep
 gdk_window_get_scale_factor
 gdk_window_set_opaque_region
-gdk_window_create_gl_context
-gdk_window_mark_paint_from_clip

 <SUBSECTION>
 gdk_window_get_clip_region
@@ -619,7 +617,6 @@ gdk_cairo_rectangle
 gdk_cairo_region
 gdk_cairo_region_create_from_surface
 gdk_cairo_surface_create_from_pixbuf
-gdk_cairo_draw_from_gl
 </SECTION>

 <SECTION>
@@ -713,8 +710,6 @@ GdkGrabOwnership

 <SUBSECTION>
 gdk_device_get_name
-gdk_device_get_vendor_id
-gdk_device_get_product_id
 gdk_device_get_source
 gdk_device_set_mode
 gdk_device_get_mode
@@ -1009,7 +1004,6 @@ gdk_x11_display_error_trap_pop
 gdk_x11_display_error_trap_pop_ignored
 gdk_x11_display_set_cursor_theme
 gdk_x11_display_set_window_scale
-gdk_x11_display_get_glx_version
 gdk_x11_register_standard_event_type
 gdk_x11_screen_get_screen_number
 gdk_x11_screen_get_xscreen
@@ -1129,11 +1123,6 @@ GDK_X11_KEYMAP_CLASS
 GDK_IS_X11_KEYMAP
 GDK_IS_X11_KEYMAP_CLASS
 GDK_X11_KEYMAP_GET_CLASS
-GDK_TYPE_X11_GL_CONTEXT
-GDK_X11_GL_CONTEXT
-GDK_X11_GL_CONTEXT_CLASS
-GDK_IS_X11_GL_CONTEXT
-GDK_IS_X11_GL_CONTEXT_CLASS
 GDK_TYPE_X11_SCREEN
 GDK_X11_SCREEN
 GDK_X11_SCREEN_CLASS
@@ -1284,40 +1273,3 @@ gdk_frame_timings_get_predicted_presentation_time
 <SUBSECTION Private>
 gdk_frame_get_type
 </SECTION>
-
-<SECTION>
-<FILE>gdkglcontext</FILE>
-GdkGLContext
-gdk_gl_context_get_display
-gdk_gl_context_get_window
-gdk_gl_context_get_shared_context
-gdk_gl_context_get_version
-
-<SUBSECTION>
-gdk_gl_context_set_required_version
-gdk_gl_context_get_required_version
-gdk_gl_context_set_debug_enabled
-gdk_gl_context_get_debug_enabled
-gdk_gl_context_set_forward_compatible
-gdk_gl_context_get_forward_compatible
-
-<SUBSECTION>
-GdkGLError
-gdk_gl_context_realize
-gdk_gl_context_make_current
-gdk_gl_context_get_current
-gdk_gl_context_clear_current
-
-<SUBSECTION Standard>
-GDK_GL_CONTEXT
-GDK_IS_GL_CONTEXT
-GDK_TYPE_GL_CONTEXT
-GDK_GL_CONTEXT_CLASS
-GDK_GL_CONTEXT_GET_CLASS
-GDK_IS_GL_CONTEXT_CLASS
-gdk_gl_context_get_type
-gdk_gl_error_quark
-GDK_GL_ERROR
-GDK_TYPE_GL_ERROR
-GDK_TYPE_GL_PROFILE
-</SECTION>
@@ -8,7 +8,6 @@ gdk_display_get_type
 gdk_display_manager_get_type
 gdk_drag_context_get_type
 gdk_frame_clock_get_type
-gdk_gl_context_get_type
 gdk_keymap_get_type
 gdk_screen_get_type
 gdk_visual_get_type
@@ -19,217 +19,84 @@ HFILE_GLOB=$(top_srcdir)/gtk/*.h
 CFILE_GLOB=$(top_srcdir)/gtk/*.c

 # Header files to ignore when scanning
-IGNORE_HFILES = \
-	inspector			\
-	a11y				\
-	gtkaccelgroupprivate.h		\
-	gtkaccelmapprivate.h		\
-	gtkadjustmentprivate.h		\
-	gtkallocatedbitmaskprivate.h	\
-	gtkappchooserprivate.h		\
-	gtkapplicationprivate.h		\
-	gtkbindingsprivate.h		\
-	gtkbitmaskprivate.h		\
-	gtkboxprivate.h		        \
-	gtkbuilderprivate.h		\
-	gtkbuttonprivate.h		\
-	gtkcairoblurprivate.h		\
-	gtkcellareaboxcontextprivate.h	\
-	gtkclipboardprivate.h		\
-	gtkcolorchooserprivate.h	\
-	gtkcoloreditorprivate.h		\
-	gtkcolorplaneprivate.h		\
-	gtkcolorscaleprivate.h		\
-	gtkcolorswatchprivate.h		\
-	gtkcomboboxprivate.h		\
-	gtkcontainerprivate.h		\
-	gtkcssanimatedstyleprivate.h	\
-	gtkcssanimationprivate.h	\
-	gtkcssarrayvalueprivate.h	\
-	gtkcssbgsizevalueprivate.h	\
-	gtkcssbordervalueprivate.h	\
-	gtkcsscolorvalueprivate.h	\
-	gtkcsscornervalueprivate.h	\
-	gtkcsscustompropertyprivate.h	\
-	gtkcsseasevalueprivate.h	\
-	gtkcssenginevalueprivate.h	\
-	gtkcssenumvalueprivate.h	\
-	gtkcssiconthemevalueprivate.h	\
-	gtkcssimagebuiltinprivate.h	\
-	gtkcssimagecrossfadeprivate.h	\
-	gtkcssimagegradientprivate.h	\
-	gtkcssimageiconthemeprivate.h	\
-	gtkcssimagelinearprivate.h	\
-	gtkcssimageprivate.h		\
-	gtkcssimagescaledprivate.h	\
-	gtkcssimagesurfaceprivate.h	\
-	gtkcssimageurlprivate.h		\
-	gtkcssimagevalueprivate.h	\
-	gtkcssimagewin32private.h	\
-	gtkcssinheritvalueprivate.h	\
-	gtkcssinitialvalueprivate.h	\
-	gtkcsskeyframesprivate.h	\
-	gtkcsslookupprivate.h		\
-	gtkcssmatcherprivate.h		\
-	gtkcssnodedeclarationprivate.h	\
-	gtkcssnumbervalueprivate.h	\
-	gtkcssparserprivate.h		\
-	gtkcsspositionvalueprivate.h	\
-	gtkcssproviderprivate.h		\
-	gtkcssrepeatvalueprivate.h	\
-	gtkcssrgbavalueprivate.h	\
-	gtkcsssectionprivate.h		\
-	gtkcssselectorprivate.h		\
-	gtkcssshadowsvalueprivate.h	\
-	gtkcssshadowvalueprivate.h	\
-	gtkcssshorthandpropertyprivate.h\
-	gtkcssstaticstyleprivate.h	\
-	gtkcssstringvalueprivate.h	\
-	gtkcssstylefuncsprivate.h	\
-	gtkcssstyleprivate.h		\
-	gtkcssstylepropertyprivate.h	\
-	gtkcsstransformvalueprivate.h	\
-	gtkcsstransitionprivate.h	\
-	gtkcsstypedvalueprivate.h	\
-	gtkcsstypesprivate.h		\
-	gtkcssunsetvalueprivate.h	\
-	gtkcssvalueprivate.h		\
-	gtkdialogprivate.h		\
-	gtkentryprivate.h		\
-	gtkeventcontrollerprivate.h	\
-	gtkfilechooserprivate.h		\
-	gtkfontchooserprivate.h		\
-	gtkgesturedragprivate.h		\
-	gtkgesturelongpressprivate.h	\
-	gtkgesturemultipressprivate.h	\
-	gtkgesturepanprivate.h		\
-	gtkgestureprivate.h		\
-	gtkgesturerotateprivate.h	\
-	gtkgesturesingleprivate.h	\
-	gtkgestureswipeprivate.h	\
-	gtkgesturezoomprivate.h		\
-	gtkheaderbarprivate.h		\
-	gtkhslaprivate.h		\
-	gtkiconhelperprivate.h		\
-	gtkiconviewprivate.h		\
-	gtkimageprivate.h		\
-	gtkimmoduleprivate.h		\
-	gtklabelprivate.h		\
-	gtklockbuttonprivate.h		\
-	gtkmagnifierprivate.h		\
-	gtkmenubuttonprivate.h		\
-	gtkmenuitemprivate.h		\
-	gtkmenuprivate.h		\
-	gtkmenushellprivate.h		\
-	gtkmodulesprivate.h		\
-	gtkmountoperationprivate.h	\
-	gtkorientableprivate.h		\
-	gtkpixelcacheprivate.h		\
-	gtkpopoverprivate.h		\
-	gtkprinter-private.h		\
-	gtkprintoperation-private.h	\
-	gtkprivate.h		        \
-	gtkrangeprivate.h		\
-	gtkrecentchooserprivate.h	\
-	gtkrenderbackgroundprivate.h	\
-	gtkrenderborderprivate.h	\
-	gtkrendericonprivate.h		\
-	gtkrenderprivate.h		\
-	gtkroundedboxprivate.h		\
-	gtkscaleprivate.h		\
-	gtksearchentryprivate.h		\
-	gtkselectionprivate.h		\
-	gtksettingsprivate.h		\
-	gtksizegroup-private.h		\
-	gtksizerequestcacheprivate.h	\
-	gtksocketprivate.h		\
-	gtkstyleanimationprivate.h	\
-	gtkstylecascadeprivate.h	\
-	gtkstylecontextprivate.h	\
-	gtkstylepropertyprivate.h	\
-	gtkstyleproviderprivate.h	\
-	gtktextchildprivate.h		\
-	gtktexthandleprivate.h		\
-	gtktextiterprivate.h		\
-	gtktextmarkprivate.h		\
-	gtktexttagprivate.h		\
-	gtktogglebuttonprivate.h	\
-	gtktoolbarprivate.h		\
-	gtktoolpaletteprivate.h		\
-	gtktooltipprivate.h		\
-	gtktreeprivate.h		\
-	gtkwidgetprivate.h		\
-	gtkwin32themeprivate.h		\
-	gtkwindowprivate.h		\
+IGNORE_HFILES=				\
 	fnmatch.h			\
 	gtkactionmuxer.h		\
 	gtkactionobserver.h		\
 	gtkactionobservable.h		\
 	gtk9slice.h			\
 	gtkanimationdescription.h	\
-	gtkbitmaskprivateimpl.h		\
-	gtkbookmarksmanager.h		\
-	gtkdbusgenerated.c		\
-	gtkdbusgenerated.h		\
 	gtkdebug.h			\
 	gtkactionhelper.h		\
+	gtkapplicationprivate.h		\
+	gtkbuilderprivate.h		\
+	gtkcolorchooserprivate.h	\
+	gtkcoloreditorprivate.h		\
+	gtkcolorplaneprivate.h		\
+	gtkcolorscaleprivate.h		\
+	gtkcolorswatchprivate.h		\
 	gtkdndcursors.h			\
+	gtkentryprivate.h		\
 	gtkfilechooserdefault.h		\
 	gtkfilechooserembed.h		\
 	gtkfilechooserentry.h		\
+	gtkfilechooserprivate.h		\
 	gtkfilechoosersettings.h	\
 	gtkfilechooserutils.h		\
 	gtkfilesystem.h			\
 	gtkfilesystemmodel.h		\
 	gtkfilesystemunix.h		\
 	gtkfilesystemwin32.h		\
-	gtkfontchooserutils.h		\
 	gtkiconcache.h			\
        gtkiconcachevalidator.h         \
 	gtkiconthemeparser.h		\
 	gtkintl.h			\
 	gtkkeyhash.h			\
-	gtkkineticscrolling.h		\
 	gtkmarshal.h			\
+	gtkmenuprivate.h		\
 	gtkmnemonichash.h		\
-	gtkmenutracker.h		\
-	gtkmenutrackeritem.h		\
-	gtkmenusectionbox.h		\
 	gtkmodelmenu.h			\
 	gtkmodelmenuitem.h		\
-	gtkmodifierstyle.h		\
 	gtkpathbar.h			\
+	gtkplugprivate.h		\
 	gtkprintbackend.h		\
 	gtkprinteroption.h		\
 	gtkprinteroptionset.h		\
 	gtkprinteroptionwidget.h	\
+	gtkprinter-private.h		\
 	gtkprint-win32.h		\
 	gtkprintutils.h			\
+	gtkprintoperation-private.h	\
 	gtkprivate.h			\
-	gtkprivatetypebuiltins.h	\
 	gtkquery.h			\
 	gtkrbtree.h			\
 	gtkrecentchooserdefault.h	\
 	gtkrecentchooserutils.h		\
+	gtkrecentchooserprivate.h	\
 	gtksearchengine.h		\
+	gtksearchenginebeagle.h		\
 	gtksearchenginetracker.h	\
 	gtksearchenginesimple.h		\
 	gtksearchenginequartz.h		\
 	gtksequence.h			\
 	gtksocketprivate.h		\
 	gtktextbtree.h			\
-	gtktextbufferserialize.h	\
+	gtktextbufferserializ.h		\
+	gtktextchildprivate.h		\
 	gtktextdisplay.h		\
+	gtktextiterprivate.h		\
 	gtktextlayout.h			\
+	gtktextmarkprivate.h		\
 	gtktextsegment.h		\
+	gtktexttagprivate.h		\
 	gtktexttypes.h			\
 	gtktextutil.h			\
 	gtktimeline.h			\
 	gtkthemes.h			\
-	gtktrashmonitor.h		\
 	gtktrayicon.h			\
 	gtktreedatalist.h		\
-	gtktreemenu.h			\
+	gtktreeprivate.h		\
+	gtktoolpaletteprivate.h		\
 	gtktypebuiltins.h		\
 	gtkxembed.h			\
 	gtkwin32embed.h			\
@@ -278,7 +145,6 @@ content_files =					\
 	osx.sgml				\
 	broadway.xml				\
 	wayland.xml				\
-	mir.xml					\
 	question_index.sgml			\
 	resources.sgml				\
 	text_widget.sgml			\
@@ -286,7 +152,6 @@ content_files =					\
 	windows.sgml				\
 	x11.sgml				\
 	gtk3-demo.xml				\
-	gtk3-demo-application.xml		\
 	gtk3-widget-factory.xml			\
 	gtk3-icon-browser.xml			\
 	gtk-query-immodules-3.0.xml		\
@@ -304,7 +169,6 @@ expand_content_files = 				\
 	drawing-model.xml			\
 	getting_started.xml			\
 	glossary.xml				\
-	input-handling.xml			\
 	migrating-2to3.xml			\
 	migrating-checklist.sgml		\
 	migrating-unique-GtkApplication.xml	\
@@ -340,7 +204,6 @@ HTML_IMAGES = \
 	$(srcdir)/images/font-button.png				\
 	$(srcdir)/images/fontchooser.png				\
 	$(srcdir)/images/frame.png					\
-	$(srcdir)/images/glarea.png					\
 	$(srcdir)/images/headerbar.png					\
 	$(srcdir)/images/icon-view.png					\
 	$(srcdir)/images/image.png					\
@@ -372,7 +235,6 @@ HTML_IMAGES = \
 	$(srcdir)/images/search-bar.png					\
 	$(srcdir)/images/search-entry.png				\
 	$(srcdir)/images/separator.png					\
-	$(srcdir)/images/sidebar.png					\
 	$(srcdir)/images/spinbutton.png					\
 	$(srcdir)/images/spinner.png					\
 	$(srcdir)/images/stack.png					\
@@ -453,7 +315,6 @@ HTML_IMAGES = \
 	$(srcdir)/images/flow-box.png					\
 	$(srcdir)/images/inspector.png

-if ENABLE_DOC_CROSS_REFERENCES
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=../gdk/html \
 	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
@@ -462,7 +323,6 @@ FIXXREF_OPTIONS=--extra-dir=../gdk/html \
 	--extra-dir=$(ATK_PREFIX)/share/gtk-doc/html/atk \
 	--extra-dir=$(PANGO_PREFIX)/share/gtk-doc/html/pango \
 	--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
-endif

 include $(top_srcdir)/gtk-doc.make

@@ -477,7 +337,6 @@ man_MANS = 				\
 	gtk-encode-symbolic-svg.1	\
 	gtk-launch.1			\
 	gtk3-demo.1			\
-	gtk3-demo-application.1		\
 	gtk3-widget-factory.1		\
 	gtk3-icon-browser.1		\
 	broadwayd.1
@@ -202,7 +202,7 @@ How to compile GTK+ itself
      </listitem>
      <listitem>
        <para>
-          <ulink url="https://wiki.gnome.org/Projects/GObjectIntrospection">Gobject Introspection</ulink>
+          <ulink url="http://live.gnome.org/GObjectIntrospection">Gobject Introspection</ulink>
          is a framework for making introspection data available to
          language bindings. It is available
          <ulink url="http://download.gnome.org/sources/gobject-introspection/">here</ulink>.
@@ -254,19 +254,6 @@ How to compile GTK+ itself
          drawing.
        </para>
      </listitem>
-      <listitem>
-        <para>
-          <ulink url="https://github.com/anholt/libepoxy">libepoxy</ulink>
-          is a library that abstracts the differences between different
-          OpenGL libraries. GTK+ uses it for cross-platform GL support.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          The <ulink url="http://wayland.freedesktop.org">Wayland</ulink> libraries
-          are needed to build GTK+ with the Wayland backend.
-        </para>
-      </listitem>
      <listitem>
        <para>
          The <ulink url="http://www.freedesktop.org/wiki/Software/shared-mime-info">shared-mime-info</ulink>
@@ -408,12 +395,12 @@ How to compile GTK+ itself
          </group>
          <sbr/>
          <group>
-            <arg choice="plain">--enable-mir-backend</arg>
-            <arg choice="plain">--disable-mir-backend</arg>
+            <arg choice="plain">--enable-introspection=[no/auto/yes]</arg>
          </group>
          <sbr/>
          <group>
-            <arg choice="plain">--enable-introspection=[no/auto/yes]</arg>
+            <arg choice="plain">--enable-gtk2-dependency</arg>
+            <arg choice="plain">--disable-gtk2-dependency</arg>
          </group>
          <sbr/>
          <group>
@@ -608,10 +595,8 @@ How to compile GTK+ itself
          <systemitem>--disable-quartz-backend</systemitem>,
          <systemitem>--enable-broadway-backend</systemitem>,
          <systemitem>--disable-broadway-backend</systemitem>,
-          <systemitem>--enable-wayland-backend</systemitem>,
-          <systemitem>--disable-wayland-backend</systemitem>
-          <systemitem>--enable-mir-backend</systemitem>, and
-          <systemitem>--disable-mir-backend</systemitem></title>
+          <systemitem>--enable-wayland-backend</systemitem>, and
+          <systemitem>--disable-wayland-backend</systemitem></title>

        <para>
          Enables specific backends for GDK.  If none of these options
@@ -632,6 +617,19 @@ How to compile GTK+ itself
        </para>
      </formalpara>

+      <formalpara>
+        <title><systemitem>--enable-gtk2-dependency</systemitem> or
+           <systemitem>--disable-gtk2-dependency</systemitem></title>
+
+        <para>
+          Whether to rely on an exiting gtk-update-icon-cache utility
+          instead of building our own. Distributions which are shipping
+          both GTK+ 2.x and GTK+ 3 may want to use this option to
+          avoid file conflicts between these packages.
+          The default is to build gtk-update-icon-cache.
+        </para>
+      </formalpara>
+
      <formalpara>
        <title><systemitem>--enable-installed-tests</systemitem> or
           <systemitem>--disable-installed-tests</systemitem></title>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jasper St. Pierre	ff58cd44cb	xxx clip	2014-09-03 13:02:48 -07:00
Jasper St. Pierre	05d4e37a40	cssshadowvalue: Convert the current point into a translate Pango uses the current point to determine where to paint the text, which is considerably inconvenient since it doesn't work well with translations. To make this simpler for us, turn the current point into a translation, which lets us merge the three different pieces of context setup into just one.	2014-09-03 13:02:47 -07:00
Jasper St. Pierre	6fb2699ac4	cssshadowvalue: Add a cache for blurred Pango layouts Drawing text with Pango is quite expensive, and drawing text and also blurring it is really expensive. To prevent us from drawing a lot of text and then blurring it a lot is really expensive. We now cache the blurred pixels for the last layout and shadow we made, which means we can repeatedly draw labels with a blurred text-shadow extremely fast. To detect whether the shadow is up-to-date, we track the serial of the PangoLayout alongside the radius of the box shadow. We don't support inset shadows nor spread on text-shadow, so we don't need to track these.	2014-09-03 13:02:47 -07:00
Jasper St. Pierre	1f60b915d7	cssshadowvalue: Move the check for blurring into its own function This makes it easier to update the check later.	2014-09-03 13:02:47 -07:00
Jasper St. Pierre	6a505da304	cssshadowvalue: Rename shadow_key to original_cr_key shadow_key is a poor name for this, and we're going to add more user data keys, so rename it to something more indicative of what it's used for.	2014-09-03 13:02:47 -07:00
Jasper St. Pierre	bdd100ed01	cssshadowvalue: Remove the move_to in paint_layout _gtk_css_shadow_value_paint_layout is always called from gtk_theming_engine_render_layout, which always moves the current point on the context.	2014-09-03 13:02:47 -07:00