Adwaita: Update notebook styling

Adapt to the changes in the previous commit.

NEWS

@@ -1,571 +1,11 @@
-Overview of Changes in GTK+ 3.19.11
-===================================
-
-* GtkRange, GtkScale and GtkScrollbar have been ported to use gadgets
-
-* Themes:
- - Windows theme improvements
-
-* Inspector:
- - Show input device information
- - Update monitor information when it changes
-
-* Wayland:
- - Implement primary selection (using a private protocol
-   with mutter for now)
-
-* Bugs fixed:
- 756751 Keypad decimal point patch prevents entry of comma in german keypad...
- 760482 GtkFrame cuts off bottom 2 pixels of child
- 761767 gcc6: Don't return bool from a const gchar* function
- 762123 Frame Layouting issue in Quadrapassel
- 762561 Implement primary selection protocol
- 762593 Solid separator in gnome-tweak-tool header bar
- 762614 Commit 51af704 gadget: Be careful in geometry calculations breaks v...
- 762629 GDK W32: Wrong MINMAXINFO calculation
- 762677 gtkplacessidebar: avoid irresponsible UI while trashing
- 762713 [Wayland] GDK doesn't remember unmaximized or unfullscreen size
- 762720 Moving Epiphany tabs with keyboard shortcuts visually broken
- 762755 Epiphany, Eye of GNOME crash when run in gdkwindow-wayland.c buffer...
- 762820 Remove "core_pointer" from the GdkDisplay struct
- 762887 yelp crashes most of the time on startup with gtk+ 3.19.10
- 762891 gdk: remove the display->list_devices vfunc
- 761156 Setting a popover 'relative_to' a widget on an offscreen window cra...
- 761686 GtkTreeView theming problems
- 762468 wayland: Switching between fullscreen and unfullscreen too fast may...
-
-* Translation updates:
- Brazilian Portuguese
- Catalan
- French
- Galician
- Hungarian
- Occitan
- Polish
- Swedish
-
-
-Overview of Changes in GTK+ 3.19.10
-===================================
-
-* GTK+ will now list included backends when seeing the
-  environment variable GDK_BACKEND=help
-
-* Themes
- - Windows theme improvements
- - Adwaita cleanups
-
-* Wayland
- - Implement startup notification
-
-* Bugs fixed:
- 309300 Adjust the key binding for setting the spin box's value to the min...
- 723659 touchpad: please do not interpret tap and click as double-click
- 754743 Middle click on "Other Locations" doesn't open a new tab
- 756659 Nautilus's Connect to server wont honor remote path
- 760714 GtkWindow: CSS node documentation is not clear
- 761431 Document overlay help action name
- 761432 Document that GtkApplication loads menus from gtk/menus-common.ui
- 761760 Welcome graphic and heading is misaligned
- 762258 wayland: gtk3 apps segfault with plasma-wayland/kwin_wayland
- 762315 Assistant pages have no padding which looks weird
- 762319 issues with randr 1.5
- 762392 gtk_drag_source_set_icon_name with empty string puts widget in bad...
-
-* Translation updates:
- Brazilian Portuguese
- Catalan
- Chinese (Taiwan)
- Galician
- German
- Polish
- Punjabi
- Serbian
- Slovak
- Spanish
- Swedish
- Thai
-
-
-Overview of Changes in GTK+ 3.19.9
+Overview of Changes in GTK+ 3.19.2
 ==================================
-
-* gtk-builder-tool can now preview .ui files with custom CSS
-
-* gtk3-demo now demonstrates saving window sizes in the application
-  example, and has many more widgets in the foreign drawing example.
-
-* CSS changes:
- - the rem unit is now supported
- - calc() expressions are supported, too
-
-* Themes:
- - Many fixes to Adwaita
- - The Windows theme is now included on all platforms
-
-* Windows
- - The Classic and XP themes have been dropped
- - The remaining theme is being fixed to work with CSS nodes
- - React to theme changes
-
-* Quartz:
- - Fix image retrieval from the clipboard
-
-* Wayland:
- - Fix a significant buffer leak
-
-* Bugs fixed:
- 677329 Missing focus-in events
- 698652 Aero-snapped windows in Win7 or 8 gets restored to previous size...
- 754990 Missing (out) annotation for gdk_rgba_parse
- 759657 GtkSeparator can segfault from CSS settings
- 760996 background in notebooks (and other places?) now white
- 761209 FileChooser crashes when invoked from FileChooserButton
- 761309 Background missing for empty treeview
- 761312 memory leak
- 761332 Creating a GtkStyleContext crashes
- 761339 [PATCH] skip gtk_widget_path_iter_add_qclass from g-ir-scanner
- 761363 Unlabeled GtkCheckButton does not respect valign
- 761381 gtk_settings_reset_property does not always reset to correct value
- 761402 GtkRange doesn't reset in_drag flag correctly
- 761428 GtkLevelBar no longer expands vertically
- 761474 x11: Scaling factor is applied twice on screen work area
- 761476 Set _GTK_THEME_VARIANT property also for light theme variant
- 761484 Spinbuttons in headerbars are way too tall
- 761552 Warnings in filechooser when typing-to-search in Recent
- 761571 Opaque region incorrectly calculated for fullscreen windows
- 761686 GtkTreeView theming problems
- 761716 Notebook scroll arrows appear to be sensitive always
- 761757 Crash in GtkFileChooserWidget
- 761775 gtkmagnifier: Avoid a crash if the inspected widget is finalized
- 761778 GtkShortcutsWindow - key labels are grey, not vertically centered
- 761791 Places sidebar: row height is too low
- 761792 Connect to server bar is too tall (and has a big fat connect butt...
- 761826 double negative in drag drop documentation for drag-motion confus...
- 761828 add a menu demo to foreigndrawing
- 761829 undefined reference to `gdk_mir_display_get_type'
- 761838 Editing widgets may be drawn off the visible area if the column i...
- 761900 gtk-demo: add spinbutton and menubar foreign drawing examples
- 761903 gtk3-demo: paned widget can be moved by resizing
- 761954 Tab detach no longer works
- 762021 GtkPaned propagates draw to NULL child
- 762032 Titlebars of windows have become unacceptably large in 3.19.x
- 762036 Extra widgets sizing messed up
- 762067 Adwaita: half maximized unfocused window has rounded corners
- 762080 gtk-demo: add combobox, menu separator and menu check/radio examp...
- 753351 notifications about removable devices being safe to remove stay a...
- 762120 Black content when using testfilechooser auto completer
- 762165 Add translation contexts
-
-* Translation updates:
- Brazilian Portuguese
- Chinese (Taiwan)
- French
- German
- Hungarian
- Kazakh
- Polish
- Slovak
- Spanish
- Swedish
-
-
-Overview of Changes in GTK+ 3.19.8
-==================================
-
-* GtkEntry:
- - Complete gadget conversion for entries and spin buttons
- - Add a visual hint for scrolling ('undershoot')
-
-* GtkStack:
- - Turn into a no-window widget
-
-* CSS changes:
- - Allow loading svg imges
- - Fix baseline handling
- - -gtk-recolor() works properly with hi-dpi now
- - image() can be used in CSS now
-
-* Themes:
- - new radio / check implementation
-
-* Tools:
- - gtk-builder-tool can now preview .ui files
-
-* Bugs fixed:
- 464528 gdk_rectangle_union() and gdk_rectangle_intersect() should ign...
- 608865 The default value of the property 'max-position' should be 214...
- 688524 Expose gtk-primary-button-warps-slider as an X setting
- 690791 gtkwindow only sends startup notification once
- 727294 Gtk SpinButton Size Greater than Screen Width
- 754868 visual anomaly in gtk path bar
- 754990 Missing (out) annotation for gdk_rgba_parse
- 760522 gtk_misc_set_padding not used for size req
- 760714 GtkWindow: CSS node documentation is not clear
- 760754 gedit crashes detaching a tab
- 760881 file can't be saved if executable attribute is not set
- 760891 GtkTreeView Cannot expand/collapse rows by mouse
- 760897 A few clean ups to the shm handling code
- 760933 Make it possible to query the CSS opacity with gtk_style_conte...
- 760942 gitg drawing code broken
- 760967 notebook gadget allocation issue
- 761005 GtkColorChooser: make set_rgba work in editor mode
- 761095 wayland: use shm_open instead of open in tmpdir
- 761128 Selected text in password entry not drawn correctly
- 761254 GtkDialog exposes public action_box internal child
- 761026 File chooser: Make Escape close the dialog
- 761318 css: Support the image() notation
-
-* Translation updates:
- German
- Hungarian
-
-
-Overview of Changes in GTK+ 3.19.7
-==================================
-
-* GtkNotebook:
- - Has been converted to use gadgets
- - Style properties have been deprecated
-
-* GtkTextView:
- - Offers (some) control over cursor blinking
-
-* CSS changes:
- - Fix rendering of asymmetric borders
- - Add CSS names to more widgets
- - Support recoloring icons with -gtk-recolor
-
-* Themes:
- - Many Adwaita fixes
-
-* GTK+ widget drawing scalability has been improved (for containers
-  with many children, like large list boxes or flow boxes).
-
-* Drag-and-Drop has been rearchitected to move the input handling into
-  GDK, where different backends can handle it according to their needs
-  and capabilities. The new, 'managed' DND is currently implemented
-  for X11 and Wayland.
-
-* Wayland:
- - Support kinetic scrolling, using the new events in version 5 of the
-   wl_pointer interface
- - Suppport DND actions and drag cancellation that were added in version
-   3 of the wl_data_offer interface
-
-* Bugs fixed:
- 722727 Widget state CSS pseudoclasses should work with adjacent selectors
- 722937 problem rendering asymmetric borders with dotted style
- 748327 W32: GDK can be hypothetically stuck in time
- 756729 No kinetic scrolling on Wayland
- 757503 Selected text is white on white (invisible) - Evo / GTK+ 3.19.1
- 759785 GdkSeat: Suspected errors in documentation
- 759898 W32: There's a gap between tooltip window and its shadow
- 760350 Cast the return value of g_array_free to void* before casting to...
- 760388 MS lib files cannot be generated (with patch)
- 760416 broadwayd --help shows translated characters as question marks o...
- 760427 Adwaita: Separators in popovers shouldn't always have margins
- 760445 regression: openQA no longer able to press ctrl-alt-del to get t...
- 760509 GdkWindow positions/sizes include css margins
- 760524 linked comboboxes change size when clicked
- 760525 Labels in dialog buttons misaligned
- 760528 GtkFrame child should start below the label widget
- 760536 ship a mini icon theme for recolarable symbolic icon assets
- 760572 Inspector highlights "random" widgets
- 760596 epiphany middle click on link opens an invisible tab
- 760615 GTK FTBFS with MinGW-w64
- 760640 Crash in gtk_notebook_set_show_tabs when closing Epiphany
- 760663 Some labels on RTL in some menus dosn't shown
- 760668 box gadget: Implement cross-axis alignment
- 760680 Emitting "shutdown" signal twice leads to a crash
- 760748 GtkTextView should allow hooks for reseting blink time
- 760754 gedit crashes detaching a tab
- 756729 No kinetic scrolling on Wayland
- 760370 GDK-ify drag and drop
-
-* Translation updates:
- Brazilian Portuguese
- Finnish
- Japanese
- Slovak
-
-
-Overview of Changes in GTK+ 3.19.6
-==================================
-
-* CSS changes:
- - CSS margins, border and padding are more consistently supported
- - More widgets support min-width and min-height
- - More style properties have been superseded by CSS properties
- - Pseudo state names have been aligned with what CSS uses:
-   :disabled instead of :insensitive, :indeterminate instead of
-   :inconsistent and :drop(active) instead of :dnd. The old names
-   still work
- - GTK+ specific CSS properties have been prefixed with -gtk-.
-   The old names still work
- - The CSS syntax for Radial gradients is now supported
- - CSS documentation has been rewritten and expanded
-
-* Themes:
- - GTK+ now includes a HighContrastInverse theme which is a dark
-   variant of the HighContrast theme
-
-* Inspector:
- - The inspector can now highlight widgets that are causing resizes,
-   which can be helpful in tracking down allocation loops
-
-* Wayland:
- - Prefer subsurfaces for temporary windows when possible, to fix
-   placement issues
- - Improve handling of dialogs without transient parent
- - Force a grab cursor while a popup is shown
-
-* Bugs fixed:
- 728344 Collate setting in Print Dialog does not override PPD setting...
- 753520 Gtk potentially misses nullable in 166 functions
- 756618 GtkWindow CSD: gtk_window_resize() also includes client side ...
- 757147 gdk_pixbuf_get_from_window() doesn't honor device scale
- 757411 Reference GtkIconSize in argument/return documentation
- 759161 wayland: dialog stacking without parents (RFC)
- 759299 wayland: possible infinite loop in gdkwindow-wayland
- 759541 shortcuts: Make sure that hidden shortcuts stay hidden
- 759567 Treeview column header buttons are jumpy
- 759586 Add a way to highlight resizing widgets
- 759607 gtkdnd-quartz: fix gtk_drag_begin_internal
- 759664 Buttonbox broken in chess promotion dialog
- 759668 Drawing failures with GTK+ master
- 759670 GtkPaned doesn't react to mouse dragging in some cases
- 759705 Sidebar broken in GNOME Disks
- 759738 wayland: use a subsurface for GDK_WINDOW_TEMP if attached to ...
- 759764 gtkinspector crashes app when selecting 'cancel' on initial p...
- 759768 gtkinspector crashes app on termination, when selecting 'canc...
- 759771 GdkSeat: Missing G_BEGIN_DECLS and G_END_DECLS
- 759857 Signal name should not be translated
- 759905 Popover: Invisible to events when we set transparent backgrounds
- 759917 GtkStatusIcon: avoid criticals
- 760018 Separator Tool Items with draw=false still get drawn
- 760082 GtkBinding: Use correct CSS key in examples
- 760097 GtkShortcutsWindow: Gestures not shown correctly in search re...
- 760141 New gdk_cursor_new_from_name() fallback breaks behavior expec...
- 760148 Duplication of word in document
- 760169 GtkColorButton sensitive and insensitive appearances are bare...
- 760188 GDK's X11 backend leaks SyncCounters
- 760202 gtkbuilder: Install gettext ITS files
- 760213 wayland: gdk_seat_grab() set cursor not resilient
- 760238 Improve function documentation for gtk_css_provider_load_from...
- 760314 gtkimcontextime.c: Silence gtk_style_context_set_state() warn...
-
-* Translation updates:
- Brazilian Portuguese
- Czech
- German
- Hebrew
- Indonesian
- Norwegian bokmål
- Portuguese
- Slovak
- Spanish
-
-
-Overview of Changes in GTK+ 3.19.5
-==================================
-
-* GtkShortcutsWindow:
- - GtkShortcutsGesture has been removed, since GtkShortcutsShortcut
-   can now document gestures
-
-* GtkFileChooser:
- - The places view now shows the available space when that information
-   is available
- - Problems with remembering the dialog size have been fixed
-
-* CSS changes:
- - CSS margins, border and padding are more consistently supported
- - Many widgets now support min-width and min-height
- - Many style properties have been superseded by CSS properties
-
-* Adwaita:
- - Some visual updates and fixes
-
-* Wayland:
- - DND with icon widgets is working properly
-
-* GDK:
- - More of the DND implementation is now handled in GDK: creating the
-   drag window, moving the window along with the cursor, the drag
-   cancel animation.
- - GdkSeat is a new API that supersedes grabs on individual devices and
-   is a better fit for backends like Wayland or Mir
-
-* Bugs fixed:
- 758929 GtkEntryCompletion should allow for changing the popdown delay
- 759079 GtkComboBox triggers segmentation fault in update_menu_sensitivity...
- 759081 Add 'nullable' to return type of gtk_cell_layout_get_area.
- 759091 notebook tab stays hovered if mouse leaves slowly
- 759092 GtkTextIter: add starts_tag() and deprecate begins_tag(), for cons...
- 759168 wayland: Implement DND icon hotspot API
- 759225 placesview: implement available space
- 759260 [Adwaita:dark] menus on GtkTreeView barely visible because menu sh...
- 759309 Add GdkSeat
- 759323 gdk_display_get_pointer(): segfault if application client (core) p...
- 729593 Add margin style property to GtkSwitch slider
- 756191 GtkModelButton css padding not working
- 708394 CSS - support min-width
- 755947 wayland: gnome-terminal does not fill entire area when tiled
-
-* Translation updates:
- Arabic
- German
- Polish
- Portuguese
- Slovak
- Spanish
-
-
-Overview of Changes in GTK+ 3.19.4
-==================================
-
-* GtkPopover can now be instructed to stay within the toplevel window
-  on platforms that don't already enforce this (such as Wayland)
- 
-* Wayland:
- - Memory leak fixes
- - Window positioning and sizing fixes
- - Clipboard and DND fixes
- - New build dependency: wayland-protocols
-
-* CSS changes:
- - The -gtk-image-effect property was renamed to -gtk-icon-effect
- - Active spinners are now :checked, not :active
- - A -gtk-icontheme property has been added
- - A -gtk-icon-palette has been added to allow recoloring symbolic icons
- - Drag highlighting uses the new :dnd pseudoclass
-
-* DND:
- - Make drag highlighting themable
- - Stop using RGBA cursors for drag icons (this only ever worked on X11)
- - Change the handling of drag windows to work on Wayland. The drag window
-   implementation has been moved to GDK, with the new function
-   gdk_drag_context_get_drag_window
- - Non-toplevel widgets can be used as drag widgets
-
-* Bugs fixed:
- 539944 Add GtkScaleButton API so struct fields can be marked as private
- 732742 Infinite recursion on GdkDevice disposal
- 735847 move animatable cursors' current frame info into GdkCursor
- 747295 shared memory leak when creating/destroying widgets
- 756618 GtkWindow CSD: gtk_window_resize() also includes client side deco...
- 757147 gdk_pixbuf_get_from_window() doesn't honor device scale
- 757282 "window: Ignore geometry widget" commit breaks gnome-terminal win...
- 757474 Add option for automatic GtkPopover placement
- 758483 GDK W32: Incorrectly uses SetWindowLong() to set/unset WS_EX_TOPM...
- 758484 GDK W32: Some calls to W32 routines are rather unclear
- 758563 play bar gets weird position in fullscreen under Wayland
- 758609 Regression with firefox dropdown menu position
- 758634 wayland: Use wayland-protocols for shared protocols
- 758660 Copy and paste doesn't work in wayland session
- 758661 every second right-click to window header is ignored (CSD-related?)
- 758698 Bug backward search + case insensitive + preceding multi-byte cha...
- 758713 Evolution cannot start on wayland if the clipboard contains data ...
- 758790 A few stylistic icon-browser patches
- 758901 wayland: old window size applied sometimes
- 758908 The app chooser dialog uses a non standard icon and doesn't wrap ...
- 758930 GTK+ spamming system logs with "doesn't match state" warnings
- 758936 Widgets within an offscreen windows are blurry on wayland with hidpi
- 759018 wayland: tests/testtooltips custom tooltip misplaced at (0,0) on ... 
-
-* Translation updates:
- Polish
- Portuguese
- Spanish
-
- 
-Overview of Changes in GTK+ 3.19.3
-==================================
-
-* Theming changes
- - Non-standard CSS properties have been renamed to have a -gtk-
-   prefix (the old names still work, with a warning):
-     gtk-key-bindings is now -gtk-key-bindings
-     icon-shadow is now -gtk-icon-shadow
- - CSS parsing errors and warnings are shown in the inspector
-
-* GtkShortcutsWindow:
- - Widgets are more complete, to allow supporting them in glade
- - GtkShortcutsShortcut can now show gestures as well, GtkShortcutsGesture
-   is no longer needed and will be removed soon
- - GtkShortcutsShortcut supports standard gestures, with predefined
-   icons and subtitles
-
-* Bugs fixed:
- 746745 Window suddenly always on top
- 758025 cursor flickering
- 758094 GtkSpinButton missing redraw
- 758187 Stock images for gestures
- 758367 GTK+ 3 does not respect bold in org.gnome.desktop.interface font-name
- 758407 Could not send the search request \ GDBus.Error:org.freedesktop.Tr...
- 758442 gtk_style_context_save() destroys style information
-
-* Translation updates:
-==================================
-
-* Most widgets have been ported to CSS nodes. The element names and
-  the tree relationships are documented now. The Adwaita and HighContrast
-  themes have been mostly kept up-to-date with these changes. Third-party
-  themes and custom CSS will need adjustments.
-
-* The inspector now shows CSS nodes and allows to manipulate them.
-
-* Size allocation has been simplified to avoid excessive resizes of
-  the entire window.
-
-* GtkShortcutsWindow can now display direction-dependent shortcuts
-  and sequences of keys.
-
 * Support for native file chooser on Win32 when using the new
   GtkFileChooserNative API, and when using GtkFileChooserButton.
 
 * The GtkFileChooser interface prerequisite was changed from GtkWidget
   to GObject to allow non-widget filechooser implementations.
 
-* :focus-on-click has been moved from various subclasses to GtkWidget,
-  so it is now available for every widget, in particular GtkListBoxRow.
-
-* Bugs fixed:
- 735341 Fix/improve gtk_text_buffer_get_iter_at_*() functions
- 748904 wayland: map real modifiers to virtual modifiers
- 756618 GtkWindow CSD: gtk_window_resize() also includes client side decorations...
- 756625 segfault in captured_event_cb
- 756670 Popover is shown below clutter widget after tab switch from Gtk.Notebook
- 756978 Deadlock in the places widget
- 757221 Memory leak in gtk-3.0.m4
- 757269 Allow to make ListBoxRows not grab focus when activated
- 757324 win32: handle WM_DISPLAYCHANGE globally
- 757358 single touch devices are not detected as touch devices
- 757377 settings.ini is only loaded from first XDG_CONFIG_DIRS entry
- 757397 gtk_widget_set_name() doesn't properly refresh the style
- 757805 gtkwindow: CSD windows not resizable in metacity
- 757888 ShortcutsWindow: Support different keyboard shortcuts for LTR vs RTL loc...
- 757950 Hanle double click better in the new file chooser
- 757968 Typo in GtkCheckMenuItem
- 757984 gtkimcontextsimple.c: Fix build on Windows
- 758072 [Wayland] additional mouse buttons don't work
- 758087 gtkcontainer: clarify requirements for implementations
- 758208 GtkStackSwitcher should allow changing the icon size
- 758327 gnome-disks segfault in gdkwayland get_popup_parent...
- 758086 gtkstack: allow subclasses overriding properties on init
- 758175 Fix character entity
-
-* Translation updates:
- Hebrew
- Hungarian
- Norwegian bokmål
- Portuguese
- Scottish Gaelic
- Spanish
- Traditional Chinese
-
-
 Overview of Changes in GTK+ 3.19.1
 ==================================
 
@@ -602,11 +42,6 @@ Overview of Changes in GTK+ 3.19.1
 
 * Debugging: GtkInspector can now edit string-array-valued properties
 
-* Wayland:
- - Fix transparent terminals
- - Fix treeview search popups
-* Debugging: GtkInspector can now edit string-array-valued properties
-
 * Wayland:
  - Fix transparent terminals
  - Fix treeview search popups

README.in

@@ -75,34 +75,6 @@ Even better are git-formatted patches. (Use git format-patch)
 Release notes for 3.20
 ======================
 
-* The way theming works in GTK+ has been reworked pretty fundamentally
-  in this release, to be able to implement many more CSS features and
-  generally give themes more power. As a result, custom CSS that is
-  shipped with applications and third-party themes will need adjustments.
-  Widgets now use element names much more than style classes; type
-  names are no longer used in style matching. Every widget now documents
-  the element names it has and the style classes it uses. The GTK+
-  inspector can also be helpful in finding this information.
-
-* GTK+ now uses internal subobjects (also known as gadgets) for allocating
-  and drawing widget parts. Applications that subclass GTK+ widgets may
-  see warnings if they override size_allocate and don't chain up. The
-  proper way to subclass is to chain up in size_allocate. If you don't
-  want to do that for some reason, you have to override draw as well.
-
-* Several fixes for window sizing and placement with client-side
-  decorations may affect applications that are saving and restoring
-  window sizes. The recommended best practice for this which is known
-  to work with client-side and server-side decorations and with older
-  and newer versions of GTK+ is to use gtk_window_get_size() to save
-  and gtk_window_set_default_size() to restore the window size. See
-  https://wiki.gnome.org/HowDoI/SaveWindowState for a detailed example.
-
-* GtkDrawingArea used to implicitly render the theme background before
-  calling the ::draw handler. This is no longer the case. If you rely
-  on having a theme-provided background, call gtk_render_background()
-  from your ::draw handler.
-
 * The GtkFileChooser interface pre-requisite changed from GtkWidget
   to GObject, allowing non-widget implementations of this interface.
   This is a minor change in ABI, as apps are no longer guaranteed
@@ -110,16 +82,6 @@ Release notes for 3.20
   However, all previously existing objects still derive from GtkWidget,
   so no existing code should break.
 
-* The GtkPlacesSidebar added a GtkPlacesOpenFlags parameter to the
-  other-locations signal in order to allow opening new windows or
-  tabs as done with other locations. This breaks the API for those
-  using the other-locations signal.
-
-* The way in which GtkLevelBar determines the offset to apply was
-  a bit inconsistent in the past; this has been fixed. Applications
-  that are using custom offsets should double-check that their
-  levels look as expected.
-
 Release notes for 3.18
 ======================
 

build/win32/Makefile.am

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

build/win32/crypt/Makefile.am

@@ -0,0 +1,7 @@
+include $(top_srcdir)/Makefile.decl
+
+EXTRA_DIST +=	\
+	crypt.h		\
+	crypt3.c
+
+-include $(top_srcdir)/git.mk

build/win32/crypt/crypt.h

@@ -0,0 +1,32 @@
+/**************************************************************************
+*            Unix-like crypt(3) Algorithm for Password Encryption
+*
+*   File    : crypt3.h
+*   Purpose : Provides crypt(3) prototypes to ANSI C compilers
+*             without a need for the crypt library.
+*   Author  : Fan, Chun-wei
+*   Date    : June 24, 2013
+*
+*   I am releasing the source that I have provided into public
+*   domain without any restrictions, warranties, or copyright
+*   claims of my own.
+*
+***************************************************************************/
+
+#ifndef __ANSI_CRYPT_H__
+#define __ANSI_CRYPT_H__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+void encrypt (char *block, int edflag);
+void setkey (char *key);
+char* crypt (const char *key, const char *salt);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ANSI_CRYPT_H__ */

build/win32/crypt/crypt3.c

@@ -0,0 +1,460 @@
+/**************************************************************************
+*            Unix-like crypt(3) Algorithm for Password Encryption
+*
+*   File    : crypt3.c
+*   Purpose : Provides crypt(3) functionality to ANSI C compilers
+*             without a need for the crypt library.
+*   Author  : Michael Dipperstein
+*   Date    : November 3, 1998
+*
+***************************************************************************
+*   The source in this file is heavily borrowed from the crypt3.c file
+*   found on several ftp sites on the Internet.  The original source
+*   claimed to be BSD, but was not distributed with any BSD license or
+*   copyright claims.  I am releasing the source that I have provided into
+*   public domain without any restrictions, warranties, or copyright
+*   claims of my own.
+*
+*   The code below has been cleaned and compiles correctly under, gcc,
+*   lcc, and Borland's bcc C compilers.  A bug involving the left and
+*   right halves of the encrypted data block in the widely published
+*   crypt3.c source has been fixed by this version.  All implicit register
+*   declarations have been removed, because they generated suboptimal code.
+*   All constant data has been explicitly declared as const and all
+*   declarations have been given a minimal scope, because I'm paranoid.
+*
+*   Caution: crypt() returns a pointer to static data.  I left it this way
+*            to maintain backward compatibility.  The downside is that
+*            successive calls will cause previous results to be lost.
+*            This can easily be changed with only minor modifications to
+*            the function crypt().
+**************************************************************************/
+
+/* Initial permutation */
+static const char IP[] =
+{
+    58, 50, 42, 34, 26, 18, 10, 2,
+    60, 52, 44, 36, 28, 20, 12, 4,
+    62, 54, 46, 38, 30, 22, 14, 6,
+    64, 56, 48, 40, 32, 24, 16, 8,
+    57, 49, 41, 33, 25, 17,  9, 1,
+    59, 51, 43, 35, 27, 19, 11, 3,
+    61, 53, 45, 37, 29, 21, 13, 5,
+    63, 55, 47, 39, 31, 23, 15, 7,
+};
+
+/* Final permutation, FP = IP^(-1) */
+static const char FP[] = {
+    40, 8, 48, 16, 56, 24, 64, 32,
+    39, 7, 47, 15, 55, 23, 63, 31,
+    38, 6, 46, 14, 54, 22, 62, 30,
+    37, 5, 45, 13, 53, 21, 61, 29,
+    36, 4, 44, 12, 52, 20, 60, 28,
+    35, 3, 43, 11, 51, 19, 59, 27,
+    34, 2, 42, 10, 50, 18, 58, 26,
+    33, 1, 41,  9, 49, 17, 57, 25,
+};
+
+/**************************************************************************
+* Permuted-choice 1 from the key bits to yield C and D.
+* Note that bits 8,16... are left out:
+* They are intended for a parity check.
+**************************************************************************/
+static const char PC1_C[] =
+{
+    57, 49, 41, 33, 25, 17,  9,
+     1, 58, 50, 42, 34, 26, 18,
+    10,  2, 59, 51, 43, 35, 27,
+    19, 11,  3, 60, 52, 44, 36,
+};
+
+static const char PC1_D[] =
+{
+    63, 55, 47, 39, 31, 23, 15,
+     7, 62, 54, 46, 38, 30, 22,
+    14,  6, 61, 53, 45, 37, 29,
+    21, 13,  5, 28, 20, 12,  4,
+};
+
+/* Sequence of shifts used for the key schedule. */
+static const char shifts[] =
+    {1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1};
+
+/**************************************************************************
+* Permuted-choice 2, to pick out the bits from the CD array that generate
+* the key schedule.
+**************************************************************************/
+static const char PC2_C[] =
+{
+    14, 17, 11, 24,  1,  5,
+     3, 28, 15,  6, 21, 10,
+    23, 19, 12,  4, 26,  8,
+    16,  7, 27, 20, 13,  2,
+};
+
+static const char PC2_D[] =
+{
+    41, 52, 31, 37, 47, 55,
+    30, 40, 51, 45, 33, 48,
+    44, 49, 39, 56, 34, 53,
+    46, 42, 50, 36, 29, 32,
+};
+
+/* The C and D arrays used to calculate the key schedule. */
+static char C[28];
+static char D[28];
+
+/* The key schedule.  Generated from the key. */
+static char KS[16][48];
+
+/* The E bit-selection table. */
+static char E[48];
+static const char e2[] =
+{
+    32,  1,  2,  3,  4,  5,
+     4,  5,  6,  7,  8,  9,
+     8,  9, 10, 11, 12, 13,
+    12, 13, 14, 15, 16, 17,
+    16, 17, 18, 19, 20, 21,
+    20, 21, 22, 23, 24, 25,
+    24, 25, 26, 27, 28, 29,
+    28, 29, 30, 31, 32,  1,
+};
+
+/**************************************************************************
+* Function:    setkey
+*
+* Description: Set up the key schedule from the encryption key.
+*
+* Inputs:      char *key
+*              pointer to 64 character array.  Each character represents a
+*              bit in the key.
+*
+* Returns:     none
+**************************************************************************/
+void setkey(char *key)
+{
+    int i, j, k, temp;
+
+    /**********************************************************************
+    * First, generate C and D by permuting the key.  The low order bit of
+    * each 8-bit char is not used, so C and D are only 28 bits apiece.
+    **********************************************************************/
+    for(i = 0; i < 28; i++)
+    {
+        C[i] = key[PC1_C[i] - 1];
+        D[i] = key[PC1_D[i] - 1];
+    }
+
+    /**********************************************************************
+    * To generate Ki, rotate C and D according to schedule and pick up a
+    * permutation using PC2.
+    **********************************************************************/
+    for(i = 0; i < 16; i++)
+    {
+        /* rotate */
+        for(k = 0; k < shifts[i]; k++)
+        {
+            temp = C[0];
+
+            for(j = 0; j < 28 - 1; j++)
+                C[j] = C[j+1];
+
+            C[27] = temp;
+            temp = D[0];
+            for(j = 0; j < 28 - 1; j++)
+                D[j] = D[j+1];
+
+            D[27] = temp;
+        }
+
+        /* get Ki. Note C and D are concatenated */
+        for(j = 0; j < 24; j++)
+        {
+            KS[i][j] = C[PC2_C[j] - 1];
+            KS[i][j + 24] = D[PC2_D[j] - 28 -1];
+        }
+    }
+
+    /* load E with the initial E bit selections */
+    for(i=0; i < 48; i++)
+        E[i] = e2[i];
+}
+
+/**************************************************************************
+* The 8 selection functions. For some reason, they give a 0-origin
+* index, unlike everything else.
+**************************************************************************/
+
+static const char S[8][64] =
+{
+    {
+        14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
+         0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8,
+         4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0,
+        15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13
+    },
+
+    {
+        15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
+         3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5,
+         0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15,
+        13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9
+    },
+
+    {
+        10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
+        13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1,
+        13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7,
+         1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12
+    },
+
+    {
+         7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
+        13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9,
+        10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4,
+         3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14
+    },
+
+    {
+         2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
+        14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6,
+         4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14,
+        11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3
+    },
+
+    {
+        12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
+        10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8,
+         9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6,
+         4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13
+    },
+
+    {
+         4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
+        13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6,
+         1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2,
+         6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12
+    },
+
+    {
+        13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7,
+         1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2,
+         7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8,
+         2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11
+    }
+};
+
+/**************************************************************************
+* P is a permutation on the selected combination of the current L and key.
+**************************************************************************/
+static const char P[] =
+{
+    16,  7, 20, 21,
+    29, 12, 28, 17,
+     1, 15, 23, 26,
+     5, 18, 31, 10,
+     2,  8, 24, 14,
+    32, 27,  3,  9,
+    19, 13, 30,  6,
+    22, 11,  4, 25,
+};
+
+/* The combination of the key and the input, before selection. */
+static char preS[48];
+
+/**************************************************************************
+* Function:    encrypt
+*
+* Description: Uses DES to encrypt a 64 bit block of data.  Requires
+*              setkey to be invoked with the encryption key before it may
+*              be used.  The results of the encryption are stored in block.
+*
+* Inputs:      char *block
+*              pointer to 64 character array.  Each character represents a
+*              bit in the data block.
+*
+* Returns:     none
+**************************************************************************/
+void encrypt(char *block)
+{
+    int i, ii, temp, j, k;
+
+    char left[32], right[32]; /* block in two halves */
+    char old[32];
+    char f[32];
+
+    /* First, permute the bits in the input */
+    for(j = 0; j < 32; j++)
+        left[j] = block[IP[j] - 1];
+
+    for(;j < 64; j++)
+        right[j - 32] = block[IP[j] - 1];
+
+    /* Perform an encryption operation 16 times. */
+    for(ii= 0; ii < 16; ii++)
+    {
+        i = ii;
+        /* Save the right array, which will be the new left. */
+        for(j = 0; j < 32; j++)
+            old[j] = right[j];
+
+        /******************************************************************
+        * Expand right to 48 bits using the E selector and
+        * exclusive-or with the current key bits.
+        ******************************************************************/
+        for(j =0 ; j < 48; j++)
+            preS[j] = right[E[j] - 1] ^ KS[i][j];
+
+        /******************************************************************
+        * The pre-select bits are now considered in 8 groups of 6 bits ea.
+        * The 8 selection functions map these 6-bit quantities into 4-bit
+        * quantities and the results are permuted to make an f(R, K).
+        * The indexing into the selection functions is peculiar;
+        * it could be simplified by rewriting the tables.
+        ******************************************************************/
+        for(j = 0; j < 8; j++)
+        {
+            temp = 6 * j;
+            k = S[j][(preS[temp + 0] << 5) +
+                (preS[temp + 1] << 3) +
+                (preS[temp + 2] << 2) +
+                (preS[temp + 3] << 1) +
+                (preS[temp + 4] << 0) +
+                (preS[temp + 5] << 4)];
+
+            temp = 4 * j;
+
+            f[temp + 0] = (k >> 3) & 01;
+            f[temp + 1] = (k >> 2) & 01;
+            f[temp + 2] = (k >> 1) & 01;
+            f[temp + 3] = (k >> 0) & 01;
+        }
+
+        /******************************************************************
+        * The new right is left ^ f(R, K).
+        * The f here has to be permuted first, though.
+        ******************************************************************/
+        for(j = 0; j < 32; j++)
+            right[j] = left[j] ^ f[P[j] - 1];
+
+        /* Finally, the new left (the original right) is copied back. */
+        for(j = 0; j < 32; j++)
+            left[j] = old[j];
+    }
+
+    /* The output left and right are reversed. */
+    for(j = 0; j < 32; j++)
+    {
+        temp = left[j];
+        left[j] = right[j];
+        right[j] = temp;
+    }
+
+    /* The final output gets the inverse permutation of the very original. */
+    for(j = 0; j < 64; j++)
+    {
+        i = FP[j];
+        if (i < 33)
+                block[j] = left[FP[j] - 1];
+        else
+                block[j] = right[FP[j] - 33];
+    }
+}
+
+/**************************************************************************
+* Function:    crypt
+*
+* Description: Clone of Unix crypt(3) function.
+*
+* Inputs:      char *pw
+*              pointer to 8 character encryption key (user password)
+*              char *salt
+*              pointer to 2 character salt used to modify the DES results.
+*
+* Returns:     Pointer to static array containing the salt concatenated
+*              on to the encrypted results.  Same as stored in passwd file.
+**************************************************************************/
+char *crypt(char *pw, char *salt)
+{
+    int i, j, temp;
+    char c,
+         block[66];             /* 1st store key, then results */
+    static char iobuf[16];      /* encrypted results */
+
+    for(i = 0; i < 66; i++)
+        block[i] = 0;
+
+    /* break pw into 64 bits */
+    for(i = 0, c = *pw; c && (i < 64); i++)
+    {
+        for(j = 0; j < 7; j++, i++)
+            block[i] = (c >> (6 - j)) & 01;
+        pw++;
+        c = *pw;
+    }
+
+    /* set key based on pw */
+    setkey(block);
+
+    for(i = 0; i < 66; i++)
+        block[i] = 0;
+
+    for(i = 0; i < 2; i++)
+    {
+        /* store salt at beginning of results */
+        c = *salt++;
+        iobuf[i] = c;
+
+        if(c > 'Z')
+            c -= 6;
+
+        if(c > '9')
+            c -= 7;
+
+        c -= '.';
+
+        /* use salt to effect the E-bit selection */
+        for(j = 0; j < 6; j++)
+        {
+            if((c >> j) & 01)
+            {
+                temp = E[6 * i + j];
+                E[6 * i +j] = E[6 * i + j + 24];
+                E[6 * i + j + 24] = temp;
+            }
+        }
+    }
+
+    /* call DES encryption 25 times using pw as key and initial data = 0 */
+    for(i = 0; i < 25; i++)
+        encrypt(block);
+
+    /* format encrypted block for standard crypt(3) output */
+    for(i=0; i < 11; i++)
+    {
+        c = 0;
+        for(j = 0; j < 6; j++)
+        {
+            c <<= 1;
+            c |= block[6 * i + j];
+        }
+
+        c += '.';
+        if(c > '9')
+            c += 7;
+
+        if(c > 'Z')
+            c += 6;
+
+        iobuf[i + 2] = c;
+    }
+
+    iobuf[i + 2] = '\0';
+
+    /* prevent premature NULL terminator */
+    if(iobuf[1] == '\0')
+        iobuf[1] = iobuf[0];
+
+    return(iobuf);
+}

build/win32/process-in-win32.py

@@ -0,0 +1,109 @@
+#!/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/replace.py

@@ -1,102 +0,0 @@
-#!/usr/bin/python
-#
-# Simple utility script to manipulate
-# certain types of strings in a file
-
-# This can be used in various projects where
-# there is the need to replace strings in files,
-# and is copied from GLib's $(srcroot)/build/win32
-
-# Author: Fan, Chun-wei
-# Date: September 03, 2014
-
-import os
-import sys
-import re
-import string
-import argparse
-
-valid_actions = ['remove-prefix',
-                 'replace-var',
-                 'replace-str',
-                 'remove-str']
-
-def replace(src, dest, instring, outstring):
-    with open(src, 'r') as s:
-        with open(dest, 'w') as d:
-            for line in s:
-                i = line.replace(instring, outstring)
-                d.write(i)
-
-def check_required_args(args, params):
-    for param in params:
-        if getattr(args, param, None) is None:
-            raise SystemExit('%s: error: --%s argument is required' % (__file__, param))
-
-def warn_ignored_args(args, params):
-    for param in params:
-        if getattr(args, param, None) is not None:
-            print('%s: warning: --%s argument is ignored' % (__file__, param))
-
-def main(argv):
-
-    parser = argparse.ArgumentParser(description='Process strings in a file.')
-    parser.add_argument('-a',
-                        '--action',
-                        help='Action to carry out.  Can be one of:\n'
-                             'remove-prefix\n'
-                             'replace-var\n'
-                             'replace-str\n'
-                             'remove-str',
-                        choices=valid_actions)
-    parser.add_argument('-i', '--input', help='Input file')
-    parser.add_argument('-o', '--output', help='Output file')
-    parser.add_argument('--instring', help='String to replace or remove')
-    parser.add_argument('--var', help='Autotools variable name to replace')
-    parser.add_argument('--outstring',
-                        help='New String to replace specified string or variable')
-    parser.add_argument('--removeprefix', help='Prefix of string to remove')
-
-    args = parser.parse_args()
-
-    input_string = ''
-    output_string = ''
-
-    # We must have action, input, output for all operations
-    check_required_args(args, ['action','input','output'])
-
-    # Build the arguments by the operation that is to be done,
-    # to be fed into replace()
-
-    # Get rid of prefixes from a string
-    if args.action == 'remove-prefix':
-        check_required_args(args, ['instring','removeprefix'])
-        warn_ignored_args(args, ['outstring','var'])
-        input_string = args.removeprefix + args.instring
-        output_string = args.instring
-
-    # Replace an m4-style variable (those surrounded by @...@)
-    if args.action == 'replace-var':
-        check_required_args(args, ['var','outstring'])
-        warn_ignored_args(args, ['instring','removeprefix'])
-        input_string = '@' + args.var + '@'
-        output_string = args.outstring
-
-    # Replace a string
-    if args.action == 'replace-str':
-        check_required_args(args, ['instring','outstring'])
-        warn_ignored_args(args, ['var','removeprefix'])
-        input_string = args.instring
-        output_string = args.outstring
-
-    # Remove a string
-    if args.action == 'remove-str':
-        check_required_args(args, ['instring'])
-        warn_ignored_args(args, ['var','outstring','removeprefix'])
-        input_string = args.instring
-        output_string = ''
-
-    replace(args.input, args.output, input_string, output_string)
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))

build/win32/vs10/Makefile.am

@@ -43,14 +43,8 @@ EXTRA_DIST += \
 	gdk-3.vcxproj.filtersin			\
 	gtk-3.vcxprojin				\
 	gtk-3.vcxproj.filtersin			\
-	gtk-builder-tool.vcxproj		\
-	gtk-builder-tool.vcxproj.filters	\
 	gtk-encode-symbolic-svg.vcxproj		\
 	gtk-encode-symbolic-svg.vcxproj.filters	\
-	gtk-query-settings.vcxproj		\
-	gtk-query-settings.vcxproj.filters	\
-	gtk-update-icon-cache.vcxproj		\
-	gtk-update-icon-cache.vcxproj.filters	\
 	gtk3-demo.vcxprojin			\
 	gtk3-demo.vcxproj.filtersin		\
 	gtk3-demo-application.vcxprojin		\

build/win32/vs10/broadwayd.vcxprojin

@@ -111,6 +111,7 @@
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -159,6 +160,7 @@
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>

build/win32/vs10/gailutil-3.vcxprojin

@@ -119,6 +119,7 @@
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -166,6 +167,7 @@
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>

build/win32/vs10/gdk-3.vcxprojin

@@ -195,6 +195,7 @@
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -217,6 +218,7 @@
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -285,6 +287,7 @@
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -307,6 +310,7 @@
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>

build/win32/vs10/gtk+.sln

@@ -22,12 +22,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-encode-symbolic-svg", "
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil-3", "gailutil-3.vcxproj", "{A1FCED61-4E51-4015-A70C-5373404D1BA0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-update-icon-cache", "gtk-update-icon-cache.vcxproj", "{FC98AF16-4C68-42DF-906B-93A6804C198A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-builder-tool", "gtk-builder-tool.vcxproj", "{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-query-settings", "gtk-query-settings.vcxproj", "{9F22107A-3EF7-4B52-B269-747B65307F36}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-install.vcxproj", "{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}"
 EndProject
 Global
@@ -226,54 +220,6 @@ Global
 		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|x64.Build.0 = Release|x64
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|Win32.Build.0 = Debug|Win32
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|x64.ActiveCfg = Debug|x64
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|x64.Build.0 = Debug|x64
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|Win32.ActiveCfg = Release|Win32
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|Win32.Build.0 = Release|Win32
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|x64.ActiveCfg = Release|x64
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|x64.Build.0 = Release|x64
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|Win32.Build.0 = Debug|Win32
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|x64.Build.0 = Debug|x64
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|Win32.Build.0 = Release|Win32
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|x64.ActiveCfg = Release|x64
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|x64.Build.0 = Release|x64
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|Win32.Build.0 = Debug|Win32
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|x64.ActiveCfg = Debug|x64
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|x64.Build.0 = Debug|x64
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|Win32.ActiveCfg = Release|Win32
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|Win32.Build.0 = Release|Win32
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|x64.ActiveCfg = Release|x64
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|x64.Build.0 = Release|x64
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|Win32.Build.0 = Debug|Win32
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|x64.Build.0 = Debug|x64
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|Win32.Build.0 = Release|Win32
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|x64.ActiveCfg = Release|x64
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|x64.Build.0 = Release|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|Win32.Build.0 = Debug|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|x64.ActiveCfg = Debug|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|x64.Build.0 = Debug|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release|Win32.ActiveCfg = Release|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release|Win32.Build.0 = Release|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release|x64.ActiveCfg = Release|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release|x64.Build.0 = Release|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|Win32.Build.0 = Debug|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|x64.Build.0 = Debug|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.Build.0 = Release|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.ActiveCfg = Release|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

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

@@ -19,8 +19,7 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\..\gtk\gtkdbusinterfaces.xml"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\..\gtk\gtk-win32.rc.body"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\..\gtk\libgtk3.manifest.in"><Filter>Resource Files</Filter></CustomBuild>
+    <CustomBuild Include="..\..\..\gtk\gtk-win32.rc.in"><Filter>Resource Files</Filter></CustomBuild>
   </ItemGroup>
   <ItemGroup>
 #include "gtk-3.vs10.sourcefiles.filters"

build/win32/vs10/gtk-3.vcxprojin

@@ -114,6 +114,7 @@
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -159,6 +160,7 @@
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -177,33 +179,19 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGtkDbusBuiltSources)</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\gtk\gtk-win32.rc.body">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying GTK+ Win32 Version Resource...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyGtkWin32RC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying GTK+ Win32 Version Resource...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyGtkWin32RC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying GTK+ Win32 Version Resource...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyGtkWin32RC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying GTK+ Win32 Version Resource...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyGtkWin32RC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\gtk\libgtk3.manifest.in">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating GTK+ Win32 Manifest...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateGtkWin32Manifest)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating GTK+ Win32 Manifest...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateGtkWin32Manifest)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating GTK+ Win32 Manifest...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateGtkWin32Manifest)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating GTK+ Win32 Manifest...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGtkWin32Manifest)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
+    <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>

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

@@ -1,181 +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>{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}</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="gtk3-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="gtk3-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="gtk3-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="gtk3-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>%(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>%(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>%(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>%(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\gtk-builder-tool.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gdk-3.vcxproj">
-      <Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gtk-3.vcxproj">
-      <Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

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

@@ -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="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\gtk\gtk-builder-tool.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>

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

@@ -111,6 +111,7 @@
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -159,6 +160,7 @@
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>

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

@@ -1,181 +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>{9F22107A-3EF7-4B52-B269-747B65307F36}</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="gtk3-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="gtk3-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="gtk3-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="gtk3-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>%(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>%(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>%(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>%(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\gtk-query-settings.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gdk-3.vcxproj">
-      <Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gtk-3.vcxproj">
-      <Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

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

@@ -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="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\gtk\gtk-query-settings.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>

build/win32/vs10/gtk-update-icon-cache.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>{FC98AF16-4C68-42DF-906B-93A6804C198A}</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="gtk3-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="gtk3-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="gtk3-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="gtk3-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>%(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>%(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>%(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>%(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\updateiconcache.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gtk3-prebuild.vcxproj">
-      <Project>{b98fbe68-b03c-48e3-8f32-c3c010720d30}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

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

@@ -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="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\gtk\updateiconcache.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>

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

@@ -18,8 +18,8 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>

build/win32/vs10/gtk3-demo-application.vcxprojin

@@ -105,8 +105,9 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
+      <OptimizeReferences>false</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -149,8 +150,9 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
+      <OptimizeReferences>false</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>

build/win32/vs10/gtk3-demo.vcxprojin

@@ -112,11 +112,12 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <FunctionLevelLinking>false</FunctionLevelLinking>
-      <OptimizeReferences>true</OptimizeReferences>
+      <OptimizeReferences>false</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -160,11 +161,12 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <FunctionLevelLinking>false</FunctionLevelLinking>
-      <OptimizeReferences>true</OptimizeReferences>
+      <OptimizeReferences>false</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>

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

@@ -64,8 +64,7 @@ $(PythonPath)\python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix
 
 cd $(SolutionDir)
     </GenerateGtkDbusBuiltSources>
-    <CopyGtkWin32RC>copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc</CopyGtkWin32RC>
-    <GenerateGtkWin32Manifest>$(PythonPath)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*</GenerateGtkWin32Manifest>
+    <GenerateGtkWin32RC>$(PythonPath)\python ..\process-in-win32.py --gtkwin32rc --gtk3manifest</GenerateGtkWin32RC>
     <CopyDemosH>copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h</CopyDemosH>
   </PropertyGroup>
   <PropertyGroup>
@@ -84,11 +83,8 @@ cd $(SolutionDir)
     <BuildMacro Include="GenerateGtkDbusBuiltSources">
       <Value>$(GenerateGtkDbusBuiltSources)</Value>
     </BuildMacro>
-    <BuildMacro Include="CopyGtkWin32RC">
-      <Value>$(CopyGtkWin32RC)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateGtkWin32Manifest">
-      <Value>$(GenerateGtkWin32Manifest)</Value>
+    <BuildMacro Include="GenerateGtkWin32RC">
+      <Value>$(GenerateGtkWin32RC)</Value>
     </BuildMacro>
     <BuildMacro Include="CopyDemosH">
       <Value>$(CopyDemosH)</Value>

build/win32/vs10/gtk3-icon-browser.vcxprojin

@@ -107,8 +107,9 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
+      <OptimizeReferences>false</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -153,8 +154,9 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
+      <OptimizeReferences>false</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>

build/win32/vs10/gtk3-install.propsin

@@ -32,12 +32,6 @@ copy "$(BinDir)\gtk3-icon-browser.exe" $(CopyDir)\bin
 copy "$(BinDir)\gtk3-icon-browser.pdb" $(CopyDir)\bin
 copy "$(BinDir)\gtk-encode-symbolic-svg.exe" $(CopyDir)\bin
 copy "$(BinDir)\gtk-encode-symbolic-svg.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk-update-icon-cache.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk-update-icon-cache.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk-query-settings.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk-query-settings.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk-builder-tool.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk-builder-tool.pdb" $(CopyDir)\bin
 goto DONE_BIN
 
 :DO_BROADWAY_BIN
@@ -61,12 +55,6 @@ copy .\Release\$(Platform)\bin\gtk3-icon-browser.exe $(CopyDir)\bin
 copy .\Release\$(Platform)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin
 copy .\Release\$(Platform)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin
 copy .\Release\$(Platform)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk-query-settings.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk-query-settings.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin
 
 goto DONE_BIN
 
@@ -85,12 +73,6 @@ copy .\Debug\$(Platform)\bin\gtk3-icon-browser.exe $(CopyDir)\bin
 copy .\Debug\$(Platform)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin
 copy .\Debug\$(Platform)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin
 copy .\Debug\$(Platform)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk-query-settings.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk-query-settings.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin
 
 :DONE_BIN
     </GtkDoInstallBin>
@@ -126,12 +108,8 @@ 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
-
 echo "Compiling gsettings XML Files..."
 $(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
-
-echo "Generating icon cache......"
-$(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor"
     </GtkDoInstall>
     <GtkDoInstallBroadwayHeaders>
 copy ..\..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk

build/win32/vs10/gtk3-install.vcxproj

@@ -215,18 +215,6 @@
       <Project>{f280bf1a-777a-4fb5-8005-dfbe04621edb}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="gtk-udpate-icon-cache.vcxproj">
-      <Project>{fc98af16-4c68-42df-906b-93a6804c198a}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gtk-builder-tool.vcxproj">
-      <Project>{7d2397cf-4c25-45bc-a1bb-cb4b6e154bbd}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gtk-query-settings.vcxproj">
-      <Project>{9f22107a-3ef7-4b52-b269-747b65307f36}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

build/win32/vs11/Makefile.am

@@ -10,14 +10,8 @@ EXTRA_DIST +=	\
 	gdk-3.vcxproj.filters	\
 	gtk-3.vcxproj	\
 	gtk-3.vcxproj.filters	\
-	gtk-builder-tool.vcxproj		\
-	gtk-builder-tool.vcxproj.filters	\
 	gtk-encode-symbolic-svg.vcxproj	\
 	gtk-encode-symbolic-svg.vcxproj.filters	\
-	gtk-update-icon-cache.vcxproj		\
-	gtk-update-icon-cache.vcxproj.filters	\
-	gtk-query-settings.vcxproj		\
-	gtk-query-settings.vcxproj.filters	\
 	gtk3-demo.vcxproj	\
 	gtk3-demo.vcxproj.filters	\
 	gtk3-demo-application.vcxproj	\

build/win32/vs12/Makefile.am

@@ -10,14 +10,8 @@ EXTRA_DIST +=	\
 	gdk-3.vcxproj.filters	\
 	gtk-3.vcxproj	\
 	gtk-3.vcxproj.filters	\
-	gtk-builder-tool.vcxproj		\
-	gtk-builder-tool.vcxproj.filters	\
 	gtk-encode-symbolic-svg.vcxproj	\
 	gtk-encode-symbolic-svg.vcxproj.filters	\
-	gtk-query-settings.vcxproj		\
-	gtk-query-settings.vcxproj.filters	\
-	gtk-update-icon-cache.vcxproj		\
-	gtk-update-icon-cache.vcxproj.filters	\
 	gtk3-demo.vcxproj	\
 	gtk3-demo.vcxproj.filters	\
 	gtk3-demo-application.vcxproj	\

build/win32/vs14/Makefile.am

@@ -10,14 +10,8 @@ EXTRA_DIST +=	\
 	gdk-3.vcxproj.filters	\
 	gtk-3.vcxproj	\
 	gtk-3.vcxproj.filters	\
-	gtk-builder-tool.vcxproj		\
-	gtk-builder-tool.vcxproj.filters	\
 	gtk-encode-symbolic-svg.vcxproj	\
 	gtk-encode-symbolic-svg.vcxproj.filters	\
-	gtk-query-settings.vcxproj		\
-	gtk-query-settings.vcxproj.filters	\
-	gtk-update-icon-cache.vcxproj		\
-	gtk-update-icon-cache.vcxproj.filters	\
 	gtk3-demo.vcxproj	\
 	gtk3-demo.vcxproj.filters	\
 	gtk3-demo-application.vcxproj	\

build/win32/vs9/Makefile.am

@@ -27,10 +27,7 @@ EXTRA_DIST += \
 	gdk3-win32.vcprojin		\
 	gdk-3.vcprojin			\
 	gtk-3.vcprojin			\
-	gtk-builder-tool.vcproj	\
 	gtk-encode-symbolic-svg.vcproj	\
-	gtk-query-settings.vcproj	\
-	gtk-update-icon-cache.vcproj	\
 	gtk3-demo.vcprojin		\
 	gtk3-demo-application.vcprojin	\
 	gtk3-icon-browser.vcprojin	\

build/win32/vs9/gtk+.sln

@@ -57,23 +57,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil-3", "gailutil-3.vc
 		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-update-icon-cache", "gtk-update-icon-cache.vcproj", "{FC98AF16-4C68-42DF-906B-93A6804C198A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B98FBE68-B03C-48E3-8F32-C3C010720D30} = {B98FBE68-B03C-48E3-8F32-C3C010720D30}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-builder-tool", "gtk-builder-tool.vcproj", "{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}
-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-query-settings", "gtk-query-settings.vcproj", "{9F22107A-3EF7-4B52-B269-747B65307F36}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}
-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-install.vcproj", "{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}
@@ -84,9 +67,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-instal
 		{343333C4-D46C-4C97-A986-959CCA6F1DE0} = {343333C4-D46C-4C97-A986-959CCA6F1DE0}
 		{E9687D21-E214-4A0C-9EB4-8B38EBB783E5} = {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}
 		{F280BF1A-777A-4FB5-8005-DFBE04621EDB} = {F280BF1A-777A-4FB5-8005-DFBE04621EDB}
-		{FC98AF16-4C68-42DF-906B-93A6804C198A} = {FC98AF16-4C68-42DF-906B-93A6804C198A}
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD} = {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}
-		{9F22107A-3EF7-4B52-B269-747B65307F36} = {9F22107A-3EF7-4B52-B269-747B65307F36}
 	EndProjectSection
 EndProject
 Global
@@ -277,54 +257,6 @@ Global
 		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|x64.Build.0 = Release|x64
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|Win32.Build.0 = Debug|Win32
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|x64.ActiveCfg = Debug|x64
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|x64.Build.0 = Debug|x64
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|Win32.ActiveCfg = Release|Win32
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|Win32.Build.0 = Release|Win32
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|x64.ActiveCfg = Release|x64
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|x64.Build.0 = Release|x64
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|Win32.Build.0 = Debug|Win32
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|x64.Build.0 = Debug|x64
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|Win32.Build.0 = Release|Win32
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|x64.ActiveCfg = Release|x64
-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|x64.Build.0 = Release|x64
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|Win32.Build.0 = Debug|Win32
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|x64.ActiveCfg = Debug|x64
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|x64.Build.0 = Debug|x64
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|Win32.ActiveCfg = Release|Win32
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|Win32.Build.0 = Release|Win32
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|x64.ActiveCfg = Release|x64
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|x64.Build.0 = Release|x64
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|Win32.Build.0 = Debug|Win32
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|x64.Build.0 = Debug|x64
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|Win32.Build.0 = Release|Win32
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|x64.ActiveCfg = Release|x64
-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|x64.Build.0 = Release|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|Win32.Build.0 = Debug|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|x64.ActiveCfg = Debug|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|x64.Build.0 = Debug|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release|Win32.ActiveCfg = Release|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release|Win32.Build.0 = Release|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release|x64.ActiveCfg = Release|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release|x64.Build.0 = Release|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|Win32.Build.0 = Debug|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|x64.Build.0 = Debug|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.Build.0 = Release|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.ActiveCfg = Release|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

build/win32/vs9/gtk-3.vcprojin

@@ -192,63 +192,33 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File RelativePath="..\..\..\gtk\gtk-win32.rc.body">
+			<File RelativePath="..\..\..\gtk\gtk-win32.rc.in">
 				<FileConfiguration Name="Debug|Win32">
 				<Tool Name="VCCustomBuildTool"
-						Description="Copying GTK+ Win32 Version Resource..."
-						CommandLine="$(CopyGtkWin32RC)"
-						Outputs="..\..\..\gtk\gtk-win32.rc"
+						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="Copying GTK+ Win32 Version Resource..."
-						CommandLine="$(CopyGtkWin32RC)"
-						Outputs="..\..\..\gtk\gtk-win32.rc"
+						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="Copying GTK+ Win32 Version Resource..."
-						CommandLine="$(CopyGtkWin32RC)"
-						Outputs="..\..\..\gtk\gtk-win32.rc"
+						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="Copying GTK+ Win32 Version Resource..."
-						CommandLine="$(CopyGtkWin32RC)"
-						Outputs="..\..\..\gtk\gtk-win32.rc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\gtk\libgtk3.manifest.in">
-				<FileConfiguration Name="Debug|Win32">
-				<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ Win32 Manifest..."
-						CommandLine="$(GenerateGtkWin32Manifest)"
-						Outputs="..\..\..\gtk\libgtk3.manifest"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ Win32 Manifest..."
-						CommandLine="$(GenerateGtkWin32Manifest)"
-						Outputs="..\..\..\gtk\libgtk3.manifest"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ Win32 Manifest..."
-						CommandLine="$(GenerateGtkWin32Manifest)"
-						Outputs="..\..\..\gtk\libgtk3.manifest"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ Win32 Manifest..."
-						CommandLine="$(GenerateGtkWin32Manifest)"
-						Outputs="..\..\..\gtk\libgtk3.manifest"
+						Description="Generating GTK+ Win32 Version Resource..."
+						CommandLine="$(GenerateGtkWin32RC)"
+						Outputs="..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest"
 					/>
 				</FileConfiguration>
 			</File>

build/win32/vs9/gtk-builder-tool.vcproj

@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk-builder-tool"
-	ProjectGUID="{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}"
-	RootNamespace="gtkbuildertool"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				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=".\gtk3-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories=""
-				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\gtk-builder-tool.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-query-settings.vcproj

@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk-query-settings"
-	ProjectGUID="{9F22107A-3EF7-4B52-B269-747B65307F36}"
-	RootNamespace="gtkquerysettings"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				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=".\gtk3-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories=""
-				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\gtk-query-settings.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-update-icon-cache.vcproj

@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk-update-icon-cache"
-	ProjectGUID="{FC98AF16-4C68-42DF-906B-93A6804C198A}"
-	RootNamespace="gtkupdateiconcache"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				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=".\gtk3-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories=""
-				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\updateiconcache.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/gtk3-build-defines.vsprops

@@ -9,8 +9,8 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include"
-		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;_USE_MATH_DEFINES"
+		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"
+		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES"
 		ForcedIncludeFiles="msvc_recommended_pragmas.h"
 		AdditionalOptions="/MP"
 	/>

build/win32/vs9/gtk3-demo-application.vcprojin

@@ -73,7 +73,7 @@
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="1"
 				EnableCOMDATFolding="2"
 				TargetMachine="1"
 			/>
@@ -134,7 +134,7 @@
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="1"
 				EnableCOMDATFolding="2"
 				TargetMachine="17"
 			/>

build/win32/vs9/gtk3-demo.vcprojin

@@ -111,7 +111,7 @@
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="1"
 				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -144,7 +144,7 @@
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="1"
 				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"

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

@@ -63,12 +63,8 @@ cd $(SolutionDir)

 		      "
 	/>
 	<UserMacro
-		Name="CopyGtkWin32RC"
-		Value="copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc"
-	/>
-	<UserMacro
-		Name="GenerateGtkWin32Manifest"
-		Value="$(PythonPath)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*"
+		Name="GenerateGtkWin32RC"
+		Value="$(PythonPath)\python ..\process-in-win32.py --gtkwin32rc --gtk3manifest"
 	/>
 	<UserMacro
 		Name="CopyDemosH"

build/win32/vs9/gtk3-icon-browser.vcprojin

@@ -77,7 +77,7 @@
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="1"
 				EnableCOMDATFolding="2"
 				TargetMachine="1"
 			/>
@@ -142,7 +142,7 @@
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="1"
 				EnableCOMDATFolding="2"
 				TargetMachine="17"
 			/>

build/win32/vs9/gtk3-install.vspropsin

@@ -31,12 +31,6 @@ copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-icon-browser.exe $(CopyDir)\b
 copy $(ConfigurationName)\$(PlatformName)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin

 copy $(ConfigurationName)\$(PlatformName)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin

 copy $(ConfigurationName)\$(PlatformName)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin

-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin

-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin

-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-query-settings.exe $(CopyDir)\bin

-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin

-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin

-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin

 goto DONE_BIN

 
 :DO_BROADWAY_BIN

@@ -60,12 +54,6 @@ copy .\Release\$(PlatformName)\bin\gtk3-icon-browser.exe $(CopyDir)\bin
&#x
 copy .\Release\$(PlatformName)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin

 copy .\Release\$(PlatformName)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin

 copy .\Release\$(PlatformName)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin

-copy .\Release\$(PlatformName)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin

-copy .\Release\$(PlatformName)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin

-copy .\Release\$(PlatformName)\bin\gtk-query-settings.exe $(CopyDir)\bin

-copy .\Release\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin

-copy .\Release\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin

-copy .\Release\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin

 goto DONE_BIN

 
 :DO_BROADWAY_DEBUG

@@ -83,12 +71,6 @@ copy .\Debug\$(PlatformName)\bin\gtk3-icon-browser.exe $(CopyDir)\bin
&#x0A
 copy .\Debug\$(PlatformName)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin

 copy .\Debug\$(PlatformName)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin

 copy .\Debug\$(PlatformName)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin

-copy .\Debug\$(PlatformName)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin

-copy .\Debug\$(PlatformName)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin

-copy .\Debug\$(PlatformName)\bin\gtk-query-settings.exe $(CopyDir)\bin

-copy .\Debug\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin

-copy .\Debug\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin

-copy .\Debug\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin

 :DONE_BIN

                        "
  />
@@ -131,9 +113,6 @@ copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\
 
 echo "Compiling gsettings XML Files..."

 $(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas

-
-echo "Generating icon cache..."

-$(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor"
 "
  />
  <UserMacro

config.h.win32.in

@@ -50,9 +50,6 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 /* #undef HAVE_DLFCN_H */
 
-/* Define to 1 if you have the `flockfile' function. */
-#undef HAVE_FLOCKFILE
-
 /* Define to 1 if you have the <ftw.h> header file. */
 /* #undef HAVE_FTW_H */
 
@@ -233,9 +230,6 @@
 /* Have the SYNC extension library */
 /* #undef HAVE_XSYNC */
 
-/* Define to 1 if you have the `_lock_file' function. */
-#define HAVE__LOCK_FILE
-
 /* Define if _NL_MEASUREMENT_MEASUREMENT is available */
 /* #undef HAVE__NL_MEASUREMENT_MEASUREMENT */
 
@@ -310,7 +304,7 @@
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */
 
-/* defines how to decorate public symbols while building */
+/* defines how to decorate public symbols while building */
 #ifdef _MSC_VER
 #define _GDK_EXTERN __declspec (dllexport) extern
 #else

configure.ac

@@ -10,7 +10,7 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [19])
-m4_define([gtk_micro_version], [11])
+m4_define([gtk_micro_version], [1])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -59,8 +59,7 @@ m4_define([atk_required_version], [2.15.1])
 m4_define([cairo_required_version], [1.14.0])
 m4_define([gdk_pixbuf_required_version], [2.30.0])
 m4_define([introspection_required_version], [1.39.0])
-m4_define([wayland_required_version], [1.9.91])
-m4_define([wayland_protocols_required_version], [1.0])
+m4_define([wayland_required_version], [1.5.91])
 m4_define([mirclient_required_version], [0.11.0])
 m4_define([mircookie_required_version], [0.17.0])
 m4_define([epoxy_required_version], [1.0])
@@ -413,7 +412,7 @@ 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 flockfile _lock_file)
+AC_CHECK_FUNCS(posix_fallocate)
 
 if test "x$enable_broadway_backend" = xyes; then
   GDK_BACKENDS="$GDK_BACKENDS broadway"
@@ -429,7 +428,7 @@ fi
 
 PKG_PROG_PKG_CONFIG
 
-WAYLAND_DEPENDENCIES="wayland-client >= wayland_required_version wayland-protocols >= wayland_protocols_required_version xkbcommon >= 0.2.0 wayland-cursor >= wayland_required_version wayland-egl libcanberra"
+WAYLAND_DEPENDENCIES="wayland-client >= wayland_required_version xkbcommon >= 0.2.0 wayland-cursor >= wayland_required_version wayland-egl"
 if test "$enable_wayland_backend" = "maybe" ; then
   AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
   PKG_CHECK_EXISTS($WAYLAND_DEPENDENCIES, [have_wayland_deps=yes], [have_wayland_deps=no])
@@ -445,7 +444,6 @@ fi
 if test "$enable_wayland_backend" = "yes"; then
   # For the cairo image backend
   cairo_backends="$cairo_backends cairo"
-  AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`)
   GDK_BACKENDS="$GDK_BACKENDS wayland"
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WAYLAND"
@@ -1690,15 +1688,6 @@ if test "$have_colord" = "yes"; then
 fi
 AM_CONDITIONAL(HAVE_COLORD, test "x$have_colord" = "xyes")
 
-##################################################
-# Check for harfbuzz and pangoft2
-##################################################
-
-PKG_CHECK_MODULES(FONTDEMO, harfbuzz >= 0.9 pangoft2, build_font_demo=yes, build_font_demo=no)
-AC_SUBST(FONTDEMO_CFLAGS)
-AC_SUBST(FONTDEMO_LIBS)
-AM_CONDITIONAL(BUILD_FONT_DEMO, [ test "x$build_font_demo" = xyes ])
-
 ##################################################
 # Checks for gtk-doc and docbook-tools
 ##################################################
@@ -1903,8 +1892,6 @@ testsuite/a11y/Makefile
 testsuite/a11y/state/Makefile
 testsuite/css/Makefile
 testsuite/css/parser/Makefile
-testsuite/css/nodes/Makefile
-testsuite/css/style/Makefile
 testsuite/gdk/Makefile
 testsuite/gtk/Makefile
 testsuite/reftests/Makefile
@@ -1922,6 +1909,7 @@ docs/tools/Makefile
 build/Makefile
 build/gtk-introspection-msvc.mak
 build/win32/Makefile
+build/win32/crypt/Makefile
 build/win32/vs9/Makefile
 build/win32/vs9/gtk3-version-paths.vsprops
 build/win32/vs10/Makefile
@@ -1942,7 +1930,7 @@ gdk/gdkversionmacros.h
 gtk/Makefile
 gtk/makefile.msc
 gtk/gtkversion.h
-gtk/gtk-win32.rc.body
+gtk/gtk-win32.rc
 gtk/libgtk3.manifest
 libgail-util/Makefile
 modules/Makefile

demos/gtk-demo/Makefile.am

@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl
 ## These should be in the order you want them to appear in the
 ## demo app, which means alphabetized by demo title, not filename
 demos_base =					\
-	application_demo.c			\
+	application.c				\
 	assistant.c				\
 	builder.c				\
 	button_box.c				\
@@ -26,7 +26,7 @@ demos_base =					\
 	event_axes.c				\
 	expander.c  				\
         filtermodel.c				\
-	foreigndrawing.c			\
+	font_features.c				\
 	gestures.c				\
 	glarea.c				\
 	headerbar.c				\
@@ -70,18 +70,12 @@ demos_base =					\
 	transparent.c				\
 	tree_store.c
 
-demos_opt =
-
-if BUILD_FONT_DEMO
-demos_opt += font_features.c
-endif
-
 if OS_UNIX
-demos_opt += pagesetup.c
+demos = $(demos_base) pagesetup.c
+else
+demos = $(demos_base)
 endif
 
-demos = $(demos_base) $(demos_opt)
-
 AM_CPPFLAGS = \
 	-I$(top_srcdir) 			\
 	-I$(top_builddir)/gdk			\
@@ -100,11 +94,6 @@ LDADDS = \
 	$(GDK_DEP_LIBS)				\
 	-lm
 
-if BUILD_FONT_DEMO
-AM_CPPFLAGS += $(FONTDEMO_CFLAGS)
-LDADDS += $(FONTDEMO_LIBS)
-endif
-
 bin_PROGRAMS = gtk3-demo gtk3-demo-application
 
 desktopdir = $(datadir)/applications
@@ -143,7 +132,7 @@ gtk3_demo_LDADD = $(LDADDS)
 gtk3_demo_LDFLAGS = -export-dynamic
 
 gtk3_demo_application_SOURCES = \
-	application.c 		\
+	application-standalone.c \
 	demo_resources.c
 
 gtk3_demo_application_LDADD = $(LDADDS)
@@ -187,7 +176,7 @@ uninstall-update-icon-cache:
 MSVCPROJS = gtk3-demo gtk3-demo-application
 
 gtk3_demo_FILES = $(gtk3_demo_SOURCES)
-gtk3_demo_EXCLUDES = font_features.c|pagesetup.c
+gtk3_demo_EXCLUDES = pagesetup.c
 
 gtk3_demo_application_FILES = $(gtk3_demo_application_SOURCES)
 gtk3_demo_application_EXCLUDES = dummy

demos/gtk-demo/application-standalone.c

@@ -0,0 +1,3 @@
+#define STANDALONE
+
+#include "application.c"

demos/gtk-demo/application.c

@@ -1,31 +1,17 @@
+/* Application Class
+ *
+ * Demonstrates a simple application.
+ *
+ * This examples uses GtkApplication, GtkApplicationWindow, GtkBuilder
+ * as well as GMenu and GResource. Due to the way GtkApplication is structured,
+ * it is run as a separate process.
+ */
 
 #include "config.h"
 
 #include <gtk/gtk.h>
 
-typedef GtkApplication DemoApplication;
-typedef GtkApplicationClass DemoApplicationClass;
-
-G_DEFINE_TYPE (DemoApplication, demo_application, GTK_TYPE_APPLICATION)
-
-typedef struct {
-  GtkApplicationWindow parent_instance;
-
-  GtkWidget *message;
-  GtkWidget *infobar;
-  GtkWidget *status;
-  GtkWidget *menutool;
-  GMenuModel *toolmenu;
-  GtkTextBuffer *buffer;
-
-  int width;
-  int height;
-  gboolean maximized;
-  gboolean fullscreen;
-} DemoApplicationWindow;
-typedef GtkApplicationWindowClass DemoApplicationWindowClass;
-
-G_DEFINE_TYPE (DemoApplicationWindow, demo_application_window, GTK_TYPE_APPLICATION_WINDOW)
+#ifdef STANDALONE
 
 static void create_window (GApplication *app, const char *contents);
 
@@ -53,9 +39,10 @@ show_action_dialog (GSimpleAction *action)
 static void
 show_action_infobar (GSimpleAction *action,
                      GVariant      *parameter,
-                     gpointer       data)
+                     gpointer       window)
 {
-  DemoApplicationWindow *window = data;
+  GtkWidget *infobar;
+  GtkWidget *message;
   gchar *text;
   const gchar *name;
   const gchar *value;
@@ -63,25 +50,27 @@ show_action_infobar (GSimpleAction *action,
   name = g_action_get_name (G_ACTION (action));
   value = g_variant_get_string (parameter, NULL);
 
+  message = g_object_get_data (G_OBJECT (window), "message");
+  infobar = g_object_get_data (G_OBJECT (window), "infobar");
   text = g_strdup_printf ("You activated radio action: \"%s\".\n"
                           "Current value: %s", name, value);
-  gtk_label_set_text (GTK_LABEL (window->message), text);
-  gtk_widget_show (window->infobar);
+  gtk_label_set_text (GTK_LABEL (message), text);
+  gtk_widget_show (infobar);
   g_free (text);
 }
 
 static void
-activate_action (GSimpleAction *action,
-                 GVariant      *parameter,
-                 gpointer       user_data)
+activate_action (GSimpleAction  *action,
+                 GVariant       *parameter,
+                 gpointer        user_data)
 {
   show_action_dialog (action);
 }
 
 static void
-activate_new (GSimpleAction *action,
-              GVariant      *parameter,
-              gpointer       user_data)
+activate_new (GSimpleAction  *action,
+              GVariant       *parameter,
+              gpointer        user_data)
 {
   GApplication *app = user_data;
 
@@ -90,8 +79,8 @@ activate_new (GSimpleAction *action,
 
 static void
 open_response_cb (GtkNativeDialog *dialog,
-                  gint             response_id,
-                  gpointer         user_data)
+                  gint response_id,
+                  gpointer user_data)
 {
   GtkFileChooserNative *native = user_data;
   GApplication *app = g_object_get_data (G_OBJECT (native), "app");
@@ -124,15 +113,14 @@ open_response_cb (GtkNativeDialog *dialog,
         }
     }
 
-  gtk_native_dialog_destroy (GTK_NATIVE_DIALOG (native));
   g_object_unref (native);
 }
 
 
 static void
-activate_open (GSimpleAction *action,
-               GVariant      *parameter,
-               gpointer       user_data)
+activate_open (GSimpleAction  *action,
+               GVariant       *parameter,
+               gpointer        user_data)
 {
   GApplication *app = user_data;
   GtkFileChooserNative *native;
@@ -239,8 +227,8 @@ activate_quit (GSimpleAction *action,
 }
 
 static void
-update_statusbar (GtkTextBuffer         *buffer,
-                  DemoApplicationWindow *window)
+update_statusbar (GtkTextBuffer *buffer,
+                  GtkStatusbar  *statusbar)
 {
   gchar *msg;
   gint row, col;
@@ -248,7 +236,7 @@ update_statusbar (GtkTextBuffer         *buffer,
   GtkTextIter iter;
 
   /* clear any previous message, underflow is allowed */
-  gtk_statusbar_pop (GTK_STATUSBAR (window->status), 0);
+  gtk_statusbar_pop (statusbar, 0);
 
   count = gtk_text_buffer_get_char_count (buffer);
 
@@ -262,18 +250,18 @@ update_statusbar (GtkTextBuffer         *buffer,
   msg = g_strdup_printf ("Cursor at row %d column %d - %d chars in document",
                          row, col, count);
 
-  gtk_statusbar_push (GTK_STATUSBAR (window->status), 0, msg);
+  gtk_statusbar_push (statusbar, 0, msg);
 
   g_free (msg);
 }
 
 static void
-mark_set_callback (GtkTextBuffer         *buffer,
-                   const GtkTextIter     *new_location,
-                   GtkTextMark           *mark,
-                   DemoApplicationWindow *window)
+mark_set_callback (GtkTextBuffer     *buffer,
+                   const GtkTextIter *new_location,
+                   GtkTextMark       *mark,
+                   gpointer           data)
 {
-  update_statusbar (buffer, window);
+  update_statusbar (buffer, GTK_STATUSBAR (data));
 }
 
 static void
@@ -331,9 +319,9 @@ static GActionEntry win_entries[] = {
 };
 
 static void
-clicked_cb (GtkWidget *widget, DemoApplicationWindow *window)
+clicked_cb (GtkWidget *widget, GtkWidget *info)
 {
-  gtk_widget_hide (window->infobar);
+  gtk_widget_hide (info);
 }
 
 static void
@@ -343,10 +331,8 @@ startup (GApplication *app)
   GMenuModel *appmenu;
   GMenuModel *menubar;
 
-  G_APPLICATION_CLASS (demo_application_parent_class)->startup (app);
-
   builder = gtk_builder_new ();
-  gtk_builder_add_from_resource (builder, "/application_demo/menus.ui", NULL);
+  gtk_builder_add_from_resource (builder, "/application/menus.ui", NULL);
 
   appmenu = (GMenuModel *)gtk_builder_get_object (builder, "appmenu");
   menubar = (GMenuModel *)gtk_builder_get_object (builder, "menubar");
@@ -359,17 +345,66 @@ startup (GApplication *app)
 
 static void
 create_window (GApplication *app,
-               const char   *content)
+               const char *content_text)
 {
-  DemoApplicationWindow *window;
+  GtkBuilder *builder;
+  GtkWidget *window;
+  GtkWidget *grid;
+  GtkWidget *contents;
+  GtkWidget *status;
+  GtkWidget *message;
+  GtkWidget *button;
+  GtkWidget *infobar;
+  GtkWidget *menutool;
+  GMenuModel *toolmenu;
+  GtkTextBuffer *buffer;
 
-  window = (DemoApplicationWindow *)g_object_new (demo_application_window_get_type (),
-                                                  "application", app,
-                                                  NULL);
-  if (content)
-    gtk_text_buffer_set_text (window->buffer, content, -1);
+  window = gtk_application_window_new (GTK_APPLICATION (app));
+  gtk_window_set_title (GTK_WINDOW (window), "Application Class");
+  gtk_window_set_icon_name (GTK_WINDOW (window), "document-open");
+  gtk_window_set_default_size (GTK_WINDOW (window), 200, 200);
 
-  gtk_window_present (GTK_WINDOW (window));
+  g_action_map_add_action_entries (G_ACTION_MAP (window),
+                                   win_entries, G_N_ELEMENTS (win_entries),
+                                   window);
+
+  builder = gtk_builder_new ();
+  gtk_builder_add_from_resource (builder, "/application/application.ui", NULL);
+
+  grid = (GtkWidget *)gtk_builder_get_object (builder, "grid");
+  contents = (GtkWidget *)gtk_builder_get_object (builder, "contents");
+  status = (GtkWidget *)gtk_builder_get_object (builder, "status");
+  message = (GtkWidget *)gtk_builder_get_object (builder, "message");
+  button = (GtkWidget *)gtk_builder_get_object (builder, "button");
+  infobar = (GtkWidget *)gtk_builder_get_object (builder, "infobar");
+  menutool = (GtkWidget *)gtk_builder_get_object (builder, "menutool");
+  toolmenu = (GMenuModel *)gtk_builder_get_object (builder, "toolmenu");
+
+  g_object_set_data (G_OBJECT (window), "message", message);
+  g_object_set_data (G_OBJECT (window), "infobar", infobar);
+
+  gtk_container_add (GTK_CONTAINER (window), grid);
+
+  gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (menutool),
+                                 gtk_menu_new_from_model (toolmenu));
+
+  gtk_widget_grab_focus (contents);
+  g_signal_connect (button, "clicked", G_CALLBACK (clicked_cb), infobar);
+
+  /* Show text widget info in the statusbar */
+  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (contents));
+  if (content_text)
+    gtk_text_buffer_set_text (buffer, content_text, -1);
+  g_signal_connect_object (buffer, "changed",
+                           G_CALLBACK (update_statusbar), status, 0);
+  g_signal_connect_object (buffer, "mark-set",
+                           G_CALLBACK (mark_set_callback), status, 0);
+
+  update_statusbar (buffer, GTK_STATUSBAR (status));
+
+  gtk_widget_show_all (window);
+
+  g_object_unref (builder);
 }
 
 static void
@@ -378,12 +413,16 @@ activate (GApplication *app)
   create_window (app, NULL);
 }
 
-static void
-demo_application_init (DemoApplication *app)
+int
+main (int argc, char *argv[])
 {
+  GtkApplication *app;
   GSettings *settings;
   GAction *action;
 
+  gtk_init (NULL, NULL);
+
+  app = gtk_application_new ("org.gtk.Demo2", 0);
   settings = g_settings_new ("org.gtk.Demo");
 
   g_action_map_add_action_entries (G_ACTION_MAP (app),
@@ -394,151 +433,97 @@ demo_application_init (DemoApplication *app)
 
   g_action_map_add_action (G_ACTION_MAP (app), action);
 
-  g_object_unref (settings);
+  g_signal_connect (app, "startup", G_CALLBACK (startup), NULL);
+  g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
+
+  g_application_run (G_APPLICATION (app), 0, NULL);
+
+  return 0;
+}
+
+#else /* !STANDALONE */
+
+static gboolean name_seen;
+static GtkWidget *placeholder;
+
+static void
+on_name_appeared (GDBusConnection *connection,
+                  const gchar     *name,
+                  const gchar     *name_owner,
+                  gpointer         user_data)
+{
+  name_seen = TRUE;
 }
 
 static void
-demo_application_class_init (DemoApplicationClass *class)
+on_name_vanished (GDBusConnection *connection,
+                  const gchar     *name,
+                  gpointer         user_data)
 {
-  GApplicationClass *app_class = G_APPLICATION_CLASS (class);
+  if (!name_seen)
+    return;
 
-  app_class->startup = startup;
-  app_class->activate = activate;
+  if (placeholder)
+    {
+      gtk_widget_destroy (placeholder);
+      g_object_unref (placeholder);
+      placeholder = NULL;
+    }
 }
 
-static void
-demo_application_window_store_state (DemoApplicationWindow *win)
-{
-  GSettings *settings;
+#ifdef G_OS_WIN32
+#define APP_EXTENSION ".exe"
+#else
+#define APP_EXTENSION
+#endif
 
-  settings = g_settings_new ("org.gtk.Demo");
-  g_settings_set (settings, "window-size", "(ii)", win->width, win->height);
-  g_settings_set_boolean (settings, "maximized", win->maximized);
-  g_settings_set_boolean (settings, "fullscreen", win->fullscreen);
-  g_object_unref (settings);
+GtkWidget *
+do_application (GtkWidget *toplevel)
+{
+  static guint watch = 0;
+
+  if (watch == 0)
+    watch = g_bus_watch_name (G_BUS_TYPE_SESSION,
+                              "org.gtk.Demo2",
+                              0,
+                              on_name_appeared,
+                              on_name_vanished,
+                              NULL, NULL);
+
+  if (placeholder == NULL)
+    {
+      const gchar *command;
+      GError *error = NULL;
+
+      if (g_file_test ("./gtk3-demo-application" APP_EXTENSION, G_FILE_TEST_IS_EXECUTABLE))
+        command = "./gtk3-demo-application" APP_EXTENSION;
+      else
+        command = "gtk3-demo-application";
+
+      if (!g_spawn_command_line_async (command, &error))
+        {
+          g_warning ("%s", error->message);
+          g_error_free (error);
+        }
+
+      placeholder = gtk_label_new ("");
+      g_object_ref_sink (placeholder);
+    }
+  else
+    {
+      g_dbus_connection_call_sync (g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL),
+                              "org.gtk.Demo2",
+                              "/org/gtk/Demo2",
+                              "org.gtk.Actions",
+                              "Activate",
+                              g_variant_new ("(sava{sv})", "quit", NULL, NULL),
+                              NULL,
+                              0,
+                              G_MAXINT,
+                              NULL, NULL);
+    }
+
+  return placeholder;
 }
 
-static void
-demo_application_window_load_state (DemoApplicationWindow *win)
-{
-  GSettings *settings;
-
-  settings = g_settings_new ("org.gtk.Demo");
-  g_settings_get (settings, "window-size", "(ii)", &win->width, &win->height);
-  win->maximized = g_settings_get_boolean (settings, "maximized");
-  win->fullscreen = g_settings_get_boolean (settings, "fullscreen");
-  g_object_unref (settings);
-}
-
-static void
-demo_application_window_init (DemoApplicationWindow *window)
-{
-  GtkWidget *menu;
-
-  window->width = -1;
-  window->height = -1;
-  window->maximized = FALSE;
-  window->fullscreen = FALSE;
-
-  gtk_widget_init_template (GTK_WIDGET (window));
-
-  menu = gtk_menu_new_from_model (window->toolmenu);
-  gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (window->menutool), menu);
-
-  g_action_map_add_action_entries (G_ACTION_MAP (window),
-                                   win_entries, G_N_ELEMENTS (win_entries),
-                                   window);
-}
-
-static void
-demo_application_window_constructed (GObject *object)
-{
-  DemoApplicationWindow *window = (DemoApplicationWindow *)object;
-
-  demo_application_window_load_state (window);
-
-  gtk_window_set_default_size (GTK_WINDOW (window), window->width, window->height);
-
-  if (window->maximized)
-    gtk_window_maximize (GTK_WINDOW (window));
-
-  if (window->fullscreen)
-    gtk_window_fullscreen (GTK_WINDOW (window));
-
-  G_OBJECT_CLASS (demo_application_window_parent_class)->constructed (object);
-}
-
-static void
-demo_application_window_size_allocate (GtkWidget     *widget,
-                                       GtkAllocation *allocation)
-{
-  DemoApplicationWindow *window = (DemoApplicationWindow *)widget;
-
-  GTK_WIDGET_CLASS (demo_application_window_parent_class)->size_allocate (widget, allocation);
-
-  if (!window->maximized && !window->fullscreen)
-    gtk_window_get_size (GTK_WINDOW (window), &window->width, &window->height);
-}
-
-static gboolean
-demo_application_window_state_event (GtkWidget           *widget,
-                                     GdkEventWindowState *event)
-{
-  DemoApplicationWindow *window = (DemoApplicationWindow *)widget;
-  gboolean res = GDK_EVENT_PROPAGATE;
-
-  if (GTK_WIDGET_CLASS (demo_application_window_parent_class)->window_state_event)
-    res = GTK_WIDGET_CLASS (demo_application_window_parent_class)->window_state_event (widget, event);
-
-  window->maximized = (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) != 0;
-  window->fullscreen = (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) != 0;
-
-  return res;
-}
-
-static void
-demo_application_window_destroy (GtkWidget *widget)
-{
-  DemoApplicationWindow *window = (DemoApplicationWindow *)widget;
-
-  demo_application_window_store_state (window);
-
-  GTK_WIDGET_CLASS (demo_application_window_parent_class)->destroy (widget);
-}
-
-static void
-demo_application_window_class_init (DemoApplicationWindowClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->constructed = demo_application_window_constructed;
-
-  widget_class->size_allocate = demo_application_window_size_allocate;
-  widget_class->window_state_event = demo_application_window_state_event;
-  widget_class->destroy = demo_application_window_destroy;
-
-  gtk_widget_class_set_template_from_resource (widget_class, "/application_demo/application.ui");
-  gtk_widget_class_bind_template_child (widget_class, DemoApplicationWindow, message);
-  gtk_widget_class_bind_template_child (widget_class, DemoApplicationWindow, infobar);
-  gtk_widget_class_bind_template_child (widget_class, DemoApplicationWindow, status);
-  gtk_widget_class_bind_template_child (widget_class, DemoApplicationWindow, buffer);
-  gtk_widget_class_bind_template_child (widget_class, DemoApplicationWindow, menutool);
-  gtk_widget_class_bind_template_child (widget_class, DemoApplicationWindow, toolmenu);
-  gtk_widget_class_bind_template_callback (widget_class, clicked_cb);
-  gtk_widget_class_bind_template_callback (widget_class, update_statusbar);
-  gtk_widget_class_bind_template_callback (widget_class, mark_set_callback);
-}
-
-int
-main (int argc, char *argv[])
-{
-  GtkApplication *app;
-
-  app = GTK_APPLICATION (g_object_new (demo_application_get_type (),
-                                       "application-id", "org.gtk.Demo2",
-                                       "flags", G_APPLICATION_HANDLES_OPEN,
-                                       NULL));
-
-  return g_application_run (G_APPLICATION (app), 0, NULL);
-}
+#endif

demos/gtk-demo/application.ui

@@ -1,123 +1,100 @@
 <?xml version="1.0"?>
 <interface>
-  <template class="DemoApplicationWindow" parent="GtkApplicationWindow">
-    <property name="title" translatable="yes">Application Class</property>
-    <property name="default-width">200</property>
-    <property name="default-height">200</property>
-    <property name="icon-name">document-open</property>
+  <object class="GtkGrid" id="grid">
     <child>
-      <object class="GtkGrid">
-        <property name="visible">1</property>
+      <object class="GtkToolbar" id="toolbar">
+        <property name="hexpand">1</property>
+        <style>
+          <class name="primary-toolbar"/>
+        </style>
         <child>
-          <object class="GtkToolbar">
-            <property name="visible">1</property>
-            <property name="hexpand">1</property>
-            <style>
-              <class name="primary-toolbar"/>
-            </style>
-            <child>
-              <object class="GtkMenuToolButton" id="menutool">
-                <property name="visible">1</property>
-                <property name="icon-name">document-open</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToolButton">
-                <property name="visible">1</property>
-                <property name="icon-name">application-exit</property>
-                <property name="action-name">app.quit</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkSeparatorToolItem">
-                <property name="visible">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToolButton">
-                <property name="visible">1</property>
-                <property name="icon-name">applications-other</property>
-                <property name="action-name">win.logo</property>
-              </object>
-            </child>
+          <object class="GtkMenuToolButton" id="menutool">
+            <property name="icon-name">document-open</property>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
-          <object class="GtkInfoBar" id="infobar">
-            <property name="no-show-all">1</property>
-            <property name="hexpand">1</property>
-            <child internal-child="content_area">
-              <object class="GtkBox" id="content_area">
-                <child>
-                  <object class="GtkLabel" id="message">
-                    <property name="visible">1</property>
-                    <property name="hexpand">1</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child internal-child="action_area">
-              <object class="GtkBox">
-                <child>
-                  <object class="GtkButton">
-                    <property name="visible">1</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">_OK</property>
-                    <property name="use_underline">1</property>
-                    <signal name="clicked" handler="clicked_cb"/>
-                  </object>
-                </child>
-              </object>
-            </child>
+          <object class="GtkToolButton" id="quit">
+            <property name="icon-name">application-exit</property>
+            <property name="action-name">app.quit</property>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
-          <object class="GtkScrolledWindow">
-            <property name="visible">1</property>
-            <property name="shadow-type">in</property>
-            <child>
-              <object class="GtkTextView">
-                <property name="visible">1</property>
-                <property name="hexpand">1</property>
-                <property name="vexpand">1</property>
-                <property name="buffer">buffer</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
-          </packing>
+          <object class="GtkSeparatorToolItem" id="sep"/>
         </child>
         <child>
-          <object class="GtkStatusbar" id="status">
-            <property name="hexpand">1</property>
-            <property name="visible">1</property>
+          <object class="GtkToolButton" id="logo">
+            <property name="icon-name">applications-other</property>
+            <property name="action-name">win.logo</property>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">3</property>
-          </packing>
         </child>
       </object>
+      <packing>
+        <property name="left-attach">0</property>
+        <property name="top-attach">0</property>
+      </packing>
     </child>
-  </template>
+    <child>
+      <object class="GtkInfoBar" id="infobar">
+        <property name="no-show-all">1</property>
+        <property name="hexpand">1</property>
+        <child internal-child="content_area">
+          <object class="GtkBox" id="content_area">
+            <child>
+              <object class="GtkLabel" id="message">
+                <property name="visible">1</property>
+                <property name="hexpand">1</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkBox" id="action_area">
+            <child>
+              <object class="GtkButton" id="button">
+                <property name="visible">1</property>
+                <property name="valign">center</property>
+                <property name="label" translatable="yes">_OK</property>
+                <property name="use_underline">1</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="left-attach">0</property>
+        <property name="top-attach">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkScrolledWindow" id="sw">
+        <property name="shadow-type">in</property>
+        <child>
+          <object class="GtkTextView" id="contents">
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="left-attach">0</property>
+        <property name="top-attach">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkStatusbar" id="status">
+        <property name="hexpand">1</property>
+        <property name="visible">1</property>
+      </object>
+      <packing>
+        <property name="left-attach">0</property>
+        <property name="top-attach">3</property>
+      </packing>
+    </child>
+  </object>
   <menu id="toolmenu">
     <item>
       <attribute name="label">File1</attribute>
       <attribute name="action">win.file1</attribute>
     </item>
   </menu>
-  <object class="GtkTextBuffer" id="buffer">
-    <signal name="changed" handler="update_statusbar"/>
-    <signal name="mark-set" handler="mark_set_callback"/>
-  </object>
 </interface>

demos/gtk-demo/application_demo.c

@@ -1,95 +0,0 @@
-/* Application Class
- *
- * Demonstrates a simple application.
- *
- * This examples uses GtkApplication, GtkApplicationWindow, GtkBuilder
- * as well as GMenu and GResource. Due to the way GtkApplication is structured,
- * it is run as a separate process.
- */
-
-#include "config.h"
-
-#include <gtk/gtk.h>
-
-static gboolean name_seen;
-static GtkWidget *placeholder;
-
-static void
-on_name_appeared (GDBusConnection *connection,
-                  const gchar     *name,
-                  const gchar     *name_owner,
-                  gpointer         user_data)
-{
-  name_seen = TRUE;
-}
-
-static void
-on_name_vanished (GDBusConnection *connection,
-                  const gchar     *name,
-                  gpointer         user_data)
-{
-  if (!name_seen)
-    return;
-
-  if (placeholder)
-    {
-      gtk_widget_destroy (placeholder);
-      g_object_unref (placeholder);
-      placeholder = NULL;
-    }
-}
-
-#ifdef G_OS_WIN32
-#define APP_EXTENSION ".exe"
-#else
-#define APP_EXTENSION
-#endif
-
-GtkWidget *
-do_application_demo (GtkWidget *toplevel)
-{
-  static guint watch = 0;
-
-  if (watch == 0)
-    watch = g_bus_watch_name (G_BUS_TYPE_SESSION,
-                              "org.gtk.Demo2",
-                              0,
-                              on_name_appeared,
-                              on_name_vanished,
-                              NULL, NULL);
-
-  if (placeholder == NULL)
-    {
-      const gchar *command;
-      GError *error = NULL;
-
-      if (g_file_test ("./gtk3-demo-application" APP_EXTENSION, G_FILE_TEST_IS_EXECUTABLE))
-        command = "./gtk3-demo-application" APP_EXTENSION;
-      else
-        command = "gtk3-demo-application";
-
-      if (!g_spawn_command_line_async (command, &error))
-        {
-          g_warning ("%s", error->message);
-          g_error_free (error);
-        }
-
-      placeholder = gtk_label_new ("");
-      g_object_ref_sink (placeholder);
-    }
-  else
-    {
-      g_dbus_connection_call_sync (g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL),
-                                   "org.gtk.Demo2",
-                                   "/org/gtk/Demo2",
-                                   "org.gtk.Actions",
-                                   "Activate",
-                                   g_variant_new ("(sava{sv})", "quit", NULL, NULL),
-                                   NULL,
-                                   0,
-                                   G_MAXINT,
-                                   NULL, NULL);
-    }
-
-  return placeholder;
-}

demos/gtk-demo/appmenu.ui

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.10 -->
-  <menu id="appmenu">
-    <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/gtk-demo/assistant.c

@@ -101,7 +101,6 @@ create_page1 (GtkWidget *assistant)
 
   entry = gtk_entry_new ();
   gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
-  gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
   gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 0);
   g_signal_connect (G_OBJECT (entry), "changed",
                     G_CALLBACK (on_entry_changed), assistant);

demos/gtk-demo/changedisplay.c

@@ -108,7 +108,6 @@ query_for_toplevel (GdkScreen  *screen,
   GtkWidget *popup, *label, *frame;
   GdkCursor *cursor;
   GtkWidget *toplevel = NULL;
-  GdkDevice *device;
 
   popup = gtk_window_new (GTK_WINDOW_POPUP);
   gtk_window_set_screen (GTK_WINDOW (popup), screen);
@@ -125,12 +124,14 @@ query_for_toplevel (GdkScreen  *screen,
 
   gtk_widget_show_all (popup);
   cursor = gdk_cursor_new_from_name (display, "crosshair");
-  device = gtk_get_current_event_device ();
 
-  if (gdk_seat_grab (gdk_device_get_seat (device),
-                     gtk_widget_get_window (popup),
-                     GDK_SEAT_CAPABILITY_ALL_POINTING,
-                     FALSE, cursor, NULL, NULL, NULL) == GDK_GRAB_SUCCESS)
+  if (gdk_device_grab (gtk_get_current_event_device (),
+                       gtk_widget_get_window (popup),
+                       GDK_OWNERSHIP_NONE,
+                       FALSE,
+                       GDK_BUTTON_RELEASE_MASK,
+                       cursor,
+                       GDK_CURRENT_TIME) == GDK_GRAB_SUCCESS)
     {
       gboolean clicked = FALSE;
 

demos/gtk-demo/combobox.c

@@ -36,10 +36,13 @@ create_icon_store (void)
     N_("Open")
   };
 
+  GtkWidget *cellview;
   GtkTreeIter iter;
   GtkListStore *store;
   gint i;
 
+  cellview = gtk_cell_view_new ();
+
   store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
 
   for (i = 0; i < G_N_ELEMENTS (icon_names); i++)
@@ -62,6 +65,8 @@ create_icon_store (void)
         }
     }
 
+  gtk_widget_destroy (cellview);
+
   return GTK_TREE_MODEL (store);
 }
 

demos/gtk-demo/css_accordion.css

@@ -7,7 +7,7 @@
     font: Cantarell 20px;
 }
 
-window {
+GtkWindow {
     background: linear-gradient(153deg, #151515, #151515 5px, transparent 5px) 0 0,
                 linear-gradient(333deg, #151515, #151515 5px, transparent 5px) 10px 5px,
                 linear-gradient(153deg, #222, #222 5px, transparent 5px) 0 5px,
@@ -18,7 +18,7 @@ window {
     background-size: 20px 20px;
 }
 
-button {
+.button {
     color: black;
     background-color: #bbb;
     border-style: solid;
@@ -28,25 +28,25 @@ button {
     padding: 12px 4px;
 }
 
-button:first-child {
+.button:first-child {
     border-radius: 5px 0 0 5px;
 }
 
-button:last-child {
+.button:last-child {
     border-radius: 0 5px 5px 0;
     border-width: 2px;
 }
 
-button:hover {
+.button:hover {
     padding: 12px 48px;
     background-color: #4870bc;
 }
 
-button *:hover {
+.button *:hover {
     color: white;
 }
 
-button:hover:active,
-button:active {
+.button:hover:active,
+.button:active {
     background-color: #993401;
 }

demos/gtk-demo/css_basics.css

@@ -16,7 +16,7 @@
 }
 
 /* Make sure selections are visible */
-selection {
+:selected {
   background-color: darkGreen;
   color: black;
 }

demos/gtk-demo/css_pixbufs.css

@@ -50,7 +50,7 @@
     100% { background-size: 12px, 96px, 12px, 96px, 12px, 96px, 12px, 96px, auto }
 }
 
-window {
+GtkWindow {
     background-image: url("resource://css_pixbufs/apple-red.png"),
                       url("resource://css_pixbufs/gnome-applets.png"),
                       url("resource://css_pixbufs/gnome-calendar.png"),
@@ -66,7 +66,7 @@ window {
 }
 
 /* Make the text editor has a nice style */
-.view, scrollbar, separator {
+.view, .scrollbar, .pane-separator {
   color: black;
   background-color: rgba(255,255,255,0.5);
 }

demos/gtk-demo/css_shadows.css

@@ -19,7 +19,7 @@
   background-size: 29px, 59px, 73px, 109px;
 }
 
-button {
+.button {
   color: black;
   padding: 10px;
   border-radius: 5px;
@@ -27,17 +27,17 @@ button {
   border: 1px transparent solid;
 }
 
-button:hover {
+.button:hover {
   text-shadow: 3px 3px 5px alpha(black, 0.75);
-  -gtk-icon-shadow: 3px 3px 5px alpha(black, 0.75);
+  icon-shadow: 3px 3px 5px alpha(black, 0.75);
   box-shadow: 3px 3px 5px alpha(black, 0.5) inset;
   border: solid 1px alpha(black, 0.75);
 }
 
-button:active {
+.button:active {
   padding: 11px 9px 9px 11px;
   text-shadow: 1px 1px 2.5px alpha(black, 0.6);
-  -gtk-icon-shadow: 1px 1px 2.5px alpha(black, 0.6);
+  icon-shadow: 1px 1px 2.5px alpha(black, 0.6);
 }
 
 

demos/gtk-demo/cssview.css

@@ -10,12 +10,12 @@
   background-color: #4a90d9;
 }
 
-scrollbar trough,
+.scrollbar.trough,
 .scrollbars-junction {
   background-color: alpha(white, 0.80);
 }
 
-scrollbar slider {
+.scrollbar.slider {
   border-width: 3px;
   border-style: solid;
   border-radius: 10px;
@@ -24,11 +24,11 @@ scrollbar slider {
   background-color: #999;
 }
 
-scrollbar slider:hover {
+.scrollbar.slider:prelight {
   background-color: #555;
 }
 
-paned separator {
+.pane-separator {
   background-color: alpha(white, 0.80);
   background-image: linear-gradient(transparent, transparent 1px, #999 1px, #999 4px, transparent 4px);
   background-size: 40px auto;
@@ -36,6 +36,6 @@ paned separator {
   background-position: center;
 }
 
-paned separator:hover {
+.pane-separator:prelight {
   background-image: linear-gradient(transparent, transparent 1px, #555 1px, #555 4px, transparent 4px);
 }

demos/gtk-demo/demo.gresource.xml

@@ -2,10 +2,8 @@
 <gresources>
   <gresource prefix="/ui">
     <file preprocess="xml-stripblanks">main.ui</file>
-    <file preprocess="xml-stripblanks">appmenu.ui</file>
   </gresource>
-  <gresource prefix="/application_demo">
-    <file>application.c</file>
+  <gresource prefix="/application">
     <file>application.ui</file>
     <file>menus.ui</file>
   </gresource>
@@ -98,7 +96,6 @@
     <file>shortcuts-builder.ui</file>
     <file>shortcuts-gedit.ui</file>
     <file>shortcuts-clocks.ui</file>
-    <file>shortcuts-boxes.ui</file>
   </gresource>
   <gresource prefix="/revealer">
     <file>revealer.ui</file>
@@ -119,7 +116,7 @@
     <file>gnu-keys.png</file>
   </gresource>
   <gresource prefix="/sources">
-    <file>application_demo.c</file>
+    <file>application.c</file>
     <file>assistant.c</file>
     <file>builder.c</file>
     <file>button_box.c</file>
@@ -142,7 +139,6 @@
     <file>expander.c</file>
     <file>filtermodel.c</file>
     <file>flowbox.c</file>
-    <file>foreigndrawing.c</file>
     <file>font_features.c</file>
     <file>gestures.c</file>
     <file>glarea.c</file>
@@ -202,7 +198,7 @@
     <file>glarea-fragment.glsl</file>
     <file>glarea-vertex.glsl</file>
   </gresource>
-  <gresource prefix="/font_features">
+  <gresource prefix="/font-features">
     <file>font-features.ui</file>
   </gresource>
   <gresource prefix="/spinbutton">
@@ -224,4 +220,8 @@
   <gresource prefix="/modelbutton">
     <file>modelbutton.ui</file>
   </gresource>
+  <gresource prefix="/icons">
+    <file>gesture-two-finger-swipe-right.svg</file>
+    <file>gesture-two-finger-swipe-left.svg</file>
+  </gresource>
 </gresources>

demos/gtk-demo/font_features.c

@@ -1,23 +1,15 @@
 /* Pango/Font Features
  *
- * This example demonstrates support for OpenType font features with
- * Pango attributes. The attributes can be used manually or via Pango
- * markup.
- *
- * It can also be used to explore available features in OpenType fonts
- * and their effect.
+ * This demonstrates support for OpenType font features with
+ * Pango attributes. The attributes can be used manually or
+ * via Pango markup.
  */
 
 #include <gtk/gtk.h>
-#include <pango/pangofc-font.h>
-#include <hb.h>
-#include <hb-ot.h>
-#include <hb-ft.h>
 
 static GtkWidget *label;
 static GtkWidget *settings;
 static GtkWidget *font;
-static GtkWidget *script_lang;
 static GtkWidget *resetbutton;
 static GtkWidget *numcasedefault;
 static GtkWidget *numspacedefault;
@@ -25,19 +17,10 @@ static GtkWidget *fractiondefault;
 static GtkWidget *stack;
 static GtkWidget *entry;
 
-#define num_features 40
-
-static GtkWidget *toggle[num_features];
-static GtkWidget *icon[num_features];
-static const char *feature_names[num_features] = {
-  "kern", "liga", "dlig", "hlig", "clig", "smcp", "c2sc", "pcap", "c2pc", "unic",
-  "cpsp", "case", "lnum", "onum", "pnum", "tnum", "frac", "afrc", "zero", "nalt",
-  "sinf", "swsh", "cswh", "locl", "calt", "hist", "salt", "titl", "rand", "subs",
-  "sups", "init", "medi", "fina", "isol", "ss01", "ss02", "ss03", "ss04", "ss05"
-};
+static GtkWidget *toggle[24];
 
 static void
-update_display (void)
+update (void)
 {
   GString *s;
   char *font_desc;
@@ -45,10 +28,6 @@ update_display (void)
   const char *text;
   gboolean has_feature;
   int i;
-  hb_tag_t lang_tag;
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-  const char *lang;
 
   text = gtk_entry_get_text (GTK_ENTRY (entry));
 
@@ -57,7 +36,7 @@ update_display (void)
   s = g_string_new ("");
 
   has_feature = FALSE;
-  for (i = 0; i < num_features; i++)
+  for (i = 0; i < 24; i++)
     {
       if (!gtk_widget_is_sensitive (toggle[i]))
         continue;
@@ -90,24 +69,8 @@ update_display (void)
 
   gtk_label_set_text (GTK_LABEL (settings), font_settings);
 
-
-  if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (script_lang), &iter))
-    {
-      model = gtk_combo_box_get_model (GTK_COMBO_BOX (script_lang));
-      gtk_tree_model_get (model, &iter,
-                          3, &lang_tag,
-                          -1);
-
-      lang = hb_language_to_string (hb_ot_tag_to_language (lang_tag));
-    }
-  else
-    lang = NULL;
-
   s = g_string_new ("");
-  g_string_append_printf (s, "<span font_desc='%s' font_features='%s'", font_desc, font_settings);
-  if (lang)
-    g_string_append_printf (s, " lang='%s'", lang);
-  g_string_append_printf (s, ">%s</span>", text);
+  g_string_append_printf (s, "<span font_desc='%s' font_features='%s'>%s</span>", font_desc, font_settings, text);
 
   gtk_label_set_markup (GTK_LABEL (label), s->str);
 
@@ -117,315 +80,15 @@ update_display (void)
   g_free (font_settings);
 }
 
-static PangoFont *
-get_pango_font (void)
-{
-  PangoFontDescription *desc;
-  PangoContext *context;
-  PangoFontMap *map;
-
-  desc = gtk_font_chooser_get_font_desc (GTK_FONT_CHOOSER (font));
-  context = gtk_widget_get_pango_context (font);
-  map = pango_context_get_font_map (context);
-
-  return pango_font_map_load_font (map, context, desc);
-}
-
-static struct { const char *name; hb_script_t script; } script_names[] = {
-  { "Common", HB_SCRIPT_COMMON },
-  { "Inherited", HB_SCRIPT_INHERITED },
-  { "Unknown", HB_SCRIPT_UNKNOWN },
-  { "Arabic", HB_SCRIPT_ARABIC },
-  { "Armenian", HB_SCRIPT_ARMENIAN },
-  { "Bengali", HB_SCRIPT_BENGALI },
-  { "Cyrillic", HB_SCRIPT_CYRILLIC },
-  { "Devanagari", HB_SCRIPT_DEVANAGARI },
-  { "Georgian", HB_SCRIPT_GEORGIAN },
-  { "Greek", HB_SCRIPT_GREEK },
-  { "Gujarati", HB_SCRIPT_GUJARATI },
-  { "Gurmukhi", HB_SCRIPT_GURMUKHI },
-  { "Hangul", HB_SCRIPT_HANGUL },
-  { "Han", HB_SCRIPT_HAN },
-  { "Hebrew", HB_SCRIPT_HEBREW },
-  { "Hiragana", HB_SCRIPT_HIRAGANA },
-  { "Kannada", HB_SCRIPT_KANNADA },
-  { "Katakana", HB_SCRIPT_KATAKANA },
-  { "Lao", HB_SCRIPT_LAO },
-  { "Latin", HB_SCRIPT_LATIN },
-  { "Malayalam", HB_SCRIPT_MALAYALAM },
-  { "Oriya", HB_SCRIPT_ORIYA },
-  { "Tamil", HB_SCRIPT_TAMIL },
-  { "Telugu", HB_SCRIPT_TELUGU },
-  { "Thai", HB_SCRIPT_THAI },
-  { "Tibetan", HB_SCRIPT_TIBETAN },
-  { "Bopomofo", HB_SCRIPT_BOPOMOFO }
-  /* FIXME: complete */
-};
-
-static struct { const char *name; hb_tag_t tag; } language_names[] = {
-  { "Arabic", HB_TAG ('A','R','A',' ') },
-  { "Romanian", HB_TAG ('R','O','M',' ') },
-  { "Skolt Sami", HB_TAG ('S','K','S',' ') },
-  { "Northern Sami", HB_TAG ('N','S','M',' ') },
-  { "Kildin Sami", HB_TAG ('K','S','M',' ') },
-  { "Moldavian", HB_TAG ('M','O','L',' ') },
-  { "Turkish", HB_TAG ('T','R','K',' ') },
-  { "Azerbaijani", HB_TAG ('A','Z','E',' ') },
-  { "Crimean Tatar", HB_TAG ('C','R','T',' ') },
-  { "Serbian", HB_TAG ('S','R','B',' ') },
-  { "German", HB_TAG ('D','E','U',' ') }
-  /* FIXME: complete */
-};
-
-typedef struct {
-  hb_tag_t script_tag;
-  hb_tag_t lang_tag;
-  unsigned int script_index;
-  unsigned int lang_index;
-} TagPair;
-
-static guint
-tag_pair_hash (gconstpointer data)
-{
-  const TagPair *pair = data;
-
-  return pair->script_tag + pair->lang_tag;
-}
-
-static gboolean
-tag_pair_equal (gconstpointer a, gconstpointer b)
-{
-  const TagPair *pair_a = a;
-  const TagPair *pair_b = b;
-
-  return pair_a->script_tag == pair_b->script_tag && pair_a->lang_tag == pair_b->lang_tag;
-}
-
 static void
-update_script_combo (void)
-{
-  GtkListStore *store;
-  hb_font_t *hb_font;
-  gint i, j, k, l;
-  FT_Face ft_face;
-  PangoFont *pango_font;
-  GHashTable *tags;
-  GHashTableIter iter;
-  TagPair *pair;
-
-  store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
-
-  pango_font = get_pango_font ();
-  ft_face = pango_fc_font_lock_face (PANGO_FC_FONT (pango_font)),
-  hb_font = hb_ft_font_create (ft_face, NULL);
-
-  tags = g_hash_table_new_full (tag_pair_hash, tag_pair_equal, g_free, NULL);
-
-  pair = g_new (TagPair, 1);
-  pair->script_tag = HB_OT_TAG_DEFAULT_SCRIPT;
-  pair->lang_tag = HB_OT_TAG_DEFAULT_LANGUAGE;
-  g_hash_table_insert (tags, pair, g_strdup ("Default"));
-
-  if (hb_font)
-    {
-      hb_tag_t tables[2] = { HB_OT_TAG_GSUB, HB_OT_TAG_GPOS };
-      hb_face_t *hb_face;
-
-      hb_face = hb_font_get_face (hb_font);
-
-      for (i= 0; i < 2; i++)
-        {
-          hb_tag_t scripts[80];
-          unsigned int script_count = G_N_ELEMENTS (scripts);
-
-          hb_ot_layout_table_get_script_tags (hb_face, tables[i], 0, &script_count, scripts);
-          for (j = 0; j < script_count; j++)
-            {
-              hb_tag_t languages[80];
-              unsigned int language_count = G_N_ELEMENTS (languages);
-
-              pair = g_new (TagPair, 1);
-              pair->script_tag = scripts[j];
-              pair->lang_tag = HB_OT_TAG_DEFAULT_LANGUAGE;
-              pair->script_index = j;
-              pair->lang_index = HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX;
-              g_hash_table_add (tags, pair);
-
-              hb_ot_layout_script_get_language_tags (hb_face, tables[i], j, 0, &language_count, languages);
-              for (k = 0; k < language_count; k++)
-                {
-                  pair = g_new (TagPair, 1);
-                  pair->script_tag = scripts[j];
-                  pair->lang_tag = languages[k];
-                  pair->script_index = j;
-                  pair->lang_index = k;
-                  g_hash_table_add (tags, pair);
-                }
-            }
-        }
-
-      hb_face_destroy (hb_face);
-    }
-
-  pango_fc_font_unlock_face (PANGO_FC_FONT (pango_font));
-  g_object_unref (pango_font);
-
-  g_hash_table_iter_init (&iter, tags);
-  while (g_hash_table_iter_next (&iter, (gpointer *)&pair, NULL))
-    {
-      const char *scriptname;
-      char scriptbuf[5];
-      const char *langname;
-      char langbuf[5];
-      char *name;
-
-      if (pair->script_tag == HB_OT_TAG_DEFAULT_SCRIPT)
-        scriptname = "Default";
-      else if (pair->script_tag == HB_TAG ('m','a','t','h'))
-        scriptname = "Math";
-      else
-        {
-          hb_script_t script;
-
-          hb_tag_to_string (pair->script_tag, scriptbuf);
-          scriptbuf[4] = 0;
-          scriptname = scriptbuf;
-
-          script = hb_script_from_iso15924_tag (pair->script_tag);
-          for (k = 0; k < G_N_ELEMENTS (script_names); k++)
-            {
-              if (script == script_names[k].script)
-                {
-                  scriptname = script_names[k].name;
-                  break;
-                }
-            }
-        }
-
-      if (pair->lang_tag == HB_OT_TAG_DEFAULT_LANGUAGE)
-        langname = "Default";
-      else
-        {
-          hb_tag_to_string (pair->lang_tag, langbuf);
-          langbuf[4] = 0;
-          langname = langbuf;
-
-          for (l = 0; l < G_N_ELEMENTS (language_names); l++)
-            {
-              if (pair->lang_tag == language_names[l].tag)
-                {
-                  langname = language_names[l].name;
-                  break;
-                }
-            }
-        }
-
-      name = g_strdup_printf ("%s - %s", scriptname, langname);
-
-      gtk_list_store_insert_with_values (store, NULL, -1,
-                                         0, name,
-                                         1, pair->script_index,
-                                         2, pair->lang_index,
-                                         3, pair->lang_tag,
-                                         -1);
-
-      g_free (name);
-    }
-
-  g_hash_table_destroy (tags);
-
-  gtk_combo_box_set_model (GTK_COMBO_BOX (script_lang), GTK_TREE_MODEL (store));
-  gtk_combo_box_set_active (GTK_COMBO_BOX (script_lang), 0);
-}
-
-static void
-update_features (void)
-{
-  gint i, j, k;
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-  guint script_index, lang_index;
-  PangoFont *pango_font;
-  FT_Face ft_face;
-  hb_font_t *hb_font;
-
-  for (i = 0; i < num_features; i++)
-    gtk_widget_set_opacity (icon[i], 0);
-
-  /* set feature presence checks from the font features */
-
-  if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (script_lang), &iter))
-    return;
-
-  model = gtk_combo_box_get_model (GTK_COMBO_BOX (script_lang));
-  gtk_tree_model_get (model, &iter,
-                      1, &script_index,
-                      2, &lang_index,
-                      -1);
-
-  pango_font = get_pango_font ();
-  ft_face = pango_fc_font_lock_face (PANGO_FC_FONT (pango_font)),
-  hb_font = hb_ft_font_create (ft_face, NULL);
-
-  if (hb_font)
-    {
-      hb_tag_t tables[2] = { HB_OT_TAG_GSUB, HB_OT_TAG_GPOS };
-      hb_face_t *hb_face;
-
-      hb_face = hb_font_get_face (hb_font);
-
-      for (i = 0; i < 2; i++)
-        {
-          hb_tag_t features[80];
-          unsigned int count = G_N_ELEMENTS(features);
-
-          hb_ot_layout_language_get_feature_tags (hb_face,
-                                                  tables[i],
-                                                  script_index,
-                                                  lang_index,
-                                                  0,
-                                                  &count,
-                                                  features);
-
-          for (j = 0; j < count; j++)
-            {
-              for (k = 0; k < num_features; k++)
-                {
-                  if (hb_tag_from_string (feature_names[k], -1) == features[j])
-                    gtk_widget_set_opacity (icon[k], 0.5);
-                }
-            }
-        }
-
-      hb_face_destroy (hb_face);
-    }
-
-  pango_fc_font_unlock_face (PANGO_FC_FONT (pango_font));
-  g_object_unref (pango_font);
-}
-
-static void
-font_changed (void)
-{
-  update_script_combo ();
-}
-
-static void
-script_changed (void)
-{
-  update_features ();
-  update_display ();
-}
-
-static void
-reset_features (void)
+reset (void)
 {
   int i;
 
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (numcasedefault), TRUE);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (numspacedefault), TRUE);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fractiondefault), TRUE);
-  for (i = 0; i < num_features; i++)
+  for (i = 0; i < 24; i++)
     {
       if (!GTK_IS_RADIO_BUTTON (toggle[i]))
         {
@@ -450,7 +113,7 @@ switch_to_label (void)
   g_free (text);
   text = NULL;
   gtk_stack_set_visible_child_name (GTK_STACK (stack), "label");
-  update_display ();
+  update ();
 }
 
 static gboolean
@@ -476,12 +139,10 @@ do_font_features (GtkWidget *do_widget)
       GtkBuilder *builder;
       int i;
 
-      builder = gtk_builder_new_from_resource ("/font_features/font-features.ui");
+      builder = gtk_builder_new_from_resource ("/font-features/font-features.ui");
 
-      gtk_builder_add_callback_symbol (builder, "update_display", update_display);
-      gtk_builder_add_callback_symbol (builder, "font_changed", font_changed);
-      gtk_builder_add_callback_symbol (builder, "script_changed", script_changed);
-      gtk_builder_add_callback_symbol (builder, "reset", reset_features);
+      gtk_builder_add_callback_symbol (builder, "update", update);
+      gtk_builder_add_callback_symbol (builder, "reset", reset);
       gtk_builder_add_callback_symbol (builder, "switch_to_entry", switch_to_entry);
       gtk_builder_add_callback_symbol (builder, "switch_to_label", switch_to_label);
       gtk_builder_add_callback_symbol (builder, "entry_key_press", G_CALLBACK (entry_key_press));
@@ -492,24 +153,39 @@ do_font_features (GtkWidget *do_widget)
       settings = GTK_WIDGET (gtk_builder_get_object (builder, "settings"));
       resetbutton = GTK_WIDGET (gtk_builder_get_object (builder, "reset"));
       font = GTK_WIDGET (gtk_builder_get_object (builder, "font"));
-      script_lang = GTK_WIDGET (gtk_builder_get_object (builder, "script_lang"));
       numcasedefault = GTK_WIDGET (gtk_builder_get_object (builder, "numcasedefault"));
       numspacedefault = GTK_WIDGET (gtk_builder_get_object (builder, "numspacedefault"));
       fractiondefault = GTK_WIDGET (gtk_builder_get_object (builder, "fractiondefault"));
       stack = GTK_WIDGET (gtk_builder_get_object (builder, "stack"));
       entry = GTK_WIDGET (gtk_builder_get_object (builder, "entry"));
 
-      for (i = 0; i < num_features; i++)
-        {
-          char *iname;
+      i = 0;
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "kern"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "liga"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "dlig"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "hlig"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "clig"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "smcp"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "c2sc"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "lnum"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "onum"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "pnum"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "tnum"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "frac"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "afrc"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "zero"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "nalt"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "swsh"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "calt"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "hist"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "salt"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "ss01"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "ss02"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "ss03"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "ss04"));
+      toggle[i++] = GTK_WIDGET (gtk_builder_get_object (builder, "ss05"));
 
-          toggle[i] = GTK_WIDGET (gtk_builder_get_object (builder, feature_names[i]));
-          iname = g_strconcat (feature_names[i], "_pres", NULL);
-          icon[i] = GTK_WIDGET (gtk_builder_get_object (builder, iname));
-          g_free (iname);
-        }
-
-      font_changed ();
+      update ();
 
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);

demos/gtk-demo/foreigndrawing.c

@@ -1,626 +0,0 @@
-/* Foreign drawing
- *
- * Many applications can't use GTK+ widgets, for a variety of reasons,
- * but still want their user interface to appear integrated with the
- * rest of the desktop, and follow GTK+ themes.
- *
- * This demo shows how to use GtkStyleContext and the gtk_render_ APIs
- * to achieve this. Note that this is a very simple, non-interactive
- * example. Also note that the application is responsible for choosing
- * suitable sizes for the rendered components.
- */
-
-#include <gtk/gtk.h>
-#include <string.h>
-
-static void
-append_element (GtkWidgetPath *path,
-                const char    *selector)
-{
-  static const struct {
-    const char    *name;
-    GtkStateFlags  state_flag;
-  } pseudo_classes[] = {
-    { "active",        GTK_STATE_FLAG_ACTIVE },
-    { "hover",         GTK_STATE_FLAG_PRELIGHT },
-    { "selected",      GTK_STATE_FLAG_SELECTED },
-    { "disabled",      GTK_STATE_FLAG_INSENSITIVE },
-    { "indeterminate", GTK_STATE_FLAG_INCONSISTENT },
-    { "focus",         GTK_STATE_FLAG_FOCUSED },
-    { "backdrop",      GTK_STATE_FLAG_BACKDROP },
-    { "dir(ltr)",      GTK_STATE_FLAG_DIR_LTR },
-    { "dir(rtl)",      GTK_STATE_FLAG_DIR_RTL },
-    { "link",          GTK_STATE_FLAG_LINK },
-    { "visited",       GTK_STATE_FLAG_VISITED },
-    { "checked",       GTK_STATE_FLAG_CHECKED },
-    { "drop(active)",  GTK_STATE_FLAG_DROP_ACTIVE }
-  };
-  const char *next;
-  char *name;
-  char type;
-  guint i;
-
-  next = strpbrk (selector, "#.:");
-  if (next == NULL)
-    next = selector + strlen (selector);
-
-  name = g_strndup (selector, next - selector);
-  if (g_ascii_isupper (selector[0]))
-    {
-      GType gtype;
-      gtype = g_type_from_name (name);
-      if (gtype == G_TYPE_INVALID)
-        {
-          g_critical ("Unknown type name `%s'", name);
-          g_free (name);
-          return;
-        }
-      gtk_widget_path_append_type (path, gtype);
-    }
-  else
-    {
-      /* Omit type, we're using name */
-      gtk_widget_path_append_type (path, G_TYPE_NONE);
-      gtk_widget_path_iter_set_object_name (path, -1, name);
-    }
-  g_free (name);
-
-  while (*next != '\0')
-    {
-      type = *next;
-      selector = next + 1;
-      next = strpbrk (selector, "#.:");
-      if (next == NULL)
-        next = selector + strlen (selector);
-      name = g_strndup (selector, next - selector);
-
-      switch (type)
-        {
-        case '#':
-          gtk_widget_path_iter_set_name (path, -1, name);
-          break;
-
-        case '.':
-          gtk_widget_path_iter_add_class (path, -1, name);
-          break;
-
-        case ':':
-          for (i = 0; i < G_N_ELEMENTS (pseudo_classes); i++)
-            {
-              if (g_str_equal (pseudo_classes[i].name, name))
-                {
-                  gtk_widget_path_iter_set_state (path,
-                                                  -1,
-                                                  gtk_widget_path_iter_get_state (path, -1)
-                                                  | pseudo_classes[i].state_flag);
-                  break;
-                }
-            }
-          if (i == G_N_ELEMENTS (pseudo_classes))
-            g_critical ("Unknown pseudo-class :%s", name);
-          break;
-
-        default:
-          g_assert_not_reached ();
-          break;
-        }
-
-      g_free (name);
-    }
-}
-
-static GtkStyleContext *
-get_style (GtkStyleContext *parent,
-           const char      *selector)
-{
-  GtkWidgetPath *path;
-  GtkStyleContext *context;
-
-  if (parent)
-    path = gtk_widget_path_copy (gtk_style_context_get_path (parent));
-  else
-    path = gtk_widget_path_new ();
-
-  append_element (path, selector);
-
-  context = gtk_style_context_new ();
-  gtk_style_context_set_path (context, path);
-  gtk_style_context_set_parent (context, parent);
-  /* Unfortunately, we have to explicitly set the state again here
-   * for it to take effect
-   */
-  gtk_style_context_set_state (context, gtk_widget_path_iter_get_state (path, -1));
-  gtk_widget_path_unref (path);
-
-  return context;
-}
-
-static void
-draw_menu (GtkWidget     *widget,
-           cairo_t       *cr,
-           gint           x,
-           gint           y,
-           gint           width,
-           gint           height)
-{
-  GtkStyleContext *menu_context;
-  GtkStyleContext *menuitem_context;
-  GtkStyleContext *hovermenuitem_context;
-  GtkStyleContext *arrowmenuitem_context;
-  GtkStyleContext *checkmenuitem_context;
-  GtkStyleContext *radiomenuitem_context;
-  GtkStyleContext *disablemenuitem_context;
-  GtkStyleContext *separatormenuitem_context;
-
-  /* This information is taken from the GtkMenu docs, see "CSS nodes" */
-  menu_context = get_style (gtk_widget_get_style_context(widget), "menu");
-
-  gtk_render_background (menu_context, cr, x, y, width, height);
-  gtk_render_frame (menu_context, cr, x, y, width, height);
-
-  hovermenuitem_context = get_style (menu_context, "menuitem:hover");
-  gtk_render_background (hovermenuitem_context, cr, x, y, width, 20);
-  gtk_render_frame (hovermenuitem_context, cr, x, y, width, 20);
-
-  /* arrow for left to right */
-  arrowmenuitem_context = get_style (hovermenuitem_context, "arrow:dir(ltr)");
-  gtk_render_arrow (arrowmenuitem_context, cr, G_PI / 2, x + width - 20, y, 20);
-  g_object_unref (arrowmenuitem_context);
-
-  menuitem_context = get_style (menu_context, "menuitem");
-  gtk_render_background (menuitem_context, cr, x, y + 20, width, 20);
-  gtk_render_frame (menuitem_context, cr, x, y + 20, width, 20);
-
-  disablemenuitem_context = get_style (menu_context, "menuitem:disabled");
-
-  /* arrow for right to left, sensitive */
-  arrowmenuitem_context = get_style (menuitem_context, "arrow:dir(rtl)");
-  gtk_render_arrow (arrowmenuitem_context, cr, G_PI / 2, x, y + 20, 20);
-  g_object_unref (arrowmenuitem_context);
-
-  /* arrow for right to left, insensitive */
-  arrowmenuitem_context = get_style (disablemenuitem_context, "arrow:dir(rtl)");
-  gtk_render_arrow (arrowmenuitem_context, cr, G_PI / 2, x + width - 20, y + 20, 20);
-
-  gtk_render_background (menuitem_context, cr, x, y + 40, width, 20);
-  gtk_render_frame (menuitem_context, cr, x, y + 40, width, 20);
-
-  /* check enabled, sensitive */
-  checkmenuitem_context = get_style (menuitem_context, "check:checked");
-  gtk_render_frame (checkmenuitem_context, cr, x + 2, y + 40, 16, 16);
-  gtk_render_check (checkmenuitem_context, cr, x + 2, y + 40, 16, 16);
-  g_object_unref (checkmenuitem_context);
-
-  /* check unchecked, insensitive */
-  checkmenuitem_context = get_style (disablemenuitem_context, "check");
-  gtk_render_frame (checkmenuitem_context, cr, x + width - 18, y + 40, 16, 16);
-  gtk_render_check (checkmenuitem_context, cr, x + width - 18, y + 40, 16, 16);
-
-  /* draw separator */
-  separatormenuitem_context = get_style (menuitem_context, "separator:disabled");
-  gtk_render_line (separatormenuitem_context, cr, x + 1, y + 60, x + width - 2, y + 60);
-
-  gtk_render_background (menuitem_context, cr, x, y + 70, width, 20);
-  gtk_render_frame (menuitem_context, cr, x, y + 70, width, 20);
-
-  /* radio checked, sensitive */
-  radiomenuitem_context = get_style (menuitem_context, "radio:checked");
-  gtk_render_frame (radiomenuitem_context, cr, x + 2, y + 70, 16, 16);
-  gtk_render_option (radiomenuitem_context, cr, x + 2, y + 70, 16, 16);
-  g_object_unref (radiomenuitem_context);
-
-  /* radio unchecked, insensitive */
-  radiomenuitem_context = get_style (disablemenuitem_context, "radio");
-  gtk_render_frame (radiomenuitem_context, cr, x + width - 18, y + 70, 16, 16);
-  gtk_render_option (radiomenuitem_context, cr, x + width - 18, y + 70, 16, 16);
-
-  g_object_unref (separatormenuitem_context);
-  g_object_unref (disablemenuitem_context);
-  g_object_unref (radiomenuitem_context);
-  g_object_unref (checkmenuitem_context);
-  g_object_unref (arrowmenuitem_context);
-  g_object_unref (hovermenuitem_context);
-  g_object_unref (menuitem_context);
-  g_object_unref (menu_context);
-}
-
-static void
-draw_menubar (GtkWidget     *widget,
-              cairo_t       *cr,
-              gint           x,
-              gint           y,
-              gint           width,
-              gint           height)
-{
-  GtkStyleContext *menubar_context;
-  GtkStyleContext *menuitem_context;
-  gint item_width = width / 3;
-
-  /* This information is taken from the GtkMenuBar docs, see "CSS nodes" */
-  menubar_context = get_style (NULL, "menubar.background");
-
-  gtk_render_background (menubar_context, cr, x, y, width, height);
-  gtk_render_frame (menubar_context, cr, x, y, width, height);
-
-  menuitem_context = get_style (menubar_context, "menuitem:hover");
-
-  gtk_render_background (menuitem_context, cr, x, y, item_width, 20);
-  gtk_render_frame (menuitem_context, cr, x, y, item_width, 20);
-
-  gtk_render_background (menuitem_context, cr, x + item_width * 2, y, item_width, 20);
-  gtk_render_frame (menuitem_context, cr, x + item_width * 2, y, item_width, 20);
-
-  g_object_unref (menuitem_context);
-  g_object_unref (menubar_context);
-}
-
-static void
-draw_notebook (GtkWidget     *widget,
-               cairo_t       *cr,
-               gint           x,
-               gint           y,
-               gint           width,
-               gint           height)
-{
-  GtkStyleContext *notebook_context;
-  GtkStyleContext *header_context;
-  GtkStyleContext *tabs_context;
-  GtkStyleContext *tab_context;
-  GtkStyleContext *stack_context;
-  gint header_height = 40;
-
-  /* This information is taken from the GtkNotebook docs, see "CSS nodes" */
-  notebook_context = get_style (NULL, "notebook.frame");
-  gtk_render_background (notebook_context, cr, x, y, width, height);
-  gtk_render_frame (notebook_context, cr, x, y, width, height);
-
-  header_context = get_style (notebook_context, "header.top");
-  gtk_render_background (header_context, cr, x, y, width, header_height);
-  gtk_render_frame (header_context, cr, x, y, width, header_height);
-
-  tabs_context = get_style (header_context, "tabs");
-  gtk_render_background (tabs_context, cr, x, y, width, header_height);
-  gtk_render_frame (tabs_context, cr, x, y, width, header_height);
-
-  tab_context = get_style (tabs_context, "tab:active");
-  gtk_render_background (tab_context, cr, x, y, width/2, header_height);
-  gtk_render_frame (tab_context, cr, x, y, width/2, header_height);
-  g_object_unref (tab_context);
-
-  tab_context = get_style (tabs_context, "tab");
-  gtk_render_background (tab_context, cr, x + width/2, y, width/2, header_height);
-  gtk_render_frame (tab_context, cr, x + width/2, y, width/2, header_height);
-
-  stack_context = get_style (notebook_context, "stack");
-  gtk_render_background (stack_context, cr, x, y + header_height, width, height - header_height);
-  gtk_render_frame (stack_context, cr, x, y + header_height, width, height - header_height);
-
-  g_object_unref (stack_context);
-  g_object_unref (tab_context);
-  g_object_unref (tabs_context);
-  g_object_unref (header_context);
-  g_object_unref (notebook_context);
-}
-
-static void
-draw_horizontal_scrollbar (GtkWidget     *widget,
-                           cairo_t       *cr,
-                           gint           x,
-                           gint           y,
-                           gint           width,
-                           gint           height,
-                           gint           position,
-                           GtkStateFlags  state)
-{
-  GtkStyleContext *scrollbar_context;
-  GtkStyleContext *trough_context;
-  GtkStyleContext *slider_context;
-
-  /* This information is taken from the GtkScrollbar docs, see "CSS nodes" */
-  scrollbar_context = get_style (NULL, "scrollbar.horizontal");
-  trough_context = get_style (scrollbar_context, "trough");
-  slider_context = get_style (trough_context, "slider");
-
-  gtk_style_context_set_state (scrollbar_context, state);
-  gtk_style_context_set_state (trough_context, state);
-  gtk_style_context_set_state (slider_context, state);
-
-  gtk_render_background (trough_context, cr, x, y, width, height);
-  gtk_render_frame (trough_context, cr, x, y, width, height);
-  gtk_render_slider (slider_context, cr, x + position, y + 1, 30, height - 2, GTK_ORIENTATION_HORIZONTAL);
-
-  g_object_unref (slider_context);
-  g_object_unref (trough_context);
-  g_object_unref (scrollbar_context);
-}
-
-static void
-draw_text (GtkWidget     *widget,
-           cairo_t       *cr,
-           gint           x,
-           gint           y,
-           gint           width,
-           gint           height,
-           const gchar   *text,
-           GtkStateFlags  state)
-{
-  GtkStyleContext *label_context;
-  GtkStyleContext *selection_context;
-  GtkStyleContext *context;
-  PangoLayout *layout;
-
-  /* This information is taken from the GtkLabel docs, see "CSS nodes" */
-  label_context = get_style (NULL, "label.view");
-  selection_context = get_style (label_context, "selection");
-
-  gtk_style_context_set_state (label_context, state);
-
-  if (state & GTK_STATE_FLAG_SELECTED)
-    context = selection_context;
-  else
-    context = label_context;
-
-  layout = gtk_widget_create_pango_layout (widget, text);
-
-  gtk_render_background (context, cr, x, y, width, height);
-  gtk_render_frame (context, cr, x, y, width, height);
-  gtk_render_layout (context, cr, x, y, layout);
-
-  g_object_unref (layout);
-
-  g_object_unref (selection_context);
-  g_object_unref (label_context);
-}
-
-static void
-draw_check (GtkWidget     *widget,
-            cairo_t       *cr,
-            gint           x,
-            gint           y,
-            GtkStateFlags  state)
-{
-  GtkStyleContext *button_context;
-  GtkStyleContext *check_context;
-
-  /* This information is taken from the GtkCheckButton docs, see "CSS nodes" */
-  button_context = get_style (NULL, "checkbutton");
-  check_context = get_style (button_context, "check");
-
-  gtk_style_context_set_state (check_context, state);
-
-  gtk_render_background (check_context, cr, x, y, 20, 20);
-  gtk_render_frame (check_context, cr, x, y, 20, 20);
-  gtk_render_check (check_context, cr, x, y, 20, 20);
-
-  g_object_unref (check_context);
-  g_object_unref (button_context);
-
-}
-
-static void
-draw_radio (GtkWidget     *widget,
-            cairo_t       *cr,
-            gint           x,
-            gint           y,
-            GtkStateFlags  state)
-{
-  GtkStyleContext *button_context;
-  GtkStyleContext *check_context;
-
-  /* This information is taken from the GtkRadioButton docs, see "CSS nodes" */
-  button_context = get_style (NULL, "radiobutton");
-  check_context = get_style (button_context, "radio");
-
-  gtk_style_context_set_state (check_context, state);
-
-  gtk_render_background (check_context, cr, x, y, 20, 20);
-  gtk_render_frame (check_context, cr, x, y, 20, 20);
-  gtk_render_option (check_context, cr, x, y, 20, 20);
-
-  g_object_unref (check_context);
-  g_object_unref (button_context);
-
-}
-
-static void
-draw_progress (GtkWidget *widget,
-               cairo_t   *cr,
-               gint       x,
-               gint       y,
-               gint       width,
-               gint       height,
-               gint       position)
-{
-  GtkStyleContext *bar_context;
-  GtkStyleContext *trough_context;
-  GtkStyleContext *progress_context;
-
-  /* This information is taken from the GtkProgressBar docs, see "CSS nodes" */
-  bar_context = get_style (NULL, "progressbar");
-  trough_context = get_style (bar_context, "trough");
-  progress_context = get_style (trough_context, "progress");
-
-  gtk_render_background (trough_context, cr, x, y, width, height);
-  gtk_render_frame (trough_context, cr, x, y, width, height);
-  gtk_render_background (progress_context, cr, x, y, position, height);
-  gtk_render_frame (progress_context, cr, x, y, position, height);
-
-  g_object_unref (progress_context);
-  g_object_unref (trough_context);
-  g_object_unref (bar_context);
-}
-
-static void
-draw_combobox (GtkWidget *widget,
-               cairo_t   *cr,
-               gint       x,
-               gint       y,
-               gint       width,
-               gboolean   has_entry)
-{
-  GtkStyleContext *combo_context;
-  GtkStyleContext *button_context;
-  GtkStyleContext *entry_context;
-  GtkStyleContext *arrow_context;
-
-  /* This information is taken from the GtkComboBox docs, see "CSS nodes" */
-  combo_context = get_style (NULL, "combobox:focus");
-  button_context = get_style (combo_context, "button:focus");
-  entry_context = get_style (combo_context, "entry:focus");
-  arrow_context = get_style (button_context, "arrow");
-
-  gtk_render_background (combo_context, cr, x, y, width, 30);
-  gtk_render_frame (combo_context, cr, x, y, width, 30);
-
-  if (has_entry)
-    {
-      gtk_style_context_set_junction_sides (entry_context, GTK_JUNCTION_RIGHT);
-      gtk_render_background (entry_context, cr, x, y, width - 30, 30);
-      gtk_render_frame (entry_context, cr, x, y, width - 30, 30);
-
-      gtk_render_background (button_context, cr, x + width - 30, y, 30, 30);
-      gtk_render_frame (button_context, cr, x + width - 30, y, 30, 30);
-    }
-  else
-    {
-      gtk_render_background (button_context, cr, x, y, width, 30);
-      gtk_render_frame (button_context, cr, x, y, width, 30);
-    }
-
-  gtk_render_arrow (arrow_context, cr, G_PI / 2, x + width - 25, y+5, 20);
-
-  g_object_unref (arrow_context);
-  g_object_unref (entry_context);
-  g_object_unref (button_context);
-  g_object_unref (combo_context);
-}
-
-static void
-draw_spinbutton (GtkWidget *widget,
-                 cairo_t   *cr,
-                 gint       x,
-                 gint       y,
-                 gint       width)
-{
-  GtkStyleContext *spin_context;
-  GtkStyleContext *entry_context;
-  GtkStyleContext *up_context;
-  GtkStyleContext *down_context;
-
-  GtkIconTheme *icon_theme;
-  GtkIconInfo *icon_info;
-  GdkPixbuf *pixbuf;
-
-  /* This information is taken from the GtkSpinButton docs, see "CSS nodes" */
-  spin_context = get_style (NULL, "spinbutton:focus");
-  entry_context = get_style (NULL, "entry:focus");
-  up_context = get_style (spin_context, "button.up:active");
-  down_context = get_style (spin_context, "button.down");
-
-  gtk_render_background (entry_context, cr, x, y, width, 30);
-  gtk_render_frame (entry_context, cr, x, y, width, 30);
-
-  gtk_render_background (up_context, cr, x + width - 30, y, 30, 30);
-  gtk_render_frame (up_context, cr, x + width - 30, y, 30, 30);
-
-  gtk_render_background (down_context, cr, x + width - 60, y, 30, 30);
-  gtk_render_frame (down_context, cr, x + width - 60, y, 30, 30);
-
-  icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget));
-
-  icon_info = gtk_icon_theme_lookup_icon (icon_theme, "list-add-symbolic", 20, 0);
-  pixbuf = gtk_icon_info_load_symbolic_for_context (icon_info, up_context, NULL, NULL);
-  g_object_unref (icon_info);
-  gtk_render_icon (up_context, cr, pixbuf, x + width - 30 + 5, y + 5);
-  g_object_unref (pixbuf);
-
-  icon_info = gtk_icon_theme_lookup_icon (icon_theme, "list-remove-symbolic", 20, 0);
-  pixbuf = gtk_icon_info_load_symbolic_for_context (icon_info, down_context, NULL, NULL);
-  g_object_unref (icon_info);
-  gtk_render_icon (down_context, cr, pixbuf, x + width - 60 + 5, y + 5);
-  g_object_unref (pixbuf);
-
-  g_object_unref (down_context);
-  g_object_unref (up_context);
-  g_object_unref (entry_context);
-  g_object_unref (spin_context);
-}
-
-static gboolean
-draw_cb (GtkWidget *widget,
-         cairo_t   *cr)
-{
-  gint panewidth, width, height;
-
-  width = gtk_widget_get_allocated_width (widget);
-  panewidth = width / 2;
-  height = gtk_widget_get_allocated_height (widget);
-
-  cairo_rectangle (cr, 0, 0, width, height);
-  cairo_set_source_rgb (cr, 0.6, 0.6, 0.6);
-  cairo_fill (cr);
-
-  draw_horizontal_scrollbar (widget, cr, 10, 10, panewidth - 20, 10, 30, GTK_STATE_FLAG_NORMAL);
-  draw_horizontal_scrollbar (widget, cr, 10, 30, panewidth - 20, 10, 40, GTK_STATE_FLAG_PRELIGHT);
-  draw_horizontal_scrollbar (widget, cr, 10, 50, panewidth - 20, 10, 50, GTK_STATE_FLAG_ACTIVE|GTK_STATE_FLAG_PRELIGHT);
-
-  draw_text (widget, cr, 10,  70, panewidth - 20, 20, "Not selected", GTK_STATE_FLAG_NORMAL);
-  draw_text (widget, cr, 10, 100, panewidth - 20, 20, "Selected", GTK_STATE_FLAG_SELECTED);
-
-  draw_check (widget, cr,  10, 130, GTK_STATE_FLAG_NORMAL);
-  draw_check (widget, cr,  40, 130, GTK_STATE_FLAG_CHECKED);
-  draw_radio (widget, cr,  70, 130, GTK_STATE_FLAG_NORMAL);
-  draw_radio (widget, cr, 100, 130, GTK_STATE_FLAG_CHECKED);
-  draw_progress (widget, cr, 10, 160, panewidth - 20, 6, 50);
-
-  draw_menu (widget, cr, 10 + panewidth, 10, panewidth - 20, 90);
-
-  draw_menubar (widget, cr, 10 + panewidth, 110, panewidth - 20, 20);
-
-  draw_spinbutton (widget, cr, 10 + panewidth, 140, panewidth - 20);
-
-  draw_notebook (widget, cr, 10, 200, panewidth - 20, 160);
-
-  draw_combobox (widget, cr, 10 + panewidth, 200, panewidth - 20, FALSE);
-
-  draw_combobox (widget, cr, 10 + panewidth, 240, panewidth - 20, TRUE);
-
-  return FALSE;
-}
-
-GtkWidget *
-do_foreigndrawing (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *box;
-      GtkWidget *da;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_title (GTK_WINDOW (window), "Foreign drawing");
-      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_container_add (GTK_CONTAINER (window), box);
-      da = gtk_drawing_area_new ();
-      gtk_widget_set_size_request (da, 400, 400);
-      gtk_widget_set_hexpand (da, TRUE);
-      gtk_widget_set_vexpand (da, TRUE);
-      gtk_widget_set_app_paintable (da, TRUE);
-      gtk_container_add (GTK_CONTAINER (box), da);
-
-      g_signal_connect (da, "draw", G_CALLBACK (draw_cb), NULL);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/gesture-two-finger-swipe-left.svg

@@ -9,15 +9,18 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64"
-   viewBox="0 0 64 64.000001"
-   id="svg6535"
+   width="80"
+   height="54"
+   viewBox="0 0 80.000001 54"
+   id="svg6660"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="two-finger-swipe-right.svg">
+   sodipodi:docname="two-finger-swipe-left.svg"
+   inkscape:export-filename="/home/aday/Scratch/two-finger-swipe-left.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <defs
-     id="defs6537" />
+     id="defs6662" />
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -26,28 +29,24 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="15.562966"
-     inkscape:cy="0.15090121"
+     inkscape:cx="-26.486277"
+     inkscape:cy="27.97415"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     units="px"
      inkscape:showpageshadow="false"
+     units="px"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:window-width="2560"
-     inkscape:window-height="1376"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
      inkscape:window-x="0"
      inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid7931" />
-  </sodipodi:namedview>
+     inkscape:window-maximized="1" />
   <metadata
-     id="metadata6540">
+     id="metadata6665">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -62,118 +61,113 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(180,-470.14793)">
-    <path
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       d="m -129,475.29637 0,7 -14.48047,0 c -0.8685,-2.58098 -2.88029,-4.74387 -5.63867,-5.67578 -1.15023,-0.3886 -2.3288,-0.52948 -3.47461,-0.45118 -3.16004,0.21596 -6.07335,2.10345 -7.50391,5.06055 -0.72859,-0.0926 -1.45444,-0.10529 -2.16406,-0.0215 -3.45482,0.40801 -6.51775,2.81143 -7.58203,6.33594 -1.30748,4.32992 0.83762,8.91584 4.84375,10.76757 l 0,18.83594 -1,0 0,-7.81445 c 0,-2.31876 -1.784,-4.18555 -4,-4.18555 -2.216,0 -4,1.86679 -4,4.18555 l 0,7.81445 0,8.81445 0,4.18555 4,0 25,0 11,0 c 2.216,0 4,-1.86679 4,-4.18555 l 0,-12.6289 0,-9 c 0,-2.31876 -1.784,-4.18555 -4,-4.18555 -2.216,0 -4,1.86679 -4,4.18555 l 0,4.81445 -1,0 0,-10.81445 c 0,-2.31876 -1.784,-4.18555 -4,-4.18555 -2.216,0 -4,1.86679 -4,4.18555 l 0,10.81445 -1,0 0,-15.95703 c 2.13659,-1.06416 3.85324,-2.95852 4.60352,-5.40235 0.0502,-0.16362 0.0846,-0.32791 0.125,-0.49218 l 14.27148,0 0,7 10,-9.5 -10,-9.5 z m -22.82812,3.84961 c 0.58024,0.0183 1.16811,0.12047 1.74804,0.3164 2.47175,0.83508 4.03799,3.09857 4.08008,5.56641 l 0,0.23242 c -0.012,0.54544 -0.0952,1.09784 -0.26367,1.64649 -0.33419,1.08853 -0.94913,2.00757 -1.73633,2.71289 l 0,-4.28711 c 0,-2.31876 -1.784,-4.18555 -4,-4.18555 -2.216,0 -4,1.86679 -4,4.18555 l 0,7.75976 c -0.27497,0.49163 -0.61337,0.93164 -1,1.31641 l 0,-4.07617 c 0,-2.31876 -1.784,-4.18555 -4,-4.18555 -2.216,0 -4,1.86679 -4,4.18555 l 0,4.48242 c -1.84972,-1.48636 -2.70286,-3.98414 -1.97266,-6.40235 0.95426,-3.16014 4.23426,-4.94531 7.40625,-4.03125 a 1.50015,1.50015 0 0 0 1.92774,-1.28906 1.5004025,1.5004025 0 0 0 0.01,-0.0234 c 0.91888,-2.48834 3.28636,-4.00326 5.80078,-3.92383 z M -156,497.45066 l 0,11.69727 -1,0 0,-11.07227 c 0.34667,-0.1849 0.67956,-0.39643 1,-0.625 z"
-       id="rect6513"
-       inkscape:connector-curvature="0" />
+     transform="translate(1077.1429,-651.07582)">
     <g
-       id="g7304"
-       transform="translate(18,114.14791)"
-       style="display:inline">
+       style="display:inline"
+       transform="translate(-753.14285,209.07579)"
+       id="g6613">
       <g
-         id="g7306">
+         id="g6615">
         <rect
            style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect7308"
+           id="rect6617"
            width="7.99999"
            height="24.999994"
-           x="-324"
-           y="391"
+           x="-288"
+           y="471"
            ry="4.1854858"
            rx="3.999995" />
         <rect
            rx="3.999995"
            ry="4.1854858"
-           y="372.00003"
-           x="-315"
+           y="452.00003"
+           x="-279"
            height="43.999989"
            width="7.99999"
-           id="rect7310"
+           id="rect6619"
            style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <rect
            style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect7312"
+           id="rect6621"
            width="7.99999"
            height="49.000015"
-           x="-306"
-           y="367"
+           x="-270"
+           y="447"
            ry="4.1854858"
            rx="3.999995" />
         <rect
            rx="3.999995"
            ry="4.1854858"
-           y="380"
-           x="-297"
+           y="460"
+           x="-261"
            height="36.000011"
            width="7.99999"
-           id="rect7314"
+           id="rect6623"
            style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <rect
            style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect7316"
+           id="rect6625"
            width="7.99999"
            height="30.000006"
-           x="-288"
-           y="386"
+           x="-252"
+           y="466"
            ry="4.1854858"
            rx="3.999995" />
         <rect
-           y="403"
-           x="-324"
+           y="483"
+           x="-288"
            height="12.99999"
            width="28.999994"
-           id="rect7318"
+           id="rect6627"
            style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <rect
            rx="3.999995"
            ry="4.1854858"
-           y="395"
-           x="-315"
+           y="475"
+           x="-279"
            height="21"
            width="34.999985"
-           id="rect7320"
+           id="rect6629"
            style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <path
            style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           id="path7322"
+           id="path6631"
            sodipodi:type="arc"
-           sodipodi:cx="-302"
-           sodipodi:cy="371"
+           sodipodi:cx="-266"
+           sodipodi:cy="451"
            sodipodi:rx="7.4999938"
            sodipodi:ry="7.5000024"
            sodipodi:start="3.4953343"
            sodipodi:end="1.8407347"
-           d="m -309.03562,368.40192 a 7.4999938,7.5000024 0 0 1 9.43617,-4.50737 7.4999938,7.5000024 0 0 1 4.76917,9.30661 7.4999938,7.5000024 0 0 1 -9.16976,5.02725"
+           d="m -273.03562,448.40192 a 7.4999938,7.5000024 0 0 1 9.43617,-4.50737 7.4999938,7.5000024 0 0 1 4.76917,9.30661 7.4999938,7.5000024 0 0 1 -9.16976,5.02725"
            sodipodi:open="true" />
         <path
-           d="m -304.10552,378.34925 a 7.4999938,7.5000024 0 0 1 -9.38146,4.80209 7.4999938,7.5000024 0 0 1 -4.92078,-9.31976 7.4999938,7.5000024 0 0 1 9.25653,-5.03869"
+           d="m -268.10552,458.34925 a 7.4999938,7.5000024 0 0 1 -9.38146,4.80209 7.4999938,7.5000024 0 0 1 -4.92078,-9.31976 7.4999938,7.5000024 0 0 1 9.25653,-5.03869"
            sodipodi:end="4.9929531"
            sodipodi:start="0.31864739"
            sodipodi:ry="7.5000024"
            sodipodi:rx="7.4999938"
-           sodipodi:cy="375.99963"
-           sodipodi:cx="-311.22797"
+           sodipodi:cy="455.99963"
+           sodipodi:cx="-275.22797"
            sodipodi:type="arc"
-           id="path7324"
+           id="path6633"
            style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
            sodipodi:open="true" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;enable-background:accumulate"
+           d="m -314,465 -10,-9.5 10,-9.5 z"
+           id="path6635"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc" />
+        <rect
+           transform="scale(-1,-1)"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           id="rect6637"
+           width="31.999987"
+           height="4.99999"
+           x="283"
+           y="-458" />
       </g>
     </g>
-    <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
-       id="path7326"
-       d="m -260.99992,494.29695 10,-9.5 -10,-9.5 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;enable-background:accumulate" />
-    <rect
-       y="-487.29697"
-       x="-278"
-       height="4.9999919"
-       width="20.686279"
-       id="rect7328"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       transform="scale(1,-1)" />
   </g>
 </svg>

demos/gtk-demo/gesture-two-finger-swipe-right.svg

@@ -9,13 +9,13 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64"
-   viewBox="0 0 64 64.000001"
+   width="80.000008"
+   height="55.000023"
+   viewBox="0 0 80.000008 55.000024"
    id="svg6535"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="two-finger-swipe-left.svg">
+   sodipodi:docname="two-finger-swipe-right.svg">
   <defs
      id="defs6537" />
   <sodipodi:namedview
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="0.8190337"
-     inkscape:cy="13.44962"
+     inkscape:zoom="2"
+     inkscape:cx="-59.169932"
+     inkscape:cy="48.63391"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -37,15 +37,11 @@
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:window-width="2560"
-     inkscape:window-height="1376"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
      inkscape:window-x="0"
      inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid7931" />
-  </sodipodi:namedview>
+     inkscape:window-maximized="1" />
   <metadata
      id="metadata6540">
     <rdf:RDF>
@@ -62,18 +58,13 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(180,-470.14793)">
-    <path
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       d="M 38.271484 6.0039062 C 37.981892 5.9956378 37.692703 6.0019094 37.40625 6.0214844 C 34.246377 6.2374271 31.332975 8.1249345 29.902344 11.082031 C 29.173793 10.990041 28.447857 10.978702 27.738281 11.0625 C 24.36672 11.460668 21.373919 13.762084 20.242188 17.148438 L 12 17.148438 L 12 10.148438 L 2 19.648438 L 12 29.148438 L 12 22.148438 L 20.048828 22.148438 C 20.694441 24.742195 22.473591 26.994506 25 28.162109 L 25 47 L 24 47 L 24 39.185547 C 24 36.866788 22.215997 35 20 35 C 17.784003 35 16 36.866788 16 39.185547 L 16 47 L 16 55.814453 L 16 60 L 20 60 L 45 60 L 56 60 C 58.215997 60 60 58.133212 60 55.814453 L 60 43.185547 L 60 34.185547 C 60 31.866788 58.215997 30 56 30 C 53.784003 30 52 31.866788 52 34.185547 L 52 39 L 51 39 L 51 28.185547 C 51 25.866788 49.215997 24 47 24 C 44.784003 24 43 25.866788 43 28.185547 L 43 39 L 42 39 L 42 23.042969 C 44.136586 21.978813 45.853243 20.084457 46.603516 17.640625 C 48.028796 12.998095 45.481769 8.0270562 40.880859 6.4726562 C 40.018187 6.1812063 39.140263 6.0287116 38.271484 6.0039062 z M 38.171875 8.9980469 C 38.752124 9.0164906 39.339992 9.1204781 39.919922 9.3164062 C 43.012882 10.361346 44.694478 13.640769 43.736328 16.761719 C 43.402083 17.85044 42.787396 18.769252 42 19.474609 L 42 15.185547 C 42 12.866788 40.215997 11 38 11 C 35.784003 11 34 12.866788 34 15.185547 L 34 22.945312 C 33.72503 23.436938 33.386634 23.876948 33 24.261719 L 33 20.185547 C 33 17.866788 31.215997 16 29 16 C 26.784003 16 25 17.866788 25 20.185547 L 25 24.666016 C 23.150282 23.179661 22.297135 20.683826 23.027344 18.265625 C 23.981604 15.105485 27.261604 13.320305 30.433594 14.234375 A 1.50015 1.50015 0 0 0 32.361328 12.945312 A 1.50015 1.50015 0 0 0 32.371094 12.921875 C 33.289974 10.433529 35.657461 8.9181241 38.171875 8.9980469 z M 34 27.302734 L 34 39 L 33 39 L 33 27.925781 C 33.346618 27.7409 33.679606 27.531269 34 27.302734 z "
-       transform="translate(-180,470.14793)"
-       id="rect7308" />
+     transform="translate(180,-479.14791)">
     <g
        style="display:inline"
-       transform="translate(80,114.14791)"
-       id="g7391">
+       transform="translate(144,118.14791)"
+       id="g6509">
       <g
-         id="g7393">
+         id="g6511">
         <rect
            rx="3.999995"
            ry="4.1854858"
@@ -81,11 +72,11 @@
            x="-324"
            height="24.999994"
            width="7.99999"
-           id="rect7395"
+           id="rect6513"
            style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <rect
            style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect7397"
+           id="rect6515"
            width="7.99999"
            height="43.999989"
            x="-315"
@@ -99,11 +90,11 @@
            x="-306"
            height="49.000015"
            width="7.99999"
-           id="rect7399"
+           id="rect6517"
            style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <rect
            style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect7401"
+           id="rect6519"
            width="7.99999"
            height="36.000011"
            x="-297"
@@ -117,24 +108,30 @@
            x="-288"
            height="30.000006"
            width="7.99999"
-           id="rect7403"
+           id="rect6521"
            style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
         <rect
            style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect7405"
+           id="rect6523"
            width="28.999994"
            height="12.99999"
            x="-324"
            y="403" />
         <rect
            style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect7407"
+           id="rect6525"
            width="34.999985"
            height="21"
            x="-315"
            y="395"
            ry="4.1854858"
            rx="3.999995" />
+        <path
+           sodipodi:nodetypes="cccc"
+           inkscape:connector-curvature="0"
+           id="path6527"
+           d="m -254,361 10,9.5 -10,9.5 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;enable-background:accumulate" />
         <path
            sodipodi:open="true"
            d="m -309.03562,368.40192 a 7.4999938,7.5000024 0 0 1 9.43617,-4.50737 7.4999938,7.5000024 0 0 1 4.76917,9.30661 7.4999938,7.5000024 0 0 1 -9.16976,5.02725"
@@ -145,12 +142,12 @@
            sodipodi:cy="371"
            sodipodi:cx="-302"
            sodipodi:type="arc"
-           id="path7409"
+           id="path6529"
            style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
         <path
            sodipodi:open="true"
            style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           id="path7411"
+           id="path6531"
            sodipodi:type="arc"
            sodipodi:cx="-311.22797"
            sodipodi:cy="375.99963"
@@ -159,21 +156,14 @@
            sodipodi:start="0.31864739"
            sodipodi:end="4.9929531"
            d="m -304.10552,378.34925 a 7.4999938,7.5000024 0 0 1 -9.38146,4.80209 7.4999938,7.5000024 0 0 1 -4.92078,-9.31976 7.4999938,7.5000024 0 0 1 9.25653,-5.03869" />
+        <rect
+           y="368"
+           x="-295"
+           height="4.99999"
+           width="41.999992"
+           id="rect6533"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       </g>
     </g>
-    <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;enable-background:accumulate"
-       d="m -248,499.29695 -10,-9.5 10,-9.5 z"
-       id="path7413"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-    <rect
-       transform="scale(-1,-1)"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#4a90d9;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect7415"
-       width="13.061281"
-       height="4.9999938"
-       x="238.62494"
-       y="-492.29697" />
   </g>
 </svg>

demos/gtk-demo/glarea.c

@@ -77,7 +77,7 @@ create_shader (int         type,
       buffer = g_malloc (log_len + 1);
       glGetShaderInfoLog (shader, log_len, NULL, buffer);
 
-      g_warning ("Compile failure in %s shader:\n%s",
+      g_warning ("Compile failure in %s shader:\n%s\n",
                  type == GL_VERTEX_SHADER ? "vertex" : "fragment",
                  buffer);
 
@@ -140,7 +140,7 @@ init_shaders (GLuint *program_out,
       buffer = g_malloc (log_len + 1);
       glGetProgramInfoLog (program, log_len, NULL, buffer);
 
-      g_warning ("Linking failure:\n%s", buffer);
+      g_warning ("Linking failure:\n%s\n", buffer);
 
       g_free (buffer);
 

demos/gtk-demo/hypertext.c

@@ -44,7 +44,7 @@ show_page (GtkTextBuffer *buffer,
   if (page == 1)
     {
       gtk_text_buffer_insert (buffer, &iter, "Some text to show that simple ", -1);
-      insert_link (buffer, &iter, "hyper text", 3);
+      insert_link (buffer, &iter, "hypertext", 3);
       gtk_text_buffer_insert (buffer, &iter, " can easily be realized with ", -1);
       insert_link (buffer, &iter, "tags", 2);
       gtk_text_buffer_insert (buffer, &iter, ".", -1);
@@ -173,8 +173,9 @@ event_after (GtkWidget *text_view,
                                          GTK_TEXT_WINDOW_WIDGET,
                                          ex, ey, &x, &y);
 
-  if (gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW (text_view), &iter, x, y))
-    follow_if_link (text_view, &iter);
+  gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW (text_view), &iter, x, y);
+
+  follow_if_link (text_view, &iter);
 
   return TRUE;
 }
@@ -196,19 +197,18 @@ set_cursor_if_appropriate (GtkTextView    *text_view,
   GtkTextIter iter;
   gboolean hovering = FALSE;
 
-  if (gtk_text_view_get_iter_at_location (text_view, &iter, x, y))
-    {
-      tags = gtk_text_iter_get_tags (&iter);
-      for (tagp = tags;  tagp != NULL;  tagp = tagp->next)
-        {
-          GtkTextTag *tag = tagp->data;
-          gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));
+  gtk_text_view_get_iter_at_location (text_view, &iter, x, y);
 
-          if (page != 0)
-            {
-              hovering = TRUE;
-              break;
-            }
+  tags = gtk_text_iter_get_tags (&iter);
+  for (tagp = tags;  tagp != NULL;  tagp = tagp->next)
+    {
+      GtkTextTag *tag = tagp->data;
+      gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));
+
+      if (page != 0)
+        {
+          hovering = TRUE;
+          break;
         }
     }
 
@@ -272,8 +272,6 @@ do_hypertext (GtkWidget *do_widget)
 
       view = gtk_text_view_new ();
       gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
-      gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 20);
-      gtk_text_view_set_right_margin (GTK_TEXT_VIEW (view), 20);
       g_signal_connect (view, "key-press-event",
                         G_CALLBACK (key_press_event), NULL);
       g_signal_connect (view, "event-after",

demos/gtk-demo/main.c

@@ -470,31 +470,6 @@ fontify (GtkTextBuffer *source_buffer)
   gchar *start_ptr, *end_ptr;
   gchar *tag;
 
-  gtk_text_buffer_create_tag (source_buffer, "source",
-                              "font", "monospace",
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "comment",
-                              "foreground", "DodgerBlue",
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "type",
-                              "foreground", "ForestGreen",
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "string",
-                              "foreground", "RosyBrown",
-                              "weight", PANGO_WEIGHT_BOLD,
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "control",
-                              "foreground", "purple",
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "preprocessor",
-                              "style", PANGO_STYLE_OBLIQUE,
-                              "foreground", "burlywood4",
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "function",
-                              "weight", PANGO_WEIGHT_BOLD,
-                              "foreground", "DarkGoldenrod4",
-                              NULL);
-
   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);
 
@@ -581,13 +556,11 @@ add_data_tab (const gchar *demoname)
               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));
-              if (g_str_has_suffix (resource_name, ".c"))
-                fontify (buffer);
               gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);
             }
           else
             {
-              g_warning ("Don't know how to display resource '%s'", resource_name);
+              g_warning ("Don't know how to display resource '%s'\n", resource_name);
               widget = NULL;
             }
 
@@ -650,6 +623,30 @@ 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);
+  gtk_text_buffer_create_tag (source_buffer, "type",
+                              "foreground", "ForestGreen",
+                              NULL);
+  gtk_text_buffer_create_tag (source_buffer, "string",
+                              "foreground", "RosyBrown",
+                              "weight", PANGO_WEIGHT_BOLD,
+                              NULL);
+  gtk_text_buffer_create_tag (source_buffer, "control",
+                              "foreground", "purple",
+                              NULL);
+  gtk_text_buffer_create_tag (source_buffer, "preprocessor",
+                              "style", PANGO_STYLE_OBLIQUE,
+                              "foreground", "burlywood4",
+                              NULL);
+  gtk_text_buffer_create_tag (source_buffer, "function",
+                              "weight", PANGO_WEIGHT_BOLD,
+                              "foreground", "DarkGoldenrod4",
+                              NULL);
 
   resource_filename = g_strconcat ("/sources/", filename, NULL);
   bytes = g_resources_lookup_data (resource_filename, 0, &err);
@@ -657,7 +654,7 @@ load_file (const gchar *demoname,
 
   if (bytes == NULL)
     {
-      g_warning ("Cannot open source for %s: %s", filename, err->message);
+      g_warning ("Cannot open source for %s: %s\n", filename, err->message);
       g_error_free (err);
       return;
     }
@@ -920,7 +917,7 @@ startup (GApplication *app)
   gchar *ids[] = { "appmenu", NULL };
 
   builder = gtk_builder_new ();
-  gtk_builder_add_objects_from_resource (builder, "/ui/appmenu.ui", ids, NULL);
+  gtk_builder_add_objects_from_resource (builder, "/ui/main.ui", ids, NULL);
 
   appmenu = (GMenuModel *)gtk_builder_get_object (builder, "appmenu");
 

demos/gtk-demo/main.ui

@@ -1,6 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.10 -->
+  <menu id="appmenu">
+    <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>
   <object class="GtkTreeStore" id="treestore">
     <columns>
       <!-- column-name NAME -->
@@ -26,7 +41,7 @@
         <property name="visible">1</property>
         <property name="show-close-button">1</property>
         <child>
-          <object class="GtkButton">
+          <object class="GtkButton" id="run_button">
             <property name="visible">1</property>
             <property name="valign">center</property>
             <property name="can_focus">1</property>
@@ -35,7 +50,7 @@
               <class name="text-button"/>
             </style>
             <child>
-              <object class="GtkLabel">
+              <object class="GtkLabel" id="run_label">
                 <property name="visible">1</property>
                 <property name="label" translatable="yes">Run</property>
               </object>
@@ -45,13 +60,13 @@
       </object>
     </child>
     <child>
-      <object class="GtkBox">
+      <object class="GtkBox" id="box1">
         <property name="visible">1</property>
         <child>
           <object class="GtkFrame">
             <property name="visible">1</property>
             <child>
-              <object class="GtkScrolledWindow">
+              <object class="GtkScrolledWindow" id="scrolledwindow">
                 <property name="width_request">120</property>
                 <property name="visible">1</property>
                 <property name="can_focus">1</property>
@@ -69,19 +84,15 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkTreeViewColumn">
+                      <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+                        <property name="title" translatable="yes">column</property>
                         <child>
-                          <object class="GtkCellRendererText"/>
+                          <object class="GtkCellRendererText" id="cellrenderertext1"/>
                           <attributes>
                             <attribute name="style">4</attribute>
                             <attribute name="text">1</attribute>
                           </attributes>
                         </child>
-                        <child>
-                          <object class="GtkCellRendererText">
-                            <property name="text">  </property>
-                          </object>
-                        </child>
                       </object>
                     </child>
                   </object>
@@ -98,7 +109,7 @@
             <property name="enable_popup">1</property>
             <property name="show_border">0</property>
             <child>
-              <object class="GtkScrolledWindow">
+              <object class="GtkScrolledWindow" id="scrolledwindow1">
                 <property name="visible">1</property>
                 <property name="can_focus">1</property>
                 <child>
@@ -122,7 +133,7 @@
               </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel">
+              <object class="GtkLabel" id="label1">
                 <property name="visible">1</property>
                 <property name="label" translatable="yes">_Info</property>
                 <property name="use_underline">1</property>
@@ -155,7 +166,7 @@
               </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel">
+              <object class="GtkLabel" id="label2">
                 <property name="visible">1</property>
                 <property name="label" translatable="yes">Source</property>
               </object>

demos/gtk-demo/offscreen_window.c

@@ -328,7 +328,7 @@ gtk_rotated_bin_add (GtkContainer *container,
       bin->child = widget;
     }
   else
-    g_warning ("GtkRotatedBin cannot have more than one child");
+    g_warning ("GtkRotatedBin cannot have more than one child\n");
 }
 
 static void

demos/gtk-demo/offscreen_window2.c

@@ -267,7 +267,7 @@ gtk_mirror_bin_add (GtkContainer *container,
       bin->child = widget;
     }
   else
-    g_warning ("GtkMirrorBin cannot have more than one child");
+    g_warning ("GtkMirrorBin cannot have more than one child\n");
 }
 
 static void

demos/gtk-demo/org.gtk.Demo.gschema.xml

@@ -12,15 +12,6 @@
     <key name='color' enum='org.gtk.Demo.Color'>
       <default>'red'</default>
     </key>
-    <key name='window-size' type='(ii)'>
-      <default>(-1, -1)</default>
-    </key>
-    <key name='maximized' type='b'>
-      <default>false</default>
-    </key>
-    <key name='fullscreen' type='b'>
-      <default>false</default>
-    </key>
   </schema>
 
 </schemalist>

demos/gtk-demo/reset.css

@@ -7,5 +7,62 @@
  */
 
 * {
-  all: unset;
+  color: inherit;
+  font-size: inherit;
+  background-color: initial;
+  font-family: inherit;
+  font-style: inherit;
+  font-variant: inherit;
+  font-weight: inherit;
+  text-shadow: inherit;
+  icon-shadow: inherit;
+  box-shadow: initial;
+  margin-top: initial;
+  margin-left: initial;
+  margin-bottom: initial;
+  margin-right: initial;
+  padding-top: initial;
+  padding-left: initial;
+  padding-bottom: initial;
+  padding-right: initial;
+  border-top-style: initial;
+  border-top-width: initial;
+  border-left-style: initial;
+  border-left-width: initial;
+  border-bottom-style: initial;
+  border-bottom-width: initial;
+  border-right-style: initial;
+  border-right-width: initial;
+  border-top-left-radius: initial;
+  border-top-right-radius: initial;
+  border-bottom-right-radius: initial;
+  border-bottom-left-radius: initial;
+  outline-style: initial;
+  outline-width: initial;
+  outline-offset: initial;
+  background-clip: initial;
+  background-origin: initial;
+  background-size: initial;
+  background-position: initial;
+  border-top-color: initial;
+  border-right-color: initial;
+  border-bottom-color: initial;
+  border-left-color: initial;
+  outline-color:  initial;
+  background-repeat: initial;
+  background-image: initial;
+  border-image-source: initial;
+  border-image-repeat: initial;
+  border-image-slice: initial;
+  border-image-width: initial;
+  transition-property: initial;
+  transition-duration: initial;
+  transition-timing-function: initial;
+  transition-delay: initial;
+  engine: initial;
+  gtk-key-bindings: initial;
+
+  -GtkWidget-focus-line-width: 0;
+  -GtkWidget-focus-padding: 0;
+  -GtkNotebook-initial-gap: 0;
 }

demos/gtk-demo/shortcuts-boxes.ui

@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.17 -->
-
-  <object class="GtkShortcutsWindow" id="shortcuts-boxes">
-    <property name="modal">1</property>
-    
-    <child>
-      <object class="GtkShortcutsSection">
-        <property name="visible">1</property>
-        <property name="section-name">shortcuts</property>
-        <property name="max-height">12</property>
-
-        <!-- Overview shortcuts -->
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Overview</property>
-            <property name="view">overview</property>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">F1</property>
-                <property name="title" translatable="yes">Help</property>
-              </object>
-            </child>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;Ctrl&gt;n</property>
-                <property name="title" translatable="yes">Create a new box</property>
-              </object>
-            </child>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;Ctrl&gt;f</property>
-                <property name="title" translatable="yes">Search</property>
-              </object>
-            </child>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;Ctrl&gt;k</property>
-                <property name="title" translatable="yes">Keyboard shortcuts</property>
-              </object>
-            </child>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;Ctrl&gt;q</property>
-                <property name="title" translatable="yes">Close Window/Quit Boxes</property>
-              </object>
-            </child>
-          </object>
-        </child>
-
-        <!-- Wizard and Properties shortcuts -->
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Box Creation and Properties</property>
-            <property name="view">wizard</property>
-
-            <!-- LTR -->
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="direction">ltr</property>
-                <property name="accelerator">&lt;Alt&gt;Right</property>
-                <property name="title" translatable="yes">Switch to the next page</property>
-              </object>
-            </child>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="direction">ltr</property>
-                <property name="accelerator">&lt;Alt&gt;Left</property>
-                <property name="title" translatable="yes">Switch to the previous page</property>
-              </object>
-            </child>
-
-            <!-- RTL -->
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="direction">rtl</property>
-                <property name="accelerator">&lt;Alt&gt;Left</property>
-                <property name="title" translatable="yes">Switch to the next page</property>
-              </object>
-            </child>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="direction">rtl</property>
-                <property name="accelerator">&lt;Alt&gt;Right</property>
-                <property name="title" translatable="yes">Switch to the previous page</property>
-              </object>
-            </child>
-          </object>
-        </child>
-
-        <!-- Display shortcuts -->
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Box Display</property>
-            <property name="view">display</property>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">Control_L+Alt_L</property>
-                <property name="title" translatable="yes">Grab/Ungrab keyboard</property>
-              </object>
-            </child>
-
-            <!-- LTR -->
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="direction">ltr</property>
-                <property name="accelerator">&lt;Alt&gt;Left</property>
-                <property name="title" translatable="yes">Back to overview</property>
-              </object>
-            </child>
-
-            <!-- RTL -->
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="direction">rtl</property>
-                <property name="accelerator">&lt;Alt&gt;Right</property>
-                <property name="title" translatable="yes">Back to overview</property>
-              </object>
-            </child>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;Ctrl&gt;q</property>
-                <property name="title" translatable="yes">Close window/Quit Boxes</property>
-              </object>
-            </child>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">F11</property>
-                <property name="title" translatable="yes">Fullscreen/Restore from fullscreen</property>
-              </object>
-            </child>
-          </object>
-        </child>
-
-      </object>
-    </child>
-  </object>
-
-</interface>

demos/gtk-demo/shortcuts-builder.ui

@@ -2,6 +2,13 @@
 <interface>
   <!-- interface-requires gtk+ 3.17 -->
 
+  <object class="GFileIcon" id="left-swipe-icon">
+    <property name="file">resource:///icons/gesture-two-finger-swipe-left.svg</property>
+  </object>
+  <object class="GFileIcon" id="right-swipe-icon">
+    <property name="file">resource:///icons/gesture-two-finger-swipe-right.svg</property>
+  </object>
+
   <object class="GtkShortcutsWindow" id="shortcuts-builder">
     <property name="modal">1</property>
     <child>
@@ -82,17 +89,19 @@
             <property name="visible">1</property>
             <property name="title" translatable="yes">Touchpad gestures</property>
             <child>
-              <object class="GtkShortcutsShortcut">
+              <object class="GtkShortcutsGesture">
                 <property name="visible">1</property>
-                <property name="shortcut-type">gesture-two-finger-swipe-right</property>
                 <property name="title" translatable="yes">Switch to the next document</property>
+                <property name="subtitle" translatable="yes">Two finger swipe right</property>
+                <property name="icon">right-swipe-icon</property>
               </object>
             </child>
             <child>
-              <object class="GtkShortcutsShortcut">
+              <object class="GtkShortcutsGesture">
                 <property name="visible">1</property>
-                <property name="shortcut-type">gesture-two-finger-swipe-left</property>
                 <property name="title" translatable="yes">Switch to the previous document</property>
+                <property name="subtitle" translatable="yes">Two finger swipe left</property>
+                <property name="icon">left-swipe-icon</property>
               </object>
             </child>
           </object>
@@ -451,95 +460,6 @@
             </child>
           </object>
         </child>
-
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">All gestures</property>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="shortcut-type">gesture-pinch</property>
-                <property name="title" translatable="yes">A stock pinch gesture</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="shortcut-type">gesture-stretch</property>
-                <property name="title" translatable="yes">A stock stretch gesture</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="shortcut-type">gesture-rotate-clockwise</property>
-                <property name="title" translatable="yes">A stock rotation gesture</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="shortcut-type">gesture-rotate-counterclockwise</property>
-                <property name="title" translatable="yes">A stock rotation gesture</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="shortcut-type">gesture-two-finger-swipe-left</property>
-                <property name="title" translatable="yes">A stock swipe gesture</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="shortcut-type">gesture-two-finger-swipe-right</property>
-                <property name="title" translatable="yes">A stock swipe gesture</property>
-              </object>
-            </child>
-
-          </object>
-        </child>
-
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">'Special' combinations</property>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">t+t</property>
-                <property name="title" translatable="yes">You want tea ?</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;shift&gt;&lt;ctrl&gt;</property>
-                <property name="title" translatable="yes">Shift Control</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;&amp;&lt;ctrl&gt;</property>
-                <property name="title" translatable="yes">Control Control</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">Control_L&amp;Control_R</property>
-                <property name="title" translatable="yes">Left and right control</property>
-              </object>
-            </child>
-
-          </object>
-        </child>
-
       </object>
     </child>
   </object>

demos/gtk-demo/shortcuts-clocks.ui

@@ -34,27 +34,10 @@
                 <property name="title" translatable="yes">Quit</property>
               </object>
             </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;alt&gt;Right</property>
-                <property name="direction">ltr</property>
-                <property name="title" translatable="yes">Forward</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;Left</property>
-                <property name="direction">ltr</property>
-                <property name="title" translatable="yes">Back</property>
-              </object>
-            </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
                 <property name="accelerator">&lt;alt&gt;Left</property>
-                <property name="direction">rtl</property>
                 <property name="title" translatable="yes">Forward</property>
               </object>
             </child>
@@ -62,7 +45,6 @@
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
                 <property name="accelerator">&lt;ctrl&gt;Right</property>
-                <property name="direction">rtl</property>
                 <property name="title" translatable="yes">Back</property>
               </object>
             </child>

demos/gtk-demo/shortcuts-gedit.ui

@@ -2,6 +2,13 @@
 <interface>
   <!-- interface-requires gtk+ 3.17 -->
 
+  <object class="GFileIcon" id="left-swipe-icon">
+    <property name="file">resource:///icons/gesture-two-finger-swipe-left.svg</property>
+  </object>
+  <object class="GFileIcon" id="right-swipe-icon">
+    <property name="file">resource:///icons/gesture-two-finger-swipe-right.svg</property>
+  </object>
+
   <object class="GtkShortcutsWindow" id="shortcuts-gedit">
     <property name="modal">1</property>
     <child>
@@ -14,17 +21,19 @@
             <property name="visible">1</property>
             <property name="title" translatable="yes">Touchpad gestures</property>
             <child>
-              <object class="GtkShortcutsShortcut">
+              <object class="GtkShortcutsGesture">
                 <property name="visible">1</property>
-                <property name="shortcut-type">gesture-two-finger-swipe-right</property>
                 <property name="title" translatable="yes">Switch to the next document</property>
+                <property name="subtitle" translatable="yes">Two finger swipe right</property>
+                <property name="icon">right-swipe-icon</property>
               </object>
             </child>
             <child>
-              <object class="GtkShortcutsShortcut">
+              <object class="GtkShortcutsGesture">
                 <property name="visible">1</property>
-                <property name="shortcut-type">gesture-two-finger-swipe-left</property>
                 <property name="title" translatable="yes">Switch to the previous document</property>
+                <property name="subtitle" translatable="yes">Two finger swipe left</property>
+                <property name="icon">left-swipe-icon</property>
               </object>
             </child>
           </object>

demos/gtk-demo/shortcuts.c

@@ -22,7 +22,6 @@ show_shortcuts (GtkWidget   *window,
   gtk_window_set_transient_for (GTK_WINDOW (overlay), GTK_WINDOW (window));
   g_object_set (overlay, "view-name", view, NULL);
   gtk_widget_show (overlay);
-  g_object_unref (builder);
 }
 
 static void
@@ -49,24 +48,6 @@ clocks_shortcuts_stopwatch (GtkWidget *window)
   show_shortcuts (window, "shortcuts-clocks", "stopwatch");
 }
 
-static void
-boxes_shortcuts (GtkWidget *window)
-{
-  show_shortcuts (window, "shortcuts-boxes", NULL);
-}
-
-static void
-boxes_shortcuts_wizard (GtkWidget *window)
-{
-  show_shortcuts (window, "shortcuts-boxes", "wizard");
-}
-
-static void
-boxes_shortcuts_display (GtkWidget *window)
-{
-  show_shortcuts (window, "shortcuts-boxes", "display");
-}
-
 GtkWidget *
 do_shortcuts (GtkWidget *do_widget)
 {
@@ -91,9 +72,6 @@ do_shortcuts (GtkWidget *do_widget)
                                         "gedit_shortcuts", G_CALLBACK (gedit_shortcuts),
                                         "clocks_shortcuts", G_CALLBACK (clocks_shortcuts),
                                         "clocks_shortcuts_stopwatch", G_CALLBACK (clocks_shortcuts_stopwatch),
-                                        "boxes_shortcuts", G_CALLBACK (boxes_shortcuts),
-                                        "boxes_shortcuts_wizard", G_CALLBACK (boxes_shortcuts_wizard),
-                                        "boxes_shortcuts_display", G_CALLBACK (boxes_shortcuts_display),
                                         NULL);
       gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));

demos/gtk-demo/shortcuts.ui

@@ -38,27 +38,6 @@
             <signal name="clicked" handler="clocks_shortcuts_stopwatch" swapped="1" object="window1"/>
           </object>
         </child>
-        <child>
-          <object class="GtkButton">
-            <property name="visible">1</property>
-            <property name="label">Boxes</property>
-            <signal name="clicked" handler="boxes_shortcuts" swapped="1" object="window1"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton">
-            <property name="visible">1</property>
-            <property name="label">Boxes - Wizard</property>
-            <signal name="clicked" handler="boxes_shortcuts_wizard" swapped="1" object="window1"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton">
-            <property name="visible">1</property>
-            <property name="label">Boxes - Display</property>
-            <signal name="clicked" handler="boxes_shortcuts_display" swapped="1" object="window1"/>
-          </object>
-        </child>
       </object>
     </child>
   </object>

demos/gtk-demo/stack.ui

@@ -4,10 +4,10 @@
   <object class="GtkWindow" id="window1">
     <property name="title" translatable="yes">Stack</property>
     <child>
-      <object class="GtkGrid">
+      <object class="GtkGrid" id="grid1">
         <property name="visible">1</property>
         <child>
-          <object class="GtkStackSwitcher">
+          <object class="GtkStackSwitcher" id="switcher">
             <property name="visible">1</property>
             <property name="stack">stack</property>
             <property name="halign">center</property>
@@ -23,7 +23,7 @@
             <property name="can_focus">1</property>
             <property name="transition-type">crossfade</property>
             <child>
-              <object class="GtkImage">
+              <object class="GtkImage" id="image1">
                 <property name="visible">1</property>
                 <property name="margin-top">20</property>
                 <property name="margin-bottom">20</property>
@@ -35,7 +35,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton">
+              <object class="GtkCheckButton" id="checkbutton1">
                 <property name="label" translatable="yes">Page 2</property>
                 <property name="visible">1</property>
                 <property name="can_focus">1</property>
@@ -49,7 +49,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSpinner">
+              <object class="GtkSpinner" id="spinner1">
                 <property name="visible">1</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>

demos/gtk-demo/theming.ui

@@ -4,7 +4,7 @@
     <property name="row-spacing">6</property>
     <property name="orientation">vertical</property>
     <child>
-      <object class="GtkToolbar">
+      <object class="GtkToolbar" id="toolbar1">
         <property name="visible">1</property>
         <property name="hexpand">1</property>
         <property name="show-arrow">0</property>
@@ -12,7 +12,7 @@
           <class name="primary-toolbar"/>
         </style>
         <child>
-          <object class="GtkToggleToolButton">
+          <object class="GtkToggleToolButton" id="toolbutton1">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="use_action_appearance">0</property>
@@ -26,7 +26,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton">
+          <object class="GtkToggleToolButton" id="toolbutton2">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="use_action_appearance">0</property>
@@ -41,7 +41,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton">
+          <object class="GtkToggleToolButton" id="toolbutton3">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="sensitive">0</property>
@@ -55,7 +55,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton">
+          <object class="GtkToggleToolButton" id="toolbutton5">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="label" translatable="yes">Raised</property>
@@ -71,7 +71,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton">
+          <object class="GtkToggleToolButton" id="toolbutton6">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="label" translatable="yes">Raised Active</property>
@@ -88,7 +88,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton">
+          <object class="GtkToggleToolButton" id="toolbutton4">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="sensitive">0</property>
@@ -103,7 +103,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToolItem">
+          <object class="GtkToolItem" id="toolitementry">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <child>
@@ -118,7 +118,7 @@
           </object>
         </child>
         <child>
-          <object class="GtkToolItem">
+          <object class="GtkToolItem" id="toolitemswitch">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <child>
@@ -132,7 +132,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkBox">
+      <object class="GtkBox" id="box1">
         <property name="visible">1</property>
         <property name="valign">center</property>
         <property name="halign">center</property>
@@ -140,7 +140,7 @@
           <class name="linked"/>
         </style>
         <child>
-          <object class="GtkButton">
+          <object class="GtkButton" id="button1">
             <property name="label" translatable="yes">Hi, I am a button</property>
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
@@ -150,8 +150,8 @@
           </object>
         </child>
         <child>
-          <object class="GtkButton">
-            <property name="label" translatable="yes">And I'm another button</property>
+          <object class="GtkButton" id="button2">
+            <property name="label" translatable="yes">And I&apos;m another button</property>
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="can_focus">1</property>
@@ -163,7 +163,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkButton">
+          <object class="GtkButton" id="button3">
             <property name="label" translatable="yes">This is a button party!</property>
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
@@ -178,7 +178,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkToolbar">
+      <object class="GtkToolbar" id="itoolbar1">
         <property name="visible">1</property>
         <property name="hexpand">1</property>
         <property name="icon_size">1</property>
@@ -186,7 +186,7 @@
           <class name="inline-toolbar"/>
         </style>
         <child>
-          <object class="GtkToggleToolButton">
+          <object class="GtkToggleToolButton" id="itoolbutton1">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="use_action_appearance">0</property>
@@ -199,7 +199,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton">
+          <object class="GtkToggleToolButton" id="itoolbutton2">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="use_action_appearance">0</property>
@@ -212,7 +212,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton">
+          <object class="GtkToggleToolButton" id="itoolbutton3">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="use_action_appearance">0</property>
@@ -226,7 +226,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton">
+          <object class="GtkToggleToolButton" id="itoolbutton4">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="use_action_appearance">0</property>
@@ -240,7 +240,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton">
+          <object class="GtkToggleToolButton" id="itoolbutton5">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="sensitive">0</property>
@@ -254,7 +254,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton">
+          <object class="GtkToggleToolButton" id="itoolbutton6">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="sensitive">0</property>

demos/icon-browser/Makefile.am

@@ -31,7 +31,7 @@ resources.c: iconbrowser.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourc
 		--target=$@ --sourcedir=$(srcdir) --generate-source
 
 EXTRA_DIST = \
-	menus.ui \
+	app-menu.ui \
 	iconbrowser.gresource.xml \
 	window.ui
 

demos/icon-browser/app-menu.ui

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

demos/icon-browser/iconbrowser.gresource.xml

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

demos/icon-browser/iconbrowserapp.c

@@ -36,6 +36,8 @@ static GActionEntry app_entries[] =
 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);
@@ -46,6 +48,11 @@ icon_browser_app_startup (GApplication *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

demos/icon-browser/iconbrowserwin.c

@@ -840,7 +840,7 @@ icon_browser_window_class_init (IconBrowserWindowClass *class)
   g_type_ensure (ICON_STORE_TYPE);
 
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
-                                               "/org/gtk/iconbrowser/gtk/window.ui");
+                                               "/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);

demos/icon-browser/window.ui

@@ -148,14 +148,16 @@
           <object class="GtkGrid">
             <property name="visible">True</property>
             <property name="margin">10</property>
-            <property name="row-spacing">18</property>
-            <property name="column-spacing">18</property>
+            <property name="row-spacing">10</property>
+            <property name="column-spacing">10</property>
             <child>
               <object class="GtkEventBox">
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkImage" id="image1">
                     <property name="visible">True</property>
+                    <property name="xpad">4</property>
+                    <property name="ypad">4</property>
                     <property name="halign">center</property>
                     <property name="valign">end</property>
                   </object>
@@ -172,6 +174,8 @@
                 <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>
@@ -188,6 +192,8 @@
                 <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>
@@ -204,6 +210,8 @@
                 <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>
@@ -220,6 +228,8 @@
                 <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>
@@ -234,9 +244,11 @@
             <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">baseline</property>
-                <property name="label">16×16</property>
+                <property name="valign">center</property>
+                <property name="label">16x16</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
@@ -249,9 +261,11 @@
             <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">baseline</property>
-                <property name="label">24×24</property>
+                <property name="valign">center</property>
+                <property name="label">24x24</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
@@ -264,9 +278,11 @@
             <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">baseline</property>
-                <property name="label">32×32</property>
+                <property name="valign">center</property>
+                <property name="label">32x32</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
@@ -279,9 +295,11 @@
             <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">baseline</property>
-                <property name="label">48×48</property>
+                <property name="valign">center</property>
+                <property name="label">48x48</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
@@ -294,9 +312,11 @@
             <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">baseline</property>
-                <property name="label">64×64</property>
+                <property name="valign">center</property>
+                <property name="label">64x64</property>
                 <style>
                   <class name="dim-label"/>
                 </style>

demos/widget-factory/widget-factory.c

@@ -38,25 +38,6 @@ change_theme_state (GSimpleAction *action,
   g_simple_action_set_state (action, state);
 }
 
-static GtkWidget *page_stack;
-
-static void
-change_transition_state (GSimpleAction *action,
-                         GVariant      *state,
-                         gpointer       user_data)
-{
-  GtkStackTransitionType transition;
-
-  if (g_variant_get_boolean (state))
-    transition = GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT_RIGHT;
-  else
-    transition = GTK_STACK_TRANSITION_TYPE_NONE;
-
-  gtk_stack_set_transition_type (GTK_STACK (page_stack), transition);
-
-  g_simple_action_set_state (action, state);
-}
-
 static gboolean
 get_idle (gpointer data)
 {
@@ -805,39 +786,10 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget)
   row = gtk_widget_get_parent (row);
   gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
   g_object_set_data (G_OBJECT (widget), color, row);
-  g_object_set_data (G_OBJECT (row), "color", (gpointer)color);
 }
 
 static void
-rgba_changed (GtkColorChooser *chooser, GParamSpec *pspec, GtkListBox *box)
-{
-  gtk_list_box_select_row (box, NULL);
-}
-
-static void
-set_color (GtkListBox *box, GtkListBoxRow *row, GtkColorChooser *chooser)
-{
-  const char *color;
-  GdkRGBA rgba;
-
-  if (!row)
-    return;
-
-  color = (const char *)g_object_get_data (G_OBJECT (row), "color");
-
-  if (!color)
-    return;
-
-  if (gdk_rgba_parse (&rgba, color))
-    {
-      g_signal_handlers_block_by_func (chooser, rgba_changed, box);
-      gtk_color_chooser_set_rgba (chooser, &rgba);
-      g_signal_handlers_unblock_by_func (chooser, rgba_changed, box);
-    }
-}
-
-static void
-populate_colors (GtkWidget *widget, GtkWidget *chooser)
+populate_colors (GtkWidget *widget)
 {
   struct { const gchar *name; const gchar *color; const gchar *title; } colors[] = {
     { "2.5", "#C8828C", "Red" },
@@ -915,13 +867,10 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser)
       gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1);
       row = gtk_widget_get_parent (row);
       gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
-      g_object_set_data (G_OBJECT (row), "color", (gpointer)colors[i].color);
       if (colors[i].title)
         g_object_set_data (G_OBJECT (row), "title", (gpointer)colors[i].title);
     }
 
-  g_signal_connect (widget, "row-selected", G_CALLBACK (set_color), chooser);
-
   gtk_list_box_invalidate_headers (GTK_LIST_BOX (widget));
 
   sw = gtk_widget_get_ancestor (widget, GTK_TYPE_SCROLLED_WINDOW);
@@ -1085,7 +1034,7 @@ my_tv_draw_layer (GtkTextView      *widget,
 {
   MyTextView *tv = (MyTextView *)widget;
 
-  if (layer == GTK_TEXT_VIEW_LAYER_BELOW_TEXT && tv->surface)
+  if (layer == GTK_TEXT_VIEW_LAYER_BELOW && tv->surface)
     {
       cairo_save (cr);
       cairo_set_source_surface (cr, tv->surface, 0.0, 0.0);
@@ -1507,124 +1456,6 @@ g_test_permission_class_init (GTestPermissionClass *class)
   permission_class->release_finish = release_finish;
 }
 
-static int icon_sizes[5];
-
-static void
-register_icon_sizes (void)
-{
-  static gboolean registered;
-
-  if (registered)
-    return;
-
-  registered = TRUE;
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  icon_sizes[0] = gtk_icon_size_register ("a", 16, 16);
-  icon_sizes[1] = gtk_icon_size_register ("b", 24, 24);
-  icon_sizes[2] = gtk_icon_size_register ("c", 32, 32);
-  icon_sizes[3] = gtk_icon_size_register ("d", 48, 48);
-  icon_sizes[4] = gtk_icon_size_register ("e", 64, 64);
-G_GNUC_END_IGNORE_DEPRECATIONS
-}
-
-static int
-find_icon_size (GtkIconSize size)
-{
-  gint w, h, w2, h2;
-  gint i;
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  gtk_icon_size_lookup (size, &w, &h);
-  for (i = 0; i < G_N_ELEMENTS (icon_sizes); i++)
-    {
-      gtk_icon_size_lookup (icon_sizes[i], &w2, &h2);
-      if (w == w2)
-        return i;
-    }
-G_GNUC_END_IGNORE_DEPRECATIONS
-
-  return 2;
-}
-
-static void
-update_buttons (GtkWidget *iv, int pos)
-{
-  GtkWidget *button;
-
-  button = GTK_WIDGET (g_object_get_data (G_OBJECT (iv), "increase_button"));
-  gtk_widget_set_sensitive (button, pos + 1 < G_N_ELEMENTS (icon_sizes));
-  button = GTK_WIDGET (g_object_get_data (G_OBJECT (iv), "decrease_button"));
-  gtk_widget_set_sensitive (button, pos > 0);
-}
-
-static void
-increase_icon_size (GtkWidget *iv)
-{
-  GList *cells;
-  GtkCellRendererPixbuf *cell;
-  GtkIconSize size;
-  int i;
-
-  cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (iv));
-  cell = cells->data;
-  g_list_free (cells);
-
-  g_object_get (cell, "stock-size", &size, NULL);
-
-  i = find_icon_size (size);
-  i = CLAMP (i + 1, 0, G_N_ELEMENTS (icon_sizes) - 1);
-  size = icon_sizes[i];
-
-  g_object_set (cell, "stock-size", size, NULL);
-
-  update_buttons (iv, i);
-
-  gtk_widget_queue_resize (iv);
-}
-
-static void
-decrease_icon_size (GtkWidget *iv)
-{
-  GList *cells;
-  GtkCellRendererPixbuf *cell;
-  GtkIconSize size;
-  int i;
-
-  cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (iv));
-  cell = cells->data;
-  g_list_free (cells);
-
-  g_object_get (cell, "stock-size", &size, NULL);
-
-  i = find_icon_size (size);
-  i = CLAMP (i - 1, 0, G_N_ELEMENTS (icon_sizes) - 1);
-  size = icon_sizes[i];
-
-  g_object_set (cell, "stock-size", size, NULL);
-
-  update_buttons (iv, i);
-
-  gtk_widget_queue_resize (iv);
-}
-
-static void
-reset_icon_size (GtkWidget *iv)
-{
-  GList *cells;
-  GtkCellRendererPixbuf *cell;
-
-  cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (iv));
-  cell = cells->data;
-  g_list_free (cells);
-
-  g_object_set (cell, "stock-size", icon_sizes[2], NULL);
-
-  update_buttons (iv, 2);
-
-  gtk_widget_queue_resize (iv);
-}
-
 static void
 activate (GApplication *app)
 {
@@ -1640,7 +1471,6 @@ activate (GApplication *app)
   GtkCssProvider *provider;
   static GActionEntry win_entries[] = {
     { "dark", NULL, NULL, "false", change_theme_state },
-    { "transition", NULL, NULL, "false", change_transition_state },
     { "search", activate_search, NULL, NULL, NULL },
     { "delete", activate_delete, NULL, NULL, NULL },
     { "busy", get_busy, NULL, NULL, NULL },
@@ -1668,7 +1498,6 @@ activate (GApplication *app)
   GAction *action;
 
   g_type_ensure (my_text_view_get_type ());
-  register_icon_sizes ();
 
   provider = gtk_css_provider_new ();
   gtk_css_provider_load_from_resource (provider, "/org/gtk/WidgetFactory/widget-factory.css");
@@ -1687,9 +1516,6 @@ activate (GApplication *app)
   gtk_builder_add_callback_symbol (builder, "on_range_to_changed", (GCallback)on_range_to_changed);
   gtk_builder_add_callback_symbol (builder, "osd_frame_button_press", (GCallback)osd_frame_button_press);
   gtk_builder_add_callback_symbol (builder, "tab_close_cb", (GCallback)tab_close_cb);
-  gtk_builder_add_callback_symbol (builder, "increase_icon_size", (GCallback)increase_icon_size);
-  gtk_builder_add_callback_symbol (builder, "decrease_icon_size", (GCallback)decrease_icon_size);
-  gtk_builder_add_callback_symbol (builder, "reset_icon_size", (GCallback)reset_icon_size);
 
   gtk_builder_connect_signals (builder, NULL);
 
@@ -1777,8 +1603,6 @@ activate (GApplication *app)
   g_signal_connect (stack, "notify::visible-child-name", G_CALLBACK (page_changed_cb), NULL);
   page_changed_cb (stack, NULL, NULL);
 
-  page_stack = stack;
-
   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");
@@ -1802,11 +1626,7 @@ activate (GApplication *app)
   gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (widget), row_separator_func, NULL, NULL);
   gtk_tree_view_expand_all (GTK_TREE_VIEW (widget));
 
-  widget = GTK_WIDGET (gtk_builder_get_object (builder, "munsell"));
-  widget2 = GTK_WIDGET (gtk_builder_get_object (builder, "cchooser"));
-
-  populate_colors (widget, widget2);
-  g_signal_connect (widget2, "notify::rgba", G_CALLBACK (rgba_changed), widget);
+  populate_colors ((GtkWidget *)gtk_builder_get_object (builder, "munsell"));
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "page_combo");
   gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (widget), page_combo_separator_func, NULL, NULL);
@@ -1850,8 +1670,8 @@ activate (GApplication *app)
                     G_CALLBACK (textbuffer_notify_selection), widget);
   widget = (GtkWidget *)gtk_builder_get_object (builder, "pastebutton");
   g_signal_connect (widget, "clicked", G_CALLBACK (handle_cutcopypaste), widget2);
-  g_signal_connect_object (gtk_widget_get_clipboard (widget2, GDK_SELECTION_CLIPBOARD), "owner-change",
-                           G_CALLBACK (clipboard_owner_change), widget, 0);
+  g_signal_connect (gtk_widget_get_clipboard (widget2, GDK_SELECTION_CLIPBOARD), "owner-change",
+                    G_CALLBACK (clipboard_owner_change), widget);
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "osd_frame");
   widget2 = (GtkWidget *)gtk_builder_get_object (builder, "totem_like_osd");
@@ -1890,12 +1710,6 @@ activate (GApplication *app)
   gtk_lock_button_set_permission (GTK_LOCK_BUTTON (widget2), permission);
   g_object_unref (permission);
 
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "iconview1");
-  widget2 = (GtkWidget *)gtk_builder_get_object (builder, "increase_button");
-  g_object_set_data (G_OBJECT (widget), "increase_button", widget2);
-  widget2 = (GtkWidget *)gtk_builder_get_object (builder, "decrease_button");
-  g_object_set_data (G_OBJECT (widget), "decrease_button", widget2);
-
   gtk_widget_show_all (GTK_WIDGET (window));
 
   g_object_unref (builder);

demos/widget-factory/widget-factory.css

@@ -1,6 +1,6 @@
 .circular-button {
   border-radius: 20px;
-  -gtk-outline-radius: 20px;
+  outline-radius: 20px;
 }
 
 .small-button {

demos/widget-factory/widget-factory.ui

@@ -11,10 +11,6 @@
         <attribute name="label" translatable="yes">Dark Theme</attribute>
         <attribute name="action">win.dark</attribute>
       </item>
-      <item>
-        <attribute name="label" translatable="yes">Slide Pages</attribute>
-        <attribute name="action">win.transition</attribute>
-      </item>
     </section>
   </menu>
   <menu id="dinner_menu">
@@ -132,8 +128,6 @@
       <column type="gchararray"/>
       <!-- column-name Nick -->
       <column type="gchararray"/>
-      <!-- column-name isRadio -->
-      <column type="gboolean"/>
     </columns>
     <data>
       <row>
@@ -141,44 +135,21 @@
         <col id="1">emblem-default-symbolic</col>
         <col id="2" translatable="yes">Andrea</col>
         <col id="3" translatable="yes">Cimi</col>
-        <col id="4">False</col>
       </row>
       <row>
         <col id="0">False</col>
         <col id="1">emblem-important-symbolic</col>
         <col id="2" translatable="yes">Otto</col>
         <col id="3" translatable="yes">chaotic</col>
-        <col id="4">False</col>
       </row>
       <row>
         <col id="0">True</col>
         <col id="1">weather-clear-night-symbolic</col>
         <col id="2" translatable="yes">Orville</col>
         <col id="3" translatable="yes">Redenbacher</col>
-        <col id="4">False</col>
-      </row>
-      <row>
-        <col id="0">True</col>
-        <col id="1">face-monkey-symbolic</col>
-        <col id="2" translatable="yes">Benjamin</col>
-        <col id="3" translatable="yes">Company</col>
-        <col id="4">True</col>
       </row>
     </data>
   </object>
-  <object class="GtkEntryCompletion" id="name_completion">
-    <property name="model">liststore1</property>
-    <property name="text-column">2</property>
-    <property name="inline-completion">1</property>
-    <property name="popup-single-match">0</property>
-    <property name="inline-selection">1</property>
-    <child>
-      <object class="GtkCellRendererText"/>
-      <attributes>
-        <attribute name="text">2</attribute>
-      </attributes>
-    </child>
-  </object>
   <object class="GtkListStore" id="lrmodel">
     <columns>
       <column type="gchararray"/>
@@ -436,7 +407,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
         <child>
           <object class="GtkStack" id="toplevel_stack">
             <property name="visible">1</property>
-            <property name="transition-duration">1000</property>
             <child>
               <object class="GtkBox" id="page1">
                 <property name="visible">1</property>
@@ -635,8 +605,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="visible">1</property>
                                 <property name="can_focus">1</property>
                                 <property name="invisible_char">•</property>
-                                <property name="width-chars">2</property>
-                                <property name="max-width-chars">2</property>
                                 <property name="adjustment">adjustment2</property>
                               </object>
                               <packing>
@@ -650,8 +618,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="can_focus">1</property>
                                 <property name="invisible_char">•</property>
                                 <property name="sensitive">0</property>
-                                <property name="width-chars">2</property>
-                                <property name="max-width-chars">2</property>
                               </object>
                               <packing>
                                 <property name="fill">0</property>
@@ -1115,11 +1081,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="max-value">5</property>
                                 <property name="value">2</property>
                                 <property name="mode">1</property>
-                                <offsets>
-                                  <offset name="low" value="1"/>
-                                  <offset name="high" value="4"/>
-                                  <offset name="full" value="5"/>
-                                </offsets>
                               </object>
                               <packing>
                                 <property name="position">11</property>
@@ -1402,7 +1363,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                       <object class="GtkCellRendererToggle" id="cellrenderertoggle1"/>
                                       <attributes>
                                         <attribute name="active">0</attribute>
-                                        <attribute name="radio">4</attribute>
                                       </attributes>
                                     </child>
                                   </object>
@@ -2756,65 +2716,23 @@ microphone-sensitivity-medium-symbolic</property>
                             <property name="can_focus">1</property>
                             <property name="expanded">1</property>
                             <child>
-                              <object class="GtkBox">
+                              <object class="GtkScrolledWindow" id="scrolledwindow3">
                                 <property name="visible">1</property>
-                                <property name="orientation">vertical</property>
+                                <property name="can_focus">1</property>
+                                <property name="shadow_type">in</property>
+                                <property name="margin-top">6</property>
+                                <property name="height_request">226</property>
                                 <child>
-                                  <object class="GtkScrolledWindow" id="scrolledwindow3">
+                                  <object class="GtkIconView" id="iconview1">
                                     <property name="visible">1</property>
                                     <property name="can_focus">1</property>
-                                    <property name="shadow_type">in</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="height_request">226</property>
+                                    <property name="selection_mode">multiple</property>
+                                    <property name="model">iconsmodel</property>
                                     <child>
-                                      <object class="GtkIconView" id="iconview1">
-                                        <property name="visible">1</property>
-                                        <property name="can_focus">1</property>
-                                        <property name="selection_mode">multiple</property>
-                                        <property name="model">iconsmodel</property>
-                                        <child>
-                                          <object class="GtkCellRendererPixbuf" id="iconviewcell">
-                                            <property name="stock-size">5</property>
-                                          </object>
-                                          <attributes>
-                                            <attribute name="icon-name">0</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkToolbar">
-                                    <property name="visible">1</property>
-                                    <property name="icon-size">1</property>
-                                    <property name="toolbar-style">icons</property>
-                                    <style>
-                                      <class name="inline-toolbar"/>
-                                    </style>
-                                    <child>
-                                      <object class="GtkToolButton" id="decrease_button">
-                                        <property name="visible">1</property>
-                                        <property name="icon-name">zoom-out-symbolic</property>
-                                        <property name="label">Remove item</property>
-                                        <signal name="clicked" handler="decrease_icon_size" object="iconview1" swapped="yes"/>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="increase_button">
-                                        <property name="visible">1</property>
-                                        <property name="icon-name">zoom-in-symbolic</property>
-                                        <property name="label">Add item</property>
-                                        <signal name="clicked" handler="increase_icon_size" object="iconview1" swapped="yes"/>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="reset_button">
-                                        <property name="visible">1</property>
-                                        <property name="icon-name">zoom-original-symbolic</property>
-                                        <property name="label">Refresh</property>
-                                        <signal name="clicked" handler="reset_icon_size" object="iconview1" swapped="yes"/>
-                                      </object>
+                                      <object class="GtkCellRendererPixbuf" id="iconviewcell"/>
+                                      <attributes>
+                                        <attribute name="icon-name">0</attribute>
+                                      </attributes>
                                     </child>
                                   </object>
                                 </child>
@@ -3712,7 +3630,6 @@ microphone-sensitivity-medium-symbolic</property>
                             <property name="visible">1</property>
                             <property name="can_focus">1</property>
                             <property name="placeholder_text" translatable="yes">Name…</property>
-                            <property name="completion">name_completion</property>
                           </object>
                         </child>
                         <child>
@@ -3754,8 +3671,7 @@ microphone-sensitivity-medium-symbolic</property>
                             </child>
                             <style>
                               <class name="image-button"/>
-                              <class name="circular"/>
-                              <class name="flat"/>
+                              <class name="sidebar-button"/>
                             </style>
                           </object>
                         </child>
@@ -3834,9 +3750,10 @@ microphone-sensitivity-medium-symbolic</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkColorChooserWidget" id="cchooser">
+                      <object class="GtkSpinner">
                         <property name="visible">1</property>
-                        <property name="show-editor">1</property>
+                        <property name="active">1</property>
+                        <property name="expand">1</property>
                       </object>
                     </child>
                   </object>

docs/reference/gdk/gdk-docs.sgml

@@ -22,7 +22,6 @@
     <xi:include href="xml/gdkdisplaymanager.xml" />
     <xi:include href="xml/gdkdisplay.xml" />
     <xi:include href="xml/gdkscreen.xml" />
-    <xi:include href="xml/gdkseat.xml" />
     <xi:include href="xml/gdkdevicemanager.xml" />
     <xi:include href="xml/gdkdevice.xml" />
     <xi:include href="xml/regions.xml" />

docs/reference/gdk/gdk3-sections.txt

@@ -156,8 +156,6 @@ gdk_display_supports_input_shapes
 gdk_display_supports_composite
 gdk_display_get_app_launch_context
 gdk_display_notify_startup_complete
-gdk_display_get_default_seat
-gdk_display_list_seats
 
 <SUBSECTION Standard>
 GDK_DISPLAY
@@ -364,7 +362,6 @@ gdk_window_unstick
 gdk_window_maximize
 gdk_window_unmaximize
 gdk_window_fullscreen
-gdk_window_fullscreen_on_monitor
 gdk_window_unfullscreen
 GdkFullscreenMode
 gdk_window_get_fullscreen_mode
@@ -374,8 +371,6 @@ gdk_window_set_keep_below
 gdk_window_set_opacity
 gdk_window_set_composited
 gdk_window_get_composited
-gdk_window_set_pass_through
-gdk_window_get_pass_through
 gdk_window_move
 gdk_window_resize
 gdk_window_move_resize
@@ -737,7 +732,6 @@ gdk_device_get_has_cursor
 gdk_device_get_n_axes
 gdk_device_get_n_keys
 gdk_device_warp
-gdk_device_get_seat
 
 <SUBSECTION>
 gdk_device_grab
@@ -778,31 +772,6 @@ gdk_device_type_get_type
 GDK_MAX_TIMECOORD_AXES
 </SECTION>
 
-<SECTION>
-<TITLE>GdkSeat</TITLE>
-<FILE>gdkseat</FILE>
-GdkSeat
-GdkSeatCapabilities
-GdkSeatGrabPrepareFunc
-gdk_seat_get_display
-gdk_seat_grab
-gdk_seat_ungrab
-gdk_seat_get_capabilities
-gdk_seat_get_pointer
-gdk_seat_get_keyboard
-gdk_seat_get_slaves
-
-<SUBSECTION Standard>
-GDK_SEAT
-GDK_IS_SEAT
-GDK_TYPE_SEAT
-GDK_TYPE_SEAT_CAPABILITIES
-
-<SUBSECTION Private>
-gdk_seat_get_type
-gdk_seat_capabilities_get_type
-</SECTION>
-
 <SECTION>
 <TITLE>GdkDeviceManager</TITLE>
 <FILE>gdkdevicemanager</FILE>
@@ -856,7 +825,6 @@ gdk_event_get_keyval
 gdk_event_get_root_coords
 gdk_event_get_scroll_direction
 gdk_event_get_scroll_deltas
-gdk_event_is_scroll_stop_event
 gdk_event_get_state
 gdk_event_get_time
 gdk_event_get_window
@@ -868,7 +836,6 @@ gdk_events_get_angle
 gdk_events_get_center
 gdk_events_get_distance
 gdk_event_triggers_context_menu
-gdk_event_get_seat
 
 <SUBSECTION>
 gdk_event_handler_set
@@ -976,16 +943,13 @@ gdk_cursor_get_type
 <TITLE>Drag and Drop</TITLE>
 <FILE>dnd</FILE>
 GdkDragContext
-GdkDragCancelReason
 gdk_drag_get_selection
 gdk_drag_abort
 gdk_drop_reply
 gdk_drag_drop
-gdk_drag_drop_done
 gdk_drag_find_window_for_screen
 gdk_drag_begin
 gdk_drag_begin_for_device
-gdk_drag_begin_from_point
 gdk_drag_motion
 gdk_drop_finish
 GdkDragProtocol
@@ -1003,8 +967,6 @@ gdk_drag_context_set_device
 gdk_drag_context_get_source_window
 gdk_drag_context_get_dest_window
 gdk_drag_context_get_protocol
-gdk_drag_context_get_drag_window
-gdk_drag_context_set_hotspot
 
 <SUBSECTION Standard>
 GDK_DRAG_CONTEXT
@@ -1218,7 +1180,6 @@ gdk_window_impl_x11_get_type
 <INCLUDE>gdk/gdkwayland.h</INCLUDE>
 <TITLE>Wayland Interaction</TITLE>
 <FILE>wayland_interaction</FILE>
-gdk_wayland_seat_get_wl_seat
 gdk_wayland_device_get_wl_keyboard
 gdk_wayland_device_get_wl_pointer
 gdk_wayland_device_get_wl_seat

docs/reference/gdk/gdk3.types

@@ -11,6 +11,5 @@ gdk_frame_clock_get_type
 gdk_gl_context_get_type
 gdk_keymap_get_type
 gdk_screen_get_type
-gdk_seat_get_type
 gdk_visual_get_type
 gdk_window_get_type

docs/reference/gtk/Makefile.am

@@ -172,7 +172,6 @@ IGNORE_HFILES = \
 	gtktoolbarprivate.h		\
 	gtktoolpaletteprivate.h		\
 	gtktooltipprivate.h		\
-	gtktooltipwindowprivate.h	\
 	gtktreeprivate.h		\
 	gtkwidgetprivate.h		\
 	gtkwin32themeprivate.h		\
@@ -281,45 +280,43 @@ MKHTML_OPTIONS="--path=\"$(abs_srcdir):$(top_srcdir)/examples\""
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =					\
-	broadway.xml				\
-	broadwayd.xml				\
+	version.xml				\
+	running.sgml				\
 	building.sgml				\
 	compiling.sgml				\
-	css-overview.xml			\
-	css-properties.xml			\
 	drawing-model.xml			\
-	getting_started.xml			\
 	glossary.xml				\
-	gtk3-demo-application.xml		\
-	gtk3-demo.xml				\
-	gtk3-icon-browser.xml			\
-	gtk3-widget-factory.xml			\
-	gtk-builder-tool.xml			\
-	gtk-encode-symbolic-svg.xml		\
-	gtk-launch.xml				\
-	gtk-query-immodules-3.0.xml		\
-	gtk-query-settings.xml			\
-	gtk-update-icon-cache.xml		\
-	input-handling.xml			\
 	migrating-2to3.xml			\
 	migrating-checklist.sgml		\
+	migrating-unique-GtkApplication.xml	\
+	migrating-smclient-GtkApplication.xml	\
 	migrating-GtkGrid.xml			\
 	migrating-GtkStyleContext.xml		\
-	migrating-smclient-GtkApplication.xml	\
-	migrating-unique-GtkApplication.xml	\
-	mir.xml					\
 	osx.sgml				\
-	overview.xml 				\
+	broadway.xml				\
+	wayland.xml				\
+	mir.xml					\
 	question_index.sgml			\
 	resources.sgml				\
-	running.sgml				\
 	text_widget.sgml			\
 	tree_widget.sgml			\
-	version.xml				\
-	visual_index.xml			\
-	wayland.xml				\
 	windows.sgml				\
-	x11.sgml
+	x11.sgml				\
+	gtk3-demo.xml				\
+	gtk3-demo-application.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				\
+	gtk-builder-tool.xml			\
+	input-handling.xml			\
+	visual_index.xml			\
+	getting_started.xml			\
+	overview.xml 				\
+	gtk-query-settings.xml
 
 expand_content_files = 				\
 	compiling.sgml				\
@@ -329,10 +326,10 @@ expand_content_files = 				\
 	input-handling.xml			\
 	migrating-2to3.xml			\
 	migrating-checklist.sgml		\
+	migrating-unique-GtkApplication.xml	\
+	migrating-smclient-GtkApplication.xml	\
 	migrating-GtkGrid.xml			\
 	migrating-GtkStyleContext.xml		\
-	migrating-smclient-GtkApplication.xml	\
-	migrating-unique-GtkApplication.xml	\
 	question_index.sgml			\
 	text_widget.sgml			\
 	tree_widget.sgml

docs/reference/gtk/getting_started.xml

@@ -211,7 +211,7 @@
 
     <para>When creating an application, you'll want to put more than one widget
     inside a window.
-    When you want to put more than one widget into a window,
+    When you want to put more than one widget into a window, it
     it becomes important to control how each widget is positioned and sized.
     This is where packing comes in.</para>
 

docs/reference/gtk/gtk-builder-tool.xml

@@ -31,7 +31,6 @@
 <cmdsynopsis>
 <command>gtk-builder-tool</command>
 <arg choice="opt"><replaceable>COMMAND</replaceable></arg>
-<arg choice="opt" rep="repeat"><replaceable>OPTION</replaceable></arg>
 <arg choice="plain"><replaceable>FILE</replaceable></arg>
 </cmdsynopsis>
 </refsynopsisdiv>
@@ -63,26 +62,6 @@
     <term><option>enumerate</option></term>
       <listitem><para>Lists all the named objects that are created in the .ui file.</para></listitem>
     </varlistentry>
-    <varlistentry>
-    <term><option>preview</option></term>
-      <listitem><para>Preview the .ui file. This command accepts options
-                to specify the ID of an object and a .css file to use.</para></listitem>
-    </varlistentry>
-  </variablelist>
-</refsect1>
-
-<refsect1><title>Preview Options</title>
-  <para>The <option>preview</option> command accepts the following options:</para>
-  <variablelist>
-    <varlistentry>
-    <term><option>--id=<arg choice="plain">ID</arg></option></term>
-      <listitem><para>The ID of the object to preview. If not specified,
-                gtk-builder-tool will choose a suitable object on its own.</para></listitem>
-    </varlistentry>
-    <varlistentry>
-    <term><option>--css=<arg choice="plain">FILE</arg></option></term>
-      <listitem><para>Load style information from the given .css file.</para></listitem>
-    </varlistentry>
   </variablelist>
 </refsect1>
 

docs/reference/gtk/gtk-docs.sgml

@@ -28,6 +28,7 @@
     <xi:include href="xml/input-handling.xml" />
   </part>
 
+
   <part id="gtkobjects">
     <title>GTK+ Widgets and Objects</title>
 
@@ -245,6 +246,7 @@
       <xi:include href="xml/gtkshortcutssection.xml" />
       <xi:include href="xml/gtkshortcutsgroup.xml" />
       <xi:include href="xml/gtkshortcutsshortcut.xml" />
+      <xi:include href="xml/gtkshortcutsgesture.xml" />
     </chapter>
 
     <chapter id="MiscObjects">
@@ -375,8 +377,6 @@
 
   <part id="theming">
     <title>Theming in GTK+</title>
-    <xi:include href="css-overview.xml" />
-    <xi:include href="css-properties.xml" />
     <xi:include href="xml/gtkstylecontext.xml" />
     <xi:include href="xml/gtkcssprovider.xml" />
     <xi:include href="xml/gtkstyleprovider.xml" />