option list: Underline matches

When using search in an option list, show matches in the list. This commit is just a proof-of-concept, it needs more work to be utf8-safe.
Fix annotations
2015-02-10 06:57:48 -05:00 · 2015-02-08 21:02:57 +01:00 · 2015-02-08 21:02:57 +01:00 · 2015-01-07 00:22:58 -05:00 · 2015-01-07 00:15:37 -05:00 · 2015-01-07 00:14:53 -05:00
902 changed files with 164232 additions and 205904 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.
@@ -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}
@@ -21,8 +21,7 @@ EXTRA_DIST +=			\
 	gtk-zip.sh.in		\
 	sanitize-la.sh		\
 	po/README.translators	\
-	po/po2tbl.sed.in	\
-	make-pot
+	po/po2tbl.sed.in

 MAINTAINERCLEANFILES = \
 	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
@@ -1,658 +1,3 @@
-Overview of Changes in GTK+ 3.17.2
-==================================
-
-* GtkFontChooser:
- - Allow custom font maps, to support application-specific fonts
- - Improve the 'no search results' page
-
-* GtkFileChooser:
- - Change simple search engine to search breadth-first
- - Make the simple search engine use GIO, so it works on
-   remote shares too
- - Merge results from the tracker and simple search engines
- - Add a 'no search results' page
-
-* GtkPlacesSidebar:
- - Use a popover for renaming bookmarks
-
-* GtkPopover:
- - Add support for default widgets
-
-* GtkScrolledWindow:
- - Support kinetic scrolling on touchpads
-
-* GtkBuilder:
- - Improve error reporting
- - gtk-builder-tool can validate templates
- - gtk-builder-tool can enumerate named objects
-
-* gtk3-demo:
- - New cursors demo
- - New page setup demo
- - Builder demo ported away from GtkUIManager
-
-* GDK:
- - Make css cursor names work across backends
-
-* Windows:
- - Require Vista or newer
- - Support RGBA windows
- - Support css cursor names
- - Support animated cursors
- - Add cursor theme support. To take advantage of this, you will need
-   a new adwaita-icon-theme with Windows cursors.
-
-* Wayland:
- - Remove assumptions on ordering of globals in startup
- - Improve DND support in various places
- - Support css cursor names
-
-* X11:
- - Support XRANDR 1.5 monitor objects
- - Support css cursor names
-
-* OS X:
- - Support css cursor names
-
-* Bugs fixed:
- 619493 Mark two functions from GtkAdjustment's public API deprecated
- 693738 gtk print dialog shows "Getting printer information failed"...
- 719683 Escaping issue "Failed to set text from markup due to error...
- 719819 Wayland backend depends on ordering of globals in the displ...
- 727316 W32: GDK does not support per-pixel alpha-blended windows
- 744086 configure.ac: Pull gio-unix dependency for all unix builds
- 746916 File chooser search does not work over remote network shares
- 747150 hint for vertical writing mode to input method
- 747634 gdk_set_program_class() breaks --class
- 747664 GtkEntry:activates-default should work inside of popovers
- 748234 Useless "Gtk-WARNING **: No object called:" warning message...
- 748615 GtkWindow: Get the correct shadow width even before window ...
- 748640 Documentation misses out example source files when not buil...
- 748771 Add API to attach custom PangoFontMap to a font dialog inst...
- 748782 fontchooser should reload list of families/styles on theme ...
- 748783 Remove PANGO_ENABLE_BACKEND from gtksettings.c
- 748784 GtkProgressBar text cannot be superimposed on the progress bar
- 748833 Define GdkRectangle structure just for introspection parsing
- 749009 notify test fails without a session bus
- 749012 GtkStack: Don't emit notify::visible-child during destruction
- 749021 GtkStackSwitcher: Don't emit notify::visible-child when set...
- 749178 quartz: Support css cursor names
- 749425 Memory leak in GtkWindow
- 749451 Windows have no border
- 749593 Miscellaneous test fixes
- 749679 Avoid device position queries during DnD
- 749770 Implement kinetic scrolling for libinput-managed devices
- 748763 warnings when starting drag from GtkEntries
- 749893 Crash when trying to drag a tab from a populated GtkNotebook...
-
-* Translation updates:
- Catalan
- Czech
- French
- German
- Hebrew
- Hungarian
- Norwegian bokmål
- Occitan
- Polish
- Russian
- Slovak
-
-
-Overview of Changes in GTK+ 3.17.1
-==================================
-
-* Themes:
- - Many HighContrast theme improvements
- - Stronger entry focus in Adwaita
- - Improve client-side decorations without a compositor
-
-* Scrolling:
- - Support horizontal wheel scrolling with Shift
- - Make indicators pop up reliably
- - Detect more trackpoints
- - Handle pens, erasers and similar devices
-
-* GtkTextView:
- - Support underline and strikethrough color
-
-* GtkFileChooser:
- - Open location entry more easily
- - Ensure a directory is loaded
- - Use a popover for new folder names
-
-* GtkBuilder:
- - Improve error messages
- - Add a gtk-builder-tool utility for ui file validation
-
-* Inspector:
- - Show accessible name and description
- - Add a tab for CSS nodes
-
-* Wayland:
- - DND and clipboard fixes
- - Support attached modal dialogs with mutter
-
-* Windows:
- - Drop XP support
- - Support horizontal mouse wheel scrolling
-
-* Bugs fixed:
- 132197 Horizontal Scrolling Using Modifier Key and Scroll Wheel
- 402168 Add underline-color and strikethrough-color to GtkTextTag properties
- 671362 Fixes for GtkRadioMenuItem
- 723394 const parameter to GtkPopover gtk_popover_set_pointing_to
- 734741 GtkScale's fill-level starts at the very left if show-fill-level is set
- 737175 most horizontal sliders are inverted when scrolled with mouse wheel
- 741849 Add GdkScreen->is_composited() for GDK-Win32
- 745721 wayland: Add support for gtk_window_set_modal
- 746149 “Close tab” buttons change the tab high on hover when using HighContrast
- 746188 [HighContrast] insensitive ModelButtons are not drawn insensitive
- 746202 Provide a stronger focus indication for entries
- 746301 Opening "Sound" panel generates pixman error
- 746358 [HighContrast] insensitive active backdrop GtkSwitches should probably...
- 746368 [HighContrast] the “selected color” mark is always black, even for black
- 746369 [HighContrast] “no date selection” (white on white)
- 746370 GtkExpander doesn't show it is expanded when using HighContrast theme
- 746386 clipboard crash when other client becomes the selection owner
- 746435 wayland: Use g_get_prgname as the xdg surface application id
- 746468 gtkcairoblur is slow
- 746493 [HighContrast] Labels’, RadioButtons’ and CheckButton’s texts are not...
- 746586 crtical warnings in a11y if focus widget is destroyed
- 746602 Invalid writes through dangling weak pointers in DND code cause crashes
- 746668 Some legacy GL calls are still made by X11 backend
- 746688 GtkProgressBar doesn't respect its style properties
- 746706 Serious accessible event spewage from Gtk+ table cells
- 746712 Range ignores the "inverted" property
- 746746 gtk3-demo 'OpenGL Area' crashes on systems with old OpenGL version
- 746784 GtkBooleanCellAccessible emits state-changed:checked signals instead...
- 746817 GtkRadioButton keynav uses wrong succession
- 746821 W32: Maximized window is obscured by the taskbar
- 746862 popover clears shadow of underlying widgets
- 746893 gtk_list_box_bind_model is not introspectable
- 746904 make it possible to disable libcanberra
- 746925 [HighContrast] Backdrop active (sensitive) GtkSwitch should look more...
- 746961 new scroll bar "hides" after click+drag+release while mouse is still...
- 747096 small cleanup in textbuffer clipoard handling
- 747121 gtklabel.c: add note about set-markup property in gtk_set_markup()
- 747133 overshoot animation is stopped on libinput-managed touchpads
- 747288 [HighContrast] Insensitive backdrop ListBoxRow have an unnecessary border
- 747305 x11/gl: Use after free in glx_pixmap_get()
- 747406 Fix indicator proximity checks
- 747407 Make indicators pop out when needed
- 747469 CSD: can't open window menu using right click after moving window
- 747471 [wayland] gdk_screen_get_monitor_geometry() returns invalid geometry
- 747524 System tray icons fail to redraw correctly on Xfce (without display...
- 747539 popover: Remove signal handlers in dispose
- 747553 Popovers inside local plugs don't get size_allocate() called
- 747560 Redefinition of typedef GtkCssNode
- 747604 Fix build of gtk/inspector/css-node-tree.c
- 747608 Scrollbar hiding / unhiding does not work with a stylus
- 747689 [HighContrast] Selected ListBoxRow’s Label is white on white
- 747805 Split Headerbar unmaximize
- 747808 window: fix initial shadow width for maximized/fullscreen windows
- 747827 firefox scrollbars broken
- 748013 Adwaita: keyboard navigation outline on first/last button in dialog...
- 748014 W32: Tilting mousewheel left/right does not scroll horizontally
- 748061 GtkMessageDialog: Minor documentation update
- 748156 Code cleanup after xp drop
- 748341 GdkOffscreenWindow should not segfault on gdk_window_beep()
- 748346 build: Avoid xgettext crash on MSYS2
- 748500 GtkSearchEntry docs incorrectly link to themselves
- 748509 FTBFS: ui/dialog6.ui is not present
-
-* Translation updates:
- Arabic
- Basque
- Brazilian Portuguese
- Breton
- Bulgarian
- Catalan
- Czech
- Danish
- Dutch
- German
- Greek
- Hebrew
- Hungarian
- Icelandic
- Italian
- Korean
- Norwegian bokmål
- Russian
- Serbian
- Slovenian
- Swedish
- Turkish
- Ukrainian
-
-
-Overview of Changes in GTK+ 3.15.12
-===================================
-
-* 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
 ==================================

@@ -99,11 +99,6 @@ Release notes for 3.16
  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
 ======================

@@ -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
@@ -9,29 +9,29 @@

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

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

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

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

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

-%.vcxproj.filters:
-	if test -e $(top_srcdir)/build/win32/vs10/$@; then \
-		cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
-	else \
-		cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
-	fi
@@ -24,7 +24,7 @@ EXTRA_DIST +=	\
 	gtk3-icon-browser.vcxproj.filters	\
 	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
@@ -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>
@@ -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>
@@ -167,10 +166,9 @@
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
@@ -209,10 +206,9 @@
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
@@ -257,10 +252,9 @@
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
@@ -299,10 +292,9 @@
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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>
@@ -22,7 +22,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-encode-symbolic-svg", "
 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
@@ -156,22 +156,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
@@ -21,8 +21,6 @@
      <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>
@@ -11,69 +11,26 @@
    <GtkDoInstallBin>
 mkdir $(CopyDir)\bin
 mkdir $(CopyDir)\lib
-
-copy "$(BinDir)\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll" $(CopyDir)\bin
-copy "$(BinDir)\$(GtkDllPrefix)gdk$(GtkDllSuffix).pdb" $(CopyDir)\bin
-copy "$(BinDir)\gdk-$(ApiVersion).lib" $(CopyDir)\lib
-
 if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_BIN
 if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_BIN
-copy "$(BinDir)\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll" $(CopyDir)\bin
-copy "$(BinDir)\$(GtkDllPrefix)gtk$(GtkDllSuffix).pdb" $(CopyDir)\bin
-copy "$(BinDir)\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll" $(CopyDir)\bin
-copy "$(BinDir)\$(GtkDllPrefix)gailutil$(GtkDllSuffix).pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk-$(ApiVersion).lib" $(CopyDir)\lib
-copy "$(BinDir)\gailutil-$(ApiVersion).lib" $(CopyDir)\lib
-copy "$(BinDir)\gtk3-demo.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk3-demo.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk3-demo-application.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk3-demo-application.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk3-icon-browser.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk3-icon-browser.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk-encode-symbolic-svg.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk-encode-symbolic-svg.pdb" $(CopyDir)\bin
+copy "$(BinDir)\*.dll" $(CopyDir)\bin
+copy "$(BinDir)\*-$(ApiVersion).lib" $(CopyDir)\lib
+copy "$(BinDir)\*.exe" $(CopyDir)\bin
 goto DONE_BIN
-
 :DO_BROADWAY_BIN
+copy "$(BinDir)\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll" $(CopyDir)\bin
+copy "$(BinDir)\gdk-$(ApiVersion).lib" $(CopyDir)\lib
 copy "$(BinDir)\broadwayd.exe" $(CopyDir)\bin
-copy "$(BinDir)\broadwayd.pdb" $(CopyDir)\bin
-
-if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_RELEASE
-if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_DEBUG
-:DO_BROADWAY_RELEASE
-copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib
-copy .\Release\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib
-copy .\Release\$(Platform)\bin\gtk3-demo.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk3-demo.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk3-demo-application.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk3-demo-application.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk3-icon-browser.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin
-
-goto DONE_BIN
-
-:DO_BROADWAY_DEBUG
-copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib
-copy .\Debug\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib
-copy .\Debug\$(Platform)\bin\gtk3-demo.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk3-demo.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk3-demo-application.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk3-demo-application.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk3-icon-browser.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin
-
+if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin
+if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin
+if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib
+if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib
+if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\*.exe $(CopyDir)\bin
+if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin
+if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin
+if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib
+if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib
+if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\*.exe $(CopyDir)\bin
 :DONE_BIN
    </GtkDoInstallBin>
    <GtkDoInstall>
@@ -86,7 +43,6 @@ mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
 copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
 copy ..\..\..\gdk\gdk.h $(CopyDir)\include\gtk-3.0\gdk\gdk.h
-copy ..\..\..\gdk\gdk-autocleanup.h $(CopyDir)\include\gtk-3.0\gdk\gdk-autocleanup.h
 copy ..\..\..\gdk\gdkapplaunchcontext.h $(CopyDir)\include\gtk-3.0\gdk\gdkapplaunchcontext.h
 copy ..\..\..\gdk\gdkcairo.h $(CopyDir)\include\gtk-3.0\gdk\gdkcairo.h
 copy ..\..\..\gdk\gdkcursor.h $(CopyDir)\include\gtk-3.0\gdk\gdkcursor.h
@@ -130,9 +86,7 @@ copy ..\..\..\gdk\win32\gdkwin32misc.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkw
 copy ..\..\..\gdk\win32\gdkwin32screen.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkwin32screen.h
 copy ..\..\..\gdk\win32\gdkwin32window.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkwin32window.h
 copy ..\..\..\gtk\gtk.h $(CopyDir)\include\gtk-3.0\gtk\gtk.h
-copy ..\..\..\gtk\gtk-autocleanups.h $(CopyDir)\include\gtk-3.0\gtk\gtk-autocleanups.h
 copy ..\..\..\gtk\gtkx.h $(CopyDir)\include\gtk-3.0\gtk\gtkx.h
-copy ..\..\..\gtk\gtkx-autocleanups.h $(CopyDir)\include\gtk-3.0\gtk\gtkx-autocleanups.h
 copy ..\..\..\gtk\gtk-a11y.h $(CopyDir)\include\gtk-3.0\gtk\gtk-a11y.h
 copy ..\..\..\gtk\gtkaboutdialog.h $(CopyDir)\include\gtk-3.0\gtk\gtkaboutdialog.h
 copy ..\..\..\gtk\gtkaccelgroup.h $(CopyDir)\include\gtk-3.0\gtk\gtkaccelgroup.h
@@ -292,7 +246,7 @@ copy ..\..\..\gtk\gtkseparatormenuitem.h $(CopyDir)\include\gtk-3.0\gtk\gtksepar
 copy ..\..\..\gtk\gtkseparatortoolitem.h $(CopyDir)\include\gtk-3.0\gtk\gtkseparatortoolitem.h
 copy ..\..\..\gtk\gtksettings.h $(CopyDir)\include\gtk-3.0\gtk\gtksettings.h
 copy ..\..\..\gtk\gtkshow.h $(CopyDir)\include\gtk-3.0\gtk\gtkshow.h
-copy ..\..\..\gtk\gtkstacksidebar.h $(CopyDir)\include\gtk-3.0\gtk\gtkstacksidebar.h
+copy ..\..\..\gtk\gtksidebar.h $(CopyDir)\include\gtk-3.0\gtk\gtksidebar.h
 copy ..\..\..\gtk\gtksizegroup.h $(CopyDir)\include\gtk-3.0\gtk\gtksizegroup.h
 copy ..\..\..\gtk\gtksizerequest.h $(CopyDir)\include\gtk-3.0\gtk\gtksizerequest.h
 copy ..\..\..\gtk\gtksocket.h $(CopyDir)\include\gtk-3.0\gtk\gtksocket.h
@@ -343,7 +297,6 @@ copy ..\..\..\gtk\gtkwindowgroup.h $(CopyDir)\include\gtk-3.0\gtk\gtkwindowgroup
 copy ..\..\..\gtk\gtktextlayout.h $(CopyDir)\include\gtk-3.0\gtk\gtktextlayout.h
 copy ..\..\..\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-3.0\gtk\gtktypebuiltins.h
 copy ..\..\..\gtk\gtkversion.h $(CopyDir)\include\gtk-3.0\gtk\gtkversion.h
-copy ..\..\..\gtk\a11y\gtk-a11y-autocleanups.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtk-a11y-autocleanups.h
 copy ..\..\..\gtk\a11y\gtkarrowaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkarrowaccessible.h
 copy ..\..\..\gtk\a11y\gtkbooleancellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkbooleancellaccessible.h
 copy ..\..\..\gtk\a11y\gtkbuttonaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkbuttonaccessible.h
@@ -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>
@@ -182,7 +182,6 @@
    <ClCompile Include="..\..\..\demos\gtk-demo\css_multiplebgs.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\css_pixbufs.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\css_shadows.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\cursors.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\dialog.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\drawingarea.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\editable_cells.c" />
@@ -24,7 +24,6 @@
    <ClCompile Include="..\..\..\demos\gtk-demo\css_multiplebgs.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\css_pixbufs.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\css_shadows.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\cursors.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\dialog.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\drawingarea.c"><Filter>Source Files</Filter></ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\editable_cells.c"><Filter>Source Files</Filter></ClCompile>
@@ -161,7 +161,6 @@
  <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" />
  </ItemGroup>
@@ -17,7 +17,6 @@
  <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>
  </ItemGroup>
@@ -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" />
@@ -219,4 +219,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
@@ -20,7 +20,7 @@ EXTRA_DIST +=	\
 	gtk3-icon-browser.vcxproj.filters	\
 	gailutil.vcxproj	\
 	gailutil.vcxproj.filters	\
-	gtk-install.vcxproj	\
+	install.vcxproj	\
 	broadwayd.vcxproj	\
 	broadwayd.vcxproj.filters	\
 	gdk-broadway.vcxproj	\
@@ -20,7 +20,7 @@ EXTRA_DIST +=	\
 	gtk3-icon-browser.vcxproj.filters	\
 	gailutil.vcxproj	\
 	gailutil.vcxproj.filters	\
-	gtk-install.vcxproj	\
+	install.vcxproj	\
 	broadwayd.vcxproj	\
 	broadwayd.vcxproj.filters	\
 	gdk-broadway.vcxproj	\
@@ -14,7 +14,7 @@ EXTRA_DIST +=	\
 	gtk3-demo-application.vcproj	\
 	gtk3-icon-browser.vcproj	\
 	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
@@ -74,7 +74,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib dwmapi.lib"
+				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -136,7 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib dwmapi.lib"
+				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -202,7 +202,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib dwmapi.lib"
+				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -264,7 +264,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib dwmapi.lib"
+				AdditionalDependencies="imm32.lib winmm.lib ws2_32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -57,7 +57,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcproj
 		{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}
@@ -161,22 +161,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
@@ -12,7 +12,6 @@
 		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"
@@ -10,63 +10,26 @@
  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;
-
-: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;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;
+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;
                       "
 />
@@ -82,7 +45,6 @@ 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;
@@ -126,9 +88,7 @@ copy ..\..\..\gdk\win32\gdkwin32misc.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkw
 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;
@@ -288,7 +248,7 @@ copy ..\..\..\gtk\gtkseparatormenuitem.h $(CopyDir)\include\gtk-3.0\gtk\gtksepar
 copy ..\..\..\gtk\gtkseparatortoolitem.h $(CopyDir)\include\gtk-3.0\gtk\gtkseparatortoolitem.h&#x0D;&#x0A;
 copy ..\..\..\gtk\gtksettings.h $(CopyDir)\include\gtk-3.0\gtk\gtksettings.h&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkshow.h $(CopyDir)\include\gtk-3.0\gtk\gtkshow.h&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstacksidebar.h $(CopyDir)\include\gtk-3.0\gtk\gtkstacksidebar.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;
@@ -339,7 +299,6 @@ copy ..\..\..\gtk\gtkwindowgroup.h $(CopyDir)\include\gtk-3.0\gtk\gtkwindowgroup
 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;
@@ -173,7 +173,6 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\css_multiplebgs.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\css_pixbufs.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\css_shadows.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\cursors.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\dialog.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\drawingarea.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\editable_cells.c" />
@@ -158,7 +158,6 @@
 			>
 			<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>
@@ -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"
 	>
@@ -141,9 +141,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], [2])
+m4_define([gtk_minor_version], [15])
+m4_define([gtk_micro_version], [3])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
          [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -41,14 +41,14 @@ 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([glib_required_version], [2.43.0])
 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([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([mirclient_required_version], [0.9.0])
 m4_define([epoxy_required_version], [1.0])
 GLIB_REQUIRED_VERSION=glib_required_version
 PANGO_REQUIRED_VERSION=pango_required_version
@@ -147,6 +147,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",
@@ -348,7 +349,8 @@ backend_immodules=
 have_gio_unix=no
 GDK_BACKENDS=
 GDK_EXTRA_LIBS=
-GDK_EXTRA_CFLAGS=
+# expoxy.pc has Cflags: -I${includedir}, but pkg-config swallows that :-(
+GDK_EXTRA_CFLAGS="-I${prefix}/include"
 GDK_WINDOWING=
 PANGO_PACKAGES="pango pangocairo"

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

@@ -564,21 +581,6 @@ PKG_CHECK_MODULES(BASE_DEPENDENCIES,

 PKG_CHECK_MODULES(CAIRO_BACKEND, [$cairo_backends])

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

 dnl ******************************************************
@@ -669,15 +671,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=- --color=no --language=Glade $srcdir/gtk/ui/gtkfilechooserwidget.ui > /dev/null 2>&1; then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-  AC_MSG_ERROR([GNU gettext 0.18.3 or newer is required])
-fi
-
 LIBS="$LIBS $INTLLIBS"
 AC_CONFIG_COMMANDS([po-properties],
                   [[case "$CONFIG_FILES" in *po-properties/Makefile.in*)
@@ -830,7 +823,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
@@ -1035,16 +1028,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.

@@ -1184,9 +1183,6 @@ if test "x$enable_x11_backend" = xyes; then
    if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
      AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])

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

 # Check for gio-unix
-if test "$os_win32" != "yes"; then
-  # Pull in gio-unix for gtk-launch usage, see at least
-  # gtk-launch.c
-  have_gio_unix=yes
-fi
 if test "$have_gio_unix" = "yes"; then
  GDK_GIO_PACKAGE="gio-unix-2.0 >= glib_required_version"
  AC_DEFINE([HAVE_GIO_UNIX], [1],
@@ -1672,34 +1663,11 @@ AM_CONDITIONAL(HAVE_COLORD, test "x$have_colord" = "xyes")
 # Check for libcanberra (only used in examples)
 ##################################################

-AC_ARG_ENABLE(libcanberra,
-              [AS_HELP_STRING([--enable-libcanberra],
-                              [enable libcanberra support in examples [default=auto]])],
-              [enable_libcanberra="$enableval"],
-              [enable_libcanberra=auto])
-
-AC_MSG_CHECKING([whether to use libcanberra])
-if test "$enable_libcanberra" != "no"; then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-fi
-
-have_libcanberra=no
-if test "$enable_libcanberra" != "no"; then
-    PKG_CHECK_MODULES(LIBCANBERRA, libcanberra-gtk3,
-                      have_libcanberra=yes, have_libcanberra=no)
-    if test "$enable_libcanberra" = "yes"; then
-        if test "$have_libcanberra" = "no"; then
-            AC_MSG_ERROR([--enable-libcanberra specified, but not available])
-        fi
-    fi
-fi
-
+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])
+        AC_DEFINE(HAVE_LIBCANBERRA, 1, [define if we have libcanberra])
 fi
-AM_CONDITIONAL(HAVE_LIBCANBERRA, test "x$have_libcanberra" = "xyes")

 ##################################################
 # Checks for gtk-doc and docbook-tools
@@ -1908,7 +1876,6 @@ testsuite/css/parser/Makefile
 testsuite/gdk/Makefile
 testsuite/gtk/Makefile
 testsuite/reftests/Makefile
-testsuite/tools/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/gdk/Makefile
@@ -1944,6 +1911,7 @@ gtk/makefile.msc
 gtk/gtkversion.h
 gtk/gtk-win32.rc
 gtk/libgtk3.manifest
+util/Makefile
 libgail-util/Makefile
 modules/Makefile
 modules/input/Makefile
@@ -1974,7 +1942,6 @@ echo "        Print backends:       $PRINT_BACKENDS"
 echo "        Dynamic modules:      $build_dynamic_modules"
 echo "        Included immodules:   $included_immodules"
 echo "        colord support:       $have_colord"
-echo "        libcanberra support:  $have_libcanberra"
 echo "        Introspection:        $found_introspection"
 echo "        Debugging:            $enable_debug"
 echo "        Documentation:        $enable_gtk_doc"
@@ -17,7 +17,6 @@ demos =						\
 	css_multiplebgs.c			\
 	css_pixbufs.c				\
 	css_shadows.c				\
-	cursors.c				\
 	dialog.c				\
 	drawingarea.c				\
 	editable_cells.c			\
@@ -61,10 +60,6 @@ demos =						\
 	transparent.c				\
 	tree_store.c

-if OS_UNIX
-demos += pagesetup.c
-endif
-
 AM_CPPFLAGS = \
 	-I$(top_srcdir) 			\
 	-I$(top_builddir)/gdk			\
@@ -141,8 +136,6 @@ RESOURCES =				\
 	brick2.png			\
 	background.jpg			\
 	floppybuddy.gif			\
-	glarea-fragment.glsl		\
-	glarea-vertex.glsl		\
 	gnome-applets.png		\
 	gnome-calendar.png		\
 	gnome-foot.png			\
@@ -159,43 +152,7 @@ RESOURCES =				\
 	css_pixbufs.css			\
 	css_shadows.css			\
 	cssview.css			\
-	reset.css			\
-	alias_cursor.png		\
-	all_scroll_cursor.png		\
-	cell_cursor.png			\
-	col_resize_cursor.png		\
-	copy_cursor.png			\
-	crosshair_cursor.png		\
-	default_cursor.png		\
-	e_resize_cursor.png		\
-	ew_resize_cursor.png		\
-	grabbing_cursor.png		\
-	grab_cursor.png			\
-	hand_cursor.png			\
-	help_cursor.png			\
-	move_cursor.png			\
-	ne_resize_cursor.png		\
-	nesw_resize_cursor.png		\
-	none_cursor.png			\
-	no_drop_cursor.png		\
-	not_allowed_cursor.png		\
-	n_resize_cursor.png		\
-	ns_resize_cursor.png		\
-	nw_resize_cursor.png		\
-	nwse_resize_cursor.png		\
-	pointer_cursor.png		\
-	progress_cursor.png		\
-	row_resize_cursor.png		\
-	se_resize_cursor.png		\
-	s_resize_cursor.png		\
-	sw_resize_cursor.png		\
-	text_cursor.png			\
-	vertical_text_cursor.png	\
-	wait_cursor.png			\
-	w_resize_cursor.png		\
-	zoom_in_cursor.png		\
-	zoom_out_cursor.png
-
+	reset.css

 iconthemedir = $(datadir)/icons/hicolor

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

-update_icon_cache = $(top_builddir)/gtk/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
@@ -2,15 +2,13 @@
 *
 * Demonstrates an interface loaded from a XML description.
 */
-
+#undef GTK_DISABLE_DEPRECATED
 #include <gtk/gtk.h>

 static GtkBuilder *builder;

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

@@ -18,10 +16,8 @@ quit_activate (GSimpleAction *action,
  gtk_widget_destroy (window);
 }

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

@@ -30,29 +26,18 @@ about_activate (GSimpleAction *action,
  gtk_widget_hide (about_dlg);
 }

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

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

  if (!window)
    {
@@ -72,49 +57,6 @@ do_builder (GtkWidget *do_widget)
      toolbar = GTK_WIDGET (gtk_builder_get_object (builder, "toolbar1"));
      gtk_style_context_add_class (gtk_widget_get_style_context (toolbar),
                                   "primary-toolbar");
-      actions = (GActionGroup*)g_simple_action_group_new ();
-      g_action_map_add_action_entries (G_ACTION_MAP (actions),
-                                       win_entries, G_N_ELEMENTS (win_entries),
-                                       NULL);
-      gtk_widget_insert_action_group (window, "win", actions);
-      accel_group = gtk_accel_group_new ();
-      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
-
-      item = (GtkWidget*)gtk_builder_get_object (builder, "new_item");
-      gtk_widget_add_accelerator (item, "activate", accel_group,
-                                  GDK_KEY_n, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-
-      item = (GtkWidget*)gtk_builder_get_object (builder, "open_item");
-      gtk_widget_add_accelerator (item, "activate", accel_group,
-                                  GDK_KEY_o, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-
-      item = (GtkWidget*)gtk_builder_get_object (builder, "save_item");
-      gtk_widget_add_accelerator (item, "activate", accel_group,
-                                  GDK_KEY_s, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-
-      item = (GtkWidget*)gtk_builder_get_object (builder, "quit_item");
-      gtk_widget_add_accelerator (item, "activate", accel_group,
-                                  GDK_KEY_q, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-
-      item = (GtkWidget*)gtk_builder_get_object (builder, "copy_item");
-      gtk_widget_add_accelerator (item, "activate", accel_group,
-                                  GDK_KEY_c, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-
-      item = (GtkWidget*)gtk_builder_get_object (builder, "cut_item");
-      gtk_widget_add_accelerator (item, "activate", accel_group,
-                                  GDK_KEY_x, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-
-      item = (GtkWidget*)gtk_builder_get_object (builder, "paste_item");
-      gtk_widget_add_accelerator (item, "activate", accel_group,
-                                  GDK_KEY_v, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-
-      item = (GtkWidget*)gtk_builder_get_object (builder, "help_item");
-      gtk_widget_add_accelerator (item, "activate", accel_group,
-                                  GDK_KEY_F1, 0, GTK_ACCEL_VISIBLE);
-
-      item = (GtkWidget*)gtk_builder_get_object (builder, "about_item");
-      gtk_widget_add_accelerator (item, "activate", accel_group,
-                                  GDK_KEY_F7, 0, GTK_ACCEL_VISIBLE);
    }

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

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

  /* Set the data for the new row */
+  gtk_list_store_insert_after (GTK_LIST_STORE (model), &iter, &current);
  gtk_list_store_set (GTK_LIST_STORE (model), &iter,
                      COLUMN_ITEM_NUMBER, foo.number,
                      COLUMN_ITEM_PRODUCT, foo.product,
@@ -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;
-}
@@ -3,7 +3,6 @@
 * GtkGLArea is a widget that allows custom drawing using OpenGL calls.
 */

-#include <math.h>
 #include <gtk/gtk.h>
 #include <epoxy/gl.h>

@@ -24,270 +23,35 @@ enum {
 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));
-
-  if (gtk_gl_area_get_error (GTK_GL_AREA (widget)) != NULL)
-    return;
-
-  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));
-
-  if (gtk_gl_area_get_error (GTK_GL_AREA (widget)) != NULL)
-    return;
-
-  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);
+  glColor3f (1.0f, 0.85f, 0.35f);
+  glBegin (GL_TRIANGLES);
+  {
+    glVertex3f ( 0.0,  0.6,  0.0);
+    glVertex3f (-0.2, -0.3,  0.0);
+    glVertex3f ( 0.2, -0.3,  0.0);
+  }
+  glEnd ();
 }

+/* The main rendering callback */
 static gboolean
 render (GtkGLArea    *area,
        GdkGLContext *context)
 {
-  if (gtk_gl_area_get_error (area) != NULL)
-    return FALSE;
-
-  /* Clear the viewport */
  glClearColor (0.5, 0.5, 0.5, 1.0);
  glClear (GL_COLOR_BUFFER_BIT);

-  /* Draw our object */
+  glMatrixMode (GL_MODELVIEW);
+  glLoadIdentity ();
+  glRotatef (rotation_angles[X_AXIS], 1, 0, 0);
+  glRotatef (rotation_angles[Y_AXIS], 0, 1, 0);
+  glRotatef (rotation_angles[Z_AXIS], 0, 0, 1);
+
  draw_triangle ();

-  /* Flush the contents of the pipeline */
  glFlush ();

  return TRUE;
@@ -374,7 +138,7 @@ create_glarea_window (GtkWidget *do_widget)
  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
  gtk_window_set_screen (GTK_WINDOW (window), gtk_widget_get_screen (do_widget));
  gtk_window_set_title (GTK_WINDOW (window), "GtkGLArea - Golden Triangle");
-  gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
+  gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
  gtk_container_set_border_width (GTK_CONTAINER (window), 12);
  g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);

@@ -387,13 +151,7 @@ create_glarea_window (GtkWidget *do_widget)
  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 */
+  /* the main "draw" call for GtkGLArea */
  g_signal_connect (gl_area, "render", G_CALLBACK (render), NULL);

  controls = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
@@ -6,5 +6,5 @@ Icon=gtk3-demo
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=Development;GTK;
+Categories=GTK;
 NoDisplay=true
@@ -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);
@@ -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;
@@ -1,38 +0,0 @@
-/* Printing/Page Setup
- *
- * GtkPageSetupUnixDialog can be used if page setup is needed
- * independent of a full printing dialog.
- */
-
-#include <math.h>
-#include <gtk/gtk.h>
-#include <gtk/gtkunixprint.h>
-
-static void
-done_cb (GtkDialog *dialog, gint response, gpointer data)
-{
-  gtk_widget_destroy (GTK_WIDGET (dialog));
-}
-
-GtkWidget *
-do_pagesetup (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      window = gtk_page_setup_unix_dialog_new ("Page Setup", GTK_WINDOW (do_widget));
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
-      g_signal_connect (window, "response", G_CALLBACK (done_cb), NULL);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
@@ -1,4 +1,4 @@
-/* Printing/Printing
+/* Printing
 *
 * GtkPrintOperation offers a simple API to support printing
 * in a cross-platform way.
@@ -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,9 +1,9 @@
-/* Stack Sidebar
+/* 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.
+ * GtkSidebar 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>
@@ -21,7 +21,7 @@ do_sidebar (GtkWidget *do_widget)
  GtkWidget *header;
  const gchar* pages[] = {
    "Welcome to GTK+",
-    "GtkStackSidebar Widget",
+    "GtkSidebar Widget",
    "Automatic navigation",
    "Consistent appearance",
    "Scrolling",
@@ -43,18 +43,18 @@ do_sidebar (GtkWidget *do_widget)
      header = gtk_header_bar_new ();
      gtk_header_bar_set_show_close_button (GTK_HEADER_BAR(header), TRUE);
      gtk_window_set_titlebar (GTK_WINDOW(window), header);
-      gtk_window_set_title (GTK_WINDOW(window), "Stack Sidebar demo");
+      gtk_window_set_title (GTK_WINDOW(window), "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 ();
+      sidebar = gtk_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));
+      gtk_sidebar_set_stack (GTK_SIDEBAR (sidebar), GTK_STACK (stack));

      /* Separator between sidebar and stack */
      widget = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
@@ -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 = \
@@ -6,5 +6,5 @@ Icon=gtk3-icon-browser
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=Development;GTK;
+Categories=GTK;
 NoDisplay=true
@@ -1,7 +1,6 @@
 #include <string.h>
 #include "iconbrowserapp.h"
 #include "iconbrowserwin.h"
-#include "iconstore.h"
 #include <gtk/gtk.h>

 typedef struct
@@ -43,6 +42,13 @@ 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
@@ -58,31 +64,16 @@ search_text_changed (GtkEntry *entry, IconBrowserWindow *win)
  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 +87,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 +146,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);
 }

@@ -711,13 +702,13 @@ icon_visible_func (GtkTreeModel *model,
  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;
@@ -740,11 +731,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);
@@ -760,72 +749,17 @@ search_mode_toggled (GObject *searchbar, GParamSpec *pspec, IconBrowserWindow *w
    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);

  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);

@@ -837,8 +771,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,6 +794,7 @@ 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);
@@ -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>
@@ -102,8 +108,7 @@
                  <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 +156,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 +169,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 +182,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 +195,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 +208,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>
@@ -47,7 +47,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget
 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

-update_icon_cache = $(top_builddir)/gtk/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
@@ -62,7 +62,6 @@ uninstall-update-icon-cache:

 EXTRA_DIST += 				\
 	widget-factory.ui 		\
-	widget-factory.css		\
 	menus.ui 			\
 	widget-factory.gresource.xml	\
 	data/source.svg			\
@@ -6,5 +6,5 @@ Icon=gtk3-widget-factory
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=Development;GTK;
+Categories=GTK;
 NoDisplay=true
@@ -308,37 +308,27 @@ on_page_combo_changed (GtkComboBox *combo,
 {
  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:;
    }
@@ -352,8 +342,8 @@ on_range_from_changed (GtkSpinButton *from)

  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);
+  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);
@@ -367,8 +357,8 @@ on_range_to_changed (GtkSpinButton *to)

  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);
+  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);
@@ -728,7 +718,7 @@ populate_colors (GtkWidget *widget)
  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);
@@ -1109,21 +1099,6 @@ osd_frame_button_press (GtkWidget *frame, GdkEventButton *event, gpointer data)
  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)
 {
@@ -1132,7 +1107,6 @@ activate (GApplication *app)
  GtkWidget *widget;
  GtkWidget *widget2;
  GtkWidget *widget3;
-  GtkWidget *widget4;
  GtkWidget *stack;
  GtkWidget *dialog;
  GtkAdjustment *adj;
@@ -1157,7 +1131,7 @@ 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_css_provider_load_from_data (provider, ".circular-button { border-radius: 20px; outline-radius: 20px; }", -1, NULL);
  gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
                                             GTK_STYLE_PROVIDER (provider),
                                             GTK_STYLE_PROVIDER_PRIORITY_USER);
@@ -1280,15 +1254,12 @@ activate (GApplication *app)
  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")));
@@ -1336,7 +1307,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 +1324,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>
@@ -28,7 +28,6 @@ IGNORE_HFILES= 			\
 	gdkprivate.h		\
 	gdk*private.h		\
 	keyname-table.h		\
-	wayland/xdg-shell-client-protocol.h \
 	win32			\
 	x11			\
 	quartz
@@ -134,42 +133,7 @@ HTML_IMAGES = 				\
 	images/umbrella.png		\
 	images/ur_angle.png		\
 	images/watch.png		\
-	images/xterm.png		\
-	images/alias_cursor.png		\
-	images/all_scroll_cursor.png	\
-	images/cell_cursor.png		\
-	images/col_resize_cursor.png	\
-	images/copy_cursor.png		\
-	images/crosshair_cursor.png	\
-	images/default_cursor.png	\
-	images/e_resize_cursor.png	\
-	images/ew_resize_cursor.png	\
-	images/grabbing_cursor.png	\
-	images/grab_cursor.png		\
-	images/hand_cursor.png		\
-	images/help_cursor.png		\
-	images/move_cursor.png		\
-	images/ne_resize_cursor.png	\
-	images/nesw_resize_cursor.png	\
-	images/no_drop_cursor.png	\
-	images/not_allowed_cursor.png	\
-	images/n_resize_cursor.png	\
-	images/ns_resize_cursor.png	\
-	images/nw_resize_cursor.png	\
-	images/nwse_resize_cursor.png	\
-	images/pointer_cursor.png	\
-	images/progress_cursor.png	\
-	images/row_resize_cursor.png	\
-	images/se_resize_cursor.png	\
-	images/s_resize_cursor.png	\
-	images/sw_resize_cursor.png	\
-	images/text_cursor.png		\
-	images/vertical_text_cursor.png	\
-	images/wait_cursor.png		\
-	images/w_resize_cursor.png	\
-	images/X_cursor.png		\
-	images/zoom_in_cursor.png	\
-	images/zoom_out_cursor.png
+	images/xterm.png

 if ENABLE_DOC_CROSS_REFERENCES
 # Extra options to supply to gtkdoc-fixref
@@ -668,7 +668,6 @@ gdk_keymap_get_direction
 gdk_keymap_have_bidi_layouts
 gdk_keymap_get_caps_lock_state
 gdk_keymap_get_num_lock_state
-gdk_keymap_get_scroll_lock_state
 gdk_keymap_get_modifier_state
 gdk_keymap_add_virtual_modifiers
 gdk_keymap_map_virtual_modifiers
@@ -714,8 +713,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
@@ -1289,25 +1286,12 @@ gdk_frame_get_type
 <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
+gdk_gl_context_get_current
+GdkGLProfile
+GdkGLError

 <SUBSECTION Standard>
 GDK_GL_CONTEXT
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthias Clasen	5471365b07	option list: Underline matches When using search in an option list, show matches in the list. This commit is just a proof-of-concept, it needs more work to be utf8-safe.	2015-02-10 06:57:48 -05:00
Matthias Clasen	8e7088342d	Fix annotations The function gtk_label_set_attributes() is also used to unset attributes, by passing %NULL. Reflect that in the argument annotations.	2015-02-08 21:02:57 +01:00
Matthias Clasen	77263b925c	Factor out hit testing Factor out hit testing into a separate function. This will be useful in the following commits.	2015-02-08 21:02:57 +01:00
Matthias Clasen	9fdbb14db5	Fix up docs a bit	2015-01-07 00:22:58 -05:00
Matthias Clasen	7169eee75d	Split GtkCombo up into two widgets Split GtkCombo up into GtkOptionButton and GtkOptionList. The latter is just the list widget, which can be used standalone. Add new tests in testoptionlist to demonstrate this.	2015-01-07 00:15:37 -05:00
Matthias Clasen	abae79f170	Implement multi-selection Add a selection-mode property to GtkCombo, and implement suitable behaviors. This requires the selected property to change to an array, instead of a single ID. At the same time change the terminology from 'active' to 'selected'.	2015-01-07 00:14:53 -05:00
Matthias Clasen	d76873ca23	Add a getter for the item text This can be used to check for the presence of items as well.	2015-01-07 00:12:19 -05:00
Matthias Clasen	515f6d14e8	Allow changing the 'Custom Entry' label	2015-01-07 00:12:04 -05:00
Matthias Clasen	d4a0807ced	Some API changes Split out setting of sort keys and group keys from gtk_combo_add_item, and rename the placeholder property to placeholder-text.	2015-01-07 00:12:04 -05:00
Matthias Clasen	1673f92dae	Make 'show more' rows same height This fixes a cosmetic issue with those rows.	2015-01-07 00:12:04 -05:00
Matthias Clasen	e292343440	Properly manage list separators If we never unset separators, the stick around at the top of the list during filtering.	2015-01-06 09:21:48 -05:00
Matthias Clasen	a60ad04b03	Update combo test for new API	2014-12-27 01:03:03 -05:00
Matthias Clasen	8a91e0b987	Support grouping in the new combo box	2014-12-27 01:03:02 -05:00
Matthias Clasen	23887ca9d3	Document GtkCombo Add documentation for GtkCombo.	2014-12-27 01:01:21 -05:00
Matthias Clasen	4cf965625c	Add a test for the new combo box Add a some simple test app for GtkCombo.	2014-12-27 01:01:21 -05:00
Matthias Clasen	2662457ab4	A new combo box Add a new, simple combo box. The feature set of this is similar to GtkComboBoxText, but it is using a popover and supports search. https://raw.githubusercontent.com/gnome-design-team/gnome-mockups/master/theming/widgets/combobox-replacements.png	2014-12-27 01:01:20 -05:00