Adwaita: Include sources in dist

These things are necessary to work on the Adwaita theme,
so include them in the tarball.

Makefile.am

@@ -1,7 +1,7 @@
 ## Makefile.am for GTK+
 include $(top_srcdir)/Makefile.decl
 
-SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples
+SRC_SUBDIRS = util gdk gtk libgail-util modules demos tests testsuite examples
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}

NEWS

@@ -1,3 +1,499 @@
+Overview of Changes in GTK+ 3.13.1 to 3.13.2
+============================================
+
+* Interactive debugging support. The GtkInspector
+  window can be triggered with the Ctrl-Shift-I
+  or Ctrl-Shift-D keyboard shortcuts, or via the
+  GTK_DEBUG environment variable.
+
+* Gesture support has landed. New classes include
+  GtkGestureLongPress, GtkGestureMultiPress, GtkGestureSwipe,
+  GtkGesturePan, GtkGestureRotate, GtkGestureZoom. Many GTK+
+  widgets already use gestures internally. Gestures also
+  show up in GtkInspector.
+  The gesture-related APIs are still subject to change.
+
+* GTK+ widgets can now draw outside their allocation,
+  by setting a clip with gtk_widget_set_clip().
+  The clip-related APIs are still subject to change.
+
+* GtkStack has added a few more transition types
+
+* GtkProgressBar is now narrower
+
+* CSS
+ - Support outline-radius in CSS
+ - Implement 'unset' and 'all'
+ - Support -gtk-icontheme
+ - Support -gtk-icon-source
+ - Add -gtk-icon-transform, supporting the 2D
+   parts of CSS transforms
+ - Support -gtk-icon-style
+
+* Theme
+ - Use outlines to render focus rings
+ - Use icons to render spinners, expanders and arrows
+ - GtkIconTheme can force symbolic or regular
+   icon variants
+ - GtkIconTheme will automatically load rtl
+   icon variants
+
+* Win32:
+ - Theme improvements
+
+* Wayland:
+ - Update to the latest xdg-shell protocol
+
+* Deprecations:
+ GdkColor
+ GtkMisc
+ GtkArrow
+ focus-line-width style property
+ GtkNumerableIcon
+ GtkButton::x/yalign
+ gtk_widget_reparent
+ gtk_widget_region_intersect
+ gtk_container_set_reallocate_redraws
+
+* Bugs fixed:
+ 525206 Remove superfluous non-NULL tests for the GtkScrolledWindow scrollbars
+ 614717 gtk_text_buffer_create_tag fails to return error on duplicate tag
+ 636695 GdkColor should be deprecated
+ 645966 gtk-demo leaks a GtkSizeGroup
+ 698396 GtkTreeStore crashes when reordering 0 elements
+ 708037 Allow live updates on widgets implementing GtkColorChooser
+ 720330 Gtk-CRITICAL **: gtk_entry_completion_set_model: assertion 'GTK_IS_E...
+ 721069 gtk_win32_embed_widget_show infinite recursion
+ 726676 More GtkStack transition counterparts of OVER_UP_DOWN
+ 727147 Search bar is too narrow
+ 727994 Gtk Popover closes on click
+ 728135 gtk_widget_set_visible's nothing-changed-check
+ 728284 [treeview] Graphics artifact when scrolling with hover-selection
+ 729346 W32: App-notification has no theme, shows up transparent
+ 729353 W32: horizontal-buttons get "selected" background when focused
+ 729451 Removing accels with application_set_accels_for_action
+ 729461 Introspection issue with GtkApplication
+ 729473 FileChooser: typos in gtk_file_chooser_set_local_only ()
+ 729475 FileChooser: typo in gtk_set_create_folders()
+ 729496 Crash with latest gtk+ from master in gtk_combo_box_get_preferred_width
+ 729564 Deprecate GtkArrow
+ 729594 Don't stretch switches in Widget Factory
+ 729598 Populate page 2 of the Widget Factory
+ 729607 GtkAboutDialog: gtk aborts when trying to show an about dialog
+ 729670 cairo surface leaked for each cursor created from pixmap
+ 729817 GtkCellLayout: allow finding attributes at runtime
+ 729834 gdk: missing (nullable) annotations on return values
+ 729915 Popopver does not follow relative widget to find action groups
+ 729983 gdk: assorted introspection and documentation syntax fixes
+ 730007 GtkInspector: add a setting to disable C-S-i
+ 730008 make gtk_set_interactive_debugging available for apps
+ 730035 GtkFileFilter contains refs to GtkRecentFilter which are probably typos
+ 730043 Add an alternative to Ctrl-Shift-I
+ 730095 Add a private call API to export internals to modules
+ 730142 placessidebar: use proper canonicalization when checking if home
+ 730183 RFC: silence harmless critical
+ 730306 Gtk+ >= 3.0 fails to load modules from settings.ini files
+ 730526 Fix the edit-clear icons in RTL 
+ 730353 Horizontal and vertical scrolling
+ 700030 GdkEventSequence not accessible from introspected bindings
+ 641836 Capture/bubble event handling
+ 119906 Add event when Double Click timeout expires
+
+* Translation updates:
+ Belarusian
+ Hebrew
+ Russian
+ Spanish 
+  
+
+Overview of Changes in GTK+ 3.12.0 to 3.13.1
+============================================
+
+* GtkListBox can now do multi-selection 
+
+* GtkSwitch has a way to delay state changes
+
+* GtkMenuButton is using a popover for menu models by default
+
+* GtkPopover can have horizontal sections
+
+* GtkFileChooser received some design improvements
+
+* GtkBuilder
+ - Supports property binding
+ - Supports dialog actions
+
+* Client-side decorations
+ - The requirement for _GTK_FRAME_EXTENTS has been dropped
+   to avoid 'double headers' with most window managers
+ - Drawing of DND highlights around the entire window works
+
+* Windows backend:
+ - *Many* theme improvements
+ - Add popover theming
+ - Enable introspection
+
+* Wayland backend
+ - Updates for xdg_shell protocol changes
+ - Touch support
+
+* Broadway backend
+ - Now builds on OpenBSD
+
+* Bugs fixed:
+ 495105 Open recent file keyboard shortcuts do not work correctly
+ 654417 Add <binding> element to GtkBuilder syntax
+ 686170 gdk/win32: VK_SNAPSHOT maps to GDK_Print
+ 712752 GtkClipboard: add _get_default and _get_primary
+ 722058 GtkTreeModelFilter bug
+ 722211 improve the file chooser design
+ 722817 Add gobject-introspection for GdkWin32
+ 723963 Use popover for the fallback app menu in the headerbar
+ 725648 Switches should always indicate the current state
+ 726179 Trivial Fix: size-allocate signal has missing documentation
+ 726271 Items not highlighted while mouse-hovered
+ 726298 gtk-font-name isn't correctly handled on Windows
+ 726475 After looking at Aisleriot solitare, I get rendering glitches...
+ 726592 W32: problems with CSDed windows
+ 726859 Assertion/crash if gtk_radio_menu_item_set_group() is called twice
+ 726870 all: Name more idles and timeouts
+ 726871 treeview: Lower the duration of validation iterations
+ 726996 Label-for/Labelled-by AtkRelations missing for containers in t...
+ 727009 redefinition of GtkPrinterCloudprint: cloudprint fails to build
+ 727022 W32: Both inc- and dec-buttons on GtkSpinbutton are "inc"
+ 727035 W32: Combobox button is drawn with two arrows
+ 727036 W32: Combobox dropdown color is button-gray instead of window-white
+ 727037 W32: Menu items look thin, while submenu arrows are huge
+ 727075 W32: Combobox (with an entry) is gigantic
+ 727078 W32: GtkPopover is transparent and non-interactable
+ 727080 W32: Window re-size grip looks UGLY.
+ 727210 W32: Prelight doesn't apply to check/radio marks
+ 727211 W32: Selection background color applies to check/radio marks
+ 727213 W32: Notebook widget is not styled correctly
+ 727244 W32: Items selected in listbox have correct background color, ...
+ 727245 W32: No .dim-label style
+ 727313 a11y: do not use deprecated a11y functions.
+ 727322 docs: Remove '\' escape character from literals
+ 727391 W32: scrollbar sliders have no "active" and "insensitive" styles
+ 727410 W32: tooltips are not themed
+ 727414 Redundant text in titlebar
+ 727487 Color picker check marks not cleared properly
+ 727643 Segfault in gtk-3.12.0
+ 727644 SEGV in gtk_window_propagate_key_event()
+ 727662 GtkVolumeButton displays "missing image" icons
+ 727908 Various GtkTextView improvements (doc, unit tests)
+ 727973 W32: focused button is visibly smaller
+ 728023 Warning when passing NULL window to inhibit
+ 728054 entry: consider ascent and descent when requesting height
+ 728073 Allow defining an invisible resize area for GtkPaned's handle
+ 728140 Illegal parameter passed to g_variant_new in gtk_application_im...
+ 728165 gtk_target_list_new argument should be (allow-none)
+ 728183 Drag and drop (GdkFrameClock) does not work for hidden widgets
+ 728272 make broadway backend build on OpenBSD
+ 728426 Implement the wl_touch interface
+ 728745 win32: add more clipboard data checks to avoid crash
+ 728806 W32: Check- and radio-buttons have a selection rectangle on act...
+ 728807 W32: Checkbutton focus rectangle becomes almost white on prelight
+ 728808 W32: Checkboxes on modelbuttons are drawn like buttons themselves
+ 728810 W32: Modelbuttons look like buttons
+ 728846 GtkDialog: Support adding action widgets in ui files
+ 728992 GtkLockButton crash if clicked and permission is NULL
+ 729013 Use OUTPUT_SCALE instead of xft-dpi on wayland 
+ 729095 redraw problems when resizing popovers
+ 729097 size allocation problem in popovers 
+
+* Translation updates:
+ Basque
+ Catalan
+ German
+ Greek
+ Hebrew
+ Russian
+ Slovenian
+
+
+Overview of Changes in GTK+ 3.11.9 to 3.12.0
+============================================
+
+* Wayland:
+ - Add support for input regions
+ - Correctly report display capabilities
+ - Fix resizing from the north-east corner
+
+* Bugs fixed:
+ 723045 Window re-size causes artifacts
+ 724728 GtkPrintOperation is below is parent in fullscreen mode
+ 726369 gnome-terminal crashes when closing a window
+ 726476 New fontchooser dialog doesn't update font list upon change
+ 726717 Nesting GtkExpander gives Gdk-CRITICAL error
+ 726749 Segmentation fault in libglib-2.0.so.0 with glib-2.39.92
+ 726825 possible invalid reads on delete event
+ 726838 crash when unsetting GtkTreeView model
+ 726855 When subdirectory selected, subdirectory name only briefly appears...
+ 726858 GTK_ENABLE_DEBUG should be G_ENABLE_DEBUG
+ 726900 gtk_recent_filter_filter() requirements aren't fully documented 
+
+* Translation updates:
+ Czech
+ Danish
+ Germans
+ Hungarian
+ Indonesian
+ Italian
+ Scottish Gaelic
+ Serbian
+ Ukrainian
+
+
+Overview of Changes in GTK+ 3.11.8 to 3.11.9
+============================================
+
+* GtkPopover:
+ - Improve focus and grab handling
+ - Add accessibility support
+
+* Client-side decorations:
+ - Make F10 move focus to the header bar
+ - Make header bars draggable on touch systems
+ - Make shadows unclickable
+
+* Bugs fixed:
+ 591258 Easy to accidentally select first option in popup menus
+ 693200 Printing via evince crashes badly when /tmp is not writable
+ 701884 lots of invalid reads in iconview a11y code
+ 709914 Cannot move windows on touchscreen (except from WM decorations)
+ 723668 Message Dialog Layout
+ 724785 Tooltips get shown even if the widget is hidden by a GtkPopover
+ 725141 Add shortcut to move focus to the GtkHeaderBar
+ 725727 Fix DnD on popovers
+ 725733 Crash when accessing freed AtkObject
+ 725754 Fix font size when gdk_x11_display_set_window_scale() is used
+ 725824 gtkentrycompletion: fix a critical warning
+ 725864 Add GtkPopover a11y
+ 725866 DnD fixes
+ 726125 Cannot click through CSD window shadows
+ 726135 documentation: clarify gtk_icon_theme_add_builtin_icon() usage
+ 726136 use && instead of 'and' in deprecation warnings
+ 726149 broadway: remove unused libcrypt
+ 726187 Use GDK's current window tracking when synthesizing events in GTK+
+ 726209	GtkTreeView: stop ignoring crossing events from grabs
+ 726492 Possible crash when setting titlebar 
+
+* Translation updates:
+ Brazilian Portuguese
+ Chinese
+ Czech
+ Finnish
+ French
+ Korean
+ Latvian
+ Norwegian bokmål
+ Portuguese
+ Punjabi
+ Spanish
+ Traditional Chinese
+
+
+Overview of Changes in GTK+ 3.11.7 to 3.11.8
+============================================
+
+* Documentation: Update screenshots
+
+* Printing: Google cloud print support
+
+* Bugs fixed:
+ 724742 revealer: Allocate extra size to child
+ 724895 printing: Fix visibility of tabs in dialog
+ 481073	allow "visibility-notify-event" signal to work when composited
+ 547988	Open button sensitive when nothing selected, returns nothing
+ 554618	GtkFileChooserDialog leaks memory
+ 723368	GTK+ print module for Google Cloud Print
+ 723438	jhbuild buildone glib gtk+ fails with `HAVE_INTROSPECTION do...
+ 724411	GtkAboutDialog: License visible even if not set and predefin...
+ 724799	gtk_menu_tool_button_set_menu () broken in gtk3-3.11.6+
+ 724891	GtkTreeViewColumn::button never freed
+ 724921	Gtk-CRITICAL **: gtk_widget_unregister_window: assertion 'GD...
+ 724968	wayland: Fix gdk_window_wayland_resize_cairo_surface()
+ 724999	GtkRevealer changes broke gedit infobar messages
+ 725089	Cairo context sent to the "draw" signal handler has incorrec...
+ 725172	GdkWindow: fix redraws for backends that keep the same backi...
+ 725205	[patch] treeselection docs: spelling fix
+ 725225	auto scroll in vertical popover from volume button goes the ...
+ 725345	dialogs: always use CSD on dialogs
+ 725559	Fix typo in gtk_window_set_default() documentation
+ 725560	GtkTreeView documentation fixes 
+        Make sure CSS theme is loaded when needed
+        GtkStackSwitcher: Avoid unnecessary updates
+
+* Translation updates:
+ Brazilian Portuguese
+ Galician
+ Hebrew
+ Kazakh
+ Lithuanian
+ Norwegian bokmål
+ Polish
+ Russian
+ Scottish Gaelic
+ Thai
+ Traditional Chinese
+
+
+Overview of Changes in GTK+ 3.11.6 to 3.11.7
+============================================
+
+* GtkActionBar:
+ - Fix theming
+
+* GtkBox:
+ - Allow setting center widget to NULL
+ - Fix a size-allocation error
+
+* GtkPopover:
+ - Fix a crash with text handles (#724392)
+ - Allow resetting relative-to  (#724407)
+
+* Wayland:
+ - Use new xdg-shell ping
+ - Use new xdg-shell focus methods
+
+* Printing:
+ - Fix a small memory leak (#724631)
+
+
+Overview of Changes in GTK+ 3.11.5 to 3.11.6
+============================================
+
+* GtkActionBar is a new widget that is meant to be used
+  for actions at the bottom of a window.
+
+* GtkPopover:
+ - A ::closed signal has been added
+ - Style propagation to popovers has been fixed
+ - Popovers can now be populated from a menu model
+ - GtkMenuButton can use popovers instead of menus
+
+* GtkAppChooserDialog has been redesigned
+
+* GtkBox can now place a widget centered, regardless of
+  the sizes of children on either side, similar to GtkHeaderBar.
+
+* The API documentation has been converted to markdown, and
+  many cleanups and improvements have been made at the same time.
+
+* Bug fixes:
+ 706515 HeaderBars are sometimes too tall
+ 707999 HeaderBar height increases when the subtitle label is set...
+ 721309 Links inside dimmed labels get different colors depending...
+ 723014 wip: Make popover from menu model
+ 723394 const parameter to GtkPopover gtk_popover_set_pointing_to
+ 723627 The padding aroung the timelabel is wrong
+ 723637 GtkTreeViewColumn: fix critical warning
+ 723672 Dialogs with header bars - buttons should have an equal w...
+ 723716 GtkFlowBox::child-activated match slot signature
+ 723771 gtkwindow: remove delete-event idle function on finalize
+ 723863 Implementation for component->get_size not needed
+ 723929 Add a generic center box
+ 724008 void function should not return void expression
+ 724094 Add GtkEntry:max-width-chars
+ 724218 App chooser dialog looks rough
+ 724411 GtkAboutDialog: License visible even if not set and prede...
+ 724503 Make gtk_popover_bind_model() public
+ 724539 Can't drag primary toolbars with a GtkSeparatorToolItem i...
+ 724541 Labels with links can't be activated in a GtkListBox 
+
+* Translation updates:
+ French
+ Galician
+ Hebrew
+ Indonesian
+ Norwegian bokmål
+ Russian
+ Scottish Gaelic
+ Slovenian
+ Spanish
+ Tajik
+ Thai
+
+
+Overview of Changes in GTK+ 3.11.4 to 3.11.5
+============================================
+
+* GtkPopover: A new widget that is can be used for transient
+  views, as an alternative to menus or dialogs.
+
+* Dialogs:
+ - Dialogs have been modernized, can use a header bar now
+ - Built-in dialogs react to a setting, gtk-dialogs-use-header
+   for this, dialogs derived from GtkDialog: default to no headerbar
+ - GtkAssistant also respects the setting
+
+* OS X:
+ - Better menu integration. Items such as 'Hide', 'Hide Others'
+   and 'Show All' are now handled specially
+ - GTK+ provides a default application menu now
+
+* Theming:
+ - GTK+ now uses RGBA visuals by default
+ - Notebook tabs now support a prelight state
+ - Reorderable notebook tabs can be themed differently
+
+* Documentation:
+ - The API documentation has seen numerous fixes and improvements
+ - Docbook markup is being phased out in favor of markdown
+
+* Bugs fixed:
+ 350190 Need specific icon for GTK_ICON_SIZE_SMALL_TOOLBAR for...
+ 566945 gtk_widget_override_color() documentation should menti...
+ 630217 RGBA visual by default
+ 634793 Use g_object_notify_by_pspec() / g_object_class_instal...
+ 636594 The default value of the property 'logo' in GtkAboutDi...
+ 665928 GtkWindow: Add comment about floating reference
+ 692931 The list of printers should be searchable/sortable
+ 699224 file chooser does not respect 12/24-hour clock setting
+ 704456 Synthesized crossing events don't have correct device ...
+ 711298 "Edit Scheduled Transaction" window way too modal
+ 720059 use headerbars in dialogs
+ 720552 Provide a more "native" Mac OS application menu
+ 721895 Remove GtkIconCache
+ 722429 docs/comments: Fix spelling of 'explicitly'
+ 722515 csd menu icon should use default window icon if per-wi...
+ 722574 GtkAboutDialog doesn't get headerbars when used from JS
+ 722588 GtkStack: add gtk_stack_get_child_by_name()
+ 722638 Version the gio-2.0 and wayland-client requirements (g...
+ 722642 Use symbolic icon for file chooser
+ 722722 Fix vertical alignment of labels in "Paper" section of...
+ 722919 Setting custom titlebar on realized window looks weird
+ 723119 docs: use |[ ]| instead of <programlisting></programli...
+ 723121 GtkPlacesSidebar: pressing "eject" icon does not power...
+ 723157 Merge GtkFileChooserWidget and GtkFileChooserDefault
+ 723159 CSD shadows are clipped
+ 723181 Use GtkPopover for GtkScaleButton
+ 723183 GtkStyleContext: don't use disconnect_by_func()
+ 723212 Use headerbar in GtkAssistant
+ 723366 GtkFileChooser crashes due to a signal connection left...
+ 723390 gdkwindow: Use an InputOnly window for focus_window
+ 723402 widget: Fix set_focus_child handling during focus changes
+ 723555 Decode extension names in X11 error handler
+
+* Translation updates:
+ Aragonese
+ Brazilian Portuguese
+ Estonian
+ Galician
+ Greek
+ Hebrew
+ Indonesian
+ Kazakh
+ Lithuanian
+ Scottish Gaelic
+ Simplified Chinese
+ Spanish
+ Tajik
+ Traditional Chinese
+ Ukrainian
+
+
 Overview of Changes in GTK+ 3.11.3 to 3.11.4
 ============================================
 

README.in

@@ -92,6 +92,11 @@ Release notes for 3.12
   it used to inconsistently scroll with the buffer but then go
   reposition to a window-relative position on redraw.
 
+* A number of container widgets have been made more compliant with
+  the uniform CSS rendering model by making them render backgrounds
+  and borders. This may require some adjustments in applications that
+  were making assumptions about containers never rendering backgrounds.
+
 Release notes for 3.10
 ======================
 

autogen.sh

@@ -17,6 +17,18 @@ else
         gtkdocize || exit $?
 fi
 
+PKGCONFIG=`which pkg-config`
+if test -z "$PKGCONFIG"; then
+        echo "*** pkg-config not found, please install it ***"
+        exit 1
+fi
+
+pkg-config --print-errors gobject-introspection-1.0
+if [ $? != 0 ]; then
+	echo "You probably need to install 'libgirepository1.0-dev'"
+	exit 1
+fi
+
 # README and INSTALL are required by automake, but may be deleted by clean
 # up rules. to get automake to work, simply touch these here, they will be
 # regenerated from their corresponding *.in files by ./configure anyway.

build/gen-file-list-gtk.py

@@ -14,7 +14,7 @@ def gen_gdk_filelist(srcroot, subdir, dest):
     vars = read_vars_from_AM(os.path.join(srcroot, subdir, 'Makefile.am'),
                              vars = {},
                              conds = {},
-                             filters = ['gdk_public_h_sources', 'gdk_c_sources'])
+                             filters = ['gdk_h_sources', 'gdk_c_sources'])
 
     vars['gdk_enums'] = 'gdkenumtypes.c gdkenumtypes.h'
 
@@ -28,14 +28,28 @@ def gen_gdk_filelist(srcroot, subdir, dest):
         for i in sources:
             d.write(srcroot + '\\' + subdir + '\\' + i.replace('/', '\\') + '\n')
 
-def gen_filelist_gtk(srcroot, subdir, dest):
+def gen_gdkwin32_filelist(srcroot, subdir, dest):
+    vars = read_vars_from_AM(os.path.join(srcroot, subdir, 'Makefile.am'),
+                             vars = {},
+                             conds = {'HAVE_INTROSPECTION': True,
+                                      'OS_WIN32': True},
+                             filters = ['w32_introspection_files'])
+
+    files = vars['w32_introspection_files'].split()
+
+    with open(dest, 'w') as d:
+        for i in files:
+            d.write(srcroot + '\\' + subdir + '\\' + i.replace('/', '\\') + '\n')
+
+def gen_gtk_filelist(srcroot, subdir, dest):
     vars = read_vars_from_AM(os.path.join(srcroot, 'gtk', 'Makefile.am'),
                              vars = {},
-                             conds = {'USE_WIN32':True,
+                             conds = {'USE_WIN32': True,
                                       'USE_QUARTZ': False,
                                       'USE_X11': False,
                                       'USE_EXTERNAL_ICON_CACHE': False},
                              filters = ['gtkinclude_HEADERS',
+                                        'a11yinclude_HEADERS',
                                         'deprecatedinclude_HEADERS',
                                         'gtk_base_c_sources',
                                         'gtk_clipboard_dnd_c_sources'])
@@ -43,6 +57,7 @@ def gen_filelist_gtk(srcroot, subdir, dest):
     vars['gtk_other_src'] = 'gtkprintoperation-win32.c gtktypebuiltins.h gtktypebuiltins.c'
 
     files = vars['gtkinclude_HEADERS'].split() + \
+            vars['a11yinclude_HEADERS'].split() + \
             vars['deprecatedinclude_HEADERS'].split() + \
             vars['gtk_base_c_sources'].split() + \
 			vars['gtk_clipboard_dnd_c_sources'].split() + \
@@ -60,7 +75,8 @@ def main(argv):
     subdir_gtk = 'gtk'
 
     gen_gdk_filelist(srcroot, subdir_gdk, 'gdk_list')
-    gen_filelist_gtk(srcroot, subdir_gtk, 'gtk_list')
+    gen_gdkwin32_filelist(srcroot, subdir_gdk, 'gdkwin32_list')
+    gen_gtk_filelist(srcroot, subdir_gtk, 'gtk_list')
     return 0
 
 if __name__ == '__main__':

build/gtk-introspection-msvc.mak

@@ -1,10 +1,4 @@
-# NMake Makefile to build Introspection Files for ATK
-
-# Change or pass in as a variable/env var if needed
-GDK_DLLNAME = gdk-3-vs$(VSVER)
-GTK_DLLNAME = gtk-3-vs$(VSVER)
-
-# Please do not change anything after this line
+# NMake Makefile to build Introspection Files for GTK+
 
 !include detectenv_msvc.mak
 
@@ -12,6 +6,9 @@ APIVERSION = 3.0
 
 CHECK_PACKAGE = gdk-pixbuf-2.0 atk pangocairo gio-2.0
 
+built_install_girs = Gdk-$(APIVERSION).gir GdkWin32-$(APIVERSION).gir Gtk-$(APIVERSION).gir
+built_install_typelibs = Gdk-$(APIVERSION).typelib GdkWin32-$(APIVERSION).typelib Gtk-$(APIVERSION).typelib
+
 !if "$(PLAT)" == "x64"
 TIME_T_DEFINE = -Dtime_t=long long
 !else
@@ -21,9 +18,9 @@ TIME_T_DEFINE = -Dtime_t=long
 !include introspection-msvc.mak
 
 !if "$(BUILD_INTROSPECTION)" == "TRUE"
-all: setgirbuildnev Gdk-$(APIVERSION).gir Gdk-$(APIVERSION).typelib Gtk-$(APIVERSION).gir Gtk-$(APIVERSION).typelib
+all: setgirbuildnev $(built_install_girs) $(built_install_typelibs)
 
-gdk_list gtk_list:
+gdk_list gdkwin32_list gtk_list:
 	@-echo Generating Filelist to Introspect for GDK/GTK...
 	$(PYTHON2) gen-file-list-gtk.py
 
@@ -34,6 +31,10 @@ setgirbuildnev:
 	@set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
 	@set LIB=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB)
 
+win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib: win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib
+	@-echo Copying win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib from win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib...
+	@-copy /b win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib
+
 Gdk-$(APIVERSION).gir: gdk_list
 	@-echo Generating Gdk-$(APIVERSION).gir...
 	$(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gdk	\
@@ -43,11 +44,26 @@ Gdk-$(APIVERSION).gir: gdk_list
 	$(TIME_T_DEFINE) --namespace=Gdk --nsversion=3.0	\
 	--include=Gio-2.0 --include=GdkPixbuf-2.0	\
 	--include=Pango-1.0 --include=cairo-1.0	\
-	--no-libtool --library=$(GDK_DLLNAME)	\
+	--no-libtool --library=gdk-3.0	\
 	--reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) --add-include-path=.	\
 	--pkg-export gdk-3.0 --warn-all --c-include="gdk/gdk.h"	\
 	-DG_LOG_DOMAIN=\"Gdk\" -DGDK_COMPILATION	\
-	--filelist=gdk_list	-o Gdk-3.0.gir
+	--filelist=gdk_list	-o $@
+
+GdkWin32-$(APIVERSION).gir: gdkwin32_list win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib
+	@-echo Generating GdkWin32-$(APIVERSION).gir...
+	$(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gdk	\
+	-I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include	\
+	-I$(BASEDIR)\include\pango-1.0 -I$(BASEDIR)\include\atk-1.0	\
+	-I$(BASEDIR)\include\gdk-pixbuf-2.0 -I$(BASEDIR)\include	\
+	$(TIME_T_DEFINE) --namespace=GdkWin32 --nsversion=3.0	\
+	--include=Gio-2.0 --include=GdkPixbuf-2.0	\
+	--include=Pango-1.0	--include-uninstalled=./Gdk-$(APIVERSION).gir	\
+	--no-libtool --library=gdk-3.0	\
+	--reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) --add-include-path=.	\
+	--pkg-export gdk-win32-3.0 --warn-all --c-include="gdk/gdkwin32.h"	\
+	-DG_LOG_DOMAIN=\"Gdk\" -DGDK_COMPILATION	\
+	--filelist=gdkwin32_list	-o $@
 
 Gtk-$(APIVERSION).gir: gtk_list
 	$(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gtk -I..\gdk	\
@@ -57,12 +73,12 @@ Gtk-$(APIVERSION).gir: gtk_list
 	--namespace=Gtk --nsversion=3.0	\
 	--include=Atk-1.0	\
 	--include-uninstalled=./Gdk-$(APIVERSION).gir	\
-	--no-libtool --library=$(GTK_DLLNAME)	\
+	--no-libtool --library=gtk-3.0 --library=gdk-3.0	\
 	--reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) --add-include-path=.	\
 	--pkg-export gtk+-3.0 --warn-all --c-include="gtk/gtkx.h"	\
 	-DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"/dummy/lib\"	\
 	$(TIME_T_DEFINE) -DGTK_DATADIR=\"/dummy/share\" -DGTK_DATA_PREFIX=\"/dummy\"	\
-	-DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"3.11.4\"	\
+	-DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"3.12.0\"	\
 	-DGTK_BINARY_VERSION=\"3.0.0\" -DGTK_HOST=\"i686-pc-vs$(VSVER)\"	\
 	-DGTK_COMPILATION -DGTK_PRINT_BACKENDS=\"file\"	\
 	-DGTK_PRINT_PREVIEW_COMMAND=\"undefined-gtk-print-preview-command\"	\
@@ -71,21 +87,15 @@ Gtk-$(APIVERSION).gir: gtk_list
 	-DINCLUDE_IM_ime -DINCLUDE_IM_inuktitut -DINCLUDE_IM_ipa	\
 	-DINCLUDE_IM_multipress -DINCLUDE_IM_thai -DINCLUDE_IM_ti_er	\
 	-DINCLUDE_IM_ti_et -DINCLUDE_IM_viqr --filelist=gtk_list	\
-	-o Gtk-3.0.gir
+	-o $@
 
-Gdk-$(APIVERSION).typelib: Gdk-$(APIVERSION).gir
-	@-echo Compiling Gdk-$(APIVERSION).typelib...
-	$(G_IR_COMPILER) --includedir=. --debug --verbose Gdk-$(APIVERSION).gir -o Gdk-$(APIVERSION).typelib
+$(built_install_typelibs): $(built_install_girs)
+	@-echo Compiling $*.typelib...
+	@-$(G_IR_COMPILER) --includedir=. --debug --verbose $*.gir -o $@
 
-Gtk-$(APIVERSION).typelib: Gtk-$(APIVERSION).gir Gdk-$(APIVERSION).typelib
-	@-echo Compiling Gtk-$(APIVERSION).typelib...
-	$(G_IR_COMPILER) --includedir=. --debug --verbose Gtk-$(APIVERSION).gir -o Gtk-$(APIVERSION).typelib
-
-install-introspection: setgirbuildnev Gdk-$(APIVERSION).gir Gdk-$(APIVERSION).typelib Gtk-$(APIVERSION).gir Gtk-$(APIVERSION).typelib
-	@-copy Gdk-$(APIVERSION).gir $(G_IR_INCLUDEDIR)
-	@-copy /b Gdk-$(APIVERSION).typelib $(G_IR_TYPELIBDIR)
-	@-copy Gtk-$(APIVERSION).gir $(G_IR_INCLUDEDIR)
-	@-copy /b Gtk-$(APIVERSION).typelib $(G_IR_TYPELIBDIR)
+install-introspection: setgirbuildnev $(built_install_girs) $(built_install_typelibs)
+	@-copy *.gir $(G_IR_INCLUDEDIR)
+	@-copy /b *.typelib $(G_IR_TYPELIBDIR)
 
 !else
 all:
@@ -93,10 +103,10 @@ all:
 !endif
 
 clean:
-	@-del /f/q Gtk-$(APIVERSION).typelib
-	@-del /f/q Gtk-$(APIVERSION).gir
-	@-del /f/q Gdk-$(APIVERSION).typelib
-	@-del /f/q Gdk-$(APIVERSION).gir
+	@-del /f/q *.typelib
+	@-del /f/q *.gir
+	@-del /f/q win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib
 	@-del /f/q gtk_list
+	@-del /f/q gdkwin32_list
 	@-del /f/q gdk_list
 	@-del /f/q *.pyc

build/win32/vs10/Makefile.am

@@ -18,10 +18,10 @@ EXTRA_DIST +=	\
 	gtk3-demo.vcxproj.filters	\
 	gtk3-demo-application.vcxproj	\
 	gtk3-demo-application.vcxproj.filters	\
-	gtka11y.vcxproj	\
-	gtka11y.vcxproj.filters	\
-	gtka11y.vcxprojin	\
-	gtka11y.vcxproj.filtersin	\
+	gtk-inspector.vcxproj	\
+	gtk-inspector.vcxprojin	\
+	gtk-inspector.vcxproj.filters	\
+	gtk-inspector.vcxproj.filtersin	\
 	gailutil.vcxproj	\
 	gailutil.vcxproj.filters	\
 	install.vcxproj	\

build/win32/vs10/README.txt

@@ -20,10 +20,14 @@ ATK and GLib.  External dependencies are at least Cairo
 gettext-runtime, fontconfig*, freetype*, expat*.  See the 
 build/win32/vs10/README.txt file in glib for details where to unpack them.
 
-You will also need a Python 2.x/3.x interpretor installed on your system,
+You will also need a Python 2.6+/3.x interpretor installed on your system,
 which can be obtained from the official installers available from
 http://www.python.org.  Please note that the Python interpretor (python.exe)
-needs to be in your PATH before attempting the build of GTK+.
+either needs to be in your PATH before attempting the build of GTK+, or it
+can be found in the path specified by PythonPath in gtk-version-paths.props.
+If you happen to change the PythonPath setting in gtk-version-paths.props after
+opening gtk+.sln with Visual Studio, you will need to close the gtk+.sln solution,
+delete all the *.sdf, *.suo and *.user files before re-attempting the build.
 
 It is recommended that one builds the dependencies with VS10 as far as
 possible, especially those from and using the GTK+ stack (i.e. GLib,

build/win32/vs10/gtk+.sln

@@ -10,7 +10,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broadwayd", "broadwayd.vcxp
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.vcxproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-inspector", "gtk-inspector.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
 EndProject
@@ -106,22 +106,22 @@ Global
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.Build.0 = Release_Broadway|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.Build.0 = Debug|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|x64.ActiveCfg = Debug|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|x64.Build.0 = Debug|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|Win32.ActiveCfg = Release|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|Win32.Build.0 = Release|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.ActiveCfg = Release|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.Build.0 = Release|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|Win32.Build.0 = Debug|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|x64.Build.0 = Debug|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|Win32.Build.0 = Release|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|x64.ActiveCfg = Release|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.Build.0 = Release|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.Build.0 = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.ActiveCfg = Debug|x64

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

@@ -7,6 +7,9 @@
     <_PropertySheetDisplayName>gtkcopygdkbroadwayprops</_PropertySheetDisplayName>
   </PropertyGroup>
   <ItemDefinitionGroup>
+    <Link>
+      <AdditionalOptions>/EXPORT:gdk_win32_display_manager_get_type</AdditionalOptions>
+    </Link
     <PostBuildEvent>
       <Command>
 if "$(Configuration)" == "Release" goto END

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

@@ -58,6 +58,8 @@ echo $(Configuration) > ..\..\..\MSVC_$(Configuration)
 :DONE_GDKCONFIG_H
     </GenGdkConfigHBroadway>
     <GenerateGtkDbusBuiltSources>
+set PATH=$(PATH);$(PythonPath)
+
 cd ..\..\..\gtk
 
 python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml

build/win32/vs10/gtk-ignore-broadway.props

@@ -12,6 +12,7 @@
     </ProjectReference>
     <Link>
       <AdditionalDependencies>$(OutDir)\gdk-win32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>/EXPORT:gdk_win32_display_manager_get_type</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
 </Project>

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

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

build/win32/vs10/gtk-inspector.vcxprojin

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

build/win32/vs10/gtk-install.props

@@ -4,6 +4,10 @@
     <Import Project="gtk-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
+    <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
+    <InstalledDlls>$(BinDir)\$(GtkDllPrefix)gdk(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gtk(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gailutil(GtkDllSuffix).dll</InstalledDlls>
+    <InstalledBins>$(BinDir)\gtk3-demo.exe;$(BinDir)\gtk3-demo-application.exe</InstalledBins>
+    <InstalledBroadwayBins>$(BinDir)\broadwayd.exe</InstalledBroadwayBins>
     <GtkDoInstallBin>
 mkdir $(CopyDir)\bin
 
@@ -15,22 +19,22 @@ if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_BIN
 if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_BIN
 
 
-copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin
+copy $(BinDir)\*.dll $(CopyDir)\bin
 
-copy $(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib
+copy $(BinDir)\*-$(ApiVersion).lib $(CopyDir)\lib
 
-copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin
+copy $(BinDir)\*.exe $(CopyDir)\bin
 
 goto DONE_BIN
 
 
 :DO_BROADWAY_BIN
 
-copy $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll $(CopyDir)\bin
+copy $(BinDir)\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll $(CopyDir)\bin
 
-copy $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib
+copy $(BinDir)\gdk-$(ApiVersion).lib $(CopyDir)\lib
 
-copy $(Configuration)\$(Platform)\bin\broadwayd.exe $(CopyDir)\bin
+copy $(BinDir)\broadwayd.exe $(CopyDir)\bin
 
 
 if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin
@@ -64,6 +68,8 @@ mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk
 
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32
 
+mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated
+
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
@@ -154,6 +160,8 @@ copy ..\..\..\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
 
 copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
 
+copy ..\..\..\gdk\deprecated\gdkcolor.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated
+
 copy ..\..\..\gtk\a11y\gtkarrowaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
 
 copy ..\..\..\gtk\a11y\gtkbooleancellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
@@ -214,6 +222,8 @@ copy ..\..\..\gtk\a11y\gtknotebookpageaccessible.h $(CopyDir)\include\gtk-$(ApiV
 
 copy ..\..\..\gtk\a11y\gtkpanedaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
 
+copy ..\..\..\gtk\a11y\gtkpopoveraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
+
 copy ..\..\..\gtk\a11y\gtkprogressbaraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
 
 copy ..\..\..\gtk\a11y\gtkradiobuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
@@ -274,8 +284,6 @@ copy ..\..\..\gtk\gtkactionbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkadjustment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkalignment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkappchooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkappchooserbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -288,8 +296,6 @@ copy ..\..\..\gtk\gtkapplication.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkapplicationwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkarrow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkaspectframe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkassistant.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -388,6 +394,8 @@ copy ..\..\..\gtk\gtkenums.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkeventbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkeventcontroller.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkexpander.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkfilechooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -414,6 +422,24 @@ copy ..\..\..\gtk\gtkfontchooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gt
 
 copy ..\..\..\gtk\gtkframe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkgesture.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkgesturedrag.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkgesturelongpress.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkgesturemultipress.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkgesturepan.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkgesturerotate.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkgesturesingle.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkgestureswipe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkgesturezoom.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkgrid.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkheaderbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -468,16 +494,12 @@ copy ..\..\..\gtk\gtkmenutoolbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkmessagedialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkmisc.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkmodules.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkmountoperation.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtknotebook.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
-copy ..\..\..\gtk\gtknumerableicon.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkoffscreenwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkorientable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -494,6 +516,8 @@ copy ..\..\..\gtk\gtkplacessidebar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkplug.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkpopover.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkprintcontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkprintoperation.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -650,6 +674,8 @@ copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkwindowgroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
 copy ..\..\..\gtk\gtktextlayout.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -662,6 +688,10 @@ copy ..\..\..\gtk\deprecated\gtkaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gt
 
 copy ..\..\..\gtk\deprecated\gtkactiongroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
 
+copy ..\..\..\gtk\deprecated\gtkalignment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtkarrow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
+
 copy ..\..\..\gtk\deprecated\gtkcolorsel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
 
 copy ..\..\..\gtk\deprecated\gtkcolorseldialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
@@ -690,6 +720,10 @@ copy ..\..\..\gtk\deprecated\gtkiconfactory.h $(CopyDir)\include\gtk-$(ApiVersio
 
 copy ..\..\..\gtk\deprecated\gtkimagemenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
 
+copy ..\..\..\gtk\deprecated\gtkmisc.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtknumerableicon.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
+
 copy ..\..\..\gtk\deprecated\gtkradioaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
 
 copy ..\..\..\gtk\deprecated\gtkrc.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
@@ -732,12 +766,44 @@ copy ..\..\..\libgail-util\gailmisc.h $(CopyDir)\include\gail-$(ApiVersion)\libg
 copy ..\..\..\libgail-util\gailtextutil.h $(CopyDir)\include\gail-$(ApiVersion)\libgail-util
 
 
+mkdir $(CopyDir)\share\icons\hicolor\16x16\apps
+
+copy ..\..\..\demos\gtk-demo\data\16x16\gtk3-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps\
+
+
+mkdir $(CopyDir)\share\icons\hicolor\22x22\apps
+
+copy ..\..\..\demos\gtk-demo\data\22x22\gtk3-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps\
+
+
+mkdir $(CopyDir)\share\icons\hicolor\24x24\apps
+
+copy ..\..\..\demos\gtk-demo\data\24x24\gtk3-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps\
+
+
+mkdir $(CopyDir)\share\icons\hicolor\32x32\apps
+
+copy ..\..\..\demos\gtk-demo\data\32x32\gtk3-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps\
+
+
+mkdir $(CopyDir)\share\icons\hicolor\48x48\apps
+
+copy ..\..\..\demos\gtk-demo\data\48x48\gtk3-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps\
+
+
+mkdir $(CopyDir)\share\icons\hicolor\256x256\apps
+
+copy ..\..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\hicolor\256x256\apps\
+
+
 mkdir $(CopyDir)\share\glib-2.0\schemas
 
 copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
 
 copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
 
+copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas
+
 copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas
 
 
@@ -764,6 +830,18 @@ copy ..\..\..\gdk\broadway\gdkbroadwayvisual.h $(CopyDir)\include\gtk-$(ApiVersi
     <_PropertySheetDisplayName>gtkinstallsprops</_PropertySheetDisplayName>
   </PropertyGroup>
   <ItemGroup>
+    <BuildMacro Include="BinDir">
+      <Value>$(BinDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="InstalledDlls">
+      <Value>$(InstalledDlls)</Value>
+    </BuildMacro>
+    <BuildMacro Include="InstalledBins">
+      <Value>$(InstalledBins)</Value>
+    </BuildMacro>
+    <BuildMacro Include="InstalledBroadwayBins">
+      <Value>$(InstalledBroadwayBins)</Value>
+    </BuildMacro>
     <BuildMacro Include="GtkDoInstallBin">
       <Value>$(GtkDoInstallBin)</Value>
     </BuildMacro>

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

@@ -3,7 +3,6 @@
   <PropertyGroup Label="UserMacros">
     <VSVer>10</VSVer>
     <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
-    <GlibEtcInstallRootFromBuildWin32>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRootFromBuildWin32>
     <CopyDir>..\..\..\..\vs$(VSVer)\$(Platform)</CopyDir>
     <ApiVersion>3.0</ApiVersion>
     <GtkLibtoolCompatibleDllPrefix>lib</GtkLibtoolCompatibleDllPrefix>
@@ -12,6 +11,7 @@
     <GtkSeparateVSDllSuffix>-3-vs$(VSVer)</GtkSeparateVSDllSuffix>
     <GtkDllPrefix>$(GtkSeparateVSDllPrefix)</GtkDllPrefix>
     <GtkDllSuffix>$(GtkSeparateVSDllSuffix)</GtkDllSuffix>
+    <PythonPath>c:\python27</PythonPath>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtkversionpathsprops</_PropertySheetDisplayName>
@@ -23,9 +23,6 @@
     <BuildMacro Include="GlibEtcInstallRoot">
       <Value>$(GlibEtcInstallRoot)</Value>
     </BuildMacro>
-    <BuildMacro Include="GlibEtcInstallRootFromBuildWin32">
-      <Value>$(GlibEtcInstallRootFromBuildWin32)</Value>
-    </BuildMacro>
     <BuildMacro Include="CopyDir">
       <Value>$(CopyDir)</Value>
     </BuildMacro>
@@ -50,5 +47,8 @@
     <BuildMacro Include="GtkDllSuffix">
       <Value>$(GtkDllSuffix)</Value>
     </BuildMacro>
+    <BuildMacro Include="PythonPath">
+      <Value>$(PythonPath)</Value>
+    </BuildMacro>
   </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/gtk.vcxprojin

@@ -204,6 +204,10 @@
       <Project>{f756b0db-40a1-4e9f-be1f-8f02cb86ea46}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="gtk-inspector.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073fd}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

build/win32/vs10/gtk3-demo.vcxproj

@@ -182,15 +182,14 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\css_multiplebgs.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\css_pixbufs.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\css_shadows.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\dialog.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\drawingarea.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\editable_cells.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\entry_buffer.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\entry_completion.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\event_axes.c" />	
+    <ClCompile Include="..\..\..\demos\gtk-demo\event_axes.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\expander.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\flowbox.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\gestures.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\headerbar.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\hypertext.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\iconview.c" />
@@ -199,8 +198,8 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\infobar.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\links.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\listbox.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\flowbox.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\list_store.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\main.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\menus.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window2.c" />
@@ -208,6 +207,7 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\panes.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\pickers.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\pixbufs.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\popover.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\printing.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\revealer.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\rotated_text.c" />
@@ -216,12 +216,14 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\sizegroup.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\spinner.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\stack.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\textview.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\theming_style_classes.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\transparent.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\tree_store.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\main.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk.vcxproj">
@@ -236,4 +238,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

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

@@ -24,7 +24,6 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\css_multiplebgs.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\css_pixbufs.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\css_shadows.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\dialog.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\drawingarea.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\editable_cells.c"><Filter>Source Files</Filter></ClCompile>
@@ -32,7 +31,7 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\entry_completion.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\event_axes.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\expander.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\flowbox.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\gestures.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\headerbar.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\hypertext.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\iconview.c"><Filter>Source Files</Filter></ClCompile>
@@ -41,8 +40,8 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\infobar.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\links.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\listbox.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\flowbox.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\list_store.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\main.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\menus.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window2.c"><Filter>Source Files</Filter></ClCompile>
@@ -50,6 +49,7 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\panes.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\pickers.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\pixbufs.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\popover.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\printing.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\revealer.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\rotated_text.c"><Filter>Source Files</Filter></ClCompile>
@@ -58,11 +58,13 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\sizegroup.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\spinner.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\stack.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\textview.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\theming_style_classes.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\transparent.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\tree_store.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\main.c"><Filter>Source Files</Filter></ClCompile>
   </ItemGroup>
 </Project>

build/win32/vs10/install.vcxproj

@@ -139,45 +139,49 @@
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" />
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">
-    <PreBuildEvent>
-      <Command>$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">
-    <PreBuildEvent>
-      <Command>$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">
-    <PreBuildEvent>
-      <Command>$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">
-    <PreBuildEvent>
-      <Command>$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\config.h.win32">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk.vcxproj">
       <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>

build/win32/vs9/Makefile.am

@@ -11,8 +11,8 @@ EXTRA_DIST +=	\
 	gtk.vcprojin	\
 	gtk3-demo.vcproj	\
 	gtk3-demo-application.vcproj	\
-	gtka11y.vcproj	\
-	gtka11y.vcprojin	\
+	gtk-inspector.vcproj	\
+	gtk-inspector.vcprojin	\
 	gailutil.vcproj	\
 	install.vcproj	\
 	broadwayd.vcproj	\

build/win32/vs9/README.txt

@@ -19,10 +19,14 @@ ATK and GLib.  External dependencies are at least Cairo
 gettext-runtime, fontconfig*, freetype*, expat*.  See the 
 build/win32/vs9/README.txt file in glib for details where to unpack them.
 
-You will also need a Python 2.x/3.x interpretor installed on your system,
+You will also need a Python 2.6+/3.x interpretor installed on your system,
 which can be obtained from the official installers available from
 http://www.python.org.  Please note that the Python interpretor (python.exe)
-needs to be in your PATH before attempting the build of GTK+.
+either needs to be in your PATH before attempting the build of GTK+, or it
+can be found in the path specified by PythonPath in gtk-version-paths.vsprops.
+If you happen to change the PythonPath setting in gtk-version-paths.vsprops after
+opening gtk+.sln with Visual Studio, you will need to close the gtk+.sln solution,
+delete all the *.ncb, *.suo and *.user files before re-attempting the build.
 
 It is recommended that one builds the dependencies with VS9 as far as
 possible, especially those from and using the GTK+ stack (i.e. GLib,

build/win32/vs9/gtk+.sln

@@ -23,7 +23,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcproj", "{FC5AA
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.vcproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-inspector", "gtk-inspector.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}
 	EndProjectSection
@@ -31,7 +31,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46} = {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
@@ -138,6 +138,22 @@ Global
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.Build.0 = Release_Broadway|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.Build.0 = Release|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.Build.0 = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.ActiveCfg = Debug|x64
@@ -154,22 +170,6 @@ Global
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release_Broadway|x64.Build.0 = Release|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.Build.0 = Debug|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|x64.ActiveCfg = Debug|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|x64.Build.0 = Debug|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|Win32.ActiveCfg = Release|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|Win32.Build.0 = Release|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.ActiveCfg = Release|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.Build.0 = Release|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|Win32.Build.0 = Debug|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug_Broadway|x64.Build.0 = Debug|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|Win32.Build.0 = Release|Win32
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|x64.ActiveCfg = Release|x64
-		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|x64.Build.0 = Release|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.Build.0 = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.ActiveCfg = Debug|x64

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

@@ -5,6 +5,10 @@
 	Name="gtkcopygdkbroadwayprops"
 	InheritedPropertySheets=".\gtk-build-defines.vsprops"
 	>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalOptions="/EXPORT:gdk_win32_display_manager_get_type"
+	/>
 	<Tool
 		Name="VCPostBuildEventTool"
 		CommandLine="

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

@@ -57,6 +57,8 @@ echo $(ConfigurationName) > ..\..\..\MSVC_$(ConfigurationName)

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

build/win32/vs9/gtk-ignore-broadway.vsprops

@@ -9,5 +9,6 @@
 		Name="VCLinkerTool"
 		LinkLibraryDependencies="false"
 		AdditionalDependencies="$(OutDir)\gdk-win32.lib"
+		AdditionalOptions="/EXPORT:gdk_win32_display_manager_get_type"
 	/>
 </VisualStudioPropertySheet>

build/win32/vs9/gtk-inspector.vcprojin

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

build/win32/vs9/gtk-install.vsprops

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -121,6 +122,7 @@ copy ..\..\..\gtk\a11y\gtkmenushellaccessible.h $(CopyDir)\include\gtk-$(ApiVers
 copy ..\..\..\gtk\a11y\gtknotebookaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -261,6 +269,7 @@ copy ..\..\..\gtk\gtkpaned.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
&#x0A
 copy ..\..\..\gtk\gtkpapersize.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -381,9 +395,28 @@ copy ..\..\..\libgail-util\gail-util.h $(CopyDir)\include\gail-$(ApiVersion)\lib
 copy ..\..\..\libgail-util\gailmisc.h $(CopyDir)\include\gail-$(ApiVersion)\libgail-util

 copy ..\..\..\libgail-util\gailtextutil.h $(CopyDir)\include\gail-$(ApiVersion)\libgail-util

 
+mkdir $(CopyDir)\share\icons\hicolor\16x16\apps

+copy ..\..\..\demos\gtk-demo\data\16x16\gtk3-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps\

+
+mkdir $(CopyDir)\share\icons\hicolor\22x22\apps

+copy ..\..\..\demos\gtk-demo\data\22x22\gtk3-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps\

+
+mkdir $(CopyDir)\share\icons\hicolor\24x24\apps

+copy ..\..\..\demos\gtk-demo\data\24x24\gtk3-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps\

+
+mkdir $(CopyDir)\share\icons\hicolor\32x32\apps

+copy ..\..\..\demos\gtk-demo\data\32x32\gtk3-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps\

+
+mkdir $(CopyDir)\share\icons\hicolor\48x48\apps

+copy ..\..\..\demos\gtk-demo\data\48x48\gtk3-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps\

+
+mkdir $(CopyDir)\share\icons\hicolor\256x256\apps

+copy ..\..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\hicolor\256x256\apps\

+
 mkdir $(CopyDir)\share\glib-2.0\schemas

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

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

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

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

 
 echo "Compiling gsettings XML Files..."


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

@@ -12,10 +12,6 @@
 		Name="GlibEtcInstallRoot"
 		Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
 	/>
-	<UserMacro
-		Name="GlibEtcInstallRootFromBuildWin32"
-		Value="..\..\..\vs$(VSVer)\$(PlatformName)"
-	/>
 	<UserMacro
 		Name="CopyDir"
 		Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
@@ -50,4 +46,8 @@
 		Name="GtkDllSuffix"
 		Value="$(GtkSeparateVSDllSuffix)"
 	/>
-</VisualStudioPropertySheet>
+	<UserMacro
+		Name="PythonPath"
+		Value="c:\python27"
+	/>
+</VisualStudioPropertySheet>

build/win32/vs9/gtk3-demo.vcproj

@@ -170,10 +170,9 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\combobox.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\css_accordion.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\css_basics.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\css_multiplebgs.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\css_pixbufs.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\css_shadows.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\css_multiplebgs.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\demo_resources.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\dialog.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\drawingarea.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\editable_cells.c" />
@@ -181,7 +180,7 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\entry_completion.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\event_axes.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\expander.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\flowbox.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\gestures.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\headerbar.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\hypertext.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\iconview.c" />
@@ -190,15 +189,16 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\infobar.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\links.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\listbox.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\flowbox.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\list_store.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\main.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\menus.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\overlay.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\offscreen_window.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\offscreen_window2.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\overlay.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\panes.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\pickers.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\pixbufs.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\popover.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\printing.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\revealer.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\rotated_text.c" />
@@ -207,12 +207,14 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\sizegroup.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\spinner.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\stack.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\textscroll.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\textview.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\textscroll.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\theming_style_classes.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\toolpalette.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\transparent.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\tree_store.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\demo_resources.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\main.c" />
 		</Filter>
 		<Filter
 			Name="Header Files"

configure.ac

@@ -9,8 +9,8 @@
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [11])
-m4_define([gtk_micro_version], [4])
+m4_define([gtk_minor_version], [13])
+m4_define([gtk_micro_version], [3])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -41,12 +41,13 @@ AC_CANONICAL_HOST
 m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.39.0])
+m4_define([glib_required_version], [2.41.0])
 m4_define([pango_required_version], [1.32.4])
-m4_define([atk_required_version], [2.7.5])
+m4_define([atk_required_version], [2.12.0])
 m4_define([cairo_required_version], [1.12.0])
 m4_define([gdk_pixbuf_required_version], [2.27.1])
 m4_define([introspection_required_version], [1.39.0])
+m4_define([wayland_required_version], [1.3.90])
 GLIB_REQUIRED_VERSION=glib_required_version
 PANGO_REQUIRED_VERSION=pango_required_version
 ATK_REQUIRED_VERSION=atk_required_version
@@ -396,6 +397,11 @@ else
 fi
 AC_SUBST(DISABLE_ON_QUARTZ)
 
+AC_CHECK_LIB([rt], [shm_open], [SHM_LIBS="-lrt"], [SHM_LIBS=""])
+AC_SUBST(SHM_LIBS)
+
+AC_CHECK_FUNCS(posix_fallocate)
+
 if test "x$enable_broadway_backend" = xyes; then
   GDK_BACKENDS="$GDK_BACKENDS broadway"
   cairo_backends="$cairo_backends cairo"
@@ -413,7 +419,7 @@ fi
 
 PKG_PROG_PKG_CONFIG
 
-WAYLAND_DEPENDENCIES="wayland-client >= 1.2.0 xkbcommon >= 0.2.0 wayland-cursor"
+WAYLAND_DEPENDENCIES="wayland-client >= wayland_required_version xkbcommon >= 0.2.0 wayland-cursor >= wayland_required_version"
 if test "$enable_wayland_backend" = "maybe" ; then
   AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
   PKG_CHECK_EXISTS($WAYLAND_DEPENDENCIES, [have_wayland_deps=yes], [have_wayland_deps=no])
@@ -1265,11 +1271,11 @@ fi
 
 # Check for gio-unix
 if test "$have_gio_unix" = "yes"; then
-  GDK_GIO_PACKAGE=gio-unix-2.0
+  GDK_GIO_PACKAGE="gio-unix-2.0 >= glib_required_version"
   AC_DEFINE([HAVE_GIO_UNIX], [1],
             [Define if gio-unix is available])
 else
-  GDK_GIO_PACKAGE=gio-2.0
+  GDK_GIO_PACKAGE="gio-2.0 >= glib_required_version"
 fi
 
 # Check for Pango flags
@@ -1314,7 +1320,7 @@ LIBS="$gtk_save_LIBS"
 CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"
 
-GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 cairo cairo-gobject"
+GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
 GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $cairo_backends"
 if test "x$enable_x11_backend" = xyes; then
   GDK_PRIVATE_PACKAGES="$GDK_PRIVATE_PACKAGES pangoft2"
@@ -1351,13 +1357,13 @@ fi
 
 PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
 
-GTK_PACKAGES="atk cairo cairo-gobject gdk-pixbuf-2.0 gio-2.0"
+GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"
 GTK_PRIVATE_PACKAGES="$ATK_PACKAGES"
 if test "x$enable_x11_backend" = xyes; then
   GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
 fi
 if test "$have_gio_unix" = "yes"; then
-  GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES gio-unix-2.0"
+  GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES gio-unix-2.0 >= glib_required_version"
 fi
 GTK_EXTRA_LIBS=
 
@@ -1519,6 +1525,37 @@ else
   fi
 fi
 
+# Checks to see if we should compile with cloudprint backend for GTK+
+#
+
+AC_ARG_ENABLE(cloudprint,
+              [AS_HELP_STRING([--disable-cloudprint],
+                              [disable cloudprint print backend])],,
+              [enable_cloudprint=auto])
+
+if test "x$enable_cloudprint" = "xno"; then
+  AM_CONDITIONAL(HAVE_CLOUDPRINT, false)
+else
+  PKG_CHECK_MODULES(REST, [rest-0.7], have_rest=yes, have_rest=no)
+  PKG_CHECK_MODULES(JSON_GLIB, [json-glib-1.0], have_json_glib=yes, have_json_glib=no)
+  if test "x$have_rest" = "xyes" -a "x$have_json_glib" = "xyes"; then
+    PRINT_BACKENDS="$PRINT_BACKENDS cloudprint"
+  fi
+  AM_CONDITIONAL(HAVE_CLOUDPRINT, test "x$have_rest" = "xyes" -a "x$have_json_glib" = "xyes")
+fi
+
+if test "x$enable_cloudprint" = "xyes" -a "x$have_rest" = "xno"; then
+    AC_MSG_ERROR([
+*** rest not found.
+])
+fi
+
+if test "x$enable_cloudprint" = "xyes" -a "x$have_json_glib" = "xno"; then
+    AC_MSG_ERROR([
+*** json-glib not found.
+])
+fi
+
 AM_CONDITIONAL(HAVE_PAPI_CUPS, test "x$have_papi" = "xyes" -a "x$CUPS_CONFIG" != "xno")
 
 gtk_save_cppflags="$CPPFLAGS"
@@ -1632,7 +1669,7 @@ AM_CONDITIONAL(HAVE_COLORD, test "x$have_colord" = "xyes")
 # Checks for gtk-doc and docbook-tools
 ##################################################
 
-GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
+GTK_DOC_CHECK([1.20],[--flavour no-tmpl])
 
 AC_ARG_ENABLE(man,
               [AS_HELP_STRING([--enable-man],
@@ -1849,15 +1886,15 @@ gtk/Makefile
 gtk/makefile.msc
 gtk/gtkversion.h
 gtk/gtk-win32.rc
-gtk/a11y/Makefile
+gtk/inspector/Makefile
 gtk/native/Makefile
+util/Makefile
 libgail-util/Makefile
 modules/Makefile
-modules/engines/Makefile
-modules/engines/pixbuf/Makefile
 modules/input/Makefile
 modules/printbackends/Makefile
 modules/printbackends/cups/Makefile
+modules/printbackends/cloudprint/Makefile
 modules/printbackends/lpr/Makefile
 modules/printbackends/file/Makefile
 modules/printbackends/papi/Makefile

demos/gtk-demo/Makefile.am

@@ -24,6 +24,7 @@ demos =						\
 	entry_completion.c			\
 	event_axes.c				\
 	expander.c  				\
+	gestures.c				\
 	headerbar.c				\
 	hypertext.c				\
 	iconview.c				\
@@ -41,6 +42,7 @@ demos =						\
 	panes.c					\
 	pickers.c				\
 	pixbufs.c				\
+	popover.c				\
 	printing.c				\
 	revealer.c				\
 	rotated_text.c				\

demos/gtk-demo/builder.c

@@ -37,6 +37,7 @@ do_builder (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
   GError *err = NULL;
+  GtkWidget *toolbar;
 
   if (!window)
     {
@@ -53,6 +54,9 @@ do_builder (GtkWidget *do_widget)
                              gtk_widget_get_screen (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
+      toolbar = GTK_WIDGET (gtk_builder_get_object (builder, "toolbar1"));
+      gtk_style_context_add_class (gtk_widget_get_style_context (toolbar),
+                                   "primary-toolbar");
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/button_box.c

@@ -90,6 +90,14 @@ do_button_box (GtkWidget *do_widget)
                         create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END),
                         TRUE, TRUE, 5);
 
+    gtk_box_pack_start (GTK_BOX (vbox),
+                        create_bbox (TRUE, "Center", 40, GTK_BUTTONBOX_CENTER),
+                        TRUE, TRUE, 5);
+
+    gtk_box_pack_start (GTK_BOX (vbox),
+                        create_bbox (TRUE, "Expand", 40, GTK_BUTTONBOX_EXPAND),
+                        TRUE, TRUE, 5);
+
     frame_vert = gtk_frame_new ("Vertical Button Boxes");
     gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE, 10);
 
@@ -98,19 +106,25 @@ do_button_box (GtkWidget *do_widget)
     gtk_container_add (GTK_CONTAINER (frame_vert), hbox);
 
     gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Spread", 30, GTK_BUTTONBOX_SPREAD),
+                        create_bbox (FALSE, "Spread", 10, GTK_BUTTONBOX_SPREAD),
                         TRUE, TRUE, 0);
 
     gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Edge", 30, GTK_BUTTONBOX_EDGE),
+                        create_bbox (FALSE, "Edge", 10, GTK_BUTTONBOX_EDGE),
                         TRUE, TRUE, 5);
 
     gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Start", 30, GTK_BUTTONBOX_START),
+                        create_bbox (FALSE, "Start", 10, GTK_BUTTONBOX_START),
                         TRUE, TRUE, 5);
 
     gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "End", 30, GTK_BUTTONBOX_END),
+                        create_bbox (FALSE, "End", 10, GTK_BUTTONBOX_END),
+                        TRUE, TRUE, 5);
+    gtk_box_pack_start (GTK_BOX (hbox),
+                        create_bbox (FALSE, "Center", 10, GTK_BUTTONBOX_CENTER),
+                        TRUE, TRUE, 5);
+    gtk_box_pack_start (GTK_BOX (hbox),
+                        create_bbox (FALSE, "Expand", 10, GTK_BUTTONBOX_EXPAND),
                         TRUE, TRUE, 5);
   }
 

demos/gtk-demo/colorsel.c

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

demos/gtk-demo/demo.gresource.xml

@@ -94,6 +94,7 @@
     <file>event_axes.c</file>
     <file>expander.c</file>
     <file>flowbox.c</file>
+    <file>gestures.c</file>
     <file>headerbar.c</file>
     <file>hypertext.c</file>
     <file>iconview.c</file>
@@ -110,6 +111,7 @@
     <file>panes.c</file>
     <file>pickers.c</file>
     <file>pixbufs.c</file>
+    <file>popover.c</file>
     <file>printing.c</file>
     <file>revealer.c</file>
     <file>rotated_text.c</file>
@@ -133,4 +135,7 @@
     <file>messages.txt</file>
     <file>apple-red.png</file>
   </gresource>
+  <gresource prefix="/popover">
+    <file>popover.ui</file>
+  </gresource>
 </gresources>

demos/gtk-demo/demo.ui

@@ -151,6 +151,7 @@
     </object>
     <object class="GtkAboutDialog" id="aboutdialog1">
         <property name="program-name" translatable="yes">GtkBuilder demo</property>
+        <property name="logo-icon-name" translatable="yes">gtk3-demo</property>
          <accessibility>
 	     <relation target="window1" type="subwindow-of"/>
 	 </accessibility>
@@ -243,9 +244,6 @@
                           </child>
                         </object>
                       </child>
-		    <accessibility>
-		      	<action action_name="move-cursor" description="Move the cursor to select another person."/>
-		    </accessibility>
                     </object>
                     <packing>
                         <property name="position">2</property>

demos/gtk-demo/dialog.c

@@ -20,7 +20,7 @@ message_dialog_clicked (GtkButton *button,
   dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                    GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                    GTK_MESSAGE_INFO,
-                                   GTK_BUTTONS_OK,
+                                   GTK_BUTTONS_OK_CANCEL,
                                    "This message box has been popped up the following\n"
                                    "number of times:");
   gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),

demos/gtk-demo/gestures.c

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

demos/gtk-demo/headerbar.c

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

demos/gtk-demo/iconview.c

@@ -270,6 +270,7 @@ do_iconview (GtkWidget *do_widget)
 
       up_button = gtk_tool_button_new (NULL, NULL);
       gtk_tool_button_set_label (GTK_TOOL_BUTTON (up_button), _("_Up"));
+      gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (up_button), TRUE);
       gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (up_button), "go-up");
       gtk_tool_item_set_is_important (up_button, TRUE);
       gtk_widget_set_sensitive (GTK_WIDGET (up_button), FALSE);
@@ -277,6 +278,7 @@ do_iconview (GtkWidget *do_widget)
 
       home_button = gtk_tool_button_new (NULL, NULL);
       gtk_tool_button_set_label (GTK_TOOL_BUTTON (home_button), _("_Home"));
+      gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (home_button), TRUE);
       gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (home_button), "go-home");
       gtk_tool_item_set_is_important (home_button, TRUE);
       gtk_toolbar_insert (GTK_TOOLBAR (tool_bar), home_button, -1);

demos/gtk-demo/iconview_edit.c

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

demos/gtk-demo/images.c

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

demos/gtk-demo/links.c

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

demos/gtk-demo/main.c

@@ -471,6 +471,9 @@ fontify (GtkTextBuffer *source_buffer)
   gchar *start_ptr, *end_ptr;
   gchar *tag;
 
+  gtk_text_buffer_get_bounds (source_buffer, &start_iter, &tmp_iter);
+  gtk_text_buffer_apply_tag_by_name (source_buffer, "source", &start_iter, &tmp_iter);
+
   state = STATE_NORMAL;
 
   gtk_text_buffer_get_iter_at_offset (source_buffer, &start_iter, 0);
@@ -626,6 +629,9 @@ 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);
@@ -1015,8 +1021,6 @@ main (int argc, char **argv)
     }
   /* -- End of hack -- */
 
-  gtk_init (&argc, &argv);
-
   app = gtk_application_new ("org.gtk.Demo", 0);
 
   g_action_map_add_action_entries (G_ACTION_MAP (app),

demos/gtk-demo/main.ui

@@ -46,7 +46,7 @@
           <object class="GtkButton" id="run_button">
             <property name="visible">True</property>
             <property name="valign">center</property>
-            <property name="can_focus">False</property>
+            <property name="can_focus">True</property>
             <property name="action_name">win.run</property>
             <style>
               <class name="text-button"/>
@@ -128,8 +128,8 @@
                   <object class="GtkTextView" id="info-textview">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="margin_left">20</property>
-                    <property name="margin_right">20</property>
+                    <property name="margin_start">20</property>
+                    <property name="margin_end">20</property>
                     <property name="margin_top">20</property>
                     <property name="margin_bottom">20</property>
                     <property name="pixels_above_lines">2</property>
@@ -165,9 +165,8 @@
                   <object class="GtkTextView" id="source-textview">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="margin_left">20</property>
+                    <property name="margin_start">20</property>
                     <property name="margin_end">20</property>
-                    <property name="margin_right">20</property>
                     <property name="margin_top">20</property>
                     <property name="margin_bottom">20</property>
                     <property name="editable">False</property>

demos/gtk-demo/offscreen_window.c

@@ -279,7 +279,7 @@ gtk_rotated_bin_realize (GtkWidget *widget)
       attributes.width = child_allocation.width;
       attributes.height = child_allocation.height;
     }
-  bin->offscreen_window = gdk_window_new (gtk_widget_get_root_window (widget),
+  bin->offscreen_window = gdk_window_new (gdk_screen_get_root_window (gtk_widget_get_screen (widget)),
                                           &attributes, attributes_mask);
   gdk_window_set_user_data (bin->offscreen_window, widget);
   if (bin->child)

demos/gtk-demo/offscreen_window2.c

@@ -218,7 +218,7 @@ gtk_mirror_bin_realize (GtkWidget *widget)
       attributes.width = child_allocation.width;
       attributes.height = child_allocation.height;
     }
-  bin->offscreen_window = gdk_window_new (gtk_widget_get_root_window (widget),
+  bin->offscreen_window = gdk_window_new (gdk_screen_get_root_window (gtk_widget_get_screen (widget)),
                                           &attributes, attributes_mask);
   gdk_window_set_user_data (bin->offscreen_window, widget);
   if (bin->child)

demos/gtk-demo/popover.c

@@ -0,0 +1,185 @@
+/* Popovers
+ *
+ * A bubble-like window containing contextual information or options.
+ * GtkPopovers can be attached to any widget, and will be displayed
+ * within the same window, but on top of all its content.
+ */
+
+#include <gtk/gtk.h>
+
+static void
+toggle_changed_cb (GtkToggleButton *button,
+                   GtkWidget       *popover)
+{
+  gtk_widget_set_visible (popover,
+                          gtk_toggle_button_get_active (button));
+}
+
+static GtkWidget *
+create_popover (GtkWidget       *parent,
+                GtkWidget       *child,
+                GtkPositionType  pos)
+{
+  GtkWidget *popover;
+
+  popover = gtk_popover_new (parent);
+  gtk_popover_set_position (GTK_POPOVER (popover), pos);
+  gtk_container_add (GTK_CONTAINER (popover), child);
+  gtk_container_set_border_width (GTK_CONTAINER (popover), 6);
+  gtk_widget_show (child);
+
+  return popover;
+}
+
+static GtkWidget *
+create_complex_popover (GtkWidget       *parent,
+                        GtkPositionType  pos)
+{
+  GtkWidget *popover, *window, *content;
+  GtkBuilder *builder;
+
+  builder = gtk_builder_new ();
+  gtk_builder_add_from_resource (builder, "/popover/popover.ui", NULL);
+  window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
+  content = gtk_bin_get_child (GTK_BIN (window));
+  g_object_ref (content);
+  gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (content)),
+                        content);
+  gtk_widget_destroy (window);
+  g_object_unref (builder);
+
+  popover = create_popover (parent, content, GTK_POS_BOTTOM);
+  g_object_unref (content);
+
+  gtk_widget_set_size_request (popover, 200, -1);
+  gtk_widget_set_vexpand (popover, TRUE);
+
+  gtk_widget_set_margin_start (popover, 10);
+  gtk_widget_set_margin_end (popover, 10);
+  gtk_widget_set_margin_bottom (popover, 10);
+
+  return popover;
+}
+
+static void
+entry_size_allocate_cb (GtkEntry      *entry,
+                        GtkAllocation *allocation,
+                        gpointer       user_data)
+{
+  GtkEntryIconPosition popover_pos;
+  GtkPopover *popover = user_data;
+  cairo_rectangle_int_t rect;
+
+  if (gtk_widget_is_visible (GTK_WIDGET (popover)))
+    {
+      popover_pos =
+        GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (entry),
+                                             "popover-icon-pos"));
+      gtk_entry_get_icon_area (entry, popover_pos, &rect);
+      gtk_popover_set_pointing_to (GTK_POPOVER (popover), &rect);
+    }
+}
+
+static void
+entry_icon_press_cb (GtkEntry             *entry,
+                     GtkEntryIconPosition  icon_pos,
+                     GdkEvent             *event,
+                     gpointer              user_data)
+{
+  GtkWidget *popover = user_data;
+  cairo_rectangle_int_t rect;
+
+  gtk_entry_get_icon_area (entry, icon_pos, &rect);
+  gtk_popover_set_pointing_to (GTK_POPOVER (popover), &rect);
+  gtk_widget_show (popover);
+
+  g_object_set_data (G_OBJECT (entry), "popover-icon-pos",
+                     GUINT_TO_POINTER (icon_pos));
+}
+
+static void
+day_selected_cb (GtkCalendar *calendar,
+                 gpointer     user_data)
+{
+  cairo_rectangle_int_t rect;
+  GtkAllocation allocation;
+  GtkWidget *popover;
+  GdkEvent *event;
+
+  event = gtk_get_current_event ();
+
+  if (event->type != GDK_BUTTON_PRESS)
+    return;
+
+  gdk_window_coords_to_parent (event->button.window,
+                               event->button.x, event->button.y,
+                               &event->button.x, &event->button.y);
+  gtk_widget_get_allocation (GTK_WIDGET (calendar), &allocation);
+  rect.x = event->button.x - allocation.x;
+  rect.y = event->button.y - allocation.y;
+  rect.width = rect.height = 1;
+
+  popover = create_popover (GTK_WIDGET (calendar),
+                            gtk_entry_new (),
+                            GTK_POS_BOTTOM);
+  gtk_popover_set_pointing_to (GTK_POPOVER (popover), &rect);
+
+  gtk_widget_show (popover);
+
+  gdk_event_free (event);
+}
+
+GtkWidget *
+do_popover (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+  GtkWidget *popover, *box, *widget;
+
+  if (!window)
+    {
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 24);
+      gtk_container_set_border_width (GTK_CONTAINER (box), 24);
+      gtk_container_add (GTK_CONTAINER (window), box);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      widget = gtk_toggle_button_new_with_label ("Button");
+      popover = create_popover (widget,
+                                gtk_label_new ("This popover does not grab input"),
+                                GTK_POS_TOP);
+      gtk_popover_set_modal (GTK_POPOVER (popover), FALSE);
+      g_signal_connect (widget, "toggled",
+                        G_CALLBACK (toggle_changed_cb), popover);
+      gtk_container_add (GTK_CONTAINER (box), widget);
+
+      widget = gtk_entry_new ();
+      popover = create_complex_popover (widget, GTK_POS_TOP);
+      gtk_entry_set_icon_from_icon_name (GTK_ENTRY (widget),
+                                         GTK_ENTRY_ICON_PRIMARY, "edit-find");
+      gtk_entry_set_icon_from_icon_name (GTK_ENTRY (widget),
+                                         GTK_ENTRY_ICON_SECONDARY, "edit-clear");
+
+      g_signal_connect (widget, "icon-press",
+                        G_CALLBACK (entry_icon_press_cb), popover);
+      g_signal_connect (widget, "size-allocate",
+                        G_CALLBACK (entry_size_allocate_cb), popover);
+      gtk_container_add (GTK_CONTAINER (box), widget);
+
+      widget = gtk_calendar_new ();
+      g_signal_connect (widget, "day-selected",
+                        G_CALLBACK (day_selected_cb), NULL);
+      gtk_container_add (GTK_CONTAINER (box), widget);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show_all (window);
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}

demos/gtk-demo/popover.ui

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Wed Nov 13 16:45:55 2013 -->
+<interface>
+  <!-- interface-requires gtk+ 3.10 -->
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <!-- column-name Name -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Item 1</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 2</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 3</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 4</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 5</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 6</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 7</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 8</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 9</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 10</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkWindow" id="window">
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkBox" id="box">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkEntry" id="entry1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="primary_icon_name">edit-find</property>
+            <property name="secondary_icon_name">edit-clear</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="shadow_type">in</property>
+            <child>
+              <object class="GtkTreeView" id="treeview1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="vexpand">True</property>
+                <property name="model">liststore1</property>
+                <property name="headers_visible">False</property>
+                <property name="enable_search">False</property>
+                <property name="search_column">2</property>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection" id="treeview-selection1"/>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="column1">
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderer1"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

demos/gtk-demo/revealer.c

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

demos/gtk-demo/sizegroup.c

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

demos/gtk-demo/textscroll.c

@@ -116,7 +116,7 @@ setup_scroll (GtkTextView *textview,
     {
       /* If we want to scroll to the end, including horizontal scrolling,
        * then we just create a mark with right gravity at the end of the
-       * buffer. It will stay at the end unless explicitely moved with
+       * buffer. It will stay at the end unless explicitly moved with
        * gtk_text_buffer_move_mark.
        */
       gtk_text_buffer_create_mark (buffer, "end", &iter, FALSE);
@@ -129,7 +129,7 @@ setup_scroll (GtkTextView *textview,
       /* If we want to scroll to the bottom, but not scroll horizontally,
        * then an end mark won't do the job. Just create a mark so we can
        * use it with gtk_text_view_scroll_mark_onscreen, we'll position it
-       * explicitely when needed. Use left gravity so the mark stays where
+       * explicitly when needed. Use left gravity so the mark stays where
        * we put it after inserting new text.
        */
       gtk_text_buffer_create_mark (buffer, "scroll", &iter, TRUE);

demos/gtk-demo/toolpalette.c

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

demos/gtk-demo/transparent.c

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

demos/pixbuf-demo/pixbuf-demo.c

@@ -195,7 +195,6 @@ main (int argc, char **argv)
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
 	gtk_widget_set_size_request (window, back_width, back_height);
-        gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
 	g_signal_connect (window, "destroy",
 			  G_CALLBACK (destroy_cb), NULL);

demos/widget-factory/widget-factory.c

@@ -23,18 +23,6 @@
 #include "config.h"
 #include <gtk/gtk.h>
 
-static void
-activate_toggle (GSimpleAction *action,
-                 GVariant      *parameter,
-                 gpointer       user_data)
-{
-  GVariant *state;
-
-  state = g_action_get_state (G_ACTION (action));
-  g_action_change_state (G_ACTION (action), g_variant_new_boolean (!g_variant_get_boolean (state)));
-  g_variant_unref (state);
-}
-
 static void
 change_theme_state (GSimpleAction *action,
                     GVariant      *state,
@@ -50,6 +38,44 @@ change_theme_state (GSimpleAction *action,
   g_simple_action_set_state (action, state);
 }
 
+static void
+change_toolbar_state (GSimpleAction *action,
+                      GVariant      *state,
+                      gpointer       user_data)
+{
+  GtkWidget *window = user_data;
+  GtkWidget *toolbar;
+
+  toolbar = GTK_WIDGET (g_object_get_data (G_OBJECT (window), "toolbar"));
+  gtk_widget_set_visible (toolbar, g_variant_get_boolean (state));
+
+  g_simple_action_set_state (action, state);
+}
+
+static void
+activate_search (GSimpleAction *action,
+                 GVariant      *parameter,
+                 gpointer       user_data)
+{
+  GtkWidget *window = user_data;
+  GtkWidget *searchbar;
+
+  searchbar = GTK_WIDGET (g_object_get_data (G_OBJECT (window), "searchbar"));
+  gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (searchbar), TRUE);
+}
+
+static void
+activate_delete (GSimpleAction *action,
+                 GVariant      *parameter,
+                 gpointer       user_data)
+{
+  GtkWidget *window = user_data;
+  GtkWidget *infobar;
+
+  infobar = GTK_WIDGET (g_object_get_data (G_OBJECT (window), "infobar"));
+  gtk_widget_show (infobar);
+}
+
 static void
 activate_about (GSimpleAction *action,
                 GVariant      *parameter,
@@ -163,6 +189,47 @@ update_pulse_time (GtkAdjustment *adjustment, GtkWidget *widget)
     }
 }
 
+static guint pulse_entry_id = 0;
+
+static gboolean
+pulse_entry (GtkEntry *entry)
+{
+  gtk_entry_progress_pulse (entry);
+
+  pulse_entry_id = g_timeout_add (100, (GSourceFunc)pulse_entry, entry);
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+on_entry_icon_release (GtkEntry            *entry,
+                       GtkEntryIconPosition icon_pos,
+                       GdkEvent            *event,
+                       gpointer             user_data)
+{
+  static int num = 0;
+
+  if (icon_pos != GTK_ENTRY_ICON_SECONDARY)
+    return;
+
+  num++;
+
+  if (num % 3 == 0)
+    {
+      if (pulse_entry_id > 0)
+        g_source_remove (pulse_entry_id);
+      gtk_entry_set_progress_fraction (entry, 0);
+    }
+  else if (num % 3 == 1)
+    gtk_entry_set_progress_fraction (entry, 0.25);
+  else if (num % 3 == 2)
+    {
+      gtk_entry_set_progress_pulse_step (entry, 0.1);
+      pulse_entry (entry);
+    }
+
+}
+
 static void
 startup (GApplication *app)
 {
@@ -179,19 +246,63 @@ startup (GApplication *app)
   g_object_unref (builder);
 }
 
+static void
+update_header (GtkListBoxRow *row,
+               GtkListBoxRow *before,
+               gpointer       data)
+{
+  if (before != NULL &&
+      gtk_list_box_row_get_header (row) == NULL)
+    {
+      GtkWidget *separator;
+
+      separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+      gtk_widget_show (separator);
+      gtk_list_box_row_set_header (row, separator);
+    }
+}
+
+static void
+info_bar_response (GtkWidget *infobar, gint response_id)
+{
+  if (response_id == GTK_RESPONSE_CLOSE)
+    gtk_widget_hide (infobar);
+}
+
+static void
+show_dialog (GtkWidget *button, GtkWidget *dialog)
+{
+  gtk_widget_show (dialog);
+}
+
+static void
+close_dialog (GtkWidget *dialog)
+{
+  gtk_widget_hide (dialog);
+}
+
 static void
 activate (GApplication *app)
 {
   GtkBuilder *builder;
   GtkWindow *window;
   GtkWidget *widget;
+  GtkWidget *dialog;
   GtkAdjustment *adj;
   static GActionEntry win_entries[] = {
-    { "dark", activate_toggle, NULL, "false", change_theme_state }
+    { "dark", NULL, NULL, "false", change_theme_state },
+    { "toolbar", NULL, NULL, "true", change_toolbar_state },
+    { "search", activate_search, NULL, NULL, NULL },
+    { "delete", activate_delete, NULL, NULL, NULL }
   };
+  GError *error = NULL;
 
   builder = gtk_builder_new ();
-  gtk_builder_add_from_resource (builder, "/ui/widget-factory.ui", NULL);
+  gtk_builder_add_from_resource (builder, "/ui/widget-factory.ui", &error);
+  if (error)
+    g_print ("error: %s\n", error->message);
+  gtk_builder_add_callback_symbol (builder, "on_entry_icon_release", (GCallback)on_entry_icon_release);
+  gtk_builder_connect_signals (builder, NULL);
 
   window = (GtkWindow *)gtk_builder_get_object (builder, "window");
   gtk_application_add_window (GTK_APPLICATION (app), window);
@@ -212,6 +323,34 @@ activate (GApplication *app)
   adj = (GtkAdjustment *) gtk_builder_get_object (builder, "adjustment2");
   g_signal_connect (adj, "value-changed", G_CALLBACK (spin_value_changed), widget);
 
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "listbox");
+  gtk_list_box_set_header_func (GTK_LIST_BOX (widget), update_header, NULL, NULL);
+
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "toolbar");
+  g_object_set_data (G_OBJECT (window), "toolbar", widget);
+
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "searchbar");
+  g_object_set_data (G_OBJECT (window), "searchbar", widget);
+
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "infobar");
+  g_signal_connect (widget, "response", G_CALLBACK (info_bar_response), NULL); 
+  g_object_set_data (G_OBJECT (window), "infobar", widget);
+
+  dialog = (GtkWidget *)gtk_builder_get_object (builder, "info_dialog");
+  g_signal_connect (dialog, "response", G_CALLBACK (close_dialog), NULL);
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "info_dialog_button");
+  g_signal_connect (widget, "clicked", G_CALLBACK (show_dialog), dialog);
+
+  dialog = (GtkWidget *)gtk_builder_get_object (builder, "action_dialog");
+  g_signal_connect (dialog, "response", G_CALLBACK (close_dialog), NULL);
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "action_dialog_button");
+  g_signal_connect (widget, "clicked", G_CALLBACK (show_dialog), dialog);
+
+  dialog = (GtkWidget *)gtk_builder_get_object (builder, "preference_dialog");
+  g_signal_connect (dialog, "response", G_CALLBACK (close_dialog), NULL);
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "preference_dialog_button");
+  g_signal_connect (widget, "clicked", G_CALLBACK (show_dialog), dialog);
+
   gtk_widget_show_all (GTK_WIDGET (window));
 
   g_object_unref (builder);
@@ -224,9 +363,16 @@ main (int argc, char *argv[])
   static GActionEntry app_entries[] = {
     { "about", activate_about, NULL, NULL, NULL },
     { "quit", activate_quit, NULL, NULL, NULL },
-  };
 
-  gtk_init (&argc, &argv);
+    { "main", NULL, "s", "'steak'", NULL },
+    { "wine", NULL, NULL, "false", NULL },
+    { "beer", NULL, NULL, "false", NULL },
+    { "water", NULL, NULL, "true", NULL },
+    { "dessert", NULL, "s", "'bars'", NULL },
+    { "pay", NULL, "s", NULL, NULL }
+
+  };
+  gint status;
 
   app = gtk_application_new ("org.gtk.WidgetFactory", 0);
 
@@ -237,7 +383,8 @@ main (int argc, char *argv[])
   g_signal_connect (app, "startup", G_CALLBACK (startup), NULL);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
 
-  g_application_run (G_APPLICATION (app), argc, argv);
+  status = g_application_run (G_APPLICATION (app), argc, argv);
+  g_object_unref (app);
 
-  return 0;
+  return status;
 }

docs/reference/gdk/Makefile.am

@@ -48,7 +48,7 @@ AM_CPPFLAGS = 			\
 GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-3.la $(GDK_DEP_LIBS)
 
 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gdk
+MKDB_OPTIONS=--output-format=xml --name-space=gdk
 
 # Extra SGML files that are included by DOC_MAIN_SGML_FILE
 content_files = 		\

docs/reference/gdk/gdk-docs.sgml

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

docs/reference/gdk/gdk3-overrides.txt

@@ -13,3 +13,18 @@
 <NAME>GDK_WINDOWING_WIN32</NAME>
 #define GDK_WINDOWING_WIN32
 </MACRO>
+
+<MACRO>
+<NAME>GDK_WINDOWING_QUARTZ</NAME>
+#define GDK_WINDOWING_QUARTZ
+</MACRO>
+
+<MACRO>
+<NAME>GDK_WINDOWING_WAYLAND</NAME>
+#define GDK_WINDOWING_WAYLAND
+</MACRO>
+
+<MACRO>
+<NAME>GDK_DISABLE_DEPRECATION_WARNINGS</NAME>
+#define GDK_DISABLE_DEPRECATION_WARNINGS
+</MACRO>

docs/reference/gdk/gdk3-sections.txt

@@ -58,6 +58,11 @@ GDK_WINDOWING_WAYLAND
 GDK_VERSION_3_0
 GDK_VERSION_3_2
 GDK_VERSION_3_4
+GDK_VERSION_3_6
+GDK_VERSION_3_8
+GDK_VERSION_3_10
+GDK_VERSION_3_12
+GDK_VERSION_3_14
 GDK_VERSION_MIN_REQUIRED
 GDK_VERSION_MAX_ALLOWED
 GDK_DISABLE_DEPRECATION_WARNINGS
@@ -384,6 +389,7 @@ gdk_window_begin_resize_drag
 gdk_window_begin_resize_drag_for_device
 gdk_window_begin_move_drag
 gdk_window_begin_move_drag_for_device
+gdk_window_show_window_menu
 gdk_window_constrain_size
 gdk_window_beep
 gdk_window_get_scale_factor
@@ -463,6 +469,7 @@ gdk_window_get_pointer
 gdk_window_get_device_position
 gdk_window_get_device_position_double
 GdkModifierType
+GdkModifierIntent
 gdk_window_get_parent
 gdk_window_get_toplevel
 gdk_window_get_children
@@ -735,6 +742,7 @@ GdkTimeCoord
 gdk_device_get_axis
 gdk_device_list_axes
 gdk_device_get_axis_value
+gdk_device_get_last_event_window
 
 <SUBSECTION Standard>
 GDK_TYPE_AXIS_USE
@@ -1162,8 +1170,7 @@ gdk_wayland_device_get_wl_pointer
 gdk_wayland_device_get_wl_seat
 gdk_wayland_display_get_wl_compositor
 gdk_wayland_display_get_wl_display
-gdk_wayland_display_get_wl_shell
-gdk_wayland_window_get_wl_shell_surface
+gdk_wayland_display_get_xdg_shell
 gdk_wayland_window_get_wl_surface
 gdk_wayland_window_set_use_custom_surface
 

docs/reference/gdk/gdk3.types

@@ -7,6 +7,7 @@ gdk_device_manager_get_type
 gdk_display_get_type
 gdk_display_manager_get_type
 gdk_drag_context_get_type
+gdk_frame_clock_get_type
 gdk_keymap_get_type
 gdk_screen_get_type
 gdk_visual_get_type

docs/reference/gtk/Makefile.am

@@ -112,6 +112,7 @@ AM_CPPFLAGS = \
 	-I$(top_builddir) 	\
 	-I$(top_builddir)/gdk	\
 	-DGTK_ENABLE_BROKEN	\
+	-Wno-deprecated-declarations \
 	$(GTK_DEBUG_FLAGS)	\
 	$(GTK_DEP_CFLAGS)
 
@@ -125,7 +126,7 @@ GTKDOC_LIBS = \
 
 
 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gtk
+MKDB_OPTIONS=--output-format=xml --name-space=gtk
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =					\
@@ -150,10 +151,13 @@ content_files =					\
 	tree_widget.sgml			\
 	windows.sgml				\
 	x11.sgml				\
+	gtk3-demo.xml				\
+	gtk3-widget-factory.xml			\
 	gtk-query-immodules-3.0.xml		\
 	gtk-update-icon-cache.xml		\
 	gtk-launch.xml				\
 	broadwayd.xml				\
+	input-handling.xml			\
 	visual_index.xml			\
 	getting_started.xml			\
 	overview.xml
@@ -296,6 +300,7 @@ HTML_IMAGES = \
 	$(top_srcdir)/gtk/stock-icons/24/gtk-page-setup.png		\
 	$(srcdir)/images/aboutdialog.png				\
 	$(srcdir)/images/accel-label.png				\
+	$(srcdir)/images/action-bar.png					\
 	$(srcdir)/images/appchooserbutton.png				\
 	$(srcdir)/images/appchooserdialog.png				\
 	$(srcdir)/images/assistant.png					\
@@ -344,6 +349,7 @@ HTML_IMAGES = \
 	$(srcdir)/images/scales.png					\
 	$(srcdir)/images/scrollbar.png					\
 	$(srcdir)/images/scrolledwindow.png				\
+	$(srcdir)/images/search-bar.png					\
 	$(srcdir)/images/search-entry.png				\
 	$(srcdir)/images/separator.png					\
 	$(srcdir)/images/spinbutton.png					\
@@ -423,7 +429,8 @@ HTML_IMAGES = \
 	$(srcdir)/images/getting-started-app9.png			\
 	$(srcdir)/images/getting-started-app10.png			\
 	$(srcdir)/images/exampleapp.png					\
-	$(srcdir)/images/flow-box.png
+	$(srcdir)/images/flow-box.png					\
+	$(srcdir)/images/inspector.png
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=../gdk/html \
@@ -445,6 +452,8 @@ man_MANS = 				\
 	gtk-query-immodules-3.0.1	\
 	gtk-update-icon-cache.1		\
 	gtk-launch.1			\
+	gtk3-demo.1			\
+	gtk3-widget-factory.1		\
 	broadwayd.1
 
 if ENABLE_MAN

docs/reference/gtk/compiling.sgml

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

docs/reference/gtk/getting_started.xml

@@ -419,7 +419,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
         <para>(<ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application2/exampleappwin.c">full source</ulink>)</para>
       </informalexample>
 
-      <para>You may have noticed that we used the _from_resource() variant
+      <para>You may have noticed that we used the <literal>_from_resource(<!-- -->)</literal> variant
       of the function that sets a template. Now we need to use GLib's resource
       functionality to include the ui file in the binary. This is commonly
       done by listing all resources in a .gresource.xml file, such as this:
@@ -456,10 +456,10 @@ example_app_window_class_init (ExampleAppWindowClass *class)
 
       <para>To this end, we add a private struct to our application
       window subclass and keep a reference to the #GtkStack there.
-      The gtk_widget_class_bind_child() function arranges things so
-      that after instantiating the template, the @stack member of
-      the private struct will point to the widget of the same name
-      from the template.</para>
+      The gtk_widget_class_bind_template_child_private() function
+      arranges things so that after instantiating the template, the
+      @stack member of the private struct will point to the widget of
+      the same name from the template.</para>
 
       <informalexample>
         <programlisting><![CDATA[
@@ -605,12 +605,16 @@ example_app_startup (GApplication *app)
 {
   GtkBuilder *builder;
   GMenuModel *app_menu;
+  const gchar *quit_accels[2] = { "&lt;Ctrl&gt;Q", NULL };
 
   G_APPLICATION_CLASS (example_app_parent_class)->startup (app);
 
   g_action_map_add_action_entries (G_ACTION_MAP (app),
                                    app_entries, G_N_ELEMENTS (app_entries),
                                    app);
+  gtk_application_set_accels_for_action (GTK_APPLICATION (app),
+                                         "app.quit",
+                                         quit_accels);
 
   builder = gtk_builder_new_from_resource ("/org/gtk/exampleapp/app-menu.ui");
   app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"));
@@ -633,7 +637,7 @@ example_app_class_init (ExampleAppClass *class)
       <para>Our preferences menu item does not do anything yet,
       but the Quit menu item is fully functional. Note that it
       can also be activated by the usual Ctrl-Q shortcut. The
-      shortcut was specified in the ui file.
+      shortcut was added with gtk_application_set_accels_for_action().
       </para>
 
       <para>The application menu looks like this:</para>
@@ -720,7 +724,7 @@ example_app_window_init (ExampleAppWindow *win)
         <programlisting><xi:include href="../../../../examples/application6/exampleappprefs.c" parse="text"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
-      <para>Now we revisit the preferences_activated() function in our
+      <para>Now we revisit the <literal>preferences_activated(<!-- -->)</literal> function in our
       application class, and make it open a new preference dialog.</para>
 
       <informalexample>
@@ -863,8 +867,8 @@ example_app_window_init (ExampleAppWindow *win)
         <programlisting><xi:include href="../../../../examples/application8/gears-menu.ui" parse="text"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
-      <para>To connect the menuitem to the show-words setting,
-      we use a #GSettingsAction.</para>
+      <para>To connect the menuitem to the show-words setting, we use
+      a #GAction corresponding to the given #GSettings key.</para>
 
       <informalexample>
         <programlisting><![CDATA[
@@ -982,9 +986,8 @@ example_app_window_init (ExampleAppWindow *win)
         <programlisting><xi:include href="../../../../examples/application10/window.ui" parse="text"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
-      <para>A small extra refinement that we have added here is to allow
-      the header bar to provide a fallback application menu, by setting
-      the show-fallback-app-menu property to TRUE. Here is how the
+      <para>A small extra bonus of using a header bar is that we get
+      a fallback application menu for free. Here is how the
       application now looks, if this fallback is used.</para>
 
       <informalfigure>

docs/reference/gtk/glossary.xml

@@ -196,9 +196,7 @@
 	A widget that does not have a GdkWindow of its own on which to
 	draw its contents, but rather shares its <glossterm
 	linkend="parent">parent's</glossterm>.  This can be tested with
-	the gtk_widget_get_has_window() function.  See
-	<xref linkend="window-no-window-widgets"/> for a detailed
-	description of this flag.
+	the gtk_widget_get_has_window() function.
       </para>
     </glossdef>
   </glossentry>
@@ -237,8 +235,7 @@
       </para>
 
       <para>
-	Note that when a widget creates a window in its <link
-	linkend="gtkwidget-realize"><methodname>::realize()</methodname></link>
+	Note that when a #GtkWidget creates a window in its #GtkWidget::realize
 	handler, it does not actually show the window.  That is, the
 	window's structure is just created in memory.  The widget
 	actually shows the window when it gets <glossterm
@@ -286,7 +283,7 @@
       <para>
         A style encapsulates what GTK+ needs to know in order to draw
         a widget. Styles can be modified with 
-        <link linkend="gtk-Resource-Files">resource files</link>.
+        <link linkend="gtk3-Resource-Files">resource files</link>.
       </para>
     </glossdef>
   </glossentry>

docs/reference/gtk/gtk-docs.sgml

@@ -25,6 +25,7 @@
     <xi:include href="resources.sgml" />
     <xi:include href="xml/question_index.sgml" />
     <xi:include href="drawing-model.xml" />
+    <xi:include href="input-handling.xml" />
   </part>
 
 
@@ -56,14 +57,14 @@
 
     <chapter id="WindowWidgets">
       <title>Windows</title>
+      <xi:include href="xml/gtkwindow.xml" />
       <xi:include href="xml/gtkdialog.xml" />
       <xi:include href="xml/gtkmessagedialog.xml" />
       <xi:include href="xml/gtkaboutdialog.xml" />
       <xi:include href="xml/gtkassistant.xml" />
-      <xi:include href="xml/gtkwindow.xml" />
-      <xi:include href="xml/gtkwindowgroup.xml" />
       <xi:include href="xml/gtkinvisible.xml" />
       <xi:include href="xml/gtkoffscreenwindow.xml" />
+      <xi:include href="xml/gtkwindowgroup.xml" />
     </chapter>
 
     <chapter id="LayoutContainers">
@@ -117,7 +118,7 @@
     </chapter>
 
     <chapter id="NumericEntry">
-      <title>Numeric/Text Data Entry</title>
+      <title>Numeric and Text Data Entry</title>
       <xi:include href="xml/gtkentry.xml" />
       <xi:include href="xml/gtkentrybuffer.xml" />
       <xi:include href="xml/gtkentrycompletion.xml" />
@@ -190,10 +191,11 @@
       <xi:include href="xml/gtkmenutoolbutton.xml" />
       <xi:include href="xml/gtktoggletoolbutton.xml" />
       <xi:include href="xml/gtkradiotoolbutton.xml" />
+      <xi:include href="xml/gtkpopover.xml" />
     </chapter>
 
     <chapter id="SelectorWidgets">
-      <title>Selectors (Color/File/Font)</title>
+      <title>Selector Widgets and Dialogs</title>
       <xi:include href="xml/gtkcolorchooser.xml" />
       <xi:include href="xml/gtkcolorbutton.xml" />
       <xi:include href="xml/gtkcolorchooserwidget.xml" />
@@ -239,7 +241,6 @@
     <chapter id="MiscObjects">
       <title>Miscellaneous</title>
       <xi:include href="xml/gtkadjustment.xml" />
-      <xi:include href="xml/gtkarrow.xml" />
       <xi:include href="xml/gtkcalendar.xml" />
       <xi:include href="xml/gtkdrawingarea.xml" />
       <xi:include href="xml/gtkeventbox.xml" />
@@ -258,7 +259,6 @@
       <xi:include href="xml/gtkcontainer.xml" />
       <xi:include href="xml/gtkbin.xml" />
       <xi:include href="xml/gtkmenushell.xml" />
-      <xi:include href="xml/gtkmisc.xml" />
       <xi:include href="xml/gtkrange.xml" />
       <xi:include href="xml/gtkimcontext.xml" />
     </chapter>
@@ -287,6 +287,20 @@
       <xi:include href="xml/gtkappchooserwidget.xml" />
     </chapter>
 
+    <chapter id="Gestures">
+      <title>Gestures</title>
+      <xi:include href="xml/gtkeventcontroller.xml" />
+      <xi:include href="xml/gtkgesture.xml" />
+      <xi:include href="xml/gtkgesturesingle.xml" />
+      <xi:include href="xml/gtkgesturedrag.xml" />
+      <xi:include href="xml/gtkgesturelongpress.xml" />
+      <xi:include href="xml/gtkgesturemultipress.xml" />
+      <xi:include href="xml/gtkgesturepan.xml" />
+      <xi:include href="xml/gtkgestureswipe.xml" />
+      <xi:include href="xml/gtkgesturerotate.xml" />
+      <xi:include href="xml/gtkgesturezoom.xml" />
+    </chapter>
+
     <chapter id="DeprecatedObjects">
       <title>Deprecated</title>
       <xi:include href="xml/gtksymboliccolor.xml" />
@@ -320,7 +334,11 @@
       <xi:include href="xml/gtkrecentaction.xml" />
       <xi:include href="xml/gtkactivatable.xml" />
       <xi:include href="xml/gtkimagemenuitem.xml" />
+      <xi:include href="xml/gtkmisc.xml" />
       <xi:include href="xml/gtkstock.xml" />
+      <xi:include href="xml/gtkiconfactory.xml" />
+      <xi:include href="xml/gtknumerableicon.xml" />
+      <xi:include href="xml/gtkarrow.xml" />
     </chapter>
 
   </part>
@@ -350,8 +368,6 @@
     <xi:include href="xml/gtkthemingengine.xml" />
     <xi:include href="xml/gtkwidgetpath.xml" />
     <xi:include href="xml/gtkicontheme.xml" />
-    <xi:include href="xml/gtkiconfactory.xml" />
-    <xi:include href="xml/gtknumerableicon.xml" />
   </part>
 
   <part id="migrating">
@@ -377,6 +393,8 @@
 
   <part>
     <title>GTK+ Tools</title>
+    <xi:include href="gtk3-demo.xml" />
+    <xi:include href="gtk3-widget-factory.xml" />
     <xi:include href="gtk-query-immodules-3.0.xml" />
     <xi:include href="gtk-update-icon-cache.xml" />
     <xi:include href="gtk-launch.xml" />
@@ -433,6 +451,10 @@
     <title>Index of new symbols in 3.12</title>
     <xi:include href="xml/api-index-3.12.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-3-14" role="3.14">
+    <title>Index of new symbols in 3.14</title>
+    <xi:include href="xml/api-index-3.14.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 

docs/reference/gtk/gtk3-demo.xml

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

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

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

docs/reference/gtk/gtk3.types.in

@@ -7,6 +7,7 @@ gtk_accel_label_get_type
 gtk_accel_map_get_type
 gtk_accessible_get_type
 gtk_actionable_get_type
+gtk_action_bar_get_type
 gtk_action_get_type
 gtk_action_group_get_type
 gtk_activatable_get_type
@@ -63,6 +64,7 @@ gtk_entry_buffer_get_type
 gtk_entry_completion_get_type
 gtk_entry_get_type
 gtk_event_box_get_type
+gtk_event_controller_get_type
 gtk_expander_get_type
 gtk_file_chooser_button_get_type
 gtk_file_chooser_dialog_get_type
@@ -79,6 +81,15 @@ gtk_font_chooser_widget_get_type
 gtk_font_selection_dialog_get_type
 gtk_font_selection_get_type
 gtk_frame_get_type
+gtk_gesture_get_type
+gtk_gesture_drag_get_type
+gtk_gesture_long_press_get_type
+gtk_gesture_multi_press_get_type
+gtk_gesture_pan_get_type
+gtk_gesture_rotate_get_type
+gtk_gesture_single_get_type
+gtk_gesture_swipe_get_type
+gtk_gesture_zoom_get_type
 gtk_grid_get_type
 gtk_handle_box_get_type
 gtk_hbox_get_type
@@ -126,6 +137,7 @@ gtk_paned_get_type
 gtk_paper_size_get_type
 gtk_places_sidebar_get_type
 @ENABLE_ON_X11@gtk_plug_get_type
+gtk_popover_get_type
 @DISABLE_ON_W32@gtk_printer_get_type
 gtk_print_context_get_type
 @DISABLE_ON_W32@gtk_print_job_get_type