Updates for 3.0.6

gtk_settings_get_default() was used to monitor the
"gtk-application-prefers-dark-theme" setting, rather
than the GtkSettings object associated with the window's
screen.

HACKING

@@ -1,9 +1,9 @@
 If you want to hack on the GTK+ project, you'll need to have
 the following packages installed:
 
-        - GNU autoconf 2.54
-        - GNU automake 1.7
-        - GNU libtool 1.4
+        - GNU autoconf 2.62
+        - GNU automake 1.11
+        - GNU libtool 2.2
         - indent (GNU indent 1.9.1 is known good)
         - GNU gettext 10.40
 
@@ -19,10 +19,10 @@ Information about using git with GNOME can be found here:
 
         http://live.gnome.org/Git
 
-In order to get GIT gtk+ installed on your system, you need to have
-the most recent GIT versions of glib, pango, and atk installed as well.
-The installation process of these libraries is similar to that of gtk+, but
-needs to be fulfilled prior to installation of gtk+.
+In order to get GIT GTK+ installed on your system, you need to have
+the most recent GIT versions of GLib, Pango, and ATK installed as well.
+The installation process of these libraries is similar to that of GTK+,
+but needs to be fulfilled prior to installation of GTK+.
 
 If at all possible, please use GIT to get the latest development version of
 gtk+ and glib. You can do the following to get glib and gtk+ from GIT:
@@ -37,7 +37,7 @@ have a gnome account, you want to use the following instead:
 
         $ git clone ssh://<username>@git.gnome.org/git/gtk+
 
-To compile the GIT version of gtk+ on your system, you will need to take
+To compile the GIT version of GTK+ on your system, you will need to take
 several steps to setup the tree for compilation.  You can do all these
 steps at once by running:
 

INSTALL.in

@@ -9,23 +9,23 @@ GTK+ requires the following packages:
    GdkPixbuf @GDK_PIXBUF_REQUIRED_VERSION@, ATK @ATK_REQUIRED_VERSION@
    and cairo @CAIRO_REQUIRED_VERSION@.
 
- - gobject-introspection 0.9.3 or newer.
+ - gobject-introspection @INTROSPECTION_REQUIRED_VERSION@ or newer.
 
 Simple install procedure
 ========================
 
   % gzip -cd gtk+-@GTK_VERSION@.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-@GTK_VERSION@			   # change to the toplevel directory
-  % ./configure				   # run the `configure' script
-  % make				   # build GTK+
+  % cd gtk+-@GTK_VERSION@                          # change to the toplevel directory
+  % ./configure                                    # run the `configure' script
+  % make                                           # build GTK+
   [ Become root if necessary ]
-  % make install			   # install GTK+
+  % make install                                   # install GTK+
 
 The Details
 ===========
 
-Complete information about installing GTK+ and related libraries can be found 
-in the file:
+Complete information about installing GTK+ and related libraries
+can be found in the file:
 
  docs/reference/gtk/html/gtk-building.html
 

Makefile.am

@@ -47,47 +47,45 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/install-sh \
 	$(srcdir)/ltmain.sh \
 	$(srcdir)/missing \
-	$(srcdir)/mkinstalldirs \
 	$(srcdir)/omf.make \
 	$(srcdir)/xmldocs.make \
 	$(srcdir)/gtk-doc.make \
 	$(srcdir)/ChangeLog \
 	`find "$(srcdir)" -type f -name Makefile.in -print`
 
-GDKTARGET=@gdktarget@
 
 ## Copy .pc files to target-specific names
-gtk+-$(GDKTARGET)-3.0.pc: gtk+-3.0.pc
-	rm -f gtk+-$(GDKTARGET)-3.0.pc && \
-	cp gtk+-3.0.pc gtk+-$(GDKTARGET)-3.0.pc
+gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc: gtk+-3.0.pc
+	rm -f $@ && \
+	cp gtk+-3.0.pc $@
 
-gdk-$(GDKTARGET)-3.0.pc: gdk-3.0.pc
-	rm -f gdk-$(GDKTARGET)-3.0.pc && \
-	cp gdk-3.0.pc gdk-$(GDKTARGET)-3.0.pc
+gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc: gdk-3.0.pc
+	rm -f $@ && \
+	cp gdk-3.0.pc $@
 
-gtk+-$(GDKTARGET)-3.0-uninstalled.pc: gtk+-3.0-uninstalled.pc
-	rm -f gtk+-$(GDKTARGET)-3.0-uninstalled.pc && \
-	cp gtk+-3.0-uninstalled.pc gtk+-$(GDKTARGET)-3.0-uninstalled.pc
-
-gdk-$(GDKTARGET)-3.0-uninstalled.pc: gdk-3.0-uninstalled.pc
-	rm -f gdk-$(GDKTARGET)-3.0-uninstalled.pc && \
-	cp gdk-3.0-uninstalled.pc gdk-$(GDKTARGET)-3.0-uninstalled.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-$(GDKTARGET)-3.0.pc gtk+-$(GDKTARGET)-3.0.pc gail-3.0.pc
+pkgconfig_DATA = gdk-3.0.pc gtk+-3.0.pc gail-3.0.pc
+
+pkgconfig_DATA += ${GDK_BACKENDS:%=gtk+-%-3.0.pc}
+pkgconfig_DATA += ${GDK_BACKENDS:%=gdk-%-3.0.pc}
 
 if OS_UNIX
 pkgconfig_DATA += gtk+-unix-print-3.0.pc
 endif
 
-DISTCLEANFILES =				\
-	gtk+-unix-print-3.0.pc			\
-	gtk+-$(GDKTARGET)-3.0.pc		\
-	gdk-$(GDKTARGET)-3.0.pc			\
-	gail-3.0.pc				\
-	gtk+-$(GDKTARGET)-3.0-uninstalled.pc	\
-	gdk-$(GDKTARGET)-3.0-uninstalled.pc	\
-	gail-3.0-uninstalled.pc			\
+DISTCLEANFILES = \
+	gtk+-unix-print-3.0.pc		\
+	gtk+-3.0.pc			\
+	gtk+-x11-3.0.pc			\
+	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:
@@ -96,8 +94,7 @@ distclean-local:
 	fi
 
 ChangeLog:
-	@echo Creating $@
-	@if test -d "$(srcdir)/.git"; then \
+	$(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
 	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log GTK_2_16_0^^.. --stat) | fmt --split-only > $@.tmp \
 	  && mv -f $@.tmp $@ \
 	  || ($(RM) $@.tmp; \
@@ -109,20 +106,7 @@ ChangeLog:
 	  echo A git checkout and git-log is required to generate this file >> $@); \
 	fi
 
-## copy the default target for this platform to gdk-3.0.pc and gtk+-3.0.pc
-DEFAULT_GDKTARGET=x11
-install-data-hook:
-	(cd $(DESTDIR)$(pkgconfigdir) && \
-	 test -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc && \
-	 test -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc && \
-	 rm -f gdk-3.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc gdk-3.0.pc && \
-	 rm -f gtk+-3.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc gtk+-3.0.pc) || \
-	(cd $(DESTDIR)$(pkgconfigdir) && \
-	 rm -f gdk-3.0.pc && cp -f gdk-$(GDKTARGET)-3.0.pc gdk-3.0.pc && \
-	 rm -f gtk+-3.0.pc && cp -f gtk+-$(GDKTARGET)-3.0.pc gtk+-3.0.pc)
-
 uninstall-local:
-	rm -f $(DESTDIR)$(pkgconfigdir)/gdk-3.0.pc
 	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc
 
 dist-hook:

Makefile.decl

@@ -17,9 +17,15 @@ XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
   1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \
   9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \
   9995 9996 9997 9998 9999
+
+if USE_X11
 SKIP_GDKTARGET = \
-	test "$(gdktarget)" != "x11" \
-	&& echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target."
+	false
+else
+SKIP_GDKTARGET = \
+	echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target."
+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` \

NEWS

@@ -1,3 +1,647 @@
+Overview of Changes in GTK+ 3.0.6
+=================================
+
+* Export dark themes for the window manager
+
+* Make selectable labels work again
+
+* Translation updates:
+ Afrikaans
+ Assamese
+ Korean
+ Simplified Chinese
+
+Overview of Changes in GTK+ 3.0.5
+=================================
+
+* Revert a font theming changes in 3.0.4 that caused
+  application-set fonts to be ignored
+
+* Use a smaller font size in GtkSwitch
+
+* Updated translations:
+ Gujarati
+
+
+Overview of Changes in GTK+ 3.0.4
+=================================
+
+* New style classes for 'inline' toolbars and sidebars
+  have been added
+
+* Theming fixes and enhancement in many widgets, including
+  GtkRange, GtkFileChooser, GtkNotebook, GtkTreeview and
+  GtkRadioButton
+
+* Bugs fixed:
+ 640692 GtkNotebook has wrong background colour when border and tabs...
+ 642712 improve the file chooser design
+ 644836 gdk_keyval_to_unicode returns incorrect value for keyval = Return
+ 644975 styleproperties: make sure to merge the font descriptions right
+ 644976 Fix "backspace", "enter", "escape" input.
+ 645057 ./configure fails on gtk+3.0 git head
+ 645134 switch: fix boundaries for the switch motion
+ 645172 radiobutton: don't forget to set the insensitive state when...
+ 645234 Leaky calls to gdk_device_manager_list_devices()
+ 645235 Free the motion hint infos in GdkDisplay
+ 645405 themingengine: don't hardcode white to draw insensitive...
+ 635254 Check whether a resolution is set in GtkPrintSettings before...
+
+* Translation updates:
+ British English
+ Dutch
+ Galician
+ German
+ Hungarian
+ Latvian
+ Lithuanian
+ Serbian
+
+
+Overview of Changes in GTK+ 3.0.3
+=================================
+
+* Support for the GDK_NATIVE_WINDOWS environment variable has
+  been removed
+
+* Bugs fixed:
+ 642604 GtkCssProvider leaks GError
+ 643416 Composited children of GtkScrolledWindow are drawn incorrectly...
+ 644119 Remove support for GDK_NATIVE_WINDOWS
+ 644248 stylecontext: add a raised style class
+ 644276 don't set the "pane-separator" style class to all the container
+ 644348 make GtkNotebook respect the focus-padding style property
+ 644353 Missing annotations in Gtk/Gdk Window and gtk_accelerator_parse
+ 644355 credits toggle inconsintency
+ 644570 handles with a background image don't work
+
+
+* Updated translations:
+ Czech
+ French
+ Italian
+ Hebrew
+ Korean
+ Kurdish
+ Slovenian
+ Swedish
+
+
+Overview of Changes in GTK+ 3.0.2
+=================================
+
+* GtkSettings have been made multi-backend-safe
+
+* Many improvements to themability and the default theme
+ - GtkScale slider theming can adjust to scale marks, using style classes
+ - A new style class for 'primary' toolbars
+ - Widget style classes can now be specified in GtkBuilder files
+ - Improved scrollbar drawing
+ - Improved combobox drawing
+ - Improved spinbutton drawing
+ - Improved switch drawing
+ - Improved checkbutton drawing
+ - Improved menu drawing
+ - Improved notebook tab drawing
+
+* Bugs fixed:
+ 643041 Gtk-CRITICAL **: gtk_render_slider: assertion `height > 0'...
+ 643131 gtk_tray_icon_dispose
+ 643170 gtk_file_chooser_set_filename does not work if "Show hidden...
+ 643216 Extraneous emits of GdkScreen::monitors-changed
+ 643321 Keypresses in window contextual menu go through to app
+ 643347 consider allowing style data in builder data
+ 643370 gtk_style_context_get_font return NULL
+ 643440 gdkconfig.h included in tarball
+ 643496 GtkDialog does not use separators any more. Description is...
+ 643543 App Chooser classes abort if no content-type is given
+ 643584 crash in gdk_event_free()
+ 643630 Tabs disappear from notebook on scrolling back and resizing...
+ 643685 Normalise marks positions internally in GtkScale
+ 643911 Inactive tab content allocation should respect tab-overlap
+ 643912 Tab allocation should respect tab-curvature
+ 643925 Mouse wheel is following URLs
+ 643967 Add a style property to flip rendering order
+ 644089 treeview: propagate the selected state from the row
+
+* Translation updates:
+ Esperanto
+ German
+ Latvian
+ Portuguese
+ Russian
+ Simplified Chinese
+ Slovenian
+ Spanish
+ Ukrainian
+
+
+Overview of Changes in GTK+ 3.0.1
+=================================
+
+* A autoconf macro, GTK_CHECK_BACKEND, has been added
+  to allow easy checking for certain gdk backends
+
+* A number of memory leaks and segfaults involving accessibility
+  have been fixed
+
+* Bugs fixed:
+ 586201 GtkLinkButton doesn't implement neither HyperLink nor...
+ 599907 Gail implementation of atk_add_key_event_listener return...
+ 626730 Check menu item does not set indeterminate state
+ 630971 gailstatusbar attempts to cast a GtkHBox to a GtkBin
+ 633291 Handle Shift-keys in X11 gdk_test_simulate_key()
+ 642213 gtk_widget_render_icon_pixbuf fails with non-standard...
+ 642263 undefined reference to "GTK_IS_SOCKET" and "GTK_IS_PLUG"
+ 642541 Missing semi-colon in gtkseparatormenuitem.c
+ 642677 "migrating" guide not in sync with GTK+ 3.0
+ 642681 gtk_combo_box_text_get_active_text doesn't work as stated
+ 642751 Typo in migrating-2to3.xml
+ 642771 Fix tiny leak in tracker backend
+ 642772 GTK does not correctly process input sent via SendInput...
+ 642778 TextView broken for large files
+ 642782 gail_misc_buffer_get_run_attributes doesn't set background-gdk...
+ 642791 Fix a typo in gtk_socket_notify
+
+
+* Translation updates:
+ Bengali India
+ British English
+ Bulgarian
+ Hebrew
+ Hungarian
+ Korean
+ Norwegian bokmål
+ Punjabi
+ Spanish
+ Uighur
+ Ukranian
+ Vietnamese
+
+
+Overview of Changes in GTK+ 3.0.0
+=================================
+
+* Library sonames have been changed from libgdk-3.0 and libgtk-3.0
+  to libgdk-3 and libgtk-3.
+
+* Bugs fixed:
+ 632775 Back / Forward button's icons don't respect RTL settings
+ 639846 GdkEventScroll events are sent twice
+ 639945 Gtk.Widget does not have drag_* methods (but in pygtk it did)
+ 640801 Crash gtk_tree_view_reset_header_styles at gtktreeview.c:11871
+ 641196 Fix another GtkFixed regression, in gtk_fixed_forall()
+ 641302 show something nicer than XF86AudioMute etc
+ 641367 [region] gnome-applications ignore layout switching
+ 641409 not chaining up in ::style-updated
+ 641429 Errors creating a GtkWidget without a display
+ 641431 Apply button goes grey after two mode switching
+ 641517 "Migrating from libunique to GtkApplication" examples do not do...
+ 641558 GtkCssProvider leaks path string
+ 641621 Use faster new G_VALUE_COLLECT_INIT variant instead...
+ 641640 Update autotools configuration
+
+* Translation updates:
+ Arabic
+ English
+ Galician
+ Hebrew
+ Korean
+ Norwegian bokmål
+ Polish
+
+
+Overview of Changes in GTK+ 2.99.3
+==================================
+
+* This release adds some forgotten padding to class structs,
+  and thus breaks ABI for a last time before 3.0
+
+* Many Introspection annotation improvements
+
+* We no longer build the gtk-update-icon-cache utility, and
+  use a preexisting one, if --enable-gtk2-dependency is passed
+  to configure
+
+* GtkBuilder can now fill GtkComboBoxText and GtkMenToolButton
+  widgets with data, as well as GtkFileFilters and GtkTextTagTables
+
+* GtkImage now has a ::use-fallback property to allow generic
+  fallback with GIcons and icon-names (e.g. for symbolic icons)
+
+* There's a new gtk_text_view_get_cursor_locations() to enable
+  popup-at-cursor functionality
+
+* The application chooser widgets can now set a custom
+  dialog heading
+
+* The file chooser and application chooser widgets have received
+  minor visual improvements
+
+* gtk-auto-mnemonics is now backed by an XSetting
+
+* Defaults for GtkSettings, as well as theme-specific settings,
+  are now read from key files
+
+* Key themes are now supported again, their syntax has been changed
+  to be CSS-like
+
+* More objects use GtkStyleContext directly now:
+  GtkTreeView
+  GtkIconView
+  GtkCellArea
+  GtkCellRendererText
+  GtkCellRendererPixbuf
+  GtkCellRendererAccel
+  GtkCellRendererProgress
+
+* GtkPlug and GtkSocket have been reduced to X11-specific API, and
+  using them requires including the <gtk/gtkx.h> header, and uses
+  of GdkNativeWindow in their APIs have been replaced by the X11
+  Window type.
+  A number of other API changes were necessary in GDK to ensure
+  that multiple GDK backends can coexist:
+  - GdkNativeWindow has been dropped
+  - The GdkEventOwnerChange owner field is a GdkWindow now
+  - The GdkEventSelection requestor field is a GdkWindow now
+  - The GtkWidget::client_event vfunc is gone
+  - GdkEventClient is gone, together with related API:
+    gdk_add_client_message_filter
+    gdk_display_add_client_message_filter
+    gdk_screen_broadcast_client_message
+    gdk_event_send_client_message
+    gdk_event_send_client_message_for_display
+    gdk_event_send_clientmessage_toall
+  - gdk_drag_get_protocol_for_display has been changed to
+    gdk_window_get_drag_protocol
+
+* Migration guide and tutorial and other documentation improvements
+
+* Bug fixes
+ 322926 FileChooser: Alt-Shift-Down should work like Alt-Down
+ 351755 GTK_RANGE (range) -> round_digits should be exposed...
+ 586635 gtk_info_bar_add_button() should return GtkButton*
+ 590459 Text is sometimes not pasted at the right location
+ 598952 Implement object attribute to expose toolkit/source
+ 626336 Warning when activating GtkButton outside of an event...
+ 634677 assertion in finalize assuring that buffer is NULL...
+ 635287 Specify packages when generating GIR
+ 636691 Rendering icons with prelight state doesn't...
+ 638920 gail should provide toolkit as an AtkAttribute
+ 639139 Subclassing GtkIconView broken lately in master
+ 639186 gtk_paper_size_new fails to recognize valid name
+ 639325 Generated introspection broken
+ 639380 Critical warnings when detaching tab
+ 639455 accel cell renderer critical warning
+ 639520 Update docs about colormap to use visual instead.
+ 639531 No error is given when attempting to save to "nonexistent...
+ 639625 Crashes on dereferencing a NULL GtkBorder.
+ 639750 Support css3 colors
+ 639754 Must widget class names begin with uppercase letter?
+ 639767 password not accepted in gnome-screensaver dialog
+ 639792 Regional panel: "Add" dialog: combos not sorted
+ 639822 Synthesized button2/button3 does not transfer source_device
+ 639845 insensitive and separator items in comboboxes not working...
+ 639931 gtk_application_add_window() docs should mention window destr...
+ 639949 pygobject leaks references on GtkWindows
+ 640005 removable media dialog should use app names
+ 640006 choose app dialog shows other apps by default
+ 640011 Selects application on cancel
+ 640105 Crash showing a offscreen window with a textview inside
+ 640161 GtkFileChooserWidget 0xbbf6c0 is mapped but visible=1...
+ 640188 gdk_pixbuf_get_from_drawable missing from migration guide
+ 640195 gdk_cairo_create gets cairo context with badly clipped...
+ 640282 insensitive, active check button becomes sensitive
+ 640313 BadDevice X error when ungrabbing a SLAVE device
+ 640391 Display lines between rows when window is focused
+ 640487 crash on gtk_statusbar_remove_all()
+ 640698 Incompatibility in 'matched-selected' signal invocation
+ 640712 GtkAssistant fonts are too big
+ 640744 mount-operation: don't show the dialog until the tree...
+ 640902 X11 headers included by default in public headers
+ 640965 XCompose does not work with GTK+ 2.99.x
+ 640983 GtkSettings: Fix theme not updating for dark theme
+ 640999 GtkSpinner Class check macro is invalid
+ 641023 assertion `hash_table != NULL' failed in gtkplug.c
+ 641039 Cannot expand/collapse nodes by mouse
+ 641042 assertion `G_IS_OBJECT (object) in gdkevents.c
+ 641059 Fix several bugs handling GtkTrayIcon symbolic colors
+ 641073 Please be consistent with GtkEntryCompletion
+ 641176 Fix crash in gtk_fixed_remove()
+
+* Translation updates
+ Arabic
+ Basque
+ Catalan
+ Chinese
+ Esperanto
+ Estonian
+ Galician
+ German
+ Greek
+ Hebrew
+ Italian
+ Kazakh
+ Norwegian bokmål
+ Persian
+ Punjabi
+ Spanish
+ Uighur
+
+
+Overview of Changes in GTK+ 2.99.2
+==================================
+
+* More widget are using GtkStyleContext directly:
+ GtkToolItemGroup, GtkMenuItem, GtkImageMenuItem, GtkMenu,
+ GtkTearoffMenuItem, GtkCheckMenuItem, GtkMenuShell
+
+* gtk-builder-convert now accepts a --target-version option
+
+* Bug fixes:
+ 637965 GtkTreeCellDataFunc called with a wrong column arguments
+ 639127 Misc Win32 GDK building problems
+ 639157 GtkOrientable should add/remove "horizontal" and "vert...
+ 639209 Allow toggling the GtkSwitch by clicking the handle
+ 639286 include gtk/gtktextattributes.h not installed
+ 639327 gtk-builder-convert needs to convert gtkcomboboxentry...
+
+* Translation updates:
+ Arabic
+ Basque
+ Hebrew
+
+Overview of Changes from GTK+ 2.99.0 to 2.99.1
+==============================================
+
+* More widgets are using GtkStyleContext directly:
+  GtkColorButton, GtkColorSelection, GtkHSV,
+  GtkFontSelection, GtkPrintUnixDialog, GtkImage,
+  GtkLayout, GtkViewport, GtkTextDisplay, GtkTextUtil,
+  GtkCalendar
+
+* GtkBuilder support has been added for setting menus
+  on GtkMenuToolButtons and for adding tags to
+  GtkTextTagTable as well as adding items to
+  GtkComboBoxText
+
+* Bug fixes:
+ 350618 start rubber banding on "white space"
+ 612918 Support disabling X11 extensions
+ 635687 problem with pygtk or gtk with gtk.Plug and gtk.Socket...
+ 638017 GtkTextView: Crash in gtk_text_view_set_tabs()
+ 638119 GtkSpinner animation not correctly stopped...
+ 638880 Need a setter for has_user_ref_count
+ 639030 Small cleanup in gailtextview code.
+ 639047 Fix remaining usage of g[dk]ktargetlib.
+ 639079 Obtain the fg color from the renderer
+ 639105 Port GtkTextDisplay to StyleContext.
+ 639106 New CSS style misses distinction between "selected focused"...
+ 639127 Misc Win32 GDK building problems
+ 639157 GtkOrientable should add/remove "horizontal" and "vertical"...
+
+* Translation updates:
+ British English
+ Galician
+ Hebrew
+ Indonesian
+ Spanish
+
+
+Overview of Changes from GTK+ 2.91.7 to 2.99.0
+==============================================
+
+* Deprecations and removals:
+ - Long-obsolete linuxfb-related GtkWindow APIs have been dropped
+ - All remaining G_SEALed struct members have been removed
+ - GtkThemeEngine has been removed
+ - gdk_display_get_window_at_device_position() has been renamed to
+   gdk_device_get_window_at_position()
+ - gdk_display_get_device_state() has been renamed to
+   gdk_device_get_position()
+ - gdk_device_set_source() has been dropped
+ - gdk_set_pointer_hooks(), gdk_display_set_pointer_hooks() and
+   gdk_display_set_device_hooks() have been removed
+ - The deprecated GtkNotebook:tab-pack child property has been removed
+ - The deprecated gtk_quit_add() functions have been removed
+ - The GtkRange update-policy facility has been removed
+
+* The gtk-update-icon-cache and gtk-builder-convert utilities have
+  been renamed back to their un-suffixed names. Distributions will
+  have to resolve the conflict between GTK+ 2.x and 3.0 packages
+  by dropping one set of the utilities and adding a dependency.
+
+* It is now possible to include multiple GDK backends in a single
+  library. The --with-gdk-backend option has been split into separate
+  --enable-{x11,win32,quartz}-backend options.
+
+* The GDK Quartz backend has been ported to the new GDK backend API
+
+* A number of widgets have been ported to use GtkStyleContext directly:
+  GtkAccelLabel, GtkArrow, GtkSeparator, GtkSpinButton, GtkMessageDialog,
+  GtkFrame, GtkEventBox, GtkScrolledWindow, GtkProgressBar, GtkEntry,
+  GtkFileChooserEntry, GtkSwitch, GtkHandleBox, GtkToolbar, GtkFixed,
+  GtkToolPalette, GtkAboutDialog, GtkAssistant, GtkTrayIcon, GtkPaned,
+  GtkToolButton, GtkSocket, GtkRecentChooser, GtkTooltip, GtkPathBar,
+  GtkWin32EmbedWidget, GtkCellView, GtkDialog, GtkDrawingArea, GtkPlug,
+  GtkEntryCompletion, GtkFileChooserButton, GtkFileChooser, GtkHandleBox,
+  GtkLinkButton, GtkOffscreenWindow
+
+* Various problems with width-for-height geometry management have been
+  fixed in GtkAlignment, GtkCheckButton, GtkBin
+
+* The GtkComboBox, GtkIconView and GtkCellView widgets have been ported
+  to use GtkCellArea for their cell layouts
+
+* The cups print backend can now send print jobs directly in PDF if
+  cups supports it
+
+* GtkNumerableIcon is a variant of GEmblemedIcon for using numbers
+  as emblems
+
+* Bugs fixed:
+ 144324 Leaking dnd contexts with XDnD
+ 165987 unsets DESKTOP_STARTUP_ID
+ 307963 GtkSpinButton clamps value with the wrong maximum.
+ 321958 gtk.Calendar Notes should also say the format of year
+ 533745 Segfault on gdk.DragContext.drag_get_selection()
+ 553404 Out-of-date comment in gtk_text_view_add_child_in_window()
+ 559503 Description should mention gregorian
+ 560177 Applications should send print jobs to CUPS in PDF format...
+ 562182 gtk_init() docs inaccurate
+ 599130 Ending a drag using space or enter doesn't always cause a...
+ 617312 Move documentation to inline comments: GtkDialog
+ 617315 Move documentation to inline comments: GtkDrawingArea
+ 617322 Move documentation to inline comments: GtkEntryCompletion
+ 617327 Move documentation to inline comments: GtkExpander
+ 617471 Migrate API docs from templates to source files...
+ 621720 Use $(AM_V_GEN) to silent the build a bit.
+ 622125 Note that gtk_show_uri needs gvfs to spawn URLs
+ 629955 Deprecate/remove gtk_main and gtk_init_add/remove* API
+ 633795 gdk_event_get_state wrongly extracts GDK_PROPERTY_NOTIFY...
+ 634711 Xlib warning when RANDR is missing
+ 635299 add gtk_selection_data_get_data_with_length API...
+ 637691 Eating events breaks proxied DND
+ 637721 gtk 2.91.6 issue with gtkcellrendererprogress
+ 637736 [GtkAboutDialog] Newlines are ignored in translator-credits
+ 637763 [GtkAboutDialog] no longer display contact link
+ 637834 gtk_widget_verify_invariants: relax toplevel checks
+ 637849 Shell segfaults when unicode characters after U+00FF...
+ 637895 gdk_pointer_grab() deprecated comment is not helpful enough
+ 637907 gtkwindow.h includes a private header
+ 637910 GtkSpinner - does not animate
+ 637958 print dialog doesn't fit on netbook screen size
+ 637974 Gtk+ 2.91.7 build of introspection fails
+ 638179 in draw signal handle call gtk_style_context_add_provider...
+ 638193 GtkSpinButton documentation out of date
+ 638231 GtkSwitch states translation
+ 638386 gdk_x11_display_init_input careless
+ 638580 'application' window's property released too late
+ 638608 gtkenums: add GTK_STATE_FLAG_NORMAL = 0
+
+* Updated translations:
+ Estonian
+ Kurdish
+ Norwegian bokmål
+ Punjabi
+ Spanish
+ Swedish
+ Uighur
+
+
+Overview of Changes from GTK+ 2.91.6 to 2.91.7
+==============================================
+
+* The treeview-refactor branch has been merged, bringing more
+  flexible cell arrangement with GtkCellArea, GtkCellAreaBox, etc
+
+* The gdk-backend branch has been merged. This branch cleans up the
+  internal frontend/backend separation in GDK, with the ultimate goal
+  of allowing to build a single gdk library that contains multiple
+  backends (interesting combinations are x11+wayland or quartz+x11).
+
+  For now, GDK is still restricted to a single backend, but
+  as a first step, the libraries no longer include the backend name
+  in their soname, but are just libgdk-3.0.so and libgtk-3.0.so.
+
+  Only the x11 backend has been kept up to date with this cleanup
+  work, other backends are broken in this release.
+
+* Deprecations and removals:
+ - G_SEALed struct members have been removed from GtkWindowGroup,
+   GtkDrawingArea, GtkTreeStore, GtkTreeModelSort, GtkTreeSelection,
+   GtkSocket, GtkPrintJob, GtkSelectionData
+ - Input device handling:
+   - gdk_display_list_devices, gdk_display_get_core_pointer,
+     gdk_input_set_extension_events, gtk_widget_set_extension_events,
+     gdk_devices_list have been removed
+   - gdk_display_warp_device has been replaced by gdk_device_warp
+   - gdk_enable_multidevice has been replaced by gdk_disable_multidevice
+ - Drag-and-Drop:
+   gdk_drag_context_new, gdk_drag_find_window and gdk_drag_get_protocol
+   have been removed
+ - Property handling:
+   Functions that deal with X11-specific encodings such as Compound Text
+   have been moved to backend-specific API:
+   gdk_string_to_compound_text[_for_display],
+   gdk_utf8_to_compound_text[_for_display], gdk_free_compound_text,
+   gdk_text_property_to_text_list[_for_display], gdk_free_text_list,
+   gdk_text_property_to_utf8_list
+ - Foreign windows:
+   Functions for dealing with GdkWindow wrappers around foreign
+   windows have been moved to backend-specific API.
+ - Application launching:
+   The gdk_spawn_* APIs have been removed, since they were trivial
+   wrappers around g_spawn_* on most platforms and can be replaced
+   by GIO GAppInfo APIs.
+ - Misc. other functions: gdk_net_wm_supports, gdk_set_locale,
+   gdkx_visual_get have been either removed, gdk_set_sm_client_id
+   has been moved to backend-specific API.
+
+* A number of GTK+ widgets have been ported to use GtkStyleContext
+  directly for rendering
+
+* The tracker search backend for the file chooser has been updated
+  to work with libtracker-sparql as available in tracker >= 0.9
+
+* The GtkAboutDialog has been given a facelift. It no longer
+  opens second-level dialogs
+
+* The GDK X11 backend now uses XI2 (including multi-device capabilities)
+  by default. Use gdk_disable_multidevice() to switch back to the
+  XI1/Core implementation
+
+* Bug fixes:
+ 629923 Consider always calling unmap() when unsetting MAPPED flag
+ 634657 Dynamically attached calendar does not respond to mouse clicks
+ 635401 Setting conflict warning does not disappear when conflict is fixed
+ 636732 Gtk+ fails to build
+ 636777 Leak in gtk_css_provider_get_named
+ 637018 Add checks for id-column/entry-text-column >= 0
+ 637069 Custom print settings set in custom-widget-apply are lost
+ 637155 Remove vestiges of support for themes using XSHAPE
+ 637156 Optimize gtk_widget_shape_combine_region (widget, NULL, ...)
+ 637189 gtk_cell_renderer_spin_start_editing uses g_ascii_strtod but...
+ 637243 docs: fix link failure on gtk-doc scanner binaries
+ 637256 gtkstylecontext: fix typos in annotations
+ 637464 Fix GdkWindowFilter internal refcounting
+ 637471 GTK2_RC_FILES should be renamed to GTK3_RC_FILES
+ 637520 Gtk+ seems to have broken Mutter
+ 637606 Missing out annotations for gtk_accelerator_parse and...
+ 637608 Problems with the new AboutDialog
+
+* Translation updates:
+ Estonian
+ Hebrew
+ Kazakh
+ Norwegian bokmål
+ Persian
+ Spanish
+ Vietnamese
+
+
+Overview of Changes from GTK+ 2.91.5 to 2.91.6
+==============================================
+
+* Deprecations, cleanups and API changes:
+ - GdkDrawable and some X11-specific APIs have been removed
+ - GtkStyle and GtkRcStyle have been deprecated
+ - The GdkWindowClass enumeration is now GdkWindowWindowClass
+ - gdk_window_get_geometry lost its depth argument
+ - The old, unused gtk_decorated_window_... functions have
+   been removed.
+
+* GtkComboBox has gained an 'active id' property that is
+  intended for easy binding to settings
+
+* GtkAppChooser: A new family of widgets that allow choosing
+  an application to open a file. This is strongly based on
+  the corresponding nautilus dialog, which it is replacing.
+
+* The GtkStyleContext branch has been merged, changing the APIs
+  that are used to do themed drawing, and the theme engine interfaces.
+  Among the new classes are GtkStyleContext (replacing GtkStyle) and
+  GtkCssProvider (replacing the gtkrc parser). The migration guide
+  contains a chapter about porting from GtkStyle to GtkStyleContext.
+
+* Bugs fixed:
+ 549720 Add a way to hide GtkScale's slider
+ 582557 need open with dialog box to use with IBM's Lotus Notes...
+ 619148 "active ID" properties (GtkComboBox)
+ 636060 use ATK_DEFINE_TYPE where possible
+ 636129 invalid uninstantiatable type `(null)' in cast to `GtkSpinner'
+ 636388 gtk3-demo craches (segfault) when pressing a key in the textarea...
+ 636511 New style override functions do not work on textview
+
+* Updated translations:
+ Estonian
+ Galician
+ Hebrew
+ Persian
+ Slovenian
+ Spanish
+
+
 Overview of Changes from GTK+ 2.91.4 to 2.91.5
 ==============================================
 

README.in

@@ -27,434 +27,20 @@ Installation
 See the file 'INSTALL'
 
 
-Release notes for 2.20
-======================
-
-* GtkStatusbar now has a message area (see gtk_status_bar_get_message_area)
-  which makes it easy to place additional widgets inside the statusbar
-  frame or to replace the label widgets. Previously, this was only possible
-  by accessing the innards of the statusbar widget directly. Applications
-  which are doing so may need some adjustments, since the addition of the
-  message area changed the internal widget hierarchy.
-
-* GtkBuilder no longer sets the "name" property of widgets to the ID
-  attribute of the <object>. Use gtk_buildable_get_name() instead of
-  gtk_widget_get_name() to obtain the ID.
-
-* GTK+ now includes introspection data, as a consequence, it gained a
-  dependency on gobject-introspection. It is possible to build without
-  introspection by passing --disable-introspection to configure.
-
-
-Release notes for 2.18
-======================
-
-* gtk_tooltip_set_custom now accept a NULL custom_widget to unset the
-  old custom_widget. Custom_widget does not get destroyed when the
-  tooltip goes away.
-
-* JPEG2000 support is no longer enabled by default. It must be
-  explicitly turned on, by passing --with-libjasper to configure.
-
-* GDK has been reworked to implement 'client-side windows'. This offers
-  exciting new possibilities, such as transformed, offscreen rendering,
-  but it breaks some long-standing assumptions that applications may
-  have about GDK windows. Setting the environment variable
-  GDK_NATIVE_WINDOWS makes GDK create a native X11 window for each
-  GDK window, which might make problematic applications work better.
-
-* GTK+ calls signal (SIGPIPE, SIG_IGN) during initialization, to ignore
-  SIGPIPE signals, since these are almost never wanted in graphical
-  applications. If you do need to handle SIGPIPE for some reason, reset
-  the handler after gtk_init(), but notice that other libraries (e.g.
-  libdbus or gvfs) might do similar things.
-
-Release notes for 2.16
-======================
-
-* Password entries now display a caps-lock warning. This can be turned off
-  with the caps-lock-warning property.
-
-* Various orientation-related functions have been deprecated in favour
-  of the new GtkOrientable interface: gtk_scale_button_get_orientation,
-  gtk_scale_button_set_orientation, gtk_toolbar_set_orientation.
-
-* The action-proxy interaction has been changed. Widgets that operate as
-  proxies have to implement the GtkActivatable interface now. GtkActivatable
-  implementation are responsible for syncing their appearance with the
-  action and for activating the action. All GTK+ widgets that are commonly
-  used as proxies implement the GtkActivatable interface.
-
-* The handling of keyboard shortcuts has been changed, to help with a
-  longstanding complaint about the way GTK+ handles multiple layouts. GTK+
-  now only uses keys from groups other than the current group if they are
-  not present in the current group.
-
-Release notes for 2.14
-======================
-
-* gtkitemfactory.h is now completely deprecated.
-  As gtkactiongroup.h and gtkstock.h no longer include the gtkitemfactory.h
-  header, this might break application using gtk_item_factory_* symbols
-  without including gtkitemfactory.h - even though this behaviour has never
-  been supported in the first place.
-
-* The GtkFileSystem semi-private interface has been removed.
-  The GTK+ filechooser implementation now uses GIO directly, which has
-  rendered external filesystem implementations unnecessary. Consequently,
-  the GtkFileSystem interface is no longer available, nor the filechooser
-  will load any GtkFileSystem implementation.
-
-* GtkComboBox now renders the popdown button insensitive when
-  the model is empty. Applications which want to populate the list
-  only before displaying it can set gtk_combo_box_set_button_sensitivity
-  to GTK_SENSITIVITY_ON, so that the button is always sensitive or
-  GTK_SENSITIVITY_OFF to make it insensitive respectively.
-
-* GtkAdjustment now enforces that values are restricted to the
-  range [lower, upper - page_size]. This has always been the documented
-  behaviour, and the recommended practice is to set page_size to 0
-  when using adjustments for simple scalar values, like in a slider
-  or spin button.
-
-* gdk-pixbuf will use GIO for mime type detection if possible. For
-  this to work, shared-mime-info needs to be installed and XDG_DATA_DIRS
-  set accordingly at configure time. Otherwise, gdk-pixbuf falls
-  back to its built-in sniffing implementation.
-
-Release notes for 2.12
-======================
-
-* gtk_about_dialog_get/set_name() were deprecated in favour of
-  gtk_about_dialog_get/set_program_name(), the GtkAboutDialog now uses the
-  "program-name" property instead of the conflicting "name" property.
-
-* The gdk-pixbuf tiff loader now requires libtiff 3.6.0 or later.
-
-* Support for Windows 9x/ME has officially been removed. It hasn't worked
-  since 2.6 anyway.
-
-* The GtkTextBufferTargetInfo enumeration values have been changed from
-  G_MAXUINT-0, G_MAXUINT-1, G_MAXUINT-2, etc, to -1, -2, -3 to stay within
-  ANSI C limits.
-
-* A change in the handling of _NET_WM_USER_TIME properties on toplevel
-  windows can cause deadlock problems with window managers that are using
-  GDK for drawing decorations. In particular, metacity <= 2.18.0 is affected
-  by this. The problem has been fixed in metacity 2.18.1.
-
-* Semi-private GtkTextLayout api has changed: new GtkTextLayout method
-  invalidate_cursors(), and new functions gtk_text_layout_invalidate_cursors()
-  and gtk_text_layout_cursors_changed(), which should be used in place of
-  gtk_text_layout_invalidate() and gtk_text_layout_changed() if invalidation
-  is due to marks moved or changed selection; new GtkTextLineDisplay structure
-  member. Source compatibility is preserved; binary compatibility may break
-  only if GtkTextLineDisplay structure was created on stack or as a part
-  of another structure (in particular GnomeCanvas and its clones do not need
-  recompiling).
-
-* Another new signal has been added to GtkNotebook. The new signal
-  is called create-window, so this name can no longer be used for signals
-  in objects derived from GtkNotebook.
-
-* The gtk_notebook_set/get_group_id() functions were found to be insufficient
-  and have been deprecated in favour of gtk_notebook_set/get_group().
-
-* The move-focus signal has been moved to GtkWidget, to unify the 
-  various implementations of this signal in specific widgets. Great care 
-  has been taken to make sure that all code using this signal continues
-  to work.
-
-* An unused and hardly visible GtkFrame has been removed from the menu 
-  widget hierarchy when GtkComboBox::appears-as-list style property is 
-  set. Any RC file applying a different style to any widget below the 
-  widget path "gtk-combobox-popup-window.GtkFrame" should take into 
-  account that the frame no longer exists.
-
-* The external print preview application used by GtkPrintOperationPreview 
-  is now passed the print settings on the command line with the 
-  --print-settings parameter pointing to a temp file containing the 
-  settings. The preview application assumes ownership of the file and 
-  should delete it once it does not need it anymore. The --print-settings 
-  commandline option is understood by Evince 0.9.0 and newer. To use a 
-  different print preview application, change the gtk-print-preview-command 
-  setting in your gtkrc file, e.g. gtk-print-preview-command = "ggv %f"
-
-* GtkMenuShell is now defined as an abstract type. It was already 
-  documented as an abstract class, and there is little reason to 
-  instantiate it.
-
-* The GtkTooltips struct (this is the old tooltips API) is now considered
-  private. Code that used to access this struct, in particular the
-  tips_data_list field, will need to change. All of the old tooltips
-  API has been deprecated in favour of a new implementation and
-  API. This affects all of the gtk_tooltips_ functions, and functions 
-  which take a GtkTooltips argument, such as gtk_tool_item_set_tooltip()
-  and gtk_menu_tool_button_set_arrow_tooltip().
-  
-* The memory management of the GtkRecentManager object has been changed,
-  as using the screen didn't guarantee that the singleton instance was
-  correctly destroyed. The screen-related functions have been deprecated,
-  and should not be used anymore; the GtkRecentManager instance returned by
-  the gtk_recent_manager_get_default() function is guaranteed to be valid
-  for the entire lifetime of an application.
-
-* A number of interfaces that have been superseded by newer interfaces for 
-  a long time have finally been deprecated. This includes 
-  gtk_widget_ref/unref(), gtk_rc_style_ref/unref() and the old file selector.
-
-* The various coordinate systems in use in GtkTreeView widgets have
-  been clarified in the documentation, and in the cause of doing so, 
-  the functions gtk_tree_view_widget_to_tree_coords() and
-  gtk_tree_view_tree_to_widget_coords() have been deprecated in 
-  favour of a new family of gtk_tree_view_convert_ functions.
-
-* gtk_menu_item_remove_submenu() has been deprecated in favour of
-  gtk_menu_item_set_submenu (..., NULL).
-
-* gtk_default_draw_check() has been fixed to really decrease the
-  indicator size by one pixel to ensure an odd size instead of
-  accidentially increasing it.
-  Consequently, gtk_cell_renderer_toggle_render() could be fixed to
-  not subtract 1 from the size passed to gtk_paint_option(), which
-  was just a workaround for above off-by-two for even sizes (theme
-  engines now get the real indicator size passed).
-  The default toggle size of GtkCheckMenuItem and GtkCellRendererToggle
-  has been changed to 13 to be consistent with GtkCheckButton.
-  The only visible change with default settings is that the indicator in
-  GtkCellRendererToggle has changed its size from 11 to 13 and is now
-  consistent with menus and toggle buttons.
-
-* GTK+ has always required that gtk_init() (or a variant thereof) is
-  called before any other GTK+ function. Some applications call functions
-  like gtk_clipboard_get() to check if they need to call gtk_init(),
-  anyway. A change in GLib 2.14 has recently broken this unsupported
-  practise. It is worth pointing out that calling gtk_init() twice
-  does no harm.
-
-
-Release notes for 2.10
-======================
-
-* The hexadecimal Unicode input feature has been reworked. It no longer
-  blocks the use of the sixteen Ctrl-Shift-<hex digit> key sequences. Now
-  it only uses Ctrl-Shift-u.
-
-* A memory leak in GtkStyle handling has been fixed. This may expose bugs
-  in third-party widgets which forget to call gtk_style_attach() in their
-  realize functions.
-
-* Range widgets like GtkScrollbar now render their arrows insensitive
-  when the slider is at the end. Applications which react to arrow
-  clicks even if the slider is at the end may want to use the new
-  gtk_range_set_[upper/lower]_stepper_sensitivity() functions to
-  prevent the arrows from being rendered insensitive.
-
-* GtkObject now uses the "floating reference" support in GObject. 
-  GTK_OBJECT_IS_FLOATING() will still work, but direct checking
-  of the GTK_FLOATING flag will no longer detect the floating 
-  reference. Details about floating references can be found in the docs:
-  http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#floating-ref
-
-* Accelerators like (_F) are now stripped from labels when they are 
-  displayed in toolbars. If this is not wanted, the feature can be 
-  suppressed by inserting a Unicode control character, e.g ZWNJ.
-
-* The pixbuf theme engine can now customize expanders (in GtkTreeView
-  and GtkExpander) and resize grips, using the new EXPANDER and
-  RESIZE_GRIP function values.
-
-* Dialogs created by gtk_about_dialog_new() no longer hide automatically
-  when the user clicks close. It is the applications responsibility to
-  hide or destroy the dialog.
-
-* Several new signals have been added to GtkNotebook. Care has been taken
-  to choose signal names which do not collide with signals added by well-known
-  derived classes. The names which can no longer be used for signals in 
-  objects derived from GtkNotebook are page-reordered, page-removed and
-  page-added.
-
-* Due to the interface changes in the file chooser backend interface, 
-  the GTK+ ABI version has been bumped to 2.10.0. Third-party filesystem 
-  backends have to be ported to the new interface, other modules, such as 
-  theme engines, input method modules or pixbuf loaders have to be rebuilt 
-  so that they are installed in the right place for GTK+ to find them.
-
-
-Release notes for 2.8
+Release notes for 3.0
 =====================
 
-* GTK+ 2.8 and Pango 1.10 require the cairo library.
+* GTK+ 3 is a major new version of GTK+, which is parallel installable
+  with GTK+ 2.x. For information about porting applications from GTK+ 2.x
+  to GTK+ 3, see the file:
 
-* The default theme has been renamed to "Raleigh". Existing configurations
-  specifying the "Default" theme name should still work.
+  docs/reference/gtk/html/migrating.html
 
-* The GtkTreeView::enable-search property has been changed to control
-  only typeahead search, not the C-f keybinding to start an interactive
-  search. To turn off interactive searching completely, you have to
-  set GtkTreeView::search-column to -1.
+  Or online at:
 
-* The restriction on using the same cell renderer in multiple columns
-  of a GtkTreeView is now more strictly enforced.
+  http://library.gnome.org/devel/gtk/3.0/migrating.html
 
-* In GTK+ 2.8, GtkCalendar uses nl_langinfo() (if available) to determine
-  the first day of the week. Thus, it is possible to select the first day
-  of the week independently from the language, by setting LC_TIME.
-
-* In GTK+ 2.8, the gtk-update-icon-cache utility includes image data
-  in the icon caches, which will make the icon cache files larger than
-  the one produced by GTK+ 2.6. This change will reduce the memory
-  overhead of icon themes at runtime, since all GTK+ applications can
-  share the image data in memory.
-
-* In 2.8, GDK emits GdkEventGrabBroken events when a keyboard or pointer
-  grab is broken. On X11, this can happen if the same application grabs
-  again, or if the window used for the grab becomes unviewable. It happens
-  more often on Win32. Applications which use grabs should pay attention
-  to these events and do the necessary cleanups when the grab is lost.
-* The GIOChannel code for sockets on win32 has been rewritten.
-  Applications who make non-trivial use of GIOChannels on win32 should
-  be watched for possible problems.
-
-* GLib 2.8 uses atomic operations to implement reference counting, thus
-  g_object_ref/unref, g_closure_ref/sink/unref and g_iochannel_ref/unref
-  can be used without locking in multithreaded applications. Note that
-  other modifications, like concurrent setting of properties still require
-  locking.
-
-* g_convert() and related character set conversion functions have been
-  fixed to emit pending shift states and to not cache iconv descriptors
-  across multiple calls, since that is problematic for some encodings.
-  Note that these functions are not suitable for streaming conversions;
-  use g_iconv() to do streaming conversion.
-
-
-Release notes for 2.6
-=====================
-
-* GTK+ 2.6 supports clipboard persistency. To make use of this feature,
-  a clipboard manager following the specification at
-  http://www.freedesktop.org/wiki/Standards/clipboard-manager-spec
-  must be running. A sample implementation of such a clipboard manager
-  is available at 
-  http://people.imendio.com/andersca/archives/clipboard-manager-0.3.tar.gz
-  Applications can use the function gdk_display_supports_clipboard_persistence() 
-  to find out if clipboard persistence is available.
-
-* Notification on clipboard ownership changes via GdkOwnerChange events 
-  requires the XFIXES X extension. Applications can use the function
-  gdk_display_supports_selection_notification() to find out if ownerchip
-  change notification is available.
-
-* The icon theme code in GTK+ 2.6 follows the freedesktop.org icon theme 
-  specification. Setting the XDG_DATA_DIRS environtment variable may be 
-  necessary if your icons aren't installed in the default location 
-  /usr/share/icons.
-
-* The icon theme code in GTK+ 2.6 can make use of mmap()able cache files
-  to avoid a lot of disk searching overhead. GTK+ includes a utility named
-  gtk-update-icon-cache to generate these cache files. For further details,
-  see the gtk-update-icon-cache man page or the GTK+ documentation.
-
-* To reduce code size and improve efficiency, GTK+, when compiled 
-  with the GNU toolchain, has separate internal and external entry 
-  points for exported functions. The internal names, which begin with 
-  IA__, may be seen when debugging a GTK+ program.
-
-* The following functions have been deprecated in GTK+ 2.6:
-  gdk_pango_context_set_colormap
-  gtk_cell_renderer_editing_canceled
-
-* The new GtkFileChooser widget emphasizes simplicity and thus does 
-  not provide a navigation entry by default when opening files. 
-  Experienced command line users will likely want to make heavy use of
-  the location dialog brought up by the Control-L key shortcut.
-
-* The GTK+ libraries use an '_' prefix to indicate private symbols that
-  must not be used by applications. On some platforms, symbols beginning 
-  with prefixes such as _gtk, _gdk, and _pango will be exported
-  from the library, on others not. In no case can applications
-  use these private symbols. In addition to that, GTK+ 2.6 makes several
-  symbols private which were not in any installed header files and
-  were never intended to be exported.
-
-* The gdk_pixbuf_xlib library included in the contrib/ directory 
-  and the framebuffer GDK backend included in the gdk/linux-fb directory
-  of GTK+ are provided on an as-is basis and have not been tested at all. 
-  No guarantees about the degree of workingness or about future
-  compatibility are provided.
-
-* On Unix, the assumption of GLib and GTK+ by default is that filenames on 
-  the filesystem are encoded in UTF-8 rather than the encoding of the locale;
-  the GTK+ developers consider that having filenames whose interpretation
-  depends on the current locale is fundamentally a bad idea.
-
-  If you have filenames encoded in the encoding of your locale, then you 
-  may want to set the G_FILENAME_ENCODING environment variable:
-  
-   G_FILENAME_ENCODING=@locale
-   export G_FILENAME_ENCODING
-
-  (Earlier versions of GLib 2.x required a different environment variable
-  setting; G_BROKEN_FILENAMES=1 to achieve the same effect; this 
-  is still supported, but G_FILENAME_ENCODING is preferred.)
-  Best integration of GTK+ 2.6 with the environment is achieved by 
-  using a UTF-8 locale.
-
-  On Windows, filenames passed to GTK+ should always be in UTF-8, as
-  in GLib 2.6. This is different than in previous versions of GTK+
-  where the system codepage was used. As in GLib, for DLL ABI
-  stability, applications built against previous versions of GTK+ will
-  use entry points providing the old semantics.
-
-  When compiling against GTK+ 2.6, applications intended to be
-  portable to Windows must take the UTF-8 file name encoding into
-  consideration, and use the gstdio wrappers to access files whose 
-  names have been constructed from strings returned from GTK+ or GLib.
-
-
-How to report bugs
-==================
-
-Bugs should be reported to the GNOME bug tracking system.
-(http://bugzilla.gnome.org, product gtk+.) You will need to create an
-account for yourself.
-  
-In the bug report please include:
-  
-* Information about your system. For instance:
-
-   - What operating system and version
-   - What version of X
-   - For Linux, what version of the C library
-
-  And anything else you think is relevant.
-
-* How to reproduce the bug. 
-
-  If you can reproduce it with one of the tests or demos built with GTK+, 
-  such as demos/gtk-demo/gtk-demo, that would be most convenient. Otherwise, 
-  please include a short test program that exhibits the behavior. As a 
-  last resort, you can also provide a pointer to a larger piece of software 
-  that can be downloaded.
-
-* If the bug was a crash, the exact text that was printed out when the
-  crash occured.
-
-* Further information such as stack traces may be useful, but is not
-  necessary. If you do send a stack trace, and the error is an X error,
-  it will be more useful if the stacktrace is produced running the test
-  program with the --sync command line option.
-
-
-Patches
-=======
-
-Patches should also be submitted to bugzilla.gnome.org. If the patch
-fixes an existing bug, add the patch as an attachment to that bug
-report.
-
-Otherwise, enter a new bug report that describes the patch, and attach
-the patch to that bug report.
-
-Patches should be in unified diff form. (The -up option to GNU diff.)
+* Note that the library sonames in this release have been changed from
+  libgtk-3.0 and libgdk-3.0 to libgtk-3 and libgdk-3, to prevent the
+  library versions from going backwards, compared to the 2.90/91/99
+  releases. Applications will have to be recompiled.

README.win32

@@ -85,7 +85,7 @@ LDFLAGS="-L/devel/dist/${ARCH}/${LIBPNG}/lib \
 LIBS=-lintl \
 CFLAGS=-O2 \
 ./configure \
---with-gdktarget=win32 \
+--enable-win32-backend \
 --disable-gdiplus \
 --with-included-immodules \
 --without-libjasper \

autogen.sh

@@ -1,130 +1,32 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
 
-ORIGDIR=`pwd`
-cd $srcdir
-PROJECT=Gtk+
-TEST_TYPE=-d
-FILE=gdk
+olddir=`pwd`
+cd "$srcdir"
 
-DIE=0
-
-have_libtool=false
-if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
-	libtool_version=`libtoolize --version |
-			 head -1 |
-			 sed -e 's/^\(.*\)([^)]*)\(.*\)$/\1\2/g' \
-			     -e 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
-	case $libtool_version in
-	    2.*)
-		have_libtool=true
-		;;
-	esac
-fi
-if $have_libtool ; then : ; else
-	echo
-	echo "You must have libtool 2.2 installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
-	DIE=1
-fi
-
-(gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have gtk-doc installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
-	DIE=1
-}
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have autoconf installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
-	DIE=1
-}
-
-if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
-    AUTOMAKE=automake-1.11
-    ACLOCAL=aclocal-1.11
-else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
-    AUTOMAKE=automake-1.10
-    ACLOCAL=aclocal-1.10
+GTKDOCIZE=`which gtkdocize`
+if test -z $GTKDOCIZE; then
+        echo "*** No GTK-Doc found, please install it ***"
+        exit 1
 else
-	echo
-	echo "You must have automake 1,10.x or 1.11.x installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
-	DIE=1
+        gtkdocize || exit $?
 fi
-fi
-
-if test "$DIE" -eq 1; then
-	exit 1
-fi
-
-test $TEST_TYPE $FILE || {
-	echo "You must run this script in the top-level $PROJECT directory"
-	exit 1
-}
-
-# NOCONFIGURE is used by gnome-common; support both
-if ! test -z "$AUTOGEN_SUBDIR_MODE"; then
-    NOCONFIGURE=1
-fi
-
-if test -z "$NOCONFIGURE"; then
-        if test -z "$*"; then
-                echo "I am going to run ./configure with no arguments - if you wish "
-                echo "to pass any to it, please specify them on the $0 command line."
-        fi
-fi
-
-if test -z "$ACLOCAL_FLAGS"; then
-
-	acdir=`$ACLOCAL --print-ac-dir`
-        m4list="glib-2.0.m4 glib-gettext.m4"
-
-	for file in $m4list
-	do
-		if [ ! -f "$acdir/$file" ]; then
-			echo "WARNING: aclocal's directory is $acdir, but..."
-			echo "         no file $acdir/$file"
-			echo "         You may see fatal macro warnings below."
-			echo "         If these files are installed in /some/dir, set the ACLOCAL_FLAGS "
-			echo "         environment variable to \"-I /some/dir\", or install"
-			echo "         $acdir/$file."
-			echo ""
-		fi
-	done
-fi
-
-rm -rf autom4te.cache
 
 # README and INSTALL are required by automake, but may be deleted by clean
 # up rules. to get automake to work, simply touch these here, they will be
 # regenerated from their corresponding *.in files by ./configure anyway.
 touch README INSTALL
 
-gtkdocize || exit $?
-
-$ACLOCAL -I m4 $ACLOCAL_FLAGS || exit $?
-
-libtoolize --force || exit $?
-
-autoheader || exit $?
-
-$AUTOMAKE --add-missing || exit $?
-autoconf || exit $?
-cd $ORIGDIR || exit $?
-
-if test -z "$NOCONFIGURE"; then
-        $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
-
-        echo 
-        echo "Now type 'make' to compile $PROJECT."
+AUTORECONF=`which autoreconf`
+if test -z $AUTORECONF; then
+        echo "*** No autoreconf found, please install it ***"
+        exit 1
+else
+        autoreconf --force --install --verbose || exit $?
 fi
+
+cd "$olddir"
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"

build/win32/vs9/README.txt

@@ -6,17 +6,18 @@ first need to use some Unix-like environment or manual work to expand
 the files needed, like config.h.win32.in into config.h.win32 and the
 .vcprojin files here into corresponding actual .vcproj files.
 
-You will need the parts from below in the GTK+ stack: pango, atk and
-glib. External dependencies are at least zlib, libpng, proxy-libintl,
-fontconfig, freetype, expat. See the corresponding README.txt file in
-glib for details where to unpack them.
+You will need the parts from below in the GTK+ stack: gdk-pixbuf, pango,
+atk and glib. External dependencies are at least zlib, libpng,
+proxy-libintl, fontconfig, freetype, expat.  See the corresponding
+README.txt file in glib for details where to unpack them.
 
 The "install" project will copy build results and headers into their
 appropriate location under <root>\vs9\<PlatformName>. For instance,
 built DLLs go into <root>\vs9\<PlatformName>\bin, built LIBs into
 <root>\vs9\<PlatformName>\lib and GTK+ headers into
-<root>\vs9\<PlatformName>\include\gtk-2.0. This is then from where
+<root>\vs9\<PlatformName>\include\gtk-3.0. This is then from where
 project files higher in the stack are supposed to look for them, not
 from a specific GLib source tree.
 
 --Tor Lillqvist <tml@iki.fi>
+--Updated by Chun-wei Fan <fanc999 --at-- yahoo --dot-- com --dot-- tw>

build/win32/vs9/gdk-win32.vcproj

@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -52,7 +52,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -93,7 +93,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -122,29 +122,24 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File RelativePath="..\..\..\gdk\win32\gdkapplaunchcontext-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkcolor-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkcursor-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkdevice-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkdevice-wintab.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkdevicemanager-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkdisplay-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkdnd-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkdrawable-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkevents-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkfont-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkgc-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkgeometry-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkglobals-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkim-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkinput-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkinput.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkkeys-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkmain-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkpixmap-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkproperty-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkscreen-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkselection-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkspawn-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdktestutils-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkvisual-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkdisplaymanager-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkwin32id.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkwindow-win32.c" />
 		</Filter>

build/win32/vs9/gdk.vcprojin

@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib imm32.lib"
+				AdditionalDependencies="imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
@@ -63,7 +63,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GdkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib imm32.lib"
+				AdditionalDependencies="imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
@@ -96,7 +96,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -107,7 +107,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib imm32.lib"
+				AdditionalDependencies="imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
@@ -128,7 +128,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GdkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -137,7 +137,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib imm32.lib"
+				AdditionalDependencies="imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
@@ -216,6 +216,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 #include "libgdk.sourcefiles"
+			<File RelativePath="..\..\..\gdk\gdkkeynames.c" />
 		</Filter>
 	</Files>
 </VisualStudioProject>

build/win32/vs9/gtk+.vsprops

@@ -8,13 +8,13 @@
 	>
 	<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"
+		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\GdkPixbuf-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"
 		ForcedIncludeFiles="msvc_recommended_pragmas.h"
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="gdk_pixbuf-2.0.lib gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
+		AdditionalDependencies="gdk_pixbuf-2.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
 		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
 	/>
 	<Tool
@@ -24,9 +24,7 @@ if exist ..\..\..\config.h goto DONE_CONFIG_H&#x0D;&#x0A;
 copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;
 :DONE_CONFIG_H&#x0D;&#x0A;
 
-if exist ..\..\..\gdk\gdkconfig.h goto DONE_GDKCONFIG_H&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
-:DONE_GDKCONFIG_H&#x0D;&#x0A;
 "
 	/>
 	<UserMacro
@@ -87,10 +85,8 @@ copy ..\..\..\gdk\gdkdevicemanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&
 copy ..\..\..\gdk\gdkdisplay.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkdisplaymanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkdnd.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdrawable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkenumtypes.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkevents.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkinput.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkkeys.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkkeysyms.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkmain.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
@@ -102,7 +98,6 @@ copy ..\..\..\gdk\gdkrectangle.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D
 copy ..\..\..\gdk\gdkrgba.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkscreen.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkselection.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkspawn.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 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;
@@ -123,6 +118,10 @@ copy ..\..\..\gtk\gtkactiongroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x
 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;
+copy ..\..\..\gtk\gtkappchooser.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkappchooserbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+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\gtkarrow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkaspectframe.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -131,10 +130,14 @@ copy ..\..\..\gtk\gtkbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0
 copy ..\..\..\gtk\gtkbin.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkbindings.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkborder.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkbuildable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkbuilder.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcalendar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellarea.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellareabox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellareacontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcelleditable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcelllayout.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcellrenderer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -156,6 +159,7 @@ copy ..\..\..\gtk\gtkcolorseldialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 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\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;
@@ -176,12 +180,12 @@ copy ..\..\..\gtk\gtkfixed.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x
 copy ..\..\..\gtk\gtkfontbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkfontsel.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\gtkhruler.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;
@@ -212,6 +216,7 @@ copy ..\..\..\gtk\gtkmisc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0
 copy ..\..\..\gtk\gtkmodules.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkmountoperation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtknotebook.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtknumerableicon.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkoffscreenwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkorientable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkpagesetup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -237,7 +242,6 @@ copy ..\..\..\gtk\gtkrecentchoosermenu.h $(OutDir)\include\gtk-$(GtkApiVersion)\
 copy ..\..\..\gtk\gtkrecentchooserwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkrecentfilter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkrecentmanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkruler.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkscalebutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkscrollable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -258,9 +262,15 @@ copy ..\..\..\gtk\gtkstatusbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D
 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;
 copy ..\..\..\gtk\gtktextbufferrichtext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktextchild.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -271,6 +281,7 @@ copy ..\..\..\gtk\gtktextmark.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;
 copy ..\..\..\gtk\gtktexttag.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktexttagtable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktextview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkthemingengine.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktoggleaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktogglebutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktoggletoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -291,7 +302,6 @@ 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\gtktypeutils.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;
@@ -299,15 +309,14 @@ copy ..\..\..\gtk\gtkversion.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&
 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\gtkvruler.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\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)\lib\gtk-$(GtkApiVersion)\include&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkconfig.h $(OutDir)\lib\gtk-$(GtkApiVersion)\include&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkconfig.h $(OutDir)\include\gtk-3.0\gdk&#x0D;&#x0A;
 
 copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
 "
@@ -318,7 +327,7 @@ copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\l
 	/>
 	<UserMacro
 		Name="GtkGenerateGtkDef"
-		Value="echo EXPORTS &gt;&quot;$(IntDir)\gtk.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gtk\gtk.symbols &gt;&gt;&quot;$(IntDir)\gtk.def&quot;"
+		Value="echo EXPORTS &gt;&quot;$(IntDir)\gtk.def&quot; &amp;&amp; cl /EP -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gtk\gtk.symbols &gt;&gt;&quot;$(IntDir)\gtk.def&quot;"
 	/>
 	<UserMacro
 		Name="GtkLibtoolCompatibleDllPrefix"

build/win32/vs9/gtk-demo.vcproj

@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -43,7 +43,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
+				AdditionalDependencies=""
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -64,7 +64,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -76,7 +76,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
+				AdditionalDependencies=""
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -97,7 +97,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="$(GtkPrefixDefine)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -107,7 +107,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
+				AdditionalDependencies=""
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -130,7 +130,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="$(GtkPrefixDefine)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -140,7 +140,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
+				AdditionalDependencies=""
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"

build/win32/vs9/gtk.vcprojin

@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib atk-1.0.lib pango-1.0.lib pangocairo-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
@@ -63,7 +63,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GtkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -72,7 +72,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib atk-1.0.lib pango-1.0.lib pangocairo-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
@@ -96,7 +96,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -107,7 +107,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib atk-1.0.lib pango-1.0.lib pangocairo-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
@@ -128,7 +128,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GtkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -137,7 +137,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib atk-1.0.lib pango-1.0.lib pangocairo-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gtk.def"

config.h.win32.in

@@ -276,12 +276,6 @@
 /* Whether to load modules via .la files rather than directly */
 /* #undef USE_LA_MODULES */
 
-/* Define to 1 if medialib is available and should be used */
-/* #undef USE_MEDIALIB */
-
-/* Define to 1 if medialib 2.5 is available */
-/* #undef USE_MEDIALIB25 */
-
 /* Define to 1 if XXM is available and should be used */
 #ifndef _MSC_VER
 #  define USE_MMX 1

demos/Makefile.am

@@ -11,14 +11,13 @@ INCLUDES = 				\
 	$(GTK_DEBUG_FLAGS)		\
 	$(GTK_DEP_CFLAGS)
 
-DEPS = 									\
-	$(top_builddir)/gdk/$(gdktargetlib) 				\
-	$(top_builddir)/gtk/$(gtktargetlib)
+DEPS = \
+	$(top_builddir)/gtk/libgtk-3.la
 
-LDADDS = 								\
-	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)				\
-	$(GTK_DEP_LIBS)							\
+LDADDS = \
+	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gdk/libgdk-3.la	\
+	$(GTK_DEP_LIBS)				\
 	$(MATH_LIB)
 
 noinst_PROGRAMS = 		\

demos/gtk-demo/Makefile.am

@@ -55,13 +55,12 @@ INCLUDES = \
 	$(GTK_DEP_CFLAGS)
 
 DEPS = \
-	$(top_builddir)/gdk/$(gdktargetlib) 				\
-	$(top_builddir)/gtk/$(gtktargetlib)
+	$(top_builddir)/gtk/libgtk-3.la
 
 LDADDS = \
-	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)				\
-	$(GTK_DEP_LIBS)							\
+	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gdk/libgdk-3.la	\
+	$(GTK_DEP_LIBS)				\
 	-lm
 
 bin_PROGRAMS = gtk3-demo

demos/gtk-demo/assistant.c

@@ -110,7 +110,7 @@ create_page1 (GtkWidget *assistant)
   gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), box, "Page 1");
   gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), box, GTK_ASSISTANT_PAGE_INTRO);
 
-  pixbuf = gtk_widget_render_icon (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
+  pixbuf = gtk_widget_render_icon_pixbuf (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
   gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), box, pixbuf);
   g_object_unref (pixbuf);
 }
@@ -133,7 +133,7 @@ create_page2 (GtkWidget *assistant)
   gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE);
   gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), box, "Page 2");
 
-  pixbuf = gtk_widget_render_icon (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
+  pixbuf = gtk_widget_render_icon_pixbuf (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
   gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), box, pixbuf);
   g_object_unref (pixbuf);
 }
@@ -152,7 +152,7 @@ create_page3 (GtkWidget *assistant)
   gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), label, TRUE);
   gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), label, "Confirmation");
 
-  pixbuf = gtk_widget_render_icon (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
+  pixbuf = gtk_widget_render_icon_pixbuf (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
   gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), label, pixbuf);
   g_object_unref (pixbuf);
 }

demos/gtk-demo/changedisplay.c

@@ -27,6 +27,9 @@
  *  - Using GtkDialog
  */
 #include <string.h>
+
+#undef GDK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
 #include "demo-common.h"
 
@@ -151,7 +154,7 @@ query_for_toplevel (GdkScreen  *screen,
 	toplevel = NULL;
     }
 
-  gdk_cursor_unref (cursor);
+  g_object_unref (cursor);
   gtk_widget_destroy (popup);
   gdk_flush ();			/* Really release the grab */
 

demos/gtk-demo/clipboard.c

@@ -77,8 +77,8 @@ get_image_pixbuf (GtkImage *image)
       return g_object_ref (gtk_image_get_pixbuf (image));
     case GTK_IMAGE_STOCK:
       gtk_image_get_stock (image, &stock_id, &size);
-      return gtk_widget_render_icon (GTK_WIDGET (image),
-                                     stock_id, size, NULL);
+      return gtk_widget_render_icon_pixbuf (GTK_WIDGET (image),
+                                            stock_id, size);
     default:
       g_warning ("Image storage type %d not handled",
                  gtk_image_get_storage_type (image));
@@ -125,7 +125,7 @@ drag_data_received (GtkWidget        *widget,
 {
   GdkPixbuf *pixbuf;
 
-  if (selection_data->length > 0)
+  if (gtk_selection_data_get_length (selection_data) > 0)
     {
       pixbuf = gtk_selection_data_get_pixbuf (selection_data);
       gtk_image_set_from_pixbuf (GTK_IMAGE (data), pixbuf);

demos/gtk-demo/colorsel.c

@@ -9,35 +9,37 @@
 
 static GtkWidget *window = NULL;
 static GtkWidget *da;
-static GdkColor color;
+static GdkRGBA color;
 static GtkWidget *frame;
 
-/* Expose callback for the drawing area
+/* draw callback for the drawing area
  */
 static gboolean
-draw_callback (GtkWidget *widget, 
+draw_callback (GtkWidget *widget,
                cairo_t   *cr,
                gpointer   data)
 {
-  GtkStyle *style;
+  GtkStyleContext *context;
+  GdkRGBA *bg;
 
-  style = gtk_widget_get_style (widget);
-
-  gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]);
+  context = gtk_widget_get_style_context (widget);
+  gtk_style_context_get (context, 0, "background-color", &bg, NULL);
+  gdk_cairo_set_source_rgba (cr, bg);
   cairo_paint (cr);
+  gdk_rgba_free (bg);
 
   return TRUE;
 }
 
 static void
 change_color_callback (GtkWidget *button,
-		       gpointer	  data)
+                       gpointer   data)
 {
   GtkWidget *dialog;
   GtkColorSelection *colorsel;
   GtkColorSelectionDialog *selection_dialog;
   gint response;
-  
+
   dialog = gtk_color_selection_dialog_new ("Changing color");
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
@@ -45,20 +47,19 @@ change_color_callback (GtkWidget *button,
   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_color (colorsel, &color);
-  gtk_color_selection_set_current_color (colorsel, &color);
+  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_color (colorsel,
-					     &color);
-      
-      gtk_widget_modify_bg (da, GTK_STATE_NORMAL, &color);
+      gtk_color_selection_get_current_rgba (colorsel, &color);
+
+      gtk_widget_override_background_color (da, 0, &color);
     }
-  
+
   gtk_widget_destroy (dialog);
 }
 
@@ -68,20 +69,21 @@ do_colorsel (GtkWidget *do_widget)
   GtkWidget *vbox;
   GtkWidget *button;
   GtkWidget *alignment;
-  
+
   if (!window)
     {
       color.red = 0;
-      color.blue = 65535;
+      color.blue = 1;
       color.green = 0;
-      
+      color.alpha = 1;
+
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Color Selection");
 
       g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
@@ -92,33 +94,32 @@ do_colorsel (GtkWidget *do_widget)
       /*
        * Create the color swatch area
        */
-      
-      
+
+
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
 
       da = gtk_drawing_area_new ();
 
-      g_signal_connect (da, "draw",
-			G_CALLBACK (draw_callback), NULL);
+      g_signal_connect (da, "draw", G_CALLBACK (draw_callback), NULL);
 
       /* set a minimum size */
       gtk_widget_set_size_request (da, 200, 200);
       /* set the color */
-      gtk_widget_modify_bg (da, GTK_STATE_NORMAL, &color);
-      
+      gtk_widget_override_background_color (da, 0, &color);
+
       gtk_container_add (GTK_CONTAINER (frame), da);
 
       alignment = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
-      
+
       button = gtk_button_new_with_mnemonic ("_Change the above color");
       gtk_container_add (GTK_CONTAINER (alignment), button);
-      
+
       gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
-      
+
       g_signal_connect (button, "clicked",
-			G_CALLBACK (change_color_callback), NULL);
+                        G_CALLBACK (change_color_callback), NULL);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/combobox.c

@@ -65,8 +65,8 @@ create_stock_icon_store (void)
     {
       if (stock_id[i])
 	{
-	  pixbuf = gtk_widget_render_icon (cellview, stock_id[i],
-					   GTK_ICON_SIZE_BUTTON, NULL);
+	  pixbuf = gtk_widget_render_icon_pixbuf (cellview, stock_id[i],
+					          GTK_ICON_SIZE_BUTTON);
 	  gtk_stock_lookup (stock_id[i], &item);
 	  label = strip_underscore (item.label);
 	  gtk_list_store_append (store, &iter);
@@ -281,18 +281,18 @@ G_DEFINE_TYPE_WITH_CODE (MaskEntry, mask_entry, GTK_TYPE_ENTRY,
 static void
 mask_entry_set_background (MaskEntry *entry)
 {
-  static const GdkColor error_color = { 0, 65535, 60000, 60000 };
+  static const GdkRGBA error_color = { 1.0, 0.9, 0.9, 1.0 };
 
   if (entry->mask)
     {
       if (!g_regex_match_simple (entry->mask, gtk_entry_get_text (GTK_ENTRY (entry)), 0, 0))
 	{
-	  gtk_widget_modify_base (GTK_WIDGET (entry), GTK_STATE_NORMAL, &error_color);
+	  gtk_widget_override_color (GTK_WIDGET (entry), 0, &error_color);
 	  return;
 	}
     }
 
-  gtk_widget_modify_base (GTK_WIDGET (entry), GTK_STATE_NORMAL, NULL);
+  gtk_widget_override_color (GTK_WIDGET (entry), 0, NULL);
 }
 
 

demos/gtk-demo/editable_cells.c

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

demos/gtk-demo/iconview.c

@@ -105,6 +105,7 @@ fill_store (GtkListStore *store)
 
       name = g_dir_read_name (dir);
     }
+  g_dir_close (dir);
 }
 
 static gint

demos/gtk-demo/images.c

@@ -432,7 +432,7 @@ do_images (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (align), frame);
       gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
 
-      gicon = g_themed_icon_new_with_default_fallbacks ("battery-critical-charging-symbolic");
+      gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic");
       image = gtk_image_new_from_gicon (gicon, GTK_ICON_SIZE_DIALOG);
 
       gtk_container_add (GTK_CONTAINER (frame), image);

demos/gtk-demo/main.c

@@ -751,7 +751,7 @@ create_text (GtkTextBuffer **buffer,
   if (is_source)
     {
       font_desc = pango_font_description_from_string ("monospace");
-      gtk_widget_modify_font (text_view, font_desc);
+      gtk_widget_override_font (text_view, font_desc);
       pango_font_description_free (font_desc);
 
       gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view),

demos/gtk-demo/menus.c

@@ -74,47 +74,17 @@ change_orientation (GtkWidget *button,
                     GtkWidget *menubar)
 {
   GtkWidget *parent;
-  GtkWidget *box = NULL;
+  GtkOrientation orientation;
 
   parent = gtk_widget_get_parent (menubar);
+  orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (parent));
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (parent), 1 - orientation);
 
-  if (GTK_IS_VBOX (parent))
-    {
-      box = gtk_widget_get_parent (parent);
-
-      g_object_ref (menubar);
-      gtk_container_remove (GTK_CONTAINER (parent), menubar);
-      gtk_container_add (GTK_CONTAINER (box), menubar);
-      gtk_box_reorder_child (GTK_BOX (box), menubar, 0);
-      g_object_unref (menubar);
-      g_object_set (menubar, 
-		    "pack-direction", GTK_PACK_DIRECTION_TTB,
-		    NULL);
-    }
+  if (orientation == GTK_ORIENTATION_VERTICAL)
+    g_object_set (menubar, "pack-direction", GTK_PACK_DIRECTION_TTB, NULL);
   else
-    {
-      GList *children, *l;
+    g_object_set (menubar, "pack-direction", GTK_PACK_DIRECTION_LTR, NULL);
 
-      children = gtk_container_get_children (GTK_CONTAINER (parent));
-      for (l = children; l; l = l->next)
-	{
-	  if (GTK_IS_VBOX (l->data))
-	    {
-	      box = l->data;
-	      break;
-	    }
-	}
-      g_list_free (children);
-
-      g_object_ref (menubar);
-      gtk_container_remove (GTK_CONTAINER (parent), menubar);
-      gtk_container_add (GTK_CONTAINER (box), menubar);
-      gtk_box_reorder_child (GTK_BOX (box), menubar, 0);
-      g_object_unref (menubar);
-      g_object_set (menubar, 
-		    "pack-direction", GTK_PACK_DIRECTION_LTR,
-		    NULL);
-    }
 }
 
 static GtkWidget *window = NULL;

demos/gtk-demo/offscreen_window.c

@@ -230,7 +230,7 @@ gtk_rotated_bin_realize (GtkWidget *widget)
 {
   GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
   GtkAllocation allocation;
-  GtkStyle *style;
+  GtkStyleContext *context;
   GdkWindow *window;
   GdkWindowAttr attributes;
   gint attributes_mask;
@@ -290,10 +290,9 @@ gtk_rotated_bin_realize (GtkWidget *widget)
   g_signal_connect (bin->offscreen_window, "from-embedder",
                     G_CALLBACK (offscreen_window_from_parent), bin);
 
-  gtk_widget_style_attach (widget);
-  style = gtk_widget_get_style (widget);
-  gtk_style_set_background (style, window, GTK_STATE_NORMAL);
-  gtk_style_set_background (style, bin->offscreen_window, GTK_STATE_NORMAL);
+  context = gtk_widget_get_style_context (widget);
+  gtk_style_context_set_background (context, window);
+  gtk_style_context_set_background (context, bin->offscreen_window);
   gdk_window_show (bin->offscreen_window);
 }
 
@@ -542,12 +541,11 @@ gtk_rotated_bin_draw (GtkWidget *widget,
     }
   if (gtk_cairo_should_draw_window (cr, bin->offscreen_window))
     {
-      gtk_paint_flat_box (gtk_widget_get_style (widget), cr,
-                          GTK_STATE_NORMAL, GTK_SHADOW_NONE,
-                          widget, "blah",
-                          0, 0,
-                          gdk_window_get_width (bin->offscreen_window),
-                          gdk_window_get_height (bin->offscreen_window));
+      gtk_render_background (gtk_widget_get_style_context (widget),
+                             cr,
+                             0, 0,
+                             gdk_window_get_width (bin->offscreen_window),
+                             gdk_window_get_height (bin->offscreen_window));
 
       if (bin->child)
         gtk_container_propagate_draw (GTK_CONTAINER (widget),
@@ -575,7 +573,7 @@ do_offscreen_window (GtkWidget *do_widget)
   if (!window)
     {
       GtkWidget *bin, *vbox, *scale, *button;
-      GdkColor black;
+      GdkRGBA black;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
@@ -585,8 +583,8 @@ do_offscreen_window (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
-      gdk_color_parse ("black", &black);
-      gtk_widget_modify_bg (window, GTK_STATE_NORMAL, &black);
+      gdk_rgba_parse (&black, "black");
+      gtk_widget_override_background_color (window, 0, &black);
       gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);

demos/gtk-demo/offscreen_window2.c

@@ -168,7 +168,7 @@ gtk_mirror_bin_realize (GtkWidget *widget)
 {
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
   GtkAllocation allocation;
-  GtkStyle *style;
+  GtkStyleContext *context;
   GdkWindow *window;
   GdkWindowAttr attributes;
   gint attributes_mask;
@@ -228,10 +228,9 @@ gtk_mirror_bin_realize (GtkWidget *widget)
   g_signal_connect (bin->offscreen_window, "from-embedder",
                     G_CALLBACK (offscreen_window_from_parent), bin);
 
-  gtk_widget_style_attach (widget);
-  style = gtk_widget_get_style (widget);
-  gtk_style_set_background (style, window, GTK_STATE_NORMAL);
-  gtk_style_set_background (style, bin->offscreen_window, GTK_STATE_NORMAL);
+  context = gtk_widget_get_style_context (widget);
+  gtk_style_context_set_background (context, window);
+  gtk_style_context_set_background (context, bin->offscreen_window);
   gdk_window_show (bin->offscreen_window);
 }
 
@@ -451,12 +450,11 @@ gtk_mirror_bin_draw (GtkWidget *widget,
     }
   else if (gtk_cairo_should_draw_window (cr, bin->offscreen_window))
     {
-      gtk_paint_flat_box (gtk_widget_get_style (widget), cr,
-                          GTK_STATE_NORMAL, GTK_SHADOW_NONE,
-                          widget, "blah",
-                          0, 0,
-                          gdk_window_get_width (bin->offscreen_window),
-                          gdk_window_get_height (bin->offscreen_window));
+      gtk_render_background (gtk_widget_get_style_context (widget),
+                             cr,
+                             0, 0,
+                             gdk_window_get_width (bin->offscreen_window),
+                             gdk_window_get_height (bin->offscreen_window));
 
       if (bin->child)
         gtk_container_propagate_draw (GTK_CONTAINER (widget),

demos/gtk-demo/rotated_text.c

@@ -18,17 +18,17 @@ const char text[] = "I ♥ GTK+";
 
 static void
 fancy_shape_renderer (cairo_t        *cr,
-		      PangoAttrShape *attr,
-		      gboolean        do_path,
-		      gpointer        data)
+                      PangoAttrShape *attr,
+                      gboolean        do_path,
+                      gpointer        data)
 {
   double x, y;
   cairo_get_current_point (cr, &x, &y);
   cairo_translate (cr, x, y);
 
   cairo_scale (cr,
-	       (double) attr->ink_rect.width  / PANGO_SCALE,
-	       (double) attr->ink_rect.height / PANGO_SCALE);
+               (double) attr->ink_rect.width  / PANGO_SCALE,
+               (double) attr->ink_rect.height / PANGO_SCALE);
 
   switch (GPOINTER_TO_UINT (attr->data))
     {
@@ -36,9 +36,9 @@ fancy_shape_renderer (cairo_t        *cr,
       {
         cairo_move_to (cr, .5, .0);
         cairo_line_to (cr, .9, -.4);
-	cairo_curve_to (cr, 1.1, -.8, .5, -.9, .5, -.5);
-	cairo_curve_to (cr, .5, -.9, -.1, -.8, .1, -.4);
-	cairo_close_path (cr);
+        cairo_curve_to (cr, 1.1, -.8, .5, -.9, .5, -.5);
+        cairo_curve_to (cr, .5, -.9, -.1, -.8, .1, -.4);
+        cairo_close_path (cr);
       }
       break;
     }
@@ -60,8 +60,8 @@ create_fancy_attr_list_for_layout (PangoLayout *layout)
 
   /* Get font metrics and prepare fancy shape size */
   metrics = pango_context_get_metrics (pango_layout_get_context (layout),
-				       pango_layout_get_font_description (layout),
-				       NULL);
+                                       pango_layout_get_font_description (layout),
+                                       NULL);
   ascent = pango_font_metrics_get_ascent (metrics);
   logical_rect.x = 0;
   logical_rect.width = ascent;
@@ -77,9 +77,9 @@ create_fancy_attr_list_for_layout (PangoLayout *layout)
       PangoAttribute *attr;
       
       attr = pango_attr_shape_new_with_data (&ink_rect,
-					     &logical_rect,
-					     GUINT_TO_POINTER (g_utf8_get_char (p)),
-					     NULL, NULL);
+                                             &logical_rect,
+                                             GUINT_TO_POINTER (g_utf8_get_char (p)),
+                                             NULL, NULL);
 
       attr->start_index = p - text;
       attr->end_index = attr->start_index + strlen (HEART);
@@ -93,7 +93,7 @@ create_fancy_attr_list_for_layout (PangoLayout *layout)
 static gboolean
 rotated_text_draw (GtkWidget *widget,
                    cairo_t   *cr,
-		   gpointer   data)
+                   gpointer   data)
 {
 #define RADIUS 150
 #define N_WORDS 5
@@ -119,8 +119,8 @@ rotated_text_draw (GtkWidget *widget,
   height = gtk_widget_get_allocated_height (widget);
   device_radius = MIN (width, height) / 2.;
   cairo_translate (cr,
-		   device_radius + (width - 2 * device_radius) / 2,
-		   device_radius + (height - 2 * device_radius) / 2);
+                   device_radius + (width - 2 * device_radius) / 2,
+                   device_radius + (height - 2 * device_radius) / 2);
   cairo_scale (cr, device_radius / RADIUS, device_radius / RADIUS);
 
   /* Create and a subtle gradient source and use it. */
@@ -132,8 +132,8 @@ rotated_text_draw (GtkWidget *widget,
   /* Create a PangoContext and set up our shape renderer */
   context = gtk_widget_create_pango_context (widget);
   pango_cairo_context_set_shape_renderer (context,
-					  fancy_shape_renderer,
-					  NULL, NULL);
+                                          fancy_shape_renderer,
+                                          NULL, NULL);
 
   /* Create a PangoLayout, set the text, font, and attributes */
   layout = pango_layout_new (context);
@@ -181,11 +181,11 @@ do_rotated_text (GtkWidget *do_widget)
       PangoLayout *layout;
       PangoAttrList *attrs;
 
-      const GdkColor white = { 0, 0xffff, 0xffff, 0xffff };
-      
+      const GdkRGBA white = { 1.0, 1.0, 1.0, 1.0 };
+
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
-			     gtk_widget_get_screen (do_widget));
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Rotated Text");
       gtk_window_set_default_size (GTK_WINDOW (window), 4 * RADIUS, 2 * RADIUS);
       g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
@@ -200,10 +200,10 @@ do_rotated_text (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (box), drawing_area);
 
       /* This overrides the background color from the theme */
-      gtk_widget_modify_bg (drawing_area, GTK_STATE_NORMAL, &white);
+      gtk_widget_override_background_color (drawing_area, 0, &white);
 
       g_signal_connect (drawing_area, "draw",
-			G_CALLBACK (rotated_text_draw), NULL);
+                        G_CALLBACK (rotated_text_draw), NULL);
 
       /* And a label */
 
@@ -215,8 +215,8 @@ do_rotated_text (GtkWidget *do_widget)
       /* Set up fancy stuff on the label */
       layout = gtk_label_get_layout (GTK_LABEL (label));
       pango_cairo_context_set_shape_renderer (pango_layout_get_context (layout),
-					      fancy_shape_renderer,
-					      NULL, NULL);
+                                              fancy_shape_renderer,
+                                              NULL, NULL);
       attrs = create_fancy_attr_list_for_layout (layout);
       gtk_label_set_attributes (GTK_LABEL (label), attrs);
       pango_attr_list_unref (attrs);

demos/gtk-demo/stock_browser.c

@@ -166,9 +166,9 @@ create_model (void)
             }
           g_free (sizes);
           
-          info.small_icon = gtk_widget_render_icon (window, info.id,
-                                                    size,
-                                                    NULL);
+          info.small_icon = gtk_widget_render_icon_pixbuf (window, 
+                                                           info.id,
+                                                           size);
           
           if (size != GTK_ICON_SIZE_MENU)
             {

demos/gtk-demo/textview.c

@@ -561,7 +561,7 @@ recursive_attach_view (int                 depth,
 {
   GtkWidget *child_view;
   GtkWidget *event_box;
-  GdkColor color;
+  GdkRGBA color;
   GtkWidget *align;
 
   if (depth > 4)
@@ -571,8 +571,8 @@ recursive_attach_view (int                 depth,
 
   /* Event box is to add a black border around each child view */
   event_box = gtk_event_box_new ();
-  gdk_color_parse ("black", &color);
-  gtk_widget_modify_bg (event_box, GTK_STATE_NORMAL, &color);
+  gdk_rgba_parse (&color, "black");
+  gtk_widget_override_background_color (event_box, 0, &color);
 
   align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
   gtk_container_set_border_width (GTK_CONTAINER (align), 1);

demos/gtk-demo/toolpalette.c

@@ -41,7 +41,7 @@ canvas_item_new (GtkWidget     *widget,
   GdkPixbuf *pixbuf;
 
   stock_id = gtk_tool_button_get_stock_id (button);
-  pixbuf = gtk_widget_render_icon (widget, stock_id, GTK_ICON_SIZE_DIALOG, NULL);
+  pixbuf = gtk_widget_render_icon_pixbuf (widget, stock_id, GTK_ICON_SIZE_DIALOG);
 
   if (pixbuf)
     {

demos/testpixbuf-scale.c

@@ -24,9 +24,9 @@ set_interp_type (GtkWidget *widget, gpointer data)
 void
 overall_changed_cb (GtkAdjustment *adjustment, gpointer data)
 {
-  if (adjustment->value != overall_alpha)
+  if (gtk_adjustment_get_value (adjustment) != overall_alpha)
     {
-      overall_alpha = adjustment->value;
+      overall_alpha = gtk_adjustment_get_value (adjustment);
       gtk_widget_queue_draw (darea);
     }
 }

docs/reference/gdk/Makefile.am

@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
 
 AUTOMAKE_OPTIONS = 1.6
 
@@ -13,130 +12,127 @@ DOC_MAIN_SGML_FILE=gdk-docs.sgml
 SCAN_OPTIONS=--deprecated-guards="GDK_ENABLE_BROKEN|GDK_DISABLE_DEPRECATED"
 
 # The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../../gdk
+DOC_SOURCE_DIR=../../../gdk ../../../gdk/x11
 
 # Used for dependencies
 HFILE_GLOB=$(top_srcdir)/gdk/*.h $(top_srcdir)/gdk/x11/gdkx.h
 CFILE_GLOB=$(top_srcdir)/gdk/*.c
 
 # Header files to ignore when scanning
-IGNORE_HFILES=			\
+IGNORE_HFILES= 			\
 	gdkintl.h		\
 	gdkmarshalers.h		\
 	gdkkeysyms.h		\
 	gdkinternals.h		\
 	gdkprivate.h		\
-	gdkpoly-generic.h	\
+	gdk*private.h		\
 	keyname-table.h		\
-	win32 			\
+	win32			\
 	x11			\
 	quartz
 
 # Extra files to add when scanning (relative to $srcdir)
 EXTRA_HFILES=			\
-	../../../gdk/x11/gdkx.h 
+	../../../gdk/x11/gdkx.h
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
-	-I$(top_srcdir) 	\
-	-I$(top_builddir) 	\
-	-I$(top_builddir)/gdk 	\
+INCLUDES = 			\
+	-I$(top_srcdir)		\
+	-I$(top_builddir)	\
+	-I$(top_builddir)/gdk	\
 	$(GTK_DEBUG_FLAGS)	\
 	$(GDK_DEP_CFLAGS)
 
-GTKDOC_LIBS = $(top_builddir)/gdk/$(gdktargetlib)
-
+GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-3.la $(GDK_DEP_LIBS)
 
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gdk
 
 # Extra SGML files that are included by DOC_MAIN_SGML_FILE
 content_files = 		\
-	version.xml		\
-	multihead.sgml
+	version.xml
 
 # Images to copy into HTML directory
-HTML_IMAGES =				\
+HTML_IMAGES = 				\
 	images/rotated-text.png		\
-					\
-	images/X_cursor.png 		\
-	images/arrow.png 		\
-	images/based_arrow_down.png 	\
-	images/based_arrow_up.png 	\
-	images/boat.png 		\
-	images/bogosity.png 		\
-	images/bottom_left_corner.png 	\
-	images/bottom_right_corner.png 	\
-	images/bottom_side.png 		\
-	images/bottom_tee.png 		\
-	images/box_spiral.png 		\
-	images/center_ptr.png 		\
-	images/circle.png 		\
-	images/clock.png 		\
-	images/coffee_mug.png 		\
-	images/cross.png 		\
-	images/cross_reverse.png 	\
-	images/crosshair.png 		\
-	images/diamond_cross.png 	\
-	images/dot.png 			\
-	images/dotbox.png 		\
-	images/double_arrow.png 	\
-	images/draft_large.png 		\
-	images/draft_small.png 		\
-	images/draped_box.png 		\
-	images/exchange.png 		\
-	images/fleur.png 		\
-	images/gobbler.png 		\
-	images/gumby.png 		\
-	images/hand1.png 		\
-	images/hand2.png 		\
-	images/heart.png 		\
-	images/icon.png 		\
-	images/iron_cross.png 		\
-	images/left_ptr.png 		\
-	images/left_side.png 		\
-	images/left_tee.png 		\
-	images/leftbutton.png 		\
-	images/ll_angle.png 		\
-	images/lr_angle.png 		\
-	images/man.png 			\
-	images/middlebutton.png 	\
-	images/mouse.png 		\
-	images/pencil.png 		\
-	images/pirate.png 		\
-	images/plus.png 		\
-	images/question_arrow.png 	\
-	images/right_ptr.png 		\
-	images/right_side.png 		\
-	images/right_tee.png 		\
-	images/rightbutton.png 		\
-	images/rtl_logo.png 		\
-	images/sailboat.png 		\
-	images/sb_down_arrow.png 	\
-	images/sb_h_double_arrow.png 	\
-	images/sb_left_arrow.png 	\
-	images/sb_right_arrow.png 	\
-	images/sb_up_arrow.png 		\
-	images/sb_v_double_arrow.png 	\
-	images/shuttle.png 		\
-	images/sizing.png 		\
-	images/spider.png 		\
-	images/spraycan.png 		\
-	images/star.png 		\
-	images/target.png 		\
-	images/tcross.png 		\
-	images/top_left_arrow.png 	\
-	images/top_left_corner.png 	\
-	images/top_right_corner.png 	\
-	images/top_side.png 		\
-	images/top_tee.png 		\
-	images/trek.png 		\
-	images/ul_angle.png 		\
-	images/umbrella.png 		\
-	images/ur_angle.png 		\
-	images/watch.png 		\
-	images/xterm.png 
+	images/X_cursor.png		\
+	images/arrow.png		\
+	images/based_arrow_down.png	\
+	images/based_arrow_up.png	\
+	images/boat.png			\
+	images/bogosity.png		\
+	images/bottom_left_corner.png	\
+	images/bottom_right_corner.png	\
+	images/bottom_side.png		\
+	images/bottom_tee.png		\
+	images/box_spiral.png		\
+	images/center_ptr.png		\
+	images/circle.png		\
+	images/clock.png		\
+	images/coffee_mug.png		\
+	images/cross.png		\
+	images/cross_reverse.png	\
+	images/crosshair.png		\
+	images/diamond_cross.png	\
+	images/dot.png			\
+	images/dotbox.png		\
+	images/double_arrow.png		\
+	images/draft_large.png		\
+	images/draft_small.png		\
+	images/draped_box.png		\
+	images/exchange.png		\
+	images/fleur.png		\
+	images/gobbler.png		\
+	images/gumby.png		\
+	images/hand1.png		\
+	images/hand2.png		\
+	images/heart.png		\
+	images/icon.png			\
+	images/iron_cross.png		\
+	images/left_ptr.png		\
+	images/left_side.png		\
+	images/left_tee.png		\
+	images/leftbutton.png		\
+	images/ll_angle.png		\
+	images/lr_angle.png		\
+	images/man.png			\
+	images/middlebutton.png		\
+	images/mouse.png		\
+	images/pencil.png		\
+	images/pirate.png		\
+	images/plus.png			\
+	images/question_arrow.png	\
+	images/right_ptr.png		\
+	images/right_side.png		\
+	images/right_tee.png		\
+	images/rightbutton.png		\
+	images/rtl_logo.png		\
+	images/sailboat.png		\
+	images/sb_down_arrow.png	\
+	images/sb_h_double_arrow.png	\
+	images/sb_left_arrow.png	\
+	images/sb_right_arrow.png	\
+	images/sb_up_arrow.png		\
+	images/sb_v_double_arrow.png	\
+	images/shuttle.png		\
+	images/sizing.png		\
+	images/spider.png		\
+	images/spraycan.png		\
+	images/star.png			\
+	images/target.png		\
+	images/tcross.png		\
+	images/top_left_arrow.png	\
+	images/top_left_corner.png	\
+	images/top_right_corner.png	\
+	images/top_side.png		\
+	images/top_tee.png		\
+	images/trek.png			\
+	images/ul_angle.png		\
+	images/umbrella.png		\
+	images/ur_angle.png		\
+	images/watch.png		\
+	images/xterm.png
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS= \

docs/reference/gdk/gdk-docs.sgml

@@ -6,23 +6,26 @@
 ]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
-    <title>GDK Reference Manual</title>
+    <title>GDK 3 Reference Manual</title>
     <releaseinfo>
-      for GDK &version;
-      The latest version of this documentation can be found on-line at
-      <ulink role="online-location" url="http://library.gnome.org/devel/gdk/unstable/">http://library.gnome.org/devel/gdk/unstable/</ulink>.
+      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>.
+      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>.
     </releaseinfo>
   </bookinfo>
 
   <reference id="reference">
     <title>API Reference</title>
     <xi:include href="xml/general.xml" />
-    <xi:include href="multihead.sgml" />
-    <xi:include href="xml/gdkdisplay.xml" />
     <xi:include href="xml/gdkdisplaymanager.xml" />
+    <xi:include href="xml/gdkdisplay.xml" />
     <xi:include href="xml/gdkscreen.xml" />
+    <xi:include href="xml/gdkdevicemanager.xml" />
+    <xi:include href="xml/gdkdevice.xml" />
     <xi:include href="xml/regions.xml" />
-    <xi:include href="xml/drawing.xml" />
+    <xi:include href="xml/pixbufs.xml" />
     <xi:include href="xml/colors.xml" />
     <xi:include href="xml/rgba_colors.xml" />
     <xi:include href="xml/visuals.xml" />
@@ -35,7 +38,6 @@
     <xi:include href="xml/dnd.xml" />
     <xi:include href="xml/properties.xml" />
     <xi:include href="xml/threads.xml" />
-    <xi:include href="xml/gdkdevicemanager.xml" />
     <xi:include href="xml/pango_interaction.xml" />
     <xi:include href="xml/cairo_interaction.xml" />
     <xi:include href="xml/x_interaction.xml" />

docs/reference/gdk/gdk3-overrides.txt

@@ -1,27 +1,4 @@
 
-# GdkPixmap, GdkBitmap and GdkDrawable are the same as GdkWindow.
-<STRUCT>
-<NAME>GdkWindow</NAME>
-struct GdkPixmap
-{
-  gpointer user_data;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkPixmap</NAME>
-struct GdkPixmap
-{
-  gpointer user_data;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkDrawable</NAME>
-struct GdkDrawable
-{
-  gpointer user_data;
-};
-</STRUCT>
-
 # GdkAtom is an opaque typedef
 <STRUCT>
 <NAME>GdkAtom</NAME>

docs/reference/gdk/gdk3-sections.txt

@@ -8,8 +8,6 @@ gdk_init
 gdk_init_check
 gdk_parse_args
 gdk_get_display_arg_name
-gdk_set_locale
-gdk_set_sm_client_id
 gdk_notify_startup_complete
 gdk_notify_startup_complete_with_id
 
@@ -63,7 +61,6 @@ GdkStatus
 GDKVAR
 gdk_axis_use_get_type
 gdk_byte_order_get_type
-gdk_cap_style_get_type
 gdk_crossing_mode_get_type
 gdk_cursor_type_get_type
 gdk_drag_action_get_type
@@ -79,17 +76,14 @@ gdk_input_mode_get_type
 gdk_input_source_get_type
 gdk_modifier_type_get_type
 gdk_notify_type_get_type
-gdk_overlap_type_get_type
 gdk_property_state_get_type
 gdk_prop_mode_get_type
 gdk_scroll_direction_get_type
 gdk_setting_action_get_type
 gdk_status_get_type
-gdk_subwindow_mode_get_type
 gdk_visibility_state_get_type
 gdk_visual_type_get_type
 gdk_window_attributes_type_get_type
-gdk_window_class_get_type
 gdk_window_edge_get_type
 gdk_window_hints_get_type
 gdk_window_state_get_type
@@ -122,23 +116,16 @@ gdk_display_sync
 gdk_display_flush
 gdk_display_close
 gdk_display_is_closed
-gdk_display_list_devices
 gdk_display_get_event
 gdk_display_peek_event
 gdk_display_put_event
-gdk_display_add_client_message_filter
+gdk_display_has_pending
 gdk_display_set_double_click_time
 gdk_display_set_double_click_distance
 gdk_display_get_pointer
-gdk_display_get_device_state
+gdk_display_list_devices
 gdk_display_get_window_at_pointer
-gdk_display_get_window_at_device_position
-GdkDisplayPointerHooks
-gdk_display_set_pointer_hooks
-GdkDisplayDeviceHooks
-gdk_display_set_device_hooks
 gdk_display_warp_pointer
-gdk_display_warp_device
 gdk_display_supports_cursor_color
 gdk_display_supports_cursor_alpha
 gdk_display_get_default_cursor_size
@@ -151,7 +138,11 @@ gdk_display_store_clipboard
 gdk_display_supports_shapes
 gdk_display_supports_input_shapes
 gdk_display_supports_composite
+gdk_display_get_app_launch_context
+gdk_display_notify_startup_complete
+
 <SUBSECTION Standard>
+GDK_DISPLAY
 GDK_DISPLAY_OBJECT
 GDK_IS_DISPLAY
 GDK_TYPE_DISPLAY
@@ -173,7 +164,8 @@ gdk_display_manager_get
 gdk_display_manager_get_default_display
 gdk_display_manager_set_default_display
 gdk_display_manager_list_displays
-gdk_display_get_core_pointer
+gdk_display_manager_open_display
+
 <SUBSECTION Standard>
 GDK_DISPLAY_MANAGER
 GDK_DISPLAY_MANAGER_CLASS
@@ -211,7 +203,6 @@ gdk_screen_get_monitor_at_window
 gdk_screen_get_monitor_height_mm
 gdk_screen_get_monitor_width_mm
 gdk_screen_get_monitor_plug_name
-gdk_screen_broadcast_client_message
 gdk_screen_get_setting
 gdk_screen_get_font_options
 gdk_screen_set_font_options
@@ -219,10 +210,6 @@ gdk_screen_get_resolution
 gdk_screen_set_resolution
 gdk_screen_get_active_window
 gdk_screen_get_window_stack
-<SUBSECTION Spawning>
-gdk_spawn_on_screen
-gdk_spawn_on_screen_with_pipes
-gdk_spawn_command_line_on_screen
 
 <SUBSECTION Standard>
 GDK_SCREEN
@@ -257,6 +244,8 @@ gdk_color_to_string
 <SUBSECTION Standard>
 GDK_TYPE_COLOR
 
+<SUBSECTION Private>
+gdk_color_get_type
 </SECTION>
 
 <SECTION>
@@ -272,25 +261,9 @@ gdk_rgba_to_string
 
 <SUBSECTION Standard>
 GDK_TYPE_RGBA
-</SECTION>
-
-<SECTION>
-<TITLE>Drawing Primitives</TITLE>
-<FILE>drawing</FILE>
-GdkDrawable
-gdk_drawable_get_clip_region
-gdk_drawable_get_visible_region
-
-<SUBSECTION Standard>
-GDK_DRAWABLE
-GDK_DRAWABLE_GET_CLASS
-GDK_TYPE_DRAWABLE
-GDK_IS_DRAWABLE
-GDK_DRAWABLE_CLASS
-GDK_IS_DRAWABLE_CLASS
 
 <SUBSECTION Private>
-GdkDrawableClass
+gdk_rgba_get_type
 </SECTION>
 
 <SECTION>
@@ -339,7 +312,7 @@ gdk_visual_get_type
 <FILE>windows</FILE>
 GdkWindow
 GdkWindowType
-GdkWindowClass
+GdkWindowWindowClass
 GdkWindowHints
 GdkGeometry
 GdkGravity
@@ -397,9 +370,11 @@ gdk_window_constrain_size
 gdk_window_beep
 
 <SUBSECTION>
+gdk_window_get_clip_region
 gdk_window_begin_paint_rect
 gdk_window_begin_paint_region
 gdk_window_end_paint
+gdk_window_get_visible_region
 
 <SUBSECTION>
 gdk_window_invalidate_rect
@@ -489,10 +464,8 @@ gdk_window_get_device_cursor
 gdk_window_set_device_cursor
 gdk_window_get_device_events
 gdk_window_set_device_events
-
-<SUBSECTION>
-GdkPointerHooks
-gdk_set_pointer_hooks
+gdk_window_get_source_events
+gdk_window_set_source_events
 
 <SUBSECTION>
 gdk_offscreen_window_get_surface
@@ -515,7 +488,6 @@ GDK_TYPE_FILTER_RETURN
 GDK_TYPE_GRAVITY
 GDK_TYPE_MODIFIER_TYPE
 GDK_TYPE_WINDOW_ATTRIBUTES_TYPE
-GDK_TYPE_WINDOW_CLASS
 GDK_TYPE_WINDOW_EDGE
 GDK_TYPE_WINDOW_HINTS
 GDK_TYPE_WINDOW_TYPE
@@ -524,12 +496,11 @@ GDK_TYPE_WM_DECORATION
 GDK_TYPE_WM_FUNCTION
 
 <SUBSECTION Private>
-gdk_window_object_get_type
-gdk_drawable_get_type
-GdkWindowObject
-GdkWindowObjectClass
+gdk_window_get_type
+gdk_window_window_class_get_type
+GdkWindowClass
 GdkWindowImpl
-GdkWindowImplIface
+GdkWindowImplClass
 GdkWindowRedirect
 gdk_window_impl_get_type
 gdk_window_freeze_toplevel_updates_libgtk_only
@@ -572,17 +543,8 @@ GdkAtom
 GDK_ATOM_TO_POINTER
 GDK_POINTER_TO_ATOM
 GDK_NONE
-gdk_text_property_to_text_list
-gdk_text_property_to_text_list_for_display
-gdk_free_text_list
-gdk_text_property_to_utf8_list
 gdk_text_property_to_utf8_list_for_display
-gdk_string_to_compound_text
-gdk_string_to_compound_text_for_display
-gdk_free_compound_text
 gdk_utf8_to_string_target
-gdk_utf8_to_compound_text
-gdk_utf8_to_compound_text_for_display
 gdk_atom_intern
 gdk_atom_intern_static_string
 gdk_atom_name
@@ -616,7 +578,6 @@ gdk_cairo_set_source_pixbuf
 gdk_cairo_set_source_window
 gdk_cairo_rectangle
 gdk_cairo_region
-gdk_cairo_reset_clip
 gdk_cairo_region_create_from_surface
 </SECTION>
 
@@ -649,10 +610,6 @@ gdk_threads_add_timeout
 gdk_threads_add_timeout_full
 gdk_threads_add_timeout_seconds
 gdk_threads_add_timeout_seconds_full
-
-<SUBSECTION Private>
-gdk_threads_lock
-gdk_threads_unlock
 </SECTION>
 
 <SECTION>
@@ -702,25 +659,17 @@ gdk_keymap_get_type
 </SECTION>
 
 <SECTION>
-<TITLE>GdkDeviceManager</TITLE>
-<FILE>gdkdevicemanager</FILE>
-GdkDeviceManager
+<TITLE>GdkDevice</TITLE>
+<FILE>gdkdevice</FILE>
 GdkDevice
-GdkDeviceType
 GdkInputSource
 GdkInputMode
-GdkDeviceKey
-GdkDeviceAxis
 GdkAxisUse
+GdkDeviceType
 GdkGrabOwnership
-gdk_enable_multidevice
-gdk_device_manager_get_display
-gdk_device_manager_list_devices
-gdk_device_manager_get_client_pointer
 
 <SUBSECTION>
 gdk_device_get_name
-gdk_device_set_source
 gdk_device_get_source
 gdk_device_set_mode
 gdk_device_get_mode
@@ -729,10 +678,13 @@ gdk_device_get_key
 gdk_device_set_axis_use
 gdk_device_get_axis_use
 gdk_device_get_associated_device
+gdk_device_list_slave_devices
 gdk_device_get_device_type
 gdk_device_get_display
 gdk_device_get_has_cursor
 gdk_device_get_n_axes
+gdk_device_get_n_keys
+gdk_device_warp
 
 <SUBSECTION>
 gdk_device_grab
@@ -740,6 +692,8 @@ gdk_device_ungrab
 
 <SUBSECTION>
 gdk_device_get_state
+gdk_device_get_position
+gdk_device_get_window_at_position
 gdk_device_get_history
 gdk_device_free_history
 GdkTimeCoord
@@ -747,14 +701,6 @@ gdk_device_get_axis
 gdk_device_list_axes
 gdk_device_get_axis_value
 
-<SUBSECTION>
-gdk_input_set_extension_events
-GdkExtensionMode
-
-<SUBSECTION>
-gdk_devices_list
-gdk_device_get_core_pointer
-
 <SUBSECTION Standard>
 GDK_TYPE_AXIS_USE
 GDK_TYPE_EXTENSION_MODE
@@ -762,12 +708,6 @@ GDK_TYPE_INPUT_MODE
 GDK_TYPE_INPUT_SOURCE
 GDK_TYPE_DEVICE_TYPE
 GDK_TYPE_GRAB_OWNERSHIP
-GDK_DEVICE_MANAGER
-GDK_DEVICE_MANAGER_CLASS
-GDK_DEVICE_MANAGER_GET_CLASS
-GDK_IS_DEVICE_MANAGER
-GDK_IS_DEVICE_MANAGER_CLASS
-GDK_TYPE_DEVICE_MANAGER
 GDK_DEVICE
 GDK_DEVICE_CLASS
 GDK_DEVICE_GET_CLASS
@@ -777,15 +717,33 @@ GDK_TYPE_DEVICE
 
 <SUBSECTION Private>
 GdkDeviceClass
-GdkDevicePrivate
-GdkDeviceManagerClass
-GdkDeviceManagerPrivate
 gdk_device_get_type
-gdk_device_manager_get_type
 gdk_device_type_get_type
 GDK_MAX_TIMECOORD_AXES
 </SECTION>
 
+<SECTION>
+<TITLE>GdkDeviceManager</TITLE>
+<FILE>gdkdevicemanager</FILE>
+GdkDeviceManager
+gdk_disable_multidevice
+gdk_device_manager_get_display
+gdk_device_manager_list_devices
+gdk_device_manager_get_client_pointer
+
+<SUBSECTION Standard>
+GDK_DEVICE_MANAGER
+GDK_DEVICE_MANAGER_CLASS
+GDK_DEVICE_MANAGER_GET_CLASS
+GDK_IS_DEVICE_MANAGER
+GDK_IS_DEVICE_MANAGER_CLASS
+GDK_TYPE_DEVICE_MANAGER
+
+<SUBSECTION Private>
+GdkDeviceManagerClass
+gdk_device_manager_get_type
+</SECTION>
+
 <SECTION>
 <TITLE>Events</TITLE>
 <FILE>events</FILE>
@@ -795,7 +753,6 @@ GDK_CURRENT_TIME
 GDK_PRIORITY_EVENTS
 GDK_PRIORITY_REDRAW
 
-
 <SUBSECTION>
 gdk_events_pending
 gdk_event_peek
@@ -818,12 +775,6 @@ gdk_events_get_distance
 gdk_event_handler_set
 GdkEventFunc
 
-<SUBSECTION>
-gdk_event_send_client_message
-gdk_event_send_client_message_for_display
-gdk_event_send_clientmessage_toall
-gdk_add_client_message_filter
-
 <SUBSECTION>
 gdk_get_show_events
 gdk_set_show_events
@@ -831,6 +782,8 @@ gdk_event_set_screen
 gdk_event_get_screen
 gdk_event_get_device
 gdk_event_set_device
+gdk_event_get_source_device
+gdk_event_set_source_device
 
 <SUBSECTION>
 gdk_setting_get
@@ -858,11 +811,8 @@ GdkEventFocus
 GdkEventConfigure
 GdkEventProperty
 GdkEventSelection
-GdkNativeWindow
 GdkEventDND
 GdkEventProximity
-GdkEventClient
-GdkEventNoExpose
 GdkEventWindowState
 GdkEventSetting
 GdkEventOwnerChange
@@ -921,30 +871,31 @@ gdk_cursor_get_type
 <SECTION>
 <TITLE>Drag and Drop</TITLE>
 <FILE>dnd</FILE>
+GdkDragContext
 gdk_drag_get_selection
 gdk_drag_abort
 gdk_drop_reply
-gdk_drag_context_new
 gdk_drag_drop
-gdk_drag_find_window
 gdk_drag_find_window_for_screen
-gdk_drag_context_get_source_window
 gdk_drag_begin
+gdk_drag_begin_for_device
 gdk_drag_motion
 gdk_drop_finish
-gdk_drag_get_protocol
-gdk_drag_get_protocol_for_display
 GdkDragProtocol
-GdkDragContext
 GdkDragAction
 gdk_drag_status
 gdk_drag_drop_succeeded
+gdk_window_get_drag_protocol
+
 gdk_drag_context_get_actions
 gdk_drag_context_get_suggested_action
 gdk_drag_context_get_selected_action
 gdk_drag_context_list_targets
 gdk_drag_context_get_device
 gdk_drag_context_set_device
+gdk_drag_context_get_source_window
+gdk_drag_context_get_dest_window
+gdk_drag_context_get_protocol
 
 <SUBSECTION Standard>
 GDK_DRAG_CONTEXT
@@ -966,38 +917,21 @@ gdk_drag_context_get_type
 <TITLE>X Window System Interaction</TITLE>
 <FILE>x_interaction</FILE>
 GDK_ROOT_WINDOW
-GDK_WINDOW_XDISPLAY
 GDK_WINDOW_XID
 GDK_DISPLAY_XDISPLAY
-GDK_DRAWABLE_XDISPLAY
-GDK_DRAWABLE_XID
 GDK_SCREEN_XDISPLAY
 GDK_SCREEN_XNUMBER
 GDK_SCREEN_XSCREEN
 GDK_CURSOR_XCURSOR
 GDK_CURSOR_XDISPLAY
-GDK_WINDOW_XWINDOW
-gdkx_visual_get
-gdk_window_foreign_new
-gdk_window_foreign_new_for_display
-gdk_xid_table_lookup
-gdk_xid_table_lookup_for_display
-gdk_window_lookup
-gdk_window_lookup_for_display
+GDK_POINTER_TO_XID
+GDK_XID_TO_POINTER
 gdk_x11_lookup_xdisplay
 gdk_x11_get_server_time
-gdk_net_wm_supports
-gdk_x11_screen_supports_net_wm_hint
-gdk_x11_screen_get_window_manager_name
-gdk_x11_screen_get_monitor_output
-gdk_x11_screen_lookup_visual
-gdk_x11_window_set_user_time
-gdk_x11_window_move_to_current_desktop
 gdk_x11_display_get_user_time
-gdk_x11_cursor_get_xcursor
-gdk_x11_cursor_get_xdisplay
 gdk_x11_display_broadcast_startup_message
 gdk_x11_display_get_startup_notification_id
+gdk_x11_display_set_startup_notification_id
 gdk_x11_display_get_xdisplay
 gdk_x11_display_grab
 gdk_x11_display_ungrab
@@ -1006,15 +940,25 @@ gdk_x11_display_error_trap_pop
 gdk_x11_display_error_trap_pop_ignored
 gdk_x11_display_set_cursor_theme
 gdk_x11_register_standard_event_type
-gdk_x11_drawable_get_xdisplay
-gdk_x11_drawable_get_xid
+gdk_x11_screen_get_screen_number
+gdk_x11_screen_get_xscreen
+gdk_x11_screen_get_window_manager_name
+gdk_x11_screen_get_monitor_output
+gdk_x11_screen_lookup_visual
+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_theme_variant_gtk_only
+gdk_x11_window_set_user_time
+gdk_x11_window_move_to_current_desktop
 gdk_x11_get_default_root_xwindow
 gdk_x11_get_default_screen
 gdk_x11_get_default_xdisplay
 gdk_x11_grab_server
-gdk_x11_screen_get_screen_number
-gdk_x11_screen_get_xscreen
 gdk_x11_ungrab_server
+gdk_x11_cursor_get_xcursor
+gdk_x11_cursor_get_xdisplay
 gdk_x11_visual_get_xvisual
 gdk_x11_atom_to_xatom
 gdk_x11_atom_to_xatom_for_display
@@ -1024,11 +968,30 @@ gdk_x11_get_xatom_by_name
 gdk_x11_get_xatom_by_name_for_display
 gdk_x11_get_xatom_name
 gdk_x11_get_xatom_name_for_display
+gdk_x11_set_sm_client_id
+gdk_x11_display_text_property_to_text_list
+gdk_x11_free_text_list
+gdk_x11_display_string_to_compound_text
+gdk_x11_display_utf8_to_compound_text
+gdk_x11_free_compound_text
 
 <SUBSECTION Private>
-GDK_HAVE_WCHAR_H
-GDK_HAVE_WCTYPE_H
-gdk_x11_window_get_drawable_impl
+gdk_x11_app_launch_context_get_type
+gdk_x11_cursor_get_type
+gdk_x11_device_core_get_type
+gdk_x11_device_manager_core_get_type
+gdk_x11_device_manager_xi2_get_type
+gdk_x11_device_manager_xi_get_type
+gdk_x11_device_xi2_get_type
+gdk_x11_device_xi_get_type
+gdk_x11_display_get_type
+gdk_x11_display_manager_get_type
+gdk_x11_drag_context_get_type
+gdk_x11_keymap_get_type
+gdk_x11_screen_get_type
+gdk_x11_visual_get_type
+gdk_x11_window_get_type
+gdk_window_impl_x11_get_type
 </SECTION>
 
 <SECTION>
@@ -1050,7 +1013,6 @@ GDK_IS_APP_LAUNCH_CONTEXT
 GDK_IS_APP_LAUNCH_CONTEXT_CLASS
 GDK_TYPE_APP_LAUNCH_CONTEXT
 GdkAppLaunchContextClass
-GdkAppLaunchContextPrivate
 <SUBSECTION Private>
 gdk_app_launch_context_get_type
 </SECTION>

docs/reference/gdk/gdk3.types

@@ -1,10 +1,13 @@
 #include <gdk/gdk.h>
 
-gdk_display_get_type
-gdk_display_manager_get_type
-gdk_screen_get_type
-gdk_drawable_get_type
-gdk_window_object_get_type
-gdk_keymap_get_type
+gdk_app_launch_context_get_type
+gdk_cursor_get_type
 gdk_device_get_type
 gdk_device_manager_get_type
+gdk_display_get_type
+gdk_display_manager_get_type
+gdk_drag_context_get_type
+gdk_keymap_get_type
+gdk_screen_get_type
+gdk_visual_get_type
+gdk_window_get_type

docs/reference/gdk/multihead.sgml

@@ -1,128 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<refentry id="multihead" revision="1 May 2002">
-  <refmeta>
-    <refentrytitle>Multi-head Support Overview</refentrytitle>
-    <manvolnum>3</manvolnum>
-    <refmiscinfo>GDK Library</refmiscinfo>
-  </refmeta>
-
-  <refnamediv>
-    <refname>Multi-head Support Overview</refname>
-    <refpurpose>Overview of GdkDisplay and GdkScreen</refpurpose>
-  </refnamediv>
-
-  <refsect1>
-    <title>Overview</title>
-      <para>
-	Multihead support is based around two main object types:
-	<itemizedlist>
-	  <listitem><para>GdkDisplay</para></listitem>
-	  <listitem><para>GdkScreen</para></listitem>
-	</itemizedlist>
-      </para>
-      
-      <para>
-	<link linkend="gdk-GdkDisplay">GdkDisplay</link> objects are the GDK
-	representation of the X Display which can be described as <emphasis>a
-	workstation consisting of a keyboard a pointing device (such as a
-	  mouse) and one or more screens</emphasis>. 
-	It is used to open and keep track of various <link
-	  linkend="gdk-GdkScreen">GdkScreen</link> objects currently 
-	instanciated by the application. It is also used to grab and release
-	the keyboard and the mouse pointer.
-      </para>
-      <para>
-	<link linkend="gdk-GdkScreen">GdkScreen</link> objects are the GDK
-	representation of a physical screen. It is used throughout GDK and GTK+
-	to specify which screen the top level windows are to be displayed on. 
-	It is also used to query the screen specification and default settings such as 
-	the default colormap (<link linkend="gdk-screen-get-default-colormap">gdk_screen_get_default_colormap</link>()),
-	the screen width (<link linkend="gdk-screen-get-width">gdk_screen_get_width</link>()), etc.
-      </para>
-      <para> 
-	The following code samples demonstrate common usage of the objects described above.
-      </para>
-      
-      <example>
-	<title>Testing the number of screen on the current display</title>
-	<programlisting><!--
--->gint num_screen = 0;
-gchar *displayname = NULL;
-GdkScreen **screen_list;
-GdkDisplay *display;
-
-gtk_init (&amp;argc, &amp;argv);
-
-display = gdk_display_get_default ();
-num_screen = gdk_display_get_n_screens (display);
-displayname = gdk_display_get_name (display);
-if (num_screen &lt;= 1)
-  {
-    printf ("This Xserver (%s) manages only one screen. exiting...\n",
-            displayname);
-    exit (1);
-  }
-else
-  {
-    printf ("This Xserver (%s) manages %d screens.\n", displayname,
-            num_screen);
-  }<!--
-
--->     </programlisting>
-      </example>
-      <example>
-	<title>Opening a second display</title>
-	<programlisting><!--
--->gchar *second_screen_name;
-GdkDisplay *second_display;
-GdkScreen *second_screen;
-GtkWidget *window;
-
-gtk_init (&amp;argc, &amp;argv);
-
-/* screen2_name needs to be initialized before calling 
-/* gdk_display_new() */
-second_display = gdk_display_new (&amp;argc, &amp;argv, second_screen_name);
-if (second_display)
-    second_screen = gdk_display_get_default_screen (second_display);
-else 
-  {
-	g_print ("Can't open display :\n\t%s\n\n",
-		  second_screen_name);
-    exit (1);	
-  }
-/* now GdkScreen can be assigned to GtkWindows */
-
-window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-gtk_window_set_screen (window, second_screen);<!--
-     --></programlisting>
-      </example>
-    </refsect1>
-    <refsect1>
-      <title>See Also</title>
-      <para>
-	<variablelist>
-	  <varlistentry>
-	    <term><link linkend="GdkDisplay">GdkDisplay</link></term>
-	    <listitem><para>the GDK Object used to represent and manipulate display
-		related data</para></listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><link linkend="GdkScreen">GdkScreen</link></term>
-	    <listitem><para>the GDK Object used to represent and query screen related
-		data</para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </refsect1>
-  </refentry>
-  
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gdk-docs.sgml" "book" "refentry" "")
-End:
--->

docs/reference/gtk/Makefile.am

@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
 
 AUTOMAKE_OPTIONS = 1.6
 
@@ -22,6 +21,8 @@ CFILE_GLOB=$(top_srcdir)/gtk/*.c
 # Header files to ignore when scanning
 IGNORE_HFILES=				\
 	fnmatch.h			\
+	gtk9slice.h			\
+	gtkanimationdescription.h	\
 	gtkdebug.h			\
 	gtkbuilderprivate.h		\
 	gtkdndcursors.h			\
@@ -77,6 +78,7 @@ IGNORE_HFILES=				\
 	gtktexttagprivate.h		\
 	gtktexttypes.h			\
 	gtktextutil.h			\
+	gtktimeline.h			\
 	gtkthemes.h			\
 	gtktrayicon.h			\
 	gtktreedatalist.h		\
@@ -104,8 +106,8 @@ CPPFLAGS += \
 	-UGTK_DISABLE_SINGLE_INCLUDES
 
 GTKDOC_LIBS = \
-	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)
+	$(top_builddir)/gtk/libgtk-3.la	\
+	$(GTK_DEP_LIBS)
 
 
 # Extra options to supply to gtkdoc-mkdb
@@ -122,6 +124,7 @@ content_files =					\
 	migrating-2to3.xml			\
 	migrating-checklist.sgml		\
 	migrating-GtkApplication.xml		\
+	migrating-GtkStyleContext.xml		\
 	objects_grouped.sgml			\
 	osx.sgml				\
 	question_index.sgml			\
@@ -131,8 +134,7 @@ content_files =					\
 	windows.sgml				\
 	x11.sgml				\
 	gtk-query-immodules-3.0.xml		\
-	gtk-update-icon-cache-3.0.xml		\
-	gtk-builder-convert-3.0.xml		\
+	gtk-update-icon-cache.xml		\
 	visual_index.xml			\
 	getting_started.xml			\
 	overview.xml
@@ -144,6 +146,7 @@ expand_content_files = 				\
 	migrating-2to3.xml			\
 	migrating-checklist.sgml		\
 	migrating-GtkApplication.xml		\
+	migrating-GtkStyleContext.xml		\
 	question_index.sgml			\
 	text_widget.sgml			\
 	tree_widget.sgml
@@ -271,6 +274,8 @@ HTML_IMAGES = \
 	$(top_srcdir)/gtk/stock-icons/24/gtk-page-setup.png		\
 	$(srcdir)/images/aboutdialog.png				\
 	$(srcdir)/images/accel-label.png				\
+	$(srcdir)/images/appchooserbutton.png				\
+	$(srcdir)/images/appchooserdialog.png				\
 	$(srcdir)/images/assistant.png					\
 	$(srcdir)/images/button.png					\
 	$(srcdir)/images/check-button.png				\
@@ -323,7 +328,35 @@ HTML_IMAGES = \
 	$(srcdir)/images/layout-tbrl.png				\
 	$(srcdir)/images/window-default.png				\
 	$(srcdir)/images/hello-world.png				\
-	$(srcdir)/images/switch.png
+	$(srcdir)/images/grid-packing.png				\
+	$(srcdir)/images/drawing.png					\
+	$(srcdir)/images/switch.png					\
+	$(srcdir)/images/linear.png					\
+	$(srcdir)/images/ease.png					\
+	$(srcdir)/images/ease-in-out.png				\
+	$(srcdir)/images/ease-in.png					\
+	$(srcdir)/images/ease-out.png					\
+	$(srcdir)/images/gradient1.png					\
+	$(srcdir)/images/gradient2.png					\
+	$(srcdir)/images/gradient3.png					\
+	$(srcdir)/images/gradient4.png					\
+	$(srcdir)/images/border1.png					\
+	$(srcdir)/images/border2.png					\
+	$(srcdir)/images/border3.png					\
+	$(srcdir)/images/slices.png					\
+	$(srcdir)/images/checks.png					\
+	$(srcdir)/images/options.png					\
+	$(srcdir)/images/arrows.png					\
+	$(srcdir)/images/expanders.png					\
+	$(srcdir)/images/background.png					\
+	$(srcdir)/images/frames.png					\
+	$(srcdir)/images/frame-gap.png					\
+	$(srcdir)/images/sliders.png					\
+	$(srcdir)/images/focus.png					\
+	$(srcdir)/images/handles.png					\
+	$(srcdir)/images/extensions.png					\
+	$(srcdir)/images/numerableicon.png				\
+	$(srcdir)/images/numerableicon2.png
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=../gdk/html \
@@ -342,8 +375,7 @@ EXTRA_DIST += version.xml.in
 
 man_MANS = 				\
 	gtk-query-immodules-3.0.1	\
-	gtk-update-icon-cache-3.0.1	\
-	gtk-builder-convert-3.0.1
+	gtk-update-icon-cache.1
 
 if ENABLE_MAN
 

docs/reference/gtk/building.sgml

@@ -2,7 +2,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
-<refentry id="gtk-building" revision="6 Sept 2001">
+<refentry id="gtk-building">
 <refmeta>
 <refentrytitle>Compiling the GTK+ libraries</refentrytitle>
 <manvolnum>3</manvolnum>
@@ -30,7 +30,7 @@ How to compile GTK+ itself
       your operating system will be available, either from your
       operating system vendor or from independent sources. If such a
       set of packages is available, installing it will get you
-      programming wih GTK+ much faster than building it yourself. In
+      programming with GTK+ much faster than building it yourself. In
       fact, you may well already have GTK+ installed on your system
       already.
     </para>
@@ -45,7 +45,7 @@ How to compile GTK+ itself
     </para>
     <para>
       If you are building GTK+ from the distributed source packages,
-      then won't need these tools installed; the necessary pieces
+      then you won't need these tools installed; the necessary pieces
       of the tools are already included in the source packages. But
       it's useful to know a bit about how packages that use these
       tools work. A source package is distributed as a
@@ -57,14 +57,15 @@ How to compile GTK+ itself
       tar xvfj gtk+-3.0.0.tar.bz2
     </programlisting>
     <para>
-      In the toplevel of the directory that is created, there will be
+      In the toplevel directory that is created, there will be
       a shell script called <filename>configure</filename> which
       you then run to take the template makefiles called
       <filename>Makefile.in</filename> in the package and create
-      makefiles customized for your operating system. The <filename>configure</filename>
-      script can be passed various command line arguments to determine how
-      the package is built and installed. The most commonly useful
-      argument is the <systemitem>--prefix</systemitem> argument which
+      makefiles customized for your operating system.
+      The <filename>configure</filename> script can be passed
+      various command line arguments to determine how the package
+      is built and installed. The most commonly useful argument is
+      the <systemitem>--prefix</systemitem> argument which
       determines where the package is installed. To install a package
       in <filename>/opt/gtk</filename> you would run configure as:
     </para>
@@ -171,7 +172,7 @@ How to compile GTK+ itself
           such as high level data types, Unicode manipulation, and
           an object and type system to C programs. It is available
           from the <ulink url="ftp://ftp.gtk.org/pub/glib/">GTK+
-          FTP site.</ulink>
+          FTP site</ulink>.
         </para>
       </listitem>
       <listitem>
@@ -179,7 +180,7 @@ How to compile GTK+ itself
           <ulink url="http://www.pango.org">Pango</ulink> is a library
           for internationalized text handling. It is available from
           the <ulink url="ftp://ftp.gtk.org/pub/pango/">GTK+ FTP
-          site.</ulink>.
+          site</ulink>.
         </para>
       </listitem>
       <listitem>
@@ -188,7 +189,7 @@ How to compile GTK+ itself
           interfaces allowing accessibility technologies such as
           screen readers to interact with a graphical user interface.
           It is available from the <ulink
-          url="ftp://ftp.gtk.org/pub/atk/">GTK+ FTP site.</ulink>
+          url="ftp://ftp.gtk.org/pub/atk/">GTK+ FTP site</ulink>.
         </para>
       </listitem>
       <listitem>
@@ -210,22 +211,6 @@ How to compile GTK+ itself
           message translation databases.
         </para>
       </listitem>
-      <listitem>
-        <para>
-          The <ulink url="http://en.wikipedia.org/wiki/Libjpeg">JPEG</ulink>,
-          <ulink url="http://www.libpng.org">PNG</ulink>, and
-          <ulink url="http://www.libtiff.org">TIFF</ulink> image
-          loading libraries are needed to compile GTK+. You probably
-          already have these libraries installed, but if not, the
-          versions you need are available in the
-           <filename>dependencies</filename> directory on the the
-          <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.10/dependencies/">GTK+
-            FTP site.</ulink>. (Before installing these libraries
-          from source, you should check if your operating system
-          vendor has prebuilt packages of these libraries that you
-          don't have installed.)
-        </para>
-      </listitem>
       <listitem>
         <para>
           The libraries from the X window system are needed to build
@@ -246,10 +231,16 @@ How to compile GTK+ itself
         <para>
           <ulink url="http://www.cairographics.org">Cairo</ulink>
           is a graphics library that supports vector graphics and image
-          compositing. Both Pango and GTK+ use cairo for much of their
+          compositing. Both Pango and GTK+ use cairo for all of their
           drawing.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          The GdkPixbuf library provides facilities for loading
+          images in a variety of file formats.
+        </para>
+      </listitem>
       <listitem>
         <para>
           <ulink url="http://live.gnome.org/GObjectIntrospection">gobject-introspection</ulink>
@@ -289,8 +280,8 @@ How to compile GTK+ itself
       <literal>make install</literal> mentioned above. If you're
       lucky, this will all go smoothly, and you'll be ready to
       <link linkend="gtk-compiling">start compiling your own GTK+
-        applications</link>. You can test your GTK+ installation
-      by running the <command>gtk-demo</command> program that
+      applications</link>. You can test your GTK+ installation
+      by running the <command>gtk3-demo</command> program that
       GTK+ installs.
     </para>
     <para>
@@ -318,49 +309,76 @@ How to compile GTK+ itself
 
         <cmdsynopsis>
           <command>configure</command>
-
+          <sbr/>
           <group>
             <arg>--disable-modules</arg>
             <arg>--enable-modules</arg>
           </group>
+          <sbr/>
           <group>
             <arg>--with-included-immodules=MODULE1,MODULE2,...</arg>
           </group>
+          <sbr/>
           <group>
-            <arg>--enable-debug=[no|minimum|yes]</arg>
+            <arg>--enable-debug=[no/minimum/yes]</arg>
           </group>
+          <sbr/>
           <group>
             <arg>--disable-Bsymbolic</arg>
             <arg>--enable-Bsymbolic</arg>
           </group>
+          <sbr/>
           <group>
             <arg>--disable-xkb</arg>
             <arg>--enable-xkb</arg>
           </group>
+          <sbr/>
           <group>
             <arg>--disable-xinerama</arg>
             <arg>--enable-xinerama</arg>
           </group>
+          <sbr/>
           <group>
             <arg>--disable-gtk-doc</arg>
             <arg>--enable-gtk-doc</arg>
           </group>
+          <sbr/>
           <group>
             <arg>--disable-cups</arg>
             <arg>--enable-cups</arg>
           </group>
+          <sbr/>
           <group>
             <arg>--disable-papi</arg>
             <arg>--enable-papi</arg>
           </group>
+          <sbr/>
           <group>
-            <arg>--with-xinput=[no|yes]</arg>
+            <arg>--enable-xinput</arg>
+            <arg>--disable-xinput</arg>
           </group>
+          <sbr/>
           <group>
-            <arg>--with-gdktarget=[x11|win32|quartz]</arg>
+            <arg>--enable-packagekit</arg>
+            <arg>--disable-packagekit</arg>
           </group>
+          <sbr/>
           <group>
-            <arg>--disable-introspection</arg>
+            <arg>--enable-x11-backend</arg>
+            <arg>--disable-x11-backend</arg>
+            <arg>--enable-win32-backend</arg>
+            <arg>--disable-win32-backend</arg>
+            <arg>--enable-quartz-backend</arg>
+            <arg>--disable-quartz-backend</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg>--enable-introspection=[no/auto/yes]</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg>--enable-gtk2-dependency</arg>
+            <arg>--disable-gtk2-dependency</arg>
           </group>
         </cmdsynopsis>
       </para>
@@ -371,14 +389,14 @@ How to compile GTK+ itself
 
         <para>
           Normally GTK+ will try to build the input method modules
-          as little shared libraries that are loaded on
-          demand.  The <systemitem>--disable-modules</systemitem>
-          argument indicates that they should all be built statically
-          into the GTK+ library instead.  This is useful for
-          people who need to produce statically-linked binaries.  If
-          neither <systemitem>--disable-modules</systemitem> nor
-          <systemitem>--enable-modules</systemitem> is specified, then
-          the <command>configure</command> script will try to
+          as little shared libraries that are loaded on demand.
+          The <systemitem>--disable-modules</systemitem> argument
+          indicates that they should all be built statically
+          into the GTK+ library instead. This is useful for
+          people who need to produce statically-linked binaries.
+          If neither <systemitem>--disable-modules</systemitem> nor
+          <systemitem>--enable-modules</systemitem> is specified,
+          then the <command>configure</command> script will try to
           auto-detect whether shared modules work on your system.
         </para>
       </formalpara>
@@ -388,7 +406,8 @@ How to compile GTK+ itself
 
         <para>
          This option allows you to specify which input method modules you
-         want to include.
+         want to include directly into the GTK+ shared library, as opposed
+         to building them as loadable modules.
         </para>
       </formalpara>
 
@@ -396,10 +415,9 @@ How to compile GTK+ itself
         <title><systemitem>--enable-debug</systemitem></title>
 
         <para>
-         Turns on various amounts of debugging support. Setting this to 'no'
-         disables g_assert(), g_return_if_fail(), g_return_val_if_fail() and
-         all cast checks between different object types. Setting it to 'minimum'
-         disables only cast checks. Setting it to 'yes' enables
+         Turns on various amounts of debugging support. Setting this to
+         'no' disables g_assert(), g_return_if_fail(), g_return_val_if_fail()           and all cast checks between different object types. Setting it
+         to 'minimum' disables only cast checks. Setting it to 'yes' enables
          <link linkend="GTK-Debug-Options">runtime debugging</link>.
          The default is 'minimum'.
          Note that 'no' is fast, but dangerous as it tends to destabilize
@@ -416,6 +434,8 @@ How to compile GTK+ itself
         <para>
           The option <systemitem>--disable-Bsymbolic</systemitem>
           turns off the use of the -Bsymbolic-functions linker flag.
+          This is only necessary if you want to override GTK+ functions
+          by using <envar>LD_PRELOAD</envar>.
         </para>
       </formalpara>
 
@@ -469,6 +489,21 @@ How to compile GTK+ itself
         </para>
       </formalpara>
 
+      <formalpara>
+        <title><systemitem>--disable-xinput</systemitem> and
+           <systemitem>--enable-xinput</systemitem></title>
+        <para>
+          Controls whether GTK+ is built with support for the XInput
+          or XInput2 extension. These extensions provide an extended
+          interface to input devices such as graphics tablets.
+          When this support is compiled in, specially written
+          GTK+ programs can get access to subpixel positions,
+          multiple simultaneous input devices, and extra "axes"
+          provided by the device such as pressure and tilt
+          information.
+        </para>
+      </formalpara>
+
       <formalpara>
         <title><systemitem>--disable-gtk-doc</systemitem> and
           <systemitem>--enable-gtk-doc</systemitem></title>
@@ -513,33 +548,54 @@ How to compile GTK+ itself
       </formalpara>
 
       <formalpara>
-        <title><systemitem>--with-xinput</systemitem></title>
+        <title><systemitem>--disable-packagekit</systemitem> and
+           <systemitem>--enable-packagekit</systemitem></title>
         <para>
-          Controls whether GTK+ is built with support for the XInput
-          or XInput2 extension. These extensions provide an extended
-          interface to input devices such as graphics tablets.
-          When this support is compiled in, specially written
-          GTK+ programs can get access to subpixel positions,
-          multiple simultaneous input devices, and extra "axes"
-          provided by the device such as pressure and tilt
-          information.
+          By default the <command>configure</command> script will try
+          to build the PackageKit support for the open-with dialog if
+          the PackageKit libraries are found.
+          These options can be used to explicitly control whether
+          PackageKit support should be built.
         </para>
       </formalpara>
+
       <formalpara>
-        <title><systemitem>--with-gdktarget</systemitem></title>
+        <title><systemitem>--enable-x11-backend</systemitem>,
+          <systemitem>--disable-x11-backend</systemitem>,
+          <systemitem>--enable-win32-backend</systemitem>,
+          <systemitem>--disable-win32-backend</systemitem>,
+          <systemitem>--enable-quartz-backend</systemitem>,
+          and <systemitem>--disable-quartz-backend</systemitem></title>
 
         <para>
-          Toggles between the supported backends for GDK.
-          The default is x11, unless the platform is Windows, in which
-          case the default is win32. Other supported backends are
-          the quartz backend for OS X.
+          Enables specific backends for GDK.  If none of these options
+          are given, the x11 backend will be enabled by default,
+          unless the platform is Windows, in which case the default is
+          win32.  If any backend is explicitly enabled or disabled, no
+          other platform will be enabled automatically.  Other
+          supported backends are the quartz backend for OS X.
         </para>
       </formalpara>
+
       <formalpara>
-        <title><systemitem>--disable-introspection</systemitem></title>
+        <title><systemitem>--enable-introspection</systemitem></title>
 
         <para>
-          Build without introspection support.
+          Build with or without introspection support.
+          The default is 'auto'.
+        </para>
+      </formalpara>
+
+      <formalpara>
+        <title><systemitem>--enable-gtk2-dependency</systemitem> or
+           <systemitem>--disable-gtk2-dependency</systemitem></title>
+
+        <para>
+          Whether to rely on an exiting gtk-update-icon-cache utility
+          instead of building our own. Distributions which are shipping
+          both GTK+ 2.x and GTK+ 3 may want to use this option to
+          avoid file conflicts between these packages.
+          The default is to build gtk-update-icon-cache.
         </para>
       </formalpara>
     </refsect1>

docs/reference/gtk/compiling.sgml

@@ -2,7 +2,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
-<refentry id="gtk-compiling" revision="4 Feb 2001">
+<refentry id="gtk-compiling">
 <refmeta>
 <refentrytitle>Compiling GTK+ Applications</refentrytitle>
 <manvolnum>3</manvolnum>
@@ -32,7 +32,7 @@ your system may be different):
 $ pkg-config --cflags gtk+-3.0
  -pthread -I/usr/include/gtk-3.0 -I/usr/lib64/gtk-3.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12
 $ pkg-config --libs gtk+-3.0
- -pthread -lgtk-x11-3.0 -lgdk-x11-3.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-3.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
+ -pthread -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
 </programlisting>
 </para>
 <para>
@@ -69,24 +69,34 @@ define the preprocessor symbol GDK_MULTIDEVICE_SAFE by using the command
 line option <literal>-DGTK_MULTIDEVICE_SAFE=1</literal>.
 </para>
 
-<para>
-The recommended way of using GTK+ has always been to only include the
-toplevel headers <filename>gtk.h</filename>, <filename>gdk.h</filename>,
-<filename>gdk-pixbuf.h</filename>.
-If you want to make sure that your program follows this recommended
-practise, you can define the preprocessor symbols GTK_DISABLE_SINGLE_INCLUDES
-and GDK_PIXBUF_DISABLE_SINGLE_INCLUDES to make GTK+ generate an error
-when individual headers are directly included.
-There are some exceptions: <filename>gdkkeysyms.h</filename> is not included in
-<filename>gdk.h</filename> because the file is quite large; see
-<link linkend="gdk-Keyboard-Handling">Key Values documentation</link>.
-<filename>gdkx.h</filename> must be included independently because It's
-platform-specific; see
-<link linkend="gdk-X-Window-System-Interaction">X Window System Interaction</link>
-documentation.
-The same for <filename>gtkunixprint.h</filename> if you use the non-portable
-<link linkend="GtkPrintUnixDialog">GtkPrintUnixDialog</link> API.
-</para>
+  <refsect2>
+    <title>Useful autotools macros</title>
+
+    <para>
+      GTK+ provides various macros for easily checking version and backends
+      supported. The macros are
+      <variablelist>
+        <varlistentry>
+          <term>AM_PATH_GTK_3_0([minimum-version], [if-found], [if-not-found], [modules])</term>
+          <listitem>This macro should be used to check that GTK+ is installed
+          and available for compilation. The four arguments are optional, and
+          they are: <emphasis>minimum-version</emphasis>, the minimum version
+          of GTK+ required for compilation; <emphasis>if-found</emphasis>, the
+          action to perform if a valid version of GTK+ has been found;
+          <emphasis>if-not-found</emphasis>, the action to perform if a valid
+          version of GTK+ has not been found; <emphasis>modules</emphasis>, a
+          list of modules to be checked along with GTK+.</listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>GTK_CHECK_BACKEND([backend-name], [minimum-version], [if-found], [if-not-found])</term>
+          <listitem>This macro should be used to check if a specific backend
+          is supported by GTK+. The <emphasis>minimum-version</emphasis>,
+          <emphasis>if-found</emphasis> and <emphasis>if-not-found</emphasis>
+          arguments are optional.</listitem>
+        </varlistentry>
+      </variablelist>
+    </para>
+  </refsect2>
 
 </refsect1>
 </refentry>

docs/reference/gtk/getting_started.xml

@@ -12,97 +12,226 @@
   <link linkend="gtk-compiling">Compiling the GTK+ libraries</link>
   section in this reference.</para>
 
-  <para>To begin our introduction to GTK, we'll start with the simplest
-  program possible. This program will create an empty 200x200 pixel
-  window:</para>
+  <simplesect>
+    <title>Basics</title>
 
-  <para>
-    <inlinegraphic fileref="window-default.png" format="PNG"></inlinegraphic>
-  </para>
+    <para>To begin our introduction to GTK, we'll start with the simplest
+    program possible. This program will create an empty 200x200 pixel
+    window:</para>
 
-  <informalexample><programlisting>
-    <xi:include href="../../../../examples/window-default.c" parse="text">
-      <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
-    </xi:include>
-  </programlisting></informalexample>
+    <para>
+      <inlinegraphic fileref="window-default.png" format="PNG"></inlinegraphic>
+    </para>
 
-  <para>You can compile the program above with GCC using:</para>
-
-  <para><literallayout>
-    <literal>gcc `pkg-config --cflags gtk+-3.0` -o window-default window-default.c `pkg-config --libs gtk+-3.0`</literal>
-  </literallayout></para>
-
-  <note><para>For more information on how to compile a GTK+ application, please
-  refer to the <link linkend="gtk-compiling">Compiling GTK+ Applications</link>
-  section in this reference.</para></note>
-
-  <para>All GTK+ applications will, of course, include
-  <filename>gtk/gtk.h</filename>, which declares functions, types and
-  macros required by GTK+ applications.</para>
-
-  <warning><para>Even if GTK+ installs multiple header files, only the
-  top-level <filename>gtk/gtk.h</filename> header can be directly included
-  by third party code. The compiler will abort with an error if any other
-  header will be included.</para></warning>
-
-  <para>We then proceed into the <function>main</function>() function of the
-  application, and we declare a <varname>window</varname> variable as a pointer
-  of type #GtkWidget.</para>
-
-  <para>The following line will call gtk_init(), which
-  is the initialization function for GTK+; this function will set up GTK+,
-  the type system, the connection to the windowing environment, etc. The
-  gtk_init() takes as arguments the pointers to the command line arguments
-  counter and string array; this allows GTK+ to parse specific command line
-  arguments that control the behavior of GTK+ itself. The parsed arguments
-  will be removed from the array, leaving the unrecognized ones for your
-  application to parse.</para>
-
-  <note><para>For more information on which command line arguments GTK+
-  recognizes, please refer to the <link linkend="gtk-running">Running GTK+
-  Applications</link> section in this reference.</para></note>
-
-  <para>The call to gtk_window_new() will create a new #GtkWindow and store
-  it inside the <varname>window</varname> variable. The type of the window
-  is %GTK_WINDOW_TOPLEVEL, which means that the #GtkWindow will be managed
-  by the windowing system: it will have a frame, a title bar and window
-  controls, depending on the platform.</para>
-
-  <para>In order to terminate the application when the #GtkWindow is
-  destroyed, we connect the #GtkWidget::destroy signal to the gtk_main_quit()
-  function. This function will terminate the GTK+ main loop started by calling
-  gtk_main() later. The #GtkWidget::destroy signal is emitted when a widget is
-  destroyed, either by explicitly calling gtk_widget_destroy() or when the
-  widget is unparented. Top-level #GtkWindow<!-- -->s are also destroyed when
-  the Close window control button is clicked.</para>
-
-  <para>#GtkWidget<!-- -->s are hidden by default. By calling gtk_widget_show()
-  on a #GtkWidget we are asking GTK+ to set the visibility attribute so that it
-  can be displayed. All this work is done after the main loop has been
-  started.</para>
-
-  <para>The last line of interest is the call to gtk_main(). This function will
-  start the GTK+ main loop and will block the control flow of the
-  <function>main</function>() until the gtk_main_quit() function is
-  called.</para>
-
-  <para>The following example is slightly more complex, and tries to
-  showcase some of the capabilities of GTK+.</para>
-
-  <para>In the long tradition of programming languages and libraries,
-  it is called <emphasis>Hello, World</emphasis>.</para>
-
-  <para>
-    <inlinegraphic fileref="hello-world.png" format="PNG"></inlinegraphic>
-  </para>
-
-  <example id="gtk-getting-started-hello-world">
-    <title>Hello World in GTK+</title>
-    <programlisting>
-      <xi:include href="../../../../examples/hello-world.c" parse="text">
+    <informalexample><programlisting>
+      <xi:include href="../../../../examples/window-default.c" parse="text">
         <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
       </xi:include>
-    </programlisting>
-  </example>
+    </programlisting></informalexample>
 
+    <para>You can compile the program above with GCC using:</para>
+
+    <para><literallayout>
+      <literal>gcc `pkg-config --cflags gtk+-3.0` -o window-default window-default.c `pkg-config --libs gtk+-3.0`</literal>
+    </literallayout></para>
+
+    <note><para>For more information on how to compile a GTK+ application, please
+    refer to the <link linkend="gtk-compiling">Compiling GTK+ Applications</link>
+    section in this reference.</para></note>
+
+    <para>All GTK+ applications will, of course, include
+    <filename>gtk/gtk.h</filename>, which declares functions, types and
+    macros required by GTK+ applications.</para>
+
+    <warning><para>Even if GTK+ installs multiple header files, only the
+    top-level <filename>gtk/gtk.h</filename> header can be directly included
+    by third party code. The compiler will abort with an error if any other
+    header is directly included.</para></warning>
+
+    <para>We then proceed into the <function>main</function>() function of the
+    application, and we declare a <varname>window</varname> variable as a pointer
+    of type #GtkWidget.</para>
+
+    <para>The following line will call gtk_init(), which
+    is the initialization function for GTK+; this function will set up GTK+,
+    the type system, the connection to the windowing environment, etc. The
+    gtk_init() takes as arguments the pointers to the command line arguments
+    counter and string array; this allows GTK+ to parse specific command line
+    arguments that control the behavior of GTK+ itself. The parsed arguments
+    will be removed from the array, leaving the unrecognized ones for your
+    application to parse.</para>
+
+    <note><para>For more information on which command line arguments GTK+
+    recognizes, please refer to the <link linkend="gtk-running">Running GTK+
+    Applications</link> section in this reference.</para></note>
+
+    <para>The call to gtk_window_new() will create a new #GtkWindow and store
+    it inside the <varname>window</varname> variable. The type of the window
+    is %GTK_WINDOW_TOPLEVEL, which means that the #GtkWindow will be managed
+    by the windowing system: it will have a frame, a title bar and window
+    controls, depending on the platform.</para>
+
+    <para>In order to terminate the application when the #GtkWindow is
+    destroyed, we connect the #GtkWidget::destroy signal to the gtk_main_quit()
+    function. This function will terminate the GTK+ main loop started by calling
+    gtk_main() later. The #GtkWidget::destroy signal is emitted when a widget is
+    destroyed, either by explicitly calling gtk_widget_destroy() or when the
+    widget is unparented. Top-level #GtkWindow<!-- -->s are also destroyed when
+    the Close window control button is clicked.</para>
+
+    <para>#GtkWidget<!-- -->s are hidden by default. By calling gtk_widget_show()
+    on a #GtkWidget we are asking GTK+ to set the visibility attribute so that it
+    can be displayed. All this work is done after the main loop has been
+    started.</para>
+
+    <para>The last line of interest is the call to gtk_main(). This function will
+    start the GTK+ main loop and will block the control flow of the
+    main() until the gtk_main_quit() function is called.</para>
+
+    <para>While the program is running, GTK+ is receiving
+    <firstterm>events</firstterm>. These are typically input events caused by
+    the user interacting with your program, but also things like messages from
+    the window manager or other applications. GTK+ processes these and as a
+    result, <firstterm>signals</firstterm> may be emitted on your widgets.
+    Connecting handlers for these signals is how you normally make your
+    program do something in response to user input.</para>
+
+    <para>The following example is slightly more complex, and tries to
+    showcase some of the capabilities of GTK+.</para>
+
+    <para>In the long tradition of programming languages and libraries,
+    it is called <emphasis>Hello, World</emphasis>.</para>
+
+    <para>
+      <inlinegraphic fileref="hello-world.png" format="PNG"></inlinegraphic>
+    </para>
+
+    <example id="gtk-getting-started-hello-world">
+      <title>Hello World in GTK+</title>
+      <programlisting>
+        <xi:include href="../../../../examples/hello-world.c" parse="text">
+          <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
+        </xi:include>
+      </programlisting>
+    </example>
+  </simplesect>
+
+  <simplesect>
+    <title>Packing</title>
+
+    <para>When creating an application, you'll want to put more than one widget
+    inside a window. Our first helloworld example only used one widget so we
+    could simply use a gtk_container_add() call to "pack" the widget into the
+    window. But when you want to put more than one widget into a window, it
+    it becomes important to control how each widget is positioned and sized.
+    This is where packing comes in.</para>
+
+    <para>GTK+ comes with a large variety of <firstterm>layout containers</firstterm>
+    whose purpose it is to control the layout of the child widgets that are
+    added to them. See <xref linkend="LayoutContainers"/> for an overview.</para>
+
+    <para>The following example shows how the GtkGrid container lets you
+    arrange several buttons:</para>
+
+    <para>
+      <inlinegraphic fileref="grid-packing.png" format="PNG"></inlinegraphic>
+    </para>
+
+    <example id="gtk-getting-started-grid-packing">
+      <title>Packing buttons</title>
+      <programlisting>
+        <xi:include href="../../../../examples/grid-packing.c" parse="text">
+          <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
+        </xi:include>
+      </programlisting>
+    </example>
+  </simplesect>
+
+  <simplesect>
+    <title>Drawing</title>
+
+    <para>Many widgets, like buttons, do all their drawing themselves. You
+    just tell them the label you want to see, and they figure out what font
+    to use, draw the button outline and focus rectangle, etc. Sometimes, it
+    is necessary to do some custom drawing. In that case, a #GtkDrawingArea
+    might be the right widget to use. It offers a canvas on which you can
+    draw by connecting to the #GtkWidget::draw signal.
+    </para>
+
+    <para>The contents of a widget often need to be partially or fully redrawn,
+    e.g. when another window is moved and uncovers part of the widget, or
+    when tie window containing it is resized. It is also possible to explicitly
+    cause part or all of the widget to be redrawn, by calling
+    gtk_widget_queue_draw() or its variants. GTK+ takes care of most of the
+    details by providing a ready-to-use cairo context to the ::draw signal
+    handler.</para>
+
+    <para>The following example shows a ::draw signal handler. It is a bit
+    more complicated than the previous examples, since it also demonstrates
+    input event handling by means of ::button-press and ::motion-notify
+    handlers.</para>
+
+    <para>
+      <inlinegraphic fileref="drawing.png" format="PNG"></inlinegraphic>
+    </para>
+
+    <example id="gtk-getting-started-drawing">
+      <title>Drawing in response to input</title>
+      <programlisting>
+        <xi:include href="../../../../examples/drawing.c" parse="text">
+          <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
+        </xi:include>
+      </programlisting>
+    </example>
+  </simplesect>
+
+  <simplesect>
+    <title>Building interfaces</title>
+
+    <para>When construcing a more complicated user interface, with dozens
+    or hundreds of widgets, doing all the setup work in C code is
+    cumbersome, and making changes becomes next to impossible.</para>
+
+    <para>Thankfully, GTK+ supports the separation of user interface
+    layout from your business logic, by using UI descriptions in an
+    XML format that can be parsed by the #GtkBuilder class.</para>
+
+    <example>
+      <title>Packing buttons with GtkBuilder</title>
+      <programlisting>
+        <xi:include href="../../../../examples/builder.c" parse="text">
+          <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
+        </xi:include>
+      </programlisting>
+      The builder.ui file looks like this:
+      <programlisting>
+        <xi:include href="../../../../examples/builder.ui" parse="text">
+          <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
+        </xi:include>
+      </programlisting>
+    </example>
+
+    <para>Note that GtkBuilder can also be used to construct objects
+    that are not widgets, such as tree models, adjustments, etc.
+    That is the reason the method we use here is called
+    gtk_builder_get_object() and returns a GObject* instead of a
+    GtkWidget*.</para>
+
+    <para>Normally, you would pass a full path to
+    gtk_builder_add_from_file() to make the execution of your program
+    independent of the current directory. A common location to install
+    UI descriptions and similar data is
+    <filename>/usr/share/<replaceable>appname</replaceable></filename>.
+    </para>
+
+    <para>It is also possible to embed the UI description in the source
+    code as a string and use gtk_builder_add_from_string() to load it.
+    But keeping the UI description in a separate file has several
+    advantages: It is then possible to make minor adjustments to the UI
+    without recompiling your program, and, more importantly, graphical
+    UI editors such as <ulink url="http://glade.gnome.org">glade</ulink>
+    can load the file and allow you to create and modify your UI by
+    point-and-click.</para>
+
+  </simplesect>
 </chapter>

docs/reference/gtk/gtk-builder-convert-3.0.xml

@@ -1,61 +0,0 @@
-<refentry id="gtk-builder-convert">
-
-<refmeta>
-<refentrytitle>gtk-builder-convert-3.0</refentrytitle>
-<manvolnum>1</manvolnum>
-</refmeta>
-
-<refnamediv>
-<refname>gtk-builder-convert-3.0</refname>
-<refpurpose>Glade file conversion utility</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-<command>gtk-builder-convert-3.0</command>
-<arg choice="opt">--skip-windows</arg>
-<arg choice="opt">--root <replaceable>name</replaceable></arg>
-<arg choice="req">input</arg>
-<arg choice="req">output</arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1><title>Description</title>
-<para><command>gtk-builder-convert-3.0</command> converts glade files
-into XML files which can be loaded with GtkBuilder.
-</para>
-<para>
-It expects the name of a glade file as the first argument, and writes
-its output the file specified as the second argument.
-</para>
-</refsect1>
-
-<refsect1><title>Options</title>
-<variablelist>
-  <varlistentry>
-    <term>--skip-windows</term>
-    <term>-w</term>
-    <listitem><para>Convert everything but GtkWindow subclasses.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>--root</term>
-    <term>-r</term>
-    <listitem><para>Convert only the widget named <replaceable>name</replaceable> 
-       and its children.</para></listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-<refsect1><title>Bugs</title>
-<para>
-Toolbars are not handled.
-</para>
-<para>
-Support for accessibility is not yet implemented.
-</para>
-<para>
-The script requires a python interpreter to run.
-</para>
-</refsect1>
-
-</refentry>

docs/reference/gtk/gtk-docs.sgml

@@ -3,14 +3,18 @@
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
 <!ENTITY version SYSTEM "version.xml">
+<!ENTITY pi "&#960;">
+<!ENTITY solidus "&#8260;">
 ]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
-    <title>GTK+ Reference Manual</title>
+    <title>GTK+ 3 Reference Manual</title>
     <releaseinfo>
-      for GTK+ &version;
-      The latest version of this documentation can be found on-line at
-      <ulink role="online-location" url="http://library.gnome.org/devel/gtk/unstable/">http://library.gnome.org/devel/gtk/unstable/</ulink>.
+      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>.
+      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>.
     </releaseinfo>
   </bookinfo>
 
@@ -38,19 +42,32 @@
     <xi:include href="xml/gtkaccelmap.xml" />
     <xi:include href="xml/gtkclipboard.xml" />
     <xi:include href="xml/gtkdnd.xml" />
-    <xi:include href="xml/gtkicontheme.xml" />
     <xi:include href="xml/gtkstock.xml" />
-    <xi:include href="xml/gtkiconfactory.xml" />
-    <xi:include href="xml/gtkrc.xml" />
     <xi:include href="xml/gtksettings.xml" />
     <xi:include href="xml/gtkbindings.xml" />
     <xi:include href="xml/gtkenums.xml" />
-    <xi:include href="xml/gtkstyle.xml" />
     <xi:include href="xml/gtkselection.xml" />
     <xi:include href="xml/gtktesting.xml" />
     <xi:include href="xml/filesystem.xml" />
   </part>
 
+  <part id="theming">
+    <title>Theming in GTK+</title>
+    <xi:include href="xml/gtkstylecontext.xml" />
+    <xi:include href="xml/gtkcssprovider.xml" />
+    <xi:include href="xml/gtkstyleprovider.xml" />
+    <xi:include href="xml/gtkstyleproperties.xml" />
+    <xi:include href="xml/gtkthemingengine.xml" />
+    <xi:include href="xml/gtkwidgetpath.xml" />
+    <xi:include href="xml/gtksymboliccolor.xml" />
+    <xi:include href="xml/gtkgradient.xml" />
+    <xi:include href="xml/gtkicontheme.xml" />
+    <xi:include href="xml/gtkiconfactory.xml" />
+    <xi:include href="xml/gtknumerableicon.xml" />
+    <xi:include href="xml/gtkrc.xml" />
+    <xi:include href="xml/gtkstyle.xml" />
+  </part>
+
   <part id="gtkobjects">
     <title>GTK+ Widgets and Objects</title>
 
@@ -137,6 +154,9 @@
       <xi:include href="xml/gtktreemodelsort.xml" />
       <xi:include href="xml/gtktreemodelfilter.xml" />
       <xi:include href="xml/gtkcelllayout.xml" />
+      <xi:include href="xml/gtkcellarea.xml" />
+      <xi:include href="xml/gtkcellareabox.xml" />
+      <xi:include href="xml/gtkcellareacontext.xml" />
       <xi:include href="xml/gtkcellrenderer.xml" />
       <xi:include href="xml/gtkcelleditable.xml" />
       <xi:include href="xml/gtkcellrendereraccel.xml" />
@@ -297,6 +317,14 @@
       <xi:include href="xml/gtkrecentfilter.xml" />
     </chapter>
 
+    <chapter id="ApplicationChoosing">
+      <title>Choosing from installed applications</title>
+      <xi:include href="xml/gtkappchooser.xml" />
+      <xi:include href="xml/gtkappchooserbutton.xml" />
+      <xi:include href="xml/gtkappchooserdialog.xml" />
+      <xi:include href="xml/gtkappchooserwidget.xml" />
+    </chapter>
+
     <chapter id="Builder">
       <title>Interface builder</title>
       <xi:include href="xml/gtkbuildable.xml" />
@@ -325,13 +353,13 @@
     <xi:include href="xml/migrating-checklist.sgml" />
     <xi:include href="xml/migrating-2to3.xml" />
     <xi:include href="xml/migrating-GtkApplication.xml" />
+    <xi:include href="xml/migrating-GtkStyleContext.xml" />
   </part>
 
   <part>
     <title>GTK+ Tools</title>
     <xi:include href="gtk-query-immodules-3.0.xml" />
-    <xi:include href="gtk-update-icon-cache-3.0.xml" />
-    <xi:include href="gtk-builder-convert-3.0.xml" />
+    <xi:include href="gtk-update-icon-cache.xml" />
   </part>
 
   <xi:include href="glossary.xml" />

docs/reference/gtk/gtk-query-immodules-3.0.xml

@@ -2,16 +2,17 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
-<refentry id="gtk-query-immodules">
+<refentry id="gtk-query-immodules-3.0">
 
 <refmeta>
-<refentrytitle>gtk-query-immodules-3.0</refentrytitle>
-<manvolnum>1</manvolnum>
+  <refentrytitle>gtk-query-immodules-3.0</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="manual">User Commands</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>gtk-query-immodules-3.0</refname>
-<refpurpose>Input method module registration utility</refpurpose>
+  <refname>gtk-query-immodules-3.0</refname>
+  <refpurpose>Input method module registration utility</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
@@ -38,8 +39,8 @@ may be absolute or relative paths.
 </para>
 <para>
 Normally, the output of <command>gtk-query-immodules-3.0</command> is written
-to <filename><replaceable>libdir</replaceable>gtk-3.0/3.0.0/immodules.cache</filename>, where GTK+ looks for it by default. If it is written to some other
-location, the environment variable <link linkend="GTK_IM_MODULE_FILE"><envar>GTK_IM_MODULE_FILE</envar></link>
+to <filename><replaceable>libdir</replaceable>/gtk-3.0/3.0.0/immodules.cache</filename>, where GTK+ looks for it by default. If it is written to some other
+location, the environment variable <link linkend="gtk-im-module-file"><envar>GTK_IM_MODULE_FILE</envar></link>
 can be set to point GTK+ at the file.
 </para>
 </refsect1>
@@ -56,7 +57,7 @@ can be set to point GTK+ at the file.
 
 <refsect1><title>Environment</title>
 <para>
-The environment variable <link linkend="GTK_PATH"><envar>GTK_PATH</envar></link>
+The environment variable <link linkend="gtk-path"><envar>GTK_PATH</envar></link>
 can be used to prepend directories to the input method module path.
 </para>
 </refsect1>

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

@@ -5,43 +5,45 @@
 <refentry id="gtk-update-icon-cache">
 
 <refmeta>
-<refentrytitle>gtk-update-icon-cache-3.0</refentrytitle>
-<manvolnum>1</manvolnum>
+  <refentrytitle>gtk-update-icon-cache</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="manual">User Commands</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>gtk-update-icon-cache-3.0</refname>
-<refpurpose>Icon theme caching utility</refpurpose>
+  <refname>gtk-update-icon-cache</refname>
+  <refpurpose>Icon theme caching utility</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>gtk-update-icon-cache-3.0</command>
+<command>gtk-update-icon-cache</command>
 <arg choice="opt">--force</arg>
 <arg choice="opt">--ignore-theme-index</arg>
 <arg choice="opt">--index-only</arg>
-<arg choice="opt">--source<arg>name</arg></arg>
+<arg choice="opt">--source <arg choice="plain"><replaceable>NAME</replaceable></arg></arg>
 <arg choice="opt">--quiet</arg>
 <arg choice="opt">--validate</arg>
-<arg choice="req">iconpath</arg>
+<arg choice="plain"><replaceable>PATH</replaceable></arg>
 </cmdsynopsis>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 <para>
-  <command>gtk-update-icon-cache-3.0</command> creates mmap()able cache
+  <command>gtk-update-icon-cache</command> creates mmapable cache
   files for icon themes.
 </para>
 <para>
-  It expects to be given the path to a icon theme directory containing an
-  <filename>index.theme</filename>, e.g. <filename>/usr/share/icons/hicolor</filename>,
-  and writes a <filename>icon-theme.cache</filename> containing cached
-  information about the icons in the directory tree below the given directory.
+  It expects to be given the <replaceable>PATH</replaceable> to a icon theme
+  directory containing an <filename>index.theme</filename>, e.g.
+  <filename>/usr/share/icons/hicolor</filename>, and writes a
+  <filename>icon-theme.cache</filename> containing cached information about
+  the icons in the directory tree below the given directory.
 </para>
 <para>
-  GTK+ can use the cache files created by <command>gtk-update-icon-cache-3.0</command>
+  GTK+ can use the cache files created by <command>gtk-update-icon-cache</command>
   to avoid a lot of system call and disk seek overhead when the application
-  starts. Since the format of the cache files allows them to be mmap()ed
+  starts. Since the format of the cache files allows them to be mmaped
   shared between multiple applications, the overall memory consumption is
   reduced as well.
 </para>
@@ -59,8 +61,8 @@
   <varlistentry>
     <term>--ignore-theme-index</term>
     <term>-t</term>
-    <listitem><para>Don't check for the existence of 'index.theme' in the icon
-     theme directory. Without this option, <command>gtk-update-icon-cache-3.0</command>
+    <listitem><para>Don't check for the existence of <filename>index.theme</filename>
+     in the icon theme directory. Without this option, <command>gtk-update-icon-cache</command>
      refuses to create an icon cache in a directory which does not appear to
      be the toplevel directory of an icon theme.
     </para></listitem>
@@ -77,7 +79,7 @@
     <term>--source</term>
     <term>-c</term>
     <listitem><para>Output a C header file declaring a constant
-     <replaceable>name</replaceable> with the contents of the icon
+     <replaceable>NAME</replaceable> with the contents of the icon
      cache.</para></listitem>
   </varlistentry>
 
@@ -104,5 +106,3 @@ None known yet.
 </refsect1>
 
 </refentry>
-
-

docs/reference/gtk/gtk3.types

@@ -1,4 +1,4 @@
-#include <gtk/gtk.h>
+#include <gtk/gtkx.h>
 #include <gtk/gtkunixprint.h>
 
 gtk_about_dialog_get_type
@@ -11,6 +11,10 @@ gtk_action_group_get_type
 gtk_activatable_get_type
 gtk_adjustment_get_type
 gtk_alignment_get_type
+gtk_app_chooser_get_type
+gtk_app_chooser_button_get_type
+gtk_app_chooser_dialog_get_type
+gtk_app_chooser_widget_get_type
 gtk_application_get_type
 gtk_arrow_get_type
 gtk_aspect_frame_get_type
@@ -22,6 +26,9 @@ gtk_buildable_get_type
 gtk_button_box_get_type
 gtk_button_get_type
 gtk_calendar_get_type
+gtk_cell_area_get_type
+gtk_cell_area_box_get_type
+gtk_cell_area_context_get_type
 gtk_cell_editable_get_type
 gtk_cell_layout_get_type
 gtk_cell_renderer_accel_get_type
@@ -43,6 +50,7 @@ gtk_color_selection_get_type
 gtk_combo_box_get_type
 gtk_combo_box_text_get_type
 gtk_container_get_type
+gtk_css_provider_get_type
 gtk_dialog_get_type
 gtk_drawing_area_get_type
 gtk_editable_get_type
@@ -93,6 +101,7 @@ gtk_message_dialog_get_type
 gtk_misc_get_type
 gtk_mount_operation_get_type
 gtk_notebook_get_type
+gtk_numerable_icon_get_type
 gtk_offscreen_window_get_type
 gtk_orientable_get_type
 gtk_page_setup_get_type
@@ -137,6 +146,8 @@ gtk_statusbar_get_type
 gtk_status_icon_get_type
 gtk_switch_get_type
 gtk_style_get_type
+gtk_style_context_get_type
+gtk_style_provider_get_type
 gtk_table_get_type
 gtk_tearoff_menu_item_get_type
 gtk_text_buffer_get_type
@@ -146,6 +157,7 @@ gtk_text_mark_get_type
 gtk_text_tag_get_type
 gtk_text_tag_table_get_type
 gtk_text_view_get_type
+gtk_theming_engine_get_type
 gtk_toggle_action_get_type
 gtk_toggle_button_get_type
 gtk_toggle_tool_button_get_type

docs/reference/gtk/migrating-2to3.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
 ]>
 <chapter id="gtk-migrating-2-to-3">
   <title>Migrating from GTK+ 2.x to GTK+ 3</title>
@@ -99,10 +100,11 @@
   </para>
   <para>
     To ensure that your application does not have problems with this, you
-    define the preprocessor symbol <literal>GSEAL_ENABLE</literal>. This
-    will make the compiler catch all uses of direct access to struct fields
-    so that you can go through them one by one and replace them with a call
-    to an accessor function instead.
+    define the preprocessor symbol <literal>GSEAL_ENABLE</literal> while
+    building your application against GTK+ 2.x. This will make the compiler
+    catch all uses of direct access to struct fields so that you can go
+    through them one by one and replace them with a call to an accessor
+    function instead.
     <programlisting>
     make CFLAGS+="-DGSEAL_ENABLE"
     </programlisting>
@@ -122,6 +124,57 @@
 
   </section>
 
+  <section>
+    <title>Use GIO for launching applications</title>
+    <para>
+      The <literal>gdk_spawn</literal> family of functions has been
+      deprecated in GDK 2.24 and removed from GDK 3. Various replacements
+      exist; the best replacement depends on the circumstances:
+      <itemizedlist>
+        <listitem>If you are opening a document or URI by launching a command
+        like <literal>firefox http://my-favourite-website.com</literal> or
+        <literal>gnome-open ghelp:epiphany</literal>, it is best to just use
+        gtk_show_uri(); as an added benefit, your application will henceforth
+        respect the users preference for what application to use.</listitem>
+        <listitem>If you are launching a regular, installed application that
+        has a desktop file, it is best to use GIOs #GAppInfo with a suitable
+        launch context.
+        <informalexample><programlisting>
+        GAppInfo *info;
+        GAppLaunchContext *context;
+        GError *error = NULL;
+
+        info = (GAppInfo*) g_desktop_app_info_new ("epiphany.desktop");
+        context = (GAppLaunchContext*) gdk_display_get_app_launch_context (display);
+        g_app_info_launch (info, NULL, context, &amp;error);
+
+        if (error)
+          {
+            g_warning ("Failed to launch epiphany: %s", error-&gt;message);
+            g_error_free (error);
+          }
+
+        g_object_unref (info);
+        g_object_unref (context);
+        </programlisting></informalexample>
+        Remember that you have to include
+        <filename>gio/gdesktopappinfo.h</filename>
+        and use the <filename>gio-unix-2.0</filename> pkg-config file
+        when using g_desktop_app_info_new().
+        </listitem>
+        <listitem>If you are launching a custom commandline, you can
+        still use g_app_info_launch() with a GAppInfo that is constructed
+        with g_app_info_create_from_commandline(), or you can use the
+        more lowlevel <literal>g_spawn</literal> family of functions
+        (e.g. g_spawn_command_line_async()), and pass <envar>DISPLAY</envar>
+        in the environment. gdk_screen_make_display_name() can be
+        used to find the right value for the <envar>DISPLAY</envar>
+        environment variable.
+        </listitem>
+      </itemizedlist>
+    </para>
+  </section>
+
   <section>
     <title>Use cairo for drawing</title>
     <para>
@@ -134,7 +187,7 @@
       them, are gone. This includes the <literal>gdk_draw</literal> family
       of functions like gdk_draw_rectangle() and gdk_draw_drawable(). As
       #GdkGC is roughly equivalent to #cairo_t and #GdkImage was used for
-      drawing images to GdkDrawables, which cairo supports automatically,
+      drawing images to GdkWindows, which cairo supports automatically,
       a transition is usually straightforward.
     </para>
     <para>
@@ -143,10 +196,10 @@
       was replaced.
     </para>
     <example>
-       <title>Drawing a GdkPixbuf onto a GdkDrawable</title>
+       <title>Drawing a GdkPixbuf onto a GdkWindow</title>
          <para>
            Drawing a pixbuf onto a drawable used to be done like this:
-<programlisting><![CDATA[
+           <informalexample><programlisting>
 gdk_draw_pixbuf (window,
                  gtk_widget_get_style (widget)->black_gc,
                  pixbuf,
@@ -156,25 +209,26 @@ gdk_draw_pixbuf (window,
                  gdk_pixbuf_get_height (pixbuf),
                  GDK_RGB_DITHER_NORMAL,
                  0, 0);
-]]></programlisting>
+           </programlisting></informalexample>
            Doing the same thing with cairo:
-<programlisting><![CDATA[
+           <informalexample><programlisting>
 cairo_t *cr = gdk_cairo_create (window);
 gdk_cairo_set_source_pixbuf (cr, pixbuf, x, y);
 cairo_paint (cr);
 cairo_destroy (cr);
-]]></programlisting>
-           Note that very similar code can be used for drawing pixmaps
-           by using gdk_cairo_set_source_pixmap() instead of
+           </programlisting></informalexample>
+           Note that very similar code can be used when porting code
+           using GdkPixmap to #cairo_surface_t by calling
+           cairo_set_source_surface() instead of
            gdk_cairo_set_source_pixbuf().
          </para>
       </example>
       <example>
-        <title>Drawing a tiled GdkPixmap to a GdkDrawable</title>
+        <title>Drawing a tiled GdkPixmap to a GdkWindow</title>
         <para>
           Tiled pixmaps are often used for drawing backgrounds.
           Old code looked something like this:
-          <programlisting><![CDATA[
+          <informalexample><programlisting>
 GdkGCValues gc_values;
 GdkGC *gc;
 
@@ -184,26 +238,30 @@ gdk_gc_set_tile (gc, pixmap);
 gdk_gc_set_fill (gc, GDK_TILED);
 gdk_gc_set_ts_origin (gc, x_origin, y_origin);
 /* use */
-gdk_draw_rectangle (drawable, gc, TRUE, 0, 0, width, height);
+gdk_draw_rectangle (window, gc, TRUE, 0, 0, width, height);
 /* restore */
 gdk_gc_set_tile (gc, NULL);
 gdk_gc_set_fill (gc, GDK_SOLID);
 gdk_gc_set_ts_origin (gc, 0, 0);
-]]></programlisting>
-          The equivalent cairo code looks like this:
-<programlisting><![CDATA[
+          </programlisting></informalexample>
+          The equivalent cairo code to draw a tiled surface looks
+          like this:
+          <informalexample><programlisting>
 cairo_t *cr;
+cairo_surface_t *surface;
 
-cr = gdk_cairo_create (drawable);
-gdk_cairo_set_source_pixmap (cr, pixmap, x_origin, y_origin);
+surface = ...
+cr = gdk_cairo_create (window);
+cairo_set_source_surface (cr, surface, x_origin, y_origin);
 cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
 cairo_rectangle (cr, 0, 0, width, height);
 cairo_fill (cr);
 cairo_destroy (cr);
-]]></programlisting>
-          Again, you can exchange pixbufs and pixmaps by using
-          gdk_cairo_set_source_pixbuf() instead of
-          gdk_cairo_set_source_pixmap().
+          </programlisting></informalexample>
+The surface here can be either an image surface or a X surface,
+and can either be created on the spot or kept around for caching purposes.
+Another alternative is to use pixbufs instead of surfaces with
+gdk_cairo_set_source_pixbuf() instead of cairo_set_source_surface().
         </para>
       </example>
       <example>
@@ -211,32 +269,38 @@ cairo_destroy (cr);
         <para>
           Drawing layouts clipped is often used to avoid overdraw or to
           allow drawing selections. Code would have looked like this:
-<programlisting><![CDATA[
+	  <informalexample><programlisting>
 GdkGC *gc;
 
 /* setup */
 gc = gtk_widget_get_style (widget)->text_gc[state];
-gdk_gc_set_clip_rectangle (gc, &area);
+gdk_gc_set_clip_rectangle (gc, &amp;area);
 /* use */
 gdk_draw_layout (drawable, gc, x, y, layout);
 /* restore */
 gdk_gc_set_clip_rectangle (gc, NULL);
-]]></programlisting>
+          </programlisting></informalexample>
           With cairo, the same effect can be achieved using:
-<programlisting><![CDATA[
+          <informalexample><programlisting>
+GtkStyleContext *context;
+GtkStateFlags flags;
+GdkRGBA rgba;
 cairo_t *cr;
 
 cr = gdk_cairo_create (drawable);
 /* clip */
-gdk_cairo_rectangle (cr, &area);
+gdk_cairo_rectangle (cr, &amp;area);
 cairo_clip (cr);
 /* set the correct source color */
-gdk_cairo_set_source_color (cr, &gtk_widget_get_style (widget)->text[state]);
+context = gtk_widget_get_style_context (widget));
+state = gtk_widget_get_state_flags (widget);
+gtk_style_context_get_color (context, state, &amp;rgba);
+gdk_cairo_set_source_rgba (cr, &amp;rgba);
 /* draw the text */
 cairo_move_to (cr, x, y);
 pango_cairo_show_layout (cr, layout);
 cairo_destroy (cr);
-]]></programlisting>
+          </programlisting></informalexample>
           Clipping using cairo_clip() is of course not restricted to text
           rendering and can be used everywhere where GC clips were used.
           And using gdk_cairo_set_source_color() with style colors should
@@ -252,7 +316,7 @@ cairo_destroy (cr);
           It was often used to achieve a checkerboard effect. You can use
           cairo_mask() to achieve this effect. To get a checkerbox mask,
           you can use code like this:
-<programlisting><![CDATA[
+          <informalexample><programlisting>
 static cairo_pattern_t *
 gtk_color_button_get_checkered (void)
 {
@@ -273,44 +337,50 @@ gtk_color_button_get_checkered (void)
 
     return pattern;
 }
-]]></programlisting>
+          </programlisting></informalexample>
           Note that stippling looks very outdated in UIs, and is rarely
           used in modern applications. All properties that made use of
           stippling have been removed from GTK+ 3. Most prominently,
           stippling is absent from text rendering, in particular #GtkTextTag.
         </para>
       </formalpara>
-      <formalpara><title>Using the the target drawable also as source or mask</title>
+      <formalpara><title>Using the target also as source or mask</title>
         <para>
           The gdk_draw_drawable() function allowed using the same drawable
           as source and target. This was often used to achieve a scrolling
           effect. Cairo does not allow this yet. You can however use
           cairo_push_group() to get a different intermediate target that
           you can copy to. So you can replace this code:
-<programlisting><![CDATA[
+          <informalexample><programlisting>
 gdk_draw_drawable (pixmap,
                    gc,
                    pixmap,
                    area.x + dx, area.y + dy,
                    area.x, area.y,
                    area.width, area.height);
-]]></programlisting>
+          </programlisting></informalexample>
           By using this code:
-<programlisting><![CDATA[
-cairo_t *cr = gdk_cairo_create (pixmap);
+          <informalexample><programlisting>
+cairo_t *cr = cairo_create (surface);
 /* clipping restricts the intermediate surface's size, so it's a good idea
  * to use it. */
-gdk_cairo_rectangle (cr, &area);
+gdk_cairo_rectangle (cr, &amp;area);
 cairo_clip (cr);
 /* Now push a group to change the target */
 cairo_push_group (cr);
-gdk_cairo_set_source_pixmap (cr, pixmap, dx, dy);
+cairo_set_source_surface (cr, surface, dx, dy);
 cairo_paint (cr);
 /* Now copy the intermediate target back */
 cairo_pop_group_to_source (cr);
 cairo_paint (cr);
 cairo_destroy (cr);
-]]></programlisting>
+          </programlisting></informalexample>
+The surface here can be either an image surface or a X surface,
+and can either be created on the spot or kept around for caching purposes.
+Another alternative is to use pixbufs instead of surfaces with
+gdk_cairo_set_source_pixbuf() instead of cairo_set_source_surface().
+        </para>
+        <para>
           The cairo developers plan to add self-copies in the future to allow
           exactly this effect, so you might want to keep up on cairo
           development to be able to change your code.
@@ -557,6 +627,7 @@ gtk_fixed_get_preferred_height (GtkWidget *widget,
       find-and-replace task. Please refer to the following table:
       <table>
         <tgroup cols="2">
+          <title>GdkRegion to cairo_region_t</title>
           <thead>
             <row><entry>GDK</entry><entry>cairo</entry></row>
           </thead>
@@ -602,7 +673,7 @@ gtk_fixed_get_preferred_height (GtkWidget *widget,
       <para>
         One place where pixmaps were commonly used is to create custom
         cursors:
-      <programlisting>
+      <informalexample><programlisting>
 GdkCursor *cursor;
 GdkPixmap *pixmap;
 cairo_t *cr;
@@ -618,10 +689,10 @@ cairo_destroy (cr);
 cursor = gdk_cursor_new_from_pixmap (pixmap, pixmap, &amp;fg, &amp;fg, 0, 0);
 
 g_object_unref (pixmap);
-      </programlisting>
+      </programlisting></informalexample>
       The same can be achieved without pixmaps, by drawing onto
       an image surface:
-      <programlisting>
+      <informalexample><programlisting>
 GdkCursor *cursor;
 cairo_surface_t *s;
 cairo_t *cr;
@@ -642,26 +713,26 @@ cairo_surface_destroy (s);
 cursor = gdk_cursor_new_from_pixbuf (display, pixbuf, 0, 0);
 
 g_object_unref (pixbuf);
-      </programlisting>
+      </programlisting></informalexample>
       </para>
     </example>
   </section>
 
   <section>
-    <title>Replace colormaps by visuals</title>
+    <title>Replace GdkColormap by GdkVisual</title>
     <para>
       For drawing with cairo, it is not necessary to allocate colors, and
       a #GdkVisual provides enough information for cairo to handle colors
       in 'native' surfaces. Therefore, #GdkColormap and related functions
       have been removed in GTK+ 3, and visuals are used instead. The
       colormap-handling functions of #GtkWidget (gtk_widget_set_colormap(),
-      etc) have been removed and gtk_window_set_visual() has been added.
+      etc) have been removed and gtk_widget_set_visual() has been added.
     </para>
     <example><title>Setting up a translucent window</title>
     <para>You might have a screen-changed handler like the following
      to set up a translucent window with an alpha-channel:
     </para>
-    <programlisting>
+    <informalexample><programlisting>
 static void
 on_alpha_screen_changed (GtkWidget *widget,
                          GdkScreen *old_screen,
@@ -675,11 +746,11 @@ on_alpha_screen_changed (GtkWidget *widget,
 
   gtk_widget_set_colormap (widget, colormap);
 }
-    </programlisting>
+    </programlisting></informalexample>
     <para>
     With visuals instead of colormaps, this will look as follows:
     </para>
-    <programlisting>
+    <informalexample><programlisting>
 static void
 on_alpha_screen_changed (GtkWindow *window,
                          GdkScreen *old_screen,
@@ -691,12 +762,178 @@ on_alpha_screen_changed (GtkWindow *window,
   if (visual == NULL)
     visual = gdk_screen_get_system_visual (screen);
 
-  gtk_window_set_visual (window, visual);
+  gtk_widget_set_visual (window, visual);
 }
-    </programlisting>
+    </programlisting></informalexample>
     </example>
   </section>
 
+  <section>
+    <title>GdkDrawable is gone</title>
+
+    <para>
+      #GdkDrawable has been removed in GTK+ 3, together with #GdkPixmap
+      and #GdkImage. The only remaining drawable class is #GdkWindow.
+      For dealing with image data, you should use a #cairo_surface_t or
+      a #GdkPixbuf.
+    </para>
+
+    <para>
+      GdkDrawable functions that are useful with windows have been replaced
+      by corresponding GdkWindow functions:
+      <table>
+        <title>GdkDrawable to GdkWindow</title>
+        <tgroup cols="2">
+          <thead>
+            <row><entry>GDK 2.x</entry><entry>GDK 3</entry></row>
+          </thead>
+          <tbody>
+            <row><entry>gdk_drawable_get_visual()</entry><entry>gdk_window_get_visual()</entry></row>
+            <row><entry>gdk_drawable_get_size()</entry><entry>gdk_window_get_width()
+                                                              gdk_window_get_height()</entry></row>
+            <row><entry>gdk_pixbuf_get_from_drawable()</entry><entry>gdk_pixbuf_get_from_window()</entry></row>
+            <row><entry>gdk_drawable_get_clip_region()</entry><entry>gdk_window_get_clip_region()</entry></row>
+            <row><entry>gdk_drawable_get_visible_region()</entry><entry>gdk_window_get_visible_region()</entry></row>
+          </tbody>
+        </tgroup>
+      </table>
+    </para>
+  </section>
+
+  <section>
+    <title>Event filtering</title>
+
+    <para>
+      If your application uses the low-level event filtering facilities in GDK,
+      there are some changes you need to be aware of.
+    </para>
+
+    <para>
+      The special-purpose GdkEventClient events and the gdk_add_client_message_filter() and gdk_display_add_client_message_filter() functions have been
+      removed. Receiving X11 ClientMessage events is still possible, using
+      the general gdk_window_add_filter() API. A client message filter like
+<informalexample><programlisting>
+static GdkFilterReturn
+message_filter (GdkXEvent *xevent, GdkEvent *event, gpointer data)
+{
+  XClientMessageEvent *evt = (XClientMessageEvent *)xevent;
+
+  /* do something with evt ... */
+}
+
+ ...
+
+message_type = gdk_atom_intern ("MANAGER", FALSE);
+gdk_display_add_client_message_filter (display, message_type, message_filter, NULL);
+</programlisting></informalexample>
+    then looks like this:
+    <informalexample><programlisting>
+static GdkFilterReturn
+event_filter (GdkXEvent *xevent, GdkEvent *event, gpointer data)
+{
+  XClientMessageEvent *evt;
+  GdkAtom message_type;
+
+  if (((XEvent *)xevent)->type != ClientMessage)
+    return GDK_FILTER_CONTINUE;
+
+  evt = (XClientMessageEvent *)xevent;
+  message_type = XInternAtom (evt->display, "MANAGER", FALSE);
+
+  if (evt->message_type != message_type)
+    return GDK_FILTER_CONTINUE;
+
+  /* do something with evt ... */
+}
+
+ ...
+
+gdk_window_add_filter (NULL, message_filter, NULL);
+</programlisting></informalexample>
+      One advantage of using an event filter is that you can actually
+      remove the filter when you don't need it anymore, using
+      gdk_window_remove_filter().
+    </para>
+
+    <para>
+      The other difference to be aware of when working with event filters
+      in GTK+ 3 is that GDK now uses XI2 by default when available. That
+      means that your application does not receive core X11 key or button
+      events. Instead, all input events are delivered as XIDeviceEvents.
+      As a short-term workaround for this, you can force your application
+      to not use XI2, with gdk_disable_multidevice(). In the long term,
+      you probably want to rewrite your event filter to deal with
+      XIDeviceEvents.
+    </para>
+  </section>
+
+  <section>
+    <title>Backend-specific code</title>
+    <para>
+      In GTK+ 2.x, GDK could only be compiled for one backend at a time,
+      and the %GDK_WINDOWING_X11 or %GDK_WINDOWING_WIN32 macros could
+      be used to find out which one you are dealing with:
+      <informalexample><programlisting>
+#ifdef GDK_WINDOWING_X11
+      if (timestamp != GDK_CURRENT_TIME)
+        gdk_x11_window_set_user_time (gdk_window, timestamp);
+#endif
+#ifdef GDK_WINDOWING_WIN32
+        /* ... win32 specific code ... */
+#endif
+      </programlisting></informalexample>
+      In GTK+ 3, GDK can be built with multiple backends, and currently
+      used backend has to be determined at runtime, typically using
+      type-check macros on a #GdkDisplay or #GdkWindow. You still need
+      to use the #GDK_WINDOWING macros to only compile code referring
+      to supported backends:
+      <informalexample><programlisting>
+#ifdef GDK_WINDOWING_X11
+      if (GDK_IS_X11_DISPLAY (display))
+        {
+          if (timestamp != GDK_CURRENT_TIME)
+            gdk_x11_window_set_user_time (gdk_window, timestamp);
+        }
+      else
+#endif
+#ifdef GDK_WINDOWING_WIN32
+      if (GDK_IS_WIN32_DISPLAY (display))
+        {
+          /* ... win32 specific code ... */
+        }
+      else
+#endif
+       {
+         g_warning ("Unsupported GDK backend");
+       }
+      </programlisting></informalexample>
+    </para>
+    <para>
+      If you used the pkg-config variable <varname>target</varname> to
+      conditionally build part of your project depending on the GDK backend,
+      for instance like this:
+      <informalexample><programlisting>
+AM_CONDITIONAL(BUILD_X11, test `$PKG_CONFIG --variable=target gtk+-2.0` = "x11")
+      </programlisting></informalexample>
+      then you should now use the M4 macro provided by GTK+ itself:
+      <informalexample><programlisting>
+GTK_CHECK_BACKEND([x11], [3.0.2], [have_x11=yes], [have_x11=no])
+AM_CONDITIONAL(BUILD_x11, [test "x$have_x11" = "xyes"])
+      </programlisting></informalexample>
+    </para>
+  </section>
+
+  <section>
+    <title>GtkPlug and GtkSocket</title>
+
+    <para>
+      The #GtkPlug and #GtkSocket widgets are now X11-specific, and you
+      have to include the <filename>&lt;gtk/gtkx.h&gt;</filename> header
+      to use them. The previous section about proper handling of
+      backend-specific code applies, if you care about other backends.
+    </para>
+  </section>
+
   <section>
     <title>The GtkWidget::draw signal</title>
     <para>
@@ -715,7 +952,7 @@ on_alpha_screen_changed (GtkWindow *window,
       is available via the new gtk_widget_get_allocated_width() and
       gtk_widget_get_allocated_height() functions. It is not necessary to
       check for GTK_WIDGET_IS_DRAWABLE(), since GTK+ already does this check
-      before emitting the ::draw signal.
+      before emitting the #GtkWidget::draw signal.
     </para>
     <para>
       There are some special considerations for widgets with multiple windows.
@@ -734,7 +971,7 @@ on_alpha_screen_changed (GtkWindow *window,
         }
       ...
       </programlisting></informalexample>
-      In contrast, the ::draw signal handler may have to draw multiple
+      In contrast, the #GtkWidget::draw signal handler may have to draw multiple
       windows in one call. GTK+ has a convenience function
       gtk_cairo_should_draw_window() that can be used to find out if
       a window needs to be drawn. With that, the example above would look
@@ -767,10 +1004,13 @@ gboolean
 gtk_arrow_draw (GtkWidget *widget,
                 cairo_t   *cr)
 {
+  GtkStyleContext *context;
   gint x, y;
   gint width, height;
   gint extent;
 
+  context = gtk_widget_get_style_context (widget);
+
   width = gtk_widget_get_allocated_width (widget);
   height = gtk_widget_get_allocated_height (widget);
 
@@ -778,15 +1018,7 @@ gtk_arrow_draw (GtkWidget *widget,
   x = PAD;
   y = PAD;
 
-  gtk_paint_arrow (gtk_widget_get_style (widget),
-                   cr,
-                   gtk_widget_get_state (widget),
-                   GTK_SHADOW_OUT,
-                   widget,
-                   "arrow",
-                   widget->priv->arrow_type,
-                   TRUE,
-                   x, y, extent, extent);
+  gtk_render_arrow (context, rc, G_PI / 2, x, y, extent);
 }
     </programlisting>
     </example>
@@ -825,7 +1057,7 @@ gtk_arrow_draw (GtkWidget *widget,
   </section>
 
   <section>
-    <title>Check your expand flags</title>
+    <title>Check your expand and fill flags</title>
 
     <para>
       The behaviour of expanding widgets has changed slightly in GTK+ 3,
@@ -836,6 +1068,11 @@ gtk_arrow_draw (GtkWidget *widget,
       expand flag of the child from being inherited. See
       gtk_widget_set_hexpand() and gtk_widget_set_vexpand().
     </para>
+    <para>
+      If you experience sizing problems with widgets in ported code,
+      carefully check the #GtkBox::expand and #GtkBox::fill flags of your
+      boxes.
+    </para>
   </section>
 
   <section>
@@ -866,7 +1103,7 @@ gtk_arrow_draw (GtkWidget *widget,
       classes that are directly derived from GtkObject, you have to make
       them derive from #GInitiallyUnowned (or, if you don't need the floating
       functionality, #GObject). If you have widgets that override the
-      destroy class handler, you have to adust your class_init function,
+      destroy class handler, you have to adjust your class_init function,
       since destroy is now a member of GtkWidgetClass:
       <informalexample><programlisting>
       GtkObjectClass *object_class = GTK_OBJECT_CLASS (class);
@@ -885,6 +1122,18 @@ gtk_arrow_draw (GtkWidget *widget,
     </para>
   </section>
 
+  <section>
+    <title>GtkEntryCompletion signal parameters</title>
+
+    <para>
+      The #GtkEntryCompletion::match-selected and
+      #GtkEntryCompletion::cursor-on-match signals were erroneously
+      given the internal filter model instead of the users model.
+      This oversight has been fixed in GTK+ 3; if you have handlers
+      for these signals, they will likely need slight adjustments.
+    </para>
+  </section>
+
   <section>
     <title>Resize grips</title>
 
@@ -954,6 +1203,8 @@ gtk_arrow_draw (GtkWidget *widget,
   </para>
   </section>
 
+  <xi:include href="migrating-GtkStyleContext.xml" />
+
   </section>
 
 </chapter>

docs/reference/gtk/migrating-ClientSideWindows.sgml

@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-ClientSideWindows">
-
-  <title>Migrating to client-side windows</title>
-
-  <para>
-    In version 2.18, GDK has been changed to use client-side windows. This
-    means that there is no longer a 1-1 correspondence between #GdkWindows
-    and windows in the underlying window system. In particular, it is no
-    longer correct to assume that each window has an associated XID.
-    Code that makes this assumption can sometimes be fixed by calling
-    gdk_window_ensure_native() on the windows in question.
-    Calling gdk_x11_drawable_get_xid() (or GDK_WINDOW_XID()) from the
-    X11-specific API on a non-native window will explicitly call
-    gdk_window_ensure_native(), so old code using this will continue to
-    work. A small gotcha is that the GDK_WINDOW_XID() call is no longer a
-    trivial accessor for the XID of the window, and thus must not be called
-    from another thread without taking locking precautions.
-  </para>
-
-  <para>
-    GDK looks for the <envar>GDK_NATIVE_WINDOWS</envar> environment variable
-    and makes all windows native if it is set. It also tries to be more
-    compatible with the way prior versions worked in some other ways.
-  </para>
-
-  <para>
-    Some applications assume that they can just operate on the X windows
-    corresponding to their GDK windows without ever telling GDK. One
-    example that we've seen is changing the child window stacking order
-    using XRestackWindows(). Fixing this properly requires to fix the code
-    to use GDK functions to achieve whatever it is trying to achieve.
-    To make this easier in the case of stacking order changes, we've added
-    a gdk_window_restack() function.
-  </para>
-
-  <para>
-    One change that can cause problems for some applications is that GDK
-    is more aggressive about optimizing away expose events. Code that does
-    more than just repainting exposed areas in response to expose events
-    may be affected by this.
-  </para>
-
-  <para>
-    Problems can also occur when using cairo for drawing. One thing that can
-    go wrong is clip handling. If you ever need to reset the clip region on
-    a cairo_t (i.e. use cairo_reset_clip()), you have to to use
-    gdk_cairo_reset_clip() instead. The reason for this is that the cairo_reset_clip() call will remove the initial clip region that limits your drawing to
-    the client-side window at hand, so you will end up drawing over stuff
-    outside the window. You also need to use gdk_cairo_reset_clip() if you
-    use a cairo_t that was not allocated in a double-buffered expose handler
-    and keep it in use after window hierarchy changes (resizing, moving,
-    stacking order changes). The easiest fix for this kind of problem is to
-    simply create a new cairo context for each expose event.
-  </para>
-
-  <para>
-    Due to a weird API in XClearArea the gdk_window_clear_area() call handled
-    a specified width or height of zero to mean "to end of window" for
-    non-double-buffered drawing. This has been changed to be consistent with
-    the docs and what happens in the double-buffered case. All code in GTK+
-    that relied on this has been fixed, but it is possible (although unlikely)
-    that third party applications rely on this. If you need to do this, just
-    implement it yourself using gdk_drawable_get_size().
-  </para>
-
-</chapter>

docs/reference/gtk/migrating-GtkAboutDialog.sgml

@@ -1,98 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-GtkAboutDialog">
-
-  <title>Migrating from GnomeAbout to GtkAboutDialog</title>
-
-  <para>
-    Since version 2.6, GTK+ provides the #GtkAboutDialog widget as a 
-    replacement for the <structname>GnomeAbout</structname> dialog in 
-    the libgnomeui library.
-  </para>
-
-  <para>
-    #GtkAboutDialog supports all features found in <structname>GnomeAbout</structname>.
-    The <structname>GtkAboutDialog</structname> API is bigger, since it follows 
-    the GTK+ policy to have getters and setters for all widget properties, 
-    but it isn't much more complex than <structname>GnomeAbout</structname>.
-  </para>
-
-  <para>
-    To convert an application that uses <structname>GnomeAbout</structname> to 
-    <structname>GtkAboutDialog</structname>, as a first step, replace calls 
-    like
-    <informalexample><programlisting>
-    const gchar *documentors[] = { 
-      "Documenter 1", 
-      "Documenter 2", 
-      NULL 
-    };
-
-    const gchar *documentors[] = { 
-      "Author 1", 
-      "Author 2", 
-      NULL 
-    };
-
-    GtkWidget *about = gnome_about_new ("GNOME Test Program", VERSION,
-					"(C) 1998-2001 The Free Software Foundation",
-					"Program to display GNOME functions.",
-					authors,
-					documenters,
-					_("translator-credits"),
-					"logo.png");
-    </programlisting></informalexample>
-    by something like 
-    <informalexample><programlisting>
-    GdkPixbuf *logo = gdk_pixbuf_new_from_file ("logo.png", NULL);
-    GtkWidget *about = g_object_new (GTK_TYPE_ABOUT_DIALOG,
-                                     "name", "GNOME Test Program", 
-                                     "version", VERSION,
-			             "copyright", "(C) 1998-2001 The Free Software Foundation",
-				     "comments", "Program to display GNOME functions.",
-			             "authors", authors,
-			             "documenters", documenters,
-			             "translator-credits", _("translator-credits"),
-				     "logo", logo,
-                                     NULL);
-    g_object_unref (pixbuf);
-    </programlisting></informalexample>
-    If the g_object_new() construction scares you, you can also use 
-    gtk_about_dialog_new() to construct the dialog and then use the 
-    setters for the individual properties.
-  </para>
-
-  <para>
-    Once you are done with the initial conversion, you may want to look into 
-    using some of the features of <structname>GtkAboutDialog</structname> 
-    which are not present in <structname>GnomeAbout</structname>.
-    <itemizedlist>
-      <listitem><para>
-        You can specify license information with the 
-        #GtkAboutDialog:license property
-      </para></listitem>
-      <listitem><para>
-        You can add separate credits for artists with the 
-        #GtkAboutDialog:artists property
-      </para></listitem>
-      <listitem><para>
-        You can add a pointer to the website of your application, using the 
-        #GtkAboutDialog:website and #GtkAboutDialog:website-label properties.
-      </para></listitem>
-      <listitem><para>
-        If your credits contain email addresses or URLs, you can turn them 
-        into clickable links using gtk_about_dialog_set_email_hook() and 
-        gtk_about_dialog_set_url_hook(). 
-      </para></listitem>   
-    </itemizedlist>
-  </para>
-</chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
-End:
--->

docs/reference/gtk/migrating-GtkAction.sgml

@@ -1,445 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-GtkAction">
-  <chapterinfo>
-    <author>
-      <firstname>Federico</firstname>
-      <surname>Mena-Quintero</surname>
-      <affiliation>
-	<address>
-	  <email>federico@ximian.com</email>
-	</address>
-      </affiliation>
-    </author>
-  </chapterinfo>
-
-  <title>Migrating from old menu and toolbar systems to GtkAction</title>
-
-  <para>
-    Prior to GTK+ 2.4, there were several APIs in use to create menus
-    and toolbars.  GTK+ itself included #GtkItemFactory, which was
-    historically used in the GIMP; libgnomeui provided the gnome-ui
-    set of macros; libbonoboui provided a complex mechanism to do menu
-    merging across embedded components.  GTK+ 2.4 includes a system
-    for creating menus and toolbars, with merging of items, based
-    around the #GtkAction mechanism.
-  </para>
-
-  <section id="actions-and-action-groups">
-    <title>Actions and Action Groups</title>
-
-    <para>
-      A #GtkAction represents an operation that the user can perform from 
-      the menus and toolbars of an application.  It is similar to "verbs" 
-      in other menu systems.  A #GtkAction has a name, which is its identifier, 
-      and it can have several widgets that represent it in the user interface.  
-      For example, an action for <symbol>EditCopy</symbol> can have a menu item 
-      as well as a toolbar button associated to it.  If there is nothing selected
-      in the document, the application can simply de-sensitize the
-      <symbol>EditCopy</symbol> action; this will cause both the menu
-      item and the toolbar button to be de-sensitized automatically.
-      Similarly, whenever the user selects the menu item or the
-      toolbar button associated to the <symbol>EditCopy</symbol>
-      action, the corresponding #GtkAction object will emit an
-      "activate" signal.
-    </para>
-
-    <para>
-      #GtkActionGroup is simply a group of #GtkAction objects.  An
-      application may want to have several groups:  one for global
-      actions such as "new document", "about", and "exit"; then one
-      group for each open document with actions specific to the
-      document, such as "cut", "copy", "paste", and "print".
-    </para>
-
-    <para>
-      Normal actions are simply commands, such as
-      <symbol>FileSave</symbol> or <symbol>EditCopy</symbol>.  
-      Toggle actions can be active or inactive, such as
-      <symbol>FormatBold</symbol> or <symbol>ViewShowRulers</symbol>.
-      Radio actions define a set of items for which one and only one
-      can be active at a time, for example, {
-      <symbol>ViewHighQuality</symbol>,
-      <symbol>ViewNormalQuality</symbol>,
-      <symbol>ViewLowQuality</symbol> }.
-    </para>
-  </section>
-
-  <section id="ui-manager">
-    <title>User Interface Manager Object</title>
-
-    <para>
-      #GtkUIManager is an object that can construct menu and toolbar widgets 
-      from an XML description.  These widgets are in turn associated to
-      corresponding actions and action groups.
-    </para>
-
-    <para>
-      #GtkUIManager supports merging of menus and toolbars for applications 
-      that have multiple components, each with separate sets of commands.  
-      For example, a word processor that can embed images may want to have
-      toolbar buttons for Bold and Italic when the cursor is on a text
-      block, but Crop and Brightness/Contrast buttons when the cursor
-      is on an image.  These actions, which change depending on the
-      state of the application, can be merged and de-merged from a
-      #GtkUIManager as appropriate.
-    </para>
-  </section>
-
-  <section id="migrating-gnomeuiinfo">
-    <title>Migrating from GnomeUIInfo</title>
-
-    <para>
-      Prior to GTK+ 2.4, some applications used the GnomeUIInfo
-      mechanism from
-      <filename>&lt;libgnomeui/gnome-app-helper.h&gt;</filename> to
-      define their menus and toolbars.  With it, a program decleres an
-      array of <structname>GnomeUIInfo</structname> structures, which
-      contain information for menu or toolbar items such as their
-      label, icon, and accelerator key.  Then, one calls
-      gnome_app_fill_menu() or gnome_app_fill_toolbar(), or one of the
-      related functions, to create the appropriate widgets based on
-      these structures.
-    </para>
-
-    <para>
-      A downside of this API is that the same structures are used to
-      pass back pointers to the widgets that got created.  This means
-      that the structures cannot simply be kept around if the program
-      requires multiple instances of the user interface (e.g. several
-      windows); each new invocation of gnome_app_fill_menu() would 
-      overwrite the widget fields of the structures.
-    </para>
-
-    <para>
-      Another disadvantage is that there is no automatic way to
-      synchronize the state of related controls.  If there are toolbar
-      toogle buttons for "Bold", "Italic", "Underline", and also
-      corresponding menu items under "Format/Bold", etc., one has to
-      synchronize their toggled states by hand whenever the user
-      selects any one of them.
-    </para>
-
-    <para>
-      Finally, there is no way to do menu and toolbar merging for
-      applications that require embedded components.
-    </para>
-
-    <para>
-      To convert an application that uses GnomeUIInfo into the new
-      GtkAction mechanism, you need to do several things:
-    </para>
-
-    <orderedlist>
-      <listitem>
-	<para>
-	  Separate your existing GnomeUIInfo entries into normal
-	  actions, toggle actions, and radio actions, and then create
-	  a separate array of #GtkActionEntry structures
-	  for each group.  This will allow you to create the necessary
-	  #GtkActionGroup objects.  Note that this does not describe 
-          the actual "shape" that your menus and toolbars will have; 
-          it simply defines the set of commands that will appear in them.
-	</para>
-      </listitem>
-      <listitem>
-	<para>
-	  Create an XML description of your menus and toolbars for use
-	  with #GtkUIManager.  This defines the actual shape of the menus 
-          and toolbars.
-	</para>
-      </listitem>
-      <listitem>
-	<para>
-	  Port the code that uses gnome-app and gnome-app-helper to
-	  #GtkAction and #GtkUIManager.
-	</para>
-      </listitem>
-      <listitem>
-       <para>
-         If your GnomeUIInfo entries use GNOME_APP_PIXMAP_DATA or 
-         GNOME_APP_PIXMAP_FILENAME for pixmaps, you have to create a 
-         #GtkIconFactory, add it to the list of default factories, then 
-         create a #GtkIconSet for each of your own icons. Add the sets to 
-         the factory, and use the id in the #GtkActionEntry like a regular 
-         GTK+ stock id.
-       </para>
-      </listitem>
-    </orderedlist>
-
-    <example id="gnomeuiinfo-example">
-      <title>GnomeUIInfo Example</title>
-
-      <para>
-	The following code shows a declaration of a simple menu bar to
-	be used with gnome_app_fill_menu() or similar.  The menu hierarchy i
-        looks like this:
-      </para>
-
-      <itemizedlist>
-	<listitem>
-	  <para><guimenu>File</guimenu></para>
-	  <simplelist>
-	    <member><guimenuitem>Open</guimenuitem></member>
-	    <member><guimenuitem>&mdash;</guimenuitem></member>
-	    <member><guimenuitem>Exit</guimenuitem></member>
-	  </simplelist>
-	</listitem>
-
-	<listitem>
-	  <para><guimenu>View</guimenu></para>
-	  <simplelist>
-	    <member><guimenuitem>Zoom In</guimenuitem></member>
-	    <member><guimenuitem>Zoom Out</guimenuitem></member>
-	    <member><guimenuitem>&mdash;</guimenuitem></member>
-	    <member><guimenuitem>[ ] Full Screen</guimenuitem></member>
-	    <member><guimenuitem>&mdash;</guimenuitem></member>
-	    <member><guimenuitem>( ) High Quality</guimenuitem></member>
-	    <member><guimenuitem>( ) Normal Quality</guimenuitem></member>
-	    <member><guimenuitem>( ) Low Quality</guimenuitem></member>
-	  </simplelist>
-	</listitem>
-      </itemizedlist>
-
-      <programlisting>
-static GnomeUIInfo file_menu_items[] = {
-  { GNOME_APP_UI_ITEM, "_Open", "Open a file",
-    open_callback, NULL, NULL, GNOME_APP_PIXMAP_STOCK, GTK_STOCK_OPEN,
-    'o', GDK_CONTROL_MASK, NULL },
-  { GNOME_APP_UI_SEPARATOR },
-  { GNOME_APP_UI_ITEM, "E_xit", "Exit the program",
-    exit_callback, NULL, NULL, GNOME_APP_PIXMAP_STOCK, GTK_STOCK_QUIT,
-    'q', GDK_CONTROL_MASK, NULL},
-  { GNOME_APP_UI_ENDOFINFO }
-};
-
-static GnomeUIInfo view_radio_items[] = {
-  { GNOME_APP_UI_ITEM, "_High Quality", "Display images in high quality, slow mode",
-    high_quality_callback, NULL, NULL, GNOME_APP_PIXMAP_FILENAME, "high-quality.png",
-    0, 0, NULL },
-  { GNOME_APP_UI_ITEM, "_Normal Quality", "Display images in normal quality",
-    normal_quality_callback, NULL, NULL, GNOME_APP_PIXMAP_FILENAME, "normal-quality.png",
-    0, 0, NULL },
-  { GNOME_APP_UI_ITEM, "_Low Quality", "Display images in low quality, fast mode",
-    low_quality_callback, NULL, NULL, GNOME_APP_PIXMAP_FILENAME, "low-quality.png",
-    0, 0, NULL },
-  { GNOME_APP_UI_ENDOFINFO }
-};
-
-static GnomeUIInfo view_menu_items[] = {
-  { GNOME_APP_UI_ITEM, "Zoom _In", "Zoom into the image",
-    zoom_in_callback, NULL, NULL, GNOME_APP_PIXMAP_STOCK, GTK_STOCK_ZOOM_IN,
-    GDK_PLUS, 0, NULL },
-  { GNOME_APP_UI_ITEM, "Zoom _Out", "Zoom away from the image",
-    zoom_out_callback, NULL, NULL, GNOME_APP_PIXMAP_STOCK, GTK_STOCK_ZOOM_OUT,
-    GDK_MINUS, 0, NULL },
-  { GNOME_APP_UI_SEPARATOR },
-  { GNOME_APP_UI_TOGGLEITEM, "_Full Screen", "Switch between full screen and windowed mode",
-    full_screen_callback, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL,
-    GDK_F11, 0, NULL },
-  { GNOME_APP_UI_SEPARATOR },
-  { GNOME_APP_UI_RADIOITEMS, NULL, NULL, view_radio_items },
-  { GNOME_APP_UI_ENDOFINFO }
-};
-
-static GnomeUIInfo menubar[] = {
-  { GNOME_APP_UI_SUBTREE, "_File", NULL, file_menu_items },
-  { GNOME_APP_UI_SUBTREE, "_View", NULL, view_menu_items },
-  { GNOME_APP_UI_ENDOFINFO }
-}
-      </programlisting>
-    </example>
-
-    <example id="gnomeuiinfo-action-entries">
-      <title><structname>GtkActionEntry</structname> Structures</title>
-
-      <para>
-	The following code is the set of actions that are present in
-	the <link linkend="gnomeuiinfo-example">previous
-	example</link>.  Note that the toggle and radio entries are
-	separate from normal actions.  Also, note that #GtkActionEntry 
-        structures take key names in the format of gtk_accelerator_parse() 
-        rather than key values plus modifiers; you will have to convert these
-	values by hand.  For example, %GDK_F11 with no modifiers is equivalent 
-        to a key name of <literal>"F11"</literal>.  Likewise, <literal>"o"</literal>
-	with %GDK_CONTROL_MASK is equivalent to <literal>"&lt;ontrol&gt;O"</literal>.
-      </para>
-
-      <programlisting>
-/* Normal items */
-static const GtkActionEntry entries[] = {
-  { "FileMenu", NULL, "_File" },
-  { "ViewMenu", NULL, "_View" },
-  { "Open", GTK_STOCK_OPEN, "_Open", "&lt;control&gt;O", "Open a file", open_action_callback },
-  { "Exit", GTK_STOCK_QUIT, "E_xit", "&lt;control&gt;Q", "Exit the program", exit_action_callback },
-  { "ZoomIn", GTK_STOCK_ZOOM_IN, "Zoom _In", "plus", "Zoom into the image", zoom_in_action_callback },
-  { "ZoomOut", GTK_STOCK_ZOOM_OUT, "Zoom _Out", "minus", "Zoom away from the image", zoom_out_action_callback },
-};
-
-/* Toggle items */
-static const GtkToggleActionEntry toggle_entries[] = {
-  { "FullScreen", NULL, "_Full Screen", "F11", "Switch between full screen and windowed mode", full_screen_action_callback, FALSE }
-};
-
-/* Radio items */
-static const GtkRadioActionEntry radio_entries[] = {
-  { "HighQuality", "my-stock-high-quality", "_High Quality", NULL, "Display images in high quality, slow mode", 0 },
-  { "NormalQuality", "my-stock-normal-quality", "_Normal Quality", NULL, "Display images in normal quality", 1 },
-  { "LowQuality", "my-stock-low-quality", "_Low Quality", NULL, "Display images in low quality, fast mode", 2 }
-};
-      </programlisting>
-    </example>
-
-    <example id="gnomeuiinfo-xml">
-      <title>XML Description</title>
-
-      <para>
-	After extracting the actions, you will need to create an XML
-	description of the actual layout of your menus and toolbars
-	for use with #GtkUIManager. The following code shows a simple 
-        menu bar that corresponds to the <link linkend="gnomeuiinfo-example">previous
-	example</link>.  Note that the <guimenu>File</guimenu> and
-	<guimenu>View</guimenu> menus have their names specified in
-	the <link linkend="gnomeuiinfo-action-entries">action
-	entries</link>, not in the XML itself.  This is because the
-	XML description only contains <emphasis>identifiers</emphasis>
-	for the items in the GUI, rather than human-readable names.
-      </para>
-
-      <programlisting>
-static const char *ui_description =
-"&lt;ui&gt;"
-"  &lt;menubar name='MainMenu'&gt;"
-"    &lt;menu action='FileMenu'&gt;"
-"      &lt;menuitem action='Open'/&gt;"
-"      &lt;menuitem action='Exit'/&gt;"
-"    &lt;/menu&gt;"
-"    &lt;menu action='ViewMenu'&gt;"
-"      &lt;menuitem action='ZoomIn'/&gt;"
-"      &lt;menuitem action='ZoomOut'/&gt;"
-"      &lt;separator/&gt;"
-"      &lt;menuitem action='FullScreen'/&gt;"
-"      &lt;separator/&gt;"
-"      &lt;menuitem action='HighQuality'/&gt;"
-"      &lt;menuitem action='NormalQuality'/&gt;"
-"      &lt;menuitem action='LowQuality'/&gt;"
-"    &lt;/menu&gt;"
-"  &lt;/menubar&gt;"
-"&lt;/ui&gt;";
-      </programlisting>
-    </example>
-
-    <example id="gnomeuiinfo-code">
-      <title>Creating the Menu Bar</title>
-
-      <para>
-	In this last example, we will create a #GtkActionGroup based on the
-	<link linkend="gnomeuiinfo-action-entries">action entries</link> 
-        we created above.  We will then create a #GtkUIManager with the <link
-	linkend="gnomeuiinfo-xml">XML description</link> of the menu
-	layout.  We will also extract the accelerator group and the
-	widgets from the #GtkUIManager put them into a window.
-      </para>
-
-      <programlisting>
-GtkWidget *window;
-GtkWidget *vbox;
-GtkWidget *menubar;
-GtkActionGroup *action_group;
-GtkUIManager *ui_manager;
-GtkAccelGroup *accel_group;
-GError *error;
-
-register_my_stock_icons (<!-- -->);
-
-window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-vbox = gtk_vbox_new (FALSE, 0);
-gtk_container_add (GTK_CONTAINER (window), vbox);
-
-action_group = gtk_action_group_new ("MenuActions");
-gtk_action_group_add_actions (action_group, entries, G_N_ELEMENTS (entries), window);
-gtk_action_group_add_toggle_actions (action_group, toggle_entries, G_N_ELEMENTS (toggle_entries), window);
-gtk_action_group_add_radio_actions (action_group, radio_entries, G_N_ELEMENTS (radio_entries), 0, radio_action_callback, window);
-
-ui_manager = gtk_ui_manager_new (<!-- -->);
-gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
-
-accel_group = gtk_ui_manager_get_accel_group (ui_manager);
-gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
-
-error = NULL;
-if (!gtk_ui_manager_add_ui_from_string (ui_manager, ui_description, -1, &amp;error))
-  {
-    g_message ("building menus failed: %s", error-&gt;message);
-    g_error_free (error);
-    exit (EXIT_FAILURE);
-  }
-
-menubar = gtk_ui_manager_get_widget (ui_manager, "/MainMenu");
-gtk_box_pack_start (GTK_BOX (vbox), menubar, FALSE, FALSE, 0);
-
-gtk_widget_show_all (window);
-      </programlisting>
-    </example>
-
-    <example id="gnomeuiinfo-icons">
-      <title>Registering the icons</title>
-
-      <para>
-	Here we show how the register_my_stock_icons() function
-        used in the previous example could look like.
-      </para>
-
-      <programlisting>
-static struct { 
-  gchar *filename;
-  gchar *stock_id;
-} stock_icons[] = {
-  { "high-quality.png", "my-stock-high-quality" },
-  { "normal-quality.png", "my-stock-normal-quality" },
-  { "low-quality.png", "my-stock-low-quality" },
-};
- 
-static gint n_stock_icons = G_N_ELEMENTS (stock_icons);
-
-static void
-register_my_stock_icons (void)
-{
-   GtkIconFactory *icon_factory;
-   GtkIconSet *icon_set; 
-   GtkIconSource *icon_source;
-   gint i;
-
-   icon_factory = gtk_icon_factory_new (<!-- -->);
-   
-   for (i = 0; i &lt; n_stock_icons; i++) 
-    {
-      icon_set = gtk_icon_set_new (<!-- -->);
-      icon_source = gtk_icon_source_new (<!-- -->);
-      gtk_icon_source_set_filename (icon_source, stock_icons[i].filename);
-      gtk_icon_set_add_source (icon_set, icon_source);
-      gtk_icon_source_free (icon_source);
-      gtk_icon_factory_add (icon_factory, stock_icons[i].stock_id, icon_set);
-      gtk_icon_set_unref (icon_set);
-    }
-
-   gtk_icon_factory_add_default (icon_factory); 
-
-   g_object_unref (icon_factory);
-}
-      </programlisting>
-    </example>
-
-  </section>
-
-</chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
-End:
--->

docs/reference/gtk/migrating-GtkApplication.xml

@@ -59,11 +59,21 @@ The same application using GtkApplication:
 static void
 activate (GtkApplication *app)
 {
+  GList *list;
   GtkWidget *window;
 
-  window = create_my_window ();
-  gtk_window_set_application (GTK_WINDOW (window), app);
-  gtk_widget_show (window);
+  list = gtk_application_get_windows (app);
+
+  if (list)
+    {
+      gtk_window_present (GTK_WINDOW (list->data));
+    }
+  else
+    {
+      window = create_my_window ();
+      gtk_window_set_application (GTK_WINDOW (window), app);
+      gtk_widget_show (window);
+    }
 }
 
 int

docs/reference/gtk/migrating-GtkAssistant.sgml

@@ -1,178 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-GtkAssistant">
-  <chapterinfo>
-    <author>
-      <firstname>Carlos</firstname>
-      <surname>Garnacho</surname>
-      <affiliation>
-	<address>
-	  <email>carlosg@gnome.org</email>
-	</address>
-      </affiliation>
-    </author>
-  </chapterinfo>
-
-  <title>Migrating from GnomeDruid to GtkAssistant</title>
-
-  <para>
-    Since version 2.10, GTK+ provides the GtkAssistant widget as a replacement
-    for the <structname>GnomeDruid</structname> widget in the libgnomeui 
-    library.
-  </para>
-
-  <para>
-    Conceptually, both <structname>GtkAssistant</structname> and
-    <structname>GnomeDruid</structname> do the same task, but there are 
-    several areas where the API has been completely redesigned, so this 
-    chapter covers the main changes between both widgets.
-  </para>
-
-  <section id="inserting-pages">
-    <title>Inserting pages</title>
-
-    <para>
-      <structname>GnomeDruid</structname> was implemented as a container for
-	 <structname>GnomeDruidPage</structname> abstract objects, which are
-         implemented by the <structname>GnomeDruidPageEdge</structname> and 
-         <structname>GnomeDruidPageStandard</structname> widgets. Instead, 
-         <structname>GtkAssistant</structname> allows any widget to be a page, 
-         and implements per-page settings (such as page type or title) as 
-         child properties. So instead of:
-    </para>
-
-    <programlisting>
-/* Page 1 */
-page = gnome_druid_page_edge_new (GNOME_EDGE_START);
-gnome_druid_page_edge_set_test (GNOME_DRUID_PAGE_EDGE (page),
-                                "Welcome to the assistant, it will make your life easier");
-gtk_widget_show (page);
-gnome_druid_append_page (GNOME_DRUID (druid), GNOME_DRUID_PAGE (page));
-
-/* Page 2 */
-page = gnome_druid_page_standard_new ();
-gtk_container_add (GTK_CONTAINER (GNOME_DRUID_PAGE_STANDARD (page)->vbox,
-                   create_page1 ());
-gtk_widget_show_all (page);
-gnome_druid_append_page (GNOME_DRUID (druid), GNOME_DRUID_PAGE (page));
-
-/* Page 3 */
-page = gnome_druid_page_edge_new (GNOME_EDGE_FINISH);
-gnome_druid_page_edge_set_test (GNOME_DRUID_PAGE_EDGE (page),
-                                "Now you are done, your life is easier");
-gtk_widget_show (page);
-gnome_druid_append_page (GNOME_DRUID (druid), GNOME_DRUID_PAGE (page));
-    </programlisting>
-
-    <para>
-      You have to write:
-    </para>
-
-    <programlisting>
-gtk_assistant_append_page (GTK_ASSISTANT (assistant),
-                           gtk_label_new ("Welcome to the assistant, it will make your life easier"));
-gtk_assistant_append_page (GTK_ASSISTANT (assistant),
-                           create_page1 ());
-gtk_assistant_append_page (GTK_ASSISTANT (assistant),
-                           gtk_label_new ("Now you are done, your life is easier");
-    </programlisting>
-  </section>
-
-  <section id="decorating-the-assistant-pages">
-    <title>Decorating the assistant pages</title>
-
-    <para>
-      To decorate your assistant pages, <structname>GtkAssistant</structname> provides similar functions
-	 to <structname>GnomeDruid</structname>, so you have to transform code like this:
-    </para>
-
-    <programlisting>
-gnome_druid_page_edge_set_title (GNOME_DRUID_PAGE_EDGE (page), "Welcome");
-gnome_druid_page_edge_set_logo (GNOME_DRUID_PAGE_EDGE (page), logo_pixbuf);
-gnome_druid_page_edge_set_watermark (GNOME_DRUID_PAGE_EDGE (page), watermark_pixbuf);
-    </programlisting>
-
-    <para>
-    Into this:
-    </para>
-
-    <programlisting>
-gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page_widget, "Welcome");
-gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), page_widget, logo_pixbuf);
-gtk_assistant_set_page_side_image (GTK_ASSISTANT (assistant), page_widget, watermark_pixbuf);
-    </programlisting>
-
-    <para>
-      Where page_widget is the widget used as a page.
-    </para>
-  </section>
-
-  <section id="setting-the-page-flow">
-    <title>Setting the page flow</title>
-
-    <para>
-      Here is the area where <structname>GtkAssistant</structname> and <structname>GnomeDruid</structname>
-	 differ the most. While <structname>GnomeDruid</structname> used the "next" and "back" signals from the 
-	 <structname>GnomeDruidPage</structname>, <structname>GtkAssistant</structname> uses the following
-	 techniques:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-	   <para>gtk_assistant_set_forward_page_func (): Allows to define a GtkAssistantPageFunc to let the
-	   assistant know which will be the following page given the current page.</para>
-      </listitem>
-      <listitem>
-	   <para>gtk_assistant_set_page_complete (): Lets the assistant know whether the specified page is complete
-	   or not, updating buttons state accordingly.</para>
-      </listitem>
-      <listitem>
-	   <para>gtk_assistant_set_page_type (): Lets the assistant know the page role and update the buttons
-	   state accordingly. Pages can have the following roles:</para>
-	   <simplelist>
-	     <member>Intro</member>
-		<member>Content</member>
-		<member>Progress</member>
-		<member>Confirmation</member>
-		<member>Summary</member>
-	   </simplelist>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      A sample GtkAssistantPageFunc could look like this:
-    </para>
-
-    <programlisting>
-static gint
-forward_page_function (gint     current_page,
-                       gpointer data)
-{
-  switch (current_page)
-    {
-    case 0:
-      return 1;
-    case 1:
-      if (check_page1_data ())
-	   return 2;
-	 else
-	   return 3;
-    case 2:
-      return 3;
-    default:
-      return -1;
-    }
-}
-    </programlisting>
-
-  </section>
-</chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
-End:
--->

docs/reference/gtk/migrating-GtkBuilder.sgml

@@ -1,102 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-GtkBuilder">
-
-  <title>Migrating from libglade to GtkBuilder</title>
-
-  <para>
-    Since version 2.12, GTK+ provides #GtkBuilder to construct
-    user interfaces from XML descriptions, similar to the functionality
-    provided by #GladeXML in the libglade library.
-  </para>
-
-  <para>
-    A good way to start a migration from libglade to GtkBuilder is using
-    <application>glade3</application> to convert your .glade file.
-    If your code uses the @root parameter of glade_xml_new(),
-    you can use gtk_builder_add_objects_from_file() to construct only certain
-    objects from a GtkBuilder file.
-  </para>
-
-  <para>
-    Alternatively, GTK+ also offers the
-    <link linkend="gtk-builder-convert">gtk-builder-convert</link> script you can use
-    to do the conversion; in which case you should be careful to inspect the output
-    and make sure you didn't lose any data.
-  </para>
-
-  <table pgwide="1" frame="topbot">
-    <title>Step-by-step instructions for porting code from libglade to GtkBuilder</title>
-    <tgroup cols="2" colsep="0" rowsep="0">
-      <thead>
-        <row><entry>libglade</entry><entry>GtkBuilder</entry></row>
-      </thead>
-      <tbody>
-        <row>
-          <entry><![CDATA[#include <glade/glade.h>]]></entry>
-          <entry>not needed</entry>
-        </row>
-        <row>
-          <entry><screen>GladeXML*</screen></entry>
-          <entry><screen>GtkBuilder*</screen></entry>
-        </row>
-        <row>
-          <entry><screen>glade_xml_new (FILE, "first_widget", NULL)</screen></entry>
-          <entry>
-<screen>
-GError* error = NULL;
-GtkBuilder* builder = gtk_builder_new (<!-- -->);
-if (!gtk_builder_add_from_file (builder, FILE, &amp;error))
-  {
-    g_warning ("Couldn't load builder file: &percnt;s", error->message);
-    g_error_free (error);
-  }
-</screen>
-          </entry>
-        </row>
-        <row>
-          <entry><screen>glade_xml_get_widget (gxml, “widget_name”)</screen></entry>
-          <entry><screen>GTK_WIDGET (gtk_builder_get_object (builder, “widget_name”))</screen></entry>
-        </row>
-        <row>
-          <entry><screen>glade_get_widget_name (widget)</screen></entry>
-          <entry><screen>gtk_widget_get_name (widget)</screen></entry>
-        </row>
-        <row>
-          <entry><screen>glade_xml_get_widget_prefix (gxml, “prefix”)</screen></entry>
-          <entry>can be emulated by <literal>gtk_builder_get_objects (builder)</literal> together with manual filtering. It returns a GSList* instead of a GList* though.</entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </table>
-
-  <para>
-    While GtkBuilder strives to be a complete replacement for
-    libglade, there are a number of areas where it is currently
-    still behind libglade:
-    <itemizedlist>
-
-      <listitem><para>
-        GtkBuilder supports context information in translatable
-        properties in a slightly different way than libglade.
-        Intltool does not yet support this; see
-        <ulink url="http://bugzilla.gnome.org/show_bug.cgi?id=454894">bug
-        454894</ulink> for the current status of intltool support for
-        GtkBuilder files. Thankfully, context in translations is a
-        rarely used feature, and if you are not using it, intltools
-        glade format support works just fine for GtkBuilder files.
-      </para></listitem>
-
-      <listitem><para>
-        While libglade can often tolerate multiple widgets having the
-        same id in a glade file, GtkBuilder will not accept duplicate
-        object ids. Both <application>gtk-builder-convert</application>
-        and the GtkBuilder parser emit warnings when they see
-        duplicate ids.
-      </para></listitem>
-  </itemizedlist>
-  </para>
-
-</chapter>

docs/reference/gtk/migrating-GtkColorButton.sgml

@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-GtkColorButton">
-
-  <title>Migrating from GnomeColorPicker to GtkColorButton</title>
-
-  <para>
-    Since version 2.6, GTK+ provides the #GtkColorButton
-    widget as a replacement for the <structname>GnomeColorPicker</structname> 
-    widget in the libgnomeui library.
-  </para>
-
-  <para>
-   Porting an application from <structname>GnomeColorPicker</structname> to 
-   <structname>GtkColorButton</structname> is very simple. 
-   <structname>GtkColorButton</structname> doesn't support dithering 
-   (since it is rarely needed on modern hardware), and it doesn't have 
-   setters and getters to set the color from floating point or integer 
-    components. So instead of
-   <informalexample><programlisting>
-   guint red, green, blue, alpha;
-   /* ... */
-   gnome_color_picker_set_i8 (color_picker, red, green, blue, alpha);
-   </programlisting></informalexample>   
-   you have to write
-   <informalexample><programlisting>
-   GdkColor color;
-
-   color.red = red &lt;&lt; 8;
-   color.green = green &lt;&lt; 8;
-   color.blue = blue &lt;&lt; 8;
-   gtk_color_button_set_color (color_picker, &amp;color);
-   gtk_color_button_set_alpha (color_picker, alpha &lt;&lt; 8);
-   </programlisting></informalexample>   
-  and similarly for the setters taking other number formats. For 
-  <function>gnome_color_picker_set_i16()</function> no conversion is needed, 
-  for <function>gnome_color_picker_set_d()</function>, you need to convert 
-  the color components like this:
-   <informalexample><programlisting>  
-   color.red = (guint16) (red * 65535.0 + 0.5);
-   color.green = (guint16) (green * 65535.0 + 0.5);
-   color.blue = (guint16) (blue * 65535.0 + 0.5);
-   </programlisting></informalexample>   
-  </para>
-</chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
-End:
--->

docs/reference/gtk/migrating-GtkComboBox.sgml

@@ -1,213 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-GtkComboBox">
-
-  <title>Migrating from GtkOptionMenu and GtkCombo to GtkComboBox and 
-         GtkComboBoxEntry</title>
-
-  <para>
-    Prior to 2.4, GTK+ offered two widgets for the task of selecting one
-    item from a list of options. #GtkOptionMenu presents the list of 
-    options as a menu while #GtkCombo presents them in a Windows-style list 
-    popup. The only difference between the two is that a #GtkCombo allows to 
-    manually edit the selected value, while the #GtkOptionMenu does not.
-  </para> 
-  <para>
-    In GTK+ 2.4, a unified API for list selection was introduced, with 
-    #GtkComboBox for the non-editable case and #GtkComboBoxEntry for the 
-    editable case. 
-    The selection of the display style &mdash; menu or list &mdash;
-    is no longer done at the API level, but has been made themeable via
-    the style property #GtkComboBox:appears-as-list.
-  </para>
-
-  <section id="migrating-GtkOptionMenu">
-    <title>Migrating from GtkOptionMenu to GtkComboBox</title>
-    
-    <para>
-      Here is an example of a simple, but typical use of 
-      #GtkOptionMenu<!---->:
-      <informalexample><programlisting>
-GtkWidget *option_menu, *menu, *menu_item;
-
-option_menu = gtk_option_menu_new (<!-- -->);      
-menu = gtk_menu_new (<!-- -->);
-
-menu_item = gtk_menu_item_new_with_label ("First Item");
-gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-gtk_widget_show (menu_item);
-menu_item = gtk_menu_item_new_with_label ("Second Item");
-gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-gtk_widget_show (menu_item);
-menu_item = gtk_menu_item_new_with_label ("Third Item");
-gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-gtk_widget_show (menu_item);
-
-gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu);
-      </programlisting></informalexample>
-      In order to react to the user's selection, connect to the #GtkOptionMenu::changed
-      signal on the option menu and use gtk_option_menu_get_history()
-      to retrieve the index of the selected item.
-    </para>
-    <para>
-      And here is how it would be done with a #GtkComboBox<!---->:
-      <informalexample><programlisting>
-GtkWidget *combo_box;
-
-combo_box = gtk_combo_box_new_text (<!-- -->);
-
-gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "First Item");
-gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "Second Item");
-gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "Third Item");
-      </programlisting></informalexample>
-      In order to react to the user's selection, connect to the 
-      #GtkComboBox::changed signal and use gtk_combo_box_get_active()
-      to retrieve the index of the selected item.
-    </para>
-
-    <para>
-      A slightly more complex example involving images:
-      <informalexample><programlisting>
-GtkWidget *option_menu, *menu, *menu_item;
-
-option_menu = gtk_option_menu_new (<!-- -->);      
-menu = gtk_menu_new (<!-- -->);
-
-menu_item = gtk_image_menu_item_new_with_label ("First Item");
-gtk_image_menu_item_set_image (gtk_image_new_from_pixbuf (pixbuf1));
-gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-gtk_widget_show (menu_item);
-menu_item = gtk_image_menu_item_new_with_label ("Second Item");
-gtk_image_menu_item_set_image (gtk_image_new_from_pixbuf (pixbuf2));
-gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-gtk_widget_show (menu_item);
-menu_item = gtk_image_menu_item_new_with_label ("Third Item");
-gtk_image_menu_item_set_image (gtk_image_new_from_pixbuf (pixbuf3));
-gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-gtk_widget_show (menu_item);
-
-gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu);
-      </programlisting></informalexample>
-    </para>
-    <para>
-      can be done using a #GtkComboBox as follows:
-      <informalexample><programlisting>
-GtkListStore *store;
-GtkTreeIter iter;
-GtkCellRenderer *renderer;
-GtkWidget *combo_box;
-
-store = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING);
-
-gtk_list_store_append (store, &amp;iter);
-gtk_list_store_set (store, &amp;iter, 0, pixbuf1, 1, "First Item", -1);
-gtk_list_store_append (store, &amp;iter);
-gtk_list_store_set (store, &amp;iter, 0, pixbuf2, 1, "Second Item", -1);
-gtk_list_store_append (store, &amp;iter);
-gtk_list_store_set (store, &amp;iter, 0, pixbuf3, 1, "Third Item", -1);
-
-combo_box = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store));
-
-renderer = gtk_cell_renderer_pixbuf_new (<!-- -->);
-gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, FALSE);
-gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer,
-                                "pixbuf", 0,
-                                NULL);
-
-renderer = gtk_cell_renderer_text_new (<!-- -->);
-gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, TRUE);
-gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer,
-                                "text", 1,
-                                NULL);
-      </programlisting></informalexample>
-    </para>
-  </section>
-
-  <section id="migrating-GtkCombo">
-    <title>Migrating from GtkCombo to GtkComboBoxEntry</title>
-
-    <para>
-      Here is an example of a simple, but typical use of a #GtkCombo<!---->:
-      <informalexample><programlisting>
-GtkWidget *combo;
-GList *items = NULL;
-
-items = g_list_append (items, "First Item");
-items = g_list_append (items, "Second Item");
-items = g_list_append (items, "Third Item");
-
-combo = gtk_combo_new (<!-- -->);
-gtk_combo_set_popdown_strings (GTK_COMBO (combo), items);
-      </programlisting></informalexample>
-      In order to react to the user's selection, connect to the #GtkCombo::changed
-      signal on the combo and use 
-      <literal>gtk_entry_get_text (GTK_ENTRY (combo->entry))</literal>
-      to retrieve the selected text.
-    </para>
-    <para>
-      And here is how it would be done using #GtkComboBoxEntry<!---->:
-      <informalexample><programlisting>
-combo_box = gtk_combo_box_entry_new_text (<!-- -->);
-
-gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "First Item");
-gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "Second Item");
-gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "Third Item");
-      </programlisting></informalexample>
-      In order to react to the user's selection, connect to the #GtkComboBox::changed
-      signal on the combo and use 
-      <literal>gtk_entry_get_text (GTK_ENTRY (GTK_BIN (combo_box)->child))</literal>
-      to retrieve the selected text.
-    </para>
-  </section>
-
-  <section id="new-features-GtkComboBox">
-    <title>New features</title>
-
-    <para>
-      The new widgets have more to offer than a mere combination of the
-      features of #GtkOptionMenu and #GtkCombo. Notable new features 
-      include:
-      <variablelist>
-        <varlistentry>
-          <term>Grid mode</term>
-          <listitem><para>Sometimes it is preferable to display the available
-            options not in a linear list, but in a grid. A typical example 
-            would be a "color combo" where the individual items are small 
-	    square color swatches. The new widgets support gridded display 
-            with the functions 
-            gtk_combo_box_set_wrap_width(), 
-            gtk_combo_box_set_row_span_column() and 
-            gtk_combo_box_set_column_span_column().
-          </para></listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Display of icons</term>
-          <listitem><para>An often-heard complaint about #GtkOptionMenu is that 
-          the icons which appear in the image menu items in its menu are not
-	  displayed in the button showing the selected item. This limitation
-          has been removed in #GtkComboBox; the selected item appears in the 
-          same way as the options in the popup.
-          </para></listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Full tree model power</term>
-          <listitem><para>
-            Since the new widgets are built around the same models that are
-            used for #GtkTreeView, all of the powerful machinery of tree models 
-            and cell renderers can be used.
-          </para></listitem>
-        </varlistentry>
-      </variablelist>
-    </para>
-  </section>
-
-</chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
-End:
--->

docs/reference/gtk/migrating-GtkEntry-icons.sgml

@@ -1,141 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-entry-icons">
-
-  <title>Migrating from SexyIconEntry to GtkEntry</title>
-
-  <para>
-    GTK+ 2.16 supports showing icons inside a #GtkEntry, similar to
-    SexyIconEntry. Porting from SexyIconEntry to GtkEntry is relatively
-    straightforward. The main difference between the two APIs is that
-    SexyIconEntry uses #GtkImage widgets in a somewhat awkward way as
-    storage vehicles for icons, while GtkEntry allows to specify icons
-    via pixbufs, stock ids, icon names or #GIcons. So, if your code uses
-    e.g.:
-<informalexample><programlisting>
-image = gtk_image_new_from_stock (GTK_STOCK_NEW, GTK_ICON_SIZE_MENU);
-sexy_icon_entry_set_icon (entry, SEXY_ICON_ENTRY_PRIMARY, image);
-</programlisting></informalexample>
-    you can get rid of the @image, and directly write:
-<informalexample><programlisting>
-gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_NEW);
-</programlisting></informalexample>
-  </para>
-
-  <para>
-    The signals SexyIconEntry::icon-pressed and SexyIconEntry::icon-released
-    have been renamed to #GtkEntry::icon-press and #GtkEntry::icon-release
-    to avoid problems due to signal name clashes. Also, the signature of the
-    signals has changed from
-<informalexample><programlisting>
-void (*icon_pressed) (SexyIconEntry         *entry, 
-                      SexyIconEntryPosition  icon_pos,
-                      int                    button)
-</programlisting></informalexample>
-to
-<informalexample><programlisting>
-void (*icon_press) (GtkEntry              *entry, 
-                    GtkEntryIconPosition  icon_pos,
-                    GdkEventButton       *event)
-</programlisting></informalexample>
-    The new signature has the advantage that the signal handler can use
-    the timestamp of the event, e.g. for passing it to gtk_menu_popup().
-    When adapting an existing signal handler to the new signature, you 
-    should note that the button number is easily available as @event->button,
-    as shown in the following example:
-<informalexample><programlisting>
-static void
-icon_pressed_cb (SexyIconEntry         *entry,
-                 SexyIconEntryPosition  position,
-                 int                    button,
-                 gpointer               data)
-{
-  GtkMenu *menu = data;
-
-  if (position == SEXY_ICON_ENTRY_PRIMARY)
-    gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
-                    button, GDK_CURRENT_TIME);
-} 
-</programlisting></informalexample>
-    can be ported as:
-<informalexample><programlisting>
-static void
-icon_press_cb (GtkEntry             *entry,
-               GtkEntryIconPosition  position,
-               GdkEventButton       *event,
-               gpointer              data)
-{
-  GtkMenu *menu = data;
-
-  if (position == GTK_ENTRY_ICON_PRIMARY)
-    gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
-                    event->button, event->time);
-} 
-</programlisting></informalexample>
-  </para>
-
-  <para>
-    Another difference is that SexyIconEntry offers manual control of
-    the icon prelighting, via sexy_icon_entry_set_icon_highlight(). 
-    #GtkEntry prelights automatically when appropriate, depending on 
-    whether the icon is activatable and sensitive. You should make
-    sure that your icons are properly marked as activatable or nonactivatable
-    and sensitive or insensitive:
-    <itemizedlist>
-      <listitem><para>
-        Sensitive, but non-activatable icons are
-        good for purely informational purposes.
-      </para></listitem>
-      <listitem><para>
-        Icons should be marked as insensitive if the
-        function that they trigger is currently not available.
-      </para></listitem>
-    </itemizedlist>
-  </para>
-
-  <para>
-    GtkEntry has no direct equivalent of the special-purpose function
-    sexy_icon_entry_add_clear_button(). If you need this functionality,
-    the following code works:
-<informalexample><programlisting>
-static void
-icon_pressed_cb (GtkEntry       *entry,
-                 gint            position,
-                 GdkEventButton *event,
-                 gpointer        data)
-{
-  if (position == GTK_ENTRY_ICON_SECONDARY)
-    gtk_entry_set_text (entry, "");
-}
-
-static void
-text_changed_cb (GtkEntry   *entry,
-                 GParamSpec *pspec,
-                 GtkWidget  *button)
-{
-  gboolean has_text;
-
-  has_text = gtk_entry_get_text_length (entry) > 0;
-  gtk_entry_set_icon_sensitive (entry,
-                                GTK_ENTRY_ICON_SECONDARY,
-                                has_text);
-}
-
-
-  /* ... */
- 
-  /* Set up the clear icon */
-  gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
-                                 GTK_ENTRY_ICON_SECONDARY,
-                                 GTK_STOCK_CLEAR);
-  g_signal_connect (entry, "icon-press",
-                    G_CALLBACK (icon_pressed_cb), NULL);
-  g_signal_connect (entry, "notify::text",
-                    G_CALLBACK (text_changed_cb), find_button);
- 
-  /* ... */
-</programlisting></informalexample>
-  </para>
-</chapter>

docs/reference/gtk/migrating-GtkFileChooser.sgml

@@ -1,163 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-GtkFileChooser">
-  <chapterinfo>
-    <author>
-      <firstname>Federico</firstname>
-      <surname>Mena-Quintero</surname>
-      <affiliation>
-	<address>
-	  <email>federico@ximian.com</email>
-	</address>
-      </affiliation>
-    </author>
-  </chapterinfo>
-
-  <title>Migrating from GtkFileSelection to GtkFileChooser</title>
-
-  <para>
-    #GtkFileChooser, starting with GTK+ 2.4, is the new set of APIs for file 
-    selection widgets and dialogs.  Previous versions of GTK+ used #GtkFileSelection, 
-    which has numerous problems.
-  </para>
-
-  <para>
-    #GtkFileChooser is an abstract interface that can be implemented by widgets 
-    that perform file selection tasks.  Two widgets in GTK+ implement this
-    interface:  #GtkFileChooserDialog and #GtkFileChooserWidget. Most applications 
-    simply need to use #GtkFileChooserDialog, which is a dialog box that allows the 
-    user to select existing files for opening them, or to pick new filenames for 
-    saving documents. #GtkFileChooserWidget is for special applications that need to 
-    embed a file selection widget inside a larger window.  In the context of GTK+, 
-    #GtkFileChooserDialog is simply a #GtkDialog box with a #GtkFileChooserWidget.
-    inside.
-  </para>
-
-  <section id="gtkfilechooser-creating">
-    <title>Creating a GtkFileChooserDialog</title>
-
-    <para>
-      To create a #GtkFileChooserDialog, you simply call gtk_file_chooser_dialog_new().
-      This function is similar to gtk_dialog_new() in that it takes parameters for the
-      title of the dialog box and its transient parent, as well as its
-      buttons.  In addition, it takes in an argument that determines
-      whether the file chooser dialog will be used for opening
-      existing files or for saving to a possibly new file.
-    </para>
-
-    <para>
-      Please see <xref linkend="gtkfilechooser-typical-usage"/> for
-      how to create a simple file chooser dialog and extract the
-      selected filename from it.
-    </para>
-  </section>
-
-  <section id="gtkfilechooser-selection-modes">
-    <title>Selection Modes</title>
-
-    <para>
-      #GtkFileChooser can be used in two modes, to select a single file at a 
-      time or to select a set of more than one file.  To set this, use
-      gtk_file_chooser_set_select_multiple().  In single-selection
-      mode, you can use gtk_file_chooser_get_filename() to get a file
-      name from the local file system or gtk_file_chooser_get_uri() to
-      get a full-formed URI.  In multiple-selection mode, you can use
-      gtk_file_chooser_get_filenames() to get a #GSList of filename strings, or
-      gtk_file_chooser_get_uris() to get a list of URI strings.
-    </para>
-
-    <para>
-      Also, you can configure #GtkFileChooser to select files
-      or folders.  Consider a backup program that needs to let the
-      user select a folder that will be backed up along with its
-      subfolders.  To configure whether #GtkFileChooser is used to select
-      files or folders, use gtk_file_chooser_set_action().  In
-      addition, this lets you configure whether the file chooser will
-      be used to select existing files or folders (e.g. for
-      "File/Open"), or to type in new filenames (for
-      "File/Save&nbsp;As...").
-    </para>
-  </section>
-
-  <section id="gtkfilechooser-installing-preview">
-    <title>Installing a Preview widget</title>
-
-    <para>
-      Many applications need to have a preview facility within their
-      file chooser dialogs.  Previous to GTK+ 2.4, one needed to
-      access the #GtkFileSelection widget hierarchy directly to hook in 
-      a preview widget.  With #GtkFileChooser, there is a
-      dedicated API to do this.
-    </para>
-
-    <para>
-      Please see the <link linkend="gtkfilechooser-preview">section on
-      creating preview widgets</link> for more information.
-    </para>
-  </section>
-
-  <section id="gtkfilechooser-installing-extra-widgets">
-    <title>Installing Extra Widgets</title>
-
-    <para>
-      Some applications need to install extra widgets in a file
-      chooser.  For example, an application may want to provide a
-      toggle button to give the user the option of opening a file
-      read-only.
-    </para>
-
-    <para>
-      Please see the <link linkend="gtkfilechooser-extra">section on
-      creating extra widgets</link> for more information.
-    </para>
-  </section>
-
-  <section id="gtkfilechooser-new-features">
-    <title>New features</title>
-
-    <para>
-      New features in #GtkFileChooser include the following:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-	<para>
-	  Ability to select URIs rather than just local files.  You
-	  must use a #GtkFileSystem implementation that supports this, 
-          for example the gnome-vfs backend.
-	</para>
-      </listitem>
-
-      <listitem>
-	<para>
-	  Present a list of application-specific shortcut folders.
-	  For example, a paint program may want to add a shortcut for
-	  its <filename>/usr/share/paint_program/Clipart</filename>
-	  folder.
-	</para>
-      </listitem>
-
-      <listitem>
-	<para>
-	  Define custom filters so that not all the files in a folder
-	  are listed.  For example, you could filter out backup files,
-	  or show only image files.
-	</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      To see how to use these features, please consult the #GtkFileChooser 
-      reference documentation.
-    </para>
-  </section>
-</chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
-End:
--->

docs/reference/gtk/migrating-GtkIconView.sgml

@@ -1,153 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-GtkIconView">
-
-  <title>Migrating from GnomeIconList to GtkIconView</title>
-
-  <para>
-    Since version 2.6, GTK+ provides the #GtkIconView widget. It is similar in 
-    functionality to the <structname>GnomeIconList</structname> widget in the 
-    libgnomeui library, both widgets provide a way to lay out named icons in 
-    a grid. The distinctive feature of the GTK+ widget is that it follows the 
-    model-view pattern, allowing it to share the actual data (i.e. the names 
-    and images of the icons) with other views.
-  </para>
-
-  <para>
-    #GtkIconView currently doesn't support some features found in 
-    <structname>GnomeIconList</structname>. Icons can not be positioned freely, 
-    the spacing is not customizable, and it is not possible to edit the names of 
-    icons. 
-  </para>
-
-  <para>
-    To convert an application that uses <structname>GnomeIconList</structname> 
-    to #GtkIconView, the first step is to organize your data in a #GtkTreeModel. 
-    <structname>GnomeIconList</structname> lets you directly insert data with 
-    gnome_icon_list_insert() and gnome_icon_list_insert_pixbuf() and their
-    append variants. So, if you previously had a function to fill your icon 
-    list similar to this one:
-    <informalexample><programlisting>
-      void 
-      fill_icon_list (GnomeIconList *icon_list)
-      {
-        gnome_icon_list_append (icon_list, "file1.png", "Icon 1");
-        gnome_icon_list_append (icon_list, "file2.png", "Icon 2");
-
-        /* more icons ... */ 
-      }
-    </programlisting></informalexample>
-    you will have to create a tree model, attach your icon view to it, and 
-    fill the model:
-    <informalexample><programlisting>
-      enum { 
-        PIXBUF_COLUMN,
-        TEXT_COLUMN,
-
-        /* you can have more columns here, e.g */ 
-
-        DATA_COLUMN
-      };
- 
-      void 
-      fill_model (GtkListStore *store)
-      {
-        GtkTreeIter iter;
-        GdkPixbuf *pixbuf;
-
-        gtk_list_store_append (store, &amp;iter);
-        pixbuf = gdk_pixbuf_new_from_file ("file1.png", NULL);
-        gtk_list_store_set (store, &amp;iter, PIXBUF_COLUMN, pixbuf, TEXT_COLUMN, "Icon 1", -1);
-        g_object_unref (pixbuf);
-
-        gtk_list_store_append (store, &amp;iter);
-        pixbuf = gdk_pixbuf_new_from_file ("file2.png", NULL);
-        gtk_list_store_set (store, &amp;iter, PIXBUF_COLUMN, pixbuf, TEXT_COLUMN, "Icon 2", -1);
-        g_object_unref (pixbuf);
-
-        /* more icons ... */ 
-      }
-
-      int 
-      main (int argc, char *argv[])
-      {
-        GtkWidget *icon_view;
-        GtkListStore *store;
-
-        gtk_init (&amp;argc, &amp;argv);
-
-        /* do other initialization... */
-
-        /* construct the GtkIconView */
-        icon_view = gtk_icon_view_new (<!-- -->);
-        store = gtk_list_store_new (3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER);
-
-        gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (icon_view), PIXBUF_COLUMN);
-        gtk_icon_view_set_text_column (GTK_ICON_VIEW (icon_view), TEXT_COLUMN);
-        gtk_icon_view_set_model (GTK_ICON_VIEW (icon_view), GTK_TREE_MODEL (store));
-
-        fill_model (store);
-
-        /* ... */
-      }
-    </programlisting></informalexample>
-    This example uses a #GtkListStore as model, but part of the elegance of the 
-    model-view pattern is that you can easily use another tree model implementation, 
-    or even write your own custom tree model.
-  </para>
-
-  <para>
-    Your application may make use of extra data attached to the icons in the 
-    <structname>GnomeIconList</structname> via gnome_icon_list_set_icon_data() and 
-    gnome_icon_list_get_icon_data(). With #GtkIconView such data is most 
-    conveniently stored in an extra column in the tree model, so you would 
-    call a function like
-    <informalexample><programlisting>
-    void 
-    set_icon_data (GtkIconView *icon_view,
-                   gint         idx,
-                   gpointer     data)
-    {
-       GtkTreeModel *model;
-       GtkTreeIter iter;
-
-       model = gtk_icon_view_get_model (icon_view);
-    
-       if (gtk_tree_model_iter_nth_child (model, &amp;iter, NULL, idx))
-         gtk_list_store_set (GTK_LIST_STORE (model), &amp;iter, 
-                             DATA_COLUMN, data, -1);
-    }
-    </programlisting></informalexample>
-    assuming that your tree model has a <literal>DATA_COLUMN</literal> of type 
-    %G_TYPE_POINTER.
-  </para>
-
-  <para>
-    There is a number of minor API differences between 
-    <structname>GnomeIconList</structname> and 
-    <structname>GtkIconView</structname>:
-    <itemizedlist> 
-     <listitem><para>
-       <type>GnomeIconListMode</type> is replaced by the 
-       <link linkend="GtkIconView--orientation">orientation</link> 
-       property of <structname>GtkIconView</structname>
-     </para></listitem>
-     <listitem><para>
-       <structname>GtkIconView</structname> can not be frozen in the same 
-       way as <structname>GnomeIconList</structname> can with 
-       gnome_icon_list_freeze() and gnome_icon_list_thaw(). Instead you can 
-       replace the whole model of a <structname>GtkIconView</structname>, 
-       instead of doing many small changes to the existing model.
-     </para></listitem>
-    </itemizedlist>
-  </para> 
-</chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
-End:
--->

docs/reference/gtk/migrating-GtkLabel-links.sgml

@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-label-links">
-
-  <title>Migrating from SexyUrlLabel to GtkLabel</title>
-
-  <para>
-    GTK+ 2.18 supports showing links inside a #GtkLabel, similar to
-    SexyUrlLabel. Porting from SexyUrlLabel to GtkLabel is relatively
-    straightforward. GtkLabel accepts links in the markup using the
-    same HTML <tag>a</tag> notation that SexyUrlLabel uses. In addition
-    to the href attribute, GtkLabel accepts a title attribute that
-    is displayed as a tooltip on the link. Instead of
-    sexy_url_label_set_markup(), just call gtk_label_set_markup().
-  </para>
-  <para>
-    One difference between the two APIs is that the ::url-activated signal
-    from SexyUrlLabel has been replaced by the #GtkLabel::activate-link
-    signal. The need for connecting to this signal is greatly reduced,
-    since GtkLabel has a default handler that calls gtk_show_uri().
-  </para>
-</chapter>

docs/reference/gtk/migrating-GtkLinkButton.sgml

@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-GtkLinkButton">
-
-  <title>Migrating from GnomeHRef to GtkLinkButton</title>
-
-  <para>
-    Since version 2.10, GTK+ provides the #GtkLinkButton widget as a
-    replacement for the <structname>GnomeHRef</structname> widget
-    in the libgnomeui library.
-  </para>
-
-  <para>
-    Porting an application from <structname>GnomeHRef</structname> to
-    #GtkLinkButton is very simple. #GtkLinkButton does not have a
-    default action for #GtkButton::clicked signal. So instead of simply 
-    creating the widget
-    <informalexample><programlisting>
-      GtkWidget *button;
-
-      button = gnome_href_new (url, "");
-    </programlisting></informalexample>
-    you will have to handle the activation of the #GtkLinkButton, using
-    the ::clicked signal for instance
-    <informalexample><programlisting>
-      static void
-      link_button_clicked_cb (GtkWidget *widget,
-                              gpointer   data)
-      {
-        const gchar *link;
-
-	link = gtk_link_button_get_uri (GTK_LINK_BUTTON (widget));
-	open_browser_at_url (link);
-      }
-
-      /* ... */
-      
-        GtkWidget *button;
-
-	button = gtk_link_button_new (url);
-	g_signal_connect (button, "clicked",
-	                  G_CALLBACK (link_button_clicked_cb), NULL);
-     </programlisting></informalexample>
-    If you have more than one #GtkLinkButton instead of connecting
-    a signal to each one, you can use a "hook function" which will be
-    called whenever a user activates a link button
-    <informalexample><programlisting>
-      static void
-      link_button_hook (GtkLinkButton *button,
-                        const gchar   *link,
-			gpointer       user_data)
-      
-      {
-        open_browser_at_url (link);
-      }
-      
-      /* ... */
-      
-        GtkWidget *button1 = gtk_link_button_new (uri1);
-	GtkWidget *button2 = gtk_link_button_new (uri2);
-
-        gtk_link_button_set_uri_hook (link_button_hook, NULL, NULL);
-    </programlisting></informalexample>
-
-  </para>
-
-  <para>
-    Starting with GTK+ 2.16, it is no longer necessary to set up a uri hook
-    manually, since GTK+ now defaults to calling gtk_show_uri() if no uri
-    hook has been set.
-  </para>
-</chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
-End:
--->

docs/reference/gtk/migrating-GtkRecentChooser.sgml

@@ -1,323 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-GtkRecentChooser">
-  <chapterinfo>
-    <author>
-      <firstname>Emmanuele</firstname>
-      <lastname>Bassi</lastname>
-      <affiliation>
-        <address>
-	  <email>ebassi@gmail.com</email>
-	</address>
-      </affiliation>
-    </author>
-  </chapterinfo>
-
-  <title>Migrating from EggRecent to GtkRecentChooser</title>
-
-  <para>
-    Since version 2.10, GTK+ provides a way of handling the recently used
-    documents. It is similar to the code that has lived inside the libegg
-    library and has been incorporated by many applications. The GTK+ version
-    aims to completely replace that code, and offers many distinctive features
-    that improve the registration and visualization of the recently used
-    documents, such as:
-  </para>
-
-  <para>
-    <itemizedlist>
-      <listitem><para>
-        Better performances while reading and writing the list of recently used
-	files
-      </para></listitem>
-      <listitem><para>
-        More meta-data available for each recent document, like the
-	applications that have registered a document inside the list, the last
-	time and the number of times the same application did register a
-	document inside the list, an optional user readable name and
-	description of the document
-      </para></listitem>
-      <listitem><para>
-        Improved the ability to sort and filter the documents, also using
-	custom sorting and filtering functions
-      </para></listitem>
-      <listitem><para>
-        New widgets for displaying the list, and better integration with
-	current #GtkFileChooser and #GtkUIManager widgets
-      </para></listitem>
-    </itemizedlist>
-  </para>
-
-  <section id="gtkrecent-manager">
-    <title>Managing the Recently Used Documents</title>
-
-    <para>
-      #GtkRecentManager is used to manage the Recently Used Documents. To
-      create a new #GtkRecentManager, you simply call gtk_recent_manager_new().
-      Like the <structname>EggRecentModel</structname> inside EggRecent, the
-      #GtkRecentManager loads the list of the recent documents and notifies
-      you of changes inside the list.
-    </para>
-
-    <para>
-      Usually, instead of creating a new #GtkRecentManager each time you
-      need it, you'll want to use the gtk_recent_manager_get_default()
-      function.
-    </para>
-
-    <para>
-      To add a document to the list, you can use gtk_recent_manager_add_item(),
-      like:
-      <informalexample><programlisting>
-        GtkRecentManager *manager;
-
-	manager = gtk_recent_manager_new (<!-- -->);
-
-	if (!gtk_recent_manager_add_item (manager, document_uri))
-	  {
-	    /* warn about the error */
-	  }
-	
-	g_object_unref (manager);
-      </programlisting></informalexample>
-      The gtk_recent_manager_add_item() function will try and guess some of the
-      meta-data associated to a URI. If you know some of meta-data about the
-      document yourself, set the desired fields of a #GtkRecentData structure
-      and pass it to the gtk_recent_manager_add_full() function instead:
-      <informalexample><programlisting>
-        GtkRecentManager *manager;
-        GtkRecentData *recent_data;
-
-	manager = gtk_recent_manager_new (<!-- -->);
-	
-	recent_data = g_new0 (GtkRecentData, 1);
-	/* the user visible name of the document (maybe its title); should
-	 * be preferred when displaying the item into the list
-	 */
-        recent_data-&gt;display_name = document_name;
-	
-	/* the MIME type is mandatory */
-	recent_data-&gt;mime_type = document_mime_type;
-
-	/* the name of the application that is registering the document
-	 * (also mandatory); usually, the same name you used with
-	 * the g_set_application_name (<!-- -->) function.
-	 */
-	recent_data-&amp;app_name = APP_NAME;
-
-	/* the command to open a file; the %u string will be automagically
-	 * expanded to the document's URI when getting the application's
-	 * command line from the GtkRecentInfo object with
-	 * gtk_recent_info_get_application_info (<!-- -->)
-	 */
-	recent_data-&amp;app_exec = g_strjoin (" ", g_get_prgname (<!-- -->), "--open-file", "%u", NULL);
-
-	if (!gtk_recent_manager_add_full (manager, document_uri, recent_data))
-	  {
-	    /* warn about the error */
-	  }
-
-	g_free (recent_data-&gt;app_exec);
-	g_free (recent_data);
-	g_object_unref (manager);
-      </programlisting></informalexample>
-    </para>
-
-    <para>
-      Getting the list of items is also similar to
-      <structname>EggRecentModel</structname>; the GtkRecentInfo data is
-      allocated at look up time in order not to waste memory keeping it
-      around, so you must remember to free the data inside the list and then
-      the list itself when you are done using it:
-      <informalexample><programlisting>
-        GtkRecentManager *manager;
-        GList *recent_items, *l;
-
-	manager = gtk_recent_manager_get_default(<!-- -->);
-
-	recent_items = gtk_recent_manager_get_items (manager);
-	for (l = recent_items; l != NULL; l = l-&gt;next)
-	  {
-	    GtkRecentInfo *recent_info = l-&gt;data;
-
-	    do_something_with_the_item (recent_info);
-	  }
-	
-	/* free everything and the list */
-	g_list_foreach (recent_items, (GFunc) gtk_recent_info_unref, NULL);
-	g_list_free (recent_items);
-      </programlisting></informalexample>
-      You can also look up a single item:
-      <informalexample><programlisting>
-        GtkRecentInfo *recent_info;
-	GError *error = NULL;
-
-	recent_info = gtk_recent_manager_lookup_item (manager, document_uri, &amp;error);
-	if (error)
-	  {
-	    display_error (error);
-
-	    g_error_free (error);
-	  }
-	else
-	  {
-	    do_something_with_the_item (recent_info);
-
-	    gtk_recent_info_unref (recent_info);
-	  }
-      </programlisting></informalexample>
-      The #GtkRecentInfo is a reference counted boxed type, and it holds all
-      the meta-data of a recently used document, like its display name, its
-      description, the list of each application that has registered the
-      document or the list of groups to which the document belong.
-    </para>
-  
-  </section> <!-- gtkrecent-manager -->
-
-  <section id="gtkrecent-chooser">
-    <title>Displaying the Recently Used Documents</title>
-
-    <para>
-      Displaying the Recently Used Documents list is handled by any widget
-      implementing the #GtkRecentChooser interface. These widgets also handle
-      the sorting and filtering of the list; they will create their own
-      #GtkRecentManager objects by default:
-      <informalexample><programlisting>
-        GtkWidget *chooser;
-	gint response;
-
-	/* create a new dialog with the recently used documents list shown
-	 * using a GtkTreeView widget
-	 */
-	chooser = gtk_recent_chooser_dialog_new ("Recent Documents",
-	                                         parent_window,
-						 GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL,
-						 GTK_STOCK_OPEN, GTK_RESPONSE_OK,
-						 NULL);
-        /* set the sorting order to "most recently used first" */
-	gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (chooser), GTK_RECENT_SORT_MRU);
-	response = gtk_dialog_run (GTK_DIALOG (chooser));
-	if (response == GTK_RESPONSE_OK)
-	  {
-	    GtkRecentInfo *info;
-
-            info = gtk_recent_chooser_get_current_item (GTK_RECENT_CHOOSER (chooser));
-	    do_something_with_the_item (info);
-
-	    gtk_recent_info_unref (info);
-	  }
-	
-	gtk_widget_destroy (chooser);
-      </programlisting></informalexample>
-    </para>
-    
-  </section> <!-- gtkrecent-chooser -->
-
-  <section id="gtkrecent-advanced">
-    <title>Advanced usage</title>
-
-    <para>
-      The #GtkRecentChooser widgets might display items sorted and filtered,
-      either with already supplied or custom sorting and filtering functions.
-      The biggest difference from the <structname>EggRecentView</structname>
-      widgets in EggRecent is that the #GtkRecentChooser widgets will use
-      their own copy of the list and will apply the sorting and filtering
-      functions only on the copy; this allows the creation of many viewers
-      with a single controller, like using many #GtkTreeView with a single
-      #GtkTreeModel instance.
-    </para>
-
-    <para>
-      Available sorting methods are:
-      <informalexample><programlisting>
-        /* no sorting */
-	gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (chooser), GTK_RECENT_SORT_NONE);
-	
-        /* most recently used first */
-	gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (chooser), GTK_RECENT_SORT_MRU);
-	
-	/* most recently used last */
-	gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (chooser), GTK_RECENT_SORT_LRU);
-      </programlisting></informalexample>
-      You can create your own sorting function, and the use the
-      GTK_RECENT_SORT_CUSTOM method:
-      <informalexample><programlisting>
-	/* custom sorting function, based on the registration count
-	 * (most used first)
-	 */
-	static void
-	sort_by_usage_count (GtkRecentInfo *a,
-                             GtkRecentInfo *b,
-                             gpointer       data)
-        {
-	  gint count_a, count_b;
-
-	  count_a = count_b = 0;
-
-	  if (gtk_recent_info_has_application (a, APP_NAME))
-	    gtk_recent_info_get_application_info (a, APP_NAME, NULL, &amp;count_a, NULL);
-
-	  if (gtk_recent_info_has_application (b, APP_NAME))
-	    gtk_recent_info_get_application_info (b, APP_NAME, NULL, &amp;count_b, NULL);
-
-	  return count_a &lt; count_b;
-	}
-
-	...
-
-	  /* set custom sorting and set the custom sorting function */
-	  gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (chooser),
-	                                    GTK_RECENT_SORT_CUSTOM);
-	  gtk_recent_chooser_set_sort_func (GTK_RECENT_CHOOSER,
-	                                    sort_by_usage_count,
-			  		    NULL, /* sort function data */
-					    NULL  /* destroy notify for the data */);
-      </programlisting></informalexample>
-    </para>
-
-    <para>
-      Filtering is done using the #GtkRecentFilter object, similar to the
-      #GtkFileFilter object used by the #GtkFileChooser widgets. The
-      #GtkRecentFilter object has a set of pre-defined options based on the
-      meta-data exposed by the #GtkRecentInfo object. It also allows custom
-      filtering function:
-      <informalexample><programlisting>
-        GtkRecentFilter *filter;
-
-	filter = gtk_recent_filter_new (<!-- -->);
-	
-	/* set the user visible name of the filter */
-	gtk_recent_filter_set_name (filter, "Since Last Month");
-
-	/* set the maximum age of a recently used document */
-	gtk_recent_filter_set_age (filter, 31);
-
-	/* the chooser takes the ownership of the object */
-	gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (chooser), filter);
-
-	/* set the currently used filter */
-	gtk_recent_chooser_set_filter (GTK_RECENT_CHOOSER (chooser), filter);
-
-	filter = gtk_recent_filter_new (<!-- -->);
-	gtk_recent_filter_set_name (filter, "Every text file");
-	gtk_recent_filter_set_mime_type (filter, "text/plain");
-
-	gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (chooser), filter);
-      </programlisting></informalexample>
-      The #GtkRecentChooserWidget and #GtkRecentChooserDialog widgets allow
-      multiple filters and the selection of an appropriate one; the
-      #GtkRecentChooserMenu widget allows just a single filter object.
-    </para>
-    
-  </section> <!-- gtkrecent-advanced -->
-  
-</chapter>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gtk-docs.sgml" "book" "part" "chapter")
-End:
--->

docs/reference/gtk/migrating-GtkStyleContext.xml

@@ -0,0 +1,691 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<section id="gtk-migrating-GtkStyleContext">
+  <title>Theming changes</title>
+
+  <para>
+    In GTK+ 3.0, #GtkStyleContext was added to replace #GtkStyle and
+    the theming infrastructure available in 2.x. GtkStyleContext is an
+    object similar in spirit to GtkStyle, as it contains theming information,
+    although in a more complete and tokenized fashion. There are two aspects
+    to switching to GtkStyleContext: porting themes and theme engines, and
+    porting applications, libraries and widgets.
+  </para>
+
+  <section id="gtk-migrating-GtkStyleContext-themes">
+    <title>Migrating themes</title>
+
+    <para>
+      From GTK+ 3.0 on, theme engines must implement #GtkThemingEngine and be
+      installed in <filename>$libdir/gtk+-3.0/$GTK_VERSION/theming-engines</filename>,
+      and the files containing style information must be written in the CSS-like
+      format that is understood by #GtkCssProvider. For a theme named
+      "Clearlooks", the CSS file parsed by default is
+      <filename>$datadir/themes/Clearlooks/gtk-3.0/gtk.css</filename>,
+      with possible variants such as the dark theme being named
+      <filename>gtk-dark.css</filename> in the same directory.
+    </para>
+
+    <para>
+      If your theme RC file was providing values for #GtkSettings, you
+      can install a <filename>settings.ini</filename> keyfile along with
+      the <filename>gtk.css</filename> to provide theme-specific defaults
+      for settings.
+    </para>
+
+    <para>
+      Key themes have been converted to CSS syntax too. See the
+      <link linkend="css-binding-set">GtkCssProvider</link> documentation
+      information about the syntax. GTK+ looks for key themes in the file
+      <filename>$datadir/themes/<replaceable>theme</replaceable>/gtk-3.0/gtk-keys.css</filename>, where <replaceable>theme</replaceable> is the current
+      key theme name.
+    </para>
+  </section>
+
+  <section id="gtk-migrating-theme-GtkStyleContext-engines">
+    <title>Migrating theme engines</title>
+
+    <para>
+      Migrating a #GtkStyle based engine to a #GtkThemingEngine based one
+      should be straightforward for most of the vfuncs. Besides a cleanup
+      in the available paint methods and a simplification in the passed
+      arguments (in favor of #GtkStyleContext containing all the information),
+      the available render methods resemble those of #GtkStyle quite
+      evidently. Notable differences include:
+    </para>
+
+    <orderedlist>
+      <listitem>
+        All variations of gtk_paint_box(), gtk_paint_flat_box(),
+        gtk_paint_shadow(), gtk_paint_box_gap() and gtk_paint_shadow_gap()
+        are replaced by gtk_render_background(), gtk_render_frame() and
+        gtk_render_frame_gap(). The first function renders frameless
+        backgrounds and the last two render frames in various forms.
+      </listitem>
+      <listitem>
+        gtk_paint_resize_grip() has been subsumed by gtk_render_handle()
+        with a #GTK_STYLE_CLASS_GRIP class set in the style context.
+      </listitem>
+      <listitem>
+        gtk_paint_spinner() disappears in favor of gtk_render_activity()
+        with a #GTK_STYLE_CLASS_SPINNER class set in the style context.
+      </listitem>
+    </orderedlist>
+
+    <para>
+      The list of available render methods is:
+    </para>
+
+    <simplelist>
+      <member>
+        gtk_render_background(): Renders a widget/area background.
+      </member>
+      <member>
+        gtk_render_frame(): Renders a frame border around the given rectangle.
+        Usually the detail of the border depends on the theme information,
+        plus the current widget state.
+      </member>
+      <member>
+        gtk_render_frame_gap(): Renders a frame border with a gap on one side.
+      </member>
+      <member>
+        gtk_render_layout(): Renders a #PangoLayout.
+      </member>
+      <member>
+        gtk_render_handle(): Renders all kind of handles and resize grips,
+        depending on the style class.
+      </member>
+      <member>
+        gtk_render_check(): Render checkboxes.
+      </member>
+      <member>
+        gtk_render_option(): Render radiobuttons.
+      </member>
+      <member>
+        gtk_render_arrow(): Renders an arrow pointing to a direction.
+      </member>
+      <member>
+        gtk_render_expander(): Renders an expander indicator, such as in
+        #GtkExpander.
+      </member>
+      <member>
+        gtk_render_focus(): Renders the indication that a widget has the
+        keyboard focus.
+      </member>
+      <member>
+        gtk_render_line(): Renders a line from one coordinate to another.
+      </member>
+      <member>
+        gtk_render_slider(): Renders a slider, such as in #GtkScale.
+      </member>
+      <member>
+        gtk_render_extension(): Renders an extension that protrudes from
+        a UI element, such as a notebook tab.
+      </member>
+      <member>
+        gtk_render_activity(): Renders an area displaying activity, be it
+        a progressbar or a spinner.
+      </member>
+      <member>
+        gtk_render_icon_pixbuf(): Renders an icon into a #GdkPixbuf.
+      </member>
+    </simplelist>
+
+    <para>
+      One of the main differences to #GtkStyle-based engines is that the
+      rendered widget is totally isolated from the theme engine, all style
+      information is meant to be retrieved from the #GtkThemingEngine API,
+      or from the #GtkWidgetPath obtained from gtk_theming_engine_get_path(),
+      which fully represents the rendered widget's hierarchy from a styling
+      point of view.
+    </para>
+
+    <para>
+      The detail string available in #GtkStyle-based engines has been
+      replaced by widget regions and style classes. Regions are a way for
+      complex widgets to associate different styles with different areas,
+      such as even and odd rows in a treeview. Style classes allow sharing
+      of style information between widgets, regardless of their type.
+      Regions and style classes can be used in style sheets to associate
+      styles, and them engines can also access them. There are several
+      predefined classes and regions such as %GTK_STYLE_CLASS_BUTTON or
+      %GTK_STYLE_REGION_TAB in <filename>gtkstylecontext.h</filename>,
+      although custom widgets may define their own, which themes may
+      attempt to handle.
+    </para>
+
+  </section>
+
+  <section id="gtk-migrating-GtkStyleContext-parser-extensions">
+    <title>Extending the CSS parser</title>
+
+    <para>
+      In #GtkStyle-based engines, #GtkRCStyle provided ways to extend the
+      gtkrc parser with engine-specific extensions. This has been replaced
+      by gtk_theming_engine_register_property(), which lets a theme engine
+      register new properties with an arbitrary type. While there is built-in
+      support for most basic types, it is possible to use a custom parser
+      for the property.
+    </para>
+
+    <para>
+      The installed properties depend on the #GtkThemeEngine::name property,
+      so they should be added in the <literal>constructed()</literal> vfunc.
+      For example, if an engine with the name "Clearlooks" installs a
+      "focus-color" property with the type #GdkRGBA, the property
+      <literal>-Clearlooks-focus-color</literal> will be registered and
+      accepted in CSS like this:
+      <informalexample><programlisting>
+      GtkEntry {
+        -Clearlooks-focus-color: rgba(255, 0, 0, 1.0);
+      }
+      </programlisting></informalexample>
+    </para>
+
+    <para>
+      Widget style properties also follow a similar syntax, with the widget
+      type name used as a prefix. For example, the #GtkWidget:focus-line-width
+      style property can be modified in CSS as
+      <literal>-GtkWidget-focus-line-width</literal>.
+    </para>
+  </section>
+
+  <section id="gtk-migrating-GtkStyleContext-css">
+    <title>Using the CSS file format</title>
+
+    <para>
+      The syntax of RC and CSS files formats is obviously different.
+      The CSS-like syntax will hopefully be much more familiar to many
+      people, lowering the barrier for custom theming.
+    </para>
+    <para>
+      Instead of going through the syntax differences one-by-one, we
+      will present a more or less comprehensive example and discuss
+      how it can be translated into CSS:
+    </para>
+
+    <example>
+      <title>Sample RC code</title>
+      <programlisting>
+        style "default" {
+                xthickness = 1
+                ythickness = 1
+
+                GtkButton::child-displacement-x = 1
+                GtkButton::child-displacement-y = 1
+                GtkCheckButton::indicator-size = 14
+
+                bg[NORMAL]        = @bg_color
+                bg[PRELIGHT]      = shade (1.02, @bg_color)
+                bg[SELECTED]      = @selected_bg_color
+                bg[INSENSITIVE]   = @bg_color
+                bg[ACTIVE]        = shade (0.9, @bg_color)
+
+                fg[NORMAL]        = @fg_color
+                fg[PRELIGHT]      = @fg_color
+                fg[SELECTED]      = @selected_fg_color
+                fg[INSENSITIVE]   = darker (@bg_color)
+                fg[ACTIVE]        = @fg_color
+
+                text[NORMAL]      = @text_color
+                text[PRELIGHT]    = @text_color
+                text[SELECTED]    = @selected_fg_color
+                text[INSENSITIVE] = darker (@bg_color)
+                text[ACTIVE]      = @selected_fg_color
+
+                base[NORMAL]      = @base_color
+                base[PRELIGHT]    = shade (0.95, @bg_color)
+                base[SELECTED]    = @selected_bg_color
+                base[INSENSITIVE] = @bg_color
+                base[ACTIVE]      = shade (0.9, @selected_bg_color)
+
+                engine "clearlooks" {
+                        colorize_scrollbar = TRUE
+                        style = CLASSIC
+                }
+        }
+
+        style "tooltips" {
+                xthickness = 4
+                ythickness = 4
+
+                bg[NORMAL]        = @tooltip_bg_color
+                fg[NORMAL]        = @tooltip_fg_color
+        }
+
+        style "button" {
+                xthickness = 3
+                ythickness = 3
+
+                bg[NORMAL]        = shade (1.04, @bg_color)
+                bg[PRELIGHT]      = shade (1.06, @bg_color)
+                bg[ACTIVE]        = shade (0.85, @bg_color)
+        }
+
+        style "entry" {
+                xthickness = 3
+                ythickness = 3
+
+                bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color)
+                fg[SELECTED] = @text_color
+
+                engine "clearlooks" {
+                        focus_color = shade (0.65, @selected_bg_color)
+                }
+        }
+
+        style "other" {
+                bg[NORMAL] = &num;fff;
+        }
+
+        class "GtkWidget" style "default"
+        class "GtkEntry" style "entry"
+        widget_class "*&lt;GtkButton&gt;" style "button"
+        widget "gtk-tooltip*" style "tooltips"
+        widget_class "window-name.*.GtkButton" style "other"
+      </programlisting>
+    </example>
+
+    <para>
+      would roughly translate to this CSS:
+    </para>
+
+    <example>
+      <title>CSS translation</title>
+      <programlisting>
+        * {
+          padding: 1;
+          -GtkButton-child-displacement-x: 1;
+          -GtkButton-child-displacement-y: 1;
+          -GtkCheckButton-indicator-size: 14;
+
+          background-color: @bg_color;
+          color: @fg_color;
+
+          -Clearlooks-colorize-scrollbar: true;
+          -Clearlooks-style: classic;
+        }
+
+        *:hover {
+          background-color: shade (@bg_color, 1.02);
+        }
+
+        *:selected {
+          background-color: @selected_bg_color;
+          color: @selected_fg_color;
+        }
+
+        *:insensitive {
+          color: shade (@bg_color, 0.7);
+        }
+
+        *:active {
+          background-color: shade (@bg_color, 0.9);
+        }
+
+        .tooltip {
+          padding: 4;
+
+          background-color: @tooltip_bg_color;
+          color: @tooltip_fg_color;
+        }
+
+        .button {
+          padding: 3;
+          background-color: shade (@bg_color, 1.04);
+        }
+
+        .button:hover {
+          background-color: shade (@bg_color, 1.06);
+        }
+
+        .button:active {
+          background-color: shade (@bg_color, 0.85);
+        }
+
+        .entry {
+          padding: 3;
+
+          background-color: @base_color;
+          color: @text_color;
+        }
+
+        .entry:selected {
+          background-color: mix (@selected_bg_color, @base_color, 0.4);
+          -Clearlooks-focus-color: shade (0.65, @selected_bg_color)
+        }
+
+        /* The latter selector is an specification of the first,
+           since any widget may use the same classes or names */
+        &num;window-name .button,
+        GtkWindow&num;window-name GtkButton.button {
+          background-color: &num;fff;
+        }
+      </programlisting>
+    </example>
+
+    <para>
+      One notable difference is the reduction from fg/bg/text/base colors
+      to only foreground/background, in exchange the widget is able to render
+      its various elements with different CSS classes, which can be themed
+      independently.
+    </para>
+
+    <para>
+      In the same vein, the light, dark and mid color variants that
+      were available in GtkStyle should be replaced by a combination of
+      symbolic colors and custom CSS, where necessary. text_aa should
+      really not be used anywhere, anyway, and the white and black colors
+      that were available in GtkStyle can just be replaced by literal
+      GdkRGBA structs.
+    </para>
+
+    <para>
+      Access to colors has also changed a bit. With #GtkStyle, the common
+      way to access colors is:
+      <informalexample><programlisting>
+      GdkColor *color1;
+      GdkColor color2;
+
+      color1 = &amp;style->bg[GTK_STATE_PRELIGHT];
+      gtk_style_lookup_color (style, "focus_color", &amp;color2);
+      </programlisting></informalexample>
+      With #GtkStyleContext, you generally use #GdkRGBA instead of #GdkColor
+      and the code looks like this:
+      <informalexample><programlisting>
+      GdkRGBA *color1;
+      GdkRGBA  color2;
+
+      gtk_style_context_get (context, GTK_STATE_FLAG_PRELIGHT,
+                             "background-color", &amp;color1,
+                             NULL);
+      gtk_style_context_lookup_color (context, "focus_color", &amp;color2);
+
+      ...
+
+      gdk_rgba_free (color1);
+      </programlisting></informalexample>
+      Note that the memory handling here is different: gtk_style_context_get()
+      expects the address of a GdkRGBA* and returns a newly allocated struct,
+      gtk_style_context_lookup_color() expects the address of an existing
+      struct, and fills it.
+    </para>
+
+    <para>
+      It is worth mentioning that the new file format does not support
+      custom keybindings nor stock icon mappings as the RC format did.
+    </para>
+  </section>
+
+  <section id="gtk-migrating-GtkStyleContext-checklist">
+    <title>A checklist for widgets</title>
+
+    <para>
+      When porting your widgets to use #GtkStyleContext, this checklist
+      might be useful.
+    </para>
+
+    <orderedlist>
+      <listitem>
+        Replace #GtkWidget::style-set handlers with
+        #GtkWidget::style-updated handlers.
+      </listitem>
+
+      <listitem>
+        <para>
+          Try to identify the role of what you're rendering with any number
+          of classes. This will replace the detail string. There is a predefined
+          set of CSS classes which you can reuse where appropriate. Doing so
+          will give you theming 'for free', whereas custom classes will require
+          extra work in the theme. Note that complex widgets are likely to
+          need different styles when rendering different parts, and style
+          classes are one way to achieve this. This could result in code like
+          the following (simplified) examples:
+        </para>
+
+        <example>
+          <title>Setting a permanent CSS class</title>
+          <programlisting>
+            static void
+            gtk_button_init (GtkButton *button)
+            {
+              GtkStyleContext *context;
+
+              ...
+
+              context = gtk_widget_get_style_context (GTK_WIDGET (button));
+
+              /* Set the "button" class */
+              gtk_style_context_add_class (context, GTK_STYLE_CLASS_BUTTON);
+            }
+          </programlisting>
+        </example>
+
+        <para>
+          Or
+        </para>
+
+        <example>
+          <title>Using dynamic CSS classes for different elements</title>
+          <programlisting>
+            static gboolean
+            gtk_spin_button_draw (GtkSpinButton *spin,
+                                  cairo_t       *cr)
+            {
+              GtkStyleContext *context;
+
+              ...
+
+              context = gtk_widget_get_style_context (GTK_WIDGET (spin));
+
+              gtk_style_context_save (context);
+              gtk_style_context_add_class (context, GTK_STYLE_CLASS_ENTRY);
+
+              /* Call to entry draw impl with "entry" class */
+              parent_class->draw (spin, cr);
+
+              gtk_style_context_restore (context);
+              gtk_style_context_save (context);
+
+              /* Render up/down buttons with the "button" class */
+              gtk_style_context_add_class (context, GTK_STYLE_CLASS_BUTTON);
+              draw_up_button (spin, cr);
+              draw_down_button (spin, cr);
+
+              gtk_style_context_restore (context);
+
+              ...
+            }
+          </programlisting>
+        </example>
+
+        <para>
+          Note that #GtkStyleContext only provides fg/bg colors, so text/base
+          is done through distinctive theming of the different classes. For
+          example, an entry would usually be black on white while a button
+          would usually be black on light grey.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          Replace all <literal>gtk_paint_*()</literal> calls with corresponding
+          <literal>gtk_render_*()</literal> calls.
+        </para>
+        <para>
+          The most distinctive changes are the use of #GtkStateFlags to
+          represent the widget state and the lack of #GtkShadowType. Note
+          that widget state is now passed implicitly via the context, so
+          to render in a certain state, you have to temporarily set the
+          state on the context, as in the following example:
+        </para>
+        <example>
+          <title>Rendering with a specific state</title>
+          <programlisting>
+            gtk_style_context_save (context);
+            gtk_style_context_set_state (context, GTK_STATE_FLAG_ACTIVE);
+            gtk_render_check (context, cr, x, y, width, height);
+            gtk_style_context_restore (context);
+          </programlisting>
+        </example>
+        <para>
+          For gtk_render_check() and gtk_render_option(), the @shadow_type
+          parameter is replaced by the #GTK_STATE_FLAG_ACTIVE and
+          #GTK_STATE_FLAG_INCONSISTENT state flags. For things such as
+          pressed/unpressed button states, #GTK_STATE_FLAG_ACTIVE is used,
+          and the CSS may style normal/active states differently to render
+          outset/inset borders, respectively.
+        </para>
+      </listitem>
+
+      <listitem>
+        The various <literal>gtk_widget_modify_*()</literal> functions to
+        override colors or fonts for individual widgets have been replaced
+        by similar <literal>gtk_widget_override_*()</literal> functions.
+      </listitem>
+
+      <listitem>
+        It is no longer necessary to call gtk_widget_style_attach(),
+        gtk_style_attach(), gtk_style_detach() or gtk_widget_ensure_style().
+      </listitem>
+
+      <listitem>
+        Replace all uses of xthickness/ythickness. #GtkStyleContext uses the
+        CSS box model, and there are border-width/padding/margin properties to
+        replace the different applications of X and Y thickness. Note that all
+        of this is merely a guideline. Widgets may choose to follow it or not.
+      </listitem>
+    </orderedlist>
+  </section>
+
+  <section id="gtk-migrating-GtkStyleContext-parsing">
+    <title>Parsing of custom resources</title>
+    <para>
+      As a consequence of the RC format going away, calling gtk_rc_parse() or
+      gtk_rc_parse_string() won't have any effect on a widgets appearance.
+      The way to replace these calls is using a custom #GtkStyleProvider,
+      either for an individual widget through gtk_style_context_add_provider()
+      or for all widgets on a screen through gtk_style_context_add_provider_for_screen().
+      Typically, the provider will be a #GtkCssProvider, which parse CSS
+      information from a file or from a string.
+    </para>
+    <example>
+      <title>Using a custom GtkStyleProvider</title>
+      <programlisting>
+        GtkStyleContext *context;
+        GtkCssProvider *provider;
+
+        context = gtk_widget_get_style_context (widget);
+        provider = gtk_css_provider_new ();
+        gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (provider),
+                                         ".frame1 {\n"
+                                         "   border-image: url('gradient1.png') 10 10 10 10 stretch;\n"
+                                         "}\n", -1, NULL);
+        gtk_style_context_add_provider (context,
+                                        GTK_STYLE_PROVIDER (provider),
+                                        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+        g_object_unref (provider);
+      </programlisting>
+    </example>
+    <para>
+      Notice that you can also get style information from custom resources
+      by implementing the #GtkStyleProvider interface yourself. This is
+      an advanced feature that should be rarely used.
+    </para>
+  </section>
+
+  <section id="gtk-migrating-GtkStyleContext-bonus-points">
+    <title>Bonus points</title>
+
+    <para>
+      There are some features in #GtkStyleContext that were not available in
+      #GtkStyle, or were made available over time for certain widgets through
+      extending the detail string in obscure ways. There is a lot more
+      information available when rendering UI elements, and it is accessible
+      in more uniform, less hacky ways. By going through this list you'll
+      ensure your widget is a good citizen in a fully themable user interface.
+    </para>
+
+    <orderedlist>
+      <listitem>
+        If your widget renders a series of similar elements, such as tabs
+        in a #GtkNotebook or rows/column in a #GtkTreeView, consider adding
+        regions through gtk_style_context_add_region(). These regions can be
+        referenced in CSS and the :nth-child pseudo-class may be used to match
+        the elements depending on the flags passed.
+
+        <example>
+          <title>Theming widget regions</title>
+          <programlisting>
+            GtkNotebook tab {
+              background-color: &num;f3329d;
+            }
+
+            GtkTreeView row::nth-child (even) {
+              background-color: &num;dddddd;
+            }
+          </programlisting>
+        </example>
+      </listitem>
+
+      <listitem>
+        <para>
+          If your container renders child widgets within different regions,
+          make it implement GtkContainer::get_path_for_child(). This function
+          lets containers assign a special #GtkWidgetPath to child widgets
+          depending on their role/region. This is necessary to extend the
+          concept above throughout the widget hierarchy.
+        </para>
+
+        <para>
+          For example, a #GtkNotebook modifies the tab labels' #GtkWidgetPath
+          so the "tab" region is added. This makes it possible to theme tab
+          labels through:
+        </para>
+
+        <example>
+          <title>Theming a widget within a parent container region</title>
+          <programlisting>
+            GtkNotebook tab GtkLabel {
+              font: Sans 8;
+            }
+          </programlisting>
+        </example>
+
+      </listitem>
+
+      <listitem>
+        If you intend several visual elements to look interconnected,
+        make sure you specify rendered elements' connection areas with
+        gtk_style_context_set_junction_sides(). It is of course up to the
+        theme to make use of this information or not.
+      </listitem>
+
+      <listitem>
+        <para>
+          #GtkStyleContext supports implicit animations on state changes for
+          the most simple case out-of-the-box: widgets with a single animatable
+          area, whose state is changed with gtk_widget_set_state_flags() or
+          gtk_widget_unset_state_flags(). These functions trigger animated
+          transitions for the affected state flags. Examples of widgets for
+          which this kind of animation may be sufficient are #GtkButton or
+          #GtkEntry.
+        </para>
+        <para>
+          If your widget consists of more than a simple area, and these areas
+          may be rendered with different states, make sure to mark the rendered
+          areas with gtk_style_context_push_animatable_region() and
+          gtk_style_context_pop_animatable_region().
+        </para>
+
+        <para>
+          gtk_style_context_notify_state_change() may be used to trigger a
+          transition for a given state. The region ID will determine the
+          animatable region that is affected by this transition.
+        </para>
+      </listitem>
+    </orderedlist>
+  </section>
+</section>

docs/reference/gtk/migrating-GtkTooltip.sgml

@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-migrating-tooltips">
-
-  <title>Migrating from GtkTooltips to GtkTooltip</title>
-
-  <para>
-    GTK+ 2.12 brings a completely new tooltip implementation which
-    allows many things that were not possible with the old 
-    #GtkTooltips interface. The new possibilities are explained
-    in more detail in the section about #GtkTooltip. 
-  </para>
-
-  <para>
-    A number of complications of the old API have been removed:
-    <itemizedlist>
-
-      <listitem><para>
-        Tooltips can not be grouped anymore. The old tooltips
-        API allowed this by using multiple #GtkTooltips objects.
-        We believe that the timeout behaviour of the new tooltips 
-        implementation is better and makes it unnecessary to use 
-        grouping as a way to overcome shortcomings of the 
-        fast-tooltips mode.
-      </para></listitem>
-
-      <listitem><para>
-        Timeouts can not be set individually anymore. Instead
-        there are settings #GtkSettings:gtk-tooltip-timeout, 
-        #GtkSettings:gtk-tooltip-browse-timeout and
-        #GtkSettings:gtk-tooltip-browse-mode-timeout to influence
-        the behaviour of tooltips globally.
-      </para></listitem>
-
-    </itemizedlist>
-  </para>
-
-  <para>
-    Here is an example of setting a tooltip on a widget with the old API:
-    <informalexample><programlisting>
-GtkTooltips *tooltips = gtk_tooltips_new ();     
-gtk_tooltips_set_tip (tooltips, widget, "Some tips", NULL);
-    </programlisting></informalexample>
-  </para>
-  <para>
-    Using the new tooltips API, it is no longer necessary to create 
-    an object:
-    <informalexample><programlisting>
-gtk_widget_set_tooltip_text (widget, "Some tips");
-    </programlisting></informalexample>
-  </para>
-  <para>
-    Similarly, setting a tooltip on a #GtkToolItem gets
-    simplified from
-    <informalexample><programlisting>
-gtk_tool_item_set_tooltip (toolitem, toolbar->tooltips, "tool tip", NULL);
-    </programlisting></informalexample>
-    to
-    <informalexample><programlisting>
-gtk_tool_item_set_tooltip_text (toolitem, text);
-    </programlisting></informalexample>
-  </para>
-
-</chapter>

docs/reference/gtk/objects_grouped.sgml

@@ -127,7 +127,6 @@
 
 <emphasis>Misc. Objects</emphasis>
     <link linkend="GtkAdjustment">GtkAdjustment</link>
-    <link linkend="GtkItemFactory">GtkItemFactory</link>
     <link linkend="GtkInvisible">GtkInvisible</link>
 </literallayout></entry>
 

docs/reference/gtk/other_software.sgml

@@ -2,7 +2,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
-<refentry id="gtk-other-software" revision="5 Sept 2001">
+<refentry id="gtk-other-software">
 <refmeta>
 <refentrytitle>Mixing GTK+ with other software</refentrytitle>
 <manvolnum>3</manvolnum>