3.3.20

This avoids assertions from gtk_render_frame_gap.

COPYING

@@ -1,15 +1,15 @@
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                  GNU LIBRARY GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
  Copyright (C) 1991 Free Software Foundation, Inc.
-    		    59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
 [This is the first released version of the library GPL.  It is
  numbered 2 because it goes with version 2 of the ordinary GPL.]
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -99,7 +99,7 @@ works together with the library.
   Note that it is possible for a library to be covered by the ordinary
 General Public License rather than by this special one.
 
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
+                  GNU LIBRARY GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library which
@@ -411,7 +411,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -434,7 +434,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
            How to Apply These Terms to Your New Libraries
 
@@ -463,9 +463,8 @@ convey the exclusion of warranty; and each file should have at least the
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the 
-    Free Software Foundation, Inc., 59 Temple Place - Suite 330, 
-    Boston, MA  02111-1307  USA.
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 Also add information on how to contact you by electronic and paper mail.
 

Makefile.am

@@ -63,10 +63,6 @@ gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc gdk-waylan
 	rm -f $@ && \
 	cp gdk-3.0.pc $@
 
-gtk+-*-3.0-uninstalled.pc: gtk+-3.0-uninstalled.pc
-	rm -f $@ && \
-	cp gtk+-3.0-uninstalled.pc $@
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gdk-3.0.pc gtk+-3.0.pc gail-3.0.pc
 
@@ -84,8 +80,6 @@ DISTCLEANFILES = \
 	gdk-3.0.pc			\
 	gdk-x11-3.0.pc			\
 	gail-3.0.pc			\
-	gtk+-3.0-uninstalled.pc		\
-	gail-3.0-uninstalled.pc		\
 	config.lt
 
 distclean-local:

Makefile.decl

@@ -10,7 +10,7 @@ TEST_PROGS =
 ### testing rules
 
 # Xvfb based test rules
-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
+XVFB = Xvfb -ac -noreset -screen 0 1024x768x16
 XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \
    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \
@@ -29,7 +29,7 @@ endif
 XVFB_START = \
 	${XVFB} -help 2>/dev/null 1>&2 \
 	&& XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \
-	&& { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \
+	&& { ${XVFB} :$$XID -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \
 	       trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \
 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
 	&& DISPLAY=:$$XID && export DISPLAY

NEWS

@@ -1,3 +1,557 @@
+Overview of Changes in GTK+ 3.3.20
+==================================
+
+* Theming:
+ - Reduced memory consumption in the css parser
+ - Fixed Windows theme rendering under XP
+ - Support for background-position
+
+* Build requirements:
+ - cups 1.2 is now required for the cups print backend
+ - X11 pre-R6 is no longer supported
+ - XI2 is a build requirement
+
+* Bug fixes
+ 657385 gtk_menu_popup() not introspected
+ 662023 gnome-panel crashes with multiple screens
+ 670176 Warning when removing a child from a box if the child has...
+ 671065 gtk: Prefer group-0 keycodes
+ 671453 Improve the configure check for XInput 2.2
+ 671488 smooth-scroll support for textview
+ 671659 generates too many scroll events with a delta of 0
+ 671819 Crash (stack overflow) in gtk_range_grab_notify
+ 671898 Collate should be enabled by default
+ 672009 gtk 3.3.18, missing "enter" events with pads devices, le...
+ 672117 Link from stable gtk reference to unstable broken
+ 672125 gtk_enumerate_printers() doesn't call the destroy notify...
+ 672173 shell window: category view broken with gtk+ 3.3.19+
+ 672182 Commit 66c99016 breaks building if cups 1.2 is not available
+ 672367 Toggle-able table cells lack the 'toggle' action
+ 671588 selectable labels loose the selection too easily
+        x11: Avoid spurious focus events on grabs
+
+* Translation updates
+ Arabic
+ Assamese
+ Basque
+ Brazilian Portuguese
+ British English
+ Bulgarian
+ Catalan
+ Catalan (Valencian)
+ Danish
+ Esperanto
+ French
+ Galician
+ German
+ Gujarati
+ Hungarian
+ Latvian
+ Lithuanian
+ Norwegian bokmål
+ Portuguese
+ Punjabi
+ Russian
+ Serbian
+ Spanish
+ Traditional Chinese
+
+
+Overview of Changes in GTK+ 3.3.18
+==================================
+
+* Add support for touch devices
+ - New device types GDK_SOURCE_TOUCHSCREEN and
+   GDK_SOURCE_TOUCHPAD for direct and indirect
+   touch devices
+ - New event GdkEventTouch and GDK_TOUCH_MASK
+ - New signal GtkWidget::touch-event
+
+* Add support for smooth scrolling
+ - Scroll events can contain scroll deltas,
+   obtainable via gdk_event_get_scroll_deltas()
+ - Scroll direction for such events is GDK_SCROLL_SMOOTH
+ - To receive scroll events, widgets must now
+   set either GDK_SCROLL_MASK or GDK_SMOOTH_SCROLL_MASK
+
+* GtkScrolledWindow will do kinetic scrolling
+  with touch devices
+
+* XInput2 is now required for building the X11
+  backend, support for XInput1 has been removed
+
+* Deprecations are now versioned, and new API is
+  marked with the version it was introduced.
+  Use these with GDK_VERSION_{MIN,MAX}_REQUIRED
+
+* Theming:
+ - Memory consumption of the CSS parser has been reduced
+ - CSS selectors of the form "a + b" and "a ~ b" work now
+
+* Bug fixes:
+ 650693 Drawing errors in column headers when adding...
+ 655065 Build failure on OS X 10.7 Lion
+ 668141 button: don't be active when holding the mouse...
+ 669335 Render a background in the scrollbars junction area
+ 669342 overlay: add left/right/top/bottom style classes...
+ 670555 I can't change GtkInfoBar text color via the theme
+ 670881 Deactivate the menu if the window is withdrawn
+ 671057 colorchooser can't remove palette
+ 671070 Correct GroupSwitch mask
+ 671170 GtkTable and GtkGrid alignment problem
+
+* Translation updates:
+ Basque
+ Belarusian
+ Brazilian Portuguese
+ Bulgarian
+ Estonian
+ Finnish
+ Galician
+ Hungarian
+ Kazakh
+ Korean
+ Polish
+ Persian
+ Punjabi
+ Serbian
+ Slovenian
+ Swedish
+ Telugu
+ Spanish
+ Ukranian
+ Vietnamese
+
+
+Overview of Changes in GTK+ 3.3.16
+==================================
+
+* The widget-factory theme test is now installed
+  as a demo named gtk3-widget-factory
+
+* The Raleigh theme is now a pure fallback theme
+  that doesn't share any CSS with other themes
+  anymore
+
+* GtkColorSelectionDialog has been deprecated in
+  favor of a new color chooser widget named
+  GtkColorChooserDialog
+
+* The GtkApplication session support has been simplified
+
+* Bug fixes:
+ 612283 Clarification for GtkListStore::gtk_list_store_insert_with_values
+ 668114 odd spacing in about dialog credits
+ 669116 GtkNotebook's child-notify::position not always emitted...
+ 669208 x11: Cancel _NET_WM_MOVERESIZE if we get a matching ButtonRelease
+ 669511 gtkcsstypes.c: variable is declared at middle of block
+ 669636 gtkactiongroup: clarify set_translation_domain docs
+ 669638 gtkbuilder-menus: translation-domain can be NULL
+ 669794 Orca + Trees/Tables == incorrect cells presented, crashes...
+ 669947 gtkuimanager: clarify @pos of insert_action_group
+ 670077 license text has poor alignment with close button
+ 670078 no stroke around credits scrollable area
+ 670400 First shortcut capture is broken
+
+* Translation updates:
+ Belarusian
+ Bulgarian
+ Danish
+ Estonian
+ Galician
+ Hebrew
+ Italian
+ Japanese
+ Kazakh
+ Lithuanian
+ Norwegian bokmål
+ Spanish
+ Traditional Chinese
+
+
+Overview of Changes in GTK+ 3.3.14
+==================================
+
+* Theming
+ - Fixes for border handling in GtkEntry,
+   GtkCellRendererText, GtkComboBox
+ - Parse values more carefully, supporting
+   percentages, angles
+ - Implement CSS linear-gradient syntax
+ - Support background-size
+ - Support a gtk.gresource file in themes
+
+* Bugs fixed
+ 543520 Cups custom options are not sent properly
+ 649121 Crash in GtkAppChooserDialog packagekit button
+ 669176 Regression: atk-add-key-event-listener doesn't work
+
+* Updated translations
+ Galician
+ Norwegian bokmål
+ Spanish
+
+
+Overview of Changes in GTK+ 3.3.10
+==================================
+
+* GtkApplication:
+ - Move application menu handling over from GIO
+ - Fix resize grip positioning in GtkApplicationWindow
+
+* Wayland:
+ - Make combo boxes work
+ - Make key modifiers work like on X11
+ - Make mouse buttons work correctly
+
+* Quartz:
+ - Make key modifiers work more like they do on X11
+
+* Printing:
+ - Fix handling of custom cups options
+
+* Accessibility:
+ - Bring key snooping support back for now
+
+* Translation updates:
+ Spanish
+
+
+Overview of Changes in GTK+ 3.3.8
+=================================
+
+* GtkApplication:
+ - Supports logout notification and inhibiting
+ - Buttons, toolbuttons and switches can now be connected
+   to GActions
+
+* GtkSpinButton no longer allows to change the value
+  when not editable
+
+* GtkLabel link support has been rewritten to be be
+  more robust
+
+* GtkBuilder:
+ - Supports the 'id' in GtkComboBoxText
+ - Can parse GVariant-valued properties
+ - Support loading from a GResource
+
+* GtkImage:
+ - Support loading from a GResource
+
+* GtkUIManager:
+ - Support loading from a GResource
+
+* Accessibility:
+ - key snooping support has been removed
+
+* Wayland backend:
+ - Cursor handling updates
+ - Look for cursors in the 'weston' directory
+ - Make resize grips work
+ - Implement device grabs
+ - Implement window geometry hints
+ - Set surface type based on window type hint
+ - Add basic clipboard and selection implementations
+ - Implement client-side keyboard repeat
+ - Update GdkWindow focus state to match reality
+
+* Theming:
+ - Improved CSS compliance for selector matching
+ - Improved CSS compliance for value resolution,
+   including full support for 'inherit', 'initial',
+   'currentColor', 'none'
+ - Support border-style properties
+ - 'window-unfocused' has been renamed to 'backdrop'
+
+* New deprecations:
+ - GdkColor
+ - GtkButton::inner-border
+
+* Miscellaneous:
+ - Turn default theme css files and dnd cursors into
+   GResources
+
+* Bugs fixed:
+ 543520 Cups custom options are not sent properly
+ 612396 ...default of entry-text-column for GtkComboBoxText
+ 613728 Rationalize GtkTreeView focus
+ 620240 GNOME Drag & Drop broken for remote X sessions
+ 629878 Missing "Back" and "Forward" icons for Firefox
+ 631414 Add symbolic constants for event emission control
+ 639875 crashes when unparenting a tab from a window...
+ 657367 GtkAction: Hold a reference to proxy widgets
+ 659516 gtk_css_provider_to_string lacks "since" tag
+ 660139 GtkGrid gives Gtk-Warnings about negative sizes when empty
+ 660309 check x11 backend when create xim module
+ 663479 "Finishing" ("Completion") and "Advanced" tabs are empty
+ 665015 "Widget (%s) has more than one label" unwanted warnings
+ 666103 Should be able to match the parent where a dropdown menu...
+ 666600 allocate the CSS border and deprecate GtkButton-inner-border
+ 666685 SIGSEGV in _gtk_tree_selection_internal_select_node
+ 666710 Fix compose sequences disabling other sequences
+ 666842 [patch] "sticky" window state reported wrongly on X11
+ 667018 Fix compilation on Windows
+ 667229 gtkspinbutton: Respect value of inherited 'editable' property
+ 667394 Gtk(Tool)Button: add an 'action-name' property
+ 667473 gdk_rgba_free (NULL)
+ 667485 gdk_rgba_parse error checking
+ 667534 Non-XInput2 build fix
+ 667546 GApplication doc mentions g_application_set_app_menu
+ 667628 GtkWindow:application property should have G_PARAM_CONSTRUCT
+ 667695 GAction leaked in examples/plugman.c
+ 667705 fix up GtkApplication on OS X
+ 666921 Fix the _NET_SUPPORTING_WM_CHECK window fetch to be spec...
+
+* Translation updates:
+ Arabic
+ Bulgarian
+ Finnish
+ Hebrew
+ Norwegian bokmål
+ Spanish
+
+
+Overview of Changes in GTK+ 3.3.6
+=================================
+
+* GtkApplication has grown support for exporting application
+  menus and menubars on the bus, as a GMenuModel. The
+  new GtkApplicationWindow toplevel automatically
+  displays these menu models when needed.
+
+* GtkSpinButtons have received a long-overdue face-lift
+  to make them easier to use with both mouse and touch.
+
+* GtkScale has gained a has-origin property to request
+  filled-in drawing of the trough.
+
+* GtkWindow can now request that the window manager hide
+  the titlebar when the window is maximized.
+
+* The GtkTreeView accessibility support and the core
+  treeview code have been extensively refactored;
+  performance should be much improved. But watch out
+  for regressions.
+
+* The GtkFileChooser entry completion code has been
+  extensively refactored; it now uses GtkEntryCompletion
+
+* Excessive dependencies have been culled from Requires:
+  lines in pc files. Dependent modules may have to declare
+  dependencies that they were getting 'for free' in the past.
+
+* Theming improvements:
+ - The background-clip and background-origin CSS properties
+   have been implemented
+
+* Win32 improvements:
+ - Theming of column headers, radio buttons and menuitems,
+   notebook tabs, etc has been fixed
+ - Menus, tooltips, and other popups show above the task bar
+
+* Wayland:
+ - The Wayland backend has been updated to the current Wayland API
+
+* Bugs fixed:
+ 603823 Print to File suggests ".ps" as filename...
+ 640317 gtk_draw_insertion_cursor should be moved to gtk_render
+ 646461 Leak in gtkfilechooserbutton.c: model_free_row_data
+ 650943 Clicking resize grip causes strange mouse grabbing beh...
+ 661428 Allow themes to know when a toplevel window appears un...
+ 662814 Request for way to tell gtk_recent_manager_add_item_qu...
+ 664137 Crash in Audacious audio player when browsing the add ...
+ 664456 segfault on arrow keypress in empty GtkIconView
+ 664467 prop-editor is broken for GdkColor properties
+ 664469 color button doesn't notify "color" and "alpha" when c...
+ 664537 GtkCssProvider: don't segfault when CSS file is not found
+ 664640 CUPS authentication does not work
+ 665140 Draw the scale split
+ 665326 FTBFS: missing Xi/Pango/Fc for gtk-query-immodules-3.0
+ 665616 Add hide-titlebar-when-maximized setting
+ 665741 Crashes in treeview when pressing End key.
+ 665999 Introspection wrong for GDK_INPUT_ONLY vs GDK_INPUT_OUTPUT
+ 666242 Separators in menuitem are not vertically aligned
+ 641999 Consider adding a workarea API
+ 657578 Toggling the state of a GtkCheckButton causes accessible...
+ 659445 Accessible event.any_data is incorrect for text-removed...
+ 663573 Rework GtkFileChooserEntry
+ 666392 widget: Flip the sensitive flag even if the state doesn't...
+ 666552 Layered region is leaked in GdkWindow
+
+* Updated translations
+ Breton
+ Kazakh
+ Russian
+ Slovak
+ Spanish
+
+
+Overview of Changes in GTK+ 3.3.4
+=================================
+
+* The beagle search backend has been dropped
+
+* Stop using GDK/GTK_DISABLE_DEPRECATED guards for deprecated
+  functions; instead use function attributes
+
+* Make GtkCellRendererAccel support naked keyvals, so it can
+  be used in gnome-control-center
+
+* GDK changes
+ - Make the Mod1 == Alt assumption official
+ - The Broadway backend has initial support for V7+ websockets
+
+* GtkApplication no longer uses gtk_main internally
+
+* GtkNotebook now destroys its action widgets, instead of leaking them
+
+* Theming improvements:
+ - Background images can now be tiled instead of stretched,
+   using the background-repeat CSS property
+ - Unfocused windows can be themed differently, using
+   the 'window-unfocused' state flag
+
+* Accessibility improvements:
+ - Much better treeview performance
+ - Completely ignore invisible columns in treeviews
+ - Many a11y/treeview-related crashes fixed
+ - Combo box keybindings are reported again
+ - Textview respects display lines again
+
+* OS X improvements:
+ - Improved handling of motion events and event state
+ - Handle recursive CFRunLoops
+ - More fixes to accel handling
+
+* Win32 improvements:
+ - Many fixes, making this the first version of GTK+ 3 that
+   works well on Windows
+
+* Bugs fixed:
+  84314 gdk_display_sync() and gdk_flush()
+ 142874 use of SetWindowLong in gdkwindow-win32.c causes incorrect...
+ 169811 configure_event and window-state-event are not emitted con...
+ 171456 "Keep Above" option in Gimp broken on Win32
+ 324254 Realizing a top-level window widget early positions it at 0,0
+ 516822 gtk_window_fullscreen does not resize correctly if removing...
+ 542777 Scroll-Wheel doesn't scroll (Win)
+ 552041 Windows' System Menu from taskbar is buggy
+ 603559 gtk should handle missing immodules better
+ 604156 gtk_window_set_modal() freezes application completely
+ 606727 Can't bind keys on numerical keypad with numlock on
+ 612359 Dialog positioning hints fail on Windows 7
+ 616544 win32 drag and drop (DnD) broken for GTK+ 3
+ 628049 Native windows don't work very well
+ 631384 Images pasted from clipboard are shifted/wrapped
+ 647460 typo in msw_style.c?
+ 652239 win32: resurect Windows clipboard selection notification
+ 658841 Ensure native window in gdk_win32_drawable_get_handle()...
+ 658842 Fix win32 _gdk_windowing_window_at_pointer - port to gtk3
+ 659151 Cannot obtain accessible keybinding for comboboxes
+ 659257 Gtk-WARNING **: GtkRecentChooserWidget 0x80da890 is mapped...
+ 661858 Add annotations for some GtkRadio* constructors
+ 661859 Add annotations for some GtkSymbolicColor constructors
+ 661997 Gtk crashes when changing the TreeView model while rubber...
+ 662160 gtk_print_operation_cancel fails
+ 662628 Add keyboard brightness to keyname-table.h
+ 662670 Pressing "Enter" in print dialog box will not cause printing
+ 662691 menuitem: Always treat submenus as popup
+ 662755 Keycode support in GtkCellRendererAccel broken
+ 662839 Fix XIGrabKeycode usage
+ 662870 Fix introspection annotations for GtkRadioToolButton
+ 662953 x11: Fix window manager change detection
+ 663073 gtk_dialog_new_with_buttons should be G_GNUC_NULL_TERMINATED
+ 663138 iconview: layout items immediately when setting a GtkTreeModel
+ 663182 Dragging any item on OS X crashes Banshee
+ 663345 'from gi.repository import Gtk' fails in jhbuild
+ 663396 With multiple master devices, right clicking may show popup...
+ 663522 css: start background-repeat
+ 663605 Fix event->state of many event types on quartz
+ 663694 GtkTreeViewAccessibleCellInfo are leaked
+ 663761 gtk: Fix GtkCellRenderer ignoring keycodes
+ 663825 calling gtk_progress_bar_set_fraction with a fraction > 1.0...
+ 663856 Make option-foo accelerators use the right symbol
+ 663994 GtkTextView no longer reports the correct line text to ATs...
+ 664021 GtkSpinButton: Clarify clamping behavior in gtk_spin_button...
+ 664027 Build fails with undefined reference to `gdk_keymap_get_mod...
+ 664132 gdk_cairo_region_create_from_surface broken on PPC...
+
+
+Overview of Changes in GTK+ 3.3.2
+=================================
+
+* GtkCellRendererAccel can show virtual modifiers
+
+* Theming improvements:
+ - CSS: 'transparent' can be used a color
+ - Improved notebook tab rendering
+ - Support opacity and rounded corners for tooltips
+
+* OS X improvements:
+ - Disable mnemonics
+ - Make Option work as a modifier
+ - Cleanup of modifiers: Alt/Option is MOD1, Command is MOD2
+ - Fix keyval <> Unicode and lowercase/uppercase mapping
+
+* Improvements of cross-platform key and button event handling:
+ - Support '<Primary>' in accelerator strings
+ - Use approprivate modifiers for extending and modifying
+   selections, depending on the platform
+ - Use the appropriate button for triggering context menus,
+   depending on the platform
+
+* Bugs fixed:
+ 628936 gtk build fails because of objective-c elements
+ 653289 GtkCellRendererText "edited" signal not emitted...
+ 655057 rendering issues with map plugin
+ 657770 Write to released memory in gtkdnd-quartz.c
+ 658767 Drag and Drop NSEvent capture is racy
+ 658772 Directory paths for resource directories are hard-coded
+ 659022 gtk_tree_model_filter_clear_cache_helper: assertion failed
+ 659655 3 errors in Spanish translation of gtk+
+ 660687 roxterm X crashes with accessibility enabled
+ 660730 Use of "struct stat" breaks Windows
+ 659602 Provide an abstraction for the platform's use...
+ 659406 Abstract what triggers a context menu
+ 660619 __SIZEOF_INT__ and __SIZEOF_POINTER__ may not be defined
+ 599617 a modern tooltip look
+ 628936 gtk build fails because of objective-c elements
+ 631167 GtkComboBox with has-entry=true should not require...
+ 651818 Crash in gtk_app_chooser_refresh()
+ 659672 gtk_tree_view_column_dispose() does not remove from tree...
+ 660139 GtkGrid gives Gtk-Warnings about negative sizes...
+ 660833 all: add an 'only-child' pseudo-class selector
+ 661032 out-of-tree builds result in broken gtk-doc documentation
+ 661089 gtkfontbutton.c will not compile on Solaris
+ 661780 GTK_STOCK_INDENT references wrong images
+ 661835 GMountOperation on OpenBSD: remove the need for kvm(3)
+ 662024 tests/css/parser/selector.errors missing from EXTRA_DIST
+ 662132 --sync
+ 662177 Toolbar returns invalid paths for toolbar items
+ 662230 treemodel: document gtk_tree_path_free() as allow-none
+ 662308 Scrollbars seem to unconditionally reserve a space...
+ 662467 tooltip: only update shape if the window is realized
+ 662481 Clean up the gtkprivate directory redefinition mess
+ 662629 notebook: update tab area allocation when switching page
+
+* Translation updates
+ Brazilian Portuguese
+ British English
+ Catalan (Valencian)
+ Czech
+ Dutch
+ Esperanto
+ Japanese
+ Galician
+ Latvian
+ Serbian
+ Spanish
+ Simplified Chinese
+ Traditional Chinese
+ Vietnamese
+
+
 Overview of Changes in GTK+ 3.2
 ===============================
 

README.in

@@ -27,6 +27,11 @@ Installation
 See the file 'INSTALL'
 
 
+Release notes for 3.4
+=====================
+
+* The -uninstalled variants of the pkg-config files have been dropped.
+
 Release notes for 3.2
 =====================
 

build/win32/vs10/gtk+.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
-    <GlibEtcInstallRoot>..\..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
+    <GlibEtcInstallRoot>..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
     <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>
     <GtkApiVersion>3.0</GtkApiVersion>
@@ -95,6 +95,8 @@ copy ..\..\..\gdk\gdkthreads.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
 
 copy ..\..\..\gdk\gdktypes.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
 
+copy ..\..\..\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
 copy ..\..\..\gdk\gdkvisual.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
 
 copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
@@ -139,6 +141,8 @@ copy ..\..\..\gtk\gtkaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkactiongroup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkactionable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkactivatable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkadjustment.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -155,6 +159,8 @@ copy ..\..\..\gtk\gtkappchooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\
 
 copy ..\..\..\gtk\gtkapplication.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkapplicationwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkarrow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkaspectframe.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -217,9 +223,13 @@ copy ..\..\..\gtk\gtkclipboard.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkcolorbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkcolorsel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+copy ..\..\..\gtk\gtkcolorchooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkcolorseldialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+copy ..\..\..\gtk\gtkcolorchooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcolorchooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcolorutils.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkcombobox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
@@ -229,6 +239,8 @@ copy ..\..\..\gtk\gtkcontainer.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkcssprovider.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkcsssection.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkdebug.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -265,7 +277,11 @@ copy ..\..\..\gtk\gtkfixed.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkfontbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkfontsel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+copy ..\..\..\gtk\gtkfontchooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkfontchooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkfontchooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkframe.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
@@ -273,22 +289,6 @@ copy ..\..\..\gtk\gtkgradient.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkgrid.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkhandlebox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkhbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkhbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkhpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkhscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkhscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkhseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkhsv.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkiconfactory.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkicontheme.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -301,6 +301,8 @@ copy ..\..\..\gtk\gtkimagemenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkimcontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkimcontextinfo.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkimcontextsimple.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkimmodule.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -369,6 +371,8 @@ copy ..\..\..\gtk\gtkprintsettings.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkprivate.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkprivatetypebuiltins.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkprogressbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkradioaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -381,8 +385,6 @@ copy ..\..\..\gtk\gtkradiotoolbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\g
 
 copy ..\..\..\gtk\gtkrange.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkrc.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkrecentaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkrecentchooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -435,8 +437,6 @@ copy ..\..\..\gtk\gtkstatusicon.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkstock.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkstyle.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkstylecontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkstyleproperties.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -447,10 +447,6 @@ copy ..\..\..\gtk\gtkswitch.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtksymboliccolor.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtktable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
-copy ..\..\..\gtk\gtktearoffmenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtktestutils.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtktextattributes.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -517,26 +513,16 @@ copy ..\..\..\gtk\gtktreeviewcolumn.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gt
 
 copy ..\..\..\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
+copy ..\..\..\gtk\gtktypes.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkuimanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkvbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkvbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkversion.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkviewport.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkvolumebutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkvpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkvscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkvscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkvseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -544,6 +530,51 @@ copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 copy ..\..\..\gtk\gtkwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 
+mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtkcolorsel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtkcolorseldialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtkfontsel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtkhandlebox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtkhbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtkhbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtkhpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtkhscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtkhsv.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtkhscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtkhseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtkrc.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtkstyle.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtktable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtktearoffmenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtkvbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtkvbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtkvscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtkvscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtkvseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+copy ..\..\..\gtk\deprecated\gtkvpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
+
+
 mkdir $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util
 
 copy ..\..\..\libgail-util\gail-util.h $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util
@@ -565,7 +596,9 @@ mkdir $(CopyDir)\share\glib-2.0\schemas
 
 copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
 
-echo "Compiling gsettings XML File(s)..."
+copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
+
+echo "Compiling gsettings XML Files..."
 
 $(CopyDir)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
 
@@ -588,7 +621,7 @@ $(CopyDir)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
     </ClCompile>
 	<Link>

build/win32/vs10/gtk.vcxprojin

@@ -69,7 +69,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -91,7 +91,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -114,7 +114,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -136,7 +136,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>

build/win32/vs10/gtk3-demo.vcxproj

@@ -164,6 +164,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\demos\gtk-demo\application.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\appwindow.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\assistant.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\builder.c" />
@@ -202,6 +203,7 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\textview.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\ui_manager.c" />
   </ItemGroup>

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

@@ -11,6 +11,9 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\demos\gtk-demo\application.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\appwindow.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -125,6 +128,9 @@
     <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>

build/win32/vs9/gtk+.vsprops

@@ -9,7 +9,7 @@
 	<Tool
 		Name="VCCLCompilerTool"
 		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"
-		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES"
+		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES"
 		ForcedIncludeFiles="msvc_recommended_pragmas.h"
 	/>
 	<Tool
@@ -101,6 +101,7 @@ copy ..\..\..\gdk\gdkselection.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D
 copy ..\..\..\gdk\gdktestutils.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkthreads.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdktypes.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkversionmacros.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkvisual.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\win32\gdkwin32.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
@@ -124,6 +125,7 @@ copy ..\..\..\gtk\gtkaccelmap.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;
 copy ..\..\..\gtk\gtkaccessible.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkactiongroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkactionable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkactivatable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkadjustment.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkalignment.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -132,6 +134,7 @@ copy ..\..\..\gtk\gtkappchooserbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\g
 copy ..\..\..\gtk\gtkappchooserdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkappchooserwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkapplication.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkapplicationwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkarrow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkaspectframe.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkassistant.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -163,12 +166,15 @@ copy ..\..\..\gtk\gtkcheckbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x
 copy ..\..\..\gtk\gtkcheckmenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkclipboard.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcolorbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorsel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorseldialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcolorchooser.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcolorchooserwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcolorchooserdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcolorutils.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcombobox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcomboboxtext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcontainer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcssprovider.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcsssection.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkdebug.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkdnd.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -187,24 +193,19 @@ copy ..\..\..\gtk\gtkfilechooserwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\
 copy ..\..\..\gtk\gtkfilefilter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkfixed.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkfontbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfontsel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfontchooser.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfontchooserdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfontchooserwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkframe.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkgradient.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkgrid.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhandlebox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhsv.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkiconfactory.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkicontheme.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkiconview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkimage.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkimagemenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkimcontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimcontextinfo.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkimcontextsimple.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkimmodule.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkimmulticontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -239,13 +240,13 @@ copy ..\..\..\gtk\gtkprintoperation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 copy ..\..\..\gtk\gtkprintoperationpreview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkprintsettings.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkprivate.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprivatetypebuiltins.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkprogressbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkradioaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkradiobutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkradiomenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkradiotoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkrange.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkrecentaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkrecentchooser.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkrecentchooserdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -272,14 +273,11 @@ copy ..\..\..\gtk\gtkspinner.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&
 copy ..\..\..\gtk\gtkstatusbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkstatusicon.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkstock.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstyle.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkstylecontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkstyleproperties.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkstyleprovider.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkswitch.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtksymboliccolor.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktearoffmenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktestutils.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktextattributes.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktextbuffer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -313,20 +311,39 @@ copy ..\..\..\gtk\gtktreestore.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D
 copy ..\..\..\gtk\gtktreeview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktreeviewcolumn.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktypebuiltins.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktypes.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkuimanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkversion.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkviewport.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvolumebutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkvolumebutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;;
 copy ..\..\..\gtk\gtkwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkwidgetpath.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 
+mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+
+copy ..\..\..\gtk\deprecated\gtkcolorsel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkcolorseldialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkfontsel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhandlebox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhsv.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkhseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkrc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkstyle.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtktable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtktearoffmenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkvbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkvbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkvscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkvscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkvseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy ..\..\..\gtk\deprecated\gtkvpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+
 mkdir $(OutDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
 copy ..\..\..\libgail-util\gail-util.h $(OutDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
 copy ..\..\..\libgail-util\gailmisc.h $(OutDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
@@ -339,7 +356,8 @@ copy $(ConfigurationName)\$(PlatformName)\bin\gailutil.lib $(OutDir)\lib&#x0D;&#
 
 mkdir $(OutDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(OutDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-echo &quot;Compiling gsettings XML File(s)...&quot;&#x0D;&#x0A;
+copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(OutDir)\share\glib-2.0\schemas&#x0D;&#x0A;
+echo &quot;Compiling gsettings XML Files...&quot;&#x0D;&#x0A;
 $(OutDir)\bin\glib-compile-schemas.exe $(OutDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 "
 	/>
@@ -379,6 +397,6 @@ $(OutDir)\bin\glib-compile-schemas.exe $(OutDir)\share\glib-2.0\schemas&#x0D;&#x
 	/>
 	<UserMacro
 		Name="GlibEtcInstallRoot"
-		Value="..\..\..\..\..\vs9\$(PlatformName)"
+		Value="..\..\..\..\vs9\$(PlatformName)"
 	/>
 </VisualStudioPropertySheet>

build/win32/vs9/gtk.vcprojin

@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"
 				PreprocessorDefinitions="$(GtkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -96,7 +96,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -128,7 +128,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"
 				PreprocessorDefinitions="$(GtkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"

build/win32/vs9/gtk3-demo.vcproj

@@ -160,6 +160,7 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
+			<File RelativePath="..\..\..\demos\gtk-demo\application.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\appwindow.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\assistant.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\builder.c" />
@@ -198,6 +199,7 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\textscroll.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\textview.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\ui_manager.c" />
 		</Filter>

config.h.win32.in

@@ -5,8 +5,8 @@
 /* always defined to indicate that i18n is enabled */
 #define ENABLE_NLS 1
 
-/* Define if gio can sniff image data */
-/* #undef GDK_PIXBUF_USE_GIO_MIME */
+/* define to enable packagekit */
+/* #undef ENABLE_PACKAGEKIT */
 
 /* The prefix for our gettext translation domains. */
 #define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
@@ -20,8 +20,8 @@
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
 
-/* Is the wctype implementation broken */
-/* #undef HAVE_BROKEN_WCTYPE */
+/* define if we have colord */
+/* #undef HAVE_COLORD */
 
 /* Define to 1 if you have the <crt_externs.h> header file. */
 /* #undef HAVE_CRT_EXTERNS_H */
@@ -73,8 +73,8 @@
 /* #undef HAVE_INTTYPES_H */
 #endif
 
-/* Define to 1 if ipc.h is available */
-/* #undef HAVE_IPC_H */
+/* Define to 1 if the system has the type `IPrintDialogCallback'. */
+#define HAVE_IPRINTDIALOGCALLBACK 1
 
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 /* #undef HAVE_LC_MESSAGES */
@@ -100,12 +100,14 @@
 /* Define to 1 if you have a working `mmap' system call. */
 /* #undef HAVE_MMAP */
 
+/* Define to 1 if nearbyint() is available */
+#ifndef _MSC_VER
+#define HAVE_NEARBYINT 1
+#endif
+
 /* Define to 1 if libpapi available */
 /* #undef HAVE_PAPI */
 
-/* Define to 1 is libjpeg supports progressive JPEG */
-/* #undef HAVE_PROGRESSIVE_JPEG */
-
 /* Define to 1 if you have the <pwd.h> header file. */
 /* #undef HAVE_PWD_H */
 
@@ -149,8 +151,8 @@
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
-/* Define to 1 if sys/select.h is available */
-/* #undef HAVE_SYS_SELECT_H */
+/* Define to 1 if you have the <sys/param.h> header file. */
+/* #undef HAVE_SYS_PARAM_H */
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
@@ -171,9 +173,6 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-/* #undef HAVE_SYS_WAIT_H */
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #ifndef _MSC_VER
 #define HAVE_UNISTD_H 1
@@ -184,12 +183,6 @@
 /* Have uxtheme.h include file */
 #define HAVE_UXTHEME_H 1
 
-/* Have wchar.h include file */
-#define HAVE_WCHAR_H 1
-
-/* Have wctype.h include file */
-#define HAVE_WCTYPE_H 1
-
 /* Define if we have X11R6 */
 /* #undef HAVE_X11R6 */
 
@@ -211,6 +204,9 @@
 /* Define to 1 if XFree Xinerama is available */
 /* #undef HAVE_XFREE_XINERAMA */
 
+/* Have XGenericEvent */
+/* #undef HAVE_XGENERICEVENTS */
+
 /* Define to 1 if xinerama is available */
 /* #undef HAVE_XINERAMA */
 
@@ -220,9 +216,6 @@
 /* Define to use XKB extension */
 /* #undef HAVE_XKB */
 
-/* Define to 1 if xshm.h is available */
-/* #undef HAVE_XSHM_H */
-
 /* Have the SYNC extension library */
 /* #undef HAVE_XSYNC */
 
@@ -248,9 +241,6 @@
 /* Define if <X11/extensions/XIproto.h> needed for xReply */
 /* #undef NEED_XIPROTO_H_FOR_XREPLY */
 
-/* Define to 1 if fd_set is not available */
-#define NO_FD_SET 1
-
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 #ifndef _MSC_VER
 /* #undef NO_MINUS_C_MINUS_O */
@@ -270,11 +260,15 @@
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gtk+"
 
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
 /* Define to the version of this package. */
 #define PACKAGE_VERSION "@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@"
 
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
+/* Use NSBundle functions to determine load paths for libraries, translations,
+   etc. */
+/* #undef QUARTZ_RELOCATION */
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -282,21 +276,8 @@
 /* Define to 1 if gmodule works and should be used */
 #define USE_GMODULE 1
 
-/* Whether to load modules via .la files rather than directly */
-/* #undef USE_LA_MODULES */
-
-/* Define to 1 if XXM is available and should be used */
-#ifndef _MSC_VER
-#  define USE_MMX 1
-#else
-#  undef USE_MMX
-#endif
-
-/* Define to 1 if no XInput should be used */
-/* #undef XINPUT_NONE */
-
-/* Define to 1 if XFree XInput should be used */
-/* #undef XINPUT_XFREE */
+/* Define to 1 if XInput 2.0 is available */
+/* #undef XINPUT_2 */
 
 /* Define to 1 if the X Window System is missing or not being used. */
 /* #undef X_DISPLAY_MISSING */
@@ -307,9 +288,6 @@
 /* Define for large files, on AIX-style hosts. */
 /* #undef _LARGE_FILES */
 
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
 /* Define to `int' if <sys/types.h> doesn't define. */
 #define gid_t int
 

configure.ac

@@ -9,9 +9,9 @@
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [2])
-m4_define([gtk_micro_version], [1])
-m4_define([gtk_interface_age], [1])
+m4_define([gtk_minor_version], [3])
+m4_define([gtk_micro_version], [20])
+m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
@@ -39,11 +39,11 @@ AC_CONFIG_AUX_DIR([build-aux])
 m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.29.14])
+m4_define([glib_required_version], [2.31.20])
 m4_define([pango_required_version], [1.29.0])
 m4_define([atk_required_version], [2.1.5])
 m4_define([cairo_required_version], [1.10.0])
-m4_define([gdk_pixbuf_required_version], [2.23.5])
+m4_define([gdk_pixbuf_required_version], [2.25.2])
 m4_define([introspection_required_version], [0.10.1])
 GLIB_REQUIRED_VERSION=glib_required_version
 PANGO_REQUIRED_VERSION=pango_required_version
@@ -165,9 +165,6 @@ case $host in
   *-*-linux*)
     os_linux=yes
     ;;
-  *-*-openbsd*)
-    os_openbsd=yes
-    ;;
 esac
 
 dnl
@@ -266,27 +263,23 @@ AC_ARG_ENABLE(xkb,
               [enable_xkb="maybe"])
 AC_ARG_ENABLE(xinerama,
               [AS_HELP_STRING([--enable-xinerama],
-	                      [support Xinerama extension if available [default=maybe]])],,
+	                      [support Xinerama extension [default=maybe]])],,
               [enable_xinerama="maybe"])
-AC_ARG_ENABLE(xinput,
-              [AS_HELP_STRING([--enable-xinput],
-                              [support XInput extension if available [default=yes]])],,
-              [enable_xinput="maybe"])
 AC_ARG_ENABLE(xrandr,
               [AS_HELP_STRING([--enable-xrandr],
-                              [support XRandR extension if available [default=maybe]])],,
+                              [support XRandR extension [default=maybe]])],,
               [enable_xrandr="maybe"])
 AC_ARG_ENABLE(xfixes,
               [AS_HELP_STRING([--enable-xfixes],
-                              [support XFixes extension if available [default=maybe]])],,
+                              [support XFixes extension [default=maybe]])],,
               [enable_xfixes="maybe"])
 AC_ARG_ENABLE(xcomposite,
               [AS_HELP_STRING([--enable-xcomposite],
-                              [support X Composite extension if available [default=maybe]])],,
+                              [support X Composite extension [default=maybe]])],,
               [enable_xcomposite="maybe"])
 AC_ARG_ENABLE(xdamage,
               [AS_HELP_STRING([--enable-xdamage],
-                              [support X Damage extension if available [default=maybe]])],,
+                              [support X Damage extension [default=maybe]])],,
               [enable_xdamage="maybe"])
 
 AC_ARG_ENABLE(x11-backend,
@@ -318,6 +311,11 @@ if test -z "$backend_set"; then
   fi
 fi
 
+AC_ARG_ENABLE(quartz-relocation,
+              [AS_HELP_STRING([--enable-quartz-relocation],
+                              [enable bundle-based relocation functions])],
+                              [quartz_relocation=yes])
+
 cairo_backends=
 backend_immodules=
 GDK_BACKENDS=
@@ -360,6 +358,10 @@ if test "x$enable_quartz_backend" = xyes; then
 #define GDK_WINDOWING_QUARTZ"
   GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
   AM_CONDITIONAL(USE_QUARTZ, true)
+  if test "x$quartz_relocation" = xyes; then
+    AC_DEFINE([QUARTZ_RELOCATION], [1], [Use NSBundle functions to determine load paths for libraries, translations, etc.])
+  fi
+
 else
   AM_CONDITIONAL(USE_QUARTZ, false)
 fi
@@ -400,7 +402,7 @@ fi
 
 if test "x$enable_debug" = "xyes"; then
   test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
-  GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES"
+  GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
 else
   if test "x$enable_debug" = "xno"; then
     GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
@@ -438,8 +440,6 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl
 
-CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES"
-
 # Ensure MSVC-compatible struct packing convention is used when
 # compiling for Win32 with gcc.
 # What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while
@@ -491,6 +491,8 @@ PKG_CHECK_MODULES(BASE_DEPENDENCIES,
 
 PKG_CHECK_MODULES(CAIRO_BACKEND, [$cairo_backends])
 
+PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
+
 if test "$os_win32" != yes; then
     # libtool option to control which symbols are exported
     # right now, symbols starting with _ are not exported
@@ -681,23 +683,11 @@ esac
 # Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working
 #
 
-GLIB_PACKAGES="gobject-2.0 gio-2.0 gmodule-no-export-2.0"
-
 AM_PATH_GLIB_2_0(glib_required_version, :,
   AC_MSG_ERROR([
 *** GLIB glib_required_version or better is required. The latest version of
 *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
-  gobject gmodule-no-export gthread)
-
-# See if it's safe to turn G_DISABLE_DEPRECATED on.
-GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.@<:@^.@:>@*\$//"`
-GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo glib_required_version | sed "s/\.@<:@^.@:>@*\$//"`
-if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
-  CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
-fi
-
-CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"
-
+  gobject gmodule-no-export)
 
 dnl
 dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
@@ -999,24 +989,6 @@ if test "x$enable_x11_backend" = xyes; then
                                        [AC_MSG_RESULT([unknown])
                                         AC_MSG_ERROR([xReply type unavailable. X11 is too old])])])
 
-  # Check for XConvertCase, XInternAtoms (X11R6 specific)
-
-  AC_CHECK_FUNCS(XConvertCase XInternAtoms)
-
-  # Generic X11R6 check needed for XIM support; we could
-  # probably use this to replace the above, but we'll
-  # leave the separate checks for XConvertCase and XInternAtoms
-  # for clarity
-
-  have_x11r6=false
-  AC_CHECK_FUNC(XAddConnectionWatch,
-      have_x11r6=true)
-
-  if $have_x11r6; then
-    AC_DEFINE(HAVE_X11R6, 1, [Define if we have X11R6])
-  fi
-  AM_CONDITIONAL(HAVE_X11R6, $have_x11r6)
-
   # Check for XKB support.
 
   if test "x$enable_xkb" = "xyes"; then
@@ -1117,34 +1089,38 @@ if test "x$enable_x11_backend" = xyes; then
                 AC_DEFINE(HAVE_XGENERICEVENTS, 1, [Have XGenericEvent]))
 
   # set up things for XInput
-  if test "x$enable_xinput" != "xno" && $PKG_CONFIG --exists "xi" ; then
-    have_xinput=yes
-
-    AC_DEFINE(XINPUT_XFREE, 1,
-              [Define to 1 if XFree XInput should be used])
+  if $PKG_CONFIG --exists "xi" ; then
 
     X_PACKAGES="$X_PACKAGES xi"
+    GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xi"
 
     AC_CHECK_HEADER(X11/extensions/XInput2.h,
                     have_xinput2=yes
-                    X_EXTENSIONS="$X_EXTENSIONS XI2"
-                    AC_DEFINE(XINPUT_2, 1, [Define to 1 if XInput 2.0 is available]),
-                    X_EXTENSIONS="$X_EXTENSIONS XInput")
+                    AC_DEFINE(XINPUT_2, 1, [Define to 1 if XInput 2.0 is available]))
 
-  else
-    AC_DEFINE(XINPUT_NONE, 1,
-              [Define to 1 if no XInput should be used])
-  fi
+    gtk_save_LIBS="$LIBS"
+    LIBS="$LIBS -lXi"
 
-  AM_CONDITIONAL(XINPUT_XFREE, test "x$have_xinput" = "xyes")
-  AM_CONDITIONAL(XINPUT_2,     test "x$have_xinput2" = "xyes")
+    # Note that we also check that the XIScrollClassInfo struct is defined,
+    # because at least Ubuntu Oneiric seems to have XIAllowTouchEvents(), but not the XIScrollClassInfo struct.
+    AC_CHECK_FUNC([XIAllowTouchEvents],
+      [AC_CHECK_MEMBER([XIScrollClassInfo.number],
+                       have_xinput2_2=yes
+                       AC_DEFINE(XINPUT_2_2, 1, [Define to 1 if XInput 2.2 is available]),
+                       have_xinput2_2=no,
+                       [[#include <X11/extensions/XInput2.h>]])])
+    LIBS="$gtk_save_LIBS"
 
-  if test "x$enable_xinput" = "xyes" ; then
-    if test "x$have_xinput" != "xyes" -a "x$have_xinput2" != "xyes" ; then
-      AC_MSG_ERROR([*** XInput extension not found. Check 'config.log' for more details.])
+    if test "x$have_xinput2_2" = "xyes"; then
+      X_EXTENSIONS="$X_EXTENSIONS XI2.2"
+    else
+      X_EXTENSIONS="$X_EXTENSIONS XI2"
     fi
   fi
 
+  AS_IF([test "x$have_xinput2" != "xyes"],
+        [AC_MSG_ERROR([*** XInput2 extension not found. Check 'config.log' for more details.])])
+
   # Check for the RANDR extension
   if test x"$enable_xrandr" != xno; then
     if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
@@ -1224,10 +1200,7 @@ if test "x$enable_x11_backend" = xyes; then
 else
   XPACKAGES=
 
-  AM_CONDITIONAL(XINPUT_XFREE, false)
-  AM_CONDITIONAL(XINPUT_2, false)
   AM_CONDITIONAL(USE_X11, false)
-  AM_CONDITIONAL(HAVE_X11R6, false)
 fi
 
 # Check for Pango flags
@@ -1261,20 +1234,24 @@ fi
 CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"
 
-GDK_PACKAGES="$PANGO_PACKAGES $GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES gdk-pixbuf-2.0 $cairo_backends cairo-gobject"
+GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 cairo cairo-gobject"
+GDK_PRIVATE_PACKAGES="$GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $cairo_backends"
+if test "x$enable_x11_backend" = xyes; then
+  GDK_PRIVATE_PACKAGES="$GDK_PRIVATE_PACKAGES pangoft2"
+fi
 
-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES` $MATH_LIB"
-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
+GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $MATH_LIB"
+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_EXTRA_CFLAGS"
 #
 # If we aren't writing explicit dependencies, then don't put the extra libraries we need
 # into the pkg-config files
 #
 if test $enable_explicit_deps != yes ; then
-  GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 cairo-gobject"
   GDK_EXTRA_LIBS=
 fi
 
 AC_SUBST(GDK_PACKAGES)
+AC_SUBST(GDK_PRIVATE_PACKAGES)
 AC_SUBST(GDK_EXTRA_LIBS)
 AC_SUBST(GDK_EXTRA_CFLAGS)
 AC_SUBST(GDK_DEP_LIBS)
@@ -1311,17 +1288,15 @@ else
 fi
 
 GTK_PACKAGES="atk cairo cairo-gobject gdk-pixbuf-2.0 gio-2.0"
+GTK_PRIVATE_PACKAGES=""
 if test "x$enable_x11_backend" = xyes; then
-  GTK_PACKAGES="$GTK_PACKAGES pangoft2"
+  GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
 fi
 GTK_EXTRA_LIBS=
-if test x"$os_openbsd" = xyes; then
-  GTK_EXTRA_LIBS="$GTK_EXTRA_LIBS -lkvm"
-fi
 
 GTK_EXTRA_CFLAGS=
-GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $MATH_LIB"
-GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES $GTK_PACKAGES` $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
+GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES $GTK_PRIVATE_PACKAGES` $GTK_EXTRA_LIBS $MATH_LIB"
+GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PACKAGES $GTK_PACKAGES $GTK_PRIVATE_PACKAGES` $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
 
 if test x"$os_win32" = xyes; then
   GTK_EXTRA_CFLAGS="$msnative_struct"
@@ -1333,6 +1308,7 @@ PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
 CAIRO_PREFIX="`$PKG_CONFIG --variable=prefix cairo`"
 
 AC_SUBST(GTK_PACKAGES)
+AC_SUBST(GTK_PRIVATE_PACKAGES)
 AC_SUBST(GTK_EXTRA_LIBS)
 AC_SUBST(GTK_EXTRA_CFLAGS)
 AC_SUBST(GTK_DEP_LIBS)
@@ -1412,9 +1388,8 @@ else
     CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
 
     if test $CUPS_API_MAJOR -gt 1 -o \
-            $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
-      AC_DEFINE(HAVE_CUPS_API_1_2, 1,
-                [Define to 1 if CUPS 1.2 API is available])
+            $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 2; then
+      AC_MSG_ERROR([CUPS >= 1.2 not found])
     fi
 
     AC_SUBST(CUPS_API_MAJOR)
@@ -1501,6 +1476,9 @@ if test "x$enable_test_print_backend" != "xno" ; then
 fi
 AM_CONDITIONAL(TEST_PRINT_BACKEND, test "x$enable_test_print_backend" != "xno")
 
+if test "$os_win32" = "yes"; then
+  AC_CHECK_TYPES([IPrintDialogCallback],[],[],[[#include <windows.h>]])
+fi
 
 ################################################################
 # Strip -export-dynamic from the link lines of various libraries
@@ -1528,6 +1506,13 @@ fi
 
 GLIB_GSETTINGS
 
+#############
+# Resources #
+#############
+
+GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
+AC_SUBST(GLIB_COMPILE_RESOURCES)
+
 ##################################################
 # GObject introspection
 ##################################################
@@ -1719,8 +1704,6 @@ gdk-3.0.pc
 gtk+-3.0.pc
 gtk+-unix-print-3.0.pc
 gail-3.0.pc
-gtk+-3.0-uninstalled.pc
-gail-3.0-uninstalled.pc
 m4macros/Makefile
 po/Makefile.in
 po-properties/Makefile.in
@@ -1728,12 +1711,14 @@ demos/Makefile
 demos/gtk-demo/Makefile
 demos/gtk-demo/geninclude.pl
 demos/pixbuf-demo/Makefile
+demos/widget-factory/Makefile
 examples/Makefile
 tests/Makefile
 tests/a11y/Makefile
 tests/css/Makefile
 tests/css/parser/Makefile
 tests/reftests/Makefile
+tests/visuals/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/gdk/Makefile
@@ -1756,6 +1741,7 @@ gdk/win32/rc/gdk.rc
 gdk/quartz/Makefile
 gdk/wayland/Makefile
 gdk/tests/Makefile
+gdk/gdkversionmacros.h
 gtk/Makefile
 gtk/makefile.msc
 gtk/gtkversion.h

debian/README.debian

@@ -1,18 +0,0 @@
-libgtk1 for Debian
-----------------------
-
-The GIMP Tool Kit (gtk) is a set of widgets to help you program
-programs for the X Windowing System easily and powerfully.
-
-gtk is the moving force behind The GNU Image Manipulation Program (The
-GIMP) -- the number one freely-available image editing and creation
-program available. 
-
-gtk is rapidly under development, and the source tree has officially
-been separated from The GIMP now, as other teams of programmers
-are beginning to write software using its great widget set -- like
-GNOME, a desktop interface for X, and gzilla, a freely available
-web browser for X.
-
-Ben Gertzfield <che@debian.org>, Mon, 29 Sep 1997 13:11:45 -0700
-

debian/build

@@ -1,62 +0,0 @@
-#!/usr/bin/perl -w
-
-				# Adjust debian/changelog and build a new
-				# Debian package of a CVS archive.
-
-				# Written 17 November 1998 by Ben Gertzfield
-				# <che@debian.org>
-
-				# This work is released under the GNU
-				# General Public License, version 2 or
-				# later.
-
-use strict;
-use diagnostics;
-use File::Copy;
-
-my $maintainer = 'Ben Gertzfield <che@debian.org>';
-
-my @date = localtime;
-
-my $datestr = sprintf("%d%.2d%.2d", $date[5] + 1900, $date[4] + 1, $date[3]);
-my $revision = '01';
-
-open (CHANGELOG, 'debian/changelog') or die "Couldn't open debian/changelog: $!\n";
-
-$_ = <CHANGELOG>;
-chomp;
-
-close CHANGELOG;
-
-my ($package, $last_date, $last_revision) = /^(.*?) \((.*?)\.(.*)?\)/;
-
-if ($last_date eq $datestr) {
-  $revision = sprintf("%.2d", $last_revision + 1);
-}
-
-my $new_version = "$datestr.$revision";
-
-copy('debian/changelog', 'debian/changelog.old') or die "Couldn't copy debian/changelog to debian/changelog.old: $!\n";
-
-open(NEWCHANGELOG, ">debian/changelog") or die "Couldn't open debian/changelog for writing: $!\n";
-
-print NEWCHANGELOG "$package ($new_version) unstable; urgency=low\n\n  * CVS snapshot build at " . scalar localtime() . "\n\n -- $maintainer  " . `date -R` . "\n";
-
-open(OLDCHANGELOG, "debian/changelog.old") or die "Couldn't open debian/changelog.old: $!\n";
-
-while (<OLDCHANGELOG>) {
-  print NEWCHANGELOG;
-}
-
-close OLDCHANGELOG;
-close NEWCHANGELOG;
-
-unlink('debian/changelog.old') or die "Couldn't unlink debian/changelog.old: $!\n";
-
-open(NEWVERSION, '>debian/version') or die "Couldn't open debian/version for writing: $!\n";
-print NEWVERSION "$new_version\n";
-close NEWVERSION;
-
-system('dpkg-buildpackage -b -rfakeroot -us -uc');
-unlink 'debian/version' or die "Couldn't unlink debian/version: $!\n";
-

debian/changelog

@@ -1,10 +0,0 @@
-gtk+-cvs (19981116.01) unstable; urgency=low
-
-  * First test build from CVS
-
- -- Ben Gertzfield <che@debian.org>  Tue, 17 Nov 1998 12:02:13 -0800
-
-Local variables:
-mode: debian-changelog
-add-log-mailing-address: "che@debian.org"
-End:

debian/control

@@ -1,81 +0,0 @@
-Source: gtk+-cvs
-Priority: extra
-Section: libs
-Maintainer: Ben Gertzfield <che@debian.org>
-Standards-Version: 2.4.0.0
-
-Package: libgtk-cvs-1.1
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}
-Conflicts: libgtk-dev (<< 1:1.0.2), libgtk1.1
-Description: CVS build of the GIMP Toolkit set of widgets for X
- **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
-   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
- . 
- The GIMP Toolkit is a freely available set of widgets for X.
- GTK is easy to use, and has been implemented in such projects as
- The GNU Image Manipulation Program (The GIMP), GNOME, a GNU
- desktop set of utilities for X, and gzilla, a GNU web-browser.
- .
- This is the unstable 1.1 branch of GTK. It is not intended for use
- with stable projects!
-
-Package: libgtk-cvs-dev
-Architecture: any
-Section: devel
-Depends: libgtk-cvs-1.1 (=${Source-Version}), libglib-cvs-dev
-Suggests: libgtk-cvs-doc
-Provides: libgtk1.1-dev
-Replaces: libgtk1.1-dev
-Conflicts: libgtk-dev, libgtk1 (<< 1:1.0.4), libgtk1.1-dev
-Description: CVS build of development files for the GIMP Toolkit
- **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
-   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
- .
- This package contains the header files and static libraries for the
- GIMP Toolkit set of widgets for X. 
- .
- This is the unstable, 1.1 branch of GTK+. This is not intended for
- use with stable releases of programs! 
- .
- Install this package if you wish to develop your own X programs using
- the GIMP Toolkit 1.1, or if you wish to compile your own plug-ins for
- The GIMP.
-
-Package: libgtk-cvs-doc
-Architecture: all
-Section: doc
-Conflicts: libgtk-dev (<< 1:0.99.4), libgtk-doc, libgtk1.1-doc
-Description: CVS build of documentation for the GIMP Toolkit
- **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
-   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
- .
- This package contains lots of info-files, HTML docs, FAQs, and
- other handy documentation about the GIMP Toolkit set of widgets
- for X. 
- .
- This package documents the unstable 1.1 release of the GIMP Toolkit.
- . 
- Install this package if you want to have lots of info about the
- GIMP toolkit when you're programming.
-
-Package: libgtk-cvs-dbg
-Architecture: any
-Section: devel
-Depends: libgtk-cvs-1.1 (= ${Source-Version}), libgtk-cvs-dev (= ${Source-Version})
-Suggests: libgtk-cvs-doc
-Conflicts: libgtk1.1-dbg
-Description: CVS build of debugging files for the GIMP Toolkit
- **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
-   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
- .
- This package contains the debugging static libraries for the
- GIMP Toolkit set of widgets for X. 
- .
- This is the unstable, 1.1 branch of GTK+. This is not intended for
- use with stable releases of programs! 
- .
- Install this package if you wish to debug your own X programs using
- the GIMP Toolkit 1.1, or if you wish to debug your own plug-ins for
- The GIMP.

debian/copyright

@@ -1,8 +0,0 @@
-This package was debianized by Ben Gertzfield <che@debian.org> on
-Tue, 17 Nov 1998 12:07:17 -0800
-
-It was produced from the CVS repository at cvs.gimp.org.
-
-It may be redistributed under the terms of the GNU LGPL, Version 2 or
-later, found on Debian systems in the file /usr/doc/copyright/LGPL.
-

debian/libgtk-cvs-dev.files

@@ -1,9 +0,0 @@
-usr/lib/libgdk.so
-usr/lib/libgdk.a
-usr/lib/libgtk.so
-usr/lib/libgtk.a
-usr/include/gdk/
-usr/include/gtk/
-usr/bin/gtk-config
-usr/man/man1/gtk-config.1
-usr/share/aclocal/gtk.m4

debian/libgtk-cvs-dev.postinst

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#

debian/libgtk-cvs-dev.prerm

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-set -e
-install-info --quiet --remove gtk
-
-#DEBHELPER#

debian/libgtk-cvs-doc.files

@@ -1,8 +0,0 @@
-usr/info/gdk.info
-usr/info/gtk.info
-usr/info/gtk.info-1
-usr/info/gtk.info-2
-usr/info/gtk.info-3
-usr/info/gtk.info-4
-usr/info/gtk.info-5
-

debian/libgtk-cvs-doc.postinst

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-install-info --quiet --description="The GIMP Toolkit." \
- --section "The GIMP" "The GIMP" /usr/info/gtk.info.gz
-
-install-info --quiet --description="The GIMP Drawing Kit." \
- --section "The GIMP" "The GIMP" /usr/info/gdk.info.gz
-
-#DEBHELPER#

debian/libgtk-cvs-doc.prerm

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-install-info --quiet --remove gtk
-install-info --quiet --remove gdk
-
-#DEBHELPER#

debian/postinst

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-ldconfig
-
-#DEBHELPER#

debian/rules

@@ -1,160 +0,0 @@
-#!/usr/bin/make -f
-
-# debian/rules file for gtk+ Debian package
-# written April 1998 by Ben Gertzfield <che@debian.org
-
-build: build-stamp
-build-stamp:
-	dh_testdir
-	./autogen.sh --prefix=/usr --with-xinput=xfree
-	$(MAKE)
-	cd docs && make distdocs
-	cd ..
-	touch build-stamp
-
-build-dbg: build-dbg-stamp
-build-dbg-stamp:
-	dh_testdir
-	./configure --prefix=/usr --with-xinput=xfree --enable-debug=yes
-	$(MAKE)
-	touch build-dbg-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp build-dbg-stamp install-stamp install-dbg-stamp
-	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
-	cd docs 
-	-$(MAKE) maintainer-clean
-	cd ..
-	-$(MAKE) distclean
-	find . -name '*.o' -o -name '_libs' -o -name '*.lo' -o -name '*.a' -o -name '.deps' | xargs rm -rf
-	dh_clean
-
-clean-dbg:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp build-dbg-stamp install-stamp install-dbg-stamp
-	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
-	cd docs
-	-$(MAKE) maintainer-clean
-	cd ..
-	-$(MAKE) distclean
-	find . -name '*.o' -o -name '_libs' -o -name '*.lo' -o -name '*.a' -o -name '.deps' | xargs rm -rf
-	dh_clean -k
-
-install: install-stamp
-install-stamp: build
-	dh_testdir
-	dh_testroot
-	dh_clean
-	$(MAKE) prefix=`pwd`/debian/tmp/usr install
-	touch install-stamp
-
-install-dbg: install-dbg-stamp
-install-dbg-stamp: build-dbg
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	$(MAKE) prefix=`pwd`/debian/libgtk-cvs-dbg/usr install
-	touch install-dbg-stamp
-
-# Build architecture-independent files here.
-binary-indep: build install libgtk-cvs-doc
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install libgtk-cvs-dev libgtk-cvs-1.1 libgtk-cvs-dbg
-
-libgtk-cvs-1.1: build
-	dh_testdir -plibgtk-cvs-1.1 
-	dh_testroot -plibgtk-cvs-1.1
-	dh_installdirs -plibgtk-cvs-1.1
-	# Add here commands to install the files into debian/tmp
-	rm -rf debian/tmp/usr/bin debian/tmp/usr/include debian/tmp/usr/info debian/tmp/usr/lib/glib debian/tmp/usr/share/aclocal debian/tmp/usr/man debian/tmp/usr/lib/*.la
-	dh_installdocs -plibgtk-cvs-1.1
-	dh_installchangelogs -plibgtk-cvs-1.1
-	dh_strip -plibgtk-cvs-1.1
-	dh_compress -plibgtk-cvs-1.1
-	dh_fixperms -plibgtk-cvs-1.1
-	dh_installdeb -plibgtk-cvs-1.1
-	dh_shlibdeps -plibgtk-cvs-1.1
-	dh_gencontrol -plibgtk-cvs-1.1
-	dh_makeshlibs -plibgtk-cvs-1.1 -V 'libgtk-cvs-1.1 (='`cat debian/version`')'
-	dh_md5sums -plibgtk-cvs-1.1
-	dh_builddeb -plibgtk-cvs-1.1
-
-libgtk-cvs-dev: build
-	dh_testdir -plibgtk-cvs-dev
-	dh_testroot -plibgtk-cvs-dev
-	dh_clean -plibgtk-cvs-dev -k
-	dh_installdirs -plibgtk-cvs-dev
-	# Add here commands to install the files into debian/tmp
-	dh_movefiles -plibgtk-cvs-dev
-	cp gtk-config debian/tmp/usr/bin
-	dh_installdocs -plibgtk-cvs-dev 
-	dh_installchangelogs -plibgtk-cvs-dev
-	dh_strip -plibgtk-cvs-dev
-	dh_compress -plibgtk-cvs-dev
-	dh_fixperms -plibgtk-cvs-dev
-	dh_installdeb -plibgtk-cvs-dev
-	dh_shlibdeps -plibgtk-cvs-dev
-	dh_gencontrol -plibgtk-cvs-dev
-	dh_md5sums -plibgtk-cvs-dev
-	dh_builddeb -plibgtk-cvs-dev
-
-libgtk-cvs-doc:
-	dh_testdir -plibgtk-cvs-doc
-	dh_testroot -plibgtk-cvs-doc
-	dh_clean -plibgtk-cvs-doc -k
-	dh_installdirs -plibgtk-cvs-doc usr/doc/libgtk-cvs-doc/faq-html \
-	  usr/doc/libgtk-cvs-doc/tutorial-html usr/doc/libgtk-cvs-doc/italian-tutorial-html usr/doc/libgtk-cvs-doc/french-tutorial-html usr/doc/libgtk-cvs-doc/gdk-html
-	dh_movefiles -plibgtk-cvs-doc
-	cp docs/html/gtkfaq*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/faq-html
-	cp docs/html/gtk_tut-*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/tutorial-html
-	cp docs/html/*.gif debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/tutorial-html
-	cp docs/html/gtk_tut.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/tutorial-html
-	cp docs/html/gtk_tut_it*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/italian-tutorial-html
-	cp docs/html/*.gif debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/italian-tutorial-html
-	cp docs/html/gtk_tut_fr*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/french-tutorial-html
-	cp docs/html/*.gif debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/french-tutorial-html
-	cp docs/html/gdk* debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/gdk-html
-	cp docs/text/*.txt debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/
-
-	dh_installdocs -plibgtk-cvs-doc docs/{debugging,developers,styles,text_widget,widget_system,gtk-config,refcounting}.txt TODO NEWS
-	dh_installchangelogs -plibgtk-cvs-doc
-	dh_strip -plibgtk-cvs-doc
-	dh_compress -plibgtk-cvs-doc
-	dh_fixperms -plibgtk-cvs-doc
-	dh_installdeb -plibgtk-cvs-doc
-	dh_shlibdeps -plibgtk-cvs-doc
-	dh_gencontrol -plibgtk-cvs-doc
-	dh_md5sums -plibgtk-cvs-doc
-	dh_builddeb -plibgtk-cvs-doc
-
-libgtk-cvs-dbg: clean-dbg install-dbg
-	dh_testdir -plibgtk-cvs-dbg
-	dh_testroot -plibgtk-cvs-dbg
-	dh_installdirs -plibgtk-cvs-dbg
-	# Add here commands to install the files into debian/libgtk-cvs-dbg
-	rm -rf debian/libgtk-cvs-dbg/usr/bin debian/libgtk-cvs-dbg/usr/include debian/libgtk-cvs-dbg/usr/info debian/libgtk-cvs-dbg/usr/lib/glib debian/libgtk-cvs-dbg/usr/man debian/libgtk-cvs-dbg/usr/share debian/libgtk-cvs-dbg/usr/lib/*.{la,so*}
-	for file in `find debian/libgtk-cvs-dbg/usr/lib -name '*.a'` ; do \
-	  mv $$file debian/libgtk-cvs-dbg/usr/lib/`basename $$file .a`_g.a; \
-        done
-	dh_installdocs -plibgtk-cvs-dbg
-	dh_installchangelogs -plibgtk-cvs-dbg
-	dh_compress -plibgtk-cvs-dbg
-	dh_fixperms -plibgtk-cvs-dbg
-	dh_installdeb -plibgtk-cvs-dbg
-	dh_shlibdeps -plibgtk-cvs-dbg
-	dh_gencontrol -plibgtk-cvs-dbg
-	dh_md5sums -plibgtk-cvs-dbg
-	dh_builddeb -plibgtk-cvs-dbg
-
-source diff:                                                                  
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary

demos/Makefile.am

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

demos/gtk-demo/Makefile.am

@@ -6,6 +6,7 @@ democodedir=$(datadir)/gtk-$(GTK_API_VERSION)/demo
 ## These should be in the order you want them to appear in the
 ## demo app, which means alphabetized by demo title, not filename
 demos =						\
+	application.c				\
 	appwindow.c				\
 	assistant.c				\
 	builder.c				\
@@ -43,6 +44,7 @@ demos =						\
 	textview.c				\
 	textscroll.c				\
 	toolpalette.c				\
+	transparent.c				\
 	tree_store.c				\
 	ui_manager.c
 
@@ -64,13 +66,24 @@ LDADDS = \
 	$(GTK_DEP_LIBS)				\
 	-lm
 
-bin_PROGRAMS = gtk3-demo
+bin_PROGRAMS = gtk3-demo gtk3-demo-application
 
-BUILT_SOURCES = demos.h
+BUILT_SOURCES = demos.h application_resources.c
 
-EXTRA_DIST += 		\
-	$(IMAGEFILES)	\
-	demo.ui
+EXTRA_DIST += 				\
+	$(IMAGEFILES)			\
+	demo.ui				\
+	application.gresource.xml	\
+	application.ui			\
+	menus.ui			\
+	gtk-logo-24.png			\
+	gtk-logo-48.png			\
+	org.gtk.Demo.gschema.xml
+
+gsettings_SCHEMAS = \
+	org.gtk.Demo.gschema.xml
+
+@GSETTINGS_RULES@
 
 demos.h: @REBUILD@ $(demos) geninclude.pl
 	$(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
@@ -85,8 +98,17 @@ gtk3_demo_DEPENDENCIES = $(DEPS)
 gtk3_demo_LDADD = $(LDADDS)
 gtk3_demo_LDFLAGS = -export-dynamic
 
+gtk3_demo_application_SOURCES = \
+	application-standalone.c \
+	application_resources.c
+
+gtk3_demo_application_LDADD = $(LDADDS)
+
+application_resources.c: application.gresource.xml gtk-logo-24.png gtk-logo-48.png application.ui menus.ui
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/application.gresource.xml
+
 IMAGEFILES=	alphatest.png		\
-	        apple-red.png		\
+		apple-red.png		\
 		background.jpg		\
 		floppybuddy.gif		\
 		gnome-applets.png	\

demos/gtk-demo/application-standalone.c

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

demos/gtk-demo/application.c

@@ -0,0 +1,479 @@
+/* Application class
+ *
+ * Demonstrates a simple application.
+ *
+ * This examples uses GtkApplication, GtkApplicationWindow, GtkBuilder
+ * as well as GMenu and GResource. Due to the way GtkApplication is structured,
+ * it is run as a separate process.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+
+#ifdef STANDALONE
+
+static void
+show_action_dialog (GSimpleAction *action)
+{
+  const gchar *name;
+  GtkWidget *dialog;
+
+  name = g_action_get_name (G_ACTION (action));
+
+  dialog = gtk_message_dialog_new (NULL,
+                                   GTK_DIALOG_DESTROY_WITH_PARENT,
+                                   GTK_MESSAGE_INFO,
+                                   GTK_BUTTONS_CLOSE,
+                                   "You activated action: \"%s\"",
+                                    name);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (gtk_widget_destroy), NULL);
+
+  gtk_widget_show (dialog);
+}
+
+static void
+show_action_infobar (GSimpleAction *action,
+                     GVariant      *parameter,
+                     gpointer       window)
+{
+  GtkWidget *infobar;
+  GtkWidget *message;
+  gchar *text;
+  const gchar *name;
+  const gchar *value;
+
+  name = g_action_get_name (G_ACTION (action));
+  value = g_variant_get_string (parameter, NULL);
+
+  message = g_object_get_data (G_OBJECT (window), "message");
+  infobar = g_object_get_data (G_OBJECT (window), "infobar");
+  text = g_strdup_printf ("You activated radio action: \"%s\".\n"
+                          "Current value: %s", name, value);
+  gtk_label_set_text (GTK_LABEL (message), text);
+  gtk_widget_show (infobar);
+  g_free (text);
+}
+
+static void
+activate_action (GSimpleAction  *action,
+                 GVariant       *parameter,
+                 gpointer        user_data)
+{
+  show_action_dialog (action);
+}
+
+static void
+activate_toggle (GSimpleAction *action,
+                 GVariant      *parameter,
+                 gpointer       user_data)
+{
+  GVariant *state;
+
+  show_action_dialog (action);
+
+  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
+activate_radio (GSimpleAction *action,
+                GVariant      *parameter,
+                gpointer       user_data)
+{
+  show_action_infobar (action, parameter, user_data);
+
+  g_action_change_state (G_ACTION (action), parameter);
+}
+
+static void
+activate_about (GSimpleAction *action,
+                GVariant      *parameter,
+                gpointer       user_data)
+{
+  GtkWidget *window = user_data;
+  GdkPixbuf *pixbuf;
+
+  const gchar *authors[] = {
+    "Peter Mattis",
+    "Spencer Kimball",
+    "Josh MacDonald",
+    "and many more...",
+    NULL
+  };
+
+  const gchar *documentors[] = {
+    "Owen Taylor",
+    "Tony Gale",
+    "Matthias Clasen <mclasen@redhat.com>",
+    "and many more...",
+    NULL
+  };
+
+  pixbuf = gdk_pixbuf_new_from_resource ("/logos/gtk-logo-48.png", NULL);
+
+  gtk_show_about_dialog (GTK_WINDOW (window),
+                         "program-name", "GTK+ Code Demos",
+                         "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
+                                                     PACKAGE_VERSION,
+                                                     gtk_get_major_version (),
+                                                     gtk_get_minor_version (),
+                                                     gtk_get_micro_version ()),
+                         "copyright", "(C) 1997-2009 The GTK+ Team",
+                         "license-type", GTK_LICENSE_LGPL_2_1,
+                         "website", "http://www.gtk.org",
+                         "comments", "Program to demonstrate GTK+ functions.",
+                         "authors", authors,
+                         "documenters", documentors,
+                         "logo", pixbuf,
+                         "title", "About GTK+ Code Demos",
+                         NULL);
+  g_object_unref (pixbuf);
+}
+
+static void
+activate_quit (GSimpleAction *action,
+               GVariant      *parameter,
+               gpointer       user_data)
+{
+  GtkApplication *app = user_data;
+  GtkWidget *win;
+  GList *list, *next;
+
+  list = gtk_application_get_windows (app);
+  while (list)
+    {
+      win = list->data;
+      next = list->next;
+
+      gtk_widget_destroy (GTK_WIDGET (win));
+
+      list = next;
+    }
+}
+
+static void
+register_stock_icons (void)
+{
+  static gboolean registered = FALSE;
+
+  if (!registered)
+    {
+      GdkPixbuf *pixbuf;
+      GtkIconFactory *factory;
+      GtkIconSet *icon_set;
+
+      static GtkStockItem items[] = {
+        { "demo-gtk-logo", "_GTK!", 0, 0, NULL }
+      };
+
+      registered = TRUE;
+
+      gtk_stock_add (items, G_N_ELEMENTS (items));
+
+      factory = gtk_icon_factory_new ();
+      gtk_icon_factory_add_default (factory);
+
+      pixbuf = gdk_pixbuf_new_from_resource ("/logos/gtk-logo-24.png", NULL);
+
+      icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+      gtk_icon_factory_add (factory, "demo-gtk-logo", icon_set);
+      gtk_icon_set_unref (icon_set);
+      g_object_unref (pixbuf);
+
+      /* Drop our reference to the factory, GTK will hold a reference. */
+      g_object_unref (factory);
+    }
+}
+
+static void
+update_statusbar (GtkTextBuffer *buffer,
+                  GtkStatusbar  *statusbar)
+{
+  gchar *msg;
+  gint row, col;
+  gint count;
+  GtkTextIter iter;
+
+  /* clear any previous message, underflow is allowed */
+  gtk_statusbar_pop (statusbar, 0);
+
+  count = gtk_text_buffer_get_char_count (buffer);
+
+  gtk_text_buffer_get_iter_at_mark (buffer,
+                                    &iter,
+                                    gtk_text_buffer_get_insert (buffer));
+
+  row = gtk_text_iter_get_line (&iter);
+  col = gtk_text_iter_get_line_offset (&iter);
+
+  msg = g_strdup_printf ("Cursor at row %d column %d - %d chars in document",
+                         row, col, count);
+
+  gtk_statusbar_push (statusbar, 0, msg);
+
+  g_free (msg);
+}
+
+static void
+mark_set_callback (GtkTextBuffer     *buffer,
+                   const GtkTextIter *new_location,
+                   GtkTextMark       *mark,
+                   gpointer           data)
+{
+  update_statusbar (buffer, GTK_STATUSBAR (data));
+}
+
+static void
+change_theme_state (GSimpleAction *action,
+                    GVariant      *state,
+                    gpointer       user_data)
+{
+  GtkSettings *settings = gtk_settings_get_default ();
+
+  g_object_set (G_OBJECT (settings),
+                "gtk-application-prefer-dark-theme",
+                g_variant_get_boolean (state),
+                NULL);
+
+  g_simple_action_set_state (action, state);
+}
+
+static void
+change_titlebar_state (GSimpleAction *action,
+                       GVariant      *state,
+                       gpointer       user_data)
+{
+  GtkWindow *window = user_data;
+
+  gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (window),
+                                               g_variant_get_boolean (state));
+
+  g_simple_action_set_state (action, state);
+}
+
+static void
+change_radio_state (GSimpleAction *action,
+                    GVariant      *state,
+                    gpointer       user_data)
+{
+  g_simple_action_set_state (action, state);
+}
+
+static GActionEntry app_entries[] = {
+  { "new", activate_action, NULL, NULL, NULL },
+  { "open", activate_action, NULL, NULL, NULL },
+  { "save", activate_action, NULL, NULL, NULL },
+  { "save-as", activate_action, NULL, NULL, NULL },
+  { "quit", activate_quit, NULL, NULL, NULL },
+  { "dark", activate_toggle, NULL, "false", change_theme_state }
+};
+
+static GActionEntry win_entries[] = {
+  { "titlebar", activate_toggle, NULL, "false", change_titlebar_state },
+  { "shape", activate_radio, "s", "'oval'", change_radio_state },
+  { "bold", activate_toggle, NULL, "false", NULL },
+  { "about", activate_about, NULL, NULL, NULL },
+  { "file1", activate_action, NULL, NULL, NULL },
+  { "logo", activate_action, NULL, NULL, NULL }
+};
+
+static void
+clicked_cb (GtkWidget *widget, GtkWidget *info)
+{
+  gtk_widget_hide (info);
+}
+
+static void
+startup (GApplication *app)
+{
+  GtkBuilder *builder;
+  GMenuModel *appmenu;
+  GMenuModel *menubar;
+
+  builder = gtk_builder_new ();
+  gtk_builder_add_from_resource (builder, "/ui/menus.ui", NULL);
+
+  appmenu = (GMenuModel *)gtk_builder_get_object (builder, "appmenu");
+  menubar = (GMenuModel *)gtk_builder_get_object (builder, "menubar");
+
+  gtk_application_set_app_menu (GTK_APPLICATION (app), appmenu);
+  gtk_application_set_menubar (GTK_APPLICATION (app), menubar);
+
+  g_object_unref (builder);
+}
+
+static void
+activate (GApplication *app)
+{
+  GtkBuilder *builder;
+  GtkWidget *window;
+  GtkWidget *grid;
+  GtkWidget *contents;
+  GtkWidget *status;
+  GtkWidget *message;
+  GtkWidget *button;
+  GtkWidget *infobar;
+  GtkWidget *menutool;
+  GMenuModel *toolmenu;
+  GtkTextBuffer *buffer;
+
+  window = gtk_application_window_new (GTK_APPLICATION (app));
+  gtk_window_set_title (GTK_WINDOW (window), "Application Class");
+  gtk_window_set_icon_name (GTK_WINDOW (window), "document-open");
+  gtk_window_set_default_size (GTK_WINDOW (window), 200, 200);
+
+  g_action_map_add_action_entries (G_ACTION_MAP (window),
+                                   win_entries, G_N_ELEMENTS (win_entries),
+                                   window);
+
+  builder = gtk_builder_new ();
+  gtk_builder_add_from_resource (builder, "/ui/application.ui", NULL);
+
+  grid = (GtkWidget *)gtk_builder_get_object (builder, "grid");
+  contents = (GtkWidget *)gtk_builder_get_object (builder, "contents");
+  status = (GtkWidget *)gtk_builder_get_object (builder, "status");
+  message = (GtkWidget *)gtk_builder_get_object (builder, "message");
+  button = (GtkWidget *)gtk_builder_get_object (builder, "button");
+  infobar = (GtkWidget *)gtk_builder_get_object (builder, "infobar");
+  menutool = (GtkWidget *)gtk_builder_get_object (builder, "menutool");
+  toolmenu = (GMenuModel *)gtk_builder_get_object (builder, "toolmenu");
+
+  g_object_set_data (G_OBJECT (window), "message", message);
+  g_object_set_data (G_OBJECT (window), "infobar", infobar);
+
+  gtk_container_add (GTK_CONTAINER (window), grid);
+
+  gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (menutool),
+                                 gtk_menu_new_from_model (toolmenu));
+
+  gtk_widget_grab_focus (contents);
+  g_signal_connect (button, "clicked", G_CALLBACK (clicked_cb), infobar);
+
+  /* Show text widget info in the statusbar */
+  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (contents));
+  g_signal_connect_object (buffer, "changed",
+                           G_CALLBACK (update_statusbar), status, 0);
+  g_signal_connect_object (buffer, "mark-set",
+                           G_CALLBACK (mark_set_callback), status, 0);
+
+  update_statusbar (buffer, GTK_STATUSBAR (status));
+
+  gtk_widget_show_all (window);
+
+  g_object_unref (builder);
+}
+
+int
+main (int argc, char *argv[])
+{
+  GtkApplication *app;
+  GSettings *settings;
+  GAction *action;
+
+  gtk_init (NULL, NULL);
+
+  register_stock_icons ();
+
+  app = gtk_application_new ("org.gtk.Demo", 0);
+  settings = g_settings_new ("org.gtk.Demo");
+
+  g_action_map_add_action_entries (G_ACTION_MAP (app),
+                                   app_entries, G_N_ELEMENTS (app_entries),
+                                   app);
+
+  action = g_settings_create_action (settings, "color");
+
+  g_action_map_add_action (G_ACTION_MAP (app), action);
+
+  g_signal_connect (app, "startup", G_CALLBACK (startup), NULL);
+  g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
+
+  g_application_run (G_APPLICATION (app), 0, NULL);
+
+  return 0;
+}
+
+#else /* !STANDALONE */
+
+static gboolean name_seen;
+static GtkWidget *placeholder;
+
+static void
+on_name_appeared (GDBusConnection *connection,
+                  const gchar     *name,
+                  const gchar     *name_owner,
+                  gpointer         user_data)
+{
+  name_seen = TRUE;
+}
+
+static void
+on_name_vanished (GDBusConnection *connection,
+                  const gchar     *name,
+                  gpointer         user_data)
+{
+  if (!name_seen)
+    return;
+
+  if (placeholder)
+    {
+      gtk_widget_destroy (placeholder);
+      g_object_unref (placeholder);
+      placeholder = NULL;
+    }
+}
+
+GtkWidget *
+do_application (GtkWidget *toplevel)
+{
+  static guint watch = 0;
+
+  if (watch == 0)
+    watch = g_bus_watch_name (G_BUS_TYPE_SESSION,
+                              "org.gtk.Demo",
+                              0,
+                              on_name_appeared,
+                              on_name_vanished,
+                              NULL, NULL);
+
+  if (placeholder == NULL)
+    {
+      const gchar *command;
+      GError *error = NULL;
+
+      if (g_file_test ("./gtk3-demo-application", G_FILE_TEST_IS_EXECUTABLE))
+        command = "./gtk3-demo-application";
+      else
+        command = "gtk3-demo-application";
+
+      if (!g_spawn_command_line_async (command, &error))
+        {
+          g_warning ("%s", error->message);
+          g_error_free (error);
+        }
+
+      placeholder = gtk_label_new ("");
+      g_object_ref_sink (placeholder);
+    }
+  else
+    {
+      g_dbus_connection_call_sync (g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL),
+                              "org.gtk.Demo",
+                              "/org/gtk/Demo",
+                              "org.gtk.Actions",
+                              "Activate",
+                              g_variant_new ("(sava{sv})", "quit", NULL, NULL),
+                              NULL,
+                              0,
+                              G_MAXINT,
+                              NULL, NULL);
+    }
+
+  return placeholder;
+}
+
+#endif

demos/gtk-demo/application.gresource.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/logos">
+    <file preprocess="to-pixdata">gtk-logo-24.png</file>
+    <file preprocess="to-pixdata">gtk-logo-48.png</file>
+  </gresource>
+  <gresource prefix="/ui">
+    <file preprocess="xml-stripblanks">application.ui</file>
+    <file preprocess="xml-stripblanks">menus.ui</file>
+  </gresource>
+</gresources>

demos/gtk-demo/application.ui

@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<interface>
+  <object class="GtkGrid" id="grid">
+    <child>
+      <object class="GtkToolbar" id="toolbar">
+        <property name="orientation">horizontal</property>
+        <property name="halign">fill</property>
+        <property name="hexpand">True</property>
+        <child>
+          <object class="GtkMenuToolButton" id="menutool">
+            <property name="stock-id">gtk-open</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToolButton" id="quit">
+            <property name="stock-id">gtk-quit</property>
+            <property name="action-name">app.quit</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparatorToolItem" id="sep"/>
+        </child>
+        <child>
+          <object class="GtkToolButton" id="logo">
+            <property name="stock-id">demo-gtk-logo</property>
+            <property name="action-name">win.logo</property>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="left-attach">0</property>
+        <property name="top-attach">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkInfoBar" id="infobar">
+        <property name="no-show-all">True</property>
+        <property name="halign">fill</property>
+        <property name="hexpand">True</property>
+        <child internal-child="content_area">
+          <object class="GtkBox" id="content_area">
+            <child>
+              <object class="GtkLabel" id="message">
+                <property name="visible">True</property>
+                <property name="hexpand">True</property>
+                <property name="halign">fill</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkBox" id="action_area">
+            <child>
+              <object class="GtkButton" id="button">
+                <property name="visible">True</property>
+                <property name="valign">center</property>
+                <property name="label">gtk-ok</property>
+                <property name="use-stock">True</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="left-attach">0</property>
+        <property name="top-attach">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkScrolledWindow" id="sw">
+        <property name="shadow-type">in</property>
+        <child>
+          <object class="GtkTextView" id="contents">
+            <property name="halign">fill</property>
+            <property name="valign">fill</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="left-attach">0</property>
+        <property name="top-attach">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkStatusbar" id="status">
+        <property name="halign">fill</property>
+        <property name="hexpand">True</property>
+        <property name="visible">True</property>
+      </object>
+      <packing>
+        <property name="left-attach">0</property>
+        <property name="top-attach">3</property>
+      </packing>
+    </child>
+  </object>
+  <menu id="toolmenu">
+    <item>
+      <attribute name="label">File1</attribute>
+      <attribute name="action">win.file1</attribute>
+    </item>
+  </menu>
+</interface>

demos/gtk-demo/appwindow.c

@@ -1,6 +1,8 @@
-/* Application main window
+/* Application window
  *
  * Demonstrates a typical application window with menubar, toolbar, statusbar.
+ *
+ * This example uses GtkUIManager and GtkActionGroup.
  */
 
 #include <gtk/gtk.h>
@@ -29,6 +31,14 @@ activate_action (GtkAction *action)
                     NULL);
       return;
     }
+
+  if (g_str_equal (name, "HideTitlebar"))
+    {
+      gboolean value = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+      gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (window), value);
+      return;
+    }
+
   dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                    GTK_DIALOG_DESTROY_WITH_PARENT,
                                    GTK_MESSAGE_INFO,
@@ -194,6 +204,11 @@ static GtkToggleActionEntry toggle_entries[] = {
     "Prefer Dark Theme",                       /* tooltip */
     G_CALLBACK (activate_action),
     FALSE },                                   /* is_active */
+  { "HideTitlebar", NULL,
+    "_Hide Titlebar when maximized", NULL,
+    "Hide Titlebar when maximized",
+    G_CALLBACK (activate_action),
+    FALSE }
 };
 static guint n_toggle_entries = G_N_ELEMENTS (toggle_entries);
 
@@ -248,6 +263,7 @@ static const gchar *ui_info =
 "    </menu>"
 "    <menu action='PreferencesMenu'>"
 "      <menuitem action='DarkTheme'/>"
+"      <menuitem action='HideTitlebar'/>"
 "      <menu action='ColorMenu'>"
 "       <menuitem action='Red'/>"
 "       <menuitem action='Green'/>"

demos/gtk-demo/assistant.c

@@ -23,14 +23,14 @@ apply_changes_gradually (gpointer data)
   if (fraction < 1.0)
     {
       gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), fraction);
-      return TRUE;
+      return G_SOURCE_CONTINUE;
     }
   else
     {
       /* Close automatically once changes are fully applied. */
       gtk_widget_destroy (assistant);
       assistant = NULL;
-      return FALSE;
+      return G_SOURCE_REMOVE;
     }
 }
 

demos/gtk-demo/changedisplay.c

@@ -78,7 +78,8 @@ find_toplevel_at_pointer (GdkDisplay *display)
   GdkWindow *pointer_window;
   GtkWidget *widget = NULL;
 
-  pointer_window = gdk_display_get_window_at_pointer (display, NULL, NULL);
+  pointer_window = gdk_device_get_window_at_position (gtk_get_current_event_device (),
+                                                      NULL, NULL);
 
   /* The user data field of a GdkWindow is used to store a pointer
    * to the widget that created it.
@@ -131,11 +132,13 @@ query_for_toplevel (GdkScreen  *screen,
   gtk_widget_show_all (popup);
   cursor = gdk_cursor_new_for_display (display, GDK_CROSSHAIR);
 
-  if (gdk_pointer_grab (gtk_widget_get_window (popup), FALSE,
-                        GDK_BUTTON_RELEASE_MASK,
-                        NULL,
-                        cursor,
-                        GDK_CURRENT_TIME) == GDK_GRAB_SUCCESS)
+  if (gdk_device_grab (gtk_get_current_event_device (),
+                       gtk_widget_get_window (popup),
+                       GDK_OWNERSHIP_NONE,
+                       FALSE,
+                       GDK_BUTTON_RELEASE_MASK,
+                       cursor,
+                       GDK_CURRENT_TIME) == GDK_GRAB_SUCCESS)
     {
       gboolean clicked = FALSE;
 

demos/gtk-demo/clipboard.c

@@ -172,7 +172,7 @@ button_press (GtkWidget      *widget,
   GtkWidget *menu;
   GtkWidget *item;
 
-  if (button->button != 3)
+  if (button->button != GDK_BUTTON_SECONDARY)
     return FALSE;
 
   menu = gtk_menu_new ();

demos/gtk-demo/colorsel.c

@@ -30,36 +30,35 @@ draw_callback (GtkWidget *widget,
   return TRUE;
 }
 
+static void
+response_cb (GtkDialog *dialog,
+             gint       response_id,
+             gpointer   user_data)
+{
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (dialog), &color);
+      gtk_widget_override_background_color (da, 0, &color);
+    }
+
+  gtk_widget_hide (GTK_WIDGET (dialog));
+}
+
 static void
 change_color_callback (GtkWidget *button,
                        gpointer   data)
 {
   GtkWidget *dialog;
-  GtkColorSelection *colorsel;
-  GtkColorSelectionDialog *selection_dialog;
-  gint response;
 
-  dialog = gtk_color_selection_dialog_new ("Changing color");
+  dialog = gtk_color_chooser_dialog_new ("Changing color", GTK_WINDOW (window));
+  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog), &color);
 
-  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
+  g_signal_connect (dialog,
+                    "response",
+                    G_CALLBACK (response_cb),
+                    NULL);
 
-  selection_dialog = GTK_COLOR_SELECTION_DIALOG (dialog);
-  colorsel = GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection (selection_dialog));
-
-  gtk_color_selection_set_previous_rgba (colorsel, &color);
-  gtk_color_selection_set_current_rgba (colorsel, &color);
-  gtk_color_selection_set_has_palette (colorsel, TRUE);
-
-  response = gtk_dialog_run (GTK_DIALOG (dialog));
-
-  if (response == GTK_RESPONSE_OK)
-    {
-      gtk_color_selection_get_current_rgba (colorsel, &color);
-
-      gtk_widget_override_background_color (da, 0, &color);
-    }
-
-  gtk_widget_destroy (dialog);
+  gtk_widget_show_all (dialog);
 }
 
 GtkWidget *

demos/gtk-demo/drawingarea.c

@@ -97,7 +97,7 @@ scribble_button_press_event (GtkWidget      *widget,
   if (surface == NULL)
     return FALSE; /* paranoia check, in case we haven't gotten a configure event */
 
-  if (event->button == 1)
+  if (event->button == GDK_BUTTON_PRIMARY)
     draw_brush (widget, event->x, event->y);
 
   /* We've handled the event, stop processing */
@@ -126,7 +126,7 @@ scribble_motion_notify_event (GtkWidget      *widget,
    * can cope.
    */
 
-  gdk_window_get_pointer (event->window, &x, &y, &state);
+  gdk_window_get_device_position (event->window, event->device, &x, &y, &state);
 
   if (state & GDK_BUTTON1_MASK)
     draw_brush (widget, x, y);

demos/gtk-demo/editable_cells.c

@@ -48,27 +48,27 @@ add_items (void)
   g_return_if_fail (articles != NULL);
 
   foo.number = 3;
-  foo.product = "bottles of coke";
+  foo.product = g_strdup ("bottles of coke");
   foo.yummy = 20;
   g_array_append_vals (articles, &foo, 1);
 
   foo.number = 5;
-  foo.product = "packages of noodles";
+  foo.product = g_strdup ("packages of noodles");
   foo.yummy = 50;
   g_array_append_vals (articles, &foo, 1);
 
   foo.number = 2;
-  foo.product = "packages of chocolate chip cookies";
+  foo.product = g_strdup ("packages of chocolate chip cookies");
   foo.yummy = 90;
   g_array_append_vals (articles, &foo, 1);
 
   foo.number = 1;
-  foo.product = "can vanilla ice cream";
+  foo.product = g_strdup ("can vanilla ice cream");
   foo.yummy = 60;
   g_array_append_vals (articles, &foo, 1);
 
   foo.number = 6;
-  foo.product = "eggs";
+  foo.product = g_strdup ("eggs");
   foo.yummy = 10;
   g_array_append_vals (articles, &foo, 1);
 }

demos/gtk-demo/geninclude.pl.in

@@ -116,7 +116,7 @@ if (defined @child_arrays) {
 }
 
 # toplevel
-print "\nDemo testgtk_demos[] = {\n";
+print "\nDemo gtk_demos[] = {\n";
 
 $first = 1;
 foreach $href (@demos) {

demos/gtk-demo/hypertext.c

@@ -144,7 +144,7 @@ event_after (GtkWidget *text_view,
 
   event = (GdkEventButton *)ev;
 
-  if (event->button != 1)
+  if (event->button != GDK_BUTTON_PRIMARY)
     return FALSE;
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
@@ -225,29 +225,6 @@ motion_notify_event (GtkWidget      *text_view,
 
   set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), x, y);
 
-  gdk_window_get_pointer (gtk_widget_get_window (text_view),
-                          NULL, NULL, NULL);
-  return FALSE;
-}
-
-/* Also update the cursor image if the window becomes visible
- * (e.g. when a window covering it got iconified).
- */
-static gboolean
-visibility_notify_event (GtkWidget          *text_view,
-                         GdkEventVisibility *event)
-{
-  gint wx, wy, bx, by;
-
-  gdk_window_get_pointer (gtk_widget_get_window (text_view),
-                          &wx, &wy, NULL);
-
-  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
-                                         GTK_TEXT_WINDOW_WIDGET,
-                                         wx, wy, &bx, &by);
-
-  set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), bx, by);
-
   return FALSE;
 }
 
@@ -285,8 +262,6 @@ do_hypertext (GtkWidget *do_widget)
                         G_CALLBACK (event_after), NULL);
       g_signal_connect (view, "motion-notify-event",
                         G_CALLBACK (motion_notify_event), NULL);
-      g_signal_connect (view, "visibility-notify-event",
-                        G_CALLBACK (visibility_notify_event), NULL);
 
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 

demos/gtk-demo/infobar.c

@@ -21,8 +21,13 @@ on_bar_response (GtkInfoBar *info_bar,
                                    "You clicked a button on an info bar");
   gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                             "Your response has id %d", response_id);
-  gtk_dialog_run (GTK_DIALOG (dialog));
-  gtk_widget_destroy (dialog);
+
+  g_signal_connect_swapped (dialog,
+                            "response",
+                            G_CALLBACK (gtk_widget_destroy),
+                            dialog);
+
+  gtk_widget_show_all (dialog);
 }
 
 GtkWidget *

demos/gtk-demo/links.c

@@ -63,7 +63,13 @@ do_links (GtkWidget *do_widget)
       label = gtk_label_new ("Some <a href=\"http://en.wikipedia.org/wiki/Text\""
                              "title=\"plain text\">text</a> may be marked up\n"
                              "as hyperlinks, which can be clicked\n"
-                             "or activated via <a href=\"keynav\">keynav</a>");
+                             "or activated via <a href=\"keynav\">keynav</a>\n"
+                             "and they work fine with other markup, like when\n"
+                             "searching on <a href=\"http://www.google.com/\">"
+                             "<span color=\"#0266C8\">G</span><span color=\"#F90101\">o</span>"
+                             "<span color=\"#F2B50F\">o</span><span color=\"#0266C8\">g</span>"
+                             "<span color=\"#00933B\">l</span><span color=\"#F90101\">e</span>"
+                             "</a>.");
       gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
       g_signal_connect (label, "activate-link", G_CALLBACK (activate_link), NULL);
       gtk_container_add (GTK_CONTAINER (window), label);

demos/gtk-demo/list_store.c

@@ -60,7 +60,7 @@ spinner_timeout (gpointer data)
   guint pulse;
 
   if (model == NULL)
-    return FALSE;
+    return G_SOURCE_REMOVE;
 
   gtk_tree_model_get_iter_first (model, &iter);
   gtk_tree_model_get (model, &iter,
@@ -77,7 +77,7 @@ spinner_timeout (gpointer data)
                       COLUMN_ACTIVE, TRUE,
                       -1);
 
-  return TRUE;
+  return G_SOURCE_CONTINUE;
 }
 
 static GtkTreeModel *

demos/gtk-demo/main.c

@@ -711,7 +711,7 @@ selection_cb (GtkTreeSelection *selection,
               GtkTreeModel     *model)
 {
   GtkTreeIter iter;
-  GValue value = {0, };
+  GValue value = G_VALUE_INIT;
 
   if (! gtk_tree_selection_get_selected (selection, NULL, &iter))
     return;
@@ -782,7 +782,7 @@ create_tree (void)
   GtkTreeIter iter;
   GtkWidget *box, *label, *scrolled_window;
 
-  Demo *d = testgtk_demos;
+  Demo *d = gtk_demos;
 
   model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_INT);
   tree_view = gtk_tree_view_new ();
@@ -936,10 +936,8 @@ main (int argc, char **argv)
    * these few lines, which are just a hack so gtk-demo will work
    * in the GTK tree without installing it.
    */
-  if (g_file_test ("../../gdk-pixbuf/libpixbufloader-pnm.la",
-                   G_FILE_TEST_EXISTS))
+  if (g_file_test ("../../modules/input/immodules.cache", G_FILE_TEST_EXISTS))
     {
-      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../../gdk-pixbuf/loaders.cache", TRUE);
       g_setenv ("GTK_IM_MODULE_FILE", "../../modules/input/immodules.cache", TRUE);
     }
   /* -- End of hack -- */
@@ -1002,7 +1000,7 @@ main (int argc, char **argv)
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
   gtk_widget_show_all (window);
 
-  load_file (testgtk_demos[0].filename);
+  load_file (gtk_demos[0].filename);
 
   gtk_main ();
 

demos/gtk-demo/menus.c

@@ -30,8 +30,7 @@
 #include <stdio.h>
 
 static GtkWidget *
-create_menu (gint     depth,
-             gboolean tearoff)
+create_menu (gint     depth)
 {
   GtkWidget *menu;
   GtkWidget *menuitem;
@@ -45,13 +44,6 @@ create_menu (gint     depth,
   menu = gtk_menu_new ();
   group = NULL;
 
-  if (tearoff)
-    {
-      menuitem = gtk_tearoff_menu_item_new ();
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-      gtk_widget_show (menuitem);
-    }
-
   for (i = 0, j = 1; i < 5; i++, j++)
     {
       sprintf (buf, "item %2d - %d", depth, j);
@@ -63,7 +55,7 @@ create_menu (gint     depth,
       if (i == 3)
         gtk_widget_set_sensitive (menuitem, FALSE);
 
-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (depth - 1, TRUE));
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (depth - 1));
     }
 
   return menu;
@@ -128,7 +120,7 @@ do_menus (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (box1), menubar, FALSE, TRUE, 0);
       gtk_widget_show (menubar);
 
-      menu = create_menu (2, TRUE);
+      menu = create_menu (2);
 
       menuitem = gtk_menu_item_new_with_label ("test\nline2");
       gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
@@ -136,12 +128,12 @@ do_menus (GtkWidget *do_widget)
       gtk_widget_show (menuitem);
 
       menuitem = gtk_menu_item_new_with_label ("foo");
-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (3, TRUE));
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (3));
       gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
       gtk_widget_show (menuitem);
 
       menuitem = gtk_menu_item_new_with_label ("bar");
-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (4, TRUE));
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (4));
       gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
       gtk_widget_show (menuitem);
 

demos/gtk-demo/menus.ui

@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<interface>
+  <menu id="appmenu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_New</attribute>
+        <attribute name="action">app.new</attribute>
+        <attribute name="accel">&lt;Primary&gt;n</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_Open</attribute>
+        <attribute name="action">app.open</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_Save</attribute>
+        <attribute name="action">app.save</attribute>
+        <attribute name="accel">&lt;Primary&gt;s</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Save _As...</attribute>
+        <attribute name="action">app.save-as</attribute>
+        <attribute name="accel">&lt;Primary&gt;s</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Quit</attribute>
+        <attribute name="action">app.quit</attribute>
+        <attribute name="accel">&lt;Primary&gt;q</attribute>
+      </item>
+    </section>
+  </menu>
+  <menu id="menubar">
+    <submenu>
+      <attribute name="label" translatable="yes">_Preferences</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Prefer Dark Theme</attribute>
+          <attribute name="action">app.dark</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Hide Titlebar when maximized</attribute>
+          <attribute name="action">win.titlebar</attribute>
+        </item>
+        <submenu>
+          <attribute name="label" translatable="yes">_Color</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Red</attribute>
+              <attribute name="action">app.color</attribute>
+              <attribute name="target">red</attribute>
+              <attribute name="accel">&lt;Primary&gt;r</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Green</attribute>
+              <attribute name="action">app.color</attribute>
+              <attribute name="target">green</attribute>
+              <attribute name="accel">&lt;Primary&gt;g</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Blue</attribute>
+              <attribute name="action">app.color</attribute>
+              <attribute name="target">blue</attribute>
+              <attribute name="accel">&lt;Primary&gt;b</attribute>
+            </item>
+          </section>
+        </submenu>
+        <submenu>
+          <attribute name="label" translatable="yes">_Shape</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Square</attribute>
+              <attribute name="action">win.shape</attribute>
+              <attribute name="target">square</attribute>
+              <attribute name="accel">&lt;Primary&gt;s</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Rectangle</attribute>
+              <attribute name="action">win.shape</attribute>
+              <attribute name="target">rectangle</attribute>
+              <attribute name="accel">&lt;Primary&gt;r</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Oval</attribute>
+              <attribute name="action">win.shape</attribute>
+              <attribute name="target">oval</attribute>
+              <attribute name="accel">&lt;Primary&gt;o</attribute>
+            </item>
+          </section>
+        </submenu>
+        <item>
+          <attribute name="label" translatable="yes">_Bold</attribute>
+          <attribute name="action">win.bold</attribute>
+          <attribute name="accel">&lt;Primary&gt;b</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <item>
+        <attribute name="label" translatable="yes">_About</attribute>
+        <attribute name="action">win.about</attribute>
+        <attribute name="accel">&lt;Primary&gt;a</attribute>
+      </item>
+    </submenu>
+  </menu>
+</interface>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<schemalist>
+
+  <enum id='org.gtk.Demo.Color'>
+    <value nick='red'   value='0'/>
+    <value nick='green' value='1'/>
+    <value nick='blue'  value='2'/>
+  </enum>
+
+  <schema id='org.gtk.Demo' path='/org/gtk/Demo/'>
+    <key name='color' enum='org.gtk.Demo.Color'>
+      <default>'red'</default>
+    </key>
+  </schema>
+
+</schemalist>

demos/gtk-demo/pixbufs.c

@@ -180,7 +180,7 @@ timeout (gpointer data)
   GDK_THREADS_LEAVE ();
 
   frame_num++;
-  return TRUE;
+  return G_SOURCE_CONTINUE;
 }
 
 static guint timeout_id;

demos/gtk-demo/search_entry.c

@@ -29,8 +29,7 @@ static gboolean
 search_progress (gpointer data)
 {
   gtk_entry_progress_pulse (GTK_ENTRY (data));
-
-  return TRUE;
+  return G_SOURCE_CONTINUE;
 }
 
 static void

demos/gtk-demo/textscroll.c

@@ -49,7 +49,7 @@ scroll_to_end (GtkTextView *textview)
   if (count > 150)
     count = 0;
 
-  return TRUE;
+  return G_SOURCE_CONTINUE;
 }
 
 /* Scroll to the bottom of the buffer.
@@ -100,7 +100,7 @@ scroll_to_bottom (GtkTextView *textview)
   if (count > 40)
     count = 0;
 
-  return TRUE;
+  return G_SOURCE_CONTINUE;
 }
 
 static guint

demos/gtk-demo/toolpalette.c

@@ -350,7 +350,7 @@ interactive_canvas_real_drag_leave (gpointer data)
       gtk_widget_queue_draw (widget);
     }
 
-  return FALSE;
+  return G_SOURCE_REMOVE;
 }
 
 static void

demos/gtk-demo/transparent.c

@@ -0,0 +1,248 @@
+/* Transparent
+ *
+ * Use transparent background on GdkWindows to create a shadow effect on a GtkOverlay widget.
+ */
+
+#include <gtk/gtk.h>
+
+#define SHADOW_OFFSET_X 7
+#define SHADOW_OFFSET_Y 7
+#define SHADOW_RADIUS 5
+
+static void
+draw_shadow_box (cairo_t   *cr,
+		 GdkRectangle rect,
+		 double radius,
+		 double transparency)
+{
+  cairo_pattern_t *pattern;
+  double x0, x1, x2, x3;
+  double y0, y1, y2, y3;
+
+  x0 = rect.x;
+  x1 = rect.x + radius;
+  x2 = rect.x + rect.width - radius;
+  x3 = rect.x + rect.width;
+  
+  y0 = rect.y;
+  y1 = rect.y + radius;
+  y2 = rect.y + rect.height - radius;
+  y3 = rect.y + rect.height;
+  
+   /* Fill non-border part */
+  cairo_set_source_rgba (cr, 0, 0, 0, transparency);
+  cairo_rectangle (cr,
+		   x1, y1, x2 - x1, y2 - y1);
+  cairo_fill (cr);
+
+  /* Upper border */
+
+  pattern = cairo_pattern_create_linear (0, y0, 0, y1);
+  
+  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, 0.0);
+  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, transparency);
+  
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+  
+  cairo_rectangle (cr,
+		   x1, y0,
+		   x2 - x1, y1 - y0);
+  cairo_fill (cr);
+
+  /* Bottom border */
+
+  pattern = cairo_pattern_create_linear (0, y2, 0, y3);
+  
+  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, transparency);
+  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, 0.0);
+  
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+  
+  cairo_rectangle (cr,
+		   x1, y2,
+		   x2 - x1, y3 - y2);
+  cairo_fill (cr);
+  
+  /* Left border */
+
+  pattern = cairo_pattern_create_linear (x0, 0, x1, 0);
+  
+  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, 0.0);
+  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, transparency);
+  
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+  
+  cairo_rectangle (cr,
+		   x0, y1,
+		   x1 - x0, y2 - y1);
+  cairo_fill (cr);
+
+  /* Right border */
+
+  pattern = cairo_pattern_create_linear (x2, 0, x3, 0);
+  
+  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, transparency);
+  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, 0.0);
+  
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+  
+  cairo_rectangle (cr,
+		   x2, y1,
+		   x3 - x2, y2 - y1);
+  cairo_fill (cr);
+
+  /* NW corner */
+  
+  pattern = cairo_pattern_create_radial (x1, y1, 0,
+					 x1, y1, radius);
+
+  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, transparency);
+  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, 0.0);
+  
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+  
+  cairo_rectangle (cr,
+		   x0, y0,
+		   x1 - x0, y1 - y0);
+  cairo_fill (cr);
+
+  /* NE corner */
+  
+  pattern = cairo_pattern_create_radial (x2, y1, 0,
+					 x2, y1, radius);
+
+  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, transparency);
+  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, 0.0);
+  
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+  
+  cairo_rectangle (cr,
+		   x2, y0,
+		   x3 - x2, y1 - y0);
+  cairo_fill (cr);
+
+  /* SW corner */
+  
+  pattern = cairo_pattern_create_radial (x1, y2, 0,
+					 x1, y2, radius);
+
+  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, transparency);
+  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, 0.0);
+  
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+  
+  cairo_rectangle (cr,
+		   x0, y2,
+		   x1 - x0, y3 - y2);
+  cairo_fill (cr);
+
+  /* SE corner */
+  
+  pattern = cairo_pattern_create_radial (x2, y2, 0,
+					 x2, y2, radius);
+
+  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, transparency);
+  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, 0.0);
+  
+  cairo_set_source (cr, pattern);
+  cairo_pattern_destroy (pattern);
+  
+  cairo_rectangle (cr,
+		   x2, y2,
+		   x3 - x2, y3 - y2);
+  cairo_fill (cr);
+}
+
+static gboolean
+draw_callback (GtkWidget *widget,
+               cairo_t   *cr,
+               gpointer   data)
+{
+  GdkRectangle rect;
+
+  gtk_widget_get_allocation (widget, &rect);
+  rect.x += SHADOW_OFFSET_X;
+  rect.y += SHADOW_OFFSET_Y;
+  rect.width -= SHADOW_OFFSET_X;
+  rect.height -= SHADOW_OFFSET_Y;
+
+  draw_shadow_box (cr,
+		   rect, SHADOW_RADIUS, 0.4);
+  
+  return FALSE;
+}
+
+GtkWidget *
+do_transparent (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+
+  if (!window)
+    {
+      GtkWidget *view;
+      GtkWidget *sw;
+      GtkWidget *overlay;
+      GtkWidget *align;
+      GtkWidget *entry;
+      GdkRGBA transparent = {0, 0, 0, 0};
+
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
+      gtk_window_set_default_size (GTK_WINDOW (window),
+                                   450, 450);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      gtk_window_set_title (GTK_WINDOW (window), "Transparent");
+      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
+
+      view = gtk_text_view_new ();
+
+      sw = gtk_scrolled_window_new (NULL, NULL);
+      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+                                      GTK_POLICY_AUTOMATIC,
+                                      GTK_POLICY_AUTOMATIC);
+      gtk_container_add (GTK_CONTAINER (sw), view);
+
+      overlay = gtk_overlay_new ();
+      gtk_container_add (GTK_CONTAINER (overlay), sw);
+      gtk_container_add (GTK_CONTAINER (window), overlay);
+
+      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);
+      
+      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);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    {
+      gtk_widget_show (window);
+    }
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}

demos/pixbuf-demo/pixbuf-demo.c

@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

demos/widget-factory/Makefile.am

@@ -0,0 +1,31 @@
+include $(top_srcdir)/Makefile.decl
+
+bin_PROGRAMS = gtk3-widget-factory
+
+gtk3_widget_factory_SOURCES = \
+	widget-factory.c	\
+	widget_factory_resources.c
+
+BUILT_SOURCES = \
+	widget_factory_resources.c
+
+gtk3_widget_factory_DEPENDENCIES = \
+	$(top_builddir)/gtk/libgtk-3.la
+
+gtk3_widget_factory_CPPFLAGS = \
+	-I$(top_srcdir)			\
+	$(GTK_DEBUG_FLAGS)		\
+	$(GTK_DEP_CFLAGS)
+
+gtk3_widget_factory_LDADD = \
+	$(top_builddir)/gdk/libgdk-3.la \
+	$(top_builddir)/gtk/libgtk-3.la \
+	$(GTK_DEP_LIBS)
+
+widget_factory_resources.c: widget-factory.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/widget-factory.gresource.xml)
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
+
+EXTRA_DIST += \
+	widget-factory.ui \
+	widget-factory.gresource.xml \
+	gtk-logo-256.png

demos/widget-factory/widget-factory.c

@@ -14,14 +14,13 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License  along  with  this library;  if not,  write to  the Free
- * Software Foundation, Inc., 51  Franklin St, Fifth Floor, Boston,
- * MA 02110-1301, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by Andrea Cimitan <andrea.cimitan@canonical.com>
  *
  */
 
+#include "config.h"
 #include <gtk/gtk.h>
 
 static void
@@ -35,6 +34,37 @@ dark_toggled (GtkCheckMenuItem *item, gpointer data)
                 NULL);
 }
 
+static void
+show_about (GtkMenuItem *item, GtkWidget *window)
+{
+  GdkPixbuf *pixbuf;
+  const gchar *authors[] = {
+    "Andrea Cimitan",
+    "Cosimo Cecchi",
+    NULL
+  };
+
+  pixbuf = gdk_pixbuf_new_from_resource ("/logos/gtk-logo-256.png", NULL);
+
+  gtk_show_about_dialog (GTK_WINDOW (window),
+                         "program-name", "GTK+ Widget Factory",
+                         "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
+                                                     PACKAGE_VERSION,
+                                                     gtk_get_major_version (),
+                                                     gtk_get_minor_version (),
+                                                     gtk_get_micro_version ()),
+                         "copyright", "(C) 1997-2009 The GTK+ Team",
+                         "license-type", GTK_LICENSE_LGPL_2_1,
+                         "website", "http://www.gtk.org",
+                         "comments", "Program to demonstrate GTK+ themes and widgets",
+                         "authors", authors,
+                         "logo", pixbuf,
+                         "title", "About GTK+ Widget Factory",
+                         NULL);
+
+  g_object_unref (pixbuf);
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -49,7 +79,7 @@ main (int argc, char *argv[])
     dark = TRUE;
 
   builder = gtk_builder_new ();
-  gtk_builder_add_from_file (builder, "./widget-factory.ui", NULL);
+  gtk_builder_add_from_resource (builder, "/ui/widget-factory.ui", NULL);
 
   window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
   gtk_builder_connect_signals (builder, NULL);
@@ -58,6 +88,9 @@ main (int argc, char *argv[])
   g_signal_connect (widget, "toggled", G_CALLBACK (dark_toggled), NULL);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (widget), dark);
 
+  widget = (GtkWidget*) gtk_builder_get_object (builder, "aboutmenuitem");
+  g_signal_connect (widget, "activate", G_CALLBACK (show_about), window);
+
   g_object_unref (G_OBJECT (builder));
 
   gtk_widget_show (window);

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/logos">
+    <file>gtk-logo-256.png</file>
+  </gresource>
+  <gresource prefix="/ui">
+    <file preprocess="xml-stripblanks">widget-factory.ui</file>
+  </gresource>
+</gresources>

demos/widget-factory/widget-factory.ui

@@ -7,6 +7,13 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">1000</property>
+    <property name="lower">1</property>
+    <property name="value">42</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkListStore" id="liststore1">
     <columns>
       <!-- column-name Cool -->
@@ -47,6 +54,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
   <object class="GtkAccelGroup" id="accelgroup1"/>
   <object class="GtkWindow" id="window">
     <property name="can_focus">False</property>
+    <property name="title">GTK+ Widget Factory</property>
+    <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
+    <signal name="delete-event" handler="gtk_false" swapped="no"/>
     <child>
       <object class="GtkBox" id="box1">
         <property name="visible">True</property>
@@ -122,6 +132,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
+                        <signal name="activate" handler="gtk_main_quit" swapped="no"/>
                       </object>
                     </child>
                   </object>
@@ -380,7 +391,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem10">
+                      <object class="GtkImageMenuItem" id="aboutmenuitem">
                         <property name="label">gtk-about</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -517,10 +528,14 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                     <property name="has_entry">True</property>
                     <child internal-child="entry">
                       <object class="GtkEntry" id="comboboxtext-entry">
-                        <property name="can_focus">False</property>
                         <property name="text" translatable="yes">comboboxentry</property>
                       </object>
                     </child>
+                    <items>
+                      <item>Donald Duck</item>
+                      <item>Mickey Mouse</item>
+                      <item>Jet McQuack</item>
+                    </items>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -610,6 +625,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="invisible_char">•</property>
+                        <property name="adjustment">adjustment2</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -622,6 +638,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="invisible_char">•</property>
+                        <property name="sensitive">False</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -867,6 +884,30 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                         <property name="height">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkSwitch" id="switch1">
+                        <property name="visible">True</property>
+                        <property name="sensitive">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">6</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSwitch" id="switch2">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">6</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>

docs/reference/gdk/Makefile.am

@@ -9,10 +9,11 @@ DOC_MODULE=gdk3
 DOC_MAIN_SGML_FILE=gdk-docs.sgml
 
 # Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards="GDK_ENABLE_BROKEN|GDK_DISABLE_DEPRECATED"
+SCAN_OPTIONS=--deprecated-guards=GDK_DISABLE_DEPRECATED \
+             --ignore-decorators=G_GNUC_WARN_UNUSED_RESULT
 
 # The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../../gdk ../../../gdk/x11
+DOC_SOURCE_DIR=$(top_srcdir)/gdk $(top_srcdir)/gdk/x11
 
 # Used for dependencies
 HFILE_GLOB=$(top_srcdir)/gdk/*.h $(top_srcdir)/gdk/x11/gdkx.h

docs/reference/gdk/gdk-docs.sgml

@@ -10,9 +10,9 @@
     <releaseinfo>
       This document is for the GDK 3 library, version &version;
       The latest versions can be found online at
-      <ulink role="online-location" url="http://library.gnome.org/devel/gdk3/">http://library.gnome.org/devel/gdk3/</ulink>.
+      <ulink role="online-location" url="http://developer.gnome.org/devel/gdk3/">http://developer.gnome.org/devel/gdk3/</ulink>.
       If you are looking for the older GDK 2 series of libraries,
-      see <ulink role="online-location" url="http://library.gnome.org/devel/gdk/">http://library.gnome.org/devel/gdk/</ulink>.
+      see <ulink role="online-location" url="http://developer.gnome.org/devel/gdk/">http://developer.gnome.org/devel/gdk/</ulink>.
     </releaseinfo>
   </bookinfo>
 
@@ -61,6 +61,10 @@
     <title>Index of new symbols in 3.2</title>
     <xi:include href="xml/api-index-3.2.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-3-4" role="3.4">
+    <title>Index of new symbols in 3.4</title>
+    <xi:include href="xml/api-index-3.4.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 

docs/reference/gdk/gdk3-sections.txt

@@ -52,6 +52,14 @@ GDK_WINDOWING_X11
 GDK_WINDOWING_WIN32
 GDK_WINDOWING_QUARTZ
 
+<SUBSECTION>
+GDK_VERSION_3_0
+GDK_VERSION_3_2
+GDK_VERSION_3_4
+GDK_VERSION_MIN_REQUIRED
+GDK_VERSION_MAX_ALLOWED
+GDK_DISABLE_DEPRECATION_WARNINGS
+
 <SUBSECTION Standard>
 GDK_TYPE_GRAB_STATUS
 
@@ -74,6 +82,7 @@ gdk_grab_status_get_type
 gdk_gravity_get_type
 gdk_input_mode_get_type
 gdk_input_source_get_type
+gdk_modifier_intent_get_type
 gdk_modifier_type_get_type
 gdk_notify_type_get_type
 gdk_property_state_get_type
@@ -198,6 +207,7 @@ gdk_screen_make_display_name
 gdk_screen_get_n_monitors
 gdk_screen_get_primary_monitor
 gdk_screen_get_monitor_geometry
+gdk_screen_get_monitor_workarea
 gdk_screen_get_monitor_at_point
 gdk_screen_get_monitor_at_window
 gdk_screen_get_monitor_height_mm
@@ -365,7 +375,9 @@ gdk_window_restack
 gdk_window_focus
 gdk_window_register_dnd
 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_constrain_size
 gdk_window_beep
 
@@ -627,8 +639,10 @@ gdk_keymap_get_direction
 gdk_keymap_have_bidi_layouts
 gdk_keymap_get_caps_lock_state
 gdk_keymap_get_num_lock_state
+gdk_keymap_get_modifier_state
 gdk_keymap_add_virtual_modifiers
 gdk_keymap_map_virtual_modifiers
+gdk_keymap_get_modifier_mask
 
 <SUBSECTION>
 gdk_keyval_name
@@ -752,6 +766,11 @@ GdkEventMask
 GDK_CURRENT_TIME
 GDK_PRIORITY_EVENTS
 GDK_PRIORITY_REDRAW
+GDK_EVENT_PROPAGATE
+GDK_EVENT_STOP
+GDK_BUTTON_PRIMARY
+GDK_BUTTON_MIDDLE
+GDK_BUTTON_SECONDARY
 
 <SUBSECTION>
 gdk_events_pending
@@ -769,12 +788,16 @@ gdk_event_get_keycode
 gdk_event_get_keyval
 gdk_event_get_root_coords
 gdk_event_get_scroll_direction
+gdk_event_get_scroll_deltas
 gdk_event_get_state
 gdk_event_get_time
+GdkEventSequence
+gdk_event_get_event_sequence
 gdk_event_request_motions
 gdk_events_get_angle
 gdk_events_get_center
 gdk_events_get_distance
+gdk_event_triggers_context_menu
 
 <SUBSECTION>
 gdk_event_handler_set
@@ -807,6 +830,7 @@ GdkEvent
 GdkEventAny
 GdkEventKey
 GdkEventButton
+GdkEventTouch
 GdkEventScroll
 GdkEventMotion
 GdkEventExpose
@@ -956,6 +980,7 @@ gdk_x11_screen_supports_net_wm_hint
 gdk_x11_window_foreign_new_for_display
 gdk_x11_window_lookup_for_display
 gdk_x11_window_get_xid
+gdk_x11_window_set_hide_titlebar_when_maximized
 gdk_x11_window_set_theme_variant
 gdk_x11_window_set_user_time
 gdk_x11_window_move_to_current_desktop
@@ -982,6 +1007,98 @@ gdk_x11_display_string_to_compound_text
 gdk_x11_display_utf8_to_compound_text
 gdk_x11_free_compound_text
 
+<SUBSECTION Standard>
+GDK_TYPE_X11_APP_LAUNCH_CONTEXT
+GDK_X11_APP_LAUNCH_CONTEXT
+GDK_X11_APP_LAUNCH_CONTEXT_CLASS
+GDK_IS_X11_APP_LAUNCH_CONTEXT
+GDK_IS_X11_APP_LAUNCH_CONTEXT_CLASS
+GDK_X11_APP_LAUNCH_CONTEXT_GET_CLASS
+GDK_TYPE_X11_CURSOR
+GDK_X11_CURSOR
+GDK_X11_CURSOR_CLASS
+GDK_IS_X11_CURSOR
+GDK_IS_X11_CURSOR_CLASS
+GDK_X11_CURSOR_GET_CLASS
+GDK_TYPE_X11_DEVICE_CORE
+GDK_X11_DEVICE_CORE
+GDK_X11_DEVICE_CORE_CLASS
+GDK_IS_X11_DEVICE_CORE
+GDK_IS_X11_DEVICE_CORE_CLASS
+GDK_X11_DEVICE_CORE_GET_CLASS
+GDK_TYPE_X11_DEVICE_MANAGER_CORE
+GDK_X11_DEVICE_MANAGER_CORE
+GDK_X11_DEVICE_MANAGER_CORE_CLASS
+GDK_IS_X11_DEVICE_MANAGER_CORE
+GDK_IS_X11_DEVICE_MANAGER_CORE_CLASS
+GDK_X11_DEVICE_MANAGER_CORE_GET_CLASS
+GDK_TYPE_X11_DEVICE_MANAGER_XI2
+GDK_X11_DEVICE_MANAGER_XI2
+GDK_X11_DEVICE_MANAGER_XI2_CLASS
+GDK_IS_X11_DEVICE_MANAGER_XI2
+GDK_IS_X11_DEVICE_MANAGER_XI2_CLASS
+GDK_X11_DEVICE_MANAGER_XI2_GET_CLASS
+GDK_TYPE_X11_DEVICE_MANAGER_XI
+GDK_X11_DEVICE_MANAGER_XI
+GDK_X11_DEVICE_MANAGER_XI_CLASS
+GDK_IS_X11_DEVICE_MANAGER_XI
+GDK_IS_X11_DEVICE_MANAGER_XI_CLASS
+GDK_X11_DEVICE_MANAGER_XI_GET_CLASS
+GDK_TYPE_X11_DEVICE_XI2
+GDK_X11_DEVICE_XI2
+GDK_X11_DEVICE_XI2_CLASS
+GDK_IS_X11_DEVICE_XI2
+GDK_IS_X11_DEVICE_XI2_CLASS
+GDK_X11_DEVICE_XI2_GET_CLASS
+GDK_TYPE_X11_DEVICE_XI
+GDK_X11_DEVICE_XI
+GDK_X11_DEVICE_XI_CLASS
+GDK_IS_X11_DEVICE_XI
+GDK_IS_X11_DEVICE_XI_CLASS
+GDK_X11_DEVICE_XI_GET_CLASS
+GDK_TYPE_X11_DISPLAY
+GDK_X11_DISPLAY
+GDK_X11_DISPLAY_CLASS
+GDK_IS_X11_DISPLAY
+GDK_IS_X11_DISPLAY_CLASS
+GDK_X11_DISPLAY_GET_CLASS
+GDK_TYPE_X11_DISPLAY_MANAGER
+GDK_X11_DISPLAY_MANAGER
+GDK_X11_DISPLAY_MANAGER_CLASS
+GDK_IS_X11_DISPLAY_MANAGER
+GDK_IS_X11_DISPLAY_MANAGER_CLASS
+GDK_X11_DISPLAY_MANAGER_GET_CLASS
+GDK_TYPE_X11_DRAG_CONTEXT
+GDK_X11_DRAG_CONTEXT
+GDK_X11_DRAG_CONTEXT_CLASS
+GDK_IS_X11_DRAG_CONTEXT
+GDK_IS_X11_DRAG_CONTEXT_CLASS
+GDK_X11_DRAG_CONTEXT_GET_CLASS
+GDK_TYPE_X11_KEYMAP
+GDK_X11_KEYMAP
+GDK_X11_KEYMAP_CLASS
+GDK_IS_X11_KEYMAP
+GDK_IS_X11_KEYMAP_CLASS
+GDK_X11_KEYMAP_GET_CLASS
+GDK_TYPE_X11_SCREEN
+GDK_X11_SCREEN
+GDK_X11_SCREEN_CLASS
+GDK_IS_X11_SCREEN
+GDK_IS_X11_SCREEN_CLASS
+GDK_X11_SCREEN_GET_CLASS
+GDK_TYPE_X11_VISUAL
+GDK_X11_VISUAL
+GDK_X11_VISUAL_CLASS
+GDK_IS_X11_VISUAL
+GDK_IS_X11_VISUAL_CLASS
+GDK_X11_VISUAL_GET_CLASS
+GDK_TYPE_X11_WINDOW
+GDK_X11_WINDOW
+GDK_X11_WINDOW_CLASS
+GDK_IS_X11_WINDOW
+GDK_IS_X11_WINDOW_CLASS
+GDK_X11_WINDOW_GET_CLASS
+
 <SUBSECTION Private>
 gdk_x11_app_launch_context_get_type
 gdk_x11_cursor_get_type
@@ -1030,4 +1147,4 @@ gdk_app_launch_context_get_type
 gdk_test_render_sync
 gdk_test_simulate_button
 gdk_test_simulate_key
-</SECTION>
+

docs/reference/gtk/Makefile.am

@@ -12,7 +12,7 @@ DOC_MAIN_SGML_FILE=gtk-docs.sgml
 SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED"
 
 # The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../../gtk
+DOC_SOURCE_DIR=$(top_srcdir)/gtk
 
 # Used for dependencies
 HFILE_GLOB=$(top_srcdir)/gtk/*.h
@@ -123,11 +123,14 @@ content_files =					\
 	glossary.xml				\
 	migrating-2to3.xml			\
 	migrating-checklist.sgml		\
-	migrating-GtkApplication.xml		\
+	migrating-unique-GtkApplication.xml	\
+	migrating-smclient-GtkApplication.xml	\
 	migrating-GtkGrid.xml			\
 	migrating-GtkStyleContext.xml		\
 	objects_grouped.sgml			\
 	osx.sgml				\
+	broadway.xml				\
+	wayland.xml				\
 	question_index.sgml			\
 	resources.sgml				\
 	text_widget.sgml			\
@@ -141,12 +144,14 @@ content_files =					\
 	overview.xml
 
 expand_content_files = 				\
+	compiling.sgml				\
 	drawing-model.xml			\
 	getting_started.xml			\
 	glossary.xml				\
 	migrating-2to3.xml			\
 	migrating-checklist.sgml		\
-	migrating-GtkApplication.xml		\
+	migrating-unique-GtkApplication.xml	\
+	migrating-smclient-GtkApplication.xml	\
 	migrating-GtkGrid.xml			\
 	migrating-GtkStyleContext.xml		\
 	question_index.sgml			\
@@ -285,6 +290,7 @@ HTML_IMAGES = \
 	$(srcdir)/images/check-button.png				\
 	$(srcdir)/images/color-button.png				\
 	$(srcdir)/images/colorsel.png					\
+	$(srcdir)/images/colorchooser.png				\
 	$(srcdir)/images/combo-box.png					\
 	$(srcdir)/images/combo-box-entry.png				\
 	$(srcdir)/images/entry.png					\
@@ -294,12 +300,14 @@ HTML_IMAGES = \
 	$(srcdir)/images/filechooser.png				\
 	$(srcdir)/images/font-button.png				\
 	$(srcdir)/images/fontsel.png					\
+	$(srcdir)/images/fontchooser.png				\
 	$(srcdir)/images/frame.png					\
 	$(srcdir)/images/icon-view.png					\
 	$(srcdir)/images/image.png					\
 	$(srcdir)/images/label.png					\
 	$(srcdir)/images/link-button.png				\
 	$(srcdir)/images/list-and-tree.png				\
+	$(srcdir)/images/lock-button.png				\
 	$(srcdir)/images/lockbutton.png				\
 	$(srcdir)/images/lockbutton-locked.png				\
 	$(srcdir)/images/lockbutton-unlocked.png			\
@@ -365,7 +373,10 @@ HTML_IMAGES = \
 	$(srcdir)/images/handles.png					\
 	$(srcdir)/images/extensions.png					\
 	$(srcdir)/images/numerableicon.png				\
-	$(srcdir)/images/numerableicon2.png
+	$(srcdir)/images/numerableicon2.png				\
+	$(srcdir)/images/bloatpad-osx.png				\
+	$(srcdir)/images/bloatpad-gnome.png				\
+	$(srcdir)/images/bloatpad-xfce.png
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=../gdk/html \

docs/reference/gtk/broadway.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gtk-broadway">
+<refmeta>
+<refentrytitle>Using GTK+ with HTML5</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>GTK Library</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+<refname>Using GTK+ with HTML5</refname>
+<refpurpose>
+HTML-specific aspects of using GTK+
+</refpurpose>
+</refnamediv>
+
+<refsect1>
+<title>Using GTK+ with HTML5</title>
+
+<para>
+The GDK Broadway backend provides support for displaying GTK+
+applications using HTML5 and Web sockets. To run your application
+in this way, select the Broadway backend by setting
+<literal>GDK_BACKEND=broadway</literal>. Then you can make
+your application appear in a web browser by pointing it at
+<literal>http://127.0.0.1:8080</literal>. Note that you need
+to enable web sockets in your web browser.
+</para>
+
+<para>
+You can choose a different port from the default 8080 by setting
+the <envar>BROADWAY_DISPLAY</envar> environment variable to the
+port that you want to use.
+</para>
+
+</refsect1>
+
+</refentry>

docs/reference/gtk/compiling.sgml

@@ -47,9 +47,28 @@ $ cc `pkg-config --cflags --libs gtk+-3.0` hello.c -o hello
 </para>
 
 <para>
-If you want to make sure that your program doesn't use any deprecated
-functions, you can define the preprocessor symbol GTK_DISABLE_DEPRECATED
-by using the command line option <literal>-DGTK_DISABLE_DEPRECATED=1</literal>.
+Deprecated GTK+ functions are annotated to make the compiler
+emit warnings when they are used (e.g. with gcc, you need to use
+the -Wdeprecated-declarations option). If these warnings are
+problematic, they can be turned off by defining the preprocessor
+symbol %GDK_DISABLE_DEPRECATION_WARNINGS by using the commandline
+option <literal>-DGDK_DISABLE_DEPRECATION_WARNINGS</literal>
+</para>
+
+<para>
+GTK+ deprecation annotations are versioned; by defining the
+macros %GDK_VERSION_MIN_REQUIRED and %GDK_VERSION_MAX_ALLOWED,
+you can specify the range of GTK+ versions whose API you want
+to use. APIs that were deprecated before or introduced after
+this range will trigger compiler warnings.
+</para>
+
+<para>
+The older deprecation mechanism of hiding deprecated interfaces
+entirely from the compiler by using the preprocessor symbol
+GTK_DISABLE_DEPRECATED is still used for deprecated macros,
+enumeration values, etc. To detect uses of these in your code,
+use the commandline option <literal>-DGTK_DISABLE_DEPRECATED</literal>.
 There are similar symbols GDK_DISABLE_DEPRECATED,
 GDK_PIXBUF_DISABLE_DEPRECATED and G_DISABLE_DEPRECATED for GDK, GdkPixbuf and
 GLib.

docs/reference/gtk/gtk-docs.sgml

@@ -12,9 +12,9 @@
     <releaseinfo>
       This document is for the GTK+ 3 library, version &version;.
       The latest versions can be found online at
-      <ulink role="online-location" url="http://library.gnome.org/devel/gtk3/">http://library.gnome.org/devel/gtk3/</ulink>.
+      <ulink role="online-location" url="http://developer.gnome.org/devel/gtk3/">http://developer.gnome.org/devel/gtk3/</ulink>.
       If you are looking for the older GTK+ 2 series of libraries,
-      see <ulink role="online-location" url="http://library.gnome.org/devel/gtk/">http://library.gnome.org/devel/gtk/</ulink>.
+      see <ulink role="online-location" url="http://developer.gnome.org/devel/gtk/">http://developer.gnome.org/devel/gtk/</ulink>.
     </releaseinfo>
   </bookinfo>
 
@@ -23,11 +23,13 @@
     <xi:include href="overview.xml"/>
     <xi:include href="xml/getting_started.xml"/>
     <xi:include href="building.sgml" />
-    <xi:include href="compiling.sgml" />
+    <xi:include href="xml/compiling.sgml" />
     <xi:include href="running.sgml" />
     <xi:include href="x11.sgml" />
     <xi:include href="windows.sgml" />
     <xi:include href="osx.sgml" />
+    <xi:include href="broadway.xml" />
+    <xi:include href="wayland.xml" />
     <xi:include href="resources.sgml" />
     <xi:include href="xml/question_index.sgml" />
     <xi:include href="drawing-model.xml" />
@@ -209,18 +211,22 @@
 
     <chapter id="SelectorWidgets">
       <title>Selectors (Color/File/Font)</title>
+      <xi:include href="xml/gtkcolorchooser.xml" />
       <xi:include href="xml/gtkcolorbutton.xml" />
-      <xi:include href="xml/gtkcolorseldlg.xml" />
+      <xi:include href="xml/gtkcolorchooserwidget.xml" />
+      <xi:include href="xml/gtkcolorchooserdialog.xml" />
       <xi:include href="xml/gtkcolorsel.xml" />
+      <xi:include href="xml/gtkcolorseldlg.xml" />
       <xi:include href="xml/gtkhsv.xml" />
       <xi:include href="xml/gtkfilechooser.xml" />
       <xi:include href="xml/gtkfilechooserbutton.xml" />
       <xi:include href="xml/gtkfilechooserdialog.xml" />
       <xi:include href="xml/gtkfilechooserwidget.xml" />
       <xi:include href="xml/gtkfilefilter.xml" />
-      <xi:include href="xml/gtkfontbutton.xml" />
       <xi:include href="xml/gtkfontchooser.xml" />
-      <xi:include href="xml/gtkfontchooserdlg.xml" />
+      <xi:include href="xml/gtkfontbutton.xml" />
+      <xi:include href="xml/gtkfontchooserwidget.xml" />
+      <xi:include href="xml/gtkfontchooserdialog.xml" />
       <xi:include href="xml/gtkfontsel.xml" />
       <xi:include href="xml/gtkfontseldlg.xml" />
     </chapter>
@@ -338,6 +344,8 @@
     <chapter id="Application">
       <title>Application support</title>
       <xi:include href="xml/gtkapplication.xml" />
+      <xi:include href="xml/gtkapplicationwindow.xml" />
+      <xi:include href="xml/gtkactionable.xml" />
     </chapter>
   </part>
 
@@ -354,11 +362,12 @@
       </para>
     </partintro>
 
-    <xi:include href="xml/migrating-checklist.sgml" />
     <xi:include href="xml/migrating-2to3.xml" />
     <xi:include href="xml/migrating-GtkStyleContext.xml" />
-    <xi:include href="xml/migrating-GtkApplication.xml" />
+    <xi:include href="xml/migrating-unique-GtkApplication.xml" />
+    <xi:include href="xml/migrating-smclient-GtkApplication.xml" />
     <xi:include href="xml/migrating-GtkGrid.xml" />
+    <xi:include href="xml/migrating-checklist.sgml" />
   </part>
 
   <part>
@@ -385,6 +394,10 @@
     <title>Index of new symbols in 3.2</title>
     <xi:include href="xml/api-index-3.2.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-3-4" role="3.4">
+    <title>Index of new symbols in 3.4</title>
+    <xi:include href="xml/api-index-3.4.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 

docs/reference/gtk/gtk3-sections.txt

@@ -37,6 +37,7 @@ gtk_about_dialog_get_logo
 gtk_about_dialog_set_logo
 gtk_about_dialog_get_logo_icon_name
 gtk_about_dialog_set_logo_icon_name
+gtk_about_dialog_add_credit_section
 gtk_show_about_dialog
 <SUBSECTION Standard>
 GTK_ABOUT_DIALOG
@@ -76,6 +77,9 @@ gtk_accelerator_valid
 gtk_accelerator_parse
 gtk_accelerator_name
 gtk_accelerator_get_label
+gtk_accelerator_parse_with_keycode
+gtk_accelerator_name_with_keycode
+gtk_accelerator_get_label_with_keycode
 gtk_accelerator_set_default_mod_mask
 gtk_accelerator_get_default_mod_mask
 
@@ -1132,6 +1136,7 @@ gtk_entry_completion_get_model
 gtk_entry_completion_set_match_func
 gtk_entry_completion_set_minimum_key_length
 gtk_entry_completion_get_minimum_key_length
+gtk_entry_completion_compute_prefix
 gtk_entry_completion_complete
 gtk_entry_completion_get_completion_prefix
 gtk_entry_completion_insert_prefix
@@ -1530,7 +1535,7 @@ gtk_font_chooser_widget_get_type
 </SECTION>
 
 <SECTION>
-<FILE>gtkfontchooserdlg</FILE>
+<FILE>gtkfontchooserdialog</FILE>
 <TITLE>GtkFontChooserDialog</TITLE>
 GtkFontChooserDialog
 gtk_font_chooser_dialog_new
@@ -2055,6 +2060,7 @@ gtk_link_button_get_type
 <TITLE>GtkMenu</TITLE>
 GtkMenu
 gtk_menu_new
+gtk_menu_new_from_model
 gtk_menu_set_screen
 gtk_menu_reorder_child
 gtk_menu_attach
@@ -2099,6 +2105,7 @@ gtk_menu_get_type
 <TITLE>GtkMenuBar</TITLE>
 GtkMenuBar
 gtk_menu_bar_new
+gtk_menu_bar_new_from_model
 GtkPackDirection
 gtk_menu_bar_set_pack_direction
 gtk_menu_bar_get_pack_direction
@@ -2820,9 +2827,11 @@ gtk_scale_new
 gtk_scale_new_with_range
 gtk_scale_set_digits
 gtk_scale_set_draw_value
+gtk_scale_set_has_origin
 gtk_scale_set_value_pos
 gtk_scale_get_digits
 gtk_scale_get_draw_value
+gtk_scale_get_has_origin
 gtk_scale_get_value_pos
 gtk_scale_get_layout
 gtk_scale_get_layout_offsets
@@ -2930,6 +2939,10 @@ gtk_scrolled_window_get_min_content_width
 gtk_scrolled_window_set_min_content_width
 gtk_scrolled_window_get_min_content_height
 gtk_scrolled_window_set_min_content_height
+gtk_scrolled_window_set_kinetic_scrolling
+gtk_scrolled_window_get_kinetic_scrolling
+gtk_scrolled_window_set_capture_button_press
+gtk_scrolled_window_get_capture_button_press
 
 <SUBSECTION Standard>
 GTK_SCROLLED_WINDOW
@@ -4349,6 +4362,7 @@ gtk_tree_view_remove_column
 gtk_tree_view_insert_column
 gtk_tree_view_insert_column_with_attributes
 gtk_tree_view_insert_column_with_data_func
+gtk_tree_view_get_n_columns
 gtk_tree_view_get_column
 gtk_tree_view_get_columns
 gtk_tree_view_move_column_after
@@ -5202,6 +5216,7 @@ gtk_widget_set_mapped
 gtk_widget_get_mapped
 gtk_widget_get_requisition
 gtk_widget_device_is_shadowed
+gtk_widget_get_modifier_mask
 
 <SUBSECTION>
 gtk_widget_get_path
@@ -5286,7 +5301,9 @@ gtk_window_set_gravity
 gtk_window_get_gravity
 gtk_window_set_position
 gtk_window_set_transient_for
+gtk_window_set_attached_to
 gtk_window_set_destroy_with_parent
+gtk_window_set_hide_titlebar_when_maximized
 gtk_window_set_screen
 gtk_window_get_screen
 gtk_window_is_active
@@ -5332,6 +5349,7 @@ gtk_window_get_default_icon_list
 gtk_window_get_default_icon_name
 gtk_window_get_default_size
 gtk_window_get_destroy_with_parent
+gtk_window_get_hide_titlebar_when_maximized
 gtk_window_get_icon
 gtk_window_get_icon_list
 gtk_window_get_icon_name
@@ -5342,6 +5360,7 @@ gtk_window_get_role
 gtk_window_get_size
 gtk_window_get_title
 gtk_window_get_transient_for
+gtk_window_get_attached_to
 gtk_window_get_type_hint
 gtk_window_get_skip_taskbar_hint
 gtk_window_get_skip_pager_hint
@@ -5618,6 +5637,7 @@ GTK_STYLE_CLASS_MENU
 GTK_STYLE_CLASS_RADIO
 GTK_STYLE_CLASS_RUBBERBAND
 GTK_STYLE_CLASS_SCROLLBAR
+GTK_STYLE_CLASS_SCROLLBARS_JUNCTION
 GTK_STYLE_CLASS_SLIDER
 GTK_STYLE_CLASS_TOOLTIP
 GTK_STYLE_CLASS_TROUGH
@@ -5652,6 +5672,12 @@ GTK_STYLE_CLASS_VIEW
 GTK_STYLE_CLASS_WARNING
 GTK_STYLE_CLASS_HORIZONTAL
 GTK_STYLE_CLASS_VERTICAL
+GTK_STYLE_CLASS_TOP
+GTK_STYLE_CLASS_BOTTOM
+GTK_STYLE_CLASS_LEFT
+GTK_STYLE_CLASS_RIGHT
+GTK_STYLE_CLASS_LINKED
+GTK_STYLE_CLASS_ARROW
 GTK_STYLE_REGION_COLUMN
 GTK_STYLE_REGION_COLUMN_HEADER
 GTK_STYLE_REGION_ROW
@@ -5664,6 +5690,7 @@ gtk_style_context_add_provider_for_screen
 gtk_style_context_get
 gtk_style_context_get_direction
 gtk_style_context_get_junction_sides
+gtk_style_context_set_parent
 gtk_style_context_get_path
 gtk_style_context_get_property
 gtk_style_context_get_screen
@@ -5672,6 +5699,7 @@ gtk_style_context_get_style
 gtk_style_context_get_style_property
 gtk_style_context_get_style_valist
 gtk_style_context_get_valist
+gtk_style_context_get_section
 gtk_style_context_get_color
 gtk_style_context_get_background_color
 gtk_style_context_get_border_color
@@ -5696,6 +5724,7 @@ gtk_style_context_restore
 gtk_style_context_save
 gtk_style_context_set_direction
 gtk_style_context_set_junction_sides
+gtk_style_context_set_parent
 gtk_style_context_set_path
 gtk_style_context_add_class
 gtk_style_context_remove_class
@@ -5731,6 +5760,7 @@ gtk_render_slider
 gtk_render_activity
 gtk_render_icon_pixbuf
 gtk_render_icon
+gtk_render_insertion_cursor
 
 <SUBSECTION Standard>
 GTK_TYPE_STYLE_CONTEXT
@@ -5835,6 +5865,7 @@ gtk_symbolic_color_new_name
 gtk_symbolic_color_new_shade
 gtk_symbolic_color_new_alpha
 gtk_symbolic_color_new_mix
+gtk_symbolic_color_new_win32
 gtk_symbolic_color_ref
 gtk_symbolic_color_unref
 gtk_symbolic_color_resolve
@@ -6988,6 +7019,18 @@ gtk_application_add_window
 gtk_application_remove_window
 gtk_application_get_windows
 
+<SUBSECTION>
+GtkApplicationInhibitFlags
+gtk_application_inhibit
+gtk_application_uninhibit
+gtk_application_is_inhibited
+
+<SUBSECTION>
+gtk_application_get_app_menu
+gtk_application_set_app_menu
+gtk_application_get_menubar
+gtk_application_set_menubar
+
 <SUBSECTION Standard>
 GtkApplicationClass
 GTK_TYPE_APPLICATION
@@ -7001,6 +7044,54 @@ gtk_application_get_type
 GtkApplicationPrivate
 </SECTION>
 
+<SECTION>
+<FILE>gtkapplicationwindow</FILE>
+<TITLE>GtkApplicationWindow</TITLE>
+GtkApplicationWindow
+gtk_application_window_new
+gtk_application_window_set_show_menubar
+gtk_application_window_get_show_menubar
+
+<SUBSECTION Standard>
+GtkApplicationWindowClass
+GTK_TYPE_APPLICATION_WINDOW
+GTK_APPLICATION_WINDOW
+GTK_APPLICATION_WINDOW_CLASS
+GTK_IS_APPLICATION_WINDOW
+GTK_IS_APPLICATION_WINDOW_CLASS
+GTK_APPLICATION_WINDOW_GET_CLASS
+
+<SUBSECTION Private>
+gtk_application_window_get_type
+GtkApplicationWindowPrivate
+</SECTION>
+
+<SECTION>
+<FILE>gtkactionable</FILE>
+<TITLE>GtkActionable</TITLE>
+GtkActionable
+GtkActionableInterface
+
+<SUBSECTION>
+gtk_actionable_get_action_name
+gtk_actionable_set_action_name
+
+<SUBSECTION>
+gtk_actionable_get_action_target_value
+gtk_actionable_set_action_target_value
+gtk_actionable_set_action_target
+
+<SUBSECTION>
+gtk_actionable_set_detailed_action_name
+
+<SUBSECTION Standard>
+gtk_actionable_get_type
+GTK_ACTIONABLE
+GTK_ACTIONABLE_GET_IFACE
+GTK_IS_ACTIONABLE
+GTK_TYPE_ACTIONABLE
+</SECTION>
+
 <SECTION>
 <FILE>gtkgrid</FILE>
 <TITLE>GtkGrid</TITLE>
@@ -7210,3 +7301,61 @@ GtkOverlayClass
 gtk_overlay_get_type
 GtkOverlayPrivate
 </SECTION>
+
+<SECTION>
+<FILE>gtkcolorchooser</FILE>
+<TITLE>GtkColorChooser</TITLE>
+GtkColorChooser
+gtk_color_chooser_get_rgba
+gtk_color_chooser_set_rgba
+gtk_color_chooser_get_use_alpha
+gtk_color_chooser_set_use_alpha
+gtk_color_chooser_add_palette
+
+<SUBSECTION Standard>
+GTK_TYPE_COLOR_CHOOSER
+GTK_COLOR_CHOOSER
+GTK_IS_COLOR_CHOOSER
+GTK_COLOR_CHOOSER_GET_IFACE
+
+<SUBSECTION Private>
+gtk_color_chooser_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkcolorchooserwidget</FILE>
+<TITLE>GtkColorChooserWidget</TITLE>
+GtkColorChooserWidget
+gtk_color_chooser_widget_new
+
+<SUBSECTION Standard>
+GTK_TYPE_COLOR_CHOOSER_WIDGET
+GTK_COLOR_CHOOSER_WIDGET
+GTK_COLOR_CHOOSER_WIDGET_CLASS
+GTK_IS_COLOR_CHOOSER_WIDGET
+GTK_IS_COLOR_CHOOSER_WIDGET_CLASS
+GTK_COLOR_CHOOSER_WIDGET_GET_CLASS
+
+<SUBSECTION Private>
+gtk_color_chooser_widget_get_type
+GtkColorChooserWidgetPrivate
+</SECTION>
+
+<SECTION>
+<FILE>gtkcolorchooserdialog</FILE>
+<TITLE>GtkColorChooserDialog</TITLE>
+GtkColorChooserDialog
+gtk_color_chooser_dialog_new
+
+<SUBSECTION Standard>
+GTK_TYPE_COLOR_CHOOSER_DIALOG
+GTK_COLOR_CHOOSER_DIALOG
+GTK_COLOR_CHOOSER_DIALOG_CLASS
+GTK_IS_COLOR_CHOOSER_DIALOG
+GTK_IS_COLOR_CHOOSER_DIALOG_CLASS
+GTK_COLOR_CHOOSER_DIALOG_GET_CLASS
+
+<SUBSECTION Private>
+GtkColorChooserDialogPrivate
+gtk_color_chooser_dialog_get_type
+</SECTION>

docs/reference/gtk/gtk3.types

@@ -6,6 +6,7 @@ gtk_accel_group_get_type
 gtk_accel_label_get_type
 gtk_accel_map_get_type
 gtk_accessible_get_type
+gtk_actionable_get_type
 gtk_action_get_type
 gtk_action_group_get_type
 gtk_activatable_get_type
@@ -16,6 +17,7 @@ gtk_app_chooser_button_get_type
 gtk_app_chooser_dialog_get_type
 gtk_app_chooser_widget_get_type
 gtk_application_get_type
+gtk_application_window_get_type
 gtk_arrow_get_type
 gtk_aspect_frame_get_type
 gtk_assistant_get_type
@@ -45,6 +47,9 @@ gtk_check_button_get_type
 gtk_check_menu_item_get_type
 gtk_clipboard_get_type
 gtk_color_button_get_type
+gtk_color_chooser_get_type
+gtk_color_chooser_dialog_get_type
+gtk_color_chooser_widget_get_type
 gtk_color_selection_dialog_get_type
 gtk_color_selection_get_type
 gtk_combo_box_get_type