3.12.1

We are keeping references on the widget we are handling as we
are iterating up, but that doesn't protect us against the entire
tree being axed from inside gtk_widget_handle_event.
https://bugzilla.gnome.org/show_bug.cgi?id=727644

Makefile.am

@@ -1,7 +1,7 @@
 ## Makefile.am for GTK+
 include $(top_srcdir)/Makefile.decl
 
-SRC_SUBDIRS = util gdk gtk libgail-util modules demos tests testsuite examples
+SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
@@ -24,7 +24,6 @@ MAINTAINERCLEANFILES = \
 	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
 	$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
 	$(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
-	$(srcdir)/m4/gtk-doc.m4 \
 	$(srcdir)/INSTALL \
 	$(srcdir)/README \
 	$(srcdir)/omf.make \
@@ -123,11 +122,11 @@ snapshot:
 	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
 DISTCHECK_CONFIGURE_FLAGS =		\
-	--enable-gtk-doc 		\
-	--enable-man 			\
-	--disable-maintainer-mode 	\
-	--enable-introspection  	\
-	--enable-installed-tests
+		--enable-gtk-doc 	\
+		--enable-man 		\
+		--disable-rebuilds 	\
+		--disable-maintainer-mode \
+		--enable-introspection
 
 GITIGNOREFILES = \
 	po-properties/Makefile.in.in \

NEWS

@@ -1,552 +1,16 @@
-Overview of Changes in GTK+ 3.13.7 to 3.13.8
+Overview of Changes in GTK+ 3.12.0 to 3.12.1
 ============================================
 
-* Wayland:
- - Implement Drag-and-Drop
- - Use subsurfaces for entry completion popups
- - Use subsurfaces for tooltips
-
-* Bugs fixed:
- 156164 Fix _gtk_text_buffer_get_line_log_attrs for last line
- 346886 GtkTreeModelFilter doesn't allow multiple calls to set_visible_func
- 415415 tree lines drawn in black
- 602443 Can't use .glade with GtkListStore, gint64/guint64 and design-time data
- 641638 Remove AM_PATH_GTK_3_0 macro
- 658722 Drag and Drop sometimes stops working
- 674264 Credentials from gnome-keyring is not used while printing
- 680067 Credits in About dialog don't support https
- 695504 gtk-demo: entry completion doesn't work
- 697855 Implement DnD in wayland
- 720269 ScaleButton: scrolling on the button doesn't do anything
- 729215 Please implement Wayland subsurfaces
- 731380 gtk3-demo button box works badly with a touch screen under wayland
- 733967 provide proper pseudostates for radios and checkboxes
- 734290 Checkbox inconsistency / usability issues in gtk3-3.13.5-2
- 734374 wl_touch serials are ignored
- 734753 Path bar - buttons don't have enough padding
- 734961 GtkAboutDialog uses deprecated property
- 735012 Toolbars take too much space
- 735014 GtkPopover smart positioning broken in RTL
- 735034 application_get_menu_by_id should either ref or be transfer none
- 735119 inconsistent order of close/help buttons
- 735223 Touch scrolling invalidates more than intended
- 735226 Avoid NULL surface access if a window is shown/hidden within a frame 
- 735253 GTK+ requires symbols not available in specified gdk-pixbuf version
- 735294 No widgets visible in simple applications with gtk+ 3.13.3 and later
- 735300 clicking on Actions tab in inspector causes abort
- 735301 Duplication of words in comments (for for, the the)
- 735310 GtkLabel selection background missing with Adwaita
- 735321 Get the default gkt-font-name font size from user font
- 735337 Crash in inspector, in the CSS editor
- 735353 GtkTreeView::row-activated not emitted sometimes
- 735368 try to tidy up the TextView background rendering
- 735389 client crashes if it gets an invalid keymap from the compositor
- 735401	make check fails on 3.13.7 without --enable-installed-tests
- 735428	gtk_main() tries to unlock an unlocked mutex
- 735531	Make tooltips use subsurfaces on wayland
- 735545	MenuButton: dismiss menu/popover when toggling programmatically
- 735593	Implement CSS font-stretch property
- 735830	Pixmap based cursors get surface destroyed after first use
- 735831	Change current cursor on grabs
-
-* Translation updates:
- Assamese
- Finnish
- Greek
- Hebrew
- Japanese
-
-
-Overview of Changes in GTK+ 3.13.6 to 3.13.7
-============================================
-
-* To align better with css, button and menuitem subclasses now use a
-  :checked state to indicate their checkedness, instead of :active or
-  :selected.
-
-* Deprecations: GtkStatusIcon, GtkThemingEngine
-
-* Bugs fixed:
- 724281 Statusbar displays removed message
- 731013 Cross-compilation from Linux to Windows broken...
- 731443 GtkPlacesSidebar - refine spacing
- 734143 Cannot drag files from the filechooser anymore
- 734357 GtkListBox doesn't get events delivered for GtkStack children
- 734420 BroadwayServer support for unix socket listening
- 734614 Undo buttons in application notifications are too tall
- 734641 gdk_window_set_device_events() does not change the event mask...
- 734649 Only notify 'adjustment' if the property changed
- 734651 Resizing gtk3-iconbrowser is super slow
- 734660 Always emit value-changed when the adjustment is changed
- 734668 Properly handle alpha in fg color when rendering symbolic icons
- 734709 GtkListBoxRow should also set its clip
- 734735 GCC warns about unused things when building GTK+ on W32
- 734736 GCC warns about wront format strings when building GTK+ on W32
- 734737 GCC warns about various things when building GTK+ on W32
- 734778 Object leaks in broadway_server_new() constructor 
- 570414 Disable font fallback in the font dialog preview panel
- 665711 Font size cannot be changed to floating point / non-integer...
- 724996 Font Button too many decimal places
- 733832 Improve fontchooser widgets display text
- 733967 provide proper pseudostates for radios and checkboxes
- 734738 Possible bug in W32 input grabbing
- 734826 Deprecate GtkStatusIcon 
-
-* Translation updates:
- Greek
-
-
-Overview of Changes in GTK+ 3.13.5 to 3.13.6
-============================================
-
-* Theme
- - Many Adwaita improvements in details
- - Much faster blur implementation for shadows
- - Support symbolic, recolorable pngs
-
-* GtkFileChooser
- - Fix editing of bookmarks
- - Use symbolic icons in the path bar
-
-* GtkTextView
- - Add a vfunc to allow subclasses to draw above/below text
-
-* GtkImage
- - Support scale factor when loading from resources
-
-* Inspector
- - Show some widget states and buildable ids
- - Add GtkTreeSelection to object tree
-
-* Wayland
- - Support newer protocol versions
-
-* Windows:
- - Fix handling of input shapes
- - Support font scaling
- - Dialog theming fixes
- - Several crash fixes
-
-* Bugs fixed:
- 624791	GtkTextBuffer doesn't emit signal "notify" on change of property "text"
- 638709	utf8_strrcasestr in GtkTextIter makes an invalid read
- 641638 Avoid pkg-config --atleast-version
- 705054	Embed manifest into gtk-update-icon-cache.exe
- 715176	object:state-changed:focused event missing when a text widget regains...
- 721367	Add gtk_application_get_actions_for_accel()
- 726224	W32: GDK tries to set GWLP_HWNDPARENT to NULL when it's NULL already
- 729140	popovers can't always track the widget
- 729636	Only show title button separator when there is something to separate...
- 729809	listbox: Add missing ::row-selected emissions
- 729924	Crash while trying to print
- 730450	Support non-svg symbolic icons
- 732137	Fix building quartz backend
- 733312	Deprecate GtkTreeView:rules-hint
- 733406	gtk_text_view_scroll_mark_onscreen() not working any more
- 733416	image: support scale factor when loading from GResource
- 733610 g_object_unref exceptions using GtkNotebook
- 733671 W32: Non-CSDed windows have unthemed titlebar
- 733679 GDK does not handle WM_NCHITTEST
- 733766 W32: gedit crashes when closing a print dialogue
- 733767 GtkPrintOperation does not keep itself alive through callbacks
- 733768 W32: Widgets can't be embedded into foreign windows
- 733769 W32: Critical error when GTK tries to set opacity for embedded windows
- 733773 GTK implicitly uses native W32 widgets in some cases, but lacks ICC...
- 733782 GtkListBoxRowAccessible expects the parent to be a GtkListBox
- 733923 gtk_widget_get_accessible() fails for an unparented GtkPopover
- 733925 GtkApplication: load gtk/menus-common.ui resource
- 733965 Add a way to debug GActions
- 733979 Combobox is styled like the last child if linked class applied, even...
- 734033 Avoid initial keyboard focus heuristic selecting labels
- 734038 GTK does not respect system font scaling
- 734053 gtkcairoblur: Replace our exponential blur with the box blur from mutter
- 734129 Popover sometimes fails to get raised above contents
- 734213 GtkSwitch showing up with "mixed" state when setting it active before...
- 734292 drag: add missing introspection annotations
- 734485 Switches are too big, glow effect makes it hard to read "ON"
- 734526 GtkToolbar: Implement clip
-
-* Translation updates:
- Arabic
- Basque
- Brazilian Portuguese
- Greek
- Lithuanian
- Slovenian
- Spanish
-
-
-Overview of Changes in GTK+ 3.13.4 to 3.13.5
-============================================
-
-* Adwaita:
- - Many improvements in details
- - Style .needs-attention in GtkStackSwitcher
-
-* CSS:
- - Selectors can now match state pseudo classes on
-   all elements
-
-* GtkListBox:
- - Rows now have a selectable property and will be
-   styled accordingly
-
-* Inspector:
- - Add an easy way to change the font
- - Show widget state and other misc. info
-
-* Wayland:
- - Fix repaint artifacts
- - Update xdg-shell
-
-* Windows:
- - Fix icon theme loading
-
-* Bugs fxed:
- 591258 Easy to accidentally select first option in popup menus
- 618852 gtk_text_iter_forward_visible_cursor_position does not move...
- 707153 Add style for stack switcher items with the needs-attention...
- 731582 Please use AC_PATH_TOOL to improve cross-compile & multilib...
- 733099 Regression: gtk_window_set_title() no longer sets header ba...
- 733174 Missing documentation for GtkSpinButton::change-value and ...
- 733189 Careless URI construction in GTK+
- 733321 Tooltips disappear when a new GtkMenu is created
- 733360 GtkSwitch: css, make box-shadow outsets work for the switch...
- 733361 GtkProgressBar: css, make box-shadow outsets work for the p...
- 733407 GtkTextView: use GSlice
- 733431 Regression: Button not added to action area of dialog
- 733441 do not mention GtkArrow in the GtkMenuButton docs 
-
-* Translation updates:
- Greek
-
-
-Overview of Changes in GTK+ 3.13.3 to 3.13.4
-============================================
-
-* Theming:
- - Adwaita is much more complete
- - Shadows, reliefs and frames in GtkScrolledWindow, GtkViewport,
-   GtkButton, GtkEntry, GtkFrame, etc are now translated to style
-   classes and themed
-
-* GtkApplication:
- - gtk_application_prefers_app_menu is a new function to facility
-   adapting UIs to platform expectations
- - GtkApplication now tries to load menus from resources in the
-   resource path that is defined by GApplication
- - GtkApplication set up a resource path for loading icons as well
-
-* GtkScrolledWindow:
- - Scrolling in response to user input (scrollbar clicks, keynav)
-   is now animated
- - The displacement animation has been replaced edge gradients
-
-* GtkScaleButton:
- - The orientation is now changed on the fly to make the popup
-   fit into small windows
-
-* GtkEntry:
- - Activity mode progress is now smooth
-
-* Client-side decorations
- - The default button layout includes minimize and maximize again
- - Dialogs are no longer using client-side decorations when
-   use-header-bar is unset
-
-* GTK+ now ships a simple icon theme browser, gtk3-icon-browser
-
-* GtkInspector:
- - Can change hi-dpi scale on the fly
- - Can simulate touchscreen at runtime
- - Shows style properties
- - Ctrl-Shift-I selects the widget under the pointer
- - Property editors show property and settings bindings
-
-* Wayland:
- - Always use CSD under Wayland
- - Avoid a crash on pointer-less systems
- - Context menus work now
-
-* Deprecations, removals:
- - GtkWindow no longer supports resize grips
- - builtin icons have been deprecated in favor of loading icons
-   from resources
-
-* Bugs fixed:
- 484640 Improve double click handling in GtkIconView
- 618852 gtk_text_iter_forward_visible_cursor_position does not move to end...
- 629129 gtk_text_iter_forward_visible_cursor_position is VERY slow
- 672676 evince doesn't permit to print more than 100 copies at once
- 680885 GtkColorButton color swatch suboptimal when color ~= background color
- 710449 Invalid memory access in "gdk_x11_window_set_opacity" on 64bit pla...
- 722092 Add GtkApplication resources support
- 722633 Remove separators from font chooser and file chooser
- 724084 Provide .error .warning .question classes for GtkEntry (not legibl...
- 726566 GtkEntryCompletion should emit signal for "no-suggestions" case.
- 729620 De-uglify GtkCalendar
- 730730 scrolling is broken when sharing adjustments
- 730893 Dialogs use headerbars even when DialogsUseHeader is unset
- 731158 gtkbookmarksmanager.c: save_bookmarks, silly strlen
- 731297 Get rid of overshooting window/animation
- 731463 Styling of last column header does not apply to treeview-like cust...
- 731711 GtkLabel forwards button-press-event after showing a context menu
- 732134 consider using an alternate durations for transitions of button pr...
- 732206 wayland: crash with touch but no pointer
- 732229 Buttons in menus in popovers - alignment and spacing issues
- 732256 Add a flat style class and use it for flat buttons
- 732298 adwaita -- progress bars indistinguishable from selected list row
- 732330 Sort *_DEBUG values alphabetically
- 732433 Typos in common questions
- 732441 Selected text background is nearly transparent
- 732443 Inspector hide and seek
- 732454 Build error: return_exposes not defined in gdkevents-win32.c due t...
- 732494 issues active buttons in popovers
- 732667 cursor blink settings not fully undeprecated
- 732681 Docs: make GtkWidget:margin-start and margin-end clearer
- 732861 GtkImage surface documentation incomplete
- 732894 icontheme: Use correct URI for icons in resource paths
- 732900 textview calls gtk_widget_set_allocation() on children out of ::si...
- 732933 horizontal autoscrolling broken
- 732970 Unselectable GtkLabels with links get the wrong initial cursor
- 732991 gtk_drag_anim_timeout change the user widget and never restore it
- 733027 GtkStack doesn't render a background
- 733076 Handle resolution changes in the GDK backend code
- 733092 inspector: Do not accidentally change tab in the object notebook
- 733099 Regression: gtk_window_set_title() no longer sets header bar title
- 733112 GtkListBox: Add a ::activatable property for rows 
-
-* Translation updates:
- Hebrew
- Lithuanian
- Russian
- Scottish Gaelic
- Slovenian
-
-
-Overview of Changes in GTK+ 3.13.2 to 3.13.3
-============================================
-
-* GtkInspector:
- - Support saving custom CSS
- - Show GMenus and GActions
- - Show combobox menus and submenus
- - Lower the inspector window when picking
- - Misc. navigation improvements
-
-* Gestures:
- - Convert most widgets to use gestures internally
-
-* Theming:
- - Use client-side shadows for menus and tooltips
- - Include the Adwaita theme
- - The default theme is now Adwaita
- - Icon loading now respects limits specified in the icon theme,
-   unless GTK_ICON_LOOKUP_FORCE_SIZE is set
- - Don't include image content in icon caches, to avoid huge caches
- - GtkSwitch gained a hover state
-
-* Widget factory:
- - Improve coverage of GTK+ features
-
-* Wayland:
- - Support GNOME classic mode
-
-* Deprecations:
- - Style regions
- - Support for .icon files
- - gdk_window_flush, drawing outside of begin/end paint
-
-* Bugs fixed:
- 721895	Remove GtkIconCache
-729820	GMenuModel submenu-action set 'false' before item activation
- 730615	a11y private library not included in GIR
- 730745	Port annotations from Vala
- 730767	Tab that's being dragged is not updated
- 730833	RTL in the inspector does not change the icons
- 730924	Setting a GtkScrolledWindow to visible in a template causes a segfault
- 731016	Text Drag'n'Drop broken in GtkTextView
- 731020	3.13.2: PlacesSidebar changes directories on right click
- 731187	Use csd shadows for menus
- 731273	minimise and maximise buttons not present in header bars in gnome classic
- 731299	Wrong function name for gtk_selection_data_get_data
- 731371	Gtk gets confused by wayland touch events
- 731377	Add a redirect on the website for the old language bindings page
- 731382	Current docs still mention GtkList and GtkCList
- 731429	Incorrect text provided by AtkText text-insert signal for GtkEntry
- 731602	GTK+ 3.13.2 won't build in Windows
- 731658	icon theme: Respect directory types for svg icons
- 731790	GtkHeaderBar subtitle not redisplayed after custom title
- 731834	GtkPopover is referenced directly in theme css
- 731866	New window shadows
- 731908	placessidebar: Use symbolic name for symbolic icon 
-
-* Updated translations:
- Hebrew
- Spanish
-
-
-Overview of Changes in GTK+ 3.13.1 to 3.13.2
-============================================
-
-* Interactive debugging support. The GtkInspector
-  window can be triggered with the Ctrl-Shift-I
-  or Ctrl-Shift-D keyboard shortcuts, or via the
-  GTK_DEBUG environment variable.
-
-* Gesture support has landed. New classes include
-  GtkGestureLongPress, GtkGestureMultiPress, GtkGestureSwipe,
-  GtkGesturePan, GtkGestureRotate, GtkGestureZoom. Many GTK+
-  widgets already use gestures internally. Gestures also
-  show up in GtkInspector.
-  The gesture-related APIs are still subject to change.
-
-* GTK+ widgets can now draw outside their allocation,
-  by setting a clip with gtk_widget_set_clip().
-  The clip-related APIs are still subject to change.
-
-* GtkStack has added a few more transition types
-
-* GtkProgressBar is now narrower
-
-* CSS
- - Support outline-radius in CSS
- - Implement 'unset' and 'all'
- - Support -gtk-icontheme
- - Support -gtk-icon-source
- - Add -gtk-icon-transform, supporting the 2D
-   parts of CSS transforms
- - Support -gtk-icon-style
-
-* Theme
- - Use outlines to render focus rings
- - Use icons to render spinners, expanders and arrows
- - GtkIconTheme can force symbolic or regular
-   icon variants
- - GtkIconTheme will automatically load rtl
-   icon variants
-
-* Win32:
- - Theme improvements
-
-* Wayland:
- - Update to the latest xdg-shell protocol
-
-* Deprecations:
- GdkColor
- GtkMisc
- GtkArrow
- focus-line-width style property
- GtkNumerableIcon
- GtkButton::x/yalign
- gtk_widget_reparent
- gtk_widget_region_intersect
- gtk_container_set_reallocate_redraws
-
-* Bugs fixed:
- 525206 Remove superfluous non-NULL tests for the GtkScrolledWindow scrollbars
- 614717 gtk_text_buffer_create_tag fails to return error on duplicate tag
- 636695 GdkColor should be deprecated
- 645966 gtk-demo leaks a GtkSizeGroup
- 698396 GtkTreeStore crashes when reordering 0 elements
- 708037 Allow live updates on widgets implementing GtkColorChooser
- 720330 Gtk-CRITICAL **: gtk_entry_completion_set_model: assertion 'GTK_IS_E...
- 721069 gtk_win32_embed_widget_show infinite recursion
- 726676 More GtkStack transition counterparts of OVER_UP_DOWN
- 727147 Search bar is too narrow
- 727994 Gtk Popover closes on click
- 728135 gtk_widget_set_visible's nothing-changed-check
- 728284 [treeview] Graphics artifact when scrolling with hover-selection
- 729346 W32: App-notification has no theme, shows up transparent
- 729353 W32: horizontal-buttons get "selected" background when focused
- 729451 Removing accels with application_set_accels_for_action
- 729461 Introspection issue with GtkApplication
- 729473 FileChooser: typos in gtk_file_chooser_set_local_only ()
- 729475 FileChooser: typo in gtk_set_create_folders()
- 729496 Crash with latest gtk+ from master in gtk_combo_box_get_preferred_width
- 729564 Deprecate GtkArrow
- 729594 Don't stretch switches in Widget Factory
- 729598 Populate page 2 of the Widget Factory
- 729607 GtkAboutDialog: gtk aborts when trying to show an about dialog
- 729670 cairo surface leaked for each cursor created from pixmap
- 729817 GtkCellLayout: allow finding attributes at runtime
- 729834 gdk: missing (nullable) annotations on return values
- 729915 Popopver does not follow relative widget to find action groups
- 729983 gdk: assorted introspection and documentation syntax fixes
- 730007 GtkInspector: add a setting to disable C-S-i
- 730008 make gtk_set_interactive_debugging available for apps
- 730035 GtkFileFilter contains refs to GtkRecentFilter which are probably typos
- 730043 Add an alternative to Ctrl-Shift-I
- 730095 Add a private call API to export internals to modules
- 730142 placessidebar: use proper canonicalization when checking if home
- 730183 RFC: silence harmless critical
- 730306 Gtk+ >= 3.0 fails to load modules from settings.ini files
- 730526 Fix the edit-clear icons in RTL 
- 730353 Horizontal and vertical scrolling
- 700030 GdkEventSequence not accessible from introspected bindings
- 641836 Capture/bubble event handling
- 119906 Add event when Double Click timeout expires
-
-* Translation updates:
- Belarusian
- Hebrew
- Russian
- Spanish 
-  
-
-Overview of Changes in GTK+ 3.12.0 to 3.13.1
-============================================
-
-* GtkListBox can now do multi-selection 
-
-* GtkSwitch has a way to delay state changes
-
-* GtkMenuButton is using a popover for menu models by default
-
-* GtkPopover can have horizontal sections
-
-* GtkFileChooser received some design improvements
-
-* GtkBuilder
- - Supports property binding
- - Supports dialog actions
-
-* Client-side decorations
- - The requirement for _GTK_FRAME_EXTENTS has been dropped
-   to avoid 'double headers' with most window managers
- - Drawing of DND highlights around the entire window works
-
-* Windows backend:
- - *Many* theme improvements
- - Add popover theming
- - Enable introspection
-
-* Wayland backend
- - Updates for xdg_shell protocol changes
- - Touch support
-
-* Broadway backend
- - Now builds on OpenBSD
-
-* Bugs fixed:
- 495105 Open recent file keyboard shortcuts do not work correctly
- 654417 Add <binding> element to GtkBuilder syntax
- 686170 gdk/win32: VK_SNAPSHOT maps to GDK_Print
+* Bug fixes:
  712752 GtkClipboard: add _get_default and _get_primary
  722058 GtkTreeModelFilter bug
- 722211 improve the file chooser design
  722817 Add gobject-introspection for GdkWin32
- 723963 Use popover for the fallback app menu in the headerbar
- 725648 Switches should always indicate the current state
- 726179 Trivial Fix: size-allocate signal has missing documentation
- 726271 Items not highlighted while mouse-hovered
  726298 gtk-font-name isn't correctly handled on Windows
- 726475 After looking at Aisleriot solitare, I get rendering glitches...
- 726592 W32: problems with CSDed windows
+ 726475 After looking at Asielriot solitare, I get rendering glitches...
  726859 Assertion/crash if gtk_radio_menu_item_set_group() is called twice
  726870 all: Name more idles and timeouts
  726871 treeview: Lower the duration of validation iterations
- 726996 Label-for/Labelled-by AtkRelations missing for containers in t...
+ 726996 Label-for/Labelled-by AtkRelations missing for containers in ...
  727009 redefinition of GtkPrinterCloudprint: cloudprint fails to build
  727022 W32: Both inc- and dec-buttons on GtkSpinbutton are "inc"
  727035 W32: Combobox button is drawn with two arrows
@@ -558,47 +22,24 @@ Overview of Changes in GTK+ 3.12.0 to 3.13.1
  727210 W32: Prelight doesn't apply to check/radio marks
  727211 W32: Selection background color applies to check/radio marks
  727213 W32: Notebook widget is not styled correctly
- 727244 W32: Items selected in listbox have correct background color, ...
+ 727244 W32: Items selected in listbox have correct background color,...
  727245 W32: No .dim-label style
  727313 a11y: do not use deprecated a11y functions.
  727322 docs: Remove '\' escape character from literals
  727391 W32: scrollbar sliders have no "active" and "insensitive" styles
  727410 W32: tooltips are not themed
  727414 Redundant text in titlebar
- 727487 Color picker check marks not cleared properly
  727643 Segfault in gtk-3.12.0
- 727644 SEGV in gtk_window_propagate_key_event()
- 727662 GtkVolumeButton displays "missing image" icons
- 727908 Various GtkTextView improvements (doc, unit tests)
- 727973 W32: focused button is visibly smaller
+ 727662 [PATCH] GtkVolumeButton displays "missing image" icons
+ 727973 W32: focused button is visibly smaller  
  728023 Warning when passing NULL window to inhibit
- 728054 entry: consider ascent and descent when requesting height
- 728073 Allow defining an invisible resize area for GtkPaned's handle
- 728140 Illegal parameter passed to g_variant_new in gtk_application_im...
- 728165 gtk_target_list_new argument should be (allow-none)
- 728183 Drag and drop (GdkFrameClock) does not work for hidden widgets
- 728272 make broadway backend build on OpenBSD
- 728426 Implement the wl_touch interface
- 728745 win32: add more clipboard data checks to avoid crash
- 728806 W32: Check- and radio-buttons have a selection rectangle on act...
- 728807 W32: Checkbutton focus rectangle becomes almost white on prelight
- 728808 W32: Checkboxes on modelbuttons are drawn like buttons themselves
- 728810 W32: Modelbuttons look like buttons
- 728846 GtkDialog: Support adding action widgets in ui files
- 728992 GtkLockButton crash if clicked and permission is NULL
- 729013 Use OUTPUT_SCALE instead of xft-dpi on wayland 
- 729095 redraw problems when resizing popovers
- 729097 size allocation problem in popovers 
+ 727644 SEGV in gtk_window_propagate_key_event()
 
 * Translation updates:
  Basque
  Catalan
- German
  Greek
- Hebrew
  Russian
- Slovenian
-
 
 Overview of Changes in GTK+ 3.11.9 to 3.12.0
 ============================================

README.in

@@ -73,32 +73,6 @@ Patches should be in unified diff form. (The -up option to GNU diff)
 Even better are git-formatted patches. (Use git format-patch)
 
 
-Release notes for 3.14
-======================
-
-* A new state, GTK_STATE_FLAG_CHECKED, has been added for checked states
-  of radio and check buttons and menuitems. Applications that are using
-  GTK+ styles without widgets will need adjustments.
-
-* Adwaita is now the default theme on all platforms.
-
-* The icon theme code has become a little pickier about sizes and is not
-  automatically scaling icons beyond the limits defined in the icon theme
-  unless explicitly asked to do so with GTK_ICON_LOOKUP_FORCE_SIZE.
-
-* GTK+ now includes an interactive debugger which can be activated with
-  the keyboard shortcuts Ctrl-Shift-d or Ctrl-Shift-i. If these shortcuts
-  interfere with application keybindings, they can be disabled with the
-  setting org.gtk.Settings.Debug.enable-inspector-keybinding.
-
-* Most widgets have been ported to use the new gesture framework internally
-  for event handling. Traditional event handlers in derived widgets are still
-  being called.
-
-* Using GTK+ under X11 without the X Render extension has been observed
-  to be problematic. This combination is using code paths in cairo and
-  graphics drivers which are rarely tested and likely buggy.
-
 Release notes for 3.12
 ======================
 
@@ -239,6 +213,7 @@ Release notes for 3.4
   in .pc files. Dependent modules may have to declare dependencies
   that there were getting 'for free' in the past.
 
+
 Release notes for 3.2
 =====================
 

build/Makefile-newvs.am

@@ -1,37 +0,0 @@
-# Centralized autotools file
-# Create the Visual Studio 2012/2013 project files
-# from the Visual Studio 2010 project files
-
-# Author: Fan, Chun-wei
-# November 05, 2012
-
-# MSVC_SLN: name of root project
-
-MSVC_FORMAT_VER=$(shell echo $$(expr $(MSVC_VER) + 1))
-
-$(MSVC_SLN).sln: $(top_srcdir)/build/win32/vs10/$(MSVC_SLN).sln create_vcxproj copy_filters create_props
-	cat $(top_srcdir)/build/win32/vs10/$(MSVC_SLN).sln | sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' | sed 's/2010/$(MSVC_VER_LONG)/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$(MSVC_SLN).sln
-
-README.txt: $(top_srcdir)/build/win32/vs10/README.txt
-	cat $(top_srcdir)/build/win32/vs10/README.txt | sed 's/vs10/vs$(MSVC_VER)/g' | sed 's/VS10/VS$(MSVC_VER)/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/README.txt
-
-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)/
-
-

build/Makefile.am

@@ -8,7 +8,6 @@ EXTRA_DIST +=	\
 	gen-file-list-gtk.py	\
 	detectenv_msvc.mak	\
 	introspection-msvc.mak	\
-	gtk-introspection-msvc.mak.in	\
 	gtk-introspection-msvc.mak
 
 -include $(top_srcdir)/git.mk

build/gen-file-list-gtk.py

@@ -14,11 +14,11 @@ def gen_gdk_filelist(srcroot, subdir, dest):
     vars = read_vars_from_AM(os.path.join(srcroot, subdir, 'Makefile.am'),
                              vars = {},
                              conds = {},
-                             filters = ['gdk_h_sources', 'gdk_c_sources'])
+                             filters = ['gdk_public_h_sources', 'gdk_c_sources'])
 
     vars['gdk_enums'] = 'gdkenumtypes.c gdkenumtypes.h'
 
-    files = vars['gdk_h_sources'].split() + \
+    files = vars['gdk_public_h_sources'].split() + \
             vars['gdk_c_sources'].split() + \
             vars['gdk_enums'].split()
 
@@ -49,7 +49,6 @@ def gen_gtk_filelist(srcroot, subdir, dest):
                                       'USE_X11': False,
                                       'USE_EXTERNAL_ICON_CACHE': False},
                              filters = ['gtkinclude_HEADERS',
-                                        'a11yinclude_HEADERS',
                                         'deprecatedinclude_HEADERS',
                                         'gtk_base_c_sources',
                                         'gtk_clipboard_dnd_c_sources'])
@@ -57,17 +56,12 @@ def gen_gtk_filelist(srcroot, subdir, dest):
     vars['gtk_other_src'] = 'gtkprintoperation-win32.c gtktypebuiltins.h gtktypebuiltins.c'
 
     files = vars['gtkinclude_HEADERS'].split() + \
-            vars['a11yinclude_HEADERS'].split() + \
             vars['deprecatedinclude_HEADERS'].split() + \
             vars['gtk_base_c_sources'].split() + \
 			vars['gtk_clipboard_dnd_c_sources'].split() + \
             vars['gtk_other_src'].split()
 
-    sources = [i for i in files \
-               if not (i.endswith('private.h')) \
-               and i != 'gtktextdisplay.h' \
-               and i != 'gtktextlayout.h' \
-               and i != 'gtkx.h']
+    sources = [i for i in files if not (i.endswith('private.h')) and i != 'gtktextdisplay.h' and i != 'gtktextlayout.h']
 
     with open(dest, 'w') as d:
         for i in sources:

build/gtk-introspection-msvc.mak

@@ -31,6 +31,10 @@ setgirbuildnev:
 	@set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
 	@set LIB=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB)
 
+win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib: win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib
+	@-echo Copying win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib from win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib...
+	@-copy /b win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib
+
 Gdk-$(APIVERSION).gir: gdk_list
 	@-echo Generating Gdk-$(APIVERSION).gir...
 	$(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gdk	\
@@ -46,7 +50,7 @@ Gdk-$(APIVERSION).gir: gdk_list
 	-DG_LOG_DOMAIN=\"Gdk\" -DGDK_COMPILATION	\
 	--filelist=gdk_list	-o $@
 
-GdkWin32-$(APIVERSION).gir: gdkwin32_list
+GdkWin32-$(APIVERSION).gir: gdkwin32_list win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib
 	@-echo Generating GdkWin32-$(APIVERSION).gir...
 	$(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gdk	\
 	-I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include	\
@@ -74,7 +78,7 @@ Gtk-$(APIVERSION).gir: gtk_list
 	--pkg-export gtk+-3.0 --warn-all --c-include="gtk/gtkx.h"	\
 	-DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"/dummy/lib\"	\
 	$(TIME_T_DEFINE) -DGTK_DATADIR=\"/dummy/share\" -DGTK_DATA_PREFIX=\"/dummy\"	\
-	-DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"@GTK_VERSION@\"	\
+	-DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"3.12.0\"	\
 	-DGTK_BINARY_VERSION=\"3.0.0\" -DGTK_HOST=\"i686-pc-vs$(VSVER)\"	\
 	-DGTK_COMPILATION -DGTK_PRINT_BACKENDS=\"file\"	\
 	-DGTK_PRINT_PREVIEW_COMMAND=\"undefined-gtk-print-preview-command\"	\
@@ -101,6 +105,7 @@ all:
 clean:
 	@-del /f/q *.typelib
 	@-del /f/q *.gir
+	@-del /f/q win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib
 	@-del /f/q gtk_list
 	@-del /f/q gdkwin32_list
 	@-del /f/q gdk_list

build/win32/Makefile.am

@@ -1,12 +1,8 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS =	\
-	crypt	\
-	vs9 	\
-	vs10	\
-	vs11	\
-	vs12
-
-EXTRA_DIST += process-in-win32.py
+SUBDIRS = \
+	crypt \
+	vs9  \
+	vs10
 
 -include $(top_srcdir)/git.mk

build/win32/process-in-win32.py

@@ -1,109 +0,0 @@
-#!/usr/bin/python
-# vim: encoding=utf-8
-# expand Windows-specific *.in files
-# for Visual Studio Builds
-
-import os
-import sys
-import re
-import string
-import argparse
-
-
-def open_compat(src, mode):
-    if (sys.version_info.major < 3):
-        return open(src, mode)
-    else:
-        return open(src, mode, encoding='utf-8', errors='surrogateescape')
-
-def get_version(srcroot):
-    ver = {}
-    RE_VERSION = re.compile(r'^m4_define\(\[(gtk_\w+)\],\s*\[(\d+)\]\)')
-    RE_FLOAT_VERSION = re.compile(r'^m4_define\(\[(gtk_\w+)\],\s*\[(\d+\.\d*)\]\)')
-    with open(os.path.join(srcroot, 'configure.ac'), 'r') as ac:
-        for i in ac:
-            mo = RE_VERSION.search(i)
-            if mo:
-                ver[mo.group(1).upper()] = int(mo.group(2))
-            mo = RE_FLOAT_VERSION.search(i)
-            if mo:
-                ver[mo.group(1).upper()] = float(mo.group(2))
-
-    ver['GTK_BINARY_AGE'] = 100 * ver['GTK_MINOR_VERSION'] + ver['GTK_MICRO_VERSION']
-    ver['GTK_VERSION'] = '%d.%d.%d' % (ver['GTK_MAJOR_VERSION'],
-                                        ver['GTK_MINOR_VERSION'],
-                                        ver['GTK_MICRO_VERSION'])
-    ver['LT_RELEASE'] = '%d.%d' % (ver['GTK_MAJOR_VERSION'], ver['GTK_MINOR_VERSION'])
-    ver['LT_CURRENT'] = 100 * \
-                        ver['GTK_MINOR_VERSION'] + \
-                        ver['GTK_MICRO_VERSION'] - \
-                        ver['GTK_INTERFACE_AGE']
-    ver['LT_REVISION'] = ver['GTK_INTERFACE_AGE']
-    ver['LT_AGE'] = ver['GTK_BINARY_AGE'] - ver['GTK_INTERFACE_AGE']
-    ver['LT_CURRENT_MINUS_AGE'] = ver['LT_CURRENT'] - ver['LT_AGE']
-    return ver
-
-def process_in(src, dest, vars):
-    RE_VARS = re.compile(r'@(\w+?)@')
-
-    with open_compat(src, 'r') as s:
-        with open_compat(dest, 'w') as d:
-            for i in s:
-                i = RE_VARS.sub(lambda x: str(vars[x.group(1)]), i)
-                d.write(i)
-
-def get_srcroot():
-    if not os.path.isabs(__file__):
-        path = os.path.abspath(__file__)
-    else:
-        path = __file__
-    dirname = os.path.dirname(path)
-    return os.path.abspath(os.path.join(dirname, '..', '..'))
-
-def main(argv):
-    prog_desc = 'Create Various autogenerated Win32-specific Source Files'
-    parser = argparse.ArgumentParser(description=prog_desc)
-    parser.add_argument('--gtkwin32rc', dest='gtkwin32rc', action='store_const',
-                        const=1,
-                        help='Generate gtk-win32.rc')
-
-    parser.add_argument('--gtk3manifest', dest='gtk3manifest', action='store_const',
-                   const=1,
-                   help='Generate libgtk3.manifest')
-
-    args = parser.parse_args()
-    no_args = True
-
-    if args.gtkwin32rc is not None:
-        srcroot = get_srcroot()
-
-        ver = get_version(srcroot)
-
-        target = os.path.join(srcroot, 'gtk', 'gtk-win32.rc')
-        process_in(os.path.join(srcroot, 'gtk', 'gtk-win32.rc.in'),
-                   target + '.intermediate',
-                   ver)
-        fp_r = open_compat(target + '.intermediate', 'r')
-        lines = fp_r.readlines()
-        fp_r.close()
-        fp_w = open_compat(target, 'w')
-        fp_w.writelines([item for item in lines[:-1]])
-
-        fp_w.close()
-        os.unlink(target + '.intermediate')
-
-        no_args = False
-
-    if args.gtk3manifest is not None:
-        manifest = {}
-        manifest['EXE_MANIFEST_ARCHITECTURE'] = '*'
-        process_in(os.path.join(srcroot, 'gtk', 'libgtk3.manifest.in'),
-                   os.path.join(srcroot, 'gtk', 'libgtk3.manifest'),
-                   manifest)
-        no_args = False
-
-    if no_args is True:
-        raise SystemExit('Action argument required.  Please see %s --help for details.' % __file__)
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))

build/win32/vs10/Makefile.am

@@ -14,16 +14,14 @@ EXTRA_DIST +=	\
 	gtk.vcxprojin	\
 	gtk.vcxproj.filters	\
 	gtk.vcxproj.filtersin	\
-	gtk-encode-symbolic-svg.vcxproj	\
-	gtk-encode-symbolic-svg.vcxproj.filters	\
 	gtk3-demo.vcxproj	\
 	gtk3-demo.vcxproj.filters	\
 	gtk3-demo-application.vcxproj	\
 	gtk3-demo-application.vcxproj.filters	\
-	gtk-inspector.vcxproj	\
-	gtk-inspector.vcxprojin	\
-	gtk-inspector.vcxproj.filters	\
-	gtk-inspector.vcxproj.filtersin	\
+	gtka11y.vcxproj	\
+	gtka11y.vcxproj.filters	\
+	gtka11y.vcxprojin	\
+	gtka11y.vcxproj.filtersin	\
 	gailutil.vcxproj	\
 	gailutil.vcxproj.filters	\
 	install.vcxproj	\
@@ -36,7 +34,6 @@ EXTRA_DIST +=	\
 	gtk-gen-srcs.props	\
 	gtk-ignore-broadway.props	\
 	gtk-install.props	\
-	gtk-version-paths.props.in	\
 	gtk-version-paths.props
 
 -include $(top_srcdir)/git.mk

build/win32/vs10/gtk+.sln

@@ -10,7 +10,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broadwayd", "broadwayd.vcxp
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-inspector", "gtk-inspector.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.vcxproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
 EndProject
@@ -18,8 +18,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcxp
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo-application", "gtk3-demo-application.vcxproj", "{3281202A-CD26-4C67-B892-EB34BDBC612F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-encode-symbolic-svg", "gtk-encode-symbolic-svg.vcxproj", "{3281202A-CD26-4C67-B892-EB34BDBC6131}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcxproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
@@ -108,22 +106,22 @@ Global
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.Build.0 = Release_Broadway|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.Build.0 = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.Build.0 = Release|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.Build.0 = Debug|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|x64.ActiveCfg = Debug|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|x64.Build.0 = Debug|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|Win32.ActiveCfg = Release|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|Win32.Build.0 = Release|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.ActiveCfg = Release|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.Build.0 = Release|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|Win32.Build.0 = Debug|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|x64.ActiveCfg = Debug|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|x64.Build.0 = Debug|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|Win32.ActiveCfg = Release|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|Win32.Build.0 = Release|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|x64.ActiveCfg = Release|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|x64.Build.0 = Release|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.Build.0 = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.ActiveCfg = Debug|x64
@@ -204,22 +202,6 @@ Global
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|x64.Build.0 = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|Win32.Build.0 = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|x64.ActiveCfg = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|x64.Build.0 = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release|Win32.ActiveCfg = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release|Win32.Build.0 = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release|x64.ActiveCfg = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release|x64.Build.0 = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug_Broadway|Win32.Build.0 = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug_Broadway|x64.Build.0 = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release_Broadway|Win32.Build.0 = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release_Broadway|x64.ActiveCfg = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release_Broadway|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

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

@@ -9,7 +9,7 @@
     <GtkPrefixDefine>GTK_PREFIX=\"$(GtkDummyPrefix)\"</GtkPrefixDefine>
     <GdkDefines>GDK_COMPILATION;G_LOG_DOMAIN="Gdk"</GdkDefines>
     <GtkIncludedImmodulesDefines>INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr</GtkIncludedImmodulesDefines>
-    <GtkDefines>GTK_COMPILATION;G_LOG_DOMAIN="Gtk";GTK_HOST="i686-pc-vs$(VSVer)";GTK_PRINT_BACKENDS="file";GTK_PRINT_PREVIEW_COMMAND="undefined-gtk-print-preview-command";$(GtkIncludedImmodulesDefines);GTK_LIBDIR="$(GtkDummyPrefix)/lib";GTK_DATADIR="$(GtkDummyPrefix)/share";GTK_DATA_PREFIX="$(GtkDummyPrefix)";GTK_SYSCONFDIR="$(GtkDummyPrefix)/etc";MULTIPRESS_CONFDIR="$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)";MULTIPRESS_LOCALEDIR="$(GtkDummyPrefix)/share/locale";GTK_VERSION="$(GtkVersion)/etc";GTK_BINARY_VERSION="$(GtkBinaryVersion)/etc";GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED</GtkDefines>
+    <GtkDefines>GTK_COMPILATION;G_LOG_DOMAIN="Gtk";GTK_HOST="i686-pc-vs$(VSVer)";GTK_PRINT_BACKENDS="file";GTK_PRINT_PREVIEW_COMMAND="undefined-gtk-print-preview-command";$(GtkIncludedImmodulesDefines);GTK_LIBDIR="$(GtkDummyPrefix)/lib";GTK_DATADIR="$(GtkDummyPrefix)/share";GTK_DATA_PREFIX="$(GtkDummyPrefix)";GTK_SYSCONFDIR="$(GtkDummyPrefix)/etc";MULTIPRESS_CONFDIR="$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)";MULTIPRESS_LOCALEDIR="$(GtkDummyPrefix)/share/locale";GTK_VERSION="$(GtkVersion)/etc";GTK_BINARY_VERSION="$(GtkBinaryVersion)/etc";GDK_DISABLE_DEPRECATED</GtkDefines>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtkbuilddefinesprops</_PropertySheetDisplayName>
@@ -47,4 +47,4 @@
       <Value>$(GtkDefines)</Value>
     </BuildMacro>
   </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/gtk-encode-symbolic-svg.vcxproj

@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{3281202A-CD26-4C67-B892-EB34BDBC6131}</ProjectGuid>
-    <RootNamespace>gtkencodesymbolicsvg</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\gtk\encodesymbolic.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gdk.vcxproj">
-      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

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

@@ -58,13 +58,14 @@ echo $(Configuration) > ..\..\..\MSVC_$(Configuration)
 :DONE_GDKCONFIG_H
     </GenGdkConfigHBroadway>
     <GenerateGtkDbusBuiltSources>
+set PATH=$(PATH);$(PythonPath)
+
 cd ..\..\..\gtk
 
-$(PythonPath)\python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml
+python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml
 
 cd $(SolutionDir)
     </GenerateGtkDbusBuiltSources>
-    <GenerateGtkWin32RC>$(PythonPath)\python ..\process-in-win32.py --gtkwin32rc --gtk3manifest</GenerateGtkWin32RC>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtkgensrcsprops</_PropertySheetDisplayName>
@@ -82,8 +83,5 @@ cd $(SolutionDir)
     <BuildMacro Include="GenerateGtkDbusBuiltSources">
       <Value>$(GenerateGtkDbusBuiltSources)</Value>
     </BuildMacro>
-    <BuildMacro Include="GenerateGtkWin32RC">
-      <Value>$(GenerateGtkWin32RC)</Value>
-    </BuildMacro>
   </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/gtk-inspector.vcxproj.filtersin

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-#include "libgtk-inspector.vs10.sourcefiles.filters"
-  </ItemGroup>
-</Project>

build/win32/vs10/gtk-install.props

@@ -4,10 +4,6 @@
     <Import Project="gtk-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
-    <InstalledDlls>$(BinDir)\$(GtkDllPrefix)gdk(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gtk(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gailutil(GtkDllSuffix).dll</InstalledDlls>
-    <InstalledBins>$(BinDir)\gtk3-demo.exe;$(BinDir)\gtk3-demo-application.exe;$(BinDir)\gtk-encode-symbolic-svg.exe</InstalledBins>
-    <InstalledBroadwayBins>$(BinDir)\broadwayd.exe</InstalledBroadwayBins>
     <GtkDoInstallBin>
 mkdir $(CopyDir)\bin
 
@@ -19,22 +15,22 @@ if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_BIN
 if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_BIN
 
 
-copy "$(BinDir)\*.dll" $(CopyDir)\bin
+copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin
 
-copy "$(BinDir)\*-$(ApiVersion).lib" $(CopyDir)\lib
+copy $(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib
 
-copy "$(BinDir)\*.exe" $(CopyDir)\bin
+copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin
 
 goto DONE_BIN
 
 
 :DO_BROADWAY_BIN
 
-copy "$(BinDir)\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll" $(CopyDir)\bin
+copy $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll $(CopyDir)\bin
 
-copy "$(BinDir)\gdk-$(ApiVersion).lib" $(CopyDir)\lib
+copy $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib
 
-copy "$(BinDir)\broadwayd.exe" $(CopyDir)\bin
+copy $(Configuration)\$(Platform)\bin\broadwayd.exe $(CopyDir)\bin
 
 
 if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin
@@ -68,8 +64,6 @@ mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk
 
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32
 
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated
-
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
@@ -160,8 +154,6 @@ copy ..\..\..\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
 
 copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
 
-copy ..\..\..\gdk\deprecated\gdkcolor.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated
-
 copy ..\..\..\gtk\a11y\gtkarrowaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
 
 copy ..\..\..\gtk\a11y\gtkbooleancellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
@@ -284,6 +276,8 @@ copy ..\..\..\gtk\gtkactionbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkadjustment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkalignment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkappchooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkappchooserbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -296,6 +290,8 @@ copy ..\..\..\gtk\gtkapplication.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkapplicationwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkarrow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkaspectframe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkassistant.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -394,8 +390,6 @@ copy ..\..\..\gtk\gtkenums.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkeventbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkeventcontroller.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkexpander.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkfilechooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -422,24 +416,6 @@ copy ..\..\..\gtk\gtkfontchooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gt
 
 copy ..\..\..\gtk\gtkframe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkgesture.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkgesturedrag.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkgesturelongpress.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkgesturemultipress.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkgesturepan.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkgesturerotate.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkgesturesingle.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkgestureswipe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkgesturezoom.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkgrid.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkheaderbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -494,12 +470,16 @@ copy ..\..\..\gtk\gtkmenutoolbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkmessagedialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkmisc.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkmodules.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkmountoperation.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtknotebook.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
+copy ..\..\..\gtk\gtknumerableicon.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkoffscreenwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkorientable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -674,8 +654,6 @@ copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkwindowgroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
 copy ..\..\..\gtk\gtktextlayout.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -688,10 +666,6 @@ copy ..\..\..\gtk\deprecated\gtkaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gt
 
 copy ..\..\..\gtk\deprecated\gtkactiongroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
 
-copy ..\..\..\gtk\deprecated\gtkalignment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkarrow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
-
 copy ..\..\..\gtk\deprecated\gtkcolorsel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
 
 copy ..\..\..\gtk\deprecated\gtkcolorseldialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
@@ -720,10 +694,6 @@ copy ..\..\..\gtk\deprecated\gtkiconfactory.h $(CopyDir)\include\gtk-$(ApiVersio
 
 copy ..\..\..\gtk\deprecated\gtkimagemenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
 
-copy ..\..\..\gtk\deprecated\gtkmisc.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtknumerableicon.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
-
 copy ..\..\..\gtk\deprecated\gtkradioaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
 
 copy ..\..\..\gtk\deprecated\gtkrc.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
@@ -802,8 +772,6 @@ copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib
 
 copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
 
-copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas
-
 copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas
 
 
@@ -830,18 +798,6 @@ copy ..\..\..\gdk\broadway\gdkbroadwayvisual.h $(CopyDir)\include\gtk-$(ApiVersi
     <_PropertySheetDisplayName>gtkinstallsprops</_PropertySheetDisplayName>
   </PropertyGroup>
   <ItemGroup>
-    <BuildMacro Include="BinDir">
-      <Value>$(BinDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="InstalledDlls">
-      <Value>$(InstalledDlls)</Value>
-    </BuildMacro>
-    <BuildMacro Include="InstalledBins">
-      <Value>$(InstalledBins)</Value>
-    </BuildMacro>
-    <BuildMacro Include="InstalledBroadwayBins">
-      <Value>$(InstalledBroadwayBins)</Value>
-    </BuildMacro>
     <BuildMacro Include="GtkDoInstallBin">
       <Value>$(GtkDoInstallBin)</Value>
     </BuildMacro>

build/win32/vs10/gtk-version-paths.props

@@ -5,7 +5,6 @@
     <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>..\..\..\..\vs$(VSVer)\$(Platform)</CopyDir>
     <ApiVersion>3.0</ApiVersion>
-    <GtkVersion>@GTK_VERSION@</GtkVersion>
     <GtkLibtoolCompatibleDllPrefix>lib</GtkLibtoolCompatibleDllPrefix>
     <GtkLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</GtkLibtoolCompatibleDllSuffix>
     <GtkSeparateVSDllPrefix />
@@ -30,9 +29,6 @@
     <BuildMacro Include="ApiVersion">
       <Value>$(ApiVersion)</Value>
     </BuildMacro>
-    <BuildMacro Include="GtkVersion">
-      <Value>$(GtkVersion)</Value>
-    </BuildMacro>
     <BuildMacro Include="GtkLibtoolCompatibleDllPrefix">
       <Value>$(GtkLibtoolCompatibleDllPrefix)</Value>
     </BuildMacro>

build/win32/vs10/gtk.vcxproj.filtersin

@@ -19,7 +19,6 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\..\gtk\gtkdbusinterfaces.xml"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\..\gtk\gtk-win32.rc.in"><Filter>Resource Files</Filter></CustomBuild>
   </ItemGroup>
   <ItemGroup>
 #include "libgtk.vs10.sourcefiles.filters"
@@ -39,7 +38,4 @@
     <ClCompile Include="..\..\..\modules\input\imviqr.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\modules\input\thai-charprop.c"><Filter>Source Files</Filter></ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <Manifest Include="..\..\..\gtk\libgtk3.manifest"><Filter>Resource Files</Filter></Manifest>
-  </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/gtk.vcxprojin

@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -96,7 +96,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -118,7 +118,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -139,7 +139,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -173,20 +173,6 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGtkDbusBuiltSources)</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\gtk\gtk-win32.rc.in">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating GTK+ Win32 Version Resource...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateGtkWin32RC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating GTK+ Win32 Version Resource...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateGtkWin32RC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating GTK+ Win32 Version Resource...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateGtkWin32RC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating GTK+ Win32 Version Resource...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGtkWin32RC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
-    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\gtk\gtk-win32.rc" />
@@ -209,16 +195,13 @@
     <ClCompile Include="..\..\..\modules\input\imviqr.c" />
     <ClCompile Include="..\..\..\modules\input\thai-charprop.c" />
   </ItemGroup>
-  <ItemGroup>
-    <Manifest Include="..\..\..\gtk\libgtk3.manifest" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk.vcxproj">
       <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="gtk-inspector.vcxproj">
-      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073fd}</Project>
+    <ProjectReference Include="gtka11y.vcxproj">
+      <Project>{f756b0db-40a1-4e9f-be1f-8f02cb86ea46}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>

build/win32/vs10/gtk3-demo.vcxproj

@@ -189,7 +189,6 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\entry_completion.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\event_axes.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\expander.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\gestures.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\headerbar.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\hypertext.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\iconview.c" />

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

@@ -31,7 +31,6 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\entry_completion.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\event_axes.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\expander.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\gestures.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\headerbar.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\hypertext.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\iconview.c"><Filter>Source Files</Filter></ClCompile>

build/win32/vs10/gtka11y.vcxproj.filtersin

@@ -15,6 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\gtk\encodesymbolic.c"><Filter>Sources</Filter></ClCompile>
+#include "gtka11y.vs10.sourcefiles.filters"
   </ItemGroup>
 </Project>

build/win32/vs10/gtka11y.vcxprojin

@@ -19,8 +19,8 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}</ProjectGuid>
-    <RootNamespace>gtkinspector</RootNamespace>
+    <ProjectGuid>{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}</ProjectGuid>
+    <RootNamespace>gtka11y</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -69,8 +69,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -80,22 +80,11 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -105,10 +94,24 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -117,7 +120,7 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-#include "libgtk-inspector.vs10.sourcefiles"
+#include "gtka11y.vs10.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gtk-prebuild.vcxproj">

build/win32/vs10/install.vcxproj

@@ -139,49 +139,45 @@
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" />
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstallBin)$(GtkDoInstall)</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstallBin)$(GtkDoInstall)</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstallBin)$(GtkDoInstall)</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstallBin)$(GtkDoInstall)</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\..\config.h.win32">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Installing Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Installing Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Installing Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Installing Build Results...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk.vcxproj">
       <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
@@ -207,10 +203,6 @@
       <Project>{3281202a-cd26-4c67-b892-eb34bdbc6130}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="gtk-encode-symbolic-svg.vcxproj">
-      <Project>{3281202a-cd26-4c67-b892-eb34bdbc6131}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

build/win32/vs11/Makefile.am

@@ -1,45 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-EXTRA_DIST +=	\
-	README.txt	\
-	gtk+.sln	\
-	gtk-prebuild.vcxproj	\
-	gdk-win32.vcxproj	\
-	gdk-win32.vcxproj.filters	\
-	gdk.vcxproj	\
-	gdk.vcxproj.filters	\
-	gtk.vcxproj	\
-	gtk.vcxproj.filters	\
-	gtk-encode-symbolic-svg.vcxproj	\
-	gtk-encode-symbolic-svg.vcxproj.filters	\
-	gtk3-demo.vcxproj	\
-	gtk3-demo.vcxproj.filters	\
-	gtk3-demo-application.vcxproj	\
-	gtk3-demo-application.vcxproj.filters	\
-	gtk-inspector.vcxproj	\
-	gtk-inspector.vcxproj.filters	\
-	gailutil.vcxproj	\
-	gailutil.vcxproj.filters	\
-	install.vcxproj	\
-	broadwayd.vcxproj	\
-	broadwayd.vcxproj.filters	\
-	gdk-broadway.vcxproj	\
-	gdk-broadway.vcxproj.filters	\
-	gtk-build-defines.props	\
-	gtk-copy-gdk-broadway.props	\
-	gtk-gen-srcs.props	\
-	gtk-ignore-broadway.props	\
-	gtk-install.props	\
-	gtk-version-paths.props
-
-DISTCLEANFILES = $(EXTRA_DIST)
-
-MSVC_SLN = gtk+
-
-MSVC_VER = 11
-
-MSVC_VER_LONG = 2012
-
-include $(top_srcdir)/build/Makefile-newvs.am
-
--include $(top_srcdir)/git.mk

build/win32/vs12/Makefile.am

@@ -1,45 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-EXTRA_DIST +=	\
-	README.txt	\
-	gtk+.sln	\
-	gtk-prebuild.vcxproj	\
-	gdk-win32.vcxproj	\
-	gdk-win32.vcxproj.filters	\
-	gdk.vcxproj	\
-	gdk.vcxproj.filters	\
-	gtk.vcxproj	\
-	gtk.vcxproj.filters	\
-	gtk-encode-symbolic-svg.vcxproj	\
-	gtk-encode-symbolic-svg.vcxproj.filters	\
-	gtk3-demo.vcxproj	\
-	gtk3-demo.vcxproj.filters	\
-	gtk3-demo-application.vcxproj	\
-	gtk3-demo-application.vcxproj.filters	\
-	gtk-inspector.vcxproj	\
-	gtk-inspector.vcxproj.filters	\
-	gailutil.vcxproj	\
-	gailutil.vcxproj.filters	\
-	install.vcxproj	\
-	broadwayd.vcxproj	\
-	broadwayd.vcxproj.filters	\
-	gdk-broadway.vcxproj	\
-	gdk-broadway.vcxproj.filters	\
-	gtk-build-defines.props	\
-	gtk-copy-gdk-broadway.props	\
-	gtk-gen-srcs.props	\
-	gtk-ignore-broadway.props	\
-	gtk-install.props	\
-	gtk-version-paths.props
-
-DISTCLEANFILES = $(EXTRA_DIST)
-
-MSVC_SLN = gtk+
-
-MSVC_VER = 12
-
-MSVC_VER_LONG = 2013
-
-include $(top_srcdir)/build/Makefile-newvs.am
-
--include $(top_srcdir)/git.mk

build/win32/vs9/Makefile.am

@@ -9,11 +9,10 @@ EXTRA_DIST +=	\
 	gdk.vcprojin	\
 	gtk.vcproj	\
 	gtk.vcprojin	\
-	gtk-encode-symbolic-svg.vcproj	\
 	gtk3-demo.vcproj	\
 	gtk3-demo-application.vcproj	\
-	gtk-inspector.vcproj	\
-	gtk-inspector.vcprojin	\
+	gtka11y.vcproj	\
+	gtka11y.vcprojin	\
 	gailutil.vcproj	\
 	install.vcproj	\
 	broadwayd.vcproj	\
@@ -23,7 +22,6 @@ EXTRA_DIST +=	\
 	gtk-gen-srcs.vsprops	\
 	gtk-ignore-broadway.vsprops	\
 	gtk-install.vsprops	\
-	gtk-version-paths.vsprops.in	\
 	gtk-version-paths.vsprops
 
 -include $(top_srcdir)/git.mk

build/win32/vs9/gtk+.sln

@@ -23,7 +23,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcproj", "{FC5AA
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-inspector", "gtk-inspector.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.vcproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}
 	EndProjectSection
@@ -31,7 +31,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46} = {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
@@ -46,11 +46,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo-application", "gt
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-encode-symbolic-svg", "gtk-encode-symbolic-svg.vcproj", "{3281202A-CD26-4C67-B892-EB34BDBC6131}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
@@ -65,7 +60,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj",
 		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942} = {29E3E814-1BA3-4AD7-A3A7-3669CB80A942}
 		{3281202A-CD26-4C67-B892-EB34BDBC612F} = {3281202A-CD26-4C67-B892-EB34BDBC612F}
 		{3281202A-CD26-4C67-B892-EB34BDBC6130} = {3281202A-CD26-4C67-B892-EB34BDBC6130}
-		{3281202A-CD26-4C67-B892-EB34BDBC6131} = {3281202A-CD26-4C67-B892-EB34BDBC6131}
 	EndProjectSection
 EndProject
 Global
@@ -144,22 +138,6 @@ Global
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.Build.0 = Release_Broadway|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.Build.0 = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.Build.0 = Release|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.Build.0 = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.ActiveCfg = Debug|x64
@@ -176,6 +154,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
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.Build.0 = Debug|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|x64.ActiveCfg = Debug|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|x64.Build.0 = Debug|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|Win32.ActiveCfg = Release|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|Win32.Build.0 = Release|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.ActiveCfg = Release|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.Build.0 = Release|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|Win32.Build.0 = Debug|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|x64.ActiveCfg = Debug|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|x64.Build.0 = Debug|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|Win32.ActiveCfg = Release|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|Win32.Build.0 = Release|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|x64.ActiveCfg = Release|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|x64.Build.0 = Release|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
@@ -240,22 +234,6 @@ Global
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|x64.Build.0 = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|Win32.Build.0 = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|x64.ActiveCfg = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|x64.Build.0 = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release|Win32.ActiveCfg = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release|Win32.Build.0 = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release|x64.ActiveCfg = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release|x64.Build.0 = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug_Broadway|Win32.Build.0 = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug_Broadway|x64.Build.0 = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release_Broadway|Win32.Build.0 = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release_Broadway|x64.ActiveCfg = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release_Broadway|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

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

@@ -40,6 +40,6 @@
 	/>
 	<UserMacro
 		Name="GtkDefines"
-		Value="GTK_COMPILATION;G_LOG_DOMAIN=\&quot;Gtk\&quot;;GTK_HOST=\&quot;i686-pc-vs$(VSVer)\&quot;;GTK_PRINT_BACKENDS=\&quot;file\&quot;;GTK_PRINT_PREVIEW_COMMAND=\&quot;undefined-gtk-print-preview-command\&quot;;$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot;;GTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot;GTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;;GTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot;;MULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\&quot;;MULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot;;GTK_VERSION=\&quot;$(GtkVersion)/etc\&quot;;GTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)/etc\&quot;;GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED"
+		Value="GTK_COMPILATION;G_LOG_DOMAIN=\&quot;Gtk\&quot;;GTK_HOST=\&quot;i686-pc-vs$(VSVer)\&quot;;GTK_PRINT_BACKENDS=\&quot;file\&quot;;GTK_PRINT_PREVIEW_COMMAND=\&quot;undefined-gtk-print-preview-command\&quot;;$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot;;GTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot;GTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;;GTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot;;MULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\&quot;;MULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot;;GTK_VERSION=\&quot;$(GtkVersion)/etc\&quot;;GTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)/etc\&quot;;GDK_DISABLE_DEPRECATED"
 	/>
-</VisualStudioPropertySheet>
+</VisualStudioPropertySheet>

build/win32/vs9/gtk-encode-symbolic-svg.vcproj

@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk-encode-symbolic-svg"
-	ProjectGUID="{3281202A-CD26-4C67-B892-EB34BDBC6131}"
-	RootNamespace="gtkencodesymbolicsvg"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\..\gdk"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\..\gdk"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\gtk\encodesymbolic.c" />
-		</Filter>
-		<Filter
-			Name="Headers"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

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

@@ -57,13 +57,11 @@ echo $(ConfigurationName) > ..\..\..\MSVC_$(ConfigurationName)

 	<UserMacro
 		Name="GenerateGtkDbusBuiltSources"
 		Value="
+set PATH=$(PATH);$(PythonPath)&#x0D;&#x0A;
+
 cd ..\..\..\gtk&#x0D;&#x0A;
-$(PythonPath)\python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml&#x0D;&#x0A;
+python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml&#x0D;&#x0A;
 cd $(SolutionDir)&#x0D;&#x0A;
 		      "
 	/>
-	<UserMacro
-		Name="GenerateGtkWin32RC"
-		Value="$(PythonPath)\python ..\process-in-win32.py --gtkwin32rc --gtk3manifest"
-	/>
-</VisualStudioPropertySheet>
+</VisualStudioPropertySheet>

build/win32/vs9/gtk-install.vsprops

@@ -45,7 +45,6 @@ echo off

 
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk

 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32

-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated

 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y

 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

@@ -62,6 +61,7 @@ copy ..\..\..\gdk\win32\gdkwin32window.h $(CopyDir)\include\gtk-$(ApiVersion)\gd
 copy ..\..\..\gdk\gdk.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

 copy ..\..\..\gdk\gdkapplaunchcontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

 copy ..\..\..\gdk\gdkcairo.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

+copy ..\..\..\gdk\gdkcolor.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

 copy ..\..\..\gdk\gdkcursor.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

 copy ..\..\..\gdk\gdkdevice.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

 copy ..\..\..\gdk\gdkdevicemanager.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

@@ -91,7 +91,6 @@ copy ..\..\..\gdk\gdkwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
&#x0
 copy ..\..\..\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

 copy ..\..\..\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

 copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

-copy ..\..\..\gdk\deprecated\gdkcolor.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated

 copy ..\..\..\gtk\a11y\gtkarrowaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y

 copy ..\..\..\gtk\a11y\gtkbooleancellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y

 copy ..\..\..\gtk\a11y\gtkbuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y

@@ -153,12 +152,14 @@ copy ..\..\..\gtk\gtkaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 copy ..\..\..\gtk\gtkactionable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkactionbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkadjustment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtkalignment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkappchooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkappchooserbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkappchooserdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkappchooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkapplication.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkapplicationwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtkarrow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkaspectframe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkassistant.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkbbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

@@ -208,7 +209,6 @@ copy ..\..\..\gtk\gtkentrybuffer.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D
 copy ..\..\..\gtk\gtkentrycompletion.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkenums.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkeventbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtkeventcontroller.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkexpander.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkfilechooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkfilechooserbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

@@ -222,15 +222,6 @@ copy ..\..\..\gtk\gtkfontchooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D
 copy ..\..\..\gtk\gtkfontchooserdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkfontchooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkframe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtkgesture.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtkgesturedrag.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtkgesturelongpress.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtkgesturemultipress.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtkgesturepan.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtkgesturerotate.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtkgesturesingle.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtkgestureswipe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtkgesturezoom.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkgrid.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkheaderbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkicontheme.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

@@ -258,9 +249,11 @@ copy ..\..\..\gtk\gtkmenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
&#
 copy ..\..\..\gtk\gtkmenushell.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkmenutoolbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkmessagedialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtkmisc.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkmodules.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkmountoperation.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtknotebook.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtknumerableicon.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkoffscreenwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkorientable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkoverlay.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

@@ -348,15 +341,12 @@ copy ..\..\..\gtk\gtkvolumebutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0
 copy ..\..\..\gtk\gtkwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

-copy ..\..\..\gtk\gtkwindowgroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtktextlayout.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkversion.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\deprecated\gtkactivatable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkactiongroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkalignment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkarrow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkcolorsel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkcolorseldialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkfontsel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

@@ -371,8 +361,6 @@ copy ..\..\..\gtk\deprecated\gtkhseparator.h $(CopyDir)\include\gtk-$(ApiVersion
 copy ..\..\..\gtk\deprecated\gtkhsv.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkiconfactory.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkimagemenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtkmisc.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

-copy ..\..\..\gtk\deprecated\gtknumerableicon.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkradioaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkrc.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

 copy ..\..\..\gtk\deprecated\gtkrecentaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated

@@ -416,7 +404,6 @@ copy ..\..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\h
 mkdir $(CopyDir)\share\glib-2.0\schemas

 copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas

 copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas

-copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas

 copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas

 
 echo "Compiling gsettings XML Files..."


build/win32/vs9/gtk-version-paths.vsprops

@@ -20,10 +20,6 @@
 		Name="ApiVersion"
 		Value="3.0"
 	/>
-	<UserMacro
-		Name="GtkVersion"
-		Value="@GTK_VERSION@"
-	/>
 	<UserMacro
 		Name="GtkLibtoolCompatibleDllPrefix"
 		Value="lib"

build/win32/vs9/gtk.vcprojin

@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"
 				PreprocessorDefinitions="$(GtkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -95,7 +95,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -127,7 +127,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"
 				PreprocessorDefinitions="$(GtkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -192,38 +192,7 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File RelativePath="..\..\..\gtk\gtk-win32.rc.in">
-				<FileConfiguration Name="Debug|Win32">
-				<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ Win32 Version Resource..."
-						CommandLine="$(GenerateGtkWin32RC)"
-						Outputs="..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ Win32 Version Resource..."
-						CommandLine="$(GenerateGtkWin32RC)"
-						Outputs="..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ Win32 Version Resource..."
-						CommandLine="$(GenerateGtkWin32RC)"
-						Outputs="..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ Win32 Version Resource..."
-						CommandLine="$(GenerateGtkWin32RC)"
-						Outputs="..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest"
-					/>
-				</FileConfiguration>
-			</File>
 			<File RelativePath="..\..\..\gtk\gtk-win32.rc" />
-			<File RelativePath="..\..\..\gtk\libgtk3.manifest" />
 		</Filter>
 		<Filter
 			Name="Source Files"

build/win32/vs9/gtk3-demo.vcproj

@@ -180,7 +180,6 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\entry_completion.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\event_axes.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\expander.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\gestures.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\headerbar.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\hypertext.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\iconview.c" />

build/win32/vs9/gtka11y.vcprojin

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="big5"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="gtk-inspector"
-	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}"
-	RootNamespace="gtkinspector"
+	Name="gtka11y"
+	ProjectGUID="{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
+	RootNamespace="gtka11y"
 	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
+	TargetFrameworkVersion="196613"
 	>
 	<Platforms>
 		<Platform
@@ -31,8 +31,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -41,26 +41,6 @@
 				DebugInformationFormat="4"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk-build-defines.vsprops"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="$(GtkDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-		</Configuration>
 		<Configuration
 			Name="Debug|x64"
 			InheritedPropertySheets=".\gtk-build-defines.vsprops"
@@ -73,8 +53,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -83,6 +63,29 @@
 				DebugInformationFormat="3"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="$(GtkDefines)"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+		</Configuration>
 		<Configuration
 			Name="Release|x64"
 			InheritedPropertySheets=".\gtk-build-defines.vsprops"
@@ -95,8 +98,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="$(GtkDefines)"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -108,23 +111,25 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Header Files"
+			Name="Sources"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+#include "gtka11y.sourcefiles"
+		</Filter>
+		<Filter
+			Name="Headers"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "libgtk-inspector.sourcefiles"
-		</Filter>
 	</Files>
+	<Globals>
+	</Globals>
 </VisualStudioProject>

configure.ac

@@ -9,9 +9,9 @@
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [13])
-m4_define([gtk_micro_version], [9])
-m4_define([gtk_interface_age], [0])
+m4_define([gtk_minor_version], [12])
+m4_define([gtk_micro_version], [1])
+m4_define([gtk_interface_age], [1])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
@@ -41,13 +41,13 @@ AC_CANONICAL_HOST
 m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.41.2])
+m4_define([glib_required_version], [2.39.5])
 m4_define([pango_required_version], [1.32.4])
-m4_define([atk_required_version], [2.12.0])
+m4_define([atk_required_version], [2.7.5])
 m4_define([cairo_required_version], [1.12.0])
-m4_define([gdk_pixbuf_required_version], [2.30.0])
+m4_define([gdk_pixbuf_required_version], [2.27.1])
 m4_define([introspection_required_version], [1.39.0])
-m4_define([wayland_required_version], [1.5.91])
+m4_define([wayland_required_version], [1.3.90])
 GLIB_REQUIRED_VERSION=glib_required_version
 PANGO_REQUIRED_VERSION=pango_required_version
 ATK_REQUIRED_VERSION=atk_required_version
@@ -184,14 +184,8 @@ case $host in
   *-*-linux*)
     os_linux=yes
     ;;
-  *-*-darwin*)
-    os_darwin=yes
-    ;;
 esac
 
-# Define _GNU_SOURCE etc. where appropriate, e.g. for strptime() on glibc
-AC_USE_SYSTEM_EXTENSIONS
-
 dnl
 dnl Check for a working C++ compiler, but do not bail out, if none is found.
 dnl We use this for an automated test for C++ header correctness.
@@ -234,7 +228,7 @@ LT_OUTPUT
 AC_SYS_LARGEFILE
 
 AM_PROG_AS
-AC_PATH_TOOL(NM, nm, nm)
+AC_PATH_PROG(NM, nm, nm)
 
 AC_MSG_CHECKING([for some Win32 platform])
 case "$host" in
@@ -251,7 +245,6 @@ AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
 AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
 AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")
 AM_CONDITIONAL(OS_LINUX, test "$os_linux" = "yes")
-AM_CONDITIONAL(OS_DARWIN, test "$os_darwin" = "yes")
 
 if test "$os_win32" = "yes"; then
   AC_CHECK_TOOL(WINDRES, windres, no)
@@ -404,11 +397,6 @@ else
 fi
 AC_SUBST(DISABLE_ON_QUARTZ)
 
-AC_CHECK_LIB([rt], [shm_open], [SHM_LIBS="-lrt"], [SHM_LIBS=""])
-AC_SUBST(SHM_LIBS)
-
-AC_CHECK_FUNCS(posix_fallocate)
-
 if test "x$enable_broadway_backend" = xyes; then
   GDK_BACKENDS="$GDK_BACKENDS broadway"
   cairo_backends="$cairo_backends cairo"
@@ -747,6 +735,9 @@ LIBS="$LIBS $GLIB_LIBS"
 AC_CHECK_FUNCS(bind_textdomain_codeset)
 LIBS=$gtk_save_LIBS
 
+AC_CHECK_HEADERS(pwd.h,
+                 AC_DEFINE(HAVE_PWD_H, 1,
+                           [Define to 1 if pwd.h is available]))
 AC_CHECK_HEADERS(sys/mman.h,
                  AC_DEFINE(HAVE_SYS_MMAN_H, 1,
                            [Define to 1 if mman.h is available]))
@@ -936,9 +927,7 @@ AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
 AS_IF([test "x$enable_gtk2_dependency" = xyes],
       [AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
        if test x$GTK_UPDATE_ICON_CACHE = xno; then
-         AC_MSG_ERROR([
-*** --enable-gtk2-dependency has been set but no existing
-*** `gtk-update-icon-cache` has been found in the path.])
+         REBUILD_PNGS=#
        fi],
 
       [test "x$cross_compiling" = xyes],
@@ -956,21 +945,22 @@ AS_IF([test "x$enable_gtk2_dependency" = xyes],
 
        NATIVE_GDKPIXBUF_CFLAGS=`$PKG_CONFIG_FOR_BUILD --cflags gdk-pixbuf-2.0`
        NATIVE_GDKPIXBUF_LIBS=`$PKG_CONFIG_FOR_BUILD --libs gdk-pixbuf-2.0`
-       # This is the native gtk-update-icon-cache which will be used at
-       # build time, NOT the one installed on the target host.
-       GTK_UPDATE_ICON_CACHE="`cd $builddir && pwd`/gtk/native/native-update-icon-cache$BUILD_EXEEXT"
        AC_SUBST(NATIVE_GDKPIXBUF_CFLAGS)
-       AC_SUBST(NATIVE_GDKPIXBUF_LIBS)
-       AC_SUBST(GTK_UPDATE_ICON_CACHE)],
-
-      [# In native compiling case, the gtk-update-icon-cache installed
-       # is the same as the one used during build.
-       GTK_UPDATE_ICON_CACHE="\$(abs_top_builddir)/gtk/gtk-update-icon-cache$EXEEXT"
-       AC_SUBST(GTK_UPDATE_ICON_CACHE)]
+       AC_SUBST(NATIVE_GDKPIXBUF_LIBS)]
 )
 
 AM_CONDITIONAL(USE_EXTERNAL_ICON_CACHE, [test "x$enable_gtk2_dependency" = xyes])
 
+AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
+
+if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
+   test "x$REBUILD_PNGS" = "x#" ; then
+     AC_MSG_ERROR([
+*** gtkbuiltincache.h is not in the tree, and cannot be built
+*** because you don't have libpng, or (when cross-compiling) you
+*** don't have a prebuilt gtk-update-icon-cache on the build system.])
+fi
+
 ########################################
 # Windowing system checks
 ########################################
@@ -1449,7 +1439,7 @@ AC_ARG_ENABLE(cups,
 if test "x$enable_cups" = "xno"; then
   AM_CONDITIONAL(HAVE_CUPS, false)
 else
-  AC_PATH_TOOL(CUPS_CONFIG, cups-config, no)
+  AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
   if test "x$CUPS_CONFIG" = "xno"; then
     if test "x$enable_cups" = "xauto"; then
       AM_CONDITIONAL(HAVE_CUPS, false)
@@ -1841,10 +1831,9 @@ po-properties/Makefile.in
 demos/Makefile
 demos/gtk-demo/Makefile
 demos/gtk-demo/geninclude.pl
+demos/pixbuf-demo/Makefile
 demos/widget-factory/Makefile
-demos/icon-browser/Makefile
 examples/Makefile
-examples/bp/Makefile
 examples/application1/Makefile
 examples/application2/Makefile
 examples/application3/Makefile
@@ -1859,7 +1848,6 @@ tests/Makefile
 tests/visuals/Makefile
 testsuite/Makefile
 testsuite/a11y/Makefile
-testsuite/a11y/state/Makefile
 testsuite/css/Makefile
 testsuite/css/parser/Makefile
 testsuite/gdk/Makefile
@@ -1876,15 +1864,10 @@ docs/reference/libgail-util/Makefile
 docs/reference/libgail-util/version.xml
 docs/tools/Makefile
 build/Makefile
-build/gtk-introspection-msvc.mak
 build/win32/Makefile
 build/win32/crypt/Makefile
 build/win32/vs9/Makefile
-build/win32/vs9/gtk-version-paths.vsprops
 build/win32/vs10/Makefile
-build/win32/vs10/gtk-version-paths.props
-build/win32/vs11/Makefile
-build/win32/vs12/Makefile
 gdk/Makefile
 gdk/broadway/Makefile
 gdk/x11/Makefile
@@ -1898,12 +1881,12 @@ gtk/Makefile
 gtk/makefile.msc
 gtk/gtkversion.h
 gtk/gtk-win32.rc
-gtk/libgtk3.manifest
-gtk/inspector/Makefile
+gtk/a11y/Makefile
 gtk/native/Makefile
-util/Makefile
 libgail-util/Makefile
 modules/Makefile
+modules/engines/Makefile
+modules/engines/pixbuf/Makefile
 modules/input/Makefile
 modules/printbackends/Makefile
 modules/printbackends/cups/Makefile

demos/Makefile.am

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

demos/gtk-demo/Makefile.am

@@ -24,7 +24,6 @@ demos =						\
 	entry_completion.c			\
 	event_axes.c				\
 	expander.c  				\
-	gestures.c				\
 	headerbar.c				\
 	hypertext.c				\
 	iconview.c				\
@@ -124,7 +123,6 @@ RESOURCES=	$(demos)			\
 		revealer.ui			\
 		theming.ui			\
 		listbox.ui			\
-		popover.ui			\
 		alphatest.png			\
 		apple-red.png			\
 		brick.png			\
@@ -165,7 +163,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png
 dist_appsicon48_DATA = data/48x48/gtk3-demo.png
 dist_appsicon256_DATA = data/256x256/gtk3-demo.png
 
-update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
+update_icon_cache = gtk-update-icon-cache --ignore-theme-index --force
 
 install-data-hook: install-update-icon-cache
 uninstall-hook: uninstall-update-icon-cache

demos/gtk-demo/button_box.c

@@ -95,7 +95,7 @@ do_button_box (GtkWidget *do_widget)
                         TRUE, TRUE, 5);
 
     gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Expand", 0, GTK_BUTTONBOX_EXPAND),
+                        create_bbox (TRUE, "Expand", 40, GTK_BUTTONBOX_EXPAND),
                         TRUE, TRUE, 5);
 
     frame_vert = gtk_frame_new ("Vertical Button Boxes");
@@ -124,7 +124,7 @@ do_button_box (GtkWidget *do_widget)
                         create_bbox (FALSE, "Center", 10, GTK_BUTTONBOX_CENTER),
                         TRUE, TRUE, 5);
     gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Expand", 0, GTK_BUTTONBOX_EXPAND),
+                        create_bbox (FALSE, "Expand", 10, GTK_BUTTONBOX_EXPAND),
                         TRUE, TRUE, 5);
   }
 

demos/gtk-demo/colorsel.c

@@ -42,7 +42,7 @@ response_cb (GtkDialog *dialog,
       gtk_widget_override_background_color (da, 0, &color);
     }
 
-  gtk_widget_destroy (GTK_WIDGET (dialog));
+  gtk_widget_hide (GTK_WIDGET (dialog));
 }
 
 static void

demos/gtk-demo/demo.gresource.xml

@@ -94,7 +94,6 @@
     <file>event_axes.c</file>
     <file>expander.c</file>
     <file>flowbox.c</file>
-    <file>gestures.c</file>
     <file>headerbar.c</file>
     <file>hypertext.c</file>
     <file>iconview.c</file>

demos/gtk-demo/editable_cells.c

@@ -351,6 +351,7 @@ do_editable_cells (GtkWidget *do_widget)
 
       /* create tree view */
       treeview = gtk_tree_view_new_with_model (items_model);
+      gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
       gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),
                                    GTK_SELECTION_SINGLE);
 

demos/gtk-demo/gestures.c

@@ -1,199 +0,0 @@
-/* Gestures
- *
- * Perform gestures on touchscreens and other input devices. This
- * demo reacts to long presses and swipes from all devices, plus
- * multi-touch rotate and zoom gestures.
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-static GtkGesture *rotate = NULL;
-static GtkGesture *zoom = NULL;
-static gdouble swipe_x = 0;
-static gdouble swipe_y = 0;
-static gboolean long_pressed = FALSE;
-
-static void
-swipe_gesture_swept (GtkGestureSwipe *gesture,
-                     gdouble          velocity_x,
-                     gdouble          velocity_y,
-                     GtkWidget       *widget)
-{
-  swipe_x = velocity_x / 10;
-  swipe_y = velocity_y / 10;
-  gtk_widget_queue_draw (widget);
-}
-
-static void
-long_press_gesture_pressed (GtkGestureLongPress *gesture,
-                            gdouble              x,
-                            gdouble              y,
-                            GtkWidget           *widget)
-{
-  long_pressed = TRUE;
-  gtk_widget_queue_draw (widget);
-}
-
-static void
-long_press_gesture_end (GtkGesture       *gesture,
-                        GdkEventSequence *sequence,
-                        GtkWidget        *widget)
-{
-  long_pressed = FALSE;
-  gtk_widget_queue_draw (widget);
-}
-
-static void
-rotation_angle_changed (GtkGestureRotate *gesture,
-                        gdouble           angle,
-                        gdouble           delta,
-                        GtkWidget        *widget)
-{
-  gtk_widget_queue_draw (widget);
-}
-
-static void
-zoom_scale_changed (GtkGestureZoom *gesture,
-                    gdouble         scale,
-                    GtkWidget      *widget)
-{
-  gtk_widget_queue_draw (widget);
-}
-
-static gboolean
-drawing_area_draw (GtkWidget *widget,
-                   cairo_t   *cr)
-{
-  GtkAllocation allocation;
-
-  gtk_widget_get_allocation (widget, &allocation);
-
-  if (swipe_x != 0 || swipe_y != 0)
-    {
-      cairo_save (cr);
-      cairo_set_line_width (cr, 6);
-      cairo_move_to (cr, allocation.width / 2,
-                     allocation.height / 2);
-      cairo_rel_line_to (cr, swipe_x, swipe_y);
-      cairo_set_source_rgba (cr, 1, 0, 0, 0.5);
-      cairo_stroke (cr);
-      cairo_restore (cr);
-    }
-
-  if (gtk_gesture_is_recognized (rotate) || gtk_gesture_is_recognized (zoom))
-    {
-      cairo_pattern_t *pat;
-      cairo_matrix_t matrix;
-      gdouble angle, scale;
-
-      cairo_matrix_init_translate (&matrix,
-                                   allocation.width / 2,
-                                   allocation.height / 2);
-
-      cairo_save (cr);
-
-      angle = gtk_gesture_rotate_get_angle_delta (GTK_GESTURE_ROTATE (rotate));
-      cairo_matrix_rotate (&matrix, angle);
-
-      scale = gtk_gesture_zoom_get_scale_delta (GTK_GESTURE_ZOOM (zoom));
-      cairo_matrix_scale (&matrix, scale, scale);
-
-      cairo_set_matrix (cr, &matrix);
-      cairo_rectangle (cr, -100, -100, 200, 200);
-
-      pat = cairo_pattern_create_linear (-100, 0, 200, 0);
-      cairo_pattern_add_color_stop_rgb (pat, 0, 0, 0, 1);
-      cairo_pattern_add_color_stop_rgb (pat, 1, 1, 0, 0);
-      cairo_set_source (cr, pat);
-      cairo_fill (cr);
-
-      cairo_restore (cr);
-
-      cairo_pattern_destroy (pat);
-    }
-
-  if (long_pressed)
-    {
-      cairo_save (cr);
-      cairo_arc (cr, allocation.width / 2,
-                 allocation.height / 2,
-                 50, 0, 2 * G_PI);
-
-      cairo_set_source_rgba (cr, 0, 1, 0, 0.5);
-      cairo_stroke (cr);
-
-      cairo_restore (cr);
-    }
-
-  return TRUE;
-}
-
-GtkWidget *
-do_gestures (GtkWidget *do_widget)
-{
-  GtkWidget *drawing_area;
-  GtkGesture *gesture;
-
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
-      gtk_window_set_title (GTK_WINDOW (window), "Gestures demo");
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      drawing_area = gtk_drawing_area_new ();
-      gtk_container_add (GTK_CONTAINER (window), drawing_area);
-      gtk_widget_add_events (drawing_area,
-                             GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
-                             GDK_POINTER_MOTION_MASK | GDK_TOUCH_MASK);
-
-      g_signal_connect (drawing_area, "draw",
-                        G_CALLBACK (drawing_area_draw), NULL);
-
-      /* Swipe */
-      gesture = gtk_gesture_swipe_new (drawing_area);
-      g_signal_connect (gesture, "swipe",
-                        G_CALLBACK (swipe_gesture_swept), drawing_area);
-      gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
-                                                  GTK_PHASE_BUBBLE);
-      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
-
-      /* Long press */
-      gesture = gtk_gesture_long_press_new (drawing_area);
-      g_signal_connect (gesture, "pressed",
-                        G_CALLBACK (long_press_gesture_pressed), drawing_area);
-      g_signal_connect (gesture, "end",
-                        G_CALLBACK (long_press_gesture_end), drawing_area);
-      gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
-                                                  GTK_PHASE_BUBBLE);
-      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
-
-      /* Rotate */
-      rotate = gesture = gtk_gesture_rotate_new (drawing_area);
-      g_signal_connect (gesture, "angle-changed",
-                        G_CALLBACK (rotation_angle_changed), drawing_area);
-      gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
-                                                  GTK_PHASE_BUBBLE);
-      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
-
-      /* Zoom */
-      zoom = gesture = gtk_gesture_zoom_new (drawing_area);
-      g_signal_connect (gesture, "scale-changed",
-                        G_CALLBACK (zoom_scale_changed), drawing_area);
-      gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
-                                                  GTK_PHASE_BUBBLE);
-      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/headerbar.c

@@ -44,10 +44,10 @@ do_headerbar (GtkWidget *do_widget)
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_style_context_add_class (gtk_widget_get_style_context (box), "linked");
       button = gtk_button_new ();
-      gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-start-symbolic", GTK_ICON_SIZE_BUTTON));
+      gtk_container_add (GTK_CONTAINER (button), gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_NONE));
       gtk_container_add (GTK_CONTAINER (box), button);
       button = gtk_button_new ();
-      gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-end-symbolic", GTK_ICON_SIZE_BUTTON));
+      gtk_container_add (GTK_CONTAINER (button), gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE));
       gtk_container_add (GTK_CONTAINER (box), button);
 
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), box);

demos/gtk-demo/iconview_edit.c

@@ -52,24 +52,20 @@ set_cell_color (GtkCellLayout   *cell_layout,
                 gpointer         data)
 {
   gchar *text;
-  GdkRGBA color;
+  GdkColor color;
   guint32 pixel = 0;
   GdkPixbuf *pixbuf;
 
   gtk_tree_model_get (tree_model, iter, COL_TEXT, &text, -1);
-  if (!text)
-    return;
-
-  if (gdk_rgba_parse (&color, text))
+  if (gdk_color_parse (text, &color))
     pixel =
-      ((gint)(color.red * 255)) << 24 |
-      ((gint)(color.green * 255)) << 16 |
-      ((gint)(color.blue  * 255)) << 8 |
-      ((gint)(color.alpha * 255));
+      (color.red   >> 8) << 24 |
+      (color.green >> 8) << 16 |
+      (color.blue  >> 8) << 8;
 
   g_free (text);
 
-  pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, 24, 24);
+  pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 24, 24);
   gdk_pixbuf_fill (pixbuf, pixel);
 
   g_object_set (cell, "pixbuf", pixbuf, NULL);

demos/gtk-demo/images.c

@@ -50,21 +50,18 @@ progressive_updated_callback (GdkPixbufLoader *loader,
                               gpointer     data)
 {
   GtkWidget *image;
-  GdkPixbuf *pixbuf;
 
   image = GTK_WIDGET (data);
 
   /* We know the pixbuf inside the GtkImage has changed, but the image
-   * itself doesn't know this; so give it a hint by setting the pixbuf
-   * again. Queuing a redraw used to be sufficient, but nowadays GtkImage
-   * uses GtkIconHelper which caches the pixbuf state and will just redraw
-   * from the cache.
+   * itself doesn't know this; so queue a redraw.  If we wanted to be
+   * really efficient, we could use a drawing area or something
+   * instead of a GtkImage, so we could control the exact position of
+   * the pixbuf on the display, then we could queue a draw for only
+   * the updated area of the image.
    */
 
-  pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (image));
-  g_object_ref (pixbuf);
-  gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
-  g_object_unref (pixbuf);
+  gtk_widget_queue_draw (image);
 }
 
 static gint

demos/gtk-demo/links.c

@@ -33,7 +33,6 @@ activate_link (GtkWidget   *label,
                  "The term <i>keynav</i> is a shorthand for "
                  "keyboard navigation and refers to the process of using "
                  "a program (exclusively) via keyboard input.");
-      gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
 
       gtk_window_present (GTK_WINDOW (dialog));
       g_signal_connect (dialog, "response", G_CALLBACK (response_cb), NULL);

demos/gtk-demo/list_store.c

@@ -284,6 +284,7 @@ do_list_store (GtkWidget *do_widget)
 
       /* create tree view */
       treeview = gtk_tree_view_new_with_model (model);
+      gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
       gtk_tree_view_set_search_column (GTK_TREE_VIEW (treeview),
                                        COLUMN_DESCRIPTION);
 

demos/gtk-demo/main.c

@@ -471,9 +471,6 @@ fontify (GtkTextBuffer *source_buffer)
   gchar *start_ptr, *end_ptr;
   gchar *tag;
 
-  gtk_text_buffer_get_bounds (source_buffer, &start_iter, &tmp_iter);
-  gtk_text_buffer_apply_tag_by_name (source_buffer, "source", &start_iter, &tmp_iter);
-
   state = STATE_NORMAL;
 
   gtk_text_buffer_get_iter_at_offset (source_buffer, &start_iter, 0);
@@ -516,8 +513,9 @@ static GtkWidget *create_text (GtkWidget **text_view, gboolean is_source);
 static void
 add_data_tab (const gchar *demoname)
 {
-  gchar *resource_dir, *resource_name;
+  gchar *resource_dir, *resource_name, *content_type, *content_mime;
   gchar **resources;
+  GBytes *bytes;
   GtkWidget *widget, *label;
   guint i;
 
@@ -532,40 +530,41 @@ add_data_tab (const gchar *demoname)
   for (i = 0; resources[i]; i++)
     {
       resource_name = g_strconcat (resource_dir, "/", resources[i], NULL);
+      bytes = g_resources_lookup_data (resource_name, 0, NULL);
+      g_assert (bytes);
 
-      widget = gtk_image_new_from_resource (resource_name);
-      if (gtk_image_get_pixbuf (GTK_IMAGE (widget)) == NULL &&
-          gtk_image_get_animation (GTK_IMAGE (widget)) == NULL)
+      content_type = g_content_type_guess (resource_name,
+                                           g_bytes_get_data (bytes, NULL),
+                                           g_bytes_get_size (bytes),
+                                           NULL);
+      content_mime = g_content_type_get_mime_type (content_type);
+
+      /* In theory we should look at all the mime types gdk-pixbuf supports
+       * and go from there, but we know what file types we've added.
+       */
+      if (g_content_type_is_a (content_mime, "image/png") ||
+          g_content_type_is_a (content_mime, "image/gif") ||
+          g_content_type_is_a (content_mime, "image/jpeg"))
         {
-          GBytes *bytes;
+          widget = gtk_image_new_from_resource (resource_name);
+        }
+      else if (g_content_type_is_a (content_mime, "text/plain") ||
+               g_content_type_is_a (content_mime, "application/x-ext-ui") ||
+               g_content_type_is_a (content_mime, "text/css"))
+        {
+          GtkTextBuffer *buffer;
+          GtkWidget *textview;
 
-          /* So we've used the best API available to figure out it's
-           * not an image. Let's try something else then.
-           */
-          g_object_ref_sink (widget);
-          gtk_widget_destroy (widget);
+          widget = create_text (&textview, FALSE);
+          buffer = gtk_text_buffer_new (NULL);
+          gtk_text_buffer_set_text (buffer, g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes));
+          gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);
+        }
+      else
+        {
 
-          bytes = g_resources_lookup_data (resource_name, 0, NULL);
-          g_assert (bytes);
-
-          if (g_utf8_validate (g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes), NULL))
-            {
-              /* Looks like it parses as text. Dump it into a textview then! */
-              GtkTextBuffer *buffer;
-              GtkWidget *textview;
-
-              widget = create_text (&textview, FALSE);
-              buffer = gtk_text_buffer_new (NULL);
-              gtk_text_buffer_set_text (buffer, g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes));
-              gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);
-            }
-          else
-            {
-              g_warning ("Don't know how to display resource '%s'\n", resource_name);
-              widget = NULL;
-            }
-
-          g_bytes_unref (bytes);
+          g_warning ("Don't know how to display resource '%s' of type '%s'\n", resource_name, content_mime);
+          widget = NULL;
         }
 
       gtk_widget_show_all (widget);
@@ -577,7 +576,10 @@ add_data_tab (const gchar *demoname)
                                "tab-expand", TRUE,
                                NULL);
 
+      g_free (content_mime);
+      g_free (content_type);
       g_free (resource_name);
+      g_bytes_unref (bytes);
     }
 
   g_strfreev (resources);
@@ -624,9 +626,6 @@ load_file (const gchar *demoname,
                               NULL);
 
   source_buffer = gtk_text_buffer_new (NULL);
-  gtk_text_buffer_create_tag (source_buffer, "source",
-                              "font", "monospace",
-                              NULL);
   gtk_text_buffer_create_tag (source_buffer, "comment",
                               "foreground", "DodgerBlue",
                               NULL);
@@ -1016,7 +1015,9 @@ main (int argc, char **argv)
     }
   /* -- End of hack -- */
 
-  app = gtk_application_new ("org.gtk.Demo", G_APPLICATION_NON_UNIQUE);
+  gtk_init (&argc, &argv);
+
+  app = gtk_application_new ("org.gtk.Demo", 0);
 
   g_action_map_add_action_entries (G_ACTION_MAP (app),
                                    app_entries, G_N_ELEMENTS (app_entries),

demos/gtk-demo/main.ui

@@ -128,8 +128,8 @@
                   <object class="GtkTextView" id="info-textview">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="margin_start">20</property>
-                    <property name="margin_end">20</property>
+                    <property name="margin_left">20</property>
+                    <property name="margin_right">20</property>
                     <property name="margin_top">20</property>
                     <property name="margin_bottom">20</property>
                     <property name="pixels_above_lines">2</property>
@@ -165,8 +165,9 @@
                   <object class="GtkTextView" id="source-textview">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="margin_start">20</property>
+                    <property name="margin_left">20</property>
                     <property name="margin_end">20</property>
+                    <property name="margin_right">20</property>
                     <property name="margin_top">20</property>
                     <property name="margin_bottom">20</property>
                     <property name="editable">False</property>

demos/gtk-demo/revealer.c

@@ -18,8 +18,6 @@ change_direction (GtkRevealer *revealer)
   gtk_revealer_set_reveal_child (revealer, !revealed);
 }
 
-static guint timeout = 0;
-
 static gboolean
 reveal_one (gpointer data)
 {
@@ -35,15 +33,11 @@ reveal_one (gpointer data)
                     G_CALLBACK (change_direction), NULL);
   count++;
 
-  if (count >= 9)
-    {
-      timeout = 0;
-      return FALSE;
-    }
-  else
-    return TRUE;
+  return count < 9;
 }
 
+static guint timeout = 0;
+
 static void
 response_cb (GtkWidget *dialog,
              gint       response_id,

demos/gtk-demo/sizegroup.c

@@ -120,7 +120,6 @@ do_sizegroup (GtkWidget *do_widget)
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
       size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-      g_object_set_data_full (G_OBJECT (window), "size-group", size_group, g_object_unref);
 
       /* Create one frame holding color options */
       frame = gtk_frame_new ("Color Options");

demos/gtk-demo/textscroll.c

@@ -16,7 +16,6 @@ scroll_to_end (GtkTextView *textview)
   GtkTextIter iter;
   GtkTextMark *mark;
   char *spaces;
-  char *text;
   static int count;
 
   buffer = gtk_text_view_get_buffer (textview);
@@ -33,11 +32,11 @@ scroll_to_end (GtkTextView *textview)
   spaces = g_strnfill (count++, ' ');
   gtk_text_buffer_insert (buffer, &iter, "\n", -1);
   gtk_text_buffer_insert (buffer, &iter, spaces, -1);
-  text = g_strdup_printf ("Scroll to end scroll to end scroll "
-                          "to end scroll to end %d", count);
-  gtk_text_buffer_insert (buffer, &iter, text, -1);
+  gtk_text_buffer_insert (buffer, &iter,
+                          "Scroll to end scroll to end scroll "
+                          "to end scroll to end ",
+                          -1);
   g_free (spaces);
-  g_free (text);
 
   /* Now scroll the end mark onscreen.
    */
@@ -61,7 +60,6 @@ scroll_to_bottom (GtkTextView *textview)
   GtkTextIter iter;
   GtkTextMark *mark;
   char *spaces;
-  char *text;
   static int count;
 
   buffer = gtk_text_view_get_buffer (textview);
@@ -75,11 +73,11 @@ scroll_to_bottom (GtkTextView *textview)
   spaces = g_strnfill (count++, ' ');
   gtk_text_buffer_insert (buffer, &iter, "\n", -1);
   gtk_text_buffer_insert (buffer, &iter, spaces, -1);
-  text = g_strdup_printf ("Scroll to bottom scroll to bottom scroll "
-                          "to bottom scroll to bottom %d", count);
-  gtk_text_buffer_insert (buffer, &iter, text, -1);
+  gtk_text_buffer_insert (buffer, &iter,
+                          "Scroll to bottom scroll to bottom scroll "
+                          "to bottom scroll to bottom",
+                          -1);
   g_free (spaces);
-  g_free (text);
 
   /* Move the iterator to the beginning of line, so we don't scroll
    * in horizontal direction

demos/gtk-demo/toolpalette.c

@@ -656,9 +656,6 @@ load_icon_items (GtkToolPalette *palette)
       GtkWidget *group = gtk_tool_item_group_new (context);
       gtk_container_add (GTK_CONTAINER (palette), group);
 
-      if (g_strcmp0 (context, "Animations") == 0)
-        continue;
-
       g_message ("Got context '%s'", context);
       icon_names = gtk_icon_theme_list_icons (icon_theme, context);
       icon_names = g_list_sort (icon_names, (GCompareFunc) strcmp);
@@ -668,12 +665,6 @@ load_icon_items (GtkToolPalette *palette)
           GtkToolItem *item;
           gchar *id = ll->data;
 
-          if (g_str_equal (id, "emblem-desktop"))
-            continue;
-
-          if (g_str_has_suffix (id, "-symbolic"))
-            continue;
-
           g_message ("Got id '%s'", id);
 
           item = gtk_tool_button_new (NULL, NULL);

demos/gtk-demo/transparent.c

@@ -189,10 +189,9 @@ do_transparent (GtkWidget *do_widget)
       GtkWidget *view;
       GtkWidget *sw;
       GtkWidget *overlay;
+      GtkWidget *align;
       GtkWidget *entry;
       GdkRGBA transparent = {0, 0, 0, 0};
-      GtkCssProvider *provider;
-      gchar *css;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
@@ -220,20 +219,17 @@ do_transparent (GtkWidget *do_widget)
 
       gtk_widget_override_background_color (overlay, 0, &transparent);
 
-      entry = gtk_entry_new ();
-      provider = gtk_css_provider_new ();
-      css = g_strdup_printf ("* { border-width: 0px %dpx %dpx 0px; }",
-                             SHADOW_OFFSET_X, SHADOW_OFFSET_Y);
-      gtk_css_provider_load_from_data (provider, css, -1, NULL);
-      g_free (css);
-      gtk_style_context_add_provider (gtk_widget_get_style_context (entry),
-                                      GTK_STYLE_PROVIDER (provider),
-                                      GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-      g_signal_connect (entry, "draw", G_CALLBACK (draw_callback), NULL);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
-      gtk_widget_set_halign (entry, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (entry, GTK_ALIGN_START);
+      align = gtk_alignment_new (0.0, 0.0, 0.0, 0.0);
+      gtk_alignment_set_padding (GTK_ALIGNMENT (align),
+				 0, SHADOW_OFFSET_Y, 0, SHADOW_OFFSET_X);
+      g_signal_connect (align, "draw", G_CALLBACK (draw_callback), NULL);
       
+      entry = gtk_entry_new ();
+      gtk_container_add (GTK_CONTAINER (align), entry);
+      
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), align);
+      gtk_widget_set_halign (align, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (align, GTK_ALIGN_START);
 
       gtk_widget_show_all (overlay);
     }

demos/gtk-demo/tree_store.c

@@ -424,6 +424,7 @@ do_tree_store (GtkWidget *do_widget)
       /* create tree view */
       treeview = gtk_tree_view_new_with_model (model);
       g_object_unref (model);
+      gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
       gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),
                                    GTK_SELECTION_MULTIPLE);
 

demos/icon-browser/Makefile.am

@@ -1,36 +0,0 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/gdk		\
-	-I$(top_builddir)/gdk		\
-	$(GTK_DEBUG_FLAGS)		\
-	$(GTK_DEP_CFLAGS)
-
-LDADD = \
-        $(top_builddir)/gtk/libgtk-3.la \
-        $(top_builddir)/gdk/libgdk-3.la \
-        $(GTK_DEP_LIBS)
-
-
-bin_PROGRAMS = gtk3-icon-browser
-
-desktopdir = $(datadir)/applications
-dist_desktop_DATA = gtk3-icon-browser.desktop
-
-gtk3_icon_browser_SOURCES = \
-	main.c \
-	iconbrowserapp.c iconbrowserapp.h \
-	iconbrowserwin.c iconbrowserwin.h \
-	resources.c
-
-BUILT_SOURCES = \
-	resources.c
-
-resources.c: iconbrowser.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/iconbrowser.gresource.xml)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/iconbrowser.gresource.xml \
-		--target=$@ --sourcedir=$(srcdir) --generate-source
-
-EXTRA_DIST = \
-	iconbrowser.gresource.xml \
-	window.ui
-
--include $(top_srcdir)/git.mk

demos/icon-browser/app-menu.ui

@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <menu id="appmenu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Quit</attribute>
-        <attribute name="action">app.quit</attribute>
-      </item>
-    </section>
-  </menu>
-</interface>

demos/icon-browser/gtk3-icon-browser.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Icon Browser
-Comment=An application that shows themed icons
-Exec=gtk3-icon-browser
-Icon=gtk3-icon-browser
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=GTK;
-NoDisplay=true

demos/icon-browser/iconbrowser.gresource.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gtk/iconbrowser">
-    <file preprocess="xml-stripblanks">window.ui</file>
-    <file preprocess="xml-stripblanks">app-menu.ui</file>
-  </gresource>
-</gresources>

demos/icon-browser/iconbrowserapp.c

@@ -1,80 +0,0 @@
-#include <gtk/gtk.h>
-
-#include "iconbrowserapp.h"
-#include "iconbrowserwin.h"
-
-struct _IconBrowserApp
-{
-  GtkApplication parent;
-};
-
-struct _IconBrowserAppClass
-{
-  GtkApplicationClass parent_class;
-};
-
-G_DEFINE_TYPE(IconBrowserApp, icon_browser_app, GTK_TYPE_APPLICATION);
-
-static void
-icon_browser_app_init (IconBrowserApp *app)
-{
-}
-
-static void
-quit_activated (GSimpleAction *action,
-                GVariant      *parameter,
-                gpointer       app)
-{
-  g_application_quit (G_APPLICATION (app));
-}
-
-static GActionEntry app_entries[] =
-{
-  { "quit", quit_activated, NULL, NULL, NULL }
-};
-
-static void
-icon_browser_app_startup (GApplication *app)
-{
-  GtkBuilder *builder;
-  GMenuModel *app_menu;
-  const gchar *quit_accels[2] = { "<Ctrl>Q", NULL };
-
-  G_APPLICATION_CLASS (icon_browser_app_parent_class)->startup (app);
-
-  g_action_map_add_action_entries (G_ACTION_MAP (app),
-                                   app_entries, G_N_ELEMENTS (app_entries),
-                                   app);
-  gtk_application_set_accels_for_action (GTK_APPLICATION (app),
-                                         "app.quit",
-                                         quit_accels);
-
-  builder = gtk_builder_new_from_resource ("/org/gtk/iconbrowser/app-menu.ui");
-  app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"));
-  gtk_application_set_app_menu (GTK_APPLICATION (app), app_menu);
-  g_object_unref (builder);
-}
-
-static void
-icon_browser_app_activate (GApplication *app)
-{
-  IconBrowserWindow *win;
-
-  win = icon_browser_window_new (ICON_BROWSER_APP (app));
-  gtk_window_present (GTK_WINDOW (win));
-}
-
-static void
-icon_browser_app_class_init (IconBrowserAppClass *class)
-{
-  G_APPLICATION_CLASS (class)->startup = icon_browser_app_startup;
-  G_APPLICATION_CLASS (class)->activate = icon_browser_app_activate;
-}
-
-IconBrowserApp *
-icon_browser_app_new (void)
-{
-  return g_object_new (ICON_BROWSER_APP_TYPE,
-                       "application-id", "org.gtk.IconBrowser",
-                       NULL);
-}

demos/icon-browser/iconbrowserapp.h

@@ -1,19 +0,0 @@
-#ifndef __ICON_BROWSER_APP_H
-#define __ICON_BROWSER_APP_H
-
-#include <gtk/gtk.h>
-
-
-#define ICON_BROWSER_APP_TYPE (icon_browser_app_get_type ())
-#define ICON_BROWSER_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ICON_BROWSER_APP_TYPE, IconBrowserApp))
-
-
-typedef struct _IconBrowserApp       IconBrowserApp;
-typedef struct _IconBrowserAppClass  IconBrowserAppClass;
-
-
-GType           icon_browser_app_get_type    (void);
-IconBrowserApp *icon_browser_app_new         (void);
-
-
-#endif /* __ICON_BROWSER_APP_H */

demos/icon-browser/iconbrowserwin.c

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

demos/icon-browser/iconbrowserwin.h

@@ -1,20 +0,0 @@
-#ifndef __ICON_BROWSER_WIN_H
-#define __ICON_BROWSER_WIN_H
-
-#include <gtk/gtk.h>
-#include "iconbrowserapp.h"
-
-
-#define ICON_BROWSER_WINDOW_TYPE (icon_browser_window_get_type ())
-#define ICON_BROWSER_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ICON_BROWSER_WINDOW_TYPE, IconBrowserWindow))
-
-
-typedef struct _IconBrowserWindow         IconBrowserWindow;
-typedef struct _IconBrowserWindowClass    IconBrowserWindowClass;
-
-
-GType              icon_browser_window_get_type     (void);
-IconBrowserWindow *icon_browser_window_new          (IconBrowserApp    *app);
-
-
-#endif /* __ICON_BROWSER_WIN_H */

demos/icon-browser/main.c

@@ -1,8 +0,0 @@
-#include <gtk/gtk.h>
-#include <iconbrowserapp.h>
-
-int
-main (int argc, char *argv[])
-{
-  return g_application_run (G_APPLICATION (icon_browser_app_new ()), argc, argv);
-}

demos/icon-browser/window.ui

@@ -1,322 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.8 -->
-  <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>
-  </object>
-  <template class="IconBrowserWindow" parent="GtkApplicationWindow">
-    <property name="title" translatable="yes">Icon Browser</property>
-    <property name="default-width">600</property>
-    <property name="default-height">800</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="header">
-        <property name="visible">True</property>
-        <property name="title" translatable="yes">Icon Browser</property>
-        <property name="show-close-button">True</property>
-        <child type="title">
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <style>
-              <class name="linked"/>
-            </style>
-            <child>
-              <object class="GtkRadioButton" id="normal_radio">
-                <property name="visible">True</property>
-                <property name="draw_indicator">False</property>
-                <property name="label" translatable="yes">Normal</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkRadioButton" id="symbolic_radio">
-                <property name="visible">True</property>
-                <property name="draw_indicator">False</property>
-                <property name="label" translatable="yes">Symbolic</property>
-                <property name="group">normal_radio</property>
-                <signal name="toggled" handler="symbolic_toggled"/>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToggleButton" id="search">
-            <property name="visible">False</property>
-            <style>
-              <class name="image-button"/>
-            </style>
-            <child>
-              <object class="GtkImage" id="search-icon">
-                <property name="visible">True</property>
-                <property name="icon-name">edit-find-symbolic</property>
-                <property name="icon-size">1</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="orientation">horizontal</property>
-        <child>
-          <object class="GtkListBox" id="context_list">
-            <property name="visible">True</property>
-            <property name="selection_mode">single</property>
-            <signal name="selected-rows-changed" handler="selected_context_changed"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox" id="content_box">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkSearchBar" id="searchbar">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkSearchEntry" id="searchentry">
-                    <signal name="search-changed" handler="search_text_changed"/>
-                    <property name="visible">True</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow" id="sw">
-                <property name="visible">True</property>
-                <property name="expand">True</property>
-                <property name="hscrollbar-policy">never</property>
-                <property name="vscrollbar-policy">automatic</property>
-                <property name="shadow-type">in</property>
-                <child>
-                  <object class="GtkIconView" id="list">
-                    <property name="visible">True</property>
-                    <property name="model">filter_model</property>
-                    <signal name="selection_changed" handler="selection_changed"/>
-                    <signal name="item_activated" handler="item_activated"/>
-                    <child>
-                      <object class="GtkCellRendererPixbuf" id="cell">
-                        <property name="xpad">10</property>
-                        <property name="ypad">10</property>
-                        <property name="stock-size">5</property>
-                        <property name="follow-state">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkCellRendererText" id="text_cell">
-                        <property name="xpad">10</property>
-                        <property name="ypad">10</property>
-                        <property name="xalign">0.5</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </template>
-  <object class="GtkSizeGroup">
-    <property name="mode">vertical</property>
-    <widgets>
-      <widget name="normal_radio"/>
-      <widget name="symbolic_radio"/>
-      <widget name="search"/>
-    </widgets>
-  </object>
-  <object class="GtkDialog" id="details">
-    <property name="modal">True</property>
-    <property name="use-header-bar">1</property>
-    <property name="resizable">False</property>
-    <signal name="delete-event" handler="gtk_widget_hide_on_delete"/>
-    <child internal-child="vbox">
-      <object class="GtkBox">
-        <child>
-          <object class="GtkGrid">
-            <property name="visible">True</property>
-            <property name="margin">10</property>
-            <property name="row-spacing">10</property>
-            <property name="column-spacing">10</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>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-              </packing>
-            </child>
-            <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>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
-              </packing>
-            </child>
-            <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>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">1</property>
-              </packing>
-            </child>
-            <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>
-              <packing>
-                <property name="left-attach">3</property>
-                <property name="top-attach">1</property>
-              </packing>
-            </child>
-            <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>
-              <packing>
-                <property name="left-attach">4</property>
-                <property name="top-attach">1</property>
-              </packing>
-            </child>
-
-            <child>
-              <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="xpad">4</property>
-                <property name="ypad">4</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="label">16x16</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="xpad">4</property>
-                <property name="ypad">4</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="label">24x24</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label3">
-                <property name="visible">True</property>
-                <property name="xpad">4</property>
-                <property name="ypad">4</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="label">32x32</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label4">
-                <property name="visible">True</property>
-                <property name="xpad">4</property>
-                <property name="ypad">4</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="label">48x48</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left-attach">3</property>
-                <property name="top-attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label5">
-                <property name="visible">True</property>
-                <property name="xpad">4</property>
-                <property name="ypad">4</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="label">64x64</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left-attach">4</property>
-                <property name="top-attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="description">
-                <property name="visible">True</property>
-                <property name="wrap">True</property>
-                <property name="max-width-chars">60</property>
-                <property name="xalign">0</property>
-                <property name="valign">start</property>
-              </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">3</property>
-                <property name="width">5</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

demos/pixbuf-demo/Makefile.am

@@ -0,0 +1,41 @@
+## Makefile.am for gtk+/demos
+include $(top_srcdir)/Makefile.decl
+
+AM_CPPFLAGS = 				\
+	-I$(top_srcdir) 		\
+	-I$(top_builddir)/gdk		\
+	-DGDK_DISABLE_DEPRECATED	\
+	-DGTK_DISABLE_DEPRECATED	\
+	$(GTK_DEBUG_FLAGS)		\
+	$(GTK_DEP_CFLAGS)
+
+DEPS = \
+	$(top_builddir)/gtk/libgtk-3.la
+
+LDADDS = \
+	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gdk/libgdk-3.la	\
+	$(GTK_DEP_LIBS)			\
+	$(MATH_LIB)
+
+noinst_PROGRAMS = 		\
+	pixbuf-demo
+
+pixbuf_demo_DEPENDENCIES = $(DEPS)
+
+pixbuf_demo_LDADD = $(LDADDS)
+
+pixbuf_demo_SOURCES = pixbuf-demo.c
+
+EXTRA_DIST +=			\
+	apple-red.png		\
+	background.jpg		\
+	gnome-applets.png	\
+	gnome-calendar.png	\
+	gnome-foot.png		\
+	gnome-gimp.png		\
+	gnome-gmush.png		\
+	gnome-gsame.png		\
+	gnu-keys.png
+
+-include $(top_srcdir)/git.mk

demos/pixbuf-demo/pixbuf-demo.c

@@ -0,0 +1,215 @@
+/* GdkPixbuf library - Scaling and compositing demo
+ *
+ * Copyright (C) 1999 The Free Software Foundation
+ *
+ * Authors: Federico Mena-Quintero <federico@gimp.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+#include <stdlib.h>
+#include <gtk/gtk.h>
+#include <math.h>
+
+
+
+#define BACKGROUND_NAME "background.jpg"
+
+static const char *image_names[] = {
+	"apple-red.png",
+	"gnome-applets.png",
+	"gnome-calendar.png",
+	"gnome-foot.png",
+	"gnome-gmush.png",
+	"gnome-gimp.png",
+	"gnome-gsame.png",
+	"gnu-keys.png"
+};
+
+#define N_IMAGES (sizeof (image_names) / sizeof (image_names[0]))
+
+/* Current frame */
+static GdkPixbuf *frame;
+
+/* Background image */
+static GdkPixbuf *background;
+static int back_width, back_height;
+
+/* Images */
+static GdkPixbuf *images[N_IMAGES];
+
+/* Widgets */
+static GtkWidget *da;
+
+
+
+/* Loads the images for the demo and returns whether the operation succeeded */
+static gboolean
+load_pixbufs (void)
+{
+	int i;
+
+        /* We pass NULL for the error return location, we don't care
+         * about the error message.
+         */
+        
+	background = gdk_pixbuf_new_from_file (BACKGROUND_NAME, NULL);
+	if (!background)
+		return FALSE;
+
+	back_width = gdk_pixbuf_get_width (background);
+	back_height = gdk_pixbuf_get_height (background);
+
+	for (i = 0; i < N_IMAGES; i++) {
+		images[i] = gdk_pixbuf_new_from_file (image_names[i], NULL);
+		if (!images[i])
+			return FALSE;
+	}
+
+	return TRUE;
+}
+
+/* Expose callback for the drawing area */
+static gboolean
+draw_cb (GtkWidget *widget, cairo_t *cr, gpointer data)
+{
+        gdk_cairo_set_source_pixbuf (cr, frame, 0, 0);
+        cairo_paint (cr);
+
+	return TRUE;
+}
+
+#define CYCLE_TIME 3000000 /* 3 seconds */
+
+static gint64 start_time;
+
+/* Handler to regenerate the frame */
+static gboolean
+on_tick (GtkWidget     *widget,
+         GdkFrameClock *frame_clock,
+         gpointer       data)
+{
+	gint64	current_time;
+	double f;
+	int i;
+	double xmid, ymid;
+	double radius;
+
+	gdk_pixbuf_copy_area (background, 0, 0, back_width, back_height,
+			      frame, 0, 0);
+
+        if (start_time == 0)
+          start_time = gdk_frame_clock_get_frame_time (frame_clock);
+
+	current_time = gdk_frame_clock_get_frame_time (frame_clock);
+	f = ((current_time - start_time) % CYCLE_TIME) / (double)CYCLE_TIME;
+
+	xmid = back_width / 2.0;
+	ymid = back_height / 2.0;
+
+	radius = MIN (xmid, ymid) / 2.0;
+
+	for (i = 0; i < N_IMAGES; i++) {
+		double ang;
+		int xpos, ypos;
+		int iw, ih;
+		double r;
+		GdkRectangle r1, r2, dest;
+		double k;
+
+		ang = 2.0 * G_PI * (double) i / N_IMAGES - f * 2.0 * G_PI;
+
+		iw = gdk_pixbuf_get_width (images[i]);
+		ih = gdk_pixbuf_get_height (images[i]);
+
+		r = radius + (radius / 3.0) * sin (f * 2.0 * G_PI);
+
+		xpos = floor (xmid + r * cos (ang) - iw / 2.0 + 0.5);
+		ypos = floor (ymid + r * sin (ang) - ih / 2.0 + 0.5);
+
+		k = (i & 1) ? sin (f * 2.0 * G_PI) : cos (f * 2.0 * G_PI);
+		k = 2.0 * k * k;
+		k = MAX (0.25, k);
+
+		r1.x = xpos;
+		r1.y = ypos;
+		r1.width = iw * k;
+		r1.height = ih * k;
+
+		r2.x = 0;
+		r2.y = 0;
+		r2.width = back_width;
+		r2.height = back_height;
+
+		if (gdk_rectangle_intersect (&r1, &r2, &dest))
+			gdk_pixbuf_composite (images[i],
+					      frame,
+					      dest.x, dest.y,
+					      dest.width, dest.height,
+					      xpos, ypos,
+					      k, k,
+					      GDK_INTERP_NEAREST,
+					      ((i & 1)
+					       ? MAX (127, fabs (255 * sin (f * 2.0 * G_PI)))
+					       : MAX (127, fabs (255 * cos (f * 2.0 * G_PI)))));
+	}
+
+	gtk_widget_queue_draw (da);
+
+	return G_SOURCE_CONTINUE;
+}
+
+/* Destroy handler for the window */
+static void
+destroy_cb (GObject *object, gpointer data)
+{
+	gtk_main_quit ();
+}
+
+int
+main (int argc, char **argv)
+{
+	GtkWidget *window;
+
+	gtk_init (&argc, &argv);
+
+	if (!load_pixbufs ()) {
+		g_message ("main(): Could not load all the pixbufs!");
+		exit (EXIT_FAILURE);
+	}
+
+	frame = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, back_width, back_height);
+
+	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+	gtk_widget_set_size_request (window, back_width, back_height);
+
+	g_signal_connect (window, "destroy",
+			  G_CALLBACK (destroy_cb), NULL);
+
+	da = gtk_drawing_area_new ();
+
+	g_signal_connect (da, "draw",
+			  G_CALLBACK (draw_cb), NULL);
+
+	gtk_container_add (GTK_CONTAINER (window), da);
+
+	gtk_widget_add_tick_callback (da, on_tick, NULL, NULL);
+
+	gtk_widget_show_all (window);
+	gtk_main ();
+
+	return 0;
+}

demos/widget-factory/Makefile.am

@@ -45,7 +45,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png
 dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png
 dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png
 
-update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
+update_icon_cache = gtk-update-icon-cache --ignore-theme-index --force
 
 install-data-hook: install-update-icon-cache
 uninstall-hook: uninstall-update-icon-cache
@@ -60,7 +60,6 @@ uninstall-update-icon-cache:
 
 EXTRA_DIST += \
 	widget-factory.ui \
-	menus.ui \
 	widget-factory.gresource.xml
 
 -include $(top_srcdir)/git.mk

demos/widget-factory/menus.ui

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <menu id="app-menu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">About</attribute>
-        <attribute name="action">app.about</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Quit</attribute>
-        <attribute name="action">app.quit</attribute>
-        <attribute name="accel">&lt;Primary&gt;q</attribute>
-      </item>
-    </section>
-  </menu>
-</interface>

demos/widget-factory/widget-factory.c

@@ -1,4 +1,5 @@
-/* widget-factory: a collection of widgets, for easy theme testing
+/* widget-factory: a collection of widgets in a single page, for easy
+ *                 theming
  *
  * Copyright (C) 2011 Canonical Ltd
  *
@@ -16,11 +17,24 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by Andrea Cimitan <andrea.cimitan@canonical.com>
+ *
  */
 
 #include "config.h"
 #include <gtk/gtk.h>
 
+static void
+activate_toggle (GSimpleAction *action,
+                 GVariant      *parameter,
+                 gpointer       user_data)
+{
+  GVariant *state;
+
+  state = g_action_get_state (G_ACTION (action));
+  g_action_change_state (G_ACTION (action), g_variant_new_boolean (!g_variant_get_boolean (state)));
+  g_variant_unref (state);
+}
+
 static void
 change_theme_state (GSimpleAction *action,
                     GVariant      *state,
@@ -36,30 +50,6 @@ change_theme_state (GSimpleAction *action,
   g_simple_action_set_state (action, state);
 }
 
-static void
-activate_search (GSimpleAction *action,
-                 GVariant      *parameter,
-                 gpointer       user_data)
-{
-  GtkWidget *window = user_data;
-  GtkWidget *searchbar;
-
-  searchbar = GTK_WIDGET (g_object_get_data (G_OBJECT (window), "searchbar"));
-  gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (searchbar), TRUE);
-}
-
-static void
-activate_delete (GSimpleAction *action,
-                 GVariant      *parameter,
-                 gpointer       user_data)
-{
-  GtkWidget *window = user_data;
-  GtkWidget *infobar;
-
-  infobar = GTK_WIDGET (g_object_get_data (G_OBJECT (window), "infobar"));
-  gtk_widget_show (infobar);
-}
-
 static void
 activate_about (GSimpleAction *action,
                 GVariant      *parameter,
@@ -71,17 +61,14 @@ activate_about (GSimpleAction *action,
     "Cosimo Cecchi",
     NULL
   };
-  gchar *version;
-
-  version = g_strdup_printf ("%s\nRunning against GTK+ %d.%d.%d",
-                             PACKAGE_VERSION,
-                             gtk_get_major_version (),
-                             gtk_get_minor_version (),
-                             gtk_get_micro_version ());
 
   gtk_show_about_dialog (GTK_WINDOW (gtk_application_get_active_window (app)),
                          "program-name", "GTK+ Widget Factory",
-                         "version", version,
+                         "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
+                                                     PACKAGE_VERSION,
+                                                     gtk_get_major_version (),
+                                                     gtk_get_minor_version (),
+                                                     gtk_get_micro_version ()),
                          "copyright", "(C) 1997-2013 The GTK+ Team",
                          "license-type", GTK_LICENSE_LGPL_2_1,
                          "website", "http://www.gtk.org",
@@ -90,8 +77,6 @@ activate_about (GSimpleAction *action,
                          "logo-icon-name", "gtk3-widget-factory",
                          "title", "About GTK+ Widget Factory",
                          NULL);
-
-  g_free (version);
 }
 
 static void
@@ -144,28 +129,15 @@ dismiss (GtkWidget *button)
   gtk_revealer_set_reveal_child (GTK_REVEALER (w), FALSE);
 }
 
-static void
-spin_value_reset (GtkWidget *button, GtkAdjustment *adjustment)
-{
-  gtk_adjustment_set_value (adjustment, 50.0);
-  dismiss (button);
-}
-
 static gint pulse_time = 250;
-static gint pulse_entry_mode = 0;
+static guint pulse_id = 0;
 
 static gboolean
 pulse_it (GtkWidget *widget)
 {
-  guint pulse_id;
-
-  if (GTK_IS_ENTRY (widget))
-    gtk_entry_progress_pulse (GTK_ENTRY (widget));
-  else
-    gtk_progress_bar_pulse (GTK_PROGRESS_BAR (widget));
+  gtk_progress_bar_pulse (GTK_PROGRESS_BAR (widget));
 
   pulse_id = g_timeout_add (pulse_time, (GSourceFunc)pulse_it, widget);
-  g_object_set_data (G_OBJECT (widget), "pulse_id", GUINT_TO_POINTER (pulse_id));
 
   return G_SOURCE_REMOVE;
 }
@@ -174,618 +146,78 @@ static void
 update_pulse_time (GtkAdjustment *adjustment, GtkWidget *widget)
 {
   gdouble value;
-  guint pulse_id;
 
   value = gtk_adjustment_get_value (adjustment);
 
-  pulse_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (widget), "pulse_id"));
-
   /* vary between 50 and 450 */
   pulse_time = 50 + 4 * value;
 
-  if (value == 100)
+  if (value == 100 && pulse_id != 0)
     {
-      if (pulse_id != 0)
-        {
-          g_source_remove (pulse_id);
-          g_object_set_data (G_OBJECT (widget), "pulse_id", NULL);
-        }
+      g_source_remove (pulse_id);
+      pulse_id = 0;
     }
-  else if (value < 100)
+  else if (value < 100 && pulse_id == 0)
     {
-      if (pulse_id == 0 && (GTK_IS_PROGRESS_BAR (widget) || pulse_entry_mode % 3 == 2))
-        {
-          pulse_id = g_timeout_add (pulse_time, (GSourceFunc)pulse_it, widget);
-          g_object_set_data (G_OBJECT (widget), "pulse_id", GUINT_TO_POINTER (pulse_id));
-        }
+      pulse_id = g_timeout_add (pulse_time, (GSourceFunc)pulse_it, widget);
     }
 }
 
+static guint pulse_entry_id = 0;
+
+static gboolean
+pulse_entry (GtkEntry *entry)
+{
+  gtk_entry_progress_pulse (entry);
+
+  pulse_entry_id = g_timeout_add (100, (GSourceFunc)pulse_entry, entry);
+
+  return G_SOURCE_REMOVE;
+}
+
 static void
 on_entry_icon_release (GtkEntry            *entry,
                        GtkEntryIconPosition icon_pos,
                        GdkEvent            *event,
                        gpointer             user_data)
 {
-  guint pulse_id;
+  static int num = 0;
 
   if (icon_pos != GTK_ENTRY_ICON_SECONDARY)
     return;
 
-  pulse_entry_mode++;
+  num++;
 
-  if (pulse_entry_mode % 3 == 0)
+  if (num % 3 == 0)
     {
-      pulse_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (entry), "pulse_id"));
-      if (pulse_id != 0)
-        {
-          g_source_remove (pulse_id);
-          g_object_set_data (G_OBJECT (entry), "pulse_id", NULL);
-        }
+      if (pulse_entry_id > 0)
+        g_source_remove (pulse_entry_id);
       gtk_entry_set_progress_fraction (entry, 0);
     }
-  else if (pulse_entry_mode % 3 == 1)
+  else if (num % 3 == 1)
     gtk_entry_set_progress_fraction (entry, 0.25);
-  else if (pulse_entry_mode % 3 == 2)
+  else if (num % 3 == 2)
     {
-      if (pulse_time - 50 < 400)
-        {
-          gtk_entry_set_progress_pulse_step (entry, 0.1);
-          pulse_it (GTK_WIDGET (entry));
-        }
+      gtk_entry_set_progress_pulse_step (entry, 0.1);
+      pulse_entry (entry);
     }
 
 }
 
 static void
-update_header (GtkListBoxRow *row,
-               GtkListBoxRow *before,
-               gpointer       data)
+startup (GApplication *app)
 {
-  if (before != NULL &&
-      gtk_list_box_row_get_header (row) == NULL)
-    {
-      GtkWidget *separator;
+  GtkBuilder *builder;
+  GMenuModel *appmenu;
 
-      separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_widget_show (separator);
-      gtk_list_box_row_set_header (row, separator);
-    }
-}
+  builder = gtk_builder_new ();
+  gtk_builder_add_from_resource (builder, "/ui/widget-factory.ui", NULL);
 
-static void
-info_bar_response (GtkWidget *infobar, gint response_id)
-{
-  if (response_id == GTK_RESPONSE_CLOSE)
-    gtk_widget_hide (infobar);
-}
+  appmenu = (GMenuModel *)gtk_builder_get_object (builder, "appmenu");
 
-static void
-show_dialog (GtkWidget *button, GtkWidget *dialog)
-{
-  gtk_widget_show (dialog);
-}
+  gtk_application_set_app_menu (GTK_APPLICATION (app), appmenu);
 
-static void
-close_dialog (GtkWidget *dialog)
-{
-  gtk_widget_hide (dialog);
-}
-
-static void
-set_needs_attention (GtkWidget *page, gboolean needs_attention)
-{
-  GtkWidget *stack;
-
-  stack = gtk_widget_get_parent (page);
-  gtk_container_child_set (GTK_CONTAINER (stack), page,
-                           "needs-attention", needs_attention,
-                           NULL);
-}
-
-static gboolean
-demand_attention (gpointer stack)
-{
-  GtkWidget *page;
-
-  page = gtk_stack_get_child_by_name (GTK_STACK (stack), "page3");
-  set_needs_attention (page, TRUE);
-
-  return G_SOURCE_REMOVE;
-}
-
-static void
-action_dialog_button_clicked (GtkButton *button, GtkWidget *page)
-{
-  g_timeout_add (1000, demand_attention, page);
-}
-
-static void
-page_changed_cb (GtkWidget *stack, GParamSpec *pspec, gpointer data)
-{
-  const gchar *name;
-  GtkWidget *page;
-
-  if (gtk_widget_in_destruction (stack))
-    return;
-
-  name = gtk_stack_get_visible_child_name (GTK_STACK (stack));
-  if (g_str_equal (name, "page3"))
-    {
-      page = gtk_stack_get_visible_child (GTK_STACK (stack));
-      set_needs_attention (GTK_WIDGET (page), FALSE);
-    }
-}
-
-static void
-populate_model (GtkTreeStore *store)
-{
-  GtkTreeIter iter, parent0, parent1, parent2, parent3;
-
-  gtk_tree_store_append (store, &iter, NULL);
-  gtk_tree_store_set (store, &iter,
-                      0, "Charlemagne",
-                      1, "742",
-                      2, "814",
-                      -1);
-  parent0 = iter;
-  gtk_tree_store_append (store, &iter, &parent0);
-  gtk_tree_store_set (store, &iter,
-                      0, "Pepin the Short",
-                      1, "714",
-                      2, "768",
-                      -1);
-  parent1 = iter;
-  gtk_tree_store_append (store, &iter, &parent1);
-  gtk_tree_store_set (store, &iter,
-                      0, "Charles Martel",
-                      1, "688",
-                      2, "741",
-                      -1);
-  parent2 = iter;
-  gtk_tree_store_append (store, &iter, &parent2);
-  gtk_tree_store_set (store, &iter,
-                      0, "Pepin of Herstal",
-                      1, "635",
-                      2, "714",
-                      -1);
-  parent3 = iter;
-  gtk_tree_store_append (store, &iter, &parent3);
-  gtk_tree_store_set (store, &iter,
-                      0, "Ansegisel",
-                      1, "602 or 610",
-                      2, "murdered before 679",
-                      -1);
-  gtk_tree_store_append (store, &iter, &parent3);
-  gtk_tree_store_set (store, &iter,
-                      0, "Begga",
-                      1, "615",
-                      2, "693",
-                      -1);
-  gtk_tree_store_append (store, &iter, &parent2);
-  gtk_tree_store_set (store, &iter,
-                      0, "Alpaida",
-                      -1);
-  gtk_tree_store_append (store, &iter, &parent1);
-  gtk_tree_store_set (store, &iter,
-                      0, "Rotrude",
-                      -1);
-  parent2 = iter;
-  gtk_tree_store_append (store, &iter, &parent2);
-  gtk_tree_store_set (store, &iter,
-                      0, "Liévin de Trèves",
-                      -1);
-  parent3 = iter;
-  gtk_tree_store_append (store, &iter, &parent3);
-  gtk_tree_store_set (store, &iter,
-                      0, "Guérin",
-                      -1);
-  gtk_tree_store_append (store, &iter, &parent3);
-  gtk_tree_store_set (store, &iter,
-                      0, "Gunza",
-                      -1);
-  gtk_tree_store_append (store, &iter, &parent2);
-  gtk_tree_store_set (store, &iter,
-                      0, "Willigarde de Bavière",
-                      -1);
-  gtk_tree_store_append (store, &iter, &parent0);
-  gtk_tree_store_set (store, &iter,
-                      0, "Bertrada of Laon",
-                      1, "710",
-                      2, "783",
-                      -1);
-  parent1 = iter;
-  gtk_tree_store_append (store, &iter, &parent1);
-  gtk_tree_store_set (store, &iter,
-                      0, "Caribert of Laon",
-                      2, "before 762",
-                      -1);
-  parent2 = iter;
-  gtk_tree_store_append (store, &iter, &parent2);
-  gtk_tree_store_set (store, &iter,
-                      0, "Unknown",
-                      -1);
-  gtk_tree_store_append (store, &iter, &parent2);
-  gtk_tree_store_set (store, &iter,
-                      0, "Bertrada of Prüm",
-                      1, "ca. 670",
-                      2, "after 721",
-                      -1);
-  gtk_tree_store_append (store, &iter, &parent1);
-  gtk_tree_store_set (store, &iter,
-                      0, "Gisele of Aquitaine",
-                      -1);
-}
-
-static void
-update_title_header (GtkListBoxRow *row,
-                     GtkListBoxRow *before,
-                     gpointer       data)
-{
-  GtkWidget *header;
-  gchar *title;
-
-  header = gtk_list_box_row_get_header (row);
-  title = (gchar *)g_object_get_data (G_OBJECT (row), "title");
-  if (!header && title)
-    {
-      title = g_strdup_printf ("<b>%s</b>", title);
-
-      header = gtk_label_new (title);
-      gtk_label_set_use_markup (GTK_LABEL (header), TRUE);
-      gtk_widget_set_halign (header, GTK_ALIGN_START);
-      gtk_widget_set_margin_top (header, 12);
-      gtk_widget_set_margin_start (header, 6);
-      gtk_widget_set_margin_end (header, 6);
-      gtk_widget_set_margin_bottom (header, 6);
-      gtk_widget_show (header);
-
-      gtk_list_box_row_set_header (row, header);
-
-      g_free (title);
-    }
-}
-
-static void
-populate_colors (GtkWidget *widget)
-{
-  struct { const gchar *name; const gchar *color; const gchar *title; } colors[] = {
-    { "2.5", "#C8828C", "Red" },
-    { "5", "#C98286", NULL },
-    { "7.5", "#C9827F", NULL },
-    { "10", "#C98376", NULL },
-    { "2.5", "#C8856D", "Red/Yellow" },
-    { "5", "#C58764", NULL },
-    { "7.5", "#C1895E", NULL },
-    { "10", "#BB8C56", NULL },
-    { "2.5", "#B58F4F", "Yellow" },
-    { "5", "#AD924B", NULL },
-    { "7.5", "#A79548", NULL },
-    { "10", "#A09749", NULL },
-    { "2.5", "#979A4E", "Yellow/Green" },
-    { "5", "#8D9C55", NULL },
-    { "7.5", "#7F9F62", NULL },
-    { "10", "#73A06E", NULL },
-    { "2.5", "#65A27C", "Green" },
-    { "5", "#5CA386", NULL },
-    { "7.5", "#57A38D", NULL },
-    { "10", "#52A394", NULL },
-    { "2.5", "#4EA39A", "Green/Blue" },
-    { "5", "#49A3A2", NULL },
-    { "7.5", "#46A2AA", NULL },
-    { "10", "#46A1B1", NULL },
-    { "2.5", "#49A0B8", "Blue" },
-    { "5", "#529EBD", NULL },
-    { "7.5", "#5D9CC1", NULL },
-    { "10", "#689AC3", NULL },
-    { "2.5", "#7597C5", "Blue/Purple" },
-    { "5", "#8095C6", NULL },
-    { "7.5", "#8D91C6", NULL },
-    { "10", "#988EC4", NULL },
-    { "2.5", "#A08CC1", "Purple" },
-    { "5", "#A88ABD", NULL },
-    { "7.5", "#B187B6", NULL },
-    { "10", "#B786B0", NULL },
-    { "2.5", "#BC84A9", "Purple/Red" },
-    { "5", "#C183A0", NULL },
-    { "7.5", "#C48299", NULL },
-    { "10", "#C68292", NULL }
-  };
-  gint i;
-  GtkWidget *row, *box, *label, *swatch;
-  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);
-      label = gtk_label_new (colors[i].name);
-      g_object_set (label,
-                    "halign", GTK_ALIGN_START,
-                    "valign", GTK_ALIGN_CENTER,
-                    "margin", 6,
-                    "xalign", 0.0,
-                    NULL);
-      gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE, 0);
-      gdk_rgba_parse (&rgba, colors[i].color);
-      swatch = g_object_new (g_type_from_name ("GtkColorSwatch"),
-                             "rgba", &rgba,
-                             "selectable", FALSE,
-                             "halign", GTK_ALIGN_END,
-                             "valign", GTK_ALIGN_CENTER,
-                             "margin", 6,
-                             "height-request", 24,
-                             NULL);
-      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_container_add (GTK_CONTAINER (box), swatch);
-      gtk_box_pack_start (GTK_BOX (row), box, FALSE, FALSE, 0);
-      gtk_widget_show_all (row);
-      gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1);
-      row = gtk_widget_get_parent (row);
-      gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
-      if (colors[i].title)
-        g_object_set_data (G_OBJECT (row), "title", (gpointer)colors[i].title);
-    }
-
-  gtk_list_box_invalidate_headers (GTK_LIST_BOX (widget));
-}
-
-typedef struct {
-  GtkWidget *flowbox;
-  gchar *filename;
-} BackgroundData;
-
-static void
-background_loaded_cb (GObject      *source,
-                      GAsyncResult *res,
-                      gpointer      data)
-{
-  BackgroundData *bd = data;
-  GtkWidget *child;
-  GdkPixbuf *pixbuf;
-  GError *error = NULL;
-
-  pixbuf = gdk_pixbuf_new_from_stream_finish (res, &error);
-  if (error)
-    {
-      g_warning ("%s", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  child = gtk_image_new_from_pixbuf (pixbuf);
-  gtk_widget_show (child);
-  gtk_flow_box_insert (GTK_FLOW_BOX (bd->flowbox), child, -1);
-  child = gtk_widget_get_parent (child);
-  g_object_set_data_full (G_OBJECT (child), "filename", bd->filename, g_free);
-  g_free (bd);
-}
-
-static void
-populate_flowbox (GtkWidget *button, GtkWidget *flowbox)
-{
-  const gchar *location;
-  GDir *dir;
-  GError *error = NULL;
-  const gchar *name;
-  gchar *filename;
-  GFile *file;
-  GInputStream *stream;
-  BackgroundData *bd;
-  GdkPixbuf *pixbuf;
-  GtkWidget *child;
-
-  g_signal_handlers_disconnect_by_func (button, populate_flowbox, flowbox);
-
-  pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 110, 70);
-  gdk_pixbuf_fill (pixbuf, 0xffffffff);
-  child = gtk_image_new_from_pixbuf (pixbuf);
-  gtk_widget_show (child);
-  gtk_flow_box_insert (GTK_FLOW_BOX (flowbox), child, -1);
-
-  location = "/usr/share/backgrounds/gnome";
-  dir = g_dir_open (location, 0, &error);
-  if (error)
-    {
-      g_warning ("%s", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  while ((name = g_dir_read_name (dir)) != NULL)
-    {
-      filename = g_build_filename (location, name, NULL);
-      file = g_file_new_for_path (filename);
-      stream = G_INPUT_STREAM (g_file_read (file, NULL, &error));
-      if (error)
-        {
-          g_warning ("%s", error->message);
-          g_clear_error (&error);
-          g_free (filename); 
-        }
-      else
-        {
-          bd = g_new (BackgroundData, 1);
-          bd->flowbox = flowbox;
-          bd->filename = filename;
-          gdk_pixbuf_new_from_stream_at_scale_async (stream, 110, 110, TRUE, NULL, 
-                                                     background_loaded_cb, bd);
-        }
-
-      g_object_unref (file);
-      g_object_unref (stream);
-    }
-
-  g_dir_close (dir);
-}
-
-static void
-row_activated (GtkListBox *box, GtkListBoxRow *row)
-{
-  GtkWidget *image;
-  GtkWidget *dialog;
-
-  image = (GtkWidget *)g_object_get_data (G_OBJECT (row), "image");
-  dialog = (GtkWidget *)g_object_get_data (G_OBJECT (row), "dialog");
-
-  if (image)
-    {
-      if (gtk_widget_get_opacity (image) > 0)
-        gtk_widget_set_opacity (image, 0);
-      else
-        gtk_widget_set_opacity (image, 1);
-    }
-  else if (dialog)
-    {
-      gtk_window_present (GTK_WINDOW (dialog));
-    }
-}
-
-static void
-set_accel (GtkApplication *app, GtkWidget *widget)
-{
-  GtkWidget *accel_label;
-  const gchar *action;
-  gchar **accels;
-  guint key;
-  GdkModifierType mods;
-
-  accel_label = gtk_bin_get_child (GTK_BIN (widget));
-  g_assert (GTK_IS_ACCEL_LABEL (accel_label));
-
-  action = gtk_actionable_get_action_name (GTK_ACTIONABLE (widget));
-  accels = gtk_application_get_accels_for_action (app, action);
-
-  gtk_accelerator_parse (accels[0], &key, &mods);
-  gtk_accel_label_set_accel (GTK_ACCEL_LABEL (accel_label), key, mods);
-
-  g_strfreev (accels);
-}
-
-typedef struct
-{
-  GtkTextView tv;
-  cairo_surface_t *surface;
-} MyTextView;
-
-typedef GtkTextViewClass MyTextViewClass;
-
-G_DEFINE_TYPE (MyTextView, my_text_view, GTK_TYPE_TEXT_VIEW)
-
-static void
-my_text_view_init (MyTextView *tv)
-{
-}
-
-static void
-my_tv_draw_layer (GtkTextView      *widget,
-                  GtkTextViewLayer  layer,
-                  cairo_t          *cr)
-{
-  MyTextView *tv = (MyTextView *)widget;
-
-  if (layer == GTK_TEXT_VIEW_LAYER_BELOW && tv->surface)
-    {
-      cairo_save (cr);
-      cairo_set_source_surface (cr, tv->surface, 0.0, 0.0);
-      cairo_paint_with_alpha (cr, 0.333);
-      cairo_restore (cr);
-    }
-}
-
-static void
-my_tv_finalize (GObject *object)
-{
-  MyTextView *tv = (MyTextView *)object;
-
-  if (tv->surface)
-    cairo_surface_destroy (tv->surface);
-
-  G_OBJECT_CLASS (my_text_view_parent_class)->finalize (object);
-}
-
-static void
-my_text_view_class_init (MyTextViewClass *class)
-{
-  GtkTextViewClass *tv_class = GTK_TEXT_VIEW_CLASS (class);
-  GObjectClass *o_class = G_OBJECT_CLASS (class);
-
-  o_class->finalize = my_tv_finalize;
-  tv_class->draw_layer = my_tv_draw_layer;
-}
-
-static void
-my_text_view_set_background (MyTextView *tv, const gchar *filename)
-{
-  GdkPixbuf *pixbuf;
-  GError *error = NULL;
-
-  if (tv->surface)
-    cairo_surface_destroy (tv->surface);
-
-  tv->surface = NULL;
-
-  if (filename == NULL)
-    return;
-
-  pixbuf = gdk_pixbuf_new_from_file (filename, &error);
-  if (error)
-    {
-      g_warning ("%s", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  tv->surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, 1, NULL);
-
-  g_object_unref (pixbuf);
-
-  gtk_widget_queue_draw (GTK_WIDGET (tv));
-}
-
-static void
-close_selection_dialog (GtkWidget *dialog, gint response, GtkWidget *tv)
-{
-  GtkWidget *box;
-  GtkWidget *child;
-  GList *children;
-  const gchar *filename;
-
-  gtk_widget_hide (dialog);
-
-  if (response == GTK_RESPONSE_CANCEL)
-    return;
-
-  box = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-  children = gtk_container_get_children (GTK_CONTAINER (box));
-  box = children->data;
-  g_list_free (children);
-  g_assert (GTK_IS_FLOW_BOX (box));
-  children = gtk_flow_box_get_selected_children (GTK_FLOW_BOX (box));
-
-  if (!children)
-    return;
-
-  child = children->data;
-  filename = (const gchar *)g_object_get_data (G_OBJECT (child), "filename");
-
-  g_list_free (children);
-
-  my_text_view_set_background ((MyTextView *)tv, filename);
-}
-
-static void
-toggle_selection_mode (GtkSwitch  *sw,
-                       GParamSpec *pspec,
-                       GtkListBox *listbox)
-{
-  if (gtk_switch_get_active (sw))
-    gtk_list_box_set_selection_mode (listbox, GTK_SELECTION_SINGLE);
-  else
-    gtk_list_box_set_selection_mode (listbox, GTK_SELECTION_NONE);
-
-  gtk_list_box_set_activate_on_single_click (listbox, !gtk_switch_get_active (sw));
+  g_object_unref (builder);
 }
 
 static void
@@ -794,30 +226,13 @@ activate (GApplication *app)
   GtkBuilder *builder;
   GtkWindow *window;
   GtkWidget *widget;
-  GtkWidget *widget2;
-  GtkWidget *stack;
-  GtkWidget *dialog;
   GtkAdjustment *adj;
   static GActionEntry win_entries[] = {
-    { "dark", NULL, NULL, "false", change_theme_state },
-    { "search", activate_search, NULL, NULL, NULL },
-    { "delete", activate_delete, NULL, NULL, NULL }
+    { "dark", activate_toggle, NULL, "false", change_theme_state }
   };
-  struct {
-    const gchar *action_and_target;
-    const gchar *accelerators[2];
-  } accels[] = {
-    { "app.about", { "F1", NULL } },
-    { "app.quit", { "<Primary>q", NULL } },
-    { "win.dark", { "<Primary>d", NULL } },
-    { "win.search", { "<Primary>s", NULL } },
-    { "win.delete", { "Delete", NULL } }
-  };
-  gint i;
 
-  g_type_ensure (my_text_view_get_type ());
-
-  builder = gtk_builder_new_from_resource ("/org/gtk/WidgetFactory/widget-factory.ui");
+  builder = gtk_builder_new ();
+  gtk_builder_add_from_resource (builder, "/ui/widget-factory.ui", NULL);
   gtk_builder_add_callback_symbol (builder, "on_entry_icon_release", (GCallback)on_entry_icon_release);
   gtk_builder_connect_signals (builder, NULL);
 
@@ -827,31 +242,11 @@ activate (GApplication *app)
                                    win_entries, G_N_ELEMENTS (win_entries),
                                    window);
 
-  for (i = 0; i < G_N_ELEMENTS (accels); i++)
-    gtk_application_set_accels_for_action (GTK_APPLICATION (app), accels[i].action_and_target, accels[i].accelerators);
-
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "statusbar");
-  gtk_statusbar_push (GTK_STATUSBAR (widget), 0, "All systems are operating normally.");
-  g_action_map_add_action (G_ACTION_MAP (window),
-                           G_ACTION (g_property_action_new ("statusbar", widget, "visible")));
-
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "toolbar");
-  g_action_map_add_action (G_ACTION_MAP (window),
-                           G_ACTION (g_property_action_new ("toolbar", widget, "visible")));
-
-  adj = (GtkAdjustment *)gtk_builder_get_object (builder, "adjustment1");
-
   widget = (GtkWidget *)gtk_builder_get_object (builder, "progressbar3");
-  g_signal_connect (adj, "value-changed", G_CALLBACK (update_pulse_time), widget);
-  update_pulse_time (adj, widget);
-
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "entry1");
-  g_signal_connect (adj, "value-changed", G_CALLBACK (update_pulse_time), widget);
-  update_pulse_time (adj, widget);
-
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "page2reset");
-  adj = (GtkAdjustment *) gtk_builder_get_object (builder, "adjustment2");
-  g_signal_connect (widget, "clicked", G_CALLBACK (spin_value_reset), adj);
+  pulse_id = g_timeout_add (250, (GSourceFunc)pulse_it, widget);
+  g_signal_connect (gtk_builder_get_object (builder, "adjustment1"),
+                    "value-changed",
+                    G_CALLBACK (update_pulse_time), widget);
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "page2dismiss");
   g_signal_connect (widget, "clicked", G_CALLBACK (dismiss), NULL);
@@ -860,76 +255,6 @@ activate (GApplication *app)
   adj = (GtkAdjustment *) gtk_builder_get_object (builder, "adjustment2");
   g_signal_connect (adj, "value-changed", G_CALLBACK (spin_value_changed), widget);
 
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "listbox");
-  gtk_list_box_set_header_func (GTK_LIST_BOX (widget), update_header, NULL, NULL);
-  g_signal_connect (widget, "row-activated", G_CALLBACK (row_activated), NULL);
-
-  widget2 = (GtkWidget *)gtk_builder_get_object (builder, "listboxrow1switch");
-  g_signal_connect (widget2, "notify::active", G_CALLBACK (toggle_selection_mode), widget);
-
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "listboxrow3");
-  widget2 = (GtkWidget *)gtk_builder_get_object (builder, "listboxrow3image");
-  g_object_set_data (G_OBJECT (widget), "image", widget2);
-
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "listboxrow4");
-  widget2 = (GtkWidget *)gtk_builder_get_object (builder, "info_dialog");
-  g_object_set_data (G_OBJECT (widget), "dialog", widget2);
-
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "listboxrow5button");
-  widget2 = (GtkWidget *)gtk_builder_get_object (builder, "action_dialog");
-  g_signal_connect_swapped (widget, "clicked", G_CALLBACK (gtk_window_present), widget2);
-
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "toolbar");
-  g_object_set_data (G_OBJECT (window), "toolbar", widget);
-
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "searchbar");
-  g_object_set_data (G_OBJECT (window), "searchbar", widget);
-
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "infobar");
-  g_signal_connect (widget, "response", G_CALLBACK (info_bar_response), NULL); 
-  g_object_set_data (G_OBJECT (window), "infobar", widget);
-
-  dialog = (GtkWidget *)gtk_builder_get_object (builder, "info_dialog");
-  g_signal_connect (dialog, "response", G_CALLBACK (close_dialog), NULL);
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "info_dialog_button");
-  g_signal_connect (widget, "clicked", G_CALLBACK (show_dialog), dialog);
-
-  dialog = (GtkWidget *)gtk_builder_get_object (builder, "action_dialog");
-  g_signal_connect (dialog, "response", G_CALLBACK (close_dialog), NULL);
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "action_dialog_button");
-  g_signal_connect (widget, "clicked", G_CALLBACK (show_dialog), dialog);
-
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "act_action_dialog");
-  stack = (GtkWidget *)gtk_builder_get_object (builder, "toplevel_stack");
-  g_signal_connect (widget, "clicked", G_CALLBACK (action_dialog_button_clicked), stack);
-  g_signal_connect (stack, "notify::visible-child-name", G_CALLBACK (page_changed_cb), NULL);
-
-  dialog = (GtkWidget *)gtk_builder_get_object (builder, "preference_dialog");
-  g_signal_connect (dialog, "response", G_CALLBACK (close_dialog), NULL);
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "preference_dialog_button");
-  g_signal_connect (widget, "clicked", G_CALLBACK (show_dialog), dialog);
-
-  dialog = (GtkWidget *)gtk_builder_get_object (builder, "selection_dialog");
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "text3");
-  g_signal_connect (dialog, "response", G_CALLBACK (close_selection_dialog), widget);
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "selection_dialog_button");
-  g_signal_connect (widget, "clicked", G_CALLBACK (show_dialog), dialog);
-
-  widget2 = (GtkWidget *)gtk_builder_get_object (builder, "selection_flowbox");
-  g_signal_connect (widget, "clicked", G_CALLBACK (populate_flowbox), widget2);
-
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "charletree");
-  populate_model ((GtkTreeStore *)gtk_tree_view_get_model (GTK_TREE_VIEW (widget)));
-  gtk_tree_view_expand_all (GTK_TREE_VIEW (widget));
-
-  populate_colors ((GtkWidget *)gtk_builder_get_object (builder, "munsell"));
-
-  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "quitmenuitem")));
-  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "deletemenuitem")));
-  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "searchmenuitem")));
-  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "darkmenuitem")));
-  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "aboutmenuitem")));
-
   gtk_widget_show_all (GTK_WIDGET (window));
 
   g_object_unref (builder);
@@ -942,25 +267,20 @@ main (int argc, char *argv[])
   static GActionEntry app_entries[] = {
     { "about", activate_about, NULL, NULL, NULL },
     { "quit", activate_quit, NULL, NULL, NULL },
-    { "main", NULL, "s", "'steak'", NULL },
-    { "wine", NULL, NULL, "false", NULL },
-    { "beer", NULL, NULL, "false", NULL },
-    { "water", NULL, NULL, "true", NULL },
-    { "dessert", NULL, "s", "'bars'", NULL },
-    { "pay", NULL, "s", NULL, NULL }
   };
-  gint status;
 
-  app = gtk_application_new ("org.gtk.WidgetFactory", G_APPLICATION_NON_UNIQUE);
+  gtk_init (&argc, &argv);
+
+  app = gtk_application_new ("org.gtk.WidgetFactory", 0);
 
   g_action_map_add_action_entries (G_ACTION_MAP (app),
                                    app_entries, G_N_ELEMENTS (app_entries),
                                    app);
 
+  g_signal_connect (app, "startup", G_CALLBACK (startup), NULL);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
 
-  status = g_application_run (G_APPLICATION (app), argc, argv);
-  g_object_unref (app);
+  g_application_run (G_APPLICATION (app), argc, argv);
 
-  return status;
+  return 0;
 }

demos/widget-factory/widget-factory.gresource.xml

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gtk/WidgetFactory">
+  <gresource prefix="/ui">
     <file preprocess="xml-stripblanks">widget-factory.ui</file>
   </gresource>
-  <gresource prefix="/org/gtk/WidgetFactory/gtk">
-    <file preprocess="xml-stripblanks">menus.ui</file>
-  </gresource>
 </gresources>

docs/reference/gdk/gdk-docs.sgml

@@ -26,6 +26,7 @@
     <xi:include href="xml/gdkdevice.xml" />
     <xi:include href="xml/regions.xml" />
     <xi:include href="xml/pixbufs.xml" />
+    <xi:include href="xml/colors.xml" />
     <xi:include href="xml/rgba_colors.xml" />
     <xi:include href="xml/visuals.xml" />
     <xi:include href="xml/cursors.xml" />
@@ -47,11 +48,6 @@
     <xi:include href="xml/gdktestutils.xml" />
   </reference>
 
-  <reference>
-    <title>Deprecated</title>
-    <xi:include href="xml/colors.xml" />
-  </reference>
-
   <index id="api-index-full">
     <title>Index of all symbols</title>
     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
@@ -88,10 +84,6 @@
     <title>Index of new symbols in 3.12</title>
     <xi:include href="xml/api-index-3.12.xml"><xi:fallback /></xi:include>
   </index>
-  <index id="api-index-3-14" role="3.14">
-    <title>Index of new symbols in 3.14</title>
-    <xi:include href="xml/api-index-3.14.xml"><xi:fallback /></xi:include>
-  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 

docs/reference/gdk/gdk3-sections.txt

@@ -58,11 +58,6 @@ GDK_WINDOWING_WAYLAND
 GDK_VERSION_3_0
 GDK_VERSION_3_2
 GDK_VERSION_3_4
-GDK_VERSION_3_6
-GDK_VERSION_3_8
-GDK_VERSION_3_10
-GDK_VERSION_3_12
-GDK_VERSION_3_14
 GDK_VERSION_MIN_REQUIRED
 GDK_VERSION_MAX_ALLOWED
 GDK_DISABLE_DEPRECATION_WARNINGS
@@ -389,7 +384,6 @@ gdk_window_begin_resize_drag
 gdk_window_begin_resize_drag_for_device
 gdk_window_begin_move_drag
 gdk_window_begin_move_drag_for_device
-gdk_window_show_window_menu
 gdk_window_constrain_size
 gdk_window_beep
 gdk_window_get_scale_factor

docs/reference/gtk/Makefile.am

@@ -151,15 +151,10 @@ content_files =					\
 	tree_widget.sgml			\
 	windows.sgml				\
 	x11.sgml				\
-	gtk3-demo.xml				\
-	gtk3-widget-factory.xml			\
-	gtk3-icon-browser.xml			\
 	gtk-query-immodules-3.0.xml		\
 	gtk-update-icon-cache.xml		\
-	gtk-encode-symbolic-svg.xml		\
 	gtk-launch.xml				\
 	broadwayd.xml				\
-	input-handling.xml			\
 	visual_index.xml			\
 	getting_started.xml			\
 	overview.xml
@@ -181,9 +176,127 @@ expand_content_files = 				\
 
 # Images to copy into HTML directory
 HTML_IMAGES = \
+	$(top_srcdir)/gtk/stock-icons/24/help-about.png			\
+	$(top_srcdir)/gtk/stock-icons/24/list-add.png			\
+	$(top_srcdir)/gtk/stock-icons/20/gtk-apply.png			\
+	$(top_srcdir)/gtk/stock-icons/24/format-text-bold.png		\
+	$(top_srcdir)/gtk/stock-icons/20/gtk-cancel.png			\
+	$(top_srcdir)/gtk/stock-icons/24/gtk-caps-lock-warning.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-optical.png		\
+	$(top_srcdir)/gtk/stock-icons/24/edit-clear.png			\
+	$(top_srcdir)/gtk/stock-icons/24/window-close.png		\
+	$(top_srcdir)/gtk/stock-icons/24/gtk-connect.png		\
+	$(top_srcdir)/gtk/stock-icons/24/gtk-convert.png		\
+	$(top_srcdir)/gtk/stock-icons/24/edit-copy.png			\
+	$(top_srcdir)/gtk/stock-icons/24/edit-cut.png			\
+	$(top_srcdir)/gtk/stock-icons/24/edit-delete.png		\
+	$(top_srcdir)/gtk/stock-icons/48/dialog-password.png		\
+	$(top_srcdir)/gtk/stock-icons/48/dialog-error.png		\
+	$(top_srcdir)/gtk/stock-icons/48/dialog-information.png		\
+	$(top_srcdir)/gtk/stock-icons/48/dialog-question.png		\
+	$(top_srcdir)/gtk/stock-icons/48/dialog-warning.png		\
+	$(top_srcdir)/gtk/stock-icons/24/folder.png			\
+	$(top_srcdir)/gtk/stock-icons/24/gtk-disconnect.png		\
+	$(top_srcdir)/gtk/stock-icons/32/gtk-dnd.png			\
+	$(top_srcdir)/gtk/stock-icons/32/gtk-dnd-multiple.png		\
+	$(top_srcdir)/gtk/stock-icons/24/gtk-edit.png			\
+	$(top_srcdir)/gtk/stock-icons/24/system-run.png			\
+	$(top_srcdir)/gtk/stock-icons/24/text-x-generic.png		\
+	$(top_srcdir)/gtk/stock-icons/24/edit-find.png			\
+	$(top_srcdir)/gtk/stock-icons/24/edit-find-replace.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-bottom.png			\
+	$(top_srcdir)/gtk/stock-icons/24/go-first-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-first-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-last-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-last-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-top.png			\
+	$(top_srcdir)/gtk/stock-icons/24/go-previous-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-previous-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-down.png			\
+	$(top_srcdir)/gtk/stock-icons/24/go-next-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-next-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-up.png			\
+	$(top_srcdir)/gtk/stock-icons/24/drive-harddisk.png		\
+	$(top_srcdir)/gtk/stock-icons/24/network-idle.png		\
+	$(top_srcdir)/gtk/stock-icons/24/help-contents.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-home.png			\
+	$(top_srcdir)/gtk/stock-icons/24/gtk-index.png			\
+	$(top_srcdir)/gtk/stock-icons/24/format-indent-more-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/format-indent-more-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/format-indent-less-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/format-indent-less-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/format-text-italic.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-jump-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-jump-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/format-justify-center.png	\
+	$(top_srcdir)/gtk/stock-icons/24/format-justify-fill.png	\
+	$(top_srcdir)/gtk/stock-icons/24/format-justify-left.png	\
+	$(top_srcdir)/gtk/stock-icons/24/format-justify-right.png	\
+	$(top_srcdir)/gtk/stock-icons/24/image-missing.png		\
+	$(top_srcdir)/gtk/stock-icons/24/document-new.png		\
+	$(top_srcdir)/gtk/stock-icons/20/gtk-no.png			\
+	$(top_srcdir)/gtk/stock-icons/20/gtk-ok.png			\
+	$(top_srcdir)/gtk/stock-icons/24/document-open.png		\
+	$(top_srcdir)/gtk/stock-icons/24/gtk-orientation-landscape.png	\
+	$(top_srcdir)/gtk/stock-icons/24/gtk-orientation-portrait.png	\
+	$(top_srcdir)/gtk/stock-icons/24/gtk-orientation-reverse-landscape.png \
+	$(top_srcdir)/gtk/stock-icons/24/gtk-orientation-reverse-portrait.png \
+	$(top_srcdir)/gtk/stock-icons/24/edit-paste.png			\
+	$(top_srcdir)/gtk/stock-icons/24/gtk-preferences.png		\
+	$(top_srcdir)/gtk/stock-icons/24/document-print.png		\
+	$(top_srcdir)/gtk/stock-icons/24/printer-error.png		\
+	$(top_srcdir)/gtk/stock-icons/24/printer-paused.png		\
+	$(top_srcdir)/gtk/stock-icons/24/document-print-preview.png	\
+	$(top_srcdir)/gtk/stock-icons/24/printer-info.png		\
+	$(top_srcdir)/gtk/stock-icons/24/printer-warning.png		\
+	$(top_srcdir)/gtk/stock-icons/24/document-properties.png	\
+	$(top_srcdir)/gtk/stock-icons/24/application-exit.png		\
+	$(top_srcdir)/gtk/stock-icons/24/edit-redo-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/edit-redo-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/view-refresh.png		\
+	$(top_srcdir)/gtk/stock-icons/24/list-remove.png		\
+	$(top_srcdir)/gtk/stock-icons/24/document-revert-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/document-revert-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-floppy.png		\
+	$(top_srcdir)/gtk/stock-icons/24/document-save.png		\
+	$(top_srcdir)/gtk/stock-icons/24/document-save-as.png		\
+	$(top_srcdir)/gtk/stock-icons/24/edit-select-all.png		\
+	$(top_srcdir)/gtk/stock-icons/24/gtk-select-color.png		\
+	$(top_srcdir)/gtk/stock-icons/24/gtk-color-picker.png		\
+	$(top_srcdir)/gtk/stock-icons/24/gtk-font.png			\
+	$(top_srcdir)/gtk/stock-icons/24/view-sort-ascending.png	\
+	$(top_srcdir)/gtk/stock-icons/24/view-sort-descending.png	\
+	$(top_srcdir)/gtk/stock-icons/24/tools-check-spelling.png	\
+	$(top_srcdir)/gtk/stock-icons/24/process-stop.png		\
+	$(top_srcdir)/gtk/stock-icons/24/format-text-strikethrough.png	\
+	$(top_srcdir)/gtk/stock-icons/24/gtk-undelete-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/gtk-undelete-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/format-text-underline.png	\
+	$(top_srcdir)/gtk/stock-icons/24/edit-undo-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/edit-undo-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/20/gtk-yes.png			\
+	$(top_srcdir)/gtk/stock-icons/24/zoom-original.png		\
+	$(top_srcdir)/gtk/stock-icons/24/zoom-fit-best.png		\
+	$(top_srcdir)/gtk/stock-icons/24/zoom-in.png			\
+	$(top_srcdir)/gtk/stock-icons/24/zoom-out.png			\
+	$(top_srcdir)/gtk/stock-icons/24/media-seek-forward-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-seek-forward-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-skip-forward-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-skip-forward-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-playback-pause.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-playback-start-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-playback-start-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-seek-backward-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-seek-backward-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-record.png		\
+	$(top_srcdir)/gtk/stock-icons/24/media-skip-backward-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-skip-backward-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-playback-stop.png	\
+	$(top_srcdir)/gtk/stock-icons/24/view-fullscreen.png		\
+	$(top_srcdir)/gtk/stock-icons/24/view-restore.png		\
+	$(top_srcdir)/gtk/stock-icons/24/gtk-page-setup.png		\
 	$(srcdir)/images/aboutdialog.png				\
 	$(srcdir)/images/accel-label.png				\
-	$(srcdir)/images/action-bar.png					\
 	$(srcdir)/images/appchooserbutton.png				\
 	$(srcdir)/images/appchooserdialog.png				\
 	$(srcdir)/images/assistant.png					\
@@ -232,7 +345,6 @@ HTML_IMAGES = \
 	$(srcdir)/images/scales.png					\
 	$(srcdir)/images/scrollbar.png					\
 	$(srcdir)/images/scrolledwindow.png				\
-	$(srcdir)/images/search-bar.png					\
 	$(srcdir)/images/search-entry.png				\
 	$(srcdir)/images/separator.png					\
 	$(srcdir)/images/spinbutton.png					\
@@ -312,8 +424,7 @@ HTML_IMAGES = \
 	$(srcdir)/images/getting-started-app9.png			\
 	$(srcdir)/images/getting-started-app10.png			\
 	$(srcdir)/images/exampleapp.png					\
-	$(srcdir)/images/flow-box.png					\
-	$(srcdir)/images/inspector.png
+	$(srcdir)/images/flow-box.png
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=../gdk/html \
@@ -334,11 +445,7 @@ EXTRA_DIST += version.xml.in gtk3.types.in
 man_MANS = 				\
 	gtk-query-immodules-3.0.1	\
 	gtk-update-icon-cache.1		\
-	gtk-encode-symbolic-svg.1	\
 	gtk-launch.1			\
-	gtk3-demo.1			\
-	gtk3-widget-factory.1		\
-	gtk3-icon-browser.1		\
 	broadwayd.1
 
 if ENABLE_MAN

docs/reference/gtk/broadwayd.xml

@@ -32,7 +32,6 @@
 <command>broadwayd</command>
 <arg choice="opt">--port <replaceable>PORT</replaceable></arg>
 <arg choice="opt">--address <replaceable>ADDRESS</replaceable></arg>
-<arg choice="opt">--unixsocket <replaceable>ADDRESS</replaceable></arg>
 <arg choice="opt"><replaceable>:DISPLAY</replaceable></arg>
 </cmdsynopsis>
 </refsynopsisdiv>
@@ -81,13 +80,6 @@ openssl passwd -1  > ~/.config/broadway.passwd
       address, instead of the default <literal>http://127.0.0.1:<replaceable>PORT</replaceable></literal>.
       </para></listitem>
   </varlistentry>
-  <varlistentry>
-    <term>--unixsocket</term>
-    <listitem><para>Use <replaceable>ADDRESS</replaceable> as the unix domain socket
-      address. This option overrides <literal>--address</literal> and <literal>--port</literal>.
-      It is available only on Unix-like systems.
-      </para></listitem>
-  </varlistentry>
 </variablelist>
 </refsect1>
 

docs/reference/gtk/building.sgml

@@ -102,7 +102,7 @@ How to compile GTK+ itself
       is used in a similar fashion for the linker. Finally the
       <envar>PKG_CONFIG_PATH</envar> environment variable contains
       a search path that <command>pkg-config</command> (see below)
-      uses when looking for files describing how to compile
+      uses when looking for for file describing how to compile
       programs using different libraries. If you were installing GTK+
       and it's dependencies into <filename>/opt/gtk</filename>, you
       might want to set these variables as:

docs/reference/gtk/compiling.sgml

@@ -90,6 +90,13 @@ GDK_PIXBUF_DISABLE_DEPRECATED and G_DISABLE_DEPRECATED for GDK, GdkPixbuf and
 GLib.
 </para>
 
+<para>
+If you want to make sure that your program doesn't use any functions which
+may be problematic in a multihead setting, you can define the preprocessor
+symbol GDK_MULTIHEAD_SAFE by using the command line option
+<literal>-DGTK_MULTIHEAD_SAFE=1</literal>.
+</para>
+
 <para>
 Similarly, if you want to make sure that your program doesn't use any
 functions which may be problematic in a multidevice setting, you can

docs/reference/gtk/getting_started.xml

@@ -605,16 +605,12 @@ example_app_startup (GApplication *app)
 {
   GtkBuilder *builder;
   GMenuModel *app_menu;
-  const gchar *quit_accels[2] = { "<Ctrl>Q", NULL };
 
   G_APPLICATION_CLASS (example_app_parent_class)->startup (app);
 
   g_action_map_add_action_entries (G_ACTION_MAP (app),
                                    app_entries, G_N_ELEMENTS (app_entries),
                                    app);
-  gtk_application_set_accels_for_action (GTK_APPLICATION (app),
-                                         "app.quit",
-                                         quit_accels);
 
   builder = gtk_builder_new_from_resource ("/org/gtk/exampleapp/app-menu.ui");
   app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"));
@@ -637,7 +633,7 @@ example_app_class_init (ExampleAppClass *class)
       <para>Our preferences menu item does not do anything yet,
       but the Quit menu item is fully functional. Note that it
       can also be activated by the usual Ctrl-Q shortcut. The
-      shortcut was added with gtk_application_set_accels_for_action().
+      shortcut was specified in the ui file.
       </para>
 
       <para>The application menu looks like this:</para>
@@ -986,8 +982,9 @@ example_app_window_init (ExampleAppWindow *win)
         <programlisting><xi:include href="../../../../examples/application10/window.ui" parse="text"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
-      <para>A small extra bonus of using a header bar is that we get
-      a fallback application menu for free. Here is how the
+      <para>A small extra refinement that we have added here is to allow
+      the header bar to provide a fallback application menu, by setting
+      the show-fallback-app-menu property to TRUE. Here is how the
       application now looks, if this fallback is used.</para>
 
       <informalfigure>

docs/reference/gtk/gtk-docs.sgml

@@ -25,7 +25,6 @@
     <xi:include href="resources.sgml" />
     <xi:include href="xml/question_index.sgml" />
     <xi:include href="drawing-model.xml" />
-    <xi:include href="input-handling.xml" />
   </part>
 
 
@@ -100,6 +99,7 @@
       <xi:include href="xml/gtklevelbar.xml" />
       <xi:include href="xml/gtkstatusbar.xml" />
       <xi:include href="xml/gtkaccellabel.xml" />
+      <xi:include href="xml/gtkstatusicon.xml" />
     </chapter>
 
     <chapter id="ButtonWidgets">
@@ -240,6 +240,7 @@
     <chapter id="MiscObjects">
       <title>Miscellaneous</title>
       <xi:include href="xml/gtkadjustment.xml" />
+      <xi:include href="xml/gtkarrow.xml" />
       <xi:include href="xml/gtkcalendar.xml" />
       <xi:include href="xml/gtkdrawingarea.xml" />
       <xi:include href="xml/gtkeventbox.xml" />
@@ -258,6 +259,7 @@
       <xi:include href="xml/gtkcontainer.xml" />
       <xi:include href="xml/gtkbin.xml" />
       <xi:include href="xml/gtkmenushell.xml" />
+      <xi:include href="xml/gtkmisc.xml" />
       <xi:include href="xml/gtkrange.xml" />
       <xi:include href="xml/gtkimcontext.xml" />
     </chapter>
@@ -286,20 +288,6 @@
       <xi:include href="xml/gtkappchooserwidget.xml" />
     </chapter>
 
-    <chapter id="Gestures">
-      <title>Gestures</title>
-      <xi:include href="xml/gtkeventcontroller.xml" />
-      <xi:include href="xml/gtkgesture.xml" />
-      <xi:include href="xml/gtkgesturesingle.xml" />
-      <xi:include href="xml/gtkgesturedrag.xml" />
-      <xi:include href="xml/gtkgesturelongpress.xml" />
-      <xi:include href="xml/gtkgesturemultipress.xml" />
-      <xi:include href="xml/gtkgesturepan.xml" />
-      <xi:include href="xml/gtkgestureswipe.xml" />
-      <xi:include href="xml/gtkgesturerotate.xml" />
-      <xi:include href="xml/gtkgesturezoom.xml" />
-    </chapter>
-
     <chapter id="DeprecatedObjects">
       <title>Deprecated</title>
       <xi:include href="xml/gtksymboliccolor.xml" />
@@ -333,13 +321,7 @@
       <xi:include href="xml/gtkrecentaction.xml" />
       <xi:include href="xml/gtkactivatable.xml" />
       <xi:include href="xml/gtkimagemenuitem.xml" />
-      <xi:include href="xml/gtkmisc.xml" />
       <xi:include href="xml/gtkstock.xml" />
-      <xi:include href="xml/gtkiconfactory.xml" />
-      <xi:include href="xml/gtknumerableicon.xml" />
-      <xi:include href="xml/gtkarrow.xml" />
-      <xi:include href="xml/gtkstatusicon.xml" />
-      <xi:include href="xml/gtkthemingengine.xml" />
     </chapter>
 
   </part>
@@ -366,8 +348,11 @@
     <xi:include href="xml/gtkcssprovider.xml" />
     <xi:include href="xml/gtkstyleprovider.xml" />
     <xi:include href="xml/gtkstyleproperties.xml" />
+    <xi:include href="xml/gtkthemingengine.xml" />
     <xi:include href="xml/gtkwidgetpath.xml" />
     <xi:include href="xml/gtkicontheme.xml" />
+    <xi:include href="xml/gtkiconfactory.xml" />
+    <xi:include href="xml/gtknumerableicon.xml" />
   </part>
 
   <part id="migrating">
@@ -393,12 +378,8 @@
 
   <part>
     <title>GTK+ Tools</title>
-    <xi:include href="gtk3-demo.xml" />
-    <xi:include href="gtk3-widget-factory.xml" />
-    <xi:include href="gtk3-icon-browser.xml" />
     <xi:include href="gtk-query-immodules-3.0.xml" />
     <xi:include href="gtk-update-icon-cache.xml" />
-    <xi:include href="gtk-encode-symbolic-svg.xml" />
     <xi:include href="gtk-launch.xml" />
     <xi:include href="broadwayd.xml" />
   </part>
@@ -453,10 +434,6 @@
     <title>Index of new symbols in 3.12</title>
     <xi:include href="xml/api-index-3.12.xml"><xi:fallback /></xi:include>
   </index>
-  <index id="api-index-3-14" role="3.14">
-    <title>Index of new symbols in 3.14</title>
-    <xi:include href="xml/api-index-3.14.xml"><xi:fallback /></xi:include>
-  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 

docs/reference/gtk/gtk-encode-symbolic-svg.xml

@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<refentry id="gtk-encode-symbolic-svg">
-
-<refentryinfo>
-  <title>gtk-encode-symbolic-svg</title>
-  <productname>GTK+</productname>
-  <authorgroup>
-    <author>
-      <contrib>Developer</contrib>
-      <firstname>Alexander</firstname>
-      <surname>Larsson</surname>
-    </author>
-  </authorgroup>
-</refentryinfo>
-
-<refmeta>
-  <refentrytitle>gtk-encode-symbolic-svg</refentrytitle>
-  <manvolnum>1</manvolnum>
-  <refmiscinfo class="manual">User Commands</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>gtk-encode-symbolic-svg</refname>
-  <refpurpose>Symbolic icon conversion utility</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-<command>gtk-encode-symbolic-svg</command>
-<arg choice="opt">OPTION...</arg>
-<arg choice="plain"><replaceable>PATH</replaceable></arg>
-<arg choice="plain"><replaceable>WIDTH</replaceable>x<replaceable>HEIGHT</replaceable></arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1><title>Description</title>
-<para>
-  <command>gtk-encode-symbolic-svg</command> converts symbolic svg icons into
-  specially prepared png files. GTK+ can load and recolor these pngs, just like
-  original svgs, but loading them is much faster.
-</para>
-<para>
-  <replaceable>PATH</replaceable> is the name of a symbolic svg file,
-  <replaceable>WIDTH</replaceable>x<replaceable>HEIGHT</replaceable> are the
-  desired dimensions for the generated png file.
-</para>
-<para>
-  To distinguish them from ordinary pngs, the generated files have the extension
-  <filename>.symbolic.png</filename>.
-</para>
-</refsect1>
-
-<refsect1><title>Options</title>
-<variablelist>
-  <varlistentry>
-    <term>-o <replaceable>DIRECTORY</replaceable></term>
-    <term>--output <replaceable>DIRECTORY</replaceable></term>
-    <listitem><para>Write png files to <replaceable>DIRECTORY</replaceable>
-         instead of the current working directory.</para></listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-</refentry>

docs/reference/gtk/gtk-update-icon-cache.xml

@@ -32,10 +32,7 @@
 <command>gtk-update-icon-cache</command>
 <arg choice="opt">--force</arg>
 <arg choice="opt">--ignore-theme-index</arg>
-<group>
-  <arg choice="plain">--index-only</arg>
-  <arg choice="plain">--include-image-data</arg>
-</group>
+<arg choice="opt">--index-only</arg>
 <arg choice="opt">--source <arg choice="plain"><replaceable>NAME</replaceable></arg></arg>
 <arg choice="opt">--quiet</arg>
 <arg choice="opt">--validate</arg>
@@ -90,12 +87,6 @@
     </para></listitem>
   </varlistentry>
 
-  <varlistentry>
-    <term>--include-image-data</term>
-    <listitem><para>Include image data in the cache.
-    </para></listitem>
-  </varlistentry>
-
   <varlistentry>
     <term>--source</term>
     <term>-c</term>

docs/reference/gtk/gtk3-demo.xml

@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<refentry id="gtk3-demo">
-
-<refentryinfo>
-  <title>gtk3-demo</title>
-  <productname>GTK+</productname>
-  <authorgroup>
-    <author>
-      <contrib>Developer</contrib>
-      <firstname>Matthias</firstname>
-      <surname>Clasen</surname>
-    </author>
-  </authorgroup>
-</refentryinfo>
-
-<refmeta>
-  <refentrytitle>gtk3-demo</refentrytitle>
-  <manvolnum>1</manvolnum>
-  <refmiscinfo class="manual">User Commands</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>gtk3-demo</refname>
-  <refpurpose>Demonstrate GTK+ widgets</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-<command>gtk3-demo</command>
-<arg choice="opt">--help</arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1><title>Description</title>
-<para>
-<command>gtk3-demo</command> is a collection of examples.
-Its purpose is to demonstrate many GTK+ widgets in a form
-that is useful to application developers.
-</para>
-<para>
-The application shows the source code for each example, as well as
-other used resources, such as ui files and icons.
-</para>
-</refsect1>
-
-<refsect1><title>Options</title>
-  <para>The following options are understood:</para>
-  <variablelist>
-    <varlistentry>
-    <term><option>-h</option>, <option>--help</option></term>
-      <listitem><para>Show help options</para></listitem>
-    </varlistentry>
-  </variablelist>
-</refsect1>
-
-</refentry>

docs/reference/gtk/gtk3-icon-browser.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<refentry id="gtk3-icon-browser">
-
-<refentryinfo>
-  <title>gtk3-icon-browser</title>
-  <productname>GTK+</productname>
-  <authorgroup>
-    <author>
-      <contrib>Developer</contrib>
-      <firstname>Matthias</firstname>
-      <surname>Clasen</surname>
-    </author>
-  </authorgroup>
-</refentryinfo>
-
-<refmeta>
-  <refentrytitle>gtk3-icon-browser</refentrytitle>
-  <manvolnum>1</manvolnum>
-  <refmiscinfo class="manual">User Commands</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>gtk3-icon-browser</refname>
-  <refpurpose>List themed icons</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-<command>gtk3-icon-browser</command>
-<arg choice="opt">--help</arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1><title>Description</title>
-<para>
-<command>gtk3-icon-browswer</command> is a utility to explore the icons
-in the current icon theme. It shows icons in various sizes, their symbolic
-variants where available, as well as a description of the icon and its context.
-</para>
-</refsect1>
-
-<refsect1><title>Options</title>
-  <para>The following options are understood:</para>
-  <variablelist>
-    <varlistentry>
-    <term><option>-h</option>, <option>--help</option></term>
-      <listitem><para>Show help options</para></listitem>
-    </varlistentry>
-  </variablelist>
-</refsect1>
-
-</refentry>

docs/reference/gtk/gtk3-sections.txt

@@ -57,7 +57,6 @@ gtk_about_dialog_get_type
 GtkAccelGroup
 GtkAccelGroupClass
 gtk_accel_group_new
-GtkAccelFlags
 gtk_accel_group_connect
 gtk_accel_group_connect_by_path
 GtkAccelGroupActivate
@@ -445,7 +444,6 @@ gtk_button_box_new
 gtk_button_box_get_layout
 gtk_button_box_get_child_secondary
 gtk_button_box_get_child_non_homogeneous
-GtkButtonBoxStyle
 gtk_button_box_set_layout
 gtk_button_box_set_child_secondary
 gtk_button_box_set_child_non_homogeneous
@@ -525,13 +523,7 @@ gtk_list_box_new
 gtk_list_box_prepend
 gtk_list_box_insert
 gtk_list_box_select_row
-gtk_list_box_unselect_row
-gtk_list_box_select_all
-gtk_list_box_unselect_all
 gtk_list_box_get_selected_row
-GtkListBoxForeachFunc
-gtk_list_box_selected_foreach
-gtk_list_box_get_selected_rows
 
 gtk_list_box_set_selection_mode
 gtk_list_box_get_selection_mode
@@ -553,15 +545,10 @@ gtk_list_box_drag_unhighlight_row
 
 gtk_list_box_row_new
 gtk_list_box_row_changed
-gtk_list_box_row_is_selected
 gtk_list_box_row_get_header
 gtk_list_box_row_get_type
 gtk_list_box_row_set_header
 gtk_list_box_row_get_index
-gtk_list_box_row_set_activatable
-gtk_list_box_row_get_activatable
-gtk_list_box_row_set_selectable
-gtk_list_box_row_get_selectable
 
 <SUBSECTION Standard>
 GTK_IS_LIST_BOX
@@ -987,7 +974,6 @@ GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID
 gtk_container_add
 gtk_container_remove
 gtk_container_add_with_properties
-GtkResizeMode
 gtk_container_get_resize_mode
 gtk_container_set_resize_mode
 gtk_container_check_resize
@@ -1927,7 +1913,6 @@ gtk_image_new_from_animation
 gtk_image_new_from_icon_name
 gtk_image_new_from_gicon
 gtk_image_new_from_resource
-gtk_image_new_from_surface
 gtk_image_set_from_file
 gtk_image_set_from_icon_set
 gtk_image_set_from_pixbuf
@@ -1936,7 +1921,6 @@ gtk_image_set_from_animation
 gtk_image_set_from_icon_name
 gtk_image_set_from_gicon
 gtk_image_set_from_resource
-gtk_image_set_from_surface
 gtk_image_clear
 gtk_image_new
 gtk_image_set_pixel_size
@@ -2191,7 +2175,6 @@ gtk_link_button_get_type
 <FILE>gtkmenu</FILE>
 <TITLE>GtkMenu</TITLE>
 GtkMenu
-GtkArrowPlacement
 gtk_menu_new
 gtk_menu_new_from_model
 gtk_menu_set_screen
@@ -2269,7 +2252,6 @@ gtk_menu_button_set_menu_model
 gtk_menu_button_get_menu_model
 gtk_menu_button_set_use_popover
 gtk_menu_button_get_use_popover
-GtkArrowType
 gtk_menu_button_set_direction
 gtk_menu_button_get_direction
 gtk_menu_button_set_align_widget
@@ -2621,8 +2603,6 @@ gtk_places_sidebar_get_show_connect_to_server
 gtk_places_sidebar_set_show_connect_to_server
 gtk_places_sidebar_get_local_only
 gtk_places_sidebar_set_local_only
-gtk_places_sidebar_get_show_enter_location
-gtk_places_sidebar_set_show_enter_location
 <SUBSECTION Standard>
 GTK_PLACES_SIDEBAR
 GTK_IS_PLACES_SIDEBAR
@@ -3128,10 +3108,8 @@ gtk_scrolled_window_get_hadjustment
 gtk_scrolled_window_get_vadjustment
 gtk_scrolled_window_get_hscrollbar
 gtk_scrolled_window_get_vscrollbar
-GtkPolicyType
 gtk_scrolled_window_set_policy
 gtk_scrolled_window_add_with_viewport
-GtkCornerType
 gtk_scrolled_window_set_placement
 gtk_scrolled_window_unset_placement
 gtk_scrolled_window_set_shadow_type
@@ -3252,8 +3230,6 @@ gtk_settings_set_property_value
 gtk_settings_set_string_property
 gtk_settings_set_long_property
 gtk_settings_set_double_property
-GtkIMPreeditStyle
-GtkIMStatusStyle
 <SUBSECTION Standard>
 GtkSettingsClass
 GTK_IS_SETTINGS
@@ -3490,7 +3466,6 @@ GtkTable
 gtk_table_new
 gtk_table_resize
 gtk_table_get_size
-GtkAttachOptions
 gtk_table_attach
 gtk_table_attach_defaults
 gtk_table_set_row_spacing
@@ -5485,8 +5460,6 @@ gtk_widget_get_allocated_height
 gtk_widget_get_allocation
 gtk_widget_set_allocation
 gtk_widget_get_allocated_baseline
-gtk_widget_get_clip
-gtk_widget_set_clip
 gtk_widget_get_app_paintable
 gtk_widget_get_can_default
 gtk_widget_set_can_default
@@ -5497,7 +5470,6 @@ gtk_widget_get_has_window
 gtk_widget_set_has_window
 gtk_widget_get_sensitive
 gtk_widget_is_sensitive
-GtkStateType
 gtk_widget_get_state
 gtk_widget_get_visible
 gtk_widget_is_visible
@@ -5615,7 +5587,6 @@ gtk_requisition_get_type
 <TITLE>GtkWindow</TITLE>
 GtkWindow
 GtkWindowClass
-GtkWindowType
 gtk_window_new
 gtk_window_set_title
 gtk_window_set_wmclass
@@ -5631,7 +5602,6 @@ gtk_window_set_default_geometry
 gtk_window_set_geometry_hints
 gtk_window_set_gravity
 gtk_window_get_gravity
-GtkWindowPosition
 gtk_window_set_position
 gtk_window_set_transient_for
 gtk_window_set_attached_to
@@ -5733,7 +5703,6 @@ gtk_window_get_application
 gtk_window_set_application
 gtk_window_set_has_user_ref_count
 gtk_window_set_titlebar
-gtk_window_set_interactive_debugging
 
 <SUBSECTION Standard>
 GTK_WINDOW
@@ -5871,7 +5840,6 @@ gtk_widget_path_iter_get_name
 gtk_widget_path_iter_get_object_type
 gtk_widget_path_iter_get_siblings
 gtk_widget_path_iter_get_sibling_index
-gtk_widget_path_iter_get_state
 gtk_widget_path_iter_has_class
 gtk_widget_path_iter_has_name
 gtk_widget_path_iter_has_qclass
@@ -5884,7 +5852,6 @@ gtk_widget_path_iter_remove_class
 gtk_widget_path_iter_remove_region
 gtk_widget_path_iter_set_name
 gtk_widget_path_iter_set_object_type
-gtk_widget_path_iter_set_state
 gtk_widget_path_length
 gtk_widget_path_new
 gtk_widget_path_prepend_type
@@ -5963,82 +5930,66 @@ GTK_STYLE_PROPERTY_BORDER_RADIUS
 GTK_STYLE_PROPERTY_BORDER_STYLE
 GTK_STYLE_PROPERTY_BORDER_COLOR
 GTK_STYLE_PROPERTY_BACKGROUND_IMAGE
-GtkBorderStyle
 <SUBSECTION>
-GTK_STYLE_CLASS_ACCELERATOR
-GTK_STYLE_CLASS_ARROW
 GTK_STYLE_CLASS_BACKGROUND
-GTK_STYLE_CLASS_BOTTOM
 GTK_STYLE_CLASS_BUTTON
 GTK_STYLE_CLASS_CALENDAR
 GTK_STYLE_CLASS_CELL
 GTK_STYLE_CLASS_COMBOBOX_ENTRY
 GTK_STYLE_CLASS_CHECK
-GTK_STYLE_CLASS_CSD
-GTK_STYLE_CLASS_CURSOR_HANDLE
 GTK_STYLE_CLASS_DEFAULT
-GTK_STYLE_CLASS_DESTRUCTIVE_ACTION
-GTK_STYLE_CLASS_DIM_LABEL
-GTK_STYLE_CLASS_DND
-GTK_STYLE_CLASS_DOCK
 GTK_STYLE_CLASS_ENTRY
+GTK_STYLE_CLASS_HEADER
+GTK_STYLE_CLASS_MENU
+GTK_STYLE_CLASS_RADIO
+GTK_STYLE_CLASS_RUBBERBAND
+GTK_STYLE_CLASS_SCROLLBAR
+GTK_STYLE_CLASS_SCROLLBARS_JUNCTION
+GTK_STYLE_CLASS_SLIDER
+GTK_STYLE_CLASS_TOOLTIP
+GTK_STYLE_CLASS_TROUGH
+GTK_STYLE_CLASS_ACCELERATOR
+GTK_STYLE_CLASS_DOCK
+GTK_STYLE_CLASS_GRIP
+GTK_STYLE_CLASS_MENUBAR
+GTK_STYLE_CLASS_MENUITEM
+GTK_STYLE_CLASS_PROGRESSBAR
+GTK_STYLE_CLASS_SPINNER
+GTK_STYLE_CLASS_TOOLBAR
+GTK_STYLE_CLASS_PRIMARY_TOOLBAR
+GTK_STYLE_CLASS_INLINE_TOOLBAR
+GTK_STYLE_CLASS_PANE_SEPARATOR
+GTK_STYLE_CLASS_SEPARATOR
+GTK_STYLE_CLASS_SIDEBAR
+GTK_STYLE_CLASS_DND
 GTK_STYLE_CLASS_ERROR
 GTK_STYLE_CLASS_EXPANDER
 GTK_STYLE_CLASS_FRAME
-GTK_STYLE_CLASS_FLAT
-GTK_STYLE_CLASS_GRIP
-GTK_STYLE_CLASS_HEADER
 GTK_STYLE_CLASS_HIGHLIGHT
-GTK_STYLE_CLASS_HORIZONTAL
 GTK_STYLE_CLASS_IMAGE
 GTK_STYLE_CLASS_INFO
-GTK_STYLE_CLASS_INLINE_TOOLBAR
-GTK_STYLE_CLASS_INSERTION_CURSOR
-GTK_STYLE_CLASS_LEFT
-GTK_STYLE_CLASS_LEVEL_BAR
-GTK_STYLE_CLASS_LINKED
-GTK_STYLE_CLASS_LIST
-GTK_STYLE_CLASS_LIST_ROW
 GTK_STYLE_CLASS_MARK
-GTK_STYLE_CLASS_MENU
-GTK_STYLE_CLASS_MENUBAR
-GTK_STYLE_CLASS_MENUITEM
-GTK_STYLE_CLASS_MESSAGE_DIALOG
-GTK_STYLE_CLASS_NEEDS_ATTENTION
 GTK_STYLE_CLASS_NOTEBOOK
-GTK_STYLE_CLASS_OSD
-GTK_STYLE_CLASS_OVERSHOOT
-GTK_STYLE_CLASS_PANE_SEPARATOR
-GTK_STYLE_CLASS_POPUP
-GTK_STYLE_CLASS_PRIMARY_TOOLBAR
-GTK_STYLE_CLASS_PROGRESSBAR
-GTK_STYLE_CLASS_PULSE
 GTK_STYLE_CLASS_QUESTION
-GTK_STYLE_CLASS_RADIO
-GTK_STYLE_CLASS_RAISED
-GTK_STYLE_CLASS_RIGHT
-GTK_STYLE_CLASS_RUBBERBAND
 GTK_STYLE_CLASS_SCALE
 GTK_STYLE_CLASS_SCALE_HAS_MARKS_ABOVE
 GTK_STYLE_CLASS_SCALE_HAS_MARKS_BELOW
-GTK_STYLE_CLASS_SCROLLBAR
-GTK_STYLE_CLASS_SCROLLBARS_JUNCTION
-GTK_STYLE_CLASS_SEPARATOR
-GTK_STYLE_CLASS_SIDEBAR
-GTK_STYLE_CLASS_SLIDER
 GTK_STYLE_CLASS_SPINBUTTON
-GTK_STYLE_CLASS_SPINNER
-GTK_STYLE_CLASS_SUBTITLE
-GTK_STYLE_CLASS_SUGGESTED_ACTION
-GTK_STYLE_CLASS_TITLE
-GTK_STYLE_CLASS_TITLEBAR
-GTK_STYLE_CLASS_TOOLBAR
-GTK_STYLE_CLASS_TOOLTIP
-GTK_STYLE_CLASS_TOP
-GTK_STYLE_CLASS_TROUGH
-GTK_STYLE_CLASS_VERTICAL
 GTK_STYLE_CLASS_VIEW
 GTK_STYLE_CLASS_WARNING
+GTK_STYLE_CLASS_HORIZONTAL
+GTK_STYLE_CLASS_VERTICAL
+GTK_STYLE_CLASS_TOP
+GTK_STYLE_CLASS_BOTTOM
+GTK_STYLE_CLASS_LEFT
+GTK_STYLE_CLASS_RIGHT
+GTK_STYLE_CLASS_LINKED
+GTK_STYLE_CLASS_ARROW
+GTK_STYLE_CLASS_OSD
+GTK_STYLE_CLASS_LEVEL_BAR
+GTK_STYLE_CLASS_CURSOR_HANDLE
+GTK_STYLE_CLASS_INSERTION_CURSOR
+GTK_STYLE_CLASS_TITLEBAR
 GTK_STYLE_REGION_COLUMN
 GTK_STYLE_REGION_COLUMN_HEADER
 GTK_STYLE_REGION_ROW
@@ -6050,7 +6001,6 @@ gtk_style_context_add_provider
 gtk_style_context_add_provider_for_screen
 gtk_style_context_get
 gtk_style_context_get_direction
-GtkJunctionSides
 gtk_style_context_get_junction_sides
 gtk_style_context_get_parent
 gtk_style_context_get_path
@@ -6093,7 +6043,6 @@ gtk_style_context_add_class
 gtk_style_context_remove_class
 gtk_style_context_has_class
 gtk_style_context_list_classes
-GtkRegionFlags
 gtk_style_context_add_region
 gtk_style_context_remove_region
 gtk_style_context_has_region
@@ -6270,7 +6219,6 @@ gtk_gradient_get_type
 GTK_STYLE_ATTACHED
 GtkStyle
 GtkStyleClass
-GtkExpanderStyle
 gtk_style_new
 gtk_style_copy
 gtk_style_attach
@@ -6329,8 +6277,6 @@ GtkRcStyle
 GtkRcStyleClass
 GtkRcFlags
 GtkRcTokenType
-GtkPathPriorityType
-GtkPathType
 gtk_rc_scanner_new
 gtk_rc_get_style
 gtk_rc_get_style_by_paths
@@ -6365,7 +6311,6 @@ GTK_RC_STYLE_GET_CLASS
 <SUBSECTION Private>
 gtk_rc_style_get_type
 GtkRcContext
-GTK_PATH_PRIO_MASK
 </SECTION>
 
 <SECTION>
@@ -6486,7 +6431,6 @@ gtk_clipboard_get_type
 <TITLE>Drag and Drop</TITLE>
 GtkDestDefaults
 GtkTargetFlags
-GtkDragResult
 <SUBSECTION Destination Side>
 gtk_drag_dest_set
 gtk_drag_dest_set_proxy
@@ -6552,23 +6496,45 @@ gtk_binding_set_add_path
 <SECTION>
 <FILE>gtkenums</FILE>
 <TITLE>Standard Enumerations</TITLE>
+GtkAccelFlags
+GtkArrowPlacement
+GtkArrowType
+GtkAttachOptions
 GtkBaselinePosition
+GtkButtonBoxStyle
+GtkCornerType
 GtkDeleteType
 GtkDirectionType
+GtkExpanderStyle
+GtkIMPreeditStyle
+GtkIMStatusStyle
 GtkJustification
 GtkMovementStep
 GtkOrientation
 GtkPackType
+GtkPathPriorityType
+GtkPathType
+GtkPolicyType
 GtkPositionType
 GtkReliefStyle
+GtkResizeMode
 GtkScrollStep
 GtkScrollType
 GtkSelectionMode
 GtkShadowType
+GtkStateType
 GtkStateFlags
 GtkToolbarStyle
+GtkWindowPosition
+GtkWindowType
 GtkSortType
+GtkDragResult
+GtkJunctionSides
+GtkBorderStyle
+GtkRegionFlags
 
+<SUBSECTION Private>
+GTK_PATH_PRIO_MASK
 </SECTION>
 
 <SECTION>
@@ -6707,7 +6673,6 @@ gtk_icon_theme_set_search_path
 gtk_icon_theme_get_search_path
 gtk_icon_theme_append_search_path
 gtk_icon_theme_prepend_search_path
-gtk_icon_theme_add_resource_path
 gtk_icon_theme_set_custom_theme
 gtk_icon_theme_has_icon
 gtk_icon_theme_lookup_icon
@@ -7402,12 +7367,10 @@ gtk_application_uninhibit
 gtk_application_is_inhibited
 
 <SUBSECTION>
-gtk_application_prefers_app_menu
 gtk_application_get_app_menu
 gtk_application_set_app_menu
 gtk_application_get_menubar
 gtk_application_set_menubar
-gtk_application_get_menu_by_id
 
 gtk_application_add_accelerator
 gtk_application_remove_accelerator
@@ -7415,7 +7378,6 @@ gtk_application_remove_accelerator
 gtk_application_list_action_descriptions
 gtk_application_get_accels_for_action
 gtk_application_set_accels_for_action
-gtk_application_get_actions_for_accel
 
 <SUBSECTION Standard>
 GTK_TYPE_APPLICATION
@@ -7525,8 +7487,6 @@ GtkSwitchClass
 gtk_switch_new
 gtk_switch_set_active
 gtk_switch_get_active
-gtk_switch_set_state
-gtk_switch_get_state
 
 <SUBSECTION Standard>
 GTK_TYPE_SWITCH
@@ -7830,8 +7790,6 @@ GtkStackTransitionType
 gtk_stack_set_transition_type
 gtk_stack_get_transition_type
 gtk_stack_get_transition_running
-<SUBSECTION Private>
-gtk_stack_get_type
 </SECTION>
 
 <SECTION>
@@ -7841,8 +7799,6 @@ GtkStackSwitcher
 gtk_stack_switcher_new
 gtk_stack_switcher_set_stack
 gtk_stack_switcher_get_stack
-<SUBSECTION Private>
-gtk_stack_switcher_get_type
 </SECTION>
 
 <SECTION>
@@ -7859,8 +7815,6 @@ gtk_revealer_set_transition_duration
 GtkRevealerTransitionType
 gtk_revealer_get_transition_type
 gtk_revealer_set_transition_type
-<SUBSECTION Private>
-gtk_revealer_get_type
 </SECTION>
 
 <SECTION>
@@ -7928,228 +7882,3 @@ gtk_popover_get_position
 gtk_popover_set_modal
 gtk_popover_get_modal
 </SECTION>
-
-<SECTION>
-<FILE>gtkeventcontroller</FILE>
-<TITLE>GtkEventController</TITLE>
-GtkEventController
-GtkPropagationPhase
-gtk_event_controller_get_propagation_phase
-gtk_event_controller_set_propagation_phase
-gtk_event_controller_handle_event
-gtk_event_controller_get_widget
-gtk_event_controller_reset
-
-<SUBSECTION Standard>
-GTK_TYPE_EVENT_CONTROLLER
-GTK_EVENT_CONTROLLER
-GTK_EVENT_CONTROLLER_CLASS
-GTK_IS_EVENT_CONTROLLER
-GTK_EVENT_CONTROLLER_GET_CLASS
-
-<SUBSECTION Private>
-GtkEventControllerPriv
-gtk_event_controller_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkgesture</FILE>
-<TITLE>GtkGesture</TITLE>
-GtkGesture
-gtk_gesture_get_device
-gtk_gesture_get_window
-gtk_gesture_set_window
-gtk_gesture_is_active
-gtk_gesture_is_recognized
-GtkEventSequenceState
-gtk_gesture_get_sequence_state
-gtk_gesture_set_sequence_state
-gtk_gesture_set_state
-gtk_gesture_get_sequences
-gtk_gesture_handles_sequence
-
-<SUBSECTION>
-gtk_gesture_get_last_updated_sequence
-gtk_gesture_get_last_event
-gtk_gesture_get_point
-gtk_gesture_get_bounding_box
-gtk_gesture_get_bounding_box_center
-
-<SUBSECTION>
-gtk_gesture_group
-gtk_gesture_ungroup
-gtk_gesture_get_group
-gtk_gesture_is_grouped_with
-
-<SUBSECTION Standard>
-GTK_TYPE_GESTURE
-GTK_GESTURE
-GTK_GESTURE_CLASS
-GTK_IS_GESTURE
-GTK_IS_GESTURE_CLASS
-GTK_GESTURE_GET_CLASS
-
-<SUBSECTION Private>
-gtk_gesture_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkgesturesingle</FILE>
-<TITLE>GtkGestureSingle</TITLE>
-GtkGestureSingle
-gtk_gesture_single_get_exclusive
-gtk_gesture_single_set_exclusive
-gtk_gesture_single_get_touch_only
-gtk_gesture_single_set_touch_only
-gtk_gesture_single_get_button
-gtk_gesture_single_set_button
-gtk_gesture_single_get_current_button
-gtk_gesture_single_get_current_sequence
-
-<SUBSECTION Standard>
-GTK_TYPE_GESTURE_SINGLE
-GTK_GESTURE_SINGLE
-GTK_GESTURE_SINGLE_CLASS
-GTK_IS_GESTURE_SINGLE
-GTK_IS_GESTURE_SINGLE_CLASS
-GTK_GESTURE_SINGLE_GET_CLASS
-
-<SUBSECTION Private>
-gtk_gesture_single_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkgesturedrag</FILE>
-<TITLE>GtkGestureDrag</TITLE>
-GtkGestureDrag
-gtk_gesture_drag_new
-gtk_gesture_drag_get_start_point
-gtk_gesture_drag_get_offset
-
-<SUBSECTION Standard>
-GTK_TYPE_GESTURE_DRAG
-GTK_GESTURE_DRAG
-GTK_GESTURE_DRAG_CLASS
-GTK_IS_GESTURE_DRAG
-GTK_IS_GESTURE_DRAG_CLASS
-GTK_GESTURE_DRAG_GET_CLASS
-
-<SUBSECTION Private>
-gtk_gesture_drag_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkgesturelongpress</FILE>
-<TITLE>GtkGestureLongPress</TITLE>
-GtkGestureLongPress
-gtk_gesture_long_press_new
-
-<SUBSECTION Standard>
-GTK_TYPE_GESTURE_LONG_PRESS
-GTK_GESTURE_LONG_PRESS
-GTK_GESTURE_LONG_PRESS_CLASS
-GTK_IS_GESTURE_LONG_PRESS
-GTK_IS_GESTURE_LONG_PRESS_CLASS
-GTK_GESTURE_LONG_PRESS_GET_CLASS
-
-<SUBSECTION Private>
-gtk_gesture_long_press_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkgesturemultipress</FILE>
-<TITLE>GtkGestureMultiPress</TITLE>
-GtkGestureMultiPress
-gtk_gesture_multi_press_new
-gtk_gesture_multi_press_set_area
-gtk_gesture_multi_press_get_area
-
-<SUBSECTION Standard>
-GTK_TYPE_GESTURE_MULTI_PRESS
-GTK_GESTURE_MULTI_PRESS
-GTK_GESTURE_MULTI_PRESS_CLASS
-GTK_IS_GESTURE_MULTI_PRESS
-GTK_IS_GESTURE_MULTI_PRESS_CLASS
-GTK_GESTURE_MULTI_PRESS_GET_CLASS
-
-<SUBSECTION Private>
-gtk_gesture_multi_press_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkgesturepan</FILE>
-<TITLE>GtkGesturePan</TITLE>
-GtkGesturePan
-GtkPanDirection
-gtk_gesture_pan_new
-gtk_gesture_pan_get_orientation
-gtk_gesture_pan_set_orientation
-
-<SUBSECTION Standard>
-GTK_TYPE_GESTURE_PAN
-GTK_GESTURE_PAN
-GTK_GESTURE_PAN_CLASS
-GTK_IS_GESTURE_PAN
-GTK_IS_GESTURE_PAN_CLASS
-GTK_GESTURE_PAN_GET_CLASS
-
-<SUBSECTION Private>
-gtk_gesture_pan_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkgestureswipe</FILE>
-<TITLE>GtkGestureSwipe</TITLE>
-GtkGestureSwipe
-gtk_gesture_swipe_new
-gtk_gesture_swipe_get_velocity
-
-<SUBSECTION Standard>
-GTK_TYPE_GESTURE_SWIPE
-GTK_GESTURE_SWIPE
-GTK_GESTURE_SWIPE_CLASS
-GTK_IS_GESTURE_SWIPE
-GTK_IS_GESTURE_SWIPE_CLASS
-GTK_GESTURE_SWIPE_GET_CLASS
-
-<SUBSECTION Private>
-gtk_gesture_swipe_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkgesturerotate</FILE>
-<TITLE>GtkGestureRotate</TITLE>
-GtkGestureRotate
-gtk_gesture_rotate_new
-gtk_gesture_rotate_get_angle_delta
-
-<SUBSECTION Standard>
-GTK_TYPE_GESTURE_ROTATE
-GTK_GESTURE_ROTATE
-GTK_GESTURE_ROTATE_CLASS
-GTK_IS_GESTURE_ROTATE
-GTK_IS_GESTURE_ROTATE_CLASS
-GTK_GESTURE_ROTATE_GET_CLASS
-
-<SUBSECTION Private>
-gtk_gesture_rotate_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkgesturezoom</FILE>
-<TITLE>GtkGestureZoom</TITLE>
-GtkGestureZoom
-gtk_gesture_zoom_new
-gtk_gesture_zoom_get_scale_delta
-
-<SUBSECTION Standard>
-GTK_TYPE_GESTURE_ZOOM
-GTK_GESTURE_ZOOM
-GTK_GESTURE_ZOOM_CLASS
-GTK_IS_GESTURE_ZOOM
-GTK_IS_GESTURE_ZOOM_CLASS
-GTK_GESTURE_ZOOM_GET_CLASS
-
-<SUBSECTION Private>
-gtk_gesture_zoom_get_type
-</SECTION>

docs/reference/gtk/gtk3-widget-factory.xml

@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<refentry id="gtk3-widget-factory">
-
-<refentryinfo>
-  <title>gtk3-widget-factory</title>
-  <productname>GTK+</productname>
-  <authorgroup>
-    <author>
-      <contrib>Developer</contrib>
-      <firstname>Matthias</firstname>
-      <surname>Clasen</surname>
-    </author>
-  </authorgroup>
-</refentryinfo>
-
-<refmeta>
-  <refentrytitle>gtk3-widget-factory</refentrytitle>
-  <manvolnum>1</manvolnum>
-  <refmiscinfo class="manual">User Commands</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>gtk3-widget-factory</refname>
-  <refpurpose>Demonstrate GTK+ widgets</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-<command>gtk3-widget-factory</command>
-<arg choice="opt">--help</arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1><title>Description</title>
-<para>
-<command>gtk3-widget-factory</command> is a collection of examples.
-Its purpose is to demonstrate many GTK+ widgets in a form
-that is useful to GTK+ theme developers.
-</para>
-<para>
-The application shows widgets in different, typical combinations
-and states.
-</para>
-</refsect1>
-
-<refsect1><title>Options</title>
-  <para>The following options are understood:</para>
-  <variablelist>
-    <varlistentry>
-    <term><option>-h</option>, <option>--help</option></term>
-      <listitem><para>Show help options</para></listitem>
-    </varlistentry>
-  </variablelist>
-</refsect1>
-
-</refentry>

docs/reference/gtk/gtk3.types.in

@@ -7,7 +7,6 @@ gtk_accel_label_get_type
 gtk_accel_map_get_type
 gtk_accessible_get_type
 gtk_actionable_get_type
-gtk_action_bar_get_type
 gtk_action_get_type
 gtk_action_group_get_type
 gtk_activatable_get_type
@@ -64,7 +63,6 @@ gtk_entry_buffer_get_type
 gtk_entry_completion_get_type
 gtk_entry_get_type
 gtk_event_box_get_type
-gtk_event_controller_get_type
 gtk_expander_get_type
 gtk_file_chooser_button_get_type
 gtk_file_chooser_dialog_get_type
@@ -81,15 +79,6 @@ gtk_font_chooser_widget_get_type
 gtk_font_selection_dialog_get_type
 gtk_font_selection_get_type
 gtk_frame_get_type
-gtk_gesture_get_type
-gtk_gesture_drag_get_type
-gtk_gesture_long_press_get_type
-gtk_gesture_multi_press_get_type
-gtk_gesture_pan_get_type
-gtk_gesture_rotate_get_type
-gtk_gesture_single_get_type
-gtk_gesture_swipe_get_type
-gtk_gesture_zoom_get_type
 gtk_grid_get_type
 gtk_handle_box_get_type
 gtk_hbox_get_type