Update NEWS for 2.24.2

document-x-generic is not actually a mimetype. Using text-x-generic
instead lets us work out-of-the-box in a11y themes.

INSTALL.in

@@ -3,11 +3,11 @@ Prerequisites
 
 GTK+ requires the following packages:
 
- - The GLib, Pango, GdkPixbuf, ATK and cairo libraries, available at
-   the same location as GTK+. GTK+ @GTK_VERSION@ requires at least
-   GLib 2.23.6, Pango 1.20, GdkPixbuf 2.21.0 ATK 1.29.2 and cairo 1.6.0.
+ - The GLib, Pango, GdkPixbuf, ATK and cairo libraries, available at the same
+   location as GTK+. GTK+ @GTK_VERSION@ requires at least GLib 2.25.10,
+   Pango 1.20, GdkPixbuf 2.21.0, ATK 1.29.2 and cairo 1.6.0.
 
- - gobject-introspection 0.6.7 or newer.
+ - gobject-introspection 0.9.3 or newer.
 
 Simple install procedure
 ========================

Makefile.am

@@ -4,7 +4,9 @@ include $(top_srcdir)/Makefile.decl
 SRC_SUBDIRS = gdk gtk modules demos tests perf
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
 
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+# require automake 1.4
+AUTOMAKE_OPTIONS = 1.7
+ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST +=			\
 	HACKING			\
@@ -48,10 +50,14 @@ EXTRA_DIST +=			\
 	examples/buttons/info.xpm  \
 	examples/calendar/Makefile  \
 	examples/calendar/calendar.c  \
+	examples/clist/Makefile  \
+	examples/clist/clist.c  \
 	examples/entry/Makefile  \
 	examples/entry/entry.c  \
 	examples/eventbox/Makefile  \
 	examples/eventbox/eventbox.c  \
+	examples/filesel/Makefile  \
+	examples/filesel/filesel.c  \
 	examples/gtkdial/Makefile  \
 	examples/gtkdial/dial_test.c  \
 	examples/gtkdial/gtkdial.c  \
@@ -62,8 +68,11 @@ EXTRA_DIST +=			\
 	examples/helloworld2/helloworld2.c  \
 	examples/label/Makefile	\
 	examples/label/label.c	\
+	examples/list/Makefile  \
+	examples/list/list.c  \
 	examples/menu/Makefile  \
 	examples/menu/menu.c  \
+	examples/menu/itemfactory.c  \
 	examples/notebook/Makefile  \
 	examples/notebook/notebook.c  \
 	examples/packbox/Makefile  \
@@ -93,10 +102,14 @@ EXTRA_DIST +=			\
 	examples/statusbar/statusbar.c  \
 	examples/table/Makefile  \
 	examples/table/table.c  \
+	examples/text/Makefile  \
+	examples/text/text.c  \
 	examples/tictactoe/Makefile  \
 	examples/tictactoe/tictactoe.c  \
 	examples/tictactoe/tictactoe.h  \
 	examples/tictactoe/ttt_test.c  \
+	examples/tree/Makefile  \
+	examples/tree/tree.c  \
 	examples/wheelbarrow/Makefile  \
 	examples/wheelbarrow/wheelbarrow.c  \
 	examples/fixed/fixed.c  \
@@ -130,37 +143,37 @@ MAINTAINERCLEANFILES = \
 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+-$(GDKTARGET)-2.0.pc: gtk+-2.0.pc
+	rm -f gtk+-$(GDKTARGET)-2.0.pc && \
+	cp gtk+-2.0.pc gtk+-$(GDKTARGET)-2.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-$(GDKTARGET)-2.0.pc: gdk-2.0.pc
+	rm -f gdk-$(GDKTARGET)-2.0.pc && \
+	cp gdk-2.0.pc gdk-$(GDKTARGET)-2.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
+gtk+-$(GDKTARGET)-2.0-uninstalled.pc: gtk+-2.0-uninstalled.pc
+	rm -f gtk+-$(GDKTARGET)-2.0-uninstalled.pc && \
+	cp gtk+-2.0-uninstalled.pc gtk+-$(GDKTARGET)-2.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
+gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc
+	rm -f gdk-$(GDKTARGET)-2.0-uninstalled.pc && \
+	cp gdk-2.0-uninstalled.pc gdk-$(GDKTARGET)-2.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-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc gail.pc
 
 if OS_UNIX
-pkgconfig_DATA += gtk+-unix-print-3.0.pc
+pkgconfig_DATA += gtk+-unix-print-2.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			\
+	gtk+-unix-print-2.0.pc			\
+	gtk+-$(GDKTARGET)-2.0.pc		\
+	gdk-$(GDKTARGET)-2.0.pc			\
+	gail.pc					\
+	gtk+-$(GDKTARGET)-2.0-uninstalled.pc	\
+	gdk-$(GDKTARGET)-2.0-uninstalled.pc	\
+	gail-uninstalled.pc 			\
 	config.lt
 
 distclean-local:
@@ -182,21 +195,21 @@ 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
+## copy the default target for this platform to gdk-2.0.pc and gtk+-2.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) || \
+	 test -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc && \
+	 test -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc && \
+	 rm -f gdk-2.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc gdk-2.0.pc && \
+	 rm -f gtk+-2.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc gtk+-2.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)
+	 rm -f gdk-2.0.pc && cp -f gdk-$(GDKTARGET)-2.0.pc gdk-2.0.pc && \
+	 rm -f gtk+-2.0.pc && cp -f gtk+-$(GDKTARGET)-2.0.pc gtk+-2.0.pc)
 
 uninstall-local:
-	rm -f $(DESTDIR)$(pkgconfigdir)/gdk-3.0.pc
-	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc
+	rm -f $(DESTDIR)$(pkgconfigdir)/gdk-2.0.pc
+	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-2.0.pc
 
 dist-hook:
 	if test -f $(srcdir)/INSTALL.in && test -f $(srcdir)/README.in ; then \
@@ -230,11 +243,7 @@ sanity:
 snapshot:
 	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
-DISTCHECK_CONFIGURE_FLAGS =		\
-		--enable-gtk-doc 	\
-		--enable-man 		\
-		--disable-rebuilds 	\
-		--enable-introspection
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds --enable-introspection
 
 GITIGNOREFILES = \
 	po-properties/Makefile.in.in \

Makefile.decl

@@ -30,13 +30,17 @@ XVFB_START = \
 # call as: $(XVFB_START) && someprogram
 
 # test: run all tests in cwd and subdirs
-test:	${TEST_PROGS}
+test: test-cwd test-recurse
+# test-cwd: run tests in cwd
+test-cwd: ${TEST_PROGS}
 	@$(SKIP_GDKTARGET) || test -z "${TEST_PROGS}" || { \
-	  $(XVFB_START) && { set -e; ${GTESTER} --verbose ${TEST_PROGS}; }; \
+	  $(XVFB_START) && { set -e; $(TESTS_ENVIRONMENT) ${GTESTER} --verbose ${TEST_PROGS}; }; \
 	}
+# test-recurse: run tests in subdirs
+test-recurse:
 	@ for subdir in $(SUBDIRS) ; do \
 	    test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \
-	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
+	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) test ) || exit $? ; \
 	  done
 # test-report: run tests in subdirs and generate report
 # perf-report: run tests in subdirs with -m perf and generate report
@@ -77,6 +81,6 @@ test-report perf-report full-report:	${TEST_PROGS}
 	    rm -rf "$$GTESTER_LOGDIR"/ ; \
 	    ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
 	  }
-.PHONY: test test-report perf-report full-report
-# run make test as part of make check
-check-local: test
+.PHONY: test test-cwd test-recurse test-report perf-report full-report
+# run make test-cwd as part of make check
+check-local: test-cwd

NEWS

@@ -1,67 +1,375 @@
-Overview of Changes from GTK+ 2.90.4 to 2.90.5
+Overview of Changes from GTK+ 2.24.1 to 2.24.2
 ==============================================
 
-* Support NOCONFIGURE in autogen.sh to avoid running configure
+* Bugs fixed:
+ 642905 reference lists 2 links for "Index of new symbols...
+ 643170 gtk_file_chooser_set_filename does not work...
+ 643216 Extraneous emits of GdkScreen::monitors-changed
+ 643416 Composited children of GtkScrolledWindow are drawn...
+ 644353 Missing annotations in Gtk/Gdk Window and gtk_acce...
 
-* The cairo dependency has been bumped to 1.9.10
 
-* Drop aliasing hacks instead use -Bsymbolic-funtions.
+Overview of Changes from GTK+ 2.24.0 to 2.24.1
+==============================================
 
-* Bugs:
- 589904 Certain drawing in some widgets does not pass on...
- 610346 Confusion between GtkWindow:allow-grow and GtkWindow:resizable
- 613284 Replace GdkRegion with cairo_region_t
- 617386 Migrate API docs from templates to source files (GtkButton)
- 617389 Migrate API docs from templates to source files (GtkCalendar)
- 617392 Migrate API docs from templates to source files (GtkCellEditable)
- 621414 Can't select file on file browser popup after choosing to sort...
- 622677 Remove GdkWindowObject public structure
- 623239 also show num-lock warning
- 623307 Annotate gdk_display_manager_list_displays return value
- 623389 [iconview] Fix segfault when using rubberband selection
- 623476 [windows] gdk fails to compile
- 623520 gtk+ 3 fails to build from outside git source tree
- 623845 Use -Bsymbolic
- 461618 use GSlice for gtkrequisition
+* GTK+ now refuses to load modules that are linked against
+  the wrong GTK+ version, preventing GTK_PATH accidents.
 
-* Deprecations and cleanups:
- - GdkRegion has been removed, and region-using code has been ported
-   to cairo_region_t and cairo_rectangle_int_t.
- - The deprecated GdkFont has been removed, together with vestigial
-   uses in GTK+, including the GdkFontSel::font property and a GdkFont
-   member in GtkStyle.
- - The GdkWindowObject structure has been removed from public headers.
- - The GdkWindow::allow-grow and ::allow-shrink properties have been removed.
+* A number of memory leaks and segfaults involving accessibility
+  have been fixed.
 
-* Quartz:
- - Misc fixed to clipping and color handling
- - Update the DND code for GdkDevice changes
+* Bugs fixed:
+ 599907 Gail implementation of atk_add_key_event_listener return...
+ 626730 Check menu item does not set indeterminate state
+ 633291 Handle Shift-keys in X11 gdk_test_simulate_key()
+ 640487 crash on gtk_statusbar_remove_all()
+ 640992 Missed Return Type in gtk/gtkrange.c: gtk_range_set_round_digits
+ 642137 gtk+-2.24.0 requires Xcomposite.h
+ 642642 Missed include in gtk/gtkmodules.c
+ 642681 gtk_combo_box_text_get_active_text doesn't work as stated
+ 642772 GTK does not correctly process input sent via SendInput...
+
+* Translation updates:
+ Hungarian
+ Polish
+
+
+Overview of Changes from GTK+ 2.23.90 to 2.24.0
+===============================================
+
+* GtkBuilder has gained support for
+ - items in GtkComboBoxText
+ - tags in GtkTextTagTable
+ - menus in GtkMenuToolButton
+
+* The gtk-builder-convert script gained a
+  --target-version option
+
+* Many introspection annotation fixes
+
+* Bugs fixed:
+ 351755 GTK_RANGE (range) -> round_digits should be exposed...
+ 590459 Text is sometimes not pasted at the right location
+ 639327 gtk-builder-convert needs to convert gtkcomboboxentry...
+ 634677 assertion in finalize assuring that buffer is NULL...
+
+* Updated translations:
+ British English
+
+
+Overview of Changes from GTK+ 2.23.3 to 2.23.90
+===============================================
+
+* New deprecations:
+ - gdk_set_pointer_hooks(), gdk_display_set_pointer_hooks()
+ - gtk_range_get/set_update_policy()
+ - gtk_window_get/set_frame_dimensions() and
+   gtk_window_get/set_has_frame()
+
+* The cups print backend can now send print jobs directly in PDF if
+  cups supports it
+
+* Bugs fixed:
+ 144324 Leaking dnd contexts with XDnD
+ 165987 unsets DESKTOP_STARTUP_ID
+ 560177 Applications should send print jobs to CUPS in PDF format...
+ 562182 gtk_init() docs inaccurate
+ 622125 Note that gtk_show_uri needs gvfs to spawn URLs
+ 637691 Eating events breaks proxied DND
+ 637958 print dialog doesn't fit on netbook screen size
+ 637973 thunderbird crashes when copying text with gtk 2.23.3
+
+
+Overview of Changes from GTK+ 2.23.2 to 2.23.3
+==============================================
+
+* New deprecations:
+ - GtkRuler (and subclasses)
+ - gtk_widget_reset_shapes
+ - gdk_set_sm_client_id
+ - Foreign window APIs
+ - gdk_spawn_*
+ - gdkx_visual_get
+ - gdk_net_wm_supports
+ - gdk_set_locale, gtk_set_locale
+ - Some GDK text conversion routines
+ - gdk_drag_context_new
+ - gdk_drag_find_window and gdk_drag_get_protocol
+ - gdk_xid_table functions
+
+* Bug fixes:
+ 629955 Deprecate / remove gtk_main and gtk_init_add / remove* API
+ 634558 Selecting "Search" should focus text box for keyboard entry
+ 634697 gdk: Add XSetting for "gtk-cursor-blink-timeout"
+ 634882 Usage of deprecated GLib API (g_source_get_current_time)
+ 635307 iconcache: Ensure we don't lose data on power loss
+ 635588 Clicking URL to be opened freezes the application for seconds
+ 636832 anoncvs.gnome.org does not exist
+ 637069 Custom print settings set in custom-widget-apply are lost
+ 637156 Optimize gtk_widget_shape_combine_region (widget, NULL, ...)
 
 * Translation updates:
- Breton
  Czech
+ Norwegian bokmål
+
+
+Overview of Changes from GTK+ 2.23.1 to 2.23.2
+==============================================
+
+* Fix a branch messup
+* Readd the gtk_private_flags_get_type symbol
+* Fix crashes on 64-bit
+* Allow building with libtool 2.4
+
+Overview of Changes from GTK+ 2.23.0 to 2.23.1
+==============================================
+
+* New deprecations:
+ - gtk_widget_hide_all
+
+* New APIs added to aid migration to GTK+ 3:
+ - gtk_combo_box_new_with_model_and_entry
+
+* Bugs fixed:
+ 624025 gdk_draw_rectangle bogged down by ColorSync
+ 632381 gtk_combo_box_text_new_with_entry() adds two...
+ 632539 Do not install gtkprivate.h
+ 633050 need gtk_combo_box_new_with_model_and_entry
+ 634060 Support for GIcon pixbufs
+
+
+Overview of Changes from GTK+ 2.22.0 to 2.23.0
+==============================================
+
+* New deprecations:
+ - gdk_cairo_set_source_pixmap
+ - Misc GdkDrawable APIs
+ - gtk_object_destroy
+ - gtk_init_add, gtk_remove_add, etc
+ - gtk_noteboook_set_window_creation_hook
+ - gtk_notebook_set/get_group
+ - gtk_link_button_set_uri_hook
+ - gtk_about_dialog_set_url/email_hook
+ - GtkComboBoxEntry
+ - combo box text convenience API
+
+* New APIs added to aid migration to GTK+ 3:
+ - gdk_cairo_set_source_window
+ - GdkWindow API to supersede GdkDrawable API
+ - gtk_notebook_set/get_group_name
+ - GtkLinkButton::activate-link signal
+ - gtk_combo_box_new_with_entry
+ - GtkComboBoxText
+
+* Bugs fixed:
+ 423201i gtk_combo_box_entry_active_changed does not transform...
+ 612396 Implement GtkComboBoxText subclass to supersede "text"...
+ 613728 Rationalize GtkTreeView focus
+ 629722 save_entry_get_info_cb() doesn't behave correctly
+ 629955 Deprecate / remove gtk_main and gtk_init_add / remove* API
+ 630521 Remove some remaining API warts from tab dnd api
+ 631473 Fix GTK+3 documentation
+ 631697 [2.24] build warnings which might crash 64-bit
+ 632140 optionally take hotspot coordinates from the pixbuf...
+
+
+Overview of Changes from GTK+ 2.21.8 to 2.22.0
+==============================================
+
+* Lower the gobject-introspection requirement to 0.9.3
+
+* Bug fixes
+ 629748 Fails to build without XComposite
+
+* Translation updates
+ Basque
+ Brazilian
+ Czech
+ Danish
+ Dutch
+ German
+ Greek
+ Gujarati
+ Indonesian
+ Japanese
+ Simplified Chinese
+ Uighur
+
+
+Overview of Changes from GTK+ 2.21.7 to 2.21.8
+==============================================
+
+* Deprecations:
+ - Various style properties have been deprecated:
+   GtkEntry::state-hint
+   GtkTreeView::row-ending-details
+   GtkRange::trough-side-details
+   GtkRange::stepper-position-details
+   GtkRange::activate-slider
+ - The GtkIconView::orientation property has been deprecated
+   and renamed to item-orientation
+ - Separator-related API in GtkDialog
+ - API related to blinking status icons
+ - The keysym names have been renamed from GDK_... to GDK_KEY_...
+ - The GtkItem class
+ - The gdk_display variable and the GDK_DISPLAY macro
+
+* GTK+ now uses standard icon names for stock icons, where applicable
+
+* Win32:
+ - Fixes to the MS Windows theme engine
+
+* Directfb:
+ - Many fixes
+
+* Bugs fixed:
+ 414712 gtk_container_set_focus_child leaks widget
+ 601731 Drag and Drop from Workspace to Activities Overview
+ 628049 Native windows don't work very well
+ 628110 gtranslator inserts unwanted line breaks
+ 628291 Drawing artifacts when used with a cairo 1.9.*
+ 628308 docs referencing non existing icons
+ 628656 _gdk_windowing_get_startup_notify_id memory leak
+ 628932 key typing causes core dump in VNC environment
+ 629093 [patch] prefix GDK key names
+ 629277 Hanging because do_syntheszie_crossing_event...
+
+* Updated translations:
+ Arabic
+ Basque
+ British English
  Estonian
+ French
+ Galician
+ German
+ Hebrew
+ Hungarian
+ Indonesian
+ Italian
+ Japanese
+ Kazakh
+ Korean
+ Norwegian bokmål
+ Polish
+ Portuguese
+ Slovian
+ Spanish
+ Swedish
+ Tradition Chinese
+
+
+Overview of Changes from GTK+ 2.21.6 to 2.21.7
+==============================================
+
+* Deprecations:
+ - GtkWidget::draw-border has been deprecated
+
+* The Windows backend has seen quite a bit of work
+  towards fixing CSW regressions.
+
+* Bugs fixed:
+ 528257 File selector and stock string problems
+ 614006 File chooser crashes when creating a new folder...
+ 616401 Noneffective gdk_keymap_map_virtual_modifiers...
+ 626537 Toggle button does not set indeterminate state
+ 627139 gtkfilechooserentry shows completion progress tool...
+ 627843 set_active_iter: remove restriction on path length
+ 628049 Native windows don't work very well
+
+* Updated translations:
+ British English
+ French
  Galician
  Hebrew
- Kazakh
+ Indonesian
+ Hungarian
  Norwegian bokmål
- Slovenian
- Simplified Chinese
  Spanish
 
 
-Overview of Changes from GTK+ 2.90.3 to 2.90.4
+Overview of Changes from GTK+ 2.21.5 to 2.21.6
 ==============================================
 
-* GSEAL is now enabled by default
+* Most drawing done by GTK+ itself has been ported from
+  GDK drawing APIs to cairo
+
+* GtkExpander gained a ::label-fill property to make the label
+  fill the entire horizontal space
+
+* Deprecations:
+ - GtkNotebookPage
+ - The GtkRecenManager::limit property
+ - All GDK drawing functions, ie gdk_draw_*. Use cairo instead
+ - All GdkGC functions. Use cairo instead
+ - All of GdkImage. Use cairo instead
+ - All of GdkRGB. Use cairo instead
+ - gdk_{bit,pix}map_create_from_data
+
+* New accessors:
+ - gdk_cursor_get_cursor_type
+ - gdk_device_get_n_axes
+ - gdk_display_is_closed
+ - gtk_notebook_get_tab_[hv]border
+
+* New cairo-related APIs:
+ - gdk_window_create_similar_surface
+ - gdk_window_get_background_pattern
+
+* Accessiblity:
+ - Make Gail work with custom treemodels
+ - Implement GailAdjustment::get_minimum_increment
+
+* Bugs fixed:
+ 599574 Crash in _cairo_surface_set_error
+ 604391 ...assertion `ancestor != NULL' when switching between tab
+ 618327 GtkNotebookPage should be deprecated
+ 623603 meld built with pygtk-2.16.0 giving warnings
+ 623865 gtkdnd: pointer grab may never finish (ungrab before grab)
+ 624087 Missing accessor for GdkCursor.type
+ 624221 Gtk-2.21 Missing accessor for GdkDevice.num_axis
+ 624224 Missing accessor for GdkDisplay.closed
+ 624333 Deprecate GtkRecentManager:limit
+ 624687 switch-page bug when activated from menu
+ 624779 GtkCalendar padding/margin/spacing/border/whatever is too hard...
+ 625491 Generate GdkX11-2.0.typelib (backported from HEAD)
+ 625650 Add annotations to gtk_tree_model_iter_next() and gtk_tree_sel...
+
+* Translation updates:
+ Norwegian bokmål
+
+
+Overview of Changes from GTK+ 2.21.4 to 2.21.5
+==============================================
+
+* Deprecations:
+ - Deprecate GdkRegion apis that have no cairo equivalent
+ - GtkWindow::allow-grow and ::allow-shrink properties
+
+* New accessors:
+ - gdk_window_has_native
+
+* Introspection: misc annotation fixes
+
+
+Overview of Changes from GTK+ 2.21.3 to 2.21.4
+==============================================
+
+* Revert a change in GtkCalendar that broke the pygtk build
+
+* Fix the building of input methods as modules
+
+* Include gdk-pixbuf-2.0 in the .pc file requires
+
+* Various OS X fixes
+
+
+Overview of Changes from GTK+ 2.21.2 to 2.21.3
+==============================================
 
 * gdk-pixbuf has been moved into a separate module
 
-* The GtkExtendedLayout interface has been renamed to
-  GtkSizeRequest
-
 * gtk_init warns if it detects GTK2.x and GTK3 being used
-  in the same process
+ in the same process
 
 * Misc new API:
  gtk_accessible_set_widget
@@ -75,234 +383,112 @@ Overview of Changes from GTK+ 2.90.3 to 2.90.4
 
 * Bugs fixed:
  522756 gnome-appearance-properties crashed with SIGSEGV...
- 620832 make _gtk_window_group_get_current_grab() public
- 621250 Missing accessors for GtkRange has_stepper_X
- 621685 Add gdk_device_manager_get_client_pointer() ...
- 621690 Enable per-device events on gtk_widget_realize()
- 621927 Bug in gtk/Makefile.in: affects gtktypefuncs.c
- 622011 Don't handle "connecting-to-device" state reason
- 622581 [GSEAL] GtkButton has no accessor for event_window
- 622765 Duplicate symbols in Gdk on OSX
- 622827 test/testapplication.c doesn't build in quartz
-
-* Translation updates:
- Arabic
- Armenian
- Galician
- Slovenian
- Spanish
-
-
-Overview of Changes from GTK+ 2.90.2 to 2.90.3
-==============================================
-
-* GtkProgress has been removed. It was entirely deprecated for
-  a long time
-
-* GtkApplication has been updated to match the GApplication API
-  as of GLib 2.25.9
-
-* XI2:
- - Device grabs now take precedence over GTK+ grabs
- - Various other bug fixes
-
-* Extended Layout:
- - Prevent negative allocations (as seen in emacs and gedit)
-
-* Win32: XP theming is back !
-
-* Misc new API:
- - Add an accessor for GtkViewport->view_window
- - Add an accessor for GdkDragContext->source_window
- - gtk_icon_theme_load_symbolic_for_style a variant of
-   gtk_icon_theme_load_symbolic taking a GtkStyle
-
-* Introspection:
- - Misc annotation fixes
-
-* Cleanups:
- - GTK_OBJECT_FLAGS and GtkObjectFlags have been depreated
-
-* Bugs fixed:
- 620618 get rid of GtkProgress
  615666 GTK_OBJECT_FLAGS() should be deprecated
- 617444 GNU emacs warnings with extended layout GTK+
- 621631 Non-consistent style in GtkUIManager docs
  621136 GtkCalendar: Some functions always return TRUE
- 621003 GtkApplication] Update for GApplication API changes
- 621683 gtk_menu_attach_to_widget() should emit an "attach-widget"...
- 621479 typo in GTK docs on library.gnome.org
- 621081 GtkViewport missing accessor for view_window.
- 620440 Combo-boxes loose focus
+ 621250 Missing accessors for GtkRange has_stepper_X
+ 621414 Can't select file on file browser popup after...
+ 621683 gtk_menu_attach_to_widget() should emit...
  621775 Space symbol missed in Resources chapter
- 621578 Symbolic color cut-and-paste mess
- 621111 gtk_init_with_args()'s GOptionEntry argument should be const
- 602289 gdk_spawn_on_screen(_with_pipes) uses gint for pid
-
-* Updated translations:
- Galician
- Norwegian bokmål
- Spanish
+ 622011 Don't handle "connecting-to-device" state reason
+ 622371 Need gtk_accessible_set_widget
+ 622581 GtkButton has no accessor for event_window
 
 
-Overview of Changes from GTK+ 2.90.1 to 2.90.2
+Overview of Changes from GTK+ 2.21.1 to 2.21.2
 ==============================================
 
-* GtkApplication: an application class, based on GApplication. Currently,
-  this is fairly minimal, but it is good enough already to replace libunique.
-  Future work:
-  - Add a way to say "This is my application menubar", which gets
-    put into all toplevel windows on non-OS-X, and into the top
-    on OS X
-  - Support session management
-  - Maybe support application settings
+* The newly added gdk_drag_context_get_action function has been
+  renamed to gdk_drag_context_get_selected_action to make the
+  name less confusing.
 
-* Misc new api:
- - gtk_window_has_group: determines if a window is part of a window group
- - gtk_status_bar_remove_all: removes all messages from a statusbar
+* Introspection annotations have been added in many places
 
-* DND on offscreen windows works now
+* New accessors for sealed struct members:
+ gtk_viewport_get_view_window
+ gdk_drag_context_get_source_window
 
-* GtkIconView:
- - arrow keynav can now be connected over adjacent icon views
-
-* GtkAssistant:
- - gtk_assistant_commits: prevents going back beyond a certain
-   point in the page sequence, adjust shown buttons appropriately
- - It is now officially supported to have a progress page at the
-   end of the page sequence
-
-* Introspection:
- - Many annotation fixes
- - gdkx.h api is exported in a separate typelib, GdkX11-3.0
-
-* Cleanups:
- - the draw_string function has been removed from GtkStyle
- - gdk_get/set_use_xshm have been removed
- - Deprecated gdk_color api has been removed
-
-* Documentation related to GTK+ 1.2, etc has been removed. Instead
-  there is an initial GTK+ 3 porting guide now.
-
-* Bugs fixed:
- 620509 Progress bar rendering is broken
- 607628 DnD operation doesn't work when using offscreen.
- 619838 kill off references to gtk 1.2 in docs/comments
+* Bug fixes:
  608218 GtkOffscreenWindow causes bad window with GtkEntry
- 619649 Remove deprecated code from GdkColor
- 619080 text-inserted events should not be emitted unless text...
- 620511 Use g_source_set_name for all custom GSources in GTK+
- 603637 gtk printer dialog does not show remote printer
- 618271 Add gtk_window_has_group()
- 617863 Actually expose the X11 funcs through introspection
- 620244 misprint in the description of the function gtk_widget_list_...
- 549127 Print error dialog not shown
- 611709 gseal hides GtkStatusBar->messages but doesn't give anything...
+ 611709 Add gtk_statusbar_remove_all
  596428 GtkAssistant: Support ending with a progress page
-
-* Translation updates:
-Esperanto
-Hebrew
-Irish
+ 620511 Use g_source_set_name for all custom GSources in GTK+
+ 608537 Make the file chooser's sort arrows consistent
+ 620863
 
 
-Overview of Changes from GTK+ 2.90.0 to 2.90.1
+Overview of Changes from GTK+ 2.21.0 to 2.21.1
 ==============================================
 
-* Printing: The list of locales using US Letter papersize has
-  been updated to match the CLDR 1.8.1
+* GDK has been sealed, with the addition of suitable accessors
 
-* The default location for the 'module cache' files (ie the files
-  produced by gdk-pixbuf-query-loaders and gtk-query-immodules) has
-  been changed to $libdir/gtk-3.0/3.0.0/{loaders,immodules}.cache.
-  This should avoid multilib problems with the previous location.
-
-  Additionally, the query utilities accept an --update-cache argument
-  to update the cache file directly, instead of writing to stdout
-
-* gtk_radio_action_join_group: A binding-friendly way to manage
-  radio actions.
-
-* GtkAdjustment enforces values to the range [lower, upper - page_size]
-
-* GDK has been GSEALed, with the addition of suitable accessors
-
-* The XI2 branch with better support for multiple input devices has
-  been merged, together with backends for XInput, XInput2, win32 and
-  Quartz, and corresponding updates to input-device handling code
-  in GTK.
-
-* A number of orientable widgets are no longer abstract: GtkBox,
-  GtkButtonBox, GtkPaned, GtkRuler, GtkScale, GtkScrollbar, GtkSeparator.
-  All of these can now be instantiated and flipped between horizontal
-  and vertical orientation at runtime. Their H/V subclasses are still
-  available, as convenience API.
-
-* More deprecated API has been removed
-
-* Bugs fixes:
+* Bugs:
  613132 GtkBoxChild should probably be deprecated
  592580 GDK needs sealing
- 618870 GTK+ uses wrong pkg-config to reveal the CAIRO_PREFIX
- 616817 Remove code to support deprecated GtkToolbar api
- 619114 undefined reference to `XkbBell'
- 617863 Actually expose the X11 funcs through introspection
- 613302 GtkWidget not emitting the unmap signal
+ 607628 DnD operation doesn't work when using offscreen.
  565559 Incorrect leave-notify signals for treeview
- 533946 GtkHScale does not update correctly
- 618000 Sync paper size fallbacks with CLDR 1.8.1
+ 618162 Description of GdkColor
  614581 Gtk print dialog freezes on start up
+ 533946 GtkHScale does not update correctly
+ 618271 Add gtk_window_has_group()
+ 618000 Sync paper size fallbacks with CLDR 1.8.1
  551322 configure does not use -lm in jasper (JPEG2000) testing
- 619474 Fixes for GtkAdjustment for GTK+ 3
- 555087 Shouldn't the return type of gtk_entry_completion_get_model...
- 619385 Fix compilation warning: Do not break strict-aliasing rules
- 596725 Add XInput2 support
-
-* Updated translations
- Arabic
- Estonian
- Galician
- Italian
- Indonesian
- Oriya
- Shavian
-
-
-Overview of Changes from GTK+ 2.20.x to 2.90.0
-==============================================
-
-* GtkExtendedLayout: Width-for-height geometry management.
-  This change is known to currently cause minor problems in
-  some applications, see
-  617444 GNU emacs warnings with extended layout GTK+
-  617556 inkscape toolbars broken with extended layout
-
-* gtk_icon_theme_load_symbolic: Support for 'symbolic' icons
-
-* Applications can indicate their preference for a dark theme
-  variant by setting GtkSettings::gtk-application-prefer-dark-theme
-
-* GtkTreeModelFilter can be more usefully subclassed
-
-* Tooltip positioning has been changed to make it less likely
-  that the tooltip covers up the widget that it relates to
-
-* Deprecated functions have been removed (though some more work
-  remains to be done in GDK)
-
-* This release is parallel installable with GTK+ <= 2.22, by renaming
-  .pc files, libraries, include paths, module paths, gtkrc files, etc
-  to include a '3.0' in its name.
+ 619114 undefined reference to `XkbBell'
+ 618093 typo in gtkprintoperation.c, "selecion" should be "selection"
 
 * Updated translations:
+ Italian
+
+
+Overview of Changes from GTK+ 2.20.0 to 2.21.0
+==============================================
+
+* Support tracker 0.8 and 0.9 in the filechooser search code
+
+* New API:
+ - add API to convert coords between parent and child windows
+ - add gdk_window_get_effective_parent() and
+   gdk_window_get_effective_toplevel() which are offscreen aware
+ - add gtk_widget_send_focus_change
+ - add accessors for GtkTextView adjustments
+ - add API to reset the im context in GtkTextView and GtkEntry
+
+* Bug fixes:
+ 614513 Func to substitute GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_GRAB)?
+ 614510 Needed func for GTK_WIDGET_SET_FLAGS (widget, TOPLEVEL) ?
+ 614515 Func to substitute GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_DEFAULT)?
+ 163251 GtkTextView derivatives need some way to set the need_im_reset flag.
+  69872 GTK_WIDGET_SET_FLAGS should be deprecated
+ 615028 gdk/x11/gdkdnd-x11.c missing Xutil.h
+ 615128 gdk monitor order does not seem to be correct
+ 616565 Fix a typo in the offscreen windows docs
+ 616118 please expand documentation for gdk_event_free()
+ 615000 gtk_builder_value_from_string_type() returns FALSE without..
+ 580889 table cells do not implement action interface
+ 616053 GtkTextView lacks accessors for hadjustment and vadjustment
+ 613988 Compile error on DirectFB backend due to missing of gdk_...
+ 614894 Add heuristic for pre XRandR 1.3 drivers
+ 560147 GtkBuilder docs should say what GErrors they throw
+ 615999 Gail doesn't send state-changed events for ATK_STATE_ENABLED
+ 613974 GtkToolItemGroup devides by 0 when allocating space for...
+ 614540 configure wants gio-unix on all platform
+ 557689 In 'select folder' action, filechooser doesn't work when...
+ 615853 BadMatch when pressing keyboard volume keys while pointer...
+ 613887 Misprint in the description of the function gtk_cell_view_...
+ 615162 Fix tooltips on offscreen widgets
+ 616851 assertion `GTK_IS_MISC (misc)' failed
+ 607839 libpixbufloader-png.so not in library list
+ 605186 Use G_DEFINE_INTERFACE macro
+ 402349 FileChooser's default directory is not "active"
+        missing break statement in gtk_tool_item_group_set_property
+        missing default events in  GtkToolItemGroup
+        fix a filechooser crash when removing files
+
+* Translation updates:
  Basque
- Bengali
  Bengali India
  Catalan
  Catalan (Valencian)
- Crimean Tatar
  Danish
- Dutch
  Galician
  Greek
  Indonesian
@@ -310,12 +496,9 @@ Overview of Changes from GTK+ 2.20.x to 2.90.0
  Kazakh
  Latvian
  Marathi
- Norwegian bokmål
- Spanish
  Thai
  Ukrainian
 
-
 Overview of Changes from GTK+ 2.19.7 to 2.20.0
 ==============================================
 

README.in

@@ -111,11 +111,15 @@ Release notes for 2.14
   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.
+* In the early 2.14.x releases, GtkAdjustment was changed to enforce
+  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.
+  Due to the large number of applications that are affected by this
+  change, the behaviour has been reverted to the old behaviour in
+  2.14.3, with an explicit warning that this change will be
+  reintroduced in 2.90.
 
 * 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

README.win32

@@ -7,9 +7,18 @@ Building GTK+ on Win32
 ======================
 
 First you obviously need developer packages for the compile-time
-dependencies: Pango, atk, glib, gettext-runtime, libiconv, libpng,
-zlib, libtiff at least. See
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies .
+dependencies: GDK-Pixbuf, Pango, atk, glib, gettext-runtime, libiconv
+at least.  See
+http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies.
+
+For people compiling GTK+ on Visual C++ 2005 or later, it is recommended
+that you build GDK-Pixbuf, Pango, atk, glib with the same compiler to avoid
+crashes and errors caused by the usage of different CRTS.  VS 2008
+project files and/or VS Makefiles are either already available in these
+packages or will be available in the next stable release.  Unfortunately
+compiling with Microsoft's compilers (version 2003 or earlier) is not
+supported as compiling GLib requires features from the newer compilers
+and/or the newer Platform SDKs at this time of writing.
 
 After installing the dependencies, there are two ways to build GTK+
 for win32.
@@ -147,11 +156,19 @@ Use the Microsoft compiler, cl and Make, nmake. Say nmake -f
 makefile.msc in gdk and gtk. Be prepared to manually edit various
 makefile.msc files, and the makefile snippets in build/win32.
 
+Since this release, there are also Visual Studio 9 (2008) Project Files
+that can be used to compile GTK+.  They can be found in ./build/win32/vs9
+for usage, and should build GTK+ out of the box provided the afore-mentioned
+compile-time dependencies are installed.  The VS2008 Solution and Project
+files are currently maintained by Chun-wei Fan, and they currently build
+GDK with the Win32 backend, GTK+ and the gtk-demo demonstration program
+(GAIL and GAIL-utils are not built with this method yet)
+
 Alternative 1 also generates Microsoft import libraries (.lib), if you
 have lib.exe available. It might also work for cross-compilation from
 Unix.
 
-I use method 1 myself. Hans Breuer has been taking care of the MSVC
+I (Tor) use method 1 myself. Hans Breuer has been taking care of the MSVC
 makefiles. At times, we disagree a bit about various issues, and for
 instance the makefile.msc files might not produce identically named
 DLLs and import libraries as the "autoconfiscated" makefiles and
@@ -182,3 +199,4 @@ sources. Unfortunately it seems that only Wacom tablets come with
 support for the Wintab API nowadays.
 
 --Tor Lillqvist <tml@iki.fi>, <tml@novell.com>
+--Updated by Fan, Chun-wei <fanc999@yahoo.com.tw>

autogen.sh

@@ -19,14 +19,14 @@ if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
 			 sed -e 's/^\(.*\)([^)]*)\(.*\)$/\1\2/g' \
 			     -e 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
 	case $libtool_version in
-	    2.2*)
+	    1.4*|1.5*|2.2*|2.4*)
 		have_libtool=true
 		;;
 	esac
 fi
 if $have_libtool ; then : ; else
 	echo
-	echo "You must have libtool 2.2 installed to compile $PROJECT."
+	echo "You must have libtool 1.4 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
@@ -54,14 +54,18 @@ if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
 else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
     AUTOMAKE=automake-1.10
     ACLOCAL=aclocal-1.10
+else if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.7
+    ACLOCAL=aclocal-1.7
 else
 	echo
-	echo "You must have automake 1,10.x or 1.11.x installed to compile $PROJECT."
+	echo "You must have automake 1.7.x, 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
 fi
 fi
+fi
 
 if test "$DIE" -eq 1; then
 	exit 1

build/win32/vs9/Makefile.am

@@ -4,9 +4,6 @@ EXTRA_DIST += \
 	README.txt \
 	gtk+.sln \
 	gtk+.vsprops \
-	gdk-pixbuf.vcproj \
-	gdk-pixbuf-csource.vcproj \
-	gdk-pixbuf-query-loaders.vcproj \
 	gdk-win32.vcproj \
 	gdk.vcproj \
 	gdk.vcprojin \

build/win32/vs9/gdk.vcprojin

@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk"
+				AdditionalIncludeDirectories="..\..\..\gdk"
 				PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -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"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib 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"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib 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"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
@@ -208,6 +208,7 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File RelativePath="..\..\..\gdk\win32\rc\gdk.rc" />
 		</Filter>
 		<Filter
 			Name="Source Files"

build/win32/vs9/gtk+.sln

@@ -1,43 +1,25 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf", "gdk-pixbuf.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf-csource", "gdk-pixbuf-csource.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf-query-loaders", "gdk-pixbuf-query-loaders.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-win32", "gdk-win32.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-demo", "gtk-demo.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}
@@ -51,30 +33,6 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Release|x64.Build.0 = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Release|x64.Build.0 = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Release|x64.Build.0 = Release|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|Win32.Build.0 = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|x64.ActiveCfg = Debug|x64

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="gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
+		AdditionalDependencies="gdk_pixbuf-2.0.lib gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
 		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
 	/>
 	<Tool
@@ -31,7 +31,7 @@ copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
 	/>
 	<UserMacro
 		Name="GtkApiVersion"
-		Value="3.0"
+		Value="2.0"
 	/>
 	<UserMacro
 		Name="GtkBinaryVersion"
@@ -45,18 +45,6 @@ copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
 		Name="GtkPrefixDefine"
 		Value="GTK_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;"
 	/>
-	<UserMacro
-		Name="GdkPixbufIncludedLoaderDefines"
-		Value="INCLUDE_ani;INCLUDE_icns;INCLUDE_pcx;INCLUDE_ras;INCLUDE_tga;INCLUDE_png;INCLUDE_pnm;INCLUDE_wbmp;INCLUDE_xbm;INCLUDE_xpm;INCLUDE_gdiplus"
-	/>
-	<UserMacro
-		Name="GdkPixbufDefines"
-		Value="GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND;$(GtkPrefixDefine);$(GdkPixbufIncludedLoaderDefines)"
-	/>
-	<UserMacro
-		Name="GdkPixbufLibdirDefine"
-		Value="PIXBUF_LIBDIR=\&quot;$(GtkDummyPrefix)/lib/gtk-$(GtkApiVersion)/$(GtkBinaryVersion)/loaders\&quot;"
-	/>
 	<UserMacro
 		Name="GdkDefines"
 		Value="GDK_COMPILATION;G_LOG_DOMAIN=\&quot;Gdk\&quot;"
@@ -67,7 +55,7 @@ copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
 	/>
 	<UserMacro
 		Name="GtkDefines"
-		Value="GTK_COMPILATION;G_LOG_DOMAIN=\&quot;Gtk\&quot;;GTK_HOST=\&quot;i686-pc-vs9\&quot;;GTK_PRINT_BACKENDS=\&quot;file\&quot;;GTK_PRINT_PREVIEW_COMMAND=\&quot;undefined-gtk-print-preview-command\&quot;;$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot;;GTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot;GTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;;GTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot;;MULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(GtkApiVersion)\&quot;;MULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot;;GTK_VERSION=\&quot;$(GtkVersion)/etc\&quot;;GTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)/etc\&quot;;GDK_DISABLE_DEPRECATED"
+		Value="GTK_COMPILATION;G_LOG_DOMAIN=\&quot;Gtk\&quot;;GTK_HOST=\&quot;i686-pc-vs9\&quot;;GTK_PRINT_BACKENDS=\&quot;file\&quot;;GTK_PRINT_PREVIEW_COMMAND=\&quot;undefined-gtk-print-preview-command\&quot;;$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot;;GTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot;GTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;;GTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot;;MULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(GtkApiVersion)\&quot;;MULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot;;GTK_VERSION=\&quot;$(GtkVersion)/etc\&quot;;GTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)/etc\&quot;"
 	/>
 	<UserMacro
 		Name="GtkDoInstall"
@@ -75,24 +63,19 @@ copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
 echo on&#x0D;&#x0A;
 mkdir $(OutDir)\bin&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(OutDir)\bin&#x0D;&#x0A;
+
+mkdir $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.png $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.gif $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.ui $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.jpg $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.c $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.h $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
 
 mkdir $(OutDir)\lib&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
 
-mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-animation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-core.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-enum-types.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-features.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-io.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-loader.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-marshal.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-simple-anim.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-transform.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixdata.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-
 mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdk.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkapplaunchcontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
@@ -112,10 +95,10 @@ copy ..\..\..\gdk\gdkimage.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x
 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\gdkkeysyms-compat.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkpango.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkpixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkpixmap.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkprivate.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkproperty.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkregion.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkrgb.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
@@ -159,6 +142,7 @@ copy ..\..\..\gtk\gtkcellrenderercombo.h $(OutDir)\include\gtk-$(GtkApiVersion)\
 copy ..\..\..\gtk\gtkcellrendererpixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcellrendererprogress.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcellrendererspin.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendererspinner.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcellrenderertext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcellrenderertoggle.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcellview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -172,6 +156,7 @@ copy ..\..\..\gtk\gtkcolorseldialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 copy ..\..\..\gtk\gtkcombo.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcombobox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcomboboxentry.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\gtkctree.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcurve.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -240,6 +225,7 @@ copy ..\..\..\gtk\gtkmodules.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&
 copy ..\..\..\gtk\gtkmountoperation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtknotebook.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkobject.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkoffscreenwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkoldeditable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkoptionmenu.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkorientable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -253,7 +239,6 @@ copy ..\..\..\gtk\gtkprintcontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#
 copy ..\..\..\gtk\gtkprintoperation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkprintoperationpreview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkprintsettings.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprivate.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkprogress.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkprogressbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkradioaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -284,6 +269,7 @@ copy ..\..\..\gtk\gtksignal.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#
 copy ..\..\..\gtk\gtksizegroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtksocket.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkspinbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkspinner.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkstatusbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkstatusicon.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkstock.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -309,6 +295,8 @@ copy ..\..\..\gtk\gtktoggletoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\g
 copy ..\..\..\gtk\gtktoolbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktoolitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolitemgroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolpalette.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktoolshell.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktooltip.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktooltips.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -345,14 +333,14 @@ copy ..\..\..\gdk\gdkconfig.h $(OutDir)\lib\gtk-$(GtkApiVersion)\include&#x0D;&#
 copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
 "
 	/>
-	<UserMacro
-		Name="GtkGenerateGdkPixbufDef"
-		Value="echo EXPORTS &gt;&quot;$(IntDir)\gdk-pixbuf.def&quot; &amp;&amp; cl /EP -DG_OS_WIN32 -DINCLUDE_VARIABLES -DALL_FILES -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= ..\..\..\gdk-pixbuf\gdk-pixbuf.symbols &gt;&gt;&quot;$(IntDir)\gdk-pixbuf.def&quot;"
-	/>
 	<UserMacro
 		Name="GtkGenerateGdkDef"
 		Value="echo EXPORTS &gt;&quot;$(IntDir)\gdk.def&quot; &amp;&amp; cl /EP -DGDK_WINDOWING_WIN32 -DALL_FILES -DG_GNUC_CONST= ..\..\..\gdk\gdk.symbols &gt;&gt;&quot;$(IntDir)\gdk.def&quot;"
 	/>
+	<UserMacro
+		Name="GtkGenerateGtkDefW64"
+		Value="echo EXPORTS &gt;&quot;$(IntDir)\gtk.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -D_WIN64 -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="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;"
@@ -377,11 +365,11 @@ copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\l
 	GtkLibtoolCompatibleDllSuffix if that is what you want -->
 	<UserMacro
 		Name="GtkDllPrefix"
-		Value="$(GtkLibtoolCompatibleDllPrefix)"
+		Value="$(GtkSeparateVS9DllPrefix)"
 	/>
 	<UserMacro
 		Name="GtkDllSuffix"
-		Value="$(GtkLibtoolCompatibleDllSuffix)"
+		Value="$(GtkSeparateVS9DllSuffix)"
 	/>
 	<UserMacro
 		Name="GlibEtcInstallRoot"

build/win32/vs9/gtk-demo.vcproj

@@ -76,9 +76,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
-				SubSystem="2"
+				SubSystem="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="17"
@@ -106,9 +107,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
-				SubSystem="2"
+				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
@@ -138,9 +140,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
-				SubSystem="2"
+				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="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"
@@ -63,7 +63,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GtkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -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"
@@ -128,7 +128,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GtkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -183,7 +183,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating gtk.def"
-						CommandLine="$(GtkGenerateGtkDef)"
+						CommandLine="$(GtkGenerateGtkDefW64)"
 						Outputs="$(IntDir)\gtk.def"
 					/>
 				</FileConfiguration>
@@ -203,11 +203,12 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating gtk.def"
-						CommandLine="$(GtkGenerateGtkDef)"
+						CommandLine="$(GtkGenerateGtkDefW64)"
 						Outputs="$(IntDir)\gtk.def"
 					/>
 				</FileConfiguration>
 			</File>
+			<File RelativePath="..\..\..\gtk\gtk-win32.rc" />
 		</Filter>
 		<Filter
 			Name="Source Files"

configure.in

@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 # require autoconf 2.54
-AC_PREREQ([2.62])
+AC_PREREQ(2.62)
 
 # Making releases:
 #   GTK_MICRO_VERSION += 1;
@@ -11,15 +11,15 @@ AC_PREREQ([2.62])
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [90])
-m4_define([gtk_micro_version], [6])
-m4_define([gtk_interface_age], [0])
+m4_define([gtk_minor_version], [24])
+m4_define([gtk_micro_version], [2])
+m4_define([gtk_interface_age], [2])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
           [gtk_major_version.gtk_minor_version.gtk_micro_version])
 # This is the X.Y used in -lgtk-FOO-X.Y
-m4_define([gtk_api_version], [3.0])
+m4_define([gtk_api_version], [2.0])
 
 # Define a string for the earliest version that this release has
 # backwards binary compatibility with for all interfaces a module
@@ -28,29 +28,29 @@ m4_define([gtk_api_version], [3.0])
 # for GTK+.
 #
 #GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT
-m4_define([gtk_binary_version], [3.0.0])
+m4_define([gtk_binary_version], [2.10.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.25.12])
+m4_define([glib_required_version], [2.27.3])
 m4_define([pango_required_version], [1.20])
 m4_define([atk_required_version], [1.29.2])
-m4_define([cairo_required_version], [1.9.10])
-m4_define([gdk_pixbuf_required_version], [2.21.0])
+m4_define([cairo_required_version], [1.6])
++m4_define([gdk_pixbuf_required_version], [2.21.0])
 
 
 AC_INIT([gtk+], [gtk_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B],
 	[gtk+])
 
-AC_CONFIG_HEADER([config.h])
 AC_CONFIG_SRCDIR([gdk/gdktypes.h])
+
 AC_CONFIG_MACRO_DIR([m4])
 
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}
 
-AM_INIT_AUTOMAKE([1.10 no-define -Wno-portability dist-bzip2])
-AM_MAINTAINER_MODE([enable])
+AM_INIT_AUTOMAKE([no-define -Wno-portability dist-bzip2])
+AM_CONFIG_HEADER(config.h)
 
 # Support silent build rules, requires at least automake-1.11. Enable
 # by either passing --enable-silent-rules to configure or passing V=0
@@ -59,6 +59,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
 
 #
 # For each of the libraries we build, we define the following
+ 
 # substituted variables:
 #
 # foo_PACKAGES:     pkg-config packages this library requires
@@ -100,23 +101,15 @@ LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age)
 AC_SUBST(LT_VERSION_INFO)
 AC_SUBST(LT_CURRENT_MINUS_AGE)
 
-m4_define([gail_lt_current],[0])
-m4_define([gail_lt_revision],[0])
+m4_define([gail_lt_current],[18])
+m4_define([gail_lt_revision],[1])
 m4_define([gail_lt_age],[0])
 m4_define([gail_lt_version_info],[gail_lt_current:gail_lt_revision:gail_lt_age])
 m4_define([gail_lt_current_minus_age],[m4_eval(gail_lt_current - gail_lt_age)])
 AC_SUBST([GAIL_LT_VERSION_INFO],[gail_lt_version_info])
 AC_SUBST([GAIL_LT_CURRENT_MINUS_AGE],[gail_lt_current_minus_age])
 
-# Checks for programs.
-AC_PROG_CC
-AC_PROG_CC_C_O
-AC_PROG_CC_STDC
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-
-
-GETTEXT_PACKAGE=gtk30
+GETTEXT_PACKAGE=gtk20
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
                    [The prefix for our gettext translation domains.])
@@ -154,12 +147,17 @@ case $host in
     ;;
 esac
 
-dnl
+dnl Initialize libtool
+AC_PROG_CC
+AM_DISABLE_STATIC
+
+dnl 
 dnl Check for a working C++ compiler, but do not bail out, if none is found.
 dnl We use this for an automated test for C++ header correctness.
-dnl
+dnl 
 AC_CHECK_TOOLS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc)
-AC_LANG_PUSH([C++])
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
 
 AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=)
 AM_CONDITIONAL(HAVE_CXX, test "$CXX" != "")
@@ -169,7 +167,7 @@ CXXFLAGS="$CXXFLAGS -x objective-c++"
 AC_TRY_COMPILE([@interface Foo @end],,OBJC=yes,OBJC=no)
 AM_CONDITIONAL(HAVE_OBJC, test "$OBJC" = "yes")
 CXXFLAGS="$gtk_save_cxxflags"
-AC_LANG_POP([C++])
+AC_LANG_RESTORE
 
 if test "$os_win32" = "yes"; then
   if test x$enable_static = xyes -o x$enable_static = x; then
@@ -182,11 +180,11 @@ if test "$os_win32" = "yes"; then
   enable_shared=yes
 fi
 
-dnl Initialize libtool
-LT_PREREQ([2.2.6])
-LT_INIT([disable-static win32-dll])
-# Create libtool early, because it's used in configure
-LT_OUTPUT
+AC_LIBTOOL_WIN32_DLL
+AM_PROG_LIBTOOL
+dnl when using libtool 2.x create libtool early, because it's used in configure
+m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
+
 
 # Make sure we use 64-bit versions of various file stuff.
 AC_SYS_LARGEFILE
@@ -194,6 +192,9 @@ AC_SYS_LARGEFILE
 AM_PROG_AS
 AC_PATH_PROG(NM, nm, nm)
 
+dnl Initialize maintainer mode
+AM_MAINTAINER_MODE
+
 AC_MSG_CHECKING([for some Win32 platform])
 case "$host" in
   *-*-mingw*|*-*-cygwin*)
@@ -245,7 +246,7 @@ AC_ARG_ENABLE(rebuilds,
               [enable_rebuilds=yes])
 AC_ARG_ENABLE(visibility,
               [AC_HELP_STRING([--disable-visibility],
-                              [do not use ELF visibility attributes])],,
+                              [don't use ELF visibility attributes])],,
               [enable_visibility=yes])
 
 AC_ARG_WITH(xinput,
@@ -274,7 +275,7 @@ AC_SUBST(gtktargetlib)
 
 if test "x$enable_debug" = "xyes"; then
   test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
-  GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES"
+  GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES" 
 else
   if test "x$enable_debug" = "xno"; then
     GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
@@ -292,10 +293,17 @@ fi
 AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}",
                    [Define if debugging is enabled])
 
-
+			
 # Build time sanity check...
 AM_SANITY_CHECK
 
+# Checks for programs.
+AC_ISC_POSIX
+AM_PROG_CC_STDC
+AM_PROG_CC_C_O
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+
 changequote(,)dnl
 if test "x$GCC" = "xyes"; then
   case " $CFLAGS " in
@@ -317,7 +325,7 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl
 
-CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES"
+CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
 
 # Ensure MSVC-compatible struct packing convention is used when
 # compiling for Win32 with gcc.
@@ -354,11 +362,14 @@ if test x"$os_win32" = xyes; then
   fi
 fi
 
-## Initial sanity check, done here so that users get told they
+# Honor aclocal flags
+ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+
+## Initial sanity check, done here so that users get told they 
 ## have the wrong dependencies as early in the process as possible.
 ## Later on we actually use the cflags/libs from separate pkg-config
-## calls. Oh, also the later pkg-config calls don't include
-## the version requirements since those make the module lists
+## calls. Oh, also the later pkg-config calls don't include 
+## the version requirements since those make the module lists 
 ## annoying to construct
 PKG_CHECK_MODULES(BASE_DEPENDENCIES,
   [glib-2.0 >= glib_required_version dnl
@@ -394,7 +405,7 @@ dnl ******************************************************
 dnl * See whether to include shared library dependencies *
 dnl ******************************************************
 
-AC_ARG_ENABLE(explicit-deps,
+AC_ARG_ENABLE(explicit-deps, 
               [AC_HELP_STRING([--enable-explicit-deps=@<:@yes/no/auto@:>@],
                               [use explicit dependencies in .pc files [default=auto]])],,
               [enable_explicit_deps=auto])
@@ -405,12 +416,12 @@ case $enable_explicit_deps in
     export SED
     deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
     if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
-      enable_explicit_deps=yes
+      enable_explicit_deps=yes  
     else
-      enable_explicit_deps=no
+      enable_explicit_deps=no  
     fi
   ;;
-  yes|no)
+  yes|no) 
   ;;
   *) AC_MSG_ERROR([Value given to --enable-explicit-deps must be one of yes, no or auto])
   ;;
@@ -485,7 +496,7 @@ if test "$gtk_ok" = "yes"; then
   AC_DEFINE([HAVE__NL_PAPER_WIDTH], [1],
 	    [Define if _NL_PAPER_WIDTH is available])
 fi
-
+	
 # sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable
 AC_MSG_CHECKING(for sigsetjmp)
 AC_TRY_LINK([#include <setjmp.h>], [
@@ -528,7 +539,7 @@ dnl (End of adapted AM_GLIB_GNU_GETTEXT snippet.)
 
 AM_GLIB_DEFINE_LOCALEDIR(GTK_LOCALEDIR)
 
-dnl The DU4 header files don't provide library prototypes unless
+dnl The DU4 header files don't provide library prototypes unless 
 dnl -std1 is given to the native cc.
 AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
 
@@ -592,13 +603,13 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
 
 #
 # Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working
-#
+# 
 
 GLIB_PACKAGES="gobject-2.0 gio-2.0 gmodule-no-export-2.0"
 
 AM_PATH_GLIB_2_0(glib_required_version, :,
   AC_MSG_ERROR([
-*** GLIB glib_required_version or better is required. The latest version of
+*** GLIB glib_required_version or better is required. The latest version of 
 *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
   gobject gmodule-no-export gthread)
 
@@ -753,7 +764,7 @@ if test x$enable_modules = xno; then
 else
     AC_MSG_RESULT(yes)
     AC_MSG_CHECKING(whether dynamic modules work)
-    ## for loop is to strip newline
+    ## for loop is to strip newline 
     tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0`
     for I in $tmp; do
         dynworks=$I
@@ -797,7 +808,7 @@ AC_ARG_WITH(included_immodules,
 [  --with-included-immodules=MODULE1,MODULE2,...
                           build the specified input methods into gtk])
 
-if $dynworks; then
+if $dynworks; then 
    :
 else
    ## if the option was specified, leave it; otherwise disable included immodules
@@ -867,7 +878,7 @@ AC_TYPE_SIGNAL
 # support.
 #
 AC_CHECK_HEADER(sys/systeminfo.h,
-                AC_DEFINE(HAVE_SYS_SYSTEMINFO_H, 1,
+                AC_DEFINE(HAVE_SYS_SYSTEMINFO_H, 1, 
                           [Define to 1 if sys/systeminfo.h is available]))
 AC_CHECK_HEADER(sys/sysinfo.h,
                 AC_DEFINE(HAVE_SYS_SYSINFO_H, 1,
@@ -908,11 +919,11 @@ fi
 
 AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
 
-if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
+if test ! -f $srcdir/gtk/gtkbuiltincache.h && 
    test "x$REBUILD_PNGS" = "x#" ; then
      AC_MSG_ERROR([
 *** gtkbuiltincache.h is not in the tree, and cannot be built
-*** because you don't have libpng, or (when cross-compiling) you
+*** because you don't have libpng, or (when cross-compiling) you 
 *** don't have a prebuilt gtk-update-icon-cache on the build system.])
 fi
 
@@ -922,7 +933,7 @@ fi
 
 GDK_EXTRA_LIBS="$GDK_WLIBS"
 GDK_EXTRA_CFLAGS=
-
+	
 # GTK+ uses some X calls, so needs to link against X directly
 GTK_DEP_PACKAGES_FOR_X=
 GTK_DEP_LIBS_FOR_X=
@@ -947,12 +958,12 @@ if test "x$gdktarget" = "xx11"; then
     X_PACKAGES="$X_PACKAGES x11 xext xrender"
     x_libs="`$PKG_CONFIG --libs x11 xext xrender`"
     X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`"
-
+    
     # Strip out any .la files that pkg-config might give us (this happens
     # with -uninstalled.pc files)
     x_libs_for_checks=
     for I in $x_libs ; do
-      case $I in
+      case $I in 
         *.la) ;;
         *) x_libs_for_checks="$x_libs_for_checks $I" ;;
       esac
@@ -965,7 +976,7 @@ if test "x$gdktarget" = "xx11"; then
     if test x$no_x = xyes ; then
       AC_MSG_ERROR([X development libraries not found])
     fi
-
+    
     x_cflags="$X_CFLAGS"
     x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS"
 
@@ -980,7 +991,7 @@ if test "x$gdktarget" = "xx11"; then
 
   gtk_save_LIBS=$LIBS
   LIBS="$x_libs_for_checks $LIBS"
-
+  
   # Sanity check for the X11 and Xext libraries. While everything we need from
   # Xext is optional, the chances a system has *none* of these things is so
   # small that we just unconditionally require it.
@@ -1012,9 +1023,9 @@ if test "x$gdktarget" = "xx11"; then
 
   # Generic X11R6 check needed for XIM support; we could
   # probably use this to replace the above, but we'll
-  # leave the separate checks for XConvertCase and XInternAtoms
+  # leave the separate checks for XConvertCase and XInternAtoms 
   # for clarity
-
+  
   have_x11r6=false
   AC_CHECK_FUNC(XAddConnectionWatch,
       have_x11r6=true)
@@ -1044,7 +1055,7 @@ if test "x$gdktarget" = "xx11"; then
   # X SYNC check
   gtk_save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $x_cflags"
-
+  
   AC_CHECK_FUNC(XSyncQueryExtension,
       [AC_CHECK_HEADER(X11/extensions/sync.h,
 	  AC_DEFINE(HAVE_XSYNC, 1, [Have the SYNC extension library]),
@@ -1059,9 +1070,9 @@ if test "x$gdktarget" = "xx11"; then
      AC_CHECK_FUNC(XShmAttach,
 	:,
 	# On AIX, it is in XextSam instead
-	[AC_CHECK_LIB(XextSam, XShmAttach,
+	[AC_CHECK_LIB(XextSam, XShmAttach, 
 	    [GTK_ADD_LIB(x_extra_libs,XextSam)])])
-  fi
+  fi    
 
   if test "x$enable_shm" = "xyes"; then
     # Check for shared memory
@@ -1075,7 +1086,7 @@ if test "x$gdktarget" = "xx11"; then
                     no_sys_shm=yes)
 
     # Check for the X shared memory extension header file
-    have_xshm=no
+    have_xshm=no 
     AC_MSG_CHECKING(X11/extensions/XShm.h)
     if test "x$no_xext_lib" = "xyes"; then
       :
@@ -1104,17 +1115,17 @@ if test "x$gdktarget" = "xx11"; then
     # Check for Xinerama extension (Solaris impl or Xfree impl)
     gtk_save_cppflags="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $x_cflags"
-
+  
     # Check for XFree
     AC_MSG_CHECKING(for Xinerama support on XFree86)
-
+	  
     have_xfree_xinerama=false
     if $PKG_CONFIG --exists xinerama ; then
        have_xfree_xinerama=true
        X_PACKAGES="$X_PACKAGES xinerama"
-    else
+    else    
        AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
-	   [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
+	   [AC_CHECK_HEADER(X11/extensions/Xinerama.h, 
 	   [GTK_ADD_LIB(x_extra_libs,Xinerama)
 	   have_xfree_xinerama=true], :,
            [#include <X11/Xlib.h>])])
@@ -1133,13 +1144,13 @@ if test "x$gdktarget" = "xx11"; then
         *-*-solaris*)
             # Check for solaris
 	    AC_MSG_CHECKING(for Xinerama support on Solaris)
-
+	  
 	    have_solaris_xinerama=false
 	    AC_CHECK_FUNC(XineramaGetInfo,
 	        [AC_CHECK_HEADER(X11/extensions/xinerama.h,
-		    [have_solaris_xinerama=true], :,
+  	  	    [have_solaris_xinerama=true], :,
 		    [#include <X11/Xlib.h>])])
-
+		
             if $have_solaris_xinerama ; then
               AC_DEFINE(HAVE_SOLARIS_XINERAMA, 1,
                         [Define to 1 if solaris xinerama is available])
@@ -1155,25 +1166,24 @@ if test "x$gdktarget" = "xx11"; then
       esac
     fi
   fi
-
+  
   # set up things for XInput
-  if test "x$with_xinput" != "xno" && $PKG_CONFIG --exists "xi" ; then
-    have_xinput=yes
 
+  if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then
     AC_DEFINE(XINPUT_XFREE, 1,
               [Define to 1 if XFree XInput should be used])
-
-    X_PACKAGES="$X_PACKAGES xi"
-
-    AC_CHECK_HEADER(X11/extensions/XInput2.h,
-                    have_xinput2=yes; AC_DEFINE(XINPUT_2, 1, [Define to 1 if XInput 2.0 is available]))
+    
+    if $PKG_CONFIG --exists xi ; then
+      X_PACKAGES="$X_PACKAGES xi"
+    else
+      GTK_ADD_LIB(x_extra_libs, Xi)
+    fi
   else
     AC_DEFINE(XINPUT_NONE, 1,
               [Define to 1 if no XInput should be used])
   fi
 
-  AM_CONDITIONAL(XINPUT_XFREE, test "x$have_xinput" = "xyes")
-  AM_CONDITIONAL(XINPUT_2,     test "x$have_xinput2" = "xyes")
+  AM_CONDITIONAL(XINPUT_XFREE, test x$with_xinput = xxfree || test x$with_xinput = xyes)
 
   # Check for the RANDR extension
   if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
@@ -1181,20 +1191,20 @@ if test "x$gdktarget" = "xx11"; then
 
      X_PACKAGES="$X_PACKAGES xrandr"
   fi
-
+       
   # Checks for Xcursor library
-
+  
   if $PKG_CONFIG --exists xcursor ; then
     AC_DEFINE(HAVE_XCURSOR, 1, [Have the Xcursor library])
-
+    
     X_PACKAGES="$X_PACKAGES xcursor"
   fi
 
   # Checks for XFixes extension
-
+  
   if $PKG_CONFIG --exists xfixes ; then
     AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension])
-
+    
     X_PACKAGES="$X_PACKAGES xfixes"
     GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes"
   fi
@@ -1231,7 +1241,6 @@ else
   XPACKAGES=
 
   AM_CONDITIONAL(XINPUT_XFREE, false)
-  AM_CONDITIONAL(XINPUT_2, false)
   AM_CONDITIONAL(USE_X11, false)
   AM_CONDITIONAL(HAVE_X11R6, false)
 fi
@@ -1357,7 +1366,7 @@ if test "x$gdktarget" = "xx11"; then
   GTK_PACKAGES="$GTK_PACKAGES pangoft2"
 fi
 GTK_EXTRA_LIBS=
-GTK_EXTRA_CFLAGS=
+GTK_EXTRA_CFLAGS= 
 GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS"
 GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES $GTK_PACKAGES` $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
 
@@ -1368,7 +1377,7 @@ fi
 GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
 ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`"
 PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
-CAIRO_PREFIX="`$PKG_CONFIG --variable=prefix cairo`"
+CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
 
 AC_SUBST(GTK_PACKAGES)
 AC_SUBST(GTK_EXTRA_LIBS)
@@ -1404,7 +1413,7 @@ AC_CHECK_MEMBER([struct sockaddr_un.sun_len],
 		[#include <sys/types.h>
 		 #include <sys/un.h>]
 		)
-case $struct_sockaddr_un_sun_len in
+case $struct_sockaddr_un_sun_len in 
 	true)
 		AC_DEFINE_UNQUOTED(HAVE_SOCKADDR_UN_SUN_LEN, 1,
 		                   [Have the sockaddr_un.sun_len member])
@@ -1449,7 +1458,7 @@ else
 
     if test $CUPS_API_MAJOR -gt 1 -o \
             $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
-      AC_DEFINE(HAVE_CUPS_API_1_2, 1,
+      AC_DEFINE(HAVE_CUPS_API_1_2, 1, 
                 [Define to 1 if CUPS 1.2 API is available])
     fi
 
@@ -1514,17 +1523,17 @@ AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([
 
 if test "$os_win32" != "yes"; then
   AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([
-*** Can't find cairo-ps.h. You must build Cairo with the
+*** Can't find cairo-ps.h. You must build Cairo with the 
 *** postscript backend enabled.]))
 
   AC_CHECK_HEADER(cairo-svg.h,,AC_MSG_ERROR([
 *** Can't find cairo-svg.h. You must build Cairo with the
 *** svg backend enabled.]))
-fi
+fi   
 
 CPPFLAGS="$gtk_save_cppflags"
-
-
+     
+			  	
 AC_ARG_ENABLE(test-print-backend,
               [AC_HELP_STRING([--enable-test-print-backend],
                               [build test print backend])],,
@@ -1556,7 +1565,7 @@ fi
 # GObject introspection
 ##################################################
 
-GOBJECT_INTROSPECTION_CHECK([0.9.0])
+GOBJECT_INTROSPECTION_CHECK([0.9.3])
 
 ##################################################
 # Checks for gtk-doc and docbook-tools
@@ -1600,7 +1609,7 @@ AC_CONFIG_COMMANDS([gdk/gdkconfig.h], [
 	cat > $outfile <<\_______EOF
 /* gdkconfig.h
  *
- * This is a generated file.  Please modify `configure.ac'
+ * This is a generated file.  Please modify `configure.in'
  */
 
 #ifndef GDKCONFIG_H
@@ -1671,41 +1680,21 @@ if test x$gdk_working_wctype = xno; then
   gdk_wc="\$gdk_wc
 #define GDK_HAVE_BROKEN_WCTYPE 1"
 fi
+
+
 ])
 
-dnl
-dnl Check for -Bsymbolic-functions linker flag used to avoid
-dnl intra-library PLT jumps, if available.
-dnl
-AC_ARG_ENABLE(Bsymbolic,
-              [AC_HELP_STRING([--disable-Bsymbolic],
-                              [avoid linking with -Bsymbolic])],,
-              [SAVED_LDFLAGS="${LDFLAGS}"
-               AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
-               LDFLAGS=-Wl,-Bsymbolic-functions
-               AC_TRY_LINK([], [int main (void) { return 0; }],
-                           AC_MSG_RESULT(yes)
-                           enable_Bsymbolic=yes,
-                           AC_MSG_RESULT(no)
-                           enable_Bsymbolic=no)
-               LDFLAGS="${SAVED_LDFLAGS}"])
-
-if test "x${enable_Bsymbolic}" == "xyes"; then
-  GTK_LINK_FLAGS=-Wl,-Bsymbolic-functions
-fi
-AC_SUBST(GTK_LINK_FLAGS)
-
 AC_CONFIG_FILES([
 config.h.win32
 gtk-zip.sh
 Makefile
-gdk-3.0.pc
-gtk+-3.0.pc
-gtk+-unix-print-3.0.pc
-gail-3.0.pc
-gdk-3.0-uninstalled.pc
-gtk+-3.0-uninstalled.pc
-gail-3.0-uninstalled.pc
+gdk-2.0.pc
+gtk+-2.0.pc
+gtk+-unix-print-2.0.pc
+gail.pc
+gdk-2.0-uninstalled.pc
+gtk+-2.0-uninstalled.pc
+gail-uninstalled.pc
 m4macros/Makefile
 po/Makefile.in
 po-properties/Makefile.in
@@ -1749,7 +1738,7 @@ modules/engines/Makefile
 modules/engines/pixbuf/Makefile
 modules/engines/ms-windows/Makefile
 modules/engines/ms-windows/Theme/Makefile
-modules/engines/ms-windows/Theme/gtk-3.0/Makefile
+modules/engines/ms-windows/Theme/gtk-2.0/Makefile
 modules/input/Makefile
 modules/printbackends/Makefile
 modules/printbackends/cups/Makefile

demos/Makefile.am

@@ -34,7 +34,7 @@ noinst_PROGRAMS += testpixbuf
 BUILT_SOURCES = test-inline-pixbufs.h
 
 test-inline-pixbufs.h: apple-red.png gnome-foot.png
-	$(GDK_PIXBUF_CSOURCE) --raw --build-list	\
+	$(GDK_PIXBUF_CSOURCE) --raw --build-list		\
 	        apple_red  $(srcdir)/apple-red.png	\
                 gnome_foot $(srcdir)/gnome-foot.png	\
         > test-inline-pixbufs.h				\

demos/gtk-demo/Makefile.am

@@ -1,7 +1,7 @@
 ## Makefile.am for gtk+/demos
 include $(top_srcdir)/Makefile.decl
 
-democodedir=$(datadir)/gtk-$(GTK_API_VERSION)/demo
+democodedir=$(datadir)/gtk-2.0/demo
 
 ## These should be in the order you want them to appear in the
 ## demo app, which means alphabetized by demo title, not filename
@@ -61,10 +61,10 @@ DEPS = \
 LDADDS = \
 	$(top_builddir)/gdk/$(gdktargetlib)        			\
 	$(top_builddir)/gtk/$(gtktargetlib)				\
-	$(GTK_DEP_LIBS)							\
+	$(GTK_DEP_LIBS) 						\
 	-lm
 
-bin_PROGRAMS = gtk3-demo
+bin_PROGRAMS = gtk-demo
 
 BUILT_SOURCES = demos.h
 
@@ -75,15 +75,15 @@ EXTRA_DIST += 		\
 demos.h: @REBUILD@ $(demos) geninclude.pl
 	(here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
 
-gtk3_demo_SOURCES = 		\
+gtk_demo_SOURCES = 		\
 	$(demos)		\
 	demo-common.h		\
 	main.c			\
 	demos.h
 
-gtk3_demo_DEPENDENCIES = $(DEPS)
-gtk3_demo_LDADD = $(LDADDS)
-gtk3_demo_LDFLAGS = -export-dynamic
+gtk_demo_DEPENDENCIES = $(DEPS)
+gtk_demo_LDADD = $(LDADDS)
+gtk_demo_LDFLAGS = -export-dynamic
 
 IMAGEFILES=	alphatest.png		\
 	        apple-red.png		\
@@ -98,7 +98,7 @@ IMAGEFILES=	alphatest.png		\
 		gnome-gmush.png		\
 		gnome-gsame.png		\
 		gnu-keys.png		\
-		gtk-logo-rgb.gif
+		gtk-logo-rgb.gif		
 
 democode_DATA = $(demos) $(IMAGEFILES) demo.ui
 

demos/gtk-demo/appwindow.c

@@ -19,16 +19,6 @@ activate_action (GtkAction *action)
 
   GtkWidget *dialog;
 
-  if (g_str_equal (name, "DarkTheme"))
-    {
-      gboolean value = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
-      GtkSettings *settings = gtk_settings_get_default ();
-
-      g_object_set (G_OBJECT (settings),
-		    "gtk-application-prefer-dark-theme", value,
-		    NULL);
-      return;
-    }
   dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                    GTK_DIALOG_DESTROY_WITH_PARENT,
                                    GTK_MESSAGE_INFO,
@@ -67,25 +57,6 @@ activate_radio_action (GtkAction *action, GtkRadioAction *current)
     }
 }
 
-static void
-activate_email (GtkAboutDialog *about,
-		const gchar    *link,
-		gpointer        data)
-{
-  gchar *text;
-  text = g_strdup_printf ("send mail to %s", link);
-  g_print ("%s\n", text);
-  g_free (text);
-}
-
-static void
-activate_url (GtkAboutDialog *about,
-	      const gchar    *link,
-	      gpointer        data)
-{
-  g_print ("show url %s\n", link);
-}
-
 static void
 about_cb (GtkAction *action,
 	  GtkWidget *window)
@@ -136,8 +107,6 @@ about_cb (GtkAction *action,
       g_object_unref (pixbuf);
     }
 
-  gtk_about_dialog_set_email_hook (activate_email, NULL, NULL);
-  gtk_about_dialog_set_url_hook (activate_url, NULL, NULL);
   gtk_show_about_dialog (GTK_WINDOW (window),
 			 "program-name", "GTK+ Code Demos",
 			 "version", PACKAGE_VERSION,
@@ -222,11 +191,6 @@ static GtkToggleActionEntry toggle_entries[] = {
     "Bold",                                    /* tooltip */
     G_CALLBACK (activate_action),
     TRUE },                                    /* is_active */
-  { "DarkTheme", NULL,                         /* name, stock id */
-     "_Prefer Dark Theme", NULL,               /* label, accelerator */
-    "Prefer Dark Theme",                       /* tooltip */
-    G_CALLBACK (activate_action),
-    FALSE },                                   /* is_active */
 };
 static guint n_toggle_entries = G_N_ELEMENTS (toggle_entries);
 
@@ -280,7 +244,6 @@ static const gchar *ui_info =
 "      <menuitem action='Quit'/>"
 "    </menu>"
 "    <menu action='PreferencesMenu'>"
-"      <menuitem action='DarkTheme'/>"
 "      <menu action='ColorMenu'>"
 "	<menuitem action='Red'/>"
 "	<menuitem action='Green'/>"

demos/gtk-demo/changedisplay.c

@@ -229,7 +229,6 @@ static void
 open_display_cb (GtkWidget         *button,
 		 ChangeDisplayInfo *info)
 {
-  GtkWidget *content_area;
   GtkWidget *dialog;
   GtkWidget *display_entry;
   GtkWidget *dialog_label;
@@ -249,13 +248,11 @@ open_display_cb (GtkWidget         *button,
   dialog_label =
     gtk_label_new ("Please enter the name of\nthe new display\n");
 
-  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-
-  gtk_container_add (GTK_CONTAINER (content_area), dialog_label);
-  gtk_container_add (GTK_CONTAINER (content_area), display_entry);
+  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), dialog_label);
+  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), display_entry);
 
   gtk_widget_grab_focus (display_entry);
-  gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (dialog)));
+  gtk_widget_show_all (GTK_BIN (dialog)->child);
 
   while (!result)
     {
@@ -602,7 +599,6 @@ do_changedisplay (GtkWidget *do_widget)
 
   if (!info)
     {
-      GtkWidget *content_area;
       GtkWidget *vbox;
       GtkWidget *frame;
 
@@ -622,11 +618,11 @@ do_changedisplay (GtkWidget *do_widget)
       g_signal_connect (info->window, "destroy",
 			G_CALLBACK (destroy_cb), &info);
 
-      content_area = gtk_dialog_get_content_area (GTK_DIALOG (info->window));
-
       vbox = gtk_vbox_new (FALSE, 5);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
-      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+
+      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (info->window)->vbox), vbox,
+			  TRUE, TRUE, 0);
 
       frame = create_display_frame (info);
       gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);

demos/gtk-demo/colorsel.c

@@ -22,14 +22,17 @@ expose_event_callback (GtkWidget      *widget,
   if (widget->window)
     {
       GtkStyle *style;
+      cairo_t *cr;
 
       style = gtk_widget_get_style (widget);
 
-      gdk_draw_rectangle (widget->window,
-                          style->bg_gc[GTK_STATE_NORMAL],
-                          TRUE,
-                          event->area.x, event->area.y,
-                          event->area.width, event->area.height);
+      cr = gdk_cairo_create (widget->window);
+
+      gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]);
+      gdk_cairo_rectangle (cr, &event->area);
+      cairo_fill (cr);
+
+      cairo_destroy (cr);
     }
 
   return TRUE;
@@ -41,15 +44,13 @@ change_color_callback (GtkWidget *button,
 {
   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));
-
-  selection_dialog = GTK_COLOR_SELECTION_DIALOG (dialog);
-  colorsel = GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection (selection_dialog));
+  
+  colorsel = GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (dialog)->colorsel);
 
   gtk_color_selection_set_previous_color (colorsel, &color);
   gtk_color_selection_set_current_color (colorsel, &color);

demos/gtk-demo/combobox.c

@@ -238,12 +238,12 @@ is_capital_sensitive (GtkCellLayout   *cell_layout,
 }
 
 static void
-fill_combo_entry (GtkWidget *entry)
+fill_combo_entry (GtkWidget *combo)
 {
-  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "One");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "Two");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "2\302\275");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (entry), "Three");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "One");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Two");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "2\302\275");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "Three");
 }
 
 
@@ -428,14 +428,14 @@ do_combobox (GtkWidget *do_widget)
     gtk_container_set_border_width (GTK_CONTAINER (box), 5);
     gtk_container_add (GTK_CONTAINER (frame), box);
     
-    combo = gtk_combo_box_entry_new_text ();
+    combo = gtk_combo_box_text_new_with_entry ();
     fill_combo_entry (combo);
     gtk_container_add (GTK_CONTAINER (box), combo);
     
     entry = g_object_new (TYPE_MASK_ENTRY, NULL);
     MASK_ENTRY (entry)->mask = "^([0-9]*|One|Two|2\302\275|Three)$";
      
-    gtk_container_remove (GTK_CONTAINER (combo), gtk_bin_get_child (GTK_BIN (combo)));
+    gtk_container_remove (GTK_CONTAINER (combo), GTK_BIN (combo)->child);
     gtk_container_add (GTK_CONTAINER (combo), entry);
   
   }

demos/gtk-demo/dialog.c

@@ -33,7 +33,6 @@ static void
 interactive_dialog_clicked (GtkButton *button,
 			    gpointer   user_data)
 {
-  GtkWidget *content_area;
   GtkWidget *dialog;
   GtkWidget *hbox;
   GtkWidget *stock;
@@ -52,11 +51,9 @@ interactive_dialog_clicked (GtkButton *button,
                                         GTK_RESPONSE_CANCEL,
 					NULL);
 
-  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-
   hbox = gtk_hbox_new (FALSE, 8);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
-  gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0);
 
   stock = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
   gtk_box_pack_start (GTK_BOX (hbox), stock, FALSE, FALSE, 0);

demos/gtk-demo/drawingarea.c

@@ -17,52 +17,51 @@
 
 static GtkWidget *window = NULL;
 /* Pixmap for scribble area, to store current scribbles */
-static GdkPixmap *pixmap = NULL;
+static cairo_surface_t *surface = NULL;
 
-/* Create a new pixmap of the appropriate size to store our scribbles */
+/* Create a new surface of the appropriate size to store our scribbles */
 static gboolean
 scribble_configure_event (GtkWidget         *widget,
                           GdkEventConfigure *event,
                           gpointer           data)
 {
-  if (pixmap)
-    g_object_unref (pixmap);
+  cairo_t *cr;
 
-  pixmap = gdk_pixmap_new (widget->window,
-                           widget->allocation.width,
-                           widget->allocation.height,
-                           -1);
+  if (surface)
+    cairo_surface_destroy (surface);
 
-  /* Initialize the pixmap to white */
-  gdk_draw_rectangle (pixmap,
-                      widget->style->white_gc,
-                      TRUE,
-                      0, 0,
-                      widget->allocation.width,
-                      widget->allocation.height);
+  surface = gdk_window_create_similar_surface (widget->window,
+                                               CAIRO_CONTENT_COLOR,
+                                               widget->allocation.width,
+                                               widget->allocation.height);
+
+  /* Initialize the surface to white */
+  cr = cairo_create (surface);
+
+  cairo_set_source_rgb (cr, 1, 1, 1);
+  cairo_paint (cr);
+
+  cairo_destroy (cr);
 
   /* We've handled the configure event, no need for further processing. */
   return TRUE;
 }
 
-/* Redraw the screen from the pixmap */
+/* Redraw the screen from the surface */
 static gboolean
 scribble_expose_event (GtkWidget      *widget,
                        GdkEventExpose *event,
                        gpointer        data)
 {
-  /* We use the "foreground GC" for the widget since it already exists,
-   * but honestly any GC would work. The only thing to worry about
-   * is whether the GC has an inappropriate clip region set.
-   */
+  cairo_t *cr;
 
-  gdk_draw_drawable (widget->window,
-                     widget->style->fg_gc[gtk_widget_get_state (widget)],
-                     pixmap,
-                     /* Only copy the area that was exposed. */
-                     event->area.x, event->area.y,
-                     event->area.x, event->area.y,
-                     event->area.width, event->area.height);
+  cr = gdk_cairo_create (widget->window);
+  
+  cairo_set_source_surface (cr, surface, 0, 0);
+  gdk_cairo_rectangle (cr, &event->area);
+  cairo_fill (cr);
+
+  cairo_destroy (cr);
 
   return FALSE;
 }
@@ -74,18 +73,20 @@ draw_brush (GtkWidget *widget,
             gdouble    y)
 {
   GdkRectangle update_rect;
+  cairo_t *cr;
 
   update_rect.x = x - 3;
   update_rect.y = y - 3;
   update_rect.width = 6;
   update_rect.height = 6;
 
-  /* Paint to the pixmap, where we store our state */
-  gdk_draw_rectangle (pixmap,
-                      widget->style->black_gc,
-                      TRUE,
-                      update_rect.x, update_rect.y,
-                      update_rect.width, update_rect.height);
+  /* Paint to the surface, where we store our state */
+  cr = cairo_create (surface);
+
+  gdk_cairo_rectangle (cr, &update_rect);
+  cairo_fill (cr);
+
+  cairo_destroy (cr);
 
   /* Now invalidate the affected region of the drawing area. */
   gdk_window_invalidate_rect (widget->window,
@@ -98,7 +99,7 @@ scribble_button_press_event (GtkWidget      *widget,
                              GdkEventButton *event,
                              gpointer        data)
 {
-  if (pixmap == NULL)
+  if (surface == NULL)
     return FALSE; /* paranoia check, in case we haven't gotten a configure event */
 
   if (event->button == 1)
@@ -116,7 +117,7 @@ scribble_motion_notify_event (GtkWidget      *widget,
   int x, y;
   GdkModifierType state;
 
-  if (pixmap == NULL)
+  if (surface == NULL)
     return FALSE; /* paranoia check, in case we haven't gotten a configure event */
 
   /* This call is very important; it requests the next motion event.
@@ -146,8 +147,7 @@ checkerboard_expose (GtkWidget      *da,
                      gpointer        data)
 {
   gint i, j, xcount, ycount;
-  GdkGC *gc1, *gc2;
-  GdkColor color;
+  cairo_t *cr;
 
 #define CHECK_SIZE 10
 #define SPACING 2
@@ -159,21 +159,9 @@ checkerboard_expose (GtkWidget      *da,
    * works.
    */
 
-  /* It would be a bit more efficient to keep these
-   * GC's around instead of recreating on each expose, but
-   * this is the lazy/slow way.
-   */
-  gc1 = gdk_gc_new (da->window);
-  color.red = 30000;
-  color.green = 0;
-  color.blue = 30000;
-  gdk_gc_set_rgb_fg_color (gc1, &color);
-
-  gc2 = gdk_gc_new (da->window);
-  color.red = 65535;
-  color.green = 65535;
-  color.blue = 65535;
-  gdk_gc_set_rgb_fg_color (gc2, &color);
+  cr = gdk_cairo_create (da->window);
+  gdk_cairo_rectangle (cr, &event->area);
+  cairo_clip (cr);
 
   xcount = 0;
   i = SPACING;
@@ -183,23 +171,17 @@ checkerboard_expose (GtkWidget      *da,
       ycount = xcount % 2; /* start with even/odd depending on row */
       while (j < da->allocation.height)
         {
-          GdkGC *gc;
-
           if (ycount % 2)
-            gc = gc1;
+            cairo_set_source_rgb (cr, 0.45777, 0, 0.45777);
           else
-            gc = gc2;
+            cairo_set_source_rgb (cr, 1, 1, 1);
 
           /* If we're outside event->area, this will do nothing.
            * It might be mildly more efficient if we handled
            * the clipping ourselves, but again we're feeling lazy.
            */
-          gdk_draw_rectangle (da->window,
-                              gc,
-                              TRUE,
-                              i, j,
-                              CHECK_SIZE,
-                              CHECK_SIZE);
+          cairo_rectangle (cr, i, j, CHECK_SIZE, CHECK_SIZE);
+          cairo_fill (cr);
 
           j += CHECK_SIZE + SPACING;
           ++ycount;
@@ -209,8 +191,7 @@ checkerboard_expose (GtkWidget      *da,
       ++xcount;
     }
 
-  g_object_unref (gc1);
-  g_object_unref (gc2);
+  cairo_destroy (cr);
 
   /* return TRUE because we've handled this event, so no
    * further processing is required.
@@ -223,9 +204,9 @@ close_window (void)
 {
   window = NULL;
 
-  if (pixmap)
-    g_object_unref (pixmap);
-  pixmap = NULL;
+  if (surface)
+    g_object_unref (surface);
+  surface = NULL;
 }
 
 GtkWidget *
@@ -292,7 +273,7 @@ do_drawingarea (GtkWidget *do_widget)
 
       gtk_container_add (GTK_CONTAINER (frame), da);
 
-      /* Signals used to handle backing pixmap */
+      /* Signals used to handle backing surface */
 
       g_signal_connect (da, "expose-event",
                         G_CALLBACK (scribble_expose_event), 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/entry_buffer.c

@@ -11,7 +11,6 @@ static GtkWidget *window = NULL;
 GtkWidget *
 do_entry_buffer (GtkWidget *do_widget)
 {
-  GtkWidget *content_area;
   GtkWidget *vbox;
   GtkWidget *label;
   GtkWidget *entry;
@@ -32,10 +31,8 @@ do_entry_buffer (GtkWidget *do_widget)
     g_signal_connect (window, "destroy",
 		      G_CALLBACK (gtk_widget_destroyed), &window);
 
-    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
     vbox = gtk_vbox_new (FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
     label = gtk_label_new (NULL);

demos/gtk-demo/entry_completion.c

@@ -37,7 +37,6 @@ create_completion_model (void)
 GtkWidget *
 do_entry_completion (GtkWidget *do_widget)
 {
-  GtkWidget *content_area;
   GtkWidget *vbox;
   GtkWidget *label;
   GtkWidget *entry;
@@ -59,10 +58,8 @@ do_entry_completion (GtkWidget *do_widget)
     g_signal_connect (window, "destroy",
 		      G_CALLBACK (gtk_widget_destroyed), &window);
 
-    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
     vbox = gtk_vbox_new (FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
     label = gtk_label_new (NULL);

demos/gtk-demo/expander.c

@@ -13,7 +13,6 @@ static GtkWidget *window = NULL;
 GtkWidget *
 do_expander (GtkWidget *do_widget)
 {
-  GtkWidget *content_area;
   GtkWidget *vbox;
   GtkWidget *label;
   GtkWidget *expander;
@@ -33,10 +32,8 @@ do_expander (GtkWidget *do_widget)
     g_signal_connect (window, "destroy",
 		      G_CALLBACK (gtk_widget_destroyed), &window);
 
-    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
     vbox = gtk_vbox_new (FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
     label = gtk_label_new ("Expander demo. Click on the triangle for details.");

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

@@ -317,7 +317,6 @@ do_images (GtkWidget *do_widget)
   GtkWidget *align;
   GtkWidget *button;
   GdkPixbuf *pixbuf;
-  GIcon     *gicon;
   GError *error = NULL;
   char *filename;
 
@@ -416,26 +415,6 @@ do_images (GtkWidget *do_widget)
 
       gtk_container_add (GTK_CONTAINER (frame), image);
 
-      /* Symbolic icon */
-
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label),
-			    "<u>Symbolic themed icon</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      /* The alignment keeps the frame from growing when users resize
-       * the window
-       */
-      align = gtk_alignment_new (0.5, 0.5, 0, 0);
-      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");
-      image = gtk_image_new_from_gicon (gicon, GTK_ICON_SIZE_DIALOG);
-
-      gtk_container_add (GTK_CONTAINER (frame), image);
 
       /* Progressive */
 

demos/gtk-demo/list_store.c

@@ -29,9 +29,7 @@ enum
   COLUMN_SEVERITY,
   COLUMN_DESCRIPTION,
   COLUMN_PULSE,
-  COLUMN_ICON,
   COLUMN_ACTIVE,
-  COLUMN_SENSITIVE,
   NUM_COLUMNS
 };
 
@@ -94,24 +92,11 @@ create_model (void)
                               G_TYPE_STRING,
                               G_TYPE_STRING,
                               G_TYPE_UINT,
-                              G_TYPE_STRING,
-                              G_TYPE_BOOLEAN,
                               G_TYPE_BOOLEAN);
 
   /* add data to the list store */
   for (i = 0; i < G_N_ELEMENTS (data); i++)
     {
-      gchar *icon_name;
-      gboolean sensitive;
-
-      if (i == 1 || i == 3)
-        icon_name = "battery-critical-charging-symbolic";
-      else
-        icon_name = NULL;
-      if (i == 3)
-        sensitive = FALSE;
-      else
-        sensitive = TRUE;
       gtk_list_store_append (store, &iter);
       gtk_list_store_set (store, &iter,
                           COLUMN_FIXED, data[i].fixed,
@@ -119,9 +104,7 @@ create_model (void)
                           COLUMN_SEVERITY, data[i].severity,
                           COLUMN_DESCRIPTION, data[i].description,
                           COLUMN_PULSE, 0,
-                          COLUMN_ICON, icon_name,
                           COLUMN_ACTIVE, FALSE,
-                          COLUMN_SENSITIVE, sensitive,
                           -1);
     }
 
@@ -216,19 +199,6 @@ add_columns (GtkTreeView *treeview)
                                                      NULL);
   gtk_tree_view_column_set_sort_column_id (column, COLUMN_PULSE);
   gtk_tree_view_append_column (treeview, column);
-
-  /* column for symbolic icon */
-  renderer = gtk_cell_renderer_pixbuf_new ();
-  g_object_set (G_OBJECT (renderer), "follow-state", TRUE, NULL);
-  column = gtk_tree_view_column_new_with_attributes ("Symbolic icon",
-                                                     renderer,
-                                                     "icon-name",
-                                                     COLUMN_ICON,
-                                                     "sensitive",
-                                                     COLUMN_SENSITIVE,
-                                                     NULL);
-  gtk_tree_view_column_set_sort_column_id (column, COLUMN_ICON);
-  gtk_tree_view_append_column (treeview, column);
 }
 
 static gboolean

demos/gtk-demo/main.c

@@ -941,8 +941,8 @@ main (int argc, char **argv)
   if (g_file_test ("../../gdk-pixbuf/libpixbufloader-pnm.la",
                    G_FILE_TEST_EXISTS))
     {
-      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../../gdk-pixbuf/loaders.cache", TRUE);
-      g_setenv ("GTK_IM_MODULE_FILE", "../../modules/input/immodules.cache", TRUE);
+      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
+      g_setenv ("GTK_IM_MODULE_FILE", "../../modules/input/gtk.immodules", TRUE);
     }
   /* -- End of hack -- */
   

demos/gtk-demo/offscreen_window.c

@@ -226,12 +226,12 @@ gtk_rotated_bin_realize (GtkWidget *widget)
   GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
   GdkWindowAttr attributes;
   gint attributes_mask;
-  guint border_width;
+  gint border_width;
   GtkRequisition child_requisition;
 
   gtk_widget_set_realized (widget, TRUE);
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+  border_width = GTK_CONTAINER (widget)->border_width;
 
   attributes.x = widget->allocation.x + border_width;
   attributes.y = widget->allocation.y + border_width;
@@ -378,7 +378,6 @@ gtk_rotated_bin_size_request (GtkWidget      *widget,
   GtkRequisition child_requisition;
   double s, c;
   double w, h;
-  guint border_width;
 
   child_requisition.width = 0;
   child_requisition.height = 0;
@@ -391,9 +390,8 @@ gtk_rotated_bin_size_request (GtkWidget      *widget,
   w = c * child_requisition.width + s * child_requisition.height;
   h = s * child_requisition.width + c * child_requisition.height;
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-  requisition->width = border_width * 2 + w;
-  requisition->height = border_width * 2 + h;
+  requisition->width = GTK_CONTAINER (widget)->border_width * 2 + w;
+  requisition->height = GTK_CONTAINER (widget)->border_width * 2 + h;
 }
 
 static void
@@ -401,13 +399,13 @@ gtk_rotated_bin_size_allocate (GtkWidget     *widget,
                                GtkAllocation *allocation)
 {
   GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
-  guint border_width;
+  gint border_width;
   gint w, h;
   gdouble s, c;
 
   widget->allocation = *allocation;
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+  border_width = GTK_CONTAINER (widget)->border_width;
 
   w = allocation->width - border_width * 2;
   h = allocation->height - border_width * 2;
@@ -495,7 +493,7 @@ gtk_rotated_bin_expose (GtkWidget      *widget,
               cairo_translate (cr, -child_area.width / 2, -child_area.height / 2);
 
               /* clip */
-              gdk_drawable_get_size (pixmap, &width, &height);
+              gdk_pixmap_get_size (pixmap, &width, &height);
               cairo_rectangle (cr, 0, 0, width, height);
               cairo_clip (cr);
               /* paint */

demos/gtk-demo/offscreen_window2.c

@@ -164,12 +164,12 @@ gtk_mirror_bin_realize (GtkWidget *widget)
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
   GdkWindowAttr attributes;
   gint attributes_mask;
-  guint border_width;
+  gint border_width;
   GtkRequisition child_requisition;
 
   gtk_widget_set_realized (widget, TRUE);
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+  border_width = GTK_CONTAINER (widget)->border_width;
 
   attributes.x = widget->allocation.x + border_width;
   attributes.y = widget->allocation.y + border_width;
@@ -302,7 +302,6 @@ gtk_mirror_bin_size_request (GtkWidget      *widget,
 {
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
   GtkRequisition child_requisition;
-  guint border_width;
 
   child_requisition.width = 0;
   child_requisition.height = 0;
@@ -310,9 +309,8 @@ gtk_mirror_bin_size_request (GtkWidget      *widget,
   if (bin->child && gtk_widget_get_visible (bin->child))
     gtk_widget_size_request (bin->child, &child_requisition);
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-  requisition->width = border_width * 2 + child_requisition.width + 10;
-  requisition->height = border_width * 2 + child_requisition.height * 2 + 10;
+  requisition->width = GTK_CONTAINER (widget)->border_width * 2 + child_requisition.width + 10;
+  requisition->height = GTK_CONTAINER (widget)->border_width * 2 + child_requisition.height * 2 + 10;
 }
 
 static void
@@ -320,12 +318,11 @@ gtk_mirror_bin_size_allocate (GtkWidget     *widget,
                                GtkAllocation *allocation)
 {
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
+  gint border_width;
   gint w, h;
-  guint border_width;
-
   widget->allocation = *allocation;
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+  border_width = GTK_CONTAINER (widget)->border_width;
 
   w = allocation->width - border_width * 2;
   h = allocation->height - border_width * 2;
@@ -384,7 +381,7 @@ gtk_mirror_bin_expose (GtkWidget      *widget,
           if (bin->child && gtk_widget_get_visible (bin->child))
             {
               pixmap = gdk_offscreen_window_get_pixmap (bin->offscreen_window);
-              gdk_drawable_get_size (pixmap, &width, &height);
+              gdk_pixmap_get_size (pixmap, &width, &height);
 
               cr = gdk_cairo_create (widget->window);
 

demos/gtk-demo/panes.c

@@ -18,13 +18,11 @@ toggle_resize (GtkWidget *widget,
 	       GtkWidget *child)
 {
   GtkPaned *paned = GTK_PANED (child->parent);
-  gboolean is_child1 = (child == gtk_paned_get_child1 (paned));
+  gboolean is_child1 = (child == paned->child1);
   gboolean resize, shrink;
 
-  gtk_container_child_get (GTK_CONTAINER (paned), child,
-                           "resize", &resize,
-                           "shrink", &shrink,
-                           NULL);
+  resize = is_child1 ? paned->child1_resize : paned->child2_resize;
+  shrink = is_child1 ? paned->child1_shrink : paned->child2_shrink;
 
   g_object_ref (child);
   gtk_container_remove (GTK_CONTAINER (child->parent), child);
@@ -40,13 +38,11 @@ toggle_shrink (GtkWidget *widget,
 	       GtkWidget *child)
 {
   GtkPaned *paned = GTK_PANED (child->parent);
-  gboolean is_child1 = (child == gtk_paned_get_child1 (paned));
+  gboolean is_child1 = (child == paned->child1);
   gboolean resize, shrink;
 
-  gtk_container_child_get (GTK_CONTAINER (paned), child,
-                           "resize", &resize,
-                           "shrink", &shrink,
-                           NULL);
+  resize = is_child1 ? paned->child1_resize : paned->child2_resize;
+  shrink = is_child1 ? paned->child1_shrink : paned->child2_shrink;
 
   g_object_ref (child);
   gtk_container_remove (GTK_CONTAINER (child->parent), child);
@@ -63,15 +59,11 @@ create_pane_options (GtkPaned	 *paned,
 		     const gchar *label1,
 		     const gchar *label2)
 {
-  GtkWidget *child1, *child2;
   GtkWidget *frame;
   GtkWidget *table;
   GtkWidget *label;
   GtkWidget *check_button;
-
-  child1 = gtk_paned_get_child1 (paned);
-  child2 = gtk_paned_get_child2 (paned);
-
+  
   frame = gtk_frame_new (frame_label);
   gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
   
@@ -86,16 +78,16 @@ create_pane_options (GtkPaned	 *paned,
   gtk_table_attach_defaults (GTK_TABLE (table), check_button,
 			     0, 1, 1, 2);
   g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_resize), child1);
-
+		    G_CALLBACK (toggle_resize), paned->child1);
+  
   check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
   gtk_table_attach_defaults (GTK_TABLE (table), check_button,
 			     0, 1, 2, 3);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
 			       TRUE);
   g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_shrink), child1);
-
+		    G_CALLBACK (toggle_shrink), paned->child1);
+  
   label = gtk_label_new (label2);
   gtk_table_attach_defaults (GTK_TABLE (table), label,
 			     1, 2, 0, 1);
@@ -106,15 +98,15 @@ create_pane_options (GtkPaned	 *paned,
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
 			       TRUE);
   g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_resize), child2);
-
+		    G_CALLBACK (toggle_resize), paned->child2);
+  
   check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
   gtk_table_attach_defaults (GTK_TABLE (table), check_button,
 			     1, 2, 2, 3);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
 			       TRUE);
   g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_shrink), child2);
+		    G_CALLBACK (toggle_shrink), paned->child2);
 
   return frame;
 }

demos/gtk-demo/pixbufs.c

@@ -100,20 +100,15 @@ expose_cb (GtkWidget      *widget,
            GdkEventExpose *event,
            gpointer        data)
 {
-  guchar *pixels;
-  int rowstride;
+  cairo_t *cr;
 
-  rowstride = gdk_pixbuf_get_rowstride (frame);
+  cr = gdk_cairo_create (event->window);
 
-  pixels = gdk_pixbuf_get_pixels (frame) + rowstride * event->area.y + event->area.x * 3;
+  gdk_cairo_set_source_pixbuf (cr, frame, 0, 0);
+  gdk_cairo_rectangle (cr, &event->area);
+  cairo_fill (cr);
 
-  gdk_draw_rgb_image_dithalign (widget->window,
-                                widget->style->black_gc,
-                                event->area.x, event->area.y,
-                                event->area.width, event->area.height,
-                                GDK_RGB_DITHER_NORMAL,
-                                pixels, rowstride,
-                                event->area.x, event->area.y);
+  cairo_destroy (cr);
 
   return TRUE;
 }

demos/gtk-demo/search_entry.c

@@ -241,7 +241,6 @@ entry_populate_popup (GtkEntry *entry,
 GtkWidget *
 do_search_entry (GtkWidget *do_widget)
 {
-  GtkWidget *content_area;
   GtkWidget *vbox;
   GtkWidget *hbox;
   GtkWidget *label;
@@ -264,10 +263,8 @@ do_search_entry (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
                         G_CALLBACK (search_entry_destroyed), &window);
 
-      content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
       vbox = gtk_vbox_new (FALSE, 5);
-      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
       label = gtk_label_new (NULL);

demos/gtk-demo/sizegroup.c

@@ -25,10 +25,10 @@ create_combo_box (const char **strings)
   GtkWidget *combo_box;
   const char **str;
 
-  combo_box = gtk_combo_box_new_text ();
+  combo_box = gtk_combo_box_text_new ();
   
   for (str = strings; *str; str++)
-    gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), *str);
+    gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), *str);
 
   gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 0);
 
@@ -82,7 +82,6 @@ toggle_grouping (GtkToggleButton *check_button,
 GtkWidget *
 do_sizegroup (GtkWidget *do_widget)
 {
-  GtkWidget *content_area;
   GtkWidget *table;
   GtkWidget *frame;
   GtkWidget *vbox;
@@ -116,10 +115,8 @@ do_sizegroup (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);
 
-      content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
       vbox = gtk_vbox_new (FALSE, 5);
-      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
       size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);

demos/gtk-demo/spinner.c

@@ -27,7 +27,6 @@ on_stop_clicked (GtkButton *button, gpointer user_data)
 GtkWidget *
 do_spinner (GtkWidget *do_widget)
 {
-  GtkWidget *content_area;
   GtkWidget *vbox;
   GtkWidget *hbox;
   GtkWidget *button;
@@ -48,10 +47,8 @@ do_spinner (GtkWidget *do_widget)
     g_signal_connect (window, "destroy",
                       G_CALLBACK (gtk_widget_destroyed), &window);
 
-    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
     vbox = gtk_vbox_new (FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
     /* Sensitive */

demos/gtk-demo/textview.c

@@ -14,17 +14,9 @@
 
 static void easter_egg_callback (GtkWidget *button, gpointer data);
 
-#define gray50_width 2
-#define gray50_height 2
-static char gray50_bits[] = {
-  0x02, 0x01
-};
-
 static void
 create_tags (GtkTextBuffer *buffer)
 {
-  GdkBitmap *stipple;
-
   /* Create a bunch of tags. Note that it's also possible to
    * create tags with gtk_text_tag_new() then add them to the
    * tag table for the buffer, gtk_text_buffer_create_tag() is
@@ -74,18 +66,6 @@ create_tags (GtkTextBuffer *buffer)
   gtk_text_buffer_create_tag (buffer, "red_background",
 			      "background", "red", NULL);
 
-  stipple = gdk_bitmap_create_from_data (NULL,
-					 gray50_bits, gray50_width,
-					 gray50_height);
-  
-  gtk_text_buffer_create_tag (buffer, "background_stipple",
-			      "background_stipple", stipple, NULL);
-
-  gtk_text_buffer_create_tag (buffer, "foreground_stipple",
-			      "foreground_stipple", stipple, NULL);
-
-  g_object_unref (stipple);
-
   gtk_text_buffer_create_tag (buffer, "big_gap_before_line",
 			      "pixels_above_lines", 30, NULL);
 
@@ -227,17 +207,9 @@ insert_text (GtkTextBuffer *buffer)
 					    "red_background", NULL);
   gtk_text_buffer_insert (buffer, &iter, " or even ", -1);  
   gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "a stippled red background", -1,
-					    "red_background",
-					    "background_stipple",
-					    NULL);
-
-  gtk_text_buffer_insert (buffer, &iter, " or ", -1);  
-  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "a stippled blue foreground on solid red background", -1,
+					    "a blue foreground on red background", -1,
 					    "blue_foreground",
 					    "red_background",
-					    "foreground_stipple",
 					    NULL);
   gtk_text_buffer_insert (buffer, &iter, " (select that to read it) can be used.\n\n", -1);  
 
@@ -399,11 +371,11 @@ attach_widgets (GtkTextView *text_view)
         }
       else if (i == 1)
         {
-          widget = gtk_combo_box_new_text ();
+          widget = gtk_combo_box_text_new ();
 
-          gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Option 1");
-          gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Option 2");
-          gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Option 3");
+          gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Option 1");
+          gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Option 2");
+          gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Option 3");
         }
       else if (i == 2)
         {

demos/pixbuf-demo.c

@@ -89,20 +89,14 @@ load_pixbufs (void)
 static gint
 expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
-	guchar *pixels;
-	int rowstride;
+        cairo_t *cr;
+         
+        cr = gdk_cairo_create (event->window);
+        gdk_cairo_set_source_pixbuf (cr, frame, 0, 0);
+        gdk_cairo_rectangle (cr, &event->area);
+        cairo_fill (cr);
 
-	rowstride = gdk_pixbuf_get_rowstride (frame);
-
-	pixels = gdk_pixbuf_get_pixels (frame) + rowstride * event->area.y + event->area.x * 3;
-		  
-	gdk_draw_rgb_image_dithalign (widget->window,
-				      widget->style->black_gc,
-				      event->area.x, event->area.y,
-				      event->area.width, event->area.height,
-				      GDK_RGB_DITHER_NORMAL,
-				      pixels, rowstride,
-				      event->area.x, event->area.y);
+        cairo_destroy (cr);
 
 	return TRUE;
 }

demos/pixbuf-init.c

@@ -16,5 +16,5 @@ void
 pixbuf_init (void)
 {
   if (file_exists ("../gdk-pixbuf/libpixbufloader-pnm.la"))
-    g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/loaders.cache", TRUE);
+    g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
 }

demos/testpixbuf-color.c

@@ -111,8 +111,6 @@ main (int argc, char **argv)
 
 	gtk_init (&argc, &argv);
 
-	gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
-
 	root = gdk_get_default_root_window ();
 	pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
 					       0, 0, 0, 0, 150, 160);

demos/testpixbuf-drawable.c

@@ -1,4 +1,7 @@
 #include "config.h"
+
+#undef GDK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
 
 int

demos/testpixbuf-save.c

@@ -311,32 +311,18 @@ static int
 expose_cb (GtkWidget *drawing_area, GdkEventExpose *evt, gpointer data)
 {
         GdkPixbuf *pixbuf;
+        cairo_t *cr;
          
         pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (drawing_area),
 						  "pixbuf");
-        if (gdk_pixbuf_get_has_alpha (pixbuf)) {
-                gdk_draw_rgb_32_image (drawing_area->window,
-                                       drawing_area->style->black_gc,
-                                       evt->area.x, evt->area.y,
-                                       evt->area.width,
-                                       evt->area.height,
-                                       GDK_RGB_DITHER_MAX,
-                                       gdk_pixbuf_get_pixels (pixbuf) +
-                                       (evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) +
-                                       (evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
-                                       gdk_pixbuf_get_rowstride (pixbuf));
-        } else {
-                gdk_draw_rgb_image (drawing_area->window, 
-                                    drawing_area->style->black_gc, 
-                                    evt->area.x, evt->area.y,
-                                    evt->area.width,
-                                    evt->area.height,  
-                                    GDK_RGB_DITHER_NORMAL,
-                                    gdk_pixbuf_get_pixels (pixbuf) +
-                                    (evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) +
-                                    (evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
-                                    gdk_pixbuf_get_rowstride (pixbuf));
-        }
+
+        cr = gdk_cairo_create (evt->window);
+        gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
+        gdk_cairo_rectangle (cr, &evt->area);
+        cairo_fill (cr);
+
+        cairo_destroy (cr);
+
         return FALSE;
 }
 
@@ -374,8 +360,6 @@ main (int argc, char **argv)
    
         gtk_init (&argc, &argv);   
 
-        gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
-
         root = gdk_get_default_root_window ();
         pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
                                                0, 0, 0, 0, 150, 160);

demos/testpixbuf-scale.c

@@ -35,6 +35,7 @@ gboolean
 expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
   GdkPixbuf *dest;
+  cairo_t *cr;
 
   gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
   
@@ -48,11 +49,13 @@ expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 			      interp_type, overall_alpha,
 			      event->area.x, event->area.y, 16, 0xaaaaaa, 0x555555);
 
-  gdk_draw_pixbuf (widget->window, widget->style->fg_gc[GTK_STATE_NORMAL], dest,
-		   0, 0, event->area.x, event->area.y,
-		   event->area.width, event->area.height,
-		   GDK_RGB_DITHER_NORMAL, event->area.x, event->area.y);
-  
+  cr = gdk_cairo_create (event->window);
+
+  gdk_cairo_set_source_pixbuf (cr, dest, 0, 0);
+  gdk_cairo_rectangle (cr, &event->area);
+  cairo_fill (cr);
+
+  cairo_destroy (cr);
   g_object_unref (dest);
   
   return TRUE;
@@ -101,12 +104,12 @@ main(int argc, char **argv)
 	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (window), vbox);
 
-        combo_box = gtk_combo_box_new_text ();
+        combo_box = gtk_combo_box_text_new ();
 
-        gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "NEAREST");
-        gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "BILINEAR");
-        gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "TILES");
-        gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "HYPER");
+        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), "NEAREST");
+        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), "BILINEAR");
+        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), "TILES");
+        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), "HYPER");
 
         gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 1);
 

demos/testpixbuf.c

@@ -22,6 +22,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+
+#undef GDK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
@@ -322,6 +325,7 @@ expose_func (GtkWidget *drawing_area, GdkEventExpose *event, gpointer data)
 
 	if (gdk_pixbuf_get_has_alpha (pixbuf)) {
 		GdkPixbuf *dest;
+                cairo_t *cr;
 	  
 		gdk_window_set_back_pixmap (drawing_area->window, NULL, FALSE);
 	  
@@ -335,11 +339,13 @@ expose_func (GtkWidget *drawing_area, GdkEventExpose *event, gpointer data)
 					    GDK_INTERP_BILINEAR, 255,
 					    event->area.x, event->area.y, 16, 0xaaaaaa, 0x555555);
 		
-		gdk_draw_pixbuf (drawing_area->window, drawing_area->style->fg_gc[GTK_STATE_NORMAL], dest,
-				 0, 0, event->area.x, event->area.y,
-				 event->area.width, event->area.height,
-				 GDK_RGB_DITHER_NORMAL, event->area.x, event->area.y);
-		
+                cr = gdk_cairo_create (drawing_area->window);
+
+                gdk_cairo_set_source_pixbuf (cr, dest, 0, 0);
+                gdk_cairo_rectangle (cr, &event->area);
+                cairo_fill (cr);
+
+                cairo_destroy (cr);
 		g_object_unref (dest);
 	} else {
 		gdk_draw_rgb_image (drawing_area->window,

docs/RELEASE-HOWTO

@@ -26,21 +26,16 @@ Make sure that gtk-doc is the latest released version.
     committers, etc. Anybody who is mentioned in ChangeLog gets
     credits, but only real names, not email addresses or nicknames.
 
- 3) Update the pot files and commit the changes:
-
-    make -C po gtk30.pot
-    make -C po-properties gtk30-properties.pot
-
- 4) In particular, if this is a major, stable, release, verify that
+ 3) In particular, if this is a major, stable, release, verify that
     README.in contains the relevant release notes and that the
     required versions of dependencies in INSTALL.in are in sync
-    with configure.ac.
+    with configure.in.
 
- 5) Verify that the version in configure.ac has been bumped after the last
+ 4) Verify that the version in configure.in has been bumped after the last
     release. (Note that this is critical, a slip-up here will cause the
     soname to change).
 
- 6) Make sure that make check is happy (If you don't do it here, make distcheck
+ 5) Make sure that make check is happy (If you don't do it here, make distcheck
     will also catch it, but it is kind of disheartening to see make distcheck
     fail due to an extraneous symbol after watching it build the docs for an
     hour...).
@@ -54,7 +49,7 @@ Make sure that gtk-doc is the latest released version.
       using a function from a different library, which is not yet allowed
       by the filter in pltcheck.sh
 
- 7) If this is a devel release, make sure that the docs for new symbols
+ 6) If this is a devel release, make sure that the docs for new symbols
     are in good shape. Look at the -unused.txt files and add stuff found
     there to the corresponding -sections.txt file. Look at the
     -undocumented.txt files and see if there is anything in there that
@@ -63,12 +58,12 @@ Make sure that gtk-doc is the latest released version.
     Since: tags, and that there is an index in the main -docs.sgml for
     the next stable version.
 
- 8) make distcheck
+ 7) make distcheck
 
- 9) Fix broken stuff found by 8), commit changes: git commit -a, repeat.
+ 8) Fix broken stuff found by 7), repeat
 
-10) Once distcheck succeeds, verify that the tree is clean: git diff should
-    come up empty.
+ 9) Commit all changes: git commit -a. You will have a bunch of po file
+    changes, NEWS and maybe some doc changes too
 
 10) Now you've got the tarball. Check that the tarball size looks
     reasonable compared to previous releases. If the size goes down
@@ -83,7 +78,7 @@ Make sure that gtk-doc is the latest released version.
 
     git push origin refs/tags/2.12.10
 
-13) Bump the version number in configure.ac and commit and push this change
+13) Bump the version number in configure.in and commit and push this change
 
 14) Upload the tarball to master.gnome.org and run install-module to transfer
     it to download.gnome.org. If you don't have an account on master.gnome.org,

docs/faq/gtk-faq.sgml

@@ -345,11 +345,12 @@ command line option.</simpara>
 <title>Is there a Windows version of GTK+? <emphasis>[GTK 2.x]</emphasis></title>
 
 <para>The Win32 port of GTK+ is maintained concurrently with the Xwindows
-version in CVS. As such it is a supported architecture.</para>
+version in Git. As such it is a supported architecture.</para>
 
 <para>The Win32 port has been predominately done by Tor Lillqvist. Tor
-maintains some information on <ulink url="http://www.gimp.org/~tml/gimp/win32/">
-GTK+ and GIMP for Windows</ulink>.</para>
+maintains some information on the
+  Windows <ulink url="http://www.gtk.org/download.html">download
+    page</ulink> (32bit and 64bit).</para>
 
 <para>There is a pre-compiled, easy-to-install version of GTK+ for
 windows on the <ulink url="http://www.dropline.net/gtk/">
@@ -670,70 +671,56 @@ successful, try executing it.</para>
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
-<title>Whats this CVS thing that everyone keeps talking about,
+<title>What's this Git thing that everyone keeps talking about,
 and how do I access it? <emphasis>[GTK 2.x]</emphasis></title>
 
-<para>CVS is the Concurrent Version System and is a very
+<para>Git is a version control system and it is a very
 popular means of version control for software projects. It is
 designed to allow multiple authors to simultanously operate on the same
 source tree.  This source tree is centrally maintained, but each
 developer has a local mirror of this repository that they make
 their changes to.</para>
 
-<para>The GTK+ developers use a CVS repository to store the
+<para>The GTK+ developers use a Git repository to store the
 master copy of the current development version of GTK+. As
 such, people wishing to contribute patches to GTK+ should
-generate them against the CVS version. Normal people should
+generate them against the Git version. Normal people should
 use the packaged releases.</para>
 
-<para>The CVS toolset is available as RPM packages from the
-usual RedHat sites. The latest version is available at <ulink
-url="http://download.cyclic.com/pub/">http://download.cyclic.com/pub/
-</ulink></para>
+<para>The Git toolset is available as a package on most distributions
+  and the released tarballs are available
+  from <ulink url="http://git-scm.com/">http://git-scm.com/</ulink>.</para>
 
-<para>Anyone can download the latest CVS version of GTK+ by
+<para>Anyone can download the latest Git version of GTK+ by
 using anonymous access using the following steps:</para>
 
 <itemizedlist>
-<listitem><simpara> In a bourne shell descendant (e.g. bash) type:</simpara>
+<listitem><simpara>In a bourne shell descendant (e.g. bash) type:</simpara>
 <para><literallayout>
-<literal>CVSROOT=':pserver:anonymous@anoncvs.gnome.org:/cvs/gnome'</literal>
-<literal>export CVSROOT</literal>
-</literallayout></para>
-</listitem>
-
-<listitem><simpara>Next, the first time the source tree is
-checked out, a cvs login is needed. </simpara>
-<para><literallayout>
-<literal>cvs login</literal>
-</literallayout></para>
-<para>This will ask you for a password. There is no
-password for cvs.gimp.org, so just enter a carriage return.</para>
-</listitem>
-
-<listitem><simpara>To get the tree and place it in a subdir of your
-current working directory, issue the command:</simpara>
-<para><literallayout>
-<literal>cvs -z3 get gtk+</literal>
+<literal>git clone git://git.gnome.org/gtk+</literal>
 </literallayout></para>
 <para>Note that with the GTK+ 1.1 tree, glib has been moved to
-a separate CVS module, so if you don't have glib installed you will
-need to get that as well:</para>
-<para><literallayout>
-<literal>cvs -z3 get glib</literal>
+a separate Git module, so if you don't have glib installed you will
+need to get that as well:<literallayout>
+<literal>git clone git://git.gnome.org/glib</literal>
 </literallayout></para>
 </listitem>
 </itemizedlist>
 
-<para>The CVS archive stores both the current development version of
-GTK+ (the CVS HEAD branch) and all current and past stable versions.
+<para>The Git archive stores both the current development version of
+GTK+ (the Git master branch) and all current and past stable versions.
 If you want to retrieve a specific version of GTK+ you have to specify
-the CVS tag corresponding to the version you want to checkout. If you
+the Git tag corresponding to the version you want to checkout. If you
 want to checkout the current GTK+ 2.2 stable source code, you would need
 to use the following command:</para>
 
 <para><literallayout>
-<literal>cvs -z3 get -r gtk-2-2 gtk+</literal>
+<literal>git checkout --track -b gtk-2-24 origin/gtk-2-24</literal>
+</literallayout></para>
+
+<para>You can switch between branches once set up more easily using:</para>
+<para><literallayout>
+<literal>git checkout master</literal>
 </literallayout></para>
 </sect1>
 
@@ -996,11 +983,11 @@ relevant packages. These are:</para>
 or on any GNU mirror.</para>
 
 <para>In order to use the powerful autoconf/automake scheme,
-you must create a configure.ac which may look like:</para>
+you must create a configure.in which may look like:</para>
 
 <programlisting role="C">
 dnl Process this file with autoconf to produce a configure script.
-dnl configure.ac for a GTK+ based program
+dnl configure.in for a GTK+ based program
 
 AC_INIT(myprg.c)
 AM_INIT_AUTOMAKE(mypkgname, 0.0.1)
@@ -1137,7 +1124,8 @@ myapp --display=:1
      | | | +GtkCombo
      | | | `GtkStatusbar
      | | `GtkVBox
-     | |   `GtkColorSelection
+     | |   +GtkColorSelection
+     | |   `GtkGammaCurve
      | +GtkButton
      | | +GtkOptionMenu
      | | `GtkToggleButton
@@ -1159,6 +1147,7 @@ myapp --display=:1
      | +GtkToolbar
      | `GtkTree
      +GtkDrawingArea
+     | `GtkCurve
      +GtkEditable
      | +GtkEntry
      | | `GtkSpinButton
@@ -1627,7 +1616,11 @@ int main(int argc, char *argv[])
   g_signal_connect(G_OBJECT (window), "destroy",
 		     G_CALLBACK(destroy), NULL);
 
+#if (GTK_MAJOR_VERSION == 1) &amp;&amp; (GTK_MINOR_VERSION == 0)
+  gtk_container_border_width(GTK_CONTAINER (window), 10);
+#else  
   gtk_container_set_border_width(GTK_CONTAINER (window), 10);
+#endif
 
   /* add a button to do something useful */
   button = gtk_button_new_with_label("Fork me!");
@@ -1892,7 +1885,7 @@ not applied you'll have to use the
 function. <literal>gtk_object_class_user_signal_new</literal> allows you
 to add a new signal to a predefined GTK+ widget without any
 modification of the GTK+ source code. The new signal can be
-emited with <literal>g_signal_emit</literal> and can be
+emited with <literal>gtk_signal_emit</literal> and can be
 handled in the same way as other signals.</para>
 
 <para>Tim Janik posted this code snippet:</para>
@@ -1914,7 +1907,7 @@ gtk_widget_user_action (GtkWidget *widget,
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  g_signal_emit (widget, signal_user_action, act_data);
+  gtk_signal_emit (GTK_OBJECT (widget), signal_user_action, act_data);
 }
 </programlisting>
 
@@ -2521,15 +2514,15 @@ using the following expression:</para>
 
 <para>If you don't want the user to be able to modify the
 content of this entry, you can use the
-gtk_editable_set_editable() function:</para>
+gtk_entry_set_editable() function:</para>
 
 
 <programlisting role="C">
-void gtk_editable_set_editable (GtkEditable *editable,
-                                gboolean     is_editable);
+      void gtk_entry_set_editable(GtkEntry *entry, 
+                                  gboolean editable);
 </programlisting>
 
-<para>Set the is_editable parameter to FALSE to disable typing
+<para>Set the editable parameter to FALSE to disable typing
 into the entry.</para>
 </sect1>
 
@@ -2553,10 +2546,10 @@ into the entry.</para>
 signal handler with</para>
 
 <programlisting role="C">
-      g_signal_connect(GTK_COMBO(cb)->entry,
-                       "changed",
-                       G_CALLBACK(my_cb_change_handler),
-                       NULL);
+      gtk_signal_connect(GTK_COMBO(cb)->entry,
+                         "changed",
+                         GTK_SIGNAL_FUNC(my_cb_change_handler),
+                         NULL);
 </programlisting>
 
 </sect1>
@@ -2623,8 +2616,8 @@ underlined, and the relevant accelerators are created.</para>
   gtk_box_pack_start (GTK_BOX (vbox1), menubar1, FALSE, FALSE, 0);
 
   file1 = gtk_menu_item_new_with_label ("");
-  gtk_label_set_use_underline (GTK_LABEL (gtk_bin_get_child (GTK_BIN (file1))),
-                               TRUE);
+  tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (file1)->child),
+                                   _("_File"));
   gtk_widget_add_accelerator (file1, "activate_item", accel_group,
                               tmp_key, GDK_MOD1_MASK, 0);
   gtk_object_set_data (GTK_OBJECT (window1), "file1", file1);
@@ -2637,8 +2630,8 @@ underlined, and the relevant accelerators are created.</para>
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (file1), file1_menu);
 
   new1 = gtk_menu_item_new_with_label ("");
-  gtk_label_set_use_underline (GTK_LABEL (gtk_bin_get_child (GTK_BIN (new1))),
-                               TRUE);
+  tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (new1)->child),
+                                   _("_New"));
   gtk_widget_add_accelerator (new1, "activate_item", file1_menu_accels,
                               tmp_key, 0, 0);
   gtk_object_set_data (GTK_OBJECT (window1), "new1", new1);
@@ -2664,9 +2657,9 @@ GtkMenuItem with:</para>
       /* do stuff with child */
       if (GTK_IS_LABEL (child))
       {
-        const gchar *text;
+        gchar *text;
     
-        text = gtk_label_get_text (GTK_LABEL (child));
+        gtk_label_get (GTK_LABEL (child), &amp;text);
         g_print ("menu item text: %s\n", text);
       }
     }
@@ -2858,9 +2851,9 @@ be:</para>
 
 <programlisting role="C">
   entry = gtk_entry_new();
-  g_signal_connect (entry, "activate",
-                    G_CALLBACK(entry_callback),
-                    NULL);
+  gtk_signal_connect (GTK_OBJECT(entry), "activate",
+                      GTK_SIGNAL_FUNC(entry_callback),
+                      NULL);
 </programlisting>
 
 </sect1>
@@ -3038,8 +3031,8 @@ main (int argc, char *argv[])
   gtk_container_add (GTK_CONTAINER (window), text);
 
   /* connect after everything else */
-  g_signal_connect_after (text, "button_press_event",
-                          G_CALLBACK (insert_bar), NULL);
+  gtk_signal_connect_after (GTK_OBJECT(text), "button_press_event",
+    GTK_SIGNAL_FUNC (insert_bar), NULL);
 
   gtk_widget_show_all(window);
   gtk_main();
@@ -3102,7 +3095,7 @@ like this:</para>
   gc = gdk_gc_new(widget->window);
 
   /* find proper dimensions for rectangle */
-  gdk_drawable_get_size(widget->window, &amp;width, &amp;height);
+  gdk_window_get_size(widget->window, &amp;width, &amp;height);
 
   /* the color we want to use */
   color = (GdkColor *)malloc(sizeof(GdkColor));
@@ -3124,7 +3117,7 @@ like this:</para>
    * displays. Therefore, this call is required so that GDK and X can
    * give us the closest color available in the colormap
    */
-  gdk_colormap_alloc_color(gtk_widget_get_colormap(widget), color, FALSE, TRUE);
+  gdk_color_alloc(gtk_widget_get_colormap(widget), color);
 
   /* set the foreground to our color */
   gdk_gc_set_foreground(gc, color);

docs/gtk-config.txt

@@ -152,10 +152,10 @@ and the AM_PATH_GTK macro. The program used here is the testinput.c
 You should first read the introductory portions of the automake
 Manual, if you are not already familiar with it.
 
-Two files are needed, 'configure.ac', which is used to build the
+Two files are needed, 'configure.in', which is used to build the
 configure script:
 
-==configure.ac===
+==configure.in===
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(testinput.c)
 

docs/refcounting.txt

@@ -197,7 +197,7 @@ GtkOptionMenu looks like this:
   /* menu_item->ref_count == 1 and it is flagged as `floating'.
    */
 
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+  gtk_menu_append (GTK_MENU (menu), menu_item);
   /* menu_item->ref_count still == 1, but it is no longer `floating'.
    */
   

docs/reference/gdk/Makefile.am

@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl
 AUTOMAKE_OPTIONS = 1.6
 
 # The name of the module.
-DOC_MODULE=gdk3
+DOC_MODULE=gdk
 
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=gdk-docs.sgml
@@ -21,12 +21,14 @@ CFILE_GLOB=$(top_srcdir)/gdk/*.c
 
 # Header files to ignore when scanning
 IGNORE_HFILES=			\
+	gdkalias.h		\
 	gdkintl.h		\
 	gdkmarshalers.h		\
 	gdkkeysyms.h		\
 	gdkinternals.h		\
 	gdkprivate.h		\
 	gdkpoly-generic.h	\
+	gdkregion-generic.h	\
 	keyname-table.h		\
 	win32 			\
 	directfb		\

docs/reference/gdk/gdk-docs.sgml

@@ -6,11 +6,14 @@
 ]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
-    <title>GDK Reference Manual</title>
+    <title>GDK 2 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 GDK 2 library; the latest versions can be found online at
+      <ulink role="online-location"
+      url="http://library.gnome.org/devel/gdk/">http://library.gnome.org/devel/gdk/</ulink>.
+      If you're looking for the newer GDK 3 series of libraries,
+      see <ulink role="online-location"
+      url="http://library.gnome.org/devel/gdk3/">http://library.gnome.org/devel/gdk3/</ulink>.
     </releaseinfo>
   </bookinfo>
 
@@ -53,7 +56,7 @@
     <xi:include href="xml/threads.xml" />
 
     <xi:include href="xml/input.xml" />
-    <xi:include href="xml/gdkdevicemanager.xml" />
+    <xi:include href="xml/input_devices.xml" />
 
     <xi:include href="xml/pango_interaction.xml" />
     <xi:include href="xml/cairo_interaction.xml" />
@@ -72,9 +75,49 @@
     <title>Index of deprecated symbols</title>
     <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
   </index>
-  <index id="api-index-3-0" role="3.0">
-    <title>Index of new symbols in 3.0</title>
-    <xi:include href="xml/api-index-3.0.xml"><xi:fallback /></xi:include>
+  <index id="api-index-2-2" role="2.2">
+    <title>Index of new symbols in 2.2</title>
+    <xi:include href="xml/api-index-2.2.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-4" role="2.4">
+    <title>Index of new symbols in 2.4</title>
+    <xi:include href="xml/api-index-2.4.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-6" role="2.6">
+    <title>Index of new symbols in 2.6</title>
+    <xi:include href="xml/api-index-2.6.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-8" role="2.8">
+    <title>Index of new symbols in 2.8</title>
+    <xi:include href="xml/api-index-2.8.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-10" role="2.10">
+    <title>Index of new symbols in 2.10</title>
+    <xi:include href="xml/api-index-2.10.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-12" role="2.12">
+    <title>Index of new symbols in 2.12</title>
+    <xi:include href="xml/api-index-2.12.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-14" role="2.14">
+    <title>Index of new symbols in 2.14</title>
+    <xi:include href="xml/api-index-2.14.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-16" role="2.16">
+    <title>Index of new symbols in 2.16</title>
+    <xi:include href="xml/api-index-2.16.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-18" role="2.18">
+    <title>Index of new symbols in 2.18</title>
+    <xi:include href="xml/api-index-2.18.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-20" role="2.20">
+    <title>Index of new symbols in 2.20</title>
+    <xi:include href="xml/api-index-2.20.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-22" role="2.22">
+    <title>Index of new symbols in 2.22</title>
+    <xi:include href="xml/api-index-2.22.xml"><xi:fallback /></xi:include>
   </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>

docs/reference/gdk/gdk-sections.txt

@@ -10,6 +10,7 @@ gdk_parse_args
 gdk_get_display_arg_name
 gdk_set_locale
 gdk_set_sm_client_id
+gdk_exit
 gdk_notify_startup_complete
 gdk_notify_startup_complete_with_id
 
@@ -44,6 +45,10 @@ gdk_keyboard_ungrab
 <SUBSECTION>
 gdk_beep
 
+<SUBSECTION>
+gdk_get_use_xshm
+gdk_set_use_xshm
+
 <SUBSECTION>
 gdk_error_trap_push
 gdk_error_trap_pop
@@ -51,8 +56,6 @@ gdk_error_trap_pop
 <SUBSECTION>
 GDK_WINDOWING_X11
 GDK_WINDOWING_WIN32
-GDK_WINDOWING_QUARTZ
-GDK_WINDOWING_DIRECTFB
 
 <SUBSECTION Standard>
 GDK_TYPE_GRAB_STATUS
@@ -74,12 +77,13 @@ gdk_extension_mode_get_type
 gdk_fill_get_type
 gdk_fill_rule_get_type
 gdk_filter_return_get_type
+gdk_font_type_get_type
 gdk_function_get_type
 gdk_gc_values_mask_get_type
-gdk_grab_ownership_get_type
 gdk_grab_status_get_type
 gdk_gravity_get_type
 gdk_image_type_get_type
+gdk_input_condition_get_type
 gdk_input_mode_get_type
 gdk_input_source_get_type
 gdk_join_style_get_type
@@ -105,7 +109,8 @@ gdk_window_type_get_type
 gdk_window_type_hint_get_type
 gdk_wm_decoration_get_type
 gdk_wm_function_get_type
-gdk_device_grab_info_libgtk_only
+gdk_pointer_grab_info_libgtk_only
+gdk_keyboard_grab_info_libgtk_only
 gdk_add_option_entries_libgtk_only
 gdk_pre_parse_libgtk_only
 </SECTION>
@@ -120,15 +125,14 @@ gdk_display_get_name
 gdk_display_get_n_screens
 gdk_display_get_screen
 gdk_display_get_default_screen
-gdk_display_get_device_manager
 gdk_display_pointer_ungrab
 gdk_display_keyboard_ungrab
 gdk_display_pointer_is_grabbed
-gdk_display_device_is_grabbed
 gdk_display_beep
 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
@@ -137,15 +141,10 @@ gdk_display_add_client_message_filter
 gdk_display_set_double_click_time
 gdk_display_set_double_click_distance
 gdk_display_get_pointer
-gdk_display_get_device_state
 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
@@ -260,7 +259,12 @@ gdk_pixmap_create_from_xpm
 gdk_pixmap_colormap_create_from_xpm
 gdk_pixmap_create_from_xpm_d
 gdk_pixmap_colormap_create_from_xpm_d
+gdk_pixmap_get_size
+gdk_pixmap_ref
+gdk_pixmap_unref
 GdkBitmap
+gdk_bitmap_ref
+gdk_bitmap_unref
 
 <SUBSECTION Standard>
 GDK_PIXMAP
@@ -283,6 +287,11 @@ GdkPixmapObjectClass
 GdkImage
 gdk_image_new
 GdkImageType
+gdk_image_new_bitmap
+gdk_image_get
+gdk_image_ref
+gdk_image_unref
+gdk_image_destroy
 gdk_image_get_colormap
 gdk_image_set_colormap
 gdk_image_get_bits_per_pixel
@@ -317,6 +326,7 @@ gdk_image_get_type
 <SECTION>
 <TITLE>GdkRGB</TITLE>
 <FILE>rgb</FILE>
+gdk_rgb_init
 
 <SUBSECTION>
 gdk_draw_rgb_image
@@ -333,6 +343,9 @@ gdk_rgb_cmap_free
 GdkRgbCmap
 
 <SUBSECTION>
+gdk_rgb_gc_set_foreground
+gdk_rgb_gc_set_background
+gdk_rgb_xpixel_from_rgb
 gdk_rgb_find_color
 
 <SUBSECTION>
@@ -340,6 +353,7 @@ gdk_rgb_set_install
 gdk_rgb_set_min_colors
 gdk_rgb_get_visual
 gdk_rgb_get_colormap
+gdk_rgb_get_cmap
 gdk_rgb_ditherable
 gdk_rgb_colormap_ditherable
 gdk_rgb_set_verbose
@@ -352,6 +366,8 @@ GDK_TYPE_RGB_DITHER
 <TITLE>Pixbufs</TITLE>
 <FILE>pixbufs</FILE>
 gdk_pixbuf_render_threshold_alpha
+gdk_pixbuf_render_to_drawable
+gdk_pixbuf_render_to_drawable_alpha
 gdk_pixbuf_render_pixmap_and_mask
 gdk_pixbuf_render_pixmap_and_mask_for_colormap
 gdk_pixbuf_get_from_drawable
@@ -364,16 +380,27 @@ gdk_pixbuf_get_from_image
 GdkColor
 GdkColormap
 gdk_colormap_new
+gdk_colormap_ref
+gdk_colormap_unref
 gdk_colormap_get_system
+gdk_colormap_get_system_size
+gdk_colormap_change
 gdk_colormap_alloc_colors
 gdk_colormap_alloc_color
 gdk_colormap_free_colors
 gdk_colormap_query_color
 gdk_colormap_get_visual
 gdk_colormap_get_screen
+gdk_colors_store
 gdk_color_copy
 gdk_color_free
+gdk_colors_alloc
+gdk_colors_free
+gdk_color_white
+gdk_color_black
 gdk_color_parse
+gdk_color_alloc
+gdk_color_change
 gdk_color_equal
 gdk_color_hash
 gdk_color_to_string
@@ -393,10 +420,60 @@ gdk_colormap_get_type
 gdk_color_get_type
 </SECTION>
 
+<SECTION>
+<TITLE>Fonts</TITLE>
+<FILE>fonts</FILE>
+GdkFont
+GdkFontType
+gdk_font_load
+gdk_font_load_for_display
+gdk_fontset_load
+gdk_fontset_load_for_display
+gdk_font_from_description
+gdk_font_from_description_for_display
+gdk_font_get_display
+gdk_font_ref
+gdk_font_unref
+gdk_font_id
+gdk_font_equal
+
+<SUBSECTION>
+gdk_string_extents
+gdk_text_extents
+gdk_text_extents_wc
+gdk_string_width
+gdk_text_width
+gdk_text_width_wc
+gdk_char_width
+gdk_char_width_wc
+gdk_string_measure
+gdk_text_measure
+gdk_char_measure
+gdk_string_height
+gdk_text_height
+gdk_char_height
+
+<SUBSECTION>
+GdkWChar
+gdk_wcstombs
+gdk_mbstowcs
+
+<SUBSECTION Standard>
+GDK_TYPE_FONT
+GDK_TYPE_FONT_TYPE
+
+<SUBSECTION Private>
+gdk_font_get_type
+</SECTION>
+
 <SECTION>
 <TITLE>Drawing Primitives</TITLE>
 <FILE>drawing</FILE>
 GdkDrawable
+gdk_drawable_ref
+gdk_drawable_unref
+gdk_drawable_set_data
+gdk_drawable_get_data
 gdk_drawable_get_display
 gdk_drawable_get_screen
 gdk_drawable_get_visual
@@ -426,8 +503,13 @@ gdk_draw_layout_line
 gdk_draw_layout_line_with_colors
 gdk_draw_layout
 gdk_draw_layout_with_colors
+<SUBSECTION>
+gdk_draw_string
+gdk_draw_text
+gdk_draw_text_wc
 
 <SUBSECTION>
+gdk_draw_pixmap
 gdk_draw_drawable
 gdk_draw_image
 gdk_drawable_get_image
@@ -443,6 +525,7 @@ GDK_IS_DRAWABLE_CLASS
 
 <SUBSECTION Private>
 GdkDrawableClass
+gdk_draw_bitmap
 </SECTION>
 
 <SECTION>
@@ -457,12 +540,16 @@ GdkFunction
 gdk_gc_new
 gdk_gc_new_with_values
 gdk_gc_get_screen
+gdk_gc_ref
+gdk_gc_unref
+gdk_gc_destroy
 gdk_gc_set_values
 gdk_gc_get_values
 gdk_gc_set_foreground
 gdk_gc_set_background
 gdk_gc_set_rgb_fg_color
 gdk_gc_set_rgb_bg_color
+gdk_gc_set_font
 gdk_gc_set_function
 gdk_gc_set_fill
 GdkFill
@@ -517,6 +604,17 @@ GdkByteOrder
 gdk_query_depths
 gdk_query_visual_types
 gdk_list_visuals
+
+gdk_visual_get_best_depth
+gdk_visual_get_best_type
+gdk_visual_get_system
+gdk_visual_get_best
+gdk_visual_get_best_with_depth
+gdk_visual_get_best_with_type
+gdk_visual_get_best_with_both
+gdk_visual_ref
+gdk_visual_unref
+gdk_visual_get_screen
 gdk_visual_get_bits_per_rgb
 gdk_visual_get_blue_pixel_details
 gdk_visual_get_byte_order
@@ -525,14 +623,7 @@ gdk_visual_get_depth
 gdk_visual_get_green_pixel_details
 gdk_visual_get_red_pixel_details
 gdk_visual_get_visual_type
-gdk_visual_get_best_depth
-gdk_visual_get_best_type
-gdk_visual_get_system
-gdk_visual_get_best
-gdk_visual_get_best_with_depth
-gdk_visual_get_best_with_type
-gdk_visual_get_best_with_both
-gdk_visual_get_screen
+
 
 <SUBSECTION Standard>
 GDK_TYPE_BYTE_ORDER
@@ -564,6 +655,13 @@ GdkWindowAttr
 GdkWindowAttributesType
 gdk_window_new
 gdk_window_destroy
+gdk_window_ref
+gdk_window_unref
+gdk_window_get_display
+gdk_window_get_screen
+gdk_window_get_visual
+gdk_window_get_width
+gdk_window_get_height
 gdk_window_get_window_type
 gdk_window_at_pointer
 gdk_window_show
@@ -572,8 +670,8 @@ gdk_window_hide
 gdk_window_is_destroyed
 gdk_window_is_visible
 gdk_window_is_viewable
-gdk_window_is_input_only
 gdk_window_is_shaped
+gdk_window_is_input_only
 gdk_window_get_state
 gdk_window_withdraw
 gdk_window_iconify
@@ -601,6 +699,7 @@ gdk_window_reparent
 gdk_window_clear
 gdk_window_clear_area
 gdk_window_clear_area_e
+gdk_window_copy_area
 gdk_window_raise
 gdk_window_lower
 gdk_window_restack
@@ -651,14 +750,15 @@ gdk_window_input_shape_combine_region
 gdk_window_set_child_input_shapes
 gdk_window_merge_child_input_shapes
 gdk_window_set_static_gravities
+gdk_window_set_hints
 gdk_window_set_title
 gdk_window_set_background
-gdk_window_get_background
 gdk_window_set_back_pixmap
-gdk_window_get_back_pixmap
+gdk_window_get_background_pattern
 GDK_PARENT_RELATIVE
 gdk_window_set_cursor
 gdk_window_get_cursor
+gdk_window_set_colormap
 gdk_window_get_user_data
 gdk_window_get_geometry
 gdk_window_set_geometry_hints
@@ -673,14 +773,21 @@ gdk_window_set_urgency_hint
 gdk_window_get_position
 gdk_window_get_root_origin
 gdk_window_get_frame_extents
+gdk_window_get_size
+gdk_window_get_visual
+gdk_window_get_colormap
+gdk_window_get_type
 gdk_window_get_origin
 gdk_window_get_deskrelative_origin
 gdk_window_get_root_coords
+gdk_window_coords_from_parent
+gdk_window_coords_to_parent
 gdk_window_get_pointer
-gdk_window_get_device_position
 GdkModifierType
 gdk_window_get_parent
+gdk_window_get_effective_parent
 gdk_window_get_toplevel
+gdk_window_get_effective_toplevel
 gdk_window_get_children
 gdk_window_peek_children
 gdk_window_get_events
@@ -697,16 +804,9 @@ gdk_window_get_decorations
 GdkWMDecoration
 gdk_window_set_functions
 GdkWMFunction
+gdk_window_get_toplevels
 gdk_get_default_root_window
 
-<SUBSECTION>
-gdk_window_get_support_multidevice
-gdk_window_set_support_multidevice
-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
@@ -718,14 +818,11 @@ gdk_offscreen_window_get_embedder
 gdk_window_geometry_changed
 gdk_window_redirect_to_drawable
 gdk_window_remove_redirection
-gdk_window_coords_from_parent
-gdk_window_coords_to_parent
-gdk_window_get_effective_parent
-gdk_window_get_effective_toplevel
 
 <SUBSECTION Standard>
 GDK_WINDOW
 GDK_WINDOW_GET_CLASS
+GDK_WINDOW_OBJECT
 GDK_TYPE_WINDOW
 GDK_IS_WINDOW
 GDK_WINDOW_CLASS
@@ -747,10 +844,6 @@ gdk_window_object_get_type
 gdk_drawable_get_type
 GdkWindowObject
 GdkWindowObjectClass
-GdkWindowImpl
-GdkWindowImplIface
-GdkWindowRedirect
-gdk_window_impl_get_type
 gdk_window_freeze_toplevel_updates_libgtk_only
 gdk_window_thaw_toplevel_updates_libgtk_only
 </SECTION>
@@ -758,6 +851,9 @@ gdk_window_thaw_toplevel_updates_libgtk_only
 <SECTION>
 <TITLE>Selections</TITLE>
 <FILE>selections</FILE>
+GdkSelection
+GdkSelectionType
+GdkTarget
 GDK_SELECTION_PRIMARY
 GDK_SELECTION_SECONDARY
 GDK_SELECTION_CLIPBOARD
@@ -827,6 +923,7 @@ gdk_pango_renderer_set_stipple
 gdk_pango_renderer_set_override_color
 gdk_pango_context_get
 gdk_pango_context_get_for_screen
+gdk_pango_context_set_colormap
 GdkPangoAttrEmbossed
 GdkPangoAttrEmbossColor
 GdkPangoAttrStipple
@@ -851,10 +948,12 @@ GdkPangoRendererPrivate
 <SECTION>
 <TITLE>Cairo Interaction</TITLE>
 <FILE>cairo_interaction</FILE>
+gdk_window_create_similar_surface
 gdk_cairo_create
 gdk_cairo_set_source_color
 gdk_cairo_set_source_pixbuf
 gdk_cairo_set_source_pixmap
+gdk_cairo_set_source_window
 gdk_cairo_rectangle
 gdk_cairo_region
 gdk_cairo_reset_clip
@@ -870,6 +969,43 @@ GdkRectangle
 gdk_rectangle_intersect
 gdk_rectangle_union
 
+<SUBSECTION>
+GdkRegion
+gdk_region_new
+gdk_region_polygon
+GdkFillRule
+gdk_region_copy
+gdk_region_rectangle
+gdk_region_destroy
+
+<SUBSECTION>
+gdk_region_get_clipbox
+gdk_region_get_rectangles
+gdk_region_empty
+gdk_region_equal
+gdk_region_rect_equal
+gdk_region_point_in
+gdk_region_rect_in
+GdkOverlapType
+
+<SUBSECTION>
+gdk_region_offset
+gdk_region_shrink
+gdk_region_union_with_rect
+gdk_region_intersect
+gdk_region_union
+gdk_region_subtract
+gdk_region_xor
+
+<SUBSECTION>
+GdkSpan
+GdkSpanFunc
+gdk_region_spans_intersect_foreach
+
+<SUBSECTION Standard>
+GDK_TYPE_OVERLAP_TYPE
+GDK_TYPE_RECTANGLE
+
 <SUBSECTION Private>
 gdk_rectangle_get_type
 </SECTION>
@@ -910,7 +1046,6 @@ gdk_keymap_get_entries_for_keycode
 gdk_keymap_get_direction
 gdk_keymap_have_bidi_layouts
 gdk_keymap_get_caps_lock_state
-gdk_keymap_get_num_lock_state
 gdk_keymap_add_virtual_modifiers
 gdk_keymap_map_virtual_modifiers
 
@@ -943,23 +1078,15 @@ gdk_keymap_get_type
 </SECTION>
 
 <SECTION>
-<TITLE>GdkDeviceManager</TITLE>
-<FILE>gdkdevicemanager</FILE>
-GdkDeviceManager
+<TITLE>Input Devices</TITLE>
+<FILE>input_devices</FILE>
 GdkDevice
-GdkDeviceType
 GdkInputSource
 GdkInputMode
 GdkDeviceKey
 GdkDeviceAxis
 GdkAxisUse
-GdkGrabOwnership
-gdk_enable_multidevice
-gdk_device_manager_get_display
-gdk_device_manager_list_devices
-gdk_device_manager_get_client_pointer
-
-<SUBSECTION>
+gdk_devices_list
 gdk_device_get_name
 gdk_device_set_source
 gdk_device_get_source
@@ -969,15 +1096,8 @@ gdk_device_set_key
 gdk_device_get_key
 gdk_device_set_axis_use
 gdk_device_get_axis_use
-gdk_device_get_associated_device
-gdk_device_get_device_type
-gdk_device_get_display
-gdk_device_get_has_cursor
-gdk_device_get_n_axes
-
-<SUBSECTION>
-gdk_device_grab
-gdk_device_ungrab
+gdk_device_get_core_pointer
+gdk_device_has_cursor
 
 <SUBSECTION>
 gdk_device_get_state
@@ -985,30 +1105,17 @@ gdk_device_get_history
 gdk_device_free_history
 GdkTimeCoord
 gdk_device_get_axis
-gdk_device_list_axes
-gdk_device_get_axis_value
+gdk_device_get_n_axes
 
 <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
 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
@@ -1018,12 +1125,7 @@ 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>
 
@@ -1041,6 +1143,7 @@ GDK_PRIORITY_REDRAW
 gdk_events_pending
 gdk_event_peek
 gdk_event_get
+gdk_event_get_graphics_expose
 gdk_event_put
 gdk_event_new
 gdk_event_copy
@@ -1051,9 +1154,6 @@ gdk_event_get_axis
 gdk_event_get_coords
 gdk_event_get_root_coords
 gdk_event_request_motions
-gdk_events_get_angle
-gdk_events_get_center
-gdk_events_get_distance
 
 <SUBSECTION>
 gdk_event_handler_set
@@ -1070,8 +1170,6 @@ gdk_get_show_events
 gdk_set_show_events
 gdk_event_set_screen
 gdk_event_get_screen
-gdk_event_get_device
-gdk_event_set_device
 
 <SUBSECTION>
 gdk_setting_get
@@ -1147,8 +1245,10 @@ gdk_cursor_new_from_name
 gdk_cursor_new_for_display
 gdk_cursor_get_display
 gdk_cursor_get_image
+gdk_cursor_get_cursor_type
 gdk_cursor_ref
 gdk_cursor_unref
+gdk_cursor_destroy
 
 <SUBSECTION Standard>
 GDK_TYPE_CURSOR_TYPE
@@ -1158,6 +1258,19 @@ GDK_TYPE_CURSOR
 gdk_cursor_get_type
 </SECTION>
 
+<SECTION>
+<TITLE>Input</TITLE>
+<FILE>input</FILE>
+gdk_input_add_full
+GdkInputCondition
+GdkInputFunction
+GdkDestroyNotify
+gdk_input_add
+gdk_input_remove
+
+<SUBSECTION Standard>
+GDK_TYPE_INPUT_CONDITION
+</SECTION>
 
 <SECTION>
 <TITLE>Drag and Drop</TITLE>
@@ -1169,6 +1282,11 @@ gdk_drag_context_new
 gdk_drag_drop
 gdk_drag_find_window
 gdk_drag_find_window_for_screen
+gdk_drag_context_ref
+gdk_drag_context_get_actions
+gdk_drag_context_get_selected_action
+gdk_drag_context_get_suggested_action
+gdk_drag_context_list_targets
 gdk_drag_context_get_source_window
 gdk_drag_begin
 gdk_drag_motion
@@ -1176,16 +1294,11 @@ gdk_drop_finish
 gdk_drag_get_protocol
 gdk_drag_get_protocol_for_display
 GdkDragProtocol
+gdk_drag_context_unref
 GdkDragContext
 GdkDragAction
 gdk_drag_status
 gdk_drag_drop_succeeded
-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
 
 <SUBSECTION Standard>
 GDK_DRAG_CONTEXT
@@ -1207,6 +1320,7 @@ gdk_drag_context_get_type
 <TITLE>X Window System Interaction</TITLE>
 <FILE>x_interaction</FILE>
 GDK_ROOT_WINDOW
+GDK_ROOT_PARENT
 GDK_DISPLAY
 GDK_WINDOW_XDISPLAY
 GDK_WINDOW_XID
@@ -1224,12 +1338,15 @@ GDK_SCREEN_XDISPLAY
 GDK_SCREEN_XNUMBER
 GDK_SCREEN_XSCREEN
 GDK_VISUAL_XVISUAL
+GDK_FONT_XDISPLAY
+GDK_FONT_XFONT
 GDK_CURSOR_XCURSOR
 GDK_CURSOR_XDISPLAY
 GDK_GC_XGC
 GDK_GC_GET_XGC
 GDK_WINDOW_XWINDOW
 gdkx_visual_get
+gdkx_colormap_get
 gdk_pixmap_foreign_new
 gdk_pixmap_foreign_new_for_display
 gdk_pixmap_foreign_new_for_screen
@@ -1241,6 +1358,8 @@ gdk_window_lookup
 gdk_window_lookup_for_display
 gdk_pixmap_lookup
 gdk_pixmap_lookup_for_display
+gdk_font_lookup
+gdk_font_lookup_for_display
 gdk_x11_lookup_xdisplay
 gdk_x11_get_server_time
 gdk_net_wm_supports
@@ -1265,6 +1384,9 @@ gdk_x11_display_set_cursor_theme
 gdk_x11_register_standard_event_type
 gdk_x11_drawable_get_xdisplay
 gdk_x11_drawable_get_xid
+gdk_x11_font_get_name
+gdk_x11_font_get_xdisplay
+gdk_x11_font_get_xfont
 gdk_x11_gc_get_xdisplay
 gdk_x11_gc_get_xgc
 gdk_x11_get_default_root_xwindow
@@ -1285,13 +1407,16 @@ 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_window_foreign_new_for_display
+gdk_x11_window_lookup_for_display
 
 <SUBSECTION Private>
 gdk_display
 GDK_HAVE_WCHAR_H
 GDK_HAVE_WCTYPE_H
-gdk_x11_pixmap_get_drawable_impl
-gdk_x11_window_get_drawable_impl
+gdk_iswalnum
+gdk_iswspace
 </SECTION>
 
 <SECTION>

docs/reference/gdk/gdk.types

@@ -9,5 +9,3 @@ gdk_pango_renderer_get_type
 gdk_pixmap_get_type
 gdk_gc_get_type
 gdk_keymap_get_type
-gdk_device_get_type
-gdk_device_manager_get_type

docs/reference/gdk/tmpl/.gitignore

@@ -1,2 +0,0 @@
-dnd.sgml
-windows.sgml

docs/reference/gdk/tmpl/colors.sgml

@@ -32,7 +32,10 @@ directly.
 In previous revisions of this interface, a number
 of functions that take a #GdkColormap parameter
 were replaced with functions whose names began
-with "gdk_colormap_".
+with "gdk_colormap_". This process will probably
+be extended somewhat in the future - 
+gdk_color_white(), gdk_color_black(), and 
+gdk_color_change() will probably become aliases.
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -75,6 +78,23 @@ The colormap structure contains the following public fields.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_colormap_ref ##### -->
+<para>
+
+</para>
+
+@cmap: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_colormap_unref ##### -->
+<para>
+
+</para>
+
+@cmap: 
+
+
 <!-- ##### FUNCTION gdk_colormap_get_system ##### -->
 <para>
 </para>
@@ -83,6 +103,22 @@ The colormap structure contains the following public fields.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_colormap_get_system_size ##### -->
+<para>
+</para>
+
+@void: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_colormap_change ##### -->
+<para>
+</para>
+
+@colormap: 
+@ncolors: 
+
+
 <!-- ##### FUNCTION gdk_colormap_alloc_colors ##### -->
 <para>
 </para>
@@ -143,6 +179,15 @@ The colormap structure contains the following public fields.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_colors_store ##### -->
+<para>
+</para>
+
+@colormap: 
+@colors: 
+@ncolors: 
+
+
 <!-- ##### FUNCTION gdk_color_copy ##### -->
 <para>
 </para>
@@ -158,6 +203,47 @@ The colormap structure contains the following public fields.
 @color: 
 
 
+<!-- ##### FUNCTION gdk_colors_alloc ##### -->
+<para>
+</para>
+
+@colormap: 
+@contiguous: 
+@planes: 
+@nplanes: 
+@pixels: 
+@npixels: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_colors_free ##### -->
+<para>
+</para>
+
+@colormap: 
+@pixels: 
+@npixels: 
+@planes: 
+
+
+<!-- ##### FUNCTION gdk_color_white ##### -->
+<para>
+</para>
+
+@colormap: 
+@color: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_color_black ##### -->
+<para>
+</para>
+
+@colormap: 
+@color: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_color_parse ##### -->
 <para>
 </para>
@@ -167,6 +253,24 @@ The colormap structure contains the following public fields.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_color_alloc ##### -->
+<para>
+</para>
+
+@colormap: 
+@color: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_color_change ##### -->
+<para>
+</para>
+
+@colormap: 
+@color: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_color_equal ##### -->
 <para>
 </para>

docs/reference/gdk/tmpl/cursors.sgml

@@ -216,3 +216,10 @@ The standard cursors available.
 @cursor: 
 
 
+<!-- ##### MACRO gdk_cursor_destroy ##### -->
+<para>
+Destroys a cursor, freeing any resources allocated for it.
+</para>
+
+
+

docs/reference/gdk/tmpl/dnd.sgml

@@ -0,0 +1,266 @@
+<!-- ##### SECTION Title ##### -->
+Drag and Drop
+
+<!-- ##### SECTION Short_Description ##### -->
+Functions for controlling drag and drop handling
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+These functions provide a low level interface for drag and drop.
+The X backend of GDK supports both the Xdnd and Motif drag and drop protocols 
+transparently, the Win32 backend supports the WM_DROPFILES protocol.
+</para>
+<para>
+GTK+ provides a higher level abstraction based on top of these functions,
+and so they are not normally needed in GTK+ applications.
+See the <link linkend="gtk-Drag-and-Drop">Drag and Drop</link> section of
+the GTK+ documentation for more information.
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### FUNCTION gdk_drag_get_selection ##### -->
+<para>
+</para>
+
+@context: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_drag_abort ##### -->
+<para>
+</para>
+
+@context: 
+@time_: 
+
+
+<!-- ##### FUNCTION gdk_drop_reply ##### -->
+<para>
+</para>
+
+@context: 
+@ok: 
+@time_: 
+
+
+<!-- ##### FUNCTION gdk_drag_context_new ##### -->
+<para>
+</para>
+
+@void: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_drag_drop ##### -->
+<para>
+</para>
+
+@context: 
+@time_: 
+
+
+<!-- ##### FUNCTION gdk_drag_find_window ##### -->
+<para>
+</para>
+
+@context: 
+@drag_window: 
+@x_root: 
+@y_root: 
+@dest_window: 
+@protocol: 
+
+
+<!-- ##### FUNCTION gdk_drag_find_window_for_screen ##### -->
+<para>
+
+</para>
+
+@context: 
+@drag_window: 
+@screen: 
+@x_root: 
+@y_root: 
+@dest_window: 
+@protocol: 
+
+
+<!-- ##### FUNCTION gdk_drag_context_ref ##### -->
+<para>
+</para>
+
+@context: 
+
+
+<!-- ##### FUNCTION gdk_drag_context_get_actions ##### -->
+<para>
+
+</para>
+
+@context: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_drag_context_get_selected_action ##### -->
+<para>
+
+</para>
+
+@context: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_drag_context_get_suggested_action ##### -->
+<para>
+
+</para>
+
+@context: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_drag_context_list_targets ##### -->
+<para>
+
+</para>
+
+@context: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_drag_context_get_source_window ##### -->
+<para>
+
+</para>
+
+@context: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_drag_begin ##### -->
+<para>
+</para>
+
+@window: 
+@targets: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_drag_motion ##### -->
+<para>
+</para>
+
+@context: 
+@dest_window: 
+@protocol: 
+@x_root: 
+@y_root: 
+@suggested_action: 
+@possible_actions: 
+@time_: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_drop_finish ##### -->
+<para>
+</para>
+
+@context: 
+@success: 
+@time_: 
+
+
+<!-- ##### FUNCTION gdk_drag_get_protocol ##### -->
+<para>
+</para>
+
+@xid: 
+@protocol: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_drag_get_protocol_for_display ##### -->
+<para>
+
+</para>
+
+@display: 
+@xid: 
+@protocol: 
+@Returns: 
+
+
+<!-- ##### ENUM GdkDragProtocol ##### -->
+<para>
+Used in #GdkDragContext to indicate the protocol according to
+which DND is done.
+</para>
+
+@GDK_DRAG_PROTO_MOTIF: The Motif DND protocol.
+@GDK_DRAG_PROTO_XDND: The Xdnd protocol.
+@GDK_DRAG_PROTO_ROOTWIN: An extension to the Xdnd protocol for
+  unclaimed root window drops.
+@GDK_DRAG_PROTO_NONE: no protocol.
+@GDK_DRAG_PROTO_WIN32_DROPFILES: The simple WM_DROPFILES protocol.
+@GDK_DRAG_PROTO_OLE2: The complex OLE2 DND protocol (not implemented).
+@GDK_DRAG_PROTO_LOCAL: Intra-application DND.
+
+<!-- ##### FUNCTION gdk_drag_context_unref ##### -->
+<para>
+</para>
+
+@context: 
+
+
+<!-- ##### STRUCT GdkDragContext ##### -->
+<para>
+A <structname>GdkDragContext</structname> holds information about a 
+drag in progress. It is used on both source and destination sides.
+</para>
+
+@parent_instance: the parent instance
+
+<!-- ##### ENUM GdkDragAction ##### -->
+<para>
+Used in #GdkDragContext to indicate what the destination
+should do with the dropped data.
+</para>
+
+@GDK_ACTION_DEFAULT: Means nothing, and should not be used.
+@GDK_ACTION_COPY: Copy the data.
+@GDK_ACTION_MOVE: Move the data, i.e. first copy it, then delete
+  it from the source using the DELETE target of the X selection protocol.
+@GDK_ACTION_LINK: Add a link to the data. Note that this is only
+  useful if source and destination agree on what it means.
+@GDK_ACTION_PRIVATE: Special action which tells the source that the
+  destination will do something that the source doesn't understand.
+@GDK_ACTION_ASK: Ask the user what to do with the data.
+
+<!-- ##### FUNCTION gdk_drag_status ##### -->
+<para>
+</para>
+
+@context: 
+@action: 
+@time_: 
+
+
+<!-- ##### FUNCTION gdk_drag_drop_succeeded ##### -->
+<para>
+
+</para>
+
+@context: 
+@Returns: 
+
+

docs/reference/gdk/tmpl/drawing.sgml

@@ -45,6 +45,44 @@ or a #GdkWindow.
 </para>
 
 
+<!-- ##### FUNCTION gdk_drawable_ref ##### -->
+<para>
+
+</para>
+
+@drawable: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_drawable_unref ##### -->
+<para>
+
+</para>
+
+@drawable: 
+
+
+<!-- ##### FUNCTION gdk_drawable_set_data ##### -->
+<para>
+
+</para>
+
+@drawable: 
+@key: 
+@data: 
+@destroy_func: 
+
+
+<!-- ##### FUNCTION gdk_drawable_get_data ##### -->
+<para>
+
+</para>
+
+@drawable: 
+@key: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_drawable_get_display ##### -->
 <para>
 
@@ -357,6 +395,52 @@ bottom edges.
 @background: 
 
 
+<!-- ##### FUNCTION gdk_draw_string ##### -->
+<para>
+</para>
+
+@drawable: 
+@font: 
+@gc: 
+@x: 
+@y: 
+@string: 
+
+
+<!-- ##### FUNCTION gdk_draw_text ##### -->
+<para>
+</para>
+
+@drawable: 
+@font: 
+@gc: 
+@x: 
+@y: 
+@text: 
+@text_length: 
+
+
+<!-- ##### FUNCTION gdk_draw_text_wc ##### -->
+<para>
+</para>
+
+@drawable: 
+@font: 
+@gc: 
+@x: 
+@y: 
+@text: 
+@text_length: 
+
+
+<!-- ##### MACRO gdk_draw_pixmap ##### -->
+<para>
+Draws a pixmap, or a part of a pixmap, onto another drawable.
+</para>
+
+@Deprecated: Use gdk_draw_drawable() instead.
+
+
 <!-- ##### FUNCTION gdk_draw_drawable ##### -->
 <para>
 

docs/reference/gdk/tmpl/event_structs.sgml

@@ -383,7 +383,7 @@ union, 16-bit data uses the s array, and 32-bit data uses the l array.
 <!-- ##### STRUCT GdkEventNoExpose ##### -->
 <para>
 Generated when the area of a #GdkDrawable being copied, with gdk_draw_drawable()
-, was completely available.
+or gdk_window_copy_area(), was completely available.
 </para>
 <para>
 FIXME: add more here.

docs/reference/gdk/tmpl/events.sgml

@@ -188,6 +188,14 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_event_get_graphics_expose ##### -->
+<para>
+</para>
+
+@window: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_event_put ##### -->
 <para>
 </para>
@@ -278,40 +286,6 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
 @event: 
 
 
-<!-- ##### FUNCTION gdk_events_get_angle ##### -->
-<para>
-
-</para>
-
-@event1: 
-@event2: 
-@angle: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_events_get_center ##### -->
-<para>
-
-</para>
-
-@event1: 
-@event2: 
-@x: 
-@y: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_events_get_distance ##### -->
-<para>
-
-</para>
-
-@event1: 
-@event2: 
-@distance: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_event_handler_set ##### -->
 <para>
 </para>
@@ -401,24 +375,6 @@ gdk_event_handler_set().
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_event_get_device ##### -->
-<para>
-
-</para>
-
-@event: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_event_set_device ##### -->
-<para>
-
-</para>
-
-@event: 
-@device: 
-
-
 <!-- ##### FUNCTION gdk_setting_get ##### -->
 <para>
 </para>

docs/reference/gdk/tmpl/fonts.sgml

@@ -0,0 +1,586 @@
+<!-- ##### SECTION Title ##### -->
+Fonts
+
+<!-- ##### SECTION Short_Description ##### -->
+Loading and manipulating fonts
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+The #GdkFont data type represents a font for drawing on
+the screen. These functions provide support for
+loading fonts, and also for determining the dimensions
+of characters and strings when drawn with a particular
+font.
+</para>
+
+<para>
+Fonts in X are specified by a
+<firstterm>X Logical Font Description</firstterm>. 
+The following description is considerably simplified.
+For definitive information about XLFD's see the 
+X reference documentation. A X Logical Font Description (XLFD)
+consists of a sequence of fields separated (and surrounded by) '-'
+characters. For example, Adobe Helvetica Bold 12 pt, has the
+full description: 
+<informalexample><programlisting>
+"-adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1"
+</programlisting></informalexample>
+</para>
+
+<para>
+The fields in the XLFD are:
+
+<informaltable pgwide="1" frame="none">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
+<tbody>
+
+<row>
+<entry>Foundry</entry>
+<entry>the company or organization where the font originated.</entry>
+</row>
+
+<row>
+<entry>Family</entry>
+<entry>the font family (a group of related font designs).</entry>
+</row>
+
+<row>
+<entry>Weight</entry>
+<entry>A name for the font's typographic weight
+For example, 'bold' or 'medium').</entry>
+</row>
+
+<row>
+<entry>Slant</entry>
+<entry>The slant of the font. Common values are 'R' for Roman,
+'I' for italoc, and 'O' for oblique.</entry>
+</row>
+
+<row>
+<entry>Set Width</entry>
+<entry>A name for the width of the font. For example,
+'normal' or 'condensed'.</entry>
+</row>
+
+<row>
+<entry>Add Style</entry>
+<entry>Additional information to distinguish a font from
+other fonts of the same family.</entry>
+</row>
+
+<row>
+<entry>Pixel Size</entry>
+<entry>The body size of the font in pixels.</entry>
+</row>
+
+<row>
+<entry>Point Size</entry>
+<entry>The body size of the font in 10ths of a point.
+(A <firstterm>point</firstterm> is 1/72.27 inch) </entry>
+</row>
+
+<row>
+<entry>Resolution X</entry>
+<entry>The horizontal resolution that the font was designed for.</entry>
+</row>
+
+<row>
+<entry>Resolution Y</entry>
+<entry>The vertical resolution that the font was designed for .</entry>
+</row>
+
+<row>
+<entry>Spacing</entry>
+<entry>The type of spacing for the font - can be 'p' for proportional,
+'m' for monospaced or 'c' for charcell.</entry>
+</row>
+
+<row>
+<entry>Average Width</entry>
+<entry>The average width of a glyph in the font. For monospaced
+and charcell fonts, all glyphs in the font have this width</entry>
+</row>
+
+<row>
+<entry>Charset Registry</entry>
+<entry>The registration authority that owns the encoding for
+the font. Together with the Charset Encoding field, this
+defines the character set for the font.</entry>
+</row>
+
+<row>
+<entry>Charset Encoding</entry>
+<entry>An identifier for the particular character set encoding.</entry>
+</row>
+
+</tbody></tgroup></informaltable>
+</para>
+
+<para>
+When specifying a font via a X logical Font Description,
+'*' can be used as a wildcard to match any portion of
+the XLFD. For instance, the above example could
+also be specified as
+<informalexample><programlisting>
+"-*-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-1"
+</programlisting></informalexample>
+
+It is generally a good idea to use wildcards for any
+portion of the XLFD that your program does not care
+about specifically, since that will improve the
+chances of finding a matching font.
+</para>
+
+<para>
+A <firstterm>fontset</firstterm> is a list of fonts
+that is used for drawing international text that may
+contain characters from a number of different character
+sets. It is represented by a list of XLFD's. 
+</para>
+
+<para>
+The font for a given character set is determined by going
+through the list of XLFD's in order. For each one, if
+the registry and and encoding fields match the desired
+character set, then that font is used, otherwise if
+the XLFD contains wild-cards for the registry and encoding
+fields, the registry and encoding for the desired character
+set are substituted in and a lookup is done. If a match is found
+that font is used. Otherwise, processing continues
+on to the next font in the list.
+</para>
+
+<para>
+The functions for determining the metrics of a string
+come in several varieties that can take a number
+of forms of string input:
+
+<variablelist>
+  <varlistentry>
+    <term>8-bit string</term>
+    <listitem><para>
+    When using functions like gdk_string_width() that
+    take a <type>gchar *</type>, if the font is of type
+    %GDK_FONT_FONT and is an 8-bit font, then each
+    <type>gchar</type> indexes the glyphs in the font directly.
+    </para></listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>16-bit string</term>
+    <listitem><para>
+    For functions taking a <type>gchar *</type>, if the
+    font is of type %GDK_FONT_FONT, and is a 16-bit
+    font, then the <type>gchar *</type> argument is
+    interpreted as a <type>guint16 *</type> cast to
+    a <type>gchar *</type> and each <type>guint16</type>
+    indexes the glyphs in the font directly.
+    </para></listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>Multibyte string</term>
+    <listitem><para>
+    For functions taking a <type>gchar *</type>, if the
+    font is of type %GDK_FONT_FONTSET, then the input
+    string is interpreted as a <firstterm>multibyte</firstterm>
+    encoded according to the current locale. (A multibyte
+    string is one in which each character may consist
+    of one or more bytes, with different lengths for different
+    characters in the string). They can be converted to and
+    from wide character strings (see below) using
+    gdk_wcstombs() and gdk_mbstowcs().) The string will
+    be rendered using one or more different fonts from
+    the fontset.
+    </para></listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>Wide character string</term>
+    <listitem><para>
+    For a number of the text-measuring functions, GDK
+    provides a variant (such as gdk_text_width_wc()) which
+    takes a <type>GdkWChar *</type> instead of a 
+    <type>gchar *</type>. The input is then taken to
+    be a wide character string in the encoding of the
+    current locale. (A wide character string is a string
+    in which each character consists of several bytes,
+    and the width of each character in the string is 
+    constant.)
+    </para></listitem>
+  </varlistentry>
+</variablelist>
+</para>
+
+<para>
+GDK provides functions to determine a number of different
+measurements (metrics) for a given string. (Need diagram
+here).
+
+<variablelist>
+  <varlistentry>
+    <term>ascent</term>
+    <listitem><para>
+    The vertical distance from the origin of the drawing
+    opereration to the top of the drawn character.
+    </para></listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>descent</term>
+    <listitem><para>
+    The vertical distance from the origin of the drawing
+    opereration to the bottom of the drawn character.
+    </para></listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>left bearing</term>
+    <listitem><para>
+    The horizontal distance from the origin of the drawing
+    operation to the left-most part of the drawn character.
+    </para></listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>right bearing</term>
+    <listitem><para>
+    The horizontal distance from the origin of the drawing
+    operation to the right-most part of the drawn character.
+    </para></listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>width bearing</term>
+    <listitem><para>
+    The horizontal distance from the origin of the drawing
+    operation to the correct origin for drawing another
+    string to follow the current one. Depending on the
+    font, this could be greater than or less than the 
+    right bearing.
+    </para></listitem>
+  </varlistentry>
+</variablelist>
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT GdkFont ##### -->
+<para>
+The <structname>GdkFont</structname> structure represents a font or fontset. It
+contains the following public fields. A new <structname>GdkFont</structname>
+structure is returned by gdk_font_load() or gdk_fontset_load(),
+and is reference counted with gdk_font_ref() and gdk_font_unref()
+</para>
+
+@type: a value of type #GdkFontType which indicates
+  whether this font is a single font or a fontset.
+@ascent: the maximum distance that the font, when drawn,
+  ascends above the baseline.
+@descent: the maximum distance that the font, when drawn,
+descends below the baseline.
+
+<!-- ##### ENUM GdkFontType ##### -->
+<para>
+Indicates the type of a font. The possible values
+are currently:
+</para>
+
+@GDK_FONT_FONT: the font is a single font.
+@GDK_FONT_FONTSET: the font is a fontset.
+
+<!-- ##### FUNCTION gdk_font_load ##### -->
+<para>
+</para>
+
+@font_name: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_font_load_for_display ##### -->
+<para>
+
+</para>
+
+@display: 
+@font_name: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_fontset_load ##### -->
+<para>
+</para>
+
+@fontset_name: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_fontset_load_for_display ##### -->
+<para>
+
+</para>
+
+@display: 
+@fontset_name: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_font_from_description ##### -->
+<para>
+
+</para>
+
+@font_desc: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_font_from_description_for_display ##### -->
+<para>
+
+</para>
+
+@display: 
+@font_desc: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_font_get_display ##### -->
+<para>
+
+</para>
+
+@font: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_font_ref ##### -->
+<para>
+</para>
+
+@font: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_font_unref ##### -->
+<para>
+</para>
+
+@font: 
+
+
+<!-- ##### FUNCTION gdk_font_id ##### -->
+<para>
+</para>
+
+@font: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_font_equal ##### -->
+<para>
+</para>
+
+@fonta: 
+@fontb: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_string_extents ##### -->
+<para>
+</para>
+
+@font: 
+@string: 
+@lbearing: 
+@rbearing: 
+@width: 
+@ascent: 
+@descent: 
+
+
+<!-- ##### FUNCTION gdk_text_extents ##### -->
+<para>
+</para>
+
+@font: 
+@text: 
+@text_length: 
+@lbearing: 
+@rbearing: 
+@width: 
+@ascent: 
+@descent: 
+
+
+<!-- ##### FUNCTION gdk_text_extents_wc ##### -->
+<para>
+</para>
+
+@font: 
+@text: 
+@text_length: 
+@lbearing: 
+@rbearing: 
+@width: 
+@ascent: 
+@descent: 
+
+
+<!-- ##### FUNCTION gdk_string_width ##### -->
+<para>
+</para>
+
+@font: 
+@string: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_text_width ##### -->
+<para>
+</para>
+
+@font: 
+@text: 
+@text_length: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_text_width_wc ##### -->
+<para>
+</para>
+
+@font: 
+@text: 
+@text_length: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_char_width ##### -->
+<para>
+</para>
+
+@font: 
+@character: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_char_width_wc ##### -->
+<para>
+</para>
+
+@font: 
+@character: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_string_measure ##### -->
+<para>
+</para>
+
+@font: 
+@string: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_text_measure ##### -->
+<para>
+</para>
+
+@font: 
+@text: 
+@text_length: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_char_measure ##### -->
+<para>
+</para>
+
+@font: 
+@character: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_string_height ##### -->
+<para>
+</para>
+
+@font: 
+@string: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_text_height ##### -->
+<para>
+</para>
+
+@font: 
+@text: 
+@text_length: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_char_height ##### -->
+<para>
+</para>
+
+@font: 
+@character: 
+@Returns: 
+
+
+<!-- ##### TYPEDEF GdkWChar ##### -->
+<para>
+Specifies a wide character type, used to represent character codes.
+This is needed since some native languages have character sets which have
+more than 256 characters (Japanese and Chinese, for example).
+</para>
+<para>
+Wide character values between 0 and 127 are always identical in meaning to
+the ASCII character codes. The wide character value 0 is often used to
+terminate strings of wide characters in a similar way to normal strings
+using the char type.
+</para>
+<para>
+An alternative to wide characters is multi-byte characters, which extend
+normal char strings to cope with larger character sets. As the name suggests,
+multi-byte characters use a different number of bytes to store different
+character codes. For example codes 0-127 (i.e. the ASCII codes) often
+use just one byte of memory, while other codes may use 2, 3 or even 4 bytes.
+Multi-byte characters have the advantage that they can often be used in an
+application with little change, since strings are still represented as arrays
+of char values. However multi-byte strings are much easier to manipulate since
+the character are all of the same size.
+</para>
+<para>
+Applications typically use wide characters to represent character codes
+internally, and multi-byte strings when saving the characters to a file.
+The gdk_wcstombs() and gdk_mbstowcs() functions can be used to convert from
+one representation to the other.
+</para>
+<para>
+See the 'Extended Characters' section of the GNU C Library Reference Manual
+for more detailed information on wide and multi-byte characters.
+</para>
+
+
+<!-- ##### FUNCTION gdk_wcstombs ##### -->
+<para>
+</para>
+
+@src: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_mbstowcs ##### -->
+<para>
+</para>
+
+@dest: 
+@src: 
+@dest_max: 
+@Returns: 
+
+

docs/reference/gdk/tmpl/gcs.sgml

@@ -79,6 +79,7 @@ A set of bit flags used to indicate which fields
 
 @GDK_GC_FOREGROUND: the @foreground is set.
 @GDK_GC_BACKGROUND: the @background is set.
+@GDK_GC_FONT: the @font is set.
 @GDK_GC_FUNCTION: the @function is set.
 @GDK_GC_FILL: the @fill is set.
 @GDK_GC_TILE: the @tile is set.
@@ -150,6 +151,33 @@ useful. For bitmaps, %GDK_AND and %GDK_OR are also useful.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_gc_ref ##### -->
+<para>
+
+</para>
+
+@gc: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_gc_unref ##### -->
+<para>
+
+</para>
+
+@gc: 
+
+
+<!-- ##### MACRO gdk_gc_destroy ##### -->
+<para>
+This function is obsolete and should not be used.
+</para>
+
+@Deprecated: Use g_object_unref() instead
+<!-- # Unused Parameters # -->
+@gc: a #GdkGC.
+
+
 <!-- ##### FUNCTION gdk_gc_set_values ##### -->
 <para>
 
@@ -205,6 +233,15 @@ useful. For bitmaps, %GDK_AND and %GDK_OR are also useful.
 @color: 
 
 
+<!-- ##### FUNCTION gdk_gc_set_font ##### -->
+<para>
+
+</para>
+
+@gc: 
+@font: 
+
+
 <!-- ##### FUNCTION gdk_gc_set_function ##### -->
 <para>
 

docs/reference/gdk/tmpl/gdk-unused.sgml

@@ -923,14 +923,6 @@ they will be ignored.
 </para>
 
 
-<!-- ##### MACRO gdk_rgb_get_cmap ##### -->
-<para>
-Gets the colormap set by GdkRGB. This colormap and the corresponding
-visual should be used when creating windows that will be drawn in by GdkRGB.
-</para>
-
-@Returns: The #GdkColormap set by GdkRGB.
-
 <!-- ##### VARIABLE gdk_screen ##### -->
 <para>
 

docs/reference/gdk/tmpl/gdkdisplay.sgml

@@ -50,13 +50,6 @@ of an X display. All its fields are private and should not be accessed directly.
 @gdkdisplay: the object which received the signal.
 @arg1: 
 
-<!-- ##### SIGNAL GdkDisplay::opened ##### -->
-<para>
-
-</para>
-
-@gdkdisplay: the object which received the signal.
-
 <!-- ##### FUNCTION gdk_display_open ##### -->
 <para>
 
@@ -112,15 +105,6 @@ of an X display. All its fields are private and should not be accessed directly.
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_display_get_device_manager ##### -->
-<para>
-
-</para>
-
-@display: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_display_pointer_ungrab ##### -->
 <para>
 
@@ -148,16 +132,6 @@ of an X display. All its fields are private and should not be accessed directly.
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_display_device_is_grabbed ##### -->
-<para>
-
-</para>
-
-@display: 
-@device: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_display_beep ##### -->
 <para>
 
@@ -267,19 +241,6 @@ of an X display. All its fields are private and should not be accessed directly.
 @mask: 
 
 
-<!-- ##### FUNCTION gdk_display_get_device_state ##### -->
-<para>
-
-</para>
-
-@display: 
-@device: 
-@screen: 
-@x: 
-@y: 
-@mask: 
-
-
 <!-- ##### FUNCTION gdk_display_get_window_at_pointer ##### -->
 <para>
 
@@ -291,18 +252,6 @@ of an X display. All its fields are private and should not be accessed directly.
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_display_get_window_at_device_position ##### -->
-<para>
-
-</para>
-
-@display: 
-@device: 
-@win_x: 
-@win_y: 
-@Returns: 
-
-
 <!-- ##### STRUCT GdkDisplayPointerHooks ##### -->
 <para>
 A table of pointers to functions for getting quantities related to 
@@ -336,25 +285,6 @@ Applications should never have any reason to use this facility
 @Returns: 
 
 
-<!-- ##### STRUCT GdkDisplayDeviceHooks ##### -->
-<para>
-
-</para>
-
-@get_device_state: 
-@window_get_device_position: 
-@window_at_device_position: 
-
-<!-- ##### FUNCTION gdk_display_set_device_hooks ##### -->
-<para>
-
-</para>
-
-@display: 
-@new_hooks: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_display_warp_pointer ##### -->
 <para>
 
@@ -366,18 +296,6 @@ Applications should never have any reason to use this facility
 @y: 
 
 
-<!-- ##### FUNCTION gdk_display_warp_device ##### -->
-<para>
-
-</para>
-
-@display: 
-@device: 
-@screen: 
-@x: 
-@y: 
-
-
 <!-- ##### FUNCTION gdk_display_supports_cursor_color ##### -->
 <para>
 

docs/reference/gdk/tmpl/general.sgml

@@ -100,6 +100,7 @@ locale.
 
 @void: 
 @Returns: the resulting locale.
+@Deprecated:2.24: Use setlocale() directly
 
 
 <!-- ##### FUNCTION gdk_set_sm_client_id ##### -->
@@ -109,6 +110,20 @@ locale.
 @sm_client_id: 
 
 
+<!-- ##### FUNCTION gdk_exit ##### -->
+<para>
+Exits the application using the <function>exit()</function> system call.
+</para>
+<para>
+This routine is provided mainly for backwards compatibility, since it used to
+perform tasks necessary to exit the application cleanly. Those tasks are now
+performed in a function which is automatically called on exit (via the use
+of g_atexit()).
+</para>
+
+@error_code: the error code to pass to the <function>exit()</function> call.
+
+
 <!-- ##### FUNCTION gdk_notify_startup_complete ##### -->
 <para>
 
@@ -327,6 +342,33 @@ available.
 @void: 
 
 
+<!-- ##### FUNCTION gdk_get_use_xshm ##### -->
+<para>
+Returns %TRUE if GDK will attempt to use the MIT-SHM shared memory extension.
+</para>
+<para>
+The shared memory extension is used for #GdkImage, and consequently for
+<link linkend="gdk-GdkRGB">GdkRGB</link>.
+It enables much faster drawing by communicating with the X server through
+SYSV shared memory calls. However, it can only be used if the X client and
+server are on the same machine and the server supports it.
+</para>
+
+@void: 
+@Returns: %TRUE if use of the MIT shared memory extension will be attempted.
+
+
+<!-- ##### FUNCTION gdk_set_use_xshm ##### -->
+<para>
+Sets whether the use of the MIT shared memory extension should be attempted.
+This function is mainly for internal use. It is only safe for an application
+to set this to %FALSE, since if it is set to %TRUE and the server does not
+support the extension it may cause warning messages to be output.
+</para>
+
+@use_xshm: %TRUE if use of the MIT shared memory extension should be attempted.
+
+
 <!-- ##### FUNCTION gdk_error_trap_push ##### -->
 <para>
 This function allows X errors to be trapped instead of the normal behavior
@@ -371,7 +413,7 @@ This macro is defined if GDK is configured to use the X11 backend.
 
 <!-- ##### MACRO GDK_WINDOWING_WIN32 ##### -->
 <para>
-This macro is defined if GDK is configured to use the win32 backend.
+This macro is defined if GDK is configured to use the Win32 backend.
 </para>
 
 

docs/reference/gdk/tmpl/images.sgml

@@ -12,6 +12,7 @@ It has now been superceded to a large extent by the much more flexible
 </para>
 <para>
 To create an empty #GdkImage use gdk_image_new().
+To create a #GdkImage from bitmap data use gdk_image_new_bitmap().
 To create an image from part of a #GdkWindow use gdk_drawable_get_image().
 </para>
 <para>
@@ -24,7 +25,7 @@ the different formats that may be used.
 To draw a #GdkImage in a #GdkWindow or #GdkPixmap use gdk_draw_image().
 </para>
 <para>
-To destroy a #GdkImage use g_object_unref().
+To destroy a #GdkImage use gdk_image_destroy().
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -96,6 +97,55 @@ is supported by the server.
 @GDK_IMAGE_FASTEST: Specifies that %GDK_IMAGE_SHARED should be tried first,
 and if that fails then %GDK_IMAGE_NORMAL will be used.
 
+<!-- ##### FUNCTION gdk_image_new_bitmap ##### -->
+<para>
+</para>
+
+@visual: 
+@data: 
+@width: 
+@height: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_image_get ##### -->
+<para>
+</para>
+
+@drawable: 
+@x: 
+@y: 
+@width: 
+@height: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_image_ref ##### -->
+<para>
+
+</para>
+
+@image: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_image_unref ##### -->
+<para>
+
+</para>
+
+@image: 
+
+
+<!-- ##### MACRO gdk_image_destroy ##### -->
+<para>
+Destroys a #GdkImage, freeing any resources allocated for it.
+</para>
+
+<!-- # Unused Parameters # -->
+@image: a #GdkImage.
+
+
 <!-- ##### FUNCTION gdk_image_get_colormap ##### -->
 <para>
 
@@ -114,96 +164,6 @@ and if that fails then %GDK_IMAGE_NORMAL will be used.
 @colormap: 
 
 
-<!-- ##### FUNCTION gdk_image_get_bits_per_pixel ##### -->
-<para>
-
-</para>
-
-@image: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_image_get_bytes_per_pixel ##### -->
-<para>
-
-</para>
-
-@image: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_image_get_bytes_per_line ##### -->
-<para>
-
-</para>
-
-@image: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_image_get_byte_order ##### -->
-<para>
-
-</para>
-
-@image: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_image_get_depth ##### -->
-<para>
-
-</para>
-
-@image: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_image_get_height ##### -->
-<para>
-
-</para>
-
-@image: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_image_get_image_type ##### -->
-<para>
-
-</para>
-
-@image: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_image_get_visual ##### -->
-<para>
-
-</para>
-
-@image: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_image_get_width ##### -->
-<para>
-
-</para>
-
-@image: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_image_get_pixels ##### -->
-<para>
-
-</para>
-
-@image: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_image_put_pixel ##### -->
 <para>
 Sets a pixel in a #GdkImage to a given pixel value.

docs/reference/gdk/tmpl/input.sgml

@@ -0,0 +1,106 @@
+<!-- ##### SECTION Title ##### -->
+Input
+
+<!-- ##### SECTION Short_Description ##### -->
+Callbacks on file descriptors
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+The functions in this section are used to establish
+callbacks when some condition becomes true for
+a file descriptor. They are currently just wrappers around
+the <link linkend="glib-IO-Channels">IO Channel</link>
+facility.
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+<variablelist>
+
+<varlistentry>
+<term><link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link></term>
+<listitem><para>The main loop in which input callbacks run.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><link linkend="glib-IO-Channels">IO Channels</link></term>
+<listitem><para>A newer and more flexible way of doing IO
+callbacks.</para></listitem>
+</varlistentry>
+
+</variablelist>
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### FUNCTION gdk_input_add_full ##### -->
+
+
+@source: 
+@condition: 
+@function: 
+@data: 
+@destroy: 
+@Returns: 
+
+
+<!-- ##### ENUM GdkInputCondition ##### -->
+<para>
+A set of bit flags used to specify conditions for which
+an input callback will be triggered. The three members
+of this enumeration correspond to the @readfds, 
+@writefds, and @exceptfds arguments to the 
+<function>select</function> system call.
+</para>
+
+@GDK_INPUT_READ: the file descriptor has become available for reading.
+(Or, as is standard in Unix, a socket or pipe was closed
+at the other end; this is the case if a subsequent read
+on the file descriptor returns a count of zero.)
+@GDK_INPUT_WRITE: the file descriptor has become available for writing.
+@GDK_INPUT_EXCEPTION: an exception was raised on the file descriptor.
+
+<!-- ##### USER_FUNCTION GdkInputFunction ##### -->
+<para>
+A callback function that will be called when some condition
+occurs.
+</para>
+
+@data: the user data passed to gdk_input_add() or gdk_input_add_full().
+@source: the source where the condition occurred.
+@condition: the triggering condition.
+
+
+<!-- ##### USER_FUNCTION GdkDestroyNotify ##### -->
+<para>
+A callback function called when a piece of user data is 
+no longer being stored by GDK. Will typically free the
+structure or object that @data points to.
+</para>
+
+@data: the user data.
+
+
+<!-- ##### FUNCTION gdk_input_add ##### -->
+
+
+@source: 
+@condition: 
+@function: 
+@data: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_input_remove ##### -->
+<para>
+Remove a callback added with gdk_input_add() or 
+gdk_input_add_full().
+</para>
+
+@tag: the tag returned when the callback was set up.
+
+

docs/reference/gdk/tmpl/input_devices.sgml

@@ -0,0 +1,300 @@
+<!-- ##### SECTION Title ##### -->
+Input Devices
+
+<!-- ##### SECTION Short_Description ##### -->
+Functions for handling extended input devices
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+In addition to the normal keyboard and mouse input devices, GTK+ also
+contains support for <firstterm>extended input devices</firstterm>. In
+particular, this support is targeted at graphics tablets. Graphics
+tablets typically return sub-pixel positioning information and possibly
+information about the pressure and tilt of the stylus. Under
+X, the support for extended devices is done through the 
+<firstterm>XInput</firstterm> extension.
+</para>
+<para>
+Because handling extended input devices may involve considerable
+overhead, they need to be turned on for each #GdkWindow
+individually using gdk_input_set_extension_events().
+(Or, more typically, for GtkWidgets, using gtk_widget_set_extension_events()).
+As an additional complication, depending on the support from
+the windowing system, its possible that a normal mouse
+cursor will not be displayed for a particular extension
+device. If an application does not want to deal with displaying
+a cursor itself, it can ask only to get extension events
+from devices that will display a cursor, by passing the
+%GDK_EXTENSION_EVENTS_CURSOR value to
+gdk_input_set_extension_events(). Otherwise, the application
+must retrieve the device information using gdk_devices_list(),
+check the <structfield>has_cursor</structfield> field, and, 
+if it is %FALSE, draw a cursor itself when it receives 
+motion events.
+</para>
+<para>
+Each pointing device is assigned a unique integer ID; events from a
+particular device can be identified by the
+<structfield>deviceid</structfield> field in the event structure. The
+events generated by pointer devices have also been extended to contain
+<structfield>pressure</structfield>, <structfield>xtilt</structfield>
+and <structfield>ytilt</structfield> fields which contain the extended
+information reported as additional <firstterm>valuators</firstterm>
+from the device. The <structfield>pressure</structfield> field is a 
+a double value ranging from 0.0 to 1.0, while the tilt fields are
+double values ranging from -1.0 to 1.0. (With -1.0 representing the
+maximum tilt to the left or up, and 1.0 representing the maximum
+tilt to the right or down.)
+</para>
+<para>
+One additional field in each event is the
+<structfield>source</structfield> field, which contains an
+enumeration value describing the type of device; this currently
+can be one of %GDK_SOURCE_MOUSE, %GDK_SOURCE_PEN, %GDK_SOURCE_ERASER,
+or %GDK_SOURCE_CURSOR. This field is present to allow simple
+applications to (for instance) delete when they detect eraser
+devices without having to keep track of complicated per-device
+settings.
+</para>
+<para>
+Various aspects of each device may be configured.
+The configuration of devices is queried using gdk_devices_list().
+Each device must be activated using gdk_device_set_mode(), which
+also controls whether the device's range is mapped to the
+entire screen or to a single window. The mapping of the valuators of
+the device onto the predefined valuator types is set using
+gdk_device_set_axis_use(). And the source type for each device
+can be set with gdk_device_set_source().
+</para>
+<para>
+Devices may also have associated <firstterm>keys</firstterm>
+or macro buttons. Such keys can be globally set to map
+into normal X keyboard events. The mapping is set using
+gdk_device_set_key().
+</para>
+<para>
+The interfaces in this section will most likely be considerably
+modified in the future to accomodate devices that may have different
+sets of additional valuators than the pressure <structfield>xtilt</structfield>
+and <structfield>ytilt</structfield>.
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT GdkDevice ##### -->
+<para>
+A <structname>GdkDevice</structname> structure contains
+a detailed description of an extended input device. All
+fields are read-only; but you can use gdk_device_set_source(),
+gdk_device_set_mode(), gdk_device_set_key() and gdk_device_set_axis_use()
+to configure various aspects of the device.
+</para>
+
+@parent_instance: the parent instance
+
+<!-- ##### ENUM GdkInputSource ##### -->
+<para>
+An enumeration describing the type of an input device
+in general terms.
+</para>
+
+@GDK_SOURCE_MOUSE: the device is a mouse. (This will be reported for the core
+                    pointer, even if it is something else, such as a trackball.)
+@GDK_SOURCE_PEN: the device is a stylus of a graphics tablet or similar device.
+@GDK_SOURCE_ERASER: the device is an eraser. Typically, this would be the other end
+                    of a stylus on a graphics tablet.
+@GDK_SOURCE_CURSOR: the device is a graphics tablet "puck" or similar device.
+
+<!-- ##### ENUM GdkInputMode ##### -->
+<para>
+An enumeration that describes the mode of an input device.
+</para>
+
+@GDK_MODE_DISABLED: the device is disabled and will not report any events.
+@GDK_MODE_SCREEN: the device is enabled. The device's coordinate space
+                    maps to the entire screen.
+@GDK_MODE_WINDOW: the device is enabled. The device's coordinate space
+                    is mapped to a single window. The manner in which this window
+                    is chosen is undefined, but it will typically be the same
+                    way in which the focus window for key events is determined.
+
+<!-- ##### STRUCT GdkDeviceKey ##### -->
+<para>
+The <structname>GdkDeviceKey</structname> structure contains information
+about the mapping of one device macro button onto a normal X key event. 
+It has the following fields:
+</para>
+
+@keyval: the keyval to generate when the macro button is pressed.
+         If this is 0, no keypress will be generated.
+@modifiers: the modifiers set for the generated key event.
+
+<!-- ##### STRUCT GdkDeviceAxis ##### -->
+<para>
+The <structname>GdkDeviceAxis</structname> structure contains information
+about the range and mapping of a device axis.
+</para>
+
+@use: specifies how the axis is used.
+@min: the minimal value that will be reported by this axis.
+@max: the maximal value that will be reported by this axis.
+
+<!-- ##### ENUM GdkAxisUse ##### -->
+<para>
+An enumeration describing the way in which a device
+axis (valuator) maps onto the predefined valuator
+types that GTK+ understands.
+</para>
+
+@GDK_AXIS_IGNORE: the axis is ignored.
+@GDK_AXIS_X: the axis is used as the x axis.
+@GDK_AXIS_Y: the axis is used as the y axis.
+@GDK_AXIS_PRESSURE: the axis is used for pressure information.
+@GDK_AXIS_XTILT: the axis is used for x tilt information.
+@GDK_AXIS_YTILT: the axis is used for x tilt information.
+@GDK_AXIS_WHEEL: the axis is used for wheel information.
+@GDK_AXIS_LAST: a constant equal to the numerically highest axis value.
+
+<!-- ##### FUNCTION gdk_devices_list ##### -->
+<para>
+</para>
+
+@void: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_device_set_source ##### -->
+<para>
+Sets the source type for an input device.
+</para>
+
+@device: a #GdkDevice.
+@source: the source type.
+
+
+<!-- ##### FUNCTION gdk_device_set_mode ##### -->
+<para>
+Sets a the mode of an input device. The mode controls if the 
+device is active and whether the device's range is mapped to the
+entire screen or to a single window.
+</para>
+
+@device: a #GdkDevice.
+@mode: the input mode.
+@Returns: %TRUE if the mode was successfully changed.
+
+
+<!-- ##### FUNCTION gdk_device_set_key ##### -->
+<para>
+Specifies the X key event to generate when a macro button of a device
+is pressed.
+</para>
+
+@device: a #GdkDevice.
+@index_: the index of the macro button to set.
+@keyval: the keyval to generate.
+@modifiers: the modifiers to set.
+
+
+<!-- ##### FUNCTION gdk_device_set_axis_use ##### -->
+<para>
+Specifies how an axis of a device is used.
+</para>
+
+@device: a #GdkDevice.
+@index_: the index of the axis.
+@use: specifies how the axis is used.
+
+
+<!-- ##### FUNCTION gdk_device_get_core_pointer ##### -->
+<para>
+</para>
+
+@void: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_device_get_state ##### -->
+
+
+@device: 
+@window: 
+@axes: 
+@mask: 
+
+
+<!-- ##### FUNCTION gdk_device_get_history ##### -->
+<para>
+
+</para>
+
+@device: 
+@window: 
+@start: 
+@stop: 
+@events: 
+@n_events: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_device_free_history ##### -->
+<para>
+Frees an array of #GdkTimeCoord that was returned by gdk_device_get_history().
+</para>
+
+@events: an array of #GdkTimeCoord.
+@n_events: the length of the array.
+
+
+<!-- ##### STRUCT GdkTimeCoord ##### -->
+<para>
+The #GdkTimeCoord structure stores a single event in a
+motion history. It contains the following fields:
+</para>
+
+@time: The timestamp for this event.
+@axes: the values of the device's axes.
+
+<!-- ##### FUNCTION gdk_device_get_axis ##### -->
+<para>
+
+</para>
+
+@device: 
+@axes: 
+@use: 
+@value: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_input_set_extension_events ##### -->
+<para>
+Turns extension events on or off for a particular window,
+and specifies the event mask for extension events.
+</para>
+
+@window: a #GdkWindow.
+@mask: the event mask
+@mode: the type of extension events that are desired.
+
+
+<!-- ##### ENUM GdkExtensionMode ##### -->
+<para>
+An enumeration used to specify which extension events
+are desired for a particular widget.
+</para>
+
+@GDK_EXTENSION_EVENTS_NONE: no extension events are desired.
+@GDK_EXTENSION_EVENTS_ALL: all extension events are desired.
+@GDK_EXTENSION_EVENTS_CURSOR: extension events are desired only if a cursor
+                              will be displayed for the device.
+

docs/reference/gdk/tmpl/pango_interaction.sgml

@@ -226,6 +226,15 @@ g_object_unref (gc);
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_pango_context_set_colormap ##### -->
+<para>
+
+</para>
+
+@context: 
+@colormap: 
+
+
 <!-- ##### STRUCT GdkPangoAttrEmbossed ##### -->
 <para>
 A Pango text attribute containing a embossed bitmap to be used when

docs/reference/gdk/tmpl/pixbufs.sgml

@@ -38,10 +38,44 @@ pixbufs, see the #GdkPixbuf API documentation.
 @alpha_threshold: 
 
 
+<!-- ##### FUNCTION gdk_pixbuf_render_to_drawable ##### -->
 <para>
 
 </para>
 
+@pixbuf: 
+@drawable: 
+@gc: 
+@src_x: 
+@src_y: 
+@dest_x: 
+@dest_y: 
+@width: 
+@height: 
+@dither: 
+@x_dither: 
+@y_dither: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_render_to_drawable_alpha ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@drawable: 
+@src_x: 
+@src_y: 
+@dest_x: 
+@dest_y: 
+@width: 
+@height: 
+@alpha_mode: 
+@alpha_threshold: 
+@dither: 
+@x_dither: 
+@y_dither: 
+
 
 <!-- ##### FUNCTION gdk_pixbuf_render_pixmap_and_mask ##### -->
 <para>

docs/reference/gdk/tmpl/pixmaps.sgml

@@ -8,11 +8,16 @@ Offscreen drawables
 <para>
 Pixmaps are offscreen drawables. They can be drawn upon with the
 standard drawing primitives, then copied to another drawable (such as
-a #GdkWindow) with gdk_draw_drawable(). The depth of a pixmap
+a #GdkWindow) with gdk_pixmap_draw(). The depth of a pixmap
 is the number of bits per pixels. Bitmaps are simply pixmaps
 with a depth of 1. (That is, they are monochrome bitmaps - each
 pixel can be either on or off).
 </para>
+<para>
+GTK 3 will remove #GdkPixmap and #GdkBitmap. You should use cairo
+surfaces instead. However, because a lot of functions still use these
+types, they are not deprecated.
+</para>
 
 <!-- ##### SECTION See_Also ##### -->
 <para>
@@ -38,6 +43,11 @@ these types.
 <para>
 Create a new pixmap with a given size and depth.
 </para>
+<para>
+Please use gdk_window_create_similar_surface() instead of this
+function if you're not forced to use a #GdkPixmap. It is intended
+as the replacement function for this function in GTK 3.
+</para>
 
 @drawable: A #GdkDrawable, used to determine default values
 for the new pixmap. Can be %NULL if @depth is specified,
@@ -62,6 +72,14 @@ window is used.
 @height: the height of the new pixmap in pixels.
 @Returns: the #GdkBitmap
 
+@Deprecated: 2.22: You can create a Cairo image surface using
+cairo_image_surface_create_for_data() instead. Specify
+%CAIRO_FORMAT_A1 as the format to get a bitmap. Keep in mind that
+Cairo images must have a rowstride of 4 bytes, so you will need
+to align your data properly. If you must use a pixmap, use
+gdk_pixmap_new() with a depth of 1 to create a bitmap and then use
+gdk_cairo_create(), cairo_set_source_surface() and cairo_paint()
+to draw the image surface to the bitmap.
 
 <!-- ##### FUNCTION gdk_pixmap_create_from_data ##### -->
 <para>
@@ -78,6 +96,11 @@ for the new pixmap. Can be %NULL, if the depth is given.
 @bg: the background color.
 @Returns: the #GdkPixmap
 
+@Deprecated: 2.22: If you must replicate the functionality of this
+function, create a pixmap using gdk_pixmap_new(), cairo_paint() it
+with the background color and then create a Cairo image surface as
+pointed out in the docs to gdk_bitmap_create_from_data() and use
+this surface with cairo_mask_surface() to paint the foreground color.
 
 <!-- ##### FUNCTION gdk_pixmap_create_from_xpm ##### -->
 
@@ -121,6 +144,21 @@ for the new pixmap. Can be %NULL, if the depth is given.
 @Returns: 
 
 
+<!-- ##### MACRO gdk_pixmap_ref ##### -->
+<para>
+Deprecated equivalent of g_object_ref().
+</para>
+
+@Returns: @pixmap
+
+
+<!-- ##### MACRO gdk_pixmap_unref ##### -->
+<para>
+Deprecated equivalent of g_object_unref().
+</para>
+
+
+
 <!-- ##### TYPEDEF GdkBitmap ##### -->
 <para>
 An opaque structure representing an offscreen drawable of depth
@@ -130,3 +168,18 @@ refers generically to any of these types.
 </para>
 
 
+<!-- ##### MACRO gdk_bitmap_ref ##### -->
+<para>
+Deprecated equivalent of g_object_ref().
+</para>
+
+@Returns: @pixmap
+
+
+<!-- ##### MACRO gdk_bitmap_unref ##### -->
+<para>
+Deprecated equivalent of g_object_unref().
+</para>
+
+
+

docs/reference/gdk/tmpl/regions.sgml

@@ -1,14 +1,13 @@
 <!-- ##### SECTION Title ##### -->
-Points and Rectangles
+Points, Rectangles and Regions
 
 <!-- ##### SECTION Short_Description ##### -->
 Simple graphical data types
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-GDK provides the #GdkPoint and #GdkRectangle data types for representing pixels
-and sets of pixels on the screen. Together with Cairo's #cairo_region_t data
-type, they make up the central types for representing graphical data.
+GDK provides the #GdkPoint, #GdkRectangle, #GdkRegion and #GdkSpan data types
+for representing pixels and sets of pixels on the screen.
 </para>
 <para>
 #GdkPoint is a simple structure containing an x and y coordinate of a point.
@@ -20,7 +19,13 @@ gdk_rectangle_intersect(). To find the union of two rectangles use
 gdk_rectangle_union().
 </para>
 <para>
-#cairo_region_t is usually used for managing clipping of graphical operations.
+#GdkRegion is an opaque data type holding a set of arbitrary pixels, and is
+usually used for clipping graphical operations (see gdk_gc_set_clip_region()).
+</para>
+<para>
+#GdkSpan is a structure holding a spanline. A spanline is a horizontal line that
+is one pixel wide. It is mainly used when rasterizing other graphics primitives.
+It can be intersected to regions by using gdk_region_spans_intersect_foreach().
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -42,12 +47,15 @@ Defines the x and y coordinates of a point.
 @x: the x coordinate of the point.
 @y: the y coordinate of the point.
 
-<!-- ##### TYPEDEF GdkRectangle ##### -->
+<!-- ##### STRUCT GdkRectangle ##### -->
 <para>
-Defines the position and size of a rectangle. It is identical to 
-#cairo_rectangle_int_t.
+Defines the position and size of a rectangle.
 </para>
 
+@x: the x coordinate of the left edge of the rectangle.
+@y: the y coordinate of the top of the rectangle.
+@width: the width of the rectangle.
+@height: the height of the rectangle.
 
 <!-- ##### FUNCTION gdk_rectangle_intersect ##### -->
 <para>
@@ -70,3 +78,244 @@ Defines the position and size of a rectangle. It is identical to
 @dest: 
 
 
+<!-- ##### STRUCT GdkRegion ##### -->
+<para>
+A GdkRegion represents a set of pixels on the screen.
+</para>
+<para>
+In GTK3, #GdkRegion will be replaced by #cairo_region_t. All the functions
+listed in this section will go away and you will have to use the relevant
+Cairo functions. The conversion can be done using simple serch and replace.
+</para>
+
+
+<!-- ##### FUNCTION gdk_region_new ##### -->
+<para>
+
+</para>
+
+@void: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_region_polygon ##### -->
+<para>
+
+</para>
+
+@points: 
+@n_points: 
+@fill_rule: 
+@Returns: 
+
+
+<!-- ##### ENUM GdkFillRule ##### -->
+<para>
+The method for determining which pixels are included in a region, when
+creating a #GdkRegion from a polygon.
+The fill rule is only relevant for polygons which overlap themselves.
+</para>
+
+@GDK_EVEN_ODD_RULE: areas which are overlapped an odd number of times are
+included in the region, while areas overlapped an even number of times are not.
+@GDK_WINDING_RULE: overlapping areas are always included.
+
+<!-- ##### FUNCTION gdk_region_copy ##### -->
+<para>
+
+</para>
+
+@region: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_region_rectangle ##### -->
+<para>
+
+</para>
+
+@rectangle: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_region_destroy ##### -->
+<para>
+
+</para>
+
+@region: 
+
+
+<!-- ##### FUNCTION gdk_region_get_clipbox ##### -->
+<para>
+
+</para>
+
+@region: 
+@rectangle: 
+
+
+<!-- ##### FUNCTION gdk_region_get_rectangles ##### -->
+<para>
+
+</para>
+
+@region: 
+@rectangles: 
+@n_rectangles: 
+
+
+<!-- ##### FUNCTION gdk_region_empty ##### -->
+<para>
+
+</para>
+
+@region: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_region_equal ##### -->
+<para>
+
+</para>
+
+@region1: 
+@region2: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_region_rect_equal ##### -->
+<para>
+
+</para>
+
+@region: 
+@rectangle: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_region_point_in ##### -->
+<para>
+
+</para>
+
+@region: 
+@x: 
+@y: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_region_rect_in ##### -->
+<para>
+
+</para>
+
+@region: 
+@rectangle: 
+@Returns: 
+
+
+<!-- ##### ENUM GdkOverlapType ##### -->
+<para>
+Specifies the possible values returned by gdk_region_rect_in().
+</para>
+
+@GDK_OVERLAP_RECTANGLE_IN: if the rectangle is inside the #GdkRegion.
+@GDK_OVERLAP_RECTANGLE_OUT: if the rectangle is outside the #GdkRegion.
+@GDK_OVERLAP_RECTANGLE_PART: if the rectangle is partly inside the #GdkRegion.
+
+<!-- ##### FUNCTION gdk_region_offset ##### -->
+<para>
+
+</para>
+
+@region: 
+@dx: 
+@dy: 
+
+
+<!-- ##### FUNCTION gdk_region_shrink ##### -->
+<para>
+
+</para>
+
+@region: 
+@dx: 
+@dy: 
+
+
+<!-- ##### FUNCTION gdk_region_union_with_rect ##### -->
+<para>
+
+</para>
+
+@region: 
+@rect: 
+
+
+<!-- ##### FUNCTION gdk_region_intersect ##### -->
+<para>
+</para>
+
+@source1: 
+@source2: 
+
+
+<!-- ##### FUNCTION gdk_region_union ##### -->
+<para>
+
+</para>
+
+@source1: 
+@source2: 
+
+
+<!-- ##### FUNCTION gdk_region_subtract ##### -->
+<para>
+</para>
+
+@source1: 
+@source2: 
+
+
+<!-- ##### FUNCTION gdk_region_xor ##### -->
+<para>
+</para>
+
+@source1: 
+@source2: 
+
+
+<!-- ##### STRUCT GdkSpan ##### -->
+<para>
+A GdkSpan represents a horizontal line of pixels starting
+at the pixel with coordinates @x, @y and ending before @x + @width, @y.
+</para>
+
+@x: x coordinate of the first pixel.
+@y: y coordinate of the first pixel.
+@width: number of pixels in the span.
+
+<!-- ##### USER_FUNCTION GdkSpanFunc ##### -->
+<para>
+This defines the type of the function passed to 
+gdk_region_spans_intersect_foreach(). 
+</para>
+
+@span: a #GdkSpan.
+@data: the user data passed to gdk_region_spans_intersect_foreach().
+
+
+<!-- ##### FUNCTION gdk_region_spans_intersect_foreach ##### -->
+<para>
+
+</para>
+
+@region: 
+@spans: 
+@n_spans: 
+@sorted: 
+@function: 
+@data: 
+
+

docs/reference/gdk/tmpl/rgb.sgml

@@ -128,6 +128,15 @@ colors.</para></listitem>
 <!-- ##### SECTION Image ##### -->
 
 
+<!-- ##### FUNCTION gdk_rgb_init ##### -->
+<para>
+This function no longer does anything at all. It's completely useless
+(and harmless).
+</para>
+
+@void: 
+
+
 <!-- ##### FUNCTION gdk_draw_rgb_image ##### -->
 <para>
 Draws an RGB image in the drawable. This is the core GdkRGB
@@ -323,6 +332,37 @@ colors. This is used only for gdk_draw_indexed_image().
 @colors: The colors, represented as 0xRRGGBB integer values.
 @n_colors: The number of colors in the cmap.
 
+<!-- ##### FUNCTION gdk_rgb_gc_set_foreground ##### -->
+<para>
+Sets the foreground color in @gc to the specified color (or the
+closest approximation, in the case of limited visuals).
+</para>
+
+@gc: The #GdkGC to modify.
+@rgb: The color, represented as a 0xRRGGBB integer value.
+
+
+<!-- ##### FUNCTION gdk_rgb_gc_set_background ##### -->
+<para>
+Sets the background color in @gc to the specified color (or the
+closest approximation, in the case of limited visuals).
+</para>
+
+@gc: The #GdkGC to modify.
+@rgb: The color, represented as a 0xRRGGBB integer value.
+
+
+<!-- ##### FUNCTION gdk_rgb_xpixel_from_rgb ##### -->
+<para>
+Finds the X pixel closest in color to the @rgb color specified. This
+value may be used to set the <structfield>pixel</structfield> field of
+a #GdkColor struct.
+</para>
+
+@rgb: The color, represented as a 0xRRGGBB integer value.
+@Returns: The X pixel value.
+
+
 <!-- ##### FUNCTION gdk_rgb_find_color ##### -->
 <para>
 
@@ -376,6 +416,15 @@ private colormap.
 @Returns: 
 
 
+<!-- ##### MACRO gdk_rgb_get_cmap ##### -->
+<para>
+Gets the colormap set by GdkRGB. This colormap and the corresponding
+visual should be used when creating windows that will be drawn in by GdkRGB.
+</para>
+
+@Returns: The #GdkColormap set by GdkRGB.
+
+
 <!-- ##### FUNCTION gdk_rgb_ditherable ##### -->
 <para>
 Determines whether the preferred visual is ditherable. This function may be

docs/reference/gdk/tmpl/selections.sgml

@@ -53,6 +53,36 @@ to the X Inter-client Communication Conventions Manual
 <!-- ##### SECTION Image ##### -->
 
 
+<!-- ##### TYPEDEF GdkSelection ##### -->
+<para>
+The #GdkSelection enumeration contains predefined 
+atom values for several common selections.
+</para>
+
+
+<!-- ##### TYPEDEF GdkSelectionType ##### -->
+<para>
+The #GdkSelectionType enumeration contains predefined
+atom values used to represent the types of data transferred
+in response to a request for a target. See the
+ICCCM for details about what data should be transferred
+for each of these types. Other atoms can be used,
+and the recommended practice for GTK+ is to to use mime 
+types for this purpose. However, supporting these types
+may be useful for compatibility with older programs.
+</para>
+
+
+<!-- ##### TYPEDEF GdkTarget ##### -->
+<para>
+The #GdkTarget enumeration contains predefined atom values which are
+used to describe possible targets for a selection. Other atoms can be
+used, and the recommended practice for GTK+ is to to use mime types
+for this purpose. However, supporting these types may be useful for
+compatibility with older programs.
+</para>
+
+
 <!-- ##### MACRO GDK_SELECTION_PRIMARY ##### -->
 <para>
 A #GdkAtom representing the <literal>PRIMARY</literal> selection.

docs/reference/gdk/tmpl/visuals.sgml

@@ -142,84 +142,6 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_visual_get_bits_per_rgb ##### -->
-<para>
-
-</para>
-
-@visual: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_visual_get_blue_pixel_details ##### -->
-<para>
-
-</para>
-
-@visual: 
-@mask: 
-@shift: 
-@precision: 
-
-
-<!-- ##### FUNCTION gdk_visual_get_byte_order ##### -->
-<para>
-
-</para>
-
-@visual: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_visual_get_colormap_size ##### -->
-<para>
-
-</para>
-
-@visual: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_visual_get_depth ##### -->
-<para>
-
-</para>
-
-@visual: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_visual_get_green_pixel_details ##### -->
-<para>
-
-</para>
-
-@visual: 
-@mask: 
-@shift: 
-@precision: 
-
-
-<!-- ##### FUNCTION gdk_visual_get_red_pixel_details ##### -->
-<para>
-
-</para>
-
-@visual: 
-@mask: 
-@shift: 
-@precision: 
-
-
-<!-- ##### FUNCTION gdk_visual_get_visual_type ##### -->
-<para>
-
-</para>
-
-@visual: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_visual_get_best_depth ##### -->
 <para>
 
@@ -284,6 +206,23 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 @Returns: 
 
 
+<!-- ##### MACRO gdk_visual_ref ##### -->
+<para>
+Deprecated equivalent of g_object_ref().
+</para>
+
+@v: a #GdkVisual
+@Returns: the same visual
+
+
+<!-- ##### MACRO gdk_visual_unref ##### -->
+<para>
+Deprecated equivalent of g_object_unref().
+</para>
+
+@v: a #GdkVisual
+
+
 <!-- ##### FUNCTION gdk_visual_get_screen ##### -->
 <para>
 

docs/reference/gdk/tmpl/x_interaction.sgml

@@ -27,6 +27,13 @@ Obtains the Xlib window id of the root window of the current screen.
 
 
 
+<!-- ##### MACRO GDK_ROOT_PARENT ##### -->
+<para>
+Obtains the Xlib window id of the root window of the default screen.
+</para>
+
+
+
 <!-- ##### MACRO GDK_DISPLAY ##### -->
 <para>
 The current display.
@@ -34,6 +41,8 @@ The current display.
 
 @Returns: an Xlib <type>Display*</type>.
 
+@Deprecated: 2.22: Use gdk_display_get_default ()
+
 
 <!-- ##### MACRO GDK_WINDOW_XDISPLAY ##### -->
 <para>
@@ -179,6 +188,24 @@ Returns the X visual belonging to a #GdkVisual.
 @Returns: an Xlib <type>Visual*</type>.
 
 
+<!-- ##### MACRO GDK_FONT_XDISPLAY ##### -->
+<para>
+Returns the display of a #GdkFont.
+</para>
+
+@font: a #GdkFont.
+@Returns: an Xlib <type>Display*</type>.
+
+
+<!-- ##### MACRO GDK_FONT_XFONT ##### -->
+<para>
+Returns the X font belonging to a #GdkFont.
+</para>
+
+@font: a #GdkFont.
+@Returns: an Xlib <type>XFontStruct*</type> or an <type>XFontSet</type>.
+
+
 <!-- ##### MACRO GDK_CURSOR_XCURSOR ##### -->
 <para>
 Returns the X cursor belonging to a #GdkCursor.
@@ -231,6 +258,14 @@ Another name for GDK_DRAWABLE_XID().
 @Returns: 
 
 
+<!-- ##### FUNCTION gdkx_colormap_get ##### -->
+<para>
+</para>
+
+@xcolormap: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_pixmap_foreign_new ##### -->
 <para>
 
@@ -337,6 +372,26 @@ Another name for GDK_DRAWABLE_XID().
 @Returns: 
 
 
+<!-- ##### MACRO gdk_font_lookup ##### -->
+<para>
+Obtains the #GdkFont for the given Xlib font ID, or %NULL if no #GdkFont has
+been created for @xid.
+</para>
+
+@xid: an Xlib font ID
+
+
+<!-- ##### MACRO gdk_font_lookup_for_display ##### -->
+<para>
+Obtains the #GdkFont for the given Xlib font ID on @display, or %NULL if no
+#GdkFont has been created for @xid.
+</para>
+
+@display: a #GdkDisplay
+@xid: an Xlib font ID
+Since: 2.2
+
+
 <!-- ##### FUNCTION gdk_x11_lookup_xdisplay ##### -->
 <para>
 
@@ -557,6 +612,33 @@ Another name for GDK_DRAWABLE_XID().
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_x11_font_get_name ##### -->
+<para>
+
+</para>
+
+@font: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_x11_font_get_xdisplay ##### -->
+<para>
+
+</para>
+
+@font: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_x11_font_get_xfont ##### -->
+<para>
+
+</para>
+
+@font: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_x11_gc_get_xdisplay ##### -->
 <para>
 

docs/reference/gtk/Makefile.am

@@ -4,13 +4,16 @@ include $(top_srcdir)/Makefile.decl
 AUTOMAKE_OPTIONS = 1.6
 
 # The name of the module.
-DOC_MODULE=gtk3
+DOC_MODULE=gtk
 
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=gtk-docs.sgml
 
 # Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED"
+SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED" 
+
+# Extra options to pass to gtkdoc-scangobj
+SCANGOBJ_OPTIONS=--type-init-func="gtk_type_init(0)" 
 
 # The directory containing the source code. Relative to $(srcdir)
 DOC_SOURCE_DIR=../../../gtk
@@ -21,6 +24,7 @@ CFILE_GLOB=$(top_srcdir)/gtk/*.c
 
 # Header files to ignore when scanning
 IGNORE_HFILES=				\
+	gtkalias.h			\
 	fnmatch.h			\
 	gtkdebug.h			\
 	gtkbuilderprivate.h		\
@@ -78,6 +82,7 @@ IGNORE_HFILES=				\
 	gtktexttypes.h			\
 	gtktextutil.h			\
 	gtkthemes.h			\
+	gtktoggleactionprivate.h	\
 	gtktrayicon.h			\
 	gtktreedatalist.h		\
 	gtktreeprivate.h		\
@@ -116,12 +121,27 @@ content_files =					\
 	version.xml				\
 	running.sgml				\
 	building.sgml				\
+	changes-1.2.sgml			\
+	changes-2.0.sgml			\
 	compiling.sgml				\
 	directfb.sgml				\
 	drawing-model.xml			\
 	glossary.xml				\
-	migrating-2to3.xml			\
 	migrating-checklist.sgml		\
+        migrating-ClientSideWindows.sgml	\
+	migrating-GtkAboutDialog.sgml		\
+	migrating-GtkAction.sgml		\
+	migrating-GtkAssistant.sgml		\
+	migrating-GtkBuilder.sgml		\
+	migrating-GtkColorButton.sgml		\
+	migrating-GtkComboBox.sgml		\
+	migrating-GtkEntry-icons.sgml		\
+	migrating-GtkFileChooser.sgml		\
+	migrating-GtkIconView.sgml		\
+	migrating-GtkLabel-links.sgml		\
+	migrating-GtkLinkButton.sgml		\
+	migrating-GtkRecentChooser.sgml 	\
+        migrating-GtkTooltip.sgml		\
 	objects_grouped.sgml			\
 	osx.sgml				\
 	question_index.sgml			\
@@ -130,141 +150,154 @@ content_files =					\
 	tree_widget.sgml			\
 	windows.sgml				\
 	x11.sgml				\
-	gtk-query-immodules-3.0.xml		\
-	gtk-update-icon-cache-3.0.xml		\
-	gtk-builder-convert-3.0.xml		\
+	gtk-query-immodules-2.0.xml		\
+	gtk-update-icon-cache.xml		\
+	gtk-builder-convert.xml			\
 	visual_index.xml
 
 expand_content_files = 				\
 	drawing-model.xml			\
 	glossary.xml				\
-	migrating-2to3.xml			\
 	migrating-checklist.sgml		\
+        migrating-ClientSideWindows.sgml	\
+	migrating-GtkAction.sgml		\
+	migrating-GtkComboBox.sgml		\
+	migrating-GtkEntry-icons.sgml		\
+	migrating-GtkFileChooser.sgml		\
+	migrating-GtkIconView.sgml		\
+	migrating-GtkAboutDialog.sgml		\
+	migrating-GtkColorButton.sgml		\
+	migrating-GtkAssistant.sgml		\
+	migrating-GtkRecentChooser.sgml 	\
+	migrating-GtkLabel-links.sgml		\
+	migrating-GtkLinkButton.sgml		\
+	migrating-GtkBuilder.sgml		\
+	migrating-GtkTooltip.sgml		\
 	tree_widget.sgml			\
 	text_widget.sgml			\
 	question_index.sgml
 
 # Images to copy into HTML directory
 HTML_IMAGES = \
-	$(top_srcdir)/gtk/stock-icons/24/gtk-about.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-add.png			\
+	$(top_srcdir)/gtk/stock-icons/24/help-about.png			\
+	$(top_srcdir)/gtk/stock-icons/24/list-add.png			\
 	$(top_srcdir)/gtk/stock-icons/20/gtk-apply.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-bold.png			\
+	$(top_srcdir)/gtk/stock-icons/24/format-text-bold.png		\
 	$(top_srcdir)/gtk/stock-icons/20/gtk-cancel.png			\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-caps-lock-warning.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-cdrom.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-clear.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-close.png			\
+	$(top_srcdir)/gtk/stock-icons/24/media-optical.png		\
+	$(top_srcdir)/gtk/stock-icons/24/edit-clear.png			\
+	$(top_srcdir)/gtk/stock-icons/24/window-close.png		\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-connect.png		\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-convert.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-copy.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-cut.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-delete.png			\
-	$(top_srcdir)/gtk/stock-icons/48/gtk-dialog-authentication.png 	\
-	$(top_srcdir)/gtk/stock-icons/48/gtk-dialog-error.png		\
-	$(top_srcdir)/gtk/stock-icons/48/gtk-dialog-info.png		\
-	$(top_srcdir)/gtk/stock-icons/48/gtk-dialog-question.png	\
-	$(top_srcdir)/gtk/stock-icons/48/gtk-dialog-warning.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-directory.png		\
+	$(top_srcdir)/gtk/stock-icons/24/edit-copy.png			\
+	$(top_srcdir)/gtk/stock-icons/24/edit-cut.png			\
+	$(top_srcdir)/gtk/stock-icons/24/edit-delete.png		\
+	$(top_srcdir)/gtk/stock-icons/48/dialog-password.png		\
+	$(top_srcdir)/gtk/stock-icons/48/dialog-error.png		\
+	$(top_srcdir)/gtk/stock-icons/48/dialog-information.png		\
+	$(top_srcdir)/gtk/stock-icons/48/dialog-question.png		\
+	$(top_srcdir)/gtk/stock-icons/48/dialog-warning.png		\
+	$(top_srcdir)/gtk/stock-icons/24/folder.png			\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-disconnect.png		\
 	$(top_srcdir)/gtk/stock-icons/32/gtk-dnd.png			\
 	$(top_srcdir)/gtk/stock-icons/32/gtk-dnd-multiple.png		\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-edit.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-execute.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-file.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-find.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-find-and-replace.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-goto-bottom.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-goto-first-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-goto-first-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-goto-last-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-goto-last-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-goto-top.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-go-back-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-go-back-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-go-down.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-go-forward-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-go-forward-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-go-up.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-harddisk.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-network.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-help.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-home.png			\
+	$(top_srcdir)/gtk/stock-icons/24/system-run.png			\
+	$(top_srcdir)/gtk/stock-icons/24/document-x-generic.png		\
+	$(top_srcdir)/gtk/stock-icons/24/edit-find.png			\
+	$(top_srcdir)/gtk/stock-icons/24/edit-find-replace.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-bottom.png			\
+	$(top_srcdir)/gtk/stock-icons/24/go-first-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-first-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-last-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-last-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-top.png			\
+	$(top_srcdir)/gtk/stock-icons/24/go-previous-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-previous-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-down.png			\
+	$(top_srcdir)/gtk/stock-icons/24/go-next-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-next-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-up.png			\
+	$(top_srcdir)/gtk/stock-icons/24/drive-harddisk.png		\
+	$(top_srcdir)/gtk/stock-icons/24/network-idle.png		\
+	$(top_srcdir)/gtk/stock-icons/24/help-contents.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-home.png			\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-index.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-indent-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-indent-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-unindent-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-unindent-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-italic.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-jump-to-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-jump-to-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-justify-center.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-justify-fill.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-justify-left.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-justify-right.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-missing-image.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-new.png			\
+	$(top_srcdir)/gtk/stock-icons/24/format-indent-more-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/format-indent-more-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/format-indent-less-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/format-indent-less-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/format-text-italic.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-jump-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/go-jump-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/format-justify-center.png	\
+	$(top_srcdir)/gtk/stock-icons/24/format-justify-fill.png	\
+	$(top_srcdir)/gtk/stock-icons/24/format-justify-left.png	\
+	$(top_srcdir)/gtk/stock-icons/24/format-justify-right.png	\
+	$(top_srcdir)/gtk/stock-icons/24/image-missing.png		\
+	$(top_srcdir)/gtk/stock-icons/24/document-new.png		\
 	$(top_srcdir)/gtk/stock-icons/20/gtk-no.png			\
 	$(top_srcdir)/gtk/stock-icons/20/gtk-ok.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-open.png			\
+	$(top_srcdir)/gtk/stock-icons/24/document-open.png		\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-orientation-landscape.png	\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-orientation-portrait.png	\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-orientation-reverse-landscape.png \
 	$(top_srcdir)/gtk/stock-icons/24/gtk-orientation-reverse-portrait.png \
-	$(top_srcdir)/gtk/stock-icons/24/gtk-paste.png			\
+	$(top_srcdir)/gtk/stock-icons/24/edit-paste.png			\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-preferences.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-print.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-print-error.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-print-paused.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-print-preview.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-print-report.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-print-warning.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-properties.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-quit.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-redo-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-redo-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-refresh.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-remove.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-revert-to-saved-ltr.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-revert-to-saved-rtl.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-floppy.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-save.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-save-as.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-select-all.png		\
+	$(top_srcdir)/gtk/stock-icons/24/document-print.png		\
+	$(top_srcdir)/gtk/stock-icons/24/printer-error.png		\
+	$(top_srcdir)/gtk/stock-icons/24/printer-paused.png		\
+	$(top_srcdir)/gtk/stock-icons/24/document-print-preview.png	\
+	$(top_srcdir)/gtk/stock-icons/24/printer-info.png		\
+	$(top_srcdir)/gtk/stock-icons/24/printer-warning.png		\
+	$(top_srcdir)/gtk/stock-icons/24/document-properties.png	\
+	$(top_srcdir)/gtk/stock-icons/24/application-exit.png		\
+	$(top_srcdir)/gtk/stock-icons/24/edit-redo-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/edit-redo-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/view-refresh.png		\
+	$(top_srcdir)/gtk/stock-icons/24/list-remove.png		\
+	$(top_srcdir)/gtk/stock-icons/24/document-revert-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/document-revert-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-floppy.png		\
+	$(top_srcdir)/gtk/stock-icons/24/document-save.png		\
+	$(top_srcdir)/gtk/stock-icons/24/document-save-as.png		\
+	$(top_srcdir)/gtk/stock-icons/24/edit-select-all.png		\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-select-color.png		\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-color-picker.png		\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-font.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-sort-ascending.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-sort-descending.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-spell-check.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-stop.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-strikethrough.png		\
+	$(top_srcdir)/gtk/stock-icons/24/view-sort-ascending.png	\
+	$(top_srcdir)/gtk/stock-icons/24/view-sort-descending.png	\
+	$(top_srcdir)/gtk/stock-icons/24/tools-check-spelling.png	\
+	$(top_srcdir)/gtk/stock-icons/24/process-stop.png		\
+	$(top_srcdir)/gtk/stock-icons/24/format-text-strikethrough.png	\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-undelete-ltr.png		\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-undelete-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-underline.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-undo-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-undo-rtl.png		\
+	$(top_srcdir)/gtk/stock-icons/24/format-text-underline.png	\
+	$(top_srcdir)/gtk/stock-icons/24/edit-undo-ltr.png		\
+	$(top_srcdir)/gtk/stock-icons/24/edit-undo-rtl.png		\
 	$(top_srcdir)/gtk/stock-icons/20/gtk-yes.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-zoom-100.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-zoom-fit.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-zoom-in.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-zoom-out.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-forward-ltr.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-forward-rtl.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-next-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-next-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-pause.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-play-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-play-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-previous-ltr.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-previous-rtl.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-record.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-rewind-ltr.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-rewind-rtl.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-media-stop.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-fullscreen.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-leave-fullscreen.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-info.png			\
+	$(top_srcdir)/gtk/stock-icons/24/zoom-original.png		\
+	$(top_srcdir)/gtk/stock-icons/24/zoom-fit-best.png		\
+	$(top_srcdir)/gtk/stock-icons/24/zoom-in.png			\
+	$(top_srcdir)/gtk/stock-icons/24/zoom-out.png			\
+	$(top_srcdir)/gtk/stock-icons/24/media-seek-forward-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-seek-forward-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-skip-forward-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-skip-forward-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-playback-pause.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-playback-start-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-playback-start-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-seek-backward-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-seek-backward-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-record.png		\
+	$(top_srcdir)/gtk/stock-icons/24/media-skip-backward-ltr.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-skip-backward-rtl.png	\
+	$(top_srcdir)/gtk/stock-icons/24/media-playback-stop.png	\
+	$(top_srcdir)/gtk/stock-icons/24/view-fullscreen.png		\
+	$(top_srcdir)/gtk/stock-icons/24/view-restore.png		\
+	$(top_srcdir)/gtk/stock-icons/24/gtk-page-setup.png		\
 	$(srcdir)/images/aboutdialog.png				\
 	$(srcdir)/images/accel-label.png				\
 	$(srcdir)/images/assistant.png					\
@@ -333,38 +366,21 @@ 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
-
 if ENABLE_MAN
 
-.xml.1:
+man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1
+
+%.1 : %.xml 
 	@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-dist-local-check-mans-enabled:
-	if grep "Man generation disabled" $(man_MANS) >/dev/null; then $(RM) $(man_MANS); fi
-
-else
-
-$(man_MANS):
-	echo Man generation disabled.  Creating dummy $@.  Configure with --enable-man to enable it.
-	echo Man generation disabled.  Remove this file, configure with --enable-man, and rebuild > $@
-
-dist-local-check-mans-enabled:
-	echo "*** --enable-man must be used in order to make dist"
-	false
+BUILT_EXTRA_DIST = $(man_MANS)
 
 endif
 
-MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES)
-
-EXTRA_DIST += $(man_MANS)
-
-dist-hook-local: dist-local-check-mans-enabled gtk-docs-clean all-local
-
-gtk-docs-clean: clean
-	cd $(srcdir) && rm -rf xml html
+dist-hook-local: $(BUILT_EXTRA_DIST)
+	files='$(BUILT_EXTRA_DIST)';				\
+	for f in $$files; do					\
+	  if test -f $$f; then d=.; else d=$(srcdir); fi;	\
+	  cp $$d/$$f $(distdir) || exit 1; done
 
 -include $(top_srcdir)/git.mk

docs/reference/gtk/building.sgml

@@ -49,12 +49,12 @@ How to compile GTK+ itself
       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
-      <literal>tar.gz</literal> or <literal>tar.bz2</literal> file
+      <literal>tar.gz</literal> or <literal>tar.bz2</literal> file 
       which you unpack into a directory full of the source files as follows:
     </para>
     <programlisting>
-      tar xvfz gtk+-3.0.0.tar.gz
-      tar xvfj gtk+-3.0.0.tar.bz2
+      tar xvfz gtk+-2.0.0.tar.gz
+      tar xvfj gtk+-2.0.0.tar.bz2
     </programlisting>
     <para>
       In the toplevel of the directory that is created, there will be
@@ -103,7 +103,7 @@ How to compile GTK+ itself
       a search path that <command>pkg-config</command> (see below)
       uses when looking for for file describing how to compile
       programs using different libraries. If you were installing GTK+
-      and it's dependencies into <filename>/opt/gtk</filename>, you
+      and it's dependencies into <filename>/opt/gtk</filename>, you 
       might want to set these variables as:
     </para>
     <programlisting>
@@ -137,134 +137,139 @@ How to compile GTK+ itself
     </para>
     <itemizedlist>
       <listitem>
-        <para>
-          <ulink
-          url="http://pkg-config.freedesktop.org">pkg-config</ulink>
-          is a tool for tracking the compilation flags needed for
-          libraries that are used by the GTK+ libraries. (For each
-          library, a small <literal>.pc</literal> text file is installed
-          in a standard location that contains the compilation flags
-          needed for that library along with version number information.)
-        </para>
+	<para>
+	  <ulink
+	  url="http://www.freedesktop.org/software/pkgconfig">pkg-config</ulink>
+	  is a tool for tracking the compilation flags needed for
+	  libraries that are used by the GTK+ libraries. (For each
+	  library, a small <literal>.pc</literal> text file is installed 
+          in a standard location that contains the compilation flags 
+          needed for that library along with version number information.)  
+          The version of <command>pkg-config</command> needed to build 
+          GTK+ is mirrored in the <filename>dependencies</filename> directory
+	  on the <ulink url="ftp://ftp.gtk.org/pub/gtk/">GTK+ FTP
+	  site.</ulink>
+	</para>
       </listitem>
       <listitem>
-        <para>
-          The GTK+ makefiles will mostly work with different versions
-          of <command>make</command>, however, there tends to be
-          a few incompatibilities, so the GTK+ team recommends
-          installing <ulink url="http://www.gnu.org/software/make">GNU
-            make</ulink> if you don't already have it on your system
-          and using it. (It may be called <command>gmake</command>
-          rather than <command>make</command>.)
-        </para>
+	<para>
+	  The GTK+ makefiles will mostly work with different versions
+	  of <command>make</command>, however, there tends to be
+	  a few incompatibilities, so the GTK+ team recommends
+	  installing <ulink url="http://www.gnu.org/software/make">GNU
+	    make</ulink> if you don't already have it on your system
+	  and using it. (It may be called <command>gmake</command>
+	  rather than <command>make</command>.)
+	</para>
       </listitem>
     </itemizedlist>
     <para>
-      Some of the libraries that GTK+ depends on are maintained by
+      Three of the libraries that GTK+ depends on are maintained by
       by the GTK+ team: GLib, GdkPixbuf, Pango, and ATK. Other libraries
       are maintained separately.
     </para>
     <itemizedlist>
       <listitem>
-        <para>
-          The GLib library provides core non-graphical functionality
-          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>
-        </para>
+	<para>
+	  The GLib library provides core non-graphical functionality
+	  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>
+	</para>
       </listitem>
       <listitem>
-        <para>
-          <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>.
-        </para>
+	<para>
+	  <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>. 
+	</para>
       </listitem>
       <listitem>
-        <para>
-          ATK is the Accessibility Toolkit. It provides a set of generic
-          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>
-        </para>
+	<para>
+	  ATK is the Accessibility Toolkit. It provides a set of generic
+	  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>
+	</para>
       </listitem>
       <listitem>
-        <para>
-          The <ulink url="http://www.gnu.org/software/libiconv/">GNU
-          libiconv library</ulink> is needed to build GLib if your
-          system doesn't have the <function>iconv()</function>
-          function for doing conversion between character
-          encodings. Most modern systems should have
-          <function>iconv()</function>.
-        </para>
+	<para>
+	  The <ulink url="http://www.gnu.org/software/libiconv/">GNU
+	  libiconv library</ulink> is needed to build GLib if your
+	  system doesn't have the <function>iconv()</function>
+	  function for doing conversion between character
+	  encodings. Most modern systems should have
+	  <function>iconv()</function>.
+	</para>
       </listitem>
       <listitem>
-        <para>
-          The libintl library from the <ulink
-          url="http://www.gnu.org/software/gettext/">GNU gettext
-          package</ulink> is needed if your system doesn't have the
-          <function>gettext()</function> functionality for handling
-          message translation databases.
-        </para>
+	<para>
+	  The libintl library from the <ulink
+	  url="http://www.gnu.org/software/gettext/">GNU gettext
+	  package</ulink> is needed if your system doesn't have the
+	  <function>gettext()</function> functionality for handling
+	  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
+	<para>
+	  The <ulink
+	    url="ftp://ftp.uu.net/graphics/jpeg/">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>
+	  <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.6/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
-          Pango and GTK+. You should already have these installed on
-          your system, but it's possible that you'll need to install
-          the development environment for these libraries that your
-          operating system vendor provides.
-        </para>
+	<para>
+	  The libraries from the X window system are needed to build
+	  Pango and GTK+. You should already have these installed on
+	  your system, but it's possible that you'll need to install
+	  the development environment for these libraries that your
+	  operating system vendor provides.
+	</para>
       </listitem>
       <listitem>
-        <para>
-          The <ulink url="http://www.fontconfig.org">fontconfig</ulink>
-          library provides Pango with a standard way of locating
-          fonts and matching them against font names.
-        </para>
+	<para>
+	  The <ulink url="http://www.fontconfig.org">fontconfig</ulink>
+	  library provides Pango with a standard way of locating
+	  fonts and matching them against font names.
+	</para>
       </listitem>
       <listitem>
-        <para>
-          <ulink url="http://www.cairographics.org">Cairo</ulink>
+	<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
           drawing.
         </para>
       </listitem>
       <listitem>
-        <para>
-          <ulink url="http://live.gnome.org/GObjectIntrospection">gobject-introspection</ulink>
+	<para>
+	  <ulink url="http://live.gnome.org/GObjectIntrospection">gobject-introspection</ulink>
           is a framework for making introspection data available to
           language bindings.
         </para>
       </listitem>
       <listitem>
         <para>
-          The <ulink url="http://www.freedesktop.org/wiki/Software/shared-mime-info">shared-mime-info</ulink>
-          package is not a hard dependency of GTK+, but it contains definitions
-          for mime types that are used by GIO and, indirectly, by GTK+.
-          gdk-pixbuf will use GIO for mime type detection if possible. For this
-          to work, shared-mime-info needs to be installed and
-          <envar>XDG_DATA_DIRS</envar> set accordingly at configure time.
+          The <ulink url="http://www.freedesktop.org/wiki/Software/shared-mime-info">shared-mime-info</ulink> 
+          package is not a hard dependency of GTK+, but it contains definitions 
+          for mime types that are used by GIO and, indirectly, by GTK+. 
+          gdk-pixbuf will use GIO for mime type detection if possible. For this 
+          to work, shared-mime-info needs to be installed and 
+          <envar>XDG_DATA_DIRS</envar> set accordingly at configure time. 
           Otherwise, gdk-pixbuf falls back to its built-in mime type detection.
         </para>
       </listitem>
@@ -276,7 +281,7 @@ How to compile GTK+ itself
       First make sure that you have the necessary external
       dependencies installed: <command>pkg-config</command>, GNU make,
       the JPEG, PNG, and TIFF libraries, FreeType, and, if necessary,
-      libiconv and libintl. To get detailed information about building
+      libiconv and libintl. To get detailed information about building 
       these packages, see the documentation provided with the
       individual packages.
       On a Linux system, it's quite likely you'll have all of these
@@ -289,7 +294,7 @@ 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
+	applications</link>. You can test your GTK+ installation
       by running the <command>gtk-demo</command> program that
       GTK+ installs.
     </para>
@@ -310,25 +315,25 @@ How to compile GTK+ itself
       <title>Extra Configuration Options</title>
 
       <para>
-        In addition to the normal options, the
-        <command>configure</command> script for the GTK+ library
-        supports a number of additional arguments. (Command line
-        arguments for the other GTK+ libraries are described in
-        the documentation distributed with the those libraries.)
+	In addition to the normal options, the
+	<command>configure</command> script for the GTK+ library
+	supports a number of additional arguments. (Command line
+	arguments for the other GTK+ libraries are described in
+	the documentation distributed with the those libraries.)
 
-        <cmdsynopsis>
-          <command>configure</command>
+	<cmdsynopsis>
+	  <command>configure</command>
 
-          <group>
-            <arg>--disable-modules</arg>
-            <arg>--enable-modules</arg>
-          </group>
-          <group>
-            <arg>--with-included-immodules=MODULE1,MODULE2,...</arg>
-          </group>
-          <group>
-            <arg>--enable-debug=[no|minimum|yes]</arg>
-          </group>
+	  <group>
+	    <arg>--disable-modules</arg>
+	    <arg>--enable-modules</arg>
+	  </group>
+	  <group>
+	    <arg>--with-included-immodules=MODULE1,MODULE2,...</arg>
+	  </group>
+	  <group>
+	    <arg>--enable-debug=[no|minimum|yes]</arg>
+	  </group>
           <group>
             <arg>--disable-visibility</arg>
             <arg>--enable-visibility</arg>
@@ -337,14 +342,6 @@ How to compile GTK+ itself
             <arg>--disable-shm</arg>
             <arg>--enable-shm</arg>
           </group>
-          <group>
-            <arg>--disable-xim</arg>
-            <arg>--enable-xim</arg>
-          </group>
-          <group>
-            <arg>--disable-xim-inst</arg>
-            <arg>--enable-xim-inst</arg>
-          </group>
           <group>
             <arg>--disable-xkb</arg>
             <arg>--enable-xkb</arg>
@@ -368,56 +365,56 @@ How to compile GTK+ itself
           <group>
             <arg>--with-xinput=[no|yes]</arg>
           </group>
+	  <group>
+	    <arg>--with-gdktarget=[x11|win32|quartz|directfb]</arg>
+	  </group>
           <group>
-            <arg>--with-gdktarget=[x11|win32|quartz|directfb]</arg>
+	    <arg>--disable-introspection</arg>
           </group>
-          <group>
-            <arg>--disable-introspection</arg>
-          </group>
-        </cmdsynopsis>
+	</cmdsynopsis>
       </para>
 
       <formalpara>
-        <title><systemitem>--disable-modules</systemitem> and
-          <systemitem>--enable-modules</systemitem></title>
+	<title><systemitem>--disable-modules</systemitem> and
+	  <systemitem>--enable-modules</systemitem></title>
 
-        <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
-          auto-detect whether shared modules work on your system.
-        </para>
+	<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
+	  auto-detect whether shared modules work on your system.
+	</para>
       </formalpara>
 
       <formalpara>
-        <title><systemitem>--with-included-immodules</systemitem></title>
+	<title><systemitem>--with-included-immodules</systemitem></title>
 
-        <para>
+	<para>
          This option allows you to specify which input method modules you
-         want to include.
-        </para>
+         want to include. 
+	</para>
       </formalpara>
 
       <formalpara>
         <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
+         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>.
+         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
-         even mostly bug-free software by changing the effect of many bugs
-         from simple warnings into fatal crashes. Thus
-         <option>--enable-debug=no</option> should <emphasis>not</emphasis>
+         Note that 'no' is fast, but dangerous as it tends to destabilize 
+         even mostly bug-free software by changing the effect of many bugs 
+         from simple warnings into fatal crashes. Thus 
+         <option>--enable-debug=no</option> should <emphasis>not</emphasis> 
          be used for stable releases of GTK+.
         </para>
       </formalpara>
@@ -429,7 +426,7 @@ How to compile GTK+ itself
           The option <systemitem>--disable-visibility</systemitem>
           turns off the use of ELF visibility attributes for linking
           optimizations. This makes sense while changing GTK+ itself,
-          since the way in which GTK+ uses visibility attributes
+          since the way in which GTK+ uses visibility attributes 
           forces a full rebuild of all source files for any header
           modification.
         </para>
@@ -439,79 +436,55 @@ How to compile GTK+ itself
         <title><systemitem>--enable-explicit-deps</systemitem> and
           <systemitem>--disable-explicit-deps</systemitem></title>
         <para>
-          If <systemitem>--enable-explicit-deps</systemitem> is
-          specified then GTK+ will write the full set of libraries
-          that GTK+ depends upon into its <literal>.pc</literal> files to be used when
-          programs depending on GTK+ are linked. Otherwise, GTK+
-          only will include the GTK+ libraries themselves, and
-          will depend on system library dependency facilities to
-          bring in the other libraries.
-          By default GTK+ will disable explicit dependencies unless
-          it detects that they are needed on the system. (If you
-          specify <systemitem>--enable-static</systemitem> to force
-          building of static libraries, then explicit dependencies
-          will be written since library dependencies don't work
-          for static libraries.) Specifying
-          <systemitem>--enable-explicit-deps</systemitem> or
-          <systemitem>--enable-static</systemitem> can cause
-          compatibility
-          problems when libraries that GTK+ depends upon change
-          their versions, and should be avoided if possible.
+	  If <systemitem>--enable-explicit-deps</systemitem> is
+	  specified then GTK+ will write the full set of libraries
+	  that GTK+ depends upon into its <literal>.pc</literal> files to be used when
+	  programs depending on GTK+ are linked. Otherwise, GTK+
+	  only will include the GTK+ libraries themselves, and
+	  will depend on system library dependency facilities to
+	  bring in the other libraries.
+	  By default GTK+ will disable explicit dependencies unless
+	  it detects that they are needed on the system. (If you
+	  specify <systemitem>--enable-static</systemitem> to force
+	  building of static libraries, then explicit dependencies
+	  will be written since library dependencies don't work
+	  for static libraries.) Specifying
+	  <systemitem>--enable-explicit-deps</systemitem> or
+	  <systemitem>--enable-static</systemitem> can cause
+	  compatibility
+	  problems when libraries that GTK+ depends upon change
+	  their versions, and should be avoided if possible.
         </para>
       </formalpara>
 
       <formalpara>
         <title><systemitem>--disable-shm</systemitem> and
           <systemitem>--enable-shm</systemitem></title>
-
+ 
         <para>
-          These options can be used to control whether GTK+ will use shared
+          These options can be used to control whether GTK+ will use shared 
           memory to communicate with the X server when possible.
           The default is 'yes'.
         </para>
       </formalpara>
 
-      <formalpara>
-        <title><systemitem>--disable-xim</systemitem> and
-          <systemitem>--enable-xim</systemitem></title>
-
-        <para>
-          These options can be used to control whether GTK+ will
-          be compiled with support for XIM. (The X Input Method
-          extension, used for Japanese input.) The default is yes.
-        </para>
-      </formalpara>
-
-      <formalpara>
-        <title><systemitem>--disable-xim-inst</systemitem> and
-          <systemitem>--enable-xim-inst</systemitem></title>
-
-        <para>
-          These options determine whether GTK+ will use the
-          XIM instantiate callback.
-          The default is 'yes', unless the host system is Solaris,
-          where <function>XRegisterIMInstantiateCallback()</function>
-          seems to cause a segfault.
-        </para>
-      </formalpara>
-
       <formalpara>
         <title><systemitem>--disable-xkb</systemitem> and
           <systemitem>--enable-xkb</systemitem></title>
-
+ 
         <para>
-          By default the <command>configure</command> script will try
-          to auto-detect whether the XKB extension is supported by
+	  By default the <command>configure</command> script will try
+	  to auto-detect whether the XKB extension is supported by
           the X libraries GTK+ is linked with.
           These options can be used to explicitly control whether
-          GTK+ will support the XKB extension.
+	  GTK+ will support the XKB extension. 
         </para>
       </formalpara>
 
       <formalpara>
         <title><systemitem>--disable-xinerama</systemitem> and
           <systemitem>--enable-xinerama</systemitem></title>
-
+     
         <para>
           By default the <command>configure</command> script will try
           to link against the Xinerama libraries if they are found.
@@ -521,29 +494,29 @@ How to compile GTK+ itself
       </formalpara>
 
       <formalpara>
-        <title><systemitem>--disable-gtk-doc</systemitem> and
-          <systemitem>--enable-gtk-doc</systemitem></title>
+	<title><systemitem>--disable-gtk-doc</systemitem> and
+	  <systemitem>--enable-gtk-doc</systemitem></title>
 
-        <para>
-          The <application>gtk-doc</application> package is
-          used to generate the reference documentation included
-          with GTK+. By default support for <application>gtk-doc</application>
-          is disabled because it requires various extra dependencies
-          to be installed. If you have
-          <application>gtk-doc</application> installed and
-          are modifying GTK+, you may want to enable
-          <application>gtk-doc</application> support by passing
-          in <systemitem>--enable-gtk-doc</systemitem>. If not
-          enabled, pre-generated HTML files distributed with GTK+
-          will be installed.
-        </para>
+	<para>
+	  The <application>gtk-doc</application> package is
+	  used to generate the reference documentation included
+	  with GTK+. By default support for <application>gtk-doc</application> 
+	  is disabled because it requires various extra dependencies
+	  to be installed. If you have
+	  <application>gtk-doc</application> installed and
+	  are modifying GTK+, you may want to enable
+	  <application>gtk-doc</application> support by passing
+	  in <systemitem>--enable-gtk-doc</systemitem>. If not
+	  enabled, pre-generated HTML files distributed with GTK+
+	  will be installed.
+	</para>
       </formalpara>
 
       <formalpara>
-        <title><systemitem>--disable-cups</systemitem> and
-          <systemitem>--enable-cups</systemitem></title>
+	<title><systemitem>--disable-cups</systemitem> and
+	  <systemitem>--enable-cups</systemitem></title>
 
-        <para>
+	<para>
           By default the <command>configure</command> script will try
           to build the cups print backend if the cups libraries are found.
           These options can be used to explicitly control whether
@@ -551,41 +524,30 @@ How to compile GTK+ itself
         </para>
       </formalpara>
 
-      <formalpara>
-        <title><systemitem>--disable-papi</systemitem> and
-          <systemitem>--enable-papi</systemitem></title>
-
-        <para>
-          By default the <command>configure</command> script will try
-          to build the papi print backend if the papi libraries are found.
-          These options can be used to explicitly control whether
-          the papi print backend should be built.
-        </para>
-      </formalpara>
-
       <formalpara>
         <title><systemitem>--with-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.
+	  Controls whether GTK+ is built with support for the XInput
+	  extension. The XInput extension provides an interface
+	  to extended 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. This is only known to work well on XFree86
+	  systems, though other systems do have this extension.
         </para>
       </formalpara>
       <formalpara>
-        <title><systemitem>--with-gdktarget</systemitem></title>
+	<title><systemitem>--with-gdktarget</systemitem></title>
 
-        <para>
-          Toggles between the supported backends for GDK.
+	<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
+	  case the default is win32. Other supported backends are
           the quartz backend for OS X, and the DirectFB backend
           for the Linux framebuffer.
-        </para>
+	</para>
       </formalpara>
       <formalpara>
         <title><systemitem>--disable-introspection</systemitem></title>

docs/reference/gtk/changes-1.2.sgml

@@ -0,0 +1,464 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gtk-changes-1-2" revision="1 Jan 2002">
+<refmeta>
+<refentrytitle>Changes from 1.0 to 1.2</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>Changes from 1.0 to 1.2</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+<refname>Changes from 1.0 to 1.2</refname>
+<refpurpose>
+Incompatible changes made between version 1.0 and version 1.2
+</refpurpose>
+</refnamediv>
+
+
+<refsect1>
+<title>Incompatible changes from 1.0 to 1.2</title>
+
+<itemizedlist>
+
+<listitem>
+<para>
+<structname>GtkAcceleratorTable</structname> has been replaced with 
+<structname>GtkAccelGroup</structname>.
+</para>
+</listitem>
+
+<listitem>
+<para>
+<structname>GtkMenuFactory</structname> has been replaced with 
+<structname>GtkItemFactory</structname>, although
+a version of <structname>GtkMenuFactory</structname> is currently still 
+provided to ease the migration phase.
+</para>
+</listitem>
+
+<listitem>
+<para>
+The <structname>GtkTypeInfo</structname> structures used in the 
+<function>gtk_*_type_init()</function> functions have
+changed a bit, the old format:
+<programlisting>
+      GtkTypeInfo bin_info =
+      {
+        "GtkBin",
+        sizeof (GtkBin),
+        sizeof (GtkBinClass),
+        (GtkClassInitFunc) gtk_bin_class_init,
+        (GtkObjectInitFunc) gtk_bin_init,
+        (GtkArgSetFunc) NULL,
+        (GtkArgGetFunc) NULL,
+      };
+</programlisting>
+
+  needs to be converted to:
+
+<programlisting>
+      static const GtkTypeInfo bin_info =
+      {
+        "GtkBin",
+        sizeof (GtkBin),
+        sizeof (GtkBinClass),
+        (GtkClassInitFunc) gtk_bin_class_init,
+        (GtkObjectInitFunc) gtk_bin_init,
+        /* reserved_1 */ NULL,
+        /* reserved_2 */ NULL,
+        (GtkClassInitFunc) NULL,
+      };
+</programlisting>
+
+  the <function>GtkArgSetFunc</function> and <function>GtkArgGetFunc</function>
+  functions are not supported from the type system anymore, and you should make
+  sure that your code only fills in these fields with <literal>NULL</literal> 
+  and doesn't use the deprecated function typedefs 
+  <literal>(GtkArgSetFunc)</literal> and <literal>(GtkArgGetFunc)</literal> 
+  anymore.
+</para>
+</listitem>
+
+<listitem>
+<para>
+A number of GTK+ functions were renamed. For compatibility, 
+  <filename>gtkcompat.h</filename> #define's the old 1.0.x function names in 
+  terms of the new names. To assure your GTK+ program doesn't rely on outdated
+  function variants, compile your program with 
+  <option>-DGTK_DISABLE_COMPAT_H</option> to disable
+  the compatibility aliases.
+
+  Here is the list of the old names and replacements:
+
+<informaltable>
+<tgroup cols="2">
+<thead>
+<row><entry>Old</entry><entry>Replacement</entry></row>
+</thead>
+<tbody>
+<row><entry><function>gtk_accel_label_accelerator_width</function></entry><entry><function>gtk_accel_label_get_accel_width</function></entry></row>
+<row><entry><function>gtk_check_menu_item_set_state</function></entry><entry><function>gtk_check_menu_item_set_active</function></entry></row>
+<row><entry><function>gtk_container_border_width</function></entry><entry><function>gtk_container_set_border_width</function></entry></row>
+<row><entry><function>gtk_label_set</function></entry><entry><function>gtk_label_set_text</function></entry></row>
+<row><entry><function>gtk_notebook_current_page</function></entry><entry><function>gtk_notebook_get_current_page</function></entry></row>
+<row><entry><function>gtk_packer_configure</function></entry><entry><function>gtk_packer_set_child_packing</function></entry></row>
+<row><entry><function>gtk_paned_gutter_size</function></entry><entry><function>gtk_paned_set_gutter_size</function></entry></row>
+<row><entry><function>gtk_paned_handle_size</function></entry><entry><function>gtk_paned_set_handle_size</function></entry></row>
+<row><entry><function>gtk_scale_value_width</function></entry><entry><function>gtk_scale_get_value_width</function></entry></row>
+<row><entry><function>gtk_style_apply_default_pixmap</function></entry><entry><function>gtk_style_apply_default_background</function></entry></row>
+<row><entry><function>gtk_toggle_button_set_state</function></entry><entry><function>gtk_toggle_button_set_active</function></entry></row>
+<row><entry><function>gtk_window_position</function></entry><entry><function>gtk_window_set_position</function></entry></row>
+</tbody>
+</tgroup>
+</informaltable> 
+Note that <function>gtk_style_apply_default_background()</function> has an 
+      additional argument, <literal>set_bg</literal>. This parameter should be 
+      <literal>FALSE</literal> if the background is being set for a 
+      <literal>NO_WINDOW</literal> widget, otherwise <literal>TRUE</literal>.
+</para>
+</listitem>
+
+<listitem>
+<para>
+During the development phase of the 1.1.x line of GTK+ certain functions
+  were deprecated and later removed. Functions affected are:
+
+<informaltable>
+<tgroup cols="2">
+<thead>
+<row><entry>Removed</entry><entry>Replacement</entry></row>
+</thead>
+<tbody>
+<row><entry><function>gtk_clist_set_border</function></entry><entry><function>gtk_clist_set_shadow_type</function></entry></row>
+<row><entry><function>gtk_container_block_resize</function></entry><entry><function>gtk_container_set_resize_mode</function></entry></row>
+<row><entry><function>gtk_container_unblock_resize</function></entry><entry><function>gtk_container_set_resize_mode</function></entry></row>
+<row><entry><function>gtk_container_need_resize</function></entry><entry><function>gtk_container_check_resize</function></entry></row>
+<row><entry><function>gtk_ctree_show_stub</function></entry><entry><function>gtk_ctree_set_show_stub</function></entry></row>
+<row><entry><function>gtk_ctree_set_reorderable</function></entry><entry><function>gtk_clist_set_reorderable</function></entry></row>
+<row><entry><function>gtk_ctree_set_use_drag_icons</function></entry><entry><function>gtk_clist_set_use_drag_icons</function></entry></row>
+<row><entry><function>gtk_entry_adjust_scroll</function></entry><entry><function>-</function></entry></row>
+<row><entry><function>gtk_object_class_add_user_signal</function></entry><entry><function>gtk_object_class_user_signal_new</function></entry></row>
+<row><entry><function>gtk_preview_put_row</function></entry><entry><function>gtk_preview_put</function></entry></row>
+<row><entry><function>gtk_progress_bar_construct</function></entry><entry><function>gtk_progress_set_adjustment</function></entry></row>
+<row><entry><function>gtk_scrolled_window_construct</function></entry><entry><function>gtk_scrolled_window_set_{h|v}adjustment</function></entry></row>
+<row><entry><function>gtk_spin_button_construct</function></entry><entry><function>gtk_spin_button_configure</function></entry></row>
+<row><entry><function>gtk_widget_thaw_accelerators</function></entry><entry><function>gtk_widget_unlock_accelerators</function></entry></row>
+<row><entry><function>gtk_widget_freeze_accelerators</function></entry><entry><function>gtk_widget_lock_accelerators</function></entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+
+Note that <function>gtk_entry_adjust_scroll()</function> is no longer needed 
+    as <structname>GtkEntry</structname> should automatically keep the scroll 
+    adjusted properly.
+</para>
+</listitem>
+
+
+<listitem>
+<para>
+Additionally, all <function>gtk_*_interp()</function> functions were removed.
+  <function>gtk_*_full()</function> versions were provided as of GTK+ 1.0 and 
+  should be used instead.
+</para>
+</listitem>
+
+<listitem>
+<para>
+<structname>GtkButton</structname> has been changed to derive from 
+<structname>GtkBin</structname>.
+  To access a button's child, use <literal>GTK_BIN (button)-&gt;child</literal>,
+  instead of the old <literal>GTK_BUTTON (button)-&gt;child</literal>.
+</para>
+</listitem>
+
+<listitem>
+<para>
+The selection API has been slightly modified:
+
+ <function>gtk_selection_add_handler()</function> and 
+ <function>gtk_selection_add_handler_full()</function> 
+ have been removed. To supply the selection, one now registers
+ the targets one is interested in with:
+
+<programlisting>
+  void gtk_selection_add_target (GtkWidget           *widget, 
+	  	                 GdkAtom              selection,
+			         GdkAtom              target,
+			         guint                info);
+</programlisting>
+
+ or:
+  
+<programlisting>
+  void gtk_selection_add_targets (GtkWidget           *widget, 
+	  			  GdkAtom              selection,
+				  GtkTargetEntry      *targets,
+				  guint                ntargets);
+</programlisting>
+
+ When a request for a selection is received, the new "selection_get"
+ signal will be called:
+
+<programlisting>
+   void  "selection_get"           (GtkWidget          *widget,
+				    GtkSelectionData   *selection_data,
+				    guint               info,
+				    guint               time);
+</programlisting>
+
+ A "time" parameter has also been added to the "selection_received"
+ signal.
+
+<programlisting>
+  void  "selection_received"       (GtkWidget          *widget,
+				    GtkSelectionData   *selection_data,
+				    guint               time);
+</programlisting>
+</para>
+</listitem>
+
+<listitem>
+<para>
+The old drag and drop API has been completely removed and replaced.
+  See the reference documentation for details on the new API.
+</para>
+</listitem>
+
+<listitem>
+<para>
+Support for Themes has been added. In general, this does
+  not affect application code, however, a few new rules should
+  be observed:
+
+  <itemizedlist>
+  <listitem>
+  <para>To set a shape for a window, you must use 
+     <function>gtk_widget_shape_combine_mask()</function> instead of 
+     <function>gdk_window_shape_combine_mask()</function>, or the shape will be
+     reset when switching themes.
+  </para>
+  </listitem>
+
+  <listitem>
+  <para>It is no longer permissable to draw directly on an arbitrary
+     widget, or to set an arbitrary widget's background pixmap.
+     If you need to do that, use a <structname>GtkDrawingArea</structname> or 
+     (for a toplevel) a <structname>GtkWindow</structname> where 
+     <function>gtk_widget_set_app_paintable()</function>
+     has been called.
+  </para>
+  </listitem>
+  </itemizedlist>
+</para>
+</listitem>
+
+<listitem>
+<para>
+The <structname>GtkScrolledWindow</structname> widget no longer creates a 
+  <structname>GtkViewport</structname> automatically. Instead, it has been 
+  generalized to accept any "self-scrolling" widget.
+</para>
+
+<para>
+  The self-scrolling widgets in the GTK+ core are 
+  <structname>GtkViewport</structname>,
+  <structname>GtkCList</structname>, <structname>GtkCTree</structname>, 
+  <structname>GtkText</structname>, and <structname>GtkLayout</structname>. 
+  All of these widgets can be added to a scrolled window as normal children with
+  <function>gtk_container_add()</function> and scrollbars will be set up 
+  automatically.
+</para>
+
+<para>
+  To add scrollbars to a non self-scrolling widget, (such as a 
+  <structname>GtkList</structname>),
+  first add it to a viewport, then add the viewport to a scrolled window.
+  The scrolled window code provides a convenience function to do this:
+
+<programlisting>
+  void gtk_scrolled_window_add_with_viewport (GtkScrolledWindow *scrollwin,
+					      GtkWidget         *child);
+</programlisting>
+
+  This does exactly what it says - it creates a viewport, adds the child
+  widget to it, then adds the viewport to the scrolled window.
+</para>
+
+<para>
+  The scrollbars have been removed from the <structname>GtkCList</structname>
+  and <structname>GtkCTree</structname>, because they are now scrolled by simply
+  adding them to a scrolled window. The scrollbar policy is set on the scrolled
+  window with <function>gtk_scrolled_window_set_policy()</function> and not on 
+  the child widgets (e.g. <structname>GtkCList</structname>'s 
+  <function>gtk_clist_set_policy()</function> was removed).
+</para>
+</listitem>  
+
+<listitem>
+<para>
+The "main loop" of GTK+ has been moved to GLib. This should not
+  affect existing programs, since compatibility functions have
+  been provided. However, you may want to consider migrating
+  your code to use the GLib main loop directly.
+</para>
+</listitem>
+
+<listitem>
+<para>
+the <literal>GTK_BASIC</literal> flag was removed, and with it the corresponding
+  macro and function <function>GTK_WIDGET_BASIC()</function> and 
+  <function>gtk_widget_basic()</function>.
+</para>
+</listitem>
+  
+<listitem>
+<para>
+All freeze/thaw methods are now recursive - that is, if you
+  freeze a widget n times, you must also thaw it n times.
+
+  Therefore, if you have code like:
+
+<informalexample><programlisting>
+  gboolean frozen;
+  frozen = GTK_CLIST_FROZEN (clist);
+  gtk_clist_freeze (clist);
+  [...]
+  if (!frozen)
+    gtk_clist_thaw (clist);
+</programlisting></informalexample>
+
+  it will not work anymore. It must be, simply:
+
+<informalexample><programlisting>
+  gtk_clist_freeze (clist);
+  [...]
+  gtk_clist_thaw (clist);
+</programlisting></informalexample>
+</para>
+</listitem>
+
+<listitem>
+<para>
+The thread safety in GTK+ 1.2 is slightly different than
+  that which appeared in early versions in the 1.1
+  development track. The main difference is that it relies on 
+  the thread primitives in GLib, and on the thread-safe 
+  GLib main loop.
+</para>
+
+<para>
+  This means:
+
+<itemizedlist>
+   <listitem>
+     <para>You must call <function>g_thread_init()</function> before 
+       executing any other GTK+ or GDK functions in a threaded GTK+ program.
+     </para>
+   </listitem>
+
+   <listitem>
+     <para>Idles, timeouts, and input functions are executed outside 
+       of the main GTK+ lock. So, if you need to call GTK+ 
+       inside of such a callback, you must surround the callback
+       with a <function>gdk_threads_enter()</function>/<function>gdk_threads_leave()</function> 
+       pair.
+     </para>
+
+     <para>However, signals are still executed within the main
+       GTK+ lock.
+     </para>
+
+     <para>In particular, this means, if you are writing widgets
+       that might be used in threaded programs, you <emphasis>must</emphasis>
+       surround timeouts and idle functions in this matter.
+     </para>
+     
+     <para>As always, you must also surround any calls to GTK+
+       not made within a signal handler with a 
+       <function>gdk_threads_enter()</function>/<function>gdk_threads_leave()</function> 
+       pair.
+     </para>
+   </listitem>
+
+   <listitem>
+     <para>There is no longer a special <option>--with-threads</option> 
+       <command>configure</command> option for GTK+. To use threads in a GTK+ 
+       program, you must:
+
+       <orderedlist>
+         <listitem>
+           <para>If you want to use the native thread implementation,
+              make sure GLib found this in configuration, otherwise,
+              call you must provide a thread implementation to
+	      <function>g_thread_init()</function>.
+           </para>
+         </listitem>
+         <listitem>
+           <para>Link with the libraries returned by
+             <command>gtk-config --libs gthread</command>
+             and use the cflags from
+             <command>gtk-config --cflags gthread</command>.
+             You can get these <envar>CFLAGS</envar> and <envar>LIBS</envar> by 
+             passing <literal>gthread</literal> as the fourth parameter to the 
+             <literal>AM_PATH_GTK</literal> <application>automake</application>
+             macro.
+           </para>
+         </listitem>
+       </orderedlist>
+     </para>
+   </listitem>
+  </itemizedlist>
+</para>
+</listitem>
+
+<listitem>
+<para>
+Prior to GTK+ 1.2, there were two conflicting interpretations
+  of <literal>widget->requisition</literal>. It was either taken to be
+  the size that the widget requested, or that size modified by calls to 
+  <function>gtk_widget_set_usize()</function>. In GTK+ 1.2,
+  it is always interpreted the first way.
+</para>
+
+<para>
+  Container widgets are affected in two ways by this:
+
+  <orderedlist>
+    <listitem>
+      <para>Container widgets should not pass 
+        <literal>widget->requisition</literal> as the second parameter to 
+        <function>gtk_widget_size_request()</function>.
+        Instead they should call it like:
+        <programlisting>
+          GtkRequisition child_requisition;
+          gtk_widget_size_request (widget, &amp;child_requisition);
+        </programlisting>
+      </para>
+    </listitem>
+    <listitem>
+      <para>Container widgets should not access 
+        <literal>child->requisition</literal> directly. Either they should use 
+        the values returned by <function>gtk_widget_size_request()</function>, 
+        or they should call the new function:
+        <programlisting>
+    void gtk_widget_get_child_requisition (GtkWidget      *widget,
+					   GtkRequisition *requisition);
+        </programlisting>
+        which returns the requisition of the given widget, modified
+        by calls to <function>gtk_widget_set_usize()</function>.
+      </para>
+    </listitem>
+  </orderedlist>
+</para>
+</listitem>
+
+
+</itemizedlist>
+
+</refsect1>
+
+</refentry>
+

docs/reference/gtk/compiling.sgml

@@ -20,58 +20,51 @@ How to compile your GTK+ application
 <title>Compiling GTK+ Applications on UNIX</title>
 
 <para>
-To compile a GTK+ application, you need to tell the compiler where to
+To compile a GTK+ application, you need to tell the compiler where to 
 find the GTK+ header files and libraries. This is done with the
 <literal>pkg-config</literal> utility.
 </para>
 <para>
 The following interactive shell session demonstrates how
-<literal>pkg-config</literal> is used (the actual output on
+<literal>pkg-config</literal> is used (the actual output on 
 your system may be different):
 <programlisting>
-$ 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
+$ pkg-config --cflags gtk+-2.0
+ -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/atk-1.0  
+$ pkg-config --libs gtk+-2.0
+ -L/usr/lib -L/usr/X11R6/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -lXi -lgdk_pixbuf-2.0 -lm -lpangox -lpangoxft -lXft -lXrender -lXext -lX11 -lfreetype -lpango -latk -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
 </programlisting>
 </para>
 <para>
 The simplest way to compile a program is to use the "backticks"
 feature of the shell. If you enclose a command in backticks
 (<emphasis>not single quotes</emphasis>), then its output will be
-substituted into the command line before execution. So to compile
+substituted into the command line before execution. So to compile 
 a GTK+ Hello, World, you would type the following:
 <programlisting>
-$ cc `pkg-config --cflags --libs gtk+-3.0` hello.c -o hello
+$ cc `pkg-config --cflags --libs gtk+-2.0` hello.c -o hello
 </programlisting>
 </para>
 
 <para>
-If you want to make sure that your program doesn't use any deprecated
+If you want to make sure that your program doesn't use any deprecated 
 functions, you can define the preprocessor symbol GTK_DISABLE_DEPRECATED
 by using the command line option <literal>-DGTK_DISABLE_DEPRECATED=1</literal>.
-There are similar symbols GDK_DISABLE_DEPRECATED,
+There are similar symbols GDK_DISABLE_DEPRECATED, 
 GDK_PIXBUF_DISABLE_DEPRECATED and G_DISABLE_DEPRECATED for GDK, GdkPixbuf and
-GLib.
+GLib. 
 </para>
 
 <para>
-If you want to make sure that your program doesn't use any functions which
+If you want to make sure that your program doesn't use any functions which 
 may be problematic in a multihead setting, you can define the preprocessor
-symbol GDK_MULTIHEAD_SAFE by using the command line option
+symbol GDK_MULTIHEAD_SAFE by using the command line option 
 <literal>-DGTK_MULTIHEAD_SAFE=1</literal>.
 </para>
 
-<para>
-Similarly, if you want to make sure that your program doesn't use any
-functions which may be problematic in a multidevice setting, you can
-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>,
+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
@@ -88,5 +81,14 @@ The same for <filename>gtkunixprint.h</filename> if you use the non-portable
 <link linkend="GtkPrintUnixDialog">GtkPrintUnixDialog</link> API.
 </para>
 
+<para>
+The next major version, GTK+ 3,  will remove many implementation details and
+struct members from its public headers. To ensure that your application will
+not have problems with this, you can define the preprocessor symbol
+GSEAL_ENABLE. 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.
+</para>
+
 </refsect1>
 </refentry>

docs/reference/gtk/glossary.xml

@@ -232,7 +232,7 @@
       <para>
 	Widgets that don't own the GdkWindow on which they draw are
 	called <glossterm linkend="no-window">no-window widgets</glossterm>.  
-        This can be tested with the gtk_widget_get_has_window() function.  Normally,
+        This can be tested with the GTK_WIDGET_NO_WINDOW() macro.  Normally, 
         these widgets draw on their parent's GdkWindow.
       </para>
 

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

@@ -1,19 +1,20 @@
 <refentry id="gtk-builder-convert">
 
 <refmeta>
-<refentrytitle>gtk-builder-convert-3.0</refentrytitle>
+<refentrytitle>gtk-builder-convert</refentrytitle>
 <manvolnum>1</manvolnum>
 </refmeta>
 
 <refnamediv>
-<refname>gtk-builder-convert-3.0</refname>
+<refname>gtk-builder-convert</refname>
 <refpurpose>Glade file conversion utility</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>gtk-builder-convert-3.0</command>
+<command>gtk-builder-convert</command>
 <arg choice="opt">--skip-windows</arg>
+<arg choice="opt">--target-version <replaceable>version</replaceable></arg>
 <arg choice="opt">--root <replaceable>name</replaceable></arg>
 <arg choice="req">input</arg>
 <arg choice="req">output</arg>
@@ -21,7 +22,7 @@
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
-<para><command>gtk-builder-convert-3.0</command> converts glade files
+<para><command>gtk-builder-convert</command> converts glade files
 into XML files which can be loaded with GtkBuilder.
 </para>
 <para>
@@ -37,6 +38,16 @@ its output the file specified as the second argument.
     <term>-w</term>
     <listitem><para>Convert everything but GtkWindow subclasses.</para></listitem>
   </varlistentry>
+  <varlistentry>
+    <term>--target-version</term>
+    <term>-t</term>
+    <listitem>
+      <para>
+        Some widgets and properties are different between GTK+ versions 2.0 and
+        3.0, so this option allows to set the desired GTK+ target version.
+      </para>
+    </listitem>
+  </varlistentry>
   <varlistentry>
     <term>--root</term>
     <term>-r</term>

docs/reference/gtk/gtk-docs.sgml

@@ -7,11 +7,14 @@
 <!--ENTITY index-Objects-Grouped SYSTEM "objects_grouped.sgml"-->
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
-    <title>GTK+ Reference Manual</title>
+    <title>GTK+ 2 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+ 2 library; the latest versions can be found online at
+      <ulink role="online-location"
+      url="http://library.gnome.org/devel/gtk/">http://library.gnome.org/devel/gtk</ulink>.
+      If you're looking for the newer GTK+ 3 series of libraries,
+      see <ulink role="online-location"
+      url="http://library.gnome.org/devel/gtk3/">http://library.gnome.org/devel/gtk3/</ulink>.
     </releaseinfo>
   </bookinfo>
 
@@ -41,33 +44,11 @@ string utilities, file utilities, a main loop abstraction, and so on.
 </para></listitem>
 </varlistentry>
 
-<varlistentry>
-<term>GObject</term>
-<listitem><para>A library that provides a type system, a collection of
-fundamental types including an object type, a signal system.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>GIO</term>
-<listitem><para>A modern, easy-to-use VFS API including abstractions for
-files, drives, volumes, stream IO, as well as network programming and
-DBus communication.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>cairo</term>
-<listitem><para>Cairo is a 2D graphics library with support for multiple
-output devices.
-</para></listitem>
-</varlistentry>
-
 <varlistentry>
 <term>Pango</term>
 <listitem><para>
 Pango is a library for internationalized text handling. It centers
-around the #PangoLayout object, representing a paragraph of text.
+around the #PangoLayout object, representing a paragraph of text. 
 Pango provides the engine for #GtkTextView, #GtkLabel, #GtkEntry, and
 other widgets that display text.
 </para></listitem>
@@ -89,7 +70,7 @@ framework.
 <term>GdkPixbuf</term>
 <listitem><para>
 This is a small library which allows you to create #GdkPixbuf
-("pixel buffer") objects from image data or image files.
+("pixel buffer") objects from image data or image files. 
 Use a #GdkPixbuf in combination with #GtkImage to display images.
 </para></listitem>
 </varlistentry>
@@ -106,7 +87,7 @@ on X11, Windows, and the Linux framebuffer device.
 <varlistentry>
 <term>GTK+</term>
 <listitem><para>
-The GTK+ library itself contains <firstterm>widgets</firstterm>,
+The GTK+ library itself contains <firstterm>widgets</firstterm>, 
 that is, GUI components such as #GtkButton or #GtkTextView.
 </para></listitem>
 </varlistentry>
@@ -144,6 +125,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
     <xi:include href="xml/gtkstyle.xml" />
     <xi:include href="xml/gtkselection.xml" />
     <xi:include href="xml/gtkfeatures.xml" />
+    <xi:include href="xml/gtksignal.xml" />
     <xi:include href="xml/gtktypeutils.xml" />
     <xi:include href="xml/gtktesting.xml" />
     <xi:include href="xml/filesystem.xml" />
@@ -202,7 +184,6 @@ that is, GUI components such as #GtkButton or #GtkTextView.
       <xi:include href="xml/gtkentry.xml" />
       <xi:include href="xml/gtkentrybuffer.xml" />
       <xi:include href="xml/gtkentrycompletion.xml" />
-      <xi:include href="xml/gtkscale.xml" />
       <xi:include href="xml/gtkhscale.xml" />
       <xi:include href="xml/gtkvscale.xml" />
       <xi:include href="xml/gtkspinbutton.xml" />
@@ -251,6 +232,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
     <chapter id="MenusAndCombos">
       <title>Menus, Combo Box, Toolbar</title>
       <xi:include href="xml/gtkcombobox.xml" />
+      <xi:include href="xml/gtkcomboboxtext.xml" />
       <xi:include href="xml/gtkcomboboxentry.xml" />
       <xi:include href="xml/gtkmenu.xml" />
       <xi:include href="xml/gtkmenubar.xml" />
@@ -297,20 +279,18 @@ that is, GUI components such as #GtkButton or #GtkTextView.
       <xi:include href="xml/gtkfontbutton.xml" />
       <xi:include href="xml/gtkfontsel.xml" />
       <xi:include href="xml/gtkfontseldlg.xml" />
+      <xi:include href="xml/gtkinputdialog.xml" />
     </chapter>
     
     <chapter id="LayoutContainers">
       <title>Layout Containers</title>
       <xi:include href="xml/gtkalignment.xml" />
       <xi:include href="xml/gtkaspectframe.xml" />
-      <xi:include href="xml/gtkbox.xml" />
       <xi:include href="xml/gtkhbox.xml" />
       <xi:include href="xml/gtkvbox.xml" />
-      <xi:include href="xml/gtkbbox.xml" />
       <xi:include href="xml/gtkhbbox.xml" />
       <xi:include href="xml/gtkvbbox.xml" />
       <xi:include href="xml/gtkfixed.xml" />
-      <xi:include href="xml/gtkpaned.xml" />
       <xi:include href="xml/gtkhpaned.xml" />
       <xi:include href="xml/gtkvpaned.xml" />
       <xi:include href="xml/gtklayout.xml" />
@@ -318,20 +298,17 @@ that is, GUI components such as #GtkButton or #GtkTextView.
       <xi:include href="xml/gtktable.xml" />
       <xi:include href="xml/gtkexpander.xml" />
       <xi:include href="xml/gtkorientable.xml" />
-      <xi:include href="xml/gtksizerequest.xml" />
     </chapter>
 
     <chapter id="Ornaments">
       <title>Ornaments</title>
       <xi:include href="xml/gtkframe.xml" />
-      <xi:include href="xml/gtkseparator.xml" />
       <xi:include href="xml/gtkhseparator.xml" />
       <xi:include href="xml/gtkvseparator.xml" />
     </chapter>
 
     <chapter id="ScrollingWidgets">
       <title>Scrolling</title>
-      <xi:include href="xml/gtkscrollbar.xml" />
       <xi:include href="xml/gtkhscrollbar.xml" />
       <xi:include href="xml/gtkvscrollbar.xml" />
       <xi:include href="xml/gtkscrolledwindow.xml" />
@@ -369,12 +346,18 @@ that is, GUI components such as #GtkButton or #GtkTextView.
     <chapter id="AbstractObjects">
       <title>Abstract Base Classes</title>
       <xi:include href="xml/gtkbin.xml" />
+      <xi:include href="xml/gtkbox.xml" />
+      <xi:include href="xml/gtkbbox.xml" />
       <xi:include href="xml/gtkcontainer.xml" />
       <xi:include href="xml/gtkitem.xml" />
       <xi:include href="xml/gtkmenushell.xml" />
       <xi:include href="xml/gtkmisc.xml" />
       <xi:include href="xml/gtkobject.xml" />
+      <xi:include href="xml/gtkpaned.xml" />
       <xi:include href="xml/gtkrange.xml" />
+      <xi:include href="xml/gtkscale.xml" />
+      <xi:include href="xml/gtkscrollbar.xml" />
+      <xi:include href="xml/gtkseparator.xml" />
       <xi:include href="xml/gtkwidget.xml" />
       <xi:include href="xml/gtkimcontext.xml" />
     </chapter>
@@ -387,6 +370,8 @@ that is, GUI components such as #GtkButton or #GtkTextView.
 
     <chapter id="SpecialObjects">
       <title>Special-purpose features</title>
+      <xi:include href="xml/gtkcurve.xml" />
+      <xi:include href="xml/gtkgamma.xml" />
       <xi:include href="xml/gtkruler.xml" />
       <xi:include href="xml/gtkhruler.xml" />
       <xi:include href="xml/gtkvruler.xml" />
@@ -408,9 +393,25 @@ that is, GUI components such as #GtkButton or #GtkTextView.
       <xi:include href="xml/gtkbuilder.xml" />
     </chapter>
 
-    <chapter id="Application">
-      <title>Application support</title>
-      <xi:include href="xml/gtkapplication.xml" />
+    <chapter id="DeprecatedObjects">
+      <title>Deprecated</title>
+      <xi:include href="xml/gtkclist.xml" />
+      <xi:include href="xml/gtkctree.xml" />
+      <xi:include href="xml/gtkcombo.xml" />
+      <xi:include href="xml/gtkfilesel.xml" />
+      <xi:include href="xml/gtkitemfactory.xml" />
+      <xi:include href="xml/gtklist.xml" />
+      <xi:include href="xml/gtklistitem.xml" />
+      <xi:include href="xml/gtkoldeditable.xml" />
+      <xi:include href="xml/gtkoptionmenu.xml" />
+      <xi:include href="xml/gtkpixmap.xml" />
+      <xi:include href="xml/gtkpreview.xml" />
+      <xi:include href="xml/gtkprogress.xml" />
+      <xi:include href="xml/gtktext.xml" />
+      <xi:include href="xml/gtktooltips.xml" />
+      <xi:include href="xml/gtktipsquery.xml" />
+      <xi:include href="xml/gtktree.xml" />
+      <xi:include href="xml/gtktreeitem.xml" />
     </chapter>
   </part>
 
@@ -419,8 +420,8 @@ that is, GUI components such as #GtkButton or #GtkTextView.
 
     <partintro>
       <para>
-        This part describes what you need to change in programs use
-        older versions of GTK+ so that they can use the new features.
+	This part describes what you need to change in programs use
+	older versions of GTK+ so that they can use the new features.
         It also mentions how to convert applications using widgets
         found in the libgnomeui library to use their counterparts
         in GTK+.
@@ -428,14 +429,29 @@ that is, GUI components such as #GtkButton or #GtkTextView.
     </partintro>
 
     <xi:include href="xml/migrating-checklist.sgml" />
-    <xi:include href="migrating-2to3.xml" />
+    <xi:include href="changes-1.2.sgml" />
+    <xi:include href="changes-2.0.sgml" />
+    <xi:include href="xml/migrating-GtkFileChooser.sgml" />
+    <xi:include href="xml/migrating-GtkAction.sgml" />
+    <xi:include href="xml/migrating-GtkComboBox.sgml" />
+    <xi:include href="xml/migrating-GtkIconView.sgml" />
+    <xi:include href="xml/migrating-GtkAboutDialog.sgml" />
+    <xi:include href="xml/migrating-GtkColorButton.sgml" />
+    <xi:include href="xml/migrating-GtkAssistant.sgml" />
+    <xi:include href="xml/migrating-GtkRecentChooser.sgml" />
+    <xi:include href="xml/migrating-GtkLinkButton.sgml" />
+    <xi:include href="xml/migrating-GtkBuilder.sgml" />
+    <xi:include href="xml/migrating-GtkTooltip.sgml" />
+    <xi:include href="xml/migrating-GtkEntry-icons.sgml" />
+    <xi:include href="xml/migrating-GtkLabel-links.sgml" />
+    <xi:include href="xml/migrating-ClientSideWindows.sgml" />
   </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-query-immodules-2.0.xml" />
+    <xi:include href="gtk-update-icon-cache.xml" />
+    <xi:include href="gtk-builder-convert.xml" />
   </part>
 
   <xi:include href="glossary.xml" />
@@ -448,9 +464,53 @@ that is, GUI components such as #GtkButton or #GtkTextView.
     <title>Index of deprecated symbols</title>
     <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
   </index>
-  <index id="api-index-3-0" role="3.0">
-    <title>Index of new symbols in 3.0</title>
-    <xi:include href="xml/api-index-3.0.xml"><xi:fallback /></xi:include>
+  <index id="api-index-2-2" role="2.2">
+    <title>Index of new symbols in 2.2</title>
+    <xi:include href="xml/api-index-2.2.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-4" role="2.4">
+    <title>Index of new symbols in 2.4</title>
+    <xi:include href="xml/api-index-2.4.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-6" role="2.6">
+    <title>Index of new symbols in 2.6</title>
+    <xi:include href="xml/api-index-2.6.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-8" role="2.8">
+    <title>Index of new symbols in 2.8</title>
+    <xi:include href="xml/api-index-2.8.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-10" role="2.10">
+    <title>Index of new symbols in 2.10</title>
+    <xi:include href="xml/api-index-2.10.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-12" role="2.12">
+    <title>Index of new symbols in 2.12</title>
+    <xi:include href="xml/api-index-2.12.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-14" role="2.14">
+    <title>Index of new symbols in 2.14</title>
+    <xi:include href="xml/api-index-2.14.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-16" role="2.16">
+    <title>Index of new symbols in 2.16</title>
+    <xi:include href="xml/api-index-2.16.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-18" role="2.18">
+    <title>Index of new symbols in 2.18</title>
+    <xi:include href="xml/api-index-2.18.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-20" role="2.20">
+    <title>Index of new symbols in 2.20</title>
+    <xi:include href="xml/api-index-2.20.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-22" role="2.22">
+    <title>Index of new symbols in 2.22</title>
+    <xi:include href="xml/api-index-2.22.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-24" role="2.24">
+    <title>Index of new symbols in 2.24</title>
+    <xi:include href="xml/api-index-2.24.xml"><xi:fallback /></xi:include>
   </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>

docs/reference/gtk/gtk-overrides.txt

@@ -0,0 +1,15 @@
+# These are manually-edited to override or add declarations to those scanned
+# from the GTK header files.
+
+# GtkAllocation is the same as GtkRectangle
+
+<STRUCT>
+<NAME>GtkAllocation</NAME>
+struct GtkAllocation
+{
+  gint x;
+  gint y;
+  gint width;
+  gint height;
+};
+</STRUCT>

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

@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gtk-query-immodules-2.0">
+
+<refmeta>
+<refentrytitle>gtk-query-immodules-2.0</refentrytitle>
+<manvolnum>1</manvolnum>
+</refmeta>
+
+<refnamediv>
+<refname>gtk-query-immodules-2.0</refname>
+<refpurpose>Input method module registration utility</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gtk-query-immodules-2.0</command>
+<arg choice="opt" rep="repeat">module</arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+<command>gtk-query-immodules-2.0</command> collects information about loadable 
+input method modules for GTK+ and writes it to <filename>stdout</filename>. 
+</para>
+<para>
+If called without arguments, it looks for modules in the GTK+ input method 
+module path.  
+</para>
+<para>
+If called with arguments, it looks for the specified modules. The arguments
+may be absolute or relative paths.
+</para>
+</refsect1>
+
+<refsect1><title>Environment</title>
+<para>
+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>
+
+<refsect1><title>Bugs</title>
+<para>
+None known yet.
+</para>
+</refsect1>
+
+</refentry>
+
+

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

@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<refentry id="gtk-query-immodules">
-
-<refmeta>
-<refentrytitle>gtk-query-immodules-3.0</refentrytitle>
-<manvolnum>1</manvolnum>
-</refmeta>
-
-<refnamediv>
-<refname>gtk-query-immodules-3.0</refname>
-<refpurpose>Input method module registration utility</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-<command>gtk-query-immodules-3.0</command>
-<arg choice="opt">--update-cache</arg>
-<arg choice="opt" rep="repeat">module</arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1><title>Description</title>
-<para>
-<command>gtk-query-immodules-3.0</command> collects information about loadable
-input method modules for GTK+ and writes it to the default cache file
-location, or to <filename>stdout</filename>.
-</para>
-<para>
-If called without arguments, it looks for modules in the GTK+ input method
-module path.
-</para>
-<para>
-If called with arguments, it looks for the specified modules. The arguments
-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>
-can be set to point GTK+ at the file.
-</para>
-</refsect1>
-
-<refsect1><title>Options</title>
-<variablelist>
-  <varlistentry>
-    <term>--update-cache</term>
-    <listitem><para>Write the output to the default cache location instead of
-                    <filename>stdout</filename></para></listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-<refsect1><title>Environment</title>
-<para>
-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>
-
-<refsect1><title>Bugs</title>
-<para>
-None known yet.
-</para>
-</refsect1>
-
-</refentry>
-
-

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

@@ -5,18 +5,18 @@
 <refentry id="gtk-update-icon-cache">
 
 <refmeta>
-<refentrytitle>gtk-update-icon-cache-3.0</refentrytitle>
+<refentrytitle>gtk-update-icon-cache</refentrytitle>
 <manvolnum>1</manvolnum>
 </refmeta>
 
 <refnamediv>
-<refname>gtk-update-icon-cache-3.0</refname>
+<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>
@@ -28,22 +28,20 @@
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
-<para>
-  <command>gtk-update-icon-cache-3.0</command> creates mmap()able cache
-  files for icon themes.
+<para><command>gtk-update-icon-cache</command> creates mmap()able 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 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.
 </para>
 <para>
-  GTK+ can use the cache files created by <command>gtk-update-icon-cache-3.0</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
-  shared between multiple applications, the overall memory consumption is
-  reduced as well.
+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 shared between
+multiple applications, the overall memory consumption is reduced as well.
 </para>
 </refsect1>
 
@@ -52,17 +50,17 @@
   <varlistentry>
     <term>--force</term>
     <term>-f</term>
-    <listitem><para>Overwrite an existing cache file even if it appears to be
+    <listitem><para>Overwrite an existing cache file even if it appears to be 
          uptodate.</para></listitem>
   </varlistentry>
 
   <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>
-     refuses to create an icon cache in a directory which does not appear to
-     be the toplevel directory of an icon theme.
+    <listitem><para>Don't check for the existence of 'index.theme' 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>
   </varlistentry>
 
@@ -76,15 +74,15 @@
   <varlistentry>
     <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
+    <listitem><para>Output a C header file declaring a constant 
+     <replaceable>name</replaceable> with the contents of the icon 
      cache.</para></listitem>
   </varlistentry>
 
   <varlistentry>
     <term>--quiet</term>
     <term>-q</term>
-    <listitem><para>Turn off verbose output.
+    <listitem><para>Turn off verbose output. 
     </para></listitem>
   </varlistentry>
 

docs/reference/gtk/gtk.types

@@ -11,7 +11,6 @@ gtk_action_group_get_type
 gtk_activatable_get_type
 gtk_adjustment_get_type
 gtk_alignment_get_type
-gtk_application_get_type
 gtk_arrow_get_type
 gtk_aspect_frame_get_type
 gtk_assistant_get_type
@@ -37,12 +36,17 @@ gtk_cell_view_get_type
 gtk_check_button_get_type
 gtk_check_menu_item_get_type
 gtk_clipboard_get_type
+gtk_clist_get_type
 gtk_color_button_get_type
 gtk_color_selection_dialog_get_type
 gtk_color_selection_get_type
 gtk_combo_box_entry_get_type
 gtk_combo_box_get_type
+gtk_combo_get_type
+gtk_combo_box_text_get_type
 gtk_container_get_type
+gtk_ctree_get_type
+gtk_curve_get_type
 gtk_dialog_get_type
 gtk_drawing_area_get_type
 gtk_editable_get_type
@@ -56,11 +60,13 @@ gtk_file_chooser_dialog_get_type
 gtk_file_chooser_get_type
 gtk_file_chooser_widget_get_type
 gtk_file_filter_get_type
+gtk_file_selection_get_type
 gtk_fixed_get_type
 gtk_font_button_get_type
 gtk_font_selection_dialog_get_type
 gtk_font_selection_get_type
 gtk_frame_get_type
+gtk_gamma_curve_get_type
 gtk_handle_box_get_type
 gtk_hbox_get_type
 gtk_hbutton_box_get_type
@@ -79,11 +85,15 @@ gtk_im_context_get_type
 gtk_im_context_simple_get_type
 gtk_im_multicontext_get_type
 gtk_info_bar_get_type
+gtk_input_dialog_get_type
 gtk_invisible_get_type
+gtk_item_factory_get_type
 gtk_item_get_type
 gtk_label_get_type
 gtk_layout_get_type
 gtk_link_button_get_type
+gtk_list_get_type
+gtk_list_item_get_type
 gtk_list_store_get_type
 gtk_menu_bar_get_type
 gtk_menu_get_type
@@ -96,12 +106,16 @@ gtk_mount_operation_get_type
 gtk_notebook_get_type
 gtk_object_get_type
 gtk_offscreen_window_get_type
+gtk_old_editable_get_type
+gtk_option_menu_get_type
 gtk_orientable_get_type
 gtk_page_setup_get_type
 gtk_page_setup_unix_dialog_get_type
 gtk_paned_get_type
 gtk_paper_size_get_type
+gtk_pixmap_get_type
 gtk_plug_get_type
+gtk_preview_get_type
 gtk_printer_get_type
 gtk_print_context_get_type
 gtk_print_job_get_type
@@ -110,6 +124,7 @@ gtk_print_operation_preview_get_type
 gtk_print_settings_get_type
 gtk_print_unix_dialog_get_type
 gtk_progress_bar_get_type
+gtk_progress_get_type
 gtk_radio_action_get_type
 gtk_radio_button_get_type
 gtk_radio_menu_item_get_type
@@ -132,7 +147,6 @@ gtk_separator_menu_item_get_type
 gtk_separator_tool_item_get_type
 gtk_settings_get_type
 gtk_size_group_get_type
-gtk_size_request_get_type
 gtk_socket_get_type
 gtk_spin_button_get_type
 gtk_spinner_get_type
@@ -143,11 +157,13 @@ gtk_table_get_type
 gtk_tearoff_menu_item_get_type
 gtk_text_buffer_get_type
 gtk_text_child_anchor_get_type
+gtk_text_get_type
 gtk_text_iter_get_type
 gtk_text_mark_get_type
 gtk_text_tag_get_type
 gtk_text_tag_table_get_type
 gtk_text_view_get_type
+gtk_tips_query_get_type
 gtk_toggle_action_get_type
 gtk_toggle_button_get_type
 gtk_toggle_tool_button_get_type
@@ -156,8 +172,11 @@ gtk_tool_button_get_type
 gtk_tool_item_get_type
 gtk_tool_item_group_get_type
 gtk_tool_palette_get_type
+gtk_tooltips_get_type
 gtk_tree_drag_dest_get_type
 gtk_tree_drag_source_get_type
+gtk_tree_get_type
+gtk_tree_item_get_type
 gtk_tree_model_filter_get_type
 gtk_tree_model_get_type
 gtk_tree_model_sort_get_type

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

@@ -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-2-to-3">
-  <title>Migrating from GTK+ 2.x to GTK+ 3</title>
-
-  <para>
-    There are a number of steps that you can take to prepare your GTK+ 2.x
-    application for the switch to GTK+ 3.
-  </para>
-
-  <section>
-  <title>Only single includes</title>
-  <para>
-    Make sure your program only include the toplevel headers:
-    <programlisting>
-    make CFLAGS+="-DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
-    </programlisting>
-  </para>
-  </section>
-
-  <section>
-  <title>Do not use deprecated symbols</title>
-  <para>
-    Make sure your program doesn't use any functions that have been
-    deprecated in GTK+ 2.x:
-    <programlisting>
-    make CFLAGS+="-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
-    </programlisting>
-  </para>
-  </section>
-
-  <section>
-  <title>Use accessor functions instead direct access</title>
-  <para>
-    GTK+ 3 removes many implementation details and struct members from
-    its public headers. To ensure that your application does not have problems
-    with this, you define the preprocessor symbol GSEAL_ENABLE. 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>
-    Starting with 2.90.4, GTK+'s .pc files turn on GSEAL_ENABLE by default.
-  </para>
-  </section>
-
-  <section>
-  <title>GTK+ Modules</title>
-  <para>
-    Some software packages install loadable GTK+ modules such as theme engines,
-    gdk-pixbuf loaders or input methods. Since GTK+ 3 is parallel-installable
-    with GTK+ 2.x, the two GTK+ versions have separate locations for their
-    loadable modules. The location for GTK+ 2.x is
-    <filename><replaceable>libdir</replaceable>/gtk-2.0</filename>
-    (and its subdirectories), for GTK+ 3 the location is
-    <filename><replaceable>libdir</replaceable>/gtk-3.0</filename>
-    (and its subdirectories).
-  </para>
-  <para>
-    For some kinds of modules, namely input methods and pixbuf loaders,
-    GTK+ keeps a cache file with extra information about the modules.
-    For GTK+ 2.x, these cache files are located in
-    <filename><replaceable>sysconfdir</replaceable>/gtk-2.0</filename>.
-    For GTK+ 3, they have been moved to
-    <filename><replaceable>libdir</replaceable>/gtk-3.0/3.0.0/</filename>.
-    The commands that create these cache files have been renamed with a -3
-    suffix to make them parallel-installable.
-  </para>
-  <para>
-    Note that GTK+ modules often link against libgtk, libgdk-pixbuf, etc.
-    If that is the case for your module, you have to be careful to link the
-    GTK+ 2.x version of your module against the 2.x version of the libraries,
-    and the GTK+ 3 version against hte 3.x versions. Loading a module linked
-    against libgtk 2.x into an application using GTK+ 3 will lead to
-    unhappiness and must be avoided.
-  </para>
-  </section>
-</chapter>

docs/reference/gtk/migrating-GtkBuilder.sgml

@@ -81,12 +81,7 @@ if (!gtk_builder_add_from_file (builder, FILE, &error))
       <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.
+        Intltool does support this since version 0.41.1.
       </para></listitem>
 
       <listitem><para>

docs/reference/gtk/migrating-checklist.sgml

@@ -19,15 +19,15 @@
     <formalpara>
       <title>Why</title>
       <para>
-        By handling this signal, you let widgets have
-        context-sensitive menus that can be invoked with the standard
-        key bindings.
+	By handling this signal, you let widgets have
+	context-sensitive menus that can be invoked with the standard
+	key bindings.
       </para>
     </formalpara>
 
     <para>
-      The #GtkWidget::popup-menu signal instructs the widget for which
-      it is emitted to create a context-sensitive popup menu. By default,
+      The #GtkWidget::popup-menu signal instructs the widget for which 
+      it is emitted to create a context-sensitive popup menu. By default, 
       the <link linkend="gtk-bindings">key binding mechanism</link> is set to
       emit this signal when the
       <keycombo><keycap>Shift</keycap><keycap>F10</keycap></keycombo>
@@ -39,14 +39,14 @@
 
     <orderedlist>
       <listitem>
-        <para>
-          Write a function to create and show a popup menu.  This
-          function needs to know the button number and the event's
-          time to pass them to gtk_menu_popup().  You can implement
-          such a function like this:
-        </para>
+	<para>
+	  Write a function to create and show a popup menu.  This
+	  function needs to know the button number and the event's
+	  time to pass them to gtk_menu_popup().  You can implement
+	  such a function like this:
+	</para>
 
-        <programlisting id="do_popup_menu">
+	<programlisting id="do_popup_menu">
 static void
 do_popup_menu (GtkWidget *my_widget, GdkEventButton *event)
 {
@@ -54,7 +54,7 @@ do_popup_menu (GtkWidget *my_widget, GdkEventButton *event)
   int button, event_time;
 
   menu = gtk_menu_new (<!-- -->);
-  g_signal_connect (menu, "deactivate",
+  g_signal_connect (menu, "deactivate", 
                     G_CALLBACK (gtk_widget_destroy), NULL);
 
   /* ... add menu items ... */
@@ -71,19 +71,19 @@ do_popup_menu (GtkWidget *my_widget, GdkEventButton *event)
     }
 
   gtk_menu_attach_to_widget (GTK_MENU (menu), my_widget, NULL);
-  gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
+  gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 
                   button, event_time);
 }
-        </programlisting>
+	</programlisting>
       </listitem>
 
       <listitem>
-        <para>
-          In your #GtkWidget::button-press-event handler, call this function
+	<para>
+	  In your #GtkWidget::button-press-event handler, call this function 
           when you need to pop up a menu:
-        </para>
+	</para>
 
-        <programlisting>
+	<programlisting>
 static gboolean
 my_widget_button_press_event_handler (GtkWidget *widget, GdkEventButton *event)
 {
@@ -96,52 +96,52 @@ my_widget_button_press_event_handler (GtkWidget *widget, GdkEventButton *event)
 
   return FALSE;
 }
-        </programlisting>
+	</programlisting>
       </listitem>
 
       <listitem>
-        <para>
-          Implement a handler for the #GtkWidget::popup-menu signal:
-        </para>
+	<para>
+	  Implement a handler for the #GtkWidget::popup-menu signal:
+	</para>
 
-        <programlisting>
+	<programlisting>
 static gboolean
 my_widget_popup_menu_handler (GtkWidget *widget)
 {
   do_popup_menu (widget, NULL);
   return TRUE;
 }
-        </programlisting>
+	</programlisting>
       </listitem>
     </orderedlist>
 
     <note>
       <para>
-        If you do not pass a positioning function to gtk_menu_popup(),
-        it will show the menu at the mouse position by default.  This
-        is what you usually want when the menu is shown as a result of
-        pressing a mouse button.  However, if you press the
-        <keycombo><keycap>Shift</keycap><keycap>F10</keycap></keycombo>
-        or <keycap>Menu</keycap> keys while the widget is focused, the
-        mouse cursor may not be near the widget at all.  In the <link
-        linkend="do_popup_menu">example above</link>, you may want to
-        provide your own <link
-        linkend="GtkMenuPositionFunc">menu-positioning function</link>
-        in the case where the <parameter>event</parameter> is
-        %NULL.  This function should compute the desired position for
-        a menu when it is invoked through the keyboard.  For example,
-        #GtkEntry aligns the top edge of its popup menu with the bottom
+	If you do not pass a positioning function to gtk_menu_popup(),
+	it will show the menu at the mouse position by default.  This
+	is what you usually want when the menu is shown as a result of
+	pressing a mouse button.  However, if you press the
+	<keycombo><keycap>Shift</keycap><keycap>F10</keycap></keycombo>
+	or <keycap>Menu</keycap> keys while the widget is focused, the
+	mouse cursor may not be near the widget at all.  In the <link
+	linkend="do_popup_menu">example above</link>, you may want to
+	provide your own <link
+	linkend="GtkMenuPositionFunc">menu-positioning function</link>
+	in the case where the <parameter>event</parameter> is
+	%NULL.  This function should compute the desired position for 
+        a menu when it is invoked through the keyboard.  For example, 
+        #GtkEntry aligns the top edge of its popup menu with the bottom 
         edge of the entry.
       </para>
     </note>
 
     <note>
       <para>
-        For the standard key bindings to work, your widget must be
-        able to take the keyboard focus.  In general, widgets should
-        be fully usable through the keyboard and not just the mouse.
-        The very first step of this is to ensure that your widget
-        turns on the %GTK_CAN_FOCUS <link linkend="gtkwidgetflags">flag</link>.
+	For the standard key bindings to work, your widget must be
+	able to take the keyboard focus.  In general, widgets should
+	be fully usable through the keyboard and not just the mouse.
+	The very first step of this is to ensure that your widget
+	turns on the %GTK_CAN_FOCUS <link linkend="gtkwidgetflags">flag</link>.
       </para>
     </note>
   </section>
@@ -152,21 +152,23 @@ my_widget_popup_menu_handler (GtkWidget *widget)
     <formalpara>
       <title>Why</title>
       <para>
-        The <structfield>region</structfield> field of
-        <structname>GdkEventExpose</structname> allows you to redraw
-        less than the traditional <structfield>GdkEventRegion.area</structfield>.
+	The <structfield>region</structfield> field of
+	<structname>GdkEventExpose</structname> allows you to redraw
+	less than the traditional
+	<structfield>GdkEventRegion.area</structfield>.
       </para>
     </formalpara>
 
     <para>
-      In early GTK+ versions, the <structname>GdkEventExpose</structname>
+      In GTK+ 1.x, the <structname>GdkEventExpose</structname>
       structure only had an <structfield>area</structfield> field to
-      let you determine the region that you needed to redraw. In current
-      GTK+, this field still exists for compatibility and as a simple
-      interface. However, there is also a <structfield>region</structfield>
-      field which contains a fine-grained region. The
-      <structfield>area</structfield> field is simply the bounding rectangle
-      of the <structfield>region</structfield>.
+      let you determine the region that you needed to redraw.  In GTK+
+      2.x, this field exists for compatibility and as a simple
+      interface.  However, there is also a
+      <structfield>region</structfield> field which contains a
+      fine-grained region.  The <structfield>area</structfield> field
+      is simply the bounding rectangle of the
+      <structfield>region</structfield>.
     </para>
 
     <para>
@@ -181,7 +183,7 @@ my_widget_popup_menu_handler (GtkWidget *widget)
 
     <para>
       Regions have an internal representation that is accessible as a
-      list of rectangles.  To turn the
+      list of rectangles.  To turn the 
       <structfield>GdkEventExpose.region</structfield> field into such
       a list, use gdk_region_get_rectangles():
     </para>
@@ -198,7 +200,7 @@ my_widget_expose_event_handler (GtkWidget *widget, GdkEventExpose *event)
 
   for (i = 0; i &lt; n_rects; i++)
     {
-      /* Repaint rectangle: (rects[i].x, rects[i].y),
+      /* Repaint rectangle: (rects[i].x, rects[i].y), 
        *                    (rects[i].width, rects[i].height)
        */
     }
@@ -216,9 +218,9 @@ my_widget_expose_event_handler (GtkWidget *widget, GdkEventExpose *event)
     <formalpara>
       <title>Why</title>
       <para>
-        With gtk_accelerator_get_default_mod_mask() you can test for
-        modifier keys reliably; this way your key event handlers will
-        work correctly even if <keycap>NumLock</keycap> or
+	With gtk_accelerator_get_default_mod_mask() you can test for 
+        modifier keys reliably; this way your key event handlers will 
+        work correctly even if <keycap>NumLock</keycap> or 
         <keycap>CapsLock</keycap> are activated.
       </para>
     </formalpara>
@@ -228,8 +230,8 @@ my_widget_expose_event_handler (GtkWidget *widget, GdkEventExpose *event)
       <structfield>state</structfield> field is a bit mask which
       indicates the modifier state at the time the key was pressed.
       Modifiers are keys like <keycap>Control</keycap> and
-      <keycap>NumLock</keycap>.  When implementing a
-      #GtkWidget::key-press-event handler, you should use
+      <keycap>NumLock</keycap>.  When implementing a 
+      #GtkWidget::key-press-event handler, you should use 
       gtk_accelerator_get_default_mod_mask() to
       test against modifier keys.  This function returns a bit mask
       which encompasses all the modifiers which the user may be
@@ -287,16 +289,17 @@ my_widget_key_press_event_handler (GtkWidget *widget, GdkEventKey *event)
     <formalpara>
       <title>Why</title>
       <para>
-        Named icons automatically adapt to theme changes, giving your
+	Named icons automatically adapt to theme changes, giving your
         application a much more integrated appearance.
       </para>
     </formalpara>
 
     <para>
-      Named icons can be used for window icons (see gtk_window_set_icon_name())
-      and images (see gtk_image_set_icon_name()). You can also use named icons
-      for drag-and-drop (see gtk_drag_source_set_icon_name()) and in treeview
-      cells (see the #GtkCellRendererPixbuf:icon-name property).
+      Since GTK+ 2.6, named icons can be used for window icons (see
+      gtk_window_set_icon_name()) and images (see gtk_image_set_icon_name()).
+      In GTK+ 2.8, you can also use named icons for drag-and-drop (see 
+      gtk_drag_source_set_icon_name()) and in treeview cells (see the
+      #GtkCellRendererPixbuf:icon-name property).
     </para>
   </section>
 </chapter>

docs/reference/gtk/objects_grouped.sgml

@@ -84,6 +84,8 @@
     <link linkend="GtkImage">GtkImage</link>
     <link linkend="GtkPixmap">GtkPixmap</link>
     <link linkend="GtkPreview">GtkPreview</link>
+    <link linkend="GtkCurve">GtkCurve</link>
+    <link linkend="GtkGammaCurve">GtkGammaCurve</link>
 
 <emphasis>Misc. Widgets</emphasis>
     <link linkend="GtkArrow">GtkArrow</link>

docs/reference/gtk/osx.sgml

@@ -31,7 +31,7 @@ or environment variables.
 
 <para>
 For up-to-date information about the current status of this port, see the
-<ulink url="http://developer.imendio.com/wiki/Gtk_Mac_OS_X">project page</ulink>.
+<ulink url="http://live.gnome.org/GTK+/OSX">project page</ulink>.
 </para>
 
 </refsect1>

docs/reference/gtk/question_index.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-question-index">
+<refentry id="gtk-question-index" revision="1 Jan 2002">
 <refmeta>
 <refentrytitle>Common Questions</refentrytitle>
 <manvolnum>3</manvolnum>
@@ -63,14 +63,19 @@ See the <link linkend="gtk-resources">documentation on this topic</link>.
 
 
 <qandaentry>
-<question><para>How do I port from one GTK+
+<question><para>How do I port from one GTK+ 
 version to another?</para></question>
 
 <answer>
 
 <para>
-See <xref linkend="gtk-migrating-2-to-3"/>.
-You may also find useful information in the documentation for
+See the <link linkend="gtk-changes-2-0">list of incompatible changes
+from 1.2 to 2.0</link>. Also, the <ulink
+url="http://developer.gnome.org/dotplan/porting/">GNOME 2.0 porting
+guide</ulink> on <ulink
+url="http://developer.gnome.org">http://developer.gnome.org</ulink>
+has some more detailed discussion of porting from 1.2 to 2.0.
+You may also find useful information in the documentation for 
 specific widgets and functions.
 </para>
 

docs/reference/gtk/running.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-running">
+<refentry id="gtk-running" revision="10 Jan 2002">
 <refmeta>
 <refentrytitle>Running GTK+ Applications</refentrytitle>
 <manvolnum>3</manvolnum>
@@ -24,8 +24,8 @@ How to run and debug your GTK+ application
 
 <para>
 All GTK+ applications support a number of standard commandline
-options. These are removed from <literal>argv</literal> by gtk_init().
-Modules may parse and remove further options. The
+options. These are removed from <literal>argv</literal> by gtk_init(). 
+Modules may parse and remove further options. The 
 <link linkend="x11-cmdline">X11</link> and
 <link linkend="win32-cmdline">Windows</link> GDK backends parse
 some additional commandline options.
@@ -35,8 +35,8 @@ some additional commandline options.
 <title><systemitem>--gtk-module <replaceable>module</replaceable></systemitem></title>
 
 <para>
-A list of modules to load in addition to those specified in the
-<envar>GTK_MODULES</envar> environment variable and the
+A list of modules to load in addition to those specified in the 
+<envar>GTK_MODULES</envar> environment variable and the 
 <literal>gtk-modules</literal> setting.
 </para>
 </formalpara>
@@ -56,10 +56,11 @@ warning that occurs.
 <title><systemitem>--gtk-debug <replaceable>options</replaceable></systemitem></title>
 
 <para>
-A list of <link linkend="GTK-Debug-Options">debug options</link>
-to turn on in addition to those specified in the <envar>GTK_DEBUG</envar>
-environment variable. This option is only available if GTK+ has been
-configured with <option>--enable-debug=yes</option>.
+A list of <link linkend="GTK-Debug-Options">debug options</link> 
+to turn on in addition to those specified in the <envar>GTK_DEBUG</envar> 
+environment variable. 
+This option is only available if GTK+ has been configured with
+<option>--enable-debug=yes</option>.
 </para>
 </formalpara>
 
@@ -67,8 +68,9 @@ configured with <option>--enable-debug=yes</option>.
 <title><systemitem>--gtk-no-debug <replaceable>options</replaceable></systemitem></title>
 
 <para>
-A list of <link linkend="GTK-Debug-Options">debug options</link>
-to turn off. This option is only available if GTK+ has been configured with
+A list of <link linkend="GTK-Debug-Options">debug options</link> 
+to turn off.
+This option is only available if GTK+ has been configured with
 <option>--enable-debug=yes</option>.
 </para>
 </formalpara>
@@ -82,7 +84,7 @@ list them here for completeness nevertheless.
 <title><systemitem>--class <replaceable>class</replaceable></systemitem></title>
 
 <para>
-Sets the program class; see gdk_set_program_class().
+Sets the program class; see gdk_set_program_class(). 
 </para>
 </formalpara>
 
@@ -98,9 +100,9 @@ Sets the program name.
 <title><systemitem>--gdk-debug <replaceable>options</replaceable></systemitem></title>
 
 <para>
-A list of <link linkend="GDK-Debug-Options">debug options</link>
-to turn on in addition to those specified in the <envar>GDK_DEBUG</envar>
-environment variable. This option is only available if GTK+ has been
+A list of <link linkend="GDK-Debug-Options">debug options</link> 
+to turn on in addition to those specified in the <envar>GDK_DEBUG</envar> 
+environment variable. This option is only available if GTK+ has been 
 configured with <option>--enable-debug=yes</option>.
 </para>
 </formalpara>
@@ -109,7 +111,7 @@ configured with <option>--enable-debug=yes</option>.
 <title><systemitem>--gdk-no-debug <replaceable>options</replaceable></systemitem></title>
 
 <para>
-A list of <link linkend="GDK-Debug-Options">debug options</link>
+A list of <link linkend="GDK-Debug-Options">debug options</link> 
 to turn off. This option is only available if GTK+ has been configured with
 <option>--enable-debug=yes</option>.
 </para>
@@ -120,12 +122,12 @@ to turn off. This option is only available if GTK+ has been configured with
 <refsect2>
 <title>Environment variables</title>
 
-<para>
+<para> 
 GTK+ inspects a number of environment variables in addition to standard
-variables like <envar>LANG</envar>, <envar>PATH</envar>, <envar>HOME</envar>
-or <envar>DISPLAY</envar>; mostly to determine paths to look for certain
-files. The <link linkend="x11-envar">X11</link>,
-<link linkend="win32-envar">Windows</link> and
+variables like <envar>LANG</envar>, <envar>PATH</envar>, <envar>HOME</envar> 
+or <envar>DISPLAY</envar>; mostly to determine paths to look for certain 
+files. The <link linkend="x11-envar">X11</link>, 
+<link linkend="win32-envar">Windows</link> and 
 <link linkend="fb-envar">Framebuffer</link> GDK backends use some
 additional environment variables.
 </para>
@@ -188,7 +190,7 @@ additional environment variables.
     </varlistentry>
 
   </variablelist>
-  The special value <literal>all</literal> can be used to turn on all
+  The special value <literal>all</literal> can be used to turn on all 
   debug options.
   </para>
 </formalpara>
@@ -199,6 +201,10 @@ additional environment variables.
   <para>
     A list of modules to load. Note that GTK+ also allows to specify modules to load via a commandline option (<option>--gtk-module</option>) and with the <literal>gtk-modules</literal> setting.
   </para>
+  <warning>
+    Note that this environment variable is read by GTK+ 3 too,
+    which may not have the same set of modules available for loading.
+  </warning>
 </formalpara>
 
 <formalpara>
@@ -208,14 +214,14 @@ additional environment variables.
     Specifies a list of directories to search when GTK+ is looking for
     dynamically loaded objects such as the modules specified by
     <envar>GTK_MODULES</envar>, theme engines, input method
-    modules, file system backends and print backends. If the path to
-    the dynamically loaded object is given as an absolute path name,
-    then GTK+ loads it directly.
-    Otherwise, GTK+ goes in turn through the directories in GTK_PATH,
-    followed by the directory <filename>.gtk-3.0</filename> in the user's
-    home directory, followed by the system default directory,
-    which is <filename><replaceable>libdir</replaceable>/gtk-3.0/modules</filename>.
-    (If <envar>GTK_EXE_PREFIX</envar> is defined, <replaceable>libdir</replaceable> is
+    modules, file system backends and print backends. If the path to 
+    the dynamically loaded object is given as an absolute path name, 
+    then GTK+ loads it directly. 
+    Otherwise, GTK+ goes in turn through the directories in GTK_PATH, 
+    followed by the directory <filename>.gtk-2.0</filename> in the user's 
+    home directory, followed by the system default directory, 
+    which is <filename><replaceable>libdir</replaceable>/gtk-2.0/modules</filename>.
+    (If <envar>GTK_EXE_PREFIX</envar> is defined, <replaceable>libdir</replaceable> is 
     <filename>$GTK_EXE_PREFIX/lib</filename>. Otherwise it is the libdir
     specified when GTK+ was configured, usually
     <filename>/usr/lib</filename>, or
@@ -225,14 +231,14 @@ additional environment variables.
     <filename><replaceable>directory</replaceable>/<replaceable>version</replaceable>/<replaceable>host</replaceable>/<replaceable>type</replaceable></filename>
     Where <replaceable>version</replaceable> is derived from the
     version of GTK+ (use <literal>pkg-config
-    --variable=gtk_binary_version gtk+-3.0</literal> to determine this from a
+    --variable=gtk_binary_version gtk+-2.0</literal> to determine this from a
     script), <replaceable>host</replaceable> is the architecture on
     which GTK+ was built. (use <literal>pkg-config
-    --variable=gtk_host gtk+-3.0</literal> to determine this from a
+    --variable=gtk_host gtk+-2.0</literal> to determine this from a
     script), and <replaceable>type</replaceable> is a directory
     specific to the type of modules; currently it can be
-    <literal>modules</literal>, <literal>engines</literal>,
-    <literal>immodules</literal>, <literal>filesystems</literal> or
+    <literal>modules</literal>, <literal>engines</literal>, 
+    <literal>immodules</literal>, <literal>filesystems</literal> or 
     <literal>printbackends</literal>, corresponding to the types of
     modules mentioned above. Either <replaceable>version</replaceable>,
     <replaceable>host</replaceable>, or both may be omitted. GTK+ looks
@@ -241,6 +247,12 @@ additional environment variables.
     The components of GTK_PATH are separated by the ':' character on
     Linux and Unix, and the ';' character on Windows.
   </para>
+  <warning>
+    Note that this environment variable is read by GTK+ 3 too, which
+    makes it unsuitable for setting it system-wide (or session-wide),
+    since doing so will cause either GTK+ 2.x applications or GTK+ 3
+    applications to see incompatible modules.
+  </warning>
 </formalpara>
 
 <formalpara>
@@ -260,27 +272,34 @@ additional environment variables.
 
   <para>
     Specifies the file listing the IM modules to load. This environment
-    variable overrides the <literal>im_module_file</literal> specified in
-    the RC files, which in turn overrides the default value
-    <filename><replaceable>libdir</replaceable>/gtk-3.0/3.0.0/immodules.cache</filename>
-    (<replaceable>libdir</replaceable> has the same meaning here as explained for <envar>GTK_PATH</envar>).
+    variable overrides the <literal>im_module_file</literal> specified in 
+    the RC files, which in turn overrides the default value 
+    <filename><replaceable>sysconfdir</replaceable>/gtk-2.0/gtk.immodules</filename>
+    (<replaceable>sysconfdir</replaceable> is the sysconfdir specified when GTK+ was configured, 
+     usually <filename>/usr/local/etc</filename>.)
   </para>
 </formalpara>
 
 <formalpara>
   <title><envar>GTK2_RC_FILES</envar></title>
-
+  
   <para>
     Specifies a list of RC files to parse instead of the default ones;
     see <link linkend="gtk-Resource-Files">Resource Files</link>.
   </para>
+  <warning>
+    Note that this environment variable is read by GTK+ 3 too, which
+    makes it unsuitable for setting it system-wide (or session-wide),
+    since doing so will cause either GTK+ 2.x applications or GTK+ 3
+    applications to see the wrong list of IM modules.
+  </warning>
 </formalpara>
 
 <formalpara>
   <title><envar>GTK_EXE_PREFIX</envar></title>
 
   <para>
-    If set, GTK+ uses <filename>$GTK_EXE_PREFIX/lib</filename> instead of
+    If set, GTK+ uses <filename>$GTK_EXE_PREFIX/lib</filename> instead of 
     the libdir configured when GTK+ was compiled.
   </para>
 </formalpara>
@@ -304,11 +323,11 @@ nevertheless.
   <title><envar>GDK_PIXBUF_MODULE_FILE</envar></title>
 
   <para>
-    Specifies the file listing the GdkPixbuf loader modules to load.
-    This environment variable overrides the default value
-	<filename><replaceable>libdir</replaceable>/gtk-3.0/3.0.0/loaders.cache</filename>
-    (<replaceable>libdir</replaceable> is the sysconfdir specified when
-	GTK+ was configured, usually <filename>/usr/local/lib</filename>.)
+    Specifies the file listing the GdkPixbuf loader modules to load. 
+    This environment variable overrides the default value 
+    <filename><replaceable>sysconfdir</replaceable>/gtk-2.0/gdk-pixbuf.loaders</filename>
+    (<replaceable>sysconfdir</replaceable> is the sysconfdir specified when
+	  GTK+ was configured, usually <filename>/usr/local/etc</filename>.)
   </para>
  </formalpara>
 
@@ -382,13 +401,26 @@ nevertheless.
 
   <para>
     GTK+ uses these environment variables to locate icon themes
-    and MIME information. For more information, see
+    and MIME information. For more information, see 
     <ulink url="http://freedesktop.org/Standards/icon-theme-spec">Icon Theme Specification</ulink>,
-    the <ulink url="http://freedesktop.org/Standards/shared-mime-info-spec">Shared MIME-info Database</ulink>
+    the <ulink url="http://freedesktop.org/Standards/shared-mime-info-spec">Shared MIME-info Database</ulink> 
     and the <ulink url="http://freedesktop.org/Standards/basedir-spec">Base Directory Specification</ulink>.
   </para>
 </formalpara>
 
+<formalpara>
+  <title><envar>DESKTOP_STARTUP_ID</envar></title>
+
+  <para>
+    GTK+ uses this environment variable to provide startup notification
+    according to the <ulink url="http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt">Startup Notification Spec</ulink>.
+    Following the specification, GTK+ unsets this variable after reading
+    it (to keep it from leaking to child processes). So, if you need its
+    value for your own purposes, you have to read it before calling
+    gtk_init().
+  </para>
+</formalpara>
+
 </refsect2>
 
 </refsect1>

docs/reference/gtk/tmpl/.gitignore

@@ -1,34 +1,3 @@
-gtkactiongroup.sgml
-gtkbbox.sgml
-gtkbox.sgml
-gtkbuilder.sgml
-gtkbutton.sgml
-gtkcalendar.sgml
-gtkcelleditable.sgml
 gtkhbox.sgml
-gtkiconview.sgml
 gtkmessagedialog.sgml
-gtkobject.sgml
-gtkorientable.sgml
-gtkpagesetupunixdialog.sgml
-gtkprinter.sgml
-gtkradioaction.sgml
-gtkradiobutton.sgml
-gtkrange.sgml
-gtkrecentaction.sgml
-gtkrecentchooser.sgml
-gtkrecentchooserdialog.sgml
-gtkrecentchoosermenu.sgml
-gtkrecentchooserwidget.sgml
-gtkscalebutton.sgml
-gtkseparator.sgml
-gtkseparatormenuitem.sgml
-gtkseparatortoolitem.sgml
-gtkstatusbar.sgml
-gtkstyle.sgml
 gtktesting.sgml
-gtktextiter.sgml
-gtktoggleaction.sgml
-gtktoolitem.sgml
-gtktreednd.sgml
-gtkwindow.sgml